Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sound: Remove unnecessary semicolon

A simplified version of the semantic patch that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r1@
statement S;
position p,p1;
@@
S@p1;@p

@script:python r2@
p << r1.p;
p1 << r1.p1;
@@
if p[0].line != p1[0].line_end:
cocci.include_match(False)
@@
position r1.p;
@@
-;@p
// </smpl>

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Peter Senna Tschudin and committed by
Takashi Iwai
395d9dd5 9f720bb9

+33 -33
+1 -1
sound/drivers/opl3/opl3_midi.c
··· 163 163 struct best *bp; 164 164 165 165 for (i = 0; i < END; i++) { 166 - best[i].time = (unsigned int)(-1); /* XXX MAX_?INT really */; 166 + best[i].time = (unsigned int)(-1); /* XXX MAX_?INT really */ 167 167 best[i].voice = -1; 168 168 } 169 169
+1 -1
sound/drivers/vx/vx_pcm.c
··· 184 184 default : 185 185 snd_BUG(); 186 186 return -EINVAL; 187 - }; 187 + } 188 188 189 189 return vx_set_stream_format(chip, pipe, header); 190 190 }
+1 -1
sound/isa/sb/emu8000_callback.c
··· 175 175 hw = emu->hw; 176 176 177 177 for (i = 0; i < END; i++) { 178 - best[i].time = (unsigned int)(-1); /* XXX MAX_?INT really */; 178 + best[i].time = (unsigned int)(-1); /* XXX MAX_?INT really */ 179 179 best[i].voice = -1; 180 180 } 181 181
+1 -1
sound/isa/wavefront/wavefront_synth.c
··· 538 538 /* Note: we leave the upper bits in place */ 539 539 540 540 dst++; 541 - }; 541 + } 542 542 return dst; 543 543 }; 544 544
+1 -1
sound/oss/audio.c
··· 354 354 355 355 if(copy_to_user(&(buf)[p], fixit, l)) 356 356 return -EFAULT; 357 - }; 357 + } 358 358 359 359 DMAbuf_rmchars(dev, buf_no, l); 360 360
+1 -1
sound/oss/opl3.c
··· 1190 1190 1191 1191 for (i = 0; i < 18; i++) 1192 1192 pv_map[i].ioaddr = devc->left_io; 1193 - }; 1193 + } 1194 1194 conf_printf2(devc->fm_info.name, ioaddr, 0, -1, -1); 1195 1195 1196 1196 for (i = 0; i < SBFM_MAXINSTR; i++)
+1 -1
sound/oss/pss.c
··· 359 359 { 360 360 /*_____ Send the next byte */ 361 361 outw (*block++, REG (PSS_DATA)); 362 - }; 362 + } 363 363 count++; 364 364 } 365 365
+11 -11
sound/oss/sb_ess.c
··· 1104 1104 default: 1105 1105 printk (KERN_ERR "Invalid esstype=%d specified\n", devc->sbmo.esstype); 1106 1106 return 0; 1107 - }; 1107 + } 1108 1108 if (submodel != -1) { 1109 1109 devc->submodel = submodel; 1110 1110 sprintf (modelname, "ES%d", devc->sbmo.esstype); 1111 1111 chip = modelname; 1112 - }; 1112 + } 1113 1113 if (chip == NULL && (ess_minor & 0x0f) < 8) { 1114 1114 chip = "ES688"; 1115 - }; 1115 + } 1116 1116 #ifdef FKS_TEST 1117 1117 FKS_test (devc); 1118 1118 #endif ··· 1122 1122 */ 1123 1123 if (chip == NULL && devc->sbmo.esstype == ESSTYPE_LIKE20) { 1124 1124 chip = "ES1688"; 1125 - }; 1125 + } 1126 1126 1127 1127 if (chip == NULL) { 1128 1128 int type; ··· 1150 1150 if ((type & 0x00ff) != ((type >> 8) & 0x00ff)) { 1151 1151 printk ("ess_init: Unrecognized %04x\n", type); 1152 1152 } 1153 - }; 1154 - }; 1153 + } 1154 + } 1155 1155 #if 0 1156 1156 /* 1157 1157 * this one failed: ··· 1182 1182 chip = "ES1788"; 1183 1183 devc->submodel = SUBMDL_ES1788; 1184 1184 } 1185 - }; 1185 + } 1186 1186 if (chip == NULL) { 1187 1187 chip = "ES1688"; 1188 - }; 1188 + } 1189 1189 1190 1190 printk ( KERN_INFO "ESS chip %s %s%s\n" 1191 1191 , chip ··· 1293 1293 default: 1294 1294 printk(KERN_ERR "ESS1887: Invalid DMA16 %d\n", dma); 1295 1295 return 0; 1296 - }; 1296 + } 1297 1297 ess_chgmixer (devc, 0x78, 0x20, dma16_bits); 1298 1298 ess_chgmixer (devc, 0x7d, 0x07, dma_bits); 1299 1299 } ··· 1584 1584 udelay(20); 1585 1585 outb(((unsigned char) (value & 0xff)), MIXER_DATA); 1586 1586 udelay(20); 1587 - }; 1587 + } 1588 1588 spin_unlock_irqrestore(&devc->lock, flags); 1589 1589 } 1590 1590 ··· 1761 1761 ess_chgmixer(devc, 0x7a, 0x18, 0x08); 1762 1762 ess_chgmixer(devc, 0x1c, 0x07, 0x07); 1763 1763 break; 1764 - }; 1764 + } 1765 1765 /* 1766 1766 * Call set_recmask for proper initialization 1767 1767 */
+2 -2
sound/oss/sb_mixer.c
··· 410 410 case MDL_SMW: 411 411 if (devc->model == MDL_ESS && ess_set_recmask (devc, &devmask)) { 412 412 break; 413 - }; 413 + } 414 414 if (devmask != SOUND_MASK_MIC && 415 415 devmask != SOUND_MASK_LINE && 416 416 devmask != SOUND_MASK_CD) ··· 666 666 667 667 if (devc->model != MDL_ESS || !ess_mixer_reset (devc)) { 668 668 set_recmask(devc, SOUND_MASK_MIC); 669 - }; 669 + } 670 670 } 671 671 672 672 int sb_mixer_init(sb_devc * devc, struct module *owner)
+2 -2
sound/oss/sys_timer.c
··· 57 57 { 58 58 def_tmr.expires = (1) + jiffies; 59 59 add_timer(&def_tmr); 60 - }; 60 + } 61 61 62 62 if (tmr_running) 63 63 { ··· 103 103 { 104 104 def_tmr.expires = (1) + jiffies; 105 105 add_timer(&def_tmr); 106 - }; 106 + } 107 107 108 108 return 0; 109 109 }
+1 -1
sound/oss/uart6850.c
··· 146 146 { 147 147 /* printk("Midi6850: Midi busy\n");*/ 148 148 return -EBUSY; 149 - }; 149 + } 150 150 151 151 uart6850_cmd(UART_RESET); 152 152 uart6850_input_loop();
+1 -1
sound/pci/asihpi/asihpi.c
··· 2658 2658 hpi_ctl.dst_node_type, 2659 2659 hpi_ctl.dst_node_index); 2660 2660 continue; 2661 - }; 2661 + } 2662 2662 if (err < 0) 2663 2663 return err; 2664 2664 }
+1 -1
sound/pci/au88x0/au88x0_game.c
··· 100 100 if (!gp) { 101 101 printk(KERN_ERR "vortex: cannot allocate memory for gameport\n"); 102 102 return -ENOMEM; 103 - }; 103 + } 104 104 105 105 gameport_set_name(gp, "AU88x0 Gameport"); 106 106 gameport_set_phys(gp, "pci%s/gameport0", pci_name(vortex->pci_dev));
+1 -1
sound/pci/au88x0/au88x0_pcm.c
··· 585 585 case 4: 586 586 mixin = p->mixin[i]; 587 587 break; 588 - }; 588 + } 589 589 vol = p->vol[i]; 590 590 vortex_mix_setinputvolumebyte(vortex, 591 591 vortex->mixplayb[i], mixin, vol);
+1 -1
sound/pci/emu10k1/emu10k1_callback.c
··· 228 228 int i; 229 229 230 230 for (i = 0; i < V_END; i++) { 231 - best[i].time = (unsigned int)-1; /* XXX MAX_?INT really */; 231 + best[i].time = (unsigned int)-1; /* XXX MAX_?INT really */ 232 232 best[i].voice = -1; 233 233 } 234 234
+1 -1
sound/pci/emu10k1/emupcm.c
··· 1310 1310 runtime->hw.channels_min = 1311 1311 runtime->hw.channels_max = 16; 1312 1312 break; 1313 - }; 1313 + } 1314 1314 #endif 1315 1315 #if 0 1316 1316 /* For 96kHz */
+1 -1
sound/pci/intel8x0.c
··· 2226 2226 case DEVICE_INTEL_ICH4: 2227 2227 chip->spdif_idx = ICHD_SPBAR; 2228 2228 break; 2229 - }; 2229 + } 2230 2230 } 2231 2231 2232 2232 chip->in_ac97_init = 1;
+1 -1
sound/pci/mixart/mixart_hwdep.c
··· 538 538 539 539 if ((err = snd_card_register(chip->card)) < 0) 540 540 return err; 541 - }; 541 + } 542 542 543 543 snd_printdd("miXart firmware downloaded and successfully set up\n"); 544 544
+2 -2
sound/sparc/amd7930.c
··· 813 813 default: 814 814 swval = &amd->pgain; 815 815 break; 816 - }; 816 + } 817 817 818 818 ucontrol->value.integer.value[0] = *swval; 819 819 ··· 838 838 default: 839 839 swval = &amd->pgain; 840 840 break; 841 - }; 841 + } 842 842 843 843 spin_lock_irqsave(&amd->lock, flags); 844 844
+1 -1
sound/sparc/dbri.c
··· 592 592 break; 593 593 default: 594 594 printk(KERN_ERR "DBRI reverse_bytes: unsupported length\n"); 595 - }; 595 + } 596 596 597 597 return b; 598 598 }