diff --git a/drivers/spi/spi-bfin-v3.c b/drivers/spi/spi-bfin-v3.c
index 603d7e91085b..914f9fe1ec99 100644
--- a/drivers/spi/spi-bfin-v3.c
+++ b/drivers/spi/spi-bfin-v3.c
@@ -888,7 +888,6 @@ static int bfin_spi_probe(struct platform_device *pdev)
 err_free_tx_dma:
 	free_dma(tx_dma);
 err_put_master:
-	platform_set_drvdata(pdev, NULL);
 	spi_master_put(master);
 
 	return ret;
@@ -905,7 +904,6 @@ static int bfin_spi_remove(struct platform_device *pdev)
 	free_dma(drv_data->rx_dma);
 	free_dma(drv_data->tx_dma);
 
-	platform_set_drvdata(pdev, NULL);
 	spi_unregister_master(drv_data->master);
 	return 0;
 }