diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-05-29 12:17:02 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:02:03 -0400 |
commit | 2aedf3e982c1b0177710c87e2f199624d07abc8e (patch) | |
tree | 498050603107fd97c78179825d24fa281d5548c5 /drivers/mtd | |
parent | 5279fe36fa4c5e3f33b25111c1cbf08386e78d06 (diff) |
mtd: ndfc don't specify default parsing options
Since 'cmdline, NULL' is now a default for parse_mtd_partitions, don't specify
this in every driver, instead pass NULL to force parse_mtd_partitions
to use default.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/nand/ndfc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c index ea2dea8a9c88..cb66fd79f1fa 100644 --- a/drivers/mtd/nand/ndfc.c +++ b/drivers/mtd/nand/ndfc.c | |||
@@ -159,11 +159,6 @@ static int ndfc_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len) | |||
159 | static int ndfc_chip_init(struct ndfc_controller *ndfc, | 159 | static int ndfc_chip_init(struct ndfc_controller *ndfc, |
160 | struct device_node *node) | 160 | struct device_node *node) |
161 | { | 161 | { |
162 | #ifdef CONFIG_MTD_CMDLINE_PARTS | ||
163 | static const char *part_types[] = { "cmdlinepart", NULL }; | ||
164 | #else | ||
165 | static const char *part_types[] = { NULL }; | ||
166 | #endif | ||
167 | struct device_node *flash_np; | 162 | struct device_node *flash_np; |
168 | struct nand_chip *chip = &ndfc->chip; | 163 | struct nand_chip *chip = &ndfc->chip; |
169 | int ret; | 164 | int ret; |
@@ -204,7 +199,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc, | |||
204 | if (ret) | 199 | if (ret) |
205 | goto err; | 200 | goto err; |
206 | 201 | ||
207 | ret = parse_mtd_partitions(&ndfc->mtd, part_types, &ndfc->parts, 0); | 202 | ret = parse_mtd_partitions(&ndfc->mtd, NULL, &ndfc->parts, 0); |
208 | if (ret < 0) | 203 | if (ret < 0) |
209 | goto err; | 204 | goto err; |
210 | 205 | ||