You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
84 lines
1.7 KiB
Diff
84 lines
1.7 KiB
Diff
From 79b4625a6ab72251e00aa94ee22a6bfe32dbeeda Mon Sep 17 00:00:00 2001
|
|
From: Bhumika Goyal <bhumirks@gmail.com>
|
|
Date: Fri, 4 Mar 2016 19:15:55 +0530
|
|
Subject: [PATCH 161/226] Staging: fsl-mc: Replace pr_err with dev_err
|
|
|
|
This patch replaces pr_err calls with dev_err when the device structure
|
|
is available as dev_* prints identifying information about the struct device.
|
|
Done using coccinelle:
|
|
|
|
@r exists@
|
|
identifier f, s;
|
|
identifier x;
|
|
position p;
|
|
@@
|
|
f(...,struct s *x,...) {
|
|
<+...
|
|
when != x == NULL
|
|
\(pr_err@p\|pr_debug@p\|pr_info\)(...);
|
|
...+>
|
|
}
|
|
|
|
@r2@
|
|
identifier fld2;
|
|
identifier r.s;
|
|
@@
|
|
|
|
struct s {
|
|
...
|
|
struct device *fld2;
|
|
...
|
|
};
|
|
|
|
@@
|
|
identifier r.x,r2.fld2;
|
|
position r.p;
|
|
@@
|
|
|
|
(
|
|
-pr_err@p
|
|
+dev_err
|
|
(
|
|
+ &x->fld2,
|
|
...)
|
|
|
|
|
- pr_debug@p
|
|
+ dev_dbg
|
|
(
|
|
+ &x->fld2,
|
|
...)
|
|
|
|
|
- pr_info@p
|
|
+ dev_info
|
|
(
|
|
+ &x->fld2,
|
|
...)
|
|
)
|
|
|
|
Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/fsl-mc/bus/mc-bus.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/staging/fsl-mc/bus/mc-bus.c
|
|
+++ b/drivers/staging/fsl-mc/bus/mc-bus.c
|
|
@@ -260,14 +260,15 @@ static int get_dprc_icid(struct fsl_mc_i
|
|
|
|
error = dprc_open(mc_io, 0, container_id, &dprc_handle);
|
|
if (error < 0) {
|
|
- pr_err("dprc_open() failed: %d\n", error);
|
|
+ dev_err(&mc_io->dev, "dprc_open() failed: %d\n", error);
|
|
return error;
|
|
}
|
|
|
|
memset(&attr, 0, sizeof(attr));
|
|
error = dprc_get_attributes(mc_io, 0, dprc_handle, &attr);
|
|
if (error < 0) {
|
|
- pr_err("dprc_get_attributes() failed: %d\n", error);
|
|
+ dev_err(&mc_io->dev, "dprc_get_attributes() failed: %d\n",
|
|
+ error);
|
|
goto common_cleanup;
|
|
}
|
|
|