From: Michal Simek <michal.simek@xilinx.com>
Date: Tue, 26 Nov 2013 10:38:20 +0000 (+0100)
Subject: ARM: 7906/1: mmc: mmci: Remove unnecessary amba_set_drvdata()
X-Git-Tag: next-20131202~76^2^4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8f12548206d2fa95d0907d093f5eac465067423;p=karo-tx-linux.git

ARM: 7906/1: mmc: mmci: Remove unnecessary amba_set_drvdata()

Driver core clears the driver data to NULL after device_release
or on probe failure, so just remove it from here.

Driver core change:
"device-core: Ensure drvdata = NULL when no driver is bound"
(sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index f32057972dd7..b93122636531 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1683,8 +1683,6 @@ static int mmci_remove(struct amba_device *dev)
 {
 	struct mmc_host *mmc = amba_get_drvdata(dev);
 
-	amba_set_drvdata(dev, NULL);
-
 	if (mmc) {
 		struct mmci_host *host = mmc_priv(mmc);