Commit c0dbbdad authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Takashi Iwai
Browse files

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.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through



Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20200708203236.GA5112@embeddedor


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a0b224b9

sound/atmel/ac97c.c

+8 −8
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE