From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 594D53932D3 for ; Thu, 9 Jul 2026 04:38:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783571912; cv=none; b=d2XXG43BS+4fUH4ZlGDVRVeZFVcbSaQoyotzVTBFNpncG/ThcrHbwq4iwR+s0eLbYfYU8Qrdj+1dqy8Ba1ThhpOTHZ8yMdVpxtxLq96UInQ63m9XTLxaTdx08RpJrGZaVWptK8mD0ok8tXeDPyxE4SM6S1ufpV6aE8a1ZtrZ3Lw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783571912; c=relaxed/simple; bh=R3OYSqMEnbeucxsybCNB089VCe8vIWs+6pC86MXQits=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ESOJOn+/2cIaC818Z6QE9GizlL/Gu5LZ53j1/cnqaiXKYHLQV/qkUEYjG44Mg5/CYtpYxT+VWytC8gPNrNxv9LUuQRPZOoEgm0m8jcWqv/msuuqZvhWjs57zTlKmMRC7+vJZ6AM0wz1a5xUy3Jv3x5Qll5jaeraE2W89MfJlDH4= 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=KW4Y5Q7Z; arc=none smtp.client-ip=209.85.214.182 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="KW4Y5Q7Z" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2cac59f8b64so17000565ad.0 for ; Wed, 08 Jul 2026 21:38:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783571911; x=1784176711; 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=Qi0KD4VU/u6N1TW91fgVF43rWN+CrXef747lf/eDsU8=; b=KW4Y5Q7ZP7ayUQobatHbHABYw0Q4akmxXLV6VMHijWyAfYbymetmP4zAcrnoek4gPw DbVYQHp+AUa4qI36RK7Koblss9/9gLxz43ohs/PWo/rPyO/8r2EgVqhv7lUNgPna1oPz eii90LeWQqY+ItAtlwbmKK9R5LoQKsUj5niW20dKVAEnTihbbChVe6VBMmZHREnRKqsg gLdpoTqvRuKYvrK2TgU4apnyPG9Wo+V4w52MzYfVMPks5v3E7eH9YmqduUlX7VF8Df6z 2ulDicfhDWbSmzld/0m6ZbbBpk1waOvJgXSQzbVOAkr5AaVUiku0czE8ibvvIVHPLtGL siIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783571911; x=1784176711; 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=Qi0KD4VU/u6N1TW91fgVF43rWN+CrXef747lf/eDsU8=; b=lh61ac495pLyvi3FsBsfiplOGoQtLww/2RndQTzHHP8sSHVSdm2Jl0uC/E5r3cPm8/ KPiljnUePUGdQOYPoB0u0Y7yo9chyetyH9wfIMQzFmBR4AoOGBMK9nPPaHrvXSjxGQLb JfJPGR53RUgFOwp0qGExZFiq1QmIuz9LPetqAB6wcBoBSX9WjjdpHCnxDQ8bKOqeY6di CeZRUZmnIqP0UQ0b4tL6rZjttGuOIxxuVO8Ml7QamsOM0A/IdajjSeXvm3uWeRjdNmZt q4L/xZ3loSdtAmQwN23zi2xGq2WjcoB9kxrGs1+uIoHH9vrT7VAmvWnegLQANsbrIpKz MFSA== X-Forwarded-Encrypted: i=1; AHgh+RoVZbVjntoJNRWbWKEiDTZLGBDvtapc4Jk3oaJmY3146Ae+kARExiUEwIstkVN62+kOEKvCmk7s/VWLjSg=@vger.kernel.org X-Gm-Message-State: AOJu0YzN8Xqnhd7Bm522PFElBSq2mezSMl2S1RdkUYF+rcSpiVpwcN3F jksecOQLoCiP0Jds0AbITX0C2Jg6klyanJ/1W/kajpRcGipI4zFOYEkP X-Gm-Gg: AfdE7cl6oF+/hrjVheLCCGSyKgTxRUQLiTuY6c1yk5dAH9Iduc/O3quugZjTWlmkoo7 bXvMdLcU3Vb5ojR2ui6ikFXu5S+x6hq+MMiRsOq70bD1R9Jiy4YytEdm/c0atALm+4n5/oGekaM F5TK4nFPnY7TalgtNZ6azgj6ld96ZqayJCHn/5hWefT2wYrzMDwPtUGP2MlOcB3st7DO1iNqiZF fdqDl8r+kCbE/Y+XU+AKJoJFmftY5Zpt0n+2sEmdX3aOn9vHFiFlbg4QsL0ww7P1tDta11HoC+/ ak1Uim7EL9UhrKHjzgTWalBPucvVZthyvooZaVUa7/+G3N4YKd2l9RnYNkebfcJehsasxZ+HPOA QGgd8YNIRPdW+rlZjbICukX39D7xLYngL3oeNGBmvfm3u1TQK3JC2NBoJHE6BxztxOxEyY1K/po lF0ow9GGsKM3TFybMBUPrI6vCtjUcrMDCnMGBaPAzPvnIrvwc= X-Received: by 2002:a17:903:2447:b0:2c9:97a8:afe7 with SMTP id d9443c01a7336-2ccea3cb09amr60107985ad.42.1783571910714; Wed, 08 Jul 2026 21:38:30 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3c99fsm37033815ad.68.2026.07.08.21.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 21:38:30 -0700 (PDT) From: phucduc.bui@gmail.com To: Max Filippov , Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH v2] ASoC: xtensa: Use dev_err_probe() and drop redundant error handling Date: Thu, 9 Jul 2026 11:37:40 +0700 Message-ID: <20260709043740.329504-1-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.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 From: bui duc phuc Convert error paths with messages to dev_err_probe(), which combines dev_err() and the return statement while also handling -EPROBE_DEFER for the clock path. Remove the redundant "err:" label and return errors directly. Paths such as platform_get_irq() already log failures in the callee, so they simply return the error code without printing an additional message. Inline the pm_runtime_disable() cleanup at its only call site. No functional change. Signed-off-by: bui duc phuc --- sound/soc/xtensa/xtfpga-i2s.c | 60 +++++++++++++---------------------- 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/sound/soc/xtensa/xtfpga-i2s.c b/sound/soc/xtensa/xtfpga-i2s.c index 9ad86c54e3ea..fd0990201b40 100644 --- a/sound/soc/xtensa/xtfpga-i2s.c +++ b/sound/soc/xtensa/xtfpga-i2s.c @@ -533,34 +533,25 @@ static int xtfpga_i2s_probe(struct platform_device *pdev) int err, irq; i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL); - if (!i2s) { - err = -ENOMEM; - goto err; - } + if (!i2s) + return -ENOMEM; + platform_set_drvdata(pdev, i2s); i2s->dev = &pdev->dev; dev_dbg(&pdev->dev, "dev: %p, i2s: %p\n", &pdev->dev, i2s); i2s->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(i2s->regs)) { - err = PTR_ERR(i2s->regs); - goto err; - } + if (IS_ERR(i2s->regs)) + return PTR_ERR(i2s->regs); i2s->regmap = devm_regmap_init_mmio(&pdev->dev, i2s->regs, &xtfpga_i2s_regmap_config); - if (IS_ERR(i2s->regmap)) { - dev_err(&pdev->dev, "regmap init failed\n"); - err = PTR_ERR(i2s->regmap); - goto err; - } + if (IS_ERR(i2s->regmap)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2s->regmap), "regmap init failed\n"); i2s->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(i2s->clk)) { - dev_err(&pdev->dev, "couldn't get clock\n"); - err = PTR_ERR(i2s->clk); - goto err; - } + if (IS_ERR(i2s->clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2s->clk), "couldn't get clock\n"); regmap_write(i2s->regmap, XTFPGA_I2S_CONFIG, (0x1 << XTFPGA_I2S_CONFIG_CHANNEL_BASE)); @@ -568,41 +559,34 @@ static int xtfpga_i2s_probe(struct platform_device *pdev) regmap_write(i2s->regmap, XTFPGA_I2S_INT_MASK, XTFPGA_I2S_INT_UNDERRUN); irq = platform_get_irq(pdev, 0); - if (irq < 0) { - err = irq; - goto err; - } + if (irq < 0) + return irq; + err = devm_request_threaded_irq(&pdev->dev, irq, NULL, xtfpga_i2s_threaded_irq_handler, IRQF_SHARED | IRQF_ONESHOT, pdev->name, i2s); - if (err < 0) { - dev_err(&pdev->dev, "request_irq failed\n"); - goto err; - } + if (err < 0) + return err; err = devm_snd_soc_register_component(&pdev->dev, &xtfpga_i2s_component, xtfpga_i2s_dai, ARRAY_SIZE(xtfpga_i2s_dai)); - if (err < 0) { - dev_err(&pdev->dev, "couldn't register component\n"); - goto err; - } + if (err < 0) + return err; + pm_runtime_enable(&pdev->dev); if (!pm_runtime_enabled(&pdev->dev)) { err = xtfpga_i2s_runtime_resume(&pdev->dev); - if (err) - goto err_pm_disable; + if (err) { + pm_runtime_disable(&pdev->dev); + return err; + } } - return 0; -err_pm_disable: - pm_runtime_disable(&pdev->dev); -err: - dev_err(&pdev->dev, "%s: err = %d\n", __func__, err); - return err; + return 0; } static void xtfpga_i2s_remove(struct platform_device *pdev) -- 2.43.0