[alsa-devel] [PATCH 1/1] ASoC: twl4030 - Fix build error

Takashi Iwai tiwai at suse.de
Mon Mar 16 09:35:24 CET 2009


At Mon, 16 Mar 2009 09:01:11 +0200,
Jarkko Nikula wrote:
> 
> >
> > Signed-off-by: Joonyoung Shim <jy0922.shim at samsung.com>
> > ---
> >  sound/soc/codecs/twl4030.c |   12 +++++++-----
> >  1 files changed, 7 insertions(+), 5 deletions(-)
> >
> > diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
> > index ce4b43b..5ed5f1b 100644
> > --- a/sound/soc/codecs/twl4030.c
> > +++ b/sound/soc/codecs/twl4030.c
> > @@ -1383,6 +1383,12 @@ static int twl4030_set_dai_fmt(struct
> > snd_soc_dai *codec_dai,
> >  #define TWL4030_RATES   (SNDRV_PCM_RATE_8000_48000)
> >  #define TWL4030_FORMATS         (SNDRV_PCM_FMTBIT_S16_LE |
> > SNDRV_PCM_FORMAT_S24_LE)
> >
> > +static struct snd_soc_dai_ops twl4030_dai_ops = {
> > +       .hw_params      = twl4030_hw_params,
> > +       .set_sysclk     = twl4030_set_dai_sysclk,
> > +       .set_fmt        = twl4030_set_dai_fmt,
> > +};
> > +
> >  struct snd_soc_dai twl4030_dai = {
> >        .name = "twl4030",
> >        .playback = {
> > @@ -1397,11 +1403,7 @@ struct snd_soc_dai twl4030_dai = {
> >                .channels_max = 2,
> >                .rates = TWL4030_RATES,
> >                .formats = TWL4030_FORMATS,},
> > -       .ops = {
> > -               .hw_params = twl4030_hw_params,
> > -               .set_sysclk = twl4030_set_dai_sysclk,
> > -               .set_fmt = twl4030_set_dai_fmt,
> > -       }
> > +       .ops = &twl4030_dai_ops,
> >  };
> >  EXPORT_SYMBOL_GPL(twl4030_dai);
> >
> >
> Looks like a valid fix but note there is line wrapping and tabs are
> converted
> into spaces so patch doesn't apply.

Right, please fix and repost.

Meanwhile, I found also sound/soc/sh/hac.c and
sound/soc/s3c24xx/s3c64xx-i2s.c have the same problem.

Mark, care to fix them?


thanks,

Takashi


More information about the Alsa-devel mailing list