aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2013-02-07 05:56:04 -0500
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2013-02-13 08:15:50 -0500
commitbe0638d9e4795254e28e39eff61e38f47d240fd2 (patch)
treec923b3ab4a84457a7cdaa8ddf31c290d3108dd81
parentef4e0c2145e928b1c165ac88a9aa20038a981488 (diff)
mtd: bcm47xxnflash: use pr_fmt for module prefix in messages
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
-rw-r--r--drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h4
-rw-r--r--drivers/mtd/nand/bcm47xxnflash/main.c4
-rw-r--r--drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
index 0bdb2ce4da75..c005a62330b1 100644
--- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
+++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
@@ -1,6 +1,10 @@
1#ifndef __BCM47XXNFLASH_H 1#ifndef __BCM47XXNFLASH_H
2#define __BCM47XXNFLASH_H 2#define __BCM47XXNFLASH_H
3 3
4#ifndef pr_fmt
5#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
6#endif
7
4#include <linux/mtd/mtd.h> 8#include <linux/mtd/mtd.h>
5#include <linux/mtd/nand.h> 9#include <linux/mtd/nand.h>
6 10
diff --git a/drivers/mtd/nand/bcm47xxnflash/main.c b/drivers/mtd/nand/bcm47xxnflash/main.c
index a52acdccd0c4..7bae569fdc79 100644
--- a/drivers/mtd/nand/bcm47xxnflash/main.c
+++ b/drivers/mtd/nand/bcm47xxnflash/main.c
@@ -9,14 +9,14 @@
9 * 9 *
10 */ 10 */
11 11
12#include "bcm47xxnflash.h"
13
12#include <linux/module.h> 14#include <linux/module.h>
13#include <linux/kernel.h> 15#include <linux/kernel.h>
14#include <linux/slab.h> 16#include <linux/slab.h>
15#include <linux/platform_device.h> 17#include <linux/platform_device.h>
16#include <linux/bcma/bcma.h> 18#include <linux/bcma/bcma.h>
17 19
18#include "bcm47xxnflash.h"
19
20MODULE_DESCRIPTION("NAND flash driver for BCMA bus"); 20MODULE_DESCRIPTION("NAND flash driver for BCMA bus");
21MODULE_LICENSE("GPL"); 21MODULE_LICENSE("GPL");
22MODULE_AUTHOR("Rafał Miłecki"); 22MODULE_AUTHOR("Rafał Miłecki");
diff --git a/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c b/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
index 86c9a79b89b3..37d5b8956694 100644
--- a/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
+++ b/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
@@ -9,13 +9,13 @@
9 * 9 *
10 */ 10 */
11 11
12#include "bcm47xxnflash.h"
13
12#include <linux/module.h> 14#include <linux/module.h>
13#include <linux/kernel.h> 15#include <linux/kernel.h>
14#include <linux/slab.h> 16#include <linux/slab.h>
15#include <linux/bcma/bcma.h> 17#include <linux/bcma/bcma.h>
16 18
17#include "bcm47xxnflash.h"
18
19/* Broadcom uses 1'000'000 but it seems to be too many. Tests on WNDR4500 has 19/* Broadcom uses 1'000'000 but it seems to be too many. Tests on WNDR4500 has
20 * shown 164 retries as maxiumum. */ 20 * shown 164 retries as maxiumum. */
21#define NFLASH_READY_RETRIES 1000 21#define NFLASH_READY_RETRIES 1000