aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-08-19 09:51:29 -0400
committerMark Brown <broonie@linaro.org>2014-08-19 11:59:47 -0400
commit75af7c081982d76cef0daf26e96b5d1e8cb9d631 (patch)
tree5611e2232f15f1b9c4e6c48fd238a16a1bab4f73
parent886f5692253de1a9509f5cb708432b2157afb57c (diff)
ASoC: Remove support for legacy snd_soc_platform IO
There were never any actual users of this in upstream and by we have with regmap a replacement in place, which should be used by new drivers. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--include/sound/soc.h3
-rw-r--r--sound/soc/soc-core.c22
2 files changed, 0 insertions, 25 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 8ebee30311e3..edbb0d72ab38 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -890,9 +890,6 @@ struct snd_soc_platform_driver {
890 /* platform stream compress ops */ 890 /* platform stream compress ops */
891 const struct snd_compr_ops *compr_ops; 891 const struct snd_compr_ops *compr_ops;
892 892
893 /* platform IO - used for platform DAPM */
894 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
895 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
896 int (*bespoke_trigger)(struct snd_pcm_substream *, int); 893 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
897}; 894};
898 895
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 96f286643ca1..2d7a9ecbb0e3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -4151,24 +4151,6 @@ static void snd_soc_platform_drv_remove(struct snd_soc_component *component)
4151 platform->driver->remove(platform); 4151 platform->driver->remove(platform);
4152} 4152}
4153 4153
4154static int snd_soc_platform_drv_write(struct snd_soc_component *component,
4155 unsigned int reg, unsigned int val)
4156{
4157 struct snd_soc_platform *platform = snd_soc_component_to_platform(component);
4158
4159 return platform->driver->write(platform, reg, val);
4160}
4161
4162static int snd_soc_platform_drv_read(struct snd_soc_component *component,
4163 unsigned int reg, unsigned int *val)
4164{
4165 struct snd_soc_platform *platform = snd_soc_component_to_platform(component);
4166
4167 *val = platform->driver->read(platform, reg);
4168
4169 return 0;
4170}
4171
4172/** 4154/**
4173 * snd_soc_add_platform - Add a platform to the ASoC core 4155 * snd_soc_add_platform - Add a platform to the ASoC core
4174 * @dev: The parent device for the platform 4156 * @dev: The parent device for the platform
@@ -4205,10 +4187,6 @@ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
4205 platform->component.probe = snd_soc_platform_drv_probe; 4187 platform->component.probe = snd_soc_platform_drv_probe;
4206 if (platform_drv->remove) 4188 if (platform_drv->remove)
4207 platform->component.remove = snd_soc_platform_drv_remove; 4189 platform->component.remove = snd_soc_platform_drv_remove;
4208 if (platform_drv->write)
4209 platform->component.write = snd_soc_platform_drv_write;
4210 if (platform_drv->read)
4211 platform->component.read = snd_soc_platform_drv_read;
4212 4190
4213#ifdef CONFIG_DEBUG_FS 4191#ifdef CONFIG_DEBUG_FS
4214 platform->component.debugfs_prefix = "platform"; 4192 platform->component.debugfs_prefix = "platform";