Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[sfrench/cifs-2.6.git] / arch / mips / pci / pci-rt3883.c

diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
index 3520e9b414e7b91dfedc59abeb37d757579e475a..958899ffe99c14b3e149a88e303fb4cd3d497d81 100644 (file)
--- a/arch/mips/pci/pci-rt3883.c
+++ b/arch/mips/pci/pci-rt3883.c
@@ -207,8 +207,7 @@ static int rt3883_pci_irq_init(struct device *dev,
 
        irq = irq_of_parse_and_map(rpc->intc_of_node, 0);
        if (irq == 0) {
-               dev_err(dev, "%s has no IRQ",
-                       of_node_full_name(rpc->intc_of_node));
+               dev_err(dev, "%pOF has no IRQ", rpc->intc_of_node);
                return -EINVAL;
        }
 
@@ -438,8 +437,8 @@ static int rt3883_pci_probe(struct platform_device *pdev)
        }
 
        if (!rpc->intc_of_node) {
-               dev_err(dev, "%s has no %s child node",
-                       of_node_full_name(rpc->intc_of_node),
+               dev_err(dev, "%pOF has no %s child node",
+                       rpc->intc_of_node,
                        "interrupt controller");
                return -EINVAL;
        }
@@ -454,8 +453,8 @@ static int rt3883_pci_probe(struct platform_device *pdev)
        }
 
        if (!rpc->pci_controller.of_node) {
-               dev_err(dev, "%s has no %s child node",
-                       of_node_full_name(rpc->intc_of_node),
+               dev_err(dev, "%pOF has no %s child node",
+                       rpc->intc_of_node,
                        "PCI host bridge");
                err = -EINVAL;
                goto err_put_intc_node;
@@ -565,7 +564,7 @@ err_put_intc_node:
        return err;
 }
 
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        return of_irq_parse_and_map_pci(dev, slot, pin);
 }