aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2009-04-06 22:00:34 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 11:31:04 -0400
commitace32865a3767e4e385b883868c228a2a6db225a (patch)
tree0bbb05b1f8b3d9936e1b78ea6cb1fedc1a032961
parenta42e809aa3150cf03698e10e57eb067dac6805a3 (diff)
Blackfin SPI Driver: use len_in_bytes when we care about the number of bytes transferred
Use len_in_bytes when we care about the number of bytes transferred rather than the number of spi transactions. (this value will be the same for 8bit transfers, but not any other sizes) Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/spi/spi_bfin5xx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 7ccd18a11fad..6d3f6064871e 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -804,7 +804,7 @@ static void pump_transfers(unsigned long data)
804 if (bfin_addr_dcachable((unsigned long) drv_data->rx)) 804 if (bfin_addr_dcachable((unsigned long) drv_data->rx))
805 invalidate_dcache_range((unsigned long) drv_data->rx, 805 invalidate_dcache_range((unsigned long) drv_data->rx,
806 (unsigned long) (drv_data->rx + 806 (unsigned long) (drv_data->rx +
807 drv_data->len)); 807 drv_data->len_in_bytes));
808 808
809 /* clear tx reg soformer data is not shifted out */ 809 /* clear tx reg soformer data is not shifted out */
810 write_TDBR(drv_data, 0xFFFF); 810 write_TDBR(drv_data, 0xFFFF);
@@ -830,7 +830,7 @@ static void pump_transfers(unsigned long data)
830 if (bfin_addr_dcachable((unsigned long) drv_data->tx)) 830 if (bfin_addr_dcachable((unsigned long) drv_data->tx))
831 flush_dcache_range((unsigned long) drv_data->tx, 831 flush_dcache_range((unsigned long) drv_data->tx,
832 (unsigned long) (drv_data->tx + 832 (unsigned long) (drv_data->tx +
833 drv_data->len)); 833 drv_data->len_in_bytes));
834 834
835 /* start dma */ 835 /* start dma */
836 dma_enable_irq(drv_data->dma_channel); 836 dma_enable_irq(drv_data->dma_channel);
@@ -893,7 +893,7 @@ static void pump_transfers(unsigned long data)
893 message->state = ERROR_STATE; 893 message->state = ERROR_STATE;
894 } else { 894 } else {
895 /* Update total byte transfered */ 895 /* Update total byte transfered */
896 message->actual_length += drv_data->len; 896 message->actual_length += drv_data->len_in_bytes;
897 897
898 /* Move to next transfer of this msg */ 898 /* Move to next transfer of this msg */
899 message->state = next_transfer(drv_data); 899 message->state = next_transfer(drv_data);