Commit cafebc05 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

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: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent f9bcca40

drivers/hid/hid-input.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/hid/hid-sony.c

+2 −1
Original line number Diff line number Diff line
@@ -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");

drivers/hid/hidraw.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

drivers/hid/i2c-hid/i2c-hid.c

+0 −1
Original line number Diff line number Diff line
@@ -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));

drivers/hid/uhid.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE