From: Daniel Baluta <daniel.baluta@gmail.com> To: Shengjiu Wang <shengjiu.wang@nxp.com> Cc: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ASoC: ak4458: Remove component probe() and remove() Date: Thu, 8 Sep 2022 11:57:55 +0300 [thread overview] Message-ID: <CAEnQRZCz_qKUMPqQgADszu_DvBEqNYRqm-wgfiYYEbRfvUEkng@mail.gmail.com> (raw) In-Reply-To: <1662622316-23426-1-git-send-email-shengjiu.wang@nxp.com> On Thu, Sep 8, 2022 at 11:03 AM Shengjiu Wang <shengjiu.wang@nxp.com> wrote: > > Most function in ak4458_probe() and ak4458_remove() are > duplicate with dai ops, so remove them and move dsd_path > setting to dai ops. > > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> > --- > sound/soc/codecs/ak4458.c | 53 ++++++--------------------------------- > 1 file changed, 7 insertions(+), 46 deletions(-) > > diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c > index ea33cc83c86c..b534212096ee 100644 > --- a/sound/soc/codecs/ak4458.c > +++ b/sound/soc/codecs/ak4458.c > @@ -447,6 +447,13 @@ static int ak4458_hw_params(struct snd_pcm_substream *substream, > snd_soc_component_update_bits(component, AK4458_0B_CONTROL7, > AK4458_DCHAIN_MASK, dchn); > > + if (ak4458->drvdata->type == AK4497) { > + ret = snd_soc_component_update_bits(component, AK4458_09_DSD2, > + 0x4, (ak4458->dsd_path << 2)); > + if (ret < 0) > + return ret; > + } > + > ret = ak4458_rstn_control(component, 0); > if (ret) > return ret; > @@ -629,48 +636,6 @@ static void ak4458_reset(struct ak4458_priv *ak4458, bool active) > } > } > > -static int ak4458_init(struct snd_soc_component *component) > -{ > - struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component); > - int ret; > - > - /* External Mute ON */ > - if (ak4458->mute_gpiod) > - gpiod_set_value_cansleep(ak4458->mute_gpiod, 1); > - > - ak4458_reset(ak4458, false); > - > - ret = snd_soc_component_update_bits(component, AK4458_00_CONTROL1, > - 0x80, 0x80); /* ACKS bit = 1; 10000000 */ > - if (ret < 0) > - return ret; > - > - if (ak4458->drvdata->type == AK4497) { > - ret = snd_soc_component_update_bits(component, AK4458_09_DSD2, > - 0x4, (ak4458->dsd_path << 2)); > - if (ret < 0) > - return ret; > - } > - > - return ak4458_rstn_control(component, 1); > -} > - > -static int ak4458_probe(struct snd_soc_component *component) > -{ > - struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component); > - > - ak4458->fs = 48000; > - > - return ak4458_init(component); > -} > - > -static void ak4458_remove(struct snd_soc_component *component) > -{ > - struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component); > - > - ak4458_reset(ak4458, true); > -} > - > #ifdef CONFIG_PM > static int __maybe_unused ak4458_runtime_suspend(struct device *dev) > { > @@ -714,8 +679,6 @@ static int __maybe_unused ak4458_runtime_resume(struct device *dev) > #endif /* CONFIG_PM */ > > static const struct snd_soc_component_driver soc_codec_dev_ak4458 = { > - .probe = ak4458_probe, > - .remove = ak4458_remove, > .controls = ak4458_snd_controls, > .num_controls = ARRAY_SIZE(ak4458_snd_controls), > .dapm_widgets = ak4458_dapm_widgets, > @@ -728,8 +691,6 @@ static const struct snd_soc_component_driver soc_codec_dev_ak4458 = { > }; > > static const struct snd_soc_component_driver soc_codec_dev_ak4497 = { > - .probe = ak4458_probe, > - .remove = ak4458_remove, > .controls = ak4497_snd_controls, > .num_controls = ARRAY_SIZE(ak4497_snd_controls), > .dapm_widgets = ak4497_dapm_widgets, > -- > 2.34.1 >
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Baluta <daniel.baluta@gmail.com> To: Shengjiu Wang <shengjiu.wang@nxp.com> Cc: alsa-devel@alsa-project.org, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, tiwai@suse.com, broonie@kernel.org Subject: Re: [PATCH] ASoC: ak4458: Remove component probe() and remove() Date: Thu, 8 Sep 2022 11:57:55 +0300 [thread overview] Message-ID: <CAEnQRZCz_qKUMPqQgADszu_DvBEqNYRqm-wgfiYYEbRfvUEkng@mail.gmail.com> (raw) In-Reply-To: <1662622316-23426-1-git-send-email-shengjiu.wang@nxp.com> On Thu, Sep 8, 2022 at 11:03 AM Shengjiu Wang <shengjiu.wang@nxp.com> wrote: > > Most function in ak4458_probe() and ak4458_remove() are > duplicate with dai ops, so remove them and move dsd_path > setting to dai ops. > > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> > --- > sound/soc/codecs/ak4458.c | 53 ++++++--------------------------------- > 1 file changed, 7 insertions(+), 46 deletions(-) > > diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c > index ea33cc83c86c..b534212096ee 100644 > --- a/sound/soc/codecs/ak4458.c > +++ b/sound/soc/codecs/ak4458.c > @@ -447,6 +447,13 @@ static int ak4458_hw_params(struct snd_pcm_substream *substream, > snd_soc_component_update_bits(component, AK4458_0B_CONTROL7, > AK4458_DCHAIN_MASK, dchn); > > + if (ak4458->drvdata->type == AK4497) { > + ret = snd_soc_component_update_bits(component, AK4458_09_DSD2, > + 0x4, (ak4458->dsd_path << 2)); > + if (ret < 0) > + return ret; > + } > + > ret = ak4458_rstn_control(component, 0); > if (ret) > return ret; > @@ -629,48 +636,6 @@ static void ak4458_reset(struct ak4458_priv *ak4458, bool active) > } > } > > -static int ak4458_init(struct snd_soc_component *component) > -{ > - struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component); > - int ret; > - > - /* External Mute ON */ > - if (ak4458->mute_gpiod) > - gpiod_set_value_cansleep(ak4458->mute_gpiod, 1); > - > - ak4458_reset(ak4458, false); > - > - ret = snd_soc_component_update_bits(component, AK4458_00_CONTROL1, > - 0x80, 0x80); /* ACKS bit = 1; 10000000 */ > - if (ret < 0) > - return ret; > - > - if (ak4458->drvdata->type == AK4497) { > - ret = snd_soc_component_update_bits(component, AK4458_09_DSD2, > - 0x4, (ak4458->dsd_path << 2)); > - if (ret < 0) > - return ret; > - } > - > - return ak4458_rstn_control(component, 1); > -} > - > -static int ak4458_probe(struct snd_soc_component *component) > -{ > - struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component); > - > - ak4458->fs = 48000; > - > - return ak4458_init(component); > -} > - > -static void ak4458_remove(struct snd_soc_component *component) > -{ > - struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component); > - > - ak4458_reset(ak4458, true); > -} > - > #ifdef CONFIG_PM > static int __maybe_unused ak4458_runtime_suspend(struct device *dev) > { > @@ -714,8 +679,6 @@ static int __maybe_unused ak4458_runtime_resume(struct device *dev) > #endif /* CONFIG_PM */ > > static const struct snd_soc_component_driver soc_codec_dev_ak4458 = { > - .probe = ak4458_probe, > - .remove = ak4458_remove, > .controls = ak4458_snd_controls, > .num_controls = ARRAY_SIZE(ak4458_snd_controls), > .dapm_widgets = ak4458_dapm_widgets, > @@ -728,8 +691,6 @@ static const struct snd_soc_component_driver soc_codec_dev_ak4458 = { > }; > > static const struct snd_soc_component_driver soc_codec_dev_ak4497 = { > - .probe = ak4458_probe, > - .remove = ak4458_remove, > .controls = ak4497_snd_controls, > .num_controls = ARRAY_SIZE(ak4497_snd_controls), > .dapm_widgets = ak4497_dapm_widgets, > -- > 2.34.1 >
next prev parent reply other threads:[~2022-09-08 8:58 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-09-08 7:31 [PATCH] ASoC: ak4458: Remove component probe() and remove() Shengjiu Wang 2022-09-08 8:57 ` Daniel Baluta [this message] 2022-09-08 8:57 ` Daniel Baluta 2022-09-08 12:42 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAEnQRZCz_qKUMPqQgADszu_DvBEqNYRqm-wgfiYYEbRfvUEkng@mail.gmail.com \ --to=daniel.baluta@gmail.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=shengjiu.wang@nxp.com \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.