]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: soc-core: remove dai->driver NULL check
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 11 Sep 2018 06:50:27 +0000 (15:50 +0900)
committerMark Brown <broonie@kernel.org>
Wed, 12 Sep 2018 10:12:27 +0000 (11:12 +0100)
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index 807f112fad80b3bfdaa3db220ca0a2fb191df82e..325dc1964850c8f0bc855444d3b493348a1ee647 100644 (file)
@@ -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)
 {
-       if (dai->driver == NULL)
-               return -EINVAL;
        if (dai->driver->ops->set_fmt == NULL)
                return -ENOTSUPP;
        return dai->driver->ops->set_fmt(dai, fmt);
@@ -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 direction)
 {
-       if (!dai->driver)
-               return -ENOTSUPP;
-
        if (dai->driver->ops->mute_stream)
                return dai->driver->ops->mute_stream(dai, mute, direction);
        else if (direction == SNDRV_PCM_STREAM_PLAYBACK &&