From patchwork Mon Dec  5 07:05:45 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: pxa2xx-flash.c
Date: Sun, 04 Dec 2011 21:05:45 -0000
From: =?ISO-8859-15?Q?Anders=20M=F8rk-Pedersen?= <amp@frogne.dk>
X-Patchwork-Id: 129229
Message-Id: <4EDC7B590200008E00014334@mail.frogne.dk>
To: <linux-mtd@lists.infradead.org>

I have done as you instructed and created a patch for "git am" and
attached it to this mail.

I've also sent a copy to: Dmitry Eremin-Solenikov
<dbaryshkov@gmail.com>

Best regards
Anders


On Fri, 2011-12-02 at 15:40 +0100, Anders Mørk-Pedersen wrote:
> Hi,
> 
> I've noticed a problem with a patch for the pxa2xx-flash.c map, which
has been committed to the nextline kernel (currently 3.2-rc3)
> 
> The problem is that hardcoded mtd partitions are no longer probed -
and that breaks a lot of board support modules.
> 
> The patch is described as 
> "mtd: pxa2xx-flash.c: use mtd_device_parse_register"
> 
> and can be seen here:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=6fcdc92fce81eadcee262a7a66bf3207314fab87
> 
> I have created a small patch to address this.

Looks OK, but could you please send a patch suitable for 'git am'? So
that I save your mail and give it to git-am and end up with a commit
which has you as the author, and a nice commit message. Also, please,
CC
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com

Thanks!


diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index 411a17d..37709a6 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -54,6 +54,7 @@ static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)
 	struct flash_platform_data *flash = pdev->dev.platform_data;
 	struct pxa2xx_flash_info *info;
 	struct resource *res;
+	struct mtd_part_parser_data	ppdata;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res)
@@ -98,7 +99,10 @@ static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)
 	}
 	info->mtd->owner = THIS_MODULE;
 
-	mtd_device_parse_register(info->mtd, probes, 0, NULL, 0);
+	ppdata.of_node = pdev->dev.of_node;
+	mtd_device_parse_register(info->mtd, probes, &ppdata,
+			flash ? flash->parts : NULL,
+			flash ? flash->nr_parts : 0);
 
 	platform_set_drvdata(pdev, info);
 	return 0;