From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (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 688CD35F18A for ; Thu, 21 May 2026 08:35:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779352544; cv=none; b=fC3ucTHlLjswW0RM0zWlaGefM/w4fY8q8XDiUFn7HhBxlue++KsuQlWwhqyTHvJSzabeIwR21yOHQ4wsxZOZ7qGTac3Z/QR/16W2JkZMBk67U6gFdZUOaCRPRG2MN6xC566Uw+UBSNhunCf3ADfu0dAxLMnPiXYIv+lJ2T7R7lE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779352544; c=relaxed/simple; bh=ZIBqVu48Sz4Y6VXLaWmf1G3Q9+5Gz36/KsTgbXSfNNs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c+Wd0stkVj5i9d3c4W6ZQrvGqF8mQBp/irNVpO7Om7LuiXDKlIeIUAO757hgKn19V4177FaOY/CMq0xWd4y4iOrn+JBf6rwMU+DoHha/cKVZPplhJDqxt/+sUFh30wNbyq5dO0zE7ped9gXXl3N/JFbUXg6uLp/vcGdxI07i/H4= 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=bVGesbne; arc=none smtp.client-ip=209.85.208.172 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="bVGesbne" Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-393a49d2e5eso53014601fa.2 for ; Thu, 21 May 2026 01:35:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779352530; x=1779957330; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eDHRIt+Xzwup3rn7oBseYJ+pZthdkwsUcMhMoWoBRnE=; b=bVGesbneaOdkI+UVYx9Yv2xeftS6grryu9Mz0Tj8yiQFB3BbpJsxBS7irSZVxKdnM/ FIVt4lMhns0yAVISleT2dpoLk94LSDvj7QY3pKFzbTo4VDsVWWI35VJbTDznh3sM41BX QNvA0L8mor51ZlDgcJkvo7C6F0lhyc3ltd/JT5ziMVAg9nkSsaBYncAWK7+GBABDGIh9 GyQgANd3NDeoGpxiGcM6Im2l6tmZE4hmoeB7UyYy60xRP4hNFjbprQH9CWD7e+f52QNL A/7AGr0yqIyEIrAcJdudqO2KNTXFlfC8vuGluCdm+rVp0iuqWfKRf+8FWKwcldZfUQsz gbDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779352530; x=1779957330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eDHRIt+Xzwup3rn7oBseYJ+pZthdkwsUcMhMoWoBRnE=; b=AXOe11iKmhU8SWBpBIxwCP2NZigSEGTZCEFEDMi1BPRhcSnJYb0q3ux3F12XYyJWoQ Ko/DwvrZiKeEytM1XeN7N43h/9OxNIWMWGP7AhV/B3Jfsn2KZsTpf1SnIeidyHkbDLND 1ywjRjkhXUZzPHF7r25xRLbe5K9OAWElIJHO9Qv76C87QGlfUzbve+eRp8nvjGUd9wL0 brwtvzR+da44AtFbBiBq7Bgv3Lm2qjAfokb1bs5thPSfUlnH7VQNHkrk37qC862yhWvb qsW1S3mxZEj46WTg7bdtq4G3Yw3WtykyX+hMPmSLgZc2s2+f4gbMxefr5a05ujGPd1cE QrmQ== X-Forwarded-Encrypted: i=1; AFNElJ+ZIZaa+0kMn/gaO2jAwyQmJjlFQAb+J0QoV1NM/wf2xaUvnDIHI07QSjnNnS7qRmR6ziEqE4argo7TtIc=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1N9/bV+rB+rvOU/f7sB3WfmkIUG/3aHVE03rbyZi/7TkxhL4j ZwMxV9E551XE77FUZO3BevF/Ued4z2jQBalU84EGs6VWxHLftcNOsyZ9 X-Gm-Gg: Acq92OGE7PbrCLTAlQc65wsnK21jX3j4P0WePL+xuK3/nyL5dDkf/xleFlEC9W4NwNh /2lTkz0dZcbHCsnOkZUrhB6duFp4aFMn64Gx7XbLG4GcGjTd7lcolLkhlb/rsbZ+kG8+F08Th16 TbZT9MRKVJqkcu69Pvtthz1d2T2x1kz3TfcsxgJFm32B7+HNCWDRygmDEkZJgNx8aKQZBi0Q9RF Qw92VfdVPV//BuBIWlEKIG+9VvO6M84oORVRy8qsD59vTioTIMxTuV9vbZtKdBUA1OgTSlqdCwe 1eGouDeCk0DXO7BeZ91HRlYlGgmLGTr6EZEfasWE7tNOX03R1whRjJnfg4VUkkOJghCFFtyJRQO JaZawKFcSqy92SmamARA+ILfMX9LHfSkFDyBMTqONBgqDHLTPYbM2n0OL0Hj3rvY7faRaKiPKsZ 49dvmB2l1M1QXfn2NYztQ+EVwFWWJkgDMUug8afO2OQVPJ8r4/+2w= X-Received: by 2002:a05:651c:98b:b0:393:6480:8924 with SMTP id 38308e7fff4ca-395ca4ee2edmr7756061fa.1.1779352529733; Thu, 21 May 2026 01:35:29 -0700 (PDT) Received: from NB-6746.corp.yadro.com ([91.132.132.206]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-395d0b68afcsm917611fa.32.2026.05.21.01.35.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 01:35:28 -0700 (PDT) From: Artem Shimko To: andriy.shevchenko@intel.com, adrian.hunter@intel.com, ulfh@kernel.org, p.zabel@pengutronix.de Cc: Artem Shimko , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] mmc: sdhci-of-dwcmshc: use dev_err_probe() to simplify error paths Date: Thu, 21 May 2026 11:35:04 +0300 Message-ID: <20260521083506.356422-4-a.shimko.dev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260521083506.356422-1-a.shimko.dev@gmail.com> References: <20260521083506.356422-1-a.shimko.dev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace common pattern of dev_err() + return with dev_err_probe() in probe functions and their callees. This macro provides standardized error message format with symbolic error names and adds deferred probe debugging information. The conversion makes the code more compact and ensures consistent error logging across all initialization paths. Signed-off-by: Artem Shimko --- drivers/mmc/host/sdhci-of-dwcmshc.c | 30 +++++++++++------------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index 925fff1c0f3a..b16027f5dd8c 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -917,11 +917,9 @@ static int dwcmshc_rk35xx_init(struct device *dev, struct sdhci_host *host, return -ENOMEM; priv->reset = devm_reset_control_array_get_optional_exclusive(mmc_dev(host->mmc)); - if (IS_ERR(priv->reset)) { - err = PTR_ERR(priv->reset); - dev_err(mmc_dev(host->mmc), "failed to get reset control %d\n", err); - return err; - } + if (IS_ERR(priv->reset)) + return dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->reset), + "failed to get reset control\n"); err = dwcmshc_get_enable_other_clks(mmc_dev(host->mmc), dwc_priv, ARRAY_SIZE(clk_ids), clk_ids); @@ -1781,10 +1779,8 @@ static int eic7700_init(struct device *dev, struct sdhci_host *host, struct dwcm dwc_priv->priv = priv; ret = sdhci_eic7700_reset_init(dev, dwc_priv->priv); - if (ret) { - dev_err(dev, "failed to reset\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "failed to reset\n"); ret = dwcmshc_get_enable_other_clks(mmc_dev(host->mmc), dwc_priv, ARRAY_SIZE(clk_ids), clk_ids); @@ -1792,16 +1788,14 @@ static int eic7700_init(struct device *dev, struct sdhci_host *host, struct dwcm return ret; ret = of_parse_phandle_with_fixed_args(dev->of_node, "eswin,hsp-sp-csr", 2, 0, &args); - if (ret) { - dev_err(dev, "Fail to parse 'eswin,hsp-sp-csr' phandle (%d)\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Fail to parse 'eswin,hsp-sp-csr' phandle\n"); hsp_regmap = syscon_node_to_regmap(args.np); if (IS_ERR(hsp_regmap)) { - dev_err(dev, "Failed to get regmap for 'eswin,hsp-sp-csr'\n"); of_node_put(args.np); - return PTR_ERR(hsp_regmap); + return dev_err_probe(dev, PTR_ERR(hsp_regmap), + "Failed to get regmap for 'eswin,hsp-sp-csr'\n"); } hsp_int_status = args.args[0]; hsp_pwr_ctrl = args.args[1]; @@ -2408,10 +2402,8 @@ static int dwcmshc_probe(struct platform_device *pdev) u32 extra, caps; pltfm_data = device_get_match_data(&pdev->dev); - if (!pltfm_data) { - dev_err(&pdev->dev, "Error: No device match data found\n"); - return -ENODEV; - } + if (!pltfm_data) + return dev_err_probe(&pdev->dev, -ENODEV, "No device match data found\n"); host = sdhci_pltfm_init(pdev, &pltfm_data->pdata, sizeof(struct dwcmshc_priv)); -- 2.43.0