Pull sbs into release branch

[pandora-kernel.git] / arch / mips / pci / pci-ddb5477.c

diff --git a/arch/mips/pci/pci-ddb5477.c b/arch/mips/pci/pci-ddb5477.c
index 4ddd53e..7363e18 100644 (file)
--- a/arch/mips/pci/pci-ddb5477.c
+++ b/arch/mips/pci/pci-ddb5477.c
@@ -22,31 +22,31 @@
 #include <asm/ddb5xxx/ddb5xxx.h>
 
 static struct resource extpci_io_resource = {
-       "ext pci IO space",
-       DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + 0x4000,
-       DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI0_IO_SIZE - 1,
-       IORESOURCE_IO
+       .start  = DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + 0x4000,
+       .end    = DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI0_IO_SIZE - 1,
+       .name   = "ext pci IO space",
+       .flags  = IORESOURCE_IO
 };
 
 static struct resource extpci_mem_resource = {
-       "ext pci memory space",
-       DDB_PCI0_MEM_BASE + 0x100000,
-       DDB_PCI0_MEM_BASE + DDB_PCI0_MEM_SIZE - 1,
-       IORESOURCE_MEM
+       .start  = DDB_PCI0_MEM_BASE + 0x100000,
+       .end    = DDB_PCI0_MEM_BASE + DDB_PCI0_MEM_SIZE - 1,
+       .name   = "ext pci memory space",
+       .flags  = IORESOURCE_MEM
 };
 
 static struct resource iopci_io_resource = {
-       "io pci IO space",
-       DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE,
-       DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI1_IO_SIZE - 1,
-       IORESOURCE_IO
+       .start  = DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE,
+       .end    = DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI1_IO_SIZE - 1,
+       .name   = "io pci IO space",
+       .flags  = IORESOURCE_IO
 };
 
 static struct resource iopci_mem_resource = {
-       "ext pci memory space",
-       DDB_PCI1_MEM_BASE,
-       DDB_PCI1_MEM_BASE + DDB_PCI1_MEM_SIZE - 1,
-       IORESOURCE_MEM
+       .start  = DDB_PCI1_MEM_BASE,
+       .end    = DDB_PCI1_MEM_BASE + DDB_PCI1_MEM_SIZE - 1,
+       .name   = "ext pci memory space",
+       .flags  = IORESOURCE_MEM
 };
 
 extern struct pci_ops ddb5477_ext_pci_ops;
@@ -76,7 +76,7 @@ struct pci_controller ddb5477_io_controller = {
  */
 
 /*
- * irq mapping : device -> pci int # -> vrc4377 irq# , 
+ * irq mapping : device -> pci int # -> vrc4377 irq# ,
  * ddb5477 board manual page 4  and vrc5477 manual page 46
  */
 
@@ -131,15 +131,15 @@ static unsigned char rockhopperII_irq_map[MAX_SLOT_NUM] = {
        /* SLOT: 20, AD:31 */ VRC5477_IRQ_IOPCI_INTA, /* vrc5477 usb host */
 };
 
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        int slot_num;
        unsigned char *slot_irq_map;
        unsigned char irq;
 
-       /* 
+       /*
         * We ignore the swizzled slot and pin values.  The original
-        * pci_fixup_irq() codes largely base irq number on the dev slot 
+        * pci_fixup_irq() codes largely base irq number on the dev slot
         * numbers because except for one case they are unique even
         * though there are multiple pci buses.
         */
@@ -160,7 +160,7 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 
        if (mips_machtype == MACH_NEC_ROCKHOPPERII) {
                /* hack to distinquish overlapping slot 20s, one
-                * on bus 0 (ALI USB on the M1535 on the backplane), 
+                * on bus 0 (ALI USB on the M1535 on the backplane),
                 * and one on bus 2 (NEC USB controller on the CPU board)
                 * Make the M1535 USB - ISA IRQ number 9.
                 */