target/linux/layerscape/patches-4.4/7161-Staging-fsl-mc-Replace-pr_err-with-dev_err.patch

   1 From 79b4625a6ab72251e00aa94ee22a6bfe32dbeeda Mon Sep 17 00:00:00 2001
   2 From: Bhumika Goyal <bhumirks@gmail.com>
   3 Date: Fri, 4 Mar 2016 19:15:55 +0530
   4 Subject: [PATCH 161/226] Staging: fsl-mc: Replace pr_err with dev_err
   5
   6 This patch replaces pr_err calls with dev_err when the device structure
   7 is available as dev_* prints identifying information about the struct device.
   8 Done using coccinelle:
   9
  10 @r exists@
  11 identifier f, s;
  12 identifier x;
  13 position p;
  14 @@
  15 f(...,struct s *x,...) {
  16 <+...
  17 when != x == NULL
  18 \(pr_err@p\|pr_debug@p\|pr_info\)(...);
  19 ...+>
  20 }
  21
  22 @r2@
  23 identifier fld2;
  24 identifier r.s;
  25 @@
  26
  27 struct s {
  28         ...
  29         struct device *fld2;
  30         ...
  31 };
  32
  33 @@
  34 identifier r.x,r2.fld2;
  35 position r.p;
  36 @@
  37
  38 (
  39 -pr_err@p
  40 +dev_err
  41    (
  42 + &x->fld2,
  43 ...)
  44 |
  45 - pr_debug@p
  46 + dev_dbg
  47    (
  48 + &x->fld2,
  49 ...)
  50 |
  51 - pr_info@p
  52 + dev_info
  53    (
  54 + &x->fld2,
  55 ...)
  56 )
  57
  58 Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
  59 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  60 ---
  61  drivers/staging/fsl-mc/bus/mc-bus.c |    5 +++--
  62  1 file changed, 3 insertions(+), 2 deletions(-)
  63
  64 --- a/drivers/staging/fsl-mc/bus/mc-bus.c
  65 +++ b/drivers/staging/fsl-mc/bus/mc-bus.c
  66 @@ -260,14 +260,15 @@ static int get_dprc_icid(struct fsl_mc_i
  67
  68         error = dprc_open(mc_io, 0, container_id, &dprc_handle);
  69         if (error < 0) {
  70 -               pr_err("dprc_open() failed: %d\n", error);
  71 +               dev_err(&mc_io->dev, "dprc_open() failed: %d\n", error);
  72                 return error;
  73         }
  74
  75         memset(&attr, 0, sizeof(attr));
  76         error = dprc_get_attributes(mc_io, 0, dprc_handle, &attr);
  77         if (error < 0) {
  78 -               pr_err("dprc_get_attributes() failed: %d\n", error);
  79 +               dev_err(&mc_io->dev, "dprc_get_attributes() failed: %d\n",
  80 +                       error);
  81                 goto common_cleanup;
  82         }
  83