diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-01-17 23:58:28 +0300 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-01-17 23:58:28 +0300 |
| commit | fe33c0fbed75dd464747c0faaedf94c7d8eb4101 (patch) | |
| tree | 057a9d98ca492c55708baedcc59bf2ea3e2511c7 /drivers/pmdomain/imx/imx8mp-blk-ctrl.c | |
| parent | 5d4747a6cc8e78ce74742d557fc9b7697fcacc95 (diff) | |
| parent | 052d534373b7ed33712a63d5e17b2b6cdbce84fd (diff) | |
| download | linux-fe33c0fbed75dd464747c0faaedf94c7d8eb4101.tar.xz | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'drivers/pmdomain/imx/imx8mp-blk-ctrl.c')
| -rw-r--r-- | drivers/pmdomain/imx/imx8mp-blk-ctrl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pmdomain/imx/imx8mp-blk-ctrl.c b/drivers/pmdomain/imx/imx8mp-blk-ctrl.c index c6ac32c1a8c1..e3203eb6a022 100644 --- a/drivers/pmdomain/imx/imx8mp-blk-ctrl.c +++ b/drivers/pmdomain/imx/imx8mp-blk-ctrl.c @@ -760,7 +760,7 @@ cleanup_pds: return ret; } -static int imx8mp_blk_ctrl_remove(struct platform_device *pdev) +static void imx8mp_blk_ctrl_remove(struct platform_device *pdev) { struct imx8mp_blk_ctrl *bc = dev_get_drvdata(&pdev->dev); int i; @@ -777,8 +777,6 @@ static int imx8mp_blk_ctrl_remove(struct platform_device *pdev) dev_pm_genpd_remove_notifier(bc->bus_power_dev); dev_pm_domain_detach(bc->bus_power_dev, true); - - return 0; } #ifdef CONFIG_PM_SLEEP @@ -856,7 +854,7 @@ MODULE_DEVICE_TABLE(of, imx8mp_blk_ctrl_of_match); static struct platform_driver imx8mp_blk_ctrl_driver = { .probe = imx8mp_blk_ctrl_probe, - .remove = imx8mp_blk_ctrl_remove, + .remove_new = imx8mp_blk_ctrl_remove, .driver = { .name = "imx8mp-blk-ctrl", .pm = &imx8mp_blk_ctrl_pm_ops, |