Commit e5c21514 authored by Xiubo Li's avatar Xiubo Li Committed by Mark Brown

ASoC: core: remove the 'of_' prefix of of_xlate_tdm_slot_mask.

The 'of_' is not appropriate here for there hasn't any DT parsing.
Signed-off-by: default avatarXiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent e090d5b6
...@@ -142,7 +142,7 @@ struct snd_soc_dai_ops { ...@@ -142,7 +142,7 @@ struct snd_soc_dai_ops {
* Called by soc_card drivers, normally in their hw_params. * Called by soc_card drivers, normally in their hw_params.
*/ */
int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt); int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt);
int (*of_xlate_tdm_slot_mask)(unsigned int slots, int (*xlate_tdm_slot_mask)(unsigned int slots,
unsigned int *tx_mask, unsigned int *rx_mask); unsigned int *tx_mask, unsigned int *rx_mask);
int (*set_tdm_slot)(struct snd_soc_dai *dai, int (*set_tdm_slot)(struct snd_soc_dai *dai,
unsigned int tx_mask, unsigned int rx_mask, unsigned int tx_mask, unsigned int rx_mask,
......
...@@ -3625,14 +3625,14 @@ int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -3625,14 +3625,14 @@ int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt); EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt);
/** /**
* snd_soc_of_xlate_tdm_slot - generate tx/rx slot mask. * snd_soc_xlate_tdm_slot - generate tx/rx slot mask.
* @slots: Number of slots in use. * @slots: Number of slots in use.
* @tx_mask: bitmask representing active TX slots. * @tx_mask: bitmask representing active TX slots.
* @rx_mask: bitmask representing active RX slots. * @rx_mask: bitmask representing active RX slots.
* *
* Generates the TDM tx and rx slot default masks for DAI. * Generates the TDM tx and rx slot default masks for DAI.
*/ */
static int snd_soc_of_xlate_tdm_slot_mask(unsigned int slots, static int snd_soc_xlate_tdm_slot_mask(unsigned int slots,
unsigned int *tx_mask, unsigned int *tx_mask,
unsigned int *rx_mask) unsigned int *rx_mask)
{ {
...@@ -3662,11 +3662,11 @@ static int snd_soc_of_xlate_tdm_slot_mask(unsigned int slots, ...@@ -3662,11 +3662,11 @@ static int snd_soc_of_xlate_tdm_slot_mask(unsigned int slots,
int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,
unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)
{ {
if (dai->driver && dai->driver->ops->of_xlate_tdm_slot_mask) if (dai->driver && dai->driver->ops->xlate_tdm_slot_mask)
dai->driver->ops->of_xlate_tdm_slot_mask(slots, dai->driver->ops->xlate_tdm_slot_mask(slots,
&tx_mask, &rx_mask); &tx_mask, &rx_mask);
else else
snd_soc_of_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask); snd_soc_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask);
if (dai->driver && dai->driver->ops->set_tdm_slot) if (dai->driver && dai->driver->ops->set_tdm_slot)
return dai->driver->ops->set_tdm_slot(dai, tx_mask, rx_mask, return dai->driver->ops->set_tdm_slot(dai, tx_mask, rx_mask,
......
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