[PATCH] mtd/physmap: use parse_mtd()

[Andrew Morton]

On Wed, 12 Nov 2008 18:39:48 -0500
Mike Frysinger <vapier at gentoo.org> wrote:

> Call parse_mtd() to handle partition/device registration rather than doing
> it all ourself.
> 
> Signed-off-by: Mike Frysinger <vapier at gentoo.org>
> ---
>  drivers/mtd/maps/physmap.c |   21 +--------------------
>  1 files changed, 1 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
> index 42d844f..9b87fd8 100644
> --- a/drivers/mtd/maps/physmap.c
> +++ b/drivers/mtd/maps/physmap.c
> @@ -84,9 +84,6 @@ static int physmap_flash_remove(struct platform_device *dev)
>  }
>  
>  static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
> -#ifdef CONFIG_MTD_PARTITIONS
> -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
> -#endif
>  
>  static int physmap_flash_probe(struct platform_device *dev)
>  {
> @@ -170,23 +167,7 @@ static int physmap_flash_probe(struct platform_device *dev)
>  	if (err)
>  		goto err_out;
>  
> -#ifdef CONFIG_MTD_PARTITIONS
> -	err = parse_mtd_partitions(info->cmtd, part_probe_types, &info->parts, 0);
> -	if (err > 0) {
> -		add_mtd_partitions(info->cmtd, info->parts, err);
> -		return 0;
> -	}
> -
> -	if (physmap_data->nr_parts) {
> -		printk(KERN_NOTICE "Using physmap partition information\n");
> -		add_mtd_partitions(info->cmtd, physmap_data->parts,
> -				   physmap_data->nr_parts);
> -		return 0;
> -	}
> -#endif
> -
> -	add_mtd_device(info->cmtd);
> -	return 0;
> +	return parse_mtd(info->cmtd, NULL, physmap_data->parts, physmap_data->nr_parts);
>  
>  err_out:
>  	physmap_flash_remove(dev);

This didn't apply due to
physmap-fix-leak-of-memory-returned-by-parse_mtd_partitions.patch.  I
just smashed it in anyway.  Should I drop
physmap-fix-leak-of-memory-returned-by-parse_mtd_partitions.patch
instead?  Your changelog mentioned nothing about leak-fixing?