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=-13.0 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=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 A0327C433E1 for ; Sun, 2 Aug 2020 08:36:55 +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 7090820738 for ; Sun, 2 Aug 2020 08:36:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="vgqQPEfA"; 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="iO2jRFEx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7090820738 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=vgqQPEfA+Q5iWGXYZD7t5X9Z2 uJONf2LalXTcKzpruZ0XzW98RSHSi7rLoQD+GRKuzuodbezO+cEvHZ6s4q+Q9ISrGbaSb5YhgRROT omGllqnXYVL8nYb53R9U4GfqcxC43LGA2etT5teaiyimEC1Xzut+XAE2xjE+IIaAPTgb8nkBt7PF2 qGUI0y2BrzEKBHDJp2n+Ah8a+/CMGEjghOV4bE9z3lzRuQql6J1YLV+8DqECQQv2OhP5kAW4ifQOm LT6DBk0IkhFAd0umS4a8CAt1LbQoIsqx8UN+rGdNzD/VNw3+g3fPvDd1/yoIfln5tkeuQgM+93Msn PxWRMzcSA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k29Se-00017f-3e; Sun, 02 Aug 2020 08:35:16 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k29SW-00016T-58 for linux-arm-kernel@lists.infradead.org; Sun, 02 Aug 2020 08:35:09 +0000 Received: by mail-wr1-x444.google.com with SMTP id f18so31474235wrs.0 for ; Sun, 02 Aug 2020 01:35:06 -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=iO2jRFEx59Eh2m1Om/5bJDJk6/MLr3z2OMyOsrMzSXjHTnYO2Yr0MJFnmUantExUSg Xsex/oX3W+VEglpLLMrC6wpt1jxfdDiWMc7IVzo2zWlxpeVRQgMfwmUv8gVmdGX89YKH /HI1+tYCx7tbOg7CvzYtnATitPyFEf8B41jGH4xE+awMJ0YdnPHpO/OvgIhfwXvExvFp oAU2wb6m44XZoZpVqs87WsGaHIUAfhC/GyOforarHWOxfupdWdDKtNs4usKA04nxmgw8 kP6x54XgAV24encfK0kNboTawG1oMc5zlvZ+OQ0RsWbrjip2tQWY9lTkgM5gle6bVUWc Z1/A== 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=Shl9L2trEFit3/FjfZ3WfLJ38e/v3Pip0tZwwBNGONidk0rg7dh9FjWkfv3ZiSxWgf 30mEC7Ap6G3x3VYJD9toLCW/SK67b4FpNNLKFeAQko5ovw+6kZWrTs3MIqkGHdmiZ4/3 K92ECg1oCAwlUm4x7GgSfh2frxsCOpxFoFU8w+NTry5V25Cw+t8we32R/1se1BLo1AtA hnr8xh2OGvEqFIR6edJCfxdasp7nfI+zgh0IPRvMxCp35d49jXQDq1CZbMRhzDoyrGuv Rsy7Xp0gjiWFLtZKzjG60RcEvpA0svfAVWS0j+3g1O3lAvg+dZoviyhI1DnBTts/4GyP V7ag== X-Gm-Message-State: AOAM531DdYcW51EyYdgsDYg7/dTOoiiMfOumr4sRpfMrSjOouJRONuug vBtjW4t0bg96oTCp4Ag2qJhzkQ== X-Google-Smtp-Source: ABdhPJy4rrs4Yd+dSBltlP9MU+WoUAnn2Nr859YwbSPgNkZJwkSvEt7W6+PVPE5XkvK5+KUEjAVJ9g== X-Received: by 2002:a5d:6641:: with SMTP id f1mr10312582wrw.307.1596357306003; Sun, 02 Aug 2020 01:35:06 -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 d14sm19281466wre.44.2020.08.02.01.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Aug 2020 01:35:05 -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 v6 3/3] iio: adc: xilinx-xadc: use devm_krealloc() Date: Sun, 2 Aug 2020 10:34:58 +0200 Message-Id: <20200802083458.24323-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200802083458.24323-1-brgl@bgdev.pl> References: <20200802083458.24323-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200802_043508_630818_5E183F0C X-CRM114-Status: GOOD ( 16.66 ) 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