summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi_bitbang.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-01-22 13:45:38 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-07 10:37:11 -0800
commit2943ecf2ed32632473c06f1975db47a7aa98c10f (patch)
tree94bbae37d42f3e03fd8fc4a86767f5815a1318fb /drivers/spi/spi_bitbang.c
parent873733188a019acdb7fa253011cbdc0a8afd97f3 (diff)
downloadop-kernel-dev-2943ecf2ed32632473c06f1975db47a7aa98c10f.zip
op-kernel-dev-2943ecf2ed32632473c06f1975db47a7aa98c10f.tar.gz
Driver core: convert SPI code to use struct device
Converts from using struct "class_device" to "struct device" making everything show up properly in /sys/devices/ with symlinks from the /sys/class directory. Cc: <dbrownell@users.sourceforge.net> 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 57289b6..4638e6c 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->cdev.dev->bus_id);
+ bitbang->master->dev.parent->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->cdev.dev, "wait for queue\n");
+ dev_dbg(&bitbang->master->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->cdev.dev, "queue didn't empty\n");
+ dev_err(&bitbang->master->dev, "queue didn't empty\n");
return -EBUSY;
}
OpenPOWER on IntegriCloud