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 C957EC43334 for ; Tue, 28 Jun 2022 02:22:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244069AbiF1CW4 (ORCPT ); Mon, 27 Jun 2022 22:22:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243608AbiF1CVa (ORCPT ); Mon, 27 Jun 2022 22:21:30 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0662724F12; Mon, 27 Jun 2022 19:21:19 -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 B8162B818E4; Tue, 28 Jun 2022 02:21:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3FDAC34115; Tue, 28 Jun 2022 02:21:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656382876; bh=HrcPwdqzux1SSIv3OoIU5/I4Yj+Y6VDA1+xfrZ+URJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=abjSLgl+tF79sOVhZZwD9wOGW1+Gmsg+gUExF2IocDwI7cOFyAQJEZ+14jmA7lAwf QbTNToAsYtCLGtrH1DDqr2t/sHC4B34fzaLXrIF8H2gCDG4S1hdDp+Cf9ojYbkmU+p oTsLqEcX+86Q/ciD+3a0+O7VEL4Gzf8bZUHhYDlYyoEsfxrPJXI+1AnnNGKyB5kUYG N5m+9+P62GADtdrqpARBZdPv2cT53tuUhe5yjIFAgRfp3r90zNQPSubc1MjG953TV9 wHB3SPU2YNauTkh1oERJDB2A/sboGJZvhxNePHaeLbM6gDUJfq0ffCaipqs6OgAHHw Vk8qx+pm+O/5g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Serge Semin , Arnd Bergmann , Sasha Levin Subject: [PATCH AUTOSEL 5.15 07/41] bus: bt1-axi: Don't print error on -EPROBE_DEFER Date: Mon, 27 Jun 2022 22:20:26 -0400 Message-Id: <20220628022100.595243-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220628022100.595243-1-sashal@kernel.org> References: <20220628022100.595243-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 5e93207e962a6d23893ff4405f6c5d4396fb5934 ] The Baikal-T1 AXI 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-2-Sergey.Semin@baikalelectronics.ru' Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- drivers/bus/bt1-axi.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/bus/bt1-axi.c b/drivers/bus/bt1-axi.c index e7a6744acc7b..70e49a6e5374 100644 --- a/drivers/bus/bt1-axi.c +++ b/drivers/bus/bt1-axi.c @@ -135,10 +135,9 @@ static int bt1_axi_request_rst(struct bt1_axi *axi) int ret; axi->arst = devm_reset_control_get_optional_exclusive(axi->dev, "arst"); - if (IS_ERR(axi->arst)) { - dev_warn(axi->dev, "Couldn't get reset control line\n"); - return PTR_ERR(axi->arst); - } + if (IS_ERR(axi->arst)) + return dev_err_probe(axi->dev, PTR_ERR(axi->arst), + "Couldn't get reset control line\n"); ret = reset_control_deassert(axi->arst); if (ret) @@ -159,10 +158,9 @@ static int bt1_axi_request_clk(struct bt1_axi *axi) int ret; axi->aclk = devm_clk_get(axi->dev, "aclk"); - if (IS_ERR(axi->aclk)) { - dev_err(axi->dev, "Couldn't get AXI Interconnect clock\n"); - return PTR_ERR(axi->aclk); - } + if (IS_ERR(axi->aclk)) + return dev_err_probe(axi->dev, PTR_ERR(axi->aclk), + "Couldn't get AXI Interconnect clock\n"); ret = clk_prepare_enable(axi->aclk); if (ret) { -- 2.35.1