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,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 B64EEC55178 for ; Mon, 26 Oct 2020 13:36:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 75D2B2466D for ; Mon, 26 Oct 2020 13:36:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="AE5uYd3q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1780247AbgJZNg0 (ORCPT ); Mon, 26 Oct 2020 09:36:26 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:39585 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1775552AbgJZNg0 (ORCPT ); Mon, 26 Oct 2020 09:36:26 -0400 Received: by mail-wm1-f65.google.com with SMTP id d3so12501737wma.4 for ; Mon, 26 Oct 2020 06:36:24 -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=CjmXhl5JLo4J/PxFbte5j14dKUd6PJral95QAT5RzjQ=; b=AE5uYd3q/mN+YF+UoNFzyWfn2e6aNplcHY2J7LSmHYbHDV+AteEfF4NyzxqqRYZoBc n/H3yCCMtcPvc+nEf7l1mv8FXlr1u6Z4ulvrO6bNG5QpWlJOX47vTf9rnpKY9axYH6n2 Lzlc+XzrljZQ7kifz3e3pRSUIOy6S64I4iKJuRFuQNVTB/yLAIgOUqIc7ZB6+jmZZmYU GrFyTr66j9EF9wpV0uVqawEulSwlRpU4G8o2LU0rE1udCvyx0DV1kIEjDiG0YhykpLEd 4F4QKwsvlMIPm5ZU6OuSE8ElztOAfmqCVI07OgFG+S66sRWCr4pILeNQf+AedtxFXQZF uQ7g== 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=CjmXhl5JLo4J/PxFbte5j14dKUd6PJral95QAT5RzjQ=; b=Upuw6tdGmjcf2XhFzWr0Ire24O39qmLUb4ZG8a4w1MWG4WoPT7ezFaeRVOUw2Em/a5 LP8tq73MDK01nL0naO+aRYVaQm2dzI+JivUR30q8vynMkEioywowoVT8wwYCiNO3vBvb Lst/iO1mQYdLsVoeGXRDgHVJa0ZuadOV9GQoHXusDCwLKUp32p4GyMDUoxxaa6AuuWG8 weYQFhFO2LXxx0pqDevPBJLMqwZ0Rvg5j30Fawabd3l8oyug5atNlbnoiHu5Wnsaqz9T ukqPkHXV0sTC8bqLcjJW1aE6THK0zGdBAj07QtHNS3+06k+lZO4fJ3w7c/bqYQ/O/o9l WSaw== X-Gm-Message-State: AOAM532LwlYuwT/ebRVbBiB/lY5opec7CMZLDAoTZD+iOYEEGTaGsXh+ kHLxiokyafbZW3WZf6H+exEZtw== X-Google-Smtp-Source: ABdhPJyx5XmliVgkj2HH8RoBGVNGyWBgD1WUqyjfZC8wakM0iZX/XJLYW/tw3KdwIN2ATgE39WAaww== X-Received: by 2002:a1c:48c3:: with SMTP id v186mr17231235wma.16.1603719383782; Mon, 26 Oct 2020 06:36:23 -0700 (PDT) Received: from localhost.localdomain (lfbn-nic-1-190-206.w2-15.abo.wanadoo.fr. [2.15.39.206]) by smtp.gmail.com with ESMTPSA id f7sm23688991wrx.64.2020.10.26.06.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 06:36:23 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 2/5] iio: adc: xilinx: use devm_krealloc() instead of kfree() + kcalloc() Date: Mon, 26 Oct 2020 14:36:06 +0100 Message-Id: <20201026133609.24262-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201026133609.24262-1-brgl@bgdev.pl> References: <20201026133609.24262-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org From: Bartosz Golaszewski We now have devm_krealloc() in the kernel Use it indstead of calling kfree() and kcalloc() separately. Signed-off-by: Bartosz Golaszewski --- drivers/iio/adc/xilinx-xadc-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index 8494eb424b33..b516280ccbd4 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -589,8 +589,9 @@ static int xadc_update_scan_mode(struct iio_dev *indio_dev, n = bitmap_weight(mask, indio_dev->masklength); - kfree(xadc->data); - xadc->data = kcalloc(n, sizeof(*xadc->data), GFP_KERNEL); + xadc->data = devm_krealloc(indio_dev->dev.parent, xadc->data, + n * sizeof(*xadc->data), + GFP_KERNEL | __GFP_ZERO); if (!xadc->data) return -ENOMEM; @@ -1372,7 +1373,6 @@ static int xadc_remove(struct platform_device *pdev) free_irq(xadc->irq, indio_dev); cancel_delayed_work_sync(&xadc->zynq_unmask_work); clk_disable_unprepare(xadc->clk); - kfree(xadc->data); return 0; } -- 2.29.1 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,URIBL_BLOCKED, 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 5EE2DC4363A for ; Mon, 26 Oct 2020 13:48:19 +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 BF82A21D42 for ; Mon, 26 Oct 2020 13:48:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="2DPFqgQP"; 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="AE5uYd3q" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF82A21D42 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=5NsyYtcep8ndLH0+/gUX9ldg7JQnag4A1yKlWx4ij60=; b=2DPFqgQPcYZi4VvyX9CwkQvpb xxQYnGv0MKz6Pid5AtU57ndHtnUzZSlTkDn1UedqLTBKIWmrHpkj7TWAMjQz2P/4xEL/YmAtPrKtB Fkyr26YpqL/jjb5QuvSI4tWbQtA2tv+cY5cutL+oI6Y3YKvvKUxQVyQHGnEpSmO/NS+IgiVGQGaNX s1t8/salJQJ79arvbCK4Fdpwej4FF+MisOQS3gnRKRA6vhUvQbCNnsTJPxqSjYP4i+ABQDuQcLwrY 1Nrl5ScK7Sx2ZSGug8yDng8LcUhvO4IaiVTm4jGPNhKygcYu0OGJpEGB9zpLB7rklNcioozJbyRsx S4OTeotuA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX2pN-0004XS-ND; Mon, 26 Oct 2020 13:46:25 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX2fj-0008Dn-Qb for linux-arm-kernel@lists.infradead.org; Mon, 26 Oct 2020 13:36:32 +0000 Received: by mail-wm1-x343.google.com with SMTP id h22so1409848wmb.0 for ; Mon, 26 Oct 2020 06:36:26 -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=CjmXhl5JLo4J/PxFbte5j14dKUd6PJral95QAT5RzjQ=; b=AE5uYd3q/mN+YF+UoNFzyWfn2e6aNplcHY2J7LSmHYbHDV+AteEfF4NyzxqqRYZoBc n/H3yCCMtcPvc+nEf7l1mv8FXlr1u6Z4ulvrO6bNG5QpWlJOX47vTf9rnpKY9axYH6n2 Lzlc+XzrljZQ7kifz3e3pRSUIOy6S64I4iKJuRFuQNVTB/yLAIgOUqIc7ZB6+jmZZmYU GrFyTr66j9EF9wpV0uVqawEulSwlRpU4G8o2LU0rE1udCvyx0DV1kIEjDiG0YhykpLEd 4F4QKwsvlMIPm5ZU6OuSE8ElztOAfmqCVI07OgFG+S66sRWCr4pILeNQf+AedtxFXQZF uQ7g== 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=CjmXhl5JLo4J/PxFbte5j14dKUd6PJral95QAT5RzjQ=; b=TwAHhKGsHLdXq72OjE4K9tjKcKR7Hc0jlkdQI3z9huDO/T2OjhlFUlfRXtC2BtQ6V5 poE8tvqguFFzDqZ1gmaaUbgH3flMbul3pM8IMasCLZRSAP3VbBMNv/pS6Jjxgl5BoBmN OcWK8lQ73bbVDbwi7rOD6JaHeM2ueM0AOahHtKcOhT/qN+ATqtCJnIlfgZ4a90vHEt9h ewFdgiaYj0U5B7YxA5uQPM0cFF7IHB99QTCLXrVFl2YrzVGyCcyywzGOu4WcBFitjbCK 1Mn/IHDbMyU0Ru3gqrdj5q7I/1HO4B6xgtNc0k3kqJBIEg2bShA4P4u0S+gXP6XyFSZR kN3w== X-Gm-Message-State: AOAM531gK8AUTU5AW7SDAMRbKzqkUBLQ00HAIcdR29r3e315VFQKiyVX 1rSD6LVTR6CnG0P87/7d4o3P2A== X-Google-Smtp-Source: ABdhPJyx5XmliVgkj2HH8RoBGVNGyWBgD1WUqyjfZC8wakM0iZX/XJLYW/tw3KdwIN2ATgE39WAaww== X-Received: by 2002:a1c:48c3:: with SMTP id v186mr17231235wma.16.1603719383782; Mon, 26 Oct 2020 06:36:23 -0700 (PDT) Received: from localhost.localdomain (lfbn-nic-1-190-206.w2-15.abo.wanadoo.fr. [2.15.39.206]) by smtp.gmail.com with ESMTPSA id f7sm23688991wrx.64.2020.10.26.06.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 06:36:23 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek Subject: [PATCH 2/5] iio: adc: xilinx: use devm_krealloc() instead of kfree() + kcalloc() Date: Mon, 26 Oct 2020 14:36:06 +0100 Message-Id: <20201026133609.24262-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201026133609.24262-1-brgl@bgdev.pl> References: <20201026133609.24262-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_093628_197548_2A4B03B4 X-CRM114-Status: GOOD ( 14.19 ) 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 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 We now have devm_krealloc() in the kernel Use it indstead of calling kfree() and kcalloc() separately. Signed-off-by: Bartosz Golaszewski --- drivers/iio/adc/xilinx-xadc-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index 8494eb424b33..b516280ccbd4 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -589,8 +589,9 @@ static int xadc_update_scan_mode(struct iio_dev *indio_dev, n = bitmap_weight(mask, indio_dev->masklength); - kfree(xadc->data); - xadc->data = kcalloc(n, sizeof(*xadc->data), GFP_KERNEL); + xadc->data = devm_krealloc(indio_dev->dev.parent, xadc->data, + n * sizeof(*xadc->data), + GFP_KERNEL | __GFP_ZERO); if (!xadc->data) return -ENOMEM; @@ -1372,7 +1373,6 @@ static int xadc_remove(struct platform_device *pdev) free_irq(xadc->irq, indio_dev); cancel_delayed_work_sync(&xadc->zynq_unmask_work); clk_disable_unprepare(xadc->clk); - kfree(xadc->data); return 0; } -- 2.29.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel