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;
Message-ID: <cb981992-a44f-d2d2-9c6d-31c5d53c74c1@amazon.com>
Date:   Thu, 23 Sep 2021 11:50:16 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.1.1
Subject: Re: [PATCH] EDAC/al-mc-edac: Make use of the helper function
 devm_add_action_or_reset()
Content-Language: en-US
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>
References: <20210922125924.321-1-caihuoqing@baidu.com>
From:   "Shenhar, Talel" <talel@amazon.com>
In-Reply-To: <20210922125924.321-1-caihuoqing@baidu.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


> 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
>