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>

diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c
index 701f4e51609aef0975a93f77bb4240fa44209e7f..e5e3c0a04aaf793206fc5dd8ec0fc7fa0389a143 100644 (file)
--- a/drivers/mtd/maps/bcm963xx-flash.c
+++ b/drivers/mtd/maps/bcm963xx-flash.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -34,8 +36,6 @@
 #define BCM63XX_BUSWIDTH       2               /* Buswidth */
 #define BCM63XX_EXTENDED_SIZE  0xBFC00000      /* Extended flash address */
 
-#define PFX KBUILD_MODNAME ": "
-
 static struct mtd_partition *parsed_parts;
 
 static struct mtd_info *bcm963xx_mtd_info;
@@ -80,8 +80,8 @@ static int parse_cfe_partitions(struct mtd_info *master,
        tagversion = &(buf->tag_version[0]);
        boardid = &(buf->board_id[0]);
 
-       printk(KERN_INFO PFX "CFE boot tag found with version %s "
-                               "and board type %s\n", tagversion, boardid);
+       pr_info("CFE boot tag found with version %s and board type %s\n",
+               tagversion, boardid);
 
        kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
        rootfsaddr = kerneladdr + kernellen;
@@ -140,13 +140,13 @@ static int parse_cfe_partitions(struct mtd_info *master,
        parts[curpart].size = master->size - parts[0].size - parts[3].size;
 
        for (i = 0; i < nrparts; i++)
-               printk(KERN_INFO PFX "Partition %d is %s offset %lx and "
-                                       "length %lx\n", i, parts[i].name,
-                                       (long unsigned int)(parts[i].offset),
-                                       (long unsigned int)(parts[i].size));
+               pr_info("Partition %d is %s offset %lx and length %lx\n", i,
+                       parts[i].name, (long unsigned int)(parts[i].offset),
+                       (long unsigned int)(parts[i].size));
+
+       pr_info("Spare partition is offset %x and length %x\n", spareaddr,
+               sparelen);
 
-       printk(KERN_INFO PFX "Spare partition is offset %x and length %x\n",
-                                                       spareaddr, sparelen);
        *pparts = parts;
        vfree(buf);