From 0fca6ab4e1761783acd393cbc55878f0522e1c4b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 28 Jan 2013 11:25:47 +0100 Subject: mtd: bcm47xxnflash: fix message This is not a serial flash driver, but a nand flash driver Signed-off-by: Hauke Mehrtens Signed-off-by: Artem Bityutskiy --- drivers/mtd/nand/bcm47xxnflash/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/mtd/nand/bcm47xxnflash') diff --git a/drivers/mtd/nand/bcm47xxnflash/main.c b/drivers/mtd/nand/bcm47xxnflash/main.c index 8363a9a5fa3f..3e2076285230 100644 --- a/drivers/mtd/nand/bcm47xxnflash/main.c +++ b/drivers/mtd/nand/bcm47xxnflash/main.c @@ -94,7 +94,8 @@ static int __init bcm47xxnflash_init(void) */ err = platform_driver_probe(&bcm47xxnflash_driver, bcm47xxnflash_probe); if (err) - pr_err("Failed to register serial flash driver: %d\n", err); + pr_err("Failed to register bcm47xx nand flash driver: %d\n", + err); return err; } -- cgit v1.2.3 From a7bf6543e842e164ec00eb53863d0454200c59d4 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 28 Jan 2013 11:25:48 +0100 Subject: mtd: bcm47xxnflash: register this as normal driver When platform_driver_probe() is used and no device is registered for this driver -ENODEV is returned and and error message is shown. Not all BCM47xx SoC have a nand flash chip controller and chip and for them an error message was shown. Signed-off-by: Hauke Mehrtens Signed-off-by: Artem Bityutskiy --- drivers/mtd/nand/bcm47xxnflash/main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'drivers/mtd/nand/bcm47xxnflash') diff --git a/drivers/mtd/nand/bcm47xxnflash/main.c b/drivers/mtd/nand/bcm47xxnflash/main.c index 3e2076285230..a52acdccd0c4 100644 --- a/drivers/mtd/nand/bcm47xxnflash/main.c +++ b/drivers/mtd/nand/bcm47xxnflash/main.c @@ -77,6 +77,7 @@ static int bcm47xxnflash_remove(struct platform_device *pdev) } static struct platform_driver bcm47xxnflash_driver = { + .probe = bcm47xxnflash_probe, .remove = bcm47xxnflash_remove, .driver = { .name = "bcma_nflash", @@ -88,11 +89,7 @@ static int __init bcm47xxnflash_init(void) { int err; - /* - * Platform device "bcma_nflash" exists on SoCs and is registered very - * early, it won't be added during runtime (use platform_driver_probe). - */ - err = platform_driver_probe(&bcm47xxnflash_driver, bcm47xxnflash_probe); + err = platform_driver_register(&bcm47xxnflash_driver); if (err) pr_err("Failed to register bcm47xx nand flash driver: %d\n", err); -- cgit v1.2.3 From be0638d9e4795254e28e39eff61e38f47d240fd2 Mon Sep 17 00:00:00 2001 From: Rafał Miłecki Date: Thu, 7 Feb 2013 11:56:04 +0100 Subject: mtd: bcm47xxnflash: use pr_fmt for module prefix in messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki Signed-off-by: Artem Bityutskiy --- drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h | 4 ++++ drivers/mtd/nand/bcm47xxnflash/main.c | 4 ++-- drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'drivers/mtd/nand/bcm47xxnflash') 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 @@ #ifndef __BCM47XXNFLASH_H #define __BCM47XXNFLASH_H +#ifndef pr_fmt +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#endif + #include #include 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 @@ * */ +#include "bcm47xxnflash.h" + #include #include #include #include #include -#include "bcm47xxnflash.h" - MODULE_DESCRIPTION("NAND flash driver for BCMA bus"); MODULE_LICENSE("GPL"); MODULE_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 @@ * */ +#include "bcm47xxnflash.h" + #include #include #include #include -#include "bcm47xxnflash.h" - /* Broadcom uses 1'000'000 but it seems to be too many. Tests on WNDR4500 has * shown 164 retries as maxiumum. */ #define NFLASH_READY_RETRIES 1000 -- cgit v1.2.3