From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 2D6DB3F3269 for ; Thu, 6 Aug 2026 23:38:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786059499; cv=none; b=OqI92hz+8B4mrKQ8H7jSwOG4h3YYrdkV4TI0s/rvpB8E10YUYSbMF7h4LRdaUr29fChYYJIOLWOOADc/PLOgXqf/vm8n/dnmmIHRIJiBcCIseqnKrHLCGt0rolrlGp/i2FPbzN3BLHlsCk6QKGC8yAwcgOwBd2s+jfS9fogbF+E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786059499; c=relaxed/simple; bh=CkeARuSXF1tZzTFlBNnlyhGKb0BOX72GkpP8uBfRv04=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=AV9QYCm6HpqfiF2RhTelDqIldyDnQ+x9JEBugunmvaXgXUo7QzShDvjDUQSis0SKIBBWmeo+oPtJ332Li+GMxkBBHFYoYckdrzS7SJ8UvXwDj/5PSGgaLDcX0t3cSILUIEOnBi4cl8mZKEg1t5b0qHB+avONE3Nw6P9pRHWgRao= 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=C+6muN4J; arc=none smtp.client-ip=209.85.214.171 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="C+6muN4J" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2d01663d816so25093215ad.1 for ; Thu, 06 Aug 2026 16:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786059496; x=1786664296; 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=hw1ZFxLKa2lyCMPhsVdiZhdCA+z9r+BreiBYhz8zEqE=; b=C+6muN4JESrL2LE2Ai8adm01dEB961ErxyPa6GB7Xu1xJSUwX3GM4hmee1sX5Njqd7 mc+K84OTmNK5q4xAJEk2CNBrVEvXVfSGIu4arghyIgDlxVJUdBUSHilvnWikZsUoGb0v JZoPm1scUN/cWDtfwkn9b9dpLaSWcwti2z9nX8vk7QSEkExFF3HS0RtQ3yFjewHWQL1b uFLlEAhmqXZpxLEOcmRLN3P+mDk7I3UjWtRon6P1Xanct5Um9UlCZjTe46NbKGkTPCwV fe1sKXoC2MSVuAqlMU8VvRXhFY8VZpTDiDbC5J6E1BknSlkq1XKhK3I+n275KQ3cBSqy Etsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786059496; x=1786664296; 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=hw1ZFxLKa2lyCMPhsVdiZhdCA+z9r+BreiBYhz8zEqE=; b=nLxB3BU5rr6gQJll2WUug1RlYG6b3gJHbiC9OVpnm5dvolN55DHZsb/IPnmtpCZK2+ 3vy97DMaO5LDA22Y2+0abwunxlTuAas/FMoyRRUYMKQZQMIrbbDar6pEyVXcQsBMdHhO EiTlz13e0tPw6PRGlMz5+UNyHmfJ3kNFxBZ1+PjFqbJvk8hQvk4Dvcvz+42h3Sx1EJdj 1YB4IE99ZDzwMtRu3Qr9XuE6qSThVm5bUcffb3ZMfBdTiiGwX5Uw6Fr8n+HWmI6niB4t dBdwPIvJAeJeZYA6vtcOQzNTD67IIFxlzEw/VUCUh/1o5ReQhrNB0r7r3sDRu4rbbnLg 1jKA== X-Forwarded-Encrypted: i=1; AHgh+RrxoGUhovklOzfhIhCUe1tpjrtxabtC7xaehL6LwchP8zb3RGMoCZXlyLTAzeqbTsZER6wqfwkp8HCiUXU=@vger.kernel.org X-Gm-Message-State: AOJu0YzJC/jNuKqMG0vvC0pTC3EsCLGfVZcj+4NDZqHDT62uidRL9Z28 +EV1+hMPKc03zX3lB4yB11zuRMHd5qh1lpq8FoCcYjWv6xhbT0N47Dxg X-Gm-Gg: AR+sD11nczQexGJ1vnFSSj2hp5aCu5qszggvCLwXIpceN/VXO2VdsJu3ZRuOU2iVTBR p0nReVf7ZDUA9/nzcYOa+kL95WlpjpDb63fTUCUyRF2QZ5ln8YA0FpSQO7Nkz7L1qi7Z2fj6Kjd qTNhlO2NDjUUlK8P7HGNaZT5wHo6ZIhKVv/QprZ4Vx2uqGRm+y4MJVvZuXJCXyMvdxgizKh1J6f QPgdRAwLmGK7r2UmRUpcxMtP0RRNtyjPhvmUhVpAGgTI9iFNiKdjQIEXEG698KnMjt7/DVRH9T8 CGMhbyJxsgRDXMqzNGWXkfbIjhSzmvNbRiQYMFlV/vagRpF+sTE1BmGaasEl+zbMfsC/JX8cT6Q 7gUWlCR/07OLnerFewg6esEIqzT9nCAIl5HoeXn/x8xwGHTUdh05GLdQ8CtbGt10ulIqtGLMARV DTBSxaKbgeUOgFJyuV3n3NGOZA2W1VknVu2OK9upO4HEEwAhfobbOmXPE957CKm4JNONATShZ6H SXOqUqMmeE+MdgBCjLej+ny/Jd1BOSG+K4ecn2kRyPEcrpNKElUdMqvBZB4r3vlqZbKvmsoQOcu aW9PixxebUFSCw7hdFM6UhUF8KfCt4zH4eVofN+eEY6ND95q X-Received: by 2002:a17:902:dac9:b0:2cc:777f:d67c with SMTP id d9443c01a7336-2d106da916bmr50227695ad.13.1786059496507; Thu, 06 Aug 2026 16:38:16 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d16c4e7e7dsm1022865ad.73.2026.08.06.16.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2026 16:38:15 -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: [PATCH] ASoC: xilinx: formatter_pcm: use devm_clk_get_enabled and simplify probe Date: Thu, 6 Aug 2026 16:38:12 -0700 Message-ID: <20260806233812.31851-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. Simplify the probe error paths by returning directly instead of jumping to clk_err, and use devm_snd_soc_register_component() return value directly. Assisted-by: opencode:deepseek-v4-flash-free --- sound/soc/xilinx/xlnx_formatter_pcm.c | 47 ++++++++------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/sound/soc/xilinx/xlnx_formatter_pcm.c b/sound/soc/xilinx/xlnx_formatter_pcm.c index b50306b0fc06..948bc604738a 100644 --- a/sound/soc/xilinx/xlnx_formatter_pcm.c +++ b/sound/soc/xilinx/xlnx_formatter_pcm.c @@ -593,24 +593,17 @@ static int xlnx_formatter_pcm_probe(struct platform_device *pdev) if (!aud_drv_data) return -ENOMEM; - aud_drv_data->axi_clk = devm_clk_get(dev, "s_axi_lite_aclk"); + aud_drv_data->axi_clk = devm_clk_get_enabled(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; + return PTR_ERR(aud_drv_data->mmio); } val = readl(aud_drv_data->mmio + XLNX_AUD_CORE_CONFIG); @@ -620,7 +613,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; } xlnx_formatter_disable_irqs(aud_drv_data->mmio + XLNX_MM2S_OFFSET, @@ -628,16 +621,15 @@ static int xlnx_formatter_pcm_probe(struct platform_device *pdev) 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; + return ret; } } if (val & AUD_CFG_S2MM_MASK) { @@ -646,7 +638,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; } xlnx_formatter_disable_irqs(aud_drv_data->mmio + XLNX_S2MM_OFFSET, @@ -654,34 +646,23 @@ static int xlnx_formatter_pcm_probe(struct platform_device *pdev) 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; + return ret; } } dev_set_drvdata(dev, aud_drv_data); - ret = devm_snd_soc_register_component(dev, &xlnx_asoc_component, + return 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; } static void xlnx_formatter_pcm_remove(struct platform_device *pdev) @@ -698,8 +679,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