diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-05-29 12:17:14 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:02:04 -0400 |
commit | 18f8eb1b23619736872740f8c4697b6534a0524b (patch) | |
tree | 4b5e1a6afba0993897e89267d7bf6c571e6d6c04 /drivers/mtd/onenand/samsung.c | |
parent | 70f438c61636a194d7c3fa341fa72353ba0090f6 (diff) |
mtd: samsung/onenand 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/onenand/samsung.c')
-rw-r--r-- | drivers/mtd/onenand/samsung.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c index 3306b5b3c736..78a08eae6adf 100644 --- a/drivers/mtd/onenand/samsung.c +++ b/drivers/mtd/onenand/samsung.c | |||
@@ -157,8 +157,6 @@ struct s3c_onenand { | |||
157 | 157 | ||
158 | static struct s3c_onenand *onenand; | 158 | static struct s3c_onenand *onenand; |
159 | 159 | ||
160 | static const char *part_probes[] = { "cmdlinepart", NULL, }; | ||
161 | |||
162 | static inline int s3c_read_reg(int offset) | 160 | static inline int s3c_read_reg(int offset) |
163 | { | 161 | { |
164 | return readl(onenand->base + offset); | 162 | return readl(onenand->base + offset); |
@@ -1017,7 +1015,7 @@ static int s3c_onenand_probe(struct platform_device *pdev) | |||
1017 | if (s3c_read_reg(MEM_CFG_OFFSET) & ONENAND_SYS_CFG1_SYNC_READ) | 1015 | if (s3c_read_reg(MEM_CFG_OFFSET) & ONENAND_SYS_CFG1_SYNC_READ) |
1018 | dev_info(&onenand->pdev->dev, "OneNAND Sync. Burst Read enabled\n"); | 1016 | dev_info(&onenand->pdev->dev, "OneNAND Sync. Burst Read enabled\n"); |
1019 | 1017 | ||
1020 | err = parse_mtd_partitions(mtd, part_probes, &onenand->parts, 0); | 1018 | err = parse_mtd_partitions(mtd, NULL, &onenand->parts, 0); |
1021 | if (err > 0) | 1019 | if (err > 0) |
1022 | mtd_device_register(mtd, onenand->parts, err); | 1020 | mtd_device_register(mtd, onenand->parts, err); |
1023 | else if (err <= 0 && pdata && pdata->parts) | 1021 | else if (err <= 0 && pdata && pdata->parts) |