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>

diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index e854ac0d413a3206c5051291dd0889d65536b8c5..c5cb98f6545408bee5e36052b90a7e64110a12ea 100644 (file)
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -98,8 +98,6 @@ struct mpc83xx_spi {
 
        bool qe_mode;
 
-       u8 busy;
-
        struct workqueue_struct *workqueue;
        struct work_struct work;
 
@@ -411,7 +409,6 @@ static void mpc83xx_spi_work(struct work_struct *work)
                                                       work);
 
        spin_lock_irq(&mpc83xx_spi->lock);
-       mpc83xx_spi->busy = 1;
        while (!list_empty(&mpc83xx_spi->queue)) {
                struct spi_message *m = container_of(mpc83xx_spi->queue.next,
                                                   struct spi_message, queue);
@@ -423,7 +420,6 @@ static void mpc83xx_spi_work(struct work_struct *work)
 
                spin_lock_irq(&mpc83xx_spi->lock);
        }
-       mpc83xx_spi->busy = 0;
        spin_unlock_irq(&mpc83xx_spi->lock);
 }
 
@@ -465,19 +461,6 @@ static int mpc83xx_spi_setup(struct spi_device *spi)
                cs->hw_mode = hw_mode; /* Restore settings */
                return retval;
        }
-
-#if 0 /* Don't think this is needed */
-       /* NOTE we _need_ to call chipselect() early, ideally with adapter
-        * setup, unless the hardware defaults cooperate to avoid confusion
-        * between normal (active low) and inverted chipselects.
-        */
-
-       /* deselect chip (low or high) */
-       spin_lock(&mpc83xx_spi->lock);
-       if (!mpc83xx_spi->busy)
-               mpc83xx_spi_chipselect(spi, BITBANG_CS_INACTIVE);
-       spin_unlock(&mpc83xx_spi->lock);
-#endif
        return 0;
 }