Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

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;
 typedef unsigned char   __u8;
 
 /* Big exception to the "don't include kernel headers into userspace, which
- * even potentially has different endianness and word sizes, since 
+ * even potentially has different endianness and word sizes, since
  * we handle those differences explicitly below */
 #include "../../include/linux/mod_devicetable.h"
 #include "../../include/linux/input.h"
@@ -153,8 +153,8 @@ static void do_usb_table(void *symval, unsigned long size,
         const unsigned long id_size = sizeof(struct usb_device_id);
 
         if (size % id_size || size < id_size) {
-                fprintf(stderr, "*** Warning: %s ids %lu bad size "
-                        "(each on %lu)\n", mod->name, size, id_size);
+                warn("%s ids %lu bad size "
+                     "(each on %lu)\n", mod->name, size, id_size);
         }
         /* Leave last one: it's the terminator. */
         size -= id_size;
@@ -217,9 +217,8 @@ static int do_pci_entry(const char *filename,
         if ((baseclass_mask != 0 && baseclass_mask != 0xFF)
             || (subclass_mask != 0 && subclass_mask != 0xFF)
             || (interface_mask != 0 && interface_mask != 0xFF)) {
-                fprintf(stderr,
-                        "*** Warning: Can't handle masks in %s:%04X\n",
-                        filename, id->class_mask);
+                warn("Can't handle masks in %s:%04X\n",
+                     filename, id->class_mask);
                 return 0;
         }
 
@@ -229,7 +228,7 @@ static int do_pci_entry(const char *filename,
         return 1;
 }
 
-/* looks like: "ccw:tNmNdtNdmN" */ 
+/* looks like: "ccw:tNmNdtNdmN" */
 static int do_ccw_entry(const char *filename,
                         struct ccw_device_id *id, char *alias)
 {
@@ -445,8 +444,8 @@ static void do_table(void *symval, unsigned long size,
         int (*do_entry)(const char *, void *entry, char *alias) = function;
 
         if (size % id_size || size < id_size) {
-                fprintf(stderr, "*** Warning: %s ids %lu bad size "
-                        "(each on %lu)\n", mod->name, size, id_size);
+                warn("%s ids %lu bad size "
+                     "(each on %lu)\n", mod->name, size, id_size);
         }
         /* Leave last one: it's the terminator. */
         size -= id_size;