| From 43bbfa109a44c217889a72041060f570a2f92ffe Mon Sep 17 00:00:00 2001 |
| From: Jingoo Han <jg1.han@samsung.com> |
| Date: Mon, 6 May 2013 15:05:21 +0900 |
| Subject: mmc: remove unnecessary platform_set_drvdata() |
| |
| The driver core clears the driver data to NULL after device_release |
| or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d |
| (device-core: Ensure drvdata = NULL when no driver is bound). |
| Thus, it is not needed to manually clear the device driver data to NULL. |
| |
| Signed-off-by: Jingoo Han <jg1.han@samsung.com> |
| Acked-by: Sonic Zhang <sonic.zhang@analog.com> |
| Acked-by: Seungwon Jeon <tgih.jun@samsung.com> |
| Acked-by: Shawn Guo <shawn.guo@linaro.org> |
| Acked-by: Adrian Hunter <adrian.hunter@intel.com> |
| Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> |
| Acked-by: Jaehoon Chung <jh80.chung@samsung.com> |
| Acked-by: Viresh Kumar <viresh.kumar@linaro.org> |
| Acked-by: Tony Prisk <linux@prisktech.co.nz> |
| Signed-off-by: Chris Ball <cjb@laptop.org> |
| (cherry picked from commit 113a87f868b2f2e086790a68e8b9e41d8f0c3295) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/android-goldfish.c | 2 -- |
| drivers/mmc/host/atmel-mci.c | 2 -- |
| drivers/mmc/host/au1xmmc.c | 1 - |
| drivers/mmc/host/bfin_sdh.c | 2 -- |
| drivers/mmc/host/davinci_mmc.c | 1 - |
| drivers/mmc/host/dw_mmc-pltfm.c | 1 - |
| drivers/mmc/host/jz4740_mmc.c | 2 -- |
| drivers/mmc/host/mvsdio.c | 1 - |
| drivers/mmc/host/mxcmmc.c | 2 -- |
| drivers/mmc/host/mxs-mmc.c | 2 -- |
| drivers/mmc/host/omap.c | 2 -- |
| drivers/mmc/host/omap_hsmmc.c | 2 -- |
| drivers/mmc/host/pxamci.c | 2 -- |
| drivers/mmc/host/rtsx_pci_sdmmc.c | 2 -- |
| drivers/mmc/host/sdhci-acpi.c | 2 -- |
| drivers/mmc/host/sdhci-pltfm.c | 1 - |
| drivers/mmc/host/sdhci-pxav2.c | 2 -- |
| drivers/mmc/host/sdhci-pxav3.c | 2 -- |
| drivers/mmc/host/sdhci-s3c.c | 1 - |
| drivers/mmc/host/sdhci-spear.c | 2 -- |
| drivers/mmc/host/sh_mmcif.c | 2 -- |
| drivers/mmc/host/tmio_mmc.c | 2 -- |
| drivers/mmc/host/wmt-sdmmc.c | 2 -- |
| 23 files changed, 40 deletions(-) |
| |
| --- a/drivers/mmc/host/android-goldfish.c |
| +++ b/drivers/mmc/host/android-goldfish.c |
| @@ -546,8 +546,6 @@ static int goldfish_mmc_remove(struct pl |
| { |
| struct goldfish_mmc_host *host = platform_get_drvdata(pdev); |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| BUG_ON(host == NULL); |
| |
| mmc_remove_host(host->mmc); |
| --- a/drivers/mmc/host/atmel-mci.c |
| +++ b/drivers/mmc/host/atmel-mci.c |
| @@ -2495,8 +2495,6 @@ static int __exit atmci_remove(struct pl |
| struct atmel_mci *host = platform_get_drvdata(pdev); |
| unsigned int i; |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| if (host->buffer) |
| dma_free_coherent(&pdev->dev, host->buf_size, |
| host->buffer, host->buf_phys_addr); |
| --- a/drivers/mmc/host/au1xmmc.c |
| +++ b/drivers/mmc/host/au1xmmc.c |
| @@ -1149,7 +1149,6 @@ static int au1xmmc_remove(struct platfor |
| kfree(host->ioarea); |
| |
| mmc_free_host(host->mmc); |
| - platform_set_drvdata(pdev, NULL); |
| } |
| return 0; |
| } |
| --- a/drivers/mmc/host/bfin_sdh.c |
| +++ b/drivers/mmc/host/bfin_sdh.c |
| @@ -621,8 +621,6 @@ static int sdh_remove(struct platform_de |
| { |
| struct mmc_host *mmc = platform_get_drvdata(pdev); |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| if (mmc) { |
| struct sdh_host *host = mmc_priv(mmc); |
| |
| --- a/drivers/mmc/host/davinci_mmc.c |
| +++ b/drivers/mmc/host/davinci_mmc.c |
| @@ -1406,7 +1406,6 @@ static int __exit davinci_mmcsd_remove(s |
| { |
| struct mmc_davinci_host *host = platform_get_drvdata(pdev); |
| |
| - platform_set_drvdata(pdev, NULL); |
| if (host) { |
| mmc_davinci_cpufreq_deregister(host); |
| |
| --- a/drivers/mmc/host/dw_mmc-pltfm.c |
| +++ b/drivers/mmc/host/dw_mmc-pltfm.c |
| @@ -72,7 +72,6 @@ static int dw_mci_pltfm_remove(struct pl |
| { |
| struct dw_mci *host = platform_get_drvdata(pdev); |
| |
| - platform_set_drvdata(pdev, NULL); |
| dw_mci_remove(host); |
| return 0; |
| } |
| --- a/drivers/mmc/host/jz4740_mmc.c |
| +++ b/drivers/mmc/host/jz4740_mmc.c |
| @@ -932,7 +932,6 @@ err_release_mem_region: |
| err_clk_put: |
| clk_put(host->clk); |
| err_free_host: |
| - platform_set_drvdata(pdev, NULL); |
| mmc_free_host(mmc); |
| |
| return ret; |
| @@ -960,7 +959,6 @@ static int jz4740_mmc_remove(struct plat |
| |
| clk_put(host->clk); |
| |
| - platform_set_drvdata(pdev, NULL); |
| mmc_free_host(host->mmc); |
| |
| return 0; |
| --- a/drivers/mmc/host/mvsdio.c |
| +++ b/drivers/mmc/host/mvsdio.c |
| @@ -827,7 +827,6 @@ static int __exit mvsd_remove(struct pla |
| clk_disable_unprepare(host->clk); |
| mmc_free_host(mmc); |
| |
| - platform_set_drvdata(pdev, NULL); |
| return 0; |
| } |
| |
| --- a/drivers/mmc/host/mxcmmc.c |
| +++ b/drivers/mmc/host/mxcmmc.c |
| @@ -1219,8 +1219,6 @@ static int mxcmci_remove(struct platform |
| struct mmc_host *mmc = platform_get_drvdata(pdev); |
| struct mxcmci_host *host = mmc_priv(mmc); |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| mmc_remove_host(mmc); |
| |
| if (host->vcc) |
| --- a/drivers/mmc/host/mxs-mmc.c |
| +++ b/drivers/mmc/host/mxs-mmc.c |
| @@ -708,8 +708,6 @@ static int mxs_mmc_remove(struct platfor |
| |
| mmc_remove_host(mmc); |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| if (ssp->dmach) |
| dma_release_channel(ssp->dmach); |
| |
| --- a/drivers/mmc/host/omap.c |
| +++ b/drivers/mmc/host/omap.c |
| @@ -1500,8 +1500,6 @@ static int mmc_omap_remove(struct platfo |
| struct mmc_omap_host *host = platform_get_drvdata(pdev); |
| int i; |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| BUG_ON(host == NULL); |
| |
| for (i = 0; i < host->nr_slots; i++) |
| --- a/drivers/mmc/host/omap_hsmmc.c |
| +++ b/drivers/mmc/host/omap_hsmmc.c |
| @@ -2047,7 +2047,6 @@ err_irq: |
| } |
| err1: |
| iounmap(host->base); |
| - platform_set_drvdata(pdev, NULL); |
| mmc_free_host(mmc); |
| err_alloc: |
| omap_hsmmc_gpio_free(pdata); |
| @@ -2093,7 +2092,6 @@ static int omap_hsmmc_remove(struct plat |
| res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| if (res) |
| release_mem_region(res->start, resource_size(res)); |
| - platform_set_drvdata(pdev, NULL); |
| |
| return 0; |
| } |
| --- a/drivers/mmc/host/pxamci.c |
| +++ b/drivers/mmc/host/pxamci.c |
| @@ -834,8 +834,6 @@ static int pxamci_remove(struct platform |
| struct mmc_host *mmc = platform_get_drvdata(pdev); |
| int gpio_cd = -1, gpio_ro = -1, gpio_power = -1; |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| if (mmc) { |
| struct pxamci_host *host = mmc_priv(mmc); |
| |
| --- a/drivers/mmc/host/rtsx_pci_sdmmc.c |
| +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c |
| @@ -1316,8 +1316,6 @@ static int rtsx_pci_sdmmc_drv_remove(str |
| mmc_remove_host(mmc); |
| mmc_free_host(mmc); |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| dev_dbg(&(pdev->dev), |
| ": Realtek PCI-E SDMMC controller has been removed\n"); |
| |
| --- a/drivers/mmc/host/sdhci-acpi.c |
| +++ b/drivers/mmc/host/sdhci-acpi.c |
| @@ -262,7 +262,6 @@ static int sdhci_acpi_probe(struct platf |
| return 0; |
| |
| err_free: |
| - platform_set_drvdata(pdev, NULL); |
| sdhci_free_host(c->host); |
| return err; |
| } |
| @@ -281,7 +280,6 @@ static int sdhci_acpi_remove(struct plat |
| |
| dead = (sdhci_readl(c->host, SDHCI_INT_STATUS) == ~0); |
| sdhci_remove_host(c->host, dead); |
| - platform_set_drvdata(pdev, NULL); |
| sdhci_free_host(c->host); |
| |
| return 0; |
| --- a/drivers/mmc/host/sdhci-pltfm.c |
| +++ b/drivers/mmc/host/sdhci-pltfm.c |
| @@ -197,7 +197,6 @@ void sdhci_pltfm_free(struct platform_de |
| iounmap(host->ioaddr); |
| release_mem_region(iomem->start, resource_size(iomem)); |
| sdhci_free_host(host); |
| - platform_set_drvdata(pdev, NULL); |
| } |
| EXPORT_SYMBOL_GPL(sdhci_pltfm_free); |
| |
| --- a/drivers/mmc/host/sdhci-pxav2.c |
| +++ b/drivers/mmc/host/sdhci-pxav2.c |
| @@ -253,8 +253,6 @@ static int sdhci_pxav2_remove(struct pla |
| sdhci_pltfm_free(pdev); |
| kfree(pxa); |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| return 0; |
| } |
| |
| --- a/drivers/mmc/host/sdhci-pxav3.c |
| +++ b/drivers/mmc/host/sdhci-pxav3.c |
| @@ -340,8 +340,6 @@ static int sdhci_pxav3_remove(struct pla |
| sdhci_pltfm_free(pdev); |
| kfree(pxa); |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| return 0; |
| } |
| |
| --- a/drivers/mmc/host/sdhci-s3c.c |
| +++ b/drivers/mmc/host/sdhci-s3c.c |
| @@ -745,7 +745,6 @@ static int sdhci_s3c_remove(struct platf |
| clk_disable_unprepare(sc->clk_io); |
| |
| sdhci_free_host(host); |
| - platform_set_drvdata(pdev, NULL); |
| |
| return 0; |
| } |
| --- a/drivers/mmc/host/sdhci-spear.c |
| +++ b/drivers/mmc/host/sdhci-spear.c |
| @@ -258,7 +258,6 @@ static int sdhci_probe(struct platform_d |
| return 0; |
| |
| set_drvdata: |
| - platform_set_drvdata(pdev, NULL); |
| sdhci_remove_host(host, 1); |
| free_host: |
| sdhci_free_host(host); |
| @@ -278,7 +277,6 @@ static int sdhci_remove(struct platform_ |
| int dead = 0; |
| u32 scratch; |
| |
| - platform_set_drvdata(pdev, NULL); |
| scratch = readl(host->ioaddr + SDHCI_INT_STATUS); |
| if (scratch == (u32)-1) |
| dead = 1; |
| --- a/drivers/mmc/host/sh_mmcif.c |
| +++ b/drivers/mmc/host/sh_mmcif.c |
| @@ -1530,8 +1530,6 @@ static int sh_mmcif_remove(struct platfo |
| if (irq[1] >= 0) |
| free_irq(irq[1], host); |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| clk_disable(host->hclk); |
| mmc_free_host(host->mmc); |
| pm_runtime_put_sync(&pdev->dev); |
| --- a/drivers/mmc/host/tmio_mmc.c |
| +++ b/drivers/mmc/host/tmio_mmc.c |
| @@ -112,8 +112,6 @@ static int tmio_mmc_remove(struct platfo |
| const struct mfd_cell *cell = mfd_get_cell(pdev); |
| struct mmc_host *mmc = platform_get_drvdata(pdev); |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| if (mmc) { |
| struct tmio_mmc_host *host = mmc_priv(mmc); |
| free_irq(platform_get_irq(pdev, 0), host); |
| --- a/drivers/mmc/host/wmt-sdmmc.c |
| +++ b/drivers/mmc/host/wmt-sdmmc.c |
| @@ -927,8 +927,6 @@ static int wmt_mci_remove(struct platfor |
| |
| mmc_free_host(mmc); |
| |
| - platform_set_drvdata(pdev, NULL); |
| - |
| dev_info(&pdev->dev, "WMT MCI device removed\n"); |
| |
| return 0; |