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 07/10] net: Relocate dev_to_net_device() into net/core/dev.c
Date: Tue, 17 Jan 2017 15:21:49 -0800 [thread overview]
Message-ID: <20170117232152.1661-8-f.fainelli@gmail.com> (raw)
In-Reply-To: <20170117232152.1661-1-f.fainelli@gmail.com>
dev_to_net_device() is moved from net/dsa/dsa.c to net/core/dev.c since
it going to be used by net/dsa/dsa2.c and the namespace of the function
justifies making it available to other users potentially. We also rename
it to device_to_net_device() to better illustrate what it does since it
is not just a container_of() wrapper.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
include/linux/netdevice.h | 2 ++
net/core/dev.c | 30 ++++++++++++++++++++++++++++++
net/dsa/dsa.c | 20 +-------------------
3 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 97ae0ac513ee..f8cc9833107c 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4390,4 +4390,6 @@ do { \
#define PTYPE_HASH_SIZE (16)
#define PTYPE_HASH_MASK (PTYPE_HASH_SIZE - 1)
+struct net_device *device_to_net_device(struct device *dev);
+
#endif /* _LINUX_NETDEVICE_H */
diff --git a/net/core/dev.c b/net/core/dev.c
index ad5959e56116..f6897906f229 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -8128,6 +8128,36 @@ const char *netdev_drivername(const struct net_device *dev)
return empty;
}
+/**
+ * device_to_net_device - return the net_device from device
+ * @dev: device reference
+ *
+ * Returns the net_device associated with this device reference
+ * NULL if the device is not a network device, or could not be
+ * found.
+ *
+ * Note: caller must call dev_put() to release the net_device
+ * once done with it.
+ */
+struct net_device *device_to_net_device(struct device *dev)
+{
+ struct device *d;
+
+ d = device_find_in_class_name(dev, "net");
+ if (d) {
+ struct net_device *nd;
+
+ nd = to_net_dev(d);
+ dev_hold(nd);
+ put_device(d);
+
+ return nd;
+ }
+
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(device_to_net_device);
+
static void __netdev_printk(const char *level, const struct net_device *dev,
struct va_format *vaf)
{
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index d9db63910887..88b56f7e3dd2 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -473,24 +473,6 @@ struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev)
}
EXPORT_SYMBOL_GPL(dsa_host_dev_to_mii_bus);
-static struct net_device *dev_to_net_device(struct device *dev)
-{
- struct device *d;
-
- d = device_find_in_class_name(dev, "net");
- if (d != NULL) {
- struct net_device *nd;
-
- nd = to_net_dev(d);
- dev_hold(nd);
- put_device(d);
-
- return nd;
- }
-
- return NULL;
-}
-
#ifdef CONFIG_OF
static int dsa_of_setup_routing_table(struct dsa_platform_data *pd,
struct dsa_chip_data *cd,
@@ -799,7 +781,7 @@ static int dsa_probe(struct platform_device *pdev)
dev = pd->of_netdev;
dev_hold(dev);
} else {
- dev = dev_to_net_device(pd->netdev);
+ dev = device_to_net_device(pd->netdev);
}
if (dev == NULL) {
ret = -EPROBE_DEFER;
--
2.9.3
next prev parent reply other threads:[~2017-01-17 23:33 UTC|newest]
Thread overview: 20+ 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 ` [PATCH net-next v4 01/10] net: dsa: Pass device pointer to dsa_register_switch 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 ` [PATCH net-next v4 03/10] net: dsa: Suffix function manipulating device_node with _dn 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 ` [PATCH net-next v4 05/10] drivers: base: Add device_find_in_class_name() Florian Fainelli
2017-01-17 23:34 ` Andy Shevchenko
2017-01-17 23:43 ` Florian Fainelli
2017-01-18 0:00 ` Andy Shevchenko
2017-01-18 0:04 ` Florian Fainelli
2017-01-18 0:07 ` Andy Shevchenko
2017-01-18 0:13 ` Florian Fainelli
2017-01-18 7:06 ` Greg Kroah-Hartman
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 ` Florian Fainelli [this message]
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 ` [PATCH net-next v4 09/10] net: phy: Allow pre-declaration of MDIO devices 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-18 21:50 ` [PATCH net-next v4 00/10] net: dsa: Support for pdata in dsa2 David Miller
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-8-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=gregory.clement@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=vivien.didelot@savoirfairelinux.com \
/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 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).