From: Rosen Penev Date: Tue, 22 Oct 2024 00:22:44 +0000 (-0700) Subject: net: ibm: emac: use devm for mutex_init X-Git-Tag: v6.13-rc1~135^2~215^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af4698be49e856589f559fee2054de5bc7d5b72f;p=thirdparty%2Fkernel%2Flinux.git net: ibm: emac: use devm for mutex_init 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 Reviewed-by: Shannon Nelson Signed-off-by: Paolo Abeni --- diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index 8c6f69f90af97..1f45f2a788294 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);