From mboxrd@z Thu Jan 1 00:00:00 1970 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 21EEB23A562 for ; Tue, 18 Aug 2026 22:03:16 +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=1787090598; cv=none; b=EtoyXP1//XmM9c5U9hvIxRtuqN878dSb1Pj4PoSs8SMCs9eAE8s1obR0CQD5lce9UeU4RTUt5Xy65y3cgRox2yS8f8Ca3LlKqS61PCk4bTox7jK5e6+NAOgpZok1EljXS16p7l8I7SEYaM8Ek+bTOcFZ/m2mKaY+Pw2UWhKPDCQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787090598; c=relaxed/simple; bh=2sKosG/PLs0EDAAv9rfdQuiSlXfmZpTH9sM9MaOnMag=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=E5TE+kZSTfbEazLU//vUaWjFKBssh18MBGnd23jtEZFeBAztJGhDqhoQWzyBcrS8zZ8F+e5O0S2RVHkbdfkYYEZovZVSaQxu9YDnWWwoy1cvqmWWNXWLrv6ZX1z848HLWvlLnq/uWank9QKvsCMAXJJ+bdQj8KqMmg+1o/WSY9U= 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=fhhjKy0T; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=bGZUWCTG; 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="fhhjKy0T"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bGZUWCTG" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67ILd3B82505123 for ; Tue, 18 Aug 2026 22:03:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= o2drbkgZlh4qyEDNlYRs7ZOmbKY3/yfqRkbgXttKS+c=; b=fhhjKy0TCVGLuY/l NkxJ/DkN8tjzWxF3DMTCtchQ0gyFeb4YwdxzRM52VlTe4COcHQXEbeqYNPIBwL/q tyuUpQw09Oo+RUWw5OHW0TqJnH6D+l2nudk51IaWVsMrhTcFN8W8Wn15++um54BI bvobQ1lprFSjRaN5v8SYzQ0CtoMyB0c/LFDNvL4LyTvSF0OMT4tMxj71HgGHLfWO /vTi999SA4shtDKFEOH3DWiuwdW9Un9tH3DS/r2KXVbFOrgk+d+PBV2ZhQ37kUJV JmzvZmLxmHex5tymVaJeGodWQIuoN4w0DHbWzonnYJPRdcHisPSvMEnRmiJ8lLPP YJiZlA== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g4yftr3ar-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 18 Aug 2026 22:03:16 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2d001671a54so7806455ad.2 for ; Tue, 18 Aug 2026 15:03:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1787090595; x=1787695395; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:organization :references:in-reply-to:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to:content-type; bh=o2drbkgZlh4qyEDNlYRs7ZOmbKY3/yfqRkbgXttKS+c=; b=bGZUWCTGmMvgn61dEs1Ce6+OZjs8m2DRVkJLsbF3gjXNVRCJl5DpoUFs6+NKPjgR60 NAxxDXT1Cy7B28IBfxSSWKJfXTPdEatwiFNm9tPCJxSBu/oZCe6TYr96uh6RCc06RAvN iVGFFkKWtCgLI/XijT/HNtkuulBpYy2+cZk4TA09VDJV1T9r4dkTdZPkSHXDtvBhqkcK zrmJhAqw8Hn8Yp1mzTWXsTC0wumqfSzst9wbV7kLXbn9LMWo2K4e4HDPvSmPweVTKmhf aIbs8mcDfuXskdYb3SgBrwWN7+3ZL/0NoXbnLkXDI0gTQWvED8HSKaPZbT3p4CMMYCRn +9tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787090595; x=1787695395; h=content-transfer-encoding:content-type:mime-version:organization :references:in-reply-to:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=o2drbkgZlh4qyEDNlYRs7ZOmbKY3/yfqRkbgXttKS+c=; b=fjNUDqRWlH6QXSDDxZr6mBxUOiwDqZlO4Dj4kJ1ib1O7U66UMxPeQVcTHCf9BAVnVg t9FK+b07SUzTzmKuL6pQZNNufF8hNupWW7t5DwfcSJxpr09PFOm4QV1gs4gFe+Rgb08l NODAYeZiMWiAM0sM61ycuwt0LPSqhLW4UQwr5TqsjK7DYz2np3fv8R86QzioCxFKjgjj QFVmRrTiH2CIK8byszIkUPlEbKo35WBOqISFQqvvtW++zn0+cUme7Qd2T294GgWIh2ZY uZ7ruFPZLovJ7LhNSnXAgvgRpq9/anHCN5IEevgKtEtcD8pL7mvvAZ9Sa8B7Hr1xR/nT x/4g== X-Forwarded-Encrypted: i=1; AHgh+RoqgiEsMawf/kT5rub5Ol6uq7lHWJbs9Zde2pUvKIaUR5SejgeRb33Qy7KH8qJrS5JKvRLhp7u7olPDQTA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/A0zgy1xBu1ByoXNC/ovV/ZLNDasqjLsHLSxEcJY6u3LMDIIV bdefPeU18PI45OYeDr0Pmb6jtXvZCeB9YbO0Sqtih+HOcH8ObhpvmI6pHQREtSqrOhvLVDg9rSU boYaq8awU+NKVHC2D38tHzdLxl1P8qjx7CYtZBMZUk+Fwq+YMJ2SVZd/hSS4/aAQSP1s= X-Gm-Gg: AR+sD10Mitz8rHTB2oXeATLTVS7Xvp4K7iVEJOuF49rYul2kNoOz+6oLSx/nLVPHcyY vZmuLeDktRxaHgvAUgFAkfNwNsfLLdbZVH2JK87bTIqGow957+rEcCTgzxm55Y3pl68JPtVF9Fd K3l/NKTEEtNXW9WW5Pwt1kg4iuqu4DrB667wVnH8yybw8kYBPhieXxCQvU5n6U/y3aycH2lsc6q kts3t8P9ZDOF8806dUoPjZJj3SrW4hrBcfv3d9wVTiyYbW6t2SGzDtCC+APY/nlCWb8IIuUAOeb 9DlslYXAN7LnTYDPds3rUFMeCIhAxXlf/xUiegHvAw5ljZRpfd4Mtnif90Z9xMPYN2fz+w5w8IG tfBw3jxZQs7DGrjgCqfM2ESD2FQ== X-Received: by 2002:a17:90b:39ab:b0:38e:fea2:df53 with SMTP id 98e67ed59e1d1-39580ed4567mr75876a91.4.1787090595358; Tue, 18 Aug 2026 15:03:15 -0700 (PDT) X-Received: by 2002:a17:90b:39ab:b0:38e:fea2:df53 with SMTP id 98e67ed59e1d1-39580ed4567mr75803a91.4.1787090594821; Tue, 18 Aug 2026 15:03:14 -0700 (PDT) Received: from localhost ([50.35.46.84]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1416aea2429sm269654c88.15.2026.08.18.15.03.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2026 15:03:14 -0700 (PDT) Date: Tue, 18 Aug 2026 15:03:05 -0700 From: Jonathan Cameron To: Rosen Penev Cc: linux-sound@vger.kernel.org, Vincenzo Frascino , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Michal Simek , linux-arm-kernel@lists.infradead.org (moderated list:ARM/ZYNQ ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: Re: [PATCHv3] ASoC: xilinx: formatter_pcm: use more devm in probe Message-ID: <20260818150305.00000a2d@oss.qualcomm.com> In-Reply-To: <20260814204428.37786-1-rosenp@gmail.com> References: <20260814204428.37786-1-rosenp@gmail.com> Organization: Qualcomm X-Mailer: Claws Mail 4.4.0 (GTK 3.24.51; x86_64-w64-mingw32) 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=US-ASCII Content-Transfer-Encoding: 7bit X-Authority-Analysis: v=2.4 cv=FIorAeos c=1 sm=1 tr=0 ts=6a84d6a4 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=qC1CW/w66vtJz1P9yTJxNA==:17 a=kj9zAlcOel0A:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=pGLkceISAAAA:8 a=zd2uoN0lAAAA:8 a=7CQSdrXTAAAA:8 a=b7Ee_MopkQ2dvn5odMIA:9 a=CjuIK1q_8ugA:10 a=1OuFwYUASf3TG4hYMiVC:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODE4MDE2MiBTYWx0ZWRfX5YvFWdaTKqbl M6g3gYUUICNfW1irFcTu5Qe4U35lqojlIHm/5SVDq+xqQD5Y1oS2nz45PJ8MuuowbQbt2vDS3Qu N2RmxQIfAz3Ou5qN9p+0Erq8Y0J+gW4= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODE4MDE2MiBTYWx0ZWRfX24MQsmoX2usR N71SR1ons7ma8/Y+FQqTel5n04SvwWfd5VjsLah3FNgmLZoDr3jmBSBMhUTpUzailFlscnSqjod laSzWo8gYnAhmZpe2Dg+yuTy5g1iuNoaw0tXdtqRQu7KatcPoILJo24pT9CAMeJNTVr+2d6ATWP 0bENmetPWWYRs2Mhple0UCDRWpyfGlP408ACkEt+UYS5Ts2s/0sgUN4avkiIjf4idryNP4KmP/G ktAbjVMktcxyZLhnXl81AQ0oWIX7HoKrA5aSEw8W57L+mnt1V/FASZHnIAM6nwcGQgwJD1imnWq Ub/iwA4qjg5yBeXb8sw5K1XeNOswci4bmzvyMUDG1s2YFxxW0ns2QLuVRb6i7jZtULhWRcfhwL8 HrsWV99ROaFMaJ4YUAQUQeNg2kxHesTAXBtOqhpwTaT+irgEww63FEwDzC0gnaxZVSEAqLfEOdr 8hMRSsSpSTLx4BbNpGQ== X-Proofpoint-GUID: XULL27h9fvwgcuSRZ2YgAWAepxNJKFgF X-Proofpoint-ORIG-GUID: XULL27h9fvwgcuSRZ2YgAWAepxNJKFgF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-18_04,2026-08-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 adultscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608180162 On Fri, 14 Aug 2026 13:44:28 -0700 Rosen Penev wrote: > Use devm_clk_get_enabled() to let the clock be enabled automatically > and cleaned up on unbind, dropping the manual clk_prepare_enable() and > clk_disable_unprepare() calls in probe and remove. As a result, move the > clk struct member into probe, which is the only place it's used. > > Simplify the probe error paths by returning directly instead of > jumping to clk_err, and use devm_snd_soc_register_component() return > value directly. Also remove error message from ioremap as it throws one > itself. Same with devm_request_irq(). > > Assisted-by: opencode:deepseek-v4-flash-free > Signed-off-by: Rosen Penev > Reviewed-by: Michal Simek > Reviewed-by: Vincenzo Frascino > --- > v3: rebase. > v2: add signed-off-by. Further clean up some stuff. > sound/soc/xilinx/xlnx_formatter_pcm.c | 71 ++++++++------------------- > 1 file changed, 20 insertions(+), 51 deletions(-) > > diff --git a/sound/soc/xilinx/xlnx_formatter_pcm.c b/sound/soc/xilinx/xlnx_formatter_pcm.c > index 3d6f1e4046d8..5f63fb28ea5f 100644 > --- a/sound/soc/xilinx/xlnx_formatter_pcm.c > +++ b/sound/soc/xilinx/xlnx_formatter_pcm.c > @@ -82,7 +82,6 @@ struct xlnx_pcm_drv_data { > int mm2s_irq; > struct snd_pcm_substream *play_stream; > struct snd_pcm_substream *capture_stream; > - struct clk *axi_clk; > unsigned int sysclk; > }; > > @@ -596,30 +595,19 @@ static int xlnx_formatter_pcm_probe(struct platform_device *pdev) > u32 val; > struct xlnx_pcm_drv_data *aud_drv_data; > struct device *dev = &pdev->dev; > + struct clk *axi_clk; > + > + axi_clk = devm_clk_get_enabled(dev, "s_axi_lite_aclk"); > + if (IS_ERR(axi_clk)) > + return dev_err_probe(dev, PTR_ERR(axi_clk), "failed to get s_axi_lite_aclk"); > > aud_drv_data = devm_kzalloc(dev, sizeof(*aud_drv_data), GFP_KERNEL); > if (!aud_drv_data) > return -ENOMEM; > > - aud_drv_data->axi_clk = devm_clk_get(dev, "s_axi_lite_aclk"); > - if (IS_ERR(aud_drv_data->axi_clk)) { > - ret = PTR_ERR(aud_drv_data->axi_clk); > - dev_err(dev, "failed to get s_axi_lite_aclk(%d)\n", ret); > - return ret; > - } > - ret = clk_prepare_enable(aud_drv_data->axi_clk); > - if (ret) { > - dev_err(dev, > - "failed to enable s_axi_lite_aclk(%d)\n", ret); > - return ret; > - } > - > aud_drv_data->mmio = devm_platform_ioremap_resource(pdev, 0); > - if (IS_ERR(aud_drv_data->mmio)) { > - dev_err(dev, "audio formatter ioremap failed\n"); > - ret = PTR_ERR(aud_drv_data->mmio); > - goto clk_err; > - } > + if (IS_ERR(aud_drv_data->mmio)) > + return PTR_ERR(aud_drv_data->mmio); > > val = readl(aud_drv_data->mmio + XLNX_AUD_CORE_CONFIG); > if (val & AUD_CFG_MM2S_MASK) { > @@ -628,7 +616,7 @@ static int xlnx_formatter_pcm_probe(struct platform_device *pdev) > XLNX_MM2S_OFFSET); > if (ret) { > dev_err(dev, "audio formatter reset failed\n"); > - goto clk_err; > + return ret; Why not dev_err_probe() for this one? Even though maybe deferred handling isn't useful here (I haven't checked) it still gives more compact code. > } > xlnx_formatter_disable_irqs(aud_drv_data->mmio + > XLNX_MM2S_OFFSET, .. > if (val & AUD_CFG_S2MM_MASK) { > aud_drv_data->s2mm_presence = true; > @@ -654,7 +639,7 @@ static int xlnx_formatter_pcm_probe(struct platform_device *pdev) > XLNX_S2MM_OFFSET); > if (ret) { > dev_err(dev, "audio formatter reset failed\n"); > - goto clk_err; > + return ret; As above, I'd go return dev_err_probe() everywhere you now return due to the other cleanups. > } > xlnx_formatter_disable_irqs(aud_drv_data->mmio +