ALSA: Use fallthrough pseudo-keyword
Subsystems (2)
PATCH v2 1/1 ALSA: Use fallthrough pseudo-keyword
Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary fall-through markings when it is the case.
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
Changes in v2:
- Remove unnecessary fall-through comment.
sound/atmel/ac97c.c | 16 ++++++++-------- sound/core/memalloc.c | 2 +- sound/core/oss/pcm_oss.c | 2 +- sound/core/oss/pcm_plugin.c | 2 +- sound/core/pcm_native.c | 8 ++++---- sound/core/seq/oss/seq_oss_timer.c | 2 +- sound/core/seq/seq_midi_emul.c | 2 +- sound/drivers/opl3/opl3_midi.c | 4 ++-- sound/isa/galaxy/galaxy.c | 6 +++--- sound/isa/msnd/msnd_pinnacle_mixer.c | 4 +--- sound/isa/opti9xx/miro.c | 10 +++++----- sound/isa/opti9xx/opti92x-ad1848.c | 12 +++++++----- sound/isa/sb/sb8_main.c | 10 +++++----- sound/oss/dmasound/dmasound_atari.c | 2 +- sound/oss/dmasound/dmasound_core.c | 4 ++-- sound/pci/ac97/ac97_codec.c | 4 ++-- sound/pci/atiixp.c | 6 +++--- sound/pci/azt3328.c | 2 +- sound/pci/echoaudio/echoaudio.c | 4 ++-- sound/pci/emu10k1/emupcm.c | 5 ++--- sound/pci/hda/hda_beep.c | 2 +- sound/pci/hda/patch_conexant.c | 2 +- sound/pci/hda/patch_realtek.c | 4 ++-- sound/pci/ice1712/delta.c | 2 +- sound/pci/intel8x0.c | 8 ++++---- sound/pci/mixart/mixart.c | 2 +- sound/pci/mixart/mixart_core.c | 2 +- sound/pci/nm256/nm256.c | 6 +++--- sound/pci/ymfpci/ymfpci_main.c | 2 +- sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 4 ++-- sound/sparc/dbri.c | 8 ++++---- sound/usb/card.c | 2 +- sound/usb/clock.c | 2 +- sound/usb/pcm.c | 2 +- sound/usb/stream.c | 3 +-- 35 files changed, 78 insertions(+), 80 deletions(-)
sound/atmel/ac97c.c +8 -8
@@ -356,14 +356,14 @@ atmel_ac97c_playback_trigger(struct snd_pcm_substream *substream, int cmd) camr =ac97c_readl (chip,CAMR );switch (cmd) { -case SNDRV_PCM_TRIGGER_PAUSE_RELEASE :/* fall through */ -case SNDRV_PCM_TRIGGER_RESUME :/* fall through */ +case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : +case SNDRV_PCM_TRIGGER_RESUME :case SNDRV_PCM_TRIGGER_START : ptcr =ATMEL_PDC_TXTEN ; camr |=AC97C_CMR_CENA |AC97C_CSR_ENDTX ;break ; -case SNDRV_PCM_TRIGGER_PAUSE_PUSH :/* fall through */ -case SNDRV_PCM_TRIGGER_SUSPEND :/* fall through */ +case SNDRV_PCM_TRIGGER_PAUSE_PUSH : +case SNDRV_PCM_TRIGGER_SUSPEND :case SNDRV_PCM_TRIGGER_STOP : ptcr |=ATMEL_PDC_TXTDIS ;if (chip->opened <=1 )
@@ -388,14 +388,14 @@ atmel_ac97c_capture_trigger(struct snd_pcm_substream *substream, int cmd) ptcr =readl (chip->regs +ATMEL_PDC_PTSR );switch (cmd) { -case SNDRV_PCM_TRIGGER_PAUSE_RELEASE :/* fall through */ -case SNDRV_PCM_TRIGGER_RESUME :/* fall through */ +case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : +case SNDRV_PCM_TRIGGER_RESUME :case SNDRV_PCM_TRIGGER_START : ptcr =ATMEL_PDC_RXTEN ; camr |=AC97C_CMR_CENA |AC97C_CSR_ENDRX ;break ; -case SNDRV_PCM_TRIGGER_PAUSE_PUSH :/* fall through */ -case SNDRV_PCM_TRIGGER_SUSPEND :/* fall through */ +case SNDRV_PCM_TRIGGER_PAUSE_PUSH : +case SNDRV_PCM_TRIGGER_SUSPEND :case SNDRV_PCM_TRIGGER_STOP : ptcr |=ATMEL_PDC_RXTDIS ;if (chip->opened <=1 )
sound/core/memalloc.c +1 -1
@@ -158,7 +158,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,*/ dmab->dev.type =SNDRV_DMA_TYPE_DEV ;#endif /* CONFIG_GENERIC_ALLOCATOR */ -/* fall through */ + fallthrough;case SNDRV_DMA_TYPE_DEV :case SNDRV_DMA_TYPE_DEV_UC :snd_malloc_dev_pages (dmab, size);
sound/core/oss/pcm_oss.c +1 -1
@@ -2851,7 +2851,7 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area) substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK ];if (substream)break ; -/* Fall through */ + fallthrough;case VM_READ : substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_CAPTURE ];break ;
sound/core/oss/pcm_plugin.c +1 -1
@@ -357,7 +357,7 @@ snd_pcm_format_t snd_pcm_plug_slave_format(snd_pcm_format_t format,if (snd_mask_test (format_mask, (__force int )format1))return format1; } -/* fall through */ + fallthrough;default :return (__force snd_pcm_format_t)-EINVAL ; }
sound/core/pcm_native.c +4 -4
@@ -1903,7 +1903,7 @@ static int snd_pcm_prepare(struct snd_pcm_substream *substream,switch (substream->runtime->status->state) {case SNDRV_PCM_STATE_PAUSED :snd_pcm_pause (substream, false); -/* fallthru */ + fallthrough;case SNDRV_PCM_STATE_SUSPENDED :snd_pcm_stop (substream,SNDRV_PCM_STATE_SETUP );break ;
@@ -2811,7 +2811,7 @@ static int do_pcm_hwsync(struct snd_pcm_substream *substream)case SNDRV_PCM_STATE_DRAINING :if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE )return -EBADFD ; -/* Fall through */ + fallthrough;case SNDRV_PCM_STATE_RUNNING :return snd_pcm_update_hw_ptr (substream);case SNDRV_PCM_STATE_PREPARED :
@@ -3814,7 +3814,7 @@ static int snd_pcm_mmap(struct file *file, struct vm_area_struct *area)case SNDRV_PCM_MMAP_OFFSET_STATUS_OLD :if (pcm_file->no_compat_mmap || !IS_ENABLED (CONFIG_64BIT ))return -ENXIO ; -/* fallthrough */ + fallthrough;case SNDRV_PCM_MMAP_OFFSET_STATUS_NEW :if (!pcm_status_mmap_allowed (pcm_file))return -ENXIO ;
@@ -3822,7 +3822,7 @@ static int snd_pcm_mmap(struct file *file, struct vm_area_struct *area)case SNDRV_PCM_MMAP_OFFSET_CONTROL_OLD :if (pcm_file->no_compat_mmap || !IS_ENABLED (CONFIG_64BIT ))return -ENXIO ; -/* fallthrough */ + fallthrough;case SNDRV_PCM_MMAP_OFFSET_CONTROL_NEW :if (!pcm_control_mmap_allowed (pcm_file))return -ENXIO ;
sound/core/seq/oss/seq_oss_timer.c +1 -1
@@ -79,7 +79,7 @@ snd_seq_oss_process_timer_event(struct seq_oss_timer *rec, union evrec *ev)case TMR_WAIT_REL : parm += rec->cur_tick; rec->realtime =0 ; -/* fall through */ + fallthrough;case TMR_WAIT_ABS :if (parm ==0 ) { rec->realtime =1 ;
sound/core/seq/seq_midi_emul.c +1 -1
@@ -309,7 +309,7 @@ do_control(const struct snd_midi_op *ops, void *drv,break ;case MIDI_CTL_MSB_DATA_ENTRY : chan->control[MIDI_CTL_LSB_DATA_ENTRY ] =0 ; -/* fall through */ + fallthrough;case MIDI_CTL_LSB_DATA_ENTRY :if (chan->param_type ==SNDRV_MIDI_PARAM_TYPE_REGISTERED )rpn (ops, drv, chan, chset);
sound/drivers/opl3/opl3_midi.c +2 -2
@@ -354,7 +354,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan) instr_4op =1 ;break ; } -/* fall through */ + fallthrough;default :spin_unlock_irqrestore (&opl3->voice_lock, flags);return ;
@@ -443,7 +443,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)switch (connection) {case 0x03 :snd_opl3_calc_volume (&vol_op[2 ], vel, chan); -/* fallthru */ + fallthrough;case 0x02 :snd_opl3_calc_volume (&vol_op[0 ], vel, chan);break ;
sound/isa/galaxy/galaxy.c +3 -3
@@ -247,7 +247,7 @@ static int snd_galaxy_match(struct device *dev, unsigned int n)break ;case 2 : irq[n] =9 ; -/* Fall through */ + fallthrough;case 9 : wss_config[n] |=WSS_CONFIG_IRQ_9 ;break ;
@@ -292,7 +292,7 @@ static int snd_galaxy_match(struct device *dev, unsigned int n)case 1 :if (dma1[n] ==0 )break ; -/* Fall through */ + fallthrough;default :dev_err (dev,"invalid capture DMA %d\n" , dma2[n]);return 0 ;
@@ -322,7 +322,7 @@ static int snd_galaxy_match(struct device *dev, unsigned int n)break ;case 2 : mpu_irq[n] =9 ; -/* Fall through */ + fallthrough;case 9 : config[n] |=GALAXY_CONFIG_MPUIRQ_2 ;break ;
sound/isa/msnd/msnd_pinnacle_mixer.c +1 -3
@@ -219,11 +219,9 @@ static int snd_msndmix_set(struct snd_msnd *dev, int d, int left, int right)case MSND_MIXER_VOLUME :/* master volume */ writew (wLeft, dev->SMA + SMA_wCurrMastVolLeft);writew (wRight, dev->SMA + SMA_wCurrMastVolRight); -/* fall through */ - + fallthrough;case MSND_MIXER_AUX :/* aux pot control */ /* scaled by master volume */ -/* fall through */ /* digital controls */ case MSND_MIXER_SYNTH :/* synth vol (dsp mix) */
sound/isa/opti9xx/miro.c +5 -5
@@ -163,13 +163,13 @@ static int aci_busy_wait(struct snd_miro_aci *aci)switch (timeout-ACI_MINTIME ) { case 0 ... 9: out /=10 ; -/* fall through */ + fallthrough; case 10 ... 19: out /=10 ; -/* fall through */ + fallthrough; case 20 ... 30: out /=10 ; -/* fall through */ + fallthrough;default :set_current_state (TASK_UNINTERRUPTIBLE );schedule_timeout (out);
@@ -824,7 +824,7 @@ static unsigned char snd_miro_read(struct snd_miro *chip, retval =inb (chip->mc_base +9 );break ; } -/* fall through */ + fallthrough;case OPTi9XX_HW_82C929: retval =inb (chip->mc_base + reg);
@@ -854,7 +854,7 @@ static void snd_miro_write(struct snd_miro *chip, unsigned char reg,outb (value, chip->mc_base +9 );break ; } -/* fall through */ + fallthrough;case OPTi9XX_HW_82C929:outb (value, chip->mc_base + reg);
sound/isa/opti9xx/opti92x-ad1848.c +7 -5
@@ -249,7 +249,7 @@ static unsigned char snd_opti9xx_read(struct snd_opti9xx *chip, retval =inb (chip->mc_base +9 );break ; } -/* Fall through */ + fallthrough;case OPTi9XX_HW_82C928:case OPTi9XX_HW_82C929:
@@ -292,7 +292,7 @@ static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg,outb (value, chip->mc_base +9 );break ; } -/* Fall through */ + fallthrough;case OPTi9XX_HW_82C928:case OPTi9XX_HW_82C929:
@@ -343,7 +343,7 @@ static int snd_opti9xx_configure(struct snd_opti9xx *chip,snd_opti9xx_write_mask (chip,OPTi9XX_MC_REG (4 ),0xf0 ,0xfc );/* enable wave audio */ snd_opti9xx_write_mask (chip,OPTi9XX_MC_REG (6 ),0x02 ,0x02 ); -/* Fall through */ + fallthrough;case OPTi9XX_HW_82C925:/* enable WSS mode */
@@ -380,7 +380,8 @@ static int snd_opti9xx_configure(struct snd_opti9xx *chip,case OPTi9XX_HW_82C931:/* disable 3D sound (set GPIO1 as output, low) */ snd_opti9xx_write_mask (chip,OPTi9XX_MC_REG (20 ),0x04 ,0x0c ); -/* fall through */ + fallthrough; +case OPTi9XX_HW_82C933:/* * The BTC 1817DW has QS1000 wavetable which is connected
@@ -392,7 +393,8 @@ static int snd_opti9xx_configure(struct snd_opti9xx *chip,* or digital input signal. */ snd_opti9xx_write_mask (chip,OPTi9XX_MC_REG (26 ),0x01 ,0x01 ); -/* fall through */ + fallthrough; +case OPTi9XX_HW_82C930:snd_opti9xx_write_mask (chip,OPTi9XX_MC_REG (6 ),0x02 ,0x03 );snd_opti9xx_write_mask (chip,OPTi9XX_MC_REG (3 ),0x00 ,0xff );
sound/isa/sb/sb8_main.c +5 -5
@@ -116,13 +116,13 @@ static int snd_sb8_playback_prepare(struct snd_pcm_substream *substream) chip->playback_format =SB_DSP_HI_OUTPUT_AUTO ;break ; } -/* fall through */ + fallthrough;case SB_HW_201 :if (rate >23000 ) { chip->playback_format =SB_DSP_HI_OUTPUT_AUTO ;break ; } -/* fall through */ + fallthrough;case SB_HW_20 : chip->playback_format =SB_DSP_LO_OUTPUT_AUTO ;break ;
@@ -261,7 +261,7 @@ static int snd_sb8_capture_prepare(struct snd_pcm_substream *substream) chip->capture_format =SB_DSP_HI_INPUT_AUTO ;break ; } -/* fall through */ + fallthrough;case SB_HW_20 : chip->capture_format =SB_DSP_LO_INPUT_AUTO ;break ;
@@ -361,7 +361,7 @@ irqreturn_t snd_sb8dsp_interrupt(struct snd_sb *chip)case SB_MODE_PLAYBACK_16 :/* ok.. playback is active */ if (chip->hardware !=SB_HW_JAZZ16 )break ; -/* fall through */ + fallthrough;case SB_MODE_PLAYBACK_8 : substream = chip->playback_substream;if (chip->playback_format ==SB_DSP_OUTPUT )
@@ -371,7 +371,7 @@ irqreturn_t snd_sb8dsp_interrupt(struct snd_sb *chip)case SB_MODE_CAPTURE_16 :if (chip->hardware !=SB_HW_JAZZ16 )break ; -/* fall through */ + fallthrough;case SB_MODE_CAPTURE_8 : substream = chip->capture_substream;if (chip->capture_format ==SB_DSP_INPUT )
sound/oss/dmasound/dmasound_atari.c +1 -1
@@ -1449,7 +1449,7 @@ static int FalconMixerIoctl(u_int cmd, u_long arg) tt_dmasnd.input_gain =RECLEVEL_VOXWARE_TO_GAIN (data &0xff ) <<4 |RECLEVEL_VOXWARE_TO_GAIN (data >>8 &0xff ); -/* fall through - return set value */ + fallthrough;/* return set value */ case SOUND_MIXER_READ_MIC : return IOCTL_OUT(arg, RECLEVEL_GAIN_TO_VOXWARE(tt_dmasnd.input_gain >> 4 & 0xf) |
sound/oss/dmasound/dmasound_core.c +2 -2
@@ -1478,13 +1478,13 @@ static int dmasound_setup(char *str)printk ("dmasound_setup: invalid catch radius, using default = %d\n" , catchRadius); else catchRadius = ints[3 ]; -/* fall through */ + fallthrough;case 2 :if (ints[1 ] <MIN_BUFFERS )printk ("dmasound_setup: invalid number of buffers, using default = %d\n" , numWriteBufs);else numWriteBufs = ints[1 ]; -/* fall through */ + fallthrough;case 1 :if ((size = ints[2 ]) <256 )/* check for small buffer specs */ size <<=10 ;
sound/pci/ac97/ac97_codec.c +2 -2
@@ -218,11 +218,11 @@ static int snd_ac97_valid_reg(struct snd_ac97 *ac97, unsigned short reg)case AC97_ID_ST_AC97_ID4 :if (reg ==0x08 )return 0 ; -/* fall through */ + fallthrough;case AC97_ID_ST7597 :if (reg ==0x22 || reg ==0x7a )return 1 ; -/* fall through */ + fallthrough;case AC97_ID_AK4540 :case AC97_ID_AK4542 :if (reg <=0x1c || reg ==0x20 || reg ==0x26 || reg >=0x7c )
sound/pci/atiixp.c +3 -3
@@ -896,15 +896,15 @@ static int snd_atiixp_playback_prepare(struct snd_pcm_substream *substream)case 8 : data |=ATI_REG_OUT_DMA_SLOT_BIT (10 ) |ATI_REG_OUT_DMA_SLOT_BIT (11 ); -/* fall through */ + fallthrough;case 6 : data |=ATI_REG_OUT_DMA_SLOT_BIT (7 ) |ATI_REG_OUT_DMA_SLOT_BIT (8 ); -/* fall through */ + fallthrough;case 4 : data |=ATI_REG_OUT_DMA_SLOT_BIT (6 ) |ATI_REG_OUT_DMA_SLOT_BIT (9 ); -/* fall through */ + fallthrough;default : data |=ATI_REG_OUT_DMA_SLOT_BIT (3 ) |ATI_REG_OUT_DMA_SLOT_BIT (4 );
sound/pci/azt3328.c +1 -1
@@ -1232,7 +1232,7 @@ snd_azf3328_codec_setfmt(struct snd_azf3328_codec_data *codec,case AZF_FREQ_32000 : freq =SOUNDFORMAT_FREQ_32000 ;break ;default :snd_printk (KERN_WARNING "unknown bitrate %d, assuming 44.1kHz!\n" , bitrate); -/* fall-through */ + fallthrough;case AZF_FREQ_44100 : freq =SOUNDFORMAT_FREQ_44100 ;break ;case AZF_FREQ_48000 : freq =SOUNDFORMAT_FREQ_48000 ;break ;case AZF_FREQ_66200 : freq =SOUNDFORMAT_FREQ_SUSPECTED_66200 ;break ;
sound/pci/echoaudio/echoaudio.c +2 -2
@@ -690,7 +690,7 @@ static int pcm_prepare(struct snd_pcm_substream *substream)break ;case SNDRV_PCM_FORMAT_S32_BE : format.data_are_bigendian =1 ; -/* fall through */ + fallthrough;case SNDRV_PCM_FORMAT_S32_LE : format.bits_per_sample =32 ;break ;
@@ -742,7 +742,7 @@ static int pcm_trigger(struct snd_pcm_substream *substream, int cmd) pipe->last_counter =0 ; pipe->position =0 ; *pipe->dma_counter =0 ; -/* fall through */ + fallthrough;case PIPE_STATE_PAUSED : pipe->state =PIPE_STATE_STARTED ;break ;
sound/pci/emu10k1/emupcm.c +2 -3
@@ -753,7 +753,7 @@ static int snd_emu10k1_playback_trigger(struct snd_pcm_substream *substream,case SNDRV_PCM_TRIGGER_START :snd_emu10k1_playback_invalidate_cache (emu,1 , epcm->extra);/* do we need this? */ snd_emu10k1_playback_invalidate_cache (emu,0 , epcm->voices[0 ]); -/* fall through */ + fallthrough;case SNDRV_PCM_TRIGGER_PAUSE_RELEASE :case SNDRV_PCM_TRIGGER_RESUME :if (cmd ==SNDRV_PCM_TRIGGER_PAUSE_RELEASE )
@@ -902,8 +902,7 @@ static int snd_emu10k1_efx_playback_trigger(struct snd_pcm_substream *substream,snd_emu10k1_playback_invalidate_cache (emu,0 , epcm->voices[i]); }snd_emu10k1_playback_invalidate_cache (emu,1 , epcm->extra); - -/* fall through */ + fallthrough;case SNDRV_PCM_TRIGGER_PAUSE_RELEASE :case SNDRV_PCM_TRIGGER_RESUME :snd_emu10k1_playback_prepare_voice (emu, epcm->extra,1 ,1 ,NULL );
sound/pci/hda/hda_beep.c +1 -1
@@ -102,7 +102,7 @@ static int snd_hda_beep_event(struct input_dev *dev, unsigned int type,case SND_BELL :if (hz) hz =1000 ; -/* fallthru */ + fallthrough;case SND_TONE :if (beep->linear_tone) beep->tone =beep_linear_tone (beep, hz);
sound/pci/hda/patch_conexant.c +1 -1
@@ -1018,7 +1018,7 @@ static int patch_conexant_auto(struct hda_codec *codec)break ;case 0x14f150f2 : codec->power_save_node =1 ; -/* Fall through */ + fallthrough;default : codec->pin_amp_workaround =1 ; snd_hda_pick_fixup(codec, cxt5066_fixup_models,
sound/pci/hda/patch_realtek.c +2 -2
@@ -382,7 +382,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)case 0x10ec0295 :case 0x10ec0299 :alc_update_coef_idx (codec,0x67 ,0xf000 ,0x3000 ); -/* fallthrough */ + fallthrough;case 0x10ec0215 :case 0x10ec0233 :case 0x10ec0235 :
@@ -4698,7 +4698,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,break ;case 0x10ec0867 :alc_update_coefex_idx (codec,0x57 ,0x5 ,0 ,1 <<14 ); -/* fallthru */ + fallthrough;case 0x10ec0221 :case 0x10ec0662 :snd_hda_set_pin_ctl_cache (codec, hp_pin,0 );
sound/pci/ice1712/delta.c +1 -1
@@ -691,7 +691,7 @@ static int snd_ice1712_delta_init(struct snd_ice1712 *ice)break ;case ICE1712_SUBDEVICE_DELTADIO2496 : ice->gpio.set_pro_rate = delta_1010_set_rate_val; -/* fall thru */ + fallthrough;case ICE1712_SUBDEVICE_DELTA66 : ice->spdif.ops.open = delta_open_spdif; ice->spdif.ops.setup_rate = delta_setup_spdif;
sound/pci/intel8x0.c +4 -4
@@ -810,7 +810,7 @@ static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmdswitch (cmd) {case SNDRV_PCM_TRIGGER_RESUME : ichdev->suspended =0 ; -/* fall through */ + fallthrough;case SNDRV_PCM_TRIGGER_START :case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : val =ICH_IOCE |ICH_STARTBM ;
@@ -818,7 +818,7 @@ static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmdbreak ;case SNDRV_PCM_TRIGGER_SUSPEND : ichdev->suspended =1 ; -/* fall through */ + fallthrough;case SNDRV_PCM_TRIGGER_STOP : val =0 ;break ;
@@ -852,7 +852,7 @@ static int snd_intel8x0_ali_trigger(struct snd_pcm_substream *substream, int cmdswitch (cmd) {case SNDRV_PCM_TRIGGER_RESUME : ichdev->suspended =0 ; -/* fall through */ + fallthrough;case SNDRV_PCM_TRIGGER_START :case SNDRV_PCM_TRIGGER_PAUSE_RELEASE :if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) {
@@ -869,7 +869,7 @@ static int snd_intel8x0_ali_trigger(struct snd_pcm_substream *substream, int cmdbreak ;case SNDRV_PCM_TRIGGER_SUSPEND : ichdev->suspended =1 ; -/* fall through */ + fallthrough;case SNDRV_PCM_TRIGGER_STOP :case SNDRV_PCM_TRIGGER_PAUSE_PUSH :/* pause */
sound/pci/mixart/mixart.c +1 -1
@@ -169,7 +169,7 @@ static int mixart_set_clock(struct mixart_mgr *mgr,case PIPE_RUNNING :if (rate !=0 )break ; -/* fall through */ + fallthrough;default :if (rate ==0 )return 0 ;/* nothing to do */
sound/pci/mixart/mixart_core.c +1 -1
@@ -527,7 +527,7 @@ irqreturn_t snd_mixart_threaded_irq(int irq, void *dev_id)dev_err (&mgr->pci->dev,"canceled notification %x !\n" , msg); } -/* fall through */ + fallthrough;case MSG_TYPE_ANSWER :/* answer or notification to a message we are waiting for*/ mutex_lock (&mgr->msg_lock);
sound/pci/nm256/nm256.c +3 -3
@@ -560,7 +560,7 @@ snd_nm256_playback_trigger(struct snd_pcm_substream *substream, int cmd)switch (cmd) {case SNDRV_PCM_TRIGGER_RESUME : s->suspended =0 ; -/* fallthru */ + fallthrough;case SNDRV_PCM_TRIGGER_START :if (! s->running) {snd_nm256_playback_start (chip, s, substream);
@@ -569,7 +569,7 @@ snd_nm256_playback_trigger(struct snd_pcm_substream *substream, int cmd)break ;case SNDRV_PCM_TRIGGER_SUSPEND : s->suspended =1 ; -/* fallthru */ + fallthrough;case SNDRV_PCM_TRIGGER_STOP :if (s->running) {snd_nm256_playback_stop (chip);
@@ -1664,7 +1664,7 @@ static int snd_nm256_probe(struct pci_dev *pci,return -ENODEV ;case NM_RESET_WORKAROUND_2 : reset_workaround_2 =1 ; -/* Fall-through */ + fallthrough;case NM_RESET_WORKAROUND : reset_workaround =1 ;break ;
sound/pci/ymfpci/ymfpci_main.c +1 -1
@@ -400,7 +400,7 @@ static int snd_ymfpci_playback_trigger(struct snd_pcm_substream *substream, kctl = chip->pcm_mixer[substream->number].ctl; kctl->vd[0 ].access |=SNDRV_CTL_ELEM_ACCESS_INACTIVE ; } -/* fall through */ + fallthrough;case SNDRV_PCM_TRIGGER_PAUSE_PUSH :case SNDRV_PCM_TRIGGER_SUSPEND : chip->ctrl_playback[ypcm->voices[0 ]->number +1 ] =0 ;
sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c +2 -2
@@ -45,7 +45,7 @@ static int pdacf_pcm_trigger(struct snd_pcm_substream *subs, int cmd)case SNDRV_PCM_TRIGGER_START : chip->pcm_hwptr =0 ; chip->pcm_tdone =0 ; -/* fall thru */ + fallthrough;case SNDRV_PCM_TRIGGER_PAUSE_RELEASE :case SNDRV_PCM_TRIGGER_RESUME : mask =0 ;
@@ -132,7 +132,7 @@ static int pdacf_pcm_prepare(struct snd_pcm_substream *subs)case SNDRV_PCM_FORMAT_S24_3LE :case SNDRV_PCM_FORMAT_S24_3BE : chip->pcm_sample =3 ; -/* fall through */ + fallthrough;default :/* 24-bit */ aval =AK4117_DIF_24R ; chip->pcm_frame =3 ;
sound/sparc/dbri.c +4 -4
@@ -580,16 +580,16 @@ static __u32 reverse_bytes(__u32 b, int len)switch (len) {case 32 : b = ((b &0xffff0000 ) >>16 ) | ((b &0x0000ffff ) <<16 ); -/* fall through */ + fallthrough;case 16 : b = ((b &0xff00ff00 ) >>8 ) | ((b &0x00ff00ff ) <<8 ); -/* fall through */ + fallthrough;case 8 : b = ((b &0xf0f0f0f0 ) >>4 ) | ((b &0x0f0f0f0f ) <<4 ); -/* fall through */ + fallthrough;case 4 : b = ((b &0xcccccccc ) >>2 ) | ((b &0x33333333 ) <<2 ); -/* fall through */ + fallthrough;case 2 : b = ((b &0xaaaaaaaa ) >>1 ) | ((b &0x55555555 ) <<1 );case 1 :
sound/usb/card.c +1 -1
@@ -230,7 +230,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)dev_warn (&dev->dev,"unknown interface protocol %#02x, assuming v1\n" , protocol); -/* fall through */ + fallthrough;case UAC_VERSION_1 : {struct uac1_ac_header_descriptor *h1;
sound/usb/clock.c +1 -1
@@ -670,7 +670,7 @@ int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface,else return 0 ; } -/* fall through */ + fallthrough;case UAC_VERSION_2 :return set_sample_rate_v2v3 (chip, iface, alts, fmt, rate); }
sound/usb/pcm.c +1 -1
@@ -1743,7 +1743,7 @@ static int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substreaswitch (cmd) {case SNDRV_PCM_TRIGGER_START : subs->trigger_tstamp_pending_update = true; -/* fall through */ + fallthrough;case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : subs->data_endpoint->prepare_data_urb = prepare_playback_urb; subs->data_endpoint->retire_data_urb = retire_playback_urb;
sound/usb/stream.c +1 -2
@@ -1146,9 +1146,8 @@ static int __snd_usb_parse_audio_interface(struct snd_usb_audio *chip,dev_dbg (&dev->dev,"%u:%d: unknown interface protocol %#02x, assuming v1\n" , iface_no, altno, protocol); protocol =UAC_VERSION_1 ; -/* fall through */ + fallthrough;case UAC_VERSION_1 : -/* fall through */ case UAC_VERSION_2 : {int bm_quirk =0 ;
Signature · 1 line
2.27.0
Quoted 11 lines · Gustavo A. R. Silva
Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary fall-through markings when it is the case.
Signed-off-by Gustavo A. R. Silva <[email protected]>---
Changes in v2:
- Remove unnecessary fall-through comment.
Applied now.
But I still see a few die-hard ones in other places than sound/soc, so I'll convert them, too. Will submit another patches.
thanks,
Takashi