diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-10-16 22:51:23 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-10-16 22:51:31 +0200 |
| commit | 4d8220323f608584b42dc648c501ace0769fda62 (patch) | |
| tree | c20084bc40423ca493796b6e85ea7a8cd86d2936 /drivers/soc/loongson | |
| parent | 55fa358ca89f2e0b6fe0a4fa2472a7448e59021a (diff) | |
| parent | e77e6e3e909d33361c58af848a96e1f7f71ba7e4 (diff) | |
Merge tag 'platform-remove-void-soc-for-6.7-rc' of https://git.pengutronix.de/git/ukl/linux into soc/drivers
Convert drivers/soc to struct platform_driver::remove_new()
This PR contains the patches I sent in the series available at
https://lore.kernel.org/all/20230925095532.1984344-1-u.kleine-koenig@pengutronix.de
that were not yet picked up in next as of next-20231013.
It converts all drivers below drivers/soc to let their remove callback
return void. See commit 5c5a7680e67b ("platform: Provide a remove
callback that returns no value") for the rationale.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc/loongson')
| -rw-r--r-- | drivers/soc/loongson/loongson2_guts.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/soc/loongson/loongson2_guts.c b/drivers/soc/loongson/loongson2_guts.c index 9a469779eea7..ef352a0f5022 100644 --- a/drivers/soc/loongson/loongson2_guts.c +++ b/drivers/soc/loongson/loongson2_guts.c @@ -148,11 +148,9 @@ static int loongson2_guts_probe(struct platform_device *pdev) return 0; } -static int loongson2_guts_remove(struct platform_device *dev) +static void loongson2_guts_remove(struct platform_device *dev) { soc_device_unregister(soc_dev); - - return 0; } /* @@ -171,7 +169,7 @@ static struct platform_driver loongson2_guts_driver = { .of_match_table = loongson2_guts_of_match, }, .probe = loongson2_guts_probe, - .remove = loongson2_guts_remove, + .remove_new = loongson2_guts_remove, }; static int __init loongson2_guts_init(void) |