From nobody Mon Feb 9 14:33:27 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E57352BF3DF for ; Fri, 17 Oct 2025 08:56:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760691398; cv=none; b=NF6pSPBDNE1erIuh9XI9QsDQrbp6ThBgzEG5yjZU9AkaSNu89aooSqZYGTolfTyFxtV4qmwLjWTX6/t93R8LuqM4IGkXAlZtBx296EO9OzpD+TOFtD+aEgAHFSwFImMYaBESfGPw6uwjZCTCtNhPMT0BPnGmqV4KLvoTtNYZKr8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760691398; c=relaxed/simple; bh=q/PMmiVC8flD2msphuOxMjtp0nJ5hITJsUZZz4yu0HQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JxXcLWw7Qmpy64sxw+55ILHT3zXf71u2dHjmMd1YXN+4smgw08/e/yS+mJ+LqcPvAz2Jkq6GM5OwSyPaIeSGnaNZWNnw0ZxSbvcy69Cnx7+Z/CcafYc7JPa4pCjWgoC1vynr6xBMHa4Yi5NPNlpe3dJ/uQARAEKPcw8IaJRUGf0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=LJAu11vz; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="LJAu11vz" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59H8fRbx002682 for ; Fri, 17 Oct 2025 08:56:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=F+z8rOJy0kp gsPU139d4TxeICpAZrzgqvaXcpET0pPQ=; b=LJAu11vz8LCePWJp4HVdHVzeNlm SqyNTSMddSApLrPEucpKL5Gskse3KLFmZYAzDUuifbn0bZXTP3Qdc7nRkclW/oN4 rG4Ajv/G18fBFVmhVTPCVFjRX99OP36yxLsPudorDG3ZQUqOm69YALBxaCfS2b0O vNV43sGxx7HG+kR0M/mFZw3A/AfdGKwrSdjwhhxT31Rshxa222ptcZlizQNCh+Ie iLOJ/aKMa/v4LjTpOvg3HCwBXcgO+Z23fnDmJ3ap7op4NQPYFpBSFjLR3bAh8DUK /DoLIlZaEBnt5iflHz+DF6TWdIosUqorMnz9r+2OocxRlVOXpVswOKb6/Ow== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 49qfd9bm9d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 17 Oct 2025 08:56:35 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-871614ad3efso582465785a.0 for ; Fri, 17 Oct 2025 01:56:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760691394; x=1761296194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F+z8rOJy0kpgsPU139d4TxeICpAZrzgqvaXcpET0pPQ=; b=Z2s7CsTGKSDX/eW8kGHHKcKKqv4oEVAPvKT9ns7PDxGTSW8M6ti4wwhAKPgj801+uw CrazySjnTcENZ3UyIsib3gZEv2hrfNpVQOuh4N+eaTmLP5sdLYo5GixHsVwwdxiHbx3h qmSQD15M7KdcDpGnIJ4nK0zQt8cJ4cho36TBkVTZYz4xRXRWP7Nkm0x2dAgY7RZdNo2B 7+ZCru2uAmeZPpOMiP9ShXDJI58phxAcfCM9eQ05l2oBiR9oeSyTOSTj91ezRGFOjYsJ wH7f5UN2T9xGNouFqZTR8auS65jRq9ubD/PCz9GySiBZmGyR6Y8a+Co8eNSGhLqjPzNM dwPw== X-Forwarded-Encrypted: i=1; AJvYcCWfn8w9KA6TruNJJxEMD4WCmCZdAuBhj4FGuNx3Aqw+DGjJAa8FOBh2aNad9OX7GeoHR6YaXrhnFcRuhXQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyIy9NJbOZ7OGOAIQfKKNT/MR71cn+APIeZ4h9YfGJ93ws4jeaf Vhzgb2br1WJzQkKp09dIaW1bJUGWkL0EhCOGdMHa8I+VtWaEq8TvY8Oj5UOpm9bZeI3T86PVc3S NboDkCmiAB3Iymix8QZnbawmd1zo+9FneJkXEVdrjan/LKYh77bJNw9hBaXj1sbOlV5o= X-Gm-Gg: ASbGnct+dCFRzRWZHNLsohOOBYwU9hdNshfe9RbK6g8G0Y3EDHjNP8Wv/9qD0izFnNM E0ByaY72TYszKJJRaUrt1oGmNl6S0xr5IkzeCbKOsSViEC/u9pLI8HGEU6Bp+3W3OMEUFeLM8WR OkzlG+jQp/THtHuThNWaUXfli05XmDzAD9PRgPrplydL/+DRhYqw9X/CZzlL2cz5Zbt4xBd5BSV 2j5ine0UFrkxDJp+c68HYFurMFKiG/+0ZMRauYLIJbYDDLXkb+MzaUauqaAIxrzpK6MoQaDgao9 UN0+Tkpj/ZuF/WWOmRyMLF3vVpVmlz6tEJ9RyDfhYY7n8PDW9Ka0ZgLp7fLsRdJ/77L1X1ZXoYL zTnxR13wlLN2l X-Received: by 2002:a05:622a:1452:b0:4e8:94c7:a60a with SMTP id d75a77b69052e-4e89d21c2e5mr37888701cf.13.1760691393847; Fri, 17 Oct 2025 01:56:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKytRRtMMI32c2JW1OGRhxHnTVyHXZTvnHTnRFGDd0RnBqK5ZD64ayhr4jB89/lKGz/3auoA== X-Received: by 2002:a05:622a:1452:b0:4e8:94c7:a60a with SMTP id d75a77b69052e-4e89d21c2e5mr37888531cf.13.1760691393331; Fri, 17 Oct 2025 01:56:33 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4711444d919sm70764985e9.14.2025.10.17.01.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Oct 2025 01:56:32 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, srini@kernel.org, alexey.klimov@linaro.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 08/12] ASoc: qcom: q6asm: Use automatic cleanup of kfree() Date: Fri, 17 Oct 2025 09:53:03 +0100 Message-ID: <20251017085307.4325-9-srinivas.kandagatla@oss.qualcomm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017085307.4325-1-srinivas.kandagatla@oss.qualcomm.com> References: <20251017085307.4325-1-srinivas.kandagatla@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: ZRFnuwbCe_auCpDyIaZ36eUHn8hGsd89 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDExMDAxOCBTYWx0ZWRfX4Qbt+2f4IQrN bbxFUiARtq29LkvZAPh7XNGgIaeqiIhc8IEZ5EV3oscWCRK5vVfYGAq4AHB1LbAzPgsfMtT2wM/ 4cghp6Vrldghxr6wOZbBSXvMAYdFSFIFbcSYvTDtmmq+AAwngAgFC9uPcnusaxAcyQjabUgL9Hd L/RQpq3rHA48eWHJpOfGboRT1QkRweNemmkHJ/t4GVhdXmaRzGgPRqAcUirrsUHkdIkz3jWs0PE M+d2ibaAnL7JvLckvOOhjtQBFrW090ZAi/l8biGOAkP+pxouEfPUGRdkKp0SW55XGHo/ybRUAv+ Sy3RFh83B7904Lu5yqKg4ZJgJF8QKEy7S48HnmWZ2ByTXQ23uybFCjFbNEMXO30A2iOh5uG0Lsd nbcYu7r8p6fwMBDz+mNf/ALkHVVN8A== X-Proofpoint-GUID: ZRFnuwbCe_auCpDyIaZ36eUHn8hGsd89 X-Authority-Analysis: v=2.4 cv=PdTyRyhd c=1 sm=1 tr=0 ts=68f204c3 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=GTJLAGQgu5kf8ZLGHUQA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-17_03,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 bulkscore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510110018 Content-Type: text/plain; charset="utf-8" Its common pattern in q6dsp code to allocate temporary buffer to send gpr/apr packets and free at the function exit. Now this can be simplified via __free(kfree) mechanism. No functional changes. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6asm.c | 166 +++++++++-------------------------- 1 file changed, 42 insertions(+), 124 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c index 67e9ca18883c..366fe8a8387f 100644 --- a/sound/soc/qcom/qdsp6/q6asm.c +++ b/sound/soc/qcom/qdsp6/q6asm.c @@ -333,7 +333,7 @@ static int __q6asm_memory_unmap(struct audio_client *ac, struct q6asm *a =3D dev_get_drvdata(ac->dev->parent); struct apr_pkt *pkt; int rc, pkt_size; - void *p; + void *p __free(kfree) =3D NULL; =20 if (ac->port[dir].mem_map_handle =3D=3D 0) { dev_err(ac->dev, "invalid mem handle\n"); @@ -358,14 +358,11 @@ static int __q6asm_memory_unmap(struct audio_client *= ac, mem_unmap->mem_map_handle =3D ac->port[dir].mem_map_handle; =20 rc =3D q6asm_apr_send_session_pkt(a, ac, pkt, 0); - if (rc < 0) { - kfree(pkt); + if (rc < 0) return rc; - } =20 ac->port[dir].mem_map_handle =3D 0; =20 - kfree(pkt); return 0; } =20 @@ -429,10 +426,10 @@ static int __q6asm_memory_map_regions(struct audio_cl= ient *ac, int dir, struct audio_port_data *port =3D NULL; struct audio_buffer *ab =3D NULL; struct apr_pkt *pkt; - void *p; + void *p __free(kfree) =3D NULL; unsigned long flags; uint32_t num_regions, buf_sz; - int rc, i, pkt_size; + int i, pkt_size; =20 if (is_contiguous) { num_regions =3D 1; @@ -479,12 +476,7 @@ static int __q6asm_memory_map_regions(struct audio_cli= ent *ac, int dir, } spin_unlock_irqrestore(&ac->lock, flags); =20 - rc =3D q6asm_apr_send_session_pkt(a, ac, pkt, - ASM_CMDRSP_SHARED_MEM_MAP_REGIONS); - - kfree(pkt); - - return rc; + return q6asm_apr_send_session_pkt(a, ac, pkt, ASM_CMDRSP_SHARED_MEM_MAP_R= EGIONS); } =20 /** @@ -930,12 +922,8 @@ int q6asm_open_write(struct audio_client *ac, uint32_t= stream_id, { struct asm_stream_cmd_open_write_v3 *open; struct apr_pkt *pkt; - void *p; - int rc, pkt_size; - - pkt_size =3D APR_HDR_SIZE + sizeof(*open); - - p =3D kzalloc(pkt_size, GFP_KERNEL); + int rc, pkt_size =3D APR_HDR_SIZE + sizeof(*open); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_KERNEL); if (!p) return -ENOMEM; =20 @@ -1001,7 +989,6 @@ int q6asm_open_write(struct audio_client *ac, uint32_t= stream_id, ac->io_mode |=3D ASM_TUN_WRITE_IO_MODE; =20 err: - kfree(pkt); return rc; } EXPORT_SYMBOL_GPL(q6asm_open_write); @@ -1012,11 +999,8 @@ static int __q6asm_run(struct audio_client *ac, uint3= 2_t stream_id, { struct asm_session_cmd_run_v2 *run; struct apr_pkt *pkt; - int pkt_size, rc; - void *p; - - pkt_size =3D APR_HDR_SIZE + sizeof(*run); - p =3D kzalloc(pkt_size, GFP_ATOMIC); + int rc, pkt_size =3D APR_HDR_SIZE + sizeof(*run); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_ATOMIC); if (!p) return -ENOMEM; =20 @@ -1037,7 +1021,6 @@ static int __q6asm_run(struct audio_client *ac, uint3= 2_t stream_id, rc =3D 0; } =20 - kfree(pkt); return rc; } =20 @@ -1098,11 +1081,8 @@ int q6asm_media_format_block_multi_ch_pcm(struct aud= io_client *ac, struct asm_multi_channel_pcm_fmt_blk_v2 *fmt; struct apr_pkt *pkt; u8 *channel_mapping; - void *p; - int rc, pkt_size; - - pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); - p =3D kzalloc(pkt_size, GFP_KERNEL); + int pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_KERNEL); if (!p) return -ENOMEM; =20 @@ -1125,16 +1105,11 @@ int q6asm_media_format_block_multi_ch_pcm(struct au= dio_client *ac, } else { if (q6dsp_map_channels(channel_mapping, channels)) { dev_err(ac->dev, " map channels failed %d\n", channels); - rc =3D -EINVAL; - goto err; + return -EINVAL; } } =20 - rc =3D q6asm_ac_send_cmd_sync(ac, pkt); - -err: - kfree(pkt); - return rc; + return q6asm_ac_send_cmd_sync(ac, pkt); } EXPORT_SYMBOL_GPL(q6asm_media_format_block_multi_ch_pcm); =20 @@ -1144,11 +1119,8 @@ int q6asm_stream_media_format_block_flac(struct audi= o_client *ac, { struct asm_flac_fmt_blk_v2 *fmt; struct apr_pkt *pkt; - void *p; - int rc, pkt_size; - - pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); - p =3D kzalloc(pkt_size, GFP_KERNEL); + int pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_KERNEL); if (!p) return -ENOMEM; =20 @@ -1168,10 +1140,7 @@ int q6asm_stream_media_format_block_flac(struct audi= o_client *ac, fmt->max_frame_size =3D cfg->max_frame_size; fmt->sample_size =3D cfg->sample_size; =20 - rc =3D q6asm_ac_send_cmd_sync(ac, pkt); - kfree(pkt); - - return rc; + return q6asm_ac_send_cmd_sync(ac, pkt); } EXPORT_SYMBOL_GPL(q6asm_stream_media_format_block_flac); =20 @@ -1181,11 +1150,8 @@ int q6asm_stream_media_format_block_wma_v9(struct au= dio_client *ac, { struct asm_wmastdv9_fmt_blk_v2 *fmt; struct apr_pkt *pkt; - void *p; - int rc, pkt_size; - - pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); - p =3D kzalloc(pkt_size, GFP_KERNEL); + int pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_KERNEL); if (!p) return -ENOMEM; =20 @@ -1206,10 +1172,7 @@ int q6asm_stream_media_format_block_wma_v9(struct au= dio_client *ac, fmt->enc_options =3D cfg->enc_options; fmt->reserved =3D 0; =20 - rc =3D q6asm_ac_send_cmd_sync(ac, pkt); - kfree(pkt); - - return rc; + return q6asm_ac_send_cmd_sync(ac, pkt); } EXPORT_SYMBOL_GPL(q6asm_stream_media_format_block_wma_v9); =20 @@ -1219,11 +1182,8 @@ int q6asm_stream_media_format_block_wma_v10(struct a= udio_client *ac, { struct asm_wmaprov10_fmt_blk_v2 *fmt; struct apr_pkt *pkt; - void *p; - int rc, pkt_size; - - pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); - p =3D kzalloc(pkt_size, GFP_KERNEL); + int pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_KERNEL); if (!p) return -ENOMEM; =20 @@ -1245,10 +1205,7 @@ int q6asm_stream_media_format_block_wma_v10(struct a= udio_client *ac, fmt->advanced_enc_options1 =3D cfg->adv_enc_options; fmt->advanced_enc_options2 =3D cfg->adv_enc_options2; =20 - rc =3D q6asm_ac_send_cmd_sync(ac, pkt); - kfree(pkt); - - return rc; + return q6asm_ac_send_cmd_sync(ac, pkt); } EXPORT_SYMBOL_GPL(q6asm_stream_media_format_block_wma_v10); =20 @@ -1258,11 +1215,8 @@ int q6asm_stream_media_format_block_alac(struct audi= o_client *ac, { struct asm_alac_fmt_blk_v2 *fmt; struct apr_pkt *pkt; - void *p; - int rc, pkt_size; - - pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); - p =3D kzalloc(pkt_size, GFP_KERNEL); + int pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_KERNEL); if (!p) return -ENOMEM; =20 @@ -1287,10 +1241,7 @@ int q6asm_stream_media_format_block_alac(struct audi= o_client *ac, fmt->mb =3D cfg->mb; fmt->kb =3D cfg->kb; =20 - rc =3D q6asm_ac_send_cmd_sync(ac, pkt); - kfree(pkt); - - return rc; + return q6asm_ac_send_cmd_sync(ac, pkt); } EXPORT_SYMBOL_GPL(q6asm_stream_media_format_block_alac); =20 @@ -1300,11 +1251,8 @@ int q6asm_stream_media_format_block_ape(struct audio= _client *ac, { struct asm_ape_fmt_blk_v2 *fmt; struct apr_pkt *pkt; - void *p; - int rc, pkt_size; - - pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); - p =3D kzalloc(pkt_size, GFP_KERNEL); + int pkt_size =3D APR_HDR_SIZE + sizeof(*fmt); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_KERNEL); if (!p) return -ENOMEM; =20 @@ -1327,10 +1275,7 @@ int q6asm_stream_media_format_block_ape(struct audio= _client *ac, fmt->sample_rate =3D cfg->sample_rate; fmt->seek_table_present =3D cfg->seek_table_present; =20 - rc =3D q6asm_ac_send_cmd_sync(ac, pkt); - kfree(pkt); - - return rc; + return q6asm_ac_send_cmd_sync(ac, pkt); } EXPORT_SYMBOL_GPL(q6asm_stream_media_format_block_ape); =20 @@ -1340,11 +1285,8 @@ static int q6asm_stream_remove_silence(struct audio_= client *ac, uint32_t stream_ { uint32_t *samples; struct apr_pkt *pkt; - void *p; - int rc, pkt_size; - - pkt_size =3D APR_HDR_SIZE + sizeof(uint32_t); - p =3D kzalloc(pkt_size, GFP_ATOMIC); + int rc, pkt_size =3D APR_HDR_SIZE + sizeof(uint32_t); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_ATOMIC); if (!p) return -ENOMEM; =20 @@ -1359,8 +1301,6 @@ static int q6asm_stream_remove_silence(struct audio_c= lient *ac, uint32_t stream_ if (rc =3D=3D pkt_size) rc =3D 0; =20 - kfree(pkt); - return rc; } =20 @@ -1403,11 +1343,8 @@ int q6asm_enc_cfg_blk_pcm_format_support(struct audi= o_client *ac, struct apr_pkt *pkt; u8 *channel_mapping; u32 frames_per_buf =3D 0; - int pkt_size, rc; - void *p; - - pkt_size =3D APR_HDR_SIZE + sizeof(*enc_cfg); - p =3D kzalloc(pkt_size, GFP_KERNEL); + int pkt_size =3D APR_HDR_SIZE + sizeof(*enc_cfg); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_KERNEL); if (!p) return -ENOMEM; =20 @@ -1428,15 +1365,10 @@ int q6asm_enc_cfg_blk_pcm_format_support(struct aud= io_client *ac, enc_cfg->is_signed =3D 1; channel_mapping =3D enc_cfg->channel_mapping; =20 - if (q6dsp_map_channels(channel_mapping, channels)) { - rc =3D -EINVAL; - goto err; - } + if (q6dsp_map_channels(channel_mapping, channels)) + return -EINVAL; =20 - rc =3D q6asm_ac_send_cmd_sync(ac, pkt); -err: - kfree(pkt); - return rc; + return q6asm_ac_send_cmd_sync(ac, pkt); } EXPORT_SYMBOL_GPL(q6asm_enc_cfg_blk_pcm_format_support); =20 @@ -1456,12 +1388,9 @@ int q6asm_read(struct audio_client *ac, uint32_t str= eam_id) struct audio_buffer *ab; struct apr_pkt *pkt; unsigned long flags; - int pkt_size; + int pkt_size =3D APR_HDR_SIZE + sizeof(*read); int rc =3D 0; - void *p; - - pkt_size =3D APR_HDR_SIZE + sizeof(*read); - p =3D kzalloc(pkt_size, GFP_ATOMIC); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_ATOMIC); if (!p) return -ENOMEM; =20 @@ -1493,7 +1422,6 @@ int q6asm_read(struct audio_client *ac, uint32_t stre= am_id) else pr_err("read op[0x%x]rc[%d]\n", pkt->hdr.opcode, rc); =20 - kfree(pkt); return rc; } EXPORT_SYMBOL_GPL(q6asm_read); @@ -1503,11 +1431,8 @@ static int __q6asm_open_read(struct audio_client *ac= , uint32_t stream_id, { struct asm_stream_cmd_open_read_v3 *open; struct apr_pkt *pkt; - int pkt_size, rc; - void *p; - - pkt_size =3D APR_HDR_SIZE + sizeof(*open); - p =3D kzalloc(pkt_size, GFP_KERNEL); + int pkt_size =3D APR_HDR_SIZE + sizeof(*open); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_KERNEL); if (!p) return -ENOMEM; =20 @@ -1535,10 +1460,7 @@ static int __q6asm_open_read(struct audio_client *ac= , uint32_t stream_id, pr_err("Invalid format[%d]\n", format); } =20 - rc =3D q6asm_ac_send_cmd_sync(ac, pkt); - - kfree(pkt); - return rc; + return q6asm_ac_send_cmd_sync(ac, pkt); } =20 /** @@ -1578,12 +1500,9 @@ int q6asm_write_async(struct audio_client *ac, uint3= 2_t stream_id, uint32_t len, struct audio_buffer *ab; unsigned long flags; struct apr_pkt *pkt; - int pkt_size; + int pkt_size =3D APR_HDR_SIZE + sizeof(*write); int rc =3D 0; - void *p; - - pkt_size =3D APR_HDR_SIZE + sizeof(*write); - p =3D kzalloc(pkt_size, GFP_ATOMIC); + void *p __free(kfree) =3D kzalloc(pkt_size, GFP_ATOMIC); if (!p) return -ENOMEM; =20 @@ -1618,7 +1537,6 @@ int q6asm_write_async(struct audio_client *ac, uint32= _t stream_id, uint32_t len, if (rc =3D=3D pkt_size) rc =3D 0; =20 - kfree(pkt); return rc; } EXPORT_SYMBOL_GPL(q6asm_write_async); --=20 2.51.0