From nobody Fri Dec 19 12:31:30 2025 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (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 515C013A3F0 for ; Wed, 3 Jul 2024 10:16:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001776; cv=none; b=Es9XXmqFaLu5XxKlzjWCni+Re4omMj1vfw6Y6SX2UFcnPOG5kJDz4WJL8rR+XqpKAi7UHxxEY8Ps+AlC9PNXH0W4NO+xpgHmjh3nuEmY8aQwCOX5RbVwBCRdI3ChXDVJjheTS2CVmiaQaLUpzsnJGxjhYt+dg4VdZFd2bjSYMA4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001776; c=relaxed/simple; bh=spgt4+9qxflitv4UZ9Bu05Oaf5uCcTTFwks7tVlyyyk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=U08ixQrO0uHf8FwpZF16/Xe15Pr65nR9zsA3UwfS0di25VHXQwH6WLKjCEIECVAcTKZgfzWjvBDYPJFi5SS0NoXXf2IF+HsQJHSv4tK60WiaEF6sL2o3YRpyyI3Rsky+mdDZEDoV8TCQiAA/xr1wiBqlAYWXWTD5N4pNSuFIPGQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=byKV50H2; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="byKV50H2" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-a751ed17b1eso77759066b.1 for ; Wed, 03 Jul 2024 03:16:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720001773; x=1720606573; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=aNI2ho20l/ka7Xx+ilkgiXagRPnJI8t8zqq0ZnfN4sg=; b=byKV50H2zkqmS/aCNK209fu0z9c8PlhfFFpYcQ1sEI6DV2PToAIV4g8VDupFD/Cw0F D5f4+J73mbpkA0mdn/JRuWClW/UMqzWYX/29oUSRoN31iTMJJl9cRgO/AbKRuOZ3qiAo tAbhYySsehHFu9Im8VjVuuEIczZEdjKH0+JSFopdg5CP74RxQ2V7kbHa0uJVVuq058I5 mFwkmzsf4SEufXqIG7+snYut7Imm7kfXx6Yo2KaAdqXC7B3mVDGtIYgHEtDj9sdhdB78 xbJc6+NhgdJhFjQZ0tieL2S28xqbHe99Wj/UgZO97iunv/gxo3AONm9Ih4+kXVEDunoA fImA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720001773; x=1720606573; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aNI2ho20l/ka7Xx+ilkgiXagRPnJI8t8zqq0ZnfN4sg=; b=Ck/CCpNyFwMSljB9GOq0XF61oWC80lz8MqG0aAc41m87WttxSUDGj9/6jhfdL9Opgz oXCIhc8OfL2XbKWFJ89pjeX0Uj6pAIbdeL4nvCMpsMJ1G6akVNCaftidN25Hw88kS6D/ 11NmTFXlM1pjTBZFYcS3MX5ijnx3djeIviDFqWU4mKiivEj88s3Aohp+tx6N0kwKPmHW bDNSpMmcVT1fHdL0SwH2kC9csLckpHHywQDvg3kKwn63N3qVe/51anyINQ7qU0LNzpzp Owi9vhux8kPIBkkdZxjErxWl9E0Zncjr9EG500TB3HYRdQu6dGPcfq3M21nFGR6JOZNu 7GXw== X-Forwarded-Encrypted: i=1; AJvYcCW1I8Ex7FdtvtSBwtqRLiVnNRDX1lEjq2LYQjg3kYMVyydK4GHdXboDS/FfV6wdkCZMY0+qcxKpVih2HjrxAWZFmLiHanJ6gAN+so+r X-Gm-Message-State: AOJu0YwrWB/o7GcmIc8YKTpE4arimziGqtCq2rO2OfCCcR5nTWYiSZg8 SiTZiSa8Cg5PF1ybPbQD4AUYKjcw3d4YYD8Tw2YKSTNE38VdwkOhHOyj2UWJyJ4= X-Google-Smtp-Source: AGHT+IFwvHMeiG1PusuzlYb/BFpwlNvMyLpyqwyCsLc+99Ds2Xl5m1ldYJi49+/zg/u8Ua72v8fKPg== X-Received: by 2002:a17:906:4755:b0:a6e:f869:d718 with SMTP id a640c23a62f3a-a77a244253fmr95689866b.21.1720001772744; Wed, 03 Jul 2024 03:16:12 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab06565csm494291466b.103.2024.07.03.03.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 03:16:12 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 03 Jul 2024 12:15:53 +0200 Subject: [PATCH 1/9] soundwire: amd: simplify return path in hw_params Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240703-soundwire-cleanup-h-v1-1-24fa0dbb948f@linaro.org> References: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> In-Reply-To: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1011; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=spgt4+9qxflitv4UZ9Bu05Oaf5uCcTTFwks7tVlyyyk=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmhSTizydiWsNiK1lACRmuFWUvFUfjVVfPft6QQ GqZjW9cjMWJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoUk4gAKCRDBN2bmhouD 1+OyEACYUGyGkiAqfA3VhOQNjJGbNBY3zshL3OR4Dp0zNhFrvG213/9aF09o5CoUJdjL9OVYlT8 cULDGKCXWhkP7sj//ZtO64dP/cCN7IHWvboimzJjdyzFIRmOU0F8yPJLpWT+5H94tqeYscQXZbk hVZKYfKfY2UIDtdTU3fvoyve0UovB+45qay3vJoU++UFxKYkOG1dsDn7QrkCSfe8NQWs7SEO45B fp84f6O8pyMo/Ukj+yHj9r0y7LneFQsDHpGjBkq6dzYbnWKmc9CVzFXiuzBLL585b/PX7BQqr3u cD5tJDKSDoe4vF+JIN4JgMDoTKvw7Yud5ryMhjMN7EIhSVBkmLET0UIeOkwB//YGBRdev4rE8lV yHSuBZQF72sQfk/GOwl//j74lQbIjoGJbXz1JqaV9PXJWm34wz9saXzWcd8fddpmfo4eQk8gCwE 7Ak8qXCX1cN8I23mA9Qm9aEV7WXzaNa3uou/yEyRMIeKIPjqsKslRBpYzViomKA2L2SzCA4FMgr bE6y04hLFzcFwlVJA5JtNirAuQMwiY5TZaCY62upQRXUPWa+YOAILvBCYA7AaL04W0dO4kDH9+4 C8py4dpNKxikSvBMwPx0Isnori7dK3OWCOqjQp56TGnQYDbSuiy+rdNfJ2zqWBHl2T5PNWrPr/j 54nNNwjTZSABXGA== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Remove unused error path (label+goto) to make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/soundwire/amd_manager.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manage= r.c index 795e223f7e5c..4470fda83c5c 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -627,10 +627,8 @@ static int amd_sdw_hw_params(struct snd_pcm_substream = *substream, =20 /* Port configuration */ pconfig =3D kzalloc(sizeof(*pconfig), GFP_KERNEL); - if (!pconfig) { - ret =3D -ENOMEM; - goto error; - } + if (!pconfig) + return -ENOMEM; =20 pconfig->num =3D dai->id; pconfig->ch_mask =3D (1 << ch) - 1; @@ -640,7 +638,7 @@ static int amd_sdw_hw_params(struct snd_pcm_substream *= substream, dev_err(amd_manager->dev, "add manager to stream failed:%d\n", ret); =20 kfree(pconfig); -error: + return ret; } =20 --=20 2.43.0 From nobody Fri Dec 19 12:31:30 2025 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 8137B142903 for ; Wed, 3 Jul 2024 10:16:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001777; cv=none; b=M90oKh4b0O3CCDi4ngp/4+wM+41eoXvP+sNv/m8/MIcn3t4uUWuTqrCj08+IbQBOZqGSQKHTS85etrDgzKrX+JpUf30shKA2fG0/U92NMRFWE2ESNPiCWJpVsRplXm8+TJX7oqNArDU9tlm+yEBmp793qoQ8jYxcB7EnGrorC4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001777; c=relaxed/simple; bh=Ol678uS9dQ4xA1iTWHOJsbF5rd2bR0cJ9zqotT/ChuY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bQzvEs5t8XqOaJmlWFHfKzGzo2+ZG/LzR0Zg+GyuVFOeyZ6+gkjY6VQKdz8nUXoUwAvdBPdy1WA9L7jQFyGkAiTKniKgQh9LrTxLzHA4qAlC2ItFankYjwdaoaAxMoRyR15zEb43XfP2DQF3jjzUdeFZugjvf4BechCFlF5ptQI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=oC3emajg; arc=none smtp.client-ip=209.85.208.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="oC3emajg" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-58b447c5112so2210854a12.3 for ; Wed, 03 Jul 2024 03:16:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720001774; x=1720606574; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Eewbky52yFyCjHy8tFMyxq78GyiBRf7ePSPsH7UZe34=; b=oC3emajgFYnSOKB/DkpgNdwcVvXU0nBisrYeqG3jCh5trONvJpgqOT1zSw5ySIuCjZ KXEbW8q6CF4/AEREVpGNNBeXtyC/yyMoMEoOOsrPG+zx8KzYEMB6UxDUg/8Y3Hg9wOI8 33Et9RiuY7xx3aqPXrYAgRNVbSi51hDmzn3+/bEx4E1FEMYvTY8ytorhgw4Ajq5CzOHc LkDBpaZ2wbxKuBNRoQqKZBv/Z6ZhjiXDqL1FLPh+Vir6xL/usXjzxzqtHMTidRpnsQd2 FPURj//Fa9QD8qlutx1JiD/LZJtAwa2k2xBasXLjNoYV79MLzPZBErZNqISi898LQUmM FBVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720001774; x=1720606574; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Eewbky52yFyCjHy8tFMyxq78GyiBRf7ePSPsH7UZe34=; b=nWZTyjD83wp/eYPyK0hTwGB7sxC7NjUJwi09XDXIUzX5xCUELGaxRKiDq1QWYaO0Wz +vvYechxRdk/gUSHa8VP0OGxoolPI7KABjTAJukFAwYC9hMw8cLK2JQ1V8wc74TGcfdZ ouq+ghqvI9MeU986iwri058LFatRTENfPrWKSZuQKOlTWgBVVlA+mxaCs9Y9UoMiSyR/ Vgq5DIZ0sbYF3GU6ile2fhRdxVjdn3ANmsYutEQct9BvIXmCrrr6bQ6D5Wxfx4KZjuns XVRFl0Jmj5DxQz3/THnEaSYcdF8grxWNY2Nw+4fhrPSFCqeJH7narNoTPOPVwlD1+MyO xQtQ== X-Forwarded-Encrypted: i=1; AJvYcCVRr+vgzpcD0EW7M97phbfBM0swiKQPVX5sycVX3fodasDQ0H928y425BzpXSr/yzjh4r0nBzVul5mD9AhWxHEjrxIz7JsT2wjqtkl7 X-Gm-Message-State: AOJu0Yx6scjp5eed4/R+SS7mbXUKlHb825u1G6UwBuRKR+4Zl4mCZfpL CQ8+2MqPWHNtAnapdlJiRI+xjy1MkxjrcQm6+LaYlEQVGQqV+Qjhi0cmuobS/Q8= X-Google-Smtp-Source: AGHT+IHmjbSzPCX5JxTEYJT9gZmcA5MeHmQoPhQv3t1ZxolhjaIIPWitPETXciwwLMO8r6zR017fKw== X-Received: by 2002:a17:906:229b:b0:a72:4281:bc72 with SMTP id a640c23a62f3a-a75144dd493mr756319266b.63.1720001774022; Wed, 03 Jul 2024 03:16:14 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab06565csm494291466b.103.2024.07.03.03.16.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 03:16:13 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 03 Jul 2024 12:15:54 +0200 Subject: [PATCH 2/9] soundwire: amd: simplify with cleanup.h Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240703-soundwire-cleanup-h-v1-2-24fa0dbb948f@linaro.org> References: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> In-Reply-To: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1555; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=Ol678uS9dQ4xA1iTWHOJsbF5rd2bR0cJ9zqotT/ChuY=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmhSTjzmj5Rr2bqkWjyjn3muBzm30I9Ht2Qp4oK 8nKJxeL+OeJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoUk4wAKCRDBN2bmhouD 1y66D/0fKO4gzBi5mD4kXweROjCrsgr94HyHuatSkmOW3tA8yr7ADL+1MGVFenX3CB99m3Gm70l NY0xWe5alMpLkQbelrBouC402XM7AHvM7m9epYbZjFjMT3mjZwweYcwfoQhQqq0j6g+xh87mL7t bMnnl8UWMlW6ipJciZsNQvh5weMNCkPawFUQPzy1wb+LmDX1Tzk3SN0NnXAAf0oz6wJU6PE/V7M hFE4hJ+SQzmWuDPykGrCRi+nxcT4FI4APLYoctY/kTxpD1IPSvYuu4n4jnc6+D0UqdLgWqkOesh dC5ECkcu6fzWdbGSMNkLyxcpScB1RjsNGChYAi5kVxIb0uSDqjIlveUOYFSzT96yu11HZ36kdZC dsRbP6BoKv1st4oV9na3f5lNADHUIEp2Rbn7xigza3o1Dey13i8ce1UNYp8HITxK7A4DGg6HaTt qc3Zhd7kLWksAuPlDVXI6QtMzY9nwvSGynRMNcVj/WiqixBElXJ8pdHnVIU/h3pjOLEtWzO0Eyw os/K+v6q907S3H481NDaFYj3PHMlmcr2PEOk3z3WzC1DVWaC+M+28uyT3CkNWR+fst9QaBVESA0 xgav4X5dmMRz0OXimVABXLLjYQPpt9zNEKy1lgrqzfHmvrmPyfREPioPwPTnqM74t3jfasBhGEG D/zwGI5F4jvh55Q== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Allocate the memory with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/soundwire/amd_manager.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manage= r.c index 4470fda83c5c..0d01849c3586 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -6,6 +6,7 @@ */ =20 #include +#include #include #include #include @@ -603,7 +604,6 @@ static int amd_sdw_hw_params(struct snd_pcm_substream *= substream, struct amd_sdw_manager *amd_manager =3D snd_soc_dai_get_drvdata(dai); struct sdw_amd_dai_runtime *dai_runtime; struct sdw_stream_config sconfig; - struct sdw_port_config *pconfig; int ch, dir; int ret; =20 @@ -626,7 +626,8 @@ static int amd_sdw_hw_params(struct snd_pcm_substream *= substream, sconfig.bps =3D snd_pcm_format_width(params_format(params)); =20 /* Port configuration */ - pconfig =3D kzalloc(sizeof(*pconfig), GFP_KERNEL); + struct sdw_port_config *pconfig __free(kfree) =3D kzalloc(sizeof(*pconfig= ), + GFP_KERNEL); if (!pconfig) return -ENOMEM; =20 @@ -637,8 +638,6 @@ static int amd_sdw_hw_params(struct snd_pcm_substream *= substream, if (ret) dev_err(amd_manager->dev, "add manager to stream failed:%d\n", ret); =20 - kfree(pconfig); - return ret; } =20 --=20 2.43.0 From nobody Fri Dec 19 12:31:30 2025 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 2096615B54F for ; Wed, 3 Jul 2024 10:16:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001778; cv=none; b=GlauOCwpA4w5RWXtbFy5bRnaM9R8LYr4Oe34ZKAWQaWMSnuHQKA9m0S+8th2COhRbI+m/8hIzBeNtQSCqa93kViwriBD52w0NJUeXZ8FpW61eFr8P8+Rcs5m3pdchy7NGT6wwliKwAtlHcQiFdfU6vnH4d4x4e/Oi5Uz67eB9ks= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001778; c=relaxed/simple; bh=Nwe0xlKfiyDOaLPbyz9qVTptKB4D1oRYsTHNGpFlOMk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eHMfTpgAf0xjrY1GBMhX7dLe8HvM9Ysqv+iJdh/yP/ETkO+TAakUMYZyT9F7oI3R9cKxi9FHZ/qsohla3DACUXgkVYrX27AWeIGwYPZu94MyhaK4thSivFGFZS+AjkrK4e84dnqVkWVICIeYzLUMtJu3u8HHPSjHD+Y296lBTso= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=fpDFUNvi; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="fpDFUNvi" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a7252bfe773so545880066b.1 for ; Wed, 03 Jul 2024 03:16:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720001775; x=1720606575; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=GfTnFwv4IUNzXvE0oSrrhVXmiYatYs6QJJBq0PCSPdk=; b=fpDFUNviq+b3wo6sKTOesLro1HINIIjoY5Gv7bTn6QfFMXC1vjv1XChsA3PcuXC76n TsPECAE4Z6dme5HPXQ9hwT31FVo4isH2yWFtcX6blt2+YYjl9PlSePmyl/kXAP2tdi0o iz0eZLy4OvOoxus9XADJ0Fp8618+LR208+R3vydLi3iyrDAcGdfmplBnr0z/BdvSuJpz IS7+Lk/c0o6rE5EtkjJaG/esXlZnOd0bqcBHI27Q86EdWCCFNOOB/xFUQEubVq8SJ9S1 NZc47zxLJ9orGhfn2BlK7uS1YMGDA6E5TpZeIiBbkRzb9kogfNRS/qyG9GRns3O13kzm BJRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720001775; x=1720606575; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GfTnFwv4IUNzXvE0oSrrhVXmiYatYs6QJJBq0PCSPdk=; b=tK9Le8XNDyuqIvdhV47SZzTshkkzKozuQU4F+TgI5IoF5fDbGCvOJWG2hfVweGY64Y 0j0gP+qRsMn7khLmn+3fXK/COaOTgjZu/tZ6ocdrzFrCixvEXBLXwrD01/Nj/k66EF89 vbspAc4H9lMeqApt+jsdluuTw24HcRqiShYy4bwbjT7cbgvzOaOpt6YvSuGhnniyTuoK LF3a0SMGB4fYdwSDV44KKJ+f2Gb7OeUEuzvw34zkm/JjnncpeoYlYuTpRBhmpzN+kp+P 54GvF45rLTZ/qv3RtM6mQRiZuEMEJaLV/yCTgil5L51vZ+JvjaqyIkhWPuYckUIzf2CG wI/A== X-Forwarded-Encrypted: i=1; AJvYcCU9XdW5oi3wuFv/+0FeStv/6lHs/kTIuVKZ2kZ0vJGlfYnjGdBuM9AJvAz1+/R79mfrKXFDnzPPoXOPRS8gacmLA3giEgPU5BNikHqm X-Gm-Message-State: AOJu0YzTavwQzb7iklfA+th9Fn6WwkvYinoDx0RwSD137gKVtPToHtMs ZnqYwSZPRDeKQRLOYKSmywt1tflgtEAON6IwpRidbZCNTvL9hpRJLYKSm26UlE4= X-Google-Smtp-Source: AGHT+IHEpkDA1cTbqIue4QyD+vUx5qAFNk1xfrPOtv5WQ36h5sxJbjzXsmByi+3O7e+BsSkBPh3SRg== X-Received: by 2002:a17:906:3106:b0:a6f:5609:9552 with SMTP id a640c23a62f3a-a75142d873cmr807100666b.10.1720001775533; Wed, 03 Jul 2024 03:16:15 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab06565csm494291466b.103.2024.07.03.03.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 03:16:14 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 03 Jul 2024 12:15:55 +0200 Subject: [PATCH 3/9] soundwire: amd_init: simplify with cleanup.h Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240703-soundwire-cleanup-h-v1-3-24fa0dbb948f@linaro.org> References: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> In-Reply-To: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1703; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=Nwe0xlKfiyDOaLPbyz9qVTptKB4D1oRYsTHNGpFlOMk=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmhSTkpUkUyMw//T6vaBK4PU7FEkGwJPparyv6X fM0Zahd6duJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoUk5AAKCRDBN2bmhouD 18xzD/9s6VRQ9i414HlaH5OFxg36sEnNg9LfehqxzJuG0E7kt3XaAmMcYoA2rR7Ffn83iw+4AJu 5ItCS9iNlNtl+pXecAinp547m3YU6QH1PiZCNXpIfF7ETnnj7tbP3D442qaKDJ1Q96eOpO73EkY dSDeTNjC9wr6k4vgLpUqr4Rz5Y63SBEZm9E5WBHcCgTI3Zu0ha5hOuKGd1Z1qRuQCpN8UWWZt0F hn1NOznUQ6VPaZTkkCyv1RQWyncGN5t74p65+LRuPP577dlgq1gH9OQLEin9e1zCF72Rz/iyvxq KFTu69tQpmmNfSVh3rpOl81860NqcReO9+DQnBPSeKLxHSn1H/cM4RavuXiEozPfyQaJaTdufRr tstL3LTVrdanQrVXR+d8uLH0q/Ylu4ESxP8RJqGTeomCgkVdxD+/9JBvFM7LExRuW6bUlMeyCfu tvu7tx6CKGuv6CRwLEHIguOp1ZrXuoIB+YMvM3Q1ii5ZFflcKOXHINYDfzEjUWrnTt071E0csmC oun40ZtnuDT0yUI9Ll+DilLTcM/aIAkPp2YMtYlrsf/NLs/O0sxanFychJhb+0ZFxVR8veVRgaS rKvmhypzuD+87RRhi5Z4fzp6Fu3ox+wAg2N+8PTw6eHp3qKty+v30+ZCm5U5d4uWX7og5ZssvXo l9JutBGgyHSEYmg== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Allocate the memory with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/soundwire/amd_init.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/soundwire/amd_init.c b/drivers/soundwire/amd_init.c index 4cd26f3a21f5..db040f435059 100644 --- a/drivers/soundwire/amd_init.c +++ b/drivers/soundwire/amd_init.c @@ -8,6 +8,7 @@ */ =20 #include +#include #include #include #include @@ -69,7 +70,6 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struc= t sdw_amd_res *res) { struct sdw_amd_ctx *ctx; struct acpi_device *adev; - struct resource *sdw_res; struct acp_sdw_pdata sdw_pdata[2]; struct platform_device_info pdevinfo[2]; u32 link_mask; @@ -104,7 +104,8 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(str= uct sdw_amd_res *res) =20 ctx->count =3D count; ctx->link_mask =3D res->link_mask; - sdw_res =3D kzalloc(sizeof(*sdw_res), GFP_KERNEL); + struct resource *sdw_res __free(kfree) =3D kzalloc(sizeof(*sdw_res), + GFP_KERNEL); if (!sdw_res) { kfree(ctx); return NULL; @@ -132,7 +133,6 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(str= uct sdw_amd_res *res) if (IS_ERR(ctx->pdev[index])) goto err; } - kfree(sdw_res); return ctx; err: while (index--) { @@ -142,7 +142,6 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(str= uct sdw_amd_res *res) platform_device_unregister(ctx->pdev[index]); } =20 - kfree(sdw_res); kfree(ctx); return NULL; } --=20 2.43.0 From nobody Fri Dec 19 12:31:30 2025 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 378D016B3A1 for ; Wed, 3 Jul 2024 10:16:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001779; cv=none; b=g1UwAzZ+nGGbDTUy/41gxqRAtRJV/Bi+m8OS6shbWJpNVz4PpnxTU8fM9cyAJNBGcgfEkuKRk0kEknHP3KKF19U7AZ6kAgD5TU5iMZC9vii03xnc1RvxiVtBQExz2fcxu0hwzuCtImmmhy1RjBcSJ4IXYXWBE8E1z7g8EZAafGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001779; c=relaxed/simple; bh=6uKd3zEd6o2IBq3WPpQXHIDwXFMOpWhIbBFNpjD55Eg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=l+eEtnBNGCa1ny2ue3SzdlsWl6NUGYaXGPi/DyeaeVoe7SSAnq6WNO09IhQYCBH42OyOYkgEOBnKkorsuXmT/QGf6llGAzQovBrCMCqITCdpfncqpHrNgk0XvQyZmO00fTZ5+Uj9uJcXbKiAp2H/kRzds+tKbfIT9fLdw/rDLrs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=j4f7ZLkd; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="j4f7ZLkd" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a72988749f0so771568066b.0 for ; Wed, 03 Jul 2024 03:16:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720001776; x=1720606576; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=2RGXPX/CSKzMjftTA4WDyZ6uPyqorccsRYB38Y+ET/0=; b=j4f7ZLkdXfzT8fMPkoMgbHMYfkfqXKIwwKkmOwinDbkSNy2BuHl56bcUWch0N6eK2X PUeJX3YcgD9nKAphm4v51w/1WC9FZMRTAOgD/Ld4qHYvPLy9iR9ddl+V5V3UkqjURRv0 c+Xy1TdBpbNcjA0/9U2WlJE35ct6AYIuzXBXOUHqPba6atlnEiDAAaNHsdJ/PcsVe/A0 is0QHdMgaT4r6TiNPP03gAvn6Hl3gouYfq9NP1qwwZC84si8+msvwWtdU9envU7Bc8VF U+o3T5R5kxyAx5/4lFfqgdvVwETvwoDHCQyTP100+UEQ0mwn0VEHpFJmnhSu4X9vSw3s ArAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720001776; x=1720606576; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2RGXPX/CSKzMjftTA4WDyZ6uPyqorccsRYB38Y+ET/0=; b=vVumK0m2+n5HumN4MKKGBTuRnpVrvd3ivwzBK19g4dlfecdQgIPrIAyl6m+r42zwxP GDVIUq9LSIOLyUDN/Rt4k1iS+2ArZfBTEzPfsqj291H/WxS7YgSkgKpIUSlInvOTSgT9 rjozeW8DTw4UesgdsPM8phg4aOGU7+Z3c7KZcHrK6UNu41gRGfZIFMn02GG5xROm4I9J LNQqxrogNHjSDB1vOQY3ztfAu6eUDNWiSGRbwdNldG+P1joPwj1SJEf8RC730PBlaNrw bWnjX10ikQJ8BYRNIOSih7DuAtQ31kF6G9c88CivaCE+vV4MGOmt5HQEMFIPZ3RwHOPT ixyQ== X-Forwarded-Encrypted: i=1; AJvYcCWPTUXlgqG7FH/5nGViTCuaOGQftG8m4cpbVn1m0GyhkUim6zi7xvRmWusBxGzs601mqT+cseUpJKmP5aiYOidhoNZIeTg0UXGwaMVH X-Gm-Message-State: AOJu0YycODSyV+CqAbsovwZcTxW1d5b07k+yr+cPXIP2Sq6ScIR++A5i DA/FqwBQmxrZvx4nS2inNh29RaDo4ttqIk9COKxwk9Y2HqIGaFf/nOY+A30WDC0= X-Google-Smtp-Source: AGHT+IFpjC/UncuvZVsjweNMYxrJoEVZ09OWbbmaVadtytsY9DAfzhNDTF5hguxVUFge710PE/lfJg== X-Received: by 2002:a17:906:ce28:b0:a72:7c0d:8fdc with SMTP id a640c23a62f3a-a75144631bemr673990966b.14.1720001776609; Wed, 03 Jul 2024 03:16:16 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab06565csm494291466b.103.2024.07.03.03.16.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 03:16:16 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 03 Jul 2024 12:15:56 +0200 Subject: [PATCH 4/9] soundwire: intel: simplify return path in hw_params Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240703-soundwire-cleanup-h-v1-4-24fa0dbb948f@linaro.org> References: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> In-Reply-To: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1567; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=6uKd3zEd6o2IBq3WPpQXHIDwXFMOpWhIbBFNpjD55Eg=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmhSTku0e0ZPNzRqNV/p6R7MRgwqF6z2Drikr2X zBVT0McBfCJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoUk5AAKCRDBN2bmhouD 1xzpD/47ioCRH55FERGs7W33sRBsRuCldVHnisxShW4zIspBBmfU+Jfo+bH9fEXFga5oqS8E3G3 0SOJ5ACjYR3l5UC7lYgFQBUrlLPCFehm1jIPrMcmMpMV5ub/0IPrKvGEirCejtdQ+9FazVcFd2Y oX46M4grsOcL06/LtLN9Fl2TMqs8k1B7k3kbLZZRXMLg2dmdxRqxWlMtTmPVh2l9Eo9PEhNPNdl 2ASelRKxbmfAXpHEUC7cPANXn2JXKaxdLLZf64s13ln3DA1uKQ0YpYUbs27A+hu03UwAY4zjEF7 tKCQEvedWmRFScBot2e3fBLIsuh7FfiTaT5niF4rmOpA14AutLhj3UFrTSl3Jl7oAKsR5JMU+Eg necUljx9SfZcYDYTKzjLntNsL17HBP1xFu1crn2l3iqmS43gg/Q72L2+dXP667INVwJOFPqgDHO 2PGN3gEn5WOmdt1ZyJwPsB5vBxplg8D5Eml/TXB/7e2xzUC8RyEUy0SqA9UJIUVIRt7sv7FsQYU 8MU0MYaU8coIKxU+U2lrITGfsqMXy+Gd2BrThJX3Wn1g6gDMgE/gR1VJV9duD8nhvJKPDHzKDV/ 5O0f+6QEa5+m0ColVNshZip7vZ+nsL3D5KoEXvNtneRpXGy/iy/Vi2CqQ3cxGO8KVAt5qsOvLsH ahjuM42P2e+E/zw== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Remove unused error path (label+goto) to make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/soundwire/intel.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 01e1a0f3ec39..b4449095b423 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -743,10 +743,8 @@ static int intel_hw_params(struct snd_pcm_substream *s= ubstream, =20 pdi =3D sdw_cdns_alloc_pdi(cdns, &cdns->pcm, ch, dir, dai->id); =20 - if (!pdi) { - ret =3D -EINVAL; - goto error; - } + if (!pdi) + return -EINVAL; =20 /* do run-time configurations for SHIM, ALH and PDI/PORT */ intel_pdi_shim_configure(sdw, pdi); @@ -763,7 +761,7 @@ static int intel_hw_params(struct snd_pcm_substream *su= bstream, sdw->instance, pdi->intel_alh_id); if (ret) - goto error; + return ret; =20 sconfig.direction =3D dir; sconfig.ch_count =3D ch; @@ -774,10 +772,8 @@ static int intel_hw_params(struct snd_pcm_substream *s= ubstream, =20 /* Port configuration */ pconfig =3D kzalloc(sizeof(*pconfig), GFP_KERNEL); - if (!pconfig) { - ret =3D -ENOMEM; - goto error; - } + if (!pconfig) + return -ENOMEM; =20 pconfig->num =3D pdi->num; pconfig->ch_mask =3D (1 << ch) - 1; @@ -788,7 +784,7 @@ static int intel_hw_params(struct snd_pcm_substream *su= bstream, dev_err(cdns->dev, "add master to stream failed:%d\n", ret); =20 kfree(pconfig); -error: + return ret; } =20 --=20 2.43.0 From nobody Fri Dec 19 12:31:30 2025 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (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 82B4B16F84D for ; Wed, 3 Jul 2024 10:16:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001781; cv=none; b=B309AXCMv1oJlYdZln9E4ZLOsrK2dvOv6PYmRXEZYeH+2wrh3nYdOByE191xmDJOkBm+Ak9f1fhNFnpo04l72EjSAEf+4ZOK/pZIk0mgbH3Q9NJ2l/hCmTq4Z2U635ZK4E4RC6e1MFJ9yIgU5wh1OwXSliLRts3d60Ho9LKst/4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001781; c=relaxed/simple; bh=cOn7ju16wjK6pDolLwYz3MYYA0UeyCHv7oicnzceFGM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GrlxijYO1bS3Lj2oitL0yoWKbkAymLn5SWLrZ+kaldx4p11YjIDDuxGdJJQw4tSBBeEFjxvT+0EVg3Cz7QlLIyIUk+WmBNXqhlNumxPs3Z5mOsaQs1LdKz7JqyA+Szh4uV9W4ugWm/KDwiffGSRAAxW8BMNJ/x8PHJn+23XGVw8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=BBAwI0x6; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="BBAwI0x6" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-57cc1c00ba6so3519352a12.1 for ; Wed, 03 Jul 2024 03:16:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720001778; x=1720606578; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Q1gM5YfJ5m/5Sqzk9+V5O7T+yd7cVFhUsmikU//os+Y=; b=BBAwI0x6uLgJygeUJ9QbPkFFvtNggu56WDoXZsgTy26PEd6jhIM1+suil4QPkF9SvZ hCI4wL9CHyaQvxIVyn9Pm2PMffVedW8BEO7cxzI0mQxR2Pcm40bCtwOh71jtpXA2bXeb 4oUOXtINA17dVn9DNY4G85JqY2oN082UgDHXrkxAzT4RXrWIOKysbqXWGYd06u0dA8Ec a+aX5ks+p/jdLS17BvjRUBfLvTkMUalxBD8y3jycZi4bmZ2s962jZz0tLhlTs6MJkduk eJnYGAncoLy9+M8sKXzXxRoX1oDpR4NW+10/k3L2NsJrg8TvOKxA3kYhoL+sV+tRPNbz jgbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720001778; x=1720606578; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q1gM5YfJ5m/5Sqzk9+V5O7T+yd7cVFhUsmikU//os+Y=; b=kaJ4qHntPHrtlNaTPdHdnV7fLGuox02I8aOtVUuweha9hWmHSCLIS+5NjD/KKRqSTz uLO+LnPB1QVP7bRRz2ojEjof3iPhITC+I2hjEnT51ncwPVeDTpWTMi9D1PHUG9M+P/9T TnQ+Rm9YGMoxvurIEJmyLSt2AbYeKDPahrVmK6xL7CFU3La+A353eJBJsfAfWikuinKB m27JRdT+x7nx82ku8OjXQsi2jiohXTNf5k6dIQLNxFEWNjaOAHI5ks54UinXGwxinFAk aHM+O+LahNie5Ye1U7TZxJFqJZI6zvlXTpe4vuHkEcrK4S3R5ysJreInWfzofq/qTHvp PJVw== X-Forwarded-Encrypted: i=1; AJvYcCXVt0WNSP88bPbez863F4jllMcFM91uwgUHntk6WLic9xbIcdQEp/aE+MTNDndbKb2dJhwVXEZUIElaSV0xYAF0UWc9ldKPj6GVZbAa X-Gm-Message-State: AOJu0YzGHQR1YxFGIdzJ6urCzZAw1eDzgys4TQrRQl/UQqwXJ6+SU4Es eAff/Y5PNIka8P9N9QzZQQg4XwuFYyzdLlTIeqCH+UxndXAoouLJ0p3yn82Rlcw= X-Google-Smtp-Source: AGHT+IHu4HDX7PNB+RrIZabjL3r10C6WAGWLrBJ/SniR7QXeM4+uEi1nx8/QXXKaEFa8XSm0LDA0qQ== X-Received: by 2002:a17:906:3716:b0:a6f:1dbb:d38b with SMTP id a640c23a62f3a-a75144309f6mr639801266b.28.1720001778032; Wed, 03 Jul 2024 03:16:18 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab06565csm494291466b.103.2024.07.03.03.16.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 03:16:17 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 03 Jul 2024 12:15:57 +0200 Subject: [PATCH 5/9] soundwire: intel: simplify with cleanup.h Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240703-soundwire-cleanup-h-v1-5-24fa0dbb948f@linaro.org> References: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> In-Reply-To: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2107; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=cOn7ju16wjK6pDolLwYz3MYYA0UeyCHv7oicnzceFGM=; b=kA0DAAoBwTdm5oaLg9cByyZiAGaFJOWjVZRJlaE4+7o8j3BoA3vRf5jfJurtUc9fTi9oPNE2H 4kCMwQAAQoAHRYhBN3SYig9ERsjO264qME3ZuaGi4PXBQJmhSTlAAoJEME3ZuaGi4PX+Q8P/1QR pWn/0I9oFGlPVBDkeUK+8ZgI+HK4gDCXUcmphuWo3fkkIISCmpdjU1CMhUIoxw0XJS0WCo4+cA7 ftUEG6AjbJ1lt7tN+UQcgof4l1hADQ2wXlaW0CzC8Bw19MC61jGS1yJvIAGAboAYgKrQSfrsnFc XY3r4AyZc3gHF7uJIm4yqrXikozsOMttAHUoafi6f6feaTFi1a0A2ISoyT+AW+RHUfyweB1E6fg QDE2hu6HhT9ON7UzbcQgoVQkCjj1CdNOZOwBYVS6wrb/B7ORkgj3dB+WI5FnMnJM9iwLkK5QDZj LoFJzQ07N5Gi1i73wARhjBRw2b/4Oo1Mi2LL0m5N4rb4IbZtyCUfNALfhRIyu72agXKYAqzR6zI 7Idc0TQZAN69ijTjxaYsaRFJs2SRoN7Z0p2hTMzk5Jr+vw0KpfS4eXaT81AJPXRx9gv8wXIBEfj Xe9LKrsmjmOV6ZgOu8O9RJK21kVII6uvktYyW4vkAVEA8conI6TgWIQKXI3TxTPAUmmhV8QO2d5 OR255h+cU3rPAb1DtzI9iXXLTncjldmjDZyoPxA32JNyQS6fBUrEZxTt9PVlb88DKKYDBS+4Iw5 u1hdypdpA5Dqlp6VHr/Lz/y9QpgZMEKfnflUiIGuux0zBtnOfNXP6/9gCRRGyYnAAXfDJZqL7rh omplR X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Allocate the memory with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/soundwire/intel.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index b4449095b423..421da0f86fad 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -6,6 +6,7 @@ */ =20 #include +#include #include #include #include @@ -73,12 +74,11 @@ static int intel_reg_show(struct seq_file *s_file, void= *data) struct sdw_intel *sdw =3D s_file->private; void __iomem *s =3D sdw->link_res->shim; void __iomem *a =3D sdw->link_res->alh; - char *buf; ssize_t ret; int i, j; unsigned int links, reg; =20 - buf =3D kzalloc(RD_BUF, GFP_KERNEL); + char *buf __free(kfree) =3D kzalloc(RD_BUF, GFP_KERNEL); if (!buf) return -ENOMEM; =20 @@ -129,7 +129,6 @@ static int intel_reg_show(struct seq_file *s_file, void= *data) ret +=3D intel_sprintf(a, true, buf, ret, SDW_ALH_STRMZCFG(i)); =20 seq_printf(s_file, "%s", buf); - kfree(buf); =20 return 0; } @@ -727,7 +726,6 @@ static int intel_hw_params(struct snd_pcm_substream *su= bstream, struct sdw_cdns_dai_runtime *dai_runtime; struct sdw_cdns_pdi *pdi; struct sdw_stream_config sconfig; - struct sdw_port_config *pconfig; int ch, dir; int ret; =20 @@ -771,7 +769,8 @@ static int intel_hw_params(struct snd_pcm_substream *su= bstream, sconfig.bps =3D snd_pcm_format_width(params_format(params)); =20 /* Port configuration */ - pconfig =3D kzalloc(sizeof(*pconfig), GFP_KERNEL); + struct sdw_port_config *pconfig __free(kfree) =3D kzalloc(sizeof(*pconfig= ), + GFP_KERNEL); if (!pconfig) return -ENOMEM; =20 @@ -783,8 +782,6 @@ static int intel_hw_params(struct snd_pcm_substream *su= bstream, if (ret) dev_err(cdns->dev, "add master to stream failed:%d\n", ret); =20 - kfree(pconfig); - return ret; } =20 --=20 2.43.0 From nobody Fri Dec 19 12:31:30 2025 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (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 0C64C171085 for ; Wed, 3 Jul 2024 10:16:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001782; cv=none; b=PrXQIhrL2hEXoqFQCsR8V8TbpsLDL3cYW/k/vAv+E//lf4MANcBiEGggEm1Sk28zrRPsZrwHoiItwhXvWw30HZw5Irtmfutu8vZxwnaYxAVyN2qBToLM8x3L7bE4CHE1t1qxkp4z3+tFzJKujHe22Mo3WvAraNIUv4Hjf6wHjKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001782; c=relaxed/simple; bh=H6MHDzn4DJjvMx+UU3AarlEqCOFCm2kvbOhK8C4skwc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Wu/g92bLrHfETM6Fyjh1tfHA2M0SPC5rbskVZkC0aaBvSqfi8oLvFICDSYJo0UL3mwBykI+ZthMJ6kFFZp6K0L9OFreMckPDpuwvqjIgF85BTKWkY5GUxQwdF1B3BD9lJcAxGfJW/vSukuLOA8bv8wMHptQ5lONFhdu2k0Gus28= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Vytpm4br; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Vytpm4br" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a72af03ebdfso724848966b.3 for ; Wed, 03 Jul 2024 03:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720001779; x=1720606579; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=4h10YGfrwPkkGVTEjCw3qirW9g6luYJ5Y1/Sh0BpRyU=; b=Vytpm4brkrYBWYak9Id6SDWsnmPTTjbwl1hMEfZ/jieTYb/p1kenN0Rry84/xgPedg SitNJMuFwrqrPnfgR11OGuVTzij+EQvA17vjrmWoJCxLWeWkM89EJfkS9RTR8GxAYfdq rUbAo5HSZngsrYKdG09tFI8yk7crjxxEFgN82r+x6DMMfrh6o/4NktL1t/UZPbN8cSlR vQDVFXcBI5gAmPIybrTXzI8f1dGVs9SFcrDCJVF9TyuBM3UUfP9Z0q4TW+y7j4ohEq3F bOzcJQqK/nS4KEflRea+siyt6eAjKpeDSQCFFfOzs9u2hKkwx0eUIdvyZBSgcuQImKGG 0miA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720001779; x=1720606579; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4h10YGfrwPkkGVTEjCw3qirW9g6luYJ5Y1/Sh0BpRyU=; b=KcJZ19R1rpCNcJcWLQykxU4AjA1zlvLfG9QDZTbpzoqqYawZBCqT3Qnm1tcINMZxUZ d7DWU195b5kzlw85dAbTMGiCmrtmwdc/G/9eYNMpJVjAQY2nwdagPscIaF2iklKSXTYD C+uIHrdOrwfSsTYHtlcNfZVk0+28b60vQc+c1q3e3y1ugq0mqBkfvRt7aij90O6os0mq coOOTUQDQCqUHJI/2u9P7/YyijKCEAWMtwBJlBcoBQf7eTW2A9fPvMW3wKb6Am1cKRYF BaZ3YH/ZEIKDAVa9yjreVDHqwMiAtuWNeClVS5aQtMeNCf0GKFbnNGPY8Q80/zlUxe4h JIVA== X-Forwarded-Encrypted: i=1; AJvYcCWCzok6VFB/08+4A6HnuMDCyhpOqe2vwGUiyYFMrpdLIFDrGepnfTCSjnQiinEbHrruwFSVkblP5d9IrecsTjO4V2MPS5i1VB4nZO/v X-Gm-Message-State: AOJu0Yw1JPkkXAgT6q93yFBIrwXSdsBYDVT9NmQHBUpHtLzjIe7fwoLY dBc4KDXgMqgMNIVndY5bhPFUYEDFkTfz2d+mG62pQ67aH9hYNzbgK/+9HxD2/dk= X-Google-Smtp-Source: AGHT+IE2lrUjD2pD2f+fZKLRkMjumm7fxaU+U4uTiEAcTuke1jkfQkdtKdbpoN9AyTeSI5vhJJyf4A== X-Received: by 2002:a17:907:7e85:b0:a72:9d25:8ad3 with SMTP id a640c23a62f3a-a75142d84cfmr1002976966b.9.1720001779364; Wed, 03 Jul 2024 03:16:19 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab06565csm494291466b.103.2024.07.03.03.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 03:16:18 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 03 Jul 2024 12:15:58 +0200 Subject: [PATCH 6/9] soundwire: intel_ace2x: simplify return path in hw_params Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240703-soundwire-cleanup-h-v1-6-24fa0dbb948f@linaro.org> References: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> In-Reply-To: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1648; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=H6MHDzn4DJjvMx+UU3AarlEqCOFCm2kvbOhK8C4skwc=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmhSTmLDnJUL3FsGDF5drvgu3fqPTzR9Y/ZiOGC mlwnnfvADqJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoUk5gAKCRDBN2bmhouD 16qGD/0RTy0gf025ZbhLA1kN/XXZ3PlVTWyAloNPGC57y/esZhOXT/qt53fssZ7KSpHzpKNERDt flw0qiIrQwaGh0tIfMFkQAgPOUX0IK+QcVX5Da4Wu2rHui3mest/vCtHs+v9GuY+ey4bGENm6Up wqF/fkwK7tNmYNBrWsNkDdSmpfLak2VaFfRqwcdS4NCcUPbDtPXin5ijO1ezNwPT7oEg6PkVnaW f87mCHd0QPF93MOCsUl8U9Df39Wloe9QZ9pn5Qh3a8IxJX9nxxcrP/dnBkXQIpbEnMwOII2doic nGobn0vQq2v1+Tte0V5hS7paQolA2IsyHfUwblLJ1yb/tn9rrbCWB9Rq9ImCTx4IKaI9FVqGJ9a dAcZaW+8Jd/xeFwQMRsnwVu+PsJPMpjrTC+4vx3/kBvqMK+e6RAK1aY+r0aoYBBUa2Y5MuwgBLa RR6JGDAO1eFUay9tABD0VU6VeHb2lT6izYKhi1FZSHW6IRa1W07dDTNQQtQZG2Wws9ATEcvliuP X+8G5QzMhXHdSUh6n53+4ZJ7xH7hHjvCv6rwtGcyAzueVoTDbNPk+COndQwODT8MomTTLf8zNva hIoHT6MEounK8Z+iGtLxmFv6ed3+RmrX0Ewuwvo315qpZIX2EpIsorjuZBuzuM/nSU8QDc+HsnT PWxuBI7PWu2MliA== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Remove unused error path (label+goto) to make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/soundwire/intel_ace2x.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/soundwire/intel_ace2x.c b/drivers/soundwire/intel_ace2= x.c index 4f78b7f99e44..f0008ff84ab4 100644 --- a/drivers/soundwire/intel_ace2x.c +++ b/drivers/soundwire/intel_ace2x.c @@ -325,11 +325,8 @@ static int intel_hw_params(struct snd_pcm_substream *s= ubstream, dir =3D SDW_DATA_DIR_TX; =20 pdi =3D sdw_cdns_alloc_pdi(cdns, &cdns->pcm, ch, dir, dai->id); - - if (!pdi) { - ret =3D -EINVAL; - goto error; - } + if (!pdi) + return -EINVAL; =20 /* use same definitions for alh_id as previous generations */ pdi->intel_alh_id =3D (sdw->instance * 16) + pdi->num + 3; @@ -350,7 +347,7 @@ static int intel_hw_params(struct snd_pcm_substream *su= bstream, sdw->instance, pdi->intel_alh_id); if (ret) - goto error; + return ret; =20 sconfig.direction =3D dir; sconfig.ch_count =3D ch; @@ -361,10 +358,8 @@ static int intel_hw_params(struct snd_pcm_substream *s= ubstream, =20 /* Port configuration */ pconfig =3D kzalloc(sizeof(*pconfig), GFP_KERNEL); - if (!pconfig) { - ret =3D -ENOMEM; - goto error; - } + if (!pconfig) + return -ENOMEM; =20 pconfig->num =3D pdi->num; pconfig->ch_mask =3D (1 << ch) - 1; @@ -375,7 +370,7 @@ static int intel_hw_params(struct snd_pcm_substream *su= bstream, dev_err(cdns->dev, "add master to stream failed:%d\n", ret); =20 kfree(pconfig); -error: + return ret; } =20 --=20 2.43.0 From nobody Fri Dec 19 12:31:30 2025 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 57464172773 for ; Wed, 3 Jul 2024 10:16:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001783; cv=none; b=oHFa5P5/Ul09X2ewrGIRMJsryMvi//z//W6WCU7ess96VIovRABk26gXVD4DsKqrb64Z//VXpMjqYsBHiUqWD0WidNp4M4oeedKA6pI2S986pYg3AsU3HjvoG+0TFcr+uM+M405K3MAHFaL6BLu7RsuHV58sJP6O/fqsNCjkflE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001783; c=relaxed/simple; bh=IY1oPHTeYFkPAQIumDC8e25FwPrkJ2qyVDIkUd9B5LY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=acco1UCvkdhGOzDLc+dcexh65xf4hHnkD1x6IFXyIEJrjFFRWbA4B0Wll9gdnNCJHNYYAlsaeKjQuWShc/kqHUQzAAJ9HFzsFj564GaPrpBr/RW34SbFIdF9gTpeUMFwH25AjSzxz2+4dR7++PPUEfRgOoi7suCc1MmyxzHVGDs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=P4g0sMs6; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="P4g0sMs6" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-a751ed17b1eso77783366b.1 for ; Wed, 03 Jul 2024 03:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720001781; x=1720606581; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=VrtpT+q3ugRzypCVgwmAVgi8FHiU6FE6B5vA8wJQ87o=; b=P4g0sMs68BTO8/fU/dfJdDuVVhfatMjOSkVZdQSXNJmtg9HLgN8aydQ3ImZf3OfAGH SfYr+ZXgnX1VVOFMIpzK/yOOpw3G0z6h3/UZGfffSMVa/YYeyxuDk09fAeq118XdPxgX HezSHa9Dp3yr8hgWHs4ItYk0UR6r4PqSTRNo0KypwXXRkZvLLnpugS1BOD1+DXuss/++ eQK7UmyX4n6TeqovpiybvVG2qb1vKN5IBWMYRmQAuz+oEJ4n1LtPxsJmv4OCAh4Vbsyx Ml3/aT3lt7wNR80xyXcRdJVfZi7a9fjDCUS54q38zdRNhi1qQj9ZBy+8sdENw0k36Nx7 jdGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720001781; x=1720606581; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VrtpT+q3ugRzypCVgwmAVgi8FHiU6FE6B5vA8wJQ87o=; b=oz9o+a7q8JKHgPmTPmN72QXp+rURTjPKMDto8NpuDQ6bvFeJc2un+lAgn27Y6+SV5e IvtcT4sIsIGpe6HAnnlKzCWX+LrjVyySOGfusuhMZlePfDwyM5V5Xx5V5DZThTLAYoQb 6ufacAoMy/bfJzQRGuDhH4AG7qycAD8ASIp+4wMbzi3CIb7LneY1P8xGzksYjJk9wrzh /7sLpUxSrZgLC68Z2Bdwp/XU/qUnruAuNY3+DINnkAH1m5+H7R77k1uhWXYRDDY2W9Lw qiI51KVpwHqlOcQOK6BU9NSN5BoLYd5pM7zoYONuJ6AbW6WnfpplXzqUNyiqq1CyHFbJ 9cZQ== X-Forwarded-Encrypted: i=1; AJvYcCWDtcxXIdBBDiqPnMegnxYx7NVB1HFW0Ya/R8X2VBCMyiiar5OaPrLhiSFRALA6MSMzWHRg/3izP5xNFJBcfh67kFSwB9YH3DOs7K3k X-Gm-Message-State: AOJu0YxF0rUqsNfEiB/omdxn22Jg0eEJVWjudnng3V6+vfvUCiBrkBkz mc9fJlN0sLcThKkOc5b+c3OzfDfJsdEYejm7lPsNJfK73xki3vujjLs1mplz3A4= X-Google-Smtp-Source: AGHT+IEtZoY5JzZntBzNzE4Y9+mfHfz4VIjEoXHHcvOnPR9dBqvKKOQoXhvwcg0LzXPqeLC+5E0HGw== X-Received: by 2002:a17:907:3681:b0:a72:7736:9e14 with SMTP id a640c23a62f3a-a77a2441768mr102819766b.20.1720001780715; Wed, 03 Jul 2024 03:16:20 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab06565csm494291466b.103.2024.07.03.03.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 03:16:20 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 03 Jul 2024 12:15:59 +0200 Subject: [PATCH 7/9] soundwire: intel_ace2x: simplify with cleanup.h Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240703-soundwire-cleanup-h-v1-7-24fa0dbb948f@linaro.org> References: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> In-Reply-To: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1521; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=IY1oPHTeYFkPAQIumDC8e25FwPrkJ2qyVDIkUd9B5LY=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmhSTnkavgfEK5yCLUKTCxvvF4PXPL5NgXbOKSZ sWx7SD8R86JAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoUk5wAKCRDBN2bmhouD 1xwsD/9gMhWaZZjNTAwmFUzuScG1m2CPsqiZWoBezCyR5KEDWxWf69dUBsYBPLlAYXfSHIrm5xT M8P3yDHaE9MQGJaR39xrtArAoYt2Qm3DiaOaSaxXPSH/nqNJrb3wIS56tYPbVCXevejg+elOd8C XU0lrreoxsHeEF2QpHehJJYoVpx0BlOTYe5SoExvz3gJrDYCVEt+YSYWhUqSpRii1LC0WNuBTYz GM1/9ei9HhvvhdgsnK2TMfiaYSsd9w6TDxeosIy1fXtgSHyaVYev7CIhJi4EI3o1eunWtc0nwDZ 6QtuoJGh4BMsA3jyc1Q5QxM05YkK2TzvEaaH9nnBhhfWGQYna0MiuYx4Z5uZgVdzKaxsSRbusWj nPERQk47di6YubUGrG5j1ezzyrr91UfHhW/PIvu//4uoGIytIEku+jVYdo7BSUWvl/+/kzBJkh8 J6p/UxVp/kJU5Ioz4yTpGpMDX6Z6kCyC1G2zUSs42BXVMWY3er3FkWkLRzW0PfE1n34coDePDFT K0dylCRRUQqDY1jSZsSQpFv1MKGZUS6uxDXZcWifj9ThsOn7rvhKGHtyY2roqmP8TdkrgeABAtQ iLubbXCuFNg2eHpsURlbaq8gaeZmAaNe9tjHo/bGlI7nBzLOdjqS3O6lSdFgIC49kid3mb993xN dFiR2mEyDKGSEag== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Allocate the memory with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/soundwire/intel_ace2x.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/soundwire/intel_ace2x.c b/drivers/soundwire/intel_ace2= x.c index f0008ff84ab4..781fe0aefa68 100644 --- a/drivers/soundwire/intel_ace2x.c +++ b/drivers/soundwire/intel_ace2x.c @@ -6,6 +6,7 @@ */ =20 #include +#include #include #include #include @@ -310,7 +311,6 @@ static int intel_hw_params(struct snd_pcm_substream *su= bstream, struct sdw_cdns_dai_runtime *dai_runtime; struct sdw_cdns_pdi *pdi; struct sdw_stream_config sconfig; - struct sdw_port_config *pconfig; int ch, dir; int ret; =20 @@ -357,7 +357,8 @@ static int intel_hw_params(struct snd_pcm_substream *su= bstream, sconfig.bps =3D snd_pcm_format_width(params_format(params)); =20 /* Port configuration */ - pconfig =3D kzalloc(sizeof(*pconfig), GFP_KERNEL); + struct sdw_port_config *pconfig __free(kfree) =3D kzalloc(sizeof(*pconfig= ), + GFP_KERNEL); if (!pconfig) return -ENOMEM; =20 @@ -369,8 +370,6 @@ static int intel_hw_params(struct snd_pcm_substream *su= bstream, if (ret) dev_err(cdns->dev, "add master to stream failed:%d\n", ret); =20 - kfree(pconfig); - return ret; } =20 --=20 2.43.0 From nobody Fri Dec 19 12:31:30 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 86575173326 for ; Wed, 3 Jul 2024 10:16:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001785; cv=none; b=o8rDdYIQGmrSkaJ2wQ2Dl6FtA2QHYYq80a16S4AryKEmXG89Q56LnYvXpIj7+XhXGXMgTCMsiuB01CeIB6zriQAn2dPZ1ILnVCEdz1lZ5XKkBy3EaTYw5fuKKUcLiXFhWdl3B+hrM2USx1m7KNwMKdNSIxn73wfbYfv4zGF1uAI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001785; c=relaxed/simple; bh=2Hgb11TSE9fOERRmOGKvCbJsU5ExxL44Ao0bbckq9aI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R6Pux+BNpDAmu+ji9n+aXWanxhjDlPxKWQ1mHzxHlrpFmg/AgWdIZ1JkRGWsLkoB/vPuNc33qwXUsnl6QR2iH47mf79rn6ZgI5s+f9LfbdnWiphLdTbZw5COyhY6IXhKIbzLs8j+JYCGM7ziyBEf3QVkio7n8GmyXpHODl+0GYI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=FKi+XauI; arc=none smtp.client-ip=209.85.218.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="FKi+XauI" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a729d9d7086so87488866b.0 for ; Wed, 03 Jul 2024 03:16:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720001782; x=1720606582; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=3joTjD/EvzvybWiPdLIbHTzIsLTnwS1UMLvS3hxDr3Y=; b=FKi+XauIGCJOUtOzsELIww5nhWM0C4941lxBHO7f1h8OT0CSAEpIMrpoIH5ied8Q1q XX6LqZcf/Wyp4KhqBbMKQwi3yEpPCnwyUrA8TWwWciAwJVZxbwnjWX0x7LdqhC853ssm 1cYe/6GS5YZqeeFYQ5GN+PwQyw17K3E68kZfVH3PyGmMk1wjm/t1AumoJjDFfGqkRKss cRpatoOBJnib240YQbtr+hK0a+DwiWH3COk90PBweevlmwbFMr5pzPS/06ZJw8vgnSjD Yyda+V/cGDkq1454drCiy+krvdgsJAeGgSykrYJNeVzB9w5Igprd9TkAzM9pJPfsjCrs 4UZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720001782; x=1720606582; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3joTjD/EvzvybWiPdLIbHTzIsLTnwS1UMLvS3hxDr3Y=; b=rrrNjADgKK4cCiLgioVw8yhyjy/isq+yL31vg6R4+cbuOc8VLlKKz1RvIQXFKzqihb KVkJiAFvdLxeBO4wrZE70w+iydKheYYtxUNof+C7w5bv+gHfYUJ/i8G9SUqotZJVHwGg qaqiOf1EtneUlaQTIEaTGKGFQ+i1AO6pDXj0Gs/UM5ocs6gLVm5jI1mkfLKZFzKhdvEp so1rndIXWDfceUDy+LpAIk6Xp4sjPAaWAvjE0Ph4p+YeGNIH4Qbp0zBuM5gpAhgos9AZ lZ9Ja0nELOn3PLUpRSMobvNvCluIZQ/b2xlUQtvsHM6z8fPHmy5PvydjAWp2YQ+6h4qQ GilA== X-Forwarded-Encrypted: i=1; AJvYcCXwSkGTe3s3O4WYjudxPhGSfzP4Fpu6Yim8tj0OWBg9JBUn+YfmYJAic1VYKssQcFi4IadbH1GiHwoGNooVS/YrUGXhBwVg69PGA5Kr X-Gm-Message-State: AOJu0YxAKQGvXVrfuNh5F8XpfqKI0J0lDt9biBtbUbHRB4VEfKZdQdHU +EaXcOWnV0Mq+q1huaCw2MlXKcuCovLbLlWoQNWrR6gbpv8emK7VTzZKqXWfpQw= X-Google-Smtp-Source: AGHT+IEELsiExLgIL8ViDXZhbHcr5lLNtKgOIwnhglxgd+MvGmadP9WGtD7IcS1FdBHJkN8UmxvuUQ== X-Received: by 2002:a17:906:3390:b0:a75:1923:eb2e with SMTP id a640c23a62f3a-a77a24202d2mr96155166b.14.1720001782114; Wed, 03 Jul 2024 03:16:22 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab06565csm494291466b.103.2024.07.03.03.16.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 03:16:21 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 03 Jul 2024 12:16:00 +0200 Subject: [PATCH 8/9] soundwire: cadence: simplify with cleanup.h Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240703-soundwire-cleanup-h-v1-8-24fa0dbb948f@linaro.org> References: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> In-Reply-To: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1247; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=2Hgb11TSE9fOERRmOGKvCbJsU5ExxL44Ao0bbckq9aI=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmhSToVO7krJpsryvmNegqDera+Tzu8RsMQNven Pl+d2kxioeJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoUk6AAKCRDBN2bmhouD 10eBD/wOYMaY6NC26kuLeUu0bJQ+sYDgl1g6Q7lkH1bSLC5TO9SnH/0h4y+otOvZV67HNOwAd8N cH2zTy/Z2E+pNrHspUPiOSxzg9tDPXMpcdSSnkBvqqine3JZhibf6kXd0c73jtRcTTRleFWfMy6 J4SOVEjrRO2VSXzv+M3iNRyUC9FU3ObCHmT55JAnRdRSwf5BYLZzD9GqqWtRtfmmAP/rY5CWWRe zOEDY+edSJHyVzoANpMEySXRE5xTcQpCs/qSjW/ZXTKfLH4NNKdEgpkfP5XBQD4Q7+PdmM7c6NM FGvnKZzzhMQaB8780Awfj0aJnoQePjrz9gVJR7eqyT2OByegp3MjXPEFye5daGwyUs+A3+st2Xe s8YO29KiNQUs0XuOXqtCPgQWQaOqeyRuiojdUr9LUk4DtwwAHpctlQzpbCAKcNI+mTLCI05PsQQ hgMuEtwxzPRyV/brU8MILtqInRt7H29Rm130MdNAe4ZopUxqoLeuz3m8jtUZ7Ujn3BJWYGpi9P/ UZfv4ulXMnDaAzhV4NITyL7vL525gjJveZi9/fb0FAFnGHnO1mBVOhAFTZEt8z0+xF15ibZINOr Pfp6TunC1dFQJKp7P8LsFxDOoNeVkJJ9nFsFn1ckc9zlLHE1Ev492Zl5aDKlzYbF4nurrDdwhJ6 /PNP2BP22TZcJaQ== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Allocate the memory with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/soundwire/cadence_master.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence= _master.c index 74da99034dab..e0683a5975d1 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -6,6 +6,7 @@ * Used by Master driver */ =20 +#include #include #include #include @@ -323,12 +324,11 @@ static ssize_t cdns_sprintf(struct sdw_cdns *cdns, static int cdns_reg_show(struct seq_file *s, void *data) { struct sdw_cdns *cdns =3D s->private; - char *buf; ssize_t ret; int num_ports; int i, j; =20 - buf =3D kzalloc(RD_BUF, GFP_KERNEL); + char *buf __free(kfree) =3D kzalloc(RD_BUF, GFP_KERNEL); if (!buf) return -ENOMEM; =20 @@ -389,7 +389,6 @@ static int cdns_reg_show(struct seq_file *s, void *data) ret +=3D cdns_sprintf(cdns, buf, ret, CDNS_PDI_CONFIG(i)); =20 seq_printf(s, "%s", buf); - kfree(buf); =20 return 0; } --=20 2.43.0 From nobody Fri Dec 19 12:31:30 2025 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 B7A56173347 for ; Wed, 3 Jul 2024 10:16:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001786; cv=none; b=aFItJI4ilJNKx0vL+XSjVffmGVSq96hr2mOjENwsIEMizBsbz+eC/vLSXttFum1G3B3HJRWMIu9/C79dJ6CjiUN0JJsyJqKbsV9jXckPlL8xBtR04cXQDpPRmhuQ6yhvaH1jMil2SzmDXC2dflAn5tuCtpVomvdg0ZwyN96FdRI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720001786; c=relaxed/simple; bh=Ya6oXVz+9PSgSZgNYuY4CHXoSmhTuQFovgLfaTWUMXo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bGiFhApQGhFRG8Y+8MfEb3FIGE5SkF3vmhtFsOXYLdwqQgm3joF6lVRmtEno6Tk8wbgv2E1mOo0BEGqelsBuyVzqqw/I+XR0BCkFWK34bdJkcYLYLC1KMBDHGk4yCd48a7FY9oW849cEH4JTHX0RZAvvHZi22VlAtUGkUJT5fc0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ABEd6ojx; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ABEd6ojx" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a72459d8d6aso537489066b.0 for ; Wed, 03 Jul 2024 03:16:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720001783; x=1720606583; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=FWGT3G4dbfhnZE1xyRO5OpmfX9c0autS1uaNaBcB/Mc=; b=ABEd6ojxnGq1t5if32foTlCyG/EmlWyyx++Safo1mr7aGbSsUr3QZbYa92/A2ZmZeg eo8nlPvBIJT3rRLcXUZpWhIQLvf39mB+v95I7o+lFfzDSygke968UsaTYflTGgWAklBd BLaHNyD+FPMPA+I9Jblp4fSumweCh0PNMFKMxSN/DE6XIOkPOn2egtJ6qfOw6TGO8iSW lV+qLz9rtZZAI4hsuST7vrvSM/9gLwWJUq57E4H6ktpFVSf40MRirRFkOgGv1Wm4niQN DYzHIC9DMtnMRsr7kMXhI9LV3CDrXKHSqx3Ia1MvB+vDdALiuHSnG46sKl2p+u8xEKvK w/Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720001783; x=1720606583; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FWGT3G4dbfhnZE1xyRO5OpmfX9c0autS1uaNaBcB/Mc=; b=kjdNTS5ZBXveJ5+35AAjLLXpnjrchi78We9R8WXpD01g2Epf74Nu0cCHUtlionuCs0 O1K6jBfPc/9G3Holh4Wd1wJX1TrD243EJFNOK6Y5ajubpD037A+FdyOsx28OUA6p8dck 88/5ZXQXQtaWo7YbXHnoFHvlxH44kC8tnN4AIb/6r8SSRGoiLtLGTDMJYNhfVdSX7oFF nMuIySRP1XNzwerAxf1AZEvAVz98u70jN64GynYhA+HBLtkoIRmRKr8k5avLUjdH814s YbOCWDffo2PKIbUVSVWf3DqB4HAGBFGJmflYIbSq+pfnDkn6cvUiwtSQ35XptOmMlEqC FMSg== X-Forwarded-Encrypted: i=1; AJvYcCUmcSB8JP5Y7ognEsbQYUmxUkTct+FxaPJhvUtmnZGJlHmt7ms4PJB2CNxFuMfE9Sq2nRRn1zrkFtUlOLYiBbOxkMWHDSNW4PwdPf9C X-Gm-Message-State: AOJu0Yz/m0LmLgyP6V6XYEsxizc5LiKW/UP9HA60BJIBZzhuoOU2gO9D h9q5D79XUz/+ePaiTubJwGGCSwkamnmNJB26mPVSb3I8o6crk28eCyQJ+th6v3pdSRAnh3DqApI /d+E= X-Google-Smtp-Source: AGHT+IHeLDjC6kF6SJTtMZmIDChVrcMjHv7cKLOslnjJZSeDu4JK3THQHeWo35I65yYU6QzYBGe/2g== X-Received: by 2002:a17:906:d78a:b0:a72:797f:cf6b with SMTP id a640c23a62f3a-a751441a667mr684555566b.14.1720001783179; Wed, 03 Jul 2024 03:16:23 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab06565csm494291466b.103.2024.07.03.03.16.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 03:16:22 -0700 (PDT) From: Krzysztof Kozlowski Date: Wed, 03 Jul 2024 12:16:01 +0200 Subject: [PATCH 9/9] soundwire: debugfs: simplify with cleanup.h Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240703-soundwire-cleanup-h-v1-9-24fa0dbb948f@linaro.org> References: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> In-Reply-To: <20240703-soundwire-cleanup-h-v1-0-24fa0dbb948f@linaro.org> To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1466; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=Ya6oXVz+9PSgSZgNYuY4CHXoSmhTuQFovgLfaTWUMXo=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmhSTppdI1vWEUj6KaRTVA6Zs6vstWpcqLtIv+K waN3oowU8eJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZoUk6QAKCRDBN2bmhouD 1zl7D/wMjbC9AmoPa2axlSVFNvUY7r8vuhRS+DbdDe8mpxB8IgQ0rJLwE79UYI6y2V+XB1M/OUr pnpEjT8oO1ReWJZ7Vsjj4afpKFwsE7rVsA1vaY5u2WQ/BH6ffgbqTLnywnI21WzG3sYV+/2WUoR uqOFoBoKwJqpP/J/lHojAT3lzh3sYmONwr566zGBEwdZ1C2YFYdxFOShtYoMPMNuURyykRGZqBo AMof/wpz5ye4HhCObCYiLgWzf8WpN20aEWB3Uu7UOBSkZEh9Ulv2uSmI7Mpz1QUvZbJi7g8jclU NChJjptEkFASqpAR9Yn+tB5jTjLVI3/WGRwjQz7kpdzjZgLpGRillyKU2tW22cowqWjJa3m2Ms0 Ko7JZSxhpB4nM1uToQq4mAA1wBLeekdT++gZHXbysR1hhlo/RlvMaIyA0NuC6sSVXI2alJRACCZ 4PablAUl2DVblPVLf87ps+coOxUZxvTwnOys1tGN2SpR2ezfB8U7AdZZw/OPFeoTH0Er8tsSne/ qvPYHgo3Ik/5cHU4OPozojj08uYxsh/xLgB8p4zPNqjgxt6GemeS95mJalFykAgOI6Ln+Xn2VYH M+Nt0CLbW5HwF3zwMFn7TP6+lGun/GtytwDffA6VKIpcsqdfQXle0rWej35Jbv+t/TRV4vPP49Z cyYnyniEZZzVm0A== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Allocate the memory with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/soundwire/debugfs.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/soundwire/debugfs.c b/drivers/soundwire/debugfs.c index 6d253d69871d..c30f571934ee 100644 --- a/drivers/soundwire/debugfs.c +++ b/drivers/soundwire/debugfs.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only // Copyright(c) 2017-2019 Intel Corporation. =20 +#include #include #include #include @@ -49,18 +50,16 @@ static ssize_t sdw_sprintf(struct sdw_slave *slave, static int sdw_slave_reg_show(struct seq_file *s_file, void *data) { struct sdw_slave *slave =3D s_file->private; - char *buf; ssize_t ret; int i, j; =20 - buf =3D kzalloc(RD_BUF, GFP_KERNEL); + char *buf __free(kfree) =3D kzalloc(RD_BUF, GFP_KERNEL); if (!buf) return -ENOMEM; =20 ret =3D pm_runtime_get_sync(&slave->dev); if (ret < 0 && ret !=3D -EACCES) { pm_runtime_put_noidle(&slave->dev); - kfree(buf); return ret; } =20 @@ -132,8 +131,6 @@ static int sdw_slave_reg_show(struct seq_file *s_file, = void *data) pm_runtime_mark_last_busy(&slave->dev); pm_runtime_put(&slave->dev); =20 - kfree(buf); - return 0; } DEFINE_SHOW_ATTRIBUTE(sdw_slave_reg); --=20 2.43.0