aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 7dbf37e0ba2f..a5b96c17633a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2510,7 +2510,6 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
{
struct device *dev = component->dev;
struct snd_soc_dai *dai;
- struct snd_soc_dai_ops *ops; /* REMOVE ME */
lockdep_assert_held(&client_mutex);
@@ -2539,30 +2538,6 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
if (!dai->name)
return NULL;
- /* REMOVE ME */
- if (dai_drv->probe ||
- dai_drv->remove ||
- dai_drv->compress_new ||
- dai_drv->pcm_new ||
- dai_drv->probe_order ||
- dai_drv->remove_order) {
-
- ops = devm_kzalloc(dev, sizeof(struct snd_soc_dai_ops), GFP_KERNEL);
- if (!ops)
- return NULL;
- if (dai_drv->ops)
- memcpy(ops, dai_drv->ops, sizeof(struct snd_soc_dai_ops));
-
- ops->probe = dai_drv->probe;
- ops->remove = dai_drv->remove;
- ops->compress_new = dai_drv->compress_new;
- ops->pcm_new = dai_drv->pcm_new;
- ops->probe_order = dai_drv->probe_order;
- ops->remove_order = dai_drv->remove_order;
-
- dai_drv->ops = ops;
- }
-
dai->component = component;
dai->dev = dev;
dai->driver = dai_drv;