Merge tag 'mips_5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

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

diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
index 0ac6346..aebd496 100644 (file)
--- a/arch/mips/pci/pci-rt3883.c
+++ b/arch/mips/pci/pci-rt3883.c
@@ -100,7 +100,6 @@ static u32 rt3883_pci_read_cfg32(struct rt3883_pci_controller *rpc,
                               unsigned bus, unsigned slot,
                               unsigned func, unsigned reg)
 {
-       unsigned long flags;
        u32 address;
        u32 ret;
 
@@ -116,7 +115,6 @@ static void rt3883_pci_write_cfg32(struct rt3883_pci_controller *rpc,
                                 unsigned bus, unsigned slot,
                                 unsigned func, unsigned reg, u32 val)
 {
-       unsigned long flags;
        u32 address;
 
        address = rt3883_pci_get_cfgaddr(bus, slot, func, reg);
@@ -229,7 +227,6 @@ static int rt3883_pci_config_read(struct pci_bus *bus, unsigned int devfn,
                                  int where, int size, u32 *val)
 {
        struct rt3883_pci_controller *rpc;
-       unsigned long flags;
        u32 address;
        u32 data;
 
@@ -263,7 +260,6 @@ static int rt3883_pci_config_write(struct pci_bus *bus, unsigned int devfn,
                                   int where, int size, u32 val)
 {
        struct rt3883_pci_controller *rpc;
-       unsigned long flags;
        u32 address;
        u32 data;
 
@@ -435,8 +431,7 @@ static int rt3883_pci_probe(struct platform_device *pdev)
 
        if (!rpc->intc_of_node) {
                dev_err(dev, "%pOF has no %s child node",
-                       rpc->intc_of_node,
-                       "interrupt controller");
+                       np, "interrupt controller");
                return -EINVAL;
        }
 
@@ -450,8 +445,7 @@ static int rt3883_pci_probe(struct platform_device *pdev)
 
        if (!rpc->pci_controller.of_node) {
                dev_err(dev, "%pOF has no %s child node",
-                       rpc->intc_of_node,
-                       "PCI host bridge");
+                       np, "PCI host bridge");
                err = -EINVAL;
                goto err_put_intc_node;
        }