mtd: struct device - replace bus_id with dev_name(), dev_set_name()

CC: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

mtd: struct device - replace bus_id with dev_name(), dev_set_name()
CC: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Kay Sievers · Greg Kroah-Hartman
1 parent 24d254759d
Showing 17 changed files with 43 additions and 43 deletions Side-by-side Diff
drivers/mtd/devices/m25p80.c
drivers/mtd/devices/mtd_dataflash.c
drivers/mtd/maps/integrator-flash.c
drivers/mtd/maps/ixp2000.c
drivers/mtd/maps/ixp4xx.c
drivers/mtd/maps/omap_nor.c
drivers/mtd/maps/physmap.c
drivers/mtd/maps/physmap_of.c
drivers/mtd/mtdconcat.c
drivers/mtd/nand/fsl_upm.c
drivers/mtd/nand/plat_nand.c
drivers/mtd/nand/tmio_nand.c
drivers/mtd/onenand/generic.c
drivers/mtd/onenand/omap2.c
drivers/mtd/ubi/build.c
drivers/mtd/ubi/vmt.c
include/linux/mtd/concat.h
@@ -170,7 +170,7 @@
 static int erase_chip(struct m25p *flash)
 {
 	DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB\n",
-			flash->spi->dev.bus_id, __func__,
+			dev_name(&flash->spi->dev), __func__,
 			flash->mtd.size / 1024);
  
 	/* Wait until finished previous write command. */
@@ -197,7 +197,7 @@
 static int erase_sector(struct m25p *flash, u32 offset)
 {
 	DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB at 0x%08x\n",
-			flash->spi->dev.bus_id, __func__,
+			dev_name(&flash->spi->dev), __func__,
 			flash->mtd.erasesize / 1024, offset);
  
 	/* Wait until finished previous write command. */
@@ -234,7 +234,7 @@
 	u32 addr,len;
  
 	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %d\n",
-			flash->spi->dev.bus_id, __func__, "at",
+			dev_name(&flash->spi->dev), __func__, "at",
 			(u32)instr->addr, instr->len);
  
 	/* sanity checks */
@@ -295,7 +295,7 @@
 	struct spi_message m;
  
 	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",
-			flash->spi->dev.bus_id, __func__, "from",
+			dev_name(&flash->spi->dev), __func__, "from",
 			(u32)from, len);
  
 	/* sanity checks */
@@ -367,7 +367,7 @@
 	struct spi_message m;
  
 	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",
-			flash->spi->dev.bus_id, __func__, "to",
+			dev_name(&flash->spi->dev), __func__, "to",
 			(u32)to, len);
  
 	if (retlen)
@@ -563,7 +563,7 @@
 	tmp = spi_write_then_read(spi, &code, 1, id, 5);
 	if (tmp < 0) {
 		DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading JEDEC ID\n",
-			spi->dev.bus_id, tmp);
+			dev_name(&spi->dev), tmp);
 		return NULL;
 	}
 	jedec = id[0];
@@ -617,7 +617,7 @@
 		/* unrecognized chip? */
 		if (i == ARRAY_SIZE(m25p_data)) {
 			DEBUG(MTD_DEBUG_LEVEL0, "%s: unrecognized id %s\n",
-					spi->dev.bus_id, data->type);
+					dev_name(&spi->dev), data->type);
 			info = NULL;
  
 		/* recognized; is that chip really what's there? */
@@ -658,7 +658,7 @@
 	if (data && data->name)
 		flash->mtd.name = data->name;
 	else
-		flash->mtd.name = spi->dev.bus_id;
+		flash->mtd.name = dev_name(&spi->dev);
  
 	flash->mtd.type = MTD_NORFLASH;
 	flash->mtd.writesize = 1;
@@ -128,7 +128,7 @@
 		status = dataflash_status(spi);
 		if (status < 0) {
 			DEBUG(MTD_DEBUG_LEVEL1, "%s: status %d?\n",
-					spi->dev.bus_id, status);
+					dev_name(&spi->dev), status);
 			status = 0;
 		}
  
@@ -154,7 +154,7 @@
 	uint8_t			*command;
  
 	DEBUG(MTD_DEBUG_LEVEL2, "%s: erase addr=0x%x len 0x%x\n",
-			spi->dev.bus_id,
+			dev_name(&spi->dev),
 			instr->addr, instr->len);
  
 	/* Sanity checks */
@@ -197,7 +197,7 @@
  
 		if (status < 0) {
 			printk(KERN_ERR "%s: erase %x, err %d\n",
-				spi->dev.bus_id, pageaddr, status);
+				dev_name(&spi->dev), pageaddr, status);
 			/* REVISIT:  can retry instr->retries times; or
 			 * giveup and instr->fail_addr = instr->addr;
 			 */
@@ -239,7 +239,7 @@
 	int			status;
  
 	DEBUG(MTD_DEBUG_LEVEL2, "%s: read 0x%x..0x%x\n",
-		priv->spi->dev.bus_id, (unsigned)from, (unsigned)(from + len));
+		dev_name(&priv->spi->dev), (unsigned)from, (unsigned)(from + len));
  
 	*retlen = 0;
  
@@ -288,7 +288,7 @@
 		status = 0;
 	} else
 		DEBUG(MTD_DEBUG_LEVEL1, "%s: read %x..%x --> %d\n",
-			priv->spi->dev.bus_id,
+			dev_name(&priv->spi->dev),
 			(unsigned)from, (unsigned)(from + len),
 			status);
 	return status;
@@ -315,7 +315,7 @@
 	uint8_t			*command;
  
 	DEBUG(MTD_DEBUG_LEVEL2, "%s: write 0x%x..0x%x\n",
-		spi->dev.bus_id, (unsigned)to, (unsigned)(to + len));
+		dev_name(&spi->dev), (unsigned)to, (unsigned)(to + len));
  
 	*retlen = 0;
  
@@ -374,7 +374,7 @@
 			status = spi_sync(spi, &msg);
 			if (status < 0)
 				DEBUG(MTD_DEBUG_LEVEL1, "%s: xfer %u -> %d \n",
-					spi->dev.bus_id, addr, status);
+					dev_name(&spi->dev), addr, status);
  
 			(void) dataflash_waitready(priv->spi);
 		}
@@ -396,7 +396,7 @@
 		spi_transfer_del(x + 1);
 		if (status < 0)
 			DEBUG(MTD_DEBUG_LEVEL1, "%s: pgm %u/%u -> %d \n",
-				spi->dev.bus_id, addr, writelen, status);
+				dev_name(&spi->dev), addr, writelen, status);
  
 		(void) dataflash_waitready(priv->spi);
  
  
@@ -416,14 +416,14 @@
 		status = spi_sync(spi, &msg);
 		if (status < 0)
 			DEBUG(MTD_DEBUG_LEVEL1, "%s: compare %u -> %d \n",
-				spi->dev.bus_id, addr, status);
+				dev_name(&spi->dev), addr, status);
  
 		status = dataflash_waitready(priv->spi);
  
 		/* Check result of the compare operation */
 		if (status & (1 << 6)) {
 			printk(KERN_ERR "%s: compare page %u, err %d\n",
-				spi->dev.bus_id, pageaddr, status);
+				dev_name(&spi->dev), pageaddr, status);
 			remaining = 0;
 			status = -EIO;
 			break;
@@ -779,7 +779,7 @@
 	tmp = spi_write_then_read(spi, &code, 1, id, 3);
 	if (tmp < 0) {
 		DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading JEDEC ID\n",
-			spi->dev.bus_id, tmp);
+			dev_name(&spi->dev), tmp);
 		return ERR_PTR(tmp);
 	}
 	if (id[0] != 0x1f)
@@ -869,7 +869,7 @@
 	status = dataflash_status(spi);
 	if (status <= 0 || status == 0xff) {
 		DEBUG(MTD_DEBUG_LEVEL1, "%s: status error %d\n",
-				spi->dev.bus_id, status);
+				dev_name(&spi->dev), status);
 		if (status == 0 || status == 0xff)
 			status = -ENODEV;
 		return status;
  
@@ -905,13 +905,13 @@
 	/* obsolete AT45DB1282 not (yet?) supported */
 	default:
 		DEBUG(MTD_DEBUG_LEVEL1, "%s: unsupported device (%x)\n",
-				spi->dev.bus_id, status & 0x3c);
+				dev_name(&spi->dev), status & 0x3c);
 		status = -ENODEV;
 	}
  
 	if (status < 0)
 		DEBUG(MTD_DEBUG_LEVEL1, "%s: add_dataflash --> %d\n",
-				spi->dev.bus_id, status);
+				dev_name(&spi->dev), status);
  
 	return status;
 }
@@ -921,7 +921,7 @@
 	struct dataflash	*flash = dev_get_drvdata(&spi->dev);
 	int			status;
  
-	DEBUG(MTD_DEBUG_LEVEL1, "%s: remove\n", spi->dev.bus_id);
+	DEBUG(MTD_DEBUG_LEVEL1, "%s: remove\n", dev_name(&spi->dev));
  
 	if (mtd_has_partitions() && flash->partitioned)
 		status = del_mtd_partitions(&flash->mtd);
@@ -105,7 +105,7 @@
 	info->map.bankwidth	= plat->width;
 	info->map.phys		= res->start;
 	info->map.virt		= base;
-	info->map.name		= dev->dev.bus_id;
+	info->map.name		= dev_name(&dev->dev);
 	info->map.set_vpp	= armflash_set_vpp;
  
 	simple_map_init(&info->map);
@@ -188,7 +188,7 @@
  	 */
 	info->map.map_priv_2 = (unsigned long) ixp_data->bank_setup;
  
-	info->map.name = dev->dev.bus_id;
+	info->map.name = dev_name(&dev->dev);
 	info->map.read = ixp2000_flash_read8;
 	info->map.write = ixp2000_flash_write8;
 	info->map.copy_from = ixp2000_flash_copy_from;
@@ -196,7 +196,7 @@
  
 	info->res = request_mem_region(dev->resource->start,
 			dev->resource->end - dev->resource->start + 1,
-			dev->dev.bus_id);
+			dev_name(&dev->dev));
 	if (!info->res) {
 		dev_err(&dev->dev, "Could not reserve memory region\n");
 		err = -ENOMEM;
@@ -218,7 +218,7 @@
 	 * handle that.
 	 */
 	info->map.bankwidth = 2;
-	info->map.name = dev->dev.bus_id;
+	info->map.name = dev_name(&dev->dev);
 	info->map.read = ixp4xx_read16,
 	info->map.write = ixp4xx_probe_write16,
 	info->map.copy_from = ixp4xx_copy_from,
@@ -101,7 +101,7 @@
 		err = -ENOMEM;
 		goto out_release_mem_region;
 	}
-	info->map.name		= pdev->dev.bus_id;
+	info->map.name		= dev_name(&pdev->dev);
 	info->map.phys		= res->start;
 	info->map.size		= size;
 	info->map.bankwidth	= pdata->width;
@@ -108,13 +108,13 @@
 		if (!devm_request_mem_region(&dev->dev,
 			dev->resource[i].start,
 			dev->resource[i].end - dev->resource[i].start + 1,
-			dev->dev.bus_id)) {
+			dev_name(&dev->dev))) {
 			dev_err(&dev->dev, "Could not reserve memory region\n");
 			err = -ENOMEM;
 			goto err_out;
 		}
  
-		info->map[i].name = dev->dev.bus_id;
+		info->map[i].name = dev_name(&dev->dev);
 		info->map[i].phys = dev->resource[i].start;
 		info->map[i].size = dev->resource[i].end - dev->resource[i].start + 1;
 		info->map[i].bankwidth = physmap_data->width;
@@ -150,7 +150,7 @@
 		 * We detected multiple devices. Concatenate them together.
 		 */
 #ifdef CONFIG_MTD_CONCAT
-		info->cmtd = mtd_concat_create(info->mtd, devices_found, dev->dev.bus_id);
+		info->cmtd = mtd_concat_create(info->mtd, devices_found, dev_name(&dev->dev));
 		if (info->cmtd == NULL)
 			err = -ENXIO;
 #else
@@ -183,7 +183,7 @@
  
 	err = -EBUSY;
 	info->res = request_mem_region(res.start, res.end - res.start + 1,
-				       dev->dev.bus_id);
+				       dev_name(&dev->dev));
 	if (!info->res)
 		goto err_out;
  
@@ -194,7 +194,7 @@
 		goto err_out;
 	}
  
-	info->map.name = dev->dev.bus_id;
+	info->map.name = dev_name(&dev->dev);
 	info->map.phys = res.start;
 	info->map.size = res.end - res.start + 1;
 	info->map.bankwidth = *width;
@@ -691,7 +691,7 @@
  */
 struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to concatenate */
 				   int num_devs,	/* number of subdevices      */
-				   char *name)
+				   const char *name)
 {				/* name for the new device   */
 	int i;
 	size_t size;
@@ -222,7 +222,7 @@
  
 	fun->rnb_gpio = of_get_gpio(ofdev->node, 0);
 	if (fun->rnb_gpio >= 0) {
-		ret = gpio_request(fun->rnb_gpio, ofdev->dev.bus_id);
+		ret = gpio_request(fun->rnb_gpio, dev_name(&ofdev->dev));
 		if (ret) {
 			dev_err(&ofdev->dev, "can't request RNB gpio\n");
 			goto err2;
@@ -54,7 +54,7 @@
 	data->chip.priv = &data;
 	data->mtd.priv = &data->chip;
 	data->mtd.owner = THIS_MODULE;
-	data->mtd.name = pdev->dev.bus_id;
+	data->mtd.name = dev_name(&pdev->dev);
  
 	data->chip.IO_ADDR_R = data->io_base;
 	data->chip.IO_ADDR_W = data->io_base;
@@ -433,7 +433,7 @@
 	nand_chip->chip_delay = 15;
  
 	retval = request_irq(irq, &tmio_irq,
-				IRQF_DISABLED, dev->dev.bus_id, tmio);
+				IRQF_DISABLED, dev_name(&dev->dev), tmio);
 	if (retval) {
 		dev_err(&dev->dev, "request_irq error %d\n", retval);
 		goto err_irq;
@@ -63,7 +63,7 @@
 	info->onenand.mmcontrol = pdata->mmcontrol;
 	info->onenand.irq = platform_get_irq(pdev, 0);
  
-	info->mtd.name = pdev->dev.bus_id;
+	info->mtd.name = dev_name(&pdev->dev);
 	info->mtd.priv = &info->onenand;
 	info->mtd.owner = THIS_MODULE;
  
@@ -668,7 +668,7 @@
 		 c->onenand.base);
  
 	c->pdev = pdev;
-	c->mtd.name = pdev->dev.bus_id;
+	c->mtd.name = dev_name(&pdev->dev);
 	c->mtd.priv = &c->onenand;
 	c->mtd.owner = THIS_MODULE;
  
@@ -280,7 +280,7 @@
 	ubi->dev.release = dev_release;
 	ubi->dev.devt = ubi->cdev.dev;
 	ubi->dev.class = ubi_class;
-	sprintf(&ubi->dev.bus_id[0], UBI_NAME_STR"%d", ubi->ubi_num);
+	dev_set_name(&ubi->dev, UBI_NAME_STR"%d", ubi->ubi_num);
 	err = device_register(&ubi->dev);
 	if (err)
 		return err;
@@ -329,7 +329,7 @@
 	vol->dev.devt = dev;
 	vol->dev.class = ubi_class;
  
-	sprintf(&vol->dev.bus_id[0], "%s_%d", ubi->ubi_name, vol->vol_id);
+	dev_set_name(&vol->dev, "%s_%d", ubi->ubi_name, vol->vol_id);
 	err = device_register(&vol->dev);
 	if (err) {
 		ubi_err("cannot register device");
@@ -678,7 +678,7 @@
 	vol->dev.parent = &ubi->dev;
 	vol->dev.devt = dev;
 	vol->dev.class = ubi_class;
-	sprintf(&vol->dev.bus_id[0], "%s_%d", ubi->ubi_name, vol->vol_id);
+	dev_set_name(&vol->dev, "%s_%d", ubi->ubi_name, vol->vol_id);
 	err = device_register(&vol->dev);
 	if (err)
 		goto out_gluebi;
@@ -13,7 +13,7 @@
 struct mtd_info *mtd_concat_create(
     struct mtd_info *subdev[],  /* subdevices to concatenate */
     int num_devs,               /* number of subdevices      */
-    char *name);                /* name for the new device   */
+    const char *name);          /* name for the new device   */
  
 void mtd_concat_destroy(struct mtd_info *mtd);
...	...	@@ -170,7 +170,7 @@
170	170	static int erase_chip(struct m25p *flash)
171	171	{
172	172	DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB\n",
173		- flash->spi->dev.bus_id, __func__,
	173	+ dev_name(&flash->spi->dev), __func__,
174	174	flash->mtd.size / 1024);
175	175
176	176	/* Wait until finished previous write command. */
...	...	@@ -197,7 +197,7 @@
197	197	static int erase_sector(struct m25p *flash, u32 offset)
198	198	{
199	199	DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB at 0x%08x\n",
200		- flash->spi->dev.bus_id, __func__,
	200	+ dev_name(&flash->spi->dev), __func__,
201	201	flash->mtd.erasesize / 1024, offset);
202	202
203	203	/* Wait until finished previous write command. */
...	...	@@ -234,7 +234,7 @@
234	234	u32 addr,len;
235	235
236	236	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %d\n",
237		- flash->spi->dev.bus_id, __func__, "at",
	237	+ dev_name(&flash->spi->dev), __func__, "at",
238	238	(u32)instr->addr, instr->len);
239	239
240	240	/* sanity checks */
...	...	@@ -295,7 +295,7 @@
295	295	struct spi_message m;
296	296
297	297	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",
298		- flash->spi->dev.bus_id, __func__, "from",
	298	+ dev_name(&flash->spi->dev), __func__, "from",
299	299	(u32)from, len);
300	300
301	301	/* sanity checks */
...	...	@@ -367,7 +367,7 @@
367	367	struct spi_message m;
368	368
369	369	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",
370		- flash->spi->dev.bus_id, __func__, "to",
	370	+ dev_name(&flash->spi->dev), __func__, "to",
371	371	(u32)to, len);
372	372
373	373	if (retlen)
...	...	@@ -563,7 +563,7 @@
563	563	tmp = spi_write_then_read(spi, &code, 1, id, 5);
564	564	if (tmp < 0) {
565	565	DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading JEDEC ID\n",
566		- spi->dev.bus_id, tmp);
	566	+ dev_name(&spi->dev), tmp);
567	567	return NULL;
568	568	}
569	569	jedec = id[0];
...	...	@@ -617,7 +617,7 @@
617	617	/* unrecognized chip? */
618	618	if (i == ARRAY_SIZE(m25p_data)) {
619	619	DEBUG(MTD_DEBUG_LEVEL0, "%s: unrecognized id %s\n",
620		- spi->dev.bus_id, data->type);
	620	+ dev_name(&spi->dev), data->type);
621	621	info = NULL;
622	622
623	623	/* recognized; is that chip really what's there? */
...	...	@@ -658,7 +658,7 @@
658	658	if (data && data->name)
659	659	flash->mtd.name = data->name;
660	660	else
661		- flash->mtd.name = spi->dev.bus_id;
	661	+ flash->mtd.name = dev_name(&spi->dev);
662	662
663	663	flash->mtd.type = MTD_NORFLASH;
664	664	flash->mtd.writesize = 1;
...	...	@@ -128,7 +128,7 @@
128	128	status = dataflash_status(spi);
129	129	if (status < 0) {
130	130	DEBUG(MTD_DEBUG_LEVEL1, "%s: status %d?\n",
131		- spi->dev.bus_id, status);
	131	+ dev_name(&spi->dev), status);
132	132	status = 0;
133	133	}
134	134
...	...	@@ -154,7 +154,7 @@
154	154	uint8_t *command;
155	155
156	156	DEBUG(MTD_DEBUG_LEVEL2, "%s: erase addr=0x%x len 0x%x\n",
157		- spi->dev.bus_id,
	157	+ dev_name(&spi->dev),
158	158	instr->addr, instr->len);
159	159
160	160	/* Sanity checks */
...	...	@@ -197,7 +197,7 @@
197	197
198	198	if (status < 0) {
199	199	printk(KERN_ERR "%s: erase %x, err %d\n",
200		- spi->dev.bus_id, pageaddr, status);
	200	+ dev_name(&spi->dev), pageaddr, status);
201	201	/* REVISIT: can retry instr->retries times; or
202	202	* giveup and instr->fail_addr = instr->addr;
203	203	*/
...	...	@@ -239,7 +239,7 @@
239	239	int status;
240	240
241	241	DEBUG(MTD_DEBUG_LEVEL2, "%s: read 0x%x..0x%x\n",
242		- priv->spi->dev.bus_id, (unsigned)from, (unsigned)(from + len));
	242	+ dev_name(&priv->spi->dev), (unsigned)from, (unsigned)(from + len));
243	243
244	244	*retlen = 0;
245	245
...	...	@@ -288,7 +288,7 @@
288	288	status = 0;
289	289	} else
290	290	DEBUG(MTD_DEBUG_LEVEL1, "%s: read %x..%x --> %d\n",
291		- priv->spi->dev.bus_id,
	291	+ dev_name(&priv->spi->dev),
292	292	(unsigned)from, (unsigned)(from + len),
293	293	status);
294	294	return status;
...	...	@@ -315,7 +315,7 @@
315	315	uint8_t *command;
316	316
317	317	DEBUG(MTD_DEBUG_LEVEL2, "%s: write 0x%x..0x%x\n",
318		- spi->dev.bus_id, (unsigned)to, (unsigned)(to + len));
	318	+ dev_name(&spi->dev), (unsigned)to, (unsigned)(to + len));
319	319
320	320	*retlen = 0;
321	321
...	...	@@ -374,7 +374,7 @@
374	374	status = spi_sync(spi, &msg);
375	375	if (status < 0)
376	376	DEBUG(MTD_DEBUG_LEVEL1, "%s: xfer %u -> %d \n",
377		- spi->dev.bus_id, addr, status);
	377	+ dev_name(&spi->dev), addr, status);
378	378
379	379	(void) dataflash_waitready(priv->spi);
380	380	}
...	...	@@ -396,7 +396,7 @@
396	396	spi_transfer_del(x + 1);
397	397	if (status < 0)
398	398	DEBUG(MTD_DEBUG_LEVEL1, "%s: pgm %u/%u -> %d \n",
399		- spi->dev.bus_id, addr, writelen, status);
	399	+ dev_name(&spi->dev), addr, writelen, status);
400	400
401	401	(void) dataflash_waitready(priv->spi);
402	402
403	403
...	...	@@ -416,14 +416,14 @@
416	416	status = spi_sync(spi, &msg);
417	417	if (status < 0)
418	418	DEBUG(MTD_DEBUG_LEVEL1, "%s: compare %u -> %d \n",
419		- spi->dev.bus_id, addr, status);
	419	+ dev_name(&spi->dev), addr, status);
420	420
421	421	status = dataflash_waitready(priv->spi);
422	422
423	423	/* Check result of the compare operation */
424	424	if (status & (1 << 6)) {
425	425	printk(KERN_ERR "%s: compare page %u, err %d\n",
426		- spi->dev.bus_id, pageaddr, status);
	426	+ dev_name(&spi->dev), pageaddr, status);
427	427	remaining = 0;
428	428	status = -EIO;
429	429	break;
...	...	@@ -779,7 +779,7 @@
779	779	tmp = spi_write_then_read(spi, &code, 1, id, 3);
780	780	if (tmp < 0) {
781	781	DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading JEDEC ID\n",
782		- spi->dev.bus_id, tmp);
	782	+ dev_name(&spi->dev), tmp);
783	783	return ERR_PTR(tmp);
784	784	}
785	785	if (id[0] != 0x1f)
...	...	@@ -869,7 +869,7 @@
869	869	status = dataflash_status(spi);
870	870	if (status <= 0 \|\| status == 0xff) {
871	871	DEBUG(MTD_DEBUG_LEVEL1, "%s: status error %d\n",
872		- spi->dev.bus_id, status);
	872	+ dev_name(&spi->dev), status);
873	873	if (status == 0 \|\| status == 0xff)
874	874	status = -ENODEV;
875	875	return status;
876	876
...	...	@@ -905,13 +905,13 @@
905	905	/* obsolete AT45DB1282 not (yet?) supported */
906	906	default:
907	907	DEBUG(MTD_DEBUG_LEVEL1, "%s: unsupported device (%x)\n",
908		- spi->dev.bus_id, status & 0x3c);
	908	+ dev_name(&spi->dev), status & 0x3c);
909	909	status = -ENODEV;
910	910	}
911	911
912	912	if (status < 0)
913	913	DEBUG(MTD_DEBUG_LEVEL1, "%s: add_dataflash --> %d\n",
914		- spi->dev.bus_id, status);
	914	+ dev_name(&spi->dev), status);
915	915
916	916	return status;
917	917	}
...	...	@@ -921,7 +921,7 @@
921	921	struct dataflash *flash = dev_get_drvdata(&spi->dev);
922	922	int status;
923	923
924		- DEBUG(MTD_DEBUG_LEVEL1, "%s: remove\n", spi->dev.bus_id);
	924	+ DEBUG(MTD_DEBUG_LEVEL1, "%s: remove\n", dev_name(&spi->dev));
925	925
926	926	if (mtd_has_partitions() && flash->partitioned)
927	927	status = del_mtd_partitions(&flash->mtd);
...	...	@@ -105,7 +105,7 @@
105	105	info->map.bankwidth = plat->width;
106	106	info->map.phys = res->start;
107	107	info->map.virt = base;
108		- info->map.name = dev->dev.bus_id;
	108	+ info->map.name = dev_name(&dev->dev);
109	109	info->map.set_vpp = armflash_set_vpp;
110	110
111	111	simple_map_init(&info->map);
...	...	@@ -188,7 +188,7 @@
188	188	*/
189	189	info->map.map_priv_2 = (unsigned long) ixp_data->bank_setup;
190	190
191		- info->map.name = dev->dev.bus_id;
	191	+ info->map.name = dev_name(&dev->dev);
192	192	info->map.read = ixp2000_flash_read8;
193	193	info->map.write = ixp2000_flash_write8;
194	194	info->map.copy_from = ixp2000_flash_copy_from;
...	...	@@ -196,7 +196,7 @@
196	196
197	197	info->res = request_mem_region(dev->resource->start,
198	198	dev->resource->end - dev->resource->start + 1,
199		- dev->dev.bus_id);
	199	+ dev_name(&dev->dev));
200	200	if (!info->res) {
201	201	dev_err(&dev->dev, "Could not reserve memory region\n");
202	202	err = -ENOMEM;
...	...	@@ -218,7 +218,7 @@
218	218	* handle that.
219	219	*/
220	220	info->map.bankwidth = 2;
221		- info->map.name = dev->dev.bus_id;
	221	+ info->map.name = dev_name(&dev->dev);
222	222	info->map.read = ixp4xx_read16,
223	223	info->map.write = ixp4xx_probe_write16,
224	224	info->map.copy_from = ixp4xx_copy_from,
...	...	@@ -101,7 +101,7 @@
101	101	err = -ENOMEM;
102	102	goto out_release_mem_region;
103	103	}
104		- info->map.name = pdev->dev.bus_id;
	104	+ info->map.name = dev_name(&pdev->dev);
105	105	info->map.phys = res->start;
106	106	info->map.size = size;
107	107	info->map.bankwidth = pdata->width;
...	...	@@ -108,13 +108,13 @@
108	108	if (!devm_request_mem_region(&dev->dev,
109	109	dev->resource[i].start,
110	110	dev->resource[i].end - dev->resource[i].start + 1,
111		- dev->dev.bus_id)) {
	111	+ dev_name(&dev->dev))) {
112	112	dev_err(&dev->dev, "Could not reserve memory region\n");
113	113	err = -ENOMEM;
114	114	goto err_out;
115	115	}
116	116
117		- info->map[i].name = dev->dev.bus_id;
	117	+ info->map[i].name = dev_name(&dev->dev);
118	118	info->map[i].phys = dev->resource[i].start;
119	119	info->map[i].size = dev->resource[i].end - dev->resource[i].start + 1;
120	120	info->map[i].bankwidth = physmap_data->width;
...	...	@@ -150,7 +150,7 @@
150	150	* We detected multiple devices. Concatenate them together.
151	151	*/
152	152	#ifdef CONFIG_MTD_CONCAT
153		- info->cmtd = mtd_concat_create(info->mtd, devices_found, dev->dev.bus_id);
	153	+ info->cmtd = mtd_concat_create(info->mtd, devices_found, dev_name(&dev->dev));
154	154	if (info->cmtd == NULL)
155	155	err = -ENXIO;
156	156	#else
...	...	@@ -183,7 +183,7 @@
183	183
184	184	err = -EBUSY;
185	185	info->res = request_mem_region(res.start, res.end - res.start + 1,
186		- dev->dev.bus_id);
	186	+ dev_name(&dev->dev));
187	187	if (!info->res)
188	188	goto err_out;
189	189
...	...	@@ -194,7 +194,7 @@
194	194	goto err_out;
195	195	}
196	196
197		- info->map.name = dev->dev.bus_id;
	197	+ info->map.name = dev_name(&dev->dev);
198	198	info->map.phys = res.start;
199	199	info->map.size = res.end - res.start + 1;
200	200	info->map.bankwidth = *width;
...	...	@@ -691,7 +691,7 @@
691	691	*/
692	692	struct mtd_info mtd_concat_create(struct mtd_info subdev[], /* subdevices to concatenate */
693	693	int num_devs, /* number of subdevices */
694		- char *name)
	694	+ const char *name)
695	695	{ /* name for the new device */
696	696	int i;
697	697	size_t size;
...	...	@@ -222,7 +222,7 @@
222	222
223	223	fun->rnb_gpio = of_get_gpio(ofdev->node, 0);
224	224	if (fun->rnb_gpio >= 0) {
225		- ret = gpio_request(fun->rnb_gpio, ofdev->dev.bus_id);
	225	+ ret = gpio_request(fun->rnb_gpio, dev_name(&ofdev->dev));
226	226	if (ret) {
227	227	dev_err(&ofdev->dev, "can't request RNB gpio\n");
228	228	goto err2;