Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21c328dc authored by Rob Herring's avatar Rob Herring Committed by David S. Miller
Browse files

net: ethernet: Convert to using %pOFn instead of device_node.name 



In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Yisen Zhuang <yisen.zhuang@huawei.com>
Cc: Salil Mehta <salil.mehta@huawei.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Felix Fietkau <nbd@openwrt.org>
Cc: John Crispin <john@phrozen.org>
Cc: Sean Wang <sean.wang@mediatek.com>
Cc: Nelson Chang <nelson.chang@mediatek.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Wingman Kwok <w-kwok2@ti.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>
Cc: netdev@vger.kernel.org

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Acked-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8bad008e

drivers/net/ethernet/freescale/fsl_pq_mdio.c

+2 −2
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev) 
		goto error;

	}



	snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s@%llx", np->name,

	snprintf(new_bus->id, MII_BUS_ID_SIZE, "%pOFn@%llx", np,

		 (unsigned long long)res.start);



	priv->map = of_iomap(np, 0);

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c

+4 −4
Original line number Diff line number Diff line
@@ -807,8 +807,8 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb) 
			 */

			put_device(&mac_cb->phy_dev->mdio.dev);



			dev_dbg(mac_cb->dev, "mac%d phy_node: %s\n",

				mac_cb->mac_id, np->name);

			dev_dbg(mac_cb->dev, "mac%d phy_node: %pOFn\n",

				mac_cb->mac_id, np);

		}

		of_node_put(np);
@@ -825,8 +825,8 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb) 
			 * if the phy_dev is found

			 */

			put_device(&mac_cb->phy_dev->mdio.dev);

			dev_dbg(mac_cb->dev, "mac%d phy_node: %s\n",

				mac_cb->mac_id, np->name);

			dev_dbg(mac_cb->dev, "mac%d phy_node: %pOFn\n",

				mac_cb->mac_id, np);

		}

		of_node_put(np);

drivers/net/ethernet/marvell/mv643xx_eth.c

+3 −3
Original line number Diff line number Diff line
@@ -2733,17 +2733,17 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev, 


	memset(&res, 0, sizeof(res));

	if (of_irq_to_resource(pnp, 0, &res) <= 0) {

		dev_err(&pdev->dev, "missing interrupt on %s\n", pnp->name);

		dev_err(&pdev->dev, "missing interrupt on %pOFn\n", pnp);

		return -EINVAL;

	}



	if (of_property_read_u32(pnp, "reg", &ppd.port_number)) {

		dev_err(&pdev->dev, "missing reg property on %s\n", pnp->name);

		dev_err(&pdev->dev, "missing reg property on %pOFn\n", pnp);

		return -EINVAL;

	}



	if (ppd.port_number >= 3) {

		dev_err(&pdev->dev, "invalid reg property on %s\n", pnp->name);

		dev_err(&pdev->dev, "invalid reg property on %pOFn\n", pnp);

		return -EINVAL;

	}

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static int mtk_mdio_init(struct mtk_eth *eth) 
	eth->mii_bus->priv = eth;

	eth->mii_bus->parent = eth->dev;



	snprintf(eth->mii_bus->id, MII_BUS_ID_SIZE, "%s", mii_np->name);

	snprintf(eth->mii_bus->id, MII_BUS_ID_SIZE, "%pOFn", mii_np);

	ret = of_mdiobus_register(eth->mii_bus, mii_np);



err_put_node:

drivers/net/ethernet/sun/sunhme.c

+1 −1
Original line number Diff line number Diff line
@@ -2999,7 +2999,7 @@ static int happy_meal_pci_probe(struct pci_dev *pdev, 
	/* Now make sure pci_dev cookie is there. */

#ifdef CONFIG_SPARC

	dp = pci_device_to_OF_node(pdev);

	strcpy(prom_name, dp->name);

	snprintf(prom_name, sizeof(prom_name), "%pOFn", dp);

#else

	if (is_quattro_p(pdev))

		strcpy(prom_name, "SUNW,qfe");