Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Benjamin Tissoires and committed by
Jiri Kosina
6fd18202 e534a935

-60
-14
drivers/hid/i2c-hid/i2c-hid.c
··· 587 587 return ret; 588 588 } 589 589 590 - static 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 - 603 590 static int i2c_hid_output_report(struct hid_device *hid, __u8 *buf, 604 591 size_t count) 605 592 { ··· 1012 1025 1013 1026 hid->driver_data = client; 1014 1027 hid->ll_driver = &i2c_hid_ll_driver; 1015 - hid->hid_output_raw_report = __i2c_hid_output_raw_report; 1016 1028 hid->dev.parent = &client->dev; 1017 1029 ACPI_COMPANION_SET(&hid->dev, ACPI_COMPANION(&client->dev)); 1018 1030 hid->bus = BUS_I2C;
-1
drivers/hid/uhid.c
··· 400 400 hid->uniq[63] = 0; 401 401 402 402 hid->ll_driver = &uhid_hid_driver; 403 - hid->hid_output_raw_report = uhid_hid_output_raw; 404 403 hid->bus = ev->u.create.bus; 405 404 hid->vendor = ev->u.create.vendor; 406 405 hid->product = ev->u.create.product;
-12
drivers/hid/usbhid/hid-core.c
··· 950 950 return ret; 951 951 } 952 952 953 - static 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 - 964 953 static void usbhid_restart_queues(struct usbhid_device *usbhid) 965 954 { 966 955 if (usbhid->urbout && !test_bit(HID_OUT_RUNNING, &usbhid->iofl)) ··· 1283 1294 1284 1295 usb_set_intfdata(intf, hid); 1285 1296 hid->ll_driver = &usb_hid_driver; 1286 - hid->hid_output_raw_report = usbhid_output_raw_report; 1287 1297 hid->ff_init = hid_pidff_init; 1288 1298 #ifdef CONFIG_USB_HIDDEV 1289 1299 hid->hiddev_connect = hiddev_connect;
-19
include/linux/hid.h
··· 510 510 struct hid_usage *, __s32); 511 511 void (*hiddev_report_event) (struct hid_device *, struct hid_report *); 512 512 513 - /* handler for raw output data, used by hidraw */ 514 - int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t, unsigned char); 515 - 516 513 /* debugging support via debugfs */ 517 514 unsigned short debug; 518 515 struct dentry *debug_dir; ··· 1014 1017 return hdev->ll_driver->output_report(hdev, buf, len); 1015 1018 1016 1019 return -ENOSYS; 1017 - } 1018 - 1019 - /** 1020 - * hid_output_raw_report - send an output or a feature report to the device 1021 - * 1022 - * @hdev: hid device 1023 - * @buf: raw data to transfer 1024 - * @len: length of buf 1025 - * @report_type: HID_FEATURE_REPORT or HID_OUTPUT_REPORT 1026 - * 1027 - * @return: count of data transfered, negative if error 1028 - */ 1029 - static inline int hid_output_raw_report(struct hid_device *hdev, __u8 *buf, 1030 - size_t len, unsigned char report_type) 1031 - { 1032 - return hdev->hid_output_raw_report(hdev, buf, len, report_type); 1033 1020 } 1034 1021 1035 1022 /**
-14
net/bluetooth/hidp/core.c
··· 382 382 data, count); 383 383 } 384 384 385 - static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, 386 - size_t count, unsigned char report_type) 387 - { 388 - if (report_type == HID_OUTPUT_REPORT) { 389 - return hidp_output_report(hid, data, count); 390 - } else if (report_type != HID_FEATURE_REPORT) { 391 - return -EINVAL; 392 - } 393 - 394 - return hidp_set_raw_report(hid, data[0], data, count, report_type); 395 - } 396 - 397 385 static int hidp_raw_request(struct hid_device *hid, unsigned char reportnum, 398 386 __u8 *buf, size_t len, unsigned char rtype, 399 387 int reqtype) ··· 763 775 764 776 hid->dev.parent = &session->conn->hcon->dev; 765 777 hid->ll_driver = &hidp_hid_driver; 766 - 767 - hid->hid_output_raw_report = hidp_output_raw_report; 768 778 769 779 /* True if device is blacklisted in drivers/hid/hid-core.c */ 770 780 if (hid_ignore(hid)) {