target/linux/layerscape/patches-4.4/7178-staging-fsl-mc-bus-Drop-warning.patch

   1 From 9821898bbfa5a21254baafe19b3cc97516fc6019 Mon Sep 17 00:00:00 2001
   2 From: Matthias Brugger <mbrugger@suse.com>
   3 Date: Thu, 14 Apr 2016 23:24:26 +0200
   4 Subject: [PATCH 178/226] staging: fsl-mc: bus: Drop warning
   5
   6 When updating the irq_chip and msi_domain_ops, the code checkes for
   7 already present functions.
   8 When more then one ITS controller are present in the system,
   9 irq_chip and msi_domain_ops got already set and a warning is invoked.
  10
  11 This patch deletes the warning, as the funtions are just already set to
  12 the needed callbacks.
  13
  14 Signed-off-by: Matthias Brugger <mbrugger@suse.com>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  16 ---
  17  drivers/staging/fsl-mc/bus/mc-msi.c |   12 ++++--------
  18  1 file changed, 4 insertions(+), 8 deletions(-)
  19
  20 --- a/drivers/staging/fsl-mc/bus/mc-msi.c
  21 +++ b/drivers/staging/fsl-mc/bus/mc-msi.c
  22 @@ -37,10 +37,8 @@ static void fsl_mc_msi_update_dom_ops(st
  23         /*
  24          * set_desc should not be set by the caller
  25          */
  26 -       if (WARN_ON(ops->set_desc))
  27 -               return;
  28 -
  29 -       ops->set_desc = fsl_mc_msi_set_desc;
  30 +       if (ops->set_desc == NULL)
  31 +               ops->set_desc = fsl_mc_msi_set_desc;
  32  }
  33
  34  static void __fsl_mc_msi_write_msg(struct fsl_mc_device *mc_bus_dev,
  35 @@ -129,10 +127,8 @@ static void fsl_mc_msi_update_chip_ops(s
  36         /*
  37          * irq_write_msi_msg should not be set by the caller
  38          */
  39 -       if (WARN_ON(chip->irq_write_msi_msg))
  40 -               return;
  41 -
  42 -       chip->irq_write_msi_msg = fsl_mc_msi_write_msg;
  43 +       if (chip->irq_write_msi_msg == NULL)
  44 +               chip->irq_write_msi_msg = fsl_mc_msi_write_msg;
  45  }
  46
  47  /**