Module Name: src
Committed By: skrll
Date: Wed Feb 23 07:55:56 UTC 2022
Modified Files:
src/sys/arch/arm/nvidia: tegra_drm.c
src/sys/dev/fdt: fdt_i2c.c fdtvar.h
Log Message:
API naming consistency. NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/nvidia/tegra_drm.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/fdt/fdt_i2c.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/fdt/fdtvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_drm.c
diff -u src/sys/arch/arm/nvidia/tegra_drm.c:1.14 src/sys/arch/arm/nvidia/tegra_drm.c:1.15
--- src/sys/arch/arm/nvidia/tegra_drm.c:1.14 Sun Dec 19 12:44:50 2021
+++ src/sys/arch/arm/nvidia/tegra_drm.c Wed Feb 23 07:55:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm.c,v 1.14 2021/12/19 12:44:50 riastradh Exp $ */
+/* $NetBSD: tegra_drm.c,v 1.15 2022/02/23 07:55:56 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm.c,v 1.14 2021/12/19 12:44:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm.c,v 1.15 2022/02/23 07:55:56 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -170,7 +170,7 @@ tegra_drm_attach(device_t parent, device
ddc_phandle = fdtbus_get_phandle(hdmi_phandle,
"nvidia,ddc-i2c-bus");
if (ddc_phandle >= 0) {
- sc->sc_ddc = fdtbus_get_i2c_tag(ddc_phandle);
+ sc->sc_ddc = fdtbus_i2c_get_tag(ddc_phandle);
}
sc->sc_pin_hpd = fdtbus_gpio_acquire(hdmi_phandle,
Index: src/sys/dev/fdt/fdt_i2c.c
diff -u src/sys/dev/fdt/fdt_i2c.c:1.11 src/sys/dev/fdt/fdt_i2c.c:1.12
--- src/sys/dev/fdt/fdt_i2c.c:1.11 Sat Aug 7 16:19:10 2021
+++ src/sys/dev/fdt/fdt_i2c.c Wed Feb 23 07:55:55 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_i2c.c,v 1.11 2021/08/07 16:19:10 thorpej Exp $ */
+/* $NetBSD: fdt_i2c.c,v 1.12 2022/02/23 07:55:55 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.11 2021/08/07 16:19:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.12 2022/02/23 07:55:55 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -75,7 +75,7 @@ fdtbus_get_i2c_controller(int phandle)
}
i2c_tag_t
-fdtbus_get_i2c_tag(int phandle)
+fdtbus_i2c_get_tag(int phandle)
{
struct fdtbus_i2c_controller *i2c;
@@ -95,7 +95,7 @@ fdtbus_i2c_acquire(int phandle, const ch
if (i2c_phandle == -1)
return NULL;
- return fdtbus_get_i2c_tag(i2c_phandle);
+ return fdtbus_i2c_get_tag(i2c_phandle);
}
device_t
Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.74 src/sys/dev/fdt/fdtvar.h:1.75
--- src/sys/dev/fdt/fdtvar.h:1.74 Fri Jan 14 07:40:52 2022
+++ src/sys/dev/fdt/fdtvar.h Wed Feb 23 07:55:55 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.74 2022/01/14 07:40:52 skrll Exp $ */
+/* $NetBSD: fdtvar.h,v 1.75 2022/02/23 07:55:55 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -322,7 +322,7 @@ int fdtbus_get_phandle_with_data(int, c
int, struct fdt_phandle_data *);
int fdtbus_get_phandle_from_native(int);
-i2c_tag_t fdtbus_get_i2c_tag(int);
+i2c_tag_t fdtbus_i2c_get_tag(int);
i2c_tag_t fdtbus_i2c_acquire(int, const char *);
void * fdtbus_intr_establish(int, u_int, int, int,
