firmware/dmi_scan: fix most checkpatch errors and warnings

Fix all errors and trivial warnings reported by checkpatch for file
drivers/firmware/dmi_scan.c.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Joe Perches <joe@perches.com>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 9e50cb997a42d06074a20de422bf4c15d8cf12b4..5a5ca664f3e7ff01597c543b13348d9299feee8c 100644 (file)
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -63,7 +63,7 @@ static char * __init dmi_string(const struct dmi_header *dm, u8 s)
        if (str != NULL)
                strcpy(str, bp);
        else
-               printk(KERN_ERR "dmi_string: cannot allocate %Zu bytes.\n", len);
+               pr_err("dmi_string: cannot allocate %Zu bytes.\n", len);
 
        return str;
 }
@@ -140,9 +140,10 @@ int dmi_available;
 /*
  *     Save a DMI string
  */
-static void __init dmi_save_ident(const struct dmi_header *dm, int slot, int string)
+static void __init dmi_save_ident(const struct dmi_header *dm, int slot,
+               int string)
 {
-       const char *d = (const char*) dm;
+       const char *d = (const char *) dm;
        char *p;
 
        if (dmi_ident[slot])
@@ -155,9 +156,10 @@ static void __init dmi_save_ident(const struct dmi_header *dm, int slot, int str
        dmi_ident[slot] = p;
 }
 
-static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, int index)
+static void __init dmi_save_uuid(const struct dmi_header *dm, int slot,
+               int index)
 {
-       const u8 *d = (u8*) dm + index;
+       const u8 *d = (u8 *) dm + index;
        char *s;
        int is_ff = 1, is_00 = 1, i;
 
@@ -188,12 +190,13 @@ static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, int inde
        else
                sprintf(s, "%pUB", d);
 
-        dmi_ident[slot] = s;
+       dmi_ident[slot] = s;
 }
 
-static void __init dmi_save_type(const struct dmi_header *dm, int slot, int index)
+static void __init dmi_save_type(const struct dmi_header *dm, int slot,
+               int index)
 {
-       const u8 *d = (u8*) dm + index;
+       const u8 *d = (u8 *) dm + index;
        char *s;
 
        if (dmi_ident[slot])
@@ -217,7 +220,7 @@ static void __init dmi_save_one_device(int type, const char *name)
 
        dev = dmi_alloc(sizeof(*dev) + strlen(name) + 1);
        if (!dev) {
-               printk(KERN_ERR "dmi_save_one_device: out of memory.\n");
+               pr_err("dmi_save_one_device: out of memory.\n");
                return;
        }
 
@@ -256,8 +259,7 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)
 
                dev = dmi_alloc(sizeof(*dev));
                if (!dev) {
-                       printk(KERN_ERR
-                          "dmi_save_oem_strings_devices: out of memory.\n");
+                       pr_err("dmi_save_oem_strings_devices: out of memory.\n");
                        break;
                }
 
@@ -272,11 +274,11 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)
 static void __init dmi_save_ipmi_device(const struct dmi_header *dm)
 {
        struct dmi_device *dev;
-       void * data;
+       void *data;
 
        data = dmi_alloc(dm->length);
        if (data == NULL) {
-               printk(KERN_ERR "dmi_save_ipmi_device: out of memory.\n");
+               pr_err("dmi_save_ipmi_device: out of memory.\n");
                return;
        }
 
@@ -284,7 +286,7 @@ static void __init dmi_save_ipmi_device(const struct dmi_header *dm)
 
        dev = dmi_alloc(sizeof(*dev));
        if (!dev) {
-               printk(KERN_ERR "dmi_save_ipmi_device: out of memory.\n");
+               pr_err("dmi_save_ipmi_device: out of memory.\n");
                return;
        }
 
@@ -302,7 +304,7 @@ static void __init dmi_save_dev_onboard(int instance, int segment, int bus,
 
        onboard_dev = dmi_alloc(sizeof(*onboard_dev) + strlen(name) + 1);
        if (!onboard_dev) {
-               printk(KERN_ERR "dmi_save_dev_onboard: out of memory.\n");
+               pr_err("dmi_save_dev_onboard: out of memory.\n");
                return;
        }
        onboard_dev->instance = instance;
@@ -320,7 +322,7 @@ static void __init dmi_save_dev_onboard(int instance, int segment, int bus,
 
 static void __init dmi_save_extended_devices(const struct dmi_header *dm)
 {
-       const u8 *d = (u8*) dm + 5;
+       const u8 *d = (u8 *) dm + 5;
 
        /* Skip disabled device */
        if ((*d & 0x80) == 0)
@@ -338,7 +340,7 @@ static void __init dmi_save_extended_devices(const struct dmi_header *dm)
  */
 static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
 {
-       switch(dm->type) {
+       switch (dm->type) {
        case 0:         /* BIOS Information */
                dmi_save_ident(dm, DMI_BIOS_VENDOR, 4);
                dmi_save_ident(dm, DMI_BIOS_VERSION, 5);
@@ -502,8 +504,7 @@ void __init dmi_scan_machine(void)
                        dmi_available = 1;
                        goto out;
                }
-       }
-       else {
+       } else {
                p = dmi_ioremap(0xF0000, 0x10000);
                if (p == NULL)
                        goto error;
@@ -528,7 +529,7 @@ void __init dmi_scan_machine(void)
                dmi_iounmap(p, 0x10000);
        }
  error:
-       printk(KERN_INFO "DMI not present or invalid.\n");
+       pr_info("DMI not present or invalid.\n");
  out:
        dmi_initialized = 1;
 }
@@ -664,7 +665,7 @@ int dmi_name_in_serial(const char *str)
 
 /**
  *     dmi_name_in_vendors - Check if string is in the DMI system or board vendor name
- *     @str:   Case sensitive Name
+ *     @str: Case sensitive Name
  */
 int dmi_name_in_vendors(const char *str)
 {
@@ -691,13 +692,13 @@ EXPORT_SYMBOL(dmi_name_in_vendors);
  *     A new search is initiated by passing %NULL as the @from argument.
  *     If @from is not %NULL, searches continue from next device.
  */
-const struct dmi_device * dmi_find_device(int type, const char *name,
+const struct dmi_device *dmi_find_device(int type, const char *name,
                                    const struct dmi_device *from)
 {
        const struct list_head *head = from ? &from->list : &dmi_devices;
        struct list_head *d;
 
-       for(d = head->next; d != &dmi_devices; d = d->next) {
+       for (d = head->next; d != &dmi_devices; d = d->next) {
                const struct dmi_device *dev =
                        list_entry(d, struct dmi_device, list);