diff options
author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-03-21 02:17:12 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-25 09:06:43 -0400 |
commit | e5c2151483facbe1a67b12ec881f45ae25b54c21 (patch) | |
tree | 8332be33a366ccaeba06c4962579d07cbdcf5d4c /sound/soc | |
parent | e090d5b6ad20056ec0ef58727e3ae95fd82be090 (diff) |
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: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/soc-core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b322cf294d06..318fee8093ce 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -3625,14 +3625,14 @@ int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) | |||
3625 | EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt); | 3625 | EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt); |
3626 | 3626 | ||
3627 | /** | 3627 | /** |
3628 | * snd_soc_of_xlate_tdm_slot - generate tx/rx slot mask. | 3628 | * snd_soc_xlate_tdm_slot - generate tx/rx slot mask. |
3629 | * @slots: Number of slots in use. | 3629 | * @slots: Number of slots in use. |
3630 | * @tx_mask: bitmask representing active TX slots. | 3630 | * @tx_mask: bitmask representing active TX slots. |
3631 | * @rx_mask: bitmask representing active RX slots. | 3631 | * @rx_mask: bitmask representing active RX slots. |
3632 | * | 3632 | * |
3633 | * Generates the TDM tx and rx slot default masks for DAI. | 3633 | * Generates the TDM tx and rx slot default masks for DAI. |
3634 | */ | 3634 | */ |
3635 | static int snd_soc_of_xlate_tdm_slot_mask(unsigned int slots, | 3635 | static int snd_soc_xlate_tdm_slot_mask(unsigned int slots, |
3636 | unsigned int *tx_mask, | 3636 | unsigned int *tx_mask, |
3637 | unsigned int *rx_mask) | 3637 | unsigned int *rx_mask) |
3638 | { | 3638 | { |
@@ -3662,11 +3662,11 @@ static int snd_soc_of_xlate_tdm_slot_mask(unsigned int slots, | |||
3662 | int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, | 3662 | int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, |
3663 | unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) | 3663 | unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) |
3664 | { | 3664 | { |
3665 | if (dai->driver && dai->driver->ops->of_xlate_tdm_slot_mask) | 3665 | if (dai->driver && dai->driver->ops->xlate_tdm_slot_mask) |
3666 | dai->driver->ops->of_xlate_tdm_slot_mask(slots, | 3666 | dai->driver->ops->xlate_tdm_slot_mask(slots, |
3667 | &tx_mask, &rx_mask); | 3667 | &tx_mask, &rx_mask); |
3668 | else | 3668 | else |
3669 | snd_soc_of_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask); | 3669 | snd_soc_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask); |
3670 | 3670 | ||
3671 | if (dai->driver && dai->driver->ops->set_tdm_slot) | 3671 | if (dai->driver && dai->driver->ops->set_tdm_slot) |
3672 | return dai->driver->ops->set_tdm_slot(dai, tx_mask, rx_mask, | 3672 | return dai->driver->ops->set_tdm_slot(dai, tx_mask, rx_mask, |