diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-01-22 16:45:38 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 13:37:11 -0500 |
commit | 2943ecf2ed32632473c06f1975db47a7aa98c10f (patch) | |
tree | 94bbae37d42f3e03fd8fc4a86767f5815a1318fb /drivers/spi/spi_bitbang.c | |
parent | 873733188a019acdb7fa253011cbdc0a8afd97f3 (diff) |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c index 57289b61d0be..4638e6c83715 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) | |||
479 | /* this task is the only thing to touch the SPI bits */ | 479 | /* this task is the only thing to touch the SPI bits */ |
480 | bitbang->busy = 0; | 480 | bitbang->busy = 0; |
481 | bitbang->workqueue = create_singlethread_workqueue( | 481 | bitbang->workqueue = create_singlethread_workqueue( |
482 | bitbang->master->cdev.dev->bus_id); | 482 | bitbang->master->dev.parent->bus_id); |
483 | if (bitbang->workqueue == NULL) { | 483 | if (bitbang->workqueue == NULL) { |
484 | status = -EBUSY; | 484 | status = -EBUSY; |
485 | goto err1; | 485 | goto err1; |
@@ -513,14 +513,14 @@ int spi_bitbang_stop(struct spi_bitbang *bitbang) | |||
513 | while (!list_empty(&bitbang->queue) && limit--) { | 513 | while (!list_empty(&bitbang->queue) && limit--) { |
514 | spin_unlock_irq(&bitbang->lock); | 514 | spin_unlock_irq(&bitbang->lock); |
515 | 515 | ||
516 | dev_dbg(bitbang->master->cdev.dev, "wait for queue\n"); | 516 | dev_dbg(&bitbang->master->dev, "wait for queue\n"); |
517 | msleep(10); | 517 | msleep(10); |
518 | 518 | ||
519 | spin_lock_irq(&bitbang->lock); | 519 | spin_lock_irq(&bitbang->lock); |
520 | } | 520 | } |
521 | spin_unlock_irq(&bitbang->lock); | 521 | spin_unlock_irq(&bitbang->lock); |
522 | if (!list_empty(&bitbang->queue)) { | 522 | if (!list_empty(&bitbang->queue)) { |
523 | dev_err(bitbang->master->cdev.dev, "queue didn't empty\n"); | 523 | dev_err(&bitbang->master->dev, "queue didn't empty\n"); |
524 | return -EBUSY; | 524 | return -EBUSY; |
525 | } | 525 | } |
526 | 526 | ||