Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
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
Thread-Topic: [PATCH] input: keyboard: imx_sc_key: Use
 devm_add_action_or_reset() to handle all cleanups
Thread-Index: AQHV+QXTnOoa7lAvbUqq8EjvsNdNNKil53Qw
Date:   Wed, 13 May 2020 06:08:20 +0000
Message-ID: <DB3PR0402MB39161C863811D9CDEA301A9FF5BF0@DB3PR0402MB3916.eurprd04.prod.outlook.com>
References: <1584082751-17047-1-git-send-email-Anson.Huang@nxp.com>
In-Reply-To: <1584082751-17047-1-git-send-email-Anson.Huang@nxp.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 6a9f0390-62f4-4a6e-47a9-08d7f704098d
X-MS-Exchange-CrossTenant-originalarrivaltime: 13 May 2020 06:08:20.6759
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: Y6HwZ04Cyxb1eduiEuMc7kKBRaZR8qUUSa2LQK+TqJNzTc2OM+Dh6mlsH4SHBTmaBUdwU5rNT17iuTSOFrePfA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3834
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Gentle ping...

> Subject: [PATCH] input: keyboard: imx_sc_key: Use
> devm_add_action_or_reset() to handle all cleanups
>=20
> Use devm_add_action_or_reset() to handle all cleanups of failure in .prob=
e
> and .remove, then .remove callback can be dropped.
>=20
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
>  drivers/input/keyboard/imx_sc_key.c | 33 +++++++++++++++----------------=
--
>  1 file changed, 15 insertions(+), 18 deletions(-)
>=20
> 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));
>  }
>=20
> +static void imx_sc_key_action(void *data) {
> +	struct imx_key_drv_data *priv =3D 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;
>  	}
>=20
> +	error =3D devm_add_action_or_reset(&pdev->dev, imx_sc_key_action,
> &priv);
> +	if (error)
> +		return error;
> +
>  	priv->key_notifier.notifier_call =3D imx_sc_key_notify;
>  	error =3D 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 =3D 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);
>=20
> -	return 0;
> +	return error;
>  }
>=20
>  static const struct of_device_id imx_sc_key_ids[] =3D { @@ -181,7 +179,6=
 @@
> static struct platform_driver imx_sc_key_driver =3D {
>  		.of_match_table =3D imx_sc_key_ids,
>  	},
>  	.probe =3D imx_sc_key_probe,
> -	.remove =3D imx_sc_key_remove,
>  };
>  module_platform_driver(imx_sc_key_driver);
>=20
> --
> 2.7.4