From nobody Sun May 24 21:37:02 2026 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (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 8A862361DBA for ; Thu, 21 May 2026 08:35:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779352529; cv=none; b=nDNIIxNBfPdwnKXOW2WIiHiNr/2+8qnvGwXNmTQGZK9VCn7R5n6saof+DrODDaSJTkuxJd0cZJvlt90ttj41cwpFMD6f904x3v9OSUGospRKq3FuuePxdNuGbMIh/oqr4cZjlPoF6XOLmE/PAsbo9PEePHmiK+yzUHueAGCny/M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779352529; c=relaxed/simple; bh=Q+haSKFB1SdpIbkH4xTiI2J7bQfg7b5S9UPBCsuRI/U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nVZsMLnlWkhurrfLxzl/XPzouR4c1BcFOyIEqoDzzcHkJRbZKhlUNiyXaBOAKZgPRbcnIjsK7Zk6t//UA2sPRf+zK1HN7tFcNCmFzkkMT62+/kJyHXDIEzHSUAHELuJ12wAex8DYY+uJ4Nf0iYLPRbkVX6Eh9vOPS+hdOO6QG4o= 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=OR9Bqo4q; arc=none smtp.client-ip=209.85.208.180 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="OR9Bqo4q" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-39378db197aso61559171fa.3 for ; Thu, 21 May 2026 01:35:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779352523; x=1779957323; 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=mCn2qEYWfhjJsuia41fA60ypMxY8rzylIJyZCEZboB4=; b=OR9Bqo4qnnsjb+aAe9c91SGtyL/10tIWalPgiWRe3BfhiDGSAtvH+JqIKSHcBVHjwi PfYcvb4qqF/lms26EhlpxyryR/QvFhmvLpXAK3M5vNbM2CTDRPk8hVeYZr59NbhzQRFk QI+AJaNADGtTzOhd16lDXSAIMEto+cXJQ5Gy7e+gmb7r3oWGh/WQaHHtl9VQvtJluPgG kHiZfVH48zFu3NrouAbOwcs+UIkuJ5bkTL7ZgLcnkfXoNIcrZkbJWznpVM7mfM69ldFD cdvI3orJgIBzzZMn1GA9RdHH6NYw0+tKdxb8hQ7WNyrRjGihBPU1qzj02fcosid8/rZd yiSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779352523; x=1779957323; 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=mCn2qEYWfhjJsuia41fA60ypMxY8rzylIJyZCEZboB4=; b=IjuZai84Zy/gN7/4IC+wd4KHX6jvhAuXoMZ37WXCjI85g8ib1zMCP1c/rfc7pSiAOF Nnj6EV0Qgct/QfAfn87QNgNH7yvpu6dAT9B0PX4gH4OnvAuS3hWnRXGVlmRoNlcB6uEu giNI9gyusr9msKxNg8h4a/QkmFaC1c++mDv8XJWyUkuAqhfs/rDpDBI9oAVSFxnmMxPX ChViC422ZC7p66RRn8PfTkJ/UweXucNG+PEsVWCc/NZlAaMCRO5K06WwNSYO9XJPAljD qvojelVAoRtZsClDmKeyV0GyJno4A7JPabqBVnx0NtzngSYFhubwvqICQVYwY3fgnHdz +cXg== X-Forwarded-Encrypted: i=1; AFNElJ/l/9Q7On1ihtWnq8AQfptswrG2Eie2d+M69Zxmwf2GncSYTVUq/779IMDYLEbKXmrs/G/tKA6XA6XUzb0=@vger.kernel.org X-Gm-Message-State: AOJu0YzdQnZZPfNmRkdmtNq6+sY0RyU200FETPTGlZZjmH1N20PVtjfy v4zPdfs1FLFdF1/34MUJvxvkhTZioFN89KrQksF5XnJKP+8bLjnJHLr1GZzu1Q== X-Gm-Gg: Acq92OE6YnJ7oij6CXQsfe7jG+cBsOuUL/FCxfdBVpLnXn/QdUDvpnB/7gQu7Sm57VF sGmMesslTC/fbDVcoROcsHVfDJM6uyiHTCO/iH9cuesw6Hz9bTicrgXKqANRfCzIQjH7gLdUXIY Zq1jPDYGMp8J63BBc9O7uSadw1xQzwcaK1UbeR4CtvJGJ20hjVW5eV/KhXygGoNW6umaX/VGxWN zs4Ktmmgx3x2i2tUmMoqAsPAADHYufghyx4znm0KP5yxZGD1/tWwILjgwWL7RI04AU4G5Nqd/Dl B4J+c9x/clZnASDgIJ3MThnYmJN76u+s82wgEkPatGXOPmeNyzVyUyPBapmbngoMCKW6u8HrKu6 Et9bK56uHmlXFbBee5eP3c7ds49Tnk8COWvD4idNXKmfRh5JbxZBM/O3b8BULdw/iMivOljXvw6 X9p/LpXoc2qzMm4Q3b74ceztGfPanEHIdWPh/dr2Kx X-Received: by 2002:a2e:a582:0:b0:395:b668:44b6 with SMTP id 38308e7fff4ca-395ca24eeb4mr7281861fa.4.1779352519360; Thu, 21 May 2026 01:35:19 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 01:35:17 -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 1/3] mmc: sdhci-of-dwcmshc: improve delay and sleep handling with fsleep() Date: Thu, 21 May 2026 11:35:02 +0300 Message-ID: <20260521083506.356422-2-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: quoted-printable Content-Type: text/plain; charset="utf-8" Replace usleep_range() and udelay(1) (for consistency) with fsleep() in several places to follow kernel documentation recommendation [1] of using fsleep() for delays in non-atomic contexts. The fsleep() function automatically selects the optimal delay mechanism: udelay() for delays <=3D 10 us, usleep_range() for 10-20000 us, and msleep() for longer delays. This makes the code more consistent and simplifies future adjustments if delay durations ever change. [1] https://docs.kernel.org/timers/delay_sleep_functions.html Signed-off-by: Artem Shimko --- drivers/mmc/host/sdhci-of-dwcmshc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-o= f-dwcmshc.c index 0b2158a7e409..4cccd6e42e60 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -816,7 +816,7 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host = *host, unsigned int clock =20 /* Reset DLL */ sdhci_writel(host, BIT(1), DWCMSHC_EMMC_DLL_CTRL); - udelay(1); + fsleep(1); sdhci_writel(host, 0x0, DWCMSHC_EMMC_DLL_CTRL); =20 /* @@ -895,7 +895,7 @@ static void rk35xx_sdhci_reset(struct sdhci_host *host,= u8 mask) =20 if (mask & SDHCI_RESET_ALL && priv->reset) { reset_control_assert(priv->reset); - udelay(1); + fsleep(1); reset_control_deassert(priv->reset); } =20 @@ -1136,7 +1136,7 @@ static void cv18xx_sdhci_set_tap(struct sdhci_host *h= ost, int tap) =20 clk |=3D SDHCI_CLOCK_CARD_EN; sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); - usleep_range(1000, 2000); + fsleep(1500); } =20 static int cv18xx_retry_tuning(struct mmc_host *mmc, u32 opcode, int *cmd_= error) @@ -1490,7 +1490,7 @@ static void sdhci_eic7700_config_phy(struct sdhci_hos= t *host) val |=3D PHY_PAD_RXSEL_1V8; sdhci_writew(host, val, PHY_STBPAD_CNFG_R); } - usleep_range(2000, 3000); + fsleep(2500); sdhci_writel(host, drv | PHY_CNFG_RSTN_DEASSERT, PHY_CNFG_R); sdhci_eic7700_config_phy_delay(host, dwc_priv->delay_line); } @@ -1520,7 +1520,7 @@ static int sdhci_eic7700_reset_init(struct device *de= v, struct eic7700_priv *pri dev_err(dev, "Failed to assert reset signals: %d\n", ret); return ret; } - usleep_range(2000, 2100); + fsleep(2050); ret =3D reset_control_deassert(priv->reset); if (ret) { dev_err(dev, "Failed to deassert reset signals: %d\n", ret); @@ -1565,7 +1565,7 @@ static int sdhci_eic7700_delay_tuning(struct sdhci_ho= st *host, u32 opcode) ret =3D mmc_send_tuning(host->mmc, opcode, &cmd_error); if (ret) { host->ops->reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA); - usleep_range(200, 210); + fsleep(205); if (delay_min !=3D -1 && delay_max !=3D -1) break; } else { @@ -1736,7 +1736,7 @@ static void sdhci_eic7700_set_uhs_signaling(struct sd= hci_host *host, unsigned in */ sdhci_writew(host, 0xffff, PHY_DLLBT_CNFG_R); sdhci_writeb(host, PHY_DLL_CTRL_ENABLE, PHY_DLL_CTRL_R); - usleep_range(100, 110); + fsleep(105); =20 ret =3D read_poll_timeout(sdhci_readb, status, status & DLL_LOCK_STS, 10= 0, 1000000, false, host, PHY_DLL_STATUS_R); --=20 2.43.0 From nobody Sun May 24 21:37:02 2026 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (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 241993064AE for ; Thu, 21 May 2026 08:35:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779352529; cv=none; b=RQIQvLdwG4h9EID25Wd2yHOosLvt+Si5dEANTgwMP3WRhommudZg2Y/JC8+4VXnj2R9nXe+osaQLx7lJRFEjyrXTPMdz1lOQyQFCRDxzLe83N1khRkbx+8rHVtwNned8YGWMZGDKqCZdIThtaQizEM2vEQJLgEbYymQwScO5o4U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779352529; c=relaxed/simple; bh=wGXmQcXBJ4CLnbRRvSwkahCMlI0m3Tzi/ONd8+kGBFA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TG+jhK8v5UYhivgqj7Yw0VNcR10cR3YFe++ZixNp4gf3GVblW5GhuvqCDDYSaRYeKTOdidvltigg11+Al+mL638eiAaurAdfP34k+2So6h232OUUGA+7rxnxEeqeBY6d8J46+byWMiCAONUC6zXyj/4Rn73+TAhzvAsChiNx8TQ= 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=GmYPKqSq; arc=none smtp.client-ip=209.85.208.173 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="GmYPKqSq" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-393c40246afso68324651fa.1 for ; Thu, 21 May 2026 01:35:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779352525; x=1779957325; 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=vtxH5AimZIUuzoz3MkwL//rulf0WcV2FAeSBCKU/bDc=; b=GmYPKqSqfi9ZKtEHj942eGeo8ij6L+8aSH0rzEE7Jpq0KfqAy+zv1pW6jjilZAJhrO xW0cfhNUeBdUM6KKzQG+ThnPdTuP3kiUPB5VGxYSlMUfMfW5WjEKOpSzU50MiEPb4Fs5 pK7T/464nMGbiNa8zdYw1trOrWl5HEGFDCgPxX338oSla7H6LgMMUJVb3ks/WxUDwuPi wKM7ID6xDW63+ZheQ/xFisPNtHfiwTi+UyHyoUnH0kHwH+r3dMbIYXePW+2Dal+xU6wX c+3FoSbt6LBhbC/CEyQwuRMYvNig/7zEKxolDaDv3XnmvrWQyDWVe269zXZesW6KzDTl Ml5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779352525; x=1779957325; 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=vtxH5AimZIUuzoz3MkwL//rulf0WcV2FAeSBCKU/bDc=; b=mwhlKFEbcuA6ghyYPd2TWJwICQ5dRXxjM0wbGCAYbxvHVxCCpPoifqSXRdMCUjudc7 PYHXGZDeiQS/HDoDZ1IocECr750aC+TtsaBuBTFP2Y/yIdTzHq0OHrxbRAzFTgdTIn+p Aokos54poa8d9RkmmFoZExqKoi27fNzUojRZziuy9Xi2SIRlRqvhTvqveRWAaxkKuQPL opSZvjz/1q+i+pabP7TS1Gr4WN5yH9qa+LYjNlvinL19b2T/Zdu/T8VWZCJ9CR8lM+Qr iEjSGm0X1Oa2PbYKNHSLQPyKG3DcemKQ6Q+ufV+NzJ5NI+0BQid5e49+QXeiZMBNvNKI rwAw== X-Forwarded-Encrypted: i=1; AFNElJ9c41uXUZo+Gts/Adt0yGc4b6MC5CPcVqrCwdESHtbzc0igoWbXzy5sFxTF/APYv9swpDcEq3+7rKbI2kE=@vger.kernel.org X-Gm-Message-State: AOJu0Yws5KX/U0DvgR86F4GXqjNGiPkGoAxvgpN/8ZdqXDnkf38oc06A oHFGPK9icQm4yJCUaA49kK2BzVtCcugU1TJKd/irT8BbeQZmIKEjjeQtuFxwbQ== X-Gm-Gg: Acq92OHkWXhUsL7/eTv2LIhFzzqqYu6vxqEQMmOl/Vs56gl5M2Py0bnuhdGDkqu8cnG BKmbPuXtxEKcCqNrxMWQ77/ydd6Gx883QwZvEE+xdnhRuRY9OdwpiFz3MbCIWFCmo+LV9UcSSQu Kai0TSUBTOnb0XOVfDJowtPKfL7D7uO9gcTTEOywjz/zjnVQCKha4L37bP9hnm+1fPTCtMkL93o Edhjx6HlbqMcQ5bwlrtJL4+bsE24qjug7z8nJnyqc2ZNBU+jX3+6OJ6fKurv1Mavq6xI+8aiTG+ K6EWUlPFbrLFu0C8PgdCHgoP80/xRDqPk3d5+LIvtRynyuGq0okHBbd+vsYPDXPsPQye2q0mEay hgAQDB5ITPTO1+RSxJ5NN4yYJ9ldRYbDgByEAWZKpEn6VSRrPhPG0tzwjhObuIExzr1pGB3hANa O6npoFuETV41aBbavT6L0U7+RfgCNoo5iJzfaQIVuO X-Received: by 2002:a2e:9581:0:b0:38e:96b5:2f45 with SMTP id 38308e7fff4ca-395ca55a41cmr5599741fa.8.1779352524344; Thu, 21 May 2026 01:35:24 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 01:35:23 -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 2/3] mmc: sdhci-of-dwcmshc: remove redundant IS_ERR() check Date: Thu, 21 May 2026 11:35:03 +0300 Message-ID: <20260521083506.356422-3-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: quoted-printable Content-Type: text/plain; charset="utf-8" The clk_disable_unprepare() function has internal protection against ERR_PTR and NULL pointers (IS_ERR_OR_NULL). Remove the redundant IS_ERR() check for bus_clk in dwcmshc_suspend() and in the error path of dwcmshc_resume() to simplify the code. Note that the clk_prepare_enable() call in dwcmshc_resume() must retain its IS_ERR() check because clk_prepare() only handles NULL pointers, not ERR_PTR. No functional change intended. Acked-by: Adrian Hunter Signed-off-by: Artem Shimko --- drivers/mmc/host/sdhci-of-dwcmshc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-o= f-dwcmshc.c index 4cccd6e42e60..925fff1c0f3a 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -2564,8 +2564,7 @@ static int dwcmshc_suspend(struct device *dev) return ret; =20 clk_disable_unprepare(pltfm_host->clk); - if (!IS_ERR(priv->bus_clk)) - clk_disable_unprepare(priv->bus_clk); + clk_disable_unprepare(priv->bus_clk); =20 clk_bulk_disable_unprepare(priv->num_other_clks, priv->other_clks); =20 @@ -2608,8 +2607,7 @@ static int dwcmshc_resume(struct device *dev) disable_other_clks: clk_bulk_disable_unprepare(priv->num_other_clks, priv->other_clks); disable_bus_clk: - if (!IS_ERR(priv->bus_clk)) - clk_disable_unprepare(priv->bus_clk); + clk_disable_unprepare(priv->bus_clk); disable_clk: clk_disable_unprepare(pltfm_host->clk); return ret; --=20 2.43.0 From nobody Sun May 24 21:37:02 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Adrian Hunter --- 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-o= f-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, str= uct sdhci_host *host, return -ENOMEM; =20 priv->reset =3D devm_reset_control_array_get_optional_exclusive(mmc_dev(h= ost->mmc)); - if (IS_ERR(priv->reset)) { - err =3D 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"); =20 err =3D 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 s= dhci_host *host, struct dwcm dwc_priv->priv =3D priv; =20 ret =3D 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"); =20 ret =3D 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; =20 ret =3D 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"); =20 hsp_regmap =3D 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 =3D args.args[0]; hsp_pwr_ctrl =3D args.args[1]; @@ -2408,10 +2402,8 @@ static int dwcmshc_probe(struct platform_device *pde= v) u32 extra, caps; =20 pltfm_data =3D 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"= ); =20 host =3D sdhci_pltfm_init(pdev, &pltfm_data->pdata, sizeof(struct dwcmshc_priv)); --=20 2.43.0