diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-24 12:31:18 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-24 12:31:18 +1100 |
commit | add902e5b0ec4c0f19c8fb255ad800d40e6cc01a (patch) | |
tree | 952e9138673a59acca5b1808765e58540767e9b0 /drivers/spi/pxa2xx_spi.c | |
parent | 27e1a1abb39177a99d2f55ab70255fcab4132f50 (diff) | |
parent | 7bcd547ab98aff3ebf955cc59d976bc873fd3822 (diff) |
Merge branch 'quilt/driver-core'
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) 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; @@ -1460,7 +1460,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev) 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; |