aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-10-19 17:10:43 -0400
committerAdrian Bunk <bunk@kernel.org>2007-10-19 17:10:43 -0400
commit3a4fa0a25da81600ea0bcd75692ae8ca6050d165 (patch)
treea4de1662e645c029cf3cf58f0646cbb1959861dc /sound
parent18735dd8d2d37031b97f9e9e106acbaed01eb896 (diff)
Fix misspellings of "system", "controller", "interrupt" and "necessary".
Fix the various misspellings of "system", controller", "interrupt" and "[un]necessary". Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/seq/seq_midi_emul.c8
-rw-r--r--sound/drivers/opl3/opl3_midi.c2
-rw-r--r--sound/isa/es18xx.c4
-rw-r--r--sound/mips/au1x00.c8
-rw-r--r--sound/pci/au88x0/au88x0.c2
-rw-r--r--sound/soc/soc-core.c2
-rw-r--r--sound/soc/soc-dapm.c2
-rw-r--r--sound/synth/emux/emux_synth.c2
8 files changed, 15 insertions, 15 deletions
diff --git a/sound/core/seq/seq_midi_emul.c b/sound/core/seq/seq_midi_emul.c
index d7c4fb86b9eb..17b3e6f13ca3 100644
--- a/sound/core/seq/seq_midi_emul.c
+++ b/sound/core/seq/seq_midi_emul.c
@@ -71,7 +71,7 @@ static void reset_all_channels(struct snd_midi_channel_set *chset);
71 * such as GM, GS and XG. 71 * such as GM, GS and XG.
72 * There modes that this module will run in are: 72 * There modes that this module will run in are:
73 * Generic MIDI - no interpretation at all, it will just save current values 73 * Generic MIDI - no interpretation at all, it will just save current values
74 * of controlers etc. 74 * of controllers etc.
75 * GM - You can use all gm_ prefixed elements of chan. Controls, RPN, NRPN, 75 * GM - You can use all gm_ prefixed elements of chan. Controls, RPN, NRPN,
76 * SysEx will be interpreded as defined in General Midi. 76 * SysEx will be interpreded as defined in General Midi.
77 * GS - You can use all gs_ prefixed elements of chan. Codes for GS will be 77 * GS - You can use all gs_ prefixed elements of chan. Codes for GS will be
@@ -176,7 +176,7 @@ snd_midi_process_event(struct snd_midi_op *ops,
176 ev->data.control.value); 176 ev->data.control.value);
177 break; 177 break;
178 case SNDRV_SEQ_EVENT_NONREGPARAM: 178 case SNDRV_SEQ_EVENT_NONREGPARAM:
179 /* Break it back into its controler values */ 179 /* Break it back into its controller values */
180 chan->param_type = SNDRV_MIDI_PARAM_TYPE_NONREGISTERED; 180 chan->param_type = SNDRV_MIDI_PARAM_TYPE_NONREGISTERED;
181 chan->control[MIDI_CTL_MSB_DATA_ENTRY] 181 chan->control[MIDI_CTL_MSB_DATA_ENTRY]
182 = (ev->data.control.value >> 7) & 0x7f; 182 = (ev->data.control.value >> 7) & 0x7f;
@@ -189,7 +189,7 @@ snd_midi_process_event(struct snd_midi_op *ops,
189 nrpn(ops, drv, chan, chanset); 189 nrpn(ops, drv, chan, chanset);
190 break; 190 break;
191 case SNDRV_SEQ_EVENT_REGPARAM: 191 case SNDRV_SEQ_EVENT_REGPARAM:
192 /* Break it back into its controler values */ 192 /* Break it back into its controller values */
193 chan->param_type = SNDRV_MIDI_PARAM_TYPE_REGISTERED; 193 chan->param_type = SNDRV_MIDI_PARAM_TYPE_REGISTERED;
194 chan->control[MIDI_CTL_MSB_DATA_ENTRY] 194 chan->control[MIDI_CTL_MSB_DATA_ENTRY]
195 = (ev->data.control.value >> 7) & 0x7f; 195 = (ev->data.control.value >> 7) & 0x7f;
@@ -267,7 +267,7 @@ note_off(struct snd_midi_op *ops, void *drv, struct snd_midi_channel *chan,
267} 267}
268 268
269/* 269/*
270 * Do all driver independent operations for this controler and pass 270 * Do all driver independent operations for this controller and pass
271 * events that need to take place immediately to the driver. 271 * events that need to take place immediately to the driver.
272 */ 272 */
273static void 273static void
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c
index 1b6f227af370..3557b6e20eb5 100644
--- a/sound/drivers/opl3/opl3_midi.c
+++ b/sound/drivers/opl3/opl3_midi.c
@@ -808,7 +808,7 @@ static void snd_opl3_pitch_ctrl(struct snd_opl3 *opl3, struct snd_midi_channel *
808} 808}
809 809
810/* 810/*
811 * Deal with a controler type event. This includes all types of 811 * Deal with a controller type event. This includes all types of
812 * control events, not just the midi controllers 812 * control events, not just the midi controllers
813 */ 813 */
814void snd_opl3_control(void *p, int type, struct snd_midi_channel *chan) 814void snd_opl3_control(void *p, int type, struct snd_midi_channel *chan)
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 4a7367a8ff9d..c1af28fd4a1f 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -623,7 +623,7 @@ static int snd_es18xx_capture_prepare(struct snd_pcm_substream *substream)
623 (snd_pcm_format_width(runtime->format) == 16 ? 0x04 : 0x00) | 623 (snd_pcm_format_width(runtime->format) == 16 ? 0x04 : 0x00) |
624 (snd_pcm_format_unsigned(runtime->format) ? 0x00 : 0x20)); 624 (snd_pcm_format_unsigned(runtime->format) ? 0x00 : 0x20));
625 625
626 /* Set DMA controler */ 626 /* Set DMA controller */
627 snd_dma_program(chip->dma1, runtime->dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT); 627 snd_dma_program(chip->dma1, runtime->dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT);
628 628
629 return 0; 629 return 0;
@@ -689,7 +689,7 @@ static int snd_es18xx_playback2_prepare(struct snd_es18xx *chip,
689 (snd_pcm_format_width(runtime->format) == 16 ? 0x04 : 0x00) | 689 (snd_pcm_format_width(runtime->format) == 16 ? 0x04 : 0x00) |
690 (snd_pcm_format_unsigned(runtime->format) ? 0x00 : 0x20)); 690 (snd_pcm_format_unsigned(runtime->format) ? 0x00 : 0x20));
691 691
692 /* Set DMA controler */ 692 /* Set DMA controller */
693 snd_dma_program(chip->dma1, runtime->dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT); 693 snd_dma_program(chip->dma1, runtime->dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);
694 694
695 return 0; 695 return 0;
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index 8a61a1191861..24460a558bf7 100644
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -498,8 +498,8 @@ snd_au1000_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
498 int i; 498 int i;
499 499
500 spin_lock(&au1000->ac97_lock); 500 spin_lock(&au1000->ac97_lock);
501/* would rather use the interupt than this polling but it works and I can't 501/* would rather use the interrupt than this polling but it works and I can't
502get the interupt driven case to work efficiently */ 502get the interrupt driven case to work efficiently */
503 for (i = 0; i < 0x5000; i++) 503 for (i = 0; i < 0x5000; i++)
504 if (!(au1000->ac97_ioport->status & AC97C_CP)) 504 if (!(au1000->ac97_ioport->status & AC97C_CP))
505 break; 505 break;
@@ -535,8 +535,8 @@ snd_au1000_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short
535 int i; 535 int i;
536 536
537 spin_lock(&au1000->ac97_lock); 537 spin_lock(&au1000->ac97_lock);
538/* would rather use the interupt than this polling but it works and I can't 538/* would rather use the interrupt than this polling but it works and I can't
539get the interupt driven case to work efficiently */ 539get the interrupt driven case to work efficiently */
540 for (i = 0; i < 0x5000; i++) 540 for (i = 0; i < 0x5000; i++)
541 if (!(au1000->ac97_ioport->status & AC97C_CP)) 541 if (!(au1000->ac97_ioport->status & AC97C_CP))
542 break; 542 break;
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index f70286a7364a..26819e2f5761 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -191,7 +191,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
191 191
192 /* Init audio core. 192 /* Init audio core.
193 * This must be done before we do request_irq otherwise we can get spurious 193 * This must be done before we do request_irq otherwise we can get spurious
194 * interupts that we do not handle properly and make a mess of things */ 194 * interrupts that we do not handle properly and make a mess of things */
195 if ((err = vortex_core_init(chip)) != 0) { 195 if ((err = vortex_core_init(chip)) != 0) {
196 printk(KERN_ERR "hw core init failed\n"); 196 printk(KERN_ERR "hw core init failed\n");
197 goto core_out; 197 goto core_out;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 91651bdfa761..e6a67b58f296 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -264,7 +264,7 @@ out:
264} 264}
265 265
266/* 266/*
267 * Power down the audio subsytem pmdown_time msecs after close is called. 267 * Power down the audio subsystem pmdown_time msecs after close is called.
268 * This is to ensure there are no pops or clicks in between any music tracks 268 * This is to ensure there are no pops or clicks in between any music tracks
269 * due to DAPM power cycling. 269 * due to DAPM power cycling.
270 */ 270 */
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index b3193e687db7..29a546fecacf 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -24,7 +24,7 @@
24 * o Automatic Mic Bias support 24 * o Automatic Mic Bias support
25 * o Jack insertion power event initiation - e.g. hp insertion will enable 25 * o Jack insertion power event initiation - e.g. hp insertion will enable
26 * sinks, dacs, etc 26 * sinks, dacs, etc
27 * o Delayed powerdown of audio susbsytem to reduce pops between a quick 27 * o Delayed powerdown of audio susbsystem to reduce pops between a quick
28 * device reopen. 28 * device reopen.
29 * 29 *
30 * Todo: 30 * Todo:
diff --git a/sound/synth/emux/emux_synth.c b/sound/synth/emux/emux_synth.c
index 3733118d39bb..478369bb38c3 100644
--- a/sound/synth/emux/emux_synth.c
+++ b/sound/synth/emux/emux_synth.c
@@ -317,7 +317,7 @@ snd_emux_update_port(struct snd_emux_port *port, int update)
317 317
318 318
319/* 319/*
320 * Deal with a controler type event. This includes all types of 320 * Deal with a controller type event. This includes all types of
321 * control events, not just the midi controllers 321 * control events, not just the midi controllers
322 */ 322 */
323void 323void