From nobody Fri May 06 23:25:02 2022 X-Original-To: dev-commits-src-all@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 2D0021AD0B52; Fri, 6 May 2022 23:25:04 +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 4Kw69W2BQgz3FFw; Fri, 6 May 2022 23:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651879504; 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=O9qSktSsfznQmdrz+sEjvz0PZ43PS48SvKi9FgtQD8I=; b=paWpOwcnmIg12zIKeqloh+GeI4w5pKk199/QX320eYaiJDNbNOcoGpiJxis0yGs97bufou c51BkflhyE9yvYvxnH+4xJDtFQIlKZGF+doKqZ1vlCrpK0RfKZhbI03jw+cRu5r14Voh3V G4R4rpN5hUPu3mytuIjqWLuIOBGUlyFgmTfDnajodyqevRSyrW8Bc1081USfK47Xrj2IwD WfeF1rRaH/e+5nj6ICB+/lIqL1t1v/eL5GjyMbOt1a6ZNSRqJwBbHXFo1Te6pbFWw5mEim PaQ7DHJLoho6kt93ipgh34ns5AA/g2DoAcTBEp+nDupt1noCifNOduYIPEExmw== 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 421DD2504D; Fri, 6 May 2022 23:25:02 +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 246NP2M7075341; Fri, 6 May 2022 23:25:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246NP2vS075340; Fri, 6 May 2022 23:25:02 GMT (envelope-from git) Date: Fri, 6 May 2022 23:25:02 GMT Message-Id: <202205062325.246NP2vS075340@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: a4777bb4373d - main - Remove unused hidraw_devclass. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a4777bb4373d85268b390ab44d94890f6480042d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651879504; 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=O9qSktSsfznQmdrz+sEjvz0PZ43PS48SvKi9FgtQD8I=; b=xV219Ig41S7AvDzCtrDukKw+NTc9+vL7LFccaB/VkY60pDZeKjwB/qa32A/ycI7Cz1s1Ni Zq2s2RfAzV9HJqVRIl5eL+lXwboAbiBGH8KMn4pfwxwk/AbKKzJ18UBruTW/ZL2WSiSyCk 4Ef0eMXzJd7Nkhh8KISyA60IOQjQL/AwPB7j6XPbr8zKOEGek9Ba/3PxquVP7Ao30pKMaW E4BYhW3QkkguqZaqzGUnhw08kbO6hjnOkdIATxMpfbPh0fG8Bbod8FxpBO28k0p9VKVyop 6wxW696VgAqjkHEoJWGEthYJeL+tjiupbUgT/E6UUXjxPFD+ahTseRNcwKdlgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651879504; a=rsa-sha256; cv=none; b=kBjad8EnVzGhgCOikKVYya2+wjKNC+C4tsTxG4gDclMNMq319oL/s7GicMMa7HV2RSNCSJ jzimQfYQ/oVJ8B8dEMj+Fj39A34bO+XT0U9pPYGcbL2F1y0zJG2FQh85zUm0YnxEbdiUyv SeAVl1P3GRFS3+iXZoO4YdfJx83IA7DboWcfervz9Z+Aa2IrEWpKZnNEq665ccDCYZnxrV ycidPgKKN1hBaVRgATWM5KSBzcVzUKnH9xT3dZzKBzcypBt9M3ZDoeKcIS6W5hW7PbS41m Sin5+VDTGxoyhD6WmwTjfhCVZ48DNnezKii5WfivcHXYwKs+GDv6+gw06RS8Ww== 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=a4777bb4373d85268b390ab44d94890f6480042d commit a4777bb4373d85268b390ab44d94890f6480042d Author: John Baldwin AuthorDate: 2022-05-06 22:46:57 +0000 Commit: John Baldwin CommitDate: 2022-05-06 22:46:57 +0000 Remove unused hidraw_devclass. --- sys/dev/hid/hid.c | 4 ---- sys/dev/hid/hid.h | 3 --- sys/dev/hid/hidraw.c | 6 +----- sys/dev/usb/input/uhid.c | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/sys/dev/hid/hid.c b/sys/dev/hid/hid.c index bd5fc79ff0d9..0ed663f99f88 100644 --- a/sys/dev/hid/hid.c +++ b/sys/dev/hid/hid.c @@ -58,10 +58,6 @@ SYSCTL_NODE(_hw, OID_AUTO, hid, CTLFLAG_RW, 0, "HID debugging"); SYSCTL_INT(_hw_hid, OID_AUTO, debug, CTLFLAG_RWTUN, &hid_debug, 0, "Debug level"); -#ifdef HIDRAW_MAKE_UHID_ALIAS -devclass_t hidraw_devclass; -#endif - static void hid_clear_local(struct hid_item *); static uint8_t hid_get_byte(struct hid_data *s, const uint16_t wSize); diff --git a/sys/dev/hid/hid.h b/sys/dev/hid/hid.h index df822fcddffb..1832af0a4ffb 100644 --- a/sys/dev/hid/hid.h +++ b/sys/dev/hid/hid.h @@ -194,9 +194,6 @@ #define HID_MAX_AUTO_QUIRK 8 /* maximum number of dynamic quirks */ #define HID_PNP_ID_SIZE 20 /* includes null terminator */ -/* Share unit number pool between uhid and hidraw */ -extern devclass_t hidraw_devclass; - /* Declare global HID debug variable. */ extern int hid_debug; diff --git a/sys/dev/hid/hidraw.c b/sys/dev/hid/hidraw.c index 25b41693b7f3..c8e36a186aaf 100644 --- a/sys/dev/hid/hidraw.c +++ b/sys/dev/hid/hidraw.c @@ -984,11 +984,7 @@ static driver_t hidraw_driver = { sizeof(struct hidraw_softc) }; -#ifndef HIDRAW_MAKE_UHID_ALIAS -devclass_t hidraw_devclass; -#endif - -DRIVER_MODULE(hidraw, hidbus, hidraw_driver, hidraw_devclass, NULL, 0); +DRIVER_MODULE(hidraw, hidbus, hidraw_driver, NULL, NULL); MODULE_DEPEND(hidraw, hidbus, 1, 1, 1); MODULE_DEPEND(hidraw, hid, 1, 1, 1); MODULE_DEPEND(hidraw, usb, 1, 1, 1); diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c index 1cad7af222ac..d877773625d7 100644 --- a/sys/dev/usb/input/uhid.c +++ b/sys/dev/usb/input/uhid.c @@ -935,7 +935,7 @@ static driver_t uhid_driver = { }; #ifdef HIDRAW_MAKE_UHID_ALIAS -DRIVER_MODULE(uhid, uhub, uhid_driver, hidraw_devclass, NULL, 0); +DRIVER_MODULE(uhid, uhub, uhid_driver, NULL, NULL); #else DRIVER_MODULE(uhid, uhub, uhid_driver, uhid_devclass, NULL, 0); #endif