From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EBB1CCA47F for ; Tue, 28 Jun 2022 02:25:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244101AbiF1CZR (ORCPT ); Mon, 27 Jun 2022 22:25:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244163AbiF1CXg (ORCPT ); Mon, 27 Jun 2022 22:23:36 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD5FB24F18; Mon, 27 Jun 2022 19:22:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7A63AB808C0; Tue, 28 Jun 2022 02:22:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92181C385A5; Tue, 28 Jun 2022 02:22:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656382973; bh=TQfJaG9zC/M0UUZXEsftYKwm0ELB1QXHFP+12hN3PJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FZpiSTH+ZS2hQ3oqH8aYivIbZd++/WRWgZllrUBLrQnGhxMWjvc+jFEadoYUdlwAZ FKeP5zvvhNUFLaM3qJu0hYqfPZN9N6VMR3mBbUO2ooEp9XaMHmHnA6W5P1atIdTZnr gRuqLpRn1hedTgt+kWLwjXYBjTuL5Zy3PvZuYg5bYZm10vb7HYbmyEZzp6giK5HdUN RjP1OhVie0Ino1KPRBB5CqUjE1MdR4xAdSknizEedoH7vFbAj6rx9klXsQ5VurhLKU Nh0Xn1sCQZYMmdK/r4m7nMe+c+dkuaP9FBRxZFEpI15GzfD7RpLivIoidexs1Lh8qx g/JBEJN+4mCuQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Serge Semin , Arnd Bergmann , Sasha Levin Subject: [PATCH AUTOSEL 5.10 05/34] bus: bt1-apb: Don't print error on -EPROBE_DEFER Date: Mon, 27 Jun 2022 22:22:12 -0400 Message-Id: <20220628022241.595835-5-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220628022241.595835-1-sashal@kernel.org> References: <20220628022241.595835-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Serge Semin [ Upstream commit be5cddef05f519a321a543906f255ac247246074 ] The Baikal-T1 APB bus driver correctly handles the deferred probe situation, but still pollutes the system log with a misleading error message. Let's fix that by using the dev_err_probe() method to print the log message in case of the clocks/resets request errors. Signed-off-by: Serge Semin Link: https://lore.kernel.org/r/20220610104030.28399-1-Sergey.Semin@baikalelectronics.ru' Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- drivers/bus/bt1-apb.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/bus/bt1-apb.c b/drivers/bus/bt1-apb.c index b25ff941e7c7..63b1b4a76671 100644 --- a/drivers/bus/bt1-apb.c +++ b/drivers/bus/bt1-apb.c @@ -175,10 +175,9 @@ static int bt1_apb_request_rst(struct bt1_apb *apb) int ret; apb->prst = devm_reset_control_get_optional_exclusive(apb->dev, "prst"); - if (IS_ERR(apb->prst)) { - dev_warn(apb->dev, "Couldn't get reset control line\n"); - return PTR_ERR(apb->prst); - } + if (IS_ERR(apb->prst)) + return dev_err_probe(apb->dev, PTR_ERR(apb->prst), + "Couldn't get reset control line\n"); ret = reset_control_deassert(apb->prst); if (ret) @@ -199,10 +198,9 @@ static int bt1_apb_request_clk(struct bt1_apb *apb) int ret; apb->pclk = devm_clk_get(apb->dev, "pclk"); - if (IS_ERR(apb->pclk)) { - dev_err(apb->dev, "Couldn't get APB clock descriptor\n"); - return PTR_ERR(apb->pclk); - } + if (IS_ERR(apb->pclk)) + return dev_err_probe(apb->dev, PTR_ERR(apb->pclk), + "Couldn't get APB clock descriptor\n"); ret = clk_prepare_enable(apb->pclk); if (ret) { -- 2.35.1