sparc: Use of_node_name_eq for node name comparisons

Convert string compares of DT node names to use of_node_name_eq helper
instead. This removes direct access to the node name pointer.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/floppy_64.h
index 2a050eab69a05378356e02093cf52cfccb151854..3729fc35ba83966aeae6c52b62d1f86266da0359 100644 (file)
--- a/arch/sparc/include/asm/floppy_64.h
+++ b/arch/sparc/include/asm/floppy_64.h
@@ -528,9 +528,9 @@ static int sun_pci_fd_test_drive(unsigned long port, int drive)
 
 static int __init ebus_fdthree_p(struct device_node *dp)
 {
-       if (!strcmp(dp->name, "fdthree"))
+       if (of_node_name_eq(dp, "fdthree"))
                return 1;
-       if (!strcmp(dp->name, "floppy")) {
+       if (of_node_name_eq(dp, "floppy")) {
                const char *compat;
 
                compat = of_get_property(dp, "compatible", NULL);
@@ -555,7 +555,7 @@ static unsigned long __init sun_floppy_init(void)
        op = NULL;
 
        for_each_node_by_name(dp, "SUNW,fdtwo") {
-               if (strcmp(dp->parent->name, "sbus"))
+               if (!of_node_name_eq(dp->parent, "sbus"))
                        continue;
                op = of_find_device_by_node(dp);
                if (op)
@@ -656,7 +656,7 @@ static unsigned long __init sun_floppy_init(void)
                 */
                config = 0;
                for (dp = ebus_dp->child; dp; dp = dp->sibling) {
-                       if (!strcmp(dp->name, "ecpp")) {
+                       if (of_node_name_eq(dp, "ecpp")) {
                                struct platform_device *ecpp_op;
 
                                ecpp_op = of_find_device_by_node(dp);

diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h
index 3c5a1c620f0f7759aa1af38c889078ddb77da2b2..03b27090c0c8cb637d63db12e23224da2308aaad 100644 (file)
--- a/arch/sparc/include/asm/parport.h
+++ b/arch/sparc/include/asm/parport.h
@@ -117,7 +117,7 @@ static int ecpp_probe(struct platform_device *op)
        int slot, err;
 
        parent = op->dev.of_node->parent;
-       if (!strcmp(parent->name, "dma")) {
+       if (of_node_name_eq(parent, "dma")) {
                p = parport_pc_probe_port(base, base + 0x400,
                                          op->archdata.irqs[0], PARPORT_DMA_NOFIFO,
                                          op->dev.parent->parent, 0);

diff --git a/arch/sparc/kernel/auxio_64.c b/arch/sparc/kernel/auxio_64.c
index e1b10f88ffb42880b241ea1190c785c8eddcd12b..4843f48bfe85f7f2543bde7d1670230ecefe2bc3 100644 (file)
--- a/arch/sparc/kernel/auxio_64.c
+++ b/arch/sparc/kernel/auxio_64.c
@@ -108,10 +108,10 @@ static int auxio_probe(struct platform_device *dev)
        struct device_node *dp = dev->dev.of_node;
        unsigned long size;
 
-       if (!strcmp(dp->parent->name, "ebus")) {
+       if (of_node_name_eq(dp->parent, "ebus")) {
                auxio_devtype = AUXIO_TYPE_EBUS;
                size = sizeof(u32);
-       } else if (!strcmp(dp->parent->name, "sbus")) {
+       } else if (of_node_name_eq(dp->parent, "sbus")) {
                auxio_devtype = AUXIO_TYPE_SBUS;
                size = 1;
        } else {

diff --git a/arch/sparc/kernel/central.c b/arch/sparc/kernel/central.c
index 38ae4fdc9eb483b1bb2423c47689bfe27d286b9c..bfae98ab863814dcd54418438f8715c184f89d72 100644 (file)
--- a/arch/sparc/kernel/central.c
+++ b/arch/sparc/kernel/central.c
@@ -168,7 +168,7 @@ static int fhc_probe(struct platform_device *op)
                goto out;
        }
 
-       if (!strcmp(op->dev.of_node->parent->name, "central"))
+       if (of_node_name_eq(op->dev.of_node->parent, "central"))
                p->central = true;
 
        p->pregs = of_ioremap(&op->resource[0], 0,

diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index 713670e6d13dccd18e4ff0ee17acadd910a1adae..3ec9f1402aad357bacb23e73e65801e3ee58253d 100644 (file)
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -915,7 +915,7 @@ static void map_prom_timers(void)
        dp = of_find_node_by_path("/");
        dp = dp->child;
        while (dp) {
-               if (!strcmp(dp->name, "counter-timer"))
+               if (of_node_name_eq(dp, "counter-timer"))
                        break;
                dp = dp->sibling;
        }

diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index ab133e2753ab799f87282cca8e021358f142f2f3..dc5b1b0ec65950c4746c5e330417ccfe6e02d0ad 100644 (file)
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -232,10 +232,10 @@ static int __init use_1to1_mapping(struct device_node *pp)
         * But, we should still pass the translation work up
         * to the SBUS itself.
         */
-       if (!strcmp(pp->name, "dma") ||
-           !strcmp(pp->name, "espdma") ||
-           !strcmp(pp->name, "ledma") ||
-           !strcmp(pp->name, "lebuffer"))
+       if (of_node_name_eq(pp, "dma") ||
+           of_node_name_eq(pp, "espdma") ||
+           of_node_name_eq(pp, "ledma") ||
+           of_node_name_eq(pp, "lebuffer"))
                return 0;
 
        return 1;

diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 2353cb7bc40f9431c7964b706d10852fd3802dc8..4b5eabb20ac8eda64a08812ffea9152b4bbd375f 100644 (file)
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -46,7 +46,7 @@ EXPORT_SYMBOL(of_iounmap);
 
 static int of_bus_pci_match(struct device_node *np)
 {
-       if (!strcmp(np->name, "pci")) {
+       if (of_node_name_eq(np, "pci")) {
                const char *model = of_get_property(np, "model", NULL);
 
                if (model && !strcmp(model, "SUNW,simba"))
@@ -77,7 +77,7 @@ static int of_bus_simba_match(struct device_node *np)
        /* Treat PCI busses lacking ranges property just like
         * simba.
         */
-       if (!strcmp(np->name, "pci")) {
+       if (of_node_name_eq(np, "pci")) {
                if (!of_find_property(np, "ranges", NULL))
                        return 1;
        }
@@ -170,8 +170,8 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
  */
 static int of_bus_fhc_match(struct device_node *np)
 {
-       return !strcmp(np->name, "fhc") ||
-               !strcmp(np->name, "central");
+       return of_node_name_eq(np, "fhc") ||
+               of_node_name_eq(np, "central");
 }
 
 #define of_bus_fhc_count_cells of_bus_sbus_count_cells
@@ -295,17 +295,17 @@ static int __init use_1to1_mapping(struct device_node *pp)
         * But, we should still pass the translation work up
         * to the SBUS itself.
         */
-       if (!strcmp(pp->name, "dma") ||
-           !strcmp(pp->name, "espdma") ||
-           !strcmp(pp->name, "ledma") ||
-           !strcmp(pp->name, "lebuffer"))
+       if (of_node_name_eq(pp, "dma") ||
+           of_node_name_eq(pp, "espdma") ||
+           of_node_name_eq(pp, "ledma") ||
+           of_node_name_eq(pp, "lebuffer"))
                return 0;
 
        /* Similarly for all PCI bridges, if we get this far
         * it lacks a ranges property, and this will include
         * cases like Simba.
         */
-       if (!strcmp(pp->name, "pci"))
+       if (of_node_name_eq(pp, "pci"))
                return 0;
 
        return 1;
@@ -591,7 +591,7 @@ static unsigned int __init build_one_device_irq(struct platform_device *op,
                                break;
                        }
                } else {
-                       if (!strcmp(pp->name, "pci")) {
+                       if (of_node_name_eq(pp, "pci")) {
                                unsigned int this_orig_irq = irq;
 
                                irq = pci_irq_swizzle(dp, pp, irq);

diff --git a/arch/sparc/kernel/of_device_common.c b/arch/sparc/kernel/of_device_common.c
index de0ee3971f00ecdda68b4ac3c081878b55df4361..b186b7f0f6c4086ca3d0f27898e70782410f2609 100644 (file)
--- a/arch/sparc/kernel/of_device_common.c
+++ b/arch/sparc/kernel/of_device_common.c
@@ -151,8 +151,8 @@ int of_bus_sbus_match(struct device_node *np)
        struct device_node *dp = np;
 
        while (dp) {
-               if (!strcmp(dp->name, "sbus") ||
-                   !strcmp(dp->name, "sbi"))
+               if (of_node_name_eq(dp, "sbus") ||
+                   of_node_name_eq(dp, "sbi"))
                        return 1;
 
                /* Have a look at use_1to1_mapping().  We're trying

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 45ba2757a1b9ef8bda5f70edca4cf7293765b651..377113ae9a6a10e7daa27d59357d71fc266d043a 100644 (file)
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -283,7 +283,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
        sd->stc = &pbm->stc;
        sd->numa_node = pbm->numa_node;
 
-       if (!strcmp(node->name, "ebus"))
+       if (of_node_name_eq(node, "ebus"))
                of_propagate_archdata(op);
 
        type = of_get_property(node, "device_type", NULL);
@@ -336,7 +336,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
        dev->error_state = pci_channel_io_normal;
        dev->dma_mask = 0xffffffff;
 
-       if (!strcmp(node->name, "pci")) {
+       if (of_node_name_eq(node, "pci")) {
                /* a PCI-PCI bridge */
                dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
                dev->rom_base_reg = PCI_ROM_ADDRESS1;

diff --git a/arch/sparc/kernel/pci_sabre.c b/arch/sparc/kernel/pci_sabre.c
index 8107286be9ab1dd2ab6c88e3cdf7cf56bf3fd362..3c38ca40a22bace28681258759f98f38b334c4bf 100644 (file)
--- a/arch/sparc/kernel/pci_sabre.c
+++ b/arch/sparc/kernel/pci_sabre.c
@@ -475,7 +475,7 @@ static int sabre_probe(struct platform_device *op)
                 * different ways, inconsistently.
                 */
                for_each_node_by_type(cpu_dp, "cpu") {
-                       if (!strcmp(cpu_dp->name, "SUNW,UltraSPARC-IIe"))
+                       if (of_node_name_eq(cpu_dp, "SUNW,UltraSPARC-IIe"))
                                hummingbird_p = 1;
                }
        }

diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index 1667df573f6fab33be854516019f77ae8a48faf8..17860d6ed1bde07ce4ca7dc890c590b8d8e49b9a 100644 (file)
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -335,8 +335,8 @@ static void __init __build_path_component(struct device_node *dp, char *tmp_buf)
                        ebus_path_component(dp, tmp_buf);
                        return;
                }
-               if (!strcmp(parent->name, "usb") ||
-                   !strcmp(parent->name, "hub")) {
+               if (of_node_name_eq(parent, "usb") ||
+                   of_node_name_eq(parent, "hub")) {
                        usb_path_component(dp, tmp_buf);
                        return;
                }

diff --git a/arch/sparc/kernel/prom_irqtrans.c b/arch/sparc/kernel/prom_irqtrans.c
index f3fecac7facb695845027559836ec23309029c67..f76b4ae697f5a057752d0c608acebbf3dda9b432 100644 (file)
--- a/arch/sparc/kernel/prom_irqtrans.c
+++ b/arch/sparc/kernel/prom_irqtrans.c
@@ -725,11 +725,11 @@ static unsigned int central_build_irq(struct device_node *dp,
        unsigned long imap, iclr;
        u32 tmp;
 
-       if (!strcmp(dp->name, "eeprom")) {
+       if (of_node_name_eq(dp, "eeprom")) {
                res = &central_op->resource[5];
-       } else if (!strcmp(dp->name, "zs")) {
+       } else if (of_node_name_eq(dp, "zs")) {
                res = &central_op->resource[4];
-       } else if (!strcmp(dp->name, "clock-board")) {
+       } else if (of_node_name_eq(dp, "clock-board")) {
                res = &central_op->resource[3];
        } else {
                return ino;
@@ -824,19 +824,19 @@ void __init irq_trans_init(struct device_node *dp)
        }
 #endif
 #ifdef CONFIG_SBUS
-       if (!strcmp(dp->name, "sbus") ||
-           !strcmp(dp->name, "sbi")) {
+       if (of_node_name_eq(dp, "sbus") ||
+           of_node_name_eq(dp, "sbi")) {
                sbus_irq_trans_init(dp);
                return;
        }
 #endif
-       if (!strcmp(dp->name, "fhc") &&
-           !strcmp(dp->parent->name, "central")) {
+       if (of_node_name_eq(dp, "fhc") &&
+           of_node_name_eq(dp->parent, "central")) {
                central_irq_trans_init(dp);
                return;
        }
-       if (!strcmp(dp->name, "virtual-devices") ||
-           !strcmp(dp->name, "niu")) {
+       if (of_node_name_eq(dp, "virtual-devices") ||
+           of_node_name_eq(dp, "niu")) {
                sun4v_vdev_irq_trans_init(dp);
                return;
        }

diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index 6d266d7dd2b6d6dcbbea8b2a419c9e1d02cbc861..9a137c70e8d1f8de7585db8a47768e763ee33138 100644 (file)
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -335,12 +335,12 @@ static unsigned int sun4d_build_device_irq(struct platform_device *op,
 
        irq = real_irq;
        while (bus) {
-               if (!strcmp(bus->name, "sbi")) {
+               if (of_node_name_eq(bus, "sbi")) {
                        bus_connection = "io-unit";
                        break;
                }
 
-               if (!strcmp(bus->name, "bootbus")) {
+               if (of_node_name_eq(bus, "bootbus")) {
                        bus_connection = "cpu-unit";
                        break;
                }
@@ -360,7 +360,7 @@ static unsigned int sun4d_build_device_irq(struct platform_device *op,
         * If Bus nodes parent is not io-unit/cpu-unit or the io-unit/cpu-unit
         * lacks a "board#" property, something is very wrong.
         */
-       if (!bus->parent || strcmp(bus->parent->name, bus_connection)) {
+       if (!of_node_name_eq(bus->parent, bus_connection)) {
                printk(KERN_ERR "%pOF: Error, parent is not %s.\n",
                        bus, bus_connection);
                goto err_out;

diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index 68a80f9baea797d417727a7787a33763bd53132d..3eb77943ce129829499c861ffa8ec6aba958bd6a 100644 (file)
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -561,8 +561,8 @@ static int mostek_probe(struct platform_device *op)
        /* On an Enterprise system there can be multiple mostek clocks.
         * We should only match the one that is on the central FHC bus.
         */
-       if (!strcmp(dp->parent->name, "fhc") &&
-           strcmp(dp->parent->parent->name, "central") != 0)
+       if (of_node_name_eq(dp->parent, "fhc") &&
+           !of_node_name_eq(dp->parent->parent, "central"))
                return -ENODEV;
 
        printk(KERN_INFO "%pOF: Mostek regs at 0x%llx\n",