| Message ID | 20220708194448.10700-1-Sergey.Semin@baikalelectronics.ru (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [RESEND,v4,1/2] bus: bt1-apb: Don't print error on -EPROBE_DEFER | expand |
Hi Arnd, Philipp Since no comments have been posted for the patches lately and the @Philipp notes have been fixed way on v2, could you please consider merge the patchset in through any of your repos? -Sergey On Fri, Jul 08, 2022 at 10:44:47PM +0300, Serge Semin wrote: > 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 <Sergey.Semin@baikalelectronics.ru> > > --- > > 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. > > Link: https://lore.kernel.org/lkml/20220624211233.7529-1-Sergey.Semin@baikalelectronics.ru/ > Changelog v4: > - Just resend. > --- > 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 >
On Mon, Jul 11, 2022 at 5:53 PM Serge Semin <fancer.lancer@gmail.com> wrote: > > Hi Arnd, Philipp > > Since no comments have been posted for the patches lately and the @Philipp > notes have been fixed way on v2, could you please consider merge the > patchset in through any of your repos? Hi Sergey, I already merged these into the arm/drivers tree on June 10, I suppose something went wrong with the notification email. Arnd
On Mon, Jul 11, 2022 at 08:54:26PM +0200, Arnd Bergmann wrote: > On Mon, Jul 11, 2022 at 5:53 PM Serge Semin <fancer.lancer@gmail.com> wrote: > > > > Hi Arnd, Philipp > > > > Since no comments have been posted for the patches lately and the @Philipp > > notes have been fixed way on v2, could you please consider merge the > > patchset in through any of your repos? > > > Hi Sergey, > > I already merged these into the arm/drivers tree on June 10, Hi Arnd. Great! Thanks for accepting the patches. > I suppose > something went wrong with the notification email. Alas I haven't got any notification. Spam folder has nothing too. -Sergey > > Arnd
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) {
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 <Sergey.Semin@baikalelectronics.ru> --- 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. Link: https://lore.kernel.org/lkml/20220624211233.7529-1-Sergey.Semin@baikalelectronics.ru/ Changelog v4: - Just resend. --- drivers/bus/bt1-apb.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)