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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 B599FC433DF for ; Mon, 17 Aug 2020 17:07:11 +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 804622067C for ; Mon, 17 Aug 2020 17:07:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bEPP78v/"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="YuiXi/ki" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 804622067C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl 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:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1tZ+C2YhgLCoXE7/aHkoVtaqxZke5V1ZMEs+8NeaCv4=; b=bEPP78v/XvoQSNKrtk9ZXcDGp YQAydHrjWbCAi5eIpbZrNt/s+4Xn/ZyA1Hpk/Ewb0Xw5QBEytsm7oiF1LQEvchPzPJsiHNlCxSypq RwLlj+xlEcWegH7tKz/VDnVhDffUMUnafM53/RAp6K3s1xaNTiqMuRxcvfCFWZSS1zzw37Jfc75Fe bq0oChR0sj68xe9Jkg90qvoHr9D6EVGhGA+eYjA884qewwYZRsrB4eyQcGDMdO7k+sy9QVQj3jtl/ 9QvnVUgUNpEvhIzgMRTFkqi1zGF41Ds0BBBUF+F4BgVP552hOhg6vqIIqfJO6AKokDXSLM9jlEusU fb3hTdfHw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k7ia4-0007mq-QB; Mon, 17 Aug 2020 17:05:56 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k7iZs-0007jg-0o for linux-arm-kernel@lists.infradead.org; Mon, 17 Aug 2020 17:05:45 +0000 Received: by mail-wr1-x443.google.com with SMTP id 88so15729166wrh.3 for ; Mon, 17 Aug 2020 10:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QPQnmI/58kOYJX5JO2+CM6DvjdssZDc2jVBjt8SVn9Y=; b=YuiXi/kinFP88R0aPiCU55Nprn56KeOKbH+KhhoCxduo6j7FzXH12C+I/rUVFF2MTP rUNab8Es+pEUJ0mOl0o47LkZ9vxB88jk2clqVQO4YC3EMN54iij8Dg8f1X9T9s8V8I+t K67UfagZ+rIkHxaCUmX6dl/fnHdP01O4+yLsnKvnlNwfJ0VVDsBuk2m/Wi0mwtG58Ypl AT44t4dH86MBjKLlQOp8xEQEF9c3YypxpUYLgQAuAR9MU4UWZR68FGdiuu+hNZEmv4Tm pX8UkOQzp2mYLfUXDwUq29cTK6tNS0ySm+dy5EOekUvDleo+l/oguSRijKxKZraz93xt 27hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QPQnmI/58kOYJX5JO2+CM6DvjdssZDc2jVBjt8SVn9Y=; b=UR8HoZQIqt6m1BQuhu7ss5lYyHwxyNDhL9YnT43rCbFCBl9fvyFk2R0xtW2zVVwxvl o+6K00S0TkHEBR9taEpSLCA409fjWO9Eq1NI94ztWXaXuVjLUL7i75rQgBIhQvghEy1i pXVMrdMb5wvVvLGAvhtWja8sH6IUKsLJJIGDFNTr0oRYjYaID5sJwTj9bdie1w+r3ovc GFirHxPuhYT/UMRvppQCXa6cmOcel3NvsIcbZqXB8Hf11EzYDGZEI+CyRRCLw+7zSxyT gthERQLoCj3IASwV3dycqOM72fj9hCjaAJLesw8MtPQ7Xn4cgJu0wWVy6CiZ3Y7lczGI l9ng== X-Gm-Message-State: AOAM530/rYug+z1tgI09np///0dsx62oFg7sbkc7P1fq/emtAeXNtnWR 7AC72B67GY5cVM6iFQNquLreDw== X-Google-Smtp-Source: ABdhPJzidFcB7ZIzIx5H9eHYngnMFhnJsHpdbQQUC3IPtgHxLJxrUgwpePI6OmXWPyKufiK3Jko02g== X-Received: by 2002:adf:ef92:: with SMTP id d18mr17541341wro.71.1597683943032; Mon, 17 Aug 2020 10:05:43 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id k184sm29747177wme.1.2020.08.17.10.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 10:05:42 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek , Greg Kroah-Hartman , Guenter Roeck , Andy Shevchenko Subject: [PATCH v7 3/3] iio: adc: xilinx-xadc: use devm_krealloc() Date: Mon, 17 Aug 2020 19:05:35 +0200 Message-Id: <20200817170535.17041-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200817170535.17041-1-brgl@bgdev.pl> References: <20200817170535.17041-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200817_130544_192838_3B7DF434 X-CRM114-Status: GOOD ( 16.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: linux-iio@vger.kernel.org, Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jonathan Cameron 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 From: Bartosz Golaszewski Use the managed variant of krealloc() and shrink the code a bit. Signed-off-by: Bartosz Golaszewski 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 d0b7ef296afb..f93c34fe5873 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -1092,6 +1092,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; @@ -1136,7 +1137,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; @@ -1172,8 +1174,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; @@ -1225,14 +1228,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)) { @@ -1350,8 +1353,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; } @@ -1371,7 +1372,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; } -- 2.26.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel