| Message ID | 1547084589-40006-1-git-send-email-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f833fe2056b3a6d69598ef029cede6e77dcc1b14 |
| Headers | show |
| Series | [-next,v2] ASoC: Intel: bytcht_es8316: use correct drvdata in snd_byt_cht_es8316_mc_remove() | expand |
On 1/9/19 7:43 PM, Wei Yongjun wrote: > The snd_byt_cht_es8316_mc_remove() use the platform drvdata as a type > of 'struct byt_cht_es8316_private', but snd_byt_cht_es8316_mc_probe() > set it to 'struct snd_soc_card', as suggested by Dan Carpenter, fix > the usage in snd_byt_cht_es8316_mc_remove(). > > Fixes: 0d3e91da0750 ("ASoC: Intel: bytcht_es8316: Add external speaker mux support") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > v1 -> v2: fix snd_byt_cht_es8316_mc_remove() instead, suggested by Dan. > --- > sound/soc/intel/boards/bytcht_es8316.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c > index cdf2061..fa9c4cf 100644 > --- a/sound/soc/intel/boards/bytcht_es8316.c > +++ b/sound/soc/intel/boards/bytcht_es8316.c > @@ -544,7 +544,8 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) > > static int snd_byt_cht_es8316_mc_remove(struct platform_device *pdev) > { > - struct byt_cht_es8316_private *priv = platform_get_drvdata(pdev); > + struct snd_soc_card *card = platform_get_drvdata(pdev); > + struct byt_cht_es8316_private *priv = snd_soc_card_get_drvdata(card); > > gpiod_put(priv->speaker_en_gpio); > return 0; > > > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Hi, On 10-01-19 02:43, Wei Yongjun wrote: > The snd_byt_cht_es8316_mc_remove() use the platform drvdata as a type > of 'struct byt_cht_es8316_private', but snd_byt_cht_es8316_mc_probe() > set it to 'struct snd_soc_card', as suggested by Dan Carpenter, fix > the usage in snd_byt_cht_es8316_mc_remove(). > > Fixes: 0d3e91da0750 ("ASoC: Intel: bytcht_es8316: Add external speaker mux support") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Thank you for catching this, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > v1 -> v2: fix snd_byt_cht_es8316_mc_remove() instead, suggested by Dan. > --- > sound/soc/intel/boards/bytcht_es8316.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c > index cdf2061..fa9c4cf 100644 > --- a/sound/soc/intel/boards/bytcht_es8316.c > +++ b/sound/soc/intel/boards/bytcht_es8316.c > @@ -544,7 +544,8 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) > > static int snd_byt_cht_es8316_mc_remove(struct platform_device *pdev) > { > - struct byt_cht_es8316_private *priv = platform_get_drvdata(pdev); > + struct snd_soc_card *card = platform_get_drvdata(pdev); > + struct byt_cht_es8316_private *priv = snd_soc_card_get_drvdata(card); > > gpiod_put(priv->speaker_en_gpio); > return 0; > > >
diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index cdf2061..fa9c4cf 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -544,7 +544,8 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) static int snd_byt_cht_es8316_mc_remove(struct platform_device *pdev) { - struct byt_cht_es8316_private *priv = platform_get_drvdata(pdev); + struct snd_soc_card *card = platform_get_drvdata(pdev); + struct byt_cht_es8316_private *priv = snd_soc_card_get_drvdata(card); gpiod_put(priv->speaker_en_gpio); return 0;
The snd_byt_cht_es8316_mc_remove() use the platform drvdata as a type of 'struct byt_cht_es8316_private', but snd_byt_cht_es8316_mc_probe() set it to 'struct snd_soc_card', as suggested by Dan Carpenter, fix the usage in snd_byt_cht_es8316_mc_remove(). Fixes: 0d3e91da0750 ("ASoC: Intel: bytcht_es8316: Add external speaker mux support") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- v1 -> v2: fix snd_byt_cht_es8316_mc_remove() instead, suggested by Dan. --- sound/soc/intel/boards/bytcht_es8316.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)