6 files changed, 89 insertions, 131 deletions

diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.c b/sound/soc/blackfin/bf5xx-ac97-pcm.c
index 8067cfafa3a7..8cfed1a5dcbe 100644
--- a/sound/soc/blackfin/bf5xx-ac97-pcm.c
+++ b/sound/soc/blackfin/bf5xx-ac97-pcm.c
@@ -297,7 +297,7 @@ static	int bf5xx_pcm_copy(struct snd_pcm_substream *substream, int channel,
 }
 #endif
 
-struct snd_pcm_ops bf5xx_pcm_ac97_ops = {
+static struct snd_pcm_ops bf5xx_pcm_ac97_ops = {
         .open           = bf5xx_pcm_open,
         .ioctl          = snd_pcm_lib_ioctl,
         .hw_params      = bf5xx_pcm_hw_params,
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index 3be2be60576d..8a935f2d1767 100644
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -31,72 +31,46 @@
 #include "bf5xx-sport.h"
 #include "bf5xx-ac97.h"
 
-#if defined(CONFIG_BF54x)
-#define PIN_REQ_SPORT_0 {P_SPORT0_TFS, P_SPORT0_DTPRI, P_SPORT0_TSCLK, \
-                P_SPORT0_RFS, P_SPORT0_DRPRI, P_SPORT0_RSCLK, 0}
-
-#define PIN_REQ_SPORT_1 {P_SPORT1_TFS, P_SPORT1_DTPRI, P_SPORT1_TSCLK, \
-                P_SPORT1_RFS, P_SPORT1_DRPRI, P_SPORT1_RSCLK, 0}
-
-#define PIN_REQ_SPORT_2 {P_SPORT2_TFS, P_SPORT2_DTPRI, P_SPORT2_TSCLK, \
-                P_SPORT2_RFS, P_SPORT2_DRPRI, P_SPORT2_RSCLK, 0}
-
-#define PIN_REQ_SPORT_3 {P_SPORT3_TFS, P_SPORT3_DTPRI, P_SPORT3_TSCLK, \
-                P_SPORT3_RFS, P_SPORT3_DRPRI, P_SPORT3_RSCLK, 0}
-#else
-#define PIN_REQ_SPORT_0 {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, \
-                 P_SPORT0_DRPRI, P_SPORT0_RSCLK, 0}
-
-#define PIN_REQ_SPORT_1 {P_SPORT1_DTPRI, P_SPORT1_TSCLK, P_SPORT1_RFS, \
-                 P_SPORT1_DRPRI, P_SPORT1_RSCLK, 0}
-#endif
-
 static int *cmd_count;
 static int sport_num = CONFIG_SND_BF5XX_SPORT_NUM;
 
+#define SPORT_REQ(x) \
+        [x] = {P_SPORT##x##_TFS, P_SPORT##x##_DTPRI, P_SPORT##x##_TSCLK, \
+               P_SPORT##x##_RFS, P_SPORT##x##_DRPRI, P_SPORT##x##_RSCLK, 0}
 static u16 sport_req[][7] = {
-                PIN_REQ_SPORT_0,
-#ifdef PIN_REQ_SPORT_1
-                PIN_REQ_SPORT_1,
+#ifdef SPORT0_TCR1
+        SPORT_REQ(0),
+#endif
+#ifdef SPORT1_TCR1
+        SPORT_REQ(1),
 #endif
-#ifdef PIN_REQ_SPORT_2
-                PIN_REQ_SPORT_2,
+#ifdef SPORT2_TCR1
+        SPORT_REQ(2),
 #endif
-#ifdef PIN_REQ_SPORT_3
-                PIN_REQ_SPORT_3,
+#ifdef SPORT3_TCR1
+        SPORT_REQ(3),
 #endif
-        };
+};
 
+#define SPORT_PARAMS(x) \
+        [x] = { \
+                .dma_rx_chan = CH_SPORT##x##_RX, \
+                .dma_tx_chan = CH_SPORT##x##_TX, \
+                .err_irq     = IRQ_SPORT##x##_ERROR, \
+                .regs        = (struct sport_register *)SPORT##x##_TCR1, \
+        }
 static struct sport_param sport_params[4] = {
-        {
-                .dma_rx_chan    = CH_SPORT0_RX,
-                .dma_tx_chan    = CH_SPORT0_TX,
-                .err_irq        = IRQ_SPORT0_ERROR,
-                .regs           = (struct sport_register *)SPORT0_TCR1,
-        },
-#ifdef PIN_REQ_SPORT_1
-        {
-                .dma_rx_chan    = CH_SPORT1_RX,
-                .dma_tx_chan    = CH_SPORT1_TX,
-                .err_irq        = IRQ_SPORT1_ERROR,
-                .regs           = (struct sport_register *)SPORT1_TCR1,
-        },
+#ifdef SPORT0_TCR1
+        SPORT_PARAMS(0),
 #endif
-#ifdef PIN_REQ_SPORT_2
-        {
-                .dma_rx_chan    = CH_SPORT2_RX,
-                .dma_tx_chan    = CH_SPORT2_TX,
-                .err_irq        = IRQ_SPORT2_ERROR,
-                .regs           = (struct sport_register *)SPORT2_TCR1,
-        },
+#ifdef SPORT1_TCR1
+        SPORT_PARAMS(1),
 #endif
-#ifdef PIN_REQ_SPORT_3
-        {
-                .dma_rx_chan    = CH_SPORT3_RX,
-                .dma_tx_chan    = CH_SPORT3_TX,
-                .err_irq        = IRQ_SPORT3_ERROR,
-                .regs           = (struct sport_register *)SPORT3_TCR1,
-        }
+#ifdef SPORT2_TCR1
+        SPORT_PARAMS(2),
+#endif
+#ifdef SPORT3_TCR1
+        SPORT_PARAMS(3),
 #endif
 };
 
@@ -332,11 +306,11 @@ static int bf5xx_ac97_probe(struct platform_device *pdev,
         if (cmd_count == NULL)
                 return -ENOMEM;
 
-        if (peripheral_request_list(&sport_req[sport_num][0], "soc-audio")) {
+        if (peripheral_request_list(sport_req[sport_num], "soc-audio")) {
                 pr_err("Requesting Peripherals failed\n");
                 ret =  -EFAULT;
                 goto peripheral_err;
-                }
+        }
 
 #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
         /* Request PB3 as reset pin */
@@ -383,9 +357,9 @@ sport_config_err:
 sport_err:
 #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
         gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
-#endif
 gpio_err:
-        peripheral_free_list(&sport_req[sport_num][0]);
+#endif
+        peripheral_free_list(sport_req[sport_num]);
 peripheral_err:
         free_page((unsigned long)cmd_count);
         cmd_count = NULL;
@@ -398,7 +372,7 @@ static void bf5xx_ac97_remove(struct platform_device *pdev,
 {
         free_page((unsigned long)cmd_count);
         cmd_count = NULL;
-        peripheral_free_list(&sport_req[sport_num][0]);
+        peripheral_free_list(sport_req[sport_num]);
 #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
         gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
 #endif
diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c
index 7f2a5e199075..edfbdc024e66 100644
--- a/sound/soc/blackfin/bf5xx-ad73311.c
+++ b/sound/soc/blackfin/bf5xx-ad73311.c
@@ -114,7 +114,7 @@ static int snd_ad73311_configure(void)
         SSYNC();
 
         /* When TUVF is set, the data is already send out */
-        while (!(status & TUVF) && count++ < 10000) {
+        while (!(status & TUVF) && ++count < 10000) {
                 udelay(1);
                 status = bfin_read_SPORT_STAT();
                 SSYNC();
@@ -123,7 +123,7 @@ static int snd_ad73311_configure(void)
         SSYNC();
         local_irq_enable();
 
-        if (count == 10000) {
+        if (count >= 10000) {
                 printk(KERN_ERR "ad73311: failed to configure codec\n");
                 return -1;
         }
diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c
index 53d290b3ea47..1318c4f627b7 100644
--- a/sound/soc/blackfin/bf5xx-i2s-pcm.c
+++ b/sound/soc/blackfin/bf5xx-i2s-pcm.c
@@ -184,7 +184,7 @@ static int bf5xx_pcm_mmap(struct snd_pcm_substream *substream,
         return 0 ;
 }
 
-struct snd_pcm_ops bf5xx_pcm_i2s_ops = {
+static struct snd_pcm_ops bf5xx_pcm_i2s_ops = {
         .open           = bf5xx_pcm_open,
         .ioctl          = snd_pcm_lib_ioctl,
         .hw_params      = bf5xx_pcm_hw_params,
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
index d1d95d2393fe..964824419678 100644
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -287,6 +287,13 @@ static int bf5xx_i2s_resume(struct platform_device *pdev,
 #define BF5XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |\
         SNDRV_PCM_FMTBIT_S32_LE)
 
+static struct snd_soc_dai_ops bf5xx_i2s_dai_ops = {
+        .startup        = bf5xx_i2s_startup,
+        .shutdown       = bf5xx_i2s_shutdown,
+        .hw_params      = bf5xx_i2s_hw_params,
+        .set_fmt        = bf5xx_i2s_set_dai_fmt,
+};
+
 struct snd_soc_dai bf5xx_i2s_dai = {
         .name = "bf5xx-i2s",
         .id = 0,
@@ -304,12 +311,7 @@ struct snd_soc_dai bf5xx_i2s_dai = {
                 .channels_max = 2,
                 .rates = BF5XX_I2S_RATES,
                 .formats = BF5XX_I2S_FORMATS,},
-        .ops = {
-                .startup   = bf5xx_i2s_startup,
-                .shutdown  = bf5xx_i2s_shutdown,
-                .hw_params = bf5xx_i2s_hw_params,
-                .set_fmt = bf5xx_i2s_set_dai_fmt,
-        },
+        .ops = &bf5xx_i2s_dai_ops,
 };
 EXPORT_SYMBOL_GPL(bf5xx_i2s_dai);
 
diff --git a/sound/soc/blackfin/bf5xx-sport.c b/sound/soc/blackfin/bf5xx-sport.c
index 3b99e484d555..b7953c8cf838 100644
--- a/sound/soc/blackfin/bf5xx-sport.c
+++ b/sound/soc/blackfin/bf5xx-sport.c
@@ -133,7 +133,7 @@ static void setup_desc(struct dmasg *desc, void *buf, int fragcount,
         int i;
 
         for (i = 0; i < fragcount; ++i) {
-                desc[i].next_desc_addr  = (unsigned long)&(desc[i + 1]);
+                desc[i].next_desc_addr  = &(desc[i + 1]);
                 desc[i].start_addr = (unsigned long)buf + i*fragsize;
                 desc[i].cfg = cfg;
                 desc[i].x_count = x_count;
@@ -143,12 +143,12 @@ static void setup_desc(struct dmasg *desc, void *buf, int fragcount,
         }
 
         /* make circular */
-        desc[fragcount-1].next_desc_addr = (unsigned long)desc;
+        desc[fragcount-1].next_desc_addr = desc;
 
-        pr_debug("setup desc: desc0=%p, next0=%lx, desc1=%p,"
-                "next1=%lx\nx_count=%x,y_count=%x,addr=0x%lx,cfs=0x%x\n",
-                &(desc[0]), desc[0].next_desc_addr,
-                &(desc[1]), desc[1].next_desc_addr,
+        pr_debug("setup desc: desc0=%p, next0=%p, desc1=%p,"
+                "next1=%p\nx_count=%x,y_count=%x,addr=0x%lx,cfs=0x%x\n",
+                desc, desc[0].next_desc_addr,
+                desc+1, desc[1].next_desc_addr,
                 desc[0].x_count, desc[0].y_count,
                 desc[0].start_addr, desc[0].cfg);
 }
@@ -184,22 +184,20 @@ static inline int sport_hook_rx_dummy(struct sport_device *sport)
         BUG_ON(sport->curr_rx_desc == sport->dummy_rx_desc);
 
         /* Maybe the dummy buffer descriptor ring is damaged */
-        sport->dummy_rx_desc->next_desc_addr = \
-                        (unsigned long)(sport->dummy_rx_desc+1);
+        sport->dummy_rx_desc->next_desc_addr = sport->dummy_rx_desc + 1;
 
         local_irq_save(flags);
-        desc = (struct dmasg *)get_dma_next_desc_ptr(sport->dma_rx_chan);
+        desc = get_dma_next_desc_ptr(sport->dma_rx_chan);
         /* Copy the descriptor which will be damaged to backup */
         temp_desc = *desc;
         desc->x_count = 0xa;
         desc->y_count = 0;
-        desc->next_desc_addr = (unsigned long)(sport->dummy_rx_desc);
+        desc->next_desc_addr = sport->dummy_rx_desc;
         local_irq_restore(flags);
         /* Waiting for dummy buffer descriptor is already hooked*/
         while ((get_dma_curr_desc_ptr(sport->dma_rx_chan) -
-                        sizeof(struct dmasg)) !=
-                        (unsigned long)sport->dummy_rx_desc)
-                ;
+                        sizeof(struct dmasg)) != sport->dummy_rx_desc)
+                continue;
         sport->curr_rx_desc = sport->dummy_rx_desc;
         /* Restore the damaged descriptor */
         *desc = temp_desc;
@@ -210,14 +208,12 @@ static inline int sport_hook_rx_dummy(struct sport_device *sport)
 static inline int sport_rx_dma_start(struct sport_device *sport, int dummy)
 {
         if (dummy) {
-                sport->dummy_rx_desc->next_desc_addr = \
-                                (unsigned long) sport->dummy_rx_desc;
+                sport->dummy_rx_desc->next_desc_addr = sport->dummy_rx_desc;
                 sport->curr_rx_desc = sport->dummy_rx_desc;
         } else
                 sport->curr_rx_desc = sport->dma_rx_desc;
 
-        set_dma_next_desc_addr(sport->dma_rx_chan, \
-                        (unsigned long)(sport->curr_rx_desc));
+        set_dma_next_desc_addr(sport->dma_rx_chan, sport->curr_rx_desc);
         set_dma_x_count(sport->dma_rx_chan, 0);
         set_dma_x_modify(sport->dma_rx_chan, 0);
         set_dma_config(sport->dma_rx_chan, (DMAFLOW_LARGE | NDSIZE_9 | \
@@ -231,14 +227,12 @@ static inline int sport_rx_dma_start(struct sport_device *sport, int dummy)
 static inline int sport_tx_dma_start(struct sport_device *sport, int dummy)
 {
         if (dummy) {
-                sport->dummy_tx_desc->next_desc_addr = \
-                                (unsigned long) sport->dummy_tx_desc;
+                sport->dummy_tx_desc->next_desc_addr = sport->dummy_tx_desc;
                 sport->curr_tx_desc = sport->dummy_tx_desc;
         } else
                 sport->curr_tx_desc = sport->dma_tx_desc;
 
-        set_dma_next_desc_addr(sport->dma_tx_chan, \
-                        (unsigned long)(sport->curr_tx_desc));
+        set_dma_next_desc_addr(sport->dma_tx_chan, sport->curr_tx_desc);
         set_dma_x_count(sport->dma_tx_chan, 0);
         set_dma_x_modify(sport->dma_tx_chan, 0);
         set_dma_config(sport->dma_tx_chan,
@@ -261,11 +255,9 @@ int sport_rx_start(struct sport_device *sport)
                 BUG_ON(sport->curr_rx_desc != sport->dummy_rx_desc);
                 local_irq_save(flags);
                 while ((get_dma_curr_desc_ptr(sport->dma_rx_chan) -
-                        sizeof(struct dmasg)) !=
-                        (unsigned long)sport->dummy_rx_desc)
-                        ;
-                sport->dummy_rx_desc->next_desc_addr =
-                                (unsigned long)(sport->dma_rx_desc);
+                        sizeof(struct dmasg)) != sport->dummy_rx_desc)
+                        continue;
+                sport->dummy_rx_desc->next_desc_addr = sport->dma_rx_desc;
                 local_irq_restore(flags);
                 sport->curr_rx_desc = sport->dma_rx_desc;
         } else {
@@ -310,23 +302,21 @@ static inline int sport_hook_tx_dummy(struct sport_device *sport)
         BUG_ON(sport->dummy_tx_desc == NULL);
         BUG_ON(sport->curr_tx_desc == sport->dummy_tx_desc);
 
-        sport->dummy_tx_desc->next_desc_addr = \
-                        (unsigned long)(sport->dummy_tx_desc+1);
+        sport->dummy_tx_desc->next_desc_addr = sport->dummy_tx_desc + 1;
 
         /* Shorten the time on last normal descriptor */
         local_irq_save(flags);
-        desc = (struct dmasg *)get_dma_next_desc_ptr(sport->dma_tx_chan);
+        desc = get_dma_next_desc_ptr(sport->dma_tx_chan);
         /* Store the descriptor which will be damaged */
         temp_desc = *desc;
         desc->x_count = 0xa;
         desc->y_count = 0;
-        desc->next_desc_addr = (unsigned long)(sport->dummy_tx_desc);
+        desc->next_desc_addr = sport->dummy_tx_desc;
         local_irq_restore(flags);
         /* Waiting for dummy buffer descriptor is already hooked*/
         while ((get_dma_curr_desc_ptr(sport->dma_tx_chan) - \
-                        sizeof(struct dmasg)) != \
-                        (unsigned long)sport->dummy_tx_desc)
-                ;
+                        sizeof(struct dmasg)) != sport->dummy_tx_desc)
+                continue;
         sport->curr_tx_desc = sport->dummy_tx_desc;
         /* Restore the damaged descriptor */
         *desc = temp_desc;
@@ -347,11 +337,9 @@ int sport_tx_start(struct sport_device *sport)
                 /* Hook the normal buffer descriptor */
                 local_irq_save(flags);
                 while ((get_dma_curr_desc_ptr(sport->dma_tx_chan) -
-                        sizeof(struct dmasg)) !=
-                        (unsigned long)sport->dummy_tx_desc)
-                        ;
-                sport->dummy_tx_desc->next_desc_addr =
-                                (unsigned long)(sport->dma_tx_desc);
+                        sizeof(struct dmasg)) != sport->dummy_tx_desc)
+                        continue;
+                sport->dummy_tx_desc->next_desc_addr = sport->dma_tx_desc;
                 local_irq_restore(flags);
                 sport->curr_tx_desc = sport->dma_tx_desc;
         } else {
@@ -536,19 +524,17 @@ static int sport_config_rx_dummy(struct sport_device *sport)
         unsigned config;
 
         pr_debug("%s entered\n", __func__);
-#if L1_DATA_A_LENGTH != 0
-        desc = (struct dmasg *) l1_data_sram_alloc(2 * sizeof(*desc));
-#else
-        {
+        if (L1_DATA_A_LENGTH)
+                desc = l1_data_sram_zalloc(2 * sizeof(*desc));
+        else {
                 dma_addr_t addr;
                 desc = dma_alloc_coherent(NULL, 2 * sizeof(*desc), &addr, 0);
+                memset(desc, 0, 2 * sizeof(*desc));
         }
-#endif
         if (desc == NULL) {
                 pr_err("Failed to allocate memory for dummy rx desc\n");
                 return -ENOMEM;
         }
-        memset(desc, 0, 2 * sizeof(*desc));
         sport->dummy_rx_desc = desc;
         desc->start_addr = (unsigned long)sport->dummy_buf;
         config = DMAFLOW_LARGE | NDSIZE_9 | compute_wdsize(sport->wdsize)
@@ -559,8 +545,8 @@ static int sport_config_rx_dummy(struct sport_device *sport)
         desc->y_count = 0;
         desc->y_modify = 0;
         memcpy(desc+1, desc, sizeof(*desc));
-        desc->next_desc_addr = (unsigned long)(desc+1);
-        desc[1].next_desc_addr = (unsigned long)desc;
+        desc->next_desc_addr = desc + 1;
+        desc[1].next_desc_addr = desc;
         return 0;
 }
 
@@ -571,19 +557,17 @@ static int sport_config_tx_dummy(struct sport_device *sport)
 
         pr_debug("%s entered\n", __func__);
 
-#if L1_DATA_A_LENGTH != 0
-        desc = (struct dmasg *) l1_data_sram_alloc(2 * sizeof(*desc));
-#else
-        {
+        if (L1_DATA_A_LENGTH)
+                desc = l1_data_sram_zalloc(2 * sizeof(*desc));
+        else {
                 dma_addr_t addr;
                 desc = dma_alloc_coherent(NULL, 2 * sizeof(*desc), &addr, 0);
+                memset(desc, 0, 2 * sizeof(*desc));
         }
-#endif
         if (!desc) {
                 pr_err("Failed to allocate memory for dummy tx desc\n");
                 return -ENOMEM;
         }
-        memset(desc, 0, 2 * sizeof(*desc));
         sport->dummy_tx_desc = desc;
         desc->start_addr = (unsigned long)sport->dummy_buf + \
                 sport->dummy_count;
@@ -595,8 +579,8 @@ static int sport_config_tx_dummy(struct sport_device *sport)
         desc->y_count = 0;
         desc->y_modify = 0;
         memcpy(desc+1, desc, sizeof(*desc));
-        desc->next_desc_addr = (unsigned long)(desc+1);
-        desc[1].next_desc_addr = (unsigned long)desc;
+        desc->next_desc_addr = desc + 1;
+        desc[1].next_desc_addr = desc;
         return 0;
 }
 
@@ -872,17 +856,15 @@ struct sport_device *sport_init(struct sport_param *param, unsigned wdsize,
         sport->wdsize = wdsize;
         sport->dummy_count = dummy_count;
 
-#if L1_DATA_A_LENGTH != 0
-        sport->dummy_buf = l1_data_sram_alloc(dummy_count * 2);
-#else
-        sport->dummy_buf = kmalloc(dummy_count * 2, GFP_KERNEL);
-#endif
+        if (L1_DATA_A_LENGTH)
+                sport->dummy_buf = l1_data_sram_zalloc(dummy_count * 2);
+        else
+                sport->dummy_buf = kzalloc(dummy_count * 2, GFP_KERNEL);
         if (sport->dummy_buf == NULL) {
                 pr_err("Failed to allocate dummy buffer\n");
                 goto __error;
         }
 
-        memset(sport->dummy_buf, 0, dummy_count * 2);
         ret = sport_config_rx_dummy(sport);
         if (ret) {
                 pr_err("Failed to config rx dummy ring\n");
@@ -939,6 +921,7 @@ void sport_done(struct sport_device *sport)
                 sport = NULL;
 }
 EXPORT_SYMBOL(sport_done);
+
 /*
 * It is only used to send several bytes when dma is not enabled
  * sport controller is configured but not enabled.
@@ -1029,4 +1012,3 @@ EXPORT_SYMBOL(sport_send_and_recv);
 MODULE_AUTHOR("Roy Huang");
 MODULE_DESCRIPTION("SPORT driver for ADI Blackfin");
 MODULE_LICENSE("GPL");
-