diff options
Diffstat (limited to 'scripts/mod/file2alias.c')
-rw-r--r-- | scripts/mod/file2alias.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index c164b230ad6f..84e21201f3c0 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c | |||
@@ -34,7 +34,7 @@ typedef uint16_t __u16; | |||
34 | typedef unsigned char __u8; | 34 | typedef unsigned char __u8; |
35 | 35 | ||
36 | /* Big exception to the "don't include kernel headers into userspace, which | 36 | /* Big exception to the "don't include kernel headers into userspace, which |
37 | * even potentially has different endianness and word sizes, since | 37 | * even potentially has different endianness and word sizes, since |
38 | * we handle those differences explicitly below */ | 38 | * we handle those differences explicitly below */ |
39 | #include "../../include/linux/mod_devicetable.h" | 39 | #include "../../include/linux/mod_devicetable.h" |
40 | #include "../../include/linux/input.h" | 40 | #include "../../include/linux/input.h" |
@@ -153,8 +153,8 @@ static void do_usb_table(void *symval, unsigned long size, | |||
153 | const unsigned long id_size = sizeof(struct usb_device_id); | 153 | const unsigned long id_size = sizeof(struct usb_device_id); |
154 | 154 | ||
155 | if (size % id_size || size < id_size) { | 155 | if (size % id_size || size < id_size) { |
156 | fprintf(stderr, "*** Warning: %s ids %lu bad size " | 156 | warn("%s ids %lu bad size " |
157 | "(each on %lu)\n", mod->name, size, id_size); | 157 | "(each on %lu)\n", mod->name, size, id_size); |
158 | } | 158 | } |
159 | /* Leave last one: it's the terminator. */ | 159 | /* Leave last one: it's the terminator. */ |
160 | size -= id_size; | 160 | size -= id_size; |
@@ -217,9 +217,8 @@ static int do_pci_entry(const char *filename, | |||
217 | if ((baseclass_mask != 0 && baseclass_mask != 0xFF) | 217 | if ((baseclass_mask != 0 && baseclass_mask != 0xFF) |
218 | || (subclass_mask != 0 && subclass_mask != 0xFF) | 218 | || (subclass_mask != 0 && subclass_mask != 0xFF) |
219 | || (interface_mask != 0 && interface_mask != 0xFF)) { | 219 | || (interface_mask != 0 && interface_mask != 0xFF)) { |
220 | fprintf(stderr, | 220 | warn("Can't handle masks in %s:%04X\n", |
221 | "*** Warning: Can't handle masks in %s:%04X\n", | 221 | filename, id->class_mask); |
222 | filename, id->class_mask); | ||
223 | return 0; | 222 | return 0; |
224 | } | 223 | } |
225 | 224 | ||
@@ -229,7 +228,7 @@ static int do_pci_entry(const char *filename, | |||
229 | return 1; | 228 | return 1; |
230 | } | 229 | } |
231 | 230 | ||
232 | /* looks like: "ccw:tNmNdtNdmN" */ | 231 | /* looks like: "ccw:tNmNdtNdmN" */ |
233 | static int do_ccw_entry(const char *filename, | 232 | static int do_ccw_entry(const char *filename, |
234 | struct ccw_device_id *id, char *alias) | 233 | struct ccw_device_id *id, char *alias) |
235 | { | 234 | { |
@@ -445,8 +444,8 @@ static void do_table(void *symval, unsigned long size, | |||
445 | int (*do_entry)(const char *, void *entry, char *alias) = function; | 444 | int (*do_entry)(const char *, void *entry, char *alias) = function; |
446 | 445 | ||
447 | if (size % id_size || size < id_size) { | 446 | if (size % id_size || size < id_size) { |
448 | fprintf(stderr, "*** Warning: %s ids %lu bad size " | 447 | warn("%s ids %lu bad size " |
449 | "(each on %lu)\n", mod->name, size, id_size); | 448 | "(each on %lu)\n", mod->name, size, id_size); |
450 | } | 449 | } |
451 | /* Leave last one: it's the terminator. */ | 450 | /* Leave last one: it's the terminator. */ |
452 | size -= id_size; | 451 | size -= id_size; |