mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
ASoC: tegra: Replace instances of rtd->codec->card with rtd->card
No need to go via the CODEC to get a pointer to the card. This will help to eventually remove the card field from the snd_soc_codec struct. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
9898e1ccf5
commit
093c4e5c3c
6 changed files with 10 additions and 16 deletions
|
@ -41,8 +41,7 @@ static int tegra_alc5632_asoc_hw_params(struct snd_pcm_substream *substream,
|
|||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_card *card = codec->card;
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct tegra_alc5632 *alc5632 = snd_soc_card_get_drvdata(card);
|
||||
int srate, mclk;
|
||||
int err;
|
||||
|
@ -105,7 +104,7 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
|
|||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(codec->card);
|
||||
struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card);
|
||||
|
||||
snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,
|
||||
&tegra_alc5632_hs_jack);
|
||||
|
|
|
@ -49,8 +49,7 @@ static int tegra_max98090_asoc_hw_params(struct snd_pcm_substream *substream,
|
|||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_card *card = codec->card;
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct tegra_max98090 *machine = snd_soc_card_get_drvdata(card);
|
||||
int srate, mclk;
|
||||
int err;
|
||||
|
@ -127,7 +126,7 @@ static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)
|
|||
{
|
||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct tegra_max98090 *machine = snd_soc_card_get_drvdata(codec->card);
|
||||
struct tegra_max98090 *machine = snd_soc_card_get_drvdata(rtd->card);
|
||||
|
||||
if (gpio_is_valid(machine->gpio_hp_det)) {
|
||||
snd_soc_jack_new(codec, "Headphones", SND_JACK_HEADPHONE,
|
||||
|
|
|
@ -51,8 +51,7 @@ static int tegra_rt5640_asoc_hw_params(struct snd_pcm_substream *substream,
|
|||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_card *card = codec->card;
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(card);
|
||||
int srate, mclk;
|
||||
int err;
|
||||
|
@ -110,7 +109,7 @@ static int tegra_rt5640_asoc_init(struct snd_soc_pcm_runtime *rtd)
|
|||
{
|
||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(codec->card);
|
||||
struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(rtd->card);
|
||||
|
||||
snd_soc_jack_new(codec, "Headphones", SND_JACK_HEADPHONE,
|
||||
&tegra_rt5640_hp_jack);
|
||||
|
|
|
@ -55,8 +55,7 @@ static int tegra_wm8753_hw_params(struct snd_pcm_substream *substream,
|
|||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_card *card = codec->card;
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct tegra_wm8753 *machine = snd_soc_card_get_drvdata(card);
|
||||
int srate, mclk;
|
||||
int err;
|
||||
|
|
|
@ -60,8 +60,7 @@ static int tegra_wm8903_hw_params(struct snd_pcm_substream *substream,
|
|||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_card *card = codec->card;
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
|
||||
int srate, mclk;
|
||||
int err;
|
||||
|
@ -173,7 +172,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
|
|||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
struct snd_soc_card *card = codec->card;
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
|
||||
|
||||
if (gpio_is_valid(machine->gpio_hp_det)) {
|
||||
|
|
|
@ -50,8 +50,7 @@ static int trimslice_asoc_hw_params(struct snd_pcm_substream *substream,
|
|||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_card *card = codec->card;
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct tegra_trimslice *trimslice = snd_soc_card_get_drvdata(card);
|
||||
int srate, mclk;
|
||||
int err;
|
||||
|
|
Loading…
Reference in a new issue