Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dabb05c6 authored by Mathieu Magnaudet's avatar Mathieu Magnaudet Committed by Jiri Kosina
Browse files

HID: make hid_report_len as a static inline function in hid.h 



In several hid drivers it is necessary to calculate the length of an
hid_report. This patch exports the existing static function hid_report_len of
hid-core.c as an inline function in hid.h

Signed-off-by: default avatarMathieu Magnaudet <mathieu.magnaudet@enac.fr>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent da10bc25

drivers/hid/hid-core.c

+0 −6
Original line number Diff line number Diff line
@@ -1280,12 +1280,6 @@ void hid_output_report(struct hid_report *report, __u8 *data) 
}

EXPORT_SYMBOL_GPL(hid_output_report);



static int hid_report_len(struct hid_report *report)

{

	/* equivalent to DIV_ROUND_UP(report->size, 8) + !!(report->id > 0) */

	return ((report->size - 1) >> 3) + 1 + (report->id > 0);

}



/*

 * Allocator for buffer that is going to be passed to hid_output_report()

 */

drivers/hid/hid-input.c

+1 −1
Original line number Diff line number Diff line
@@ -1215,7 +1215,7 @@ static void hidinput_led_worker(struct work_struct *work) 
		return hid->ll_driver->request(hid, report, HID_REQ_SET_REPORT);



	/* fall back to generic raw-output-report */

	len = ((report->size - 1) >> 3) + 1 + (report->id > 0);

	len = hid_report_len(report);

	buf = hid_alloc_report_buf(report, GFP_KERNEL);

	if (!buf)

		return;

drivers/hid/hid-multitouch.c

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ static void mt_set_input_mode(struct hid_device *hdev) 
	r = re->report_id_hash[td->inputmode];

	if (r) {

		if (cls->quirks & MT_QUIRK_FORCE_GET_FEATURE) {

			report_len = ((r->size - 1) >> 3) + 1 + (r->id > 0);

			report_len = hid_report_len(r);

			buf = hid_alloc_report_buf(r, GFP_KERNEL);

			if (!buf) {

				hid_err(hdev, "failed to allocate buffer for report\n");

drivers/hid/usbhid/hid-core.c

+1 −2
Original line number Diff line number Diff line
@@ -338,8 +338,7 @@ static int hid_submit_out(struct hid_device *hid) 
	report = usbhid->out[usbhid->outtail].report;

	raw_report = usbhid->out[usbhid->outtail].raw_report;



	usbhid->urbout->transfer_buffer_length = ((report->size - 1) >> 3) +

						 1 + (report->id > 0);

	usbhid->urbout->transfer_buffer_length = hid_report_len(report);

	usbhid->urbout->dev = hid_to_usb_dev(hid);

	if (raw_report) {

		memcpy(usbhid->outbuf, raw_report,

drivers/hid/wacom_sys.c

+1 −7
Original line number Diff line number Diff line
@@ -1321,12 +1321,6 @@ static void wacom_calculate_res(struct wacom_features *features) 
						    features->unitExpo);

}



static int wacom_hid_report_len(struct hid_report *report)

{

	/* equivalent to DIV_ROUND_UP(report->size, 8) + !!(report->id > 0) */

	return ((report->size - 1) >> 3) + 1 + (report->id > 0);

}



static size_t wacom_compute_pktlen(struct hid_device *hdev)

{

	struct hid_report_enum *report_enum;
@@ -1336,7 +1330,7 @@ static size_t wacom_compute_pktlen(struct hid_device *hdev) 
	report_enum = hdev->report_enum + HID_INPUT_REPORT;



	list_for_each_entry(report, &report_enum->report_list, list) {

		size_t report_size = wacom_hid_report_len(report);

		size_t report_size = hid_report_len(report);

		if (report_size > size)

			size = report_size;

	}