From nobody Fri May 6 23:25:21 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 689FF1AD1712; Fri, 6 May 2022 23:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kw69t0Hf0z3FRM; Fri, 6 May 2022 23:25:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651879522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GF3hHykOKolF65fGWLycCvM32wH0tMSTceE7TCAChVE=; b=HdYmG03JoeSgJegCkGKzkoT9gjSf++r4xtm3CN8YA2X6CdSQMYK97hqGXrzZG06/NKmZvq bascUV/TTxhQRY7M5ghMwHAE1t49/mgSC/fOGR0m1FoQHohi8lam/Re7fkwHoWjHnJI/qq Us5lXoGiYemCfB/ZmvyvRbClLj609wKaqI0FZnPoADecKSrZHf89XtYcTDWam8sbEbB3W0 8/aC3x04Im/HjHwWeYSon2/9VgocIybM2PpBswcxokHrIxjT4vNjXTcVUXsvUoKc3L6351 xn44KUwHnHEI85nIXpGN6EDEFXqJwD+JqNPG78IXwEMlVPX1s5JA/geHE/3Lgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8CF3F25052; Fri, 6 May 2022 23:25:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 246NPLGk075767; Fri, 6 May 2022 23:25:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246NPLIn075766; Fri, 6 May 2022 23:25:21 GMT (envelope-from git) Date: Fri, 6 May 2022 23:25:21 GMT Message-Id: <202205062325.246NPLIn075766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1c1e88367c76 - main - atkbd/psm: Remove unused devclass arguments to DRIVER_MODULE. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c1e88367c76469ffbb806a40272bdd3fd1ac3bc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651879522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GF3hHykOKolF65fGWLycCvM32wH0tMSTceE7TCAChVE=; b=dKayuS4LQIjva5DowHySuBrJ5TeEUB+6Ss59ItmXUUrbVUf38rXs8kXiLDCI+dOK13hw1d I0ELSMigqe+GhHNbik00nsXJIS48P2cYznOq/DCLdJQh63P142f2aJrgmRc/3WKPO+9iqs UHKMpJgupAQPPyQ0o44qkZ6M5b/6PZ8vPHZK/pTv6wwNx5TKsiaFi2sMI+gSaeYg1dOso+ XdOVUje8Da/ZjzqF5rGkD9gf7kmgvoTu5meQ8bvrpkPnYtyyyCjfc2rLhTFPNegJ9uGUjV Ley7fTlKejB+vUsvZwk17YflqHyp/6wytOiXzx6Y36Ga716VbrrEWyh36JDu5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651879522; a=rsa-sha256; cv=none; b=xKJx5rFxcyDRAOMGLssAxG3WNhJYuYrw9YYaALt6WTubliS3/5XMJMgXuUDXxavGAqSRXI negpfR2tbwwAOZjlgMydqD8+hIVjP1dxLLXwIORCngFRjCOY92WK8AVsWtX/YRu/DBzstE RlzEmgg1099Uq6Uvv05hHF7cUZOVr8HUry3eU2q1uxQf4GcljStCZDpZ40MFHDBSRAkQ5T QjdmFiVnYiOuxEZjODEPNs0X3vY9yQ/ENAN/ubE75PsvAstFk3xfpMgNvdwbDJfufQMTKj 5pb0VjPNXE5coRT2CytFEPUy2C6z1GnIIc5D1giyZ0kwpj3G4+Aw4mz2yrdPSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1c1e88367c76469ffbb806a40272bdd3fd1ac3bc commit 1c1e88367c76469ffbb806a40272bdd3fd1ac3bc Author: John Baldwin AuthorDate: 2022-05-06 22:46:58 +0000 Commit: John Baldwin CommitDate: 2022-05-06 22:46:58 +0000 atkbd/psm: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/atkbdc/atkbd_atkbdc.c | 4 +--- sys/dev/atkbdc/atkbdc_isa.c | 4 ++-- sys/dev/atkbdc/atkbdc_subr.c | 2 -- sys/dev/atkbdc/atkbdc_subr.h | 2 -- sys/dev/atkbdc/psm.c | 9 +++------ 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c index 9513e238f153..7acc2244cad8 100644 --- a/sys/dev/atkbdc/atkbd_atkbdc.c +++ b/sys/dev/atkbdc/atkbd_atkbdc.c @@ -52,8 +52,6 @@ typedef struct { void *ih; } atkbd_softc_t; -static devclass_t atkbd_devclass; - static void atkbdidentify(driver_t *driver, device_t dev); static int atkbdprobe(device_t dev); static int atkbdattach(device_t dev); @@ -171,7 +169,7 @@ atkbdintr(void *arg) kbdd_intr(kbd, NULL); } -DRIVER_MODULE(atkbd, atkbdc, atkbd_driver, atkbd_devclass, 0, 0); +DRIVER_MODULE(atkbd, atkbdc, atkbd_driver, 0, 0); #ifdef EVDEV_SUPPORT MODULE_DEPEND(atkbd, evdev, 1, 1, 1); #endif diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c index c882403d89ab..75d2850dbcd7 100644 --- a/sys/dev/atkbdc/atkbdc_isa.c +++ b/sys/dev/atkbdc/atkbdc_isa.c @@ -319,6 +319,6 @@ atkbdc_isa_release_resource(device_t dev, device_t child, int type, int rid, return (bus_generic_rl_release_resource(dev, child, type, rid, r)); } -DRIVER_MODULE(atkbdc, isa, atkbdc_isa_driver, atkbdc_devclass, 0, 0); -DRIVER_MODULE(atkbdc, acpi, atkbdc_isa_driver, atkbdc_devclass, 0, 0); +DRIVER_MODULE(atkbdc, isa, atkbdc_isa_driver, 0, 0); +DRIVER_MODULE(atkbdc, acpi, atkbdc_isa_driver, 0, 0); ISA_PNP_INFO(atkbdc_ids); diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c index 8ac80d95258d..dc9d2d5cd812 100644 --- a/sys/dev/atkbdc/atkbdc_subr.c +++ b/sys/dev/atkbdc/atkbdc_subr.c @@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$"); MALLOC_DEFINE(M_ATKBDDEV, "atkbddev", "AT Keyboard device"); -devclass_t atkbdc_devclass; - int atkbdc_print_child(device_t bus, device_t dev) { diff --git a/sys/dev/atkbdc/atkbdc_subr.h b/sys/dev/atkbdc/atkbdc_subr.h index 54e40f4b839a..8d0aee26031d 100644 --- a/sys/dev/atkbdc/atkbdc_subr.h +++ b/sys/dev/atkbdc/atkbdc_subr.h @@ -34,8 +34,6 @@ MALLOC_DECLARE(M_ATKBDDEV); -extern devclass_t atkbdc_devclass; - /* children */ typedef struct atkbdc_device { struct resource_list resources; diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index ed0f78bb3839..b3e036ebc134 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -476,7 +476,6 @@ struct psm_softc { /* Driver status information */ struct evdev_dev *evdev_r; /* Relative reporting device */ #endif }; -static devclass_t psm_devclass; /* driver state flags (state) */ #define PSM_VALID 0x80 @@ -7438,7 +7437,7 @@ psmresume(device_t dev) return (err); } -DRIVER_MODULE(psm, atkbdc, psm_driver, psm_devclass, 0, 0); +DRIVER_MODULE(psm, atkbdc, psm_driver, 0, 0); #ifdef EVDEV_SUPPORT MODULE_DEPEND(psm, evdev, 1, 1, 1); #endif @@ -7459,8 +7458,6 @@ MODULE_DEPEND(psm, evdev, 1, 1, 1); * under the keyboard controller, then probe and attach it. */ -static devclass_t psmcpnp_devclass; - static device_probe_t psmcpnp_probe; static device_attach_t psmcpnp_attach; @@ -7619,7 +7616,7 @@ psmcpnp_attach(device_t dev) return (0); } -DRIVER_MODULE(psmcpnp, isa, psmcpnp_driver, psmcpnp_devclass, 0, 0); -DRIVER_MODULE(psmcpnp, acpi, psmcpnp_driver, psmcpnp_devclass, 0, 0); +DRIVER_MODULE(psmcpnp, isa, psmcpnp_driver, 0, 0); +DRIVER_MODULE(psmcpnp, acpi, psmcpnp_driver, 0, 0); ISA_PNP_INFO(psmcpnp_ids); #endif /* DEV_ISA */