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

[linux.git] / drivers / spi / spi-ep93xx.c

diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index f1b14977abdf7cba412026acb57ef9a15f387519..15ea07d8f8d692b97c65f97ed31d27d33ff0969a 100644 (file)
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -1123,7 +1123,6 @@ fail_put_clock:
        clk_put(espi->clk);
 fail_release_master:
        spi_master_put(master);
-       platform_set_drvdata(pdev, NULL);
 
        return error;
 }
@@ -1158,7 +1157,6 @@ static int ep93xx_spi_remove(struct platform_device *pdev)
 
        ep93xx_spi_release_dma(espi);
        clk_put(espi->clk);
-       platform_set_drvdata(pdev, NULL);
 
        spi_unregister_master(master);
        return 0;