diff options
89 files changed, 117 insertions, 117 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index fe26cc978523..37c10cba7177 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
@@ -224,7 +224,7 @@ against the page the filesystem should redirty the page with | |||
224 | redirty_page_for_writepage(), then unlock the page and return zero. | 224 | redirty_page_for_writepage(), then unlock the page and return zero. |
225 | This may also be done to avoid internal deadlocks, but rarely. | 225 | This may also be done to avoid internal deadlocks, but rarely. |
226 | 226 | ||
227 | If the filesytem is called for sync then it must wait on any | 227 | If the filesystem is called for sync then it must wait on any |
228 | in-progress I/O and then start new I/O. | 228 | in-progress I/O and then start new I/O. |
229 | 229 | ||
230 | The filesystem should unlock the page synchronously, before returning to the | 230 | The filesystem should unlock the page synchronously, before returning to the |
diff --git a/Documentation/mips/AU1xxx_IDE.README b/Documentation/mips/AU1xxx_IDE.README index afb31c141d9d..5c8334123f4f 100644 --- a/Documentation/mips/AU1xxx_IDE.README +++ b/Documentation/mips/AU1xxx_IDE.README | |||
@@ -59,7 +59,7 @@ Four configs variables are introduced: | |||
59 | CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA - enable the PIO+DBDMA mode | 59 | CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA - enable the PIO+DBDMA mode |
60 | CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA - enable the MWDMA mode | 60 | CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA - enable the MWDMA mode |
61 | CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON - set Burstable FIFO in DBDMA | 61 | CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON - set Burstable FIFO in DBDMA |
62 | controler | 62 | controller |
63 | CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ - maximum transfer size | 63 | CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ - maximum transfer size |
64 | per descriptor | 64 | per descriptor |
65 | 65 | ||
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c index ba4a1bb3ee40..aa2d365c93fb 100644 --- a/arch/arm/mach-at91/gpio.c +++ b/arch/arm/mach-at91/gpio.c | |||
@@ -439,7 +439,7 @@ void __init at91_gpio_irq_setup(void) | |||
439 | for (i = 0; i < 32; i++, pin++) { | 439 | for (i = 0; i < 32; i++, pin++) { |
440 | /* | 440 | /* |
441 | * Can use the "simple" and not "edge" handler since it's | 441 | * Can use the "simple" and not "edge" handler since it's |
442 | * shorter, and the AIC handles interupts sanely. | 442 | * shorter, and the AIC handles interrupts sanely. |
443 | */ | 443 | */ |
444 | set_irq_chip(pin, &gpio_irqchip); | 444 | set_irq_chip(pin, &gpio_irqchip); |
445 | set_irq_handler(pin, handle_simple_irq); | 445 | set_irq_handler(pin, handle_simple_irq); |
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c index cab9d6265e9e..2bfaa6102025 100644 --- a/arch/arm/mach-s3c2410/clock.c +++ b/arch/arm/mach-s3c2410/clock.c | |||
@@ -238,7 +238,7 @@ int __init s3c2410_baseclk_add(void) | |||
238 | } | 238 | } |
239 | 239 | ||
240 | /* We must be careful disabling the clocks we are not intending to | 240 | /* We must be careful disabling the clocks we are not intending to |
241 | * be using at boot time, as subsytems such as the LCD which do | 241 | * be using at boot time, as subsystems such as the LCD which do |
242 | * their own DMA requests to the bus can cause the system to lockup | 242 | * their own DMA requests to the bus can cause the system to lockup |
243 | * if they where in the middle of requesting bus access. | 243 | * if they where in the middle of requesting bus access. |
244 | * | 244 | * |
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c index 8543dd6df391..458993601897 100644 --- a/arch/arm/mach-s3c2412/clock.c +++ b/arch/arm/mach-s3c2412/clock.c | |||
@@ -689,7 +689,7 @@ int __init s3c2412_baseclk_add(void) | |||
689 | } | 689 | } |
690 | 690 | ||
691 | /* We must be careful disabling the clocks we are not intending to | 691 | /* We must be careful disabling the clocks we are not intending to |
692 | * be using at boot time, as subsytems such as the LCD which do | 692 | * be using at boot time, as subsystems such as the LCD which do |
693 | * their own DMA requests to the bus can cause the system to lockup | 693 | * their own DMA requests to the bus can cause the system to lockup |
694 | * if they where in the middle of requesting bus access. | 694 | * if they where in the middle of requesting bus access. |
695 | * | 695 | * |
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index 58402948c47c..b42f956738d0 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c | |||
@@ -1005,7 +1005,7 @@ void __init s3c2443_init_clocks(int xtal) | |||
1005 | } | 1005 | } |
1006 | 1006 | ||
1007 | /* We must be careful disabling the clocks we are not intending to | 1007 | /* We must be careful disabling the clocks we are not intending to |
1008 | * be using at boot time, as subsytems such as the LCD which do | 1008 | * be using at boot time, as subsystems such as the LCD which do |
1009 | * their own DMA requests to the bus can cause the system to lockup | 1009 | * their own DMA requests to the bus can cause the system to lockup |
1010 | * if they where in the middle of requesting bus access. | 1010 | * if they where in the middle of requesting bus access. |
1011 | * | 1011 | * |
diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c index 1de0026bb94e..c263b8232dbc 100644 --- a/arch/cris/arch-v10/drivers/pcf8563.c +++ b/arch/cris/arch-v10/drivers/pcf8563.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * From Phillips' datasheet: | 4 | * From Phillips' datasheet: |
5 | * | 5 | * |
6 | * The PCF8563 is a CMOS real-time clock/calendar optimized for low power | 6 | * The PCF8563 is a CMOS real-time clock/calendar optimized for low power |
7 | * consumption. A programmable clock output, interupt output and voltage | 7 | * consumption. A programmable clock output, interrupt output and voltage |
8 | * low detector are also provided. All address and data are transferred | 8 | * low detector are also provided. All address and data are transferred |
9 | * serially via two-line bidirectional I2C-bus. Maximum bus speed is | 9 | * serially via two-line bidirectional I2C-bus. Maximum bus speed is |
10 | * 400 kbits/s. The built-in word address register is incremented | 10 | * 400 kbits/s. The built-in word address register is incremented |
diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c index da479a14f836..6dbd700d3d66 100644 --- a/arch/cris/arch-v32/drivers/pcf8563.c +++ b/arch/cris/arch-v32/drivers/pcf8563.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * From Phillips' datasheet: | 4 | * From Phillips' datasheet: |
5 | * | 5 | * |
6 | * The PCF8563 is a CMOS real-time clock/calendar optimized for low power | 6 | * The PCF8563 is a CMOS real-time clock/calendar optimized for low power |
7 | * consumption. A programmable clock output, interupt output and voltage | 7 | * consumption. A programmable clock output, interrupt output and voltage |
8 | * low detector are also provided. All address and data are transferred | 8 | * low detector are also provided. All address and data are transferred |
9 | * serially via two-line bidirectional I2C-bus. Maximum bus speed is | 9 | * serially via two-line bidirectional I2C-bus. Maximum bus speed is |
10 | * 400 kbits/s. The built-in word address register is incremented | 10 | * 400 kbits/s. The built-in word address register is incremented |
diff --git a/arch/h8300/kernel/irq.c b/arch/h8300/kernel/irq.c index 43d21e93f41f..8dec4dd57b4e 100644 --- a/arch/h8300/kernel/irq.c +++ b/arch/h8300/kernel/irq.c | |||
@@ -68,7 +68,7 @@ static void h8300_shutdown_irq(unsigned int irq) | |||
68 | } | 68 | } |
69 | 69 | ||
70 | /* | 70 | /* |
71 | * h8300 interrupt controler implementation | 71 | * h8300 interrupt controller implementation |
72 | */ | 72 | */ |
73 | struct irq_chip h8300irq_chip = { | 73 | struct irq_chip h8300irq_chip = { |
74 | .name = "H8300-INTC", | 74 | .name = "H8300-INTC", |
diff --git a/arch/m68knommu/platform/5307/pit.c b/arch/m68knommu/platform/5307/pit.c index e53c446d10e4..f18352fa35a6 100644 --- a/arch/m68knommu/platform/5307/pit.c +++ b/arch/m68knommu/platform/5307/pit.c | |||
@@ -83,7 +83,7 @@ unsigned long coldfire_pit_offset(void) | |||
83 | 83 | ||
84 | /* | 84 | /* |
85 | * If we are still in the first half of the upcount and a | 85 | * If we are still in the first half of the upcount and a |
86 | * timer interupt is pending, then add on a ticks worth of time. | 86 | * timer interrupt is pending, then add on a ticks worth of time. |
87 | */ | 87 | */ |
88 | offset = ((pmr - pcntr) * (1000000 / HZ)) / pmr; | 88 | offset = ((pmr - pcntr) * (1000000 / HZ)) / pmr; |
89 | if ((offset < (1000000 / HZ / 2)) && (*ipr & MCFPIT_IMR_IBIT)) | 89 | if ((offset < (1000000 / HZ / 2)) && (*ipr & MCFPIT_IMR_IBIT)) |
diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c index cb0801437b66..e7ed0ac48537 100644 --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c | |||
@@ -381,7 +381,7 @@ const struct exception_table_entry *search_module_dbetables(unsigned long addr) | |||
381 | return e; | 381 | return e; |
382 | } | 382 | } |
383 | 383 | ||
384 | /* Put in dbe list if neccessary. */ | 384 | /* Put in dbe list if necessary. */ |
385 | int module_finalize(const Elf_Ehdr *hdr, | 385 | int module_finalize(const Elf_Ehdr *hdr, |
386 | const Elf_Shdr *sechdrs, | 386 | const Elf_Shdr *sechdrs, |
387 | struct module *me) | 387 | struct module *me) |
diff --git a/arch/mips/pci/pci-excite.c b/arch/mips/pci/pci-excite.c index 3c86c77cb74f..8a56876afcc6 100644 --- a/arch/mips/pci/pci-excite.c +++ b/arch/mips/pci/pci-excite.c | |||
@@ -131,7 +131,7 @@ static int __init basler_excite_pci_setup(void) | |||
131 | ocd_writel(0x00000000, bar + 0x100); | 131 | ocd_writel(0x00000000, bar + 0x100); |
132 | } | 132 | } |
133 | 133 | ||
134 | /* Finally, enable the PCI interupt */ | 134 | /* Finally, enable the PCI interrupt */ |
135 | #if USB_IRQ > 7 | 135 | #if USB_IRQ > 7 |
136 | set_c0_intcontrol(1 << USB_IRQ); | 136 | set_c0_intcontrol(1 << USB_IRQ); |
137 | #else | 137 | #else |
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c index 39bb15f1f2a6..4df070f2ff5d 100644 --- a/arch/mips/sni/pcimt.c +++ b/arch/mips/sni/pcimt.c | |||
@@ -246,7 +246,7 @@ static void pcimt_hwint1(void) | |||
246 | /* | 246 | /* |
247 | * Note: ASIC PCI's builtin interrupt achknowledge feature is | 247 | * Note: ASIC PCI's builtin interrupt achknowledge feature is |
248 | * broken. Using it may result in loss of some or all i8259 | 248 | * broken. Using it may result in loss of some or all i8259 |
249 | * interupts, so don't use PCIMT_INT_ACKNOWLEDGE ... | 249 | * interrupts, so don't use PCIMT_INT_ACKNOWLEDGE ... |
250 | */ | 250 | */ |
251 | irq = i8259_irq(); | 251 | irq = i8259_irq(); |
252 | if (unlikely(irq < 0)) | 252 | if (unlikely(irq < 0)) |
diff --git a/arch/powerpc/platforms/celleb/scc_uhc.c b/arch/powerpc/platforms/celleb/scc_uhc.c index a7c548bde2e3..b59c38a06e3e 100644 --- a/arch/powerpc/platforms/celleb/scc_uhc.c +++ b/arch/powerpc/platforms/celleb/scc_uhc.c | |||
@@ -36,7 +36,7 @@ static inline int uhc_clkctrl_ready(u32 val) | |||
36 | } | 36 | } |
37 | 37 | ||
38 | /* | 38 | /* |
39 | * UHC(usb host controler) enable function. | 39 | * UHC(usb host controller) enable function. |
40 | * affect to both of OHCI and EHCI core module. | 40 | * affect to both of OHCI and EHCI core module. |
41 | */ | 41 | */ |
42 | static void enable_scc_uhc(struct pci_dev *dev) | 42 | static void enable_scc_uhc(struct pci_dev *dev) |
diff --git a/arch/sh64/kernel/pci_sh5.c b/arch/sh64/kernel/pci_sh5.c index 388bb711f1b0..b4d9534d2b0e 100644 --- a/arch/sh64/kernel/pci_sh5.c +++ b/arch/sh64/kernel/pci_sh5.c | |||
@@ -480,7 +480,7 @@ static int __init pcibios_init(void) | |||
480 | return -EINVAL; | 480 | return -EINVAL; |
481 | } | 481 | } |
482 | 482 | ||
483 | /* The pci subsytem needs to know where memory is and how much | 483 | /* The pci subsystem needs to know where memory is and how much |
484 | * of it there is. I've simply made these globals. A better mechanism | 484 | * of it there is. I've simply made these globals. A better mechanism |
485 | * is probably needed. | 485 | * is probably needed. |
486 | */ | 486 | */ |
diff --git a/arch/x86/kernel/suspend_64.c b/arch/x86/kernel/suspend_64.c index f8fafe527ff1..76274eeae9a9 100644 --- a/arch/x86/kernel/suspend_64.c +++ b/arch/x86/kernel/suspend_64.c | |||
@@ -123,7 +123,7 @@ void fix_processor_context(void) | |||
123 | int cpu = smp_processor_id(); | 123 | int cpu = smp_processor_id(); |
124 | struct tss_struct *t = &per_cpu(init_tss, cpu); | 124 | struct tss_struct *t = &per_cpu(init_tss, cpu); |
125 | 125 | ||
126 | set_tss_desc(cpu,t); /* This just modifies memory; should not be neccessary. But... This is neccessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ | 126 | set_tss_desc(cpu,t); /* This just modifies memory; should not be necessary. But... This is necessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ |
127 | 127 | ||
128 | cpu_gdt(cpu)[GDT_ENTRY_TSS].type = 9; | 128 | cpu_gdt(cpu)[GDT_ENTRY_TSS].type = 9; |
129 | 129 | ||
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 10bc3f64c453..47c806040524 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
@@ -1479,7 +1479,7 @@ static void ahci_port_intr(struct ata_port *ap) | |||
1479 | return; | 1479 | return; |
1480 | } | 1480 | } |
1481 | 1481 | ||
1482 | /* hmmm... a spurious interupt */ | 1482 | /* hmmm... a spurious interrupt */ |
1483 | 1483 | ||
1484 | /* if !NCQ, ignore. No modern ATA device has broken HSM | 1484 | /* if !NCQ, ignore. No modern ATA device has broken HSM |
1485 | * implementation for non-NCQ commands. | 1485 | * implementation for non-NCQ commands. |
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index f9e4cd527942..8227c45109ec 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
@@ -856,7 +856,7 @@ err_out: | |||
856 | * @pdev: PCI device | 856 | * @pdev: PCI device |
857 | * | 857 | * |
858 | * Some PCI ATA devices report simplex mode but in fact can be told to | 858 | * Some PCI ATA devices report simplex mode but in fact can be told to |
859 | * enter non simplex mode. This implements the neccessary logic to | 859 | * enter non simplex mode. This implements the necessary logic to |
860 | * perform the task on such devices. Calling it on other devices will | 860 | * perform the task on such devices. Calling it on other devices will |
861 | * have -undefined- behaviour. | 861 | * have -undefined- behaviour. |
862 | */ | 862 | */ |
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index 57e827e4109e..e1818fdd9159 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c | |||
@@ -138,7 +138,7 @@ static void cs5530_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
138 | * | 138 | * |
139 | * Called when the libata layer is about to issue a command. We wrap | 139 | * Called when the libata layer is about to issue a command. We wrap |
140 | * this interface so that we can load the correct ATA timings if | 140 | * this interface so that we can load the correct ATA timings if |
141 | * neccessary. Specifically we have a problem that there is only | 141 | * necessary. Specifically we have a problem that there is only |
142 | * one MWDMA/UDMA bit. | 142 | * one MWDMA/UDMA bit. |
143 | */ | 143 | */ |
144 | 144 | ||
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c index 3578593a882b..01324530d052 100644 --- a/drivers/ata/pata_cs5535.c +++ b/drivers/ata/pata_cs5535.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * Documentation: | 25 | * Documentation: |
26 | * Available from AMD web site. | 26 | * Available from AMD web site. |
27 | * TODO | 27 | * TODO |
28 | * Review errata to see if serializing is neccessary | 28 | * Review errata to see if serializing is necessary |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index 988ef736b936..ca9aae09daed 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
@@ -105,7 +105,7 @@ struct it821x_dev | |||
105 | 105 | ||
106 | /* | 106 | /* |
107 | * We allow users to force the card into non raid mode without | 107 | * We allow users to force the card into non raid mode without |
108 | * flashing the alternative BIOS. This is also neccessary right now | 108 | * flashing the alternative BIOS. This is also necessary right now |
109 | * for embedded platforms that cannot run a PC BIOS but are using this | 109 | * for embedded platforms that cannot run a PC BIOS but are using this |
110 | * device. | 110 | * device. |
111 | */ | 111 | */ |
@@ -383,7 +383,7 @@ static void it821x_passthru_bmdma_stop(struct ata_queued_cmd *qc) | |||
383 | * @ap: ATA port | 383 | * @ap: ATA port |
384 | * @device: Device number (not pointer) | 384 | * @device: Device number (not pointer) |
385 | * | 385 | * |
386 | * Device selection hook. If neccessary perform clock switching | 386 | * Device selection hook. If necessary perform clock switching |
387 | */ | 387 | */ |
388 | 388 | ||
389 | static void it821x_passthru_dev_select(struct ata_port *ap, | 389 | static void it821x_passthru_dev_select(struct ata_port *ap, |
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c index d5483087a3fa..c0d9e0cf208c 100644 --- a/drivers/ata/pata_mpiix.c +++ b/drivers/ata/pata_mpiix.c | |||
@@ -129,7 +129,7 @@ static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
129 | * | 129 | * |
130 | * Called when the libata layer is about to issue a command. We wrap | 130 | * Called when the libata layer is about to issue a command. We wrap |
131 | * this interface so that we can load the correct ATA timings if | 131 | * this interface so that we can load the correct ATA timings if |
132 | * neccessary. Our logic also clears TIME0/TIME1 for the other device so | 132 | * necessary. Our logic also clears TIME0/TIME1 for the other device so |
133 | * that, even if we get this wrong, cycles to the other device will | 133 | * that, even if we get this wrong, cycles to the other device will |
134 | * be made PIO0. | 134 | * be made PIO0. |
135 | */ | 135 | */ |
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c index 6e8e55745b7b..9fe66fd75017 100644 --- a/drivers/ata/pata_ns87410.c +++ b/drivers/ata/pata_ns87410.c | |||
@@ -124,7 +124,7 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
124 | * | 124 | * |
125 | * Called when the libata layer is about to issue a command. We wrap | 125 | * Called when the libata layer is about to issue a command. We wrap |
126 | * this interface so that we can load the correct ATA timings if | 126 | * this interface so that we can load the correct ATA timings if |
127 | * neccessary. | 127 | * necessary. |
128 | */ | 128 | */ |
129 | 129 | ||
130 | static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc) | 130 | static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc) |
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c index 3cd5eb2b6c91..44da09ace52c 100644 --- a/drivers/ata/pata_oldpiix.c +++ b/drivers/ata/pata_oldpiix.c | |||
@@ -200,7 +200,7 @@ static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
200 | * | 200 | * |
201 | * Called when the libata layer is about to issue a command. We wrap | 201 | * Called when the libata layer is about to issue a command. We wrap |
202 | * this interface so that we can load the correct ATA timings if | 202 | * this interface so that we can load the correct ATA timings if |
203 | * neccessary. Our logic also clears TIME0/TIME1 for the other device so | 203 | * necessary. Our logic also clears TIME0/TIME1 for the other device so |
204 | * that, even if we get this wrong, cycles to the other device will | 204 | * that, even if we get this wrong, cycles to the other device will |
205 | * be made PIO0. | 205 | * be made PIO0. |
206 | */ | 206 | */ |
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c index d5b76497f4a2..8109b08fc024 100644 --- a/drivers/ata/pata_radisys.c +++ b/drivers/ata/pata_radisys.c | |||
@@ -161,7 +161,7 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
161 | * | 161 | * |
162 | * Called when the libata layer is about to issue a command. We wrap | 162 | * Called when the libata layer is about to issue a command. We wrap |
163 | * this interface so that we can load the correct ATA timings if | 163 | * this interface so that we can load the correct ATA timings if |
164 | * neccessary. Our logic also clears TIME0/TIME1 for the other device so | 164 | * necessary. Our logic also clears TIME0/TIME1 for the other device so |
165 | * that, even if we get this wrong, cycles to the other device will | 165 | * that, even if we get this wrong, cycles to the other device will |
166 | * be made PIO0. | 166 | * be made PIO0. |
167 | */ | 167 | */ |
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c index 21ebc485ca4b..725a8586cd6e 100644 --- a/drivers/ata/pata_sc1200.c +++ b/drivers/ata/pata_sc1200.c | |||
@@ -156,7 +156,7 @@ static void sc1200_set_dmamode(struct ata_port *ap, struct ata_device *adev) | |||
156 | * | 156 | * |
157 | * Called when the libata layer is about to issue a command. We wrap | 157 | * Called when the libata layer is about to issue a command. We wrap |
158 | * this interface so that we can load the correct ATA timings if | 158 | * this interface so that we can load the correct ATA timings if |
159 | * neccessary. Specifically we have a problem that there is only | 159 | * necessary. Specifically we have a problem that there is only |
160 | * one MWDMA/UDMA bit. | 160 | * one MWDMA/UDMA bit. |
161 | */ | 161 | */ |
162 | 162 | ||
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c index 4dc2e73298fd..5c1e9cb59ecb 100644 --- a/drivers/ata/pata_sil680.c +++ b/drivers/ata/pata_sil680.c | |||
@@ -16,7 +16,7 @@ | |||
16 | * | 16 | * |
17 | * If you have strange problems with nVidia chipset systems please | 17 | * If you have strange problems with nVidia chipset systems please |
18 | * see the SI support documentation and update your system BIOS | 18 | * see the SI support documentation and update your system BIOS |
19 | * if neccessary | 19 | * if necessary |
20 | * | 20 | * |
21 | * TODO | 21 | * TODO |
22 | * If we know all our devices are LBA28 (or LBA28 sized) we could use | 22 | * If we know all our devices are LBA28 (or LBA28 sized) we could use |
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index 5d41b6612d7f..ea7a9a652e61 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c | |||
@@ -420,7 +420,7 @@ static struct ata_port_operations via_port_ops_noirq = { | |||
420 | * @pdev: PCI device | 420 | * @pdev: PCI device |
421 | * @flags: configuration flags | 421 | * @flags: configuration flags |
422 | * | 422 | * |
423 | * Set the FIFO properties for this device if neccessary. Used both on | 423 | * Set the FIFO properties for this device if necessary. Used both on |
424 | * set up and on and the resume path | 424 | * set up and on and the resume path |
425 | */ | 425 | */ |
426 | 426 | ||
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index 94ebc9dc40fd..f8f7139c07c1 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c | |||
@@ -1596,7 +1596,7 @@ static irqreturn_t fs_irq (int irq, void *dev_id) | |||
1596 | 1596 | ||
1597 | /* print the bits in the ISR register. */ | 1597 | /* print the bits in the ISR register. */ |
1598 | if (fs_debug & FS_DEBUG_IRQ) { | 1598 | if (fs_debug & FS_DEBUG_IRQ) { |
1599 | /* The FS_DEBUG things are unneccesary here. But this way it is | 1599 | /* The FS_DEBUG things are unnecessary here. But this way it is |
1600 | clear for grep that these are debug prints. */ | 1600 | clear for grep that these are debug prints. */ |
1601 | fs_dprintk (FS_DEBUG_IRQ, "IRQ status:"); | 1601 | fs_dprintk (FS_DEBUG_IRQ, "IRQ status:"); |
1602 | for (i=0;i<27;i++) | 1602 | for (i=0;i<27;i++) |
diff --git a/drivers/block/rd.c b/drivers/block/rd.c index 08176d23a46c..47f8ac6cce57 100644 --- a/drivers/block/rd.c +++ b/drivers/block/rd.c | |||
@@ -365,7 +365,7 @@ static int rd_open(struct inode *inode, struct file *filp) | |||
365 | /* | 365 | /* |
366 | * Deep badness. rd_blkdev_pagecache_IO() needs to allocate | 366 | * Deep badness. rd_blkdev_pagecache_IO() needs to allocate |
367 | * pagecache pages within a request_fn. We cannot recur back | 367 | * pagecache pages within a request_fn. We cannot recur back |
368 | * into the filesytem which is mounted atop the ramdisk, because | 368 | * into the filesystem which is mounted atop the ramdisk, because |
369 | * that would deadlock on fs locks. And we really don't want | 369 | * that would deadlock on fs locks. And we really don't want |
370 | * to reenter rd_blkdev_pagecache_IO when we're already within | 370 | * to reenter rd_blkdev_pagecache_IO when we're already within |
371 | * that function. | 371 | * that function. |
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c index 038056911934..596c7173997b 100644 --- a/drivers/char/n_tty.c +++ b/drivers/char/n_tty.c | |||
@@ -437,7 +437,7 @@ static inline void finish_erasing(struct tty_struct *tty) | |||
437 | * @c: character input | 437 | * @c: character input |
438 | * @tty: terminal device | 438 | * @tty: terminal device |
439 | * | 439 | * |
440 | * Perform erase and neccessary output when an erase character is | 440 | * Perform erase and necessary output when an erase character is |
441 | * present in the stream from the driver layer. Handles the complexities | 441 | * present in the stream from the driver layer. Handles the complexities |
442 | * of UTF-8 multibyte symbols. | 442 | * of UTF-8 multibyte symbols. |
443 | */ | 443 | */ |
@@ -657,7 +657,7 @@ static inline void n_tty_receive_overrun(struct tty_struct *tty) | |||
657 | * @c: character | 657 | * @c: character |
658 | * | 658 | * |
659 | * Process a parity error and queue the right data to indicate | 659 | * Process a parity error and queue the right data to indicate |
660 | * the error case if neccessary. Locking as per n_tty_receive_buf. | 660 | * the error case if necessary. Locking as per n_tty_receive_buf. |
661 | */ | 661 | */ |
662 | static inline void n_tty_receive_parity_error(struct tty_struct *tty, | 662 | static inline void n_tty_receive_parity_error(struct tty_struct *tty, |
663 | unsigned char c) | 663 | unsigned char c) |
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 7e6a3a413bb2..d83419c3857e 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c | |||
@@ -563,7 +563,7 @@ static void rp_do_poll(unsigned long dummy) | |||
563 | /* Get a ptr to the board's control struct */ | 563 | /* Get a ptr to the board's control struct */ |
564 | ctlp = sCtlNumToCtlPtr(ctrl); | 564 | ctlp = sCtlNumToCtlPtr(ctrl); |
565 | 565 | ||
566 | /* Get the interupt status from the board */ | 566 | /* Get the interrupt status from the board */ |
567 | #ifdef CONFIG_PCI | 567 | #ifdef CONFIG_PCI |
568 | if (ctlp->BusType == isPCI) | 568 | if (ctlp->BusType == isPCI) |
569 | CtlMask = sPCIGetControllerIntStatus(ctlp); | 569 | CtlMask = sPCIGetControllerIntStatus(ctlp); |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 13a53575a016..f36fecd3fd26 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -943,7 +943,7 @@ EXPORT_SYMBOL_GPL(tty_ldisc_deref); | |||
943 | * @tty: terminal to activate ldisc on | 943 | * @tty: terminal to activate ldisc on |
944 | * | 944 | * |
945 | * Set the TTY_LDISC flag when the line discipline can be called | 945 | * Set the TTY_LDISC flag when the line discipline can be called |
946 | * again. Do neccessary wakeups for existing sleepers. | 946 | * again. Do necessary wakeups for existing sleepers. |
947 | * | 947 | * |
948 | * Note: nobody should set this bit except via this function. Clearing | 948 | * Note: nobody should set this bit except via this function. Clearing |
949 | * directly is allowed. | 949 | * directly is allowed. |
@@ -1504,7 +1504,7 @@ EXPORT_SYMBOL(tty_hangup); | |||
1504 | * | 1504 | * |
1505 | * The user has asked via system call for the terminal to be hung up. | 1505 | * The user has asked via system call for the terminal to be hung up. |
1506 | * We do this synchronously so that when the syscall returns the process | 1506 | * We do this synchronously so that when the syscall returns the process |
1507 | * is complete. That guarantee is neccessary for security reasons. | 1507 | * is complete. That guarantee is necessary for security reasons. |
1508 | */ | 1508 | */ |
1509 | 1509 | ||
1510 | void tty_vhangup(struct tty_struct * tty) | 1510 | void tty_vhangup(struct tty_struct * tty) |
@@ -1691,7 +1691,7 @@ EXPORT_SYMBOL(stop_tty); | |||
1691 | * @tty: tty to start | 1691 | * @tty: tty to start |
1692 | * | 1692 | * |
1693 | * Start a tty that has been stopped if at all possible. Perform | 1693 | * Start a tty that has been stopped if at all possible. Perform |
1694 | * any neccessary wakeups and propagate the TIOCPKT status. If this | 1694 | * any necessary wakeups and propagate the TIOCPKT status. If this |
1695 | * is the tty was previous stopped and is being started then the | 1695 | * is the tty was previous stopped and is being started then the |
1696 | * driver start method is invoked and the line discipline woken. | 1696 | * driver start method is invoked and the line discipline woken. |
1697 | * | 1697 | * |
@@ -2877,7 +2877,7 @@ static int tty_fasync(int fd, struct file * filp, int on) | |||
2877 | * @tty: tty to fake input into | 2877 | * @tty: tty to fake input into |
2878 | * @p: pointer to character | 2878 | * @p: pointer to character |
2879 | * | 2879 | * |
2880 | * Fake input to a tty device. Does the neccessary locking and | 2880 | * Fake input to a tty device. Does the necessary locking and |
2881 | * input management. | 2881 | * input management. |
2882 | * | 2882 | * |
2883 | * FIXME: does not honour flow control ?? | 2883 | * FIXME: does not honour flow control ?? |
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c index 0def089cc1f2..7a003504c265 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/char/tty_ioctl.c | |||
@@ -444,7 +444,7 @@ static void change_termios(struct tty_struct * tty, struct ktermios * new_termio | |||
444 | * @arg: user data | 444 | * @arg: user data |
445 | * @opt: option information | 445 | * @opt: option information |
446 | * | 446 | * |
447 | * Helper function to prepare termios data and run neccessary other | 447 | * Helper function to prepare termios data and run necessary other |
448 | * functions before using change_termios to do the actual changes. | 448 | * functions before using change_termios to do the actual changes. |
449 | * | 449 | * |
450 | * Locking: | 450 | * Locking: |
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 1fa57947bca0..b463cef2de63 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -565,7 +565,7 @@ typedef struct os_dat_s { | |||
565 | * The following parameter is used to select the point in the internal | 565 | * The following parameter is used to select the point in the internal |
566 | * tape fifo in which we will start to refill the buffer. Decreasing | 566 | * tape fifo in which we will start to refill the buffer. Decreasing |
567 | * the following parameter will improve the system's latency and | 567 | * the following parameter will improve the system's latency and |
568 | * interactive response, while using a high value might improve sytem | 568 | * interactive response, while using a high value might improve system |
569 | * throughput. | 569 | * throughput. |
570 | */ | 570 | */ |
571 | #define IDETAPE_FIFO_THRESHOLD 2 | 571 | #define IDETAPE_FIFO_THRESHOLD 2 |
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c index ec45b7247209..08e820e89ae2 100644 --- a/drivers/ide/pci/it821x.c +++ b/drivers/ide/pci/it821x.c | |||
@@ -95,7 +95,7 @@ struct it821x_dev | |||
95 | 95 | ||
96 | /* | 96 | /* |
97 | * We allow users to force the card into non raid mode without | 97 | * We allow users to force the card into non raid mode without |
98 | * flashing the alternative BIOS. This is also neccessary right now | 98 | * flashing the alternative BIOS. This is also necessary right now |
99 | * for embedded platforms that cannot run a PC BIOS but are using this | 99 | * for embedded platforms that cannot run a PC BIOS but are using this |
100 | * device. | 100 | * device. |
101 | */ | 101 | */ |
@@ -564,7 +564,7 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif) | |||
564 | 564 | ||
565 | /* | 565 | /* |
566 | * Not in the docs but according to the reference driver | 566 | * Not in the docs but according to the reference driver |
567 | * this is neccessary. | 567 | * this is necessary. |
568 | */ | 568 | */ |
569 | 569 | ||
570 | pci_read_config_byte(hwif->pci_dev, 0x08, &conf); | 570 | pci_read_config_byte(hwif->pci_dev, 0x08, &conf); |
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 689786df1ede..1353afb10a4d 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * | 26 | * |
27 | * If you have strange problems with nVidia chipset systems please | 27 | * If you have strange problems with nVidia chipset systems please |
28 | * see the SI support documentation and update your system BIOS | 28 | * see the SI support documentation and update your system BIOS |
29 | * if neccessary | 29 | * if necessary |
30 | * | 30 | * |
31 | * The Dell DRAC4 has some interesting features including effectively hot | 31 | * The Dell DRAC4 has some interesting features including effectively hot |
32 | * unplugging/replugging the virtual CD interface when the DRAC is reset. | 32 | * unplugging/replugging the virtual CD interface when the DRAC is reset. |
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 64fee90bb68b..4a5849b55197 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
@@ -112,7 +112,7 @@ static void clone_init(struct dm_crypt_io *, struct bio *); | |||
112 | * Different IV generation algorithms: | 112 | * Different IV generation algorithms: |
113 | * | 113 | * |
114 | * plain: the initial vector is the 32-bit little-endian version of the sector | 114 | * plain: the initial vector is the 32-bit little-endian version of the sector |
115 | * number, padded with zeros if neccessary. | 115 | * number, padded with zeros if necessary. |
116 | * | 116 | * |
117 | * essiv: "encrypted sector|salt initial vector", the sector number is | 117 | * essiv: "encrypted sector|salt initial vector", the sector number is |
118 | * encrypted with the bulk cipher using a salt as key. The salt | 118 | * encrypted with the bulk cipher using a salt as key. The salt |
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c index eca602d9b3de..85e36a1d6d78 100644 --- a/drivers/media/dvb/bt8xx/bt878.c +++ b/drivers/media/dvb/bt8xx/bt878.c | |||
@@ -280,7 +280,7 @@ static irqreturn_t bt878_irq(int irq, void *dev_id) | |||
280 | if (!(astat = (stat & mask))) | 280 | if (!(astat = (stat & mask))) |
281 | return IRQ_NONE; /* this interrupt is not for me */ | 281 | return IRQ_NONE; /* this interrupt is not for me */ |
282 | /* dprintk("bt878(%d) debug: irq count %d, stat 0x%8.8x, mask 0x%8.8x\n",bt->nr,count,stat,mask); */ | 282 | /* dprintk("bt878(%d) debug: irq count %d, stat 0x%8.8x, mask 0x%8.8x\n",bt->nr,count,stat,mask); */ |
283 | btwrite(astat, BT878_AINT_STAT); /* try to clear interupt condition */ | 283 | btwrite(astat, BT878_AINT_STAT); /* try to clear interrupt condition */ |
284 | 284 | ||
285 | 285 | ||
286 | if (astat & (BT878_ASCERR | BT878_AOCERR)) { | 286 | if (astat & (BT878_ASCERR | BT878_AOCERR)) { |
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index 288e79f2cb0f..7902ae1d9a18 100644 --- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | |||
@@ -128,7 +128,7 @@ struct ttusb { | |||
128 | struct dvb_frontend* fe; | 128 | struct dvb_frontend* fe; |
129 | }; | 129 | }; |
130 | 130 | ||
131 | /* ugly workaround ... don't know why it's neccessary to read */ | 131 | /* ugly workaround ... don't know why it's necessary to read */ |
132 | /* all result codes. */ | 132 | /* all result codes. */ |
133 | 133 | ||
134 | #define DEBUG 0 | 134 | #define DEBUG 0 |
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index dd6a7d68b07f..3162223a2ff5 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -4709,18 +4709,18 @@ adtvk503_audio(struct bttv *btv, struct video_audio *v, int set) | |||
4709 | * | 4709 | * |
4710 | * The board hardwire Y0 (xpoint) to MUX1 and MUXOUT to Yin. | 4710 | * The board hardwire Y0 (xpoint) to MUX1 and MUXOUT to Yin. |
4711 | * GPIO pins are wired as: | 4711 | * GPIO pins are wired as: |
4712 | * GPIO[0:3] - AX[0:3] (xpoint) - P1[0:3] (microcontroler) | 4712 | * GPIO[0:3] - AX[0:3] (xpoint) - P1[0:3] (microcontroller) |
4713 | * GPIO[4:6] - AY[0:2] (xpoint) - P1[4:6] (microcontroler) | 4713 | * GPIO[4:6] - AY[0:2] (xpoint) - P1[4:6] (microcontroller) |
4714 | * GPIO[7] - DATA (xpoint) - P1[7] (microcontroler) | 4714 | * GPIO[7] - DATA (xpoint) - P1[7] (microcontroller) |
4715 | * GPIO[8] - - P3[5] (microcontroler) | 4715 | * GPIO[8] - - P3[5] (microcontroller) |
4716 | * GPIO[9] - RESET (xpoint) - P3[6] (microcontroler) | 4716 | * GPIO[9] - RESET (xpoint) - P3[6] (microcontroller) |
4717 | * GPIO[10] - STROBE (xpoint) - P3[7] (microcontroler) | 4717 | * GPIO[10] - STROBE (xpoint) - P3[7] (microcontroller) |
4718 | * GPINTR - - P3[4] (microcontroler) | 4718 | * GPINTR - - P3[4] (microcontroller) |
4719 | * | 4719 | * |
4720 | * The microcontroler is a 80C32 like. It should be possible to change xpoint | 4720 | * The microcontroller is a 80C32 like. It should be possible to change xpoint |
4721 | * configuration either directly (as we are doing) or using the microcontroler | 4721 | * configuration either directly (as we are doing) or using the microcontroller |
4722 | * which is also wired to I2C interface. I have no further info on the | 4722 | * which is also wired to I2C interface. I have no further info on the |
4723 | * microcontroler features, one would need to disassembly the firmware. | 4723 | * microcontroller features, one would need to disassembly the firmware. |
4724 | * note: the vendor refused to give any information on this product, all | 4724 | * note: the vendor refused to give any information on this product, all |
4725 | * that stuff was found using a multimeter! :) | 4725 | * that stuff was found using a multimeter! :) |
4726 | */ | 4726 | */ |
@@ -4788,7 +4788,7 @@ static void tibetCS16_init(struct bttv *btv) | |||
4788 | * The analog switch is controlled by the "master", but the detection order | 4788 | * The analog switch is controlled by the "master", but the detection order |
4789 | * of the four BT878A chips is in an order which I just don't understand. | 4789 | * of the four BT878A chips is in an order which I just don't understand. |
4790 | * The "master" is actually the second controller to be detected. The | 4790 | * The "master" is actually the second controller to be detected. The |
4791 | * logic on the board uses logical numbers for the 4 controlers, but | 4791 | * logic on the board uses logical numbers for the 4 controllers, but |
4792 | * those numbers are different from the detection sequence. When working | 4792 | * those numbers are different from the detection sequence. When working |
4793 | * with the analog switch, we need to "map" from the detection sequence | 4793 | * with the analog switch, we need to "map" from the detection sequence |
4794 | * over to the board's logical controller number. This mapping sequence | 4794 | * over to the board's logical controller number. This mapping sequence |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index b8d5327c438d..e467682aabd7 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -907,7 +907,7 @@ static int em28xx_set_fmt(struct em28xx *dev, unsigned int cmd, struct v4l2_form | |||
907 | 907 | ||
908 | /* stop io in case it is already in progress */ | 908 | /* stop io in case it is already in progress */ |
909 | if (dev->stream == STREAM_ON) { | 909 | if (dev->stream == STREAM_ON) { |
910 | em28xx_videodbg("VIDIOC_SET_FMT: interupting stream\n"); | 910 | em28xx_videodbg("VIDIOC_SET_FMT: interrupting stream\n"); |
911 | if ((ret = em28xx_stream_interrupt(dev))) | 911 | if ((ret = em28xx_stream_interrupt(dev))) |
912 | return ret; | 912 | return ret; |
913 | } | 913 | } |
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 1bfbb87e5793..fc70fbab7beb 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
@@ -277,7 +277,7 @@ static void do_sony_laptop_release_key(struct work_struct *work) | |||
277 | static DECLARE_WORK(sony_laptop_release_key_work, | 277 | static DECLARE_WORK(sony_laptop_release_key_work, |
278 | do_sony_laptop_release_key); | 278 | do_sony_laptop_release_key); |
279 | 279 | ||
280 | /* forward event to the input subsytem */ | 280 | /* forward event to the input subsystem */ |
281 | static void sony_laptop_report_input_event(u8 event) | 281 | static void sony_laptop_report_input_event(u8 event) |
282 | { | 282 | { |
283 | struct input_dev *jog_dev = sony_laptop_input.jog_dev; | 283 | struct input_dev *jog_dev = sony_laptop_input.jog_dev; |
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 1cc74ec88a58..eebf5bb2b03a 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -1111,7 +1111,7 @@ static struct net_device_stats *amd8111e_get_stats(struct net_device * dev) | |||
1111 | 1111 | ||
1112 | return new_stats; | 1112 | return new_stats; |
1113 | } | 1113 | } |
1114 | /* This function recalculate the interupt coalescing mode on every interrupt | 1114 | /* This function recalculate the interrupt coalescing mode on every interrupt |
1115 | according to the datarate and the packet rate. | 1115 | according to the datarate and the packet rate. |
1116 | */ | 1116 | */ |
1117 | static int amd8111e_calc_coalesce(struct net_device *dev) | 1117 | static int amd8111e_calc_coalesce(struct net_device *dev) |
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 185f98e3964c..504b7ce2747d 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c | |||
@@ -542,7 +542,7 @@ static struct { | |||
542 | static int num_ifs; | 542 | static int num_ifs; |
543 | 543 | ||
544 | /* | 544 | /* |
545 | * Setup the base address and interupt of the Au1xxx ethernet macs | 545 | * Setup the base address and interrupt of the Au1xxx ethernet macs |
546 | * based on cpu type and whether the interface is enabled in sys_pinfunc | 546 | * based on cpu type and whether the interface is enabled in sys_pinfunc |
547 | * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0. | 547 | * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0. |
548 | */ | 548 | */ |
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 80c0c8c415ed..855dc10ffa1b 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c | |||
@@ -55,7 +55,7 @@ static int expected_refcount = -1; | |||
55 | static struct class *netdev_class; | 55 | static struct class *netdev_class; |
56 | /*--------------------------- Data Structures -----------------------------*/ | 56 | /*--------------------------- Data Structures -----------------------------*/ |
57 | 57 | ||
58 | /* Bonding sysfs lock. Why can't we just use the subsytem lock? | 58 | /* Bonding sysfs lock. Why can't we just use the subsystem lock? |
59 | * Because kobject_register tries to acquire the subsystem lock. If | 59 | * Because kobject_register tries to acquire the subsystem lock. If |
60 | * we already hold the lock (which we would if the user was creating | 60 | * we already hold the lock (which we would if the user was creating |
61 | * a new bond through the sysfs interface), we deadlock. | 61 | * a new bond through the sysfs interface), we deadlock. |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 64f35e20fd48..3dbaec680b46 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1324,7 +1324,7 @@ static inline int e100_exec_cb_wait(struct nic *nic, struct sk_buff *skb, | |||
1324 | if (!--counter) break; | 1324 | if (!--counter) break; |
1325 | } | 1325 | } |
1326 | 1326 | ||
1327 | /* ack any interupts, something could have been set */ | 1327 | /* ack any interrupts, something could have been set */ |
1328 | iowrite8(~0, &nic->csr->scb.stat_ack); | 1328 | iowrite8(~0, &nic->csr->scb.stat_ack); |
1329 | 1329 | ||
1330 | /* if the command failed, or is not OK, notify and return */ | 1330 | /* if the command failed, or is not OK, notify and return */ |
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index a82d8f98383d..1257e1a7e819 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c | |||
@@ -595,7 +595,7 @@ toshoboe_startchip (struct toshoboe_cb *self) | |||
595 | OUTB ((physaddr >> 18) & 0xff, OBOE_RING_BASE1); | 595 | OUTB ((physaddr >> 18) & 0xff, OBOE_RING_BASE1); |
596 | OUTB ((physaddr >> 26) & 0x3f, OBOE_RING_BASE2); | 596 | OUTB ((physaddr >> 26) & 0x3f, OBOE_RING_BASE2); |
597 | 597 | ||
598 | /*Enable DMA controler in byte mode and RX */ | 598 | /*Enable DMA controller in byte mode and RX */ |
599 | OUTB (CONFIG0H_DMA_ON, OBOE_CONFIG0H); | 599 | OUTB (CONFIG0H_DMA_ON, OBOE_CONFIG0H); |
600 | 600 | ||
601 | /* Start up the clocks */ | 601 | /* Start up the clocks */ |
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 7c60df46fc65..dd18af0ce676 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
@@ -1223,7 +1223,7 @@ static irqreturn_t smc911x_interrupt(int irq, void *dev_id) | |||
1223 | } | 1223 | } |
1224 | #endif | 1224 | #endif |
1225 | 1225 | ||
1226 | /* Handle PHY interupt condition */ | 1226 | /* Handle PHY interrupt condition */ |
1227 | if (status & INT_STS_PHY_INT_) { | 1227 | if (status & INT_STS_PHY_INT_) { |
1228 | DBG(SMC_DEBUG_MISC, "%s: PHY irq\n", dev->name); | 1228 | DBG(SMC_DEBUG_MISC, "%s: PHY irq\n", dev->name); |
1229 | smc911x_phy_interrupt(dev); | 1229 | smc911x_phy_interrupt(dev); |
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 571060a3c91e..bccae7e5c6ad 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
@@ -1639,7 +1639,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg) | |||
1639 | 1639 | ||
1640 | /** | 1640 | /** |
1641 | * spider_net_interrupt - interrupt handler for spider_net | 1641 | * spider_net_interrupt - interrupt handler for spider_net |
1642 | * @irq: interupt number | 1642 | * @irq: interrupt number |
1643 | * @ptr: pointer to net_device | 1643 | * @ptr: pointer to net_device |
1644 | * @regs: PU registers | 1644 | * @regs: PU registers |
1645 | * | 1645 | * |
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index 8038f2882c9b..d887c05588d5 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
@@ -1654,7 +1654,7 @@ tc35815_rx(struct net_device *dev) | |||
1654 | panic_queues(dev); | 1654 | panic_queues(dev); |
1655 | } | 1655 | } |
1656 | #endif | 1656 | #endif |
1657 | /* pass BD to controler */ | 1657 | /* pass BD to controller */ |
1658 | #ifndef TC35815_USE_PACKEDBUFFER | 1658 | #ifndef TC35815_USE_PACKEDBUFFER |
1659 | if (!lp->rx_skbs[curid].skb) { | 1659 | if (!lp->rx_skbs[curid].skb) { |
1660 | lp->rx_skbs[curid].skb = | 1660 | lp->rx_skbs[curid].skb = |
@@ -1694,7 +1694,7 @@ tc35815_rx(struct net_device *dev) | |||
1694 | } | 1694 | } |
1695 | #endif | 1695 | #endif |
1696 | for (i = 0; i < (bd_count + 1) / 2 + 1; i++) { | 1696 | for (i = 0; i < (bd_count + 1) / 2 + 1; i++) { |
1697 | /* pass FD to controler */ | 1697 | /* pass FD to controller */ |
1698 | #ifdef DEBUG | 1698 | #ifdef DEBUG |
1699 | lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead); | 1699 | lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead); |
1700 | #else | 1700 | #else |
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 4ae05799ac44..5c4a92de9a07 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -1648,7 +1648,7 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx) | |||
1648 | * | 1648 | * |
1649 | * Scan the queues looking for transmitted packets that | 1649 | * Scan the queues looking for transmitted packets that |
1650 | * we can complete and clean up. Update any statistics as | 1650 | * we can complete and clean up. Update any statistics as |
1651 | * neccessary/ | 1651 | * necessary/ |
1652 | */ | 1652 | */ |
1653 | 1653 | ||
1654 | static int velocity_tx_srv(struct velocity_info *vptr, u32 status) | 1654 | static int velocity_tx_srv(struct velocity_info *vptr, u32 status) |
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index 8b9d68f6e016..69402f3a1453 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c | |||
@@ -2001,7 +2001,7 @@ dasd_3990_erp_compound_code(struct dasd_ccw_req * erp, char *sense) | |||
2001 | switch (sense[28]) { | 2001 | switch (sense[28]) { |
2002 | case 0x17: | 2002 | case 0x17: |
2003 | /* issue a Diagnostic Control command with an | 2003 | /* issue a Diagnostic Control command with an |
2004 | * Inhibit Write subcommand and controler modifier */ | 2004 | * Inhibit Write subcommand and controller modifier */ |
2005 | erp = dasd_3990_erp_DCTL(erp, 0x20); | 2005 | erp = dasd_3990_erp_DCTL(erp, 0x20); |
2006 | break; | 2006 | break; |
2007 | 2007 | ||
diff --git a/drivers/s390/char/sclp_cpi.c b/drivers/s390/char/sclp_cpi.c index 29fe2a5ec2fe..82a13d9fdfe4 100644 --- a/drivers/s390/char/sclp_cpi.c +++ b/drivers/s390/char/sclp_cpi.c | |||
@@ -157,7 +157,7 @@ cpi_prepare_req(void) | |||
157 | sclp_ascebc_str(evb->system_name, CPI_LENGTH_SYSTEM_NAME); | 157 | sclp_ascebc_str(evb->system_name, CPI_LENGTH_SYSTEM_NAME); |
158 | EBC_TOUPPER(evb->system_name, CPI_LENGTH_SYSTEM_NAME); | 158 | EBC_TOUPPER(evb->system_name, CPI_LENGTH_SYSTEM_NAME); |
159 | 159 | ||
160 | /* set sytem level */ | 160 | /* set system level */ |
161 | evb->system_level = LINUX_VERSION_CODE; | 161 | evb->system_level = LINUX_VERSION_CODE; |
162 | 162 | ||
163 | /* set sysplex name */ | 163 | /* set sysplex name */ |
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 03b51025a8f4..9abba8b90f70 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h | |||
@@ -1526,7 +1526,7 @@ struct aac_mntent { | |||
1526 | __le32 capacityhigh; | 1526 | __le32 capacityhigh; |
1527 | }; | 1527 | }; |
1528 | 1528 | ||
1529 | #define FSCS_NOTCLEAN 0x0001 /* fsck is neccessary before mounting */ | 1529 | #define FSCS_NOTCLEAN 0x0001 /* fsck is necessary before mounting */ |
1530 | #define FSCS_READONLY 0x0002 /* possible result of broken mirror */ | 1530 | #define FSCS_READONLY 0x0002 /* possible result of broken mirror */ |
1531 | #define FSCS_HIDDEN 0x0004 /* should be ignored - set during a clear */ | 1531 | #define FSCS_HIDDEN 0x0004 /* should be ignored - set during a clear */ |
1532 | 1532 | ||
diff --git a/drivers/scsi/aic7xxx/cam.h b/drivers/scsi/aic7xxx/cam.h index 26f17e3fc45c..687aef6ef185 100644 --- a/drivers/scsi/aic7xxx/cam.h +++ b/drivers/scsi/aic7xxx/cam.h | |||
@@ -48,7 +48,7 @@ typedef enum { | |||
48 | CAM_REQ_ABORTED, /* CCB request aborted by the host */ | 48 | CAM_REQ_ABORTED, /* CCB request aborted by the host */ |
49 | CAM_UA_ABORT, /* Unable to abort CCB request */ | 49 | CAM_UA_ABORT, /* Unable to abort CCB request */ |
50 | CAM_REQ_CMP_ERR, /* CCB request completed with an error */ | 50 | CAM_REQ_CMP_ERR, /* CCB request completed with an error */ |
51 | CAM_BUSY, /* CAM subsytem is busy */ | 51 | CAM_BUSY, /* CAM subsystem is busy */ |
52 | CAM_REQ_INVALID, /* CCB request was invalid */ | 52 | CAM_REQ_INVALID, /* CCB request was invalid */ |
53 | CAM_PATH_INVALID, /* Supplied Path ID is invalid */ | 53 | CAM_PATH_INVALID, /* Supplied Path ID is invalid */ |
54 | CAM_SEL_TIMEOUT, /* Target Selection Timeout */ | 54 | CAM_SEL_TIMEOUT, /* Target Selection Timeout */ |
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index fd42d4789202..a9def6e1d30e 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c | |||
@@ -1808,12 +1808,12 @@ static irqreturn_t dc395x_interrupt(int irq, void *dev_id) | |||
1808 | irqreturn_t handled = IRQ_NONE; | 1808 | irqreturn_t handled = IRQ_NONE; |
1809 | 1809 | ||
1810 | /* | 1810 | /* |
1811 | * Check for pending interupt | 1811 | * Check for pending interrupt |
1812 | */ | 1812 | */ |
1813 | scsi_status = DC395x_read16(acb, TRM_S1040_SCSI_STATUS); | 1813 | scsi_status = DC395x_read16(acb, TRM_S1040_SCSI_STATUS); |
1814 | dma_status = DC395x_read8(acb, TRM_S1040_DMA_STATUS); | 1814 | dma_status = DC395x_read8(acb, TRM_S1040_DMA_STATUS); |
1815 | if (scsi_status & SCSIINTERRUPT) { | 1815 | if (scsi_status & SCSIINTERRUPT) { |
1816 | /* interupt pending - let's process it! */ | 1816 | /* interrupt pending - let's process it! */ |
1817 | dc395x_handle_interrupt(acb, scsi_status); | 1817 | dc395x_handle_interrupt(acb, scsi_status); |
1818 | handled = IRQ_HANDLED; | 1818 | handled = IRQ_HANDLED; |
1819 | } | 1819 | } |
@@ -4579,7 +4579,7 @@ static void adapter_uninit_chip(struct AdapterCtlBlk *acb) | |||
4579 | if (acb->config & HCC_SCSI_RESET) | 4579 | if (acb->config & HCC_SCSI_RESET) |
4580 | reset_scsi_bus(acb); | 4580 | reset_scsi_bus(acb); |
4581 | 4581 | ||
4582 | /* clear any pending interupt state */ | 4582 | /* clear any pending interrupt state */ |
4583 | DC395x_read8(acb, TRM_S1040_SCSI_INTSTATUS); | 4583 | DC395x_read8(acb, TRM_S1040_SCSI_INTSTATUS); |
4584 | } | 4584 | } |
4585 | 4585 | ||
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index e4e4c6a39ed6..78779209ac89 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
@@ -427,7 +427,7 @@ megaraid_exit(void) | |||
427 | * @id : pci device id of the class of controllers | 427 | * @id : pci device id of the class of controllers |
428 | * | 428 | * |
429 | * This routine should be called whenever a new adapter is detected by the | 429 | * This routine should be called whenever a new adapter is detected by the |
430 | * PCI hotplug susbsytem. | 430 | * PCI hotplug susbsystem. |
431 | */ | 431 | */ |
432 | static int __devinit | 432 | static int __devinit |
433 | megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | 433 | megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) |
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c index 1e29f51d596b..d692c713416a 100644 --- a/drivers/scsi/qla4xxx/ql4_init.c +++ b/drivers/scsi/qla4xxx/ql4_init.c | |||
@@ -1006,7 +1006,7 @@ int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a) | |||
1006 | * qla4xxx_start_firmware - starts qla4xxx firmware | 1006 | * qla4xxx_start_firmware - starts qla4xxx firmware |
1007 | * @ha: Pointer to host adapter structure. | 1007 | * @ha: Pointer to host adapter structure. |
1008 | * | 1008 | * |
1009 | * This routine performs the neccessary steps to start the firmware for | 1009 | * This routine performs the necessary steps to start the firmware for |
1010 | * the QLA4010 adapter. | 1010 | * the QLA4010 adapter. |
1011 | **/ | 1011 | **/ |
1012 | static int qla4xxx_start_firmware(struct scsi_qla_host *ha) | 1012 | static int qla4xxx_start_firmware(struct scsi_qla_host *ha) |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 69f542c4923c..a69b155f39a2 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -676,7 +676,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo) | |||
676 | * success as well). Returns a negated errno value in case of error. | 676 | * success as well). Returns a negated errno value in case of error. |
677 | * | 677 | * |
678 | * Note: most ioctls are forward onto the block subsystem or further | 678 | * Note: most ioctls are forward onto the block subsystem or further |
679 | * down in the scsi subsytem. | 679 | * down in the scsi subsystem. |
680 | **/ | 680 | **/ |
681 | static int sd_ioctl(struct inode * inode, struct file * filp, | 681 | static int sd_ioctl(struct inode * inode, struct file * filp, |
682 | unsigned int cmd, unsigned long arg) | 682 | unsigned int cmd, unsigned long arg) |
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c index e9aba932f217..7051e6c5edc3 100644 --- a/drivers/spi/mpc52xx_psc_spi.c +++ b/drivers/spi/mpc52xx_psc_spi.c | |||
@@ -181,7 +181,7 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi, | |||
181 | } | 181 | } |
182 | 182 | ||
183 | 183 | ||
184 | /* enable interupts and wait for wake up | 184 | /* enable interrupts and wait for wake up |
185 | * if just one byte is expected the Rx FIFO genererates no | 185 | * if just one byte is expected the Rx FIFO genererates no |
186 | * FFULL interrupt, so activate the RxRDY interrupt | 186 | * FFULL interrupt, so activate the RxRDY interrupt |
187 | */ | 187 | */ |
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 0dcb4164dc83..735db4aec831 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c | |||
@@ -451,7 +451,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf) | |||
451 | 451 | ||
452 | /* Some boards (mostly VIA?) report bogus overcurrent indications, | 452 | /* Some boards (mostly VIA?) report bogus overcurrent indications, |
453 | * causing massive log spam unless we completely ignore them. It | 453 | * causing massive log spam unless we completely ignore them. It |
454 | * may be relevant that VIA VT8235 controlers, where PORT_POWER is | 454 | * may be relevant that VIA VT8235 controllers, where PORT_POWER is |
455 | * always set, seem to clear PORT_OCC and PORT_CSC when writing to | 455 | * always set, seem to clear PORT_OCC and PORT_CSC when writing to |
456 | * PORT_POWER; that's surprising, but maybe within-spec. | 456 | * PORT_POWER; that's surprising, but maybe within-spec. |
457 | */ | 457 | */ |
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index 94d859aa73f8..ba370c56172c 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c | |||
@@ -1556,7 +1556,7 @@ sl811h_start(struct usb_hcd *hcd) | |||
1556 | hcd->power_budget = sl811->board->power * 2; | 1556 | hcd->power_budget = sl811->board->power * 2; |
1557 | } | 1557 | } |
1558 | 1558 | ||
1559 | /* enable power and interupts */ | 1559 | /* enable power and interrupts */ |
1560 | port_power(sl811, 1); | 1560 | port_power(sl811, 1); |
1561 | 1561 | ||
1562 | return 0; | 1562 | return 0; |
diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c index df0b8535de84..df25ecc418af 100644 --- a/fs/jfs/jfs_dtree.c +++ b/fs/jfs/jfs_dtree.c | |||
@@ -773,7 +773,7 @@ int dtSearch(struct inode *ip, struct component_name * key, ino_t * data, | |||
773 | getChild: | 773 | getChild: |
774 | /* update max. number of pages to split */ | 774 | /* update max. number of pages to split */ |
775 | if (BT_STACK_FULL(btstack)) { | 775 | if (BT_STACK_FULL(btstack)) { |
776 | /* Something's corrupted, mark filesytem dirty so | 776 | /* Something's corrupted, mark filesystem dirty so |
777 | * chkdsk will fix it. | 777 | * chkdsk will fix it. |
778 | */ | 778 | */ |
779 | jfs_error(sb, "stack overrun in dtSearch!"); | 779 | jfs_error(sb, "stack overrun in dtSearch!"); |
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c index 014e73978dac..3094ddb7a254 100644 --- a/fs/ocfs2/dcache.c +++ b/fs/ocfs2/dcache.c | |||
@@ -376,7 +376,7 @@ out: | |||
376 | * directory locks. The dentries have already been deleted on other | 376 | * directory locks. The dentries have already been deleted on other |
377 | * nodes via ocfs2_remote_dentry_delete(). | 377 | * nodes via ocfs2_remote_dentry_delete(). |
378 | * | 378 | * |
379 | * Normally, the VFS handles the d_move() for the file sytem, after | 379 | * Normally, the VFS handles the d_move() for the file system, after |
380 | * the ->rename() callback. OCFS2 wants to handle this internally, so | 380 | * the ->rename() callback. OCFS2 wants to handle this internally, so |
381 | * the new lock can be created atomically with respect to the cluster. | 381 | * the new lock can be created atomically with respect to the cluster. |
382 | */ | 382 | */ |
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 57adfe90d5ae..98c3781bc069 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
@@ -319,7 +319,7 @@ static int finish_unfinished(struct super_block *s) | |||
319 | 319 | ||
320 | /* to protect file being unlinked from getting lost we "safe" link files | 320 | /* to protect file being unlinked from getting lost we "safe" link files |
321 | being unlinked. This link will be deleted in the same transaction with last | 321 | being unlinked. This link will be deleted in the same transaction with last |
322 | item of file. mounting the filesytem we scan all these links and remove | 322 | item of file. mounting the filesystem we scan all these links and remove |
323 | files which almost got lost */ | 323 | files which almost got lost */ |
324 | void add_save_link(struct reiserfs_transaction_handle *th, | 324 | void add_save_link(struct reiserfs_transaction_handle *th, |
325 | struct inode *inode, int truncate) | 325 | struct inode *inode, int truncate) |
diff --git a/fs/super.c b/fs/super.c index d28fde7e1cfb..ed1b93ca213c 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -417,7 +417,7 @@ restart: | |||
417 | } | 417 | } |
418 | 418 | ||
419 | /* | 419 | /* |
420 | * Call the ->sync_fs super_op against all filesytems which are r/w and | 420 | * Call the ->sync_fs super_op against all filesystems which are r/w and |
421 | * which implement it. | 421 | * which implement it. |
422 | * | 422 | * |
423 | * This operation is careful to avoid the livelock which could easily happen | 423 | * This operation is careful to avoid the livelock which could easily happen |
@@ -425,7 +425,7 @@ restart: | |||
425 | * is used only here. We set it against all filesystems and then clear it as | 425 | * is used only here. We set it against all filesystems and then clear it as |
426 | * we sync them. So redirtied filesystems are skipped. | 426 | * we sync them. So redirtied filesystems are skipped. |
427 | * | 427 | * |
428 | * But if process A is currently running sync_filesytems and then process B | 428 | * But if process A is currently running sync_filesystems and then process B |
429 | * calls sync_filesystems as well, process B will set all the s_need_sync_fs | 429 | * calls sync_filesystems as well, process B will set all the s_need_sync_fs |
430 | * flags again, which will cause process A to resync everything. Fix that with | 430 | * flags again, which will cause process A to resync everything. Fix that with |
431 | * a local mutex. | 431 | * a local mutex. |
diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h index 678134bf2475..1eb8aac43228 100644 --- a/include/asm-arm/dma-mapping.h +++ b/include/asm-arm/dma-mapping.h | |||
@@ -401,7 +401,7 @@ extern void dma_sync_sg_for_device(struct device*, struct scatterlist*, int, enu | |||
401 | * | 401 | * |
402 | * On the SA-1111, a bug limits DMA to only certain regions of RAM. | 402 | * On the SA-1111, a bug limits DMA to only certain regions of RAM. |
403 | * On the IXP425, the PCI inbound window is 64MB (256MB total RAM) | 403 | * On the IXP425, the PCI inbound window is 64MB (256MB total RAM) |
404 | * On some ADI engineering sytems, PCI inbound window is 32MB (12MB total RAM) | 404 | * On some ADI engineering systems, PCI inbound window is 32MB (12MB total RAM) |
405 | * | 405 | * |
406 | * The following are helper functions used by the dmabounce subystem | 406 | * The following are helper functions used by the dmabounce subystem |
407 | * | 407 | * |
diff --git a/include/asm-mips/pci/bridge.h b/include/asm-mips/pci/bridge.h index b84feebf2cef..5f4b9d4e4114 100644 --- a/include/asm-mips/pci/bridge.h +++ b/include/asm-mips/pci/bridge.h | |||
@@ -538,7 +538,7 @@ typedef struct bridge_err_cmdword_s { | |||
538 | BRIDGE_ISR_PMU_ESIZE_FAULT) | 538 | BRIDGE_ISR_PMU_ESIZE_FAULT) |
539 | 539 | ||
540 | /* | 540 | /* |
541 | * List of Errors which are fatal and kill the sytem | 541 | * List of Errors which are fatal and kill the system |
542 | */ | 542 | */ |
543 | #define BRIDGE_ISR_ERROR_FATAL \ | 543 | #define BRIDGE_ISR_ERROR_FATAL \ |
544 | ((BRIDGE_ISR_XTALK_ERROR & ~BRIDGE_ISR_XREAD_REQ_TIMEOUT)|\ | 544 | ((BRIDGE_ISR_XTALK_ERROR & ~BRIDGE_ISR_XREAD_REQ_TIMEOUT)|\ |
diff --git a/include/asm-sh/se7751.h b/include/asm-sh/se7751.h index 02ca9347f043..b36792ac5d66 100644 --- a/include/asm-sh/se7751.h +++ b/include/asm-sh/se7751.h | |||
@@ -36,7 +36,7 @@ | |||
36 | #define PA_LED 0xba000000 /* LED */ | 36 | #define PA_LED 0xba000000 /* LED */ |
37 | #define PA_BCR 0xbb000000 /* FPGA on the MS7751SE01 */ | 37 | #define PA_BCR 0xbb000000 /* FPGA on the MS7751SE01 */ |
38 | 38 | ||
39 | #define PA_MRSHPC 0xb83fffe0 /* MR-SHPC-01 PCMCIA controler */ | 39 | #define PA_MRSHPC 0xb83fffe0 /* MR-SHPC-01 PCMCIA controller */ |
40 | #define PA_MRSHPC_MW1 0xb8400000 /* MR-SHPC-01 memory window base */ | 40 | #define PA_MRSHPC_MW1 0xb8400000 /* MR-SHPC-01 memory window base */ |
41 | #define PA_MRSHPC_MW2 0xb8500000 /* MR-SHPC-01 attribute window base */ | 41 | #define PA_MRSHPC_MW2 0xb8500000 /* MR-SHPC-01 attribute window base */ |
42 | #define PA_MRSHPC_IO 0xb8600000 /* MR-SHPC-01 I/O window base */ | 42 | #define PA_MRSHPC_IO 0xb8600000 /* MR-SHPC-01 I/O window base */ |
diff --git a/include/asm-sh/systemh7751.h b/include/asm-sh/systemh7751.h index b143bb2a2ca7..4161122c84ef 100644 --- a/include/asm-sh/systemh7751.h +++ b/include/asm-sh/systemh7751.h | |||
@@ -36,7 +36,7 @@ | |||
36 | #define PA_LED 0xba000000 /* LED */ | 36 | #define PA_LED 0xba000000 /* LED */ |
37 | #define PA_BCR 0xbb000000 /* FPGA on the MS7751SE01 */ | 37 | #define PA_BCR 0xbb000000 /* FPGA on the MS7751SE01 */ |
38 | 38 | ||
39 | #define PA_MRSHPC 0xb83fffe0 /* MR-SHPC-01 PCMCIA controler */ | 39 | #define PA_MRSHPC 0xb83fffe0 /* MR-SHPC-01 PCMCIA controller */ |
40 | #define PA_MRSHPC_MW1 0xb8400000 /* MR-SHPC-01 memory window base */ | 40 | #define PA_MRSHPC_MW1 0xb8400000 /* MR-SHPC-01 memory window base */ |
41 | #define PA_MRSHPC_MW2 0xb8500000 /* MR-SHPC-01 attribute window base */ | 41 | #define PA_MRSHPC_MW2 0xb8500000 /* MR-SHPC-01 attribute window base */ |
42 | #define PA_MRSHPC_IO 0xb8600000 /* MR-SHPC-01 I/O window base */ | 42 | #define PA_MRSHPC_IO 0xb8600000 /* MR-SHPC-01 I/O window base */ |
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h index efa292a52e7e..56ae438ae510 100644 --- a/include/linux/ipmi_smi.h +++ b/include/linux/ipmi_smi.h | |||
@@ -118,7 +118,7 @@ struct ipmi_smi_handlers | |||
118 | /* Enable/disable firmware maintenance mode. Note that this | 118 | /* Enable/disable firmware maintenance mode. Note that this |
119 | is *not* the modes defined, this is simply an on/off | 119 | is *not* the modes defined, this is simply an on/off |
120 | setting. The message handler does the mode handling. Note | 120 | setting. The message handler does the mode handling. Note |
121 | that this is called from interupt context, so it cannot | 121 | that this is called from interrupt context, so it cannot |
122 | block. */ | 122 | block. */ |
123 | void (*set_maintenance_mode)(void *send_info, int enable); | 123 | void (*set_maintenance_mode)(void *send_info, int enable); |
124 | 124 | ||
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index b2b2c2b0a49b..dabfefb4ffdf 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -412,7 +412,7 @@ static int hrtimer_reprogram(struct hrtimer *timer, | |||
412 | /* | 412 | /* |
413 | * When the callback is running, we do not reprogram the clock event | 413 | * When the callback is running, we do not reprogram the clock event |
414 | * device. The timer callback is either running on a different CPU or | 414 | * device. The timer callback is either running on a different CPU or |
415 | * the callback is executed in the hrtimer_interupt context. The | 415 | * the callback is executed in the hrtimer_interrupt context. The |
416 | * reprogramming is handled either by the softirq, which called the | 416 | * reprogramming is handled either by the softirq, which called the |
417 | * callback or at the end of the hrtimer_interrupt. | 417 | * callback or at the end of the hrtimer_interrupt. |
418 | */ | 418 | */ |
diff --git a/kernel/sched.c b/kernel/sched.c index afe76ec2e7fe..a54bd9dfbedb 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -5146,7 +5146,7 @@ static int __migrate_task_irq(struct task_struct *p, int src_cpu, int dest_cpu) | |||
5146 | } | 5146 | } |
5147 | 5147 | ||
5148 | /* | 5148 | /* |
5149 | * Figure out where task on dead CPU should go, use force if neccessary. | 5149 | * Figure out where task on dead CPU should go, use force if necessary. |
5150 | * NOTE: interrupts should be disabled by the caller | 5150 | * NOTE: interrupts should be disabled by the caller |
5151 | */ | 5151 | */ |
5152 | static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p) | 5152 | static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p) |
@@ -5525,7 +5525,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
5525 | 5525 | ||
5526 | case CPU_ONLINE: | 5526 | case CPU_ONLINE: |
5527 | case CPU_ONLINE_FROZEN: | 5527 | case CPU_ONLINE_FROZEN: |
5528 | /* Strictly unneccessary, as first user will wake it. */ | 5528 | /* Strictly unnecessary, as first user will wake it. */ |
5529 | wake_up_process(cpu_rq(cpu)->migration_thread); | 5529 | wake_up_process(cpu_rq(cpu)->migration_thread); |
5530 | break; | 5530 | break; |
5531 | 5531 | ||
diff --git a/kernel/taskstats.c b/kernel/taskstats.c index 9f360f68aad6..354e74bc17c1 100644 --- a/kernel/taskstats.c +++ b/kernel/taskstats.c | |||
@@ -263,7 +263,7 @@ out: | |||
263 | 263 | ||
264 | stats->version = TASKSTATS_VERSION; | 264 | stats->version = TASKSTATS_VERSION; |
265 | /* | 265 | /* |
266 | * Accounting subsytems can also add calls here to modify | 266 | * Accounting subsystems can also add calls here to modify |
267 | * fields of taskstats. | 267 | * fields of taskstats. |
268 | */ | 268 | */ |
269 | return rc; | 269 | return rc; |
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 2e4eae5b0824..5886147252d0 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c | |||
@@ -126,7 +126,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, | |||
126 | else | 126 | else |
127 | subsystem = kobject_name(&kset->kobj); | 127 | subsystem = kobject_name(&kset->kobj); |
128 | if (!subsystem) { | 128 | if (!subsystem) { |
129 | pr_debug("unset subsytem caused the event to drop!\n"); | 129 | pr_debug("unset subsystem caused the event to drop!\n"); |
130 | return 0; | 130 | return 0; |
131 | } | 131 | } |
132 | 132 | ||
diff --git a/net/irda/discovery.c b/net/irda/discovery.c index af0cea721d2a..80c33f408e3f 100644 --- a/net/irda/discovery.c +++ b/net/irda/discovery.c | |||
@@ -202,7 +202,7 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force) | |||
202 | /* Drop the spinlock before calling the higher layers, as | 202 | /* Drop the spinlock before calling the higher layers, as |
203 | * we can't guarantee they won't call us back and create a | 203 | * we can't guarantee they won't call us back and create a |
204 | * deadlock. We will work on our own private data, so we | 204 | * deadlock. We will work on our own private data, so we |
205 | * don't care to be interupted. - Jean II */ | 205 | * don't care to be interrupted. - Jean II */ |
206 | spin_unlock_irqrestore(&log->hb_spinlock, flags); | 206 | spin_unlock_irqrestore(&log->hb_spinlock, flags); |
207 | 207 | ||
208 | if(buffer == NULL) | 208 | if(buffer == NULL) |
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c index 983058d432dc..a2f5a6ea3895 100644 --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c | |||
@@ -389,7 +389,7 @@ static void iucv_block_cpu(void *data) | |||
389 | * iucv_declare_cpu | 389 | * iucv_declare_cpu |
390 | * @data: unused | 390 | * @data: unused |
391 | * | 391 | * |
392 | * Declare a interupt buffer on this cpu. | 392 | * Declare a interrupt buffer on this cpu. |
393 | */ | 393 | */ |
394 | static void iucv_declare_cpu(void *data) | 394 | static void iucv_declare_cpu(void *data) |
395 | { | 395 | { |
diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c index 8cc324b159e9..856793e8db7a 100644 --- a/net/netfilter/xt_CONNMARK.c +++ b/net/netfilter/xt_CONNMARK.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <linux/ip.h> | 23 | #include <linux/ip.h> |
24 | #include <net/checksum.h> | 24 | #include <net/checksum.h> |
25 | 25 | ||
26 | MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>"); | 26 | MODULE_AUTHOR("Henrik Nordstrom <hno@marasystems.com>"); |
27 | MODULE_DESCRIPTION("IP tables CONNMARK matching module"); | 27 | MODULE_DESCRIPTION("IP tables CONNMARK matching module"); |
28 | MODULE_LICENSE("GPL"); | 28 | MODULE_LICENSE("GPL"); |
29 | MODULE_ALIAS("ipt_CONNMARK"); | 29 | MODULE_ALIAS("ipt_CONNMARK"); |
diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c index 1071fc54d6d3..9f67920af41f 100644 --- a/net/netfilter/xt_connmark.c +++ b/net/netfilter/xt_connmark.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/netfilter/x_tables.h> | 25 | #include <linux/netfilter/x_tables.h> |
26 | #include <linux/netfilter/xt_connmark.h> | 26 | #include <linux/netfilter/xt_connmark.h> |
27 | 27 | ||
28 | MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>"); | 28 | MODULE_AUTHOR("Henrik Nordstrom <hno@marasystems.com>"); |
29 | MODULE_DESCRIPTION("IP tables connmark match module"); | 29 | MODULE_DESCRIPTION("IP tables connmark match module"); |
30 | MODULE_LICENSE("GPL"); | 30 | MODULE_LICENSE("GPL"); |
31 | MODULE_ALIAS("ipt_connmark"); | 31 | MODULE_ALIAS("ipt_connmark"); |
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index e9989610712c..ceda8890ab0e 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c | |||
@@ -55,7 +55,7 @@ | |||
55 | * ppp0..9. | 55 | * ppp0..9. |
56 | * | 56 | * |
57 | * NOTE: Certain meta values depend on other subsystems and are | 57 | * NOTE: Certain meta values depend on other subsystems and are |
58 | * only available if that subsytem is enabled in the kernel. | 58 | * only available if that subsystem is enabled in the kernel. |
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include <linux/module.h> | 61 | #include <linux/module.h> |
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 | */ |
273 | static void | 273 | static 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 | */ |
814 | void snd_opl3_control(void *p, int type, struct snd_midi_channel *chan) | 814 | void 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 |
502 | get the interupt driven case to work efficiently */ | 502 | get 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 |
539 | get the interupt driven case to work efficiently */ | 539 | get 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 | */ |
323 | void | 323 | void |