sound: Remove unnecessary semicolons
Subsystems (6)
PATCH 1/1 sound: Remove unnecessary semicolons
These aren't necessary after switch and if blocks.
Signed-off-by Joe Perches <[email protected]>
--- sound/oss/sb_ess.c | 2 +- sound/pci/au88x0/au88x0_pcm.c | 2 +- sound/soc/atmel/atmel_ssc_dai.c | 2 +- sound/soc/codecs/ak4641.c | 2 +- sound/soc/codecs/mc13783.c | 2 +- sound/soc/codecs/tas5086.c | 2 +- sound/soc/codecs/twl6040.c | 4 ++-- sound/soc/fsl/fsl_spdif.c | 4 ++-- sound/soc/tegra/tegra20_i2s.c | 6 +++--- sound/soc/tegra/tegra20_spdif.c | 6 +++--- sound/soc/tegra/tegra30_ahub.c | 4 ++-- sound/soc/tegra/tegra30_i2s.c | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-)
sound/oss/sb_ess.c +1 -1
@@ -1544,7 +1544,7 @@ static int ess_has_rec_mixer (int submodel)return 1 ;default :return 0 ; - }; + } };#ifdef FKS_LOGGING
sound/pci/au88x0/au88x0_pcm.c +1 -1
@@ -671,7 +671,7 @@ static int snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)return err;break ;#endif - }; + }if (VORTEX_PCM_TYPE (pcm) ==VORTEX_PCM_SPDIF ) {for (i =0 ; i <ARRAY_SIZE (snd_vortex_mixer_spdif); i++) {
sound/soc/atmel/atmel_ssc_dai.c +1 -1
@@ -777,7 +777,7 @@ static int asoc_ssc_init(struct device *dev)if (ret) {dev_err (dev,"Could not register PCM: %d\n" , ret); goto err_unregister_dai; - }; + }return 0 ;
sound/soc/codecs/ak4641.c +1 -1
@@ -328,7 +328,7 @@ static int ak4641_i2s_hw_params(struct snd_pcm_substream *substream,if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { ak4641->playback_fs = rate;ak4641_set_deemph (codec); - }; + }return 0 ; }
sound/soc/codecs/mc13783.c +1 -1
@@ -382,7 +382,7 @@ static int mc13783_set_tdm_slot_dac(struct snd_soc_dai *dai,break ;default :return -EINVAL ; - }; + }snd_soc_update_bits (codec,MC13783_SSI_NETWORK , mask, val);
sound/soc/codecs/tas5086.c +1 -1
@@ -429,7 +429,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream,default :dev_err (codec->dev,"Invalid bit width\n" );return -EINVAL ; - }; + } ret =regmap_write (priv->regmap,TAS5086_SERIAL_DATA_IF , val);if (ret <0 )
sound/soc/codecs/twl6040.c +2 -2
@@ -246,7 +246,7 @@ static bool twl6040_is_path_unmuted(struct snd_soc_codec *codec,return priv->dl2_unmuted;default :return 1 ; - }; + } }/*
@@ -1100,7 +1100,7 @@ static void twl6040_mute_path(struct snd_soc_codec *codec, enum twl6040_dai_id ibreak ;default :break ; - }; + } }static int twl6040_digital_mute (struct snd_soc_dai *dai,int mute)
sound/soc/fsl/fsl_spdif.c +2 -2
@@ -963,7 +963,7 @@ static bool fsl_spdif_readable_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool fsl_spdif_writeable_reg (struct device *dev,unsigned int reg)
@@ -982,7 +982,7 @@ static bool fsl_spdif_writeable_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static const struct regmap_config fsl_spdif_regmap_config = {
sound/soc/tegra/tegra20_i2s.c +3 -3
@@ -297,7 +297,7 @@ static bool tegra20_i2s_wr_rd_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool tegra20_i2s_volatile_reg (struct device *dev,unsigned int reg)
@@ -310,7 +310,7 @@ static bool tegra20_i2s_volatile_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool tegra20_i2s_precious_reg (struct device *dev,unsigned int reg)
@@ -321,7 +321,7 @@ static bool tegra20_i2s_precious_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static const struct regmap_config tegra20_i2s_regmap_config = {
sound/soc/tegra/tegra20_spdif.c +3 -3
@@ -213,7 +213,7 @@ static bool tegra20_spdif_wr_rd_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool tegra20_spdif_volatile_reg (struct device *dev,unsigned int reg)
@@ -234,7 +234,7 @@ static bool tegra20_spdif_volatile_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool tegra20_spdif_precious_reg (struct device *dev,unsigned int reg)
@@ -247,7 +247,7 @@ static bool tegra20_spdif_precious_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static const struct regmap_config tegra20_spdif_regmap_config = {
sound/soc/tegra/tegra30_ahub.c +2 -2
@@ -346,7 +346,7 @@ static bool tegra30_ahub_apbif_wr_rd_reg(struct device *dev, unsigned int reg)return true;default :break ; - }; + } if (REG_IN_ARRAY(reg, CHANNEL_CTRL) || REG_IN_ARRAY(reg, CHANNEL_CLEAR) ||
@@ -381,7 +381,7 @@ static bool tegra30_ahub_apbif_volatile_reg(struct device *dev,return true;default :break ; - }; + } if (REG_IN_ARRAY(reg, CHANNEL_CLEAR) || REG_IN_ARRAY(reg, CHANNEL_STATUS) ||
sound/soc/tegra/tegra30_i2s.c +2 -2
@@ -369,7 +369,7 @@ static bool tegra30_i2s_wr_rd_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool tegra30_i2s_volatile_reg (struct device *dev,unsigned int reg)
@@ -382,7 +382,7 @@ static bool tegra30_i2s_volatile_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static const struct regmap_config tegra30_i2s_regmap_config = {
Takashi Iwai
AppliedAt Tue, 08 Oct 2013 15:55:45 -0700,
Quoted 4 lines · Joe Perches
These aren't necessary after switch and if blocks.
Signed-off-by Joe Perches <[email protected]>
Thanks, applied.
Takashi
Quoted 246 lines
--- sound/oss/sb_ess.c | 2 +- sound/pci/au88x0/au88x0_pcm.c | 2 +- sound/soc/atmel/atmel_ssc_dai.c | 2 +- sound/soc/codecs/ak4641.c | 2 +- sound/soc/codecs/mc13783.c | 2 +- sound/soc/codecs/tas5086.c | 2 +- sound/soc/codecs/twl6040.c | 4 ++-- sound/soc/fsl/fsl_spdif.c | 4 ++-- sound/soc/tegra/tegra20_i2s.c | 6 +++--- sound/soc/tegra/tegra20_spdif.c | 6 +++--- sound/soc/tegra/tegra30_ahub.c | 4 ++-- sound/soc/tegra/tegra30_i2s.c | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-)sound/oss/sb_ess.c +1
-1@@ -1544,7 +1544,7 @@ static int ess_has_rec_mixer (int submodel)return 1 ;default :return 0 ; - }; + } };#ifdef FKS_LOGGING sound/pci/au88x0/au88x0_pcm.c +1
-1@@ -671,7 +671,7 @@ static int snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)return err;break ;#endif - }; + }if (VORTEX_PCM_TYPE (pcm) ==VORTEX_PCM_SPDIF ) {for (i =0 ; i <ARRAY_SIZE (snd_vortex_mixer_spdif); i++) {sound/soc/atmel/atmel_ssc_dai.c +1
-1@@ -777,7 +777,7 @@ static int asoc_ssc_init(struct device *dev)if (ret) {dev_err (dev,"Could not register PCM: %d\n" , ret); goto err_unregister_dai; - }; + }return 0 ;sound/soc/codecs/ak4641.c +1
-1@@ -328,7 +328,7 @@ static int ak4641_i2s_hw_params(struct snd_pcm_substream *substream,if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { ak4641->playback_fs = rate;ak4641_set_deemph (codec); - }; + }return 0 ; }sound/soc/codecs/mc13783.c +1
-1@@ -382,7 +382,7 @@ static int mc13783_set_tdm_slot_dac(struct snd_soc_dai *dai,break ;default :return -EINVAL ; - }; + }snd_soc_update_bits (codec,MC13783_SSI_NETWORK , mask, val);sound/soc/codecs/tas5086.c +1
-1@@ -429,7 +429,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream,default :dev_err (codec->dev,"Invalid bit width\n" );return -EINVAL ; - }; + } ret =regmap_write (priv->regmap,TAS5086_SERIAL_DATA_IF , val);if (ret <0 )sound/soc/codecs/twl6040.c +2
-2@@ -246,7 +246,7 @@ static bool twl6040_is_path_unmuted(struct snd_soc_codec *codec,return priv->dl2_unmuted;default :return 1 ; - }; + } }/* @@ -1100,7 +1100,7 @@ static void twl6040_mute_path(struct snd_soc_codec *codec, enum twl6040_dai_id ibreak ;default :break ; - }; + } }static int twl6040_digital_mute (struct snd_soc_dai *dai,int mute)sound/soc/fsl/fsl_spdif.c +2
-2@@ -963,7 +963,7 @@ static bool fsl_spdif_readable_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool fsl_spdif_writeable_reg (struct device *dev,unsigned int reg)@@ -982,7 +982,7 @@ static bool fsl_spdif_writeable_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static const struct regmap_config fsl_spdif_regmap_config = {sound/soc/tegra/tegra20_i2s.c +3
-3@@ -297,7 +297,7 @@ static bool tegra20_i2s_wr_rd_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool tegra20_i2s_volatile_reg (struct device *dev,unsigned int reg)@@ -310,7 +310,7 @@ static bool tegra20_i2s_volatile_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool tegra20_i2s_precious_reg (struct device *dev,unsigned int reg)@@ -321,7 +321,7 @@ static bool tegra20_i2s_precious_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static const struct regmap_config tegra20_i2s_regmap_config = {sound/soc/tegra/tegra20_spdif.c +3
-3@@ -213,7 +213,7 @@ static bool tegra20_spdif_wr_rd_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool tegra20_spdif_volatile_reg (struct device *dev,unsigned int reg)@@ -234,7 +234,7 @@ static bool tegra20_spdif_volatile_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool tegra20_spdif_precious_reg (struct device *dev,unsigned int reg)@@ -247,7 +247,7 @@ static bool tegra20_spdif_precious_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static const struct regmap_config tegra20_spdif_regmap_config = {sound/soc/tegra/tegra30_ahub.c +2
-2@@ -346,7 +346,7 @@ static bool tegra30_ahub_apbif_wr_rd_reg(struct device *dev, unsigned int reg)return true;default :break ; - }; + } if (REG_IN_ARRAY(reg, CHANNEL_CTRL) || REG_IN_ARRAY(reg, CHANNEL_CLEAR) ||@@ -381,7 +381,7 @@ static bool tegra30_ahub_apbif_volatile_reg(struct device *dev,return true;default :break ; - }; + } if (REG_IN_ARRAY(reg, CHANNEL_CLEAR) || REG_IN_ARRAY(reg, CHANNEL_STATUS) ||sound/soc/tegra/tegra30_i2s.c +2
-2@@ -369,7 +369,7 @@ static bool tegra30_i2s_wr_rd_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static bool tegra30_i2s_volatile_reg (struct device *dev,unsigned int reg)@@ -382,7 +382,7 @@ static bool tegra30_i2s_volatile_reg(struct device *dev, unsigned int reg)return true;default :return false; - }; + } }static const struct regmap_config tegra30_i2s_regmap_config = {