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

Commit 46471925 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: remove unneeded dai->driver check 



On soc_add_dai(), it is checking dai->driver->xxx,
This means, dai->driver is mandatory, never been NULL.
dai->driver check is not needed.
This patch removes it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent db1721f5

sound/soc/soc-core.c

+8 −8
Original line number Diff line number Diff line
@@ -2631,7 +2631,7 @@ EXPORT_SYMBOL_GPL(snd_soc_add_dai_controls); 
int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,

	unsigned int freq, int dir)

{

	if (dai->driver && dai->driver->ops->set_sysclk)

	if (dai->driver->ops->set_sysclk)

		return dai->driver->ops->set_sysclk(dai, clk_id, freq, dir);



	return snd_soc_component_set_sysclk(dai->component, clk_id, 0,
@@ -2699,7 +2699,7 @@ EXPORT_SYMBOL_GPL(snd_soc_component_set_sysclk); 
int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai,

	int div_id, int div)

{

	if (dai->driver && dai->driver->ops->set_clkdiv)

	if (dai->driver->ops->set_clkdiv)

		return dai->driver->ops->set_clkdiv(dai, div_id, div);

	else

		return -EINVAL;
@@ -2719,7 +2719,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_clkdiv); 
int snd_soc_dai_set_pll(struct snd_soc_dai *dai, int pll_id, int source,

	unsigned int freq_in, unsigned int freq_out)

{

	if (dai->driver && dai->driver->ops->set_pll)

	if (dai->driver->ops->set_pll)

		return dai->driver->ops->set_pll(dai, pll_id, source,

					 freq_in, freq_out);
@@ -2785,7 +2785,7 @@ EXPORT_SYMBOL_GPL(snd_soc_component_set_pll); 
 */

int snd_soc_dai_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)

{

	if (dai->driver && dai->driver->ops->set_bclk_ratio)

	if (dai->driver->ops->set_bclk_ratio)

		return dai->driver->ops->set_bclk_ratio(dai, ratio);

	else

		return -EINVAL;
@@ -2859,7 +2859,7 @@ static int snd_soc_xlate_tdm_slot_mask(unsigned int slots, 
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)

{

	if (dai->driver && dai->driver->ops->xlate_tdm_slot_mask)

	if (dai->driver->ops->xlate_tdm_slot_mask)

		dai->driver->ops->xlate_tdm_slot_mask(slots,

						&tx_mask, &rx_mask);

	else
@@ -2868,7 +2868,7 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, 
	dai->tx_mask = tx_mask;

	dai->rx_mask = rx_mask;



	if (dai->driver && dai->driver->ops->set_tdm_slot)

	if (dai->driver->ops->set_tdm_slot)

		return dai->driver->ops->set_tdm_slot(dai, tx_mask, rx_mask,

				slots, slot_width);

	else
@@ -2892,7 +2892,7 @@ int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai, 
	unsigned int tx_num, unsigned int *tx_slot,

	unsigned int rx_num, unsigned int *rx_slot)

{

	if (dai->driver && dai->driver->ops->set_channel_map)

	if (dai->driver->ops->set_channel_map)

		return dai->driver->ops->set_channel_map(dai, tx_num, tx_slot,

			rx_num, rx_slot);

	else
@@ -2909,7 +2909,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_channel_map); 
 */

int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate)

{

	if (dai->driver && dai->driver->ops->set_tristate)

	if (dai->driver->ops->set_tristate)

		return dai->driver->ops->set_tristate(dai, tristate);

	else

		return -EINVAL;