diff mbox

[006/104] mtdpart: default to cmdlinepart, NULL partitions probing

Message ID 1307026293-8535-4-git-send-email-dbaryshkov@gmail.com
State Accepted
Commit 5c4eefbd5bb82a525ce5340cc8a91ab6dffeb490
Headers show

Commit Message

Dmitry Baryshkov June 2, 2011, 2:51 p.m. UTC
Lots of MTD devices default to cmdlinepart, NULL as partition parsing
order. Make it a default.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 drivers/mtd/mtdpart.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Comments

Artem Bityutskiy June 6, 2011, 7:14 a.m. UTC | #1
On Thu, 2011-06-02 at 18:51 +0400, Dmitry Eremin-Solenikov wrote:
> Lots of MTD devices default to cmdlinepart, NULL as partition parsing
> order. Make it a default.
> 
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
>  drivers/mtd/mtdpart.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
> index 630be3e..3477e16 100644
> --- a/drivers/mtd/mtdpart.c
> +++ b/drivers/mtd/mtdpart.c
> @@ -712,12 +712,17 @@ int deregister_mtd_parser(struct mtd_part_parser *p)
>  }
>  EXPORT_SYMBOL_GPL(deregister_mtd_parser);
>  
> +static const char *default_mtd_part_types[] = {"cmdlinepart", NULL};
> +
>  int parse_mtd_partitions(struct mtd_info *master, const char **types,
>  			 struct mtd_partition **pparts, unsigned long origin)
>  {
>  	struct mtd_part_parser *parser;
>  	int ret = 0;
>  
> +	if (!types)
> +		types = default_mtd_part_types;
> +
>  	for ( ; ret <= 0 && *types; types++) {
>  		parser = get_partition_parser(*types);
>  		if (!parser && !request_module("%s", *types))

Pushed patches 4 and 5 to l2-mtd-2.6.git. Going to push this one as
well, but I would be nice go put a piece of descriptive comment above
'parse_mtd_partitions()', preferably a nice kerneldoc comment. As a
separate patch.

Anyway, pushing this one to the l2 tree as well.

P.S. Also added an "mtd:" prefix.
diff mbox

Patch

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 630be3e..3477e16 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -712,12 +712,17 @@  int deregister_mtd_parser(struct mtd_part_parser *p)
 }
 EXPORT_SYMBOL_GPL(deregister_mtd_parser);
 
+static const char *default_mtd_part_types[] = {"cmdlinepart", NULL};
+
 int parse_mtd_partitions(struct mtd_info *master, const char **types,
 			 struct mtd_partition **pparts, unsigned long origin)
 {
 	struct mtd_part_parser *parser;
 	int ret = 0;
 
+	if (!types)
+		types = default_mtd_part_types;
+
 	for ( ; ret <= 0 && *types; types++) {
 		parser = get_partition_parser(*types);
 		if (!parser && !request_module("%s", *types))