OMAP3: McBSP: Use the port's buffer_size when calculating tx delay

Sicne the platform data's buffer_size now holds the full size
of the FIFO, there is no longer need to handle the ports
differently.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolsfonmicro.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index 4ef46047b787a6c363737e7c0ed4c5509651cd59..e31496e35b0f452d4ff9e375855718fc0a078d40 100644 (file)
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -576,8 +576,6 @@ u16 omap_mcbsp_get_fifo_size(unsigned int id)
 }
 EXPORT_SYMBOL(omap_mcbsp_get_fifo_size);
 
-#define MCBSP2_FIFO_SIZE       0x500 /* 1024 + 256 locations */
-#define MCBSP1345_FIFO_SIZE    0x80  /* 128 locations */
 /*
  * omap_mcbsp_get_tx_delay returns the number of used slots in the McBSP FIFO
  */
@@ -596,10 +594,7 @@ u16 omap_mcbsp_get_tx_delay(unsigned int id)
        buffstat = MCBSP_READ(mcbsp, XBUFFSTAT);
 
        /* Number of slots are different in McBSP ports */
-       if (mcbsp->id == 2)
-               return MCBSP2_FIFO_SIZE - buffstat;
-       else
-               return MCBSP1345_FIFO_SIZE - buffstat;
+       return mcbsp->pdata->buffer_size - buffstat;
 }
 EXPORT_SYMBOL(omap_mcbsp_get_tx_delay);