提交 ca105f4d 编写于 作者: J Jonas Gorski 提交者: David Woodhouse

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: NJonas Gorski <jonas.gorski@gmail.com>
Acked-by: NFlorian Fainelli <florian@openwrt.org>
Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
上级 6ae9c1c8
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * 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/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -34,8 +36,6 @@ ...@@ -34,8 +36,6 @@
#define BCM63XX_BUSWIDTH 2 /* Buswidth */ #define BCM63XX_BUSWIDTH 2 /* Buswidth */
#define BCM63XX_EXTENDED_SIZE 0xBFC00000 /* Extended flash address */ #define BCM63XX_EXTENDED_SIZE 0xBFC00000 /* Extended flash address */
#define PFX KBUILD_MODNAME ": "
static struct mtd_partition *parsed_parts; static struct mtd_partition *parsed_parts;
static struct mtd_info *bcm963xx_mtd_info; static struct mtd_info *bcm963xx_mtd_info;
...@@ -80,8 +80,8 @@ static int parse_cfe_partitions(struct mtd_info *master, ...@@ -80,8 +80,8 @@ static int parse_cfe_partitions(struct mtd_info *master,
tagversion = &(buf->tag_version[0]); tagversion = &(buf->tag_version[0]);
boardid = &(buf->board_id[0]); boardid = &(buf->board_id[0]);
printk(KERN_INFO PFX "CFE boot tag found with version %s " pr_info("CFE boot tag found with version %s and board type %s\n",
"and board type %s\n", tagversion, boardid); tagversion, boardid);
kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE; kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
rootfsaddr = kerneladdr + kernellen; rootfsaddr = kerneladdr + kernellen;
...@@ -140,13 +140,13 @@ static int parse_cfe_partitions(struct mtd_info *master, ...@@ -140,13 +140,13 @@ static int parse_cfe_partitions(struct mtd_info *master,
parts[curpart].size = master->size - parts[0].size - parts[3].size; parts[curpart].size = master->size - parts[0].size - parts[3].size;
for (i = 0; i < nrparts; i++) for (i = 0; i < nrparts; i++)
printk(KERN_INFO PFX "Partition %d is %s offset %lx and " pr_info("Partition %d is %s offset %lx and length %lx\n", i,
"length %lx\n", i, parts[i].name, parts[i].name, (long unsigned int)(parts[i].offset),
(long unsigned int)(parts[i].offset), (long unsigned int)(parts[i].size));
(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; *pparts = parts;
vfree(buf); vfree(buf);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册