Merge branch 'master' into next

1 files changed, 6 insertions, 6 deletions

diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c
index eab31838badf..41db75af3c69 100644
--- a/sound/soc/sh/hac.c
+++ b/sound/soc/sh/hac.c
@@ -267,6 +267,10 @@ static int hac_hw_params(struct snd_pcm_substream *substream,
 #define AC97_FMTS       \
         SNDRV_PCM_FMTBIT_S16_LE
 
+static struct snd_soc_dai_ops hac_dai_ops = {
+        .hw_params      = hac_hw_params,
+};
+
 struct snd_soc_dai sh4_hac_dai[] = {
 {
         .name                   = "HAC0",
@@ -284,9 +288,7 @@ struct snd_soc_dai sh4_hac_dai[] = {
                 .channels_min   = 2,
                 .channels_max   = 2,
         },
-        .ops = {
-                .hw_params      = hac_hw_params,
-        },
+        .ops = &hac_dai_ops,
 },
 #ifdef CONFIG_CPU_SUBTYPE_SH7760
 {
@@ -305,9 +307,7 @@ struct snd_soc_dai sh4_hac_dai[] = {
                 .channels_min   = 2,
                 .channels_max   = 2,
         },
-        .ops = {
-                .hw_params      = hac_hw_params,
-        },
+        .ops = &hac_dai_ops,
 
 },
 #endif