Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a60a133 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Kim Low
Browse files

UPSTREAM: HID: sony: Make work handling more generic 



The driver currently uses sony_schedule_work to submit output
reports for the different devices for LEDs or rumble.

This patch adds a new parameter to sony_schedule_work to allow
scheduling for other types of work. The next patch in this series
will utilize this functionality. Considering the driver structure
and all error handling it felt best to reuse sony_schedule_work
and sony_cancel_work. The idea was inspired by the wacom driver
which does something similar.

Signed-off-by: default avatarRoderick Colenbrander <roderick.colenbrander@sony.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
(cherry picked from commit b53227360dc2e30fb8809815dfdc39339a34b8dd)

Bug: 111431828
Signed-off-by: default avatarKim Low <kim-huei.low@sony.com>
Change-Id: I5ecb2c977820bb29ed671e16de961df0cef60406
parent 8f1d4700

drivers/hid/hid-sony.c

+19 −11
Original line number Diff line number Diff line
@@ -624,6 +624,10 @@ struct ds4_calibration_data { 
	int sens_denom;

};



enum sony_worker {

	SONY_WORKER_STATE

};



struct sony_sc {

	spinlock_t lock;

	struct list_head list_node;
@@ -645,7 +649,7 @@ struct sony_sc { 
#endif



	u8 mac_address[6];

	u8 worker_initialized;

	u8 state_worker_initialized;

	u8 defer_initialization;

	u8 cable_state;

	u8 battery_charging;
@@ -666,11 +670,15 @@ struct sony_sc { 


static void sony_set_leds(struct sony_sc *sc);



static inline void sony_schedule_work(struct sony_sc *sc)

static inline void sony_schedule_work(struct sony_sc *sc,

				      enum sony_worker which)

{

	switch (which) {

	case SONY_WORKER_STATE:

		if (!sc->defer_initialization)

			schedule_work(&sc->state_worker);

	}

}



static u8 *sixaxis_fixup(struct hid_device *hdev, u8 *rdesc,

			     unsigned int *rsize)
@@ -1103,7 +1111,7 @@ static int sony_raw_event(struct hid_device *hdev, struct hid_report *report, 


	if (sc->defer_initialization) {

		sc->defer_initialization = 0;

		sony_schedule_work(sc);

		sony_schedule_work(sc, SONY_WORKER_STATE);

	}



	return 0;
@@ -1584,7 +1592,7 @@ static void buzz_set_leds(struct sony_sc *sc) 
static void sony_set_leds(struct sony_sc *sc)

{

	if (!(sc->quirks & BUZZ_CONTROLLER))

		sony_schedule_work(sc);

		sony_schedule_work(sc, SONY_WORKER_STATE);

	else

		buzz_set_leds(sc);

}
@@ -1695,7 +1703,7 @@ static int sony_led_blink_set(struct led_classdev *led, unsigned long *delay_on, 
		new_off != drv_data->led_delay_off[n]) {

		drv_data->led_delay_on[n] = new_on;

		drv_data->led_delay_off[n] = new_off;

		sony_schedule_work(drv_data);

		sony_schedule_work(drv_data, SONY_WORKER_STATE);

	}



	return 0;
@@ -2025,7 +2033,7 @@ static int sony_play_effect(struct input_dev *dev, void *data, 
	sc->left = effect->u.rumble.strong_magnitude / 256;

	sc->right = effect->u.rumble.weak_magnitude / 256;



	sony_schedule_work(sc);

	sony_schedule_work(sc, SONY_WORKER_STATE);

	return 0;

}
@@ -2346,15 +2354,15 @@ static inline void sony_init_output_report(struct sony_sc *sc, 
{

	sc->send_output_report = send_output_report;



	if (!sc->worker_initialized)

	if (!sc->state_worker_initialized)

		INIT_WORK(&sc->state_worker, sony_state_worker);



	sc->worker_initialized = 1;

	sc->state_worker_initialized = 1;

}



static inline void sony_cancel_work_sync(struct sony_sc *sc)

{

	if (sc->worker_initialized)

	if (sc->state_worker_initialized)

		cancel_work_sync(&sc->state_worker);

}