From 6971d8bfbdea6d5826c5f92b6f6e36b8d429e3d5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jul 2024 10:05:04 +0000 Subject: [PATCH] Revert "spi: axi-spi-engine: Convert to platform remove callback returning void" This reverts commit 4a680d305e58712b96979772e401b26c02a00a37 which is commit fc87abbef23413943457459e2c473ce607b4dd24 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 --- drivers/spi/spi-axi-spi-engine.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c index c5a3a3189164..80c3e38f5c1b 100644 --- a/drivers/spi/spi-axi-spi-engine.c +++ b/drivers/spi/spi-axi-spi-engine.c @@ -554,7 +554,7 @@ err_put_master: 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_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->clk); + + return 0; } 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 = { .probe = spi_engine_probe, - .remove_new = spi_engine_remove, + .remove = spi_engine_remove, .driver = { .name = "spi-engine", .of_match_table = spi_engine_match_table,