Commit 160bbab3 authored by Kay Sievers's avatar Kay Sievers Committed by David Woodhouse
Browse files

[MTD] struct device - replace bus_id with dev_name(), dev_set_name() 



Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent d85316ac

drivers/mtd/devices/m25p80.c

+10 −10
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int wait_till_ready(struct m25p *flash) 
static int erase_chip(struct m25p *flash)

{

	DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %lldKiB\n",

			flash->spi->dev.bus_id, __func__,

	      dev_name(&flash->spi->dev), __func__,

	      (long long)(flash->mtd.size >> 10));



	/* Wait until finished previous write command. */
@@ -198,7 +198,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. */
@@ -236,7 +236,7 @@ static int m25p80_erase(struct mtd_info *mtd, struct erase_info *instr) 
	uint32_t rem;



	DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%llx, len %lld\n",

			flash->spi->dev.bus_id, __func__, "at",

	      dev_name(&flash->spi->dev), __func__, "at",

	      (long long)instr->addr, (long long)instr->len);



	/* sanity checks */
@@ -296,7 +296,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 */
@@ -368,7 +368,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)
@@ -564,7 +564,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];
@@ -618,7 +618,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? */
@@ -659,7 +659,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;

drivers/mtd/devices/mtd_dataflash.c

+16 −16
Original line number Diff line number Diff line
@@ -129,7 +129,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;

		}
@@ -156,7 +156,7 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr) 
	uint32_t		rem;



	DEBUG(MTD_DEBUG_LEVEL2, "%s: erase addr=0x%llx len 0x%llx\n",

			spi->dev.bus_id, (long long)instr->addr,

	      dev_name(&spi->dev), (long long)instr->addr,

	      (long long)instr->len);



	/* Sanity checks */
@@ -203,7 +203,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;

			 */
@@ -245,7 +245,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;
@@ -294,7 +294,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;
@@ -321,7 +321,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;
@@ -380,7 +380,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);

		}
@@ -402,7 +402,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);
@@ -422,14 +422,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;
@@ -785,7 +785,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)
@@ -875,7 +875,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;
@@ -911,13 +911,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;

}
@@ -927,7 +927,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);

drivers/mtd/maps/integrator-flash.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/mtd/maps/ixp2000.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/mtd/maps/ixp4xx.c

+1 −1
Original line number Diff line number Diff line
@@ -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,