diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-06-18 19:49:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 19:46:05 -0400 |
commit | aef79d827657fce5a3038ba07f11ce6dcd0421d0 (patch) | |
tree | 8e681110b10b448ba20b33fca4039f625fbb8e1e /drivers/spi | |
parent | b9b9af11fe35f509899fc5ff242b68d3299c3aef (diff) |
spi_mpc83xx: remove dead code
This patch removes #if 0'ed code, and spi_mpc83xx->busy variable that is
used by that dead snippet only.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Cc: Kumar Gala <galak@gate.crashing.org>
Cc: David Brownell <david-b@pacbell.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi_mpc83xx.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c index e854ac0d413a..c5cb98f65454 100644 --- a/drivers/spi/spi_mpc83xx.c +++ b/drivers/spi/spi_mpc83xx.c | |||
@@ -98,8 +98,6 @@ struct mpc83xx_spi { | |||
98 | 98 | ||
99 | bool qe_mode; | 99 | bool qe_mode; |
100 | 100 | ||
101 | u8 busy; | ||
102 | |||
103 | struct workqueue_struct *workqueue; | 101 | struct workqueue_struct *workqueue; |
104 | struct work_struct work; | 102 | struct work_struct work; |
105 | 103 | ||
@@ -411,7 +409,6 @@ static void mpc83xx_spi_work(struct work_struct *work) | |||
411 | work); | 409 | work); |
412 | 410 | ||
413 | spin_lock_irq(&mpc83xx_spi->lock); | 411 | spin_lock_irq(&mpc83xx_spi->lock); |
414 | mpc83xx_spi->busy = 1; | ||
415 | while (!list_empty(&mpc83xx_spi->queue)) { | 412 | while (!list_empty(&mpc83xx_spi->queue)) { |
416 | struct spi_message *m = container_of(mpc83xx_spi->queue.next, | 413 | struct spi_message *m = container_of(mpc83xx_spi->queue.next, |
417 | struct spi_message, queue); | 414 | struct spi_message, queue); |
@@ -423,7 +420,6 @@ static void mpc83xx_spi_work(struct work_struct *work) | |||
423 | 420 | ||
424 | spin_lock_irq(&mpc83xx_spi->lock); | 421 | spin_lock_irq(&mpc83xx_spi->lock); |
425 | } | 422 | } |
426 | mpc83xx_spi->busy = 0; | ||
427 | spin_unlock_irq(&mpc83xx_spi->lock); | 423 | spin_unlock_irq(&mpc83xx_spi->lock); |
428 | } | 424 | } |
429 | 425 | ||
@@ -465,19 +461,6 @@ static int mpc83xx_spi_setup(struct spi_device *spi) | |||
465 | cs->hw_mode = hw_mode; /* Restore settings */ | 461 | cs->hw_mode = hw_mode; /* Restore settings */ |
466 | return retval; | 462 | return retval; |
467 | } | 463 | } |
468 | |||
469 | #if 0 /* Don't think this is needed */ | ||
470 | /* NOTE we _need_ to call chipselect() early, ideally with adapter | ||
471 | * setup, unless the hardware defaults cooperate to avoid confusion | ||
472 | * between normal (active low) and inverted chipselects. | ||
473 | */ | ||
474 | |||
475 | /* deselect chip (low or high) */ | ||
476 | spin_lock(&mpc83xx_spi->lock); | ||
477 | if (!mpc83xx_spi->busy) | ||
478 | mpc83xx_spi_chipselect(spi, BITBANG_CS_INACTIVE); | ||
479 | spin_unlock(&mpc83xx_spi->lock); | ||
480 | #endif | ||
481 | return 0; | 464 | return 0; |
482 | } | 465 | } |
483 | 466 | ||