Module Name: src
Committed By: thorpej
Date: Sun May 9 22:36:35 UTC 2021
Modified Files:
src/sys/arch/macppc/dev [thorpej-i2c-spi-conf]: deq.c lmu.c psoc.c
smusat.c
Log Message:
ia->ia_cookie -> devhandle_to_of(device_handle(self))
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.4.1 src/sys/arch/macppc/dev/deq.c
cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/arch/macppc/dev/lmu.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/macppc/dev/psoc.c
cvs rdiff -u -r1.9.4.1 -r1.9.4.2 src/sys/arch/macppc/dev/smusat.c
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/macppc/dev/deq.c
diff -u src/sys/arch/macppc/dev/deq.c:1.20 src/sys/arch/macppc/dev/deq.c:1.20.4.1
--- src/sys/arch/macppc/dev/deq.c:1.20 Wed Jan 27 02:17:27 2021
+++ src/sys/arch/macppc/dev/deq.c Sun May 9 22:36:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: deq.c,v 1.20 2021/01/27 02:17:27 thorpej Exp $ */
+/* $NetBSD: deq.c,v 1.20.4.1 2021/05/09 22:36:35 thorpej Exp $ */
/*-
* Copyright (C) 2005 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.20 2021/01/27 02:17:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.20.4.1 2021/05/09 22:36:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@ deq_attach(device_t parent, device_t sel
char name[256];
sc->sc_dev = self;
- sc->sc_node = ia->ia_cookie;
+ sc->sc_node = devhandle_to_of(device_handle(self));
sc->sc_parent = parent;
sc->sc_address = ia->ia_addr;
sc->sc_i2c = ia->ia_tag;
Index: src/sys/arch/macppc/dev/lmu.c
diff -u src/sys/arch/macppc/dev/lmu.c:1.8 src/sys/arch/macppc/dev/lmu.c:1.8.4.1
--- src/sys/arch/macppc/dev/lmu.c:1.8 Wed Jan 27 02:17:28 2021
+++ src/sys/arch/macppc/dev/lmu.c Sun May 9 22:36:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lmu.c,v 1.8 2021/01/27 02:17:28 thorpej Exp $ */
+/* $NetBSD: lmu.c,v 1.8.4.1 2021/05/09 22:36:35 thorpej Exp $ */
/*-
* Copyright (c) 2020 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lmu.c,v 1.8 2021/01/27 02:17:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lmu.c,v 1.8.4.1 2021/05/09 22:36:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -166,7 +166,7 @@ lmu_attach(device_t parent, device_t sel
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_node = ia->ia_cookie;
+ sc->sc_node = devhandle_to_of(device_handle(self));
sc->sc_last = 0;
aprint_naive("\n");
Index: src/sys/arch/macppc/dev/psoc.c
diff -u src/sys/arch/macppc/dev/psoc.c:1.6 src/sys/arch/macppc/dev/psoc.c:1.6.4.1
--- src/sys/arch/macppc/dev/psoc.c:1.6 Wed Jan 27 02:17:28 2021
+++ src/sys/arch/macppc/dev/psoc.c Sun May 9 22:36:35 2021
@@ -1,4 +1,4 @@
- /* $NetBSD: psoc.c,v 1.6 2021/01/27 02:17:28 thorpej Exp $ */
+ /* $NetBSD: psoc.c,v 1.6.4.1 2021/05/09 22:36:35 thorpej Exp $ */
/*-
* Copyright (c) 2019 Michael Lorenz
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psoc.c,v 1.6 2021/01/27 02:17:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psoc.c,v 1.6.4.1 2021/05/09 22:36:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,7 +109,7 @@ psoc_attach(device_t parent, device_t se
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
sc->sc_addr = ia->ia_addr;
- sc->sc_node = ia->ia_cookie;
+ sc->sc_node = devhandle_to_of(device_handle(self));
sc->sc_last = 0;
aprint_naive("\n");
Index: src/sys/arch/macppc/dev/smusat.c
diff -u src/sys/arch/macppc/dev/smusat.c:1.9.4.1 src/sys/arch/macppc/dev/smusat.c:1.9.4.2
--- src/sys/arch/macppc/dev/smusat.c:1.9.4.1 Sun May 9 22:29:54 2021
+++ src/sys/arch/macppc/dev/smusat.c Sun May 9 22:36:35 2021
@@ -135,7 +135,7 @@ smusat_attach(device_t parent, device_t
int node, i, j;
sc->sc_dev = self;
- sc->sc_node = ia->ia_cookie;
+ sc->sc_node = devhandle_to_of(device_handle(self));
sc->sc_addr = ia->ia_addr;
sc->sc_i2c = ia->ia_tag;
