PNP: Lindent all source files

Run Lindent on all PNP source files.

Produced by:

    $ quilt new pnp-lindent
    $ find drivers/pnp -name \*.[ch] | xargs quilt add
    $ quilt add include/linux/{pnp.h,pnpbios.h}
    $ scripts/Lindent drivers/pnp/*.c drivers/pnp/*/*.c include/linux/pnp*.h
    $ quilt refresh --sort

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Adam Belay <ambx1@neo.rr.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 68 insertions, 52 deletions

diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 57e6ab1004d0..17c95188bd11 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -26,7 +26,8 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
                 return -EINVAL;
 
         if (idx >= PNP_MAX_PORT) {
-                pnp_err("More than 4 ports is incompatible with pnp specifications.");
+                pnp_err
+                    ("More than 4 ports is incompatible with pnp specifications.");
                 /* pretend we were successful so at least the manager won't try again */
                 return 1;
         }
@@ -41,11 +42,11 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx)
 
         /* set the initial values */
         *flags |= rule->flags | IORESOURCE_IO;
-        *flags &=  ~IORESOURCE_UNSET;
+        *flags &= ~IORESOURCE_UNSET;
 
         if (!rule->size) {
                 *flags |= IORESOURCE_DISABLED;
-                return 1; /* skip disabled resource requests */
+                return 1;       /* skip disabled resource requests */
         }
 
         *start = rule->min;
@@ -70,7 +71,8 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
                 return -EINVAL;
 
         if (idx >= PNP_MAX_MEM) {
-                pnp_err("More than 8 mems is incompatible with pnp specifications.");
+                pnp_err
+                    ("More than 8 mems is incompatible with pnp specifications.");
                 /* pretend we were successful so at least the manager won't try again */
                 return 1;
         }
@@ -85,7 +87,7 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
 
         /* set the initial values */
         *flags |= rule->flags | IORESOURCE_MEM;
-        *flags &=  ~IORESOURCE_UNSET;
+        *flags &= ~IORESOURCE_UNSET;
 
         /* convert pnp flags to standard Linux flags */
         if (!(rule->flags & IORESOURCE_MEM_WRITEABLE))
@@ -99,11 +101,11 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
 
         if (!rule->size) {
                 *flags |= IORESOURCE_DISABLED;
-                return 1; /* skip disabled resource requests */
+                return 1;       /* skip disabled resource requests */
         }
 
         *start = rule->min;
-        *end = *start + rule->size -1;
+        *end = *start + rule->size - 1;
 
         /* run through until pnp_check_mem is happy */
         while (!pnp_check_mem(dev, idx)) {
@@ -115,7 +117,7 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx)
         return 1;
 }
 
-static int pnp_assign_irq(struct pnp_dev * dev, struct pnp_irq *rule, int idx)
+static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx)
 {
         resource_size_t *start, *end;
         unsigned long *flags;
@@ -130,7 +132,8 @@ static int pnp_assign_irq(struct pnp_dev * dev, struct pnp_irq *rule, int idx)
                 return -EINVAL;
 
         if (idx >= PNP_MAX_IRQ) {
-                pnp_err("More than 2 irqs is incompatible with pnp specifications.");
+                pnp_err
+                    ("More than 2 irqs is incompatible with pnp specifications.");
                 /* pretend we were successful so at least the manager won't try again */
                 return 1;
         }
@@ -145,11 +148,11 @@ static int pnp_assign_irq(struct pnp_dev * dev, struct pnp_irq *rule, int idx)
 
         /* set the initial values */
         *flags |= rule->flags | IORESOURCE_IRQ;
-        *flags &=  ~IORESOURCE_UNSET;
+        *flags &= ~IORESOURCE_UNSET;
 
         if (bitmap_empty(rule->map, PNP_IRQ_NR)) {
                 *flags |= IORESOURCE_DISABLED;
-                return 1; /* skip disabled resource requests */
+                return 1;       /* skip disabled resource requests */
         }
 
         /* TBD: need check for >16 IRQ */
@@ -159,9 +162,9 @@ static int pnp_assign_irq(struct pnp_dev * dev, struct pnp_irq *rule, int idx)
                 return 1;
         }
         for (i = 0; i < 16; i++) {
-                if(test_bit(xtab[i], rule->map)) {
+                if (test_bit(xtab[i], rule->map)) {
                         *start = *end = xtab[i];
-                        if(pnp_check_irq(dev, idx))
+                        if (pnp_check_irq(dev, idx))
                                 return 1;
                 }
         }
@@ -183,7 +186,8 @@ static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
                 return -EINVAL;
 
         if (idx >= PNP_MAX_DMA) {
-                pnp_err("More than 2 dmas is incompatible with pnp specifications.");
+                pnp_err
+                    ("More than 2 dmas is incompatible with pnp specifications.");
                 /* pretend we were successful so at least the manager won't try again */
                 return 1;
         }
@@ -198,17 +202,17 @@ static int pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx)
 
         /* set the initial values */
         *flags |= rule->flags | IORESOURCE_DMA;
-        *flags &=  ~IORESOURCE_UNSET;
+        *flags &= ~IORESOURCE_UNSET;
 
         if (!rule->map) {
                 *flags |= IORESOURCE_DISABLED;
-                return 1; /* skip disabled resource requests */
+                return 1;       /* skip disabled resource requests */
         }
 
         for (i = 0; i < 8; i++) {
-                if(rule->map & (1<<xtab[i])) {
+                if (rule->map & (1 << xtab[i])) {
                         *start = *end = xtab[i];
-                        if(pnp_check_dma(dev, idx))
+                        if (pnp_check_dma(dev, idx))
                                 return 1;
                 }
         }
@@ -227,25 +231,29 @@ void pnp_init_resource_table(struct pnp_resource_table *table)
                 table->irq_resource[idx].name = NULL;
                 table->irq_resource[idx].start = -1;
                 table->irq_resource[idx].end = -1;
-                table->irq_resource[idx].flags = IORESOURCE_IRQ | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                table->irq_resource[idx].flags =
+                    IORESOURCE_IRQ | IORESOURCE_AUTO | IORESOURCE_UNSET;
         }
         for (idx = 0; idx < PNP_MAX_DMA; idx++) {
                 table->dma_resource[idx].name = NULL;
                 table->dma_resource[idx].start = -1;
                 table->dma_resource[idx].end = -1;
-                table->dma_resource[idx].flags = IORESOURCE_DMA | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                table->dma_resource[idx].flags =
+                    IORESOURCE_DMA | IORESOURCE_AUTO | IORESOURCE_UNSET;
         }
         for (idx = 0; idx < PNP_MAX_PORT; idx++) {
                 table->port_resource[idx].name = NULL;
                 table->port_resource[idx].start = 0;
                 table->port_resource[idx].end = 0;
-                table->port_resource[idx].flags = IORESOURCE_IO | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                table->port_resource[idx].flags =
+                    IORESOURCE_IO | IORESOURCE_AUTO | IORESOURCE_UNSET;
         }
         for (idx = 0; idx < PNP_MAX_MEM; idx++) {
                 table->mem_resource[idx].name = NULL;
                 table->mem_resource[idx].start = 0;
                 table->mem_resource[idx].end = 0;
-                table->mem_resource[idx].flags = IORESOURCE_MEM | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                table->mem_resource[idx].flags =
+                    IORESOURCE_MEM | IORESOURCE_AUTO | IORESOURCE_UNSET;
         }
 }
 
@@ -254,7 +262,7 @@ void pnp_init_resource_table(struct pnp_resource_table *table)
  * @res: the resources to clean
  *
  */
-static void pnp_clean_resource_table(struct pnp_resource_table * res)
+static void pnp_clean_resource_table(struct pnp_resource_table *res)
 {
         int idx;
         for (idx = 0; idx < PNP_MAX_IRQ; idx++) {
@@ -262,28 +270,32 @@ static void pnp_clean_resource_table(struct pnp_resource_table * res)
                         continue;
                 res->irq_resource[idx].start = -1;
                 res->irq_resource[idx].end = -1;
-                res->irq_resource[idx].flags = IORESOURCE_IRQ | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res->irq_resource[idx].flags =
+                    IORESOURCE_IRQ | IORESOURCE_AUTO | IORESOURCE_UNSET;
         }
         for (idx = 0; idx < PNP_MAX_DMA; idx++) {
                 if (!(res->dma_resource[idx].flags & IORESOURCE_AUTO))
                         continue;
                 res->dma_resource[idx].start = -1;
                 res->dma_resource[idx].end = -1;
-                res->dma_resource[idx].flags = IORESOURCE_DMA | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res->dma_resource[idx].flags =
+                    IORESOURCE_DMA | IORESOURCE_AUTO | IORESOURCE_UNSET;
         }
         for (idx = 0; idx < PNP_MAX_PORT; idx++) {
                 if (!(res->port_resource[idx].flags & IORESOURCE_AUTO))
                         continue;
                 res->port_resource[idx].start = 0;
                 res->port_resource[idx].end = 0;
-                res->port_resource[idx].flags = IORESOURCE_IO | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res->port_resource[idx].flags =
+                    IORESOURCE_IO | IORESOURCE_AUTO | IORESOURCE_UNSET;
         }
         for (idx = 0; idx < PNP_MAX_MEM; idx++) {
                 if (!(res->mem_resource[idx].flags & IORESOURCE_AUTO))
                         continue;
                 res->mem_resource[idx].start = 0;
                 res->mem_resource[idx].end = 0;
-                res->mem_resource[idx].flags = IORESOURCE_MEM | IORESOURCE_AUTO | IORESOURCE_UNSET;
+                res->mem_resource[idx].flags =
+                    IORESOURCE_MEM | IORESOURCE_AUTO | IORESOURCE_UNSET;
         }
 }
 
@@ -306,7 +318,7 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
                 return -ENODEV;
 
         down(&pnp_res_mutex);
-        pnp_clean_resource_table(&dev->res); /* start with a fresh slate */
+        pnp_clean_resource_table(&dev->res);    /* start with a fresh slate */
         if (dev->independent) {
                 port = dev->independent->port;
                 mem = dev->independent->mem;
@@ -341,10 +353,11 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
         if (depnum) {
                 struct pnp_option *dep;
                 int i;
-                for (i=1,dep=dev->dependent; i<depnum; i++, dep=dep->next)
-                        if(!dep)
+                for (i = 1, dep = dev->dependent; i < depnum;
+                     i++, dep = dep->next)
+                        if (!dep)
                                 goto fail;
-                port =dep->port;
+                port = dep->port;
                 mem = dep->mem;
                 irq = dep->irq;
                 dma = dep->dma;
@@ -378,7 +391,7 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
         up(&pnp_res_mutex);
         return 1;
 
-fail:
+      fail:
         pnp_clean_resource_table(&dev->res);
         up(&pnp_res_mutex);
         return 0;
@@ -392,10 +405,11 @@ fail:
  *
  * This function can be used by drivers that want to manually set thier resources.
  */
-int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table * res, int mode)
+int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table *res,
+                          int mode)
 {
         int i;
-        struct pnp_resource_table * bak;
+        struct pnp_resource_table *bak;
         if (!dev || !res)
                 return -EINVAL;
         if (!pnp_can_configure(dev))
@@ -409,19 +423,19 @@ int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table * res,
         dev->res = *res;
         if (!(mode & PNP_CONFIG_FORCE)) {
                 for (i = 0; i < PNP_MAX_PORT; i++) {
-                        if(!pnp_check_port(dev,i))
+                        if (!pnp_check_port(dev, i))
                                 goto fail;
                 }
                 for (i = 0; i < PNP_MAX_MEM; i++) {
-                        if(!pnp_check_mem(dev,i))
+                        if (!pnp_check_mem(dev, i))
                                 goto fail;
                 }
                 for (i = 0; i < PNP_MAX_IRQ; i++) {
-                        if(!pnp_check_irq(dev,i))
+                        if (!pnp_check_irq(dev, i))
                                 goto fail;
                 }
                 for (i = 0; i < PNP_MAX_DMA; i++) {
-                        if(!pnp_check_dma(dev,i))
+                        if (!pnp_check_dma(dev, i))
                                 goto fail;
                 }
         }
@@ -430,7 +444,7 @@ int pnp_manual_config_dev(struct pnp_dev *dev, struct pnp_resource_table * res,
         kfree(bak);
         return 0;
 
-fail:
+      fail:
         dev->res = *bak;
         up(&pnp_res_mutex);
         kfree(bak);
@@ -447,11 +461,12 @@ int pnp_auto_config_dev(struct pnp_dev *dev)
         struct pnp_option *dep;
         int i = 1;
 
-        if(!dev)
+        if (!dev)
                 return -EINVAL;
 
-        if(!pnp_can_configure(dev)) {
-                pnp_dbg("Device %s does not support resource configuration.", dev->dev.bus_id);
+        if (!pnp_can_configure(dev)) {
+                pnp_dbg("Device %s does not support resource configuration.",
+                        dev->dev.bus_id);
                 return -ENODEV;
         }
 
@@ -482,11 +497,12 @@ int pnp_auto_config_dev(struct pnp_dev *dev)
 int pnp_start_dev(struct pnp_dev *dev)
 {
         if (!pnp_can_write(dev)) {
-                pnp_dbg("Device %s does not support activation.", dev->dev.bus_id);
+                pnp_dbg("Device %s does not support activation.",
+                        dev->dev.bus_id);
                 return -EINVAL;
         }
 
-        if (dev->protocol->set(dev, &dev->res)<0) {
+        if (dev->protocol->set(dev, &dev->res) < 0) {
                 pnp_err("Failed to activate device %s.", dev->dev.bus_id);
                 return -EIO;
         }
@@ -506,10 +522,11 @@ int pnp_start_dev(struct pnp_dev *dev)
 int pnp_stop_dev(struct pnp_dev *dev)
 {
         if (!pnp_can_disable(dev)) {
-                pnp_dbg("Device %s does not support disabling.", dev->dev.bus_id);
+                pnp_dbg("Device %s does not support disabling.",
+                        dev->dev.bus_id);
                 return -EINVAL;
         }
-        if (dev->protocol->disable(dev)<0) {
+        if (dev->protocol->disable(dev) < 0) {
                 pnp_err("Failed to disable device %s.", dev->dev.bus_id);
                 return -EIO;
         }
@@ -532,7 +549,7 @@ int pnp_activate_dev(struct pnp_dev *dev)
         if (!dev)
                 return -EINVAL;
         if (dev->active) {
-                return 0; /* the device is already active */
+                return 0;       /* the device is already active */
         }
 
         /* ensure resources are allocated */
@@ -558,10 +575,10 @@ int pnp_disable_dev(struct pnp_dev *dev)
 {
         int error;
 
-        if (!dev)
-                return -EINVAL;
+        if (!dev)
+                return -EINVAL;
         if (!dev->active) {
-                return 0; /* the device is already disabled */
+                return 0;       /* the device is already disabled */
         }
 
         error = pnp_stop_dev(dev);
@@ -586,7 +603,7 @@ int pnp_disable_dev(struct pnp_dev *dev)
  *
  */
 void pnp_resource_change(struct resource *resource, resource_size_t start,
-                                resource_size_t size)
+                         resource_size_t size)
 {
         if (resource == NULL)
                 return;
@@ -595,7 +612,6 @@ void pnp_resource_change(struct resource *resource, resource_size_t start,
         resource->end = start + size - 1;
 }
 
-
 EXPORT_SYMBOL(pnp_manual_config_dev);
 #if 0
 EXPORT_SYMBOL(pnp_auto_config_dev);