summary refs log tree commit diff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-01-28 11:25:48 +0100
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2013-02-04 10:31:30 +0200
commita7bf6543e842e164ec00eb53863d0454200c59d4 (patch)
tree2f3aff28e03e7708ba477322b3bef0b8348df6f1
parent0fca6ab4e1761783acd393cbc55878f0522e1c4b (diff)
downloadlinux-a7bf6543e842e164ec00eb53863d0454200c59d4.tar.gz
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 <hauke@hauke-m.de>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
-rw-r--r--drivers/mtd/nand/bcm47xxnflash/main.c7
1 files changed, 2 insertions, 5 deletions
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);