diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-23 17:55:23 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-27 05:30:54 -0500 |
commit | 6627a653bceb3a54e55e5cdc478ec5b8d5c9cc44 (patch) | |
tree | 9a6f157ad1123e4f047689bbf3c4ef88ec1259a4 /sound/soc/soc-dapm.c | |
parent | 0db4d0705260dd4bddf1e5a5441c58bdf08bdc9f (diff) |
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-dapm.c')
-rw-r--r-- | sound/soc/soc-dapm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 54b4564b82b4..f4a8753c84c0 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -817,7 +817,7 @@ static ssize_t dapm_widget_show(struct device *dev, | |||
817 | struct device_attribute *attr, char *buf) | 817 | struct device_attribute *attr, char *buf) |
818 | { | 818 | { |
819 | struct snd_soc_device *devdata = dev_get_drvdata(dev); | 819 | struct snd_soc_device *devdata = dev_get_drvdata(dev); |
820 | struct snd_soc_codec *codec = devdata->codec; | 820 | struct snd_soc_codec *codec = devdata->card->codec; |
821 | struct snd_soc_dapm_widget *w; | 821 | struct snd_soc_dapm_widget *w; |
822 | int count = 0; | 822 | int count = 0; |
823 | char *state = "not set"; | 823 | char *state = "not set"; |
@@ -1552,8 +1552,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_stream_event); | |||
1552 | int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev, | 1552 | int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev, |
1553 | enum snd_soc_bias_level level) | 1553 | enum snd_soc_bias_level level) |
1554 | { | 1554 | { |
1555 | struct snd_soc_codec *codec = socdev->codec; | ||
1556 | struct snd_soc_card *card = socdev->card; | 1555 | struct snd_soc_card *card = socdev->card; |
1556 | struct snd_soc_codec *codec = socdev->card->codec; | ||
1557 | int ret = 0; | 1557 | int ret = 0; |
1558 | 1558 | ||
1559 | if (card->set_bias_level) | 1559 | if (card->set_bias_level) |
@@ -1645,7 +1645,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_get_pin_status); | |||
1645 | */ | 1645 | */ |
1646 | void snd_soc_dapm_free(struct snd_soc_device *socdev) | 1646 | void snd_soc_dapm_free(struct snd_soc_device *socdev) |
1647 | { | 1647 | { |
1648 | struct snd_soc_codec *codec = socdev->codec; | 1648 | struct snd_soc_codec *codec = socdev->card->codec; |
1649 | 1649 | ||
1650 | snd_soc_dapm_sys_remove(socdev->dev); | 1650 | snd_soc_dapm_sys_remove(socdev->dev); |
1651 | dapm_free_widgets(codec); | 1651 | dapm_free_widgets(codec); |