Module Name: src
Committed By: pgoyette
Date: Wed Mar 30 00:06:51 UTC 2022
Modified Files:
src/sys/dev/i2c: am2315.c dbcool.c hytp14.c scmdi2c.c sgp40.c sht3x.c
sht4x.c si70xx.c spdmem_i2c.c
Log Message:
These modules need to depend on iic, not just on i2cexec. (They will
still recursively get i2cexec since the iic depends on it.)
Partial fix for kern/56772
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2c/am2315.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/i2c/hytp14.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/scmdi2c.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/sgp40.c src/sys/dev/i2c/sht4x.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/sht3x.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/i2c/si70xx.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/i2c/spdmem_i2c.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/dev/i2c/am2315.c
diff -u src/sys/dev/i2c/am2315.c:1.6 src/sys/dev/i2c/am2315.c:1.7
--- src/sys/dev/i2c/am2315.c:1.6 Tue Jun 15 04:40:13 2021
+++ src/sys/dev/i2c/am2315.c Wed Mar 30 00:06:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: am2315.c,v 1.6 2021/06/15 04:40:13 mlelstv Exp $ */
+/* $NetBSD: am2315.c,v 1.7 2022/03/30 00:06:50 pgoyette Exp $ */
/*
* Copyright (c) 2017 Brad Spencer <b...@anduin.eldar.org>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am2315.c,v 1.6 2021/06/15 04:40:13 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am2315.c,v 1.7 2022/03/30 00:06:50 pgoyette Exp $");
/*
* Driver for the Aosong AM2315
@@ -475,7 +475,7 @@ am2315_detach(device_t self, int flags)
return 0;
}
-MODULE(MODULE_CLASS_DRIVER, am2315temp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, am2315temp, "iic,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.63 src/sys/dev/i2c/dbcool.c:1.64
--- src/sys/dev/i2c/dbcool.c:1.63 Mon Aug 9 20:49:09 2021
+++ src/sys/dev/i2c/dbcool.c Wed Mar 30 00:06:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.63 2021/08/09 20:49:09 andvar Exp $ */
+/* $NetBSD: dbcool.c,v 1.64 2022/03/30 00:06:50 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.63 2021/08/09 20:49:09 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.64 2022/03/30 00:06:50 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2189,7 +2189,7 @@ dbcool_set_fan_limits(struct dbcool_soft
}
}
-MODULE(MODULE_CLASS_DRIVER, dbcool, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, dbcool, "iic,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/i2c/hytp14.c
diff -u src/sys/dev/i2c/hytp14.c:1.14 src/sys/dev/i2c/hytp14.c:1.15
--- src/sys/dev/i2c/hytp14.c:1.14 Tue Jun 15 04:39:49 2021
+++ src/sys/dev/i2c/hytp14.c Wed Mar 30 00:06:50 2022
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.14 2021/06/15 04:39:49 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.15 2022/03/30 00:06:50 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -487,7 +487,7 @@ sysctl_hytp14_interval(SYSCTLFN_ARGS)
return 0;
}
-MODULE(MODULE_CLASS_DRIVER, hythygtemp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, hythygtemp, "iic,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/i2c/scmdi2c.c
diff -u src/sys/dev/i2c/scmdi2c.c:1.1 src/sys/dev/i2c/scmdi2c.c:1.2
--- src/sys/dev/i2c/scmdi2c.c:1.1 Tue Dec 7 17:39:54 2021
+++ src/sys/dev/i2c/scmdi2c.c Wed Mar 30 00:06:50 2022
@@ -1,5 +1,5 @@
-/* $NetBSD: scmdi2c.c,v 1.1 2021/12/07 17:39:54 brad Exp $ */
+/* $NetBSD: scmdi2c.c,v 1.2 2022/03/30 00:06:50 pgoyette Exp $ */
/*
* Copyright (c) 2021 Brad Spencer <b...@anduin.eldar.org>
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scmdi2c.c,v 1.1 2021/12/07 17:39:54 brad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scmdi2c.c,v 1.2 2022/03/30 00:06:50 pgoyette Exp $");
/*
* I2C driver for the Sparkfun Serial motor controller.
@@ -233,7 +233,7 @@ scmdi2c_activate(device_t self, enum dev
}
}
-MODULE(MODULE_CLASS_DRIVER, scmdi2c, "i2cexec,scmd");
+MODULE(MODULE_CLASS_DRIVER, scmdi2c, "iic,scmd");
#ifdef _MODULE
/* Like other drivers, we do this because the scmd common
Index: src/sys/dev/i2c/sgp40.c
diff -u src/sys/dev/i2c/sgp40.c:1.2 src/sys/dev/i2c/sgp40.c:1.3
--- src/sys/dev/i2c/sgp40.c:1.2 Wed Oct 20 17:52:44 2021
+++ src/sys/dev/i2c/sgp40.c Wed Mar 30 00:06:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sgp40.c,v 1.2 2021/10/20 17:52:44 christos Exp $ */
+/* $NetBSD: sgp40.c,v 1.3 2022/03/30 00:06:50 pgoyette Exp $ */
/*
* Copyright (c) 2021 Brad Spencer <b...@anduin.eldar.org>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sgp40.c,v 1.2 2021/10/20 17:52:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgp40.c,v 1.3 2022/03/30 00:06:50 pgoyette Exp $");
/*
Driver for the Sensirion SGP40 MOx gas sensor for air quality
@@ -800,7 +800,7 @@ sgp40_detach(device_t self, int flags)
return 0;
}
-MODULE(MODULE_CLASS_DRIVER, sgp40mox, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, sgp40mox, "iic,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/i2c/sht4x.c
diff -u src/sys/dev/i2c/sht4x.c:1.2 src/sys/dev/i2c/sht4x.c:1.3
--- src/sys/dev/i2c/sht4x.c:1.2 Fri Oct 29 23:23:33 2021
+++ src/sys/dev/i2c/sht4x.c Wed Mar 30 00:06:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sht4x.c,v 1.2 2021/10/29 23:23:33 brad Exp $ */
+/* $NetBSD: sht4x.c,v 1.3 2022/03/30 00:06:50 pgoyette Exp $ */
/*
* Copyright (c) 2021 Brad Spencer <b...@anduin.eldar.org>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sht4x.c,v 1.2 2021/10/29 23:23:33 brad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sht4x.c,v 1.3 2022/03/30 00:06:50 pgoyette Exp $");
/*
Driver for the Sensirion SHT40/SHT41/SHT45
@@ -855,7 +855,7 @@ sht4x_detach(device_t self, int flags)
return 0;
}
-MODULE(MODULE_CLASS_DRIVER, sht4xtemp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, sht4xtemp, "iic,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/i2c/sht3x.c
diff -u src/sys/dev/i2c/sht3x.c:1.4 src/sys/dev/i2c/sht3x.c:1.5
--- src/sys/dev/i2c/sht3x.c:1.4 Sun Nov 14 18:36:13 2021
+++ src/sys/dev/i2c/sht3x.c Wed Mar 30 00:06:50 2022
@@ -1,5 +1,5 @@
-/* $NetBSD: sht3x.c,v 1.4 2021/11/14 18:36:13 brad Exp $ */
+/* $NetBSD: sht3x.c,v 1.5 2022/03/30 00:06:50 pgoyette Exp $ */
/*
* Copyright (c) 2021 Brad Spencer <b...@anduin.eldar.org>
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sht3x.c,v 1.4 2021/11/14 18:36:13 brad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sht3x.c,v 1.5 2022/03/30 00:06:50 pgoyette Exp $");
/*
Driver for the Sensirion SHT30/SHT31/SHT35
@@ -2096,7 +2096,7 @@ sht3x_activate(device_t self, enum devac
}
}
-MODULE(MODULE_CLASS_DRIVER, sht3xtemp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, sht3xtemp, "iic,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/i2c/si70xx.c
diff -u src/sys/dev/i2c/si70xx.c:1.10 src/sys/dev/i2c/si70xx.c:1.11
--- src/sys/dev/i2c/si70xx.c:1.10 Fri Nov 12 15:12:11 2021
+++ src/sys/dev/i2c/si70xx.c Wed Mar 30 00:06:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: si70xx.c,v 1.10 2021/11/12 15:12:11 brad Exp $ */
+/* $NetBSD: si70xx.c,v 1.11 2022/03/30 00:06:50 pgoyette Exp $ */
/*
* Copyright (c) 2017 Brad Spencer <b...@anduin.eldar.org>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: si70xx.c,v 1.10 2021/11/12 15:12:11 brad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: si70xx.c,v 1.11 2022/03/30 00:06:50 pgoyette Exp $");
/*
Driver for the Silicon Labs SI7013/SI7020/SI7021, HTU21D and SHT21
@@ -1027,7 +1027,7 @@ si70xx_detach(device_t self, int flags)
return 0;
}
-MODULE(MODULE_CLASS_DRIVER, si70xxtemp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, si70xxtemp, "iic,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/i2c/spdmem_i2c.c
diff -u src/sys/dev/i2c/spdmem_i2c.c:1.25 src/sys/dev/i2c/spdmem_i2c.c:1.26
--- src/sys/dev/i2c/spdmem_i2c.c:1.25 Mon Dec 6 16:24:57 2021
+++ src/sys/dev/i2c/spdmem_i2c.c Wed Mar 30 00:06:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem_i2c.c,v 1.25 2021/12/06 16:24:57 msaitoh Exp $ */
+/* $NetBSD: spdmem_i2c.c,v 1.26 2022/03/30 00:06:50 pgoyette Exp $ */
/*
* Copyright (c) 2007 Nicolas Joly
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.25 2021/12/06 16:24:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.26 2022/03/30 00:06:50 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -292,7 +292,7 @@ spdmem_i2c_read(struct spdmem_softc *sof
return rv;
}
-MODULE(MODULE_CLASS_DRIVER, spdmem, "i2cexec");
+MODULE(MODULE_CLASS_DRIVER, spdmem, "iic");
#ifdef _MODULE
#include "ioconf.c"
