From 4332ea8f40c80d51a534f194291bf3b7738a7beb Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Mon, 4 May 2020 13:12:03 +0200
Subject: [PATCH] spi: amd: Drop duplicate driver data assignments
References: jsc#SLE-15356
Git-commit: 4332ea8f40c80d51a534f194291bf3b7738a7beb
Patch-mainline: v5.8-rc1
The AMD SPI driver calls platform_set_drvdata() on probe even though
it's already been set by __spi_alloc_controller(). Likewise, it calls
platform_set_drvdata() on remove even though it's going to be set by
__device_release_driver(). Drop the duplicate assignments.
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Link: https://lore.kernel.org/r/499f8ad4759c2ff0f586e0459fb9a293faecff6d.1588590210.git.lukas@wunner.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/spi/spi-amd.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/spi/spi-amd.c b/drivers/spi/spi-amd.c
index a4248b97b67e..d3e3516ef957 100644
--- a/drivers/spi/spi-amd.c
+++ b/drivers/spi/spi-amd.c
@@ -287,7 +287,6 @@ static int amd_spi_probe(struct platform_device *pdev)
dev_err(dev, "error %d registering SPI controller\n", err);
goto err_free_master;
}
- platform_set_drvdata(pdev, amd_spi);
return 0;
@@ -303,7 +302,6 @@ static int amd_spi_remove(struct platform_device *pdev)
spi_unregister_master(amd_spi->master);
spi_master_put(amd_spi->master);
- platform_set_drvdata(pdev, NULL);
return 0;
}
--
2.16.4