[src/thorpej-i2c-spi-conf]: src/sys/dev/i2c Remove "count" from the device en...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71295d412424
branches:  thorpej-i2c-spi-conf
changeset: 378791:71295d412424
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon May 17 00:05:56 2021 +0000

description:
Remove "count" from the device enumeration callback arguments.

diffstat:

 sys/dev/i2c/i2c.c    |  6 ++----
 sys/dev/i2c/i2cvar.h |  3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r d6976c6dd270 -r 71295d412424 sys/dev/i2c/i2c.c
--- a/sys/dev/i2c/i2c.c Sun May 16 23:45:12 2021 +0000
+++ b/sys/dev/i2c/i2c.c Mon May 17 00:05:56 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i2c.c,v 1.78.2.5 2021/05/16 21:04:59 thorpej Exp $     */
+/*     $NetBSD: i2c.c,v 1.78.2.6 2021/05/17 00:05:56 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.78.2.5 2021/05/16 21:04:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.78.2.6 2021/05/17 00:05:56 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -618,8 +618,6 @@ iic_enumerate_devices_callback(device_t 
        device_t newdev;
        bool rv __diagused;
 
-       args->count++;
-
        loc[IICCF_ADDR] = args->ia->ia_addr;
 
        if (args->ia->ia_addr > I2C_MAX_ADDR) {
diff -r d6976c6dd270 -r 71295d412424 sys/dev/i2c/i2cvar.h
--- a/sys/dev/i2c/i2cvar.h      Sun May 16 23:45:12 2021 +0000
+++ b/sys/dev/i2c/i2cvar.h      Mon May 17 00:05:56 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i2cvar.h,v 1.24.2.4 2021/05/14 01:08:53 thorpej Exp $  */
+/*     $NetBSD: i2cvar.h,v 1.24.2.5 2021/05/17 00:05:56 thorpej Exp $  */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -170,7 +170,6 @@ struct i2c_attach_args {
 struct i2c_enumerate_devices_args {
        struct i2c_attach_args *ia;
        bool (*callback)(device_t, struct i2c_enumerate_devices_args *);
-       unsigned int count;
 };
 
 /*