Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/arch/mips/pci/ops-pnx8550.c b/arch/mips/pci/ops-pnx8550.c
index 454b65c..0e160d9 100644 (file)
--- a/arch/mips/pci/ops-pnx8550.c
+++ b/arch/mips/pci/ops-pnx8550.c
@@ -90,14 +90,14 @@ config_access(unsigned int pci_cmd, struct pci_bus *bus, unsigned int devfn, int
 
                loops--;
                if (loops == 0) {
-                       printk("%s : Arbiter Locked.\n", __FUNCTION__);
+                       printk("%s : Arbiter Locked.\n", __func__);
                }
        }
 
        clear_status();
        if ((pci_cmd == PCI_CMD_IOR) || (pci_cmd == PCI_CMD_IOW)) {
                printk("%s timeout (GPPM_CTRL=%X) ioaddr %lX pci_cmd %X\n",
-                      __FUNCTION__, inl(PCI_BASE | PCI_GPPM_CTRL), ioaddr,
+                      __func__, inl(PCI_BASE | PCI_GPPM_CTRL), ioaddr,
                       pci_cmd);
        }
 
@@ -117,7 +117,7 @@ read_config_byte(struct pci_bus *bus, unsigned int devfn, int where, u8 * val)
        unsigned int data = 0;
        int err;
 
-       if (bus == 0)
+       if (bus == NULL)
                return -1;
 
        err = config_access(PCI_CMD_CONFIG_READ, bus, devfn, where, ~(1 << (where & 3)), &data);
@@ -145,7 +145,7 @@ read_config_word(struct pci_bus *bus, unsigned int devfn, int where, u16 * val)
        unsigned int data = 0;
        int err;
 
-       if (bus == 0)
+       if (bus == NULL)
                return -1;
 
        if (where & 0x01)
@@ -168,7 +168,7 @@ static int
 read_config_dword(struct pci_bus *bus, unsigned int devfn, int where, u32 * val)
 {
        int err;
-       if (bus == 0)
+       if (bus == NULL)
                return -1;
 
        if (where & 0x03)
@@ -185,7 +185,7 @@ write_config_byte(struct pci_bus *bus, unsigned int devfn, int where, u8 val)
        unsigned int data = (unsigned int)val;
        int err;
 
-       if (bus == 0)
+       if (bus == NULL)
                return -1;
 
        switch (where & 0x03) {
@@ -202,7 +202,7 @@ write_config_byte(struct pci_bus *bus, unsigned int devfn, int where, u8 val)
                break;
        }
 
-       err = config_access(PCI_CMD_CONFIG_READ, bus, devfn, where, ~(1 << (where & 3)), &data);
+       err = config_access(PCI_CMD_CONFIG_WRITE, bus, devfn, where, ~(1 << (where & 3)), &data);
 
        return err;
 }
@@ -213,7 +213,7 @@ write_config_word(struct pci_bus *bus, unsigned int devfn, int where, u16 val)
        unsigned int data = (unsigned int)val;
        int err;
 
-       if (bus == 0)
+       if (bus == NULL)
                return -1;
 
        if (where & 0x01)
@@ -235,7 +235,7 @@ static int
 write_config_dword(struct pci_bus *bus, unsigned int devfn, int where, u32 val)
 {
        int err;
-       if (bus == 0)
+       if (bus == NULL)
                return -1;
 
        if (where & 0x03)