summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:52:12 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:52:12 +0100
commitcb42e0f709a73caf4d631be32189bb1ca513ad25 (patch)
tree16a45cd33a8edf58967cd56cc74f51dbc3d91e5c /include/sound
parentca945cf9fb887ff64e63f324a9098a1bd848c58f (diff)
parentf2988afedf2c19880a3c65d79dfc7939e1b53d8a (diff)
downloadlinux-cb42e0f709a73caf4d631be32189bb1ca513ad25.tar.bz2
Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 59635a12c3be..ab69e2652b4e 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -791,7 +791,6 @@ struct snd_soc_component {
/* Don't use these, use snd_soc_component_get_dapm() */
struct snd_soc_dapm_context dapm;
- struct snd_soc_dapm_context *dapm_ptr;
const struct snd_kcontrol_new *controls;
unsigned int num_controls;
@@ -831,9 +830,6 @@ struct snd_soc_codec {
/* component */
struct snd_soc_component component;
- /* Don't access this directly, use snd_soc_codec_get_dapm() */
- struct snd_soc_dapm_context dapm;
-
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_reg;
#endif
@@ -1276,7 +1272,7 @@ static inline struct snd_soc_component *snd_soc_dapm_to_component(
static inline struct snd_soc_codec *snd_soc_dapm_to_codec(
struct snd_soc_dapm_context *dapm)
{
- return container_of(dapm, struct snd_soc_codec, dapm);
+ return snd_soc_component_to_codec(snd_soc_dapm_to_component(dapm));
}
/**
@@ -1301,7 +1297,7 @@ static inline struct snd_soc_platform *snd_soc_dapm_to_platform(
static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm(
struct snd_soc_component *component)
{
- return component->dapm_ptr;
+ return &component->dapm;
}
/**
@@ -1313,7 +1309,7 @@ static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm(
static inline struct snd_soc_dapm_context *snd_soc_codec_get_dapm(
struct snd_soc_codec *codec)
{
- return &codec->dapm;
+ return snd_soc_component_get_dapm(&codec->component);
}
/**