diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-14 14:57:30 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-14 14:57:44 -0700 |
| commit | 19a7ab612428cb9ab6161552202ffa095c6f3bcc (patch) | |
| tree | 0b7667893e131810fe05968cb75e065fbcc12e00 /drivers | |
| parent | 777d466d13238336c83a5a8d402a5f0017f69407 (diff) | |
| parent | b15d0b5256056a67c5cb14c2d4d46dd12c8bfb99 (diff) | |
Merge tag 'cleanup-3.11-4' of git://git.infradead.org/users/jcooper/linux into next/cleanup
From Jason Cooper, mvebu cleanup for v3.11 (round 4):
- use pr_fmt in mvebu-mbus driver
* tag 'cleanup-3.11-4' of git://git.infradead.org/users/jcooper/linux:
bus: mvebu-mbus: Use pr_fmt
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bus/mvebu-mbus.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index 8740f46b4d0d..33c6947eebec 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c @@ -49,6 +49,8 @@ * configuration (file 'devices'). */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> @@ -762,7 +764,7 @@ int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base, break; if (!s->soc->map[i].name) { - pr_err("mvebu-mbus: unknown device '%s'\n", devname); + pr_err("unknown device '%s'\n", devname); return -ENODEV; } @@ -775,7 +777,7 @@ int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base, attr |= 0x28; if (!mvebu_mbus_window_conflicts(s, base, size, target, attr)) { - pr_err("mvebu-mbus: cannot add window '%s', conflicts with another window\n", + pr_err("cannot add window '%s', conflicts with another window\n", devname); return -EINVAL; } @@ -842,7 +844,7 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base, break; if (!of_id->compatible) { - pr_err("mvebu-mbus: could not find a matching SoC family\n"); + pr_err("could not find a matching SoC family\n"); return -ENODEV; } |