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

HID: logitech-hidpp: Drop delayed_work_cb() 



Drop delayed_work_cb() instead make hidpp_connect_event() the workqueue
function itself.

Besides resulting in a small cleanup this will hopefully also make
it clearer that going forward hidpp_connect_event() should only
be run from a workqueue and not be directly invoked.

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


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

drivers/hid/hid-logitech-hidpp.c

+3 −11
Original line number Diff line number Diff line
@@ -234,8 +234,6 @@ struct hidpp_device { 
#define HIDPP20_ERROR_UNSUPPORTED		0x09

#define HIDPP20_ERROR				0xff



static void hidpp_connect_event(struct hidpp_device *hidpp_dev);



static int __hidpp_send_report(struct hid_device *hdev,

				struct hidpp_report *hidpp_report)

{
@@ -449,13 +447,6 @@ static int hidpp_send_rap_command_sync(struct hidpp_device *hidpp_dev, 
	return ret;

}



static void delayed_work_cb(struct work_struct *work)

{

	struct hidpp_device *hidpp = container_of(work, struct hidpp_device,

							work);

	hidpp_connect_event(hidpp);

}



static inline bool hidpp_match_answer(struct hidpp_report *question,

		struct hidpp_report *answer)

{
@@ -4183,8 +4174,9 @@ static struct input_dev *hidpp_allocate_input(struct hid_device *hdev) 
	return input_dev;

}



static void hidpp_connect_event(struct hidpp_device *hidpp)

static void hidpp_connect_event(struct work_struct *work)

{

	struct hidpp_device *hidpp = container_of(work, struct hidpp_device, work);

	struct hid_device *hdev = hidpp->hid_dev;

	struct input_dev *input;

	char *name, *devm_name;
@@ -4435,7 +4427,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
			return ret;

	}



	INIT_WORK(&hidpp->work, delayed_work_cb);

	INIT_WORK(&hidpp->work, hidpp_connect_event);

	mutex_init(&hidpp->send_mutex);

	init_waitqueue_head(&hidpp->wait);