[alsa-devel] [RFC 8/x] ASoC: remove platform related things

25 Jul 2017

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Now, all platform are replaced to component.
This patch removes all platform code.
One note is that, "platform_list_read_file()" is replaced to
"component_list_read_file()" by this patch
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
---
 Documentation/sound/soc/platform.rst |  30 ++---
 include/sound/soc.h                  | 102 +---------------
 sound/soc/soc-compress.c             | 209 --------------------------------
 sound/soc/soc-core.c                 | 229 ++---------------------------------
 sound/soc/soc-devres.c               |  35 ------
 sound/soc/soc-io.c                   |  21 ----
 sound/soc/soc-pcm.c                  | 121 +-----------------
 7 files changed, 26 insertions(+), 721 deletions(-)

diff --git a/Documentation/sound/soc/platform.rst b/Documentation/sound/soc/platform.rst
index d557490..cc81707 100644
--- a/Documentation/sound/soc/platform.rst
+++ b/Documentation/sound/soc/platform.rst
@@ -23,30 +23,26 @@ The platform DMA driver optionally supports the following ALSA operations:-
   };
The platform driver exports its DMA functionality via struct
-snd_soc_platform_driver:-
+snd_soc_component_driver:-
 ::
-  struct snd_soc_platform_driver {
-	char *name;
+  struct snd_soc_component_driver {
+	const char *name;
-	int (*probe)(struct platform_device *pdev);
-	int (*remove)(struct platform_device *pdev);
-	int (*suspend)(struct platform_device *pdev, struct snd_soc_cpu_dai *cpu_dai);
-	int (*resume)(struct platform_device *pdev, struct snd_soc_cpu_dai *cpu_dai);
+	...
+	int (*probe)(struct snd_soc_component *);
+	void (*remove)(struct snd_soc_component *);
+	int (*suspend)(struct snd_soc_component *);
+	int (*resume)(struct snd_soc_component *);
/* pcm creation and destruction */
-	int (*pcm_new)(struct snd_card *, struct snd_soc_codec_dai *, struct snd_pcm *);
+	int (*pcm_new)(struct snd_soc_pcm_runtime *);
    void (*pcm_free)(struct snd_pcm *);
-	/*
-	 * For platform caused delay reporting.
-	 * Optional.
-	 */
-	snd_pcm_sframes_t (*delay)(struct snd_pcm_substream *,
-		struct snd_soc_dai *);
-
-	/* platform stream ops */
-	struct snd_pcm_ops *pcm_ops;
+	...
+	const struct snd_pcm_ops *ops;
+	const struct snd_compr_ops *compr_ops;
+	...
   };
Please refer to the ALSA driver documentation for details of audio DMA.
diff --git a/include/sound/soc.h b/include/sound/soc.h
index ef5297d..dfc6dae 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -401,9 +401,7 @@ enum snd_soc_bias_level {
 struct snd_soc_pcm_runtime;
 struct snd_soc_dai;
 struct snd_soc_dai_driver;
-struct snd_soc_platform;
 struct snd_soc_dai_link;
-struct snd_soc_platform_driver;
 struct snd_soc_codec;
 struct snd_soc_codec_driver;
 struct snd_soc_component;
@@ -455,15 +453,6 @@ static inline int snd_soc_resume(struct device *dev)
 }
 #endif
 int snd_soc_poweroff(struct device *dev);
-int snd_soc_register_platform(struct device *dev,
-		const struct snd_soc_platform_driver *platform_drv);
-int devm_snd_soc_register_platform(struct device *dev,
-		const struct snd_soc_platform_driver *platform_drv);
-void snd_soc_unregister_platform(struct device *dev);
-int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
-		const struct snd_soc_platform_driver *platform_drv);
-void snd_soc_remove_platform(struct snd_soc_platform *platform);
-struct snd_soc_platform *snd_soc_lookup_platform(struct device *dev);
 int snd_soc_register_codec(struct device *dev,
    	const struct snd_soc_codec_driver *codec_drv,
    	struct snd_soc_dai_driver *dai_drv, int num_dai);
@@ -488,11 +477,6 @@ struct snd_soc_component *snd_soc_lookup_component(struct device *dev,
    			const char *driver_name);
 int snd_soc_cache_init(struct snd_soc_codec *codec);
 int snd_soc_cache_exit(struct snd_soc_codec *codec);
-
-int snd_soc_platform_read(struct snd_soc_platform *platform,
-					unsigned int reg);
-int snd_soc_platform_write(struct snd_soc_platform *platform,
-					unsigned int reg, unsigned int val);
 int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num);
 #ifdef CONFIG_SND_SOC_COMPRESS
 int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num);
@@ -623,8 +607,6 @@ int snd_soc_add_component_controls(struct snd_soc_component *component,
    const struct snd_kcontrol_new *controls, unsigned int num_controls);
 int snd_soc_add_codec_controls(struct snd_soc_codec *codec,
    const struct snd_kcontrol_new *controls, unsigned int num_controls);
-int snd_soc_add_platform_controls(struct snd_soc_platform *platform,
-	const struct snd_kcontrol_new *controls, unsigned int num_controls);
 int snd_soc_add_card_controls(struct snd_soc_card *soc_card,
    const struct snd_kcontrol_new *controls, int num_controls);
 int snd_soc_add_dai_controls(struct snd_soc_dai *dai,
@@ -888,8 +870,6 @@ struct snd_soc_component {
    void (*remove)(struct snd_soc_component *);
    int (*suspend)(struct snd_soc_component *);
    int (*resume)(struct snd_soc_component *);
-	int (*pcm_new)(struct snd_soc_component *, struct snd_soc_pcm_runtime *);
-	void (*pcm_free)(struct snd_soc_component *, struct snd_pcm *);
/* machine specific init */
    int (*init)(struct snd_soc_component *component);
@@ -975,39 +955,12 @@ struct snd_soc_codec_driver {
    bool ignore_pmdown_time;  /* Doesn't benefit from pmdown delay */
 };
-/* SoC platform interface */
-struct snd_soc_platform_driver {
-
-	int (*probe)(struct snd_soc_platform *);
-	int (*remove)(struct snd_soc_platform *);
-	struct snd_soc_component_driver component_driver;
-
-	/* pcm creation and destruction */
-	int (*pcm_new)(struct snd_soc_pcm_runtime *);
-	void (*pcm_free)(struct snd_pcm *);
-
-	/* platform stream pcm ops */
-	const struct snd_pcm_ops *ops;
-
-	/* platform stream compress ops */
-	const struct snd_compr_ops *compr_ops;
-};
-
 struct snd_soc_dai_link_component {
    const char *name;
    struct device_node *of_node;
    const char *dai_name;
 };
-struct snd_soc_platform {
-	struct device *dev;
-	const struct snd_soc_platform_driver *driver;
-
-	struct list_head list;
-
-	struct snd_soc_component component;
-};
-
 struct snd_soc_dai_link {
    /* config - must be set by machine driver */
    const char *name;			/* Codec name */
@@ -1256,7 +1209,6 @@ struct snd_soc_pcm_runtime {
    struct snd_pcm *pcm;
    struct snd_compr *compr;
    struct snd_soc_codec *codec;
-	struct snd_soc_platform *platform; /* will be removed */
    struct snd_soc_dai *codec_dai;
    struct snd_soc_dai *cpu_dai;
@@ -1339,19 +1291,6 @@ static inline struct snd_soc_codec *snd_soc_component_to_codec(
 }
/**
- * snd_soc_component_to_platform() - Casts a component to the platform it is embedded in
- * @component: The component to cast to a platform
- *
- * This function must only be used on components that are known to be platforms.
- * Otherwise the behavior is undefined.
- */
-static inline struct snd_soc_platform *snd_soc_component_to_platform(
-	struct snd_soc_component *component)
-{
-	return container_of(component, struct snd_soc_platform, component);
-}
-
-/**
  * snd_soc_dapm_to_component() - Casts a DAPM context to the component it is
  *  embedded in
  * @dapm: The DAPM context to cast to the component
@@ -1380,20 +1319,6 @@ static inline struct snd_soc_codec *snd_soc_dapm_to_codec(
 }
/**
- * snd_soc_dapm_to_platform() - Casts a DAPM context to the platform it is
- *  embedded in
- * @dapm: The DAPM context to cast to the platform.
- *
- * This function must only be used on DAPM contexts that are known to be part of
- * a platform (e.g. in a platform driver). Otherwise the behavior is undefined.
- */
-static inline struct snd_soc_platform *snd_soc_dapm_to_platform(
-	struct snd_soc_dapm_context *dapm)
-{
-	return snd_soc_component_to_platform(snd_soc_dapm_to_component(dapm));
-}
-
-/**
  * snd_soc_component_get_dapm() - Returns the DAPM context associated with a
  *  component
  * @component: The component for which to get the DAPM context
@@ -1572,17 +1497,6 @@ static inline void *snd_soc_codec_get_drvdata(struct snd_soc_codec *codec)
    return snd_soc_component_get_drvdata(&codec->component);
 }
-static inline void snd_soc_platform_set_drvdata(struct snd_soc_platform *platform,
-		void *data)
-{
-	snd_soc_component_set_drvdata(&platform->component, data);
-}
-
-static inline void *snd_soc_platform_get_drvdata(struct snd_soc_platform *platform)
-{
-	return snd_soc_component_get_drvdata(&platform->component);
-}
-
 static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
 {
    INIT_LIST_HEAD(&card->widgets);
@@ -1646,7 +1560,7 @@ static inline bool snd_soc_codec_is_active(struct snd_soc_codec *codec)
  *
  * Note: This function will work correctly if the control has been registered
  * for a component. Either with snd_soc_add_codec_controls() or
- * snd_soc_add_platform_controls() or via  table based setup for either a
+ * via  table based setup for either a
  * CODEC, a platform or component driver. Otherwise the behavior is undefined.
  */
 static inline struct snd_soc_component *snd_soc_kcontrol_component(
@@ -1669,20 +1583,6 @@ static inline struct snd_soc_codec *snd_soc_kcontrol_codec(
    return snd_soc_component_to_codec(snd_soc_kcontrol_component(kcontrol));
 }
-/**
- * snd_soc_kcontrol_platform() - Returns the platform that registered the control
- * @kcontrol: The control for which to get the platform
- *
- * Note: This function will only work correctly if the control has been
- * registered with snd_soc_add_platform_controls() or via table based setup of
- * a snd_soc_platform_driver. Otherwise the behavior is undefined.
- */
-static inline struct snd_soc_platform *snd_soc_kcontrol_platform(
-	struct snd_kcontrol *kcontrol)
-{
-	return snd_soc_component_to_platform(snd_soc_kcontrol_component(kcontrol));
-}
-
 int snd_soc_util_init(void);
 void snd_soc_util_exit(void);
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index fab9a7b..69d3608 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -29,7 +29,6 @@
 static int soc_compr_open(struct snd_compr_stream *cstream)
 {
    struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -46,22 +45,9 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
    	}
    }
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->open) {
-		ret = platform->driver->compr_ops->open(cstream);
-		if (ret < 0) {
-			pr_err("compress asoc: can't open platform %s\n",
-				platform->component.name);
-			goto plat_err;
-		}
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->open)
    		continue;
@@ -94,10 +80,6 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->free)
    		continue;
@@ -105,9 +87,6 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
    	component->driver->compr_ops->free(cstream);
    }
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->free)
-		platform->driver->compr_ops->free(cstream);
-plat_err:
    if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown)
    	cpu_dai->driver->cops->shutdown(cstream, cpu_dai);
 out:
@@ -120,7 +99,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
    struct snd_soc_pcm_runtime *fe = cstream->private_data;
    struct snd_pcm_substream *fe_substream =
    	 fe->pcm->streams[cstream->direction].substream;
-	struct snd_soc_platform *platform = fe->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = fe->cpu_dai;
@@ -145,23 +123,9 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
    	}
    }
-
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->open) {
-		ret = platform->driver->compr_ops->open(cstream);
-		if (ret < 0) {
-			pr_err("compress asoc: can't open platform %s\n",
-				platform->component.name);
-			goto plat_err;
-		}
-	}
-
    for_each_rtdcom(fe, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->open)
    		continue;
@@ -230,10 +194,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
    for_each_rtdcom(fe, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->free)
    		continue;
@@ -241,9 +201,6 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
    	component->driver->compr_ops->free(cstream);
    }
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->free)
-		platform->driver->compr_ops->free(cstream);
-plat_err:
    if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown)
    	cpu_dai->driver->cops->shutdown(cstream, cpu_dai);
 out:
@@ -283,7 +240,6 @@ static void close_delayed_work(struct work_struct *work)
 static int soc_compr_free(struct snd_compr_stream *cstream)
 {
    struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -314,10 +270,6 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->free)
    		continue;
@@ -325,9 +277,6 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
    	component->driver->compr_ops->free(cstream);
    }
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->free)
-		platform->driver->compr_ops->free(cstream);
-
    if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown)
    	cpu_dai->driver->cops->shutdown(cstream, cpu_dai);
@@ -356,7 +305,6 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
 static int soc_compr_free_fe(struct snd_compr_stream *cstream)
 {
    struct snd_soc_pcm_runtime *fe = cstream->private_data;
-	struct snd_soc_platform *platform = fe->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = fe->cpu_dai;
@@ -396,16 +344,9 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)
    if (fe->dai_link->compr_ops && fe->dai_link->compr_ops->shutdown)
    	fe->dai_link->compr_ops->shutdown(cstream);
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->free)
-		platform->driver->compr_ops->free(cstream);
-
    for_each_rtdcom(fe, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->free)
    		continue;
@@ -424,7 +365,6 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
 {
struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *codec_dai = rtd->codec_dai;
@@ -433,19 +373,9 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->trigger) {
-		ret = platform->driver->compr_ops->trigger(cstream, cmd);
-		if (ret < 0)
-			goto out;
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->trigger)
    		continue;
@@ -478,7 +408,6 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
 static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
 {
    struct snd_soc_pcm_runtime *fe = cstream->private_data;
-	struct snd_soc_platform *platform = fe->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = fe->cpu_dai;
@@ -487,19 +416,9 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
    if (cmd == SND_COMPR_TRIGGER_PARTIAL_DRAIN ||
    	cmd == SND_COMPR_TRIGGER_DRAIN) {
-		if (platform &&
-		    platform->driver->compr_ops &&
-		    platform->driver->compr_ops->trigger)
-			return platform->driver->compr_ops->trigger(cstream,
-								    cmd);
-
    	for_each_rtdcom(fe, rtdcom) {
    		component = rtdcom->component;
-			/* ignore duplication for now */
-			if (platform && (component == &platform->component))
-				continue;
-
    		if (!component->driver->compr_ops ||
    		    !component->driver->compr_ops->trigger)
    			continue;
@@ -525,19 +444,9 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
    		goto out;
    }
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->trigger) {
-		ret = platform->driver->compr_ops->trigger(cstream, cmd);
-		if (ret < 0)
-			goto out;
-	}
-
    for_each_rtdcom(fe, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->trigger)
    		continue;
@@ -578,7 +487,6 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream,
    				struct snd_compr_params *params)
 {
    struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -598,19 +506,9 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream,
    		goto err;
    }
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->set_params) {
-		ret = platform->driver->compr_ops->set_params(cstream, params);
-		if (ret < 0)
-			goto err;
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->set_params)
    		continue;
@@ -654,7 +552,6 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
    struct snd_soc_pcm_runtime *fe = cstream->private_data;
    struct snd_pcm_substream *fe_substream =
    	 fe->pcm->streams[cstream->direction].substream;
-	struct snd_soc_platform *platform = fe->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = fe->cpu_dai;
@@ -673,19 +570,9 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
    		goto out;
    }
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->set_params) {
-		ret = platform->driver->compr_ops->set_params(cstream, params);
-		if (ret < 0)
-			goto out;
-	}
-
    for_each_rtdcom(fe, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->set_params)
    		continue;
@@ -734,7 +621,6 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream,
    				struct snd_codec *params)
 {
    struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -748,19 +634,9 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream,
    		goto err;
    }
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->get_params) {
-		ret = platform->driver->compr_ops->get_params(cstream, params);
-		if (ret < 0)
-			goto err;
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->get_params)
    		continue;
@@ -779,26 +655,15 @@ static int soc_compr_get_caps(struct snd_compr_stream *cstream,
    			struct snd_compr_caps *caps)
 {
    struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    int ret = 0, __ret;
mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->get_caps) {
-		ret = platform->driver->compr_ops->get_caps(cstream, caps);
-		if (ret < 0)
-			goto err;
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->get_caps)
    		continue;
@@ -817,26 +682,15 @@ static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream,
    			struct snd_compr_codec_caps *codec)
 {
    struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    int ret = 0, __ret;
mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->get_codec_caps) {
-		ret = platform->driver->compr_ops->get_codec_caps(cstream, codec);
-		if (ret < 0)
-			goto err;
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->get_codec_caps)
    		continue;
@@ -854,7 +708,6 @@ static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream,
 static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes)
 {
    struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -868,19 +721,9 @@ static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes)
    		goto err;
    }
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->ack) {
-		ret = platform->driver->compr_ops->ack(cstream, bytes);
-		if (ret < 0)
-			goto err;
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->ack)
    		continue;
@@ -899,7 +742,6 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
    		struct snd_compr_tstamp *tstamp)
 {
    struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    int ret = 0, __ret;
@@ -910,19 +752,9 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
    if (cpu_dai->driver->cops && cpu_dai->driver->cops->pointer)
    	cpu_dai->driver->cops->pointer(cstream, tstamp, cpu_dai);
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->pointer) {
-		ret = platform->driver->compr_ops->pointer(cstream, tstamp);
-		if (ret < 0)
-			goto err;
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->pointer)
    		continue;
@@ -941,26 +773,15 @@ static int soc_compr_copy(struct snd_compr_stream *cstream,
    		  char __user *buf, size_t count)
 {
    struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    int ret = 0, __ret;
mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->copy) {
-		ret = platform->driver->compr_ops->copy(cstream, buf, count);
-		if (ret < 0)
-			goto err;
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->copy)
    		continue;
@@ -978,7 +799,6 @@ static int soc_compr_set_metadata(struct snd_compr_stream *cstream,
    			struct snd_compr_metadata *metadata)
 {
    struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -990,19 +810,9 @@ static int soc_compr_set_metadata(struct snd_compr_stream *cstream,
    		return ret;
    }
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->set_metadata) {
-		ret = platform->driver->compr_ops->set_metadata(cstream, metadata);
-		if (ret < 0)
-			return ret;
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->set_metadata)
    		continue;
@@ -1019,7 +829,6 @@ static int soc_compr_get_metadata(struct snd_compr_stream *cstream,
    			struct snd_compr_metadata *metadata)
 {
    struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -1031,19 +840,9 @@ static int soc_compr_get_metadata(struct snd_compr_stream *cstream,
    		return ret;
    }
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->get_metadata) {
-		ret = platform->driver->compr_ops->get_metadata(cstream, metadata);
-		if (ret < 0)
-			return ret;
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->get_metadata)
    		continue;
@@ -1097,7 +896,6 @@ static int soc_compr_get_metadata(struct snd_compr_stream *cstream,
 int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
 {
    struct snd_soc_codec *codec = rtd->codec;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *codec_dai = rtd->codec_dai;
@@ -1179,16 +977,9 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
/* Add copy callback for not memory mapped DSPs */
-	if (platform && platform->driver->compr_ops && platform->driver->compr_ops->copy)
-		compr->ops->copy = soc_compr_copy;
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->compr_ops ||
    	    !component->driver->compr_ops->copy)
    		continue;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2e8beee..c016f38 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -56,7 +56,6 @@
 #endif
static DEFINE_MUTEX(client_mutex);
-static LIST_HEAD(platform_list);
 static LIST_HEAD(codec_list);
 static LIST_HEAD(component_list);
@@ -426,22 +425,22 @@ static ssize_t dai_list_read_file(struct file *file, char __user *user_buf,
    .llseek = default_llseek,/* read accesses f_pos */
 };
-static ssize_t platform_list_read_file(struct file *file,
+static ssize_t component_list_read_file(struct file *file,
    			       char __user *user_buf,
    			       size_t count, loff_t *ppos)
 {
    char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
    ssize_t len, ret = 0;
-	struct snd_soc_platform *platform;
+	struct snd_soc_component *component;
if (!buf)
    	return -ENOMEM;
mutex_lock(&client_mutex);
-	list_for_each_entry(platform, &platform_list, list) {
+	list_for_each_entry(component, &component_list, list) {
    	len = snprintf(buf + ret, PAGE_SIZE - ret, "%s\n",
-			       platform->component.name);
+			       component->name);
    	if (len >= 0)
    		ret += len;
    	if (ret > PAGE_SIZE) {
@@ -459,8 +458,8 @@ static ssize_t platform_list_read_file(struct file *file,
    return ret;
 }
-static const struct file_operations platform_list_fops = {
-	.read = platform_list_read_file,
+static const struct file_operations component_list_fops = {
+	.read = component_list_read_file,
    .llseek = default_llseek,/* read accesses f_pos */
 };
@@ -508,8 +507,8 @@ static void snd_soc_debugfs_init(void)
    			 &dai_list_fops))
    	pr_warn("ASoC: Failed to create DAI list debugfs file\n");
-	if (!debugfs_create_file("platforms", 0444, snd_soc_debugfs_root, NULL,
-				 &platform_list_fops))
+	if (!debugfs_create_file("components", 0444, snd_soc_debugfs_root, NULL,
+				 &component_list_fops))
    	pr_warn("ASoC: Failed to create platform list debugfs file\n");
 }
@@ -1101,7 +1100,6 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
    struct snd_soc_dai_link_component cpu_dai_component;
    struct snd_soc_component *component;
    struct snd_soc_dai **codec_dais;
-	struct snd_soc_platform *platform;
    struct device_node *platform_of_node;
    const char *platform_name;
    int i;
@@ -1169,23 +1167,6 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
    	snd_soc_rtdcom_add(rtd, component);
    }
-	/* find one from the set of registered platforms */
-	list_for_each_entry(platform, &platform_list, list) {
-		platform_of_node = platform->dev->of_node;
-		if (!platform_of_node && platform->dev->parent->of_node)
-			platform_of_node = platform->dev->parent->of_node;
-
-		if (dai_link->platform_of_node) {
-			if (platform_of_node != dai_link->platform_of_node)
-				continue;
-		} else {
-			if (strcmp(platform->component.name, platform_name))
-				continue;
-		}
-
-		rtd->platform = platform;
-	}
-
    soc_add_pcm_runtime(card, rtd);
    return 0;
@@ -2554,24 +2535,6 @@ int snd_soc_add_codec_controls(struct snd_soc_codec *codec,
 EXPORT_SYMBOL_GPL(snd_soc_add_codec_controls);
/**
- * snd_soc_add_platform_controls - add an array of controls to a platform.
- * Convenience function to add a list of controls.
- *
- * @platform: platform to add controls to
- * @controls: array of controls to add
- * @num_controls: number of elements in the array
- *
- * Return 0 for success, else error.
- */
-int snd_soc_add_platform_controls(struct snd_soc_platform *platform,
-	const struct snd_kcontrol_new *controls, unsigned int num_controls)
-{
-	return snd_soc_add_component_controls(&platform->component, controls,
-		num_controls);
-}
-EXPORT_SYMBOL_GPL(snd_soc_add_platform_controls);
-
-/**
  * snd_soc_add_card_controls - add an array of controls to a SoC card.
  * Convenience function to add a list of controls.
  *
@@ -3192,22 +3155,6 @@ static int snd_soc_component_stream_event(struct snd_soc_dapm_context *dapm,
    return component->driver->stream_event(component, event);
 }
-static int snd_soc_component_drv_pcm_new(struct snd_soc_component *component,
-					struct snd_soc_pcm_runtime *rtd)
-{
-	if (component->driver->pcm_new)
-		return component->driver->pcm_new(rtd);
-
-	return 0;
-}
-
-static void snd_soc_component_drv_pcm_free(struct snd_soc_component *component,
-					  struct snd_pcm *pcm)
-{
-	if (component->driver->pcm_free)
-		component->driver->pcm_free(pcm);
-}
-
 static int snd_soc_component_initialize(struct snd_soc_component *component,
    const struct snd_soc_component_driver *driver, struct device *dev)
 {
@@ -3225,8 +3172,6 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
    component->remove = component->driver->remove;
    component->suspend = component->driver->suspend;
    component->resume = component->driver->resume;
-	component->pcm_new = snd_soc_component_drv_pcm_new;
-	component->pcm_free= snd_soc_component_drv_pcm_free;
dapm = &component->dapm;
    dapm->dev = dev;
@@ -3442,164 +3387,6 @@ struct snd_soc_component *snd_soc_lookup_component(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(snd_soc_lookup_component);
-static int snd_soc_platform_drv_probe(struct snd_soc_component *component)
-{
-	struct snd_soc_platform *platform = snd_soc_component_to_platform(component);
-
-	return platform->driver->probe(platform);
-}
-
-static void snd_soc_platform_drv_remove(struct snd_soc_component *component)
-{
-	struct snd_soc_platform *platform = snd_soc_component_to_platform(component);
-
-	platform->driver->remove(platform);
-}
-
-static int snd_soc_platform_drv_pcm_new(struct snd_soc_component *component,
-					struct snd_soc_pcm_runtime *rtd)
-{
-	struct snd_soc_platform *platform = snd_soc_component_to_platform(component);
-
-	if (platform->driver->pcm_new)
-		return platform->driver->pcm_new(rtd);
-
-	return 0;
-}
-
-static void snd_soc_platform_drv_pcm_free(struct snd_soc_component *component,
-					  struct snd_pcm *pcm)
-{
-	struct snd_soc_platform *platform = snd_soc_component_to_platform(component);
-
-	if (platform->driver->pcm_free)
-		platform->driver->pcm_free(pcm);
-}
-
-/**
- * snd_soc_add_platform - Add a platform to the ASoC core
- * @dev: The parent device for the platform
- * @platform: The platform to add
- * @platform_drv: The driver for the platform
- */
-int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
-		const struct snd_soc_platform_driver *platform_drv)
-{
-	int ret;
-
-	ret = snd_soc_component_initialize(&platform->component,
-			&platform_drv->component_driver, dev);
-	if (ret)
-		return ret;
-
-	platform->dev = dev;
-	platform->driver = platform_drv;
-
-	if (platform_drv->probe)
-		platform->component.probe = snd_soc_platform_drv_probe;
-	if (platform_drv->remove)
-		platform->component.remove = snd_soc_platform_drv_remove;
-	if (platform_drv->pcm_new)
-		platform->component.pcm_new = snd_soc_platform_drv_pcm_new;
-	if (platform_drv->pcm_free)
-		platform->component.pcm_free = snd_soc_platform_drv_pcm_free;
-
-#ifdef CONFIG_DEBUG_FS
-	platform->component.debugfs_prefix = "platform";
-#endif
-
-	mutex_lock(&client_mutex);
-	snd_soc_component_add_unlocked(&platform->component);
-	list_add(&platform->list, &platform_list);
-	mutex_unlock(&client_mutex);
-
-	dev_dbg(dev, "ASoC: Registered platform '%s'\n",
-		platform->component.name);
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(snd_soc_add_platform);
-
-/**
- * snd_soc_register_platform - Register a platform with the ASoC core
- *
- * @dev: The device for the platform
- * @platform_drv: The driver for the platform
- */
-int snd_soc_register_platform(struct device *dev,
-		const struct snd_soc_platform_driver *platform_drv)
-{
-	struct snd_soc_platform *platform;
-	int ret;
-
-	dev_dbg(dev, "ASoC: platform register %s\n", dev_name(dev));
-
-	platform = kzalloc(sizeof(struct snd_soc_platform), GFP_KERNEL);
-	if (platform == NULL)
-		return -ENOMEM;
-
-	ret = snd_soc_add_platform(dev, platform, platform_drv);
-	if (ret)
-		kfree(platform);
-
-	return ret;
-}
-EXPORT_SYMBOL_GPL(snd_soc_register_platform);
-
-/**
- * snd_soc_remove_platform - Remove a platform from the ASoC core
- * @platform: the platform to remove
- */
-void snd_soc_remove_platform(struct snd_soc_platform *platform)
-{
-
-	mutex_lock(&client_mutex);
-	list_del(&platform->list);
-	snd_soc_component_del_unlocked(&platform->component);
-	mutex_unlock(&client_mutex);
-
-	dev_dbg(platform->dev, "ASoC: Unregistered platform '%s'\n",
-		platform->component.name);
-
-	snd_soc_component_cleanup(&platform->component);
-}
-EXPORT_SYMBOL_GPL(snd_soc_remove_platform);
-
-struct snd_soc_platform *snd_soc_lookup_platform(struct device *dev)
-{
-	struct snd_soc_platform *platform;
-
-	mutex_lock(&client_mutex);
-	list_for_each_entry(platform, &platform_list, list) {
-		if (dev == platform->dev) {
-			mutex_unlock(&client_mutex);
-			return platform;
-		}
-	}
-	mutex_unlock(&client_mutex);
-
-	return NULL;
-}
-EXPORT_SYMBOL_GPL(snd_soc_lookup_platform);
-
-/**
- * snd_soc_unregister_platform - Unregister a platform from the ASoC core
- *
- * @dev: platform to unregister
- */
-void snd_soc_unregister_platform(struct device *dev)
-{
-	struct snd_soc_platform *platform;
-
-	platform = snd_soc_lookup_platform(dev);
-	if (!platform)
-		return;
-
-	snd_soc_remove_platform(platform);
-	kfree(platform);
-}
-EXPORT_SYMBOL_GPL(snd_soc_unregister_platform);
-
 static u64 codec_format_map[] = {
    SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE,
    SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_U16_BE,
diff --git a/sound/soc/soc-devres.c b/sound/soc/soc-devres.c
index 9194696..b05041c 100644
--- a/sound/soc/soc-devres.c
+++ b/sound/soc/soc-devres.c
@@ -52,41 +52,6 @@ int devm_snd_soc_register_component(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(devm_snd_soc_register_component);
-static void devm_platform_release(struct device *dev, void *res)
-{
-	snd_soc_unregister_platform(*(struct device **)res);
-}
-
-/**
- * devm_snd_soc_register_platform - resource managed platform registration
- * @dev: Device used to manage platform
- * @platform_drv: platform to register
- *
- * Register a platform driver with automatic unregistration when the device is
- * unregistered.
- */
-int devm_snd_soc_register_platform(struct device *dev,
-			const struct snd_soc_platform_driver *platform_drv)
-{
-	struct device **ptr;
-	int ret;
-
-	ptr = devres_alloc(devm_platform_release, sizeof(*ptr), GFP_KERNEL);
-	if (!ptr)
-		return -ENOMEM;
-
-	ret = snd_soc_register_platform(dev, platform_drv);
-	if (ret == 0) {
-		*ptr = dev;
-		devres_add(dev, ptr);
-	} else {
-		devres_free(ptr);
-	}
-
-	return ret;
-}
-EXPORT_SYMBOL_GPL(devm_snd_soc_register_platform);
-
 static void devm_card_release(struct device *dev, void *res)
 {
    snd_soc_unregister_card(*(struct snd_soc_card **)res);
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 9b39390..c909330 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -250,24 +250,3 @@ int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg,
    return snd_soc_component_test_bits(&codec->component, reg, mask, value);
 }
 EXPORT_SYMBOL_GPL(snd_soc_test_bits);
-
-int snd_soc_platform_read(struct snd_soc_platform *platform,
-					unsigned int reg)
-{
-	unsigned int val;
-	int ret;
-
-	ret = snd_soc_component_read(&platform->component, reg, &val);
-	if (ret < 0)
-		return -1;
-
-	return val;
-}
-EXPORT_SYMBOL_GPL(snd_soc_platform_read);
-
-int snd_soc_platform_write(struct snd_soc_platform *platform,
-					 unsigned int reg, unsigned int val)
-{
-	return snd_soc_component_write(&platform->component, reg, val);
-}
-EXPORT_SYMBOL_GPL(snd_soc_platform_write);
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index e1c3d5c7..ab1de54 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -453,7 +453,6 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
 {
    struct snd_soc_pcm_runtime *rtd = substream->private_data;
    struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -483,23 +482,10 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
    	}
    }
-	if (platform && platform->driver->ops && platform->driver->ops->open) {
-		ret = platform->driver->ops->open(substream);
-		if (ret < 0) {
-			dev_err(platform->dev, "ASoC: can't open platform"
-				" %s: %d\n", platform->component.name, ret);
-			goto platform_err;
-		}
-	}
-
    ret = 0;
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->ops ||
    	    !component->driver->ops->open)
    		continue;
@@ -625,10 +611,6 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->ops ||
    	    !component->driver->ops->close)
    		continue;
@@ -636,10 +618,6 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
    	component->driver->ops->close(substream);
    }
-	if (platform && platform->driver->ops && platform->driver->ops->close)
-		platform->driver->ops->close(substream);
-
-platform_err:
    if (cpu_dai->driver->ops->shutdown)
    	cpu_dai->driver->ops->shutdown(substream, cpu_dai);
 out:
@@ -698,7 +676,6 @@ static void close_delayed_work(struct work_struct *work)
 static int soc_pcm_close(struct snd_pcm_substream *substream)
 {
    struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -733,16 +710,9 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
    if (rtd->dai_link->ops && rtd->dai_link->ops->shutdown)
    	rtd->dai_link->ops->shutdown(substream);
-	if (platform && platform->driver->ops && platform->driver->ops->close)
-		platform->driver->ops->close(substream);
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->ops ||
    	    !component->driver->ops->close)
    		continue;
@@ -796,7 +766,6 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
 static int soc_pcm_prepare(struct snd_pcm_substream *substream)
 {
    struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -814,22 +783,9 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
    	}
    }
-	if (platform && platform->driver->ops && platform->driver->ops->prepare) {
-		ret = platform->driver->ops->prepare(substream);
-		if (ret < 0) {
-			dev_err(platform->dev, "ASoC: platform prepare error:"
-				" %d\n", ret);
-			goto out;
-		}
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->ops ||
    	    !component->driver->ops->prepare)
    		continue;
@@ -923,7 +879,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
    			struct snd_pcm_hw_params *params)
 {
    struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -990,23 +945,10 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
    if (ret < 0)
    	goto interface_err;
-	if (platform && platform->driver->ops && platform->driver->ops->hw_params) {
-		ret = platform->driver->ops->hw_params(substream, params);
-		if (ret < 0) {
-			dev_err(platform->dev, "ASoC: %s hw params failed: %d\n",
-			       platform->component.name, ret);
-			goto platform_err;
-		}
-	}
-
    ret = 0;
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->ops ||
    	    !component->driver->ops->hw_params)
    		continue;
@@ -1036,10 +978,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->ops ||
    	    !component->driver->ops->hw_free)
    		continue;
@@ -1047,10 +985,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
    	component->driver->ops->hw_free(substream);
    }
-	if (platform && platform->driver->ops && platform->driver->ops->hw_free)
-		platform->driver->ops->hw_free(substream);
-
-platform_err:
    if (cpu_dai->driver->ops && cpu_dai->driver->ops->hw_free)
    	cpu_dai->driver->ops->hw_free(substream, cpu_dai);
@@ -1078,7 +1012,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
 static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
 {
    struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -1116,18 +1049,10 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
    if (rtd->dai_link->ops && rtd->dai_link->ops->hw_free)
    	rtd->dai_link->ops->hw_free(substream);
-	/* free any DMA resources */
-	if (platform && platform->driver->ops && platform->driver->ops->hw_free)
-		platform->driver->ops->hw_free(substream);
-
    /* free any component resources */
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->ops ||
    	    !component->driver->ops->hw_free)
    		continue;
@@ -1152,7 +1077,6 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
 static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
    struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -1169,19 +1093,9 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
    	}
    }
-	if (platform && platform->driver->ops && platform->driver->ops->trigger) {
-		ret = platform->driver->ops->trigger(substream, cmd);
-		if (ret < 0)
-			return ret;
-	}
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->ops ||
    	    !component->driver->ops->trigger)
    		continue;
@@ -1240,7 +1154,6 @@ static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream,
 static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
 {
    struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -1251,16 +1164,9 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
    snd_pcm_sframes_t codec_delay = 0;
    int i;
-	if (platform && platform->driver->ops && platform->driver->ops->pointer)
-		offset = platform->driver->ops->pointer(substream);
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->ops ||
    	    !component->driver->ops->pointer)
    		continue;
@@ -2453,20 +2359,12 @@ static int soc_pcm_ioctl(struct snd_pcm_substream *substream,
    	     unsigned int cmd, void *arg)
 {
    struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_component *component;
    struct snd_soc_rtdcom_list *rtdcom;
-	if (platform && platform->driver->ops && platform->driver->ops->ioctl)
-		return platform->driver->ops->ioctl(substream, cmd, arg);
-
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		/* ignore duplication for now */
-		if (platform && (component == &platform->component))
-			continue;
-
    	if (!component->driver->ops ||
    	    !component->driver->ops->ioctl)
    		continue;
@@ -2828,8 +2726,8 @@ static void soc_pcm_free(struct snd_pcm *pcm)
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		if (component->pcm_free)
-			component->pcm_free(component, pcm);
+		if (component->driver->pcm_free)
+			component->driver->pcm_free(pcm);
    }
 }
@@ -2968,7 +2866,6 @@ static int soc_rtdcom_mmap(struct snd_pcm_substream *substream,
 /* create a new pcm */
 int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
 {
-	struct snd_soc_platform *platform = rtd->platform;
    struct snd_soc_dai *codec_dai;
    struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
    struct snd_soc_component *component;
@@ -3087,16 +2984,6 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
    		rtd->ops.mmap		= soc_rtdcom_mmap;
    }
-	/* overwrite */
-	if (platform && platform->driver->ops) {
-		rtd->ops.ack		= platform->driver->ops->ack;
-		rtd->ops.copy_user	= platform->driver->ops->copy_user;
-		rtd->ops.copy_kernel	= platform->driver->ops->copy_kernel;
-		rtd->ops.fill_silence	= platform->driver->ops->fill_silence;
-		rtd->ops.page		= platform->driver->ops->page;
-		rtd->ops.mmap		= platform->driver->ops->mmap;
-	}
-
    if (playback)
    	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &rtd->ops);
@@ -3106,10 +2993,10 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
    for_each_rtdcom(rtd, rtdcom) {
    	component = rtdcom->component;
-		if (!component->pcm_new)
+		if (!component->driver->pcm_new)
    		continue;
-		ret = component->pcm_new(component, rtd);
+		ret = component->driver->pcm_new(rtd);
    	if (ret < 0) {
    		dev_err(component->dev,
    			"ASoC: pcm constructor failed: %d\n",
-- 
1.9.1


    