Commit 3064a03b authored by Aaron Ma's avatar Aaron Ma Committed by Jiri Kosina

HID: Fix hid_report_len usage

Follow the change of return type u32 of hid_report_len,
fix all the types of variables those get the return value of
hid_report_len to u32, and all other code already uses u32.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarAaron Ma <aaron.ma@canonical.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 6de0b13c
...@@ -1368,7 +1368,8 @@ static void hidinput_led_worker(struct work_struct *work) ...@@ -1368,7 +1368,8 @@ static void hidinput_led_worker(struct work_struct *work)
led_work); led_work);
struct hid_field *field; struct hid_field *field;
struct hid_report *report; struct hid_report *report;
int len, ret; int ret;
u32 len;
__u8 *buf; __u8 *buf;
field = hidinput_get_led_field(hid); field = hidinput_get_led_field(hid);
......
...@@ -370,7 +370,8 @@ static const struct attribute_group mt_attribute_group = { ...@@ -370,7 +370,8 @@ static const struct attribute_group mt_attribute_group = {
static void mt_get_feature(struct hid_device *hdev, struct hid_report *report) static void mt_get_feature(struct hid_device *hdev, struct hid_report *report)
{ {
struct mt_device *td = hid_get_drvdata(hdev); struct mt_device *td = hid_get_drvdata(hdev);
int ret, size = hid_report_len(report); int ret;
u32 size = hid_report_len(report);
u8 *buf; u8 *buf;
/* /*
...@@ -1183,7 +1184,7 @@ static void mt_set_input_mode(struct hid_device *hdev) ...@@ -1183,7 +1184,7 @@ static void mt_set_input_mode(struct hid_device *hdev)
struct hid_report_enum *re; struct hid_report_enum *re;
struct mt_class *cls = &td->mtclass; struct mt_class *cls = &td->mtclass;
char *buf; char *buf;
int report_len; u32 report_len;
if (td->inputmode < 0) if (td->inputmode < 0)
return; return;
......
...@@ -89,8 +89,8 @@ struct rmi_data { ...@@ -89,8 +89,8 @@ struct rmi_data {
u8 *writeReport; u8 *writeReport;
u8 *readReport; u8 *readReport;
int input_report_size; u32 input_report_size;
int output_report_size; u32 output_report_size;
unsigned long flags; unsigned long flags;
......
...@@ -219,7 +219,7 @@ static void wacom_feature_mapping(struct hid_device *hdev, ...@@ -219,7 +219,7 @@ static void wacom_feature_mapping(struct hid_device *hdev,
unsigned int equivalent_usage = wacom_equivalent_usage(usage->hid); unsigned int equivalent_usage = wacom_equivalent_usage(usage->hid);
u8 *data; u8 *data;
int ret; int ret;
int n; u32 n;
switch (equivalent_usage) { switch (equivalent_usage) {
case HID_DG_CONTACTMAX: case HID_DG_CONTACTMAX:
...@@ -519,7 +519,7 @@ static int wacom_set_device_mode(struct hid_device *hdev, ...@@ -519,7 +519,7 @@ static int wacom_set_device_mode(struct hid_device *hdev,
u8 *rep_data; u8 *rep_data;
struct hid_report *r; struct hid_report *r;
struct hid_report_enum *re; struct hid_report_enum *re;
int length; u32 length;
int error = -ENOMEM, limit = 0; int error = -ENOMEM, limit = 0;
if (wacom_wac->mode_report < 0) if (wacom_wac->mode_report < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment