diff options
Diffstat (limited to 'drivers/mtd/nand/h1910.c')
-rw-r--r-- | drivers/mtd/nand/h1910.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c index 02a03e67109c..5dc6f0d92f1a 100644 --- a/drivers/mtd/nand/h1910.c +++ b/drivers/mtd/nand/h1910.c | |||
@@ -81,9 +81,6 @@ static int h1910_device_ready(struct mtd_info *mtd) | |||
81 | static int __init h1910_init(void) | 81 | static int __init h1910_init(void) |
82 | { | 82 | { |
83 | struct nand_chip *this; | 83 | struct nand_chip *this; |
84 | const char *part_type = 0; | ||
85 | int mtd_parts_nb = 0; | ||
86 | struct mtd_partition *mtd_parts = 0; | ||
87 | void __iomem *nandaddr; | 84 | void __iomem *nandaddr; |
88 | 85 | ||
89 | if (!machine_is_h1900()) | 86 | if (!machine_is_h1900()) |
@@ -136,22 +133,10 @@ static int __init h1910_init(void) | |||
136 | iounmap((void *)nandaddr); | 133 | iounmap((void *)nandaddr); |
137 | return -ENXIO; | 134 | return -ENXIO; |
138 | } | 135 | } |
139 | #ifdef CONFIG_MTD_CMDLINE_PARTS | ||
140 | mtd_parts_nb = parse_cmdline_partitions(h1910_nand_mtd, &mtd_parts, "h1910-nand"); | ||
141 | if (mtd_parts_nb > 0) | ||
142 | part_type = "command line"; | ||
143 | else | ||
144 | mtd_parts_nb = 0; | ||
145 | #endif | ||
146 | if (mtd_parts_nb == 0) { | ||
147 | mtd_parts = partition_info; | ||
148 | mtd_parts_nb = NUM_PARTITIONS; | ||
149 | part_type = "static"; | ||
150 | } | ||
151 | 136 | ||
152 | /* Register the partitions */ | 137 | /* Register the partitions */ |
153 | printk(KERN_NOTICE "Using %s partition definition\n", part_type); | 138 | mtd_device_parse_register(h1910_nand_mtd, NULL, 0, |
154 | mtd_device_register(h1910_nand_mtd, mtd_parts, mtd_parts_nb); | 139 | partition_info, NUM_PARTITIONS); |
155 | 140 | ||
156 | /* Return happy */ | 141 | /* Return happy */ |
157 | return 0; | 142 | return 0; |