ALSA: Convert remaining fall through comments
Subsystems (6)
cover ALSA: Convert remaining fall through comments
Hi,
here is a simple patch set to replace or remove the remaining "fall through" comments in sound tree (modulo sound/soc/*).
I suppose ASoC parts are coverted by another patch.
Takashi
===
Takashi Iwai (3):
ALSA: atmel: Remove invalid "fall through" comments
ALSA: xen: Remove superfluous fall through comments
ALSA: Replace with fallthrough pseudo keyword in the remaining places
sound/atmel/ac97c.c | 4 ++-- sound/isa/es18xx.c | 2 +- sound/pci/au88x0/au88x0_core.c | 12 ++++++------ sound/pci/oxygen/oxygen_pcm.c | 2 +- sound/usb/caiaq/audio.c | 2 +- sound/usb/caiaq/device.c | 2 +- sound/usb/midi.c | 2 +- sound/xen/xen_snd_front.c | 4 ---- sound/xen/xen_snd_front_evtchnl.c | 4 ---- 9 files changed, 13 insertions(+), 21 deletions(-)
Signature · 1 line
2.16.4
PATCH 1/3 ALSA: atmel: Remove invalid "fall through" comments
The comments about fall through in sound/atmel/ac97.c are just superfluous and rather confusing. Let's remove them.
--- sound/atmel/ac97c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/atmel/ac97c.c +2 -2
@@ -219,7 +219,7 @@ static int atmel_ac97c_playback_prepare(struct snd_pcm_substream *substream)switch (runtime->format) {case SNDRV_PCM_FORMAT_S16_LE :break ; -case SNDRV_PCM_FORMAT_S16_BE :/* fall through */ +case SNDRV_PCM_FORMAT_S16_BE : word &= ~(AC97C_CMR_CEM_LITTLE );break ;default :
@@ -301,7 +301,7 @@ static int atmel_ac97c_capture_prepare(struct snd_pcm_substream *substream)switch (runtime->format) {case SNDRV_PCM_FORMAT_S16_LE :break ; -case SNDRV_PCM_FORMAT_S16_BE :/* fall through */ +case SNDRV_PCM_FORMAT_S16_BE : word &= ~(AC97C_CMR_CEM_LITTLE );break ;default :
Signature · 1 line
2.16.4
Re: [PATCH 1/3] ALSA: atmel: Remove invalid "fall through" comments
Quoted 3 lines · Takashi Iwai
The comments about fall through in
sound/atmel/ac97.care just superfluous and rather confusing. Let's remove them.
Quoted 30 lines
Signed-off-by Takashi Iwai <[email protected]>--- sound/atmel/ac97c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)sound/atmel/ac97c.c +2
-2@@ -219,7 +219,7 @@ static int atmel_ac97c_playback_prepare(struct snd_pcm_substream *substream)switch (runtime->format) {case SNDRV_PCM_FORMAT_S16_LE :break ; -case SNDRV_PCM_FORMAT_S16_BE :/* fall through */ +case SNDRV_PCM_FORMAT_S16_BE : word &= ~(AC97C_CMR_CEM_LITTLE );break ;default :@@ -301,7 +301,7 @@ static int atmel_ac97c_capture_prepare(struct snd_pcm_substream *substream)switch (runtime->format) {case SNDRV_PCM_FORMAT_S16_LE :break ; -case SNDRV_PCM_FORMAT_S16_BE :/* fall through */ +case SNDRV_PCM_FORMAT_S16_BE : word &= ~(AC97C_CMR_CEM_LITTLE );break ;default :Signature · 1 line
2.16.4
PATCH 2/3 ALSA: xen: Remove superfluous fall through comments
In reply to Takashi IwaiThe "fall through" comments found in switch-cases in ALSA xen driver are all superfluous. The kernel coding style allows the multiple cases in a row. Let's remove them.
--- sound/xen/xen_snd_front.c | 4 ---- sound/xen/xen_snd_front_evtchnl.c | 4 ---- 2 files changed, 8 deletions(-)
sound/xen/xen_snd_front.c +0 -4
@@ -246,11 +246,8 @@ static void sndback_changed(struct xenbus_device *xb_dev,switch (backend_state) {case XenbusStateReconfiguring: -/* fall through */ case XenbusStateReconfigured: -/* fall through */ case XenbusStateInitialised: -/* fall through */ break ;case XenbusStateInitialising:
@@ -289,7 +286,6 @@ static void sndback_changed(struct xenbus_device *xb_dev,break ;case XenbusStateUnknown: -/* fall through */ case XenbusStateClosed:if (xb_dev->state == XenbusStateClosed)break ;
sound/xen/xen_snd_front_evtchnl.c +0 -4
@@ -46,13 +46,9 @@ static irqreturn_t evtchnl_interrupt_req(int irq, void *dev_id)continue ;switch (resp->operation) {case XENSND_OP_OPEN : -/* fall through */ case XENSND_OP_CLOSE : -/* fall through */ case XENSND_OP_READ : -/* fall through */ case XENSND_OP_WRITE : -/* fall through */ case XENSND_OP_TRIGGER : channel->u.req.resp_status = resp->status;complete (&channel->u.req.completion);
Signature · 1 line
2.16.4
Re: [PATCH 2/3] ALSA: xen: Remove superfluous fall through comments
Quoted 4 lines · Takashi Iwai
The "fall through" comments found in switch-cases in ALSA xen driver are all superfluous. The kernel coding style allows the multiple cases in a row. Let's remove them.
Quoted 51 lines
Signed-off-by Takashi Iwai <[email protected]>--- sound/xen/xen_snd_front.c | 4 ---- sound/xen/xen_snd_front_evtchnl.c | 4 ---- 2 files changed, 8 deletions(-)sound/xen/xen_snd_front.c +0
-4@@ -246,11 +246,8 @@ static void sndback_changed(struct xenbus_device *xb_dev,switch (backend_state) {case XenbusStateReconfiguring: -/* fall through */ case XenbusStateReconfigured: -/* fall through */ case XenbusStateInitialised: -/* fall through */ break ;case XenbusStateInitialising:@@ -289,7 +286,6 @@ static void sndback_changed(struct xenbus_device *xb_dev,break ;case XenbusStateUnknown: -/* fall through */ case XenbusStateClosed:if (xb_dev->state == XenbusStateClosed)break ;sound/xen/xen_snd_front_evtchnl.c +0
-4@@ -46,13 +46,9 @@ static irqreturn_t evtchnl_interrupt_req(int irq, void *dev_id)continue ;switch (resp->operation) {case XENSND_OP_OPEN : -/* fall through */ case XENSND_OP_CLOSE : -/* fall through */ case XENSND_OP_READ : -/* fall through */ case XENSND_OP_WRITE : -/* fall through */ case XENSND_OP_TRIGGER : channel->u.req.resp_status = resp->status;complete (&channel->u.req.completion);Signature · 1 line
2.16.4
PATCH 3/3 ALSA: Replace with fallthrough pseudo keyword in the remaining places
In reply to Takashi IwaiA few places (except for ASoC) are left unconverted for the new fallthrough pseudo keyword. Now replace them all.
--- sound/isa/es18xx.c | 2 +- sound/pci/au88x0/au88x0_core.c | 12 ++++++------ sound/pci/oxygen/oxygen_pcm.c | 2 +- sound/usb/caiaq/audio.c | 2 +- sound/usb/caiaq/device.c | 2 +- sound/usb/midi.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)
sound/isa/es18xx.c +1 -1
@@ -998,7 +998,7 @@ static int snd_es18xx_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem val =3 ; }else retVal =snd_es18xx_mixer_bits (chip,0x7a ,0x08 ,0x00 ) !=0x00 ; -/* fall through */ + fallthrough;/* 4 source chips */ case 0x1868 :case 0x1878 :
sound/pci/au88x0/au88x0_core.c +6 -6
@@ -1103,7 +1103,7 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,hwwrite (vortex->mmio,VORTEX_ADBDMA_BUFBASE + (adbdma <<4 ) +0xc ,snd_pcm_sgbuf_get_addr (dma->substream, psize *3 )); -/* fall through */ + fallthrough;/* 3 pages */ case 3 : dma->cfg0 |=0x12000000 ;
@@ -1111,14 +1111,14 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,hwwrite (vortex->mmio,VORTEX_ADBDMA_BUFBASE + (adbdma <<4 ) +0x8 ,snd_pcm_sgbuf_get_addr (dma->substream, psize *2 )); -/* fall through */ + fallthrough;/* 2 pages */ case 2 : dma->cfg0 |=0x88000000 |0x44000000 |0x10000000 | (psize -1 );hwwrite (vortex->mmio,VORTEX_ADBDMA_BUFBASE + (adbdma <<4 ) +0x4 ,snd_pcm_sgbuf_get_addr (dma->substream, psize)); -/* fall through */ + fallthrough;/* 1 page */ case 1 : dma->cfg0 |=0x80000000 |0x40000000 | ((psize -1 ) <<0xc );
@@ -1381,20 +1381,20 @@ vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma, dma->cfg1 |=0x88000000 |0x44000000 |0x30000000 | (psize-1 );hwwrite (vortex->mmio,VORTEX_WTDMA_BUFBASE + (wtdma <<4 ) +0xc ,snd_pcm_sgbuf_get_addr (dma->substream, psize *3 )); -/* fall through */ + fallthrough;/* 3 pages */ case 3 : dma->cfg0 |=0x12000000 ; dma->cfg1 |=0x80000000 |0x40000000 | ((psize-1 ) <<0xc );hwwrite (vortex->mmio,VORTEX_WTDMA_BUFBASE + (wtdma <<4 ) +0x8 ,snd_pcm_sgbuf_get_addr (dma->substream, psize *2 )); -/* fall through */ + fallthrough;/* 2 pages */ case 2 : dma->cfg0 |=0x88000000 |0x44000000 |0x10000000 | (psize-1 );hwwrite (vortex->mmio,VORTEX_WTDMA_BUFBASE + (wtdma <<4 ) +0x4 ,snd_pcm_sgbuf_get_addr (dma->substream, psize)); -/* fall through */ + fallthrough;/* 1 page */ case 1 : dma->cfg0 |=0x80000000 |0x40000000 | ((psize-1 ) <<0xc );
sound/pci/oxygen/oxygen_pcm.c +1 -1
@@ -137,7 +137,7 @@ static int oxygen_open(struct snd_pcm_substream *substream, SNDRV_PCM_RATE_64000); runtime->hw.rate_min =44100 ; } -/* fall through */ + fallthrough;case PCM_A :case PCM_B : runtime->hw.fifo_size =0 ;
sound/usb/caiaq/audio.c +1 -1
@@ -820,7 +820,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *cdev)case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_SESSIONIO ):case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_GUITARRIGMOBILE ): cdev->samplerates |=SNDRV_PCM_RATE_192000 ; -/* fall thru */ + fallthrough;case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_AUDIO2DJ ):case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_AUDIO4DJ ):case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_AUDIO8DJ ):
sound/usb/caiaq/device.c +1 -1
@@ -187,7 +187,7 @@ static void usb_ep1_command_reply_dispatch (struct urb* urb)break ; }#ifdef CONFIG_SND_USB_CAIAQ_INPUT -/* fall through */ + fallthrough;case EP1_CMD_READ_ERP :case EP1_CMD_READ_ANALOG :snd_usb_caiaq_input_dispatch (cdev, buf, urb->actual_length);
sound/usb/midi.c +1 -1
@@ -2401,7 +2401,7 @@ int __snd_usbmidi_create(struct snd_card *card,break ;case QUIRK_MIDI_US122L : umidi->usb_protocol_ops = &snd_usbmidi_122l_ops; -/* fall through */ + fallthrough;case QUIRK_MIDI_FIXED_ENDPOINT :memcpy (&endpoints[0 ], quirk->data,sizeof (struct snd_usb_midi_endpoint_info ));
Signature · 1 line
2.16.4
Re: [PATCH 3/3] ALSA: Replace with fallthrough pseudo keyword in the remaining places
Quoted 3 lines · Takashi Iwai
A few places (except for ASoC) are left unconverted for the new fallthrough pseudo keyword. Now replace them all.
Quoted 132 lines
Signed-off-by Takashi Iwai <[email protected]>--- sound/isa/es18xx.c | 2 +- sound/pci/au88x0/au88x0_core.c | 12 ++++++------ sound/pci/oxygen/oxygen_pcm.c | 2 +- sound/usb/caiaq/audio.c | 2 +- sound/usb/caiaq/device.c | 2 +- sound/usb/midi.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)sound/isa/es18xx.c +1
-1@@ -998,7 +998,7 @@ static int snd_es18xx_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem val =3 ; }else retVal =snd_es18xx_mixer_bits (chip,0x7a ,0x08 ,0x00 ) !=0x00 ; -/* fall through */ + fallthrough;/* 4 source chips */ case 0x1868 :case 0x1878 :sound/pci/au88x0/au88x0_core.c +6
-6@@ -1103,7 +1103,7 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,hwwrite (vortex->mmio,VORTEX_ADBDMA_BUFBASE + (adbdma <<4 ) +0xc ,snd_pcm_sgbuf_get_addr (dma->substream, psize *3 )); -/* fall through */ + fallthrough;/* 3 pages */ case 3 : dma->cfg0 |=0x12000000 ;@@ -1111,14 +1111,14 @@ vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma,hwwrite (vortex->mmio,VORTEX_ADBDMA_BUFBASE + (adbdma <<4 ) +0x8 ,snd_pcm_sgbuf_get_addr (dma->substream, psize *2 )); -/* fall through */ + fallthrough;/* 2 pages */ case 2 : dma->cfg0 |=0x88000000 |0x44000000 |0x10000000 | (psize -1 );hwwrite (vortex->mmio,VORTEX_ADBDMA_BUFBASE + (adbdma <<4 ) +0x4 ,snd_pcm_sgbuf_get_addr (dma->substream, psize)); -/* fall through */ + fallthrough;/* 1 page */ case 1 : dma->cfg0 |=0x80000000 |0x40000000 | ((psize -1 ) <<0xc );@@ -1381,20 +1381,20 @@ vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma, dma->cfg1 |=0x88000000 |0x44000000 |0x30000000 | (psize-1 );hwwrite (vortex->mmio,VORTEX_WTDMA_BUFBASE + (wtdma <<4 ) +0xc ,snd_pcm_sgbuf_get_addr (dma->substream, psize *3 )); -/* fall through */ + fallthrough;/* 3 pages */ case 3 : dma->cfg0 |=0x12000000 ; dma->cfg1 |=0x80000000 |0x40000000 | ((psize-1 ) <<0xc );hwwrite (vortex->mmio,VORTEX_WTDMA_BUFBASE + (wtdma <<4 ) +0x8 ,snd_pcm_sgbuf_get_addr (dma->substream, psize *2 )); -/* fall through */ + fallthrough;/* 2 pages */ case 2 : dma->cfg0 |=0x88000000 |0x44000000 |0x10000000 | (psize-1 );hwwrite (vortex->mmio,VORTEX_WTDMA_BUFBASE + (wtdma <<4 ) +0x4 ,snd_pcm_sgbuf_get_addr (dma->substream, psize)); -/* fall through */ + fallthrough;/* 1 page */ case 1 : dma->cfg0 |=0x80000000 |0x40000000 | ((psize-1 ) <<0xc );sound/pci/oxygen/oxygen_pcm.c +1
-1@@ -137,7 +137,7 @@ static int oxygen_open(struct snd_pcm_substream *substream, SNDRV_PCM_RATE_64000); runtime->hw.rate_min =44100 ; } -/* fall through */ + fallthrough;case PCM_A :case PCM_B : runtime->hw.fifo_size =0 ;sound/usb/caiaq/audio.c +1
-1@@ -820,7 +820,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *cdev)case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_SESSIONIO ):case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_GUITARRIGMOBILE ): cdev->samplerates |=SNDRV_PCM_RATE_192000 ; -/* fall thru */ + fallthrough;case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_AUDIO2DJ ):case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_AUDIO4DJ ):case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_AUDIO8DJ ):sound/usb/caiaq/device.c +1
-1@@ -187,7 +187,7 @@ static void usb_ep1_command_reply_dispatch (struct urb* urb)break ; }#ifdef CONFIG_SND_USB_CAIAQ_INPUT -/* fall through */ + fallthrough;case EP1_CMD_READ_ERP :case EP1_CMD_READ_ANALOG :snd_usb_caiaq_input_dispatch (cdev, buf, urb->actual_length);sound/usb/midi.c +1
-1@@ -2401,7 +2401,7 @@ int __snd_usbmidi_create(struct snd_card *card,break ;case QUIRK_MIDI_US122L : umidi->usb_protocol_ops = &snd_usbmidi_122l_ops; -/* fall through */ + fallthrough;case QUIRK_MIDI_FIXED_ENDPOINT :memcpy (&endpoints[0 ], quirk->data,sizeof (struct snd_usb_midi_endpoint_info ));Signature · 1 line
2.16.4