From: "Shenhar, Talel" <talel@amazon.com>
To: Cai Huoqing <caihuoqing@baidu.com>
Cc: Borislav Petkov <bp@alien8.de>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Tony Luck <tony.luck@intel.com>,
James Morse <james.morse@arm.com>,
Robert Richter <rric@kernel.org>,
Ronen Krupnik <ronenk@amazon.com>, <linux-edac@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <talelshenhar@gmail.com>
Subject: Re: [PATCH] EDAC/al-mc-edac: Make use of the helper function devm_add_action_or_reset()
Date: Thu, 23 Sep 2021 11:50:16 +0300 [thread overview]
Message-ID: <cb981992-a44f-d2d2-9c6d-31c5d53c74c1@amazon.com> (raw)
In-Reply-To: <20210922125924.321-1-caihuoqing@baidu.com>
> The helper function devm_add_action_or_reset() will internally
> call devm_add_action(), and if devm_add_action() fails then it will
> execute the action mentioned and return the error code. So
> use devm_add_action_or_reset() instead of devm_add_action()
> to simplify the error handling, reduce the code.
>
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Acked-by: Talel Shenhar <talel@amazon.com>
> ---
> drivers/edac/al_mc_edac.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/edac/al_mc_edac.c b/drivers/edac/al_mc_edac.c
> index 7d4f396c27b5..178b9e581a72 100644
> --- a/drivers/edac/al_mc_edac.c
> +++ b/drivers/edac/al_mc_edac.c
> @@ -238,11 +238,9 @@ static int al_mc_edac_probe(struct platform_device *pdev)
> if (!mci)
> return -ENOMEM;
>
> - ret = devm_add_action(&pdev->dev, devm_al_mc_edac_free, mci);
> - if (ret) {
> - edac_mc_free(mci);
> + ret = devm_add_action_or_reset(&pdev->dev, devm_al_mc_edac_free, mci);
> + if (ret)
> return ret;
> - }
>
> platform_set_drvdata(pdev, mci);
> al_mc = mci->pvt_info;
> @@ -293,11 +291,9 @@ static int al_mc_edac_probe(struct platform_device *pdev)
> return ret;
> }
>
> - ret = devm_add_action(&pdev->dev, devm_al_mc_edac_del, &pdev->dev);
> - if (ret) {
> - edac_mc_del_mc(&pdev->dev);
> + ret = devm_add_action_or_reset(&pdev->dev, devm_al_mc_edac_del, &pdev->dev);
> + if (ret)
> return ret;
> - }
>
> if (al_mc->irq_ue > 0) {
> ret = devm_request_irq(&pdev->dev,
> --
> 2.25.1
>
next prev parent reply other threads:[~2021-09-23 8:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 12:59 [PATCH] EDAC/al-mc-edac: Make use of the helper function devm_add_action_or_reset() Cai Huoqing
2021-09-23 8:50 ` Shenhar, Talel [this message]
2021-09-28 16:51 ` Borislav Petkov
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=cb981992-a44f-d2d2-9c6d-31c5d53c74c1@amazon.com \
--to=talel@amazon.com \
--cc=bp@alien8.de \
--cc=caihuoqing@baidu.com \
--cc=james.morse@arm.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=ronenk@amazon.com \
--cc=rric@kernel.org \
--cc=talelshenhar@gmail.com \
--cc=tony.luck@intel.com \
/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).