Commit a7c439d6 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-core: remove dai->driver NULL check

It is strange if it has "dai" but doesn't have "dai->driver".
And more over "dai->driver->xxx" is used everywhere without
"dai->driver" pointer NULL checking.
It got Oops already if "dai->driver" was NULL.
Let's remove un-needed "dai->driver" NULL check.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e894efef
...@@ -2519,8 +2519,6 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_bclk_ratio); ...@@ -2519,8 +2519,6 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_bclk_ratio);
*/ */
int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{ {
if (dai->driver == NULL)
return -EINVAL;
if (dai->driver->ops->set_fmt == NULL) if (dai->driver->ops->set_fmt == NULL)
return -ENOTSUPP; return -ENOTSUPP;
return dai->driver->ops->set_fmt(dai, fmt); return dai->driver->ops->set_fmt(dai, fmt);
...@@ -2667,9 +2665,6 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_tristate); ...@@ -2667,9 +2665,6 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_tristate);
int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute, int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute,
int direction) int direction)
{ {
if (!dai->driver)
return -ENOTSUPP;
if (dai->driver->ops->mute_stream) if (dai->driver->ops->mute_stream)
return dai->driver->ops->mute_stream(dai, mute, direction); return dai->driver->ops->mute_stream(dai, mute, direction);
else if (direction == SNDRV_PCM_STREAM_PLAYBACK && else if (direction == SNDRV_PCM_STREAM_PLAYBACK &&
......
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