qlcnic: Fix for flash update failure on 83xx adapter

[karo-tx-linux.git] / drivers / bus / mvebu-mbus.c

diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 8740f46b4d0d3a55c350540d096c8c7fc6318a49..33c6947eebecb5069c156003563548efaa4c3b6b 100644 (file)
--- 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;
        }