From 80266c60e18c7899e445c4eaa4b04f08be95b598 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 23 Sep 2009 23:24:59 +0000
Subject: [PATCH] --- yaml --- r: 212319 b: refs/heads/master c:
 5cc0159a5779f297d1b987d5f6d0feb6dc36a27a h: refs/heads/master i:   212317:
 be29ad0acca02706a21d2cef3a4de75d8c284fe9   212315:
 e0160d61865c2ed11a60e3da0bccc5c01111aafe   212311:
 09095b1f4d69daea5425ca781bf145a9e6dafa8f   212303:
 60ba6865df31e0d0ca687646b5d8da309a3c24e9   212287:
 242f45cfaf934b9404a0f8a177557d06d9d40a32 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/spi/spi_bfin5xx.c | 47 ++++-----------------------------
 2 files changed, 6 insertions(+), 43 deletions(-)

diff --git a/[refs] b/[refs]
index 8bfeda3b89f7..d1b8e0018bcb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 201bbc6fd84c67b4021f454d3e4c30d5cd77f702
+refs/heads/master: 5cc0159a5779f297d1b987d5f6d0feb6dc36a27a
diff --git a/trunk/drivers/spi/spi_bfin5xx.c b/trunk/drivers/spi/spi_bfin5xx.c
index f4023a78c87e..5e07f498b495 100644
--- a/trunk/drivers/spi/spi_bfin5xx.c
+++ b/trunk/drivers/spi/spi_bfin5xx.c
@@ -255,43 +255,6 @@ static inline void bfin_spi_dummy_read(struct driver_data *drv_data)
 	(void) read_RDBR(drv_data);
 }
 
-static void bfin_spi_null_writer(struct driver_data *drv_data)
-{
-	u8 n_bytes = drv_data->n_bytes;
-	u16 tx_val = drv_data->cur_chip->idle_tx_val;
-
-	/* clear RXS (we check for RXS inside the loop) */
-	bfin_spi_dummy_read(drv_data);
-
-	while (drv_data->tx < drv_data->tx_end) {
-		write_TDBR(drv_data, tx_val);
-		drv_data->tx += n_bytes;
-		/* wait until transfer finished.
-		   checking SPIF or TXS may not guarantee transfer completion */
-		while (!(read_STAT(drv_data) & BIT_STAT_RXS))
-			cpu_relax();
-		/* discard RX data and clear RXS */
-		bfin_spi_dummy_read(drv_data);
-	}
-}
-
-static void bfin_spi_null_reader(struct driver_data *drv_data)
-{
-	u8 n_bytes = drv_data->n_bytes;
-	u16 tx_val = drv_data->cur_chip->idle_tx_val;
-
-	/* discard old RX data and clear RXS */
-	bfin_spi_dummy_read(drv_data);
-
-	while (drv_data->rx < drv_data->rx_end) {
-		write_TDBR(drv_data, tx_val);
-		drv_data->rx += n_bytes;
-		while (!(read_STAT(drv_data) & BIT_STAT_RXS))
-			cpu_relax();
-		bfin_spi_dummy_read(drv_data);
-	}
-}
-
 static void bfin_spi_u8_writer(struct driver_data *drv_data)
 {
 	/* clear RXS (we check for RXS inside the loop) */
@@ -680,9 +643,9 @@ static void bfin_spi_pump_transfers(unsigned long data)
 		transfer->bits_per_word = chip->bits_per_word;
 		drv_data->n_bytes = chip->n_bytes;
 		width = chip->width;
-		drv_data->write = drv_data->tx ? chip->write : bfin_spi_null_writer;
-		drv_data->read = drv_data->rx ? chip->read : bfin_spi_null_reader;
-		drv_data->duplex = chip->duplex ? chip->duplex : bfin_spi_null_writer;
+		drv_data->write = chip->write;
+		drv_data->read = chip->read;
+		drv_data->duplex = chip->duplex;
 		break;
 	}
 	cr = (read_CTRL(drv_data) & (~BIT_CTL_TIMOD));
@@ -695,8 +658,8 @@ static void bfin_spi_pump_transfers(unsigned long data)
 		drv_data->len = transfer->len;
 	}
 	dev_dbg(&drv_data->pdev->dev,
-		"transfer: drv_data->write is %p, chip->write is %p, null_wr is %p\n",
-		drv_data->write, chip->write, bfin_spi_null_writer);
+		"transfer: drv_data->write is %p, chip->write is %p\n",
+		drv_data->write, chip->write);
 
 	/* speed and width has been set on per message */
 	message->state = RUNNING_STATE;