From patchwork Wed Dec 5 19:50:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 152964 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp9696908ljp; Wed, 5 Dec 2018 11:53:04 -0800 (PST) X-Google-Smtp-Source: AFSGD/VhDik57OjSgE8u/vgrjsUdda/Dr59yEIvGfkIzh6017qKIxDjhlf6XQmuCNlaByA1Izl9/ X-Received: by 2002:a63:cb4a:: with SMTP id m10mr20730223pgi.105.1544039584564; Wed, 05 Dec 2018 11:53:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544039584; cv=none; d=google.com; s=arc-20160816; b=LHEq76CVxZ+/evuM+7TJpWpzPIxIg4d4o7EZkoDOLGG5u+MXKmBww4JWzD80cett7h vNxEL6J35ooB7q4F4DGJ9UY68B2kYnPRlP8a92PfEn8NrZBL0nJEQH32kKEWavJoGa8Y sTc2KlQKG3Q3iYhaiCUSH9W8aF6+36xUqcTUgMpA7qDtcNtOS3qHmYp/RSktV9uBFeTx FFQJfFsJRgbDIwXW0KVOdtupwApHsIqmECXZowEWmVnpI7voS8n7lOSd3Iek5t8SO/Ip hCF0AegZLCeJNZQm2C6EZAeZpgVa/Vn1ELXu6AHjuV6DtPmri39lsK2IbW/35EUmq9cD 1dRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=64JnrfkdMgu2EPsvD7FnBPzsb1bi6pVhE4y3hEeScxc=; b=sOMQzWdlnuHaGESkDqYW3Be/Rf5+b83q3ZGALVAbK4qGimcICrG6Tej2srZ7iv8mbj MkwPQU6EDz7rdKhx9Zkf9BJFAKSBHzryYsWhLgExU+RN5z79659xNiqC+py3kbDLXe1T UA+UfklFK16MwcB4smBL76iN0ANg95+wHUUThs6Fyq/1LwYHaTd2M0fzYyrzapaVcucX wd4TtcehwIPMz5FejWbE3/fiC1028D2OvFO9hTuPMy5kOiYwxdPjUfLir8ftmB7Efoqb 9yw2OhlQzFnvTVIIWywHrmU8ZiZo6884S2osaz9q5NShlDgNJw7YDcODj0USUi8naP5u wD+A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r17si18805981pgh.299.2018.12.05.11.53.04; Wed, 05 Dec 2018 11:53:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729005AbeLETxD (ORCPT + 31 others); Wed, 5 Dec 2018 14:53:03 -0500 Received: from mail-oi1-f195.google.com ([209.85.167.195]:37455 "EHLO mail-oi1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728736AbeLETvK (ORCPT ); Wed, 5 Dec 2018 14:51:10 -0500 Received: by mail-oi1-f195.google.com with SMTP id y23so18657580oia.4; Wed, 05 Dec 2018 11:51:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=64JnrfkdMgu2EPsvD7FnBPzsb1bi6pVhE4y3hEeScxc=; b=mqjDfWdVbSw45pQziyZXy2CgJWYzD0ANgBTFYhbPCITKaMXsx8NJ/9nIHHqIzwlJ9V U0uOCiMFO7LYxY8LePnuvCXcElCE5d7UMhWSxiasOiWl7BBWTPVUj1o8L9RFLZzQodCy vgvxOoqVb4DpOizAPdTexV0RHp8bnzBfOuuNXMMZTx0YaKVpRFmyyfN0Z5z0/jXCzNhr AOasw0QvzNhKbtpExMpqPnDOjRFYNvXMxaTCUuI3Qexwwv/cEoLluzvbYXSS+/A3SHVX iNps5A8Og3CN2Rg5curDngsWHCVk/tCa2/hU5VHDKO+1V71HKKyJW4bKuDjE02jUUaE4 xh/Q== X-Gm-Message-State: AA+aEWb2yYzPgnOmgbEU7If7VyqOj59w58g7Dx2+F2P2QR4zmMWt1TEw zVfMHi4TJcKvpXB1dlnSFUUISLk= X-Received: by 2002:aca:aad8:: with SMTP id t207mr14705306oie.90.1544039468996; Wed, 05 Dec 2018 11:51:08 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id k13sm25759879otj.19.2018.12.05.11.51.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 11:51:08 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "David S. Miller" , Claudiu Manoil , Grygorii Strashko , Wingman Kwok , Murali Karicheri , netdev@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH] net: Use of_node_name_eq for node name comparisons Date: Wed, 5 Dec 2018 13:50:32 -0600 Message-Id: <20181205195050.4759-16-robh@kernel.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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" Cc: Claudiu Manoil Cc: Grygorii Strashko Cc: Wingman Kwok Cc: Murali Karicheri Cc: netdev@vger.kernel.org Cc: linux-omap@vger.kernel.org Signed-off-by: Rob Herring --- 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(-) -- 2.19.1 diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c index b4fc0ed5bce8..91c9140d2a52 100644 --- a/drivers/net/ethernet/amd/sunlance.c +++ b/drivers/net/ethernet/amd/sunlance.c @@ -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); diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 3c8da1a18ba0..7b5f08725b5b 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -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); diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 863fd602fd33..ff641cf30a4e 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -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) { diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 500f7ed8c58c..aeb599f230ab 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -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)) diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c index 0397ccb6597e..bfde91ca5df7 100644 --- a/drivers/net/ethernet/ti/netcp_ethss.c +++ b/drivers/net/ethernet/ti/netcp_ethss.c @@ -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;