Skip to contentSkip to conversation

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

PATCH Kay Sievers 1 participant 1 message Jan 25, 2009

Subsystems (3)
Arm i.MX and Layerscape SPI Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

Kay Sievers

author
#0 lore raw

From: Kay Sievers <[email protected]>
Subject: spi: struct device - replace bus_id with dev_name(), dev_set_name()

Cc [email protected]
Cc spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Acked-by Greg Kroah-Hartman <[email protected]>
Signed-off-by Kay Sievers <[email protected]>
---
 drivers/spi/atmel_spi.c       |    8 ++++----
 drivers/spi/mpc52xx_psc_spi.c |    2 +-
 drivers/spi/omap2_mcspi.c     |    2 +-
 drivers/spi/omap_uwire.c      |   12 ++++++------
 drivers/spi/orion_spi.c       |    2 +-
 drivers/spi/pxa2xx_spi.c      |    4 ++--
 drivers/spi/spi_bfin5xx.c     |    4 ++--
 drivers/spi/spi_gpio.c        |    2 +-
 drivers/spi/spi_imx.c         |    5 +++--
 drivers/spi/spi_mpc83xx.c     |    4 ++--
 drivers/spi/spi_txx9.c        |    3 ++-
 11 files changed, 25 insertions(+), 23 deletions(-)
drivers/spi/atmel_spi.c +4 -4
@@ -322,7 +322,7 @@ static void atmel_spi_next_message(struc
 	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_de
 		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
 	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
 	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
@@ -429,7 +429,7 @@ static int __init mpc52xx_psc_spi_do_pro
 	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
@@ -1003,7 +1003,7 @@ static int __init omap2_mcspi_probe(stru
 		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
@@ -245,7 +245,7 @@ static int uwire_txrx(struct spi_device
 
 #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
 			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 s
 	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 s
 		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 s
 		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 s
 	}
 	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
@@ -496,7 +496,7 @@ static int __init orion_spi_probe(struct
 	}
 
 	if (!request_mem_region(r->start, (r->end - r->start) + 1,
-				pdev->dev.bus_id)) {
+				dev_name(&pdev->dev))) {
 		status = -EBUSY;
 		goto out;
 	}
drivers/spi/pxa2xx_spi.c +2 -2
@@ -1333,7 +1333,7 @@ static int __init init_queue(struct driv
 
 	INIT_WORK(&drv_data->pump_messages, pump_messages);
 	drv_data->workqueue = create_singlethread_workqueue(
-					drv_data->master->dev.parent->bus_id);
+				dev_name(drv_data->master->dev.parent));
 	if (drv_data->workqueue == NULL)
 		return -EBUSY;
 

@@ -1462,7 +1462,7 @@ static int __init pxa2xx_spi_probe(struc
 		drv_data->mask_sr = SSSR_TINT | SSSR_RFS | SSSR_TFS | SSSR_ROR;
 	}
 
-	status = request_irq(ssp->irq, ssp_int, 0, dev->bus_id, drv_data);
+	status = request_irq(ssp->irq, ssp_int, 0, dev_name(dev), drv_data);
 	if (status < 0) {
 		dev_err(&pdev->dev, "cannot get IRQ %d\n", ssp->irq);
 		goto out_error_master_alloc;
drivers/spi/spi_bfin5xx.c +2 -2
@@ -1160,8 +1160,8 @@ static inline int init_queue(struct driv
 
 	/* init messages workqueue */
 	INIT_WORK(&drv_data->pump_messages, pump_messages);
-	drv_data->workqueue =
-	    create_singlethread_workqueue(drv_data->master->dev.parent->bus_id);
+	drv_data->workqueue = create_singlethread_workqueue(
+				dev_name(drv_data->master->dev.parent));
 	if (drv_data->workqueue == NULL)
 		return -EBUSY;
drivers/spi/spi_gpio.c +1 -1
@@ -191,7 +191,7 @@ static int spi_gpio_setup(struct spi_dev
 		return -EINVAL;
 
 	if (!spi->controller_state) {
-		status = gpio_request(cs, spi->dev.bus_id);
+		status = gpio_request(cs, dev_name(&spi->dev));
 		if (status)
 			return status;
 		status = gpio_direction_output(cs, spi->mode & SPI_CS_HIGH);
drivers/spi/spi_imx.c +3 -2
@@ -1381,7 +1381,7 @@ static int __init init_queue(struct driv
 
 	INIT_WORK(&drv_data->work, pump_messages);
 	drv_data->workqueue = create_singlethread_workqueue(
-					drv_data->master->dev.parent->bus_id);
+				dev_name(drv_data->master->dev.parent));
 	if (drv_data->workqueue == NULL)
 		return -EBUSY;
 

@@ -1525,7 +1525,8 @@ static int __init spi_imx_probe(struct p
 		status = -ENODEV;
 		goto err_no_irqres;
 	}
-	status = request_irq(irq, spi_int, IRQF_DISABLED, dev->bus_id, drv_data);
+	status = request_irq(irq, spi_int, IRQF_DISABLED,
+			     dev_name(dev), drv_data);
 	if (status < 0) {
 		dev_err(&pdev->dev, "probe - cannot get IRQ (%d)\n", status);
 		goto err_no_irqres;
drivers/spi/spi_mpc83xx.c +2 -2
@@ -637,7 +637,7 @@ static int __init mpc83xx_spi_probe(stru
 	INIT_LIST_HEAD(&mpc83xx_spi->queue);
 
 	mpc83xx_spi->workqueue = create_singlethread_workqueue(
-		master->dev.parent->bus_id);
+		dev_name(master->dev.parent));
 	if (mpc83xx_spi->workqueue == NULL) {
 		ret = -EBUSY;
 		goto free_irq;

@@ -649,7 +649,7 @@ static int __init mpc83xx_spi_probe(stru
 
 	printk(KERN_INFO
 	       "%s: MPC83xx SPI Controller driver at 0x%p (irq = %d)\n",
-	       dev->dev.bus_id, mpc83xx_spi->base, mpc83xx_spi->irq);
+	       dev_name(&dev->dev), mpc83xx_spi->base, mpc83xx_spi->irq);
 
 	return ret;
drivers/spi/spi_txx9.c +2 -1
@@ -404,7 +404,8 @@ static int __init txx9spi_probe(struct p
 	if (ret)
 		goto exit;
 
-	c->workqueue = create_singlethread_workqueue(master->dev.parent->bus_id);
+	c->workqueue = create_singlethread_workqueue(
+				dev_name(master->dev.parent));
 	if (!c->workqueue)
 		goto exit_busy;
 	c->last_chipselect = -1;

------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword