Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d236ade authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: HID: add hid_is_usb() function to make it simpler for USB detection 



A number of HID drivers already call hid_is_using_ll_driver() but only
for the detection of if this is a USB device or not.  Make this more
obvious by creating hid_is_usb() and calling the function that way.

Also converts the existing hid_is_using_ll_driver() functions to use the
new call.

Cc: Jiri Kosina <jikos@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: linux-input@vger.kernel.org
Cc: stable@vger.kernel.org
Tested-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Link: https://lore.kernel.org/r/20211201183503.2373082-1-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit f83baa0cb6cfc92ebaf7f9d3a99d7e34f2e77a8a)
Bug: 188677105
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibfa4252d4b6501a09a997bb9efbab46fae3fd1dc
parent b0f930a5

drivers/hid/hid-asus.c

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	if (drvdata->quirks & QUIRK_IS_MULTITOUCH)

		drvdata->tp = &asus_i2c_tp;



	if (drvdata->quirks & QUIRK_T100_KEYBOARD) {

	if ((drvdata->quirks & QUIRK_T100_KEYBOARD) && hid_is_usb(hdev)) {

		struct usb_interface *intf = to_usb_interface(hdev->dev.parent);



		if (intf->altsetting->desc.bInterfaceNumber == T100_TPAD_INTF) {

drivers/hid/hid-logitech-dj.c

+1 −1
Original line number Diff line number Diff line
@@ -1686,7 +1686,7 @@ static int logi_dj_probe(struct hid_device *hdev, 
	case recvr_type_27mhz:		no_dj_interfaces = 2; break;

	case recvr_type_bluetooth:	no_dj_interfaces = 2; break;

	}

	if (hid_is_using_ll_driver(hdev, &usb_hid_driver)) {

	if (hid_is_usb(hdev)) {

		intf = to_usb_interface(hdev->dev.parent);

		if (intf && intf->altsetting->desc.bInterfaceNumber >=

							no_dj_interfaces) {

drivers/hid/hid-u2fzero.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int u2fzero_probe(struct hid_device *hdev, 
	unsigned int minor;

	int ret;



	if (!hid_is_using_ll_driver(hdev, &usb_hid_driver))

	if (!hid_is_usb(hdev))

		return -EINVAL;



	dev = devm_kzalloc(&hdev->dev, sizeof(*dev), GFP_KERNEL);

drivers/hid/hid-uclogic-params.c

+1 −2
Original line number Diff line number Diff line
@@ -841,8 +841,7 @@ int uclogic_params_init(struct uclogic_params *params, 
	struct uclogic_params p = {0, };



	/* Check arguments */

	if (params == NULL || hdev == NULL ||

	    !hid_is_using_ll_driver(hdev, &usb_hid_driver)) {

	if (params == NULL || hdev == NULL || !hid_is_usb(hdev)) {

		rc = -EINVAL;

		goto cleanup;

	}

drivers/hid/wacom_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -2217,7 +2217,7 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix) 
	if ((features->type == HID_GENERIC) && !strcmp("Wacom HID", features->name)) {

		char *product_name = wacom->hdev->name;



		if (hid_is_using_ll_driver(wacom->hdev, &usb_hid_driver)) {

		if (hid_is_usb(wacom->hdev)) {

			struct usb_interface *intf = to_usb_interface(wacom->hdev->dev.parent);

			struct usb_device *dev = interface_to_usbdev(intf);

			product_name = dev->product;