Commit 219ccfb6 authored by Hans de Goede's avatar Hans de Goede Committed by Benjamin Tissoires
Browse files

HID: logitech-hidpp: Move g920_get_config() to just before hidpp_ff_init() 



The data retrieved by g920_get_config() is only used by hidpp_ff_init().

Now that the hw is kept open till the end of probe() the g920_get_config()
call can be moved to just before hidpp_ff_init() to have all
the HIDPP_QUIRK_CLASS_G920 together in a single place.

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: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20231010102029.111003-6-hdegoede@redhat.com


Signed-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
parent a3643036

drivers/hid/hid-logitech-hidpp.c

+6 −8
Original line number Diff line number Diff line
@@ -4399,7 +4399,6 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	int ret;

	bool connected;

	unsigned int connect_mask = HID_CONNECT_DEFAULT;

	struct hidpp_ff_private_data data;



	/* report_fixup needs drvdata to be set before we call hid_parse */

	hidpp = devm_kzalloc(&hdev->dev, sizeof(*hidpp), GFP_KERNEL);
@@ -4499,12 +4498,6 @@ 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_G920)) {

		ret = g920_get_config(hidpp, &data);

		if (ret)

			goto hid_hw_init_fail;

	}



	schedule_work(&hidpp->work);

	flush_work(&hidpp->work);
@@ -4519,7 +4512,12 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	}



	if (hidpp->quirks & HIDPP_QUIRK_CLASS_G920) {

		struct hidpp_ff_private_data data;



		ret = g920_get_config(hidpp, &data);

		if (!ret)

			ret = hidpp_ff_init(hidpp, &data);



		if (ret)

			hid_warn(hidpp->hid_dev,

		     "Unable to initialize force feedback support, errno %d\n",