aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/hid.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/hid.h')
-rw-r--r--include/linux/hid.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 091a81cf330f..0efe80b59156 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -851,7 +851,7 @@ extern int hidinput_connect(struct hid_device *hid, unsigned int force);
851extern void hidinput_disconnect(struct hid_device *); 851extern void hidinput_disconnect(struct hid_device *);
852 852
853int hid_set_field(struct hid_field *, unsigned, __s32); 853int hid_set_field(struct hid_field *, unsigned, __s32);
854int hid_input_report(struct hid_device *, int type, u8 *, int, int); 854int hid_input_report(struct hid_device *, int type, u8 *, u32, int);
855int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field); 855int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field);
856struct hid_field *hidinput_get_led_field(struct hid_device *hid); 856struct hid_field *hidinput_get_led_field(struct hid_device *hid);
857unsigned int hidinput_count_leds(struct hid_device *hid); 857unsigned int hidinput_count_leds(struct hid_device *hid);
@@ -1102,13 +1102,13 @@ static inline void hid_hw_wait(struct hid_device *hdev)
1102 * 1102 *
1103 * @report: the report we want to know the length 1103 * @report: the report we want to know the length
1104 */ 1104 */
1105static inline int hid_report_len(struct hid_report *report) 1105static inline u32 hid_report_len(struct hid_report *report)
1106{ 1106{
1107 /* equivalent to DIV_ROUND_UP(report->size, 8) + !!(report->id > 0) */ 1107 /* equivalent to DIV_ROUND_UP(report->size, 8) + !!(report->id > 0) */
1108 return ((report->size - 1) >> 3) + 1 + (report->id > 0); 1108 return ((report->size - 1) >> 3) + 1 + (report->id > 0);
1109} 1109}
1110 1110
1111int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, 1111int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, u32 size,
1112 int interrupt); 1112 int interrupt);
1113 1113
1114/* HID quirks API */ 1114/* HID quirks API */