Merge tag 'mtd/fixes-for-5.0-rc8' of git://git.infradead.org/linux-mtd

torvalds · torvalds · commit 7d9d592caf8c · 2019-02-20T09:16:11.000-08:00
Pull MTD fixes from Boris Brezillon:

 - Don't add a digit to MTD-backed nvmem device names

 - Make sure powernv flash names are unique

* tag 'mtd/fixes-for-5.0-rc8' of git://git.infradead.org/linux-mtd:
  mtd: powernv_flash: Fix device registration error
  mtd: Use mtd-&gt;name when registering nvmem device
diff --git a/drivers/mtd/devices/powernv_flash.c b/drivers/mtd/devices/powernv_flash.c
@@ -212,7 +212,7 @@ static int powernv_flash_set_driver_info(struct device *dev,
 	 * Going to have to check what details I need to set and how to
 	 * get them
 	 */
-	mtd->name = devm_kasprintf(dev, GFP_KERNEL, "%pOFn", dev->of_node);
+	mtd->name = devm_kasprintf(dev, GFP_KERNEL, "%pOFP", dev->of_node);
 	mtd->type = MTD_NORFLASH;
 	mtd->flags = MTD_WRITEABLE;
 	mtd->size = size;
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
@@ -507,6 +507,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd)
 {
 	struct nvmem_config config = {};
 
+	config.id = -1;
 	config.dev = &mtd->dev;
 	config.name = mtd->name;
 	config.owner = THIS_MODULE;

Original file line number	Diff line number	Diff line change
`@@ -507,6 +507,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd)`
`507`	`507`	`{`
`508`	`508`	`struct nvmem_config config = {};`
`509`	`509`
	`510`	`+ config.id = -1;`
`510`	`511`	`config.dev = &mtd->dev;`
`511`	`512`	`config.name = mtd->name;`
`512`	`513`	`config.owner = THIS_MODULE;`