diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /drivers | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'drivers')
116 files changed, 166 insertions, 171 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index cbfe9ae7a9e5..d9d531cce27f 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -830,7 +830,7 @@ static int acpi_bus_get_flags(struct acpi_device *device) | |||
830 | if (ACPI_SUCCESS(status)) | 830 | if (ACPI_SUCCESS(status)) |
831 | device->flags.wake_capable = 1; | 831 | device->flags.wake_capable = 1; |
832 | 832 | ||
833 | /* TBD: Peformance management */ | 833 | /* TBD: Performance management */ |
834 | 834 | ||
835 | return 0; | 835 | return 0; |
836 | } | 836 | } |
diff --git a/drivers/acpi/utilities/utresrc.c b/drivers/acpi/utilities/utresrc.c index cbbd3315a1e2..b630ee137ee1 100644 --- a/drivers/acpi/utilities/utresrc.c +++ b/drivers/acpi/utilities/utresrc.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /******************************************************************************* | 1 | /******************************************************************************* |
2 | * | 2 | * |
3 | * Module Name: utresrc - Resource managment utilities | 3 | * Module Name: utresrc - Resource management utilities |
4 | * | 4 | * |
5 | ******************************************************************************/ | 5 | ******************************************************************************/ |
6 | 6 | ||
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 47892e6f5ded..4b99ed0c59bb 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -837,7 +837,7 @@ static void piix_set_piomode(struct ata_port *ap, struct ata_device *adev) | |||
837 | if (is_slave) { | 837 | if (is_slave) { |
838 | /* clear TIME1|IE1|PPE1|DTE1 */ | 838 | /* clear TIME1|IE1|PPE1|DTE1 */ |
839 | master_data &= 0xff0f; | 839 | master_data &= 0xff0f; |
840 | /* Enable SITRE (seperate slave timing register) */ | 840 | /* Enable SITRE (separate slave timing register) */ |
841 | master_data |= 0x4000; | 841 | master_data |= 0x4000; |
842 | /* enable PPE1, IE1 and TIME1 as needed */ | 842 | /* enable PPE1, IE1 and TIME1 as needed */ |
843 | master_data |= (control << 4); | 843 | master_data |= (control << 4); |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index bdbd55af7022..361cf50cbdea 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -3097,7 +3097,7 @@ static int ata_dev_set_mode(struct ata_device *dev) | |||
3097 | /** | 3097 | /** |
3098 | * ata_do_set_mode - Program timings and issue SET FEATURES - XFER | 3098 | * ata_do_set_mode - Program timings and issue SET FEATURES - XFER |
3099 | * @link: link on which timings will be programmed | 3099 | * @link: link on which timings will be programmed |
3100 | * @r_failed_dev: out paramter for failed device | 3100 | * @r_failed_dev: out parameter for failed device |
3101 | * | 3101 | * |
3102 | * Standard implementation of the function used to tune and set | 3102 | * Standard implementation of the function used to tune and set |
3103 | * ATA device disk transfer mode (PIO3, UDMA6, etc.). If | 3103 | * ATA device disk transfer mode (PIO3, UDMA6, etc.). If |
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c index 67e574de31e8..db057b183d60 100644 --- a/drivers/ata/pata_at32.c +++ b/drivers/ata/pata_at32.c | |||
@@ -324,7 +324,7 @@ static int __init pata_at32_probe(struct platform_device *pdev) | |||
324 | if (irq < 0) | 324 | if (irq < 0) |
325 | return irq; | 325 | return irq; |
326 | 326 | ||
327 | /* Setup struct containing private infomation */ | 327 | /* Setup struct containing private information */ |
328 | info = kzalloc(sizeof(struct at32_ide_info), GFP_KERNEL); | 328 | info = kzalloc(sizeof(struct at32_ide_info), GFP_KERNEL); |
329 | if (!info) | 329 | if (!info) |
330 | return -ENOMEM; | 330 | return -ENOMEM; |
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c index 043dcd35106c..dc33220fe5b2 100644 --- a/drivers/ata/pata_efar.c +++ b/drivers/ata/pata_efar.c | |||
@@ -135,7 +135,7 @@ static void efar_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
135 | idetm_data &= 0xCC0F; | 135 | idetm_data &= 0xCC0F; |
136 | idetm_data |= (control << 4); | 136 | idetm_data |= (control << 4); |
137 | 137 | ||
138 | /* Slave timing in seperate register */ | 138 | /* Slave timing in separate register */ |
139 | pci_read_config_byte(dev, 0x44, &slave_data); | 139 | pci_read_config_byte(dev, 0x44, &slave_data); |
140 | slave_data &= 0x0F << shift; | 140 | slave_data &= 0x0F << shift; |
141 | slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << shift; | 141 | slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << shift; |
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c index 1eda821e5e39..e0c2cc29d0ca 100644 --- a/drivers/ata/pata_it8213.c +++ b/drivers/ata/pata_it8213.c | |||
@@ -128,7 +128,7 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
128 | idetm_data &= 0xCC0F; | 128 | idetm_data &= 0xCC0F; |
129 | idetm_data |= (control << 4); | 129 | idetm_data |= (control << 4); |
130 | 130 | ||
131 | /* Slave timing in seperate register */ | 131 | /* Slave timing in separate register */ |
132 | pci_read_config_byte(dev, 0x44, &slave_data); | 132 | pci_read_config_byte(dev, 0x44, &slave_data); |
133 | slave_data &= 0xF0; | 133 | slave_data &= 0xF0; |
134 | slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << 4; | 134 | slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << 4; |
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 87546d9f1ca0..dc7e91562e43 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c | |||
@@ -345,7 +345,7 @@ static void sis_old_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
345 | 345 | ||
346 | if (adev->dma_mode < XFER_UDMA_0) { | 346 | if (adev->dma_mode < XFER_UDMA_0) { |
347 | /* bits 3-0 hold recovery timing bits 8-10 active timing and | 347 | /* bits 3-0 hold recovery timing bits 8-10 active timing and |
348 | the higer bits are dependant on the device */ | 348 | the higher bits are dependant on the device */ |
349 | timing &= ~0x870F; | 349 | timing &= ~0x870F; |
350 | timing |= mwdma_bits[speed]; | 350 | timing |= mwdma_bits[speed]; |
351 | } else { | 351 | } else { |
@@ -385,7 +385,7 @@ static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev) | |||
385 | 385 | ||
386 | if (adev->dma_mode < XFER_UDMA_0) { | 386 | if (adev->dma_mode < XFER_UDMA_0) { |
387 | /* bits 3-0 hold recovery timing bits 8-10 active timing and | 387 | /* bits 3-0 hold recovery timing bits 8-10 active timing and |
388 | the higer bits are dependant on the device, bit 15 udma */ | 388 | the higher bits are dependant on the device, bit 15 udma */ |
389 | timing &= ~0x870F; | 389 | timing &= ~0x870F; |
390 | timing |= mwdma_bits[speed]; | 390 | timing |= mwdma_bits[speed]; |
391 | } else { | 391 | } else { |
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c index 63ee6c076cb3..55178e9973a0 100644 --- a/drivers/block/cciss_scsi.c +++ b/drivers/block/cciss_scsi.c | |||
@@ -1453,7 +1453,7 @@ static int cciss_eh_device_reset_handler(struct scsi_cmnd *scsicmd) | |||
1453 | rc = sendcmd(CCISS_RESET_MSG, ctlr, NULL, 0, 2, 0, 0, | 1453 | rc = sendcmd(CCISS_RESET_MSG, ctlr, NULL, 0, 2, 0, 0, |
1454 | (unsigned char *) &cmd_in_trouble->Header.LUN.LunAddrBytes[0], | 1454 | (unsigned char *) &cmd_in_trouble->Header.LUN.LunAddrBytes[0], |
1455 | TYPE_MSG); | 1455 | TYPE_MSG); |
1456 | /* sendcmd turned off interrputs on the board, turn 'em back on. */ | 1456 | /* sendcmd turned off interrupts on the board, turn 'em back on. */ |
1457 | (*c)->access.set_intr_mask(*c, CCISS_INTR_ON); | 1457 | (*c)->access.set_intr_mask(*c, CCISS_INTR_ON); |
1458 | if (rc == 0) | 1458 | if (rc == 0) |
1459 | return SUCCESS; | 1459 | return SUCCESS; |
@@ -1483,7 +1483,7 @@ static int cciss_eh_abort_handler(struct scsi_cmnd *scsicmd) | |||
1483 | 0, 2, 0, 0, | 1483 | 0, 2, 0, 0, |
1484 | (unsigned char *) &cmd_to_abort->Header.LUN.LunAddrBytes[0], | 1484 | (unsigned char *) &cmd_to_abort->Header.LUN.LunAddrBytes[0], |
1485 | TYPE_MSG); | 1485 | TYPE_MSG); |
1486 | /* sendcmd turned off interrputs on the board, turn 'em back on. */ | 1486 | /* sendcmd turned off interrupts on the board, turn 'em back on. */ |
1487 | (*c)->access.set_intr_mask(*c, CCISS_INTR_ON); | 1487 | (*c)->access.set_intr_mask(*c, CCISS_INTR_ON); |
1488 | if (rc == 0) | 1488 | if (rc == 0) |
1489 | return SUCCESS; | 1489 | return SUCCESS; |
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 08f48d577aba..dade1626865b 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -383,7 +383,7 @@ static void btuart_change_speed(btuart_info_t *info, unsigned int speed) | |||
383 | outb(lcr, iobase + UART_LCR); /* Set 8N1 */ | 383 | outb(lcr, iobase + UART_LCR); /* Set 8N1 */ |
384 | outb(fcr, iobase + UART_FCR); /* Enable FIFO's */ | 384 | outb(fcr, iobase + UART_FCR); /* Enable FIFO's */ |
385 | 385 | ||
386 | /* Turn on interrups */ | 386 | /* Turn on interrupts */ |
387 | outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER); | 387 | outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER); |
388 | 388 | ||
389 | spin_unlock_irqrestore(&(info->lock), flags); | 389 | spin_unlock_irqrestore(&(info->lock), flags); |
diff --git a/drivers/char/drm/r300_reg.h b/drivers/char/drm/r300_reg.h index 3ae57ecc7afd..fa194a46c1e4 100644 --- a/drivers/char/drm/r300_reg.h +++ b/drivers/char/drm/r300_reg.h | |||
@@ -584,7 +584,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
584 | #define R300_RE_FOG_START 0x4298 | 584 | #define R300_RE_FOG_START 0x4298 |
585 | 585 | ||
586 | /* Not sure why there are duplicate of factor and constant values. | 586 | /* Not sure why there are duplicate of factor and constant values. |
587 | * My best guess so far is that there are seperate zbiases for test and write. | 587 | * My best guess so far is that there are separate zbiases for test and write. |
588 | * Ordering might be wrong. | 588 | * Ordering might be wrong. |
589 | * Some of the tests indicate that fgl has a fallback implementation of zbias | 589 | * Some of the tests indicate that fgl has a fallback implementation of zbias |
590 | * via pixel shaders. | 590 | * via pixel shaders. |
diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c index 75d6b748c2c0..7009dbddac43 100644 --- a/drivers/char/drm/via_dma.c +++ b/drivers/char/drm/via_dma.c | |||
@@ -400,7 +400,7 @@ static inline uint32_t *via_align_buffer(drm_via_private_t * dev_priv, | |||
400 | } | 400 | } |
401 | 401 | ||
402 | /* | 402 | /* |
403 | * This function is used internally by ring buffer mangement code. | 403 | * This function is used internally by ring buffer management code. |
404 | * | 404 | * |
405 | * Returns virtual pointer to ring buffer. | 405 | * Returns virtual pointer to ring buffer. |
406 | */ | 406 | */ |
diff --git a/drivers/char/efirtc.c b/drivers/char/efirtc.c index 004141d535a2..49233f589874 100644 --- a/drivers/char/efirtc.c +++ b/drivers/char/efirtc.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | * NOTES: | 19 | * NOTES: |
20 | * - Locking is required for safe execution of EFI calls with regards | 20 | * - Locking is required for safe execution of EFI calls with regards |
21 | * to interrrupts and SMP. | 21 | * to interrupts and SMP. |
22 | * | 22 | * |
23 | * TODO (December 1999): | 23 | * TODO (December 1999): |
24 | * - provide the API to set/get the WakeUp Alarm (different from the | 24 | * - provide the API to set/get the WakeUp Alarm (different from the |
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index ffcecde9e2a5..ffd747c5dff0 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c | |||
@@ -1797,7 +1797,7 @@ static unsigned termios2digi_c(struct channel *ch, unsigned cflag) | |||
1797 | res |= cflag & ((CBAUD ^ CBAUDEX) | PARODD | PARENB | CSTOPB | CSIZE); | 1797 | res |= cflag & ((CBAUD ^ CBAUDEX) | PARODD | PARENB | CSTOPB | CSIZE); |
1798 | /* | 1798 | /* |
1799 | * This gets a little confusing. The Digi cards have their own | 1799 | * This gets a little confusing. The Digi cards have their own |
1800 | * representation of c_cflags controling baud rate. For the most part | 1800 | * representation of c_cflags controlling baud rate. For the most part |
1801 | * this is identical to the Linux implementation. However; Digi | 1801 | * this is identical to the Linux implementation. However; Digi |
1802 | * supports one rate (76800) that Linux doesn't. This means that the | 1802 | * supports one rate (76800) that Linux doesn't. This means that the |
1803 | * c_cflag entry that would normally mean 76800 for Digi actually means | 1803 | * c_cflag entry that would normally mean 76800 for Digi actually means |
@@ -2068,7 +2068,7 @@ static int info_ioctl(struct tty_struct *tty, struct file *file, | |||
2068 | { | 2068 | { |
2069 | /* | 2069 | /* |
2070 | * This call is made by the apps to complete the | 2070 | * This call is made by the apps to complete the |
2071 | * initilization of the board(s). This routine is | 2071 | * initialization of the board(s). This routine is |
2072 | * responsible for setting the card to its initial | 2072 | * responsible for setting the card to its initial |
2073 | * state and setting the drivers control fields to the | 2073 | * state and setting the drivers control fields to the |
2074 | * sutianle settings for the card in question. | 2074 | * sutianle settings for the card in question. |
diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c index 0e8ceea5ea78..712d9f271aa6 100644 --- a/drivers/char/hangcheck-timer.c +++ b/drivers/char/hangcheck-timer.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * The hangcheck-timer driver uses the TSC to catch delays that | 26 | * The hangcheck-timer driver uses the TSC to catch delays that |
27 | * jiffies does not notice. A timer is set. When the timer fires, it | 27 | * jiffies does not notice. A timer is set. When the timer fires, it |
28 | * checks whether it was delayed and if that delay exceeds a given | 28 | * checks whether it was delayed and if that delay exceeds a given |
29 | * margin of error. The hangcheck_tick module paramter takes the timer | 29 | * margin of error. The hangcheck_tick module parameter takes the timer |
30 | * duration in seconds. The hangcheck_margin parameter defines the | 30 | * duration in seconds. The hangcheck_margin parameter defines the |
31 | * margin of error, in seconds. The defaults are 60 seconds for the | 31 | * margin of error, in seconds. The defaults are 60 seconds for the |
32 | * timer and 180 seconds for the margin of error. IOW, a timer is set | 32 | * timer and 180 seconds for the margin of error. IOW, a timer is set |
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c index fd7559084b82..3402def22007 100644 --- a/drivers/char/hvcs.c +++ b/drivers/char/hvcs.c | |||
@@ -838,7 +838,7 @@ static int __devexit hvcs_remove(struct vio_dev *dev) | |||
838 | if (!hvcsd) | 838 | if (!hvcsd) |
839 | return -ENODEV; | 839 | return -ENODEV; |
840 | 840 | ||
841 | /* By this time the vty-server won't be getting any more interrups */ | 841 | /* By this time the vty-server won't be getting any more interrupts */ |
842 | 842 | ||
843 | spin_lock_irqsave(&hvcsd->lock, flags); | 843 | spin_lock_irqsave(&hvcsd->lock, flags); |
844 | 844 | ||
diff --git a/drivers/char/ip2/i2lib.c b/drivers/char/ip2/i2lib.c index e46120d05b68..d6567b32fb5c 100644 --- a/drivers/char/ip2/i2lib.c +++ b/drivers/char/ip2/i2lib.c | |||
@@ -661,7 +661,7 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands, | |||
661 | if (!in_interrupt()) { | 661 | if (!in_interrupt()) { |
662 | schedule_timeout_interruptible(1); // short nap | 662 | schedule_timeout_interruptible(1); // short nap |
663 | } else { | 663 | } else { |
664 | // we cannot sched/sleep in interrrupt silly | 664 | // we cannot sched/sleep in interrupt silly |
665 | return 0; | 665 | return 0; |
666 | } | 666 | } |
667 | if (signal_pending(current)) { | 667 | if (signal_pending(current)) { |
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index e04e66cf2c68..0f49ccf02a7f 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
@@ -1251,7 +1251,7 @@ ip2_poll(unsigned long arg) | |||
1251 | 1251 | ||
1252 | // Just polled boards, IRQ = 0 will hit all non-interrupt boards. | 1252 | // Just polled boards, IRQ = 0 will hit all non-interrupt boards. |
1253 | // It will NOT poll boards handled by hard interrupts. | 1253 | // It will NOT poll boards handled by hard interrupts. |
1254 | // The issue of queued BH interrups is handled in ip2_interrupt(). | 1254 | // The issue of queued BH interrupts is handled in ip2_interrupt(). |
1255 | ip2_polled_interrupt(); | 1255 | ip2_polled_interrupt(); |
1256 | 1256 | ||
1257 | PollTimer.expires = POLL_TIMEOUT; | 1257 | PollTimer.expires = POLL_TIMEOUT; |
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index 905d1f51a7bf..d010ed95ed3b 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c | |||
@@ -1544,7 +1544,7 @@ static void mgsl_isr_receive_data( struct mgsl_struct *info ) | |||
1544 | 1544 | ||
1545 | /* mgsl_isr_misc() | 1545 | /* mgsl_isr_misc() |
1546 | * | 1546 | * |
1547 | * Service a miscellaneos interrupt source. | 1547 | * Service a miscellaneous interrupt source. |
1548 | * | 1548 | * |
1549 | * Arguments: info pointer to device extension (instance data) | 1549 | * Arguments: info pointer to device extension (instance data) |
1550 | * Return Value: None | 1550 | * Return Value: None |
diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c index 5422f999636f..ce5ebe3b168f 100644 --- a/drivers/char/toshiba.c +++ b/drivers/char/toshiba.c | |||
@@ -505,7 +505,7 @@ static int __init toshiba_init(void) | |||
505 | if (tosh_probe()) | 505 | if (tosh_probe()) |
506 | return -ENODEV; | 506 | return -ENODEV; |
507 | 507 | ||
508 | printk(KERN_INFO "Toshiba System Managment Mode driver v" TOSH_VERSION "\n"); | 508 | printk(KERN_INFO "Toshiba System Management Mode driver v" TOSH_VERSION "\n"); |
509 | 509 | ||
510 | /* set the port to use for Fn status if not specified as a parameter */ | 510 | /* set the port to use for Fn status if not specified as a parameter */ |
511 | if (tosh_fn==0x00) | 511 | if (tosh_fn==0x00) |
diff --git a/drivers/dio/dio-driver.c b/drivers/dio/dio-driver.c index e4c48e329367..8cd8507b1a8a 100644 --- a/drivers/dio/dio-driver.c +++ b/drivers/dio/dio-driver.c | |||
@@ -15,16 +15,15 @@ | |||
15 | #include <linux/dio.h> | 15 | #include <linux/dio.h> |
16 | 16 | ||
17 | 17 | ||
18 | /** | 18 | /** |
19 | * dio_match_device - Tell if a DIO device structure has a matching | 19 | * dio_match_device - Tell if a DIO device structure has a matching DIO device id structure |
20 | * DIO device id structure | 20 | * @ids: array of DIO device id structures to search in |
21 | * @ids: array of DIO device id structures to search in | 21 | * @d: the DIO device structure to match against |
22 | * @dev: the DIO device structure to match against | 22 | * |
23 | * | 23 | * Used by a driver to check whether a DIO device present in the |
24 | * Used by a driver to check whether a DIO device present in the | 24 | * system is in its list of supported devices. Returns the matching |
25 | * system is in its list of supported devices. Returns the matching | 25 | * dio_device_id structure or %NULL if there is no match. |
26 | * dio_device_id structure or %NULL if there is no match. | 26 | */ |
27 | */ | ||
28 | 27 | ||
29 | const struct dio_device_id * | 28 | const struct dio_device_id * |
30 | dio_match_device(const struct dio_device_id *ids, | 29 | dio_match_device(const struct dio_device_id *ids, |
@@ -66,13 +65,13 @@ static int dio_device_probe(struct device *dev) | |||
66 | } | 65 | } |
67 | 66 | ||
68 | 67 | ||
69 | /** | 68 | /** |
70 | * dio_register_driver - register a new DIO driver | 69 | * dio_register_driver - register a new DIO driver |
71 | * @drv: the driver structure to register | 70 | * @drv: the driver structure to register |
72 | * | 71 | * |
73 | * Adds the driver structure to the list of registered drivers | 72 | * Adds the driver structure to the list of registered drivers |
74 | * Returns zero or a negative error value. | 73 | * Returns zero or a negative error value. |
75 | */ | 74 | */ |
76 | 75 | ||
77 | int dio_register_driver(struct dio_driver *drv) | 76 | int dio_register_driver(struct dio_driver *drv) |
78 | { | 77 | { |
@@ -85,15 +84,15 @@ int dio_register_driver(struct dio_driver *drv) | |||
85 | } | 84 | } |
86 | 85 | ||
87 | 86 | ||
88 | /** | 87 | /** |
89 | * dio_unregister_driver - unregister a DIO driver | 88 | * dio_unregister_driver - unregister a DIO driver |
90 | * @drv: the driver structure to unregister | 89 | * @drv: the driver structure to unregister |
91 | * | 90 | * |
92 | * Deletes the driver structure from the list of registered DIO drivers, | 91 | * Deletes the driver structure from the list of registered DIO drivers, |
93 | * gives it a chance to clean up by calling its remove() function for | 92 | * gives it a chance to clean up by calling its remove() function for |
94 | * each device it was responsible for, and marks those devices as | 93 | * each device it was responsible for, and marks those devices as |
95 | * driverless. | 94 | * driverless. |
96 | */ | 95 | */ |
97 | 96 | ||
98 | void dio_unregister_driver(struct dio_driver *drv) | 97 | void dio_unregister_driver(struct dio_driver *drv) |
99 | { | 98 | { |
@@ -101,16 +100,15 @@ void dio_unregister_driver(struct dio_driver *drv) | |||
101 | } | 100 | } |
102 | 101 | ||
103 | 102 | ||
104 | /** | 103 | /** |
105 | * dio_bus_match - Tell if a DIO device structure has a matching DIO | 104 | * dio_bus_match - Tell if a DIO device structure has a matching DIO device id structure |
106 | * device id structure | 105 | * @dev: the DIO device structure to match against |
107 | * @ids: array of DIO device id structures to search in | 106 | * @drv: the &device_driver that points to the array of DIO device id structures to search |
108 | * @dev: the DIO device structure to match against | 107 | * |
109 | * | 108 | * Used by a driver to check whether a DIO device present in the |
110 | * Used by a driver to check whether a DIO device present in the | 109 | * system is in its list of supported devices. Returns the matching |
111 | * system is in its list of supported devices. Returns the matching | 110 | * dio_device_id structure or %NULL if there is no match. |
112 | * dio_device_id structure or %NULL if there is no match. | 111 | */ |
113 | */ | ||
114 | 112 | ||
115 | static int dio_bus_match(struct device *dev, struct device_driver *drv) | 113 | static int dio_bus_match(struct device *dev, struct device_driver *drv) |
116 | { | 114 | { |
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c index 5dee9f50414b..e0b47b74ec45 100644 --- a/drivers/edac/edac_pci.c +++ b/drivers/edac/edac_pci.c | |||
@@ -73,7 +73,7 @@ EXPORT_SYMBOL_GPL(edac_pci_alloc_ctl_info); | |||
73 | * | 73 | * |
74 | * Last action on the pci control structure. | 74 | * Last action on the pci control structure. |
75 | * | 75 | * |
76 | * call the remove sysfs informaton, which will unregister | 76 | * call the remove sysfs information, which will unregister |
77 | * this control struct's kobj. When that kobj's ref count | 77 | * this control struct's kobj. When that kobj's ref count |
78 | * goes to zero, its release function will be call and then | 78 | * goes to zero, its release function will be call and then |
79 | * kfree() the memory. | 79 | * kfree() the memory. |
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c index a1f24c42d5ff..5a852017c17a 100644 --- a/drivers/edac/i5000_edac.c +++ b/drivers/edac/i5000_edac.c | |||
@@ -351,7 +351,7 @@ struct i5000_pvt { | |||
351 | u16 b1_ambpresent0; /* Branch 1, Channel 8 */ | 351 | u16 b1_ambpresent0; /* Branch 1, Channel 8 */ |
352 | u16 b1_ambpresent1; /* Branch 1, Channel 1 */ | 352 | u16 b1_ambpresent1; /* Branch 1, Channel 1 */ |
353 | 353 | ||
354 | /* DIMM infomation matrix, allocating architecture maximums */ | 354 | /* DIMM information matrix, allocating architecture maximums */ |
355 | struct i5000_dimm_info dimm_info[MAX_CSROWS][MAX_CHANNELS]; | 355 | struct i5000_dimm_info dimm_info[MAX_CSROWS][MAX_CHANNELS]; |
356 | 356 | ||
357 | /* Actual values for this controller */ | 357 | /* Actual values for this controller */ |
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c index d168223db159..744011989044 100644 --- a/drivers/firmware/edd.c +++ b/drivers/firmware/edd.c | |||
@@ -11,7 +11,7 @@ | |||
11 | * | 11 | * |
12 | * This code takes information provided by BIOS EDD calls | 12 | * This code takes information provided by BIOS EDD calls |
13 | * fn41 - Check Extensions Present and | 13 | * fn41 - Check Extensions Present and |
14 | * fn48 - Get Device Parametes with EDD extensions | 14 | * fn48 - Get Device Parameters with EDD extensions |
15 | * made in setup.S, copied to safe structures in setup.c, | 15 | * made in setup.S, copied to safe structures in setup.c, |
16 | * and presents it in sysfs. | 16 | * and presents it in sysfs. |
17 | * | 17 | * |
diff --git a/drivers/ide/ide-timing.h b/drivers/ide/ide-timing.h index adeda7626529..3b12ffe77071 100644 --- a/drivers/ide/ide-timing.h +++ b/drivers/ide/ide-timing.h | |||
@@ -199,7 +199,7 @@ static int ide_timing_compute(ide_drive_t *drive, short speed, struct ide_timing | |||
199 | } | 199 | } |
200 | 200 | ||
201 | /* | 201 | /* |
202 | * Lenghten active & recovery time so that cycle time is correct. | 202 | * Lengthen active & recovery time so that cycle time is correct. |
203 | */ | 203 | */ |
204 | 204 | ||
205 | if (t->act8b + t->rec8b < t->cyc8b) { | 205 | if (t->act8b + t->rec8b < t->cyc8b) { |
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c index 1dc2ac9f3d1c..c5600ac5feb3 100644 --- a/drivers/input/gameport/gameport.c +++ b/drivers/input/gameport/gameport.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/gameport.h> | 18 | #include <linux/gameport.h> |
19 | #include <linux/wait.h> | 19 | #include <linux/wait.h> |
20 | #include <linux/sched.h> | ||
21 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
23 | #include <linux/kthread.h> | 22 | #include <linux/kthread.h> |
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c index e5f4da928340..05e3494cf8b8 100644 --- a/drivers/input/keyboard/bf54x-keys.c +++ b/drivers/input/keyboard/bf54x-keys.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #include <linux/delay.h> | 42 | #include <linux/delay.h> |
43 | #include <linux/platform_device.h> | 43 | #include <linux/platform_device.h> |
44 | #include <linux/input.h> | 44 | #include <linux/input.h> |
45 | #include <linux/irq.h> | ||
46 | 45 | ||
47 | #include <asm/portmux.h> | 46 | #include <asm/portmux.h> |
48 | #include <asm/mach/bf54x_keys.h> | 47 | #include <asm/mach/bf54x_keys.h> |
diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c index e6696b3c9416..986f93cfc6b8 100644 --- a/drivers/input/keyboard/jornada720_kbd.c +++ b/drivers/input/keyboard/jornada720_kbd.c | |||
@@ -17,7 +17,6 @@ | |||
17 | */ | 17 | */ |
18 | #include <linux/device.h> | 18 | #include <linux/device.h> |
19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
20 | #include <linux/init.h> | ||
21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
23 | #include <linux/input.h> | 22 | #include <linux/input.h> |
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 3e99df6be084..adc3bd6e7f7b 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c | |||
@@ -141,7 +141,7 @@ static void gscps2_flush(struct gscps2port *ps2port) | |||
141 | /* | 141 | /* |
142 | * gscps2_writeb_output() - write a byte to the port | 142 | * gscps2_writeb_output() - write a byte to the port |
143 | * | 143 | * |
144 | * returns 1 on sucess, 0 on error | 144 | * returns 1 on success, 0 on error |
145 | */ | 145 | */ |
146 | 146 | ||
147 | static inline int gscps2_writeb_output(struct gscps2port *ps2port, u8 data) | 147 | static inline int gscps2_writeb_output(struct gscps2port *ps2port, u8 data) |
diff --git a/drivers/isdn/hardware/eicon/debuglib.c b/drivers/isdn/hardware/eicon/debuglib.c index a19b7ffe9ace..e39c5c1f623e 100644 --- a/drivers/isdn/hardware/eicon/debuglib.c +++ b/drivers/isdn/hardware/eicon/debuglib.c | |||
@@ -106,7 +106,7 @@ DbgRegister (char *drvName, char *drvTag, unsigned long dbgMask) | |||
106 | return (1) ; | 106 | return (1) ; |
107 | } | 107 | } |
108 | /* | 108 | /* |
109 | * Check if we registered whith an old maint driver (see debuglib.h) | 109 | * Check if we registered with an old maint driver (see debuglib.h) |
110 | */ | 110 | */ |
111 | if ( myDriverDebugHandle.dbg_end != NULL | 111 | if ( myDriverDebugHandle.dbg_end != NULL |
112 | /* location of 'dbg_prt' in _OldDbgHandle_ struct */ | 112 | /* location of 'dbg_prt' in _OldDbgHandle_ struct */ |
diff --git a/drivers/isdn/hardware/eicon/debuglib.h b/drivers/isdn/hardware/eicon/debuglib.h index 11b3b9edd1d6..016410cf2273 100644 --- a/drivers/isdn/hardware/eicon/debuglib.h +++ b/drivers/isdn/hardware/eicon/debuglib.h | |||
@@ -177,7 +177,7 @@ DBG_DECL(PRV3) | |||
177 | } } | 177 | } } |
178 | #endif | 178 | #endif |
179 | /* | 179 | /* |
180 | * For event level debug use a separate define, the paramete are | 180 | * For event level debug use a separate define, the parameter are |
181 | * different and cause compiler errors on some systems. | 181 | * different and cause compiler errors on some systems. |
182 | */ | 182 | */ |
183 | #define DBG_EVL_ID(args) \ | 183 | #define DBG_EVL_ID(args) \ |
diff --git a/drivers/isdn/hardware/eicon/di.c b/drivers/isdn/hardware/eicon/di.c index ce8df3878908..10760b3c5eb5 100644 --- a/drivers/isdn/hardware/eicon/di.c +++ b/drivers/isdn/hardware/eicon/di.c | |||
@@ -285,7 +285,7 @@ byte pr_dpc(ADAPTER * a) | |||
285 | a->ram_in(a, &RcIn->RcId), | 285 | a->ram_in(a, &RcIn->RcId), |
286 | a->ram_in(a, &RcIn->RcCh), | 286 | a->ram_in(a, &RcIn->RcCh), |
287 | a->ram_inw(a, &RcIn->Reference), | 287 | a->ram_inw(a, &RcIn->Reference), |
288 | tmp[0], /* type of extended informtion */ | 288 | tmp[0], /* type of extended information */ |
289 | tmp[1]); /* extended information */ | 289 | tmp[1]); /* extended information */ |
290 | a->ram_out(a, &RcIn->Rc, 0); | 290 | a->ram_out(a, &RcIn->Rc, 0); |
291 | } | 291 | } |
diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c index ccd35d047ec8..b9177ca4369a 100644 --- a/drivers/isdn/hardware/eicon/message.c +++ b/drivers/isdn/hardware/eicon/message.c | |||
@@ -4941,7 +4941,7 @@ void sig_ind(PLCI * plci) | |||
4941 | /* b = IE1 */ | 4941 | /* b = IE1 */ |
4942 | /* S = IE1 length + cont. */ | 4942 | /* S = IE1 length + cont. */ |
4943 | /* b = IE2 */ | 4943 | /* b = IE2 */ |
4944 | /* S = IE2 lenght + cont. */ | 4944 | /* S = IE2 length + cont. */ |
4945 | sendf(plci->appl, | 4945 | sendf(plci->appl, |
4946 | _MANUFACTURER_I, | 4946 | _MANUFACTURER_I, |
4947 | Id, | 4947 | Id, |
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c index f85450146bdc..d3999a8e9f88 100644 --- a/drivers/isdn/hysdn/hycapi.c +++ b/drivers/isdn/hysdn/hycapi.c | |||
@@ -541,7 +541,7 @@ hycapi_rx_capipkt(hysdn_card * card, unsigned char *buf, unsigned short len) | |||
541 | } | 541 | } |
542 | ctrl = &cinfo->capi_ctrl; | 542 | ctrl = &cinfo->capi_ctrl; |
543 | if(len < CAPI_MSG_BASELEN) { | 543 | if(len < CAPI_MSG_BASELEN) { |
544 | printk(KERN_ERR "HYSDN Card%d: invalid CAPI-message, lenght %d!\n", | 544 | printk(KERN_ERR "HYSDN Card%d: invalid CAPI-message, length %d!\n", |
545 | card->myid, len); | 545 | card->myid, len); |
546 | return; | 546 | return; |
547 | } | 547 | } |
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index d409f6759482..8ba49385c3ff 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * - maybe add timeout to commands ? | 12 | * - maybe add timeout to commands ? |
13 | * - blocking version of time functions | 13 | * - blocking version of time functions |
14 | * - polling version of i2c commands (including timer that works with | 14 | * - polling version of i2c commands (including timer that works with |
15 | * interrutps off) | 15 | * interrupts off) |
16 | * - maybe avoid some data copies with i2c by directly using the smu cmd | 16 | * - maybe avoid some data copies with i2c by directly using the smu cmd |
17 | * buffer and a lower level internal interface | 17 | * buffer and a lower level internal interface |
18 | * - understand SMU -> CPU events and implement reception of them via | 18 | * - understand SMU -> CPU events and implement reception of them via |
@@ -179,7 +179,7 @@ static irqreturn_t smu_db_intr(int irq, void *arg) | |||
179 | /* CPU might have brought back the cache line, so we need | 179 | /* CPU might have brought back the cache line, so we need |
180 | * to flush again before peeking at the SMU response. We | 180 | * to flush again before peeking at the SMU response. We |
181 | * flush the entire buffer for now as we haven't read the | 181 | * flush the entire buffer for now as we haven't read the |
182 | * reply lenght (it's only 2 cache lines anyway) | 182 | * reply length (it's only 2 cache lines anyway) |
183 | */ | 183 | */ |
184 | faddr = (unsigned long)smu->cmd_buf; | 184 | faddr = (unsigned long)smu->cmd_buf; |
185 | flush_inval_dcache_range(faddr, faddr + 256); | 185 | flush_inval_dcache_range(faddr, faddr + 256); |
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c index 7d04a6fd1acb..168a8d3a5e55 100644 --- a/drivers/media/common/saa7146_core.c +++ b/drivers/media/common/saa7146_core.c | |||
@@ -388,7 +388,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent | |||
388 | } | 388 | } |
389 | dev->revision &= 0xf; | 389 | dev->revision &= 0xf; |
390 | 390 | ||
391 | /* remap the memory from virtual to physical adress */ | 391 | /* remap the memory from virtual to physical address */ |
392 | 392 | ||
393 | err = pci_request_region(pci, 0, "saa7146"); | 393 | err = pci_request_region(pci, 0, "saa7146"); |
394 | if (err < 0) | 394 | if (err < 0) |
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c index a33eb5988c42..ed3f8268ed11 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.c +++ b/drivers/media/dvb/dvb-core/dvb_net.c | |||
@@ -681,7 +681,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len ) | |||
681 | drop = 1; | 681 | drop = 1; |
682 | /* else: destination address matches the MAC address of our receiver device */ | 682 | /* else: destination address matches the MAC address of our receiver device */ |
683 | } | 683 | } |
684 | /* else: promiscious mode; pass everything up the stack */ | 684 | /* else: promiscuous mode; pass everything up the stack */ |
685 | 685 | ||
686 | if (drop) { | 686 | if (drop) { |
687 | #ifdef ULE_DEBUG | 687 | #ifdef ULE_DEBUG |
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 63a47cd4c161..7374c02dd183 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -4344,7 +4344,7 @@ static void rv605_muxsel(struct bttv *btv, unsigned int input) | |||
4344 | gpio_bits(0x200,0x000); | 4344 | gpio_bits(0x200,0x000); |
4345 | mdelay(1); | 4345 | mdelay(1); |
4346 | 4346 | ||
4347 | /* create a new conection */ | 4347 | /* create a new connection */ |
4348 | gpio_bits(0x480,0x080); | 4348 | gpio_bits(0x480,0x080); |
4349 | gpio_bits(0x480,0x480); | 4349 | gpio_bits(0x480,0x480); |
4350 | mdelay(1); | 4350 | mdelay(1); |
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c index 5c2c4029ff86..84b9e4f2b3b3 100644 --- a/drivers/media/video/indycam.c +++ b/drivers/media/video/indycam.c | |||
@@ -326,7 +326,7 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind) | |||
326 | // initialize | 326 | // initialize |
327 | err = indycam_write_block(client, 0, sizeof(initseq), (u8 *)&initseq); | 327 | err = indycam_write_block(client, 0, sizeof(initseq), (u8 *)&initseq); |
328 | if (err) { | 328 | if (err) { |
329 | printk(KERN_ERR "IndyCam initalization failed\n"); | 329 | printk(KERN_ERR "IndyCam initialization failed\n"); |
330 | err = -EIO; | 330 | err = -EIO; |
331 | goto out_detach_client; | 331 | goto out_detach_client; |
332 | } | 332 | } |
diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c index b630c26cfe85..58bab653330f 100644 --- a/drivers/media/video/mt20xx.c +++ b/drivers/media/video/mt20xx.c | |||
@@ -369,7 +369,7 @@ static struct dvb_tuner_ops mt2032_tuner_ops = { | |||
369 | .get_frequency = microtune_get_frequency, | 369 | .get_frequency = microtune_get_frequency, |
370 | }; | 370 | }; |
371 | 371 | ||
372 | // Initalization as described in "MT203x Programming Procedures", Rev 1.2, Feb.2001 | 372 | // Initialization as described in "MT203x Programming Procedures", Rev 1.2, Feb.2001 |
373 | static int mt2032_init(struct dvb_frontend *fe) | 373 | static int mt2032_init(struct dvb_frontend *fe) |
374 | { | 374 | { |
375 | struct microtune_priv *priv = fe->tuner_priv; | 375 | struct microtune_priv *priv = fe->tuner_priv; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2.h b/drivers/media/video/pvrusb2/pvrusb2.h index 074533e9c21e..1a9a4baf12b8 100644 --- a/drivers/media/video/pvrusb2/pvrusb2.h +++ b/drivers/media/video/pvrusb2/pvrusb2.h | |||
@@ -27,7 +27,7 @@ | |||
27 | might want to increase this - however the driver operation will not | 27 | might want to increase this - however the driver operation will not |
28 | be impaired if it is too small. Instead additional units just | 28 | be impaired if it is too small. Instead additional units just |
29 | won't have an ID assigned and it might not be possible to specify | 29 | won't have an ID assigned and it might not be possible to specify |
30 | module paramters for those extra units. */ | 30 | module parameters for those extra units. */ |
31 | #define PVR_NUM 20 | 31 | #define PVR_NUM 20 |
32 | 32 | ||
33 | #endif /* __PVRUSB2_H */ | 33 | #endif /* __PVRUSB2_H */ |
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 7300ace8f44e..f991d72fe108 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
@@ -542,7 +542,7 @@ int pwc_handle_frame(struct pwc_device *pdev) | |||
542 | } | 542 | } |
543 | 543 | ||
544 | if (pdev->read_frame != NULL) { | 544 | if (pdev->read_frame != NULL) { |
545 | /* Decompression is a lenghty process, so it's outside of the lock. | 545 | /* Decompression is a lengthy process, so it's outside of the lock. |
546 | This gives the isoc_handler the opportunity to fill more frames | 546 | This gives the isoc_handler the opportunity to fill more frames |
547 | in the mean time. | 547 | in the mean time. |
548 | */ | 548 | */ |
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c index e0ff811fab6f..ca05cd655087 100644 --- a/drivers/media/video/tea6420.c +++ b/drivers/media/video/tea6420.c | |||
@@ -57,7 +57,7 @@ static int tea6420_switch(struct i2c_client *client, int i, int o, int g) | |||
57 | 57 | ||
58 | dprintk("adr:0x%02x, i:%d, o:%d, g:%d\n", client->addr, i, o, g); | 58 | dprintk("adr:0x%02x, i:%d, o:%d, g:%d\n", client->addr, i, o, g); |
59 | 59 | ||
60 | /* check if the paramters are valid */ | 60 | /* check if the parameters are valid */ |
61 | if (i < 1 || i > 6 || o < 1 || o > 4 || g < 0 || g > 6 || g % 2 != 0) | 61 | if (i < 1 || i > 6 || o < 1 || o > 4 || g < 0 || g > 6 || g % 2 != 0) |
62 | return -1; | 62 | return -1; |
63 | 63 | ||
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c index d847273eeba0..5e7b79501370 100644 --- a/drivers/media/video/usbvideo/quickcam_messenger.c +++ b/drivers/media/video/usbvideo/quickcam_messenger.c | |||
@@ -258,7 +258,7 @@ static void qcm_hsv2rgb(u16 hue, u16 sat, u16 val, u16 *r, u16 *g, u16 *b) | |||
258 | unsigned int p; | 258 | unsigned int p; |
259 | 259 | ||
260 | /* | 260 | /* |
261 | the registers controling gain are 8 bit of which | 261 | the registers controlling gain are 8 bit of which |
262 | we affect only the last 4 bits with our gain. | 262 | we affect only the last 4 bits with our gain. |
263 | we know that if saturation is 0, (unsaturated) then | 263 | we know that if saturation is 0, (unsaturated) then |
264 | we're grayscale (center axis of the colour cone) so | 264 | we're grayscale (center axis of the colour cone) so |
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index b52b826a30be..df52f8a60215 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -131,7 +131,7 @@ static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = { | |||
131 | /* Function prototypes */ | 131 | /* Function prototypes */ |
132 | static void usbvision_release(struct usb_usbvision *usbvision); | 132 | static void usbvision_release(struct usb_usbvision *usbvision); |
133 | 133 | ||
134 | /* Default initalization of device driver parameters */ | 134 | /* Default initialization of device driver parameters */ |
135 | /* Set the default format for ISOC endpoint */ | 135 | /* Set the default format for ISOC endpoint */ |
136 | static int isocMode = ISOC_MODE_COMPRESS; | 136 | static int isocMode = ISOC_MODE_COMPRESS; |
137 | /* Set the default Debug Mode of the device driver */ | 137 | /* Set the default Debug Mode of the device driver */ |
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c index 8ef31ed7d3f1..a9133858e913 100644 --- a/drivers/media/video/vpx3220.c +++ b/drivers/media/video/vpx3220.c | |||
@@ -566,7 +566,7 @@ vpx3220_init_client (struct i2c_client *client) | |||
566 | } | 566 | } |
567 | 567 | ||
568 | /* ----------------------------------------------------------------------- | 568 | /* ----------------------------------------------------------------------- |
569 | * Client managment code | 569 | * Client management code |
570 | */ | 570 | */ |
571 | 571 | ||
572 | /* | 572 | /* |
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c index 6e0ac4c5c379..690281bb59ee 100644 --- a/drivers/media/video/zoran_card.c +++ b/drivers/media/video/zoran_card.c | |||
@@ -1270,7 +1270,7 @@ zoran_setup_videocodec (struct zoran *zr, | |||
1270 | } | 1270 | } |
1271 | 1271 | ||
1272 | /* | 1272 | /* |
1273 | * Scan for a Buz card (actually for the PCI contoler ZR36057), | 1273 | * Scan for a Buz card (actually for the PCI controller ZR36057), |
1274 | * request the irq and map the io memory | 1274 | * request the irq and map the io memory |
1275 | */ | 1275 | */ |
1276 | static int __devinit | 1276 | static int __devinit |
diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zr36050.c index 9f622e00c479..faae4ec3ea0b 100644 --- a/drivers/media/video/zr36050.c +++ b/drivers/media/video/zr36050.c | |||
@@ -161,7 +161,7 @@ zr36050_wait_end (struct zr36050 *ptr) | |||
161 | udelay(1); | 161 | udelay(1); |
162 | if (i++ > 200000) { // 200ms, there is for sure something wrong!!! | 162 | if (i++ > 200000) { // 200ms, there is for sure something wrong!!! |
163 | dprintk(1, | 163 | dprintk(1, |
164 | "%s: timout at wait_end (last status: 0x%02x)\n", | 164 | "%s: timeout at wait_end (last status: 0x%02x)\n", |
165 | ptr->name, ptr->status1); | 165 | ptr->name, ptr->status1); |
166 | break; | 166 | break; |
167 | } | 167 | } |
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c index 1ef14fef08e6..7849b65969d0 100644 --- a/drivers/media/video/zr36060.c +++ b/drivers/media/video/zr36060.c | |||
@@ -163,7 +163,7 @@ zr36060_wait_end (struct zr36060 *ptr) | |||
163 | udelay(1); | 163 | udelay(1); |
164 | if (i++ > 200000) { // 200ms, there is for sure something wrong!!! | 164 | if (i++ > 200000) { // 200ms, there is for sure something wrong!!! |
165 | dprintk(1, | 165 | dprintk(1, |
166 | "%s: timout at wait_end (last status: 0x%02x)\n", | 166 | "%s: timeout at wait_end (last status: 0x%02x)\n", |
167 | ptr->name, ptr->status); | 167 | ptr->name, ptr->status); |
168 | break; | 168 | break; |
169 | } | 169 | } |
diff --git a/drivers/message/fusion/lsi/mpi_log_sas.h b/drivers/message/fusion/lsi/mpi_log_sas.h index 6be1f6b65777..af9da03e95e5 100644 --- a/drivers/message/fusion/lsi/mpi_log_sas.h +++ b/drivers/message/fusion/lsi/mpi_log_sas.h | |||
@@ -162,7 +162,7 @@ | |||
162 | #define PL_LOGINFO_SUB_CODE_FRAME_XFER_ERROR (0x00000400) /* Bits 0-3 encode Transport Status Register (offset 0x08) */ | 162 | #define PL_LOGINFO_SUB_CODE_FRAME_XFER_ERROR (0x00000400) /* Bits 0-3 encode Transport Status Register (offset 0x08) */ |
163 | /* Bit 0 is Status Bit 0: FrameXferErr */ | 163 | /* Bit 0 is Status Bit 0: FrameXferErr */ |
164 | /* Bit 1 & 2 are Status Bits 16 and 17: FrameXmitErrStatus */ | 164 | /* Bit 1 & 2 are Status Bits 16 and 17: FrameXmitErrStatus */ |
165 | /* Bit 3 is Status Bit 18 WriteDataLenghtGTDataLengthErr */ | 165 | /* Bit 3 is Status Bit 18 WriteDataLengthGTDataLengthErr */ |
166 | 166 | ||
167 | #define PL_LOGINFO_SUB_CODE_TX_FM_CONNECTED_LOW (0x00000500) | 167 | #define PL_LOGINFO_SUB_CODE_TX_FM_CONNECTED_LOW (0x00000500) |
168 | #define PL_LOGINFO_SUB_CODE_SATA_NON_NCQ_RW_ERR_BIT_SET (0x00000600) | 168 | #define PL_LOGINFO_SUB_CODE_SATA_NON_NCQ_RW_ERR_BIT_SET (0x00000600) |
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index 6029509702d3..e630b50966ec 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c | |||
@@ -1708,7 +1708,7 @@ mptctl_replace_fw (unsigned long arg) | |||
1708 | * | 1708 | * |
1709 | * Outputs: None. | 1709 | * Outputs: None. |
1710 | * Return: 0 if successful | 1710 | * Return: 0 if successful |
1711 | * -EBUSY if previous command timout and IOC reset is not complete. | 1711 | * -EBUSY if previous command timeout and IOC reset is not complete. |
1712 | * -EFAULT if data unavailable | 1712 | * -EFAULT if data unavailable |
1713 | * -ENODEV if no such device/adapter | 1713 | * -ENODEV if no such device/adapter |
1714 | * -ETIME if timer expires | 1714 | * -ETIME if timer expires |
@@ -1748,7 +1748,7 @@ mptctl_mpt_command (unsigned long arg) | |||
1748 | * | 1748 | * |
1749 | * Outputs: None. | 1749 | * Outputs: None. |
1750 | * Return: 0 if successful | 1750 | * Return: 0 if successful |
1751 | * -EBUSY if previous command timout and IOC reset is not complete. | 1751 | * -EBUSY if previous command timeout and IOC reset is not complete. |
1752 | * -EFAULT if data unavailable | 1752 | * -EFAULT if data unavailable |
1753 | * -ENODEV if no such device/adapter | 1753 | * -ENODEV if no such device/adapter |
1754 | * -ETIME if timer expires | 1754 | * -ETIME if timer expires |
@@ -2316,7 +2316,7 @@ done_free_mem: | |||
2316 | * Outputs: None. | 2316 | * Outputs: None. |
2317 | * Return: 0 if successful | 2317 | * Return: 0 if successful |
2318 | * -EFAULT if data unavailable | 2318 | * -EFAULT if data unavailable |
2319 | * -EBUSY if previous command timout and IOC reset is not complete. | 2319 | * -EBUSY if previous command timeout and IOC reset is not complete. |
2320 | * -ENODEV if no such device/adapter | 2320 | * -ENODEV if no such device/adapter |
2321 | * -ETIME if timer expires | 2321 | * -ETIME if timer expires |
2322 | * -ENOMEM if memory allocation error | 2322 | * -ENOMEM if memory allocation error |
@@ -2553,7 +2553,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size) | |||
2553 | * Outputs: None. | 2553 | * Outputs: None. |
2554 | * Return: 0 if successful | 2554 | * Return: 0 if successful |
2555 | * -EFAULT if data unavailable | 2555 | * -EFAULT if data unavailable |
2556 | * -EBUSY if previous command timout and IOC reset is not complete. | 2556 | * -EBUSY if previous command timeout and IOC reset is not complete. |
2557 | * -ENODEV if no such device/adapter | 2557 | * -ENODEV if no such device/adapter |
2558 | * -ETIME if timer expires | 2558 | * -ETIME if timer expires |
2559 | * -ENOMEM if memory allocation error | 2559 | * -ENOMEM if memory allocation error |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 5c614ec38cc4..af1de0ccee2f 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
@@ -1736,7 +1736,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, i | |||
1736 | fail_out: | 1736 | fail_out: |
1737 | 1737 | ||
1738 | /* | 1738 | /* |
1739 | * Free task managment mf, and corresponding tm flags | 1739 | * Free task management mf, and corresponding tm flags |
1740 | */ | 1740 | */ |
1741 | mpt_free_msg_frame(ioc, mf); | 1741 | mpt_free_msg_frame(ioc, mf); |
1742 | hd->tmPending = 0; | 1742 | hd->tmPending = 0; |
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index 7814a06ae970..da715e11c1b2 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c | |||
@@ -916,7 +916,7 @@ static int i2o_parse_hrt(struct i2o_controller *c) | |||
916 | * status block. The status block could then be accessed through | 916 | * status block. The status block could then be accessed through |
917 | * c->status_block. | 917 | * c->status_block. |
918 | * | 918 | * |
919 | * Returns 0 on sucess or negative error code on failure. | 919 | * Returns 0 on success or negative error code on failure. |
920 | */ | 920 | */ |
921 | int i2o_status_get(struct i2o_controller *c) | 921 | int i2o_status_get(struct i2o_controller *c) |
922 | { | 922 | { |
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c index c73e96bfafc6..90acf57c19bd 100644 --- a/drivers/mtd/devices/doc2000.c +++ b/drivers/mtd/devices/doc2000.c | |||
@@ -376,7 +376,7 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip) | |||
376 | * hardware restriction. */ | 376 | * hardware restriction. */ |
377 | if (doc->mfr) { | 377 | if (doc->mfr) { |
378 | if (doc->mfr == mfr && doc->id == id) | 378 | if (doc->mfr == mfr && doc->id == id) |
379 | return 1; /* This is another the same the first */ | 379 | return 1; /* This is the same as the first */ |
380 | else | 380 | else |
381 | printk(KERN_WARNING | 381 | printk(KERN_WARNING |
382 | "Flash chip at floor %d, chip %d is different:\n", | 382 | "Flash chip at floor %d, chip %d is different:\n", |
diff --git a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c index e3744eb8eccb..dd38011ee0b7 100644 --- a/drivers/mtd/nand/autcpu12.c +++ b/drivers/mtd/nand/autcpu12.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * | 20 | * |
21 | * 02-12-2002 TG Cleanup of module params | 21 | * 02-12-2002 TG Cleanup of module params |
22 | * | 22 | * |
23 | * 02-20-2002 TG adjusted for different rd/wr adress support | 23 | * 02-20-2002 TG adjusted for different rd/wr address support |
24 | * added support for read device ready/busy line | 24 | * added support for read device ready/busy line |
25 | * added page_cache | 25 | * added page_cache |
26 | * | 26 | * |
@@ -144,7 +144,7 @@ static int __init autcpu12_init(void) | |||
144 | goto out; | 144 | goto out; |
145 | } | 145 | } |
146 | 146 | ||
147 | /* map physical adress */ | 147 | /* map physical address */ |
148 | autcpu12_fio_base = ioremap(AUTCPU12_PHYS_SMC, SZ_1K); | 148 | autcpu12_fio_base = ioremap(AUTCPU12_PHYS_SMC, SZ_1K); |
149 | if (!autcpu12_fio_base) { | 149 | if (!autcpu12_fio_base) { |
150 | printk("Ioremap autcpu12 SmartMedia Card failed\n"); | 150 | printk("Ioremap autcpu12 SmartMedia Card failed\n"); |
@@ -227,7 +227,7 @@ static void __exit autcpu12_cleanup(void) | |||
227 | /* Release resources, unregister device */ | 227 | /* Release resources, unregister device */ |
228 | nand_release(autcpu12_mtd); | 228 | nand_release(autcpu12_mtd); |
229 | 229 | ||
230 | /* unmap physical adress */ | 230 | /* unmap physical address */ |
231 | iounmap(autcpu12_fio_base); | 231 | iounmap(autcpu12_fio_base); |
232 | 232 | ||
233 | /* Free the MTD device structure */ | 233 | /* Free the MTD device structure */ |
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c index 1657ecd74881..a52f3a737c39 100644 --- a/drivers/mtd/nand/bf5xx_nand.c +++ b/drivers/mtd/nand/bf5xx_nand.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * http://blackfin.uclinux.org/ | 4 | * http://blackfin.uclinux.org/ |
5 | * Bryan Wu <bryan.wu@analog.com> | 5 | * Bryan Wu <bryan.wu@analog.com> |
6 | * | 6 | * |
7 | * Blackfin BF5xx on-chip NAND flash controler driver | 7 | * Blackfin BF5xx on-chip NAND flash controller driver |
8 | * | 8 | * |
9 | * Derived from drivers/mtd/nand/s3c2410.c | 9 | * Derived from drivers/mtd/nand/s3c2410.c |
10 | * Copyright (c) 2007 Ben Dooks <ben@simtec.co.uk> | 10 | * Copyright (c) 2007 Ben Dooks <ben@simtec.co.uk> |
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c index 89deff007116..19e1594421a4 100644 --- a/drivers/mtd/nand/cs553x_nand.c +++ b/drivers/mtd/nand/cs553x_nand.c | |||
@@ -337,7 +337,7 @@ static void __exit cs553x_cleanup(void) | |||
337 | nand_release(cs553x_mtd[i]); | 337 | nand_release(cs553x_mtd[i]); |
338 | cs553x_mtd[i] = NULL; | 338 | cs553x_mtd[i] = NULL; |
339 | 339 | ||
340 | /* unmap physical adress */ | 340 | /* unmap physical address */ |
341 | iounmap(mmio_base); | 341 | iounmap(mmio_base); |
342 | 342 | ||
343 | /* Free the MTD device structure */ | 343 | /* Free the MTD device structure */ |
diff --git a/drivers/mtd/nand/edb7312.c b/drivers/mtd/nand/edb7312.c index 0146cdc48039..ba67bbec20d3 100644 --- a/drivers/mtd/nand/edb7312.c +++ b/drivers/mtd/nand/edb7312.c | |||
@@ -125,7 +125,7 @@ static int __init ep7312_init(void) | |||
125 | return -ENOMEM; | 125 | return -ENOMEM; |
126 | } | 126 | } |
127 | 127 | ||
128 | /* map physical adress */ | 128 | /* map physical address */ |
129 | ep7312_fio_base = ioremap(ep7312_fio_pbase, SZ_1K); | 129 | ep7312_fio_base = ioremap(ep7312_fio_pbase, SZ_1K); |
130 | if (!ep7312_fio_base) { | 130 | if (!ep7312_fio_base) { |
131 | printk("ioremap EDB7312 NAND flash failed\n"); | 131 | printk("ioremap EDB7312 NAND flash failed\n"); |
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index e29c1da7f56e..ddd4fc019042 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
@@ -89,7 +89,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to, | |||
89 | struct mtd_oob_ops *ops); | 89 | struct mtd_oob_ops *ops); |
90 | 90 | ||
91 | /* | 91 | /* |
92 | * For devices which display every fart in the system on a seperate LED. Is | 92 | * For devices which display every fart in the system on a separate LED. Is |
93 | * compiled away when LED support is disabled. | 93 | * compiled away when LED support is disabled. |
94 | */ | 94 | */ |
95 | DEFINE_LED_TRIGGER(nand_led_trigger); | 95 | DEFINE_LED_TRIGGER(nand_led_trigger); |
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index 10490b48d9f7..bb885d1fcab5 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c | |||
@@ -210,7 +210,7 @@ MODULE_PARM_DESC(overridesize, "Specifies the NAND Flash size overriding the I | |||
210 | #define STATE_CMD_RESET 0x0000000C /* reset */ | 210 | #define STATE_CMD_RESET 0x0000000C /* reset */ |
211 | #define STATE_CMD_MASK 0x0000000F /* command states mask */ | 211 | #define STATE_CMD_MASK 0x0000000F /* command states mask */ |
212 | 212 | ||
213 | /* After an addres is input, the simulator goes to one of these states */ | 213 | /* After an address is input, the simulator goes to one of these states */ |
214 | #define STATE_ADDR_PAGE 0x00000010 /* full (row, column) address is accepted */ | 214 | #define STATE_ADDR_PAGE 0x00000010 /* full (row, column) address is accepted */ |
215 | #define STATE_ADDR_SEC 0x00000020 /* sector address was accepted */ | 215 | #define STATE_ADDR_SEC 0x00000020 /* sector address was accepted */ |
216 | #define STATE_ADDR_ZERO 0x00000030 /* one byte zero address was accepted */ | 216 | #define STATE_ADDR_ZERO 0x00000030 /* one byte zero address was accepted */ |
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 66f76e9618dd..2bd0737572c6 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * | 8 | * |
9 | * Changelog: | 9 | * Changelog: |
10 | * 21-Sep-2004 BJD Initial version | 10 | * 21-Sep-2004 BJD Initial version |
11 | * 23-Sep-2004 BJD Mulitple device support | 11 | * 23-Sep-2004 BJD Multiple device support |
12 | * 28-Sep-2004 BJD Fixed ECC placement for Hardware mode | 12 | * 28-Sep-2004 BJD Fixed ECC placement for Hardware mode |
13 | * 12-Oct-2004 BJD Fixed errors in use of platform data | 13 | * 12-Oct-2004 BJD Fixed errors in use of platform data |
14 | * 18-Feb-2005 BJD Fix sparse errors | 14 | * 18-Feb-2005 BJD Fix sparse errors |
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c index 51c7288ab49a..033f8800b1e6 100644 --- a/drivers/mtd/nand/sharpsl.c +++ b/drivers/mtd/nand/sharpsl.c | |||
@@ -165,7 +165,7 @@ static int __init sharpsl_nand_init(void) | |||
165 | return -ENOMEM; | 165 | return -ENOMEM; |
166 | } | 166 | } |
167 | 167 | ||
168 | /* map physical adress */ | 168 | /* map physical address */ |
169 | sharpsl_io_base = ioremap(sharpsl_phys_base, 0x1000); | 169 | sharpsl_io_base = ioremap(sharpsl_phys_base, 0x1000); |
170 | if (!sharpsl_io_base) { | 170 | if (!sharpsl_io_base) { |
171 | printk("ioremap to access Sharp SL NAND chip failed\n"); | 171 | printk("ioremap to access Sharp SL NAND chip failed\n"); |
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c index 067262ee8df0..0513cbc8834d 100644 --- a/drivers/mtd/nftlmount.c +++ b/drivers/mtd/nftlmount.c | |||
@@ -429,7 +429,7 @@ static void check_sectors_in_chain(struct NFTLrecord *nftl, unsigned int first_b | |||
429 | } | 429 | } |
430 | } | 430 | } |
431 | 431 | ||
432 | /* calc_chain_lenght: Walk through a Virtual Unit Chain and estimate chain length */ | 432 | /* calc_chain_length: Walk through a Virtual Unit Chain and estimate chain length */ |
433 | static int calc_chain_length(struct NFTLrecord *nftl, unsigned int first_block) | 433 | static int calc_chain_length(struct NFTLrecord *nftl, unsigned int first_block) |
434 | { | 434 | { |
435 | unsigned int length = 0, block = first_block; | 435 | unsigned int length = 0, block = first_block; |
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index d5459a8056b1..2eb82aba4a8b 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Many modifications, and currently maintained, by | 9 | * Many modifications, and currently maintained, by |
10 | * Philip Blundell <philb@gnu.org> | 10 | * Philip Blundell <philb@gnu.org> |
11 | * Added the Compaq LTE Alan Cox <alan@redhat.com> | 11 | * Added the Compaq LTE Alan Cox <alan@redhat.com> |
12 | * Added MCA support Adam Fritzler <mid@auk.cx> | 12 | * Added MCA support Adam Fritzler |
13 | * | 13 | * |
14 | * Note - this driver is experimental still - it has problems on faster | 14 | * Note - this driver is experimental still - it has problems on faster |
15 | * machines. Someone needs to sit down and go through it line by line with | 15 | * machines. Someone needs to sit down and go through it line by line with |
diff --git a/drivers/net/irda/ali-ircc.h b/drivers/net/irda/ali-ircc.h index e489c6661ee8..07876578887f 100644 --- a/drivers/net/irda/ali-ircc.h +++ b/drivers/net/irda/ali-ircc.h | |||
@@ -173,13 +173,13 @@ struct st_fifo { | |||
173 | 173 | ||
174 | struct frame_cb { | 174 | struct frame_cb { |
175 | void *start; /* Start of frame in DMA mem */ | 175 | void *start; /* Start of frame in DMA mem */ |
176 | int len; /* Lenght of frame in DMA mem */ | 176 | int len; /* Length of frame in DMA mem */ |
177 | }; | 177 | }; |
178 | 178 | ||
179 | struct tx_fifo { | 179 | struct tx_fifo { |
180 | struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */ | 180 | struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */ |
181 | int ptr; /* Currently being sent */ | 181 | int ptr; /* Currently being sent */ |
182 | int len; /* Lenght of queue */ | 182 | int len; /* Length of queue */ |
183 | int free; /* Next free slot */ | 183 | int free; /* Next free slot */ |
184 | void *tail; /* Next free start in DMA mem */ | 184 | void *tail; /* Next free start in DMA mem */ |
185 | }; | 185 | }; |
diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h index bbdc97ff83ca..29398a4f73fd 100644 --- a/drivers/net/irda/nsc-ircc.h +++ b/drivers/net/irda/nsc-ircc.h | |||
@@ -231,13 +231,13 @@ struct st_fifo { | |||
231 | 231 | ||
232 | struct frame_cb { | 232 | struct frame_cb { |
233 | void *start; /* Start of frame in DMA mem */ | 233 | void *start; /* Start of frame in DMA mem */ |
234 | int len; /* Lenght of frame in DMA mem */ | 234 | int len; /* Length of frame in DMA mem */ |
235 | }; | 235 | }; |
236 | 236 | ||
237 | struct tx_fifo { | 237 | struct tx_fifo { |
238 | struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */ | 238 | struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */ |
239 | int ptr; /* Currently being sent */ | 239 | int ptr; /* Currently being sent */ |
240 | int len; /* Lenght of queue */ | 240 | int len; /* Length of queue */ |
241 | int free; /* Next free slot */ | 241 | int free; /* Next free slot */ |
242 | void *tail; /* Next free start in DMA mem */ | 242 | void *tail; /* Next free start in DMA mem */ |
243 | }; | 243 | }; |
diff --git a/drivers/net/irda/via-ircc.h b/drivers/net/irda/via-ircc.h index 204b1b34ffc7..9d012f0dbd30 100644 --- a/drivers/net/irda/via-ircc.h +++ b/drivers/net/irda/via-ircc.h | |||
@@ -54,13 +54,13 @@ struct st_fifo { | |||
54 | 54 | ||
55 | struct frame_cb { | 55 | struct frame_cb { |
56 | void *start; /* Start of frame in DMA mem */ | 56 | void *start; /* Start of frame in DMA mem */ |
57 | int len; /* Lenght of frame in DMA mem */ | 57 | int len; /* Length of frame in DMA mem */ |
58 | }; | 58 | }; |
59 | 59 | ||
60 | struct tx_fifo { | 60 | struct tx_fifo { |
61 | struct frame_cb queue[MAX_TX_WINDOW + 2]; /* Info about frames in queue */ | 61 | struct frame_cb queue[MAX_TX_WINDOW + 2]; /* Info about frames in queue */ |
62 | int ptr; /* Currently being sent */ | 62 | int ptr; /* Currently being sent */ |
63 | int len; /* Lenght of queue */ | 63 | int len; /* Length of queue */ |
64 | int free; /* Next free slot */ | 64 | int free; /* Next free slot */ |
65 | void *tail; /* Next free start in DMA mem */ | 65 | void *tail; /* Next free start in DMA mem */ |
66 | }; | 66 | }; |
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c index c429a5002dd6..0c5447dac03b 100644 --- a/drivers/net/lib8390.c +++ b/drivers/net/lib8390.c | |||
@@ -148,7 +148,7 @@ static void __NS8390_init(struct net_device *dev, int startp); | |||
148 | * | 148 | * |
149 | * "The author (me) didn't use spin_lock_irqsave because the slowness of the | 149 | * "The author (me) didn't use spin_lock_irqsave because the slowness of the |
150 | * card means that approach caused horrible problems like losing serial data | 150 | * card means that approach caused horrible problems like losing serial data |
151 | * at 38400 baud on some chips. Rememeber many 8390 nics on PCI were ISA | 151 | * at 38400 baud on some chips. Remember many 8390 nics on PCI were ISA |
152 | * chips with FPGA front ends. | 152 | * chips with FPGA front ends. |
153 | * | 153 | * |
154 | * Ok the logic behind the 8390 is very simple: | 154 | * Ok the logic behind the 8390 is very simple: |
diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c index 62b01328c496..889f98724610 100644 --- a/drivers/net/skfp/ess.c +++ b/drivers/net/skfp/ess.c | |||
@@ -598,7 +598,7 @@ static void ess_send_alc_req(struct s_smc *smc) | |||
598 | req->cmd.sba_cmd = REQUEST_ALLOCATION ; | 598 | req->cmd.sba_cmd = REQUEST_ALLOCATION ; |
599 | 599 | ||
600 | /* | 600 | /* |
601 | * set the parameter type and parameter lenght of all used | 601 | * set the parameter type and parameter length of all used |
602 | * parameters | 602 | * parameters |
603 | */ | 603 | */ |
604 | 604 | ||
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c index a45205da8033..76dc8adc9441 100644 --- a/drivers/net/skfp/fplustm.c +++ b/drivers/net/skfp/fplustm.c | |||
@@ -398,7 +398,7 @@ static void copy_tx_mac(struct s_smc *smc, u_long td, struct fddi_mac *mac, | |||
398 | /* u_long td; transmit descriptor */ | 398 | /* u_long td; transmit descriptor */ |
399 | /* struct fddi_mac *mac; mac frame pointer */ | 399 | /* struct fddi_mac *mac; mac frame pointer */ |
400 | /* unsigned off; start address within buffer memory */ | 400 | /* unsigned off; start address within buffer memory */ |
401 | /* int len ; lenght of the frame including the FC */ | 401 | /* int len ; length of the frame including the FC */ |
402 | { | 402 | { |
403 | int i ; | 403 | int i ; |
404 | u_int *p ; | 404 | u_int *p ; |
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c index 8a430a366547..46e339315656 100644 --- a/drivers/net/skfp/hwmtm.c +++ b/drivers/net/skfp/hwmtm.c | |||
@@ -1185,7 +1185,7 @@ void process_receive(struct s_smc *smc) | |||
1185 | 1185 | ||
1186 | DB_RX("frame length = %d",len,0,4) ; | 1186 | DB_RX("frame length = %d",len,0,4) ; |
1187 | /* | 1187 | /* |
1188 | * check the frame_lenght and all error flags | 1188 | * check the frame_length and all error flags |
1189 | */ | 1189 | */ |
1190 | if (rfsw & (RX_MSRABT|RX_FS_E|RX_FS_CRC|RX_FS_IMPL)){ | 1190 | if (rfsw & (RX_MSRABT|RX_FS_E|RX_FS_CRC|RX_FS_IMPL)){ |
1191 | if (rfsw & RD_S_MSRABT) { | 1191 | if (rfsw & RD_S_MSRABT) { |
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c index 124cfd4fbcf4..7a7de0469eae 100644 --- a/drivers/net/tokenring/abyss.c +++ b/drivers/net/tokenring/abyss.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * - Madge Smart 16/4 PCI Mk2 | 10 | * - Madge Smart 16/4 PCI Mk2 |
11 | * | 11 | * |
12 | * Maintainer(s): | 12 | * Maintainer(s): |
13 | * AF Adam Fritzler mid@auk.cx | 13 | * AF Adam Fritzler |
14 | * | 14 | * |
15 | * Modification History: | 15 | * Modification History: |
16 | * 30-Dec-99 AF Split off from the tms380tr driver. | 16 | * 30-Dec-99 AF Split off from the tms380tr driver. |
diff --git a/drivers/net/tokenring/abyss.h b/drivers/net/tokenring/abyss.h index 0ee6e4f085b1..b0a473b89133 100644 --- a/drivers/net/tokenring/abyss.h +++ b/drivers/net/tokenring/abyss.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * abyss.h: Header for the abyss tms380tr module | 2 | * abyss.h: Header for the abyss tms380tr module |
3 | * | 3 | * |
4 | * Authors: | 4 | * Authors: |
5 | * - Adam Fritzler <mid@auk.cx> | 5 | * - Adam Fritzler |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #ifndef __LINUX_MADGETR_H | 8 | #ifndef __LINUX_MADGETR_H |
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c index 5a4151362fc0..c9c5a2b1ed9e 100644 --- a/drivers/net/tokenring/madgemc.c +++ b/drivers/net/tokenring/madgemc.c | |||
@@ -11,7 +11,7 @@ | |||
11 | * - Madge Smart 16/4 Ringnode MC32 (??) | 11 | * - Madge Smart 16/4 Ringnode MC32 (??) |
12 | * | 12 | * |
13 | * Maintainer(s): | 13 | * Maintainer(s): |
14 | * AF Adam Fritzler mid@auk.cx | 14 | * AF Adam Fritzler |
15 | * | 15 | * |
16 | * Modification History: | 16 | * Modification History: |
17 | * 16-Jan-00 AF Created | 17 | * 16-Jan-00 AF Created |
diff --git a/drivers/net/tokenring/madgemc.h b/drivers/net/tokenring/madgemc.h index 2dd822203809..fe88e272c531 100644 --- a/drivers/net/tokenring/madgemc.h +++ b/drivers/net/tokenring/madgemc.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * madgemc.h: Header for the madgemc tms380tr module | 2 | * madgemc.h: Header for the madgemc tms380tr module |
3 | * | 3 | * |
4 | * Authors: | 4 | * Authors: |
5 | * - Adam Fritzler <mid@auk.cx> | 5 | * - Adam Fritzler |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #ifndef __LINUX_MADGEMC_H | 8 | #ifndef __LINUX_MADGEMC_H |
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c index ca6b65919b3d..00ea94513460 100644 --- a/drivers/net/tokenring/proteon.c +++ b/drivers/net/tokenring/proteon.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * - Proteon 1392, 1392+ | 12 | * - Proteon 1392, 1392+ |
13 | * | 13 | * |
14 | * Maintainer(s): | 14 | * Maintainer(s): |
15 | * AF Adam Fritzler mid@auk.cx | 15 | * AF Adam Fritzler |
16 | * JF Jochen Friedrich jochen@scram.de | 16 | * JF Jochen Friedrich jochen@scram.de |
17 | * | 17 | * |
18 | * Modification History: | 18 | * Modification History: |
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c index 32e8d5a9f958..41b6999a0f33 100644 --- a/drivers/net/tokenring/skisa.c +++ b/drivers/net/tokenring/skisa.c | |||
@@ -13,7 +13,7 @@ | |||
13 | * - SysKonnect TR4/16(+) ISA (SK-4190) | 13 | * - SysKonnect TR4/16(+) ISA (SK-4190) |
14 | * | 14 | * |
15 | * Maintainer(s): | 15 | * Maintainer(s): |
16 | * AF Adam Fritzler mid@auk.cx | 16 | * AF Adam Fritzler |
17 | * JF Jochen Friedrich jochen@scram.de | 17 | * JF Jochen Friedrich jochen@scram.de |
18 | * | 18 | * |
19 | * Modification History: | 19 | * Modification History: |
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index d5fa36d36515..d07c4523c847 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c | |||
@@ -30,7 +30,7 @@ | |||
30 | * Maintainer(s): | 30 | * Maintainer(s): |
31 | * JS Jay Schulist jschlst@samba.org | 31 | * JS Jay Schulist jschlst@samba.org |
32 | * CG Christoph Goos cgoos@syskonnect.de | 32 | * CG Christoph Goos cgoos@syskonnect.de |
33 | * AF Adam Fritzler mid@auk.cx | 33 | * AF Adam Fritzler |
34 | * MLP Mike Phillips phillim@amtrak.com | 34 | * MLP Mike Phillips phillim@amtrak.com |
35 | * JF Jochen Friedrich jochen@scram.de | 35 | * JF Jochen Friedrich jochen@scram.de |
36 | * | 36 | * |
diff --git a/drivers/net/tokenring/tms380tr.h b/drivers/net/tokenring/tms380tr.h index 7daf74e31ccd..7af76d708849 100644 --- a/drivers/net/tokenring/tms380tr.h +++ b/drivers/net/tokenring/tms380tr.h | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Authors: | 4 | * Authors: |
5 | * - Christoph Goos <cgoos@syskonnect.de> | 5 | * - Christoph Goos <cgoos@syskonnect.de> |
6 | * - Adam Fritzler <mid@auk.cx> | 6 | * - Adam Fritzler |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #ifndef __LINUX_TMS380TR_H | 9 | #ifndef __LINUX_TMS380TR_H |
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c index 1c18f782f522..5f0ee880cfff 100644 --- a/drivers/net/tokenring/tmspci.c +++ b/drivers/net/tokenring/tmspci.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * - 3Com 3C339 Token Link Velocity | 14 | * - 3Com 3C339 Token Link Velocity |
15 | * | 15 | * |
16 | * Maintainer(s): | 16 | * Maintainer(s): |
17 | * AF Adam Fritzler mid@auk.cx | 17 | * AF Adam Fritzler |
18 | * | 18 | * |
19 | * Modification History: | 19 | * Modification History: |
20 | * 30-Dec-99 AF Split off from the tms380tr driver. | 20 | * 30-Dec-99 AF Split off from the tms380tr driver. |
diff --git a/drivers/net/wan/cycx_drv.c b/drivers/net/wan/cycx_drv.c index d347d59db656..d14e6678deed 100644 --- a/drivers/net/wan/cycx_drv.c +++ b/drivers/net/wan/cycx_drv.c | |||
@@ -322,7 +322,7 @@ static int cycx_data_boot(void __iomem *addr, u8 *code, u32 len) | |||
322 | void __iomem *pt_boot_cmd = addr + CMD_OFFSET; | 322 | void __iomem *pt_boot_cmd = addr + CMD_OFFSET; |
323 | u32 i; | 323 | u32 i; |
324 | 324 | ||
325 | /* boot buffer lenght */ | 325 | /* boot buffer length */ |
326 | writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16)); | 326 | writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16)); |
327 | writew(GEN_DEFPAR, pt_boot_cmd); | 327 | writew(GEN_DEFPAR, pt_boot_cmd); |
328 | 328 | ||
@@ -353,7 +353,7 @@ static int cycx_code_boot(void __iomem *addr, u8 *code, u32 len) | |||
353 | void __iomem *pt_boot_cmd = addr + CMD_OFFSET; | 353 | void __iomem *pt_boot_cmd = addr + CMD_OFFSET; |
354 | u32 i; | 354 | u32 i; |
355 | 355 | ||
356 | /* boot buffer lenght */ | 356 | /* boot buffer length */ |
357 | writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16)); | 357 | writew(CFM_LOAD_BUFSZ, pt_boot_cmd + sizeof(u16)); |
358 | writew(GEN_DEFPAR, pt_boot_cmd); | 358 | writew(GEN_DEFPAR, pt_boot_cmd); |
359 | 359 | ||
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c index 9a61188b62e9..69f94c92b32d 100644 --- a/drivers/net/wireless/libertas/scan.c +++ b/drivers/net/wireless/libertas/scan.c | |||
@@ -1473,7 +1473,7 @@ int lbs_get_scan(struct net_device *dev, struct iw_request_info *info, | |||
1473 | * Called via lbs_prepare_and_send_command(priv, CMD_802_11_SCAN, ...) | 1473 | * Called via lbs_prepare_and_send_command(priv, CMD_802_11_SCAN, ...) |
1474 | * from cmd.c | 1474 | * from cmd.c |
1475 | * | 1475 | * |
1476 | * Sends a fixed lenght data part (specifying the BSS type and BSSID filters) | 1476 | * Sends a fixed length data part (specifying the BSS type and BSSID filters) |
1477 | * as well as a variable number/length of TLVs to the firmware. | 1477 | * as well as a variable number/length of TLVs to the firmware. |
1478 | * | 1478 | * |
1479 | * @param priv A pointer to struct lbs_private structure | 1479 | * @param priv A pointer to struct lbs_private structure |
diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c index e503c9c98032..f4076aeb2098 100644 --- a/drivers/nubus/nubus.c +++ b/drivers/nubus/nubus.c | |||
@@ -352,7 +352,7 @@ nubus_find_rsrc(struct nubus_dir* dir, unsigned char rsrc_type, | |||
352 | resource blocks. */ | 352 | resource blocks. */ |
353 | 353 | ||
354 | /* FIXME: A lot of this stuff will eventually be useful after | 354 | /* FIXME: A lot of this stuff will eventually be useful after |
355 | initializaton, for intelligently probing Ethernet and video chips, | 355 | initialization, for intelligently probing Ethernet and video chips, |
356 | among other things. The rest of it should go in the /proc code. | 356 | among other things. The rest of it should go in the /proc code. |
357 | For now, we just use it to give verbose boot logs. */ | 357 | For now, we just use it to give verbose boot logs. */ |
358 | 358 | ||
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index 7c60cbd85dc8..ca52307b8f40 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
@@ -363,7 +363,7 @@ ccio_alloc_range(struct ioc *ioc, size_t size) | |||
363 | if (pages_needed <= 8) { | 363 | if (pages_needed <= 8) { |
364 | /* | 364 | /* |
365 | * LAN traffic will not thrash the TLB IFF the same NIC | 365 | * LAN traffic will not thrash the TLB IFF the same NIC |
366 | * uses 8 adjacent pages to map seperate payload data. | 366 | * uses 8 adjacent pages to map separate payload data. |
367 | * ie the same byte in the resource bit map. | 367 | * ie the same byte in the resource bit map. |
368 | */ | 368 | */ |
369 | #if 0 | 369 | #if 0 |
@@ -1589,7 +1589,7 @@ static int __init ccio_probe(struct parisc_device *dev) | |||
1589 | } | 1589 | } |
1590 | 1590 | ||
1591 | /** | 1591 | /** |
1592 | * ccio_init - ccio initalization procedure. | 1592 | * ccio_init - ccio initialization procedure. |
1593 | * | 1593 | * |
1594 | * Register this driver. | 1594 | * Register this driver. |
1595 | */ | 1595 | */ |
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c index a728a7cd2fc8..65eee67aa2ae 100644 --- a/drivers/parisc/hppb.c +++ b/drivers/parisc/hppb.c | |||
@@ -95,7 +95,7 @@ static struct parisc_driver hppb_driver = { | |||
95 | }; | 95 | }; |
96 | 96 | ||
97 | /** | 97 | /** |
98 | * hppb_init - HP-PB bus initalization procedure. | 98 | * hppb_init - HP-PB bus initialization procedure. |
99 | * | 99 | * |
100 | * Register this driver. | 100 | * Register this driver. |
101 | */ | 101 | */ |
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c index 853a15f44f88..cd565bb4e1a9 100644 --- a/drivers/parport/probe.c +++ b/drivers/parport/probe.c | |||
@@ -163,7 +163,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer, | |||
163 | idlens[1] = idlens[0]+2; | 163 | idlens[1] = idlens[0]+2; |
164 | if (belen != lelen) { | 164 | if (belen != lelen) { |
165 | int off = 2; | 165 | int off = 2; |
166 | /* Don't try lenghts of 0x100 and 0x200 as 1 and 2 */ | 166 | /* Don't try lengths of 0x100 and 0x200 as 1 and 2 */ |
167 | if (idlens[0] <= 2) | 167 | if (idlens[0] <= 2) |
168 | off = 0; | 168 | off = 0; |
169 | idlens[off] = max(belen, lelen); | 169 | idlens[off] = max(belen, lelen); |
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c index c5e0d89c3ece..ec4c1253ebbb 100644 --- a/drivers/pcmcia/m32r_pcc.c +++ b/drivers/pcmcia/m32r_pcc.c | |||
@@ -368,7 +368,7 @@ static irqreturn_t pcc_interrupt(int irq, void *dev) | |||
368 | handled = 1; | 368 | handled = 1; |
369 | irc = pcc_get(i, PCIRC); | 369 | irc = pcc_get(i, PCIRC); |
370 | irc >>=16; | 370 | irc >>=16; |
371 | debug(2, "m32r-pcc:interrput: socket %d pcirc 0x%02x ", i, irc); | 371 | debug(2, "m32r-pcc:interrupt: socket %d pcirc 0x%02x ", i, irc); |
372 | if (!irc) | 372 | if (!irc) |
373 | continue; | 373 | continue; |
374 | 374 | ||
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index d182760f035b..4ea426a25909 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -851,7 +851,7 @@ static int m8xx_set_socket(struct pcmcia_socket *sock, socket_state_t * state) | |||
851 | I tried to control the CxOE signal with SS_OUTPUT_ENA, | 851 | I tried to control the CxOE signal with SS_OUTPUT_ENA, |
852 | but the reset signal seems connected via the 541. | 852 | but the reset signal seems connected via the 541. |
853 | If the CxOE is left high are some signals tristated and | 853 | If the CxOE is left high are some signals tristated and |
854 | no pullups are present -> the cards act wierd. | 854 | no pullups are present -> the cards act weird. |
855 | So right now the buffers are enabled if the power is on. */ | 855 | So right now the buffers are enabled if the power is on. */ |
856 | 856 | ||
857 | if (state->Vcc || state->Vpp) | 857 | if (state->Vcc || state->Vpp) |
diff --git a/drivers/scsi/NCR53C9x.h b/drivers/scsi/NCR53C9x.h index d85cb73a9f69..00a0ba040dba 100644 --- a/drivers/scsi/NCR53C9x.h +++ b/drivers/scsi/NCR53C9x.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* NCR53C9x.c: Defines and structures for the NCR53C9x generic driver. | 1 | /* NCR53C9x.c: Defines and structures for the NCR53C9x generic driver. |
2 | * | 2 | * |
3 | * Originaly esp.h: Defines and structures for the Sparc ESP | 3 | * Originally esp.h: Defines and structures for the Sparc ESP |
4 | * (Enhanced SCSI Processor) driver under Linux. | 4 | * (Enhanced SCSI Processor) driver under Linux. |
5 | * | 5 | * |
6 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 6 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c index 190568ebea3c..5a1471c370fa 100644 --- a/drivers/scsi/aha1542.c +++ b/drivers/scsi/aha1542.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * Modified by Chris Faulhaber <jedgar@fxp.org> | 21 | * Modified by Chris Faulhaber <jedgar@fxp.org> |
22 | * Added module command-line options | 22 | * Added module command-line options |
23 | * 19-Jul-99 | 23 | * 19-Jul-99 |
24 | * Modified by Adam Fritzler <mid@auk.cx> | 24 | * Modified by Adam Fritzler |
25 | * Added proper detection of the AHA-1640 (MCA version of AHA-1540) | 25 | * Added proper detection of the AHA-1640 (MCA version of AHA-1540) |
26 | */ | 26 | */ |
27 | 27 | ||
diff --git a/drivers/scsi/aic7xxx/aic79xx_inline.h b/drivers/scsi/aic7xxx/aic79xx_inline.h index 2ceb67f4af2a..45e55575a0fa 100644 --- a/drivers/scsi/aic7xxx/aic79xx_inline.h +++ b/drivers/scsi/aic7xxx/aic79xx_inline.h | |||
@@ -417,7 +417,7 @@ ahd_targetcmd_offset(struct ahd_softc *ahd, u_int index) | |||
417 | - (uint8_t *)ahd->qoutfifo); | 417 | - (uint8_t *)ahd->qoutfifo); |
418 | } | 418 | } |
419 | 419 | ||
420 | /*********************** Miscelaneous Support Functions ***********************/ | 420 | /*********************** Miscellaneous Support Functions ***********************/ |
421 | static __inline struct ahd_initiator_tinfo * | 421 | static __inline struct ahd_initiator_tinfo * |
422 | ahd_fetch_transinfo(struct ahd_softc *ahd, | 422 | ahd_fetch_transinfo(struct ahd_softc *ahd, |
423 | char channel, u_int our_id, | 423 | char channel, u_int our_id, |
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 014654792901..72fccd9f40df 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
@@ -325,7 +325,7 @@ MODULE_PARM_DESC(aic79xx, | |||
325 | " verbose Enable verbose/diagnostic logging\n" | 325 | " verbose Enable verbose/diagnostic logging\n" |
326 | " allow_memio Allow device registers to be memory mapped\n" | 326 | " allow_memio Allow device registers to be memory mapped\n" |
327 | " debug Bitmask of debug values to enable\n" | 327 | " debug Bitmask of debug values to enable\n" |
328 | " no_reset Supress initial bus resets\n" | 328 | " no_reset Suppress initial bus resets\n" |
329 | " extended Enable extended geometry on all controllers\n" | 329 | " extended Enable extended geometry on all controllers\n" |
330 | " periodic_otag Send an ordered tagged transaction\n" | 330 | " periodic_otag Send an ordered tagged transaction\n" |
331 | " periodically to prevent tag starvation.\n" | 331 | " periodically to prevent tag starvation.\n" |
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c index df853676e66a..c9f79fdf9131 100644 --- a/drivers/scsi/aic7xxx/aic79xx_pci.c +++ b/drivers/scsi/aic7xxx/aic79xx_pci.c | |||
@@ -979,7 +979,7 @@ ahd_aic790X_setup(struct ahd_softc *ahd) | |||
979 | | AHD_FAINT_LED_BUG; | 979 | | AHD_FAINT_LED_BUG; |
980 | 980 | ||
981 | /* | 981 | /* |
982 | * IO Cell paramter setup. | 982 | * IO Cell parameter setup. |
983 | */ | 983 | */ |
984 | AHD_SET_PRECOMP(ahd, AHD_PRECOMP_CUTBACK_29); | 984 | AHD_SET_PRECOMP(ahd, AHD_PRECOMP_CUTBACK_29); |
985 | 985 | ||
@@ -1006,7 +1006,7 @@ ahd_aic790X_setup(struct ahd_softc *ahd) | |||
1006 | ahd->bugs |= AHD_INTCOLLISION_BUG|AHD_ABORT_LQI_BUG; | 1006 | ahd->bugs |= AHD_INTCOLLISION_BUG|AHD_ABORT_LQI_BUG; |
1007 | 1007 | ||
1008 | /* | 1008 | /* |
1009 | * IO Cell paramter setup. | 1009 | * IO Cell parameter setup. |
1010 | */ | 1010 | */ |
1011 | AHD_SET_PRECOMP(ahd, AHD_PRECOMP_CUTBACK_29); | 1011 | AHD_SET_PRECOMP(ahd, AHD_PRECOMP_CUTBACK_29); |
1012 | AHD_SET_SLEWRATE(ahd, AHD_SLEWRATE_DEF_REVB); | 1012 | AHD_SET_SLEWRATE(ahd, AHD_SLEWRATE_DEF_REVB); |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_inline.h b/drivers/scsi/aic7xxx/aic7xxx_inline.h index 8e1954cdd84f..cba2f23bbe79 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_inline.h +++ b/drivers/scsi/aic7xxx/aic7xxx_inline.h | |||
@@ -229,7 +229,7 @@ ahc_name(struct ahc_softc *ahc) | |||
229 | return (ahc->name); | 229 | return (ahc->name); |
230 | } | 230 | } |
231 | 231 | ||
232 | /*********************** Miscelaneous Support Functions ***********************/ | 232 | /*********************** Miscellaneous Support Functions ***********************/ |
233 | 233 | ||
234 | static __inline void ahc_update_residual(struct ahc_softc *ahc, | 234 | static __inline void ahc_update_residual(struct ahc_softc *ahc, |
235 | struct scb *scb); | 235 | struct scb *scb); |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index 99a3b33a3233..282aff6f852e 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c | |||
@@ -347,7 +347,7 @@ MODULE_PARM_DESC(aic7xxx, | |||
347 | " debug Bitmask of debug values to enable\n" | 347 | " debug Bitmask of debug values to enable\n" |
348 | " no_probe Toggle EISA/VLB controller probing\n" | 348 | " no_probe Toggle EISA/VLB controller probing\n" |
349 | " probe_eisa_vl Toggle EISA/VLB controller probing\n" | 349 | " probe_eisa_vl Toggle EISA/VLB controller probing\n" |
350 | " no_reset Supress initial bus resets\n" | 350 | " no_reset Suppress initial bus resets\n" |
351 | " extended Enable extended geometry on all controllers\n" | 351 | " extended Enable extended geometry on all controllers\n" |
352 | " periodic_otag Send an ordered tagged transaction\n" | 352 | " periodic_otag Send an ordered tagged transaction\n" |
353 | " periodically to prevent tag starvation.\n" | 353 | " periodically to prevent tag starvation.\n" |
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 73270ff892d9..2074701f7e76 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -7053,7 +7053,7 @@ static pci_ers_result_t ipr_pci_error_detected(struct pci_dev *pdev, | |||
7053 | * where it can accept new commands. | 7053 | * where it can accept new commands. |
7054 | 7054 | ||
7055 | * Return value: | 7055 | * Return value: |
7056 | * 0 on sucess / -EIO on failure | 7056 | * 0 on success / -EIO on failure |
7057 | **/ | 7057 | **/ |
7058 | static int __devinit ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg) | 7058 | static int __devinit ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg) |
7059 | { | 7059 | { |
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 7505cca8e68e..bb152fb9fec7 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c | |||
@@ -1309,7 +1309,7 @@ ips_intr_copperhead(ips_ha_t * ha) | |||
1309 | cstatus.value = (*ha->func.statupd) (ha); | 1309 | cstatus.value = (*ha->func.statupd) (ha); |
1310 | 1310 | ||
1311 | if (cstatus.fields.command_id > (IPS_MAX_CMDS - 1)) { | 1311 | if (cstatus.fields.command_id > (IPS_MAX_CMDS - 1)) { |
1312 | /* Spurious Interupt ? */ | 1312 | /* Spurious Interrupt ? */ |
1313 | continue; | 1313 | continue; |
1314 | } | 1314 | } |
1315 | 1315 | ||
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h index f26b9538affe..83567b9755b4 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h | |||
@@ -325,7 +325,7 @@ struct lpfc_vport { | |||
325 | 325 | ||
326 | #define WORKER_MBOX_TMO 0x100 /* hba: MBOX timeout */ | 326 | #define WORKER_MBOX_TMO 0x100 /* hba: MBOX timeout */ |
327 | #define WORKER_HB_TMO 0x200 /* hba: Heart beat timeout */ | 327 | #define WORKER_HB_TMO 0x200 /* hba: Heart beat timeout */ |
328 | #define WORKER_FABRIC_BLOCK_TMO 0x400 /* hba: fabric block timout */ | 328 | #define WORKER_FABRIC_BLOCK_TMO 0x400 /* hba: fabric block timeout */ |
329 | #define WORKER_RAMP_DOWN_QUEUE 0x800 /* hba: Decrease Q depth */ | 329 | #define WORKER_RAMP_DOWN_QUEUE 0x800 /* hba: Decrease Q depth */ |
330 | #define WORKER_RAMP_UP_QUEUE 0x1000 /* hba: Increase Q depth */ | 330 | #define WORKER_RAMP_UP_QUEUE 0x1000 /* hba: Increase Q depth */ |
331 | 331 | ||
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c index dfc63f6ccd7b..7a9be4c5b7cb 100644 --- a/drivers/scsi/lpfc/lpfc_mbox.c +++ b/drivers/scsi/lpfc/lpfc_mbox.c | |||
@@ -880,7 +880,7 @@ lpfc_mbox_get(struct lpfc_hba * phba) | |||
880 | void | 880 | void |
881 | lpfc_mbox_cmpl_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq) | 881 | lpfc_mbox_cmpl_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq) |
882 | { | 882 | { |
883 | /* This function expects to be called from interupt context */ | 883 | /* This function expects to be called from interrupt context */ |
884 | spin_lock(&phba->hbalock); | 884 | spin_lock(&phba->hbalock); |
885 | list_add_tail(&mbq->list, &phba->sli.mboxq_cmpl); | 885 | list_add_tail(&mbq->list, &phba->sli.mboxq_cmpl); |
886 | spin_unlock(&phba->hbalock); | 886 | spin_unlock(&phba->hbalock); |
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index 6db77c00e3ee..9f041929aca5 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
@@ -3464,12 +3464,12 @@ megaraid_mbox_setup_device_map(adapter_t *adapter) | |||
3464 | /* | 3464 | /* |
3465 | * START: Interface for the common management module | 3465 | * START: Interface for the common management module |
3466 | * | 3466 | * |
3467 | * This is the module, which interfaces with the common mangement module to | 3467 | * This is the module, which interfaces with the common management module to |
3468 | * provide support for ioctl and sysfs | 3468 | * provide support for ioctl and sysfs |
3469 | */ | 3469 | */ |
3470 | 3470 | ||
3471 | /** | 3471 | /** |
3472 | * megaraid_cmm_register - register with the mangement module | 3472 | * megaraid_cmm_register - register with the management module |
3473 | * @adapter : HBA soft state | 3473 | * @adapter : HBA soft state |
3474 | * | 3474 | * |
3475 | * Register with the management module, which allows applications to issue | 3475 | * Register with the management module, which allows applications to issue |
@@ -3557,7 +3557,7 @@ megaraid_cmm_register(adapter_t *adapter) | |||
3557 | 3557 | ||
3558 | 3558 | ||
3559 | /** | 3559 | /** |
3560 | * megaraid_cmm_unregister - un-register with the mangement module | 3560 | * megaraid_cmm_unregister - un-register with the management module |
3561 | * @adapter : HBA soft state | 3561 | * @adapter : HBA soft state |
3562 | * | 3562 | * |
3563 | * Un-register with the management module. | 3563 | * Un-register with the management module. |
@@ -3579,7 +3579,7 @@ megaraid_cmm_unregister(adapter_t *adapter) | |||
3579 | * @kioc : CMM interface packet | 3579 | * @kioc : CMM interface packet |
3580 | * @action : command action | 3580 | * @action : command action |
3581 | * | 3581 | * |
3582 | * This routine is invoked whenever the Common Mangement Module (CMM) has a | 3582 | * This routine is invoked whenever the Common Management Module (CMM) has a |
3583 | * command for us. The 'action' parameter specifies if this is a new command | 3583 | * command for us. The 'action' parameter specifies if this is a new command |
3584 | * or otherwise. | 3584 | * or otherwise. |
3585 | */ | 3585 | */ |
@@ -3944,7 +3944,7 @@ megaraid_sysfs_get_ldmap_timeout(unsigned long data) | |||
3944 | * | 3944 | * |
3945 | * This routine will be called whenever user reads the logical drive | 3945 | * This routine will be called whenever user reads the logical drive |
3946 | * attributes, go get the current logical drive mapping table from the | 3946 | * attributes, go get the current logical drive mapping table from the |
3947 | * firmware. We use the managment API's to issue commands to the controller. | 3947 | * firmware. We use the management API's to issue commands to the controller. |
3948 | * | 3948 | * |
3949 | * NOTE: The commands issuance functionality is not generalized and | 3949 | * NOTE: The commands issuance functionality is not generalized and |
3950 | * implemented in context of "get ld map" command only. If required, the | 3950 | * implemented in context of "get ld map" command only. If required, the |
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index eb0784c9ff83..6226d88479f5 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c | |||
@@ -1094,7 +1094,7 @@ qla2x00_sns_rnn_id(scsi_qla_host_t *ha) | |||
1094 | } | 1094 | } |
1095 | 1095 | ||
1096 | /** | 1096 | /** |
1097 | * qla2x00_mgmt_svr_login() - Login to fabric Managment Service. | 1097 | * qla2x00_mgmt_svr_login() - Login to fabric Management Service. |
1098 | * @ha: HA context | 1098 | * @ha: HA context |
1099 | * | 1099 | * |
1100 | * Returns 0 on success. | 1100 | * Returns 0 on success. |
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h index accaf690eaf0..d6be0762eb91 100644 --- a/drivers/scsi/qla4xxx/ql4_def.h +++ b/drivers/scsi/qla4xxx/ql4_def.h | |||
@@ -121,7 +121,7 @@ | |||
121 | #define MAX_REQS_SERVICED_PER_INTR 16 | 121 | #define MAX_REQS_SERVICED_PER_INTR 16 |
122 | 122 | ||
123 | #define ISCSI_IPADDR_SIZE 4 /* IP address size */ | 123 | #define ISCSI_IPADDR_SIZE 4 /* IP address size */ |
124 | #define ISCSI_ALIAS_SIZE 32 /* ISCSI Alais name size */ | 124 | #define ISCSI_ALIAS_SIZE 32 /* ISCSI Alias name size */ |
125 | #define ISCSI_NAME_SIZE 0xE0 /* ISCSI Name size */ | 125 | #define ISCSI_NAME_SIZE 0xE0 /* ISCSI Name size */ |
126 | 126 | ||
127 | #define LSDW(x) ((u32)((u64)(x))) | 127 | #define LSDW(x) ((u32)((u64)(x))) |
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c index cbe0a17ced5f..49925f92555e 100644 --- a/drivers/scsi/qla4xxx/ql4_init.c +++ b/drivers/scsi/qla4xxx/ql4_init.c | |||
@@ -1098,7 +1098,7 @@ static int qla4xxx_start_firmware(struct scsi_qla_host *ha) | |||
1098 | } | 1098 | } |
1099 | config_chip = 1; | 1099 | config_chip = 1; |
1100 | 1100 | ||
1101 | /* Reset clears the semaphore, so aquire again */ | 1101 | /* Reset clears the semaphore, so acquire again */ |
1102 | if (ql4xxx_lock_drvr_wait(ha) != QLA_SUCCESS) | 1102 | if (ql4xxx_lock_drvr_wait(ha) != QLA_SUCCESS) |
1103 | return QLA_ERROR; | 1103 | return QLA_ERROR; |
1104 | } | 1104 | } |
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c index 91630baea532..3677fbb30b72 100644 --- a/drivers/scsi/scsi_tgt_lib.c +++ b/drivers/scsi/scsi_tgt_lib.c | |||
@@ -320,7 +320,7 @@ int scsi_tgt_queue_command(struct scsi_cmnd *cmd, u64 itn_id, | |||
320 | EXPORT_SYMBOL_GPL(scsi_tgt_queue_command); | 320 | EXPORT_SYMBOL_GPL(scsi_tgt_queue_command); |
321 | 321 | ||
322 | /* | 322 | /* |
323 | * This is run from a interrpt handler normally and the unmap | 323 | * This is run from a interrupt handler normally and the unmap |
324 | * needs process context so we must queue | 324 | * needs process context so we must queue |
325 | */ | 325 | */ |
326 | static void scsi_tgt_cmd_done(struct scsi_cmnd *cmd) | 326 | static void scsi_tgt_cmd_done(struct scsi_cmnd *cmd) |
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c index f2149d0bb999..43a964d635b4 100644 --- a/drivers/scsi/scsi_transport_sas.c +++ b/drivers/scsi/scsi_transport_sas.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | * The SAS transport class contains common code to deal with SAS HBAs, | 7 | * The SAS transport class contains common code to deal with SAS HBAs, |
8 | * an aproximated representation of SAS topologies in the driver model, | 8 | * an aproximated representation of SAS topologies in the driver model, |
9 | * and various sysfs attributes to expose these topologies and managment | 9 | * and various sysfs attributes to expose these topologies and management |
10 | * interfaces to userspace. | 10 | * interfaces to userspace. |
11 | * | 11 | * |
12 | * In addition to the basic SCSI core objects this transport class | 12 | * In addition to the basic SCSI core objects this transport class |
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 8a053ea21e1d..4fa7927997ad 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -1295,8 +1295,8 @@ config SERIAL_NETX_CONSOLE | |||
1295 | depends on SERIAL_NETX | 1295 | depends on SERIAL_NETX |
1296 | select SERIAL_CORE_CONSOLE | 1296 | select SERIAL_CORE_CONSOLE |
1297 | help | 1297 | help |
1298 | If you have enabled the serial port on the Motorola IMX | 1298 | If you have enabled the serial port on the Hilscher NetX SoC |
1299 | CPU you can make it the console by answering Y to this option. | 1299 | you can make it the console by answering Y to this option. |
1300 | 1300 | ||
1301 | config SERIAL_OF_PLATFORM | 1301 | config SERIAL_OF_PLATFORM |
1302 | tristate "Serial port on Open Firmware platform bus" | 1302 | tristate "Serial port on Open Firmware platform bus" |
diff --git a/drivers/serial/icom.h b/drivers/serial/icom.h index 027455496745..c8029e0025c9 100644 --- a/drivers/serial/icom.h +++ b/drivers/serial/icom.h | |||
@@ -20,7 +20,7 @@ | |||
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include<linux/serial_core.h> | 23 | #include <linux/serial_core.h> |
24 | 24 | ||
25 | #define BAUD_TABLE_LIMIT ((sizeof(icom_acfg_baud)/sizeof(int)) - 1) | 25 | #define BAUD_TABLE_LIMIT ((sizeof(icom_acfg_baud)/sizeof(int)) - 1) |
26 | static int icom_acfg_baud[] = { | 26 | static int icom_acfg_baud[] = { |
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index 83211013deb8..e94031731a47 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c | |||
@@ -582,7 +582,7 @@ static struct parisc_driver serial_mux_driver = { | |||
582 | }; | 582 | }; |
583 | 583 | ||
584 | /** | 584 | /** |
585 | * mux_init - Serial MUX initalization procedure. | 585 | * mux_init - Serial MUX initialization procedure. |
586 | * | 586 | * |
587 | * Register the Serial MUX driver. | 587 | * Register the Serial MUX driver. |
588 | */ | 588 | */ |
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 2cd8573fb09c..639963eb1ac1 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c | |||
@@ -157,7 +157,7 @@ | |||
157 | #define SPI_FIFO_BYTE_WIDTH (2) | 157 | #define SPI_FIFO_BYTE_WIDTH (2) |
158 | #define SPI_FIFO_OVERFLOW_MARGIN (2) | 158 | #define SPI_FIFO_OVERFLOW_MARGIN (2) |
159 | 159 | ||
160 | /* DMA burst lenght for half full/empty request trigger */ | 160 | /* DMA burst length for half full/empty request trigger */ |
161 | #define SPI_DMA_BLR (SPI_FIFO_DEPTH * SPI_FIFO_BYTE_WIDTH / 2) | 161 | #define SPI_DMA_BLR (SPI_FIFO_DEPTH * SPI_FIFO_BYTE_WIDTH / 2) |
162 | 162 | ||
163 | /* Dummy char output to achieve reads. | 163 | /* Dummy char output to achieve reads. |
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c index 1a31f7a72848..2d27d6d6d08e 100644 --- a/drivers/ssb/b43_pci_bridge.c +++ b/drivers/ssb/b43_pci_bridge.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Broadcom 43xx PCI-SSB bridge module | 2 | * Broadcom 43xx PCI-SSB bridge module |
3 | * | 3 | * |
4 | * This technically is a seperate PCI driver module, but | 4 | * This technically is a separate PCI driver module, but |
5 | * because of its small size we include it in the SSB core | 5 | * because of its small size we include it in the SSB core |
6 | * instead of creating a standalone module. | 6 | * instead of creating a standalone module. |
7 | * | 7 | * |
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index 83ee3e75386c..675abdafc2d8 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c | |||
@@ -2561,7 +2561,7 @@ static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend) | |||
2561 | pci_read_config_dword(rinfo->pdev, i * 4, | 2561 | pci_read_config_dword(rinfo->pdev, i * 4, |
2562 | &rinfo->cfg_save[i]); | 2562 | &rinfo->cfg_save[i]); |
2563 | 2563 | ||
2564 | /* Switch PCI power managment to D2. */ | 2564 | /* Switch PCI power management to D2. */ |
2565 | pci_disable_device(rinfo->pdev); | 2565 | pci_disable_device(rinfo->pdev); |
2566 | for (;;) { | 2566 | for (;;) { |
2567 | pci_read_config_word( | 2567 | pci_read_config_word( |
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c index e23324d10be2..9704b73135f5 100644 --- a/drivers/video/cyblafb.c +++ b/drivers/video/cyblafb.c | |||
@@ -1156,7 +1156,7 @@ static struct fb_ops cyblafb_ops __devinitdata = { | |||
1156 | // need altered timings to display correctly. So I decided that it is much | 1156 | // need altered timings to display correctly. So I decided that it is much |
1157 | // better to provide a limited optimized set of modes plus the option of | 1157 | // better to provide a limited optimized set of modes plus the option of |
1158 | // using the mode in effect at startup time (might be selected using the | 1158 | // using the mode in effect at startup time (might be selected using the |
1159 | // vga=??? paramter). After that the user might use fbset to select any | 1159 | // vga=??? parameter). After that the user might use fbset to select any |
1160 | // mode he likes, check_var will not try to alter geometry parameters as | 1160 | // mode he likes, check_var will not try to alter geometry parameters as |
1161 | // it would be necessary otherwise. | 1161 | // it would be necessary otherwise. |
1162 | // | 1162 | // |
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h index 2fe3f7def530..836796177942 100644 --- a/drivers/video/intelfb/intelfb.h +++ b/drivers/video/intelfb/intelfb.h | |||
@@ -111,7 +111,7 @@ | |||
111 | 111 | ||
112 | #define FIXED_MODE(d) ((d)->fixed_mode) | 112 | #define FIXED_MODE(d) ((d)->fixed_mode) |
113 | 113 | ||
114 | /*** Driver paramters ***/ | 114 | /*** Driver parameters ***/ |
115 | 115 | ||
116 | #define RINGBUFFER_SIZE KB(64) | 116 | #define RINGBUFFER_SIZE KB(64) |
117 | #define HW_CURSOR_SIZE KB(4) | 117 | #define HW_CURSOR_SIZE KB(4) |
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index 9085188d815e..fb19ed4992db 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c | |||
@@ -312,7 +312,7 @@ static irqreturn_t lcdc_irq_handler(int irq, void *dev_id) | |||
312 | /* | 312 | /* |
313 | * Change to a new video mode. We defer this to a later time to avoid any | 313 | * Change to a new video mode. We defer this to a later time to avoid any |
314 | * flicker and not to mess up the current LCD DMA context. For this we disable | 314 | * flicker and not to mess up the current LCD DMA context. For this we disable |
315 | * the LCD controler, which will generate a DONE irq after the last frame has | 315 | * the LCD controller, which will generate a DONE irq after the last frame has |
316 | * been transferred. Then it'll be safe to reconfigure both the LCD controller | 316 | * been transferred. Then it'll be safe to reconfigure both the LCD controller |
317 | * as well as the LCD DMA. | 317 | * as well as the LCD DMA. |
318 | */ | 318 | */ |
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c index 1be95a68d696..58f200c69be3 100644 --- a/drivers/video/sm501fb.c +++ b/drivers/video/sm501fb.c | |||
@@ -48,7 +48,7 @@ enum sm501_controller { | |||
48 | HEAD_PANEL = 1, | 48 | HEAD_PANEL = 1, |
49 | }; | 49 | }; |
50 | 50 | ||
51 | /* SM501 memory adress */ | 51 | /* SM501 memory address */ |
52 | struct sm501_mem { | 52 | struct sm501_mem { |
53 | unsigned long size; | 53 | unsigned long size; |
54 | unsigned long sm_addr; | 54 | unsigned long sm_addr; |
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c index cecbedd473a4..61dde863bd40 100644 --- a/drivers/watchdog/shwdt.c +++ b/drivers/watchdog/shwdt.c | |||
@@ -52,7 +52,7 @@ | |||
52 | * overflow periods respectively. | 52 | * overflow periods respectively. |
53 | * | 53 | * |
54 | * Also, since we can't really expect userspace to be responsive enough | 54 | * Also, since we can't really expect userspace to be responsive enough |
55 | * before the overflow happens, we maintain two seperate timers .. One in | 55 | * before the overflow happens, we maintain two separate timers .. One in |
56 | * the kernel for clearing out WOVF every 2ms or so (again, this depends on | 56 | * the kernel for clearing out WOVF every 2ms or so (again, this depends on |
57 | * HZ == 1000), and another for monitoring userspace writes to the WDT device. | 57 | * HZ == 1000), and another for monitoring userspace writes to the WDT device. |
58 | * | 58 | * |