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.5 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 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 084CDC433B4 for ; Sat, 24 Apr 2021 13:59:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D663E61494 for ; Sat, 24 Apr 2021 13:59:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232250AbhDXN7z (ORCPT ); Sat, 24 Apr 2021 09:59:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:50666 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230432AbhDXN7y (ORCPT ); Sat, 24 Apr 2021 09:59:54 -0400 Received: from jic23-huawei (cpc108967-cmbg20-2-0-cust86.5-4.cable.virginm.net [81.101.6.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6BD3F61481; Sat, 24 Apr 2021 13:59:14 +0000 (UTC) Date: Sat, 24 Apr 2021 14:59:55 +0100 From: Jonathan Cameron To: Yicong Yang Cc: , , , , , Subject: Re: [PATCH 4/7] iio: triggered-buffer: simplify devm_iio_triggered_buffer_setup_ext Message-ID: <20210424145955.0a665a3c@jic23-huawei> In-Reply-To: References: <1617881896-3164-1-git-send-email-yangyicong@hisilicon.com> <1617881896-3164-5-git-send-email-yangyicong@hisilicon.com> <20210411151606.1ec66860@jic23-huawei> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Mon, 12 Apr 2021 17:05:15 +0800 Yicong Yang wrote: > On 2021/4/11 22:16, Jonathan Cameron wrote: > > On Thu, 8 Apr 2021 19:38:13 +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/buffer/industrialio-triggered-buffer.c | 19 +++++-------------- > >> 1 file changed, 5 insertions(+), 14 deletions(-) > >> > >> diff --git a/drivers/iio/buffer/industrialio-triggered-buffer.c b/drivers/iio/buffer/industrialio-triggered-buffer.c > >> index 92b8aea..63b4722 100644 > >> --- a/drivers/iio/buffer/industrialio-triggered-buffer.c > >> +++ b/drivers/iio/buffer/industrialio-triggered-buffer.c > >> @@ -92,9 +92,9 @@ void iio_triggered_buffer_cleanup(struct iio_dev *indio_dev) > >> } > >> EXPORT_SYMBOL(iio_triggered_buffer_cleanup); > >> > >> -static void devm_iio_triggered_buffer_clean(struct device *dev, void *res) > >> +static void devm_iio_triggered_buffer_clean(void *indio_dev) > >> { > >> - iio_triggered_buffer_cleanup(*(struct iio_dev **)res); > >> + iio_triggered_buffer_cleanup(indio_dev); > >> } > >> > >> int devm_iio_triggered_buffer_setup_ext(struct device *dev, > >> @@ -104,24 +104,15 @@ int devm_iio_triggered_buffer_setup_ext(struct device *dev, > >> const struct iio_buffer_setup_ops *ops, > >> const struct attribute **buffer_attrs) > >> { > >> - struct iio_dev **ptr; > >> int ret; > >> > >> - ptr = devres_alloc(devm_iio_triggered_buffer_clean, sizeof(*ptr), > >> - GFP_KERNEL); > >> - if (!ptr) > >> - return -ENOMEM; > >> - > >> - *ptr = indio_dev; > >> - > >> ret = iio_triggered_buffer_setup_ext(indio_dev, h, thread, ops, > >> buffer_attrs); > >> if (!ret) > >> - devres_add(dev, ptr); > >> - else > >> - devres_free(ptr); > >> + return ret; > > > > This looks inverted from what it should be. > > > > if (ret) > > return ret; > > > > return devm_add_action_or_reset()... > > > > yes. it does. will fix. I fixed it up and applied to the togreg branch of iio.git. Pushed out as testing for all the usual reasons. Thanks, Jonathan > > thanks > > >> > >> - return ret; > >> + return devm_add_action_or_reset(dev, devm_iio_triggered_buffer_clean, > >> + indio_dev); > >> } > >> EXPORT_SYMBOL_GPL(devm_iio_triggered_buffer_setup_ext); > >> > > > > > > . > > >