target/linux/bcm27xx/patches-5.4/950-0642-component-Silence-bind-error-on-EPROBE_DEFER.patch

   1 From 8695764265eb6e749c9fdc901e98c2e7b4d2adfc Mon Sep 17 00:00:00 2001
   2 From: James Hilliard <james.hilliard1@gmail.com>
   3 Date: Fri, 10 Apr 2020 20:23:13 -0600
   4 Subject: [PATCH] component: Silence bind error on -EPROBE_DEFER
   5
   6 If a component fails to bind due to -EPROBE_DEFER we should not log an
   7 error as this is not a real failure.
   8
   9 Fixes:
  10 vc4-drm soc:gpu: failed to bind 3f902000.hdmi (ops vc4_hdmi_ops): -517
  11 vc4-drm soc:gpu: master bind failed: -517
  12
  13 Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
  14 ---
  15  drivers/base/component.c | 8 +++++---
  16  1 file changed, 5 insertions(+), 3 deletions(-)
  17
  18 --- a/drivers/base/component.c
  19 +++ b/drivers/base/component.c
  20 @@ -257,7 +257,8 @@ static int try_to_bring_up_master(struct
  21         ret = master->ops->bind(master->dev);
  22         if (ret < 0) {
  23                 devres_release_group(master->dev, NULL);
  24 -               dev_info(master->dev, "master bind failed: %d\n", ret);
  25 +               if (ret != -EPROBE_DEFER)
  26 +                       dev_info(master->dev, "master bind failed: %d\n", ret);
  27                 return ret;
  28         }
  29
  30 @@ -611,8 +612,9 @@ static int component_bind(struct compone
  31                 devres_release_group(component->dev, NULL);
  32                 devres_release_group(master->dev, NULL);
  33
  34 -               dev_err(master->dev, "failed to bind %s (ops %ps): %d\n",
  35 -                       dev_name(component->dev), component->ops, ret);
  36 +               if (ret != -EPROBE_DEFER)
  37 +                       dev_err(master->dev, "failed to bind %s (ops %ps): %d\n",
  38 +                               dev_name(component->dev), component->ops, ret);
  39         }
  40
  41         return ret;