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/pxa2xx_spi.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/pxa2xx_spi.c')
-rw-r--r-- | drivers/spi/pxa2xx_spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index d0fc4ca2f656..ec24f2d16f3c 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
@@ -1333,7 +1333,7 @@ static int __init init_queue(struct driver_data *drv_data) | |||
1333 | 1333 | ||
1334 | INIT_WORK(&drv_data->pump_messages, pump_messages); | 1334 | INIT_WORK(&drv_data->pump_messages, pump_messages); |
1335 | drv_data->workqueue = create_singlethread_workqueue( | 1335 | drv_data->workqueue = create_singlethread_workqueue( |
1336 | drv_data->master->dev.parent->bus_id); | 1336 | dev_name(drv_data->master->dev.parent)); |
1337 | if (drv_data->workqueue == NULL) | 1337 | if (drv_data->workqueue == NULL) |
1338 | return -EBUSY; | 1338 | return -EBUSY; |
1339 | 1339 | ||
@@ -1462,7 +1462,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev) | |||
1462 | drv_data->mask_sr = SSSR_TINT | SSSR_RFS | SSSR_TFS | SSSR_ROR; | 1462 | drv_data->mask_sr = SSSR_TINT | SSSR_RFS | SSSR_TFS | SSSR_ROR; |
1463 | } | 1463 | } |
1464 | 1464 | ||
1465 | status = request_irq(ssp->irq, ssp_int, 0, dev->bus_id, drv_data); | 1465 | status = request_irq(ssp->irq, ssp_int, 0, dev_name(dev), drv_data); |
1466 | if (status < 0) { | 1466 | if (status < 0) { |
1467 | dev_err(&pdev->dev, "cannot get IRQ %d\n", ssp->irq); | 1467 | dev_err(&pdev->dev, "cannot get IRQ %d\n", ssp->irq); |
1468 | goto out_error_master_alloc; | 1468 | goto out_error_master_alloc; |