HID: remove hid_get_raw_report in struct hid_device

dev->hid_get_raw_report(X) and hid_hw_raw_request(X, HID_REQ_GET_REPORT)
are strictly equivalent. Switch the hid subsystem to the hid_hw notation
and remove the field .hid_get_raw_report in struct hid_device.

Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

6 files changed, 9 insertions, 10 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index e5bb3c378292..5bd17b256856 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -350,9 +350,9 @@ static int hidinput_get_battery_property(struct power_supply *psy,
                         ret = -ENOMEM;
                         break;
                 }
-                ret = dev->hid_get_raw_report(dev, dev->battery_report_id,
-                                              buf, 2,
-                                              dev->battery_report_type);
+                ret = hid_hw_raw_request(dev, dev->battery_report_id, buf, 2,
+                                         dev->battery_report_type,
+                                         HID_REQ_GET_REPORT);
 
                 if (ret != 2) {
                         ret = -ENODATA;
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 12354055d474..3930acbdee98 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -706,7 +706,8 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
         if (!buf)
                 return -ENOMEM;
 
-        ret = hdev->hid_get_raw_report(hdev, 0xf2, buf, 17, HID_FEATURE_REPORT);
+        ret = hid_hw_raw_request(hdev, 0xf2, buf, 17, HID_FEATURE_REPORT,
+                                 HID_REQ_GET_REPORT);
 
         if (ret < 0)
                 hid_err(hdev, "can't set operational mode\n");
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index cb0137b3718d..4b2dc956c702 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -189,7 +189,7 @@ static ssize_t hidraw_get_report(struct file *file, char __user *buffer, size_t
 
         dev = hidraw_table[minor]->hid;
 
-        if (!dev->hid_get_raw_report) {
+        if (!dev->ll_driver->raw_request) {
                 ret = -ENODEV;
                 goto out;
         }
@@ -216,14 +216,15 @@ static ssize_t hidraw_get_report(struct file *file, char __user *buffer, size_t
 
         /*
          * Read the first byte from the user. This is the report number,
-         * which is passed to dev->hid_get_raw_report().
+         * which is passed to hid_hw_raw_request().
          */
         if (copy_from_user(&report_number, buffer, 1)) {
                 ret = -EFAULT;
                 goto out_free;
         }
 
-        ret = dev->hid_get_raw_report(dev, report_number, buf, count, report_type);
+        ret = hid_hw_raw_request(dev, report_number, buf, count, report_type,
+                                 HID_REQ_GET_REPORT);
 
         if (ret < 0)
                 goto out_free;
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index e914f2755491..f4ea7343e823 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -1005,7 +1005,6 @@ static int i2c_hid_probe(struct i2c_client *client,
 
         hid->driver_data = client;
         hid->ll_driver = &i2c_hid_ll_driver;
-        hid->hid_get_raw_report = i2c_hid_get_raw_report;
         hid->hid_output_raw_report = i2c_hid_output_raw_report;
         hid->dev.parent = &client->dev;
         ACPI_COMPANION_SET(&hid->dev, ACPI_COMPANION(&client->dev));
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index f5a2b1931143..12439e1eeae2 100644
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -404,7 +404,6 @@ static int uhid_dev_create(struct uhid_device *uhid,
         hid->uniq[63] = 0;
 
         hid->ll_driver = &uhid_hid_driver;
-        hid->hid_get_raw_report = uhid_hid_get_raw;
         hid->hid_output_raw_report = uhid_hid_output_raw;
         hid->bus = ev->u.create.bus;
         hid->vendor = ev->u.create.vendor;
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 406497b120ea..b9a770f4d7ae 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1289,7 +1289,6 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *
 
         usb_set_intfdata(intf, hid);
         hid->ll_driver = &usb_hid_driver;
-        hid->hid_get_raw_report = usbhid_get_raw_report;
         hid->hid_output_raw_report = usbhid_output_raw_report;
         hid->ff_init = hid_pidff_init;
 #ifdef CONFIG_USB_HIDDEV