diff options
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 d22fac27219a..33fcef3150d4 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
@@ -1331,7 +1331,7 @@ static int __init init_queue(struct driver_data *drv_data) | |||
1331 | 1331 | ||
1332 | INIT_WORK(&drv_data->pump_messages, pump_messages); | 1332 | INIT_WORK(&drv_data->pump_messages, pump_messages); |
1333 | drv_data->workqueue = create_singlethread_workqueue( | 1333 | drv_data->workqueue = create_singlethread_workqueue( |
1334 | drv_data->master->dev.parent->bus_id); | 1334 | dev_name(drv_data->master->dev.parent)); |
1335 | if (drv_data->workqueue == NULL) | 1335 | if (drv_data->workqueue == NULL) |
1336 | return -EBUSY; | 1336 | return -EBUSY; |
1337 | 1337 | ||
@@ -1460,7 +1460,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev) | |||
1460 | drv_data->mask_sr = SSSR_TINT | SSSR_RFS | SSSR_TFS | SSSR_ROR; | 1460 | drv_data->mask_sr = SSSR_TINT | SSSR_RFS | SSSR_TFS | SSSR_ROR; |
1461 | } | 1461 | } |
1462 | 1462 | ||
1463 | status = request_irq(ssp->irq, ssp_int, 0, dev->bus_id, drv_data); | 1463 | status = request_irq(ssp->irq, ssp_int, 0, dev_name(dev), drv_data); |
1464 | if (status < 0) { | 1464 | if (status < 0) { |
1465 | dev_err(&pdev->dev, "cannot get IRQ %d\n", ssp->irq); | 1465 | dev_err(&pdev->dev, "cannot get IRQ %d\n", ssp->irq); |
1466 | goto out_error_master_alloc; | 1466 | goto out_error_master_alloc; |