Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbcdb69d authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: fsl: Remove fsl_asoc_xlate_tdm_slot_mask() 



Now that the fsl DAI drivers uses the same semantics as the rest of a ASoC
the custom fsl_asoc_xlate_tdm_slot_mask() callback can be removed as it is
identical to the generic one.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d0077aaf

sound/soc/fsl/fsl_utils.c

+0 −27
Original line number Diff line number Diff line
@@ -86,33 +86,6 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np, 
}

EXPORT_SYMBOL(fsl_asoc_get_dma_channel);



/**

 * fsl_asoc_xlate_tdm_slot_mask - generate TDM slot TX/RX mask.

 *

 * @slots: Number of slots in use.

 * @tx_mask: bitmask representing active TX slots.

 * @rx_mask: bitmask representing active RX slots.

 *

 * This function used to generate the TDM slot TX/RX mask. And the TX/RX

 * mask will use a 1 bit for an active slot as default, and the default

 * active bits are at the LSB of the mask value.

 */

int fsl_asoc_xlate_tdm_slot_mask(unsigned int slots,

				    unsigned int *tx_mask,

				    unsigned int *rx_mask)

{

	if (!slots)

		return -EINVAL;



	if (tx_mask)

		*tx_mask = ((1 << slots) - 1);

	if (rx_mask)

		*rx_mask = ((1 << slots) - 1);



	return 0;

}

EXPORT_SYMBOL_GPL(fsl_asoc_xlate_tdm_slot_mask);



MODULE_AUTHOR("Timur Tabi <timur@freescale.com>");

MODULE_DESCRIPTION("Freescale ASoC utility code");

MODULE_LICENSE("GPL v2");

sound/soc/fsl/fsl_utils.h

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,4 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np, const char *name, 
			     struct snd_soc_dai_link *dai,

			     unsigned int *dma_channel_id,

			     unsigned int *dma_id);

int fsl_asoc_xlate_tdm_slot_mask(unsigned int slots,

				    unsigned int *tx_mask,

				    unsigned int *rx_mask);

#endif /* _FSL_UTILS_H */

sound/soc/fsl/imx-ssi.c

+0 −1
Original line number Diff line number Diff line
@@ -340,7 +340,6 @@ static const struct snd_soc_dai_ops imx_ssi_pcm_dai_ops = { 
	.set_fmt	= imx_ssi_set_dai_fmt,

	.set_clkdiv	= imx_ssi_set_dai_clkdiv,

	.set_sysclk	= imx_ssi_set_dai_sysclk,

	.xlate_tdm_slot_mask = fsl_asoc_xlate_tdm_slot_mask,

	.set_tdm_slot	= imx_ssi_set_dai_tdm_slot,

	.trigger	= imx_ssi_trigger,

};