* [PATCH] EDAC/al-mc-edac: Make use of the helper function devm_add_action_or_reset()
@ 2021-09-22 12:59 Cai Huoqing
2021-09-23 8:50 ` Shenhar, Talel
2021-09-28 16:51 ` Borislav Petkov
0 siblings, 2 replies; 3+ messages in thread
From: Cai Huoqing @ 2021-09-22 12:59 UTC (permalink / raw)
To: caihuoqing
Cc: Talel Shenhar, Borislav Petkov, Mauro Carvalho Chehab, Tony Luck,
James Morse, Robert Richter, linux-edac, linux-kernel
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] EDAC/al-mc-edac: Make use of the helper function devm_add_action_or_reset()
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
2021-09-28 16:51 ` Borislav Petkov
1 sibling, 0 replies; 3+ messages in thread
From: Shenhar, Talel @ 2021-09-23 8:50 UTC (permalink / raw)
To: Cai Huoqing
Cc: Borislav Petkov, Mauro Carvalho Chehab, Tony Luck, James Morse,
Robert Richter, Ronen Krupnik, linux-edac, linux-kernel,
talelshenhar
> 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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] EDAC/al-mc-edac: Make use of the helper function devm_add_action_or_reset()
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
@ 2021-09-28 16:51 ` Borislav Petkov
1 sibling, 0 replies; 3+ messages in thread
From: Borislav Petkov @ 2021-09-28 16:51 UTC (permalink / raw)
To: Cai Huoqing
Cc: Talel Shenhar, Mauro Carvalho Chehab, Tony Luck, James Morse,
Robert Richter, linux-edac, linux-kernel
On Wed, Sep 22, 2021 at 08:59:23PM +0800, Cai Huoqing wrote:
> 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>
> ---
> drivers/edac/al_mc_edac.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
Applied, thanks.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-28 16:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2021-09-28 16:51 ` Borislav Petkov
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).