From: Anson Huang <anson.huang@nxp.com>
To: Anson Huang <anson.huang@nxp.com>,
"dmitry.torokhov@gmail.com" <dmitry.torokhov@gmail.com>,
"shawnguo@kernel.org" <shawnguo@kernel.org>,
"s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
"kernel@pengutronix.de" <kernel@pengutronix.de>,
"festevam@gmail.com" <festevam@gmail.com>,
"robh@kernel.org" <robh@kernel.org>,
"linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: dl-linux-imx <linux-imx@nxp.com>
Subject: RE: [PATCH] input: keyboard: imx_sc_key: Use devm_add_action_or_reset() to handle all cleanups
Date: Wed, 13 May 2020 06:08:20 +0000 [thread overview]
Message-ID: <DB3PR0402MB39161C863811D9CDEA301A9FF5BF0@DB3PR0402MB3916.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <1584082751-17047-1-git-send-email-Anson.Huang@nxp.com>
Gentle ping...
> Subject: [PATCH] input: keyboard: imx_sc_key: Use
> devm_add_action_or_reset() to handle all cleanups
>
> Use devm_add_action_or_reset() to handle all cleanups of failure in .probe
> and .remove, then .remove callback can be dropped.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> drivers/input/keyboard/imx_sc_key.c | 33 +++++++++++++++------------------
> 1 file changed, 15 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/input/keyboard/imx_sc_key.c
> b/drivers/input/keyboard/imx_sc_key.c
> index 2672fd4..eab5dfb 100644
> --- a/drivers/input/keyboard/imx_sc_key.c
> +++ b/drivers/input/keyboard/imx_sc_key.c
> @@ -96,6 +96,15 @@ static void imx_sc_check_for_events(struct work_struct
> *work)
> msecs_to_jiffies(REPEAT_INTERVAL));
> }
>
> +static void imx_sc_key_action(void *data) {
> + struct imx_key_drv_data *priv = data;
> +
> + imx_scu_irq_group_enable(SC_IRQ_GROUP_WAKE, SC_IRQ_BUTTON,
> false);
> + imx_scu_irq_unregister_notifier(&priv->key_notifier);
> + cancel_delayed_work_sync(&priv->check_work);
> +}
> +
> static int imx_sc_key_probe(struct platform_device *pdev) {
> struct imx_key_drv_data *priv;
> @@ -146,27 +155,16 @@ static int imx_sc_key_probe(struct platform_device
> *pdev)
> return error;
> }
>
> + error = devm_add_action_or_reset(&pdev->dev, imx_sc_key_action,
> &priv);
> + if (error)
> + return error;
> +
> priv->key_notifier.notifier_call = imx_sc_key_notify;
> error = imx_scu_irq_register_notifier(&priv->key_notifier);
> - if (error) {
> - imx_scu_irq_group_enable(SC_IRQ_GROUP_WAKE,
> SC_IRQ_BUTTON,
> - false);
> + if (error)
> dev_err(&pdev->dev, "failed to register scu notifier\n");
> - return error;
> - }
> -
> - return 0;
> -}
> -
> -static int imx_sc_key_remove(struct platform_device *pdev) -{
> - struct imx_key_drv_data *priv = platform_get_drvdata(pdev);
> -
> - imx_scu_irq_group_enable(SC_IRQ_GROUP_WAKE, SC_IRQ_BUTTON,
> false);
> - imx_scu_irq_unregister_notifier(&priv->key_notifier);
> - cancel_delayed_work_sync(&priv->check_work);
>
> - return 0;
> + return error;
> }
>
> static const struct of_device_id imx_sc_key_ids[] = { @@ -181,7 +179,6 @@
> static struct platform_driver imx_sc_key_driver = {
> .of_match_table = imx_sc_key_ids,
> },
> .probe = imx_sc_key_probe,
> - .remove = imx_sc_key_remove,
> };
> module_platform_driver(imx_sc_key_driver);
>
> --
> 2.7.4
next prev parent reply other threads:[~2020-05-13 6:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 6:59 [PATCH] input: keyboard: imx_sc_key: Use devm_add_action_or_reset() to handle all cleanups Anson Huang
2020-05-13 6:08 ` Anson Huang [this message]
2020-05-13 17:19 ` Dmitry Torokhov
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=DB3PR0402MB39161C863811D9CDEA301A9FF5BF0@DB3PR0402MB3916.eurprd04.prod.outlook.com \
--to=anson.huang@nxp.com \
--cc=dmitry.torokhov@gmail.com \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).