Unverified Commit f1243fce authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.7-rockchip-drivers1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 57e06f8c 20bd1191

drivers/soc/rockchip/io-domain.c

+2 −4
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static int rockchip_iodomain_probe(struct platform_device *pdev) 
	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,