aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2014-03-08 22:52:43 -0500
committerJiri Kosina <jkosina@suse.cz>2014-03-14 10:30:24 -0400
commit6fd182028c43baf1c7d017d52b0134ecadbdc447 (patch)
treeb563b33356ab9d8947ff601d8dcc7f7803697570 /drivers
parente534a9352237e84263cecedff283387b144b3ed8 (diff)
HID: remove hid_output_raw_report transport implementations
Nobody calls hid_output_raw_report anymore, and nobody should. We can now remove the various implementation in the different transport drivers and the declarations. 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/i2c-hid/i2c-hid.c14
-rw-r--r--drivers/hid/uhid.c1
-rw-r--r--drivers/hid/usbhid/hid-core.c12
3 files changed, 0 insertions, 27 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index 1a955317d05f..2de2b8e22462 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -587,19 +587,6 @@ static int i2c_hid_output_raw_report(struct hid_device *hid, __u8 *buf,
587 return ret; 587 return ret;
588} 588}
589 589
590static int __i2c_hid_output_raw_report(struct hid_device *hid, __u8 *buf,
591 size_t count, unsigned char report_type)
592{
593 struct i2c_client *client = hid->driver_data;
594 struct i2c_hid *ihid = i2c_get_clientdata(client);
595 bool data = true; /* SET_REPORT */
596
597 if (report_type == HID_OUTPUT_REPORT)
598 data = le16_to_cpu(ihid->hdesc.wMaxOutputLength) == 0;
599
600 return i2c_hid_output_raw_report(hid, buf, count, report_type, data);
601}
602
603static int i2c_hid_output_report(struct hid_device *hid, __u8 *buf, 590static int i2c_hid_output_report(struct hid_device *hid, __u8 *buf,
604 size_t count) 591 size_t count)
605{ 592{
@@ -1025,7 +1012,6 @@ static int i2c_hid_probe(struct i2c_client *client,
1025 1012
1026 hid->driver_data = client; 1013 hid->driver_data = client;
1027 hid->ll_driver = &i2c_hid_ll_driver; 1014 hid->ll_driver = &i2c_hid_ll_driver;
1028 hid->hid_output_raw_report = __i2c_hid_output_raw_report;
1029 hid->dev.parent = &client->dev; 1015 hid->dev.parent = &client->dev;
1030 ACPI_COMPANION_SET(&hid->dev, ACPI_COMPANION(&client->dev)); 1016 ACPI_COMPANION_SET(&hid->dev, ACPI_COMPANION(&client->dev));
1031 hid->bus = BUS_I2C; 1017 hid->bus = BUS_I2C;
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index 60acee422fdc..7ed79be2686a 100644
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -400,7 +400,6 @@ static int uhid_dev_create(struct uhid_device *uhid,
400 hid->uniq[63] = 0; 400 hid->uniq[63] = 0;
401 401
402 hid->ll_driver = &uhid_hid_driver; 402 hid->ll_driver = &uhid_hid_driver;
403 hid->hid_output_raw_report = uhid_hid_output_raw;
404 hid->bus = ev->u.create.bus; 403 hid->bus = ev->u.create.bus;
405 hid->vendor = ev->u.create.vendor; 404 hid->vendor = ev->u.create.vendor;
406 hid->product = ev->u.create.product; 405 hid->product = ev->u.create.product;
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 3bc7cad48fe0..7b88f4cb9902 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -950,17 +950,6 @@ static int usbhid_output_report(struct hid_device *hid, __u8 *buf, size_t count)
950 return ret; 950 return ret;
951} 951}
952 952
953static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf,
954 size_t count, unsigned char report_type)
955{
956 struct usbhid_device *usbhid = hid->driver_data;
957
958 if (usbhid->urbout && report_type != HID_FEATURE_REPORT)
959 return usbhid_output_report(hid, buf, count);
960
961 return usbhid_set_raw_report(hid, buf[0], buf, count, report_type);
962}
963
964static void usbhid_restart_queues(struct usbhid_device *usbhid) 953static void usbhid_restart_queues(struct usbhid_device *usbhid)
965{ 954{
966 if (usbhid->urbout && !test_bit(HID_OUT_RUNNING, &usbhid->iofl)) 955 if (usbhid->urbout && !test_bit(HID_OUT_RUNNING, &usbhid->iofl))
@@ -1294,7 +1283,6 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *
1294 1283
1295 usb_set_intfdata(intf, hid); 1284 usb_set_intfdata(intf, hid);
1296 hid->ll_driver = &usb_hid_driver; 1285 hid->ll_driver = &usb_hid_driver;
1297 hid->hid_output_raw_report = usbhid_output_raw_report;
1298 hid->ff_init = hid_pidff_init; 1286 hid->ff_init = hid_pidff_init;
1299#ifdef CONFIG_USB_HIDDEV 1287#ifdef CONFIG_USB_HIDDEV
1300 hid->hiddev_connect = hiddev_connect; 1288 hid->hiddev_connect = hiddev_connect;