Commit 6c7377ab authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



Cc: dbrownell@users.sourceforge.net
Cc: spi-devel-general@lists.sourceforge.net
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
parent 031d5518

drivers/spi/atmel_spi.c

+4 −4
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static void atmel_spi_next_message(struct spi_master *master) 
	spi = msg->spi;



	dev_dbg(master->dev.parent, "start message %p for %s\n",

			msg, spi->dev.bus_id);

			msg, dev_name(&spi->dev));



	/* select chip if it's not still active */

	if (as->stay) {
@@ -627,7 +627,7 @@ static int atmel_spi_setup(struct spi_device *spi) 
		if (!asd)

			return -ENOMEM;



		ret = gpio_request(npcs_pin, spi->dev.bus_id);

		ret = gpio_request(npcs_pin, dev_name(&spi->dev));

		if (ret) {

			kfree(asd);

			return ret;
@@ -668,7 +668,7 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg) 
	as = spi_master_get_devdata(spi->master);



	dev_dbg(controller, "new message %p submitted for %s\n",

			msg, spi->dev.bus_id);

			msg, dev_name(&spi->dev));



	if (unlikely(list_empty(&msg->transfers)))

		return -EINVAL;
@@ -803,7 +803,7 @@ static int __init atmel_spi_probe(struct platform_device *pdev) 
	as->clk = clk;



	ret = request_irq(irq, atmel_spi_interrupt, 0,

			pdev->dev.bus_id, master);

			dev_name(&pdev->dev), master);

	if (ret)

		goto out_unmap_regs;

drivers/spi/mpc52xx_psc_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int __init mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr, 
	INIT_LIST_HEAD(&mps->queue);



	mps->workqueue = create_singlethread_workqueue(

		master->dev.parent->bus_id);

		dev_name(master->dev.parent));

	if (mps->workqueue == NULL) {

		ret = -EBUSY;

		goto free_irq;

drivers/spi/omap2_mcspi.c

+1 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) 
		goto err1;

	}

	if (!request_mem_region(r->start, (r->end - r->start) + 1,

			pdev->dev.bus_id)) {

			dev_name(&pdev->dev))) {

		status = -EBUSY;

		goto err1;

	}

drivers/spi/omap_uwire.c

+6 −6
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t) 


#ifdef	VERBOSE

			pr_debug("%s: write-%d =%04x\n",

					spi->dev.bus_id, bits, val);

					dev_name(&spi->dev), bits, val);

#endif

			if (wait_uwire_csr_flag(CSRB, 0, 0))

				goto eio;
@@ -305,7 +305,7 @@ static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t) 
			status += bytes;

#ifdef	VERBOSE

			pr_debug("%s: read-%d =%04x\n",

					spi->dev.bus_id, bits, val);

					dev_name(&spi->dev), bits, val);

#endif



		}
@@ -331,7 +331,7 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t) 
	uwire = spi_master_get_devdata(spi->master);



	if (spi->chip_select > 3) {

		pr_debug("%s: cs%d?\n", spi->dev.bus_id, spi->chip_select);

		pr_debug("%s: cs%d?\n", dev_name(&spi->dev), spi->chip_select);

		status = -ENODEV;

		goto done;

	}
@@ -343,7 +343,7 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t) 
		bits = 8;



	if (bits > 16) {

		pr_debug("%s: wordsize %d?\n", spi->dev.bus_id, bits);

		pr_debug("%s: wordsize %d?\n", dev_name(&spi->dev), bits);

		status = -ENODEV;

		goto done;

	}
@@ -378,7 +378,7 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t) 
		hz = t->speed_hz;



	if (!hz) {

		pr_debug("%s: zero speed?\n", spi->dev.bus_id);

		pr_debug("%s: zero speed?\n", dev_name(&spi->dev));

		status = -EINVAL;

		goto done;

	}
@@ -406,7 +406,7 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t) 
	}

	if (div1_idx == 4) {

		pr_debug("%s: lowest clock %ld, need %d\n",

			spi->dev.bus_id, rate / 10 / 8, hz);

			dev_name(&spi->dev), rate / 10 / 8, hz);

		status = -EDOM;

		goto done;

	}

drivers/spi/orion_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static int __init orion_spi_probe(struct platform_device *pdev) 
	}



	if (!request_mem_region(r->start, (r->end - r->start) + 1,

				pdev->dev.bus_id)) {

				dev_name(&pdev->dev))) {

		status = -EBUSY;

		goto out;

	}