Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19a7ab61 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 777d466d b15d0b52

drivers/bus/mvebu-mbus.c

+5 −3
Original line number Diff line number Diff line
@@ -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;

	}