69d323f231
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.10, and Linux v3.11. This work mainly covers: * Enabling USB storage, and PCI to mvebu_defconfig. * Add support for NOR flash. * Some PCI device tree related updates, and bus parsing. * Adding Armada XP & 370 PCI driver, and update some clock gating specifics. * Introduce Marvell EBU Device Bus driver. * Enaling USB in the armada*.dts. * Enabling, and updating the mvebu-mbus. * Some SATA and Ethernet related fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39564
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From 35e8d985e056f583290406258e3f17789bd05bce Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Fri, 7 Jun 2013 13:47:38 -0300
|
|
Subject: [PATCH 022/203] bus: mvebu-mbus: Use pr_fmt
|
|
|
|
In order to clean message printing, we replace pr_info with pr_fmt.
|
|
This is purely cosmetic change, with the sole purpose of making
|
|
the code a bit more readable.
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
|
|
---
|
|
drivers/bus/mvebu-mbus.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
--- 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(co
|
|
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(co
|
|
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 *s
|
|
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;
|
|
}
|
|
|