summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Weißschuh <linux@weissschuh.net>2022-12-22 05:10:45 +0000
committerJiri Kosina <jkosina@suse.cz>2023-01-17 13:44:01 +0100
commit8c3e24065e3d37ee4787e6c72aa0ab6460db7598 (patch)
tree8edbac6a13919e27e5ae93cb77058841a4523d45
parent2bafbef6ff4eebec93267b060cc6f83f25505b1b (diff)
downloadlwn-8c3e24065e3d37ee4787e6c72aa0ab6460db7598.tar.gz
lwn-8c3e24065e3d37ee4787e6c72aa0ab6460db7598.zip
HID: usbhid: Make hid_is_usb() non-inline
By making hid_is_usb() a non-inline function the lowlevel usbhid driver does not have to be exported anymore. Also mark the argument as const as it is not modified. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Reviewed-by: David Rheinsberg <david.rheinsberg@gmail.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/usbhid/hid-core.c6
-rw-r--r--include/linux/hid.h5
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index be4c731aaa65..54b0280d0073 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1334,6 +1334,12 @@ struct hid_ll_driver usb_hid_driver = {
};
EXPORT_SYMBOL_GPL(usb_hid_driver);
+bool hid_is_usb(const struct hid_device *hdev)
+{
+ return hdev->ll_driver == &usb_hid_driver;
+}
+EXPORT_SYMBOL_GPL(hid_is_usb);
+
static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *id)
{
struct usb_host_interface *interface = intf->cur_altsetting;
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 1eb5408599cd..c4cf9cea4377 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -866,10 +866,7 @@ static inline bool hid_is_using_ll_driver(struct hid_device *hdev,
return hdev->ll_driver == driver;
}
-static inline bool hid_is_usb(struct hid_device *hdev)
-{
- return hid_is_using_ll_driver(hdev, &usb_hid_driver);
-}
+extern bool hid_is_usb(const struct hid_device *hdev);
#define PM_HINT_FULLON 1<<5
#define PM_HINT_NORMAL 1<<1