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

HID: logitech-hidpp: Add hidpp_non_unifying_init() helper 



Turn hidpp_overwrite_name() into a hidpp_non_unifying_init() helper
which takes care of setting both the name and the serial for non
unifying devices.

This mirrors the hidpp_unifying_init() helper for unifying devices.

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-8-hdegoede@redhat.com


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

drivers/hid/hid-logitech-hidpp.c

+10 −8
Original line number Diff line number Diff line
@@ -4130,11 +4130,16 @@ static int hidpp_initialize_battery(struct hidpp_device *hidpp) 
	return ret;

}



static void hidpp_overwrite_name(struct hid_device *hdev)

/* Get name + serial for USB and Bluetooth HID++ devices */

static void hidpp_non_unifying_init(struct hidpp_device *hidpp)

{

	struct hidpp_device *hidpp = hid_get_drvdata(hdev);

	struct hid_device *hdev = hidpp->hid_dev;

	char *name;



	/* Bluetooth devices already have their serialnr set */

	if (hid_is_usb(hdev))

		hidpp_serial_init(hidpp);



	name = hidpp_get_device_name(hidpp);

	if (name) {

		dbg_hid("HID++: Got name: %s\n", name);
@@ -4474,14 +4479,11 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	/* Allow incoming packets */

	hid_device_io_start(hdev);



	/* Get name + serial, store in hdev->name + hdev->uniq */

	if (hidpp->quirks & HIDPP_QUIRK_UNIFYING)

		hidpp_unifying_init(hidpp);

	else {

		if (hid_is_usb(hidpp->hid_dev))

			hidpp_serial_init(hidpp);



		hidpp_overwrite_name(hdev);

	}

	else

		hidpp_non_unifying_init(hidpp);



	connected = hidpp_root_get_protocol_version(hidpp) == 0;

	atomic_set(&hidpp->connected, connected);