diff options
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
-rw-r--r-- | sound/soc/codecs/wm8903.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index ce40d7877605..efbe8927b7d2 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
@@ -1257,7 +1257,8 @@ static struct { | |||
1257 | { 0, 0 }, | 1257 | { 0, 0 }, |
1258 | }; | 1258 | }; |
1259 | 1259 | ||
1260 | static int wm8903_startup(struct snd_pcm_substream *substream) | 1260 | static int wm8903_startup(struct snd_pcm_substream *substream, |
1261 | struct snd_soc_dai *dai) | ||
1261 | { | 1262 | { |
1262 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 1263 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
1263 | struct snd_soc_device *socdev = rtd->socdev; | 1264 | struct snd_soc_device *socdev = rtd->socdev; |
@@ -1298,7 +1299,8 @@ static int wm8903_startup(struct snd_pcm_substream *substream) | |||
1298 | return 0; | 1299 | return 0; |
1299 | } | 1300 | } |
1300 | 1301 | ||
1301 | static void wm8903_shutdown(struct snd_pcm_substream *substream) | 1302 | static void wm8903_shutdown(struct snd_pcm_substream *substream, |
1303 | struct snd_soc_dai *dai) | ||
1302 | { | 1304 | { |
1303 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 1305 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
1304 | struct snd_soc_device *socdev = rtd->socdev; | 1306 | struct snd_soc_device *socdev = rtd->socdev; |
@@ -1317,7 +1319,8 @@ static void wm8903_shutdown(struct snd_pcm_substream *substream) | |||
1317 | } | 1319 | } |
1318 | 1320 | ||
1319 | static int wm8903_hw_params(struct snd_pcm_substream *substream, | 1321 | static int wm8903_hw_params(struct snd_pcm_substream *substream, |
1320 | struct snd_pcm_hw_params *params) | 1322 | struct snd_pcm_hw_params *params, |
1323 | struct snd_soc_dai *dai) | ||
1321 | { | 1324 | { |
1322 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 1325 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
1323 | struct snd_soc_device *socdev = rtd->socdev; | 1326 | struct snd_soc_device *socdev = rtd->socdev; |
@@ -1515,8 +1518,6 @@ struct snd_soc_dai wm8903_dai = { | |||
1515 | .startup = wm8903_startup, | 1518 | .startup = wm8903_startup, |
1516 | .shutdown = wm8903_shutdown, | 1519 | .shutdown = wm8903_shutdown, |
1517 | .hw_params = wm8903_hw_params, | 1520 | .hw_params = wm8903_hw_params, |
1518 | }, | ||
1519 | .dai_ops = { | ||
1520 | .digital_mute = wm8903_digital_mute, | 1521 | .digital_mute = wm8903_digital_mute, |
1521 | .set_fmt = wm8903_set_dai_fmt, | 1522 | .set_fmt = wm8903_set_dai_fmt, |
1522 | .set_sysclk = wm8903_set_dai_sysclk | 1523 | .set_sysclk = wm8903_set_dai_sysclk |