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>

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),