Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / mips / pci / ops-sni.c

diff --git a/arch/mips/pci/ops-sni.c b/arch/mips/pci/ops-sni.c
index 88bfbc4..2b0ccd6 100644 (file)
--- a/arch/mips/pci/ops-sni.c
+++ b/arch/mips/pci/ops-sni.c
@@ -21,9 +21,9 @@
  *
  * ASIC PCI only supports type 1 config cycles.
  */
-static int set_config_address(unsigned char busno, unsigned int devfn, int reg)
+static int set_config_address(unsigned int busno, unsigned int devfn, int reg)
 {
-       if ((busno > 255) || (devfn > 255) || (reg > 255))
+       if ((devfn > 255) || (reg > 255))
                return PCIBIOS_BAD_REGISTER_NUMBER;
 
        if (busno == 0 && devfn >= PCI_DEVFN(8, 0))
@@ -47,13 +47,13 @@ static int pcimt_read(struct pci_bus *bus, unsigned int devfn, int reg,
 
        switch (size) {
        case 1:
-               *val = *(volatile  u8 *) (PCIMT_CONFIG_DATA + (reg & 3));
+               *val = inb(PCIMT_CONFIG_DATA + (reg & 3));
                break;
        case 2:
-               *val = *(volatile u16 *) (PCIMT_CONFIG_DATA + (reg & 2));
+               *val = inw(PCIMT_CONFIG_DATA + (reg & 2));
                break;
        case 4:
-               *val = *(volatile u32 *) PCIMT_CONFIG_DATA;
+               *val = inl(PCIMT_CONFIG_DATA);
                break;
        }
 
@@ -70,13 +70,13 @@ static int pcimt_write(struct pci_bus *bus, unsigned int devfn, int reg,
 
        switch (size) {
        case 1:
-               *(volatile  u8 *) (PCIMT_CONFIG_DATA + (reg & 3)) = val;
+               outb (val, PCIMT_CONFIG_DATA + (reg & 3));
                break;
        case 2:
-               *(volatile u16 *) (PCIMT_CONFIG_DATA + (reg & 2)) = val;
+               outw (val, PCIMT_CONFIG_DATA + (reg & 2));
                break;
        case 4:
-               *(volatile u32 *) PCIMT_CONFIG_DATA = val;
+               outl (val, PCIMT_CONFIG_DATA);
                break;
        }