From: Mark Brown <broonie@linaro.org>
Date: Wed, 26 Jun 2013 15:21:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/txx9' into spi-next
X-Git-Tag: v3.11-rc1~110^2~1
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=592cd34d9431736493c375b609f7f7d4458a8637;hp=cf7315b21466f6a1de0bf9f032faef4ceb0483c3;p=cascardo%2Flinux.git

Merge remote-tracking branch 'spi/topic/txx9' into spi-next
---

diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index cefd9568f098..e9b7681ff6ac 100644
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -419,7 +419,6 @@ exit:
 		clk_disable(c->clk);
 		clk_put(c->clk);
 	}
-	platform_set_drvdata(dev, NULL);
 	spi_master_put(master);
 	return ret;
 }
@@ -430,7 +429,6 @@ static int txx9spi_remove(struct platform_device *dev)
 	struct txx9spi *c = spi_master_get_devdata(master);
 
 	spi_unregister_master(master);
-	platform_set_drvdata(dev, NULL);
 	destroy_workqueue(c->workqueue);
 	clk_disable(c->clk);
 	clk_put(c->clk);