Skip to content

Commit 21c328d

Browse files
robherringdavem330
robherring
authored and
davem330
committed
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: Rob Herring <robh@kernel.org> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Acked-by: Sean Wang <sean.wang@mediatek.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 8bad008 commit 21c328d

File tree

7 files changed

+40
-46
lines changed

7 files changed

+40
-46
lines changed

‎drivers/net/ethernet/freescale/fsl_pq_mdio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,8 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev)
446446
goto error;
447447
}
448448

449-
snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s@%llx", np->name,
450-
(unsigned long long)res.start);
449+
snprintf(new_bus->id, MII_BUS_ID_SIZE, "%pOFn@%llx", np,
450+
(unsigned long long)res.start);
451451

452452
priv->map = of_iomap(np, 0);
453453
if (!priv->map) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -807,8 +807,8 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb)
807807
*/
808808
put_device(&mac_cb->phy_dev->mdio.dev);
809809

810-
dev_dbg(mac_cb->dev, "mac%d phy_node: %s\n",
811-
mac_cb->mac_id, np->name);
810+
dev_dbg(mac_cb->dev, "mac%d phy_node: %pOFn\n",
811+
mac_cb->mac_id, np);
812812
}
813813
of_node_put(np);
814814

@@ -825,8 +825,8 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb)
825825
* if the phy_dev is found
826826
*/
827827
put_device(&mac_cb->phy_dev->mdio.dev);
828-
dev_dbg(mac_cb->dev, "mac%d phy_node: %s\n",
829-
mac_cb->mac_id, np->name);
828+
dev_dbg(mac_cb->dev, "mac%d phy_node: %pOFn\n",
829+
mac_cb->mac_id, np);
830830
}
831831
of_node_put(np);
832832

‎drivers/net/ethernet/marvell/mv643xx_eth.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2733,17 +2733,17 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev,
27332733

27342734
memset(&res, 0, sizeof(res));
27352735
if (of_irq_to_resource(pnp, 0, &res) <= 0) {
2736-
dev_err(&pdev->dev, "missing interrupt on %s\n", pnp->name);
2736+
dev_err(&pdev->dev, "missing interrupt on %pOFn\n", pnp);
27372737
return -EINVAL;
27382738
}
27392739

27402740
if (of_property_read_u32(pnp, "reg", &ppd.port_number)) {
2741-
dev_err(&pdev->dev, "missing reg property on %s\n", pnp->name);
2741+
dev_err(&pdev->dev, "missing reg property on %pOFn\n", pnp);
27422742
return -EINVAL;
27432743
}
27442744

27452745
if (ppd.port_number >= 3) {
2746-
dev_err(&pdev->dev, "invalid reg property on %s\n", pnp->name);
2746+
dev_err(&pdev->dev, "invalid reg property on %pOFn\n", pnp);
27472747
return -EINVAL;
27482748
}
27492749

‎drivers/net/ethernet/mediatek/mtk_eth_soc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ static int mtk_mdio_init(struct mtk_eth *eth)
405405
eth->mii_bus->priv = eth;
406406
eth->mii_bus->parent = eth->dev;
407407

408-
snprintf(eth->mii_bus->id, MII_BUS_ID_SIZE, "%s", mii_np->name);
408+
snprintf(eth->mii_bus->id, MII_BUS_ID_SIZE, "%pOFn", mii_np);
409409
ret = of_mdiobus_register(eth->mii_bus, mii_np);
410410

411411
err_put_node:

‎drivers/net/ethernet/sun/sunhme.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2999,7 +2999,7 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,
29992999
/* Now make sure pci_dev cookie is there. */
30003000
#ifdef CONFIG_SPARC
30013001
dp = pci_device_to_OF_node(pdev);
3002-
strcpy(prom_name, dp->name);
3002+
snprintf(prom_name, sizeof(prom_name), "%pOFn", dp);
30033003
#else
30043004
if (is_quattro_p(pdev))
30053005
strcpy(prom_name, "SUNW,qfe");

‎drivers/net/ethernet/ti/netcp_core.c

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,6 @@ static int emac_arch_get_mac_addr(char *x, void __iomem *efuse_mac, u32 swap)
225225
return 0;
226226
}
227227

228-
static const char *netcp_node_name(struct device_node *node)
229-
{
230-
const char *name;
231-
232-
if (of_property_read_string(node, "label", &name) < 0)
233-
name = node->name;
234-
if (!name)
235-
name = "unknown";
236-
return name;
237-
}
238-
239228
/* Module management routines */
240229
static int netcp_register_interface(struct netcp_intf *netcp)
241230
{
@@ -267,8 +256,13 @@ static int netcp_module_probe(struct netcp_device *netcp_device,
267256
}
268257

269258
for_each_available_child_of_node(devices, child) {
270-
const char *name = netcp_node_name(child);
259+
const char *name;
260+
char node_name[32];
271261

262+
if (of_property_read_string(node, "label", &name) < 0) {
263+
snprintf(node_name, sizeof(node_name), "%pOFn", child);
264+
name = node_name;
265+
}
272266
if (!strcasecmp(module->name, name))
273267
break;
274268
}
@@ -2209,8 +2203,8 @@ static int netcp_probe(struct platform_device *pdev)
22092203
for_each_available_child_of_node(interfaces, child) {
22102204
ret = netcp_create_interface(netcp_device, child);
22112205
if (ret) {
2212-
dev_err(dev, "could not create interface(%s)\n",
2213-
child->name);
2206+
dev_err(dev, "could not create interface(%pOFn)\n",
2207+
child);
22142208
goto probe_quit_interface;
22152209
}
22162210
}

‎drivers/net/ethernet/ti/netcp_ethss.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3137,15 +3137,15 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev,
31373137
for_each_child_of_node(node, port) {
31383138
slave = devm_kzalloc(dev, sizeof(*slave), GFP_KERNEL);
31393139
if (!slave) {
3140-
dev_err(dev, "memory alloc failed for secondary port(%s), skipping...\n",
3141-
port->name);
3140+
dev_err(dev, "memory alloc failed for secondary port(%pOFn), skipping...\n",
3141+
port);
31423142
continue;
31433143
}
31443144

31453145
if (init_slave(gbe_dev, slave, port)) {
31463146
dev_err(dev,
3147-
"Failed to initialize secondary port(%s), skipping...\n",
3148-
port->name);
3147+
"Failed to initialize secondary port(%pOFn), skipping...\n",
3148+
port);
31493149
devm_kfree(dev, slave);
31503150
continue;
31513151
}
@@ -3239,8 +3239,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev,
32393239
ret = of_address_to_resource(node, XGBE_SS_REG_INDEX, &res);
32403240
if (ret) {
32413241
dev_err(gbe_dev->dev,
3242-
"Can't xlate xgbe of node(%s) ss address at %d\n",
3243-
node->name, XGBE_SS_REG_INDEX);
3242+
"Can't xlate xgbe of node(%pOFn) ss address at %d\n",
3243+
node, XGBE_SS_REG_INDEX);
32443244
return ret;
32453245
}
32463246

@@ -3254,8 +3254,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev,
32543254
ret = of_address_to_resource(node, XGBE_SM_REG_INDEX, &res);
32553255
if (ret) {
32563256
dev_err(gbe_dev->dev,
3257-
"Can't xlate xgbe of node(%s) sm address at %d\n",
3258-
node->name, XGBE_SM_REG_INDEX);
3257+
"Can't xlate xgbe of node(%pOFn) sm address at %d\n",
3258+
node, XGBE_SM_REG_INDEX);
32593259
return ret;
32603260
}
32613261

@@ -3269,8 +3269,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev,
32693269
ret = of_address_to_resource(node, XGBE_SERDES_REG_INDEX, &res);
32703270
if (ret) {
32713271
dev_err(gbe_dev->dev,
3272-
"Can't xlate xgbe serdes of node(%s) address at %d\n",
3273-
node->name, XGBE_SERDES_REG_INDEX);
3272+
"Can't xlate xgbe serdes of node(%pOFn) address at %d\n",
3273+
node, XGBE_SERDES_REG_INDEX);
32743274
return ret;
32753275
}
32763276

@@ -3347,8 +3347,8 @@ static int get_gbe_resource_version(struct gbe_priv *gbe_dev,
33473347
ret = of_address_to_resource(node, GBE_SS_REG_INDEX, &res);
33483348
if (ret) {
33493349
dev_err(gbe_dev->dev,
3350-
"Can't translate of node(%s) of gbe ss address at %d\n",
3351-
node->name, GBE_SS_REG_INDEX);
3350+
"Can't translate of node(%pOFn) of gbe ss address at %d\n",
3351+
node, GBE_SS_REG_INDEX);
33523352
return ret;
33533353
}
33543354

@@ -3372,8 +3372,8 @@ static int set_gbe_ethss14_priv(struct gbe_priv *gbe_dev,
33723372
ret = of_address_to_resource(node, GBE_SGMII34_REG_INDEX, &res);
33733373
if (ret) {
33743374
dev_err(gbe_dev->dev,
3375-
"Can't translate of gbe node(%s) address at index %d\n",
3376-
node->name, GBE_SGMII34_REG_INDEX);
3375+
"Can't translate of gbe node(%pOFn) address at index %d\n",
3376+
node, GBE_SGMII34_REG_INDEX);
33773377
return ret;
33783378
}
33793379

@@ -3388,8 +3388,8 @@ static int set_gbe_ethss14_priv(struct gbe_priv *gbe_dev,
33883388
ret = of_address_to_resource(node, GBE_SM_REG_INDEX, &res);
33893389
if (ret) {
33903390
dev_err(gbe_dev->dev,
3391-
"Can't translate of gbe node(%s) address at index %d\n",
3392-
node->name, GBE_SM_REG_INDEX);
3391+
"Can't translate of gbe node(%pOFn) address at index %d\n",
3392+
node, GBE_SM_REG_INDEX);
33933393
return ret;
33943394
}
33953395

@@ -3498,8 +3498,8 @@ static int set_gbenu_ethss_priv(struct gbe_priv *gbe_dev,
34983498
ret = of_address_to_resource(node, GBENU_SM_REG_INDEX, &res);
34993499
if (ret) {
35003500
dev_err(gbe_dev->dev,
3501-
"Can't translate of gbenu node(%s) addr at index %d\n",
3502-
node->name, GBENU_SM_REG_INDEX);
3501+
"Can't translate of gbenu node(%pOFn) addr at index %d\n",
3502+
node, GBENU_SM_REG_INDEX);
35033503
return ret;
35043504
}
35053505

@@ -3642,7 +3642,7 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev,
36423642
ret = netcp_xgbe_serdes_init(gbe_dev->xgbe_serdes_regs,
36433643
gbe_dev->ss_regs);
36443644
} else {
3645-
dev_err(dev, "unknown GBE node(%s)\n", node->name);
3645+
dev_err(dev, "unknown GBE node(%pOFn)\n", node);
36463646
ret = -ENODEV;
36473647
}
36483648

@@ -3667,8 +3667,8 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev,
36673667
for_each_child_of_node(interfaces, interface) {
36683668
ret = of_property_read_u32(interface, "slave-port", &slave_num);
36693669
if (ret) {
3670-
dev_err(dev, "missing slave-port parameter, skipping interface configuration for %s\n",
3671-
interface->name);
3670+
dev_err(dev, "missing slave-port parameter, skipping interface configuration for %pOFn\n",
3671+
interface);
36723672
continue;
36733673
}
36743674
gbe_dev->num_slaves++;

0 commit comments

Comments
 (0)