From patchwork Tue Dec 19 04:41:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 180749 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1714176dyi; Mon, 18 Dec 2023 20:41:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IHSuwNth2/582tyCd4AZnypUP/3XZbtppR+O2gu/xpva7eESvu8ub+kcot4YwarzPaDYZJ5 X-Received: by 2002:a9d:6512:0:b0:6d3:3dcf:bb92 with SMTP id i18-20020a9d6512000000b006d33dcfbb92mr16579507otl.37.1702960916832; Mon, 18 Dec 2023 20:41:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702960916; cv=none; d=google.com; s=arc-20160816; b=g8aXXSBJKXcCbhNkSrdT2TtvxPzD1g8NUlHYld5iVRWQO4tVI0e5N3dGbRVxV/RC2f hrsUSzk86jeNH+E0NyMot3wx0nL3pFQXxQeLTFc0yW6ZO19HyJzE9U3DJdx45hpnlDXL H9NvTx60Nul/HOUNgfXDK+KCeowLQA3f87A4ymjJkOD0nw4poU5W+0vPI8OLqQpg20mM n0SE/OGc9gjGsBgrVPhZIzyVbK4SpHF6bRFFkG+wciv7YpL3IBlVHVBS6TO/FR7DH/sY E0Wx3NypnWb71p1BcgaoGrho77Nk/kb+l9C+5ABc3nfLF2PrYAUz8bHopbuVo0pZZk1l utnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=cUzYcHCIluQtLI47YxLbQmZaKW4i/ciHI8Ppn0igCjw=; fh=n+OhmTblI1uUxjok+JagNAG13231/trb1Kx9l3jz4sY=; b=XvYYb8FJyn3TR74JGi85GXZBGznTAzFGH2+kaYNSDQXqn+8VfUrZ/tAKhMSkjW//gm YtJzrSktxhlMHy4WF/h23pITDb6Jh7u0hQIhHhRpn5bNxNrxcL83FmZm2ohkr03dEf58 8tIHrgbe0hUZcf9C69hdH0+CeQ50YczW4TdUUrijo9U5nkAOTsuIKZa/i/elY+PWqjt2 1gb1DhY6LkgPK5P2Sk44yNli3R7iROYAkopiWLF63wO/8+wAqA9x+DLxXBxhH+oY4DkD o/ghzmU4LcCKAGsv9VVNLB9w/jrUg/ytfKidgb92wDz/qxKVlvi+k4/AU8g+mhNWKDi+ hQ3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=n4pVtjAF; spf=pass (google.com: domain of linux-kernel+bounces-4690-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-4690-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id k10-20020a65434a000000b005c690ba4060si18427953pgq.261.2023.12.18.20.41.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 20:41:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-4690-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=n4pVtjAF; spf=pass (google.com: domain of linux-kernel+bounces-4690-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-4690-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 93AFE28515D for ; Tue, 19 Dec 2023 04:41:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D945C8475; Tue, 19 Dec 2023 04:41:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wanadoo.fr header.i=@wanadoo.fr header.b="n4pVtjAF" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.smtpout.orange.fr (smtp-20.smtpout.orange.fr [80.12.242.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAB71C135 for ; Tue, 19 Dec 2023 04:41:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=wanadoo.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wanadoo.fr Received: from pop-os.home ([92.140.202.140]) by smtp.orange.fr with ESMTPA id FRv4rqervb4TgFRv4rjXAp; Tue, 19 Dec 2023 05:41:28 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1702960888; bh=cUzYcHCIluQtLI47YxLbQmZaKW4i/ciHI8Ppn0igCjw=; h=From:To:Cc:Subject:Date; b=n4pVtjAFR1nQ9jwRE978HzDHV4WihO5oeBif9lN/ekFNsTqr8TUjJJptyXGUc+Qcg FVoGWZfceeHRzTMI2DGnzPPlyrNNdvSfmZZkyO+hWcUnIWC5JvHv5J4UNpMgKFtKGK mXA3v343MUz7R/a7sNYw96q/Q7sPinC8X/KKwQ0P6hj3bdaKyTOb2eABkReShL3vNn DOOzvCwbNLcrDM6icYrm62NMNDC7/ftidCS3bG4ZGyrQtFcIukgWdfq5q5BqktlJBW ucF9z0oNOozTE8D0tVCCA0CKI2zAOqbvlRDKcEno2cg8Otm/giED5GCRjldFDs/wen zdgLpnhYR30Og== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Tue, 19 Dec 2023 05:41:28 +0100 X-ME-IP: 92.140.202.140 From: Christophe JAILLET To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Orson Zhai , Baolin Wang , Chunyan Zhang Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-sound@vger.kernel.org Subject: [PATCH] ASoC: sprd: Simplify memory allocation in sprd_platform_compr_dma_config() Date: Tue, 19 Dec 2023 05:41:19 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785683946091728777 X-GMAIL-MSGID: 1785683946091728777 'sg' is freed at the end sprd_platform_compr_dma_config() both in the normal and in the error handling path. There is no need to use the devm_kcalloc()/devm_kfree(), kcalloc()/kfree() is enough. Signed-off-by: Christophe JAILLET --- sound/soc/sprd/sprd-pcm-compress.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/sprd/sprd-pcm-compress.c b/sound/soc/sprd/sprd-pcm-compress.c index 6cfab8844d0f..57bd1a0728ac 100644 --- a/sound/soc/sprd/sprd-pcm-compress.c +++ b/sound/soc/sprd/sprd-pcm-compress.c @@ -160,7 +160,7 @@ static int sprd_platform_compr_dma_config(struct snd_soc_component *component, return -ENODEV; } - sgt = sg = devm_kcalloc(dev, sg_num, sizeof(*sg), GFP_KERNEL); + sgt = sg = kcalloc(sg_num, sizeof(*sg), GFP_KERNEL); if (!sg) { ret = -ENOMEM; goto sg_err; @@ -250,12 +250,12 @@ static int sprd_platform_compr_dma_config(struct snd_soc_component *component, dma->desc->callback_param = cstream; } - devm_kfree(dev, sg); + kfree(sg); return 0; config_err: - devm_kfree(dev, sg); + kfree(sg); sg_err: dma_release_channel(dma->chan); return ret;