1 files changed, 56 insertions, 51 deletions

diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 8027073f7919..9c8c07701b65 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -18,9 +18,6 @@
  * The other files are human-readable.
  */
 
-//#include <pcmcia/config.h>
-//#include <pcmcia/k_compat.h>
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -37,42 +34,37 @@ static struct proc_dir_entry *proc_pnp = NULL;
 static struct proc_dir_entry *proc_pnp_boot = NULL;
 
 static int proc_read_pnpconfig(char *buf, char **start, off_t pos,
-                               int count, int *eof, void *data)
+                               int count, int *eof, void *data)
 {
         struct pnp_isa_config_struc pnps;
 
         if (pnp_bios_isapnp_config(&pnps))
                 return -EIO;
         return snprintf(buf, count,
-                "structure_revision %d\n"
-                "number_of_CSNs %d\n"
-                "ISA_read_data_port 0x%x\n",
-                pnps.revision,
-                pnps.no_csns,
-                pnps.isa_rd_data_port
-        );
+                        "structure_revision %d\n"
+                        "number_of_CSNs %d\n"
+                        "ISA_read_data_port 0x%x\n",
+                        pnps.revision, pnps.no_csns, pnps.isa_rd_data_port);
 }
 
 static int proc_read_escdinfo(char *buf, char **start, off_t pos,
-                              int count, int *eof, void *data)
+                              int count, int *eof, void *data)
 {
         struct escd_info_struc escd;
 
         if (pnp_bios_escd_info(&escd))
                 return -EIO;
         return snprintf(buf, count,
-                "min_ESCD_write_size %d\n"
-                "ESCD_size %d\n"
-                "NVRAM_base 0x%x\n",
-                escd.min_escd_write_size,
-                escd.escd_size,
-                escd.nv_storage_base
-        );
+                        "min_ESCD_write_size %d\n"
+                        "ESCD_size %d\n"
+                        "NVRAM_base 0x%x\n",
+                        escd.min_escd_write_size,
+                        escd.escd_size, escd.nv_storage_base);
 }
 
 #define MAX_SANE_ESCD_SIZE (32*1024)
 static int proc_read_escd(char *buf, char **start, off_t pos,
-                          int count, int *eof, void *data)
+                          int count, int *eof, void *data)
 {
         struct escd_info_struc escd;
         char *tmpbuf;
@@ -83,30 +75,36 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
 
         /* sanity check */
         if (escd.escd_size > MAX_SANE_ESCD_SIZE) {
-                printk(KERN_ERR "PnPBIOS: proc_read_escd: ESCD size reported by BIOS escd_info call is too great\n");
+                printk(KERN_ERR
+                       "PnPBIOS: proc_read_escd: ESCD size reported by BIOS escd_info call is too great\n");
                 return -EFBIG;
         }
 
         tmpbuf = kzalloc(escd.escd_size, GFP_KERNEL);
-        if (!tmpbuf) return -ENOMEM;
+        if (!tmpbuf)
+                return -ENOMEM;
 
         if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) {
                 kfree(tmpbuf);
                 return -EIO;
         }
 
-        escd_size = (unsigned char)(tmpbuf[0]) + (unsigned char)(tmpbuf[1])*256;
+        escd_size =
+            (unsigned char)(tmpbuf[0]) + (unsigned char)(tmpbuf[1]) * 256;
 
         /* sanity check */
         if (escd_size > MAX_SANE_ESCD_SIZE) {
-                printk(KERN_ERR "PnPBIOS: proc_read_escd: ESCD size reported by BIOS read_escd call is too great\n");
+                printk(KERN_ERR
+                       "PnPBIOS: proc_read_escd: ESCD size reported by BIOS read_escd call is too great\n");
                 return -EFBIG;
         }
 
         escd_left_to_read = escd_size - pos;
-        if (escd_left_to_read < 0) escd_left_to_read = 0;
-        if (escd_left_to_read == 0) *eof = 1;
-        n = min(count,escd_left_to_read);
+        if (escd_left_to_read < 0)
+                escd_left_to_read = 0;
+        if (escd_left_to_read == 0)
+                *eof = 1;
+        n = min(count, escd_left_to_read);
         memcpy(buf, tmpbuf + pos, n);
         kfree(tmpbuf);
         *start = buf;
@@ -114,17 +112,17 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
 }
 
 static int proc_read_legacyres(char *buf, char **start, off_t pos,
-                               int count, int *eof, void *data)
+                               int count, int *eof, void *data)
 {
         /* Assume that the following won't overflow the buffer */
-        if (pnp_bios_get_stat_res(buf)) 
+        if (pnp_bios_get_stat_res(buf))
                 return -EIO;
 
-        return count;  // FIXME: Return actual length
+        return count;           // FIXME: Return actual length
 }
 
 static int proc_read_devices(char *buf, char **start, off_t pos,
-                             int count, int *eof, void *data)
+                             int count, int *eof, void *data)
 {
         struct pnp_bios_node *node;
         u8 nodenum;
@@ -134,9 +132,10 @@ static int proc_read_devices(char *buf, char **start, off_t pos,
                 return 0;
 
         node = kzalloc(node_info.max_node_size, GFP_KERNEL);
-        if (!node) return -ENOMEM;
+        if (!node)
+                return -ENOMEM;
 
-        for (nodenum=pos; nodenum<0xff; ) {
+        for (nodenum = pos; nodenum < 0xff;) {
                 u8 thisnodenum = nodenum;
                 /* 26 = the number of characters per line sprintf'ed */
                 if ((p - buf + 26) > count)
@@ -148,7 +147,11 @@ static int proc_read_devices(char *buf, char **start, off_t pos,
                              node->type_code[0], node->type_code[1],
                              node->type_code[2], node->flags);
                 if (nodenum <= thisnodenum) {
-                        printk(KERN_ERR "%s Node number 0x%x is out of sequence following node 0x%x. Aborting.\n", "PnPBIOS: proc_read_devices:", (unsigned int)nodenum, (unsigned int)thisnodenum);
+                        printk(KERN_ERR
+                               "%s Node number 0x%x is out of sequence following node 0x%x. Aborting.\n",
+                               "PnPBIOS: proc_read_devices:",
+                               (unsigned int)nodenum,
+                               (unsigned int)thisnodenum);
                         *eof = 1;
                         break;
                 }
@@ -156,12 +159,12 @@ static int proc_read_devices(char *buf, char **start, off_t pos,
         kfree(node);
         if (nodenum == 0xff)
                 *eof = 1;
-        *start = (char *)((off_t)nodenum - pos);
+        *start = (char *)((off_t) nodenum - pos);
         return p - buf;
 }
 
 static int proc_read_node(char *buf, char **start, off_t pos,
-                          int count, int *eof, void *data)
+                          int count, int *eof, void *data)
 {
         struct pnp_bios_node *node;
         int boot = (long)data >> 8;
@@ -169,7 +172,8 @@ static int proc_read_node(char *buf, char **start, off_t pos,
         int len;
 
         node = kzalloc(node_info.max_node_size, GFP_KERNEL);
-        if (!node) return -ENOMEM;
+        if (!node)
+                return -ENOMEM;
         if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
                 kfree(node);
                 return -EIO;
@@ -180,8 +184,8 @@ static int proc_read_node(char *buf, char **start, off_t pos,
         return len;
 }
 
-static int proc_write_node(struct file *file, const char __user *buf,
-                           unsigned long count, void *data)
+static int proc_write_node(struct file *file, const char __user * buf,
+                           unsigned long count, void *data)
 {
         struct pnp_bios_node *node;
         int boot = (long)data >> 8;
@@ -208,12 +212,12 @@ static int proc_write_node(struct file *file, const char __user *buf,
                 goto out;
         }
         ret = count;
-out:
+      out:
         kfree(node);
         return ret;
 }
 
-int pnpbios_interface_attach_device(struct pnp_bios_node * node)
+int pnpbios_interface_attach_device(struct pnp_bios_node *node)
 {
         char name[3];
         struct proc_dir_entry *ent;
@@ -222,7 +226,7 @@ int pnpbios_interface_attach_device(struct pnp_bios_node * node)
 
         if (!proc_pnp)
                 return -EIO;
-        if ( !pnpbios_dont_use_current_config ) {
+        if (!pnpbios_dont_use_current_config) {
                 ent = create_proc_entry(name, 0, proc_pnp);
                 if (ent) {
                         ent->read_proc = proc_read_node;
@@ -237,7 +241,7 @@ int pnpbios_interface_attach_device(struct pnp_bios_node * node)
         if (ent) {
                 ent->read_proc = proc_read_node;
                 ent->write_proc = proc_write_node;
-                ent->data = (void *)(long)(node->handle+0x100);
+                ent->data = (void *)(long)(node->handle + 0x100);
                 return 0;
         }
 
@@ -249,7 +253,7 @@ int pnpbios_interface_attach_device(struct pnp_bios_node * node)
  * work and the pnpbios_dont_use_current_config flag
  * should already have been set to the appropriate value
  */
-int __init pnpbios_proc_init( void )
+int __init pnpbios_proc_init(void)
 {
         proc_pnp = proc_mkdir("pnp", proc_bus);
         if (!proc_pnp)
@@ -258,10 +262,13 @@ int __init pnpbios_proc_init( void )
         if (!proc_pnp_boot)
                 return -EIO;
         create_proc_read_entry("devices", 0, proc_pnp, proc_read_devices, NULL);
-        create_proc_read_entry("configuration_info", 0, proc_pnp, proc_read_pnpconfig, NULL);
-        create_proc_read_entry("escd_info", 0, proc_pnp, proc_read_escdinfo, NULL);
+        create_proc_read_entry("configuration_info", 0, proc_pnp,
+                               proc_read_pnpconfig, NULL);
+        create_proc_read_entry("escd_info", 0, proc_pnp, proc_read_escdinfo,
+                               NULL);
         create_proc_read_entry("escd", S_IRUSR, proc_pnp, proc_read_escd, NULL);
-        create_proc_read_entry("legacy_device_resources", 0, proc_pnp, proc_read_legacyres, NULL);
+        create_proc_read_entry("legacy_device_resources", 0, proc_pnp,
+                               proc_read_legacyres, NULL);
 
         return 0;
 }
@@ -274,9 +281,9 @@ void __exit pnpbios_proc_exit(void)
         if (!proc_pnp)
                 return;
 
-        for (i=0; i<0xff; i++) {
+        for (i = 0; i < 0xff; i++) {
                 sprintf(name, "%02x", i);
-                if ( !pnpbios_dont_use_current_config )
+                if (!pnpbios_dont_use_current_config)
                         remove_proc_entry(name, proc_pnp);
                 remove_proc_entry(name, proc_pnp_boot);
         }
@@ -287,6 +294,4 @@ void __exit pnpbios_proc_exit(void)
         remove_proc_entry("devices", proc_pnp);
         remove_proc_entry("boot", proc_pnp);
         remove_proc_entry("pnp", proc_bus);
-
-        return;
 }