Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next

diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 687565d08d9c2c856fdea679cd98367b71a8022a..090d499bb7ebca49d34fd2ac3142b782f8f46a1b 100644 (file)
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -352,7 +352,6 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
         */
        default:
                return -EINVAL;
-               break;
        }
        snd_soc_update_bits(codec, MD_CTL1, DIF_MASK, data);
 
@@ -405,7 +404,6 @@ static int ak4642_dai_hw_params(struct snd_pcm_substream *substream,
                break;
        default:
                return -EINVAL;
-               break;
        }
        snd_soc_update_bits(codec, MD_CTL2, FS_MASK, rate);