aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2011-07-01 04:52:26 -0400
committerTony Lindgren <tony@atomide.com>2011-07-07 15:06:16 -0400
commit9df0fcc4c842703080ee431112d624b1f8f2f1c8 (patch)
tree8eec4c7d18414d170cc737d6cb9f0cd5dcf23112
parent48cb1258e8b0f8c81cfb699b42326c5b2147b3f8 (diff)
omap: mcbsp: Remove rx_/tx_word_length variables
These variables got unused after ("omap: mcbsp: Drop in-driver transfer support") but was noticed only afterwards. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/plat-omap/include/plat/mcbsp.h2
-rw-r--r--arch/arm/plat-omap/mcbsp.c3
2 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index 6c5350832407..63464ad9c67a 100644
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -385,8 +385,6 @@ struct omap_mcbsp {
385 void __iomem *io_base; 385 void __iomem *io_base;
386 u8 id; 386 u8 id;
387 u8 free; 387 u8 free;
388 omap_mcbsp_word_length rx_word_length;
389 omap_mcbsp_word_length tx_word_length;
390 388
391 int rx_irq; 389 int rx_irq;
392 int tx_irq; 390 int tx_irq;
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index 455eadcd820c..3c1fbdc92468 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -869,9 +869,6 @@ void omap_mcbsp_start(unsigned int id, int tx, int rx)
869 if (cpu_is_omap34xx()) 869 if (cpu_is_omap34xx())
870 omap_st_start(mcbsp); 870 omap_st_start(mcbsp);
871 871
872 mcbsp->rx_word_length = (MCBSP_READ_CACHE(mcbsp, RCR1) >> 5) & 0x7;
873 mcbsp->tx_word_length = (MCBSP_READ_CACHE(mcbsp, XCR1) >> 5) & 0x7;
874
875 /* Only enable SRG, if McBSP is master */ 872 /* Only enable SRG, if McBSP is master */
876 w = MCBSP_READ_CACHE(mcbsp, PCR0); 873 w = MCBSP_READ_CACHE(mcbsp, PCR0);
877 if (w & (FSXM | FSRM | CLKXM | CLKRM)) 874 if (w & (FSXM | FSRM | CLKXM | CLKRM))