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

Commit 2936836f authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: logitech-hidpp: rework hidpp_connect_event() 



Looks like all users don't care about a disconnect.
Simplify the various variant_connect() and put the connect state check
at the beginning.

For delayed input devices, make sure we go through all other connect
values (protocol, battery) before bailing out.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 187f2bba

drivers/hid/hid-logitech-hidpp.c

+5 −14
Original line number Diff line number Diff line
@@ -1884,9 +1884,6 @@ static int wtp_connect(struct hid_device *hdev, bool connected) 
	struct wtp_data *wd = hidpp->private_data;

	int ret;



	if (!connected)

		return 0;



	if (!wd->x_size) {

		ret = wtp_get_config(hidpp);

		if (ret) {
@@ -1954,9 +1951,6 @@ static int m560_send_config_command(struct hid_device *hdev, bool connected) 


	hidpp_dev = hid_get_drvdata(hdev);



	if (!connected)

		return -ENODEV;



	return hidpp_send_rap_command_sync(

		hidpp_dev,

		REPORT_ID_HIDPP_SHORT,
@@ -2160,9 +2154,6 @@ static int k400_connect(struct hid_device *hdev, bool connected) 
{

	struct hidpp_device *hidpp = hid_get_drvdata(hdev);



	if (!connected)

		return 0;



	if (!disable_tap_to_click)

		return 0;
@@ -2414,6 +2405,9 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) 
	struct input_dev *input;

	char *name, *devm_name;



	if (!connected)

		return;



	if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP) {

		ret = wtp_connect(hdev, connected);

		if (ret)
@@ -2428,9 +2422,6 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) 
			return;

	}



	if (!connected || hidpp->delayed_input)

		return;



	/* the device is already connected, we can ask for its name and

	 * protocol */

	if (!hidpp->protocol_major) {
@@ -2461,8 +2452,8 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) 


	hidpp_initialize_battery(hidpp);



	if (!(hidpp->quirks & HIDPP_QUIRK_NO_HIDINPUT))

		/* if HID created the input nodes for us, we can stop now */

	if (!(hidpp->quirks & HIDPP_QUIRK_NO_HIDINPUT) || hidpp->delayed_input)

		/* if the input nodes are already created, we can stop now */

		return;



	input = hidpp_allocate_input(hdev);