ALSA: remove unneeded break

A break is not needed if it is preceded by a return, goto
or break

Signed-off-by: Tom Rix <trix@redhat.com>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20201019164857.27223-1-trix@redhat.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index 869af8a..4eabece 100644 (file)
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -468,7 +468,6 @@ static int snd_rme32_capture_getrate(struct rme32 * rme32, int *is_adat)
                        return 32000;
                default:
                        return -1;
-                       break;
                } 
        else
                switch (n) {    /* supporting the CS8412 */

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 4a1f576..3382c06 100644 (file)
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -2286,7 +2286,6 @@ static int hdspm_get_wc_sample_rate(struct hdspm *hdspm)
        case AIO:
                status = hdspm_read(hdspm, HDSPM_RD_STATUS_1);
                return (status >> 16) & 0xF;
-               break;
        case AES32:
                status = hdspm_read(hdspm, HDSPM_statusRegister);
                return (status >> HDSPM_AES32_wcFreq_bit) & 0xF;
@@ -2312,7 +2311,6 @@ static int hdspm_get_tco_sample_rate(struct hdspm *hdspm)
                case AIO:
                        status = hdspm_read(hdspm, HDSPM_RD_STATUS_1);
                        return (status >> 20) & 0xF;
-                       break;
                case AES32:
                        status = hdspm_read(hdspm, HDSPM_statusRegister);
                        return (status >> 1) & 0xF;
@@ -2338,7 +2336,6 @@ static int hdspm_get_sync_in_sample_rate(struct hdspm *hdspm)
                case AIO:
                        status = hdspm_read(hdspm, HDSPM_RD_STATUS_2);
                        return (status >> 12) & 0xF;
-                       break;
                default:
                        break;
                }
@@ -2358,7 +2355,6 @@ static int hdspm_get_aes_sample_rate(struct hdspm *hdspm, int index)
        case AES32:
                timecode = hdspm_read(hdspm, HDSPM_timecodeRegister);
                return (timecode >> (4*index)) & 0xF;
-               break;
        default:
                break;
        }
@@ -3845,7 +3841,6 @@ static int hdspm_wc_sync_check(struct hdspm *hdspm)
                                return 1;
                }
                return 0;
-               break;
 
        case MADI:
                status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
@@ -3856,7 +3851,6 @@ static int hdspm_wc_sync_check(struct hdspm *hdspm)
                                return 1;
                }
                return 0;
-               break;
 
        case RayDAT:
        case AIO:
@@ -3868,8 +3862,6 @@ static int hdspm_wc_sync_check(struct hdspm *hdspm)
                        return 1;
                return 0;
 
-               break;
-
        case MADIface:
                break;
        }

diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 7ab1002..012fbec 100644 (file)
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -732,34 +732,27 @@ static inline int rme9652_spdif_sample_rate(struct snd_rme9652 *s)
        switch (rme9652_decode_spdif_rate(rate_bits)) {
        case 0x7:
                return 32000;
-               break;
 
        case 0x6:
                return 44100;
-               break;
 
        case 0x5:
                return 48000;
-               break;
 
        case 0x4:
                return 88200;
-               break;
 
        case 0x3:
                return 96000;
-               break;
 
        case 0x0:
                return 64000;
-               break;
 
        default:
                dev_err(s->card->dev,
                        "%s: unknown S/PDIF input rate (bits = 0x%x)\n",
                           s->card_name, rate_bits);
                return 0;
-               break;
        }
 }
 

diff --git a/sound/soc/codecs/wcd-clsh-v2.c b/sound/soc/codecs/wcd-clsh-v2.c
index 1be8211..817d825 100644 (file)
--- a/sound/soc/codecs/wcd-clsh-v2.c
+++ b/sound/soc/codecs/wcd-clsh-v2.c
@@ -480,7 +480,6 @@ static int _wcd_clsh_ctrl_set_state(struct wcd_clsh_ctrl *ctrl, int req_state,
        case WCD_CLSH_STATE_HPHR:
                wcd_clsh_state_hph_r(ctrl, req_state, is_enable, mode);
                break;
-               break;
        case WCD_CLSH_STATE_LO:
                wcd_clsh_state_lo(ctrl, req_state, is_enable, mode);
                break;

diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index c56b932..d8ced45 100644 (file)
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -311,7 +311,6 @@ static int wl1273_startup(struct snd_pcm_substream *substream,
                break;
        default:
                return -EINVAL;
-               break;
        }
 
        return 0;

diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index bbe8d78..b1ca64d 100644 (file)
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -502,7 +502,6 @@ static int skl_pcm_trigger(struct snd_pcm_substream *substream, int cmd,
                if (ret < 0)
                        return ret;
                return skl_run_pipe(skl, mconfig->pipe);
-               break;
 
        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
        case SNDRV_PCM_TRIGGER_SUSPEND:

diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index a6b72ad..2d85cc4 100644 (file)
--- a/sound/soc/ti/davinci-mcasp.c
+++ b/sound/soc/ti/davinci-mcasp.c
@@ -2385,7 +2385,6 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret);
        case -EPROBE_DEFER:
                goto err;
-               break;
        }
 
        if (ret) {