Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / mips / pci / pci-ar71xx.c

diff --git a/arch/mips/pci/pci-ar71xx.c b/arch/mips/pci/pci-ar71xx.c
index 2882f6a..9e62ad3 100644 (file)
--- a/arch/mips/pci/pci-ar71xx.c
+++ b/arch/mips/pci/pci-ar71xx.c
@@ -50,7 +50,6 @@
 
 struct ar71xx_pci_controller {
        void __iomem *cfg_base;
-       spinlock_t lock;
        int irq;
        int irq_base;
        struct pci_controller pci_ctrl;
@@ -182,7 +181,6 @@ static int ar71xx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
 {
        struct ar71xx_pci_controller *apc = pci_bus_to_ar71xx_controller(bus);
        void __iomem *base = apc->cfg_base;
-       unsigned long flags;
        u32 data;
        int err;
        int ret;
@@ -190,8 +188,6 @@ static int ar71xx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
        ret = PCIBIOS_SUCCESSFUL;
        data = ~0;
 
-       spin_lock_irqsave(&apc->lock, flags);
-
        err = ar71xx_pci_set_cfgaddr(bus, devfn, where, size,
                                     AR71XX_PCI_CFG_CMD_READ);
        if (err)
@@ -199,8 +195,6 @@ static int ar71xx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
        else
                data = __raw_readl(base + AR71XX_PCI_REG_CFG_RDDATA);
 
-       spin_unlock_irqrestore(&apc->lock, flags);
-
        *value = (data >> (8 * (where & 3))) & ar71xx_pci_read_mask[size & 7];
 
        return ret;
@@ -211,15 +205,12 @@ static int ar71xx_pci_write_config(struct pci_bus *bus, unsigned int devfn,
 {
        struct ar71xx_pci_controller *apc = pci_bus_to_ar71xx_controller(bus);
        void __iomem *base = apc->cfg_base;
-       unsigned long flags;
        int err;
        int ret;
 
        value = value << (8 * (where & 3));
        ret = PCIBIOS_SUCCESSFUL;
 
-       spin_lock_irqsave(&apc->lock, flags);
-
        err = ar71xx_pci_set_cfgaddr(bus, devfn, where, size,
                                     AR71XX_PCI_CFG_CMD_WRITE);
        if (err)
@@ -227,8 +218,6 @@ static int ar71xx_pci_write_config(struct pci_bus *bus, unsigned int devfn,
        else
                __raw_writel(value, base + AR71XX_PCI_REG_CFG_WRDATA);
 
-       spin_unlock_irqrestore(&apc->lock, flags);
-
        return ret;
 }
 
@@ -360,8 +349,6 @@ static int ar71xx_pci_probe(struct platform_device *pdev)
        if (!apc)
                return -ENOMEM;
 
-       spin_lock_init(&apc->lock);
-
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_base");
        apc->cfg_base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(apc->cfg_base))