pci: clean up some whitespace and formatting

I tried to clean up the white space and formatting offenses and
inconsistencies in the generic PCI code that obviously has been around for
some time.  Emphasis on large increases in readability and maintainability
and consistency.  I omitted the platform/processor specific files in
the drivers/pci directory because I wanted to leave those file to those
that care more about them.

Signed-off-by: Andrew Sharp <andywyse6@gmail.com>

1 files changed, 34 insertions, 20 deletions

diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index 2338706b2f..9a42ede56b 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -35,7 +35,7 @@
  *
  */
 
-void pciauto_region_init(struct pci_region* res)
+void pciauto_region_init(struct pci_region *res)
 {
 	/*
 	 * Avoid allocating PCI resources from address 0 -- this is illegal
@@ -50,7 +50,8 @@ void pciauto_region_align(struct pci_region *res, pci_size_t size)
 	res->bus_lower = ((res->bus_lower - 1) | (size - 1)) + 1;
 }
 
-int pciauto_region_allocate(struct pci_region* res, pci_size_t size, pci_addr_t *bar)
+int pciauto_region_allocate(struct pci_region *res, pci_size_t size,
+	pci_addr_t *bar)
 {
 	pci_addr_t addr;
 
@@ -99,7 +100,8 @@ void pciauto_setup_device(struct pci_controller *hose,
 	pci_hose_read_config_word(hose, dev, PCI_COMMAND, &cmdstat);
 	cmdstat = (cmdstat & ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) | PCI_COMMAND_MASTER;
 
-	for (bar = PCI_BASE_ADDRESS_0; bar < PCI_BASE_ADDRESS_0 + (bars_num*4); bar += 4) {
+	for (bar = PCI_BASE_ADDRESS_0;
+		bar < PCI_BASE_ADDRESS_0 + (bars_num * 4); bar += 4) {
 		/* Tickle the BAR and get the response */
 		pci_hose_write_config_dword(hose, dev, bar, 0xffffffff);
 		pci_hose_read_config_dword(hose, dev, bar, &bar_response);
@@ -118,12 +120,14 @@ void pciauto_setup_device(struct pci_controller *hose,
 
 			DEBUGF("PCI Autoconfig: BAR %d, I/O, size=0x%llx, ", bar_nr, (u64)bar_size);
 		} else {
-			if ( (bar_response & PCI_BASE_ADDRESS_MEM_TYPE_MASK) ==
+			if ((bar_response & PCI_BASE_ADDRESS_MEM_TYPE_MASK) ==
 			     PCI_BASE_ADDRESS_MEM_TYPE_64) {
 				u32 bar_response_upper;
 				u64 bar64;
-				pci_hose_write_config_dword(hose, dev, bar+4, 0xffffffff);
-				pci_hose_read_config_dword(hose, dev, bar+4, &bar_response_upper);
+				pci_hose_write_config_dword(hose, dev, bar + 4,
+					0xffffffff);
+				pci_hose_read_config_dword(hose, dev, bar + 4,
+					&bar_response_upper);
 
 				bar64 = ((u64)bar_response_upper << 32) | bar_response;
 
@@ -249,7 +253,7 @@ void pciauto_postscan_setup_bridge(struct pci_controller *hose,
 		pciauto_region_align(pci_mem, 0x100000);
 
 		pci_hose_write_config_word(hose, dev, PCI_MEMORY_LIMIT,
-					(pci_mem->bus_lower-1) >> 16);
+				(pci_mem->bus_lower - 1) >> 16);
 	}
 
 	if (pci_prefetch) {
@@ -257,7 +261,7 @@ void pciauto_postscan_setup_bridge(struct pci_controller *hose,
 		pciauto_region_align(pci_prefetch, 0x100000);
 
 		pci_hose_write_config_word(hose, dev, PCI_PREF_MEMORY_LIMIT,
-					(pci_prefetch->bus_lower-1) >> 16);
+				(pci_prefetch->bus_lower - 1) >> 16);
 	}
 
 	if (pci_io) {
@@ -265,9 +269,9 @@ void pciauto_postscan_setup_bridge(struct pci_controller *hose,
 		pciauto_region_align(pci_io, 0x1000);
 
 		pci_hose_write_config_byte(hose, dev, PCI_IO_LIMIT,
-					((pci_io->bus_lower-1) & 0x0000f000) >> 8);
+				((pci_io->bus_lower - 1) & 0x0000f000) >> 8);
 		pci_hose_write_config_word(hose, dev, PCI_IO_LIMIT_UPPER16,
-					((pci_io->bus_lower-1) & 0xffff0000) >> 16);
+				((pci_io->bus_lower - 1) & 0xffff0000) >> 16);
 	}
 }
 
@@ -281,7 +285,7 @@ void pciauto_config_init(struct pci_controller *hose)
 
 	hose->pci_io = hose->pci_mem = NULL;
 
-	for (i=0; i<hose->region_count; i++) {
+	for (i = 0; i < hose->region_count; i++) {
 		switch(hose->regions[i].flags) {
 		case PCI_REGION_IO:
 			if (!hose->pci_io ||
@@ -339,7 +343,8 @@ void pciauto_config_init(struct pci_controller *hose)
 	}
 }
 
-/* HJF: Changed this to return int. I think this is required
+/*
+ * HJF: Changed this to return int. I think this is required
  * to get the correct result when scanning bridges
  */
 int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
@@ -351,7 +356,7 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 
 	pci_hose_read_config_word(hose, dev, PCI_CLASS_DEVICE, &class);
 
-	switch(class) {
+	switch (class) {
 	case PCI_CLASS_PROCESSOR_POWERPC: /* an agent or end-point */
 		DEBUGF("PCI AutoConfig: Found PowerPC device\n");
 		pciauto_setup_device(hose, dev, 6, hose->pci_mem,
@@ -360,7 +365,8 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 
 	case PCI_CLASS_BRIDGE_PCI:
 		hose->current_busno++;
-		pciauto_setup_device(hose, dev, 2, hose->pci_mem, hose->pci_prefetch, hose->pci_io);
+		pciauto_setup_device(hose, dev, 2, hose->pci_mem,
+			hose->pci_prefetch, hose->pci_io);
 
 		DEBUGF("PCI Autoconfig: Found P2P bridge, device %d\n", PCI_DEV(dev));
 
@@ -386,14 +392,20 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 			return sub_bus;
 		}
 
-		pciauto_setup_device(hose, dev, 6, hose->pci_mem, hose->pci_prefetch, hose->pci_io);
+		pciauto_setup_device(hose, dev, 6, hose->pci_mem,
+			hose->pci_prefetch, hose->pci_io);
 		break;
 
 	case PCI_CLASS_BRIDGE_CARDBUS:
-		/* just do a minimal setup of the bridge, let the OS take care of the rest */
-		pciauto_setup_device(hose, dev, 0, hose->pci_mem, hose->pci_prefetch, hose->pci_io);
+		/*
+		 * just do a minimal setup of the bridge,
+		 * let the OS take care of the rest
+		 */
+		pciauto_setup_device(hose, dev, 0, hose->pci_mem,
+			hose->pci_prefetch, hose->pci_io);
 
-		DEBUGF("PCI Autoconfig: Found P2CardBus bridge, device %d\n", PCI_DEV(dev));
+		DEBUGF("PCI Autoconfig: Found P2CardBus bridge, device %d\n",
+			PCI_DEV(dev));
 
 		hose->current_busno++;
 		break;
@@ -413,11 +425,13 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 		 * the PIMMR window to be allocated (BAR0 - 1MB size)
 		 */
 		DEBUGF("PCI Autoconfig: Broken bridge found, only minimal config\n");
-		pciauto_setup_device(hose, dev, 0, hose->pci_mem, hose->pci_prefetch, hose->pci_io);
+		pciauto_setup_device(hose, dev, 0, hose->pci_mem,
+			hose->pci_prefetch, hose->pci_io);
 		break;
 #endif
 	default:
-		pciauto_setup_device(hose, dev, 6, hose->pci_mem, hose->pci_prefetch, hose->pci_io);
+		pciauto_setup_device(hose, dev, 6, hose->pci_mem,
+			hose->pci_prefetch, hose->pci_io);
 		break;
 	}