Module Name:    src
Committed By:   thorpej
Date:           Fri Sep 10 15:45:28 UTC 2021

Modified Files:
        src/sys/arch/macppc/dev [thorpej-i2c-spi-conf2]: cuda.c ki2c.c
        src/sys/arch/sandpoint/sandpoint [thorpej-i2c-spi-conf2]: autoconf.c
        src/sys/arch/sparc64/sparc64 [thorpej-i2c-spi-conf2]: ofw_patch.c
        src/sys/dev/acpi [thorpej-i2c-spi-conf2]: acpi_i2c.c
        src/sys/dev/i2c [thorpej-i2c-spi-conf2]: adm1021.c dbcool.c dstemp.c
            i2c.c i2cvar.h lm75.c
        src/sys/dev/ofw [thorpej-i2c-spi-conf2]: ofw_i2c_subr.c

Log Message:
Remove unnecessary references to i2c_attach_args::ia_prop and mark the ones
that remain as XXX.


To generate a diff of this commit:
cvs rdiff -u -r1.29.2.1 -r1.29.2.2 src/sys/arch/macppc/dev/cuda.c
cvs rdiff -u -r1.32.2.1 -r1.32.2.2 src/sys/arch/macppc/dev/ki2c.c
cvs rdiff -u -r1.29.16.2 -r1.29.16.3 \
    src/sys/arch/sandpoint/sandpoint/autoconf.c
cvs rdiff -u -r1.7.14.1 -r1.7.14.2 src/sys/arch/sparc64/sparc64/ofw_patch.c
cvs rdiff -u -r1.11.14.1 -r1.11.14.2 src/sys/dev/acpi/acpi_i2c.c
cvs rdiff -u -r1.29 -r1.29.6.1 src/sys/dev/i2c/adm1021.c
cvs rdiff -u -r1.62 -r1.62.6.1 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.14 -r1.14.6.1 src/sys/dev/i2c/dstemp.c
cvs rdiff -u -r1.80.2.4 -r1.80.2.5 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.24.12.1 -r1.24.12.2 src/sys/dev/i2c/i2cvar.h
cvs rdiff -u -r1.45 -r1.45.6.1 src/sys/dev/i2c/lm75.c
cvs rdiff -u -r1.1.16.1 -r1.1.16.2 src/sys/dev/ofw/ofw_i2c_subr.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/cuda.c
diff -u src/sys/arch/macppc/dev/cuda.c:1.29.2.1 src/sys/arch/macppc/dev/cuda.c:1.29.2.2
--- src/sys/arch/macppc/dev/cuda.c:1.29.2.1	Mon Aug  9 00:30:08 2021
+++ src/sys/arch/macppc/dev/cuda.c	Fri Sep 10 15:45:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: cuda.c,v 1.29.2.1 2021/08/09 00:30:08 thorpej Exp $ */
+/*	$NetBSD: cuda.c,v 1.29.2.2 2021/09/10 15:45:27 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.29.2.1 2021/08/09 00:30:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.29.2.2 2021/09/10 15:45:27 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -178,7 +178,6 @@ static int
 cuda_i2c_enumerate_devices(device_t dev, devhandle_t call_handle, void *v)
 {
 	struct i2c_enumerate_devices_args *args = v;
-	prop_dictionary_t props;
 	int i;
 	bool cbrv;
 
@@ -186,20 +185,15 @@ cuda_i2c_enumerate_devices(device_t dev,
 	struct cuda_softc *sc = args->ia->ia_tag->ic_cookie;
 
 	for (i = 0; i < sc->sc_ni2c_devices; i++) {
-		props = prop_dictionary_create();
-
 		args->ia->ia_addr = sc->sc_i2c_devices[i].addr;
 		args->ia->ia_name = sc->sc_i2c_devices[i].name;
 		args->ia->ia_clist = sc->sc_i2c_devices[i].compatible;
 		args->ia->ia_clist_size = strlen(args->ia->ia_clist) + 1;
-		args->ia->ia_prop = props;
 		/* Child gets no handle. */
 		devhandle_invalidate(&args->ia->ia_devhandle);
 
 		cbrv = args->callback(dev, args);
 
-		prop_object_release(props);
-
 		if (!cbrv) {
 			break;	/* callback decides if we continue */
 		}

Index: src/sys/arch/macppc/dev/ki2c.c
diff -u src/sys/arch/macppc/dev/ki2c.c:1.32.2.1 src/sys/arch/macppc/dev/ki2c.c:1.32.2.2
--- src/sys/arch/macppc/dev/ki2c.c:1.32.2.1	Mon Aug  9 00:30:08 2021
+++ src/sys/arch/macppc/dev/ki2c.c	Fri Sep 10 15:45:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ki2c.c,v 1.32.2.1 2021/08/09 00:30:08 thorpej Exp $	*/
+/*	$NetBSD: ki2c.c,v 1.32.2.2 2021/09/10 15:45:28 thorpej Exp $	*/
 /*	Id: ki2c.c,v 1.7 2002/10/05 09:56:05 tsubai Exp	*/
 
 /*-
@@ -68,6 +68,7 @@ ki2c_i2c_device_props(struct ki2c_softc 
 	char descr[32], num[8];
 
 	/* We're fetching descriptions for sensors. */
+	/* XXX This is a terrible hack and should not be done this way XXX */
 
 	for (node = OF_child(node); node != 0; node = OF_peer(node)) {
 		if (of_getprop_uint32(node, "reg", &reg) == -1) {

Index: src/sys/arch/sandpoint/sandpoint/autoconf.c
diff -u src/sys/arch/sandpoint/sandpoint/autoconf.c:1.29.16.2 src/sys/arch/sandpoint/sandpoint/autoconf.c:1.29.16.3
--- src/sys/arch/sandpoint/sandpoint/autoconf.c:1.29.16.2	Tue Aug 24 03:27:39 2021
+++ src/sys/arch/sandpoint/sandpoint/autoconf.c	Fri Sep 10 15:45:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.29.16.2 2021/08/24 03:27:39 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.29.16.3 2021/09/10 15:45:28 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29.16.2 2021/08/24 03:27:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29.16.3 2021/09/10 15:45:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -118,7 +118,6 @@ sandpoint_i2c_enumerate_devices(device_t
 	struct i2c_enumerate_devices_args *args = v;
 	const struct device_compatible_entry *dce;
 	const struct sandpoint_i2cdev *i2cdev;
-	prop_dictionary_t props;
 	bool cbrv;
 
 	KASSERT(bi_pfam != NULL);
@@ -141,20 +140,15 @@ sandpoint_i2c_enumerate_devices(device_t
 			}
 		}
 
-		props = prop_dictionary_create();
-
 		args->ia->ia_addr = i2cdev->addr;
 		args->ia->ia_name = i2cdev->name;
 		args->ia->ia_clist = i2cdev->compat;
 		args->ia->ia_clist_size = strlen(i2cdev->compat) + 1;
-		args->ia->ia_prop = props;
 		/* no devhandle for child devices. */
 		devhandle_invalidate(&args->ia->ia_devhandle);
 
 		cbrv = args->callback(dev, args);
 
-		prop_object_release(props);
-
 		if (!cbrv) {
 			break;
 		}

Index: src/sys/arch/sparc64/sparc64/ofw_patch.c
diff -u src/sys/arch/sparc64/sparc64/ofw_patch.c:1.7.14.1 src/sys/arch/sparc64/sparc64/ofw_patch.c:1.7.14.2
--- src/sys/arch/sparc64/sparc64/ofw_patch.c:1.7.14.1	Mon Aug  9 00:30:08 2021
+++ src/sys/arch/sparc64/sparc64/ofw_patch.c	Fri Sep 10 15:45:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw_patch.c,v 1.7.14.1 2021/08/09 00:30:08 thorpej Exp $ */
+/*	$NetBSD: ofw_patch.c,v 1.7.14.2 2021/09/10 15:45:28 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2020, 2021 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_patch.c,v 1.7.14.1 2021/08/09 00:30:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_patch.c,v 1.7.14.2 2021/09/10 15:45:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -143,20 +143,16 @@ i2c_fixup_enumerate_devices(device_t dev
 	/* Now enumerate our additions. */
 	const struct i2c_addition *i2c_adds = fixup->i2c_additions;
 	KASSERT(i2c_adds != NULL);
-	prop_dictionary_t props;
 	int i;
 	bool cbrv;
 
 	for (i = 0; i < fixup->i2c_nadditions; i++) {
-		props = prop_dictionary_create();
-
 		args->ia->ia_addr = i2c_adds[i].addr;
 		args->ia->ia_name = i2c_adds[i].name;
 		args->ia->ia_clist = i2c_adds[i].compat;
 		args->ia->ia_clist_size = args->ia->ia_clist != NULL
 		    ? strlen(i2c_adds[i].compat) + 1
 		    : 0;
-		args->ia->ia_prop = props;
 		if (fixup->i2c_phandle != 0) {
 			args->ia->ia_devhandle =
 			    devhandle_from_of(fixup->i2c_phandle);
@@ -166,8 +162,6 @@ i2c_fixup_enumerate_devices(device_t dev
 
 		cbrv = args->callback(dev, args);
 
-		prop_object_release(props);
-
 		if (! cbrv) {
 			break;
 		}

Index: src/sys/dev/acpi/acpi_i2c.c
diff -u src/sys/dev/acpi/acpi_i2c.c:1.11.14.1 src/sys/dev/acpi/acpi_i2c.c:1.11.14.2
--- src/sys/dev/acpi/acpi_i2c.c:1.11.14.1	Mon Aug  9 00:30:09 2021
+++ src/sys/dev/acpi/acpi_i2c.c	Fri Sep 10 15:45:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_i2c.c,v 1.11.14.1 2021/08/09 00:30:09 thorpej Exp $ */
+/* $NetBSD: acpi_i2c.c,v 1.11.14.2 2021/09/10 15:45:28 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2017, 2021 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.11.14.1 2021/08/09 00:30:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.11.14.2 2021/09/10 15:45:28 thorpej Exp $");
 
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
@@ -74,7 +74,6 @@ acpi_i2c_enumerate_device(device_t dev, 
 {
 	char *clist;
 	size_t clist_size;
-	prop_dictionary_t props;
 	struct acpi_i2c_context i2cc;
 	bool cbrv;
 	ACPI_STATUS rv;
@@ -97,18 +96,15 @@ acpi_i2c_enumerate_device(device_t dev, 
 		    ad->ad_name);
 		return true;	/* keep enumerating */
 	}
-	props = prop_dictionary_create();
 
 	args->ia->ia_addr = i2cc.i2c_addr;
 	args->ia->ia_name = ad->ad_name;
 	args->ia->ia_clist = clist;
 	args->ia->ia_clist_size = clist_size;
-	args->ia->ia_prop = props;
 	args->ia->ia_devhandle = devhandle_from_acpi(ad->ad_handle);
 
 	cbrv = args->callback(dev, args);
 
-	prop_object_release(props);
 	kmem_free(clist, clist_size);
 
 	return cbrv;	/* callback decides if we keep enumerating */

Index: src/sys/dev/i2c/adm1021.c
diff -u src/sys/dev/i2c/adm1021.c:1.29 src/sys/dev/i2c/adm1021.c:1.29.6.1
--- src/sys/dev/i2c/adm1021.c:1.29	Mon Jun 21 03:12:54 2021
+++ src/sys/dev/i2c/adm1021.c	Fri Sep 10 15:45:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: adm1021.c,v 1.29 2021/06/21 03:12:54 christos Exp $ */
+/*	$NetBSD: adm1021.c,v 1.29.6.1 2021/09/10 15:45:28 thorpej Exp $ */
 /*	$OpenBSD: adm1021.c,v 1.27 2007/06/24 05:34:35 dlg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.29 2021/06/21 03:12:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.29.6.1 2021/09/10 15:45:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -341,8 +341,11 @@ admtemp_attach(device_t parent, device_t
 
 	sc->sc_tag = ia->ia_tag;
 	sc->sc_addr = ia->ia_addr;
-	sc->sc_prop = ia->ia_prop;
-	prop_object_retain(sc->sc_prop);
+
+	/* XXX XXX XXX */
+	if ((sc->sc_prop = ia->ia_prop) != NULL) {
+		prop_object_retain(sc->sc_prop);
+	}
 
 	if (iic_acquire_bus(sc->sc_tag, 0)) {
 		aprint_error_dev(self, "cannot acquire iic bus\n");

Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.62 src/sys/dev/i2c/dbcool.c:1.62.6.1
--- src/sys/dev/i2c/dbcool.c:1.62	Mon Jun 21 03:12:54 2021
+++ src/sys/dev/i2c/dbcool.c	Fri Sep 10 15:45:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbcool.c,v 1.62 2021/06/21 03:12:54 christos Exp $ */
+/*	$NetBSD: dbcool.c,v 1.62.6.1 2021/09/10 15:45:28 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.62 2021/06/21 03:12:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.62.6.1 2021/09/10 15:45:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -775,8 +775,11 @@ dbcool_attach(device_t parent, device_t 
 	sc->sc_dc.dc_readreg = dbcool_readreg;
 	sc->sc_dc.dc_writereg = dbcool_writereg;
 	sc->sc_dev = self;
-	sc->sc_prop = args->ia_prop;
-	prop_object_retain(sc->sc_prop);
+
+	/* XXX XXX XXX */
+	if ((sc->sc_prop = args->ia_prop) != NULL) {
+		prop_object_retain(sc->sc_prop);
+	}
 
 	if (dbcool_chip_ident(&sc->sc_dc) < 0 || sc->sc_dc.dc_chip == NULL)
 		panic("could not identify chip at addr %d", args->ia_addr);

Index: src/sys/dev/i2c/dstemp.c
diff -u src/sys/dev/i2c/dstemp.c:1.14 src/sys/dev/i2c/dstemp.c:1.14.6.1
--- src/sys/dev/i2c/dstemp.c:1.14	Mon Jun 21 03:12:54 2021
+++ src/sys/dev/i2c/dstemp.c	Fri Sep 10 15:45:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dstemp.c,v 1.14 2021/06/21 03:12:54 christos Exp $ */
+/* $NetBSD: dstemp.c,v 1.14.6.1 2021/09/10 15:45:28 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2018 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dstemp.c,v 1.14 2021/06/21 03:12:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dstemp.c,v 1.14.6.1 2021/09/10 15:45:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -109,8 +109,11 @@ dstemp_attach(device_t parent, device_t 
 	sc->sc_dev = self;
 	sc->sc_i2c = ia->ia_tag;
 	sc->sc_addr = ia->ia_addr;
-	sc->sc_prop = ia->ia_prop;
-	prop_object_retain(sc->sc_prop);
+
+	/* XXX XXX XXX */
+	if ((sc->sc_prop = ia->ia_prop) != NULL) {
+		prop_object_retain(sc->sc_prop);
+	}
 
 	aprint_naive("\n");
 	aprint_normal(": DS1361\n");

Index: src/sys/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.80.2.4 src/sys/dev/i2c/i2c.c:1.80.2.5
--- src/sys/dev/i2c/i2c.c:1.80.2.4	Sun Aug 22 18:43:06 2021
+++ src/sys/dev/i2c/i2c.c	Fri Sep 10 15:45:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i2c.c,v 1.80.2.4 2021/08/22 18:43:06 thorpej Exp $	*/
+/*	$NetBSD: i2c.c,v 1.80.2.5 2021/09/10 15:45:28 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.80.2.4 2021/08/22 18:43:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.80.2.5 2021/09/10 15:45:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -495,13 +495,9 @@ iic_search(device_t parent, cfdata_t cf,
 		/* Use the default. */
 	}
 
+	memset(&ia, 0, sizeof(ia));
 	ia.ia_tag = sc->sc_tag;
 
-	ia.ia_name = NULL;
-	ia.ia_clist = NULL;
-	ia.ia_clist_size = 0;
-	ia.ia_prop = NULL;
-
 	if (cf->cf_loc[IICCF_ADDR] == IICCF_ADDR_DEFAULT) {
 		/*
 		 * This particular config directive has

Index: src/sys/dev/i2c/i2cvar.h
diff -u src/sys/dev/i2c/i2cvar.h:1.24.12.1 src/sys/dev/i2c/i2cvar.h:1.24.12.2
--- src/sys/dev/i2c/i2cvar.h:1.24.12.1	Mon Aug  9 00:30:09 2021
+++ src/sys/dev/i2c/i2cvar.h	Fri Sep 10 15:45:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i2cvar.h,v 1.24.12.1 2021/08/09 00:30:09 thorpej Exp $	*/
+/*	$NetBSD: i2cvar.h,v 1.24.12.2 2021/09/10 15:45:28 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -155,8 +155,10 @@ struct i2c_attach_args {
 	const char *	ia_name;	/* name of the device */
 	const char *	ia_clist;	/* compatible strlist */
 	size_t		ia_clist_size;	/* size of compatible strlist */
-	prop_dictionary_t ia_prop;	/* property dictionary for the device */
 	devhandle_t	ia_devhandle;	/* device handle for the device */
+
+	/* XXX ia_prop is deprecated; please don't add new usage. XXX */
+	prop_dictionary_t ia_prop;	/* property dictionary for the device */
 };
 
 /*

Index: src/sys/dev/i2c/lm75.c
diff -u src/sys/dev/i2c/lm75.c:1.45 src/sys/dev/i2c/lm75.c:1.45.6.1
--- src/sys/dev/i2c/lm75.c:1.45	Mon Jun 21 03:12:54 2021
+++ src/sys/dev/i2c/lm75.c	Fri Sep 10 15:45:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: lm75.c,v 1.45 2021/06/21 03:12:54 christos Exp $	*/
+/*	$NetBSD: lm75.c,v 1.45.6.1 2021/09/10 15:45:28 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.45 2021/06/21 03:12:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.45.6.1 2021/09/10 15:45:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -214,9 +214,11 @@ lmtemp_attach(device_t parent, device_t 
 
 	sc->sc_tag = ia->ia_tag;
 	sc->sc_address = ia->ia_addr;
-	sc->sc_prop = ia->ia_prop;
-	
-	if (ia->ia_prop != NULL) prop_object_retain(sc->sc_prop);
+
+	/* XXX XXX XXX */
+	if ((sc->sc_prop = ia->ia_prop) != NULL) {
+		prop_object_retain(sc->sc_prop);
+	}
 
 	aprint_naive(": Temperature Sensor\n");
 	if (ia->ia_name) {

Index: src/sys/dev/ofw/ofw_i2c_subr.c
diff -u src/sys/dev/ofw/ofw_i2c_subr.c:1.1.16.1 src/sys/dev/ofw/ofw_i2c_subr.c:1.1.16.2
--- src/sys/dev/ofw/ofw_i2c_subr.c:1.1.16.1	Mon Aug  9 00:30:09 2021
+++ src/sys/dev/ofw/ofw_i2c_subr.c	Fri Sep 10 15:45:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ofw_i2c_subr.c,v 1.1.16.1 2021/08/09 00:30:09 thorpej Exp $	*/
+/*	$NetBSD: ofw_i2c_subr.c,v 1.1.16.2 2021/09/10 15:45:28 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_i2c_subr.c,v 1.1.16.1 2021/08/09 00:30:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_i2c_subr.c,v 1.1.16.2 2021/09/10 15:45:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -132,7 +132,6 @@ of_i2c_enumerate_devices(device_t dev, d
 	struct i2c_enumerate_devices_args *args = v;
 	int i2c_node, node;
 	char name[32], compat_buf[32];
-	prop_dictionary_t props;
 	uint32_t addr;
 	char *clist;
 	int clist_size;
@@ -163,18 +162,15 @@ of_i2c_enumerate_devices(device_t dev, d
 			kmem_tmpbuf_free(clist, clist_size, compat_buf);
 			continue;
 		}
-		props = prop_dictionary_create();
 
 		args->ia->ia_addr = (i2c_addr_t)addr;
 		args->ia->ia_name = name;
 		args->ia->ia_clist = clist;
 		args->ia->ia_clist_size = clist_size;
-		args->ia->ia_prop = props;
 		args->ia->ia_devhandle = devhandle_from_of(node);
 
 		cbrv = args->callback(dev, args);
 
-		prop_object_release(props);
 		kmem_tmpbuf_free(clist, clist_size, compat_buf);
 
 		if (!cbrv) {

Reply via email to