git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
driver core: move knode_bus into private structure
[safe/jmp/linux-2.6]
/
drivers
/
spi
/
pxa2xx_spi.c
diff --git
a/drivers/spi/pxa2xx_spi.c
b/drivers/spi/pxa2xx_spi.c
index
cf12f2d
..
ec24f2d
100644
(file)
--- a/
drivers/spi/pxa2xx_spi.c
+++ b/
drivers/spi/pxa2xx_spi.c
@@
-32,8
+32,8
@@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/delay.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/delay.h>
-#include <asm/dma.h>
+#include <mach/dma.h>
#include <mach/hardware.h>
#include <mach/pxa-regs.h>
#include <mach/regs-ssp.h>
#include <mach/hardware.h>
#include <mach/pxa-regs.h>
#include <mach/regs-ssp.h>
@@
-1333,7
+1333,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(
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;
if (drv_data->workqueue == NULL)
return -EBUSY;
@@
-1462,7
+1462,7
@@
static int __init pxa2xx_spi_probe(struct platform_device *pdev)
drv_data->mask_sr = SSSR_TINT | SSSR_RFS | SSSR_TFS | SSSR_ROR;
}
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;
if (status < 0) {
dev_err(&pdev->dev, "cannot get IRQ %d\n", ssp->irq);
goto out_error_master_alloc;
@@
-1561,11
+1561,12
@@
out_error_master_alloc:
static int pxa2xx_spi_remove(struct platform_device *pdev)
{
struct driver_data *drv_data = platform_get_drvdata(pdev);
static int pxa2xx_spi_remove(struct platform_device *pdev)
{
struct driver_data *drv_data = platform_get_drvdata(pdev);
- struct ssp_device *ssp
= drv_data->ssp
;
+ struct ssp_device *ssp;
int status = 0;
if (!drv_data)
return 0;
int status = 0;
if (!drv_data)
return 0;
+ ssp = drv_data->ssp;
/* Remove the queue */
status = destroy_queue(drv_data);
/* Remove the queue */
status = destroy_queue(drv_data);