net: Use of_node_name_eq for node name comparisons
Subsystems (5)
PATCH 1/1 net: 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.
For instances using of_node_cmp, this has the side effect of now using case sensitive comparisons. This should not matter for any FDT based system which all of these are.
Cc "David S. Miller" <[email protected]>
Cc Claudiu Manoil <[email protected]>
Cc Grygorii Strashko <[email protected]>
Cc Wingman Kwok <[email protected]>
Cc Murali Karicheri <[email protected]>
Signed-off-by Rob Herring <[email protected]>
--- drivers/net/ethernet/amd/sunlance.c | 4 ++-- drivers/net/ethernet/freescale/gianfar.c | 4 ++-- drivers/net/ethernet/sun/sunhme.c | 2 +- drivers/net/ethernet/ti/cpsw.c | 4 ++-- drivers/net/ethernet/ti/netcp_ethss.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
drivers/net/ethernet/amd/sunlance.c +2 -2
@@ -1486,9 +1486,9 @@ static int sunlance_sbus_probe(struct platform_device *op)struct device_node *parent_dp = parent->dev.of_node;int err; -if (!strcmp (parent_dp->name,"ledma" )) { +if (of_node_name_eq (parent_dp,"ledma" )) { err =sparc_lance_probe_one (op, parent,NULL ); - }else if (!strcmp (parent_dp->name,"lebuffer" )) { + }else if (of_node_name_eq (parent_dp,"lebuffer" )) { err =sparc_lance_probe_one (op,NULL , parent); }else err =sparc_lance_probe_one (op,NULL ,NULL );
drivers/net/ethernet/freescale/gianfar.c +2 -2
@@ -720,7 +720,7 @@ static int gfar_of_group_count(struct device_node *np)int num =0 ;for_each_available_child_of_node (np, child) -if (!of_node_cmp (child->name,"queue-group" )) +if (of_node_name_eq (child,"queue-group" )) num++;return num;
@@ -838,7 +838,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)/* Parse and initialize group specific information */ if (priv->mode ==MQ_MG_MODE ) {for_each_available_child_of_node (np, child) { -if (of_node_cmp (child->name,"queue-group" )) +if (!of_node_name_eq (child,"queue-group" ))continue ; err =gfar_parse_group (child, priv, model);
drivers/net/ethernet/sun/sunhme.c +1 -1
@@ -2691,7 +2691,7 @@ static int happy_meal_sbus_probe_one(struct platform_device *op, int is_qfe) sbus_dp = op->dev.parent->of_node;/* We can match PCI devices too, do not accept those here. */ -if (strcmp (sbus_dp->name,"sbus" ) &&strcmp (sbus_dp->name,"sbi" )) +if (!of_node_name_eq (sbus_dp,"sbus" ) && !of_node_name_eq (sbus_dp,"sbi" ))return err;if (is_qfe) {
drivers/net/ethernet/ti/cpsw.c +2 -2
@@ -3144,7 +3144,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,const __be32 *parp;/* This is no slave child node, continue */ -if (strcmp (slave_node->name,"slave" )) +if (!of_node_name_eq (slave_node,"slave" ))continue ; slave_data->phy_node = of_parse_phandle(slave_node,
@@ -3240,7 +3240,7 @@ static void cpsw_remove_dt(struct platform_device *pdev)for_each_available_child_of_node (node, slave_node) {struct cpsw_slave_data *slave_data = &data->slave_data[i]; -if (strcmp (slave_node->name,"slave" )) +if (!of_node_name_eq (slave_node,"slave" ))continue ;if (of_phy_is_fixed_link (slave_node))
drivers/net/ethernet/ti/netcp_ethss.c +2 -2
@@ -3621,7 +3621,7 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev,return -EINVAL ; } -if (!strcmp (node->name,"gbe" )) { +if (of_node_name_eq (node,"gbe" )) { ret =get_gbe_resource_version (gbe_dev, node);if (ret)return ret;
@@ -3635,7 +3635,7 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev,else ret = -ENODEV ; - }else if (!strcmp (node->name,"xgbe" )) { + }else if (of_node_name_eq (node,"xgbe" )) { ret =set_xgbe_ethss10_priv (gbe_dev, node);if (ret)return ret;
Signature · 1 line
2.19.1
From: Rob Herring <[email protected]>
Date: Wed, 5 Dec 2018 13:50:32 -0600
Quoted 7 lines
Convert string compares of DT node names to use
of_node_name_eqhelper instead. This removes direct access to the node name pointer.For instances using
of_node_cmp, this has the side effect of now using case sensitive comparisons. This should not matter for any FDT based system which all of these are.
Quoted 8 lines
Cc "David S. Miller" <[email protected]>Cc Claudiu Manoil <[email protected]>Cc Grygorii Strashko <[email protected]>Cc Wingman Kwok <[email protected]>Cc Murali Karicheri <[email protected]>Signed-off-by Rob Herring <[email protected]>
Applied to net-next, thanks Rob.