1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/mtd/nand/bcm47xxnflash/main.c b/drivers/mtd/nand/bcm47xxnflash/main.c
index 8363a9a5fa3f..7bae569fdc79 100644
--- a/drivers/mtd/nand/bcm47xxnflash/main.c
+++ b/drivers/mtd/nand/bcm47xxnflash/main.c
@@ -9,14 +9,14 @@
  *
  */
 
+#include "bcm47xxnflash.h"
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/bcma/bcma.h>
 
-#include "bcm47xxnflash.h"
-
 MODULE_DESCRIPTION("NAND flash driver for BCMA bus");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Rafał Miłecki");
@@ -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,13 +89,10 @@ 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 serial flash driver: %d\n", err);
+                pr_err("Failed to register bcm47xx nand flash driver: %d\n",
+                       err);
 
         return err;
 }