diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:21 -0400 |
commit | 6c7377ab6814c247d7600955a4ead2e3db490697 (patch) | |
tree | fabaed3b89e26609cdb911bd75407ed9c4b073b3 /drivers/spi/spi_imx.c | |
parent | 031d5518591006efd13a33a86909b9477b22917b (diff) |
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: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Diffstat (limited to 'drivers/spi/spi_imx.c')
-rw-r--r-- | drivers/spi/spi_imx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 269a55ec52ef..0480d8bb19d3 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c | |||
@@ -1381,7 +1381,7 @@ static int __init init_queue(struct driver_data *drv_data) | |||
1381 | 1381 | ||
1382 | INIT_WORK(&drv_data->work, pump_messages); | 1382 | INIT_WORK(&drv_data->work, pump_messages); |
1383 | drv_data->workqueue = create_singlethread_workqueue( | 1383 | drv_data->workqueue = create_singlethread_workqueue( |
1384 | drv_data->master->dev.parent->bus_id); | 1384 | dev_name(drv_data->master->dev.parent)); |
1385 | if (drv_data->workqueue == NULL) | 1385 | if (drv_data->workqueue == NULL) |
1386 | return -EBUSY; | 1386 | return -EBUSY; |
1387 | 1387 | ||
@@ -1525,7 +1525,8 @@ static int __init spi_imx_probe(struct platform_device *pdev) | |||
1525 | status = -ENODEV; | 1525 | status = -ENODEV; |
1526 | goto err_no_irqres; | 1526 | goto err_no_irqres; |
1527 | } | 1527 | } |
1528 | status = request_irq(irq, spi_int, IRQF_DISABLED, dev->bus_id, drv_data); | 1528 | status = request_irq(irq, spi_int, IRQF_DISABLED, |
1529 | dev_name(dev), drv_data); | ||
1529 | if (status < 0) { | 1530 | if (status < 0) { |
1530 | dev_err(&pdev->dev, "probe - cannot get IRQ (%d)\n", status); | 1531 | dev_err(&pdev->dev, "probe - cannot get IRQ (%d)\n", status); |
1531 | goto err_no_irqres; | 1532 | goto err_no_irqres; |