Commit 999f7f5a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: remove Codec related code

Now no one is using Codec related code.
Let's remove all
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 11fb14f8
...@@ -313,7 +313,6 @@ struct snd_soc_dai { ...@@ -313,7 +313,6 @@ struct snd_soc_dai {
unsigned int sample_bits; unsigned int sample_bits;
/* parent platform/codec */ /* parent platform/codec */
struct snd_soc_codec *codec;
struct snd_soc_component *component; struct snd_soc_component *component;
/* CODEC TDM slot masks and params (for fixup) */ /* CODEC TDM slot masks and params (for fixup) */
......
This diff is collapsed.
This diff is collapsed.
...@@ -32,8 +32,6 @@ int snd_soc_component_read(struct snd_soc_component *component, ...@@ -32,8 +32,6 @@ int snd_soc_component_read(struct snd_soc_component *component,
if (component->regmap) if (component->regmap)
ret = regmap_read(component->regmap, reg, val); ret = regmap_read(component->regmap, reg, val);
else if (component->read)
ret = component->read(component, reg, val);
else if (component->driver->read) { else if (component->driver->read) {
*val = component->driver->read(component, reg); *val = component->driver->read(component, reg);
ret = 0; ret = 0;
...@@ -72,8 +70,6 @@ int snd_soc_component_write(struct snd_soc_component *component, ...@@ -72,8 +70,6 @@ int snd_soc_component_write(struct snd_soc_component *component,
{ {
if (component->regmap) if (component->regmap)
return regmap_write(component->regmap, reg, val); return regmap_write(component->regmap, reg, val);
else if (component->write)
return component->write(component, reg, val);
else if (component->driver->write) else if (component->driver->write)
return component->driver->write(component, reg, val); return component->driver->write(component, reg, val);
else else
...@@ -209,61 +205,3 @@ int snd_soc_component_test_bits(struct snd_soc_component *component, ...@@ -209,61 +205,3 @@ int snd_soc_component_test_bits(struct snd_soc_component *component,
return old != new; return old != new;
} }
EXPORT_SYMBOL_GPL(snd_soc_component_test_bits); EXPORT_SYMBOL_GPL(snd_soc_component_test_bits);
unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg)
{
unsigned int val;
int ret;
ret = snd_soc_component_read(&codec->component, reg, &val);
if (ret < 0)
return -1;
return val;
}
EXPORT_SYMBOL_GPL(snd_soc_read);
int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,
unsigned int val)
{
return snd_soc_component_write(&codec->component, reg, val);
}
EXPORT_SYMBOL_GPL(snd_soc_write);
/**
* snd_soc_update_bits - update codec register bits
* @codec: audio codec
* @reg: codec register
* @mask: register mask
* @value: new value
*
* Writes new register value.
*
* Returns 1 for change, 0 for no change, or negative error code.
*/
int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned int reg,
unsigned int mask, unsigned int value)
{
return snd_soc_component_update_bits(&codec->component, reg, mask,
value);
}
EXPORT_SYMBOL_GPL(snd_soc_update_bits);
/**
* snd_soc_test_bits - test register for change
* @codec: audio codec
* @reg: codec register
* @mask: register mask
* @value: new value
*
* Tests a register with a new value and checks if the new value is
* different from the old value.
*
* Returns 1 for change else 0.
*/
int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg,
unsigned int mask, unsigned int value)
{
return snd_soc_component_test_bits(&codec->component, reg, mask, value);
}
EXPORT_SYMBOL_GPL(snd_soc_test_bits);
...@@ -28,24 +28,6 @@ struct jack_gpio_tbl { ...@@ -28,24 +28,6 @@ struct jack_gpio_tbl {
struct snd_soc_jack_gpio *gpios; struct snd_soc_jack_gpio *gpios;
}; };
/**
* snd_soc_codec_set_jack - configure codec jack.
* @codec: CODEC
* @jack: structure to use for the jack
* @data: can be used if codec driver need extra data for configuring jack
*
* Configures and enables jack detection function.
*/
int snd_soc_codec_set_jack(struct snd_soc_codec *codec,
struct snd_soc_jack *jack, void *data)
{
if (codec->driver->set_jack)
return codec->driver->set_jack(codec, jack, data);
else
return -ENOTSUPP;
}
EXPORT_SYMBOL_GPL(snd_soc_codec_set_jack);
/** /**
* snd_soc_component_set_jack - configure component jack. * snd_soc_component_set_jack - configure component jack.
* @component: COMPONENTs * @component: COMPONENTs
...@@ -57,10 +39,6 @@ EXPORT_SYMBOL_GPL(snd_soc_codec_set_jack); ...@@ -57,10 +39,6 @@ EXPORT_SYMBOL_GPL(snd_soc_codec_set_jack);
int snd_soc_component_set_jack(struct snd_soc_component *component, int snd_soc_component_set_jack(struct snd_soc_component *component,
struct snd_soc_jack *jack, void *data) struct snd_soc_jack *jack, void *data)
{ {
/* will be removed */
if (component->set_jack)
return component->set_jack(component, jack, data);
if (component->driver->set_jack) if (component->driver->set_jack)
return component->driver->set_jack(component, jack, data); return component->driver->set_jack(component, jack, data);
......
...@@ -135,7 +135,6 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd) ...@@ -135,7 +135,6 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_rtdcom_list *rtdcom; struct snd_soc_rtdcom_list *rtdcom;
struct snd_soc_component *component; struct snd_soc_component *component;
int i;
bool ignore = true; bool ignore = true;
if (!rtd->pmdown_time || rtd->dai_link->ignore_pmdown_time) if (!rtd->pmdown_time || rtd->dai_link->ignore_pmdown_time)
...@@ -147,10 +146,6 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd) ...@@ -147,10 +146,6 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd)
ignore &= !component->driver->use_pmdown_time; ignore &= !component->driver->use_pmdown_time;
} }
/* this will be removed */
for (i = 0; i < rtd->num_codecs; i++)
ignore &= rtd->codec_dais[i]->component->ignore_pmdown_time;
return ignore; return ignore;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment