From: f.fainelli@gmail.com (Florian Fainelli)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH net-next v4 06/10] net: dsa: Migrate to device_find_in_class_name()
Date: Tue, 17 Jan 2017 15:21:48 -0800 [thread overview]
Message-ID: <20170117232152.1661-7-f.fainelli@gmail.com> (raw)
In-Reply-To: <20170117232152.1661-1-f.fainelli@gmail.com>
Now that the base device driver code provides an identical
implementation of dev_find_class() utilize device_find_in_class_name()
instead of our own version of it.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/dsa/dsa.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 2306d1b87c83..d9db63910887 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -455,29 +455,11 @@ EXPORT_SYMBOL_GPL(dsa_switch_resume);
#endif
/* platform driver init and cleanup *****************************************/
-static int dev_is_class(struct device *dev, void *class)
-{
- if (dev->class != NULL && !strcmp(dev->class->name, class))
- return 1;
-
- return 0;
-}
-
-static struct device *dev_find_class(struct device *parent, char *class)
-{
- if (dev_is_class(parent, class)) {
- get_device(parent);
- return parent;
- }
-
- return device_find_child(parent, class, dev_is_class);
-}
-
struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev)
{
struct device *d;
- d = dev_find_class(dev, "mdio_bus");
+ d = device_find_in_class_name(dev, "mdio_bus");
if (d != NULL) {
struct mii_bus *bus;
@@ -495,7 +477,7 @@ static struct net_device *dev_to_net_device(struct device *dev)
{
struct device *d;
- d = dev_find_class(dev, "net");
+ d = device_find_in_class_name(dev, "net");
if (d != NULL) {
struct net_device *nd;
--
2.9.3
WARNING: multiple messages have this Message-ID (diff)
From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
Gregory Clement <gregory.clement@free-electrons.com>,
Russell King <linux@armlinux.org.uk>,
Vivien Didelot <vivien.didelot@savoirfairelinux.com>,
"David S. Miller" <davem@davemloft.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-arm-kernel@lists.infradead.org (moderated list:ARM/Marvell
Dove/MV78xx0/Orion SOC support),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH net-next v4 06/10] net: dsa: Migrate to device_find_in_class_name()
Date: Tue, 17 Jan 2017 15:21:48 -0800 [thread overview]
Message-ID: <20170117232152.1661-7-f.fainelli@gmail.com> (raw)
In-Reply-To: <20170117232152.1661-1-f.fainelli@gmail.com>
Now that the base device driver code provides an identical
implementation of dev_find_class() utilize device_find_in_class_name()
instead of our own version of it.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/dsa/dsa.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 2306d1b87c83..d9db63910887 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -455,29 +455,11 @@ EXPORT_SYMBOL_GPL(dsa_switch_resume);
#endif
/* platform driver init and cleanup *****************************************/
-static int dev_is_class(struct device *dev, void *class)
-{
- if (dev->class != NULL && !strcmp(dev->class->name, class))
- return 1;
-
- return 0;
-}
-
-static struct device *dev_find_class(struct device *parent, char *class)
-{
- if (dev_is_class(parent, class)) {
- get_device(parent);
- return parent;
- }
-
- return device_find_child(parent, class, dev_is_class);
-}
-
struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev)
{
struct device *d;
- d = dev_find_class(dev, "mdio_bus");
+ d = device_find_in_class_name(dev, "mdio_bus");
if (d != NULL) {
struct mii_bus *bus;
@@ -495,7 +477,7 @@ static struct net_device *dev_to_net_device(struct device *dev)
{
struct device *d;
- d = dev_find_class(dev, "net");
+ d = device_find_in_class_name(dev, "net");
if (d != NULL) {
struct net_device *nd;
--
2.9.3
next prev parent reply other threads:[~2017-01-17 23:21 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 23:21 [PATCH net-next v4 00/10] net: dsa: Support for pdata in dsa2 Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 01/10] net: dsa: Pass device pointer to dsa_register_switch Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 02/10] net: dsa: Make most functions take a dsa_port argument Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 03/10] net: dsa: Suffix function manipulating device_node with _dn Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 04/10] net: dsa: Move ports assignment closer to error checking Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 05/10] drivers: base: Add device_find_in_class_name() Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:34 ` Andy Shevchenko
2017-01-17 23:34 ` Andy Shevchenko
2017-01-17 23:43 ` Florian Fainelli
2017-01-17 23:43 ` Florian Fainelli
2017-01-17 23:43 ` Florian Fainelli
2017-01-18 0:00 ` Andy Shevchenko
2017-01-18 0:00 ` Andy Shevchenko
2017-01-18 0:04 ` Florian Fainelli
2017-01-18 0:04 ` Florian Fainelli
2017-01-18 0:07 ` Andy Shevchenko
2017-01-18 0:07 ` Andy Shevchenko
2017-01-18 0:13 ` Florian Fainelli
2017-01-18 0:13 ` Florian Fainelli
2017-01-18 0:13 ` Florian Fainelli
2017-01-18 7:06 ` Greg Kroah-Hartman
2017-01-18 7:06 ` Greg Kroah-Hartman
2017-01-18 7:06 ` Greg Kroah-Hartman
2017-01-17 23:21 ` Florian Fainelli [this message]
2017-01-17 23:21 ` [PATCH net-next v4 06/10] net: dsa: Migrate to device_find_in_class_name() Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 07/10] net: Relocate dev_to_net_device() into net/core/dev.c Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 08/10] net: dsa: Add support for platform data Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 09/10] net: phy: Allow pre-declaration of MDIO devices Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-17 23:21 ` [PATCH net-next v4 10/10] ARM: orion: Register DSA switch as a MDIO device Florian Fainelli
2017-01-17 23:21 ` Florian Fainelli
2017-01-18 21:50 ` [PATCH net-next v4 00/10] net: dsa: Support for pdata in dsa2 David Miller
2017-01-18 21:50 ` David Miller
2017-01-18 22:06 ` Florian Fainelli
2017-01-18 22:06 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170117232152.1661-7-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.