summaryrefslogtreecommitdiffstats
path: root/drivers/spi/pxa2xx_spi.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2007-02-08 06:34:08 +0100
committerGreg Kroah-Hartman2007-02-08 06:34:08 +0100
commit07b2463046247ce580ff9b37e91394f2f6424768 (patch)
tree6f6e79f132a2580c455a533f864492f0b34e54e2 /drivers/spi/pxa2xx_spi.c
parentkbuild: make $(checker-shell ) strip spaces around the result (diff)
downloadkernel-qcow2-linux-07b2463046247ce580ff9b37e91394f2f6424768.tar.gz
kernel-qcow2-linux-07b2463046247ce580ff9b37e91394f2f6424768.tar.xz
kernel-qcow2-linux-07b2463046247ce580ff9b37e91394f2f6424768.zip
Revert "Driver core: convert SPI code to use struct device"
This reverts commit 2943ecf2ed32632473c06f1975db47a7aa98c10f. This should go through the SPI maintainer, it was my fault that it did not. Especially as it conflicts with other patches he has pending. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/spi/pxa2xx_spi.c')
-rw-r--r--drivers/spi/pxa2xx_spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index dccdc50b0296..8b41f9cc2560 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1234,7 +1234,7 @@ static int 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);
+ drv_data->master->cdev.dev->bus_id);
if (drv_data->workqueue == NULL)
return -EBUSY;
h'>| * Input: ads7846 - fix sparse endian warningsHarvey Harrison2008-07-231-4/+2Star | | | | | | | | | | | | | | Also remove the temporary pointer and use ->rx_buf directly. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> | * Input: uinput - remove duplicate includeHuang Weiyi2008-07-231-1/+0Star | | | | | | | | | | | | | | | | Remove duplicate include file <linux/smp_lock.h> in drivers/input/misc/uinput.c. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> | * Input: serio - offload resume to kseriodShaohua Li2008-07-23