From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_NONE,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A2BBC433ED for ; Mon, 12 Apr 2021 09:13:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 43BFA611F0 for ; Mon, 12 Apr 2021 09:13:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239723AbhDLJNT (ORCPT ); Mon, 12 Apr 2021 05:13:19 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:16570 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240615AbhDLJKr (ORCPT ); Mon, 12 Apr 2021 05:10:47 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4FJjZP2nSrz1BGg3; Mon, 12 Apr 2021 17:08:13 +0800 (CST) Received: from [127.0.0.1] (10.69.38.196) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.498.0; Mon, 12 Apr 2021 17:10:17 +0800 Subject: Re: [PATCH 1/7] iio: adc: adi-axi-adc: simplify devm_adi_axi_adc_conv_register To: Jonathan Cameron CC: , , , , , References: <1617881896-3164-1-git-send-email-yangyicong@hisilicon.com> <1617881896-3164-2-git-send-email-yangyicong@hisilicon.com> <20210411151215.5d3e5494@jic23-huawei> From: Yicong Yang Message-ID: Date: Mon, 12 Apr 2021 17:10:17 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 In-Reply-To: <20210411151215.5d3e5494@jic23-huawei> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.69.38.196] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On 2021/4/11 22:12, Jonathan Cameron wrote: > On Thu, 8 Apr 2021 19:38:10 +0800 > Yicong Yang wrote: > >> Use devm_add_action_or_reset() instead of devres_alloc() and >> devres_add(), which works the same. This will simplify the >> code. There is no functional changes. >> >> Signed-off-by: Yicong Yang >> --- >> drivers/iio/adc/adi-axi-adc.c | 22 +++++++++------------- >> 1 file changed, 9 insertions(+), 13 deletions(-) >> >> diff --git a/drivers/iio/adc/adi-axi-adc.c b/drivers/iio/adc/adi-axi-adc.c >> index 9109da2..575a63f 100644 >> --- a/drivers/iio/adc/adi-axi-adc.c >> +++ b/drivers/iio/adc/adi-axi-adc.c >> @@ -210,29 +210,25 @@ static void adi_axi_adc_conv_unregister(struct adi_axi_adc_conv *conv) >> kfree(cl); >> } >> >> -static void devm_adi_axi_adc_conv_release(struct device *dev, void *res) >> +static void devm_adi_axi_adc_conv_release(void *conv) >> { >> - adi_axi_adc_conv_unregister(*(struct adi_axi_adc_conv **)res); >> + adi_axi_adc_conv_unregister(conv); >> } >> >> struct adi_axi_adc_conv *devm_adi_axi_adc_conv_register(struct device *dev, >> size_t sizeof_priv) >> { >> - struct adi_axi_adc_conv **ptr, *conv; >> - >> - ptr = devres_alloc(devm_adi_axi_adc_conv_release, sizeof(*ptr), >> - GFP_KERNEL); >> - if (!ptr) >> - return ERR_PTR(-ENOMEM); >> + struct adi_axi_adc_conv *conv; >> + int ret; >> >> conv = adi_axi_adc_conv_register(dev, sizeof_priv); >> - if (IS_ERR(conv)) { >> - devres_free(ptr); >> + if (IS_ERR(conv)) >> return ERR_CAST(conv); > > Is that ERR_CAST() needed here? conv is already of the > right type so we don't need to cast it to a void * and back gain. > Obviously was there before an not needed either, but might as well > tidy it up whilst we are here! sure. thanks for the hint. I didn't notice this. will drop the ERR_CAST. thanks! > > Thanks, > > Jonathan > > > >> - } >> >> - *ptr = conv; >> - devres_add(dev, ptr); >> + ret = devm_add_action_or_reset(dev, devm_adi_axi_adc_conv_release, >> + conv); >> + if (ret) >> + return ERR_PTR(ret); >> >> return conv; >> } > > > . >