From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Jonathan Corbet <corbet@lwn.net>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, John Crispin <john@phrozen.org>,
Sean Wang <sean.wang@mediatek.com>,
Mark Lee <Mark-MC.Lee@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Realtek linux nic maintainers <nic_swsd@realtek.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org,
Fabien Parent <fparent@baylibre.com>,
Stephane Le Provost <stephane.leprovost@mediatek.com>,
Pedro Tsai <pedro.tsai@mediatek.com>,
Andrew Perepech <andrew.perepech@mediatek.com>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH 03/11] net: devres: relax devm_register_netdev()
Date: Mon, 22 Jun 2020 12:00:48 +0200 [thread overview]
Message-ID: <20200622100056.10151-4-brgl@bgdev.pl> (raw)
In-Reply-To: <20200622100056.10151-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
This devres helper registers a release callback that only unregisters
the net_device. It works perfectly fine with netdev structs that are
not managed on their own. There's no reason to check this - drop the
warning.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
net/devres.c | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/net/devres.c b/net/devres.c
index 57a6a88d11f6..1583ccb207c0 100644
--- a/net/devres.c
+++ b/net/devres.c
@@ -46,14 +46,6 @@ static void devm_netdev_release(struct device *dev, void *this)
unregister_netdev(res->ndev);
}
-static int netdev_devres_match(struct device *dev, void *this, void *match_data)
-{
- struct net_device_devres *res = this;
- struct net_device *ndev = match_data;
-
- return ndev == res->ndev;
-}
-
/**
* devm_register_netdev - resource managed variant of register_netdev()
* @dev: managing device for this netdev - usually the parent device
@@ -61,22 +53,13 @@ static int netdev_devres_match(struct device *dev, void *this, void *match_data)
*
* This is a devres variant of register_netdev() for which the unregister
* function will be call automatically when the managing device is
- * detached. Note: the net_device used must also be resource managed by
- * the same struct device.
+ * detached.
*/
int devm_register_netdev(struct device *dev, struct net_device *ndev)
{
struct net_device_devres *dr;
int ret;
- /* struct net_device must itself be managed. For now a managed netdev
- * can only be allocated by devm_alloc_etherdev_mqs() so the check is
- * straightforward.
- */
- if (WARN_ON(!devres_find(dev, devm_free_netdev,
- netdev_devres_match, ndev)))
- return -EINVAL;
-
dr = devres_alloc(devm_netdev_release, sizeof(*dr), GFP_KERNEL);
if (!dr)
return -ENOMEM;
--
2.26.1
next prev parent reply other threads:[~2020-06-22 10:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-22 10:00 [PATCH 00/11] net: improve devres helpers Bartosz Golaszewski
2020-06-22 10:00 ` [PATCH 01/11] net: ethernet: ixgbe: check the return value of ixgbe_mii_bus_init() Bartosz Golaszewski
2020-06-22 10:00 ` [PATCH 02/11] net: ethernet: ixgbe: don't call devm_mdiobus_free() Bartosz Golaszewski
2020-06-22 10:00 ` Bartosz Golaszewski [this message]
2020-06-22 22:49 ` [PATCH 03/11] net: devres: relax devm_register_netdev() Jakub Kicinski
2020-06-23 9:12 ` Bartosz Golaszewski
2020-06-23 20:16 ` Jakub Kicinski
2020-06-22 10:00 ` [PATCH 04/11] net: devres: rename the release callback of devm_register_netdev() Bartosz Golaszewski
2020-06-22 10:00 ` [PATCH 05/11] Documentation: devres: add missing mdio helper Bartosz Golaszewski
2020-06-22 10:00 ` [PATCH 06/11] phy: un-inline devm_mdiobus_register() Bartosz Golaszewski
2020-06-22 23:55 ` Florian Fainelli
2020-06-25 9:16 ` Bartosz Golaszewski
2020-06-22 10:00 ` [PATCH 07/11] phy: mdio: add kerneldoc for __devm_mdiobus_register() Bartosz Golaszewski
2020-06-22 10:00 ` [PATCH 08/11] net: phy: don't abuse devres in devm_mdiobus_register() Bartosz Golaszewski
2020-06-22 10:00 ` [PATCH 09/11] of: mdio: remove the 'extern' keyword from function declarations Bartosz Golaszewski
2020-06-22 10:00 ` [PATCH 10/11] of: mdio: provide devm_of_mdiobus_register() Bartosz Golaszewski
2020-06-22 10:00 ` [PATCH 11/11] net: ethernet: mtk-star-emac: use devm_of_mdiobus_register() Bartosz Golaszewski
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=20200622100056.10151-4-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=Mark-MC.Lee@mediatek.com \
--cc=andrew.perepech@mediatek.com \
--cc=andrew@lunn.ch \
--cc=bgolaszewski@baylibre.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=fparent@baylibre.com \
--cc=frowand.list@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=john@phrozen.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=matthias.bgg@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
--cc=pedro.tsai@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=sean.wang@mediatek.com \
--cc=stephane.leprovost@mediatek.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).