openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mvebu cleanup for v3.11 (round 4) 

- mvebu
     - use pr_fmt in mvebu-mbus driver
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
 iQEcBAABAgAGBQJRujNJAAoJEAi3KVZQDZAe8b0H/0/ZEpOt93lu+hmHiVMklT+R
 3kb6s3hT+GCIGOtCcJx5gQbz1Xw+UksiXj62X/wAHDYTl+TvBEaxVj4p7iaCuLDL
 ucdkvdrbg+lMqt+suzlBDIds+rQ4IR1qr5L9YbdFQeD7wv3Bf72GzpjbnzcaObap
 4lqqYf7rlItDAoN0twce1IrXj9FpJRRhQWwrZFNIhLpddKhYgl2akyY+GvAh0BDz
 iDb85KO6nR/kT/jJhJoNdB8SOzrhXFgGX7ezp2zWdAgWC7YFgKJVKHCLF2/yNIjW
 rK5sR9ItAy5+ixNYYyHAoMH2195w0NWPlt/LRu/jEsnQUCE05VTdocIe1gmKb2E=
 =EOJ9
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2013-06-14 14:57:30 -07:00
parent 777d466d13 b15d0b5256
commit 19a7ab6124
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/bus/mvebu-mbus.c
View File

@ -49,6 +49,8 @@
* configuration (file 'devices'). * configuration (file 'devices').
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
@ -762,7 +764,7 @@ int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base,
break; break;
if (!s->soc->map[i].name) { if (!s->soc->map[i].name) {
pr_err("mvebu-mbus: unknown device '%s'\n", devname); pr_err("unknown device '%s'\n", devname);
return -ENODEV; return -ENODEV;
} }
@ -775,7 +777,7 @@ int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base,
attr |= 0x28; attr |= 0x28;
if (!mvebu_mbus_window_conflicts(s, base, size, target, attr)) { 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); devname);
return -EINVAL; return -EINVAL;
} }
@ -842,7 +844,7 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base,
break; break;
if (!of_id->compatible) { 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; return -ENODEV;
} }