Module Name: src
Committed By: thorpej
Date: Mon May 17 00:05:56 UTC 2021
Modified Files:
src/sys/dev/i2c [thorpej-i2c-spi-conf]: i2c.c i2cvar.h
Log Message:
Remove "count" from the device enumeration callback arguments.
To generate a diff of this commit:
cvs rdiff -u -r1.78.2.5 -r1.78.2.6 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.24.2.4 -r1.24.2.5 src/sys/dev/i2c/i2cvar.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/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.78.2.5 src/sys/dev/i2c/i2c.c:1.78.2.6
--- src/sys/dev/i2c/i2c.c:1.78.2.5 Sun May 16 21:04:59 2021
+++ src/sys/dev/i2c/i2c.c Mon May 17 00:05:56 2021
@@ -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) {
Index: src/sys/dev/i2c/i2cvar.h
diff -u src/sys/dev/i2c/i2cvar.h:1.24.2.4 src/sys/dev/i2c/i2cvar.h:1.24.2.5
--- src/sys/dev/i2c/i2cvar.h:1.24.2.4 Fri May 14 01:08:53 2021
+++ src/sys/dev/i2c/i2cvar.h Mon May 17 00:05:56 2021
@@ -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;
};
/*
