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 cefd956..e9b7681 100644 (file)
--- 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);