From: Mark Brown Date: Tue, 16 Jul 2013 09:47:10 +0000 (+0100) Subject: ASoC: kirkwood-i2s: Inline KIRKWOOD_I2S_RATES X-Git-Tag: v3.12-rc1~43^2~9^2~2^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e12cbd93232c20544d16aa33c587786a6cb726d;p=kernel%2Fkernel-generic.git ASoC: kirkwood-i2s: Inline KIRKWOOD_I2S_RATES The addition of extclk support makes this misleading as it's only the rates used when there is no extclk so put it in the specific DAI it applies to. Signed-off-by: Mark Brown --- diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index becc082..e6027fd 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -26,9 +26,6 @@ #define DRV_NAME "kirkwood-i2s" -#define KIRKWOOD_I2S_RATES \ - (SNDRV_PCM_RATE_44100 | \ - SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000) #define KIRKWOOD_I2S_FORMATS \ (SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S24_LE | \ @@ -411,13 +408,15 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai = { .playback = { .channels_min = 1, .channels_max = 2, - .rates = KIRKWOOD_I2S_RATES, + .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | + SNDRV_PCM_RATE_96000, .formats = KIRKWOOD_I2S_FORMATS, }, .capture = { .channels_min = 1, .channels_max = 2, - .rates = KIRKWOOD_I2S_RATES, + .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | + SNDRV_PCM_RATE_96000, .formats = KIRKWOOD_I2S_FORMATS, }, .ops = &kirkwood_i2s_dai_ops,