Commit a3643036 authored Oct 10, 2023 by Hans de Goede Committed by Benjamin Tissoires Oct 25, 2023

HID: logitech-hidpp: Remove wtp_get_config() call from probe()



For WTP devices which start disconnected (paired with the unifying
receiver, but not connected atm) hidpp_connect_event() takes care
of calling wtp_get_config() when the device later connects.

There is no need to have a separate code path for WTP devices which
are connected at probe() time, these can use the same code-path since
probe() will queue hidpp_connect_event() for those at probe time.

Drop the unnecessary wtp_get_config() call from probe().

This series has been tested on the following devices:
Logitech Bluetooth Laser Travel Mouse (bluetooth, HID++ 1.0)
Logitech M720 Triathlon (bluetooth, HID++ 4.5)
Logitech M720 Triathlon (unifying, HID++ 4.5)
Logitech K400 Pro (unifying, HID++ 4.1)
Logitech K270 (eQUAD nano Lite, HID++ 2.0)
Logitech M185 (eQUAD nano Lite, HID++ 4.5)
Logitech LX501 keyboard (27 Mhz, HID++ builtin scroll-wheel, HID++ 1.0)
Logitech M-RAZ105 mouse (27 Mhz, HID++ extra mouse buttons, HID++ 1.0)

And by bentiss:
Logitech Touchpad T650 (unifying)
Logitech Touchpad T651 (bluetooth)
Logitech MX Master 3B (BLE)
Logitech G403 (plain USB / Gaming receiver)

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20231010102029.111003-5-hdegoede@redhat.com


Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>

parent ba9de350

drivers/hid/hid-logitech-hidpp.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -4499,11 +4499,7 @@ static int hidpp_probe(struct hid_device hdev, const struct hid_device_id id)
		hidpp_overwrite_name(hdev);
		}

		if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP)) {
		ret = wtp_get_config(hidpp);
		if (ret)
		goto hid_hw_init_fail;
		} else if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_G920)) {
		if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_G920)) {
		ret = g920_get_config(hidpp, &data);
		if (ret)
		goto hid_hw_init_fail;