[src/trunk]: src/sys/dev/i2c These modules need to depend on iic, not just on...

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

details:   https://anonhg.NetBSD.org/src/rev/5f528c8d7dac
branches:  trunk
changeset: 364573:5f528c8d7dac
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Wed Mar 30 00:06:50 2022 +0000

description:
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

diffstat:

 sys/dev/i2c/am2315.c     |  6 +++---
 sys/dev/i2c/dbcool.c     |  6 +++---
 sys/dev/i2c/hytp14.c     |  4 ++--
 sys/dev/i2c/scmdi2c.c    |  6 +++---
 sys/dev/i2c/sgp40.c      |  6 +++---
 sys/dev/i2c/sht3x.c      |  6 +++---
 sys/dev/i2c/sht4x.c      |  6 +++---
 sys/dev/i2c/si70xx.c     |  6 +++---
 sys/dev/i2c/spdmem_i2c.c |  6 +++---
 9 files changed, 26 insertions(+), 26 deletions(-)

diffs (239 lines):

diff -r 6c961eb8d794 -r 5f528c8d7dac sys/dev/i2c/am2315.c
--- a/sys/dev/i2c/am2315.c      Tue Mar 29 22:48:04 2022 +0000
+++ b/sys/dev/i2c/am2315.c      Wed Mar 30 00:06:50 2022 +0000
@@ -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 <brad%anduin.eldar.org@localhost>
@@ -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 @@
        return 0;
 }
 
-MODULE(MODULE_CLASS_DRIVER, am2315temp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, am2315temp, "iic,sysmon_envsys");
 
 #ifdef _MODULE
 #include "ioconf.c"
diff -r 6c961eb8d794 -r 5f528c8d7dac sys/dev/i2c/dbcool.c
--- a/sys/dev/i2c/dbcool.c      Tue Mar 29 22:48:04 2022 +0000
+++ b/sys/dev/i2c/dbcool.c      Wed Mar 30 00:06:50 2022 +0000
@@ -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 @@
        }
 }
 
-MODULE(MODULE_CLASS_DRIVER, dbcool, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, dbcool, "iic,sysmon_envsys");
 
 #ifdef _MODULE
 #include "ioconf.c"
diff -r 6c961eb8d794 -r 5f528c8d7dac sys/dev/i2c/hytp14.c
--- a/sys/dev/i2c/hytp14.c      Tue Mar 29 22:48:04 2022 +0000
+++ b/sys/dev/i2c/hytp14.c      Wed Mar 30 00:06:50 2022 +0000
@@ -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 @@
        return 0;
 }
 
-MODULE(MODULE_CLASS_DRIVER, hythygtemp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, hythygtemp, "iic,sysmon_envsys");
 
 #ifdef _MODULE
 #include "ioconf.c"
diff -r 6c961eb8d794 -r 5f528c8d7dac sys/dev/i2c/scmdi2c.c
--- a/sys/dev/i2c/scmdi2c.c     Tue Mar 29 22:48:04 2022 +0000
+++ b/sys/dev/i2c/scmdi2c.c     Wed Mar 30 00:06:50 2022 +0000
@@ -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 <brad%anduin.eldar.org@localhost>
@@ -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 @@
        }
 }
 
-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
diff -r 6c961eb8d794 -r 5f528c8d7dac sys/dev/i2c/sgp40.c
--- a/sys/dev/i2c/sgp40.c       Tue Mar 29 22:48:04 2022 +0000
+++ b/sys/dev/i2c/sgp40.c       Wed Mar 30 00:06:50 2022 +0000
@@ -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 <brad%anduin.eldar.org@localhost>
@@ -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 @@
        return 0;
 }
 
-MODULE(MODULE_CLASS_DRIVER, sgp40mox, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, sgp40mox, "iic,sysmon_envsys");
 
 #ifdef _MODULE
 #include "ioconf.c"
diff -r 6c961eb8d794 -r 5f528c8d7dac sys/dev/i2c/sht3x.c
--- a/sys/dev/i2c/sht3x.c       Tue Mar 29 22:48:04 2022 +0000
+++ b/sys/dev/i2c/sht3x.c       Wed Mar 30 00:06:50 2022 +0000
@@ -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 <brad%anduin.eldar.org@localhost>
@@ -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 @@
        }
 }
 
-MODULE(MODULE_CLASS_DRIVER, sht3xtemp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, sht3xtemp, "iic,sysmon_envsys");
 
 #ifdef _MODULE
 #include "ioconf.c"
diff -r 6c961eb8d794 -r 5f528c8d7dac sys/dev/i2c/sht4x.c
--- a/sys/dev/i2c/sht4x.c       Tue Mar 29 22:48:04 2022 +0000
+++ b/sys/dev/i2c/sht4x.c       Wed Mar 30 00:06:50 2022 +0000
@@ -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 <brad%anduin.eldar.org@localhost>
@@ -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 @@
        return 0;
 }
 
-MODULE(MODULE_CLASS_DRIVER, sht4xtemp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, sht4xtemp, "iic,sysmon_envsys");
 
 #ifdef _MODULE
 #include "ioconf.c"
diff -r 6c961eb8d794 -r 5f528c8d7dac sys/dev/i2c/si70xx.c
--- a/sys/dev/i2c/si70xx.c      Tue Mar 29 22:48:04 2022 +0000
+++ b/sys/dev/i2c/si70xx.c      Wed Mar 30 00:06:50 2022 +0000
@@ -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 <brad%anduin.eldar.org@localhost>
@@ -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 @@
        return 0;
 }
 
-MODULE(MODULE_CLASS_DRIVER, si70xxtemp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, si70xxtemp, "iic,sysmon_envsys");
 
 #ifdef _MODULE
 #include "ioconf.c"
diff -r 6c961eb8d794 -r 5f528c8d7dac sys/dev/i2c/spdmem_i2c.c
--- a/sys/dev/i2c/spdmem_i2c.c  Tue Mar 29 22:48:04 2022 +0000
+++ b/sys/dev/i2c/spdmem_i2c.c  Wed Mar 30 00:06:50 2022 +0000
@@ -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 @@
        return rv;
 }
 
-MODULE(MODULE_CLASS_DRIVER, spdmem, "i2cexec");
+MODULE(MODULE_CLASS_DRIVER, spdmem, "iic");
 
 #ifdef _MODULE
 #include "ioconf.c"