From mboxrd@z Thu Jan 1 00:00:00 1970 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: 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 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; 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