| Message ID | 20220405075959.2744803-4-s.hauer@pengutronix.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: fsl_micfil: Driver updates | expand |
On Tue, Apr 5, 2022 at 4:00 PM Sascha Hauer <s.hauer@pengutronix.de> wrote: > All that the .set_sysclk hook in the micfil driver does is to pass > the sysclk frequency to fsl_micfil_set_mclk_rate(). This function > expects the sample rate as argument though, not any kind of sysclk > frequency. The resulting rate setting of the clock is overwritten > in hw_params anyway, so drop this altogether. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com> Best regards wang shengjiu > --- > sound/soc/fsl/fsl_micfil.c | 20 -------------------- > 1 file changed, 20 deletions(-) > > diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c > index cf10c212d770d..5353474d0ff2b 100644 > --- a/sound/soc/fsl/fsl_micfil.c > +++ b/sound/soc/fsl/fsl_micfil.c > @@ -358,30 +358,10 @@ static int fsl_micfil_hw_params(struct > snd_pcm_substream *substream, > return 0; > } > > -static int fsl_micfil_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, > - unsigned int freq, int dir) > -{ > - struct fsl_micfil *micfil = snd_soc_dai_get_drvdata(dai); > - struct device *dev = &micfil->pdev->dev; > - > - int ret; > - > - if (!freq) > - return 0; > - > - ret = fsl_micfil_set_mclk_rate(micfil, freq); > - if (ret < 0) > - dev_err(dev, "failed to set mclk[%lu] to rate %u\n", > - clk_get_rate(micfil->mclk), freq); > - > - return ret; > -} > - > static const struct snd_soc_dai_ops fsl_micfil_dai_ops = { > .startup = fsl_micfil_startup, > .trigger = fsl_micfil_trigger, > .hw_params = fsl_micfil_hw_params, > - .set_sysclk = fsl_micfil_set_dai_sysclk, > }; > > static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai) > -- > 2.30.2 > >
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index cf10c212d770d..5353474d0ff2b 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -358,30 +358,10 @@ static int fsl_micfil_hw_params(struct snd_pcm_substream *substream, return 0; } -static int fsl_micfil_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, - unsigned int freq, int dir) -{ - struct fsl_micfil *micfil = snd_soc_dai_get_drvdata(dai); - struct device *dev = &micfil->pdev->dev; - - int ret; - - if (!freq) - return 0; - - ret = fsl_micfil_set_mclk_rate(micfil, freq); - if (ret < 0) - dev_err(dev, "failed to set mclk[%lu] to rate %u\n", - clk_get_rate(micfil->mclk), freq); - - return ret; -} - static const struct snd_soc_dai_ops fsl_micfil_dai_ops = { .startup = fsl_micfil_startup, .trigger = fsl_micfil_trigger, .hw_params = fsl_micfil_hw_params, - .set_sysclk = fsl_micfil_set_dai_sysclk, }; static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai)
All that the .set_sysclk hook in the micfil driver does is to pass the sysclk frequency to fsl_micfil_set_mclk_rate(). This function expects the sample rate as argument though, not any kind of sysclk frequency. The resulting rate setting of the clock is overwritten in hw_params anyway, so drop this altogether. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- sound/soc/fsl/fsl_micfil.c | 20 -------------------- 1 file changed, 20 deletions(-)