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=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable 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 EAC20C433E4 for ; Mon, 20 Jul 2020 11:25:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C6BD122B4D for ; Mon, 20 Jul 2020 11:25:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595244333; bh=JrIe64vK19fXZOsenVP7rSnigc5B7CQyObVtpukyt1g=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=Ja3DsR5XUa496cuj1hDr8oXQcHj9q7aAOw81KRxXSlJoMmhkvNBrqCH59oagK2eLS eGN3NxoE8B8s6QykGOWoS3rtrIfPNfU3gCL0C0v/BNQ4xSAijI621xs3Tdw+XVYQNP UNI1X2kQ1dvXV6xKfFU2EFHe8m2IQnVSsS6KM2rQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728629AbgGTLZc (ORCPT ); Mon, 20 Jul 2020 07:25:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:56012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728058AbgGTLZb (ORCPT ); Mon, 20 Jul 2020 07:25:31 -0400 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (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 193D222B4E; Mon, 20 Jul 2020 11:25:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595244331; bh=JrIe64vK19fXZOsenVP7rSnigc5B7CQyObVtpukyt1g=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=AykSFuOn+cstZkFbNL+KY6qvlK4kCSU5uPHlPeDldKfDu0PXZefvVqXHboHMjIQZt W8wxYkACqbN5vId5Q52h4q1xkiVbwYn3h0+jIxHrFQO4tX0lT1eMo/AiK+wua1LrVn 7nPe5XpvSj4mP7D90jmXMg313jH3wP4UnkEy3j4M= Date: Mon, 20 Jul 2020 12:25:26 +0100 From: Jonathan Cameron To: Bartosz Golaszewski Cc: Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek , Greg Kroah-Hartman , Guenter Roeck , Andy Shevchenko , linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: Re: [PATCH v5 3/3] iio: adc: xilinx-xadc: use devm_krealloc() Message-ID: <20200720122526.2662732f@archlinux> In-Reply-To: <20200715092528.8136-4-brgl@bgdev.pl> References: <20200715092528.8136-1-brgl@bgdev.pl> <20200715092528.8136-4-brgl@bgdev.pl> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 15 Jul 2020 11:25:28 +0200 Bartosz Golaszewski wrote: > From: Bartosz Golaszewski > > Use the managed variant of krealloc() and shrink the code a bit. > > Signed-off-by: Bartosz Golaszewski Looks good to me. Acked-by: Jonathan Cameron > --- > drivers/iio/adc/xilinx-xadc-core.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c > index d7fecab9252e4..5bdbe502e983a 100644 > --- a/drivers/iio/adc/xilinx-xadc-core.c > +++ b/drivers/iio/adc/xilinx-xadc-core.c > @@ -1094,6 +1094,7 @@ MODULE_DEVICE_TABLE(of, xadc_of_match_table); > static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, > unsigned int *conf) > { > + struct device *dev = indio_dev->dev.parent; > struct xadc *xadc = iio_priv(indio_dev); > struct iio_chan_spec *channels, *chan; > struct device_node *chan_node, *child; > @@ -1138,7 +1139,8 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, > *conf |= XADC_CONF0_MUX | XADC_CONF0_CHAN(ext_mux_chan); > } > > - channels = kmemdup(xadc_channels, sizeof(xadc_channels), GFP_KERNEL); > + channels = devm_kmemdup(dev, xadc_channels, > + sizeof(xadc_channels), GFP_KERNEL); > if (!channels) > return -ENOMEM; > > @@ -1174,8 +1176,9 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, > of_node_put(chan_node); > > indio_dev->num_channels = num_channels; > - indio_dev->channels = krealloc(channels, sizeof(*channels) * > - num_channels, GFP_KERNEL); > + indio_dev->channels = devm_krealloc(dev, channels, > + sizeof(*channels) * num_channels, > + GFP_KERNEL); > /* If we can't resize the channels array, just use the original */ > if (!indio_dev->channels) > indio_dev->channels = channels; > @@ -1229,14 +1232,14 @@ static int xadc_probe(struct platform_device *pdev) > > ret = xadc_parse_dt(indio_dev, pdev->dev.of_node, &conf0); > if (ret) > - goto err_device_free; > + return ret; > > if (xadc->ops->flags & XADC_FLAGS_BUFFERED) { > ret = iio_triggered_buffer_setup(indio_dev, > &iio_pollfunc_store_time, &xadc_trigger_handler, > &xadc_buffer_ops); > if (ret) > - goto err_device_free; > + return ret; > > xadc->convst_trigger = xadc_alloc_trigger(indio_dev, "convst"); > if (IS_ERR(xadc->convst_trigger)) { > @@ -1354,8 +1357,6 @@ static int xadc_probe(struct platform_device *pdev) > err_triggered_buffer_cleanup: > if (xadc->ops->flags & XADC_FLAGS_BUFFERED) > iio_triggered_buffer_cleanup(indio_dev); > -err_device_free: > - kfree(indio_dev->channels); > > return ret; > } > @@ -1375,7 +1376,6 @@ static int xadc_remove(struct platform_device *pdev) > cancel_delayed_work_sync(&xadc->zynq_unmask_work); > clk_disable_unprepare(xadc->clk); > kfree(xadc->data); > - kfree(indio_dev->channels); > > return 0; > } 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=-11.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 5B8B3C433E1 for ; Mon, 20 Jul 2020 11:26:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 26E5122B4D for ; Mon, 20 Jul 2020 11:26:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Jjg6WPP7"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="AykSFuOn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26E5122B4D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=scUCd3uAElo3Qr5qhrnp6zXzuoYP71FgHMSd4P6kSyE=; b=Jjg6WPP7glTaV35Fx3NM7Ntot EiXKMYkDbmL8eKxlEzQx0hmQLYXZRe5nfzFDZaMEgHGBa21GEfsXUWvV7WQKXCYtU8N4RFPZYzT03 ooGT65nkb+2hIludkWXDOKy8NNINOTFAW+mEyAXADTgIwDYfY7O/U/u9mnAyUcQkHd6eMJH614Lhl JvsjIcP2vCt/9JsOXB93adzBinuExg7tpsZK7PLDo4tzSwckyOwMVei2MH6eLHoObbZ+LOTIOyWQl 8qYppEeX2JpixHb7Q4zyCQwdzE2n12F3WbnWbEX3DN3ehBKMjZW6LBHuDiJGpDikrAefcTutWh+aW hHVewRYdQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTvL-0001Ym-UU; Mon, 20 Jul 2020 11:25:36 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTvI-0001XA-Ij for linux-arm-kernel@lists.infradead.org; Mon, 20 Jul 2020 11:25:33 +0000 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (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 193D222B4E; Mon, 20 Jul 2020 11:25:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595244331; bh=JrIe64vK19fXZOsenVP7rSnigc5B7CQyObVtpukyt1g=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=AykSFuOn+cstZkFbNL+KY6qvlK4kCSU5uPHlPeDldKfDu0PXZefvVqXHboHMjIQZt W8wxYkACqbN5vId5Q52h4q1xkiVbwYn3h0+jIxHrFQO4tX0lT1eMo/AiK+wua1LrVn 7nPe5XpvSj4mP7D90jmXMg313jH3wP4UnkEy3j4M= Date: Mon, 20 Jul 2020 12:25:26 +0100 From: Jonathan Cameron To: Bartosz Golaszewski Subject: Re: [PATCH v5 3/3] iio: adc: xilinx-xadc: use devm_krealloc() Message-ID: <20200720122526.2662732f@archlinux> In-Reply-To: <20200715092528.8136-4-brgl@bgdev.pl> References: <20200715092528.8136-1-brgl@bgdev.pl> <20200715092528.8136-4-brgl@bgdev.pl> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200720_072532_745354_C56CE4DF X-CRM114-Status: GOOD ( 20.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lars-Peter Clausen , linux-iio@vger.kernel.org, Greg Kroah-Hartman , Michal Simek , linux-kernel@vger.kernel.org, Bartosz Golaszewski , linux-arm-kernel@lists.infradead.org, Peter Meerwald-Stadler , Hartmut Knaack , Andy Shevchenko , Guenter Roeck Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 15 Jul 2020 11:25:28 +0200 Bartosz Golaszewski wrote: > From: Bartosz Golaszewski > > Use the managed variant of krealloc() and shrink the code a bit. > > Signed-off-by: Bartosz Golaszewski Looks good to me. Acked-by: Jonathan Cameron > --- > drivers/iio/adc/xilinx-xadc-core.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c > index d7fecab9252e4..5bdbe502e983a 100644 > --- a/drivers/iio/adc/xilinx-xadc-core.c > +++ b/drivers/iio/adc/xilinx-xadc-core.c > @@ -1094,6 +1094,7 @@ MODULE_DEVICE_TABLE(of, xadc_of_match_table); > static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, > unsigned int *conf) > { > + struct device *dev = indio_dev->dev.parent; > struct xadc *xadc = iio_priv(indio_dev); > struct iio_chan_spec *channels, *chan; > struct device_node *chan_node, *child; > @@ -1138,7 +1139,8 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, > *conf |= XADC_CONF0_MUX | XADC_CONF0_CHAN(ext_mux_chan); > } > > - channels = kmemdup(xadc_channels, sizeof(xadc_channels), GFP_KERNEL); > + channels = devm_kmemdup(dev, xadc_channels, > + sizeof(xadc_channels), GFP_KERNEL); > if (!channels) > return -ENOMEM; > > @@ -1174,8 +1176,9 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, > of_node_put(chan_node); > > indio_dev->num_channels = num_channels; > - indio_dev->channels = krealloc(channels, sizeof(*channels) * > - num_channels, GFP_KERNEL); > + indio_dev->channels = devm_krealloc(dev, channels, > + sizeof(*channels) * num_channels, > + GFP_KERNEL); > /* If we can't resize the channels array, just use the original */ > if (!indio_dev->channels) > indio_dev->channels = channels; > @@ -1229,14 +1232,14 @@ static int xadc_probe(struct platform_device *pdev) > > ret = xadc_parse_dt(indio_dev, pdev->dev.of_node, &conf0); > if (ret) > - goto err_device_free; > + return ret; > > if (xadc->ops->flags & XADC_FLAGS_BUFFERED) { > ret = iio_triggered_buffer_setup(indio_dev, > &iio_pollfunc_store_time, &xadc_trigger_handler, > &xadc_buffer_ops); > if (ret) > - goto err_device_free; > + return ret; > > xadc->convst_trigger = xadc_alloc_trigger(indio_dev, "convst"); > if (IS_ERR(xadc->convst_trigger)) { > @@ -1354,8 +1357,6 @@ static int xadc_probe(struct platform_device *pdev) > err_triggered_buffer_cleanup: > if (xadc->ops->flags & XADC_FLAGS_BUFFERED) > iio_triggered_buffer_cleanup(indio_dev); > -err_device_free: > - kfree(indio_dev->channels); > > return ret; > } > @@ -1375,7 +1376,6 @@ static int xadc_remove(struct platform_device *pdev) > cancel_delayed_work_sync(&xadc->zynq_unmask_work); > clk_disable_unprepare(xadc->clk); > kfree(xadc->data); > - kfree(indio_dev->channels); > > return 0; > } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel