| Message ID | 1307026293-8535-5-git-send-email-dbaryshkov@gmail.com |
|---|---|
| State | Accepted |
| Commit | 4d1220f6fa03f60a3d3995683911d29ae9c317f7 |
| Headers | show |
On Thu, 2011-06-02 at 18:51 +0400, Dmitry Eremin-Solenikov wrote: > 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> Pushed to l2-mtd-2.6.git, thanks.
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 35180e4..70d5fca 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -968,13 +968,7 @@ static int __devinit m25p_probe(struct spi_device *spi) /* partitions should match sector boundaries; and it may be good to * use readonly partitions for writeprotected sectors (BP2..BP0). */ - if (mtd_has_cmdlinepart()) { - static const char *part_probes[] - = { "cmdlinepart", NULL, }; - - nr_parts = parse_mtd_partitions(&flash->mtd, - part_probes, &parts, 0); - } + nr_parts = parse_mtd_partitions(&flash->mtd, NULL, &parts, 0); if (nr_parts <= 0 && data && data->parts) { parts = data->parts;
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> --- drivers/mtd/devices/m25p80.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-)