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
This commit is contained in:
pgoyette
parent
fdd8676a97
commit
a02f62015b
|
|
@ -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>
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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_softc *sc, int idx,
|
|||
}
|
||||
}
|
||||
|
||||
MODULE(MODULE_CLASS_DRIVER, dbcool, "i2cexec,sysmon_envsys");
|
||||
MODULE(MODULE_CLASS_DRIVER, dbcool, "iic,sysmon_envsys");
|
||||
|
||||
#ifdef _MODULE
|
||||
#include "ioconf.c"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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 devact act)
|
|||
}
|
||||
}
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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 devact act)
|
|||
}
|
||||
}
|
||||
|
||||
MODULE(MODULE_CLASS_DRIVER, sht3xtemp, "i2cexec,sysmon_envsys");
|
||||
MODULE(MODULE_CLASS_DRIVER, sht3xtemp, "iic,sysmon_envsys");
|
||||
|
||||
#ifdef _MODULE
|
||||
#include "ioconf.c"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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 *softc, uint16_t addr, uint8_t *val)
|
|||
return rv;
|
||||
}
|
||||
|
||||
MODULE(MODULE_CLASS_DRIVER, spdmem, "i2cexec");
|
||||
MODULE(MODULE_CLASS_DRIVER, spdmem, "iic");
|
||||
|
||||
#ifdef _MODULE
|
||||
#include "ioconf.c"
|
||||
|
|
|
|||
Loading…
Reference in New Issue