ASoC: samsung: Use params_width()

commit 8c5178fca4ce ("ALSA: Add params_width() helpers") introduces
a helper to get the sample width. Updating Samsung related sound
drivers to use this helper.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 043d98645a544cebf97d90422bfe4642f7086a56..2ac76fa3e742e6fcd5dbacf094a2a38244345564 100644 (file)
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -676,8 +676,8 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
        if (is_manager(i2s))
                mod &= ~MOD_BLC_MASK;
 
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S8:
+       switch (params_width(params)) {
+       case 8:
                if (is_secondary(i2s))
                        mod |= MOD_BLCS_8BIT;
                else
@@ -685,7 +685,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
                if (is_manager(i2s))
                        mod |= MOD_BLC_8BIT;
                break;
-       case SNDRV_PCM_FORMAT_S16_LE:
+       case 16:
                if (is_secondary(i2s))
                        mod |= MOD_BLCS_16BIT;
                else
@@ -693,7 +693,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
                if (is_manager(i2s))
                        mod |= MOD_BLC_16BIT;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                if (is_secondary(i2s))
                        mod |= MOD_BLCS_24BIT;
                else

diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index a3c9c9cba3b015664c6512209ae9a5e2cf09d887..4c5f97fe45c866bdf14913d3189e7a85ffd12a2c 100644 (file)
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -283,8 +283,8 @@ static int s3c_pcm_hw_params(struct snd_pcm_substream *substream,
        dev_dbg(pcm->dev, "Entered %s\n", __func__);
 
        /* Strictly check for sample size */
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                break;
        default:
                return -EINVAL;

diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index 77a2ae50dc94ca5806299cc921b23d45c0355946..0ff4bbe23af3a5837074d05400bbc2e2e32bdfee 100644 (file)
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -322,13 +322,13 @@ static int s3c_i2sv2_hw_params(struct snd_pcm_substream *substream,
 
        iismod &= ~S3C64XX_IISMOD_BLC_MASK;
        /* Sample size */
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S8:
+       switch (params_width(params)) {
+       case 8:
                iismod |= S3C64XX_IISMOD_BLC_8BIT;
                break;
-       case SNDRV_PCM_FORMAT_S16_LE:
+       case 16:
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                iismod |= S3C64XX_IISMOD_BLC_24BIT;
                break;
        }

diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index 843f315dcb3ad360652ff4935adeb51bdef52a58..08c059be9104cb90ee390a3f1754a07024fd4368 100644 (file)
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -120,11 +120,11 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream,
        iismod = readl(i2s->regs + S3C2412_IISMOD);
        pr_debug("%s: r: IISMOD: %x\n", __func__, iismod);
 
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S8:
+       switch (params_width(params)) {
+       case 8:
                iismod |= S3C2412_IISMOD_8BIT;
                break;
-       case SNDRV_PCM_FORMAT_S16_LE:
+       case 16:
                iismod &= ~S3C2412_IISMOD_8BIT;
                break;
        }

diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 4a6d206db222c1131f98e946319e03e4b4d61da8..9aba9fb7df0ed0cd0dc03bf3005b2d5971648e97 100644 (file)
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -248,12 +248,12 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream,
        iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
        pr_debug("hw_params r: IISMOD: %x\n", iismod);
 
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S8:
+       switch (params_width(params)) {
+       case 8:
                iismod &= ~S3C2410_IISMOD_16BIT;
                dma_data->dma_size = 1;
                break;
-       case SNDRV_PCM_FORMAT_S16_LE:
+       case 16:
                iismod |= S3C2410_IISMOD_16BIT;
                dma_data->dma_size = 2;
                break;

diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c
index 7a16b32ed673372de134c3b87ba457b1f5e853d2..b1a519f83b29ea439c262ef2263fab208514bebc 100644 (file)
--- a/sound/soc/samsung/smdk_wm8580.c
+++ b/sound/soc/samsung/smdk_wm8580.c
@@ -37,13 +37,11 @@ static int smdk_hw_params(struct snd_pcm_substream *substream,
        unsigned int pll_out;
        int bfs, rfs, ret;
 
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_U8:
-       case SNDRV_PCM_FORMAT_S8:
+       switch (params_width(params)) {
+       case 8:
                bfs = 16;
                break;
-       case SNDRV_PCM_FORMAT_U16_LE:
-       case SNDRV_PCM_FORMAT_S16_LE:
+       case 16:
                bfs = 32;
                break;
        default:

diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index 682eb4f7ba0c61257ade6e96691ceafcb4d023a5..5b544dcf18b4696bd2b0fd2f7a8b375ddc42244a 100644 (file)
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -57,7 +57,7 @@ static int smdk_hw_params(struct snd_pcm_substream *substream,
        int ret;
 
        /* AIF1CLK should be >=3MHz for optimal performance */
-       if (params_format(params) == SNDRV_PCM_FORMAT_S24_LE)
+       if (params_width(params) == 24)
                pll_out = params_rate(params) * 384;
        else if (params_rate(params) == 8000 || params_rate(params) == 11025)
                pll_out = params_rate(params) * 512;

diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
index e93a93e296f470b3557a70d1d455a59f2617d419..d9ffc48fce5e2183e3a360108ff9e59e43017adb 100644 (file)
--- a/sound/soc/samsung/spdif.c
+++ b/sound/soc/samsung/spdif.c
@@ -211,8 +211,8 @@ static int spdif_hw_params(struct snd_pcm_substream *substream,
        con |= CON_PCM_DATA;
 
        con &= ~CON_PCM_MASK;
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                con |= CON_PCM_16BIT;
                break;
        default: