shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "spi: axi-spi-engine: Convert to platform remove callback returning void"

Browse Source 
This reverts commit 4a680d305e which is
commit fc87abbef2 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Ia869ac0e9edc46f61d2f7b6b60801984cdae1173
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-07-22 10:05:04 +00:00
parent 31e3fe5faa
commit 6971d8bfbd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/spi-axi-spi-engine.c
View File

@@ -554,7 +554,7 @@ err_put_master:
return ret; return ret;
} }
static void spi_engine_remove(struct platform_device *pdev) static int spi_engine_remove(struct platform_device *pdev)
{ {
struct spi_master *master = spi_master_get(platform_get_drvdata(pdev)); struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));
struct spi_engine *spi_engine = spi_master_get_devdata(master); struct spi_engine *spi_engine = spi_master_get_devdata(master);
@@ -572,6 +572,8 @@ static void spi_engine_remove(struct platform_device *pdev)
clk_disable_unprepare(spi_engine->ref_clk); clk_disable_unprepare(spi_engine->ref_clk);
clk_disable_unprepare(spi_engine->clk); clk_disable_unprepare(spi_engine->clk);
return 0;
} }
static const struct of_device_id spi_engine_match_table[] = { static const struct of_device_id spi_engine_match_table[] = {
@@ -582,7 +584,7 @@ MODULE_DEVICE_TABLE(of, spi_engine_match_table);
static struct platform_driver spi_engine_driver = { static struct platform_driver spi_engine_driver = {
.probe = spi_engine_probe, .probe = spi_engine_probe,
.remove_new = spi_engine_remove, .remove = spi_engine_remove,
.driver = { .driver = {
.name = "spi-engine", .name = "spi-engine",
.of_match_table = spi_engine_match_table, .of_match_table = spi_engine_match_table,