From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.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 E12583603FB for ; Sun, 23 Aug 2026 05:00:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787461216; cv=none; b=FS54+3cLbItPbXEvjwhl+mpTbwCeT14Or7g7HOwZL+TzYOqUlD2QkK6K3UJg796ZpemlOwlqvPVzObH29zX7u2Ay3ZtXaz1dCJFsE7EigwWHEMABJD+AI4rNcUzgpowddt2xu5TB/v5txFKFoVW5B5Buqd7KJyZyq/Cd6l/Gjds= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787461216; c=relaxed/simple; bh=3twbRfnqX/9P5GZJs6Qn0AGe+X2EOr8qTXEIjGv0jLc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=u+HOgy16TkWAIoI6ovpnIbTmWMbkV6NeTK3EUUKetP+1HxFxUexPcEFCgyg6IcrGC5vyBsY7bihheTTpntgQL95xG3qyv2lUnZJ8itDVm5p+aHPqqasEKNHnVQ3upuooPoB9BM9BJ8pKY3F9wT49hWwgVMBJWgDtlm8RfecPr4U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GbqWm1y+; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GbqWm1y+" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-38a0c7e841fso3178003a91.2 for ; Sat, 22 Aug 2026 22:00:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787461214; x=1788066014; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=LHlqmGMbfsxtCYIUcQEVll9m/OkCwVr2FmGex2YgLq0=; b=GbqWm1y+vMy0uQXkIVOyGw2fVjWiJ+Ey4FPGUju7VRtheRaxtA5+5ILQFrhAZnnuwL SDw12Ksx1StxS9+48jRzhwnr2c61CTJvAs9w9ELJ4m/Wd7YMIcNS7y/j0AmGa9nkvl37 kUffPAPG9lIBUTZS+Ox9N+5xdmwCXvHMRzjFdo4E+0QNyk2CKi49ZgQyq3oys5osD2bg 3XjgOkeZHayrnd7QkbttOP2i55ZzOeJSk+Q/y0/WYwWXhO91ffwYf+wmI/1A8QlCf4HC cNvHovoAe9fdUB/wwjl7VT2I0JGRfsWL4b6KxYmll6n6Yd/Y/J/pKSPIqHiHmA3N4sT1 5eZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787461214; x=1788066014; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=LHlqmGMbfsxtCYIUcQEVll9m/OkCwVr2FmGex2YgLq0=; b=EXdzXXFq/ZsFugIZnOi1wDOk1n8OZ23ONAN8ORz4vffUlUmG2Etx+v2iFLUQISNUcr 84qrrFvVzacIQLFXKI0P5sushpxbSidcWWdp5NeVmKshPe4BtvWLS0AYLmnAgF+1PKs7 shQqLoK60nQYVtC9p842gQcEbT7TfwLuICI2Pv0dmTxtYgliWPa4DY5gUpnkWM5yOe+P kzojruZ1iUj13cmNZaZjPao4WLzzH0EjJl22Eqv26rxc/bMw/WrG9izv6Q5z4pu1HZym ePzoXSG/wUwVamac3t6NlgdbMwT9Wk8egrt7xR70yYBV24sVdEJuCciae2DeAd7A/bb6 +zCA== X-Forwarded-Encrypted: i=1; AHgh+RqbpvIYNcuNJuzMu8pRuJHWi9quGf0o7VuPZHPfvTKsd674TgV7DE6YExfYrlotAL7NRXmDeK2MGPnLtLw=@vger.kernel.org X-Gm-Message-State: AFuF++mMfGhqU+ndd/ogzMTKTg15a8kGpUQwpV3EMCMMUyoR+IyKS1dV oXQqHzm2PRPjay/qTKPqATzUs3dWp8ZMsWEoocpmNOwuK+g2uC94ymFwAPqlAg== X-Gm-Gg: AR+sD10KxJHpWUzqUdtbqTH+tUpZKideX/S7S7ZUodNjqUhgJDXg7kUq0fYlOiJvC8U 5bRnp1T/v4YM9LLvcBjY+n3PfgZYe0lbzLnOBC7yDTjTDhwLpNEXSrR+9irpp87FrROLPfutJfw zIgYlpnZFJe4lX6CzLktsZfQnYGOhXLRqKM8Troc5z5YXctWOrzPYhiRtralXtoQZU6KU4KZsBd 1WLqZMKqimHhWgo2C9HPo4R5Kv5cPyvNVvf3jPj7S4LpCrJNoaE0Je52jl9ktjSjljTRbCAJFuH ZwgMNMqC48AaJ4zJrEaIQJYQWqxGXneZ7wiMAgJspai6BCHrdbMSvRZ4B8ajsogG5tmv2HLEBky +JMAt4uIocO1FKltlk/ww18DBOmXzSRCF6kYbfDLfhiYPTLPOwxn2pdqYqr5XIooyyltKz8PjRE AnJUe6DeL2kng7WEwtexAMWOhvrB9wZWHJ3vqyND+wZkm/KjDZRfhTR5qIfWVtR3GBpuLUdYr4D 4ZtutoqPxkf6HIr/XXaKTKeSz524OVHrC33p4ngBElICOPR/S4VL4GMYVWoV3Hf3TdryY4hMXso kKwIc5IhOZGfSWoFBEnhWu8NQ8PZakl+RPRy5g== X-Received: by 2002:a17:90b:3c84:b0:390:b41a:b92b with SMTP id 98e67ed59e1d1-395c3542369mr34039656a91.4.1787461214151; Sat, 22 Aug 2026 22:00:14 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-395c9128498sm2813642a91.2.2026.08.22.22.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Aug 2026 22:00:13 -0700 (PDT) From: Rosen Penev To: linux-sound@vger.kernel.org Cc: 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: [PATCHv4] ASoC: xilinx: formatter_pcm: use more devm in probe Date: Sat, 22 Aug 2026 22:00:12 -0700 Message-ID: <20260823050012.17067-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- v4: use dev_err_probe v3: rebase. v2: add signed-off-by. Further clean up some stuff. sound/soc/xilinx/xlnx_formatter_pcm.c | 79 ++++++++------------------- 1 file changed, 22 insertions(+), 57 deletions(-) diff --git a/sound/soc/xilinx/xlnx_formatter_pcm.c b/sound/soc/xilinx/xlnx_formatter_pcm.c index 95312b4ddc5b..3c321c19f829 100644 --- a/sound/soc/xilinx/xlnx_formatter_pcm.c +++ b/sound/soc/xilinx/xlnx_formatter_pcm.c @@ -81,7 +81,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; }; @@ -595,100 +594,68 @@ 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) { aud_drv_data->mm2s_presence = true; ret = xlnx_formatter_pcm_reset(aud_drv_data->mmio + XLNX_MM2S_OFFSET); - if (ret) { - dev_err(dev, "audio formatter reset failed\n"); - goto clk_err; - } + if (ret) + return dev_err_probe(dev, ret, "audio formatter reset failed\n"); xlnx_formatter_disable_irqs(aud_drv_data->mmio + XLNX_MM2S_OFFSET, SNDRV_PCM_STREAM_PLAYBACK); aud_drv_data->mm2s_irq = platform_get_irq_byname(pdev, "irq_mm2s"); - if (aud_drv_data->mm2s_irq < 0) { - ret = aud_drv_data->mm2s_irq; - goto clk_err; - } + if (aud_drv_data->mm2s_irq < 0) + return aud_drv_data->mm2s_irq; + ret = devm_request_irq(dev, aud_drv_data->mm2s_irq, xlnx_mm2s_irq_handler, 0, "xlnx_formatter_pcm_mm2s_irq", aud_drv_data); - if (ret) { - dev_err(dev, "xlnx audio mm2s irq request failed\n"); - goto clk_err; - } + if (ret) + return ret; } if (val & AUD_CFG_S2MM_MASK) { aud_drv_data->s2mm_presence = true; ret = xlnx_formatter_pcm_reset(aud_drv_data->mmio + XLNX_S2MM_OFFSET); - if (ret) { - dev_err(dev, "audio formatter reset failed\n"); - goto clk_err; - } + if (ret) + return dev_err_probe(dev, "audio formatter reset failed\n"); xlnx_formatter_disable_irqs(aud_drv_data->mmio + XLNX_S2MM_OFFSET, SNDRV_PCM_STREAM_CAPTURE); aud_drv_data->s2mm_irq = platform_get_irq_byname(pdev, "irq_s2mm"); - if (aud_drv_data->s2mm_irq < 0) { - ret = aud_drv_data->s2mm_irq; - goto clk_err; - } + if (aud_drv_data->s2mm_irq < 0) + return aud_drv_data->s2mm_irq; + ret = devm_request_irq(dev, aud_drv_data->s2mm_irq, xlnx_s2mm_irq_handler, 0, "xlnx_formatter_pcm_s2mm_irq", aud_drv_data); - if (ret) { - dev_err(dev, "xlnx audio s2mm irq request failed\n"); - goto clk_err; - } + if (ret) + return ret; } dev_set_drvdata(dev, aud_drv_data); - ret = devm_snd_soc_register_component(dev, &xlnx_asoc_component, - NULL, 0); - if (ret) { - dev_err(dev, "pcm platform device register failed\n"); - goto clk_err; - } - - return 0; - -clk_err: - clk_disable_unprepare(aud_drv_data->axi_clk); - return ret; + return devm_snd_soc_register_component(dev, &xlnx_asoc_component, NULL, 0); } static void xlnx_formatter_pcm_remove(struct platform_device *pdev) @@ -705,8 +672,6 @@ static void xlnx_formatter_pcm_remove(struct platform_device *pdev) if (ret) dev_err(&pdev->dev, "audio formatter reset failed\n"); - - clk_disable_unprepare(adata->axi_clk); } static const struct of_device_id xlnx_formatter_pcm_of_match[] = { -- 2.55.0