summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-06-16 18:13:02 +0200
committerMark Brown <broonie@linaro.org>2014-06-21 21:04:24 +0100
commitf4333203ec933f9272c90c7add01774ec2cf94d3 (patch)
tree4a7f0bd37c7a5d00105dd91980fca721e181bee4 /include
parent94f99c875c109e51decf0d8c25ec2c946db20c56 (diff)
downloadblackbird-op-linux-f4333203ec933f9272c90c7add01774ec2cf94d3.tar.gz
blackbird-op-linux-f4333203ec933f9272c90c7add01774ec2cf94d3.zip
ASoC: Move name and id from CODEC/platform to component
The component struct already has a name and id field which are initialized to the same values as the same fields in the CODEC and platform structs. So remove them from the CODEC and platform structs and used the ones from the component struct instead. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc.h4
-rw-r--r--include/trace/events/asoc.h6
2 files changed, 3 insertions, 7 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index e1cce0042f8a..f64bf9452466 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -710,8 +710,6 @@ struct snd_soc_component {
/* SoC Audio Codec device */
struct snd_soc_codec {
- const char *name;
- int id;
struct device *dev;
const struct snd_soc_codec_driver *driver;
@@ -848,8 +846,6 @@ struct snd_soc_platform_driver {
};
struct snd_soc_platform {
- const char *name;
- int id;
struct device *dev;
const struct snd_soc_platform_driver *driver;
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index c75c795a377b..0194a641e4e2 100644
--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
@@ -296,17 +296,17 @@ TRACE_EVENT(snd_soc_cache_sync,
TP_ARGS(codec, type, status),
TP_STRUCT__entry(
- __string( name, codec->name )
+ __string( name, codec->component.name)
__string( status, status )
__string( type, type )
__field( int, id )
),
TP_fast_assign(
- __assign_str(name, codec->name);
+ __assign_str(name, codec->component.name);
__assign_str(status, status);
__assign_str(type, type);
- __entry->id = codec->id;
+ __entry->id = codec->component.id;
),
TP_printk("codec=%s.%d type=%s status=%s", __get_str(name),
OpenPOWER on IntegriCloud