Module Name: src
Committed By: jdc
Date: Sat Oct 31 14:39:31 UTC 2020
Modified Files:
src/sys/dev/i2c: pcf8574.c
Log Message:
Detach led's and sysmon in our detach routine.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/pcf8574.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/pcf8574.c
diff -u src/sys/dev/i2c/pcf8574.c:1.1 src/sys/dev/i2c/pcf8574.c:1.2
--- src/sys/dev/i2c/pcf8574.c:1.1 Thu Oct 29 06:55:51 2020
+++ src/sys/dev/i2c/pcf8574.c Sat Oct 31 14:39:31 2020
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcf8574.c,v 1.1 2020/10/29 06:55:51 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcf8574.c,v 1.2 2020/10/31 14:39:31 jdc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcf8574.c,v
struct pcf8574_led {
void *cookie;
+ struct led_device *led;
uint8_t mask, v_on, v_off;
};
@@ -215,13 +216,19 @@ pcf8574_attach(device_t parent, device_t
static int
pcf8574_detach(device_t self, int flags)
{
-#ifdef PCF8574_DEBUG
struct pcf8574_softc *sc = device_private(self);
+ int i;
+
+ if (sc->sc_sme != NULL)
+ sysmon_envsys_unregister(sc->sc_sme);
+
+ for (i = 0; i < sc->sc_nleds; i++)
+ led_detach(sc->sc_leds[i].led);
+#ifdef PCF8574_DEBUG
callout_halt(&sc->sc_timer, NULL);
callout_destroy(&sc->sc_timer);
#endif
-
return 0;
}
