mvebu: backport mainline patches from kernel 3.11
[openwrt/svn-archive/archive.git] / target / linux / mvebu / patches-3.10 / 0022-bus-mvebu-mbus-Use-pr_fmt.patch
1 From 35e8d985e056f583290406258e3f17789bd05bce Mon Sep 17 00:00:00 2001
2 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
3 Date: Fri, 7 Jun 2013 13:47:38 -0300
4 Subject: [PATCH 022/203] bus: mvebu-mbus: Use pr_fmt
5
6 In order to clean message printing, we replace pr_info with pr_fmt.
7 This is purely cosmetic change, with the sole purpose of making
8 the code a bit more readable.
9
10 Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
11 Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
12 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
13 ---
14 drivers/bus/mvebu-mbus.c | 8 +++++---
15 1 file changed, 5 insertions(+), 3 deletions(-)
16
17 --- a/drivers/bus/mvebu-mbus.c
18 +++ b/drivers/bus/mvebu-mbus.c
19 @@ -49,6 +49,8 @@
20 * configuration (file 'devices').
21 */
22
23 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
24 +
25 #include <linux/kernel.h>
26 #include <linux/module.h>
27 #include <linux/init.h>
28 @@ -762,7 +764,7 @@ int mvebu_mbus_add_window_remap_flags(co
29 break;
30
31 if (!s->soc->map[i].name) {
32 - pr_err("mvebu-mbus: unknown device '%s'\n", devname);
33 + pr_err("unknown device '%s'\n", devname);
34 return -ENODEV;
35 }
36
37 @@ -775,7 +777,7 @@ int mvebu_mbus_add_window_remap_flags(co
38 attr |= 0x28;
39
40 if (!mvebu_mbus_window_conflicts(s, base, size, target, attr)) {
41 - pr_err("mvebu-mbus: cannot add window '%s', conflicts with another window\n",
42 + pr_err("cannot add window '%s', conflicts with another window\n",
43 devname);
44 return -EINVAL;
45 }
46 @@ -842,7 +844,7 @@ int __init mvebu_mbus_init(const char *s
47 break;
48
49 if (!of_id->compatible) {
50 - pr_err("mvebu-mbus: could not find a matching SoC family\n");
51 + pr_err("could not find a matching SoC family\n");
52 return -ENODEV;
53 }
54