From: Andrew Davis <afd@ti.com> To: Sebastian Reichel <sre@kernel.org>, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, Cristian Ciocaltea <cristian.ciocaltea@gmail.com>, Florian Fainelli <florian.fainelli@broadcom.com>, Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Sean Wang <sean.wang@mediatek.com>, Matthias Brugger <matthias.bgg@gmail.com>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Cc: <linux-pm@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-actions@lists.infradead.org>, <linux-arm-msm@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-mediatek@lists.infradead.org>, Andrew Davis <afd@ti.com> Subject: [PATCH v4 17/19] power: reset: restart-poweroff: Use devm_register_sys_off_handler(POWER_OFF) Date: Mon, 12 Feb 2024 10:28:29 -0600 [thread overview] Message-ID: <20240212162831.67838-18-afd@ti.com> (raw) In-Reply-To: <20240212162831.67838-1-afd@ti.com> Use device life-cycle managed register function to simplify probe and exit paths. Signed-off-by: Andrew Davis <afd@ti.com> --- drivers/power/reset/restart-poweroff.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c index f4d6004793d3a..fcd588f9ae9d3 100644 --- a/drivers/power/reset/restart-poweroff.c +++ b/drivers/power/reset/restart-poweroff.c @@ -14,29 +14,21 @@ #include <linux/module.h> #include <linux/reboot.h> -static void restart_poweroff_do_poweroff(void) +static int restart_poweroff_do_poweroff(struct sys_off_data *data) { reboot_mode = REBOOT_HARD; machine_restart(NULL); + return NOTIFY_DONE; } static int restart_poweroff_probe(struct platform_device *pdev) { - /* If a pm_power_off function has already been added, leave it alone */ - if (pm_power_off != NULL) { - dev_err(&pdev->dev, - "pm_power_off function already registered"); - return -EBUSY; - } - - pm_power_off = &restart_poweroff_do_poweroff; - return 0; -} - -static void restart_poweroff_remove(struct platform_device *pdev) -{ - if (pm_power_off == &restart_poweroff_do_poweroff) - pm_power_off = NULL; + /* Set this handler to low priority to not override an existing handler */ + return devm_register_sys_off_handler(&pdev->dev, + SYS_OFF_MODE_POWER_OFF, + SYS_OFF_PRIO_LOW, + restart_poweroff_do_poweroff, + NULL); } static const struct of_device_id of_restart_poweroff_match[] = { @@ -47,7 +39,6 @@ MODULE_DEVICE_TABLE(of, of_restart_poweroff_match); static struct platform_driver restart_poweroff_driver = { .probe = restart_poweroff_probe, - .remove_new = restart_poweroff_remove, .driver = { .name = "poweroff-restart", .of_match_table = of_restart_poweroff_match, -- 2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Davis <afd@ti.com> To: Sebastian Reichel <sre@kernel.org>, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, Cristian Ciocaltea <cristian.ciocaltea@gmail.com>, Florian Fainelli <florian.fainelli@broadcom.com>, Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Sean Wang <sean.wang@mediatek.com>, Matthias Brugger <matthias.bgg@gmail.com>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Cc: <linux-pm@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-actions@lists.infradead.org>, <linux-arm-msm@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-mediatek@lists.infradead.org>, Andrew Davis <afd@ti.com> Subject: [PATCH v4 17/19] power: reset: restart-poweroff: Use devm_register_sys_off_handler(POWER_OFF) Date: Mon, 12 Feb 2024 10:28:29 -0600 [thread overview] Message-ID: <20240212162831.67838-18-afd@ti.com> (raw) In-Reply-To: <20240212162831.67838-1-afd@ti.com> Use device life-cycle managed register function to simplify probe and exit paths. Signed-off-by: Andrew Davis <afd@ti.com> --- drivers/power/reset/restart-poweroff.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c index f4d6004793d3a..fcd588f9ae9d3 100644 --- a/drivers/power/reset/restart-poweroff.c +++ b/drivers/power/reset/restart-poweroff.c @@ -14,29 +14,21 @@ #include <linux/module.h> #include <linux/reboot.h> -static void restart_poweroff_do_poweroff(void) +static int restart_poweroff_do_poweroff(struct sys_off_data *data) { reboot_mode = REBOOT_HARD; machine_restart(NULL); + return NOTIFY_DONE; } static int restart_poweroff_probe(struct platform_device *pdev) { - /* If a pm_power_off function has already been added, leave it alone */ - if (pm_power_off != NULL) { - dev_err(&pdev->dev, - "pm_power_off function already registered"); - return -EBUSY; - } - - pm_power_off = &restart_poweroff_do_poweroff; - return 0; -} - -static void restart_poweroff_remove(struct platform_device *pdev) -{ - if (pm_power_off == &restart_poweroff_do_poweroff) - pm_power_off = NULL; + /* Set this handler to low priority to not override an existing handler */ + return devm_register_sys_off_handler(&pdev->dev, + SYS_OFF_MODE_POWER_OFF, + SYS_OFF_PRIO_LOW, + restart_poweroff_do_poweroff, + NULL); } static const struct of_device_id of_restart_poweroff_match[] = { @@ -47,7 +39,6 @@ MODULE_DEVICE_TABLE(of, of_restart_poweroff_match); static struct platform_driver restart_poweroff_driver = { .probe = restart_poweroff_probe, - .remove_new = restart_poweroff_remove, .driver = { .name = "poweroff-restart", .of_match_table = of_restart_poweroff_match, -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-02-12 16:28 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-02-12 16:28 [PATCH v4 00/19] Remove pm_power_off use in drivers/power/reset Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 01/19] power: reset: atc260x-poweroff: Use devm_register_sys_off_handler(RESTART) Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 22:48 ` Cristian Ciocaltea 2024-02-12 22:48 ` Cristian Ciocaltea 2024-02-12 16:28 ` [PATCH v4 02/19] power: reset: atc260x-poweroff: Use devm_register_sys_off_handler(POWER_OFF) Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 22:54 ` Cristian Ciocaltea 2024-02-12 22:54 ` Cristian Ciocaltea 2024-02-12 16:28 ` [PATCH v4 03/19] power: reset: xgene-reboot: Use devm_platform_ioremap_resource() helper Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 04/19] power: reset: xgene-reboot: Use devm_register_sys_off_handler(RESTART) Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 05/19] power: reset: tps65086-restart: " Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 06/19] power: reset: tps65086-restart: Remove unneeded device data struct Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 07/19] power: reset: brcm-kona-reset: Use devm_register_sys_off_handler(RESTART) Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 08/19] power: reset: axxia-reset: " Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 09/19] power: reset: rmobile-reset: Use devm_platform_ioremap_resource() helper Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 10/19] power: reset: rmobile-reset: Use devm_register_sys_off_handler(RESTART) Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 11/19] power: reset: mt6323-poweroff: Use devm_register_sys_off_handler(POWER_OFF) Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 12/19] power: reset: msm-poweroff: " Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 13/19] power: reset: msm-poweroff: Use devm_register_sys_off_handler(RESTART) Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 14/19] power: reset: regulator-poweroff: Use devm_register_sys_off_handler(POWER_OFF) Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 15/19] power: reset: as3722-poweroff: " Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 16/19] power: reset: gemini-poweroff: " Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` Andrew Davis [this message] 2024-02-12 16:28 ` [PATCH v4 17/19] power: reset: restart-poweroff: " Andrew Davis 2024-02-12 16:28 ` [PATCH v4 18/19] power: reset: syscon-poweroff: Move device data into a struct Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-12 16:28 ` [PATCH v4 19/19] power: reset: syscon-poweroff: Use devm_register_sys_off_handler(POWER_OFF) Andrew Davis 2024-02-12 16:28 ` Andrew Davis 2024-02-13 1:30 ` [PATCH v4 00/19] Remove pm_power_off use in drivers/power/reset Sebastian Reichel 2024-02-13 1:30 ` Sebastian Reichel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240212162831.67838-18-afd@ti.com \ --to=afd@ti.com \ --cc=andersson@kernel.org \ --cc=angelogioacchino.delregno@collabora.com \ --cc=cristian.ciocaltea@gmail.com \ --cc=florian.fainelli@broadcom.com \ --cc=konrad.dybcio@linaro.org \ --cc=linux-actions@lists.infradead.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=manivannan.sadhasivam@linaro.org \ --cc=matthias.bgg@gmail.com \ --cc=rjui@broadcom.com \ --cc=sbranden@broadcom.com \ --cc=sean.wang@mediatek.com \ --cc=sre@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.