From patchwork Fri Jun 24 21:10:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serge Semin X-Patchwork-Id: 12895088 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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D036DC43334 for ; Fri, 24 Jun 2022 21:10:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id 9A130C3411C; Fri, 24 Jun 2022 21:10:23 +0000 (UTC) Received: from mail.baikalelectronics.com (mail.baikalelectronics.com [87.245.175.230]) by smtp.kernel.org (Postfix) with ESMTP id 945CCC34114 for ; Fri, 24 Jun 2022 21:10:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 945CCC34114 Authentication-Results: smtp.kernel.org; dmarc=pass (p=reject dis=none) header.from=baikalelectronics.ru Authentication-Results: smtp.kernel.org; spf=pass smtp.mailfrom=baikalelectronics.ru Received: from mail (mail.baikal.int [192.168.51.25]) by mail.baikalelectronics.com (Postfix) with ESMTP id 9CA0B16CC; Sat, 25 Jun 2022 00:11:37 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.baikalelectronics.com 9CA0B16CC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baikalelectronics.ru; s=mail; t=1656105097; bh=1Kj5DDWyXfcYA8qLytKcBbBHBni5sL6qSb5CPzoNZjM=; h=From:To:CC:Subject:Date:From; b=YSlksluuGgtBbNUM1acR5F6Kk5MPnsWduylpXKI6DSa/VAcBgSSAkW4QHQl8bEcpA JDi62SdgQfMS0P2r7axMPP4lhsjsi/1+Ho2qgt+IunC++qMNLXSNOJoM3eqEVpMidS JKoQtYiyU4AvKY6S1OmShLIE2oO6Uprq8TTaZ0n4= Received: from localhost (192.168.53.207) by mail (192.168.51.25) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Sat, 25 Jun 2022 00:10:16 +0300 From: Serge Semin To: Arnd Bergmann , Philipp Zabel List-Id: CC: Serge Semin , Serge Semin , Alexey Malahov , Pavel Parkhomenko , , Subject: [PATCH RESEND v2 1/2] bus: bt1-apb: Don't print error on -EPROBE_DEFER Date: Sat, 25 Jun 2022 00:10:13 +0300 Message-ID: <20220624211015.7351-1-Sergey.Semin@baikalelectronics.ru> MIME-Version: 1.0 X-ClientProxiedBy: MAIL.baikal.int (192.168.51.25) To mail (192.168.51.25) 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/lkml/20220610080103.10689-1-Sergey.Semin@baikalelectronics.ru/ Changelog v2: - Use the dev_err_probe() return value as the return status of the corresponding method. (@Philipp) Link: https://lore.kernel.org/lkml/20220610104030.28399-1-Sergey.Semin@baikalelectronics.ru Changelog v3: - Just resend. - Rebase onto the kernel v5.19-rcX. --- 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) { From patchwork Fri Jun 24 21:10:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serge Semin X-Patchwork-Id: 12895089 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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7B612C433EF for ; Fri, 24 Jun 2022 21:10:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id 3A915C34114; Fri, 24 Jun 2022 21:10:24 +0000 (UTC) Received: from mail.baikalelectronics.com (mail.baikalelectronics.com [87.245.175.230]) by smtp.kernel.org (Postfix) with ESMTP id A885BC341C0 for ; Fri, 24 Jun 2022 21:10:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org A885BC341C0 Authentication-Results: smtp.kernel.org; dmarc=pass (p=reject dis=none) header.from=baikalelectronics.ru Authentication-Results: smtp.kernel.org; spf=pass smtp.mailfrom=baikalelectronics.ru Received: from mail (mail.baikal.int [192.168.51.25]) by mail.baikalelectronics.com (Postfix) with ESMTP id 80CF416CF; Sat, 25 Jun 2022 00:11:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.baikalelectronics.com 80CF416CF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baikalelectronics.ru; s=mail; t=1656105098; bh=EVjSlxO14l8e2kikyRC3XsnI7trVHKvpd6yQROJjrNI=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=VzMeq87JU3kHn4mBB/owxyrkf7P2ZePWeKY72rPCh19xcSRLdHEck0/tEfwRGwLyd LMDfTCtCIpTRDdDUFSG6blAQ/drzTHBs+qnTidWLhv5wif7HncL74WmH+WV6ESUIJM jsCkGZBkBfyKim0v9FwEsM74fPluNF+hXhK/uh6g= Received: from localhost (192.168.53.207) by mail (192.168.51.25) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Sat, 25 Jun 2022 00:10:17 +0300 From: Serge Semin To: Arnd Bergmann , Philipp Zabel List-Id: CC: Serge Semin , Serge Semin , Alexey Malahov , Pavel Parkhomenko , , Subject: [PATCH RESEND v2 2/2] bus: bt1-axi: Don't print error on -EPROBE_DEFER Date: Sat, 25 Jun 2022 00:10:14 +0300 Message-ID: <20220624211015.7351-2-Sergey.Semin@baikalelectronics.ru> In-Reply-To: <20220624211015.7351-1-Sergey.Semin@baikalelectronics.ru> References: <20220624211015.7351-1-Sergey.Semin@baikalelectronics.ru> MIME-Version: 1.0 X-ClientProxiedBy: MAIL.baikal.int (192.168.51.25) To mail (192.168.51.25) 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/lkml/20220610080103.10689-1-Sergey.Semin@baikalelectronics.ru/ Changelog v2: - Use the dev_err_probe() return value as the return status of the corresponding method. (@Philipp) Link: https://lore.kernel.org/lkml/20220610104030.28399-2-Sergey.Semin@baikalelectronics.ru/ Changelog v3: - Just resend. - Rebase onto the kernel v5.19-rcX. --- 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) {