[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1000 pci_fixup.c,1.3,1.4 pci_ops.c,1.1,1.2

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000
In directory usw-pr-cvs1:/tmp/cvs-serv5739/arch/mips/au1000/pb1000

Modified Files:
	pci_fixup.c pci_ops.c 
Log Message:
Sync with OSS 2.4.9.



Index: pci_fixup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000/pci_fixup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pci_fixup.c	2001/08/29 00:12:29	1.3
+++ pci_fixup.c	2001/09/25 03:36:35	1.4
@@ -1,5 +1,4 @@
 /*
- *
  * BRIEF MODULE DESCRIPTION
  *	Board specific pci fixups.
  *
@@ -53,7 +52,7 @@
 
 void __init pcibios_fixup(void)
 {
-	unsigned long pci_mem_start = (unsigned long)PCI_MEM_START;
+	unsigned long pci_mem_start = (unsigned long) PCI_MEM_START;
 
 	writel(0, PCI_BRIDGE_CONFIG); // set extend byte to 0
 	writel(0, SDRAM_MBAR);        // set mbar to 0
@@ -61,7 +60,8 @@
 	au_sync_delay(1);
 
 	// set extend byte to mbar of ext slot
-	writel(((pci_mem_start>>24)&0xff) | (1<<8 | 1<<9 | 1<<10 | 1<<27), PCI_BRIDGE_CONFIG); 
+	writel(((pci_mem_start >> 24) & 0xff) |
+	       (1 << 8 | 1 << 9 | 1 << 10 | 1 << 27), PCI_BRIDGE_CONFIG);
 	DBG("Set bridge config to %x\n", readl(PCI_BRIDGE_CONFIG));
 }
 

Index: pci_ops.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000/pci_ops.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pci_ops.c	2001/08/17 22:53:26	1.1
+++ pci_ops.c	2001/09/25 03:36:35	1.2
@@ -1,5 +1,4 @@
 /*
- *
  * BRIEF MODULE DESCRIPTION
  *	PB1000 specific pci support.
  *
@@ -54,20 +53,22 @@
 	"pci IO space", 
 	PCI_IO_START,
 	PCI_IO_END,
-	IORESOURCE_IO};
+	IORESOURCE_IO
+};
 
 static struct resource pci_mem_resource = {
 	"pci memory space", 
 	PCI_MEM_START,
 	PCI_MEM_END,
-	IORESOURCE_MEM};
+	IORESOURCE_MEM
+};
 
 extern struct pci_ops pb1000_pci_ops;
 
 struct pci_channel mips_pci_channels[] = {
-	{ &pb1000_pci_ops, &pci_io_resource, &pci_mem_resource, 0, 1 },
-	{ (struct pci_ops *)NULL, (struct resource *)NULL, 
-		(struct resource *)NULL, (int)NULL, (int)NULL}
+	{&pb1000_pci_ops, &pci_io_resource, &pci_mem_resource, 0, 1},
+	{(struct pci_ops *) NULL, (struct resource *) NULL,
+	 (struct resource *) NULL, (int) NULL, (int) NULL}
 };
 
 
@@ -77,13 +78,13 @@
  * external slot only. The SDRAM is already initialized in setup.c.
  */
 static int config_access(unsigned char access_type, struct pci_dev *dev, 
-		unsigned char where, u32 *data)
+			 unsigned char where, u32 * data)
 {
 	unsigned char bus = dev->bus->number;
 	unsigned char dev_fn = dev->devfn;
 	unsigned long config;
 
-	if (((dev_fn>>3) != 0) || (bus != 0)) {
+	if (((dev_fn >> 3) != 0) || (bus != 0)) {
 		*data = 0xffffffff;
 		return -1;
 	}
@@ -92,8 +93,7 @@
 
 	if (access_type == PCI_ACCESS_WRITE) {
 		outl(*data, config);
-	}
-	else {
+	} else {
 		*data = inl(config);
 	}
 	au_sync_udelay(1);
@@ -103,18 +103,16 @@
 
 	DBG("bridge config reg: %x (%x)\n", inl(PCI_BRIDGE_CONFIG), *data);
 
-	if (inl(PCI_BRIDGE_CONFIG) & (1<<16))  {
+	if (inl(PCI_BRIDGE_CONFIG) & (1 << 16)) {
 		*data = 0xffffffff;
 		return -1;
-	}
-	else {
+	} else {
 		return PCIBIOS_SUCCESSFUL;
 	}
 }
 
 
-static int
-read_config_byte (struct pci_dev *dev, int where, u8 *val)
+static int read_config_byte(struct pci_dev *dev, int where, u8 * val)
 {
 	u32 data;
 	int ret;
@@ -125,8 +123,7 @@
 }
 
 
-static int
-read_config_word (struct pci_dev *dev, int where, u16 *val)
+static int read_config_word(struct pci_dev *dev, int where, u16 * val)
 {
 	u32 data;
 	int ret;
@@ -136,8 +133,7 @@
 	return ret; 
 }
 
-static int
-read_config_dword (struct pci_dev *dev, int where, u32 *val)
+static int read_config_dword(struct pci_dev *dev, int where, u32 * val)
 {
 	int ret;
 
@@ -146,8 +142,7 @@
 }
 
 
-static int
-write_config_byte (struct pci_dev *dev, int where, u8 val)
+static int write_config_byte(struct pci_dev *dev, int where, u8 val)
 {
 	u32 data = 0;
        
@@ -163,8 +158,7 @@
 	return PCIBIOS_SUCCESSFUL;
 }
 
-static int
-write_config_word (struct pci_dev *dev, int where, u16 val)
+static int write_config_word(struct pci_dev *dev, int where, u16 val)
 {
         u32 data = 0;
 
@@ -184,8 +178,7 @@
 	return PCIBIOS_SUCCESSFUL;
 }
 
-static int
-write_config_dword(struct pci_dev *dev, int where, u32 val)
+static int write_config_dword(struct pci_dev *dev, int where, u32 val)
 {
 	if (where & 3)
 		return PCIBIOS_BAD_REGISTER_NUMBER;