Module Name: src Committed By: riastradh Date: Tue Jul 18 10:06:00 UTC 2023
Modified Files: src/sys/dev/acpi: acpi_ec.c Log Message: acpiec(4): Pass softc, not device_t, to acpiec_callout. Simpler. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/dev/acpi/acpi_ec.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/acpi/acpi_ec.c diff -u src/sys/dev/acpi/acpi_ec.c:1.99 src/sys/dev/acpi/acpi_ec.c:1.100 --- src/sys/dev/acpi/acpi_ec.c:1.99 Tue Jul 18 10:05:49 2023 +++ src/sys/dev/acpi/acpi_ec.c Tue Jul 18 10:06:00 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_ec.c,v 1.99 2023/07/18 10:05:49 riastradh Exp $ */ +/* $NetBSD: acpi_ec.c,v 1.100 2023/07/18 10:06:00 riastradh Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>. @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.99 2023/07/18 10:05:49 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.100 2023/07/18 10:06:00 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_acpi_ec.h" @@ -422,7 +422,7 @@ acpiec_common_attach(device_t parent, de aprint_normal_dev(self, "using global ACPI lock\n"); callout_init(&sc->sc_pseudo_intr, CALLOUT_MPSAFE); - callout_setfunc(&sc->sc_pseudo_intr, acpiec_callout, self); + callout_setfunc(&sc->sc_pseudo_intr, acpiec_callout, sc); rv = AcpiInstallAddressSpaceHandler(sc->sc_ech, ACPI_ADR_SPACE_EC, acpiec_space_handler, acpiec_space_setup, self); @@ -1054,8 +1054,7 @@ acpiec_gpe_state_machine(struct acpiec_s static void acpiec_callout(void *arg) { - device_t dv = arg; - struct acpiec_softc *sc = device_private(dv); + struct acpiec_softc *sc = arg; mutex_enter(&sc->sc_mtx); DPRINTF(ACPIEC_DEBUG_INTR, sc, "callout\n");