From: Rosen Penev <rosenp@gmail.com>
To: netdev@vger.kernel.org
Cc: "Andrew Lunn" <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Rosen Penev" <rosenp@gmail.com>,
"Simon Horman" <horms@kernel.org>,
"Shannon Nelson" <shannon.nelson@amd.com>,
"Uwe Kleine-König" <u.kleine-koenig@baylibre.com>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCHv8 net-next 4/5] net: ibm: emac: use devm for mutex_init
Date: Mon, 21 Oct 2024 17:22:44 -0700 [thread overview]
Message-ID: <20241022002245.843242-5-rosenp@gmail.com> (raw)
In-Reply-To: <20241022002245.843242-1-rosenp@gmail.com>
It seems since inception that mutex_destroy was never called for these
in _remove. Instead of handling this manually, just use devm for
simplicity.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/net/ethernet/ibm/emac/core.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 8c6f69f90af9..1f45f2a78829 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -3021,8 +3021,14 @@ static int emac_probe(struct platform_device *ofdev)
SET_NETDEV_DEV(ndev, &ofdev->dev);
/* Initialize some embedded data structures */
- mutex_init(&dev->mdio_lock);
- mutex_init(&dev->link_lock);
+ err = devm_mutex_init(&ofdev->dev, &dev->mdio_lock);
+ if (err)
+ goto err_gone;
+
+ err = devm_mutex_init(&ofdev->dev, &dev->link_lock);
+ if (err)
+ goto err_gone;
+
spin_lock_init(&dev->lock);
INIT_WORK(&dev->reset_work, emac_reset_work);
--
2.47.0
next prev parent reply other threads:[~2024-10-22 0:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-22 0:22 [PATCHv8 net-next 0/5] ibm: emac: more cleanups Rosen Penev
2024-10-22 0:22 ` [PATCHv8 net-next 1/5] net: ibm: emac: use netif_receive_skb_list Rosen Penev
2024-10-22 0:22 ` [PATCHv8 net-next 2/5] net: ibm: emac: use devm_platform_ioremap_resource Rosen Penev
2024-10-22 0:22 ` [PATCHv8 net-next 3/5] net: ibm: emac: use platform_get_irq Rosen Penev
2024-10-22 0:22 ` Rosen Penev [this message]
2024-10-22 0:22 ` [PATCHv8 net-next 5/5] net: ibm: emac: generate random MAC if not found Rosen Penev
2024-10-22 0:50 ` [PATCHv8 net-next 0/5] ibm: emac: more cleanups Nelson, Shannon
2024-10-29 14:50 ` patchwork-bot+netdevbpf
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=20241022002245.843242-5-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shannon.nelson@amd.com \
--cc=u.kleine-koenig@baylibre.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