mtd: diskonchip: remove two-phase partitioning / registration

[karo-tx-linux.git] / drivers / mtd / nand / diskonchip.c

diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index e5800146cf33a9c1c2fc452846c3931cfa79030d..7da266a5397990281e0a35625435168b2f11a78f 100644 (file)
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1301,10 +1301,7 @@ static int __init nftl_scan_bbt(struct mtd_info *mtd)
        if (ret)
                return ret;
 
-       mtd_device_register(mtd, NULL, 0);
-       if (!no_autopart)
-               mtd_device_register(mtd, parts, numparts);
-       return 0;
+       return mtd_device_register(mtd, parts, no_autopart ? 0 : numparts);
 }
 
 static int __init inftl_scan_bbt(struct mtd_info *mtd)
@@ -1358,10 +1355,7 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd)
           autopartitioning, but I want to give it more thought. */
        if (!numparts)
                return -EIO;
-       mtd_device_register(mtd, NULL, 0);
-       if (!no_autopart)
-               mtd_device_register(mtd, parts, numparts);
-       return 0;
+       return mtd_device_register(mtd, parts, no_autopart ? 0 : numparts);
 }
 
 static inline int __init doc2000_init(struct mtd_info *mtd)