if (np) {
                bus->name = np->full_name;
-               snprintf(bus->id, MII_BUS_ID_SIZE, "%s", np->full_name);
+               snprintf(bus->id, MII_BUS_ID_SIZE, "%pOF", np);
        } else {
                bus->name = "mv88e6xxx SMI";
                snprintf(bus->id, MII_BUS_ID_SIZE, "mv88e6xxx-%d", index++);
 
        int j, rev, rc = -EBUSY;
 
        if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {
-               printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n",
-                      mace->full_name);
+               printk(KERN_ERR "can't use MACE %pOF: need 3 addrs and 3 irqs\n",
+                      mace);
                return -ENODEV;
        }
 
        if (addr == NULL) {
                addr = of_get_property(mace, "local-mac-address", NULL);
                if (addr == NULL) {
-                       printk(KERN_ERR "Can't get mac-address for MACE %s\n",
-                              mace->full_name);
+                       printk(KERN_ERR "Can't get mac-address for MACE %pOF\n",
+                              mace);
                        return -ENODEV;
                }
        }
 
 
        of_dev = of_find_device_by_node(mac_node);
        if (!of_dev) {
-               dev_err(dpaa_dev, "of_find_device_by_node(%s) failed\n",
-                       mac_node->full_name);
+               dev_err(dpaa_dev, "of_find_device_by_node(%pOF) failed\n",
+                       mac_node);
                of_node_put(mac_node);
                return ERR_PTR(-EINVAL);
        }
 
 
        /* We're done ! */
        platform_set_drvdata(op, ndev);
-       netdev_info(ndev, "%s MAC %pM\n",
-                   op->dev.of_node->full_name, ndev->dev_addr);
+       netdev_info(ndev, "%pOF MAC %pM\n",
+                   op->dev.of_node, ndev->dev_addr);
 
        return 0;
 
 
 
                guts_regs = of_iomap(guts_node, 0);
                if (!guts_regs) {
-                       dev_err(fman->dev, "%s: Couldn't map %s regs\n",
-                               __func__, guts_node->full_name);
+                       dev_err(fman->dev, "%s: Couldn't map %pOF regs\n",
+                               __func__, guts_node);
                        goto guts_regs;
                }
 #define FMAN1_ALL_MACS_MASK    0xFCC00000
 
        err = of_property_read_u32(fm_node, "cell-index", &val);
        if (err) {
-               dev_err(&of_dev->dev, "%s: failed to read cell-index for %s\n",
-                       __func__, fm_node->full_name);
+               dev_err(&of_dev->dev, "%s: failed to read cell-index for %pOF\n",
+                       __func__, fm_node);
                goto fman_node_put;
        }
        fman->dts_params.id = (u8)val;
        err = of_property_read_u32_array(fm_node, "fsl,qman-channel-range",
                                         &range[0], 2);
        if (err) {
-               dev_err(&of_dev->dev, "%s: failed to read fsl,qman-channel-range for %s\n",
-                       __func__, fm_node->full_name);
+               dev_err(&of_dev->dev, "%s: failed to read fsl,qman-channel-range for %pOF\n",
+                       __func__, fm_node);
                goto fman_node_put;
        }
        fman->dts_params.qman_channel_base = range[0];
 
 
        err = of_property_read_u32(port_node, "cell-index", &val);
        if (err) {
-               dev_err(port->dev, "%s: reading cell-index for %s failed\n",
-                       __func__, port_node->full_name);
+               dev_err(port->dev, "%s: reading cell-index for %pOF failed\n",
+                       __func__, port_node);
                err = -EINVAL;
                goto return_err;
        }
 
                priv->internal_phy_node = of_parse_phandle(mac_node,
                                                          "pcsphy-handle", 0);
        } else {
-               dev_err(dev, "MAC node (%s) contains unsupported MAC\n",
-                       mac_node->full_name);
+               dev_err(dev, "MAC node (%pOF) contains unsupported MAC\n",
+                       mac_node);
                err = -EINVAL;
                goto _return;
        }
        /* Get the FM node */
        dev_node = of_get_parent(mac_node);
        if (!dev_node) {
-               dev_err(dev, "of_get_parent(%s) failed\n",
-                       mac_node->full_name);
+               dev_err(dev, "of_get_parent(%pOF) failed\n",
+                       mac_node);
                err = -EINVAL;
                goto _return_dev_set_drvdata;
        }
 
        of_dev = of_find_device_by_node(dev_node);
        if (!of_dev) {
-               dev_err(dev, "of_find_device_by_node(%s) failed\n",
-                       dev_node->full_name);
+               dev_err(dev, "of_find_device_by_node(%pOF) failed\n", dev_node);
                err = -EINVAL;
                goto _return_of_node_put;
        }
        /* Get the FMan cell-index */
        err = of_property_read_u32(dev_node, "cell-index", &val);
        if (err) {
-               dev_err(dev, "failed to read cell-index for %s\n",
-                       dev_node->full_name);
+               dev_err(dev, "failed to read cell-index for %pOF\n", dev_node);
                err = -EINVAL;
                goto _return_of_node_put;
        }
 
        priv->fman = fman_bind(&of_dev->dev);
        if (!priv->fman) {
-               dev_err(dev, "fman_bind(%s) failed\n", dev_node->full_name);
+               dev_err(dev, "fman_bind(%pOF) failed\n", dev_node);
                err = -ENODEV;
                goto _return_of_node_put;
        }
        /* Get the address of the memory mapped registers */
        err = of_address_to_resource(mac_node, 0, &res);
        if (err < 0) {
-               dev_err(dev, "of_address_to_resource(%s) = %d\n",
-                       mac_node->full_name, err);
+               dev_err(dev, "of_address_to_resource(%pOF) = %d\n",
+                       mac_node, err);
                goto _return_dev_set_drvdata;
        }
 
        /* Get the cell-index */
        err = of_property_read_u32(mac_node, "cell-index", &val);
        if (err) {
-               dev_err(dev, "failed to read cell-index for %s\n",
-                       mac_node->full_name);
+               dev_err(dev, "failed to read cell-index for %pOF\n", mac_node);
                err = -EINVAL;
                goto _return_dev_set_drvdata;
        }
        /* Get the MAC address */
        mac_addr = of_get_mac_address(mac_node);
        if (!mac_addr) {
-               dev_err(dev, "of_get_mac_address(%s) failed\n",
-                       mac_node->full_name);
+               dev_err(dev, "of_get_mac_address(%pOF) failed\n", mac_node);
                err = -EINVAL;
                goto _return_dev_set_drvdata;
        }
        /* Get the port handles */
        nph = of_count_phandle_with_args(mac_node, "fsl,fman-ports", NULL);
        if (unlikely(nph < 0)) {
-               dev_err(dev, "of_count_phandle_with_args(%s, fsl,fman-ports) failed\n",
-                       mac_node->full_name);
+               dev_err(dev, "of_count_phandle_with_args(%pOF, fsl,fman-ports) failed\n",
+                       mac_node);
                err = nph;
                goto _return_dev_set_drvdata;
        }
 
        if (nph != ARRAY_SIZE(mac_dev->port)) {
-               dev_err(dev, "Not supported number of fman-ports handles of mac node %s from device tree\n",
-                       mac_node->full_name);
+               dev_err(dev, "Not supported number of fman-ports handles of mac node %pOF from device tree\n",
+                       mac_node);
                err = -EINVAL;
                goto _return_dev_set_drvdata;
        }
                /* Find the port node */
                dev_node = of_parse_phandle(mac_node, "fsl,fman-ports", i);
                if (!dev_node) {
-                       dev_err(dev, "of_parse_phandle(%s, fsl,fman-ports) failed\n",
-                               mac_node->full_name);
+                       dev_err(dev, "of_parse_phandle(%pOF, fsl,fman-ports) failed\n",
+                               mac_node);
                        err = -EINVAL;
                        goto _return_of_node_put;
                }
 
                of_dev = of_find_device_by_node(dev_node);
                if (!of_dev) {
-                       dev_err(dev, "of_find_device_by_node(%s) failed\n",
-                               dev_node->full_name);
+                       dev_err(dev, "of_find_device_by_node(%pOF) failed\n",
+                               dev_node);
                        err = -EINVAL;
                        goto _return_of_node_put;
                }
 
                mac_dev->port[i] = fman_port_bind(&of_dev->dev);
                if (!mac_dev->port[i]) {
-                       dev_err(dev, "dev_get_drvdata(%s) failed\n",
-                               dev_node->full_name);
+                       dev_err(dev, "dev_get_drvdata(%pOF) failed\n",
+                               dev_node);
                        err = -EINVAL;
                        goto _return_of_node_put;
                }
        phy_if = of_get_phy_mode(mac_node);
        if (phy_if < 0) {
                dev_warn(dev,
-                        "of_get_phy_mode() for %s failed. Defaulting to SGMII\n",
-                        mac_node->full_name);
+                        "of_get_phy_mode() for %pOF failed. Defaulting to SGMII\n",
+                        mac_node);
                phy_if = PHY_INTERFACE_MODE_SGMII;
        }
        priv->phy_if = phy_if;
 
 
                ret = of_address_to_resource(np, 0, &res);
                if (ret < 0) {
-                       pr_debug("fsl-pq-mdio: no address range in node %s\n",
-                                np->full_name);
+                       pr_debug("fsl-pq-mdio: no address range in node %pOF\n",
+                                np);
                        continue;
                }
 
                if (!iprop) {
                        iprop = of_get_property(np, "device-id", NULL);
                        if (!iprop) {
-                               pr_debug("fsl-pq-mdio: no UCC ID in node %s\n",
-                                        np->full_name);
+                               pr_debug("fsl-pq-mdio: no UCC ID in node %pOF\n",
+                                        np);
                                continue;
                        }
                }
                 * numbered from 1, not 0.
                 */
                if (ucc_set_qe_mux_mii_mng(id - 1) < 0) {
-                       pr_debug("fsl-pq-mdio: invalid UCC ID in node %s\n",
-                                np->full_name);
+                       pr_debug("fsl-pq-mdio: invalid UCC ID in node %pOF\n",
+                                np);
                        continue;
                }
 
        if (data->get_tbipa) {
                for_each_child_of_node(np, tbi) {
                        if (strcmp(tbi->type, "tbi-phy") == 0) {
-                               dev_dbg(&pdev->dev, "found TBI PHY node %s\n",
-                                       strrchr(tbi->full_name, '/') + 1);
+                               dev_dbg(&pdev->dev, "found TBI PHY node %pOFP\n",
+                                       tbi);
                                break;
                        }
                }
 
                        if (!prop) {
                                dev_err(&pdev->dev,
-                                       "missing 'reg' property in node %s\n",
-                                       tbi->full_name);
+                                       "missing 'reg' property in node %pOF\n",
+                                       tbi);
                                err = -EBUSY;
                                goto error;
                        }
 
                dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
                                                 NULL);
                if (!dn_log_port_id) {
-                       pr_err("bad device node: eth_dn name=%s\n",
-                              eth_dn->full_name);
+                       pr_err("bad device node: eth_dn name=%pOF\n", eth_dn);
                        continue;
                }
 
 
        if (!adapter->handle) {
                dev_err(&dev->dev, "failed getting handle for adapter"
-                       " '%s'\n", dev->dev.of_node->full_name);
+                       " '%pOF'\n", dev->dev.of_node);
                ret = -ENODEV;
                goto out_free_ad;
        }
 
                                  EMAC_FTR_440EP_PHY_CLK_FIX))
                DBG(dev, "%s" NL, error);
        else if (net_ratelimit())
-               printk(KERN_ERR "%s: %s\n", dev->ofdev->dev.of_node->full_name,
-                       error);
+               printk(KERN_ERR "%pOF: %s\n", dev->ofdev->dev.of_node, error);
 }
 
 /* EMAC PHY clock workaround:
 
        strlcpy(info->driver, "ibm_emac", sizeof(info->driver));
        strlcpy(info->version, DRV_VERSION, sizeof(info->version));
-       snprintf(info->bus_info, sizeof(info->bus_info), "PPC 4xx EMAC-%d %s",
-                dev->cell_index, dev->ofdev->dev.of_node->full_name);
+       snprintf(info->bus_info, sizeof(info->bus_info), "PPC 4xx EMAC-%d %pOF",
+                dev->cell_index, dev->ofdev->dev.of_node);
 }
 
 static const struct ethtool_ops emac_ethtool_ops = {
        const u32 *prop = of_get_property(np, name, &len);
        if (prop == NULL || len < sizeof(u32)) {
                if (fatal)
-                       printk(KERN_ERR "%s: missing %s property\n",
-                              np->full_name, name);
+                       printk(KERN_ERR "%pOF: missing %s property\n",
+                              np, name);
                return -ENODEV;
        }
        *val = *prop;
 #endif
        mutex_unlock(&emac_phy_map_lock);
        if (i == 0x20) {
-               printk(KERN_WARNING "%s: can't find PHY!\n", np->full_name);
+               printk(KERN_WARNING "%pOF: can't find PHY!\n", np);
                return -ENXIO;
        }
 
 #ifdef CONFIG_IBM_EMAC_NO_FLOW_CTRL
                        dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;
 #else
-                       printk(KERN_ERR "%s: Flow control not disabled!\n",
-                                       np->full_name);
+                       printk(KERN_ERR "%pOF: Flow control not disabled!\n",
+                                       np);
                        return -ENXIO;
 #endif
                }
 #ifdef CONFIG_IBM_EMAC_TAH
                dev->features |= EMAC_FTR_HAS_TAH;
 #else
-               printk(KERN_ERR "%s: TAH support not enabled !\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: TAH support not enabled !\n", np);
                return -ENXIO;
 #endif
        }
 #ifdef CONFIG_IBM_EMAC_ZMII
                dev->features |= EMAC_FTR_HAS_ZMII;
 #else
-               printk(KERN_ERR "%s: ZMII support not enabled !\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: ZMII support not enabled !\n", np);
                return -ENXIO;
 #endif
        }
 #ifdef CONFIG_IBM_EMAC_RGMII
                dev->features |= EMAC_FTR_HAS_RGMII;
 #else
-               printk(KERN_ERR "%s: RGMII support not enabled !\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: RGMII support not enabled !\n", np);
                return -ENXIO;
 #endif
        }
        /* Read MAC-address */
        p = of_get_property(np, "local-mac-address", NULL);
        if (p == NULL) {
-               printk(KERN_ERR "%s: Can't find local-mac-address property\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: Can't find local-mac-address property\n",
+                      np);
                return -ENXIO;
        }
        memcpy(dev->ndev->dev_addr, p, ETH_ALEN);
        dev->emac_irq = irq_of_parse_and_map(np, 0);
        dev->wol_irq = irq_of_parse_and_map(np, 1);
        if (!dev->emac_irq) {
-               printk(KERN_ERR "%s: Can't map main interrupt\n", np->full_name);
+               printk(KERN_ERR "%pOF: Can't map main interrupt\n", np);
                goto err_free;
        }
        ndev->irq = dev->emac_irq;
 
        /* Map EMAC regs */
        if (of_address_to_resource(np, 0, &dev->rsrc_regs)) {
-               printk(KERN_ERR "%s: Can't get registers address\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: Can't get registers address\n", np);
                goto err_irq_unmap;
        }
        // TODO : request_mem_region
        dev->emacp = ioremap(dev->rsrc_regs.start,
                             resource_size(&dev->rsrc_regs));
        if (dev->emacp == NULL) {
-               printk(KERN_ERR "%s: Can't map device registers!\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: Can't map device registers!\n", np);
                err = -ENOMEM;
                goto err_irq_unmap;
        }
        err = emac_wait_deps(dev);
        if (err) {
                printk(KERN_ERR
-                      "%s: Timeout waiting for dependent devices\n",
-                      np->full_name);
+                      "%pOF: Timeout waiting for dependent devices\n", np);
                /*  display more info about what's missing ? */
                goto err_reg_unmap;
        }
        dev->commac.rx_chan_mask = MAL_CHAN_MASK(dev->mal_rx_chan);
        err = mal_register_commac(dev->mal, &dev->commac);
        if (err) {
-               printk(KERN_ERR "%s: failed to register with mal %s!\n",
-                      np->full_name, dev->mal_dev->dev.of_node->full_name);
+               printk(KERN_ERR "%pOF: failed to register with mal %pOF!\n",
+                      np, dev->mal_dev->dev.of_node);
                goto err_rel_deps;
        }
        dev->rx_skb_size = emac_rx_skb_size(ndev->mtu);
 
        err = register_netdev(ndev);
        if (err) {
-               printk(KERN_ERR "%s: failed to register net device (%d)!\n",
-                      np->full_name, err);
+               printk(KERN_ERR "%pOF: failed to register net device (%d)!\n",
+                      np, err);
                goto err_detach_tah;
        }
 
        wake_up_all(&emac_probe_wait);
 
 
-       printk(KERN_INFO "%s: EMAC-%d %s, MAC %pM\n",
-              ndev->name, dev->cell_index, np->full_name, ndev->dev_addr);
+       printk(KERN_INFO "%s: EMAC-%d %pOF, MAC %pM\n",
+              ndev->name, dev->cell_index, np, ndev->dev_addr);
 
        if (dev->phy_mode == PHY_MODE_SGMII)
                printk(KERN_NOTICE "%s: in SGMII mode\n", ndev->name);
 
 #endif
 
 #define EMAC_DBG(d, name, fmt, arg...) \
-       printk(KERN_DEBUG #name "%s: " fmt, d->ofdev->dev.of_node->full_name, ## arg)
+       printk(KERN_DEBUG #name "%pOF: " fmt, d->ofdev->dev.of_node, ## arg)
 
 #if DBG_LEVEL > 0
 #  define DBG(d,f,x...)                EMAC_DBG(d, emac, f, ##x)
 
                mal->features |= (MAL_FTR_CLEAR_ICINTSTAT |
                                MAL_FTR_COMMON_ERR_INT);
 #else
-               printk(KERN_ERR "%s: Support for 405EZ not enabled!\n",
-                               ofdev->dev.of_node->full_name);
+               printk(KERN_ERR "%pOF: Support for 405EZ not enabled!\n",
+                               ofdev->dev.of_node);
                err = -ENODEV;
                goto fail;
 #endif
        mal_enable_eob_irq(mal);
 
        printk(KERN_INFO
-              "MAL v%d %s, %d TX channels, %d RX channels\n",
-              mal->version, ofdev->dev.of_node->full_name,
+              "MAL v%d %pOF, %d TX channels, %d RX channels\n",
+              mal->version, ofdev->dev.of_node,
               mal->num_tx_chans, mal->num_rx_chans);
 
        /* Advertise this instance to the rest of the world */
 
 
        /* Check if we need to attach to a RGMII */
        if (input < 0 || !rgmii_valid_mode(mode)) {
-               printk(KERN_ERR "%s: unsupported settings !\n",
-                      ofdev->dev.of_node->full_name);
+               printk(KERN_ERR "%pOF: unsupported settings !\n",
+                      ofdev->dev.of_node);
                return -ENODEV;
        }
 
        /* Enable this input */
        out_be32(&p->fer, in_be32(&p->fer) | rgmii_mode_mask(mode, input));
 
-       printk(KERN_NOTICE "%s: input %d in %s mode\n",
-              ofdev->dev.of_node->full_name, input, rgmii_mode_name(mode));
+       printk(KERN_NOTICE "%pOF: input %d in %s mode\n",
+              ofdev->dev.of_node, input, rgmii_mode_name(mode));
 
        ++dev->users;
 
 
        rc = -ENXIO;
        if (of_address_to_resource(np, 0, ®s)) {
-               printk(KERN_ERR "%s: Can't get registers address\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: Can't get registers address\n", np);
                goto err_free;
        }
 
        dev->base = (struct rgmii_regs __iomem *)ioremap(regs.start,
                                                 sizeof(struct rgmii_regs));
        if (dev->base == NULL) {
-               printk(KERN_ERR "%s: Can't map device registers!\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: Can't map device registers!\n", np);
                goto err_free;
        }
 
        out_be32(&dev->base->fer, 0);
 
        printk(KERN_INFO
-              "RGMII %s initialized with%s MDIO support\n",
-              ofdev->dev.of_node->full_name,
+              "RGMII %pOF initialized with%s MDIO support\n",
+              ofdev->dev.of_node,
               (dev->flags & EMAC_RGMII_FLAG_HAS_MDIO) ? "" : "out");
 
        wmb();
 
                --n;
 
        if (unlikely(!n))
-               printk(KERN_ERR "%s: reset timeout\n",
-                       ofdev->dev.of_node->full_name);
+               printk(KERN_ERR "%pOF: reset timeout\n", ofdev->dev.of_node);
 
        /* 10KB TAH TX FIFO accommodates the max MTU of 9000 */
        out_be32(&p->mr,
 
        rc = -ENXIO;
        if (of_address_to_resource(np, 0, ®s)) {
-               printk(KERN_ERR "%s: Can't get registers address\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: Can't get registers address\n", np);
                goto err_free;
        }
 
        dev->base = (struct tah_regs __iomem *)ioremap(regs.start,
                                               sizeof(struct tah_regs));
        if (dev->base == NULL) {
-               printk(KERN_ERR "%s: Can't map device registers!\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: Can't map device registers!\n", np);
                goto err_free;
        }
 
        /* Initialize TAH and enable IPv4 checksum verification, no TSO yet */
        tah_reset(ofdev);
 
-       printk(KERN_INFO
-              "TAH %s initialized\n", ofdev->dev.of_node->full_name);
+       printk(KERN_INFO "TAH %pOF initialized\n", ofdev->dev.of_node);
        wmb();
 
        return 0;
 
                } else
                        dev->mode = *mode;
 
-               printk(KERN_NOTICE "%s: bridge in %s mode\n",
-                      ofdev->dev.of_node->full_name,
+               printk(KERN_NOTICE "%pOF: bridge in %s mode\n",
+                      ofdev->dev.of_node,
                       zmii_mode_name(dev->mode));
        } else {
                /* All inputs must use the same mode */
                if (*mode != PHY_MODE_NA && *mode != dev->mode) {
                        printk(KERN_ERR
-                              "%s: invalid mode %d specified for input %d\n",
-                              ofdev->dev.of_node->full_name, *mode, input);
+                              "%pOF: invalid mode %d specified for input %d\n",
+                              ofdev->dev.of_node, *mode, input);
                        mutex_unlock(&dev->lock);
                        return -EINVAL;
                }
 
        rc = -ENXIO;
        if (of_address_to_resource(np, 0, ®s)) {
-               printk(KERN_ERR "%s: Can't get registers address\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: Can't get registers address\n", np);
                goto err_free;
        }
 
        dev->base = (struct zmii_regs __iomem *)ioremap(regs.start,
                                                sizeof(struct zmii_regs));
        if (dev->base == NULL) {
-               printk(KERN_ERR "%s: Can't map device registers!\n",
-                      np->full_name);
+               printk(KERN_ERR "%pOF: Can't map device registers!\n", np);
                goto err_free;
        }
 
        /* Disable all inputs by default */
        out_be32(&dev->base->fer, 0);
 
-       printk(KERN_INFO
-              "ZMII %s initialized\n", ofdev->dev.of_node->full_name);
+       printk(KERN_INFO "ZMII %pOF initialized\n", ofdev->dev.of_node);
        wmb();
        platform_set_drvdata(ofdev, dev);
 
 
 
        phy_type = of_get_property(dp, "phy-type", &prop_len);
        if (!phy_type) {
-               netdev_err(dev, "%s: OF node lacks phy-type property\n",
-                          dp->full_name);
+               netdev_err(dev, "%pOF: OF node lacks phy-type property\n", dp);
                return -EINVAL;
        }
 
        strcpy(np->vpd.phy_type, phy_type);
 
        if (niu_phy_type_prop_decode(np, np->vpd.phy_type)) {
-               netdev_err(dev, "%s: Illegal phy string [%s]\n",
-                          dp->full_name, np->vpd.phy_type);
+               netdev_err(dev, "%pOF: Illegal phy string [%s]\n",
+                          dp, np->vpd.phy_type);
                return -EINVAL;
        }
 
        mac_addr = of_get_property(dp, "local-mac-address", &prop_len);
        if (!mac_addr) {
-               netdev_err(dev, "%s: OF node lacks local-mac-address property\n",
-                          dp->full_name);
+               netdev_err(dev, "%pOF: OF node lacks local-mac-address property\n",
+                          dp);
                return -EINVAL;
        }
        if (prop_len != dev->addr_len) {
-               netdev_err(dev, "%s: OF MAC address prop len (%d) is wrong\n",
-                          dp->full_name, prop_len);
+               netdev_err(dev, "%pOF: OF MAC address prop len (%d) is wrong\n",
+                          dp, prop_len);
        }
        memcpy(dev->dev_addr, mac_addr, dev->addr_len);
        if (!is_valid_ether_addr(&dev->dev_addr[0])) {
-               netdev_err(dev, "%s: OF MAC address is invalid\n",
-                          dp->full_name);
-               netdev_err(dev, "%s: [ %pM ]\n", dp->full_name, dev->dev_addr);
+               netdev_err(dev, "%pOF: OF MAC address is invalid\n", dp);
+               netdev_err(dev, "%pOF: [ %pM ]\n", dp, dev->dev_addr);
                return -EINVAL;
        }
 
 
        reg = of_get_property(op->dev.of_node, "reg", NULL);
        if (!reg) {
-               dev_err(&op->dev, "%s: No 'reg' property, aborting\n",
-                       op->dev.of_node->full_name);
+               dev_err(&op->dev, "%pOF: No 'reg' property, aborting\n",
+                       op->dev.of_node);
                return -ENODEV;
        }
 
 
                phy = of_phy_connect(priv->ndev, slave->data->phy_node,
                                 &cpsw_adjust_link, 0, slave->data->phy_if);
                if (!phy) {
-                       dev_err(priv->dev, "phy \"%s\" not found on slave %d\n",
-                               slave->data->phy_node->full_name,
+                       dev_err(priv->dev, "phy \"%pOF\" not found on slave %d\n",
+                               slave->data->phy_node,
                                slave->slave_num);
                        return;
                }
                parp = of_get_property(slave_node, "phy_id", &lenp);
                if (slave_data->phy_node) {
                        dev_dbg(&pdev->dev,
-                               "slave[%d] using phy-handle=\"%s\"\n",
-                               i, slave_data->phy_node->full_name);
+                               "slave[%d] using phy-handle=\"%pOF\"\n",
+                               i, slave_data->phy_node);
                } else if (of_phy_is_fixed_link(slave_node)) {
                        /* In the case of a fixed PHY, the DT node associated
                         * to the PHY is the Ethernet MAC DT node.
 
                phydev = of_phy_connect(ndev, priv->phy_node,
                                        &emac_adjust_link, 0, 0);
                if (!phydev) {
-                       dev_err(emac_dev, "could not connect to phy %s\n",
-                               priv->phy_node->full_name);
+                       dev_err(emac_dev, "could not connect to phy %pOF\n",
+                               priv->phy_node);
                        ret = -ENODEV;
                        goto err;
                }
 
 
        lp->phy_node = of_parse_phandle(op->dev.of_node, "phy-handle", 0);
        if (lp->phy_node)
-               dev_dbg(lp->dev, "using PHY node %s (%p)\n", np->full_name, np);
+               dev_dbg(lp->dev, "using PHY node %pOF (%p)\n", np, np);
 
        /* Add the device attributes */
        rc = sysfs_create_group(&lp->dev->kobj, &temac_attr_group);
 
        const __be32 *iprop;
        int len, ret;
 
-       dev_dbg(&pdev->dev, "probing node %s\n", np->full_name);
+       dev_dbg(&pdev->dev, "probing node %pOF\n", np);
 
        s = devm_kzalloc(&pdev->dev, sizeof(*s), GFP_KERNEL);
        if (!s)
 
        ret = of_address_to_resource(np, 0, &res);
        if (ret) {
-               dev_err(&pdev->dev, "could not obtain memory map for node %s\n",
-                       np->full_name);
+               dev_err(&pdev->dev, "could not obtain memory map for node %pOF\n",
+                       np);
                return ret;
        }
        s->phys = res.start;
        for_each_available_child_of_node(np, np2) {
                iprop = of_get_property(np2, "reg", &len);
                if (!iprop || len != sizeof(uint32_t)) {
-                       dev_err(&pdev->dev, "mdio-mux child node %s is "
-                               "missing a 'reg' property\n", np2->full_name);
+                       dev_err(&pdev->dev, "mdio-mux child node %pOF is "
+                               "missing a 'reg' property\n", np2);
                        of_node_put(np2);
                        return -ENODEV;
                }
                if (be32_to_cpup(iprop) & ~s->mask) {
-                       dev_err(&pdev->dev, "mdio-mux child node %s has "
+                       dev_err(&pdev->dev, "mdio-mux child node %pOF has "
                                "a 'reg' value with unmasked bits\n",
-                               np2->full_name);
+                               np2);
                        of_node_put(np2);
                        return -ENODEV;
                }
        ret = mdio_mux_init(&pdev->dev, mdio_mux_mmioreg_switch_fn,
                            &s->mux_handle, s, NULL);
        if (ret) {
-               dev_err(&pdev->dev, "failed to register mdio-mux bus %s\n",
-                       np->full_name);
+               dev_err(&pdev->dev, "failed to register mdio-mux bus %pOF\n",
+                       np);
                return ret;
        }
 
 
                r = of_property_read_u32(child_bus_node, "reg", &v);
                if (r) {
                        dev_err(dev,
-                               "Error: Failed to find reg for child %s\n",
-                               of_node_full_name(child_bus_node));
+                               "Error: Failed to find reg for child %pOF\n",
+                               child_bus_node);
                        continue;
                }
 
                cb = devm_kzalloc(dev, sizeof(*cb), GFP_KERNEL);
                if (cb == NULL) {
                        dev_err(dev,
-                               "Error: Failed to allocate memory for child %s\n",
-                               of_node_full_name(child_bus_node));
+                               "Error: Failed to allocate memory for child %pOF\n",
+                               child_bus_node);
                        ret_val = -ENOMEM;
                        continue;
                }
                cb->mii_bus = mdiobus_alloc();
                if (!cb->mii_bus) {
                        dev_err(dev,
-                               "Error: Failed to allocate MDIO bus for child %s\n",
-                               of_node_full_name(child_bus_node));
+                               "Error: Failed to allocate MDIO bus for child %pOF\n",
+                               child_bus_node);
                        ret_val = -ENOMEM;
                        devm_kfree(dev, cb);
                        continue;
                r = of_mdiobus_register(cb->mii_bus, child_bus_node);
                if (r) {
                        dev_err(dev,
-                               "Error: Failed to register MDIO bus for child %s\n",
-                               of_node_full_name(child_bus_node));
+                               "Error: Failed to register MDIO bus for child %pOF\n",
+                               child_bus_node);
                        mdiobus_free(cb->mii_bus);
                        devm_kfree(dev, cb);
                } else {