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>

17 files changed, 43 insertions, 43 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 6659b2275c0c..5733f0643843 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -170,7 +170,7 @@ static int wait_till_ready(struct m25p *flash)
 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_chip(struct m25p *flash)
 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 @@ static int m25p80_erase(struct mtd_info *mtd, struct erase_info *instr)
         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 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
         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 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
         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 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
         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 @@ static int __devinit m25p_probe(struct spi_device *spi)
                 /* 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 @@ static int __devinit m25p_probe(struct spi_device *spi)
         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;
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 6dd9aff8bb2d..65126cd668ff 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -128,7 +128,7 @@ static int dataflash_waitready(struct spi_device *spi)
                 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 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
         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 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
 
                 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 @@ static int dataflash_read(struct mtd_info *mtd, loff_t from, size_t len,
         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 @@ static int dataflash_read(struct mtd_info *mtd, loff_t from, size_t len,
                 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 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
         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 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
                         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 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
                 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 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
                 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 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi)
         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 @@ static int __devinit dataflash_probe(struct spi_device *spi)
         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 @@ static int __devinit dataflash_probe(struct spi_device *spi)
         /* 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 @@ static int __devexit dataflash_remove(struct spi_device *spi)
         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);
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c
index 7100ee3c7b01..d2ec262666c7 100644
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@ -105,7 +105,7 @@ static int armflash_probe(struct platform_device *dev)
         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);
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index 3ea1de9be720..d4fb9a3ab4df 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -188,7 +188,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
          */
         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 @@ static int ixp2000_flash_probe(struct platform_device *dev)
 
         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;
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 16555cbeaea4..7214b876feba 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -218,7 +218,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
          * 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,
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index 05f276af15da..7e50e9b1b781 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -101,7 +101,7 @@ static int __init omapflash_probe(struct platform_device *pdev)
                 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;
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index dfbf3f270cea..1db16e549e38 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -108,13 +108,13 @@ static int physmap_flash_probe(struct platform_device *dev)
                 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 @@ static int physmap_flash_probe(struct platform_device *dev)
                  * 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
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 5fcfec034a94..fbf0ca939d72 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -183,7 +183,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
 
         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 @@ static int __devinit of_flash_probe(struct of_device *dev,
                 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;
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 789842d0e6f2..1a05cf37851e 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -691,7 +691,7 @@ static int concat_block_markbad(struct mtd_info *mtd, loff_t ofs)
  */
 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;
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index a83192f80eba..7815a404a632 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -222,7 +222,7 @@ static int __devinit fun_probe(struct of_device *ofdev,
 
         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;
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index f674c5427b17..75f9f4874ecf 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -54,7 +54,7 @@ static int __init plat_nand_probe(struct platform_device *pdev)
         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;
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index edb1e322113d..daa6a4c3b8ce 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -433,7 +433,7 @@ static int tmio_probe(struct platform_device *dev)
         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;
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
index ad81ab8e95e2..5b69e7773c6c 100644
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
@@ -63,7 +63,7 @@ static int __devinit generic_onenand_probe(struct device *dev)
         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;
 
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index d1e0b8e7224b..96ecc1766fa8 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -668,7 +668,7 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
                  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;
 
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index ba0bd3d5775b..7caf22cd5ad0 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -280,7 +280,7 @@ static int ubi_sysfs_init(struct ubi_device *ubi)
         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;
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 3531ca9a1e24..22e1d7398fce 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -329,7 +329,7 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req)
         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 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol)
         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;
diff --git a/include/linux/mtd/concat.h b/include/linux/mtd/concat.h
index c02f3d264ecf..e80c674daeb3 100644
--- a/include/linux/mtd/concat.h
+++ b/include/linux/mtd/concat.h
@@ -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);