HID: sony: Use low-level transport driver functions

Switch to the low-level transport driver functions.

sony_set_output_report is removed since it is no longer used.

Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 14 insertions, 42 deletions

diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index e6995bf9f95a..f93f3ca2c231 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -502,7 +502,6 @@ struct sony_sc {
         spinlock_t lock;
         struct hid_device *hdev;
         struct led_classdev *leds[MAX_LEDS];
-        struct hid_report *output_report;
         unsigned long quirks;
         struct work_struct state_worker;
         struct power_supply battery;
@@ -1051,21 +1050,26 @@ static void dualshock4_state_worker(struct work_struct *work)
 {
         struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
         struct hid_device *hdev = sc->hdev;
-        struct hid_report *report = sc->output_report;
-        __s32 *value = report->field[0]->value;
+        int offset;
+
+        __u8 buf[32] = { 0 };
 
-        value[0] = 0x03;
+        buf[0] = 0x05;
+        buf[1] = 0x03;
+        offset = 4;
 
 #ifdef CONFIG_SONY_FF
-        value[3] = sc->right;
-        value[4] = sc->left;
+        buf[offset++] = sc->right;
+        buf[offset++] = sc->left;
+#else
+        offset += 2;
 #endif
 
-        value[5] = sc->led_state[0];
-        value[6] = sc->led_state[1];
-        value[7] = sc->led_state[2];
+        buf[offset++] = sc->led_state[0];
+        buf[offset++] = sc->led_state[1];
+        buf[offset++] = sc->led_state[2];
 
-        hid_hw_request(hdev, report, HID_REQ_SET_REPORT);
+        hid_hw_output_report(hdev, buf, sizeof(buf));
 }
 
 #ifdef CONFIG_SONY_FF
@@ -1198,33 +1202,6 @@ static void sony_battery_remove(struct sony_sc *sc)
         sc->battery.name = NULL;
 }
 
-static int sony_set_output_report(struct sony_sc *sc, int req_id, int req_size)
-{
-        struct list_head *head, *list;
-        struct hid_report *report;
-        struct hid_device *hdev = sc->hdev;
-
-        list = &hdev->report_enum[HID_OUTPUT_REPORT].report_list;
-
-        list_for_each(head, list) {
-                report = list_entry(head, struct hid_report, list);
-
-                if (report->id == req_id) {
-                        if (report->size < req_size) {
-                                hid_err(hdev, "Output report 0x%02x (%i bits) is smaller than requested size (%i bits)\n",
-                                        req_id, report->size, req_size);
-                                return -EINVAL;
-                        }
-                        sc->output_report = report;
-                        return 0;
-                }
-        }
-
-        hid_err(hdev, "Unable to locate output report 0x%02x\n", req_id);
-
-        return -EINVAL;
-}
-
 static int sony_register_touchpad(struct sony_sc *sc, int touch_count,
                                         int w, int h)
 {
@@ -1289,11 +1266,6 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
         else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
                 ret = sixaxis_set_operational_bt(hdev);
         else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
-                /* Report 5 (31 bytes) is used to send data to the controller via USB */
-                ret = sony_set_output_report(sc, 0x05, 248);
-                if (ret < 0)
-                        goto err_stop;
-
                 /* The Dualshock 4 touchpad supports 2 touches and has a
                  * resolution of 1920x940.
                  */