mmc: remove unnecessary set_drvdata() function

The driver data will be cleared in device_unbind_cleanup() in driver
core code. So the set_drvdata(..., NULL) called in remove and error
path in probe can be removed.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20230808121513.553143-1-yangyingliang@huawei.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index b6f4be2..266298a 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -3026,7 +3026,6 @@ static void mmc_blk_remove(struct mmc_card *card)
                pm_runtime_disable(&card->dev);
        pm_runtime_put_noidle(&card->dev);
        mmc_blk_remove_req(md);
-       dev_set_drvdata(&card->dev, NULL);
        destroy_workqueue(card->complete_wq);
 }
 

diff --git a/drivers/mmc/host/moxart-mmc.c b/drivers/mmc/host/moxart-mmc.c
index d0d6ffc..43c2a95 100644 (file)
--- a/drivers/mmc/host/moxart-mmc.c
+++ b/drivers/mmc/host/moxart-mmc.c
@@ -692,8 +692,6 @@ static int moxart_remove(struct platform_device *pdev)
        struct mmc_host *mmc = dev_get_drvdata(&pdev->dev);
        struct moxart_host *host = mmc_priv(mmc);
 
-       dev_set_drvdata(&pdev->dev, NULL);
-
        if (!IS_ERR_OR_NULL(host->dma_chan_tx))
                dma_release_channel(host->dma_chan_tx);
        if (!IS_ERR_OR_NULL(host->dma_chan_rx))

diff --git a/drivers/mmc/host/sunplus-mmc.c b/drivers/mmc/host/sunplus-mmc.c
index e9cb1a5..37ebed0 100644 (file)
--- a/drivers/mmc/host/sunplus-mmc.c
+++ b/drivers/mmc/host/sunplus-mmc.c
@@ -948,7 +948,6 @@ static int spmmc_drv_remove(struct platform_device *dev)
        clk_disable_unprepare(host->clk);
        pm_runtime_put_noidle(&dev->dev);
        pm_runtime_disable(&dev->dev);
-       platform_set_drvdata(dev, NULL);
 
        return 0;
 }

diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c
index a2b0d94..ba6044b 100644 (file)
--- a/drivers/mmc/host/via-sdmmc.c
+++ b/drivers/mmc/host/via-sdmmc.c
@@ -1160,7 +1160,6 @@ static int via_sd_probe(struct pci_dev *pcidev,
 unmap:
        iounmap(sdhost->mmiobase);
 free_mmc_host:
-       dev_set_drvdata(&pcidev->dev, NULL);
        mmc_free_host(mmc);
 release:
        pci_release_regions(pcidev);
@@ -1212,7 +1211,6 @@ static void via_sd_remove(struct pci_dev *pcidev)
        writeb(gatt, sdhost->pcictrl_mmiobase + VIA_CRDR_PCICLKGATT);
 
        iounmap(sdhost->mmiobase);
-       dev_set_drvdata(&pcidev->dev, NULL);
        mmc_free_host(sdhost->mmc);
        pci_release_regions(pcidev);
        pci_disable_device(pcidev);

diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index bf2a92f..0589d16 100644 (file)
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -1264,8 +1264,6 @@ static void wbsd_free_mmc(struct device *dev)
        del_timer_sync(&host->ignore_timer);
 
        mmc_free_host(mmc);
-
-       dev_set_drvdata(dev, NULL);
 }
 
 /*