summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi_bitbang.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-02-07 21:34:08 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-07 21:34:08 -0800
commit07b2463046247ce580ff9b37e91394f2f6424768 (patch)
tree6f6e79f132a2580c455a533f864492f0b34e54e2 /drivers/spi/spi_bitbang.c
parentc4184f117af7441fb83bc413d2214d92920e0289 (diff)
downloadop-kernel-dev-07b2463046247ce580ff9b37e91394f2f6424768.zip
op-kernel-dev-07b2463046247ce580ff9b37e91394f2f6424768.tar.gz
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/spi_bitbang.c')
-rw-r--r--drivers/spi/spi_bitbang.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index 4638e6c..57289b6 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -479,7 +479,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)
/* this task is the only thing to touch the SPI bits */
bitbang->busy = 0;
bitbang->workqueue = create_singlethread_workqueue(
- bitbang->master->dev.parent->bus_id);
+ bitbang->master->cdev.dev->bus_id);
if (bitbang->workqueue == NULL) {
status = -EBUSY;
goto err1;
@@ -513,14 +513,14 @@ int spi_bitbang_stop(struct spi_bitbang *bitbang)
while (!list_empty(&bitbang->queue) && limit--) {
spin_unlock_irq(&bitbang->lock);
- dev_dbg(&bitbang->master->dev, "wait for queue\n");
+ dev_dbg(bitbang->master->cdev.dev, "wait for queue\n");
msleep(10);
spin_lock_irq(&bitbang->lock);
}
spin_unlock_irq(&bitbang->lock);
if (!list_empty(&bitbang->queue)) {
- dev_err(&bitbang->master->dev, "queue didn't empty\n");
+ dev_err(bitbang->master->cdev.dev, "queue didn't empty\n");
return -EBUSY;
}
OpenPOWER on IntegriCloud