aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-03-28 12:06:41 -0400
committerJiri Kosina <jkosina@suse.cz>2008-04-22 05:34:57 -0400
commit282bfd4cbcc2bbeb1a2cad1f42debd378e0b5ac9 (patch)
tree781686fe5851846962dc030de493da0ca4d7a64f
parent377e10fbb4ef219f540d06796e9fb0d3ec35a58f (diff)
HID: fix sparse warnings
Fix these sparse warnings: .../hid/hid-core.c:100:15: warning: incorrect type in assignment (different signedness) .../hid/hid-core.c:100:15: expected signed int [usertype] *value .../hid/hid-core.c:100:15: got unsigned int *<noident> by unsigned -> s32 .../hid/hid-input-quirks.c:336:10: warning: Using plain integer as NULL pointer by 0 -> NULL .../hid/usbhid/hid-core.c:786:46: warning: incorrect type in argument 3 (different signedness) .../hid/usbhid/hid-core.c:786:46: expected int *max .../hid/usbhid/hid-core.c:786:46: got unsigned int *<noident> .../hid/usbhid/hid-core.c:787:47: warning: incorrect type in argument 3 (different signedness) .../hid/usbhid/hid-core.c:787:47: expected int *max .../hid/usbhid/hid-core.c:787:47: got unsigned int *<noident> .../hid/usbhid/hid-core.c:788:48: warning: incorrect type in argument 3 (different signedness) .../hid/usbhid/hid-core.c:788:48: expected int *max .../hid/usbhid/hid-core.c:788:48: got unsigned int *<noident> by int -> unsigned int Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-core.c2
-rw-r--r--drivers/hid/hid-input-quirks.c2
-rw-r--r--drivers/hid/usbhid/hid-core.c9
3 files changed, 7 insertions, 6 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 538bf28e4dd5..d7b2f6868a6d 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -97,7 +97,7 @@ static struct hid_field *hid_register_field(struct hid_report *report, unsigned
97 field->index = report->maxfield++; 97 field->index = report->maxfield++;
98 report->field[field->index] = field; 98 report->field[field->index] = field;
99 field->usage = (struct hid_usage *)(field + 1); 99 field->usage = (struct hid_usage *)(field + 1);
100 field->value = (unsigned *)(field->usage + usages); 100 field->value = (s32 *)(field->usage + usages);
101 field->report = report; 101 field->report = report;
102 102
103 return field; 103 return field;
diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c
index 845d31d08fa5..4c2052c658f1 100644
--- a/drivers/hid/hid-input-quirks.c
+++ b/drivers/hid/hid-input-quirks.c
@@ -353,7 +353,7 @@ static const struct hid_input_blacklist {
353 353
354 { VENDOR_ID_SUNPLUS, DEVICE_ID_SUNPLUS_WDESKTOP, quirk_sunplus_wdesktop }, 354 { VENDOR_ID_SUNPLUS, DEVICE_ID_SUNPLUS_WDESKTOP, quirk_sunplus_wdesktop },
355 355
356 { 0, 0, 0 } 356 { 0, 0, NULL }
357}; 357};
358 358
359int hidinput_mapping_quirks(struct hid_usage *usage, 359int hidinput_mapping_quirks(struct hid_usage *usage,
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index b4ad5d175280..120b49d2b4a6 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -610,10 +610,11 @@ static void usbhid_set_leds(struct hid_device *hid)
610/* 610/*
611 * Traverse the supplied list of reports and find the longest 611 * Traverse the supplied list of reports and find the longest
612 */ 612 */
613static void hid_find_max_report(struct hid_device *hid, unsigned int type, int *max) 613static void hid_find_max_report(struct hid_device *hid, unsigned int type,
614 unsigned int *max)
614{ 615{
615 struct hid_report *report; 616 struct hid_report *report;
616 int size; 617 unsigned int size;
617 618
618 list_for_each_entry(report, &hid->report_enum[type].report_list, list) { 619 list_for_each_entry(report, &hid->report_enum[type].report_list, list) {
619 size = ((report->size - 1) >> 3) + 1; 620 size = ((report->size - 1) >> 3) + 1;
@@ -705,9 +706,9 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
705 struct hid_descriptor *hdesc; 706 struct hid_descriptor *hdesc;
706 struct hid_device *hid; 707 struct hid_device *hid;
707 u32 quirks = 0; 708 u32 quirks = 0;
708 unsigned rsize = 0; 709 unsigned int insize = 0, rsize = 0;
709 char *rdesc; 710 char *rdesc;
710 int n, len, insize = 0; 711 int n, len;
711 struct usbhid_device *usbhid; 712 struct usbhid_device *usbhid;
712 713
713 quirks = usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor), 714 quirks = usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),