aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorFrank Praznik <frank.praznik@oh.rr.com>2014-01-11 15:13:54 -0500
committerJiri Kosina <jkosina@suse.cz>2014-01-16 16:44:35 -0500
commitcad665a2a937d070e5909beec37f891a95911bef (patch)
tree81fca9e22b89a781ee593ff400490b1158a1b2d5 /drivers/hid
parent60781cf487e3aae5134b5fec85fe60ece31ff627 (diff)
HID: sony: Rename worker function
Rename sony_state_worker to sixaxis_state_worker since the function is now sixaxis specific. Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-sony.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 79e0d5808a92..1dfed2365d40 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -632,7 +632,7 @@ error_leds:
632 return ret; 632 return ret;
633} 633}
634 634
635static void sony_state_worker(struct work_struct *work) 635static void sixaxis_state_worker(struct work_struct *work)
636{ 636{
637 struct sony_sc *sc = container_of(work, struct sony_sc, state_worker); 637 struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
638 unsigned char buf[] = { 638 unsigned char buf[] = {
@@ -771,7 +771,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
771 if (sc->quirks & SIXAXIS_CONTROLLER_USB) { 771 if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
772 hdev->hid_output_raw_report = sixaxis_usb_output_raw_report; 772 hdev->hid_output_raw_report = sixaxis_usb_output_raw_report;
773 ret = sixaxis_set_operational_usb(hdev); 773 ret = sixaxis_set_operational_usb(hdev);
774 INIT_WORK(&sc->state_worker, sony_state_worker); 774 INIT_WORK(&sc->state_worker, sixaxis_state_worker);
775 } 775 }
776 else if (sc->quirks & SIXAXIS_CONTROLLER_BT) 776 else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
777 ret = sixaxis_set_operational_bt(hdev); 777 ret = sixaxis_set_operational_bt(hdev);