Commit 39335d1c authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: core: remove the need for HID_QUIRK_NO_EMPTY_INPUT 



There is no real point of registering an empty input node.
This should be default, but given some drivers need the blank input
node to set it up during input_configured, we need to postpone
the check for hidinput_has_been_populated().

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent c30e5989

drivers/hid/hid-asus.c

+1 −2
Original line number Diff line number Diff line
@@ -644,8 +644,7 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		 * All functionality is on a single HID interface and for

		 * userspace the touchpad must be a separate input_dev.

		 */

		hdev->quirks |= HID_QUIRK_MULTI_INPUT |

				HID_QUIRK_NO_EMPTY_INPUT;

		hdev->quirks |= HID_QUIRK_MULTI_INPUT;

		drvdata->tp = &asus_t100chi_tp;

	}

drivers/hid/hid-input.c

+5 −5
Original line number Diff line number Diff line
@@ -1656,16 +1656,16 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) 
	}



	list_for_each_entry_safe(hidinput, next, &hid->inputs, list) {

		if ((hid->quirks & HID_QUIRK_NO_EMPTY_INPUT) &&

		    !hidinput_has_been_populated(hidinput)) {

		if (drv->input_configured &&

		    drv->input_configured(hid, hidinput))

			goto out_unwind;



		if (!hidinput_has_been_populated(hidinput)) {

			/* no need to register an input device not populated */

			hidinput_cleanup_hidinput(hid, hidinput);

			continue;

		}



		if (drv->input_configured &&

		    drv->input_configured(hid, hidinput))

			goto out_unwind;

		if (input_register_device(hidinput->input))

			goto out_unwind;

		hidinput->registered = true;

drivers/hid/hid-multitouch.c

+0 −1
Original line number Diff line number Diff line
@@ -1469,7 +1469,6 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	 * device.

	 */

	hdev->quirks |= HID_QUIRK_MULTI_INPUT;

	hdev->quirks |= HID_QUIRK_NO_EMPTY_INPUT;



	/*

	 * Some multitouch screens do not like to be polled for input

drivers/hid/hid-uclogic.c

+0 −1
Original line number Diff line number Diff line
@@ -946,7 +946,6 @@ static int uclogic_probe(struct hid_device *hdev, 
	 * than the pen, so use QUIRK_MULTI_INPUT for all tablets.

	 */

	hdev->quirks |= HID_QUIRK_MULTI_INPUT;

	hdev->quirks |= HID_QUIRK_NO_EMPTY_INPUT;



	/* Allocate and assign driver data */

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

include/linux/hid.h

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ struct hid_item { 
#define HID_QUIRK_BADPAD			BIT(5)

#define HID_QUIRK_MULTI_INPUT			BIT(6)

#define HID_QUIRK_HIDINPUT_FORCE		BIT(7)

#define HID_QUIRK_NO_EMPTY_INPUT		BIT(8)

/* BIT(8) reserved for backward compatibility, was HID_QUIRK_NO_EMPTY_INPUT */

/* BIT(9) reserved for backward compatibility, was NO_INIT_INPUT_REPORTS */

#define HID_QUIRK_ALWAYS_POLL			BIT(10)

#define HID_QUIRK_SKIP_OUTPUT_REPORTS		BIT(16)

CRA Git | Maintained and supported by SUSTech CRA and CCSE