PNPACPI: whitespace cleanup

Tidy up whitespace.  No functional change.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 47 insertions, 50 deletions

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index b13f85e0bc34..3a4a644c2686 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -36,13 +36,13 @@ static int irq_flags(int triggering, int polarity)
 {
         int flag;
         if (triggering == ACPI_LEVEL_SENSITIVE) {
-                if(polarity == ACPI_ACTIVE_LOW)
+                if (polarity == ACPI_ACTIVE_LOW)
                         flag = IORESOURCE_IRQ_LOWLEVEL;
                 else
                         flag = IORESOURCE_IRQ_HIGHLEVEL;
         }
         else {
-                if(polarity == ACPI_ACTIVE_LOW)
+                if (polarity == ACPI_ACTIVE_LOW)
                         flag = IORESOURCE_IRQ_LOWEDGE;
                 else
                         flag = IORESOURCE_IRQ_HIGHEDGE;
@@ -57,7 +57,7 @@ static void decode_irq_flags(int flag, int *triggering, int *polarity)
                 *triggering = ACPI_LEVEL_SENSITIVE;
                 *polarity = ACPI_ACTIVE_LOW;
                 break;
-        case IORESOURCE_IRQ_HIGHLEVEL:  
+        case IORESOURCE_IRQ_HIGHLEVEL:
                 *triggering = ACPI_LEVEL_SENSITIVE;
                 *polarity = ACPI_ACTIVE_HIGH;
                 break;
@@ -73,7 +73,7 @@ static void decode_irq_flags(int flag, int *triggering, int *polarity)
 }
 
 static void
-pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, u32 gsi,
+pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res, u32 gsi,
         int triggering, int polarity)
 {
         int i = 0;
@@ -101,7 +101,7 @@ pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, u32 gsi,
 }
 
 static void
-pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table * res, u32 dma)
+pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res, u32 dma)
 {
         int i = 0;
         while (i < PNP_MAX_DMA &&
@@ -119,7 +119,7 @@ pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table * res, u32 dma)
 }
 
 static void
-pnpacpi_parse_allocated_ioresource(struct pnp_resource_table * res,
+pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
         u64 io, u64 len)
 {
         int i = 0;
@@ -138,7 +138,7 @@ pnpacpi_parse_allocated_ioresource(struct pnp_resource_table * res,
 }
 
 static void
-pnpacpi_parse_allocated_memresource(struct pnp_resource_table * res,
+pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,
         u64 mem, u64 len)
 {
         int i = 0;
@@ -181,7 +181,7 @@ pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res_table,
 static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
         void *data)
 {
-        struct pnp_resource_table * res_table = (struct pnp_resource_table *)data;
+        struct pnp_resource_table *res_table = (struct pnp_resource_table *)data;
         int i;
 
         switch (res->type) {
@@ -266,11 +266,11 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                 pnp_warn("PnPACPI: unknown resource type %d", res->type);
                 return AE_ERROR;
         }
-                        
+
         return AE_OK;
 }
 
-acpi_status pnpacpi_parse_allocated_resource(acpi_handle handle, struct pnp_resource_table * res)
+acpi_status pnpacpi_parse_allocated_resource(acpi_handle handle, struct pnp_resource_table *res)
 {
         /* Blank the resource table values */
         pnp_init_resource_table(res);
@@ -328,17 +328,17 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option, struct acpi_reso
                 pnp_err("Invalid DMA transfer type");
         }
 
-        pnp_register_dma_resource(option,dma);
+        pnp_register_dma_resource(option, dma);
         return;
 }
 
-        
+
 static void pnpacpi_parse_irq_option(struct pnp_option *option,
         struct acpi_resource_irq *p)
 {
         int i;
-        struct pnp_irq * irq;
-        
+        struct pnp_irq *irq;
+
         if (p->interrupt_count == 0)
                 return;
         irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
@@ -358,7 +358,7 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
         struct acpi_resource_extended_irq *p)
 {
         int i;
-        struct pnp_irq * irq;
+        struct pnp_irq *irq;
 
         if (p->interrupt_count == 0)
                 return;
@@ -379,7 +379,7 @@ static void
 pnpacpi_parse_port_option(struct pnp_option *option,
         struct acpi_resource_io *io)
 {
-        struct pnp_port * port;
+        struct pnp_port *port;
 
         if (io->address_length == 0)
                 return;
@@ -392,7 +392,7 @@ pnpacpi_parse_port_option(struct pnp_option *option,
         port->size = io->address_length;
         port->flags = ACPI_DECODE_16 == io->io_decode ?
                 PNP_PORT_FLAG_16BITADDR : 0;
-        pnp_register_port_resource(option,port);
+        pnp_register_port_resource(option, port);
         return;
 }
 
@@ -400,7 +400,7 @@ static void
 pnpacpi_parse_fixed_port_option(struct pnp_option *option,
         struct acpi_resource_fixed_io *io)
 {
-        struct pnp_port * port;
+        struct pnp_port *port;
 
         if (io->address_length == 0)
                 return;
@@ -411,7 +411,7 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option,
         port->size = io->address_length;
         port->align = 0;
         port->flags = PNP_PORT_FLAG_FIXED;
-        pnp_register_port_resource(option,port);
+        pnp_register_port_resource(option, port);
         return;
 }
 
@@ -419,7 +419,7 @@ static void
 pnpacpi_parse_mem24_option(struct pnp_option *option,
         struct acpi_resource_memory24 *p)
 {
-        struct pnp_mem * mem;
+        struct pnp_mem *mem;
 
         if (p->address_length == 0)
                 return;
@@ -434,7 +434,7 @@ pnpacpi_parse_mem24_option(struct pnp_option *option,
         mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
                         IORESOURCE_MEM_WRITEABLE : 0;
 
-        pnp_register_mem_resource(option,mem);
+        pnp_register_mem_resource(option, mem);
         return;
 }
 
@@ -442,7 +442,7 @@ static void
 pnpacpi_parse_mem32_option(struct pnp_option *option,
         struct acpi_resource_memory32 *p)
 {
-        struct pnp_mem * mem;
+        struct pnp_mem *mem;
 
         if (p->address_length == 0)
                 return;
@@ -457,7 +457,7 @@ pnpacpi_parse_mem32_option(struct pnp_option *option,
         mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
                         IORESOURCE_MEM_WRITEABLE : 0;
 
-        pnp_register_mem_resource(option,mem);
+        pnp_register_mem_resource(option, mem);
         return;
 }
 
@@ -465,7 +465,7 @@ static void
 pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
         struct acpi_resource_fixed_memory32 *p)
 {
-        struct pnp_mem * mem;
+        struct pnp_mem *mem;
 
         if (p->address_length == 0)
                 return;
@@ -479,7 +479,7 @@ pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
         mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
                         IORESOURCE_MEM_WRITEABLE : 0;
 
-        pnp_register_mem_resource(option,mem);
+        pnp_register_mem_resource(option, mem);
         return;
 }
 
@@ -488,8 +488,8 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
 {
         struct acpi_resource_address64 addr, *p = &addr;
         acpi_status status;
-        struct pnp_mem * mem;
-        struct pnp_port * port;
+        struct pnp_mem *mem;
+        struct pnp_port *port;
 
         status = acpi_resource_to_address64(r, p);
         if (!ACPI_SUCCESS(status)) {
@@ -509,7 +509,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
                 mem->align = 0;
                 mem->flags = (p->info.mem.write_protect ==
                     ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE : 0;
-                pnp_register_mem_resource(option,mem);
+                pnp_register_mem_resource(option, mem);
         } else if (p->resource_type == ACPI_IO_RANGE) {
                 port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
                 if (!port)
@@ -518,7 +518,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
                 port->size = p->address_length;
                 port->align = 0;
                 port->flags = PNP_PORT_FLAG_FIXED;
-                pnp_register_port_resource(option,port);
+                pnp_register_port_resource(option, port);
         }
 }
 
@@ -542,7 +542,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                         break;
 
                 case ACPI_RESOURCE_TYPE_DMA:
-                        pnpacpi_parse_dma_option(option, &res->data.dma);       
+                        pnpacpi_parse_dma_option(option, &res->data.dma);
                         break;
 
                 case ACPI_RESOURCE_TYPE_START_DEPENDENT:
@@ -550,7 +550,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                                 case ACPI_GOOD_CONFIGURATION:
                                         priority = PNP_RES_PRIORITY_PREFERRED;
                                         break;
-                                        
+
                                 case ACPI_ACCEPTABLE_CONFIGURATION:
                                         priority = PNP_RES_PRIORITY_ACCEPTABLE;
                                         break;
@@ -566,7 +566,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                         option = pnp_register_dependent_option(dev, priority);
                         if (!option)
                                 return AE_ERROR;
-                        parse_data->option = option;    
+                        parse_data->option = option;
                         break;
 
                 case ACPI_RESOURCE_TYPE_END_DEPENDENT:
@@ -626,7 +626,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                         pnp_warn("PnPACPI: unknown resource type %d", res->type);
                         return AE_ERROR;
         }
-                        
+
         return AE_OK;
 }
 
@@ -679,10 +679,9 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
         return AE_OK;
 }
 
-static acpi_status pnpacpi_type_resources(struct acpi_resource *res,
-        void *data)
+static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
 {
-        struct acpi_resource **resource = (struct acpi_resource **)data;        
+        struct acpi_resource **resource = (struct acpi_resource **)data;
 
         if (pnpacpi_supported_resource(res)) {
                 (*resource)->type = res->type;
@@ -731,9 +730,8 @@ static void pnpacpi_encode_irq(struct acpi_resource *resource,
         struct resource *p)
 {
         int triggering, polarity;
-        
-        decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering,
-                &polarity);
+
+        decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity);
         resource->data.irq.triggering = triggering;
         resource->data.irq.polarity = polarity;
         if (triggering == ACPI_EDGE_SENSITIVE)
@@ -748,9 +746,8 @@ static void pnpacpi_encode_ext_irq(struct acpi_resource *resource,
         struct resource *p)
 {
         int triggering, polarity;
-        
-        decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering,
-                &polarity);
+
+        decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity);
         resource->data.extended_irq.producer_consumer = ACPI_CONSUMER;
         resource->data.extended_irq.triggering = triggering;
         resource->data.extended_irq.polarity = polarity;
@@ -862,37 +859,37 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
                         pnp_dbg("Encode dma");
                         pnpacpi_encode_dma(resource,
                                 &res_table->dma_resource[dma]);
-                        dma ++;
+                        dma++;
                         break;
                 case ACPI_RESOURCE_TYPE_IO:
                         pnp_dbg("Encode io");
                         pnpacpi_encode_io(resource,
                                 &res_table->port_resource[port]);
-                        port ++;
+                        port++;
                         break;
                 case ACPI_RESOURCE_TYPE_FIXED_IO:
                         pnp_dbg("Encode fixed io");
                         pnpacpi_encode_fixed_io(resource,
                                 &res_table->port_resource[port]);
-                        port ++;
+                        port++;
                         break;
                 case ACPI_RESOURCE_TYPE_MEMORY24:
                         pnp_dbg("Encode mem24");
                         pnpacpi_encode_mem24(resource,
                                 &res_table->mem_resource[mem]);
-                        mem ++;
+                        mem++;
                         break;
                 case ACPI_RESOURCE_TYPE_MEMORY32:
                         pnp_dbg("Encode mem32");
                         pnpacpi_encode_mem32(resource,
                                 &res_table->mem_resource[mem]);
-                        mem ++;
+                        mem++;
                         break;
                 case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
                         pnp_dbg("Encode fixed mem32");
                         pnpacpi_encode_fixed_mem32(resource,
                                 &res_table->mem_resource[mem]);
-                        mem ++;
+                        mem++;
                         break;
                 case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
                         pnp_dbg("Encode ext irq");
@@ -913,8 +910,8 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
                         pnp_warn("unknown resource type %d", resource->type);
                         return -EINVAL;
                 }
-                resource ++;
-                i ++;
+                resource++;
+                i++;
         }
         return 0;
 }