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

HID: logitech-hidpp: Remove unused connected param from *_connect() 



Remove the unused connected function parameter from wtp_connect(),
m560_send_config_command() and k400_connect().

This is a preparation patch for moving all connected state handling
to hidpp_connect_event().

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


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

drivers/hid/hid-logitech-hidpp.c

+6 −6
Original line number Diff line number Diff line
@@ -3141,7 +3141,7 @@ static int wtp_allocate(struct hid_device *hdev, const struct hid_device_id *id) 
	return 0;

};



static int wtp_connect(struct hid_device *hdev, bool connected)

static int wtp_connect(struct hid_device *hdev)

{

	struct hidpp_device *hidpp = hid_get_drvdata(hdev);

	struct wtp_data *wd = hidpp->private_data;
@@ -3203,7 +3203,7 @@ static const u8 m560_config_parameter[] = {0x00, 0xaf, 0x03}; 
#define M560_SUB_ID			0x0a

#define M560_BUTTON_MODE_REGISTER	0x35



static int m560_send_config_command(struct hid_device *hdev, bool connected)

static int m560_send_config_command(struct hid_device *hdev)

{

	struct hidpp_report response;

	struct hidpp_device *hidpp_dev;
@@ -3398,7 +3398,7 @@ static int k400_allocate(struct hid_device *hdev) 
	return 0;

};



static int k400_connect(struct hid_device *hdev, bool connected)

static int k400_connect(struct hid_device *hdev)

{

	struct hidpp_device *hidpp = hid_get_drvdata(hdev);
@@ -4205,15 +4205,15 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) 
	}



	if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP) {

		ret = wtp_connect(hdev, connected);

		ret = wtp_connect(hdev);

		if (ret)

			return;

	} else if (hidpp->quirks & HIDPP_QUIRK_CLASS_M560) {

		ret = m560_send_config_command(hdev, connected);

		ret = m560_send_config_command(hdev);

		if (ret)

			return;

	} else if (hidpp->quirks & HIDPP_QUIRK_CLASS_K400) {

		ret = k400_connect(hdev, connected);

		ret = k400_connect(hdev);

		if (ret)

			return;

	}