summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-jack.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-23 22:55:23 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-27 10:30:54 +0000
commit6627a653bceb3a54e55e5cdc478ec5b8d5c9cc44 (patch)
tree9a6f157ad1123e4f047689bbf3c4ef88ec1259a4 /sound/soc/soc-jack.c
parent0db4d0705260dd4bddf1e5a5441c58bdf08bdc9f (diff)
downloadlinux-6627a653bceb3a54e55e5cdc478ec5b8d5c9cc44.tar.bz2
ASoC: Push the codec runtime storage into the card structure
This is a further stage on the road to refactoring away the ASoC platform device. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-jack.c')
-rw-r--r--sound/soc/soc-jack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 8cc00c3cdf34..ab64a30bedde 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -34,7 +34,7 @@ int snd_soc_jack_new(struct snd_soc_card *card, const char *id, int type,
jack->card = card;
INIT_LIST_HEAD(&jack->pins);
- return snd_jack_new(card->socdev->codec->card, id, type, &jack->jack);
+ return snd_jack_new(card->codec->card, id, type, &jack->jack);
}
EXPORT_SYMBOL_GPL(snd_soc_jack_new);
@@ -54,7 +54,7 @@ EXPORT_SYMBOL_GPL(snd_soc_jack_new);
*/
void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
{
- struct snd_soc_codec *codec = jack->card->socdev->codec;
+ struct snd_soc_codec *codec = jack->card->codec;
struct snd_soc_jack_pin *pin;
int enable;
int oldstatus;