From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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-of-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; clk_disable_unprepare(pltfm_host->clk); - if (!IS_ERR(priv->bus_clk)) - clk_disable_unprepare(priv->bus_clk); + clk_disable_unprepare(priv->bus_clk); clk_bulk_disable_unprepare(priv->num_other_clks, priv->other_clks); @@ -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; -- 2.43.0