aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2011-12-05 10:08:07 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-01-09 13:13:44 -0500
commitca105f4d9823f916a4718c4bc766fd14842056f2 (patch)
treeda91372a91c62a7e54617182f37b8831e79881eb
parent6ae9c1c82a6ed0858b2fb1c03f11b19194788a31 (diff)
mtd: maps: bcm963xx-flash: clean up printk usage
Replace raw printk's with their pr_XXX equivalent and unify broken up strings so they become grepable. Also replace the PFX definition with a pr_fmt(). Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Acked-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/maps/bcm963xx-flash.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c
index 701f4e51609a..e5e3c0a04aaf 100644
--- a/drivers/mtd/maps/bcm963xx-flash.c
+++ b/drivers/mtd/maps/bcm963xx-flash.c
@@ -18,6 +18,8 @@
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19 */ 19 */
20 20
21#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
22
21#include <linux/init.h> 23#include <linux/init.h>
22#include <linux/kernel.h> 24#include <linux/kernel.h>
23#include <linux/slab.h> 25#include <linux/slab.h>
@@ -34,8 +36,6 @@
34#define BCM63XX_BUSWIDTH 2 /* Buswidth */ 36#define BCM63XX_BUSWIDTH 2 /* Buswidth */
35#define BCM63XX_EXTENDED_SIZE 0xBFC00000 /* Extended flash address */ 37#define BCM63XX_EXTENDED_SIZE 0xBFC00000 /* Extended flash address */
36 38
37#define PFX KBUILD_MODNAME ": "
38
39static struct mtd_partition *parsed_parts; 39static struct mtd_partition *parsed_parts;
40 40
41static struct mtd_info *bcm963xx_mtd_info; 41static struct mtd_info *bcm963xx_mtd_info;
@@ -80,8 +80,8 @@ static int parse_cfe_partitions(struct mtd_info *master,
80 tagversion = &(buf->tag_version[0]); 80 tagversion = &(buf->tag_version[0]);
81 boardid = &(buf->board_id[0]); 81 boardid = &(buf->board_id[0]);
82 82
83 printk(KERN_INFO PFX "CFE boot tag found with version %s " 83 pr_info("CFE boot tag found with version %s and board type %s\n",
84 "and board type %s\n", tagversion, boardid); 84 tagversion, boardid);
85 85
86 kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE; 86 kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
87 rootfsaddr = kerneladdr + kernellen; 87 rootfsaddr = kerneladdr + kernellen;
@@ -140,13 +140,13 @@ static int parse_cfe_partitions(struct mtd_info *master,
140 parts[curpart].size = master->size - parts[0].size - parts[3].size; 140 parts[curpart].size = master->size - parts[0].size - parts[3].size;
141 141
142 for (i = 0; i < nrparts; i++) 142 for (i = 0; i < nrparts; i++)
143 printk(KERN_INFO PFX "Partition %d is %s offset %lx and " 143 pr_info("Partition %d is %s offset %lx and length %lx\n", i,
144 "length %lx\n", i, parts[i].name, 144 parts[i].name, (long unsigned int)(parts[i].offset),
145 (long unsigned int)(parts[i].offset), 145 (long unsigned int)(parts[i].size));
146 (long unsigned int)(parts[i].size)); 146
147 pr_info("Spare partition is offset %x and length %x\n", spareaddr,
148 sparelen);
147 149
148 printk(KERN_INFO PFX "Spare partition is offset %x and length %x\n",
149 spareaddr, sparelen);
150 *pparts = parts; 150 *pparts = parts;
151 vfree(buf); 151 vfree(buf);
152 152