]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: ibm: emac: use devm for mutex_init
authorRosen Penev <rosenp@gmail.com>
Tue, 22 Oct 2024 00:22:44 +0000 (17:22 -0700)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 29 Oct 2024 14:33:23 +0000 (15:33 +0100)
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>
Reviewed-by: Shannon Nelson <shannon.nelson@amd.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/ibm/emac/core.c

index 8c6f69f90af9761280e3e8a7153c3ff96262de0d..1f45f2a78829437dc962c11a641759f0222acd75 100644 (file)
@@ -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);