diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:53 +0100 |
| commit | b5c784894c90042f4fc6348aedc7524e899df281 (patch) | |
| tree | 0db86a93d73e4aabca04e361d7e6807aa4c1d307 /sound/soc/au1x/psc-i2s.c | |
| parent | Merge branch 'topic/aoa' into for-linus (diff) | |
| parent | ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c (diff) | |
| download | linux-b5c784894c90042f4fc6348aedc7524e899df281.tar.xz linux-b5c784894c90042f4fc6348aedc7524e899df281.zip | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/au1x/psc-i2s.c')
| -rw-r--r-- | sound/soc/au1x/psc-i2s.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c index f916de4400ed..bb589327ee32 100644 --- a/sound/soc/au1x/psc-i2s.c +++ b/sound/soc/au1x/psc-i2s.c @@ -367,6 +367,12 @@ static int au1xpsc_i2s_resume(struct snd_soc_dai *cpu_dai) return 0; } +static struct snd_soc_dai_ops au1xpsc_i2s_dai_ops = { + .trigger = au1xpsc_i2s_trigger, + .hw_params = au1xpsc_i2s_hw_params, + .set_fmt = au1xpsc_i2s_set_fmt, +}; + struct snd_soc_dai au1xpsc_i2s_dai = { .name = "au1xpsc_i2s", .probe = au1xpsc_i2s_probe, @@ -385,11 +391,7 @@ struct snd_soc_dai au1xpsc_i2s_dai = { .channels_min = 2, .channels_max = 8, /* 2 without external help */ }, - .ops = { - .trigger = au1xpsc_i2s_trigger, - .hw_params = au1xpsc_i2s_hw_params, - .set_fmt = au1xpsc_i2s_set_fmt, - }, + .ops = &au1xpsc_i2s_dai_ops, }; EXPORT_SYMBOL(au1xpsc_i2s_dai); |