diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-10-18 17:45:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-10-18 17:45:53 +0200 |
| commit | f1243fcea5a3f0a9cd15283fa4b512b2cdf14a08 (patch) | |
| tree | b2a8f672a66e385d75294c32cbb935d1bb8ba460 /drivers/soc | |
| parent | 57e06f8c1f9470932255145c40f54fd7a818a72f (diff) | |
| parent | 20bd1191830478cfdc9be766a735923c5fbe5350 (diff) | |
Merge tag 'v6.7-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/drivers
Converting the io-domain driver to the new remove callback.
* tag 'v6.7-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
soc/rockchip: io-domain: Convert to platform remove callback returning void
Link: https://lore.kernel.org/r/2578684.Lt9SDvczpP@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/rockchip/io-domain.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c index 6619256c2d11..18f809c160a7 100644 --- a/drivers/soc/rockchip/io-domain.c +++ b/drivers/soc/rockchip/io-domain.c @@ -687,7 +687,7 @@ unreg_notify: return ret; } -static int rockchip_iodomain_remove(struct platform_device *pdev) +static void rockchip_iodomain_remove(struct platform_device *pdev) { struct rockchip_iodomain *iod = platform_get_drvdata(pdev); int i; @@ -699,13 +699,11 @@ static int rockchip_iodomain_remove(struct platform_device *pdev) regulator_unregister_notifier(io_supply->reg, &io_supply->nb); } - - return 0; } static struct platform_driver rockchip_iodomain_driver = { .probe = rockchip_iodomain_probe, - .remove = rockchip_iodomain_remove, + .remove_new = rockchip_iodomain_remove, .driver = { .name = "rockchip-iodomain", .of_match_table = rockchip_iodomain_match, |