* [PATCH] net: ethernet: Convert to using %pOFn instead of device_node.name [not found] <20180828015252.28511-1-robh@kernel.org> @ 2018-08-28 1:52 ` Rob Herring 2018-08-28 15:44 ` [PATCH v2] " Rob Herring 2018-08-28 1:52 ` [PATCH] net: phy: " Rob Herring 2018-08-28 1:52 ` [PATCH] net: wireless: ath: " Rob Herring 2 siblings, 1 reply; 10+ messages in thread From: Rob Herring @ 2018-08-28 1:52 UTC (permalink / raw) To: linux-kernel Cc: David S. Miller, Yisen Zhuang, Salil Mehta, Sebastian Hesselbarth, Felix Fietkau, John Crispin, Sean Wang, Nelson Chang, Matthias Brugger, Wingman Kwok, Murali Karicheri, netdev 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> --- drivers/net/ethernet/freescale/fsl_pq_mdio.c | 4 +- .../net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 8 ++-- drivers/net/ethernet/marvell/mv643xx_eth.c | 6 +-- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- drivers/net/ethernet/sun/sunhme.c | 2 +- drivers/net/ethernet/ti/netcp_core.c | 22 ++++------ drivers/net/ethernet/ti/netcp_ethss.c | 42 +++++++++---------- 7 files changed, 40 insertions(+), 46 deletions(-) diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c index ac2c3f6a12bc..82722d05fedb 100644 --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c @@ -446,8 +446,8 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev) goto error; } - snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s@%llx", np->name, - (unsigned long long)res.start); + snprintf(new_bus->id, MII_BUS_ID_SIZE, "%pOFn@%llx", np, + (unsigned long long)res.start); priv->map = of_iomap(np, 0); if (!priv->map) { diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c index 1c2326bd76e2..6521d8d53745 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c @@ -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); diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 62f204f32316..1e9bcbdc6a90 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -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; } diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 6e6abdc399de..b44bcfd85b05 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -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: diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 06da2f59fcbf..863fd602fd33 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -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"); diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index a1d335a3c5e4..cb240e0d515a 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -225,17 +225,6 @@ static int emac_arch_get_mac_addr(char *x, void __iomem *efuse_mac, u32 swap) return 0; } -static const char *netcp_node_name(struct device_node *node) -{ - const char *name; - - if (of_property_read_string(node, "label", &name) < 0) - name = node->name; - if (!name) - name = "unknown"; - return name; -} - /* Module management routines */ static int netcp_register_interface(struct netcp_intf *netcp) { @@ -267,7 +256,12 @@ static int netcp_module_probe(struct netcp_device *netcp_device, } for_each_available_child_of_node(devices, child) { - const char *name = netcp_node_name(child); + const char *name; + char node_name[32]; + + if (of_property_read_string(node, "label", &name) < 0) + snprintf(node_name, sizeof(node_name), "%pOFn", child); + name = node_name; if (!strcasecmp(module->name, name)) break; @@ -2209,8 +2203,8 @@ static int netcp_probe(struct platform_device *pdev) for_each_available_child_of_node(interfaces, child) { ret = netcp_create_interface(netcp_device, child); if (ret) { - dev_err(dev, "could not create interface(%s)\n", - child->name); + dev_err(dev, "could not create interface(%pOFn)\n", + child); goto probe_quit_interface; } } diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c index 72b98e27c992..0397ccb6597e 100644 --- a/drivers/net/ethernet/ti/netcp_ethss.c +++ b/drivers/net/ethernet/ti/netcp_ethss.c @@ -3137,15 +3137,15 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev, for_each_child_of_node(node, port) { slave = devm_kzalloc(dev, sizeof(*slave), GFP_KERNEL); if (!slave) { - dev_err(dev, "memory alloc failed for secondary port(%s), skipping...\n", - port->name); + dev_err(dev, "memory alloc failed for secondary port(%pOFn), skipping...\n", + port); continue; } if (init_slave(gbe_dev, slave, port)) { dev_err(dev, - "Failed to initialize secondary port(%s), skipping...\n", - port->name); + "Failed to initialize secondary port(%pOFn), skipping...\n", + port); devm_kfree(dev, slave); continue; } @@ -3239,8 +3239,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, XGBE_SS_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't xlate xgbe of node(%s) ss address at %d\n", - node->name, XGBE_SS_REG_INDEX); + "Can't xlate xgbe of node(%pOFn) ss address at %d\n", + node, XGBE_SS_REG_INDEX); return ret; } @@ -3254,8 +3254,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, XGBE_SM_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't xlate xgbe of node(%s) sm address at %d\n", - node->name, XGBE_SM_REG_INDEX); + "Can't xlate xgbe of node(%pOFn) sm address at %d\n", + node, XGBE_SM_REG_INDEX); return ret; } @@ -3269,8 +3269,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, XGBE_SERDES_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't xlate xgbe serdes of node(%s) address at %d\n", - node->name, XGBE_SERDES_REG_INDEX); + "Can't xlate xgbe serdes of node(%pOFn) address at %d\n", + node, XGBE_SERDES_REG_INDEX); return ret; } @@ -3347,8 +3347,8 @@ static int get_gbe_resource_version(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, GBE_SS_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't translate of node(%s) of gbe ss address at %d\n", - node->name, GBE_SS_REG_INDEX); + "Can't translate of node(%pOFn) of gbe ss address at %d\n", + node, GBE_SS_REG_INDEX); return ret; } @@ -3372,8 +3372,8 @@ static int set_gbe_ethss14_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, GBE_SGMII34_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't translate of gbe node(%s) address at index %d\n", - node->name, GBE_SGMII34_REG_INDEX); + "Can't translate of gbe node(%pOFn) address at index %d\n", + node, GBE_SGMII34_REG_INDEX); return ret; } @@ -3388,8 +3388,8 @@ static int set_gbe_ethss14_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, GBE_SM_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't translate of gbe node(%s) address at index %d\n", - node->name, GBE_SM_REG_INDEX); + "Can't translate of gbe node(%pOFn) address at index %d\n", + node, GBE_SM_REG_INDEX); return ret; } @@ -3498,8 +3498,8 @@ static int set_gbenu_ethss_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, GBENU_SM_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't translate of gbenu node(%s) addr at index %d\n", - node->name, GBENU_SM_REG_INDEX); + "Can't translate of gbenu node(%pOFn) addr at index %d\n", + node, GBENU_SM_REG_INDEX); return ret; } @@ -3642,7 +3642,7 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, ret = netcp_xgbe_serdes_init(gbe_dev->xgbe_serdes_regs, gbe_dev->ss_regs); } else { - dev_err(dev, "unknown GBE node(%s)\n", node->name); + dev_err(dev, "unknown GBE node(%pOFn)\n", node); ret = -ENODEV; } @@ -3667,8 +3667,8 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, for_each_child_of_node(interfaces, interface) { ret = of_property_read_u32(interface, "slave-port", &slave_num); if (ret) { - dev_err(dev, "missing slave-port parameter, skipping interface configuration for %s\n", - interface->name); + dev_err(dev, "missing slave-port parameter, skipping interface configuration for %pOFn\n", + interface); continue; } gbe_dev->num_slaves++; -- 2.17.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2] net: ethernet: Convert to using %pOFn instead of device_node.name 2018-08-28 1:52 ` [PATCH] net: ethernet: Convert to using %pOFn instead of device_node.name Rob Herring @ 2018-08-28 15:44 ` Rob Herring 2018-08-28 15:45 ` Matthias Brugger ` (2 more replies) 0 siblings, 3 replies; 10+ messages in thread From: Rob Herring @ 2018-08-28 15:44 UTC (permalink / raw) To: linux-kernel Cc: David S. Miller, Yisen Zhuang, Salil Mehta, Sebastian Hesselbarth, Felix Fietkau, John Crispin, Sean Wang, Nelson Chang, Matthias Brugger, Wingman Kwok, Murali Karicheri, netdev 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> --- v2: - fix missing brackets in netcp drivers/net/ethernet/freescale/fsl_pq_mdio.c | 4 +- .../net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 8 ++-- drivers/net/ethernet/marvell/mv643xx_eth.c | 6 +-- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- drivers/net/ethernet/sun/sunhme.c | 2 +- drivers/net/ethernet/ti/netcp_core.c | 22 ++++------ drivers/net/ethernet/ti/netcp_ethss.c | 42 +++++++++---------- 7 files changed, 40 insertions(+), 46 deletions(-) diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c index ac2c3f6a12bc..82722d05fedb 100644 --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c @@ -446,8 +446,8 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev) goto error; } - snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s@%llx", np->name, - (unsigned long long)res.start); + snprintf(new_bus->id, MII_BUS_ID_SIZE, "%pOFn@%llx", np, + (unsigned long long)res.start); priv->map = of_iomap(np, 0); if (!priv->map) { diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c index 1c2326bd76e2..6521d8d53745 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c @@ -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); diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 62f204f32316..1e9bcbdc6a90 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -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; } diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 6e6abdc399de..b44bcfd85b05 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -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: diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 06da2f59fcbf..863fd602fd33 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -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"); diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index a1d335a3c5e4..1f612268c998 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -225,17 +225,6 @@ static int emac_arch_get_mac_addr(char *x, void __iomem *efuse_mac, u32 swap) return 0; } -static const char *netcp_node_name(struct device_node *node) -{ - const char *name; - - if (of_property_read_string(node, "label", &name) < 0) - name = node->name; - if (!name) - name = "unknown"; - return name; -} - /* Module management routines */ static int netcp_register_interface(struct netcp_intf *netcp) { @@ -267,8 +256,13 @@ static int netcp_module_probe(struct netcp_device *netcp_device, } for_each_available_child_of_node(devices, child) { - const char *name = netcp_node_name(child); + const char *name; + char node_name[32]; + if (of_property_read_string(node, "label", &name) < 0) { + snprintf(node_name, sizeof(node_name), "%pOFn", child); + name = node_name; + } if (!strcasecmp(module->name, name)) break; } @@ -2209,8 +2203,8 @@ static int netcp_probe(struct platform_device *pdev) for_each_available_child_of_node(interfaces, child) { ret = netcp_create_interface(netcp_device, child); if (ret) { - dev_err(dev, "could not create interface(%s)\n", - child->name); + dev_err(dev, "could not create interface(%pOFn)\n", + child); goto probe_quit_interface; } } diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c index 72b98e27c992..0397ccb6597e 100644 --- a/drivers/net/ethernet/ti/netcp_ethss.c +++ b/drivers/net/ethernet/ti/netcp_ethss.c @@ -3137,15 +3137,15 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev, for_each_child_of_node(node, port) { slave = devm_kzalloc(dev, sizeof(*slave), GFP_KERNEL); if (!slave) { - dev_err(dev, "memory alloc failed for secondary port(%s), skipping...\n", - port->name); + dev_err(dev, "memory alloc failed for secondary port(%pOFn), skipping...\n", + port); continue; } if (init_slave(gbe_dev, slave, port)) { dev_err(dev, - "Failed to initialize secondary port(%s), skipping...\n", - port->name); + "Failed to initialize secondary port(%pOFn), skipping...\n", + port); devm_kfree(dev, slave); continue; } @@ -3239,8 +3239,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, XGBE_SS_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't xlate xgbe of node(%s) ss address at %d\n", - node->name, XGBE_SS_REG_INDEX); + "Can't xlate xgbe of node(%pOFn) ss address at %d\n", + node, XGBE_SS_REG_INDEX); return ret; } @@ -3254,8 +3254,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, XGBE_SM_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't xlate xgbe of node(%s) sm address at %d\n", - node->name, XGBE_SM_REG_INDEX); + "Can't xlate xgbe of node(%pOFn) sm address at %d\n", + node, XGBE_SM_REG_INDEX); return ret; } @@ -3269,8 +3269,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, XGBE_SERDES_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't xlate xgbe serdes of node(%s) address at %d\n", - node->name, XGBE_SERDES_REG_INDEX); + "Can't xlate xgbe serdes of node(%pOFn) address at %d\n", + node, XGBE_SERDES_REG_INDEX); return ret; } @@ -3347,8 +3347,8 @@ static int get_gbe_resource_version(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, GBE_SS_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't translate of node(%s) of gbe ss address at %d\n", - node->name, GBE_SS_REG_INDEX); + "Can't translate of node(%pOFn) of gbe ss address at %d\n", + node, GBE_SS_REG_INDEX); return ret; } @@ -3372,8 +3372,8 @@ static int set_gbe_ethss14_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, GBE_SGMII34_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't translate of gbe node(%s) address at index %d\n", - node->name, GBE_SGMII34_REG_INDEX); + "Can't translate of gbe node(%pOFn) address at index %d\n", + node, GBE_SGMII34_REG_INDEX); return ret; } @@ -3388,8 +3388,8 @@ static int set_gbe_ethss14_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, GBE_SM_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't translate of gbe node(%s) address at index %d\n", - node->name, GBE_SM_REG_INDEX); + "Can't translate of gbe node(%pOFn) address at index %d\n", + node, GBE_SM_REG_INDEX); return ret; } @@ -3498,8 +3498,8 @@ static int set_gbenu_ethss_priv(struct gbe_priv *gbe_dev, ret = of_address_to_resource(node, GBENU_SM_REG_INDEX, &res); if (ret) { dev_err(gbe_dev->dev, - "Can't translate of gbenu node(%s) addr at index %d\n", - node->name, GBENU_SM_REG_INDEX); + "Can't translate of gbenu node(%pOFn) addr at index %d\n", + node, GBENU_SM_REG_INDEX); return ret; } @@ -3642,7 +3642,7 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, ret = netcp_xgbe_serdes_init(gbe_dev->xgbe_serdes_regs, gbe_dev->ss_regs); } else { - dev_err(dev, "unknown GBE node(%s)\n", node->name); + dev_err(dev, "unknown GBE node(%pOFn)\n", node); ret = -ENODEV; } @@ -3667,8 +3667,8 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, for_each_child_of_node(interfaces, interface) { ret = of_property_read_u32(interface, "slave-port", &slave_num); if (ret) { - dev_err(dev, "missing slave-port parameter, skipping interface configuration for %s\n", - interface->name); + dev_err(dev, "missing slave-port parameter, skipping interface configuration for %pOFn\n", + interface); continue; } gbe_dev->num_slaves++; -- 2.17.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2] net: ethernet: Convert to using %pOFn instead of device_node.name 2018-08-28 15:44 ` [PATCH v2] " Rob Herring @ 2018-08-28 15:45 ` Matthias Brugger 2018-08-29 2:06 ` Sean Wang 2018-08-30 2:41 ` David Miller 2 siblings, 0 replies; 10+ messages in thread From: Matthias Brugger @ 2018-08-28 15:45 UTC (permalink / raw) To: Rob Herring, linux-kernel Cc: David S. Miller, Yisen Zhuang, Salil Mehta, Sebastian Hesselbarth, Felix Fietkau, John Crispin, Sean Wang, Nelson Chang, Wingman Kwok, Murali Karicheri, netdev On 28/08/18 17:44, Rob Herring wrote: > drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] net: ethernet: Convert to using %pOFn instead of device_node.name 2018-08-28 15:44 ` [PATCH v2] " Rob Herring 2018-08-28 15:45 ` Matthias Brugger @ 2018-08-29 2:06 ` Sean Wang 2018-08-30 2:41 ` David Miller 2 siblings, 0 replies; 10+ messages in thread From: Sean Wang @ 2018-08-29 2:06 UTC (permalink / raw) To: Rob Herring Cc: linux-kernel, David S. Miller, Yisen Zhuang, Salil Mehta, Sebastian Hesselbarth, Felix Fietkau, John Crispin, Nelson Chang, Matthias Brugger, Wingman Kwok, Murali Karicheri, netdev On Tue, 2018-08-28 at 10:44 -0500, Rob Herring wrote: > 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> > --- > v2: > - fix missing brackets in netcp > > drivers/net/ethernet/freescale/fsl_pq_mdio.c | 4 +- > .../net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 8 ++-- > drivers/net/ethernet/marvell/mv643xx_eth.c | 6 +-- > drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- for mtk-eth Acked-by: Sean Wang <sean.wang@mediatek.com> > drivers/net/ethernet/sun/sunhme.c | 2 +- > drivers/net/ethernet/ti/netcp_core.c | 22 ++++------ > drivers/net/ethernet/ti/netcp_ethss.c | 42 +++++++++---------- > 7 files changed, 40 insertions(+), 46 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c > index ac2c3f6a12bc..82722d05fedb 100644 > --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c > +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c > @@ -446,8 +446,8 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev) > goto error; > } > > - snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s@%llx", np->name, > - (unsigned long long)res.start); > + snprintf(new_bus->id, MII_BUS_ID_SIZE, "%pOFn@%llx", np, > + (unsigned long long)res.start); > > priv->map = of_iomap(np, 0); > if (!priv->map) { > diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c > index 1c2326bd76e2..6521d8d53745 100644 > --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c > +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c > @@ -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); > > diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c > index 62f204f32316..1e9bcbdc6a90 100644 > --- a/drivers/net/ethernet/marvell/mv643xx_eth.c > +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c > @@ -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; > } > > diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > index 6e6abdc399de..b44bcfd85b05 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > @@ -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: > diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c > index 06da2f59fcbf..863fd602fd33 100644 > --- a/drivers/net/ethernet/sun/sunhme.c > +++ b/drivers/net/ethernet/sun/sunhme.c > @@ -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"); > diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c > index a1d335a3c5e4..1f612268c998 100644 > --- a/drivers/net/ethernet/ti/netcp_core.c > +++ b/drivers/net/ethernet/ti/netcp_core.c > @@ -225,17 +225,6 @@ static int emac_arch_get_mac_addr(char *x, void __iomem *efuse_mac, u32 swap) > return 0; > } > > -static const char *netcp_node_name(struct device_node *node) > -{ > - const char *name; > - > - if (of_property_read_string(node, "label", &name) < 0) > - name = node->name; > - if (!name) > - name = "unknown"; > - return name; > -} > - > /* Module management routines */ > static int netcp_register_interface(struct netcp_intf *netcp) > { > @@ -267,8 +256,13 @@ static int netcp_module_probe(struct netcp_device *netcp_device, > } > > for_each_available_child_of_node(devices, child) { > - const char *name = netcp_node_name(child); > + const char *name; > + char node_name[32]; > > + if (of_property_read_string(node, "label", &name) < 0) { > + snprintf(node_name, sizeof(node_name), "%pOFn", child); > + name = node_name; > + } > if (!strcasecmp(module->name, name)) > break; > } > @@ -2209,8 +2203,8 @@ static int netcp_probe(struct platform_device *pdev) > for_each_available_child_of_node(interfaces, child) { > ret = netcp_create_interface(netcp_device, child); > if (ret) { > - dev_err(dev, "could not create interface(%s)\n", > - child->name); > + dev_err(dev, "could not create interface(%pOFn)\n", > + child); > goto probe_quit_interface; > } > } > diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c > index 72b98e27c992..0397ccb6597e 100644 > --- a/drivers/net/ethernet/ti/netcp_ethss.c > +++ b/drivers/net/ethernet/ti/netcp_ethss.c > @@ -3137,15 +3137,15 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev, > for_each_child_of_node(node, port) { > slave = devm_kzalloc(dev, sizeof(*slave), GFP_KERNEL); > if (!slave) { > - dev_err(dev, "memory alloc failed for secondary port(%s), skipping...\n", > - port->name); > + dev_err(dev, "memory alloc failed for secondary port(%pOFn), skipping...\n", > + port); > continue; > } > > if (init_slave(gbe_dev, slave, port)) { > dev_err(dev, > - "Failed to initialize secondary port(%s), skipping...\n", > - port->name); > + "Failed to initialize secondary port(%pOFn), skipping...\n", > + port); > devm_kfree(dev, slave); > continue; > } > @@ -3239,8 +3239,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev, > ret = of_address_to_resource(node, XGBE_SS_REG_INDEX, &res); > if (ret) { > dev_err(gbe_dev->dev, > - "Can't xlate xgbe of node(%s) ss address at %d\n", > - node->name, XGBE_SS_REG_INDEX); > + "Can't xlate xgbe of node(%pOFn) ss address at %d\n", > + node, XGBE_SS_REG_INDEX); > return ret; > } > > @@ -3254,8 +3254,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev, > ret = of_address_to_resource(node, XGBE_SM_REG_INDEX, &res); > if (ret) { > dev_err(gbe_dev->dev, > - "Can't xlate xgbe of node(%s) sm address at %d\n", > - node->name, XGBE_SM_REG_INDEX); > + "Can't xlate xgbe of node(%pOFn) sm address at %d\n", > + node, XGBE_SM_REG_INDEX); > return ret; > } > > @@ -3269,8 +3269,8 @@ static int set_xgbe_ethss10_priv(struct gbe_priv *gbe_dev, > ret = of_address_to_resource(node, XGBE_SERDES_REG_INDEX, &res); > if (ret) { > dev_err(gbe_dev->dev, > - "Can't xlate xgbe serdes of node(%s) address at %d\n", > - node->name, XGBE_SERDES_REG_INDEX); > + "Can't xlate xgbe serdes of node(%pOFn) address at %d\n", > + node, XGBE_SERDES_REG_INDEX); > return ret; > } > > @@ -3347,8 +3347,8 @@ static int get_gbe_resource_version(struct gbe_priv *gbe_dev, > ret = of_address_to_resource(node, GBE_SS_REG_INDEX, &res); > if (ret) { > dev_err(gbe_dev->dev, > - "Can't translate of node(%s) of gbe ss address at %d\n", > - node->name, GBE_SS_REG_INDEX); > + "Can't translate of node(%pOFn) of gbe ss address at %d\n", > + node, GBE_SS_REG_INDEX); > return ret; > } > > @@ -3372,8 +3372,8 @@ static int set_gbe_ethss14_priv(struct gbe_priv *gbe_dev, > ret = of_address_to_resource(node, GBE_SGMII34_REG_INDEX, &res); > if (ret) { > dev_err(gbe_dev->dev, > - "Can't translate of gbe node(%s) address at index %d\n", > - node->name, GBE_SGMII34_REG_INDEX); > + "Can't translate of gbe node(%pOFn) address at index %d\n", > + node, GBE_SGMII34_REG_INDEX); > return ret; > } > > @@ -3388,8 +3388,8 @@ static int set_gbe_ethss14_priv(struct gbe_priv *gbe_dev, > ret = of_address_to_resource(node, GBE_SM_REG_INDEX, &res); > if (ret) { > dev_err(gbe_dev->dev, > - "Can't translate of gbe node(%s) address at index %d\n", > - node->name, GBE_SM_REG_INDEX); > + "Can't translate of gbe node(%pOFn) address at index %d\n", > + node, GBE_SM_REG_INDEX); > return ret; > } > > @@ -3498,8 +3498,8 @@ static int set_gbenu_ethss_priv(struct gbe_priv *gbe_dev, > ret = of_address_to_resource(node, GBENU_SM_REG_INDEX, &res); > if (ret) { > dev_err(gbe_dev->dev, > - "Can't translate of gbenu node(%s) addr at index %d\n", > - node->name, GBENU_SM_REG_INDEX); > + "Can't translate of gbenu node(%pOFn) addr at index %d\n", > + node, GBENU_SM_REG_INDEX); > return ret; > } > > @@ -3642,7 +3642,7 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, > ret = netcp_xgbe_serdes_init(gbe_dev->xgbe_serdes_regs, > gbe_dev->ss_regs); > } else { > - dev_err(dev, "unknown GBE node(%s)\n", node->name); > + dev_err(dev, "unknown GBE node(%pOFn)\n", node); > ret = -ENODEV; > } > > @@ -3667,8 +3667,8 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, > for_each_child_of_node(interfaces, interface) { > ret = of_property_read_u32(interface, "slave-port", &slave_num); > if (ret) { > - dev_err(dev, "missing slave-port parameter, skipping interface configuration for %s\n", > - interface->name); > + dev_err(dev, "missing slave-port parameter, skipping interface configuration for %pOFn\n", > + interface); > continue; > } > gbe_dev->num_slaves++; > -- > 2.17.1 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] net: ethernet: Convert to using %pOFn instead of device_node.name 2018-08-28 15:44 ` [PATCH v2] " Rob Herring 2018-08-28 15:45 ` Matthias Brugger 2018-08-29 2:06 ` Sean Wang @ 2018-08-30 2:41 ` David Miller 2 siblings, 0 replies; 10+ messages in thread From: David Miller @ 2018-08-30 2:41 UTC (permalink / raw) To: robh Cc: linux-kernel, yisen.zhuang, salil.mehta, sebastian.hesselbarth, nbd, john, sean.wang, nelson.chang, matthias.bgg, w-kwok2, m-karicheri2, netdev From: Rob Herring <robh@kernel.org> Date: Tue, 28 Aug 2018 10:44:30 -0500 > In preparation to remove the node name pointer from struct device_node, > convert printf users to use the %pOFn format specifier. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > v2: > - fix missing brackets in netcp Applied to net-next. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] net: phy: Convert to using %pOFn instead of device_node.name [not found] <20180828015252.28511-1-robh@kernel.org> 2018-08-28 1:52 ` [PATCH] net: ethernet: Convert to using %pOFn instead of device_node.name Rob Herring @ 2018-08-28 1:52 ` Rob Herring 2018-08-28 16:57 ` Florian Fainelli 2018-08-28 1:52 ` [PATCH] net: wireless: ath: " Rob Herring 2 siblings, 1 reply; 10+ messages in thread From: Rob Herring @ 2018-08-28 1:52 UTC (permalink / raw) To: linux-kernel; +Cc: Andrew Lunn, Florian Fainelli, David S. Miller, netdev In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Cc: Andrew Lunn <andrew@lunn.ch> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/net/phy/mdio-thunder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/mdio-thunder.c b/drivers/net/phy/mdio-thunder.c index 564616968cad..1546f6398831 100644 --- a/drivers/net/phy/mdio-thunder.c +++ b/drivers/net/phy/mdio-thunder.c @@ -73,8 +73,8 @@ static int thunder_mdiobus_pci_probe(struct pci_dev *pdev, err = of_address_to_resource(node, 0, &r); if (err) { dev_err(&pdev->dev, - "Couldn't translate address for \"%s\"\n", - node->name); + "Couldn't translate address for \"%pOFn\"\n", + node); break; } -- 2.17.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] net: phy: Convert to using %pOFn instead of device_node.name 2018-08-28 1:52 ` [PATCH] net: phy: " Rob Herring @ 2018-08-28 16:57 ` Florian Fainelli 0 siblings, 0 replies; 10+ messages in thread From: Florian Fainelli @ 2018-08-28 16:57 UTC (permalink / raw) To: Rob Herring, linux-kernel; +Cc: Andrew Lunn, David S. Miller, netdev On 08/27/2018 06:52 PM, Rob Herring wrote: > In preparation to remove the node name pointer from struct device_node, > convert printf users to use the %pOFn format specifier. > > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Florian Fainelli <f.fainelli@gmail.com> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: netdev@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> -- Florian ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] net: wireless: ath: Convert to using %pOFn instead of device_node.name [not found] <20180828015252.28511-1-robh@kernel.org> 2018-08-28 1:52 ` [PATCH] net: ethernet: Convert to using %pOFn instead of device_node.name Rob Herring 2018-08-28 1:52 ` [PATCH] net: phy: " Rob Herring @ 2018-08-28 1:52 ` Rob Herring 2018-08-28 11:19 ` Kalle Valo 2018-09-03 16:58 ` Kalle Valo 2 siblings, 2 replies; 10+ messages in thread From: Rob Herring @ 2018-08-28 1:52 UTC (permalink / raw) To: linux-kernel; +Cc: Kalle Valo, David S. Miller, linux-wireless, netdev In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Cc: Kalle Valo <kvalo@codeaurora.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/net/wireless/ath/ath6kl/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c index 58fb227a849f..54132af70094 100644 --- a/drivers/net/wireless/ath/ath6kl/init.c +++ b/drivers/net/wireless/ath/ath6kl/init.c @@ -710,8 +710,8 @@ static bool check_device_tree(struct ath6kl *ar) for_each_compatible_node(node, NULL, "atheros,ath6kl") { board_id = of_get_property(node, board_id_prop, NULL); if (board_id == NULL) { - ath6kl_warn("No \"%s\" property on %s node.\n", - board_id_prop, node->name); + ath6kl_warn("No \"%s\" property on %pOFn node.\n", + board_id_prop, node); continue; } snprintf(board_filename, sizeof(board_filename), -- 2.17.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] net: wireless: ath: Convert to using %pOFn instead of device_node.name 2018-08-28 1:52 ` [PATCH] net: wireless: ath: " Rob Herring @ 2018-08-28 11:19 ` Kalle Valo 2018-09-03 16:58 ` Kalle Valo 1 sibling, 0 replies; 10+ messages in thread From: Kalle Valo @ 2018-08-28 11:19 UTC (permalink / raw) To: Rob Herring; +Cc: linux-kernel, David S. Miller, linux-wireless, netdev Rob Herring <robh@kernel.org> writes: > In preparation to remove the node name pointer from struct device_node, > convert printf users to use the %pOFn format specifier. > > Cc: Kalle Valo <kvalo@codeaurora.org> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: linux-wireless@vger.kernel.org > Cc: netdev@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- > drivers/net/wireless/ath/ath6kl/init.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) The correct prefix is "ath6kl:" but I can fix that. -- Kalle Valo ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] net: wireless: ath: Convert to using %pOFn instead of device_node.name 2018-08-28 1:52 ` [PATCH] net: wireless: ath: " Rob Herring 2018-08-28 11:19 ` Kalle Valo @ 2018-09-03 16:58 ` Kalle Valo 1 sibling, 0 replies; 10+ messages in thread From: Kalle Valo @ 2018-09-03 16:58 UTC (permalink / raw) To: Rob Herring; +Cc: linux-kernel, David S. Miller, linux-wireless, netdev Rob Herring <robh@kernel.org> wrote: > In preparation to remove the node name pointer from struct device_node, > convert printf users to use the %pOFn format specifier. > > Cc: Kalle Valo <kvalo@codeaurora.org> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: linux-wireless@vger.kernel.org > Cc: netdev@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Patch applied to ath-next branch of ath.git, thanks. e12e643c1dfb ath6kl: convert to using %pOFn instead of device_node.name -- https://patchwork.kernel.org/patch/10577811/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-09-03 16:58 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <20180828015252.28511-1-robh@kernel.org> 2018-08-28 1:52 ` [PATCH] net: ethernet: Convert to using %pOFn instead of device_node.name Rob Herring 2018-08-28 15:44 ` [PATCH v2] " Rob Herring 2018-08-28 15:45 ` Matthias Brugger 2018-08-29 2:06 ` Sean Wang 2018-08-30 2:41 ` David Miller 2018-08-28 1:52 ` [PATCH] net: phy: " Rob Herring 2018-08-28 16:57 ` Florian Fainelli 2018-08-28 1:52 ` [PATCH] net: wireless: ath: " Rob Herring 2018-08-28 11:19 ` Kalle Valo 2018-09-03 16:58 ` Kalle Valo
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).