Skip to contentSkip to conversation

mmc: sdhci-spear: remove unnecessary platform_set_drvdata()

PATCH In review Jingoo Han 2 participants 2 messages May 6, 2013 – May 12, 2013

Subsystems (3)
MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver Secure digital host controller interface (SDHCI) ST spear driver
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 19/22 mmc: sdhci-spear: 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 <[email protected]>
---
 drivers/mmc/host/sdhci-spear.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-spear.c +0 -2
index 7ae5b3a..2dba9f8 100644
@@ -258,7 +258,6 @@ static int sdhci_probe(struct platform_device *pdev)
 	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_device *pdev)
 	int dead = 0;
 	u32 scratch;
 
-	platform_set_drvdata(pdev, NULL);
 	scratch = readl(host->ioaddr + SDHCI_INT_STATUS);
 	if (scratch == (u32)-1)
 		dead = 1;
Signature · 1 line
1.7.2.5
Acked-by on v1 19/22
#1 lore raw
Quoted 23 lines · Jingoo Han

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 <[email protected]>
---
 drivers/mmc/host/sdhci-spear.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-spear.c +0 -1
index 7ae5b3a..2dba9f8 100644
@@ -258,7 +258,6 @@ static int sdhci_probe(struct platform_device *pdev)
        return 0;
 
 set_drvdata:
-       platform_set_drvdata(pdev, NULL);
        sdhci_remove_host(host, 1);
 free_host:
        sdhci_free_host(host);

drivers/mmc/host/sdhci-spear.c static int sdhci_remove(struct platform_device *pdev) · line 282

Quoted 7 lines
drivers/mmc/host/sdhci-spear.c +0 -1
@@ -278,7 +277,6 @@ static int sdhci_remove(struct platform_device *pdev)
        int dead = 0;
        u32 scratch;
 
-       platform_set_drvdata(pdev, NULL);
        scratch = readl(host->ioaddr + SDHCI_INT_STATUS);
        if (scratch == (u32)-1)
                dead = 1;
Acked-by Viresh Kumar <[email protected]>