Messages in this thread Patch in this message | | | From | Fei Shao <> | Subject | [PATCH 4/5] spmi: hisi-spmi-controller: Use devm_spmi_controller_add() | Date | Thu, 24 Aug 2023 18:40:11 +0800 |
| |
Convert to the device-managed version of spmi_controller_add() and delete the unnecessary driver remove callback.
Signed-off-by: Fei Shao <fshao@chromium.org> --- Note that I skipped the conversions in spmi-mtk-pmif.c and spmi-pmic-arb.c because the driver remove sequence would have been changed, as using the devm version will postpone spmi_controller_remove() to where after remove callback is executed. So it turns out only hisi-spmi-controller.c is updated.
drivers/spmi/hisi-spmi-controller.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/spmi/hisi-spmi-controller.c b/drivers/spmi/hisi-spmi-controller.c index a5525902656a..674a350cc676 100644 --- a/drivers/spmi/hisi-spmi-controller.c +++ b/drivers/spmi/hisi-spmi-controller.c @@ -308,7 +308,7 @@ static int spmi_controller_probe(struct platform_device *pdev) ctrl->read_cmd = spmi_read_cmd; ctrl->write_cmd = spmi_write_cmd; - ret = spmi_controller_add(ctrl); + ret = devm_spmi_controller_add(&pdev->dev, ctrl); if (ret) { dev_err(&pdev->dev, "spmi_controller_add failed with error %d!\n", ret); return ret; @@ -317,13 +317,6 @@ static int spmi_controller_probe(struct platform_device *pdev) return 0; } -static void spmi_del_controller(struct platform_device *pdev) -{ - struct spmi_controller *ctrl = platform_get_drvdata(pdev); - - spmi_controller_remove(ctrl); -} - static const struct of_device_id spmi_controller_match_table[] = { { .compatible = "hisilicon,kirin970-spmi-controller", @@ -334,7 +327,6 @@ MODULE_DEVICE_TABLE(of, spmi_controller_match_table); static struct platform_driver spmi_controller_driver = { .probe = spmi_controller_probe, - .remove_new = spmi_del_controller, .driver = { .name = "hisi_spmi_controller", .of_match_table = spmi_controller_match_table, -- 2.42.0.rc1.204.g551eb34607-goog
| |