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>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 8ebee30..edbb0d7 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -890,9 +890,6 @@ struct snd_soc_platform_driver {
        /* platform stream compress ops */
        const struct snd_compr_ops *compr_ops;
 
-       /* platform IO - used for platform DAPM */
-       unsigned int (*read)(struct snd_soc_platform *, unsigned int);
-       int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
        int (*bespoke_trigger)(struct snd_pcm_substream *, int);
 };
 

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 96f2866..2d7a9ec 100644 (file)
--- 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)
        platform->driver->remove(platform);
 }
 
-static int snd_soc_platform_drv_write(struct snd_soc_component *component,
-       unsigned int reg, unsigned int val)
-{
-       struct snd_soc_platform *platform = snd_soc_component_to_platform(component);
-
-       return platform->driver->write(platform, reg, val);
-}
-
-static int snd_soc_platform_drv_read(struct snd_soc_component *component,
-       unsigned int reg, unsigned int *val)
-{
-       struct snd_soc_platform *platform = snd_soc_component_to_platform(component);
-
-       *val = platform->driver->read(platform, reg);
-
-       return 0;
-}
-
 /**
  * snd_soc_add_platform - Add a platform to the ASoC core
  * @dev: The parent device for the platform
@@ -4205,10 +4187,6 @@ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
                platform->component.probe = snd_soc_platform_drv_probe;
        if (platform_drv->remove)
                platform->component.remove = snd_soc_platform_drv_remove;
-       if (platform_drv->write)
-               platform->component.write = snd_soc_platform_drv_write;
-       if (platform_drv->read)
-               platform->component.read = snd_soc_platform_drv_read;
 
 #ifdef CONFIG_DEBUG_FS
        platform->component.debugfs_prefix = "platform";