From nobody Sun May 24 20:33:06 2026 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (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 CD0FC30B53C for ; Fri, 22 May 2026 07:32:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779435123; cv=none; b=j2mwpBtdj7MK2/c1X+6aNUFlfGtIswDa1w53P+uotd1n2G4ad9+DRVTD9xhgutc997xzee2U2wUXVNV7ywlCr8sgrkaylLi44idszEchmlXfIv8kwA6oLbYmG0DqOmm/7uMByopJithlsMG49WPp+YdiqLIIjqsCDHbX79ZbPLU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779435123; c=relaxed/simple; bh=g8HCOvznuaCizoSItkBM2k6rEBvIxm+DYP4utVV7Lx8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BoBy+wwc19MkEdYKowhNRgyPshI86QvMHNF1PRgZAMfT7TQlBUcPnpQi/D36zZkhBoQAUsYSqw8zGE99iyGjZIlDX5QRpI3bvw4XyVGln7h19NEPUwQS4hITq3CZzjtksjET/acP3081VZk9pwDVKE1CgT58Z3YvQaB9fia3uZc= 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=nWPKw198; arc=none smtp.client-ip=209.85.208.175 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="nWPKw198" Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-39397d63804so18615581fa.2 for ; Fri, 22 May 2026 00:32:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779435120; x=1780039920; 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=dE15t8Mxev7j1oSU8fnkqi5IApdtNWy6ugDPzn+jf08=; b=nWPKw198p58eshuOYr76VlN6fKIvnjzuyfTgDyuDmrwbrJGpmcSfHCNOxNnlwKhcFQ 4IjGPppP4X2P4goZJKkTdLk0yEO9QOBVl98mk+j4TmV7WhcaXPfBjR9AM+2oR9s79vDm cy12sbqivBJ+sTcdvgJIdtNO22LJJH0ZuhRdaUwRGixI7jDzTFInWj2h/SzetB481r4x hyzS9MBf4vWEzlxNmh/dpqmsN4NZ7b+LMIiPdR/UVZ02EaEsvIxo7cnC9ajH4Sg2p+hA WnavkNx0Ktdh+cB1eAziftvu/Mpf/O0ZrOPXPzuBLcap9wwCbEctRUxuE6co29gbmw3F /ppw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779435120; x=1780039920; 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=dE15t8Mxev7j1oSU8fnkqi5IApdtNWy6ugDPzn+jf08=; b=i7a7LK6xZfFjV2cL9rhkPsQRVBBHm3ToqENdmlZZYGxWmRyJoowMFRnRFdXDHSh5Sz xzxaBXROEsfsfZ5xnETeMBfHdmQ4eMruINK4GjtVh8lsmuz4DRvNb9v9Z8aHUl0J7AvY SyhRc4qD6k3tbMFeElaLQNYWm8ejaTgu9BgI6bKKK430oRD5u4cECsoa6VKcpC/m7lnP ue71j9x16kdd4N7nyfRZgUN9Xtjcdf5gy0fotQzCoRlkBaAI9VFqV7sY05qYCfCc3Jxh AVykPxAv0WGBBCoCDgUE0EwV5CvrdZ6LCVd2fetmDuCKJ/4qpWS3JaNtLGOCg6gaxPS4 UHGg== X-Forwarded-Encrypted: i=1; AFNElJ9qP4ZNbGzSmJNRs9qy5J2FB2YalKRNCEaeqj85/GTT8QOGWqUNa/BN8j7RPhITos/kaQtD9nPoGhmIvD4=@vger.kernel.org X-Gm-Message-State: AOJu0YzUiztnTUnnF3884nVsF/6Yeznz0/bynEM5MglhdVlvV9Ktcdho GmuI4i4wxULICC7QjsxRhqXj9LTbe8AdVmv1d9aLg9v1dtedSz5tMxA2 X-Gm-Gg: Acq92OGRprIgU5BU10T6lM38jFAarzTqwy4lsEu8kWdk/n5l+xImgbNWUmFlt3eWgJ8 TWX5HYyoUHB0r+xFyQQ4KDg5Ocfnco1XafzRSYw7biL7k1pgBY1SQGgn2QwE68tqBDcU30F9TYe nnptkvYuudQNm21kxPD8lmjpEGH208dJH4t+gMnSG6RAkwjqik9BW2BoGcgjiwuCzW4E+oWac3E E25nnjhB7eCkoUIMIM3r6MZMM2Y/hqBnykCXYf1Cc5/gNsVk1mIm0cdwbgDHoZW6Qgi9uoq9hqF yW38RVtLxWolYjyRIkmOjaTuVw5OWvhFyqgpk0CGro09vLYjO2NJ7eb/w9sKMhRcuC8KqQPeNZJ jIKbl7SxZz4ILt0MiMtmh5AltgS17jltkLRlrwzcxCQM2GKYUmtY4ktJOtX6bLwPh+r+sWYDkVG Vds1zfeOqZYfyctGZhwOUY0jZl0qRb4LVxlY+6Qu00Y++TKlvCpPk= X-Received: by 2002:a2e:bd87:0:b0:394:1192:5e1f with SMTP id 38308e7fff4ca-395d8d3c7f2mr6687951fa.22.1779435119905; Fri, 22 May 2026 00:31:59 -0700 (PDT) Received: from NB-6746.corp.yadro.com ([91.132.132.238]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-395dcc0a4e3sm1818751fa.22.2026.05.22.00.31.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 00:31:59 -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 v3 1/2] mmc: sdhci-of-dwcmshc: remove redundant IS_ERR() check Date: Fri, 22 May 2026 10:31:31 +0300 Message-ID: <20260522073133.409844-2-a.shimko.dev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260522073133.409844-1-a.shimko.dev@gmail.com> References: <20260522073133.409844-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 0b2158a7e409..c1ed7f28d75b 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 20:33:06 2026 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (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 41BCD30B53C for ; Fri, 22 May 2026 07:32:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779435129; cv=none; b=QlByh8W+S5xxI85yN0sw/K98c0ymzGqFU320GOU+O/3DznmctnrEggME1FDYVcLoSmSF0Dz3J0TQUiPTpQK5qOZ4yZIZZLVEzv9KBxxQ4+96TlGeivdp+rI3KCSiEZSxXU59eJwZ3xrfDp1j1YdNMctVwx8jgx1VSsG+Luz1+zI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779435129; c=relaxed/simple; bh=OV3FSPuX5tKaoq2qrJVNtQ+IVuAXWfO/iPawTJkYaZ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XurGDdTXXD0Zd9A7UhSgHfiYHSvjesC9o+8XJ7h0MwA5E4+SSbpVHe84SG2tOEjODL9X8ZZVjKciiu9/KY2qTWGf4Wf0L7vhGV+ECSueJ5AqvL3nol9opLxiS6p0iGe5JbN2AafTqLGfBuB9wRZagg60RTDQDKse9k17vSPdNEM= 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=DbDqPuXm; arc=none smtp.client-ip=209.85.208.175 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="DbDqPuXm" Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-3937014be0cso13081211fa.0 for ; Fri, 22 May 2026 00:32:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779435127; x=1780039927; 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=zV/xYY/R3r3zJuAs6jjVdbRqPC9QZozg8Q0lLxCFZbM=; b=DbDqPuXmGUqXODAMmyAUOLYkXDsWGnhNap/KOi816/nASkkSwz+XW5xYgW3mY79PMu pG+cPyv+v+xgDYkvs5BHaWT2Vm91UtcAUqBhRC31ghT/V23nffCpLd4MpgdemUwUHwQK UtfJk18zaonWmAcTitWXXFllYHw0OG3CqKE10nzx407X0IPt/9XgtLQTJfe0IDpqtfgi /RVEkDN2eIQ8E0VgnO8Qs4ecotSoQIsElEvUI1jJrJyVhayIPHEK6gazS6IUW64h4DSd fPi2/IZB2zLEKkjDfn9wLL1Qt53sONwltAuTHXfSjRj3Q8j38+Ett4ESPs+rOewrSSEn ztQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779435127; x=1780039927; 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=zV/xYY/R3r3zJuAs6jjVdbRqPC9QZozg8Q0lLxCFZbM=; b=ZEfqm+lIIVH3sbSG6M/LF1ikNiCqEwABx4K7+5/u1W3ji4lRWq3c4hygnMutAwId7N 1KfKHXKji6JaPoRpK0b7BmPyhD7MK5QQP16/9ShMyiHaBrPfp2TNzVkleuxUVbLu+W6v IZVR0N2g136QnaA3nPHX2h/yRGtvsxUvGmlvSxMRyCQqRsUTYDbWn/Xri02aps496lLf NSzXVxsOk+1ct1di8ByzXWvJOUIDmWrDDLPdVOcLbVQOCRp6YIn9/k6fG7Ep20Ep0H5K 1GEop3OIVGysrI6ULGeGkSJL/mr34KiKYc7xAI4waja+kn5pNgK7tUCVrUIm/peyj8ez 4hHQ== X-Forwarded-Encrypted: i=1; AFNElJ8EY2CIO9TwwDKS/7fX6GlHV3r1Puz/bAghD7J72aBv6vOhst6iYCvsXnm1JjHnVYyTnk4lbcbJHJktCzs=@vger.kernel.org X-Gm-Message-State: AOJu0YwXQeTN/SzTOUcHzEDwUwrPSjsTu0P7RrSWqqvIszQPNdYpcCTR HxvpKYLfKhOhds1/76CFWjQIHYJEDXs9CqAKxm73by0dJ6DCw/fijLXk X-Gm-Gg: Acq92OGAjLYp3mlW5Nk34Nv9lNXTn1Kcby7ETpL56mzq2I3XLN+TxQVtM5D9oST9sIu UaaXuSCx8Ei8Ox23/xqepxkUe4HJB+xgTWqBq6Na/2g6LyRf2KX0CCEC7b+9JmmunNPRK3muKP2 LIOqfgahxPoo/LCqJdZ6zad3nx/8MGVvr+RgOt2eP5N+RxY9LL/vITgsoByCYcm08qhMUcJL5lE WD7c0aIJAYkcSh95cdIVFqn0cvHEpOoM6FBNZ0vdhSazMT6ml8xAwtT7+xaBxSPyzVRBsHM+0JL Ox5nbKgKR4CkaNa11MGzlD7hF9OopAKvcFims6aN/wmgjN7boJz5ThLk2Utj3D6EovsgGz4N2O7 c0i7+GONqoSMZKF42usAoCHxpYb42rI9W5uBj40U2KiVnNs51BS99uY9gxa/s4Btn5mwA9BhClS TvUcQYlfjjA1j+CsvCwauQ+RrKCCvLjwxdYtBU+I8U X-Received: by 2002:a2e:959a:0:b0:38e:9667:f21a with SMTP id 38308e7fff4ca-395d8d1d1f1mr4691941fa.20.1779435126479; Fri, 22 May 2026 00:32:06 -0700 (PDT) Received: from NB-6746.corp.yadro.com ([91.132.132.238]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-395dcc0a4e3sm1818751fa.22.2026.05.22.00.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 00:32:06 -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 v3 2/2] mmc: sdhci-of-dwcmshc: use dev_err_probe() to simplify error paths Date: Fri, 22 May 2026 10:31:32 +0300 Message-ID: <20260522073133.409844-3-a.shimko.dev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260522073133.409844-1-a.shimko.dev@gmail.com> References: <20260522073133.409844-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. Acked-by: Adrian Hunter 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-o= f-dwcmshc.c index c1ed7f28d75b..c758e904f5c8 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