diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
tree | 856ba96302a36014736747e8464f80eeb827bbdd /drivers | |
parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'drivers')
274 files changed, 417 insertions, 458 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 48bbdbe43e69..26e434ad373c 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
@@ -1,5 +1,3 @@ | |||
1 | # drivers/Kconfig | ||
2 | |||
3 | menu "Device Drivers" | 1 | menu "Device Drivers" |
4 | 2 | ||
5 | source "drivers/base/Kconfig" | 3 | source "drivers/base/Kconfig" |
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index 575593a8b4e6..27c77729c7ca 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * video_detect.c: | 7 | * video_detect.c: |
8 | * Provides acpi_is_video_device() for early scanning of ACPI devices in scan.c | 8 | * Provides acpi_is_video_device() for early scanning of ACPI devices in scan.c |
9 | * There a Linux specific (Spec does not provide a HID for video devices) is | 9 | * There a Linux specific (Spec does not provide a HID for video devices) is |
10 | * assinged | 10 | * assigned |
11 | * | 11 | * |
12 | * After PCI devices are glued with ACPI devices | 12 | * After PCI devices are glued with ACPI devices |
13 | * acpi_get_pci_dev() can be called to identify ACPI graphics | 13 | * acpi_get_pci_dev() can be called to identify ACPI graphics |
@@ -83,16 +83,16 @@ long acpi_is_video_device(struct acpi_device *device) | |||
83 | if (!device) | 83 | if (!device) |
84 | return 0; | 84 | return 0; |
85 | 85 | ||
86 | /* Does this device able to support video switching ? */ | 86 | /* Is this device able to support video switching ? */ |
87 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) || | 87 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) || |
88 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy))) | 88 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy))) |
89 | video_caps |= ACPI_VIDEO_OUTPUT_SWITCHING; | 89 | video_caps |= ACPI_VIDEO_OUTPUT_SWITCHING; |
90 | 90 | ||
91 | /* Does this device able to retrieve a video ROM ? */ | 91 | /* Is this device able to retrieve a video ROM ? */ |
92 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy))) | 92 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy))) |
93 | video_caps |= ACPI_VIDEO_ROM_AVAILABLE; | 93 | video_caps |= ACPI_VIDEO_ROM_AVAILABLE; |
94 | 94 | ||
95 | /* Does this device able to configure which video head to be POSTed ? */ | 95 | /* Is this device able to configure which video head to be POSTed ? */ |
96 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) && | 96 | if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) && |
97 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) && | 97 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) && |
98 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy))) | 98 | ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy))) |
@@ -137,7 +137,7 @@ find_video(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
137 | * | 137 | * |
138 | * if NULL is passed as argument all ACPI devices are enumerated and | 138 | * if NULL is passed as argument all ACPI devices are enumerated and |
139 | * all graphics capabilities of physically present devices are | 139 | * all graphics capabilities of physically present devices are |
140 | * summerized and returned. This is cached and done only once. | 140 | * summarized and returned. This is cached and done only once. |
141 | */ | 141 | */ |
142 | long acpi_video_get_capabilities(acpi_handle graphics_handle) | 142 | long acpi_video_get_capabilities(acpi_handle graphics_handle) |
143 | { | 143 | { |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 0c6155f51173..19136a7e1064 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -599,7 +599,7 @@ static const struct ich_laptop ich_laptop[] = { | |||
599 | { 0x27DF, 0x1028, 0x02b0 }, /* ICH7 on unknown Dell */ | 599 | { 0x27DF, 0x1028, 0x02b0 }, /* ICH7 on unknown Dell */ |
600 | { 0x27DF, 0x1043, 0x1267 }, /* ICH7 on Asus W5F */ | 600 | { 0x27DF, 0x1043, 0x1267 }, /* ICH7 on Asus W5F */ |
601 | { 0x27DF, 0x103C, 0x30A1 }, /* ICH7 on HP Compaq nc2400 */ | 601 | { 0x27DF, 0x103C, 0x30A1 }, /* ICH7 on HP Compaq nc2400 */ |
602 | { 0x27DF, 0x103C, 0x361a }, /* ICH7 on unkown HP */ | 602 | { 0x27DF, 0x103C, 0x361a }, /* ICH7 on unknown HP */ |
603 | { 0x27DF, 0x1071, 0xD221 }, /* ICH7 on Hercules EC-900 */ | 603 | { 0x27DF, 0x1071, 0xD221 }, /* ICH7 on Hercules EC-900 */ |
604 | { 0x27DF, 0x152D, 0x0778 }, /* ICH7 on unknown Intel */ | 604 | { 0x27DF, 0x152D, 0x0778 }, /* ICH7 on unknown Intel */ |
605 | { 0x24CA, 0x1025, 0x0061 }, /* ICH4 on ACER Aspire 2023WLMi */ | 605 | { 0x24CA, 0x1025, 0x0061 }, /* ICH4 on ACER Aspire 2023WLMi */ |
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 51eb1e298601..efa8773bef5a 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
@@ -736,7 +736,7 @@ unsigned int ata_sff_data_xfer(struct ata_device *dev, unsigned char *buf, | |||
736 | 736 | ||
737 | /* | 737 | /* |
738 | * Use io*16_rep() accessors here as well to avoid pointlessly | 738 | * Use io*16_rep() accessors here as well to avoid pointlessly |
739 | * swapping bytes to and fro on the big endian machines... | 739 | * swapping bytes to and from on the big endian machines... |
740 | */ | 740 | */ |
741 | if (rw == READ) { | 741 | if (rw == READ) { |
742 | ioread16_rep(data_addr, pad, 1); | 742 | ioread16_rep(data_addr, pad, 1); |
@@ -776,7 +776,7 @@ unsigned int ata_sff_data_xfer32(struct ata_device *dev, unsigned char *buf, | |||
776 | void __iomem *data_addr = ap->ioaddr.data_addr; | 776 | void __iomem *data_addr = ap->ioaddr.data_addr; |
777 | unsigned int words = buflen >> 2; | 777 | unsigned int words = buflen >> 2; |
778 | int slop = buflen & 3; | 778 | int slop = buflen & 3; |
779 | 779 | ||
780 | if (!(ap->pflags & ATA_PFLAG_PIO32)) | 780 | if (!(ap->pflags & ATA_PFLAG_PIO32)) |
781 | return ata_sff_data_xfer(dev, buf, buflen, rw); | 781 | return ata_sff_data_xfer(dev, buf, buflen, rw); |
782 | 782 | ||
@@ -795,7 +795,7 @@ unsigned int ata_sff_data_xfer32(struct ata_device *dev, unsigned char *buf, | |||
795 | 795 | ||
796 | /* | 796 | /* |
797 | * Use io*_rep() accessors here as well to avoid pointlessly | 797 | * Use io*_rep() accessors here as well to avoid pointlessly |
798 | * swapping bytes to and fro on the big endian machines... | 798 | * swapping bytes to and from on the big endian machines... |
799 | */ | 799 | */ |
800 | if (rw == READ) { | 800 | if (rw == READ) { |
801 | if (slop < 3) | 801 | if (slop < 3) |
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c index 403f56165cec..71cef9a962d4 100644 --- a/drivers/ata/pata_cs5535.c +++ b/drivers/ata/pata_cs5535.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Alan Cox <alan@lxorguk.ukuu.org.uk> | 4 | * Alan Cox <alan@lxorguk.ukuu.org.uk> |
5 | * | 5 | * |
6 | * based upon cs5535.c from AMD <Jens.Altmann@amd.com> as cleaned up and | 6 | * based upon cs5535.c from AMD <Jens.Altmann@amd.com> as cleaned up and |
7 | * made readable and Linux style by Wolfgang Zuleger <wolfgang.zuleger@gmx.de | 7 | * made readable and Linux style by Wolfgang Zuleger <wolfgang.zuleger@gmx.de> |
8 | * and Alexander Kiausch <alex.kiausch@t-online.de> | 8 | * and Alexander Kiausch <alex.kiausch@t-online.de> |
9 | * | 9 | * |
10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 8a5d35b759dd..ce4136eea08f 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c | |||
@@ -43,9 +43,9 @@ enum { | |||
43 | /* | 43 | /* |
44 | * SATA-FSL host controller supports a max. of (15+1) direct PRDEs, and | 44 | * SATA-FSL host controller supports a max. of (15+1) direct PRDEs, and |
45 | * chained indirect PRDEs upto a max count of 63. | 45 | * chained indirect PRDEs upto a max count of 63. |
46 | * We are allocating an array of 63 PRDEs contigiously, but PRDE#15 will | 46 | * We are allocating an array of 63 PRDEs contiguously, but PRDE#15 will |
47 | * be setup as an indirect descriptor, pointing to it's next | 47 | * be setup as an indirect descriptor, pointing to it's next |
48 | * (contigious) PRDE. Though chained indirect PRDE arrays are | 48 | * (contiguous) PRDE. Though chained indirect PRDE arrays are |
49 | * supported,it will be more efficient to use a direct PRDT and | 49 | * supported,it will be more efficient to use a direct PRDT and |
50 | * a single chain/link to indirect PRDE array/PRDT. | 50 | * a single chain/link to indirect PRDE array/PRDT. |
51 | */ | 51 | */ |
@@ -314,7 +314,7 @@ static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc, | |||
314 | u32 ttl_dwords = 0; | 314 | u32 ttl_dwords = 0; |
315 | 315 | ||
316 | /* | 316 | /* |
317 | * NOTE : direct & indirect prdt's are contigiously allocated | 317 | * NOTE : direct & indirect prdt's are contiguously allocated |
318 | */ | 318 | */ |
319 | struct prde *prd = (struct prde *)&((struct command_desc *) | 319 | struct prde *prd = (struct prde *)&((struct command_desc *) |
320 | cmd_desc)->prdt; | 320 | cmd_desc)->prdt; |
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index b2c1b37ab2e4..f734b345ac71 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
@@ -1132,7 +1132,7 @@ static int rx_pkt(struct atm_dev *dev) | |||
1132 | IF_ERR(printk(" cause: packet time out\n");) | 1132 | IF_ERR(printk(" cause: packet time out\n");) |
1133 | } | 1133 | } |
1134 | else { | 1134 | else { |
1135 | IF_ERR(printk(" cause: buffer over flow\n");) | 1135 | IF_ERR(printk(" cause: buffer overflow\n");) |
1136 | } | 1136 | } |
1137 | goto out_free_desc; | 1137 | goto out_free_desc; |
1138 | } | 1138 | } |
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 979d159b5cd1..ee95c76bfd3d 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c | |||
@@ -188,7 +188,7 @@ EXPORT_SYMBOL_GPL(wait_for_device_probe); | |||
188 | * @dev: device to try to bind to the driver | 188 | * @dev: device to try to bind to the driver |
189 | * | 189 | * |
190 | * This function returns -ENODEV if the device is not registered, | 190 | * This function returns -ENODEV if the device is not registered, |
191 | * 1 if the device is bound sucessfully and 0 otherwise. | 191 | * 1 if the device is bound successfully and 0 otherwise. |
192 | * | 192 | * |
193 | * This function must be called with @dev->sem held. When called for a | 193 | * This function must be called with @dev->sem held. When called for a |
194 | * USB interface, @dev->parent->sem must be held as well. | 194 | * USB interface, @dev->parent->sem must be held as well. |
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index 847a9e57570a..a5af1d6dda8b 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c | |||
@@ -1478,10 +1478,7 @@ void do_fd_request(struct request_queue * q) | |||
1478 | stdma_lock(floppy_irq, NULL); | 1478 | stdma_lock(floppy_irq, NULL); |
1479 | 1479 | ||
1480 | atari_disable_irq( IRQ_MFP_FDC ); | 1480 | atari_disable_irq( IRQ_MFP_FDC ); |
1481 | local_save_flags(flags); /* The request function is called with ints | ||
1482 | local_irq_disable(); * disabled... so must save the IPL for later */ | ||
1483 | redo_fd_request(); | 1481 | redo_fd_request(); |
1484 | local_irq_restore(flags); | ||
1485 | atari_enable_irq( IRQ_MFP_FDC ); | 1482 | atari_enable_irq( IRQ_MFP_FDC ); |
1486 | } | 1483 | } |
1487 | 1484 | ||
diff --git a/drivers/block/cciss_cmd.h b/drivers/block/cciss_cmd.h index b50a9b261b85..6afa700890ff 100644 --- a/drivers/block/cciss_cmd.h +++ b/drivers/block/cciss_cmd.h | |||
@@ -5,7 +5,7 @@ | |||
5 | //########################################################################### | 5 | //########################################################################### |
6 | #define CISS_VERSION "1.00" | 6 | #define CISS_VERSION "1.00" |
7 | 7 | ||
8 | //general boundary defintions | 8 | //general boundary definitions |
9 | #define SENSEINFOBYTES 32//note that this value may vary between host implementations | 9 | #define SENSEINFOBYTES 32//note that this value may vary between host implementations |
10 | #define MAXSGENTRIES 32 | 10 | #define MAXSGENTRIES 32 |
11 | #define CCISS_SG_CHAIN 0x80000000 | 11 | #define CCISS_SG_CHAIN 0x80000000 |
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 1e6eb1aeba2b..f36defa37764 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c | |||
@@ -535,7 +535,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv) | |||
535 | break; | 535 | break; |
536 | 536 | ||
537 | default: | 537 | default: |
538 | BT_ERR("Unknow packet type:%d", type); | 538 | BT_ERR("Unknown packet type:%d", type); |
539 | print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, payload, | 539 | print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, payload, |
540 | blksz * buf_block_len); | 540 | blksz * buf_block_len); |
541 | 541 | ||
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 4895f0e05322..aa0919386b8c 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c | |||
@@ -214,7 +214,7 @@ static int hci_uart_send_frame(struct sk_buff *skb) | |||
214 | struct hci_uart *hu; | 214 | struct hci_uart *hu; |
215 | 215 | ||
216 | if (!hdev) { | 216 | if (!hdev) { |
217 | BT_ERR("Frame for uknown device (hdev=NULL)"); | 217 | BT_ERR("Frame for unknown device (hdev=NULL)"); |
218 | return -ENODEV; | 218 | return -ENODEV; |
219 | } | 219 | } |
220 | 220 | ||
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index ad82ec92ebd4..30eff80fed6f 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Added devfs support. | 6 | * Added devfs support. |
7 | * Jan-11-1998, C. Scott Ananian <cananian@alumni.princeton.edu> | 7 | * Jan-11-1998, C. Scott Ananian <cananian@alumni.princeton.edu> |
8 | * Shared /dev/zero mmaping support, Feb 2000, Kanoj Sarcar <kanoj@sgi.com> | 8 | * Shared /dev/zero mmapping support, Feb 2000, Kanoj Sarcar <kanoj@sgi.com> |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c index 1997270bb6f4..ecb89d798e35 100644 --- a/drivers/char/mspec.c +++ b/drivers/char/mspec.c | |||
@@ -248,7 +248,7 @@ static const struct vm_operations_struct mspec_vm_ops = { | |||
248 | /* | 248 | /* |
249 | * mspec_mmap | 249 | * mspec_mmap |
250 | * | 250 | * |
251 | * Called when mmaping the device. Initializes the vma with a fault handler | 251 | * Called when mmapping the device. Initializes the vma with a fault handler |
252 | * and private data structure necessary to allocate, track, and free the | 252 | * and private data structure necessary to allocate, track, and free the |
253 | * underlying pages. | 253 | * underlying pages. |
254 | */ | 254 | */ |
diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c index 6934025a1ac1..c1d8b54c816d 100644 --- a/drivers/char/n_r3964.c +++ b/drivers/char/n_r3964.c | |||
@@ -602,7 +602,7 @@ static void receive_char(struct r3964_info *pInfo, const unsigned char c) | |||
602 | } | 602 | } |
603 | break; | 603 | break; |
604 | case R3964_WAIT_FOR_RX_REPEAT: | 604 | case R3964_WAIT_FOR_RX_REPEAT: |
605 | /* FALLTROUGH */ | 605 | /* FALLTHROUGH */ |
606 | case R3964_IDLE: | 606 | case R3964_IDLE: |
607 | if (c == STX) { | 607 | if (c == STX) { |
608 | /* Prevent rx_queue from overflow: */ | 608 | /* Prevent rx_queue from overflow: */ |
diff --git a/drivers/char/rio/route.h b/drivers/char/rio/route.h index 20ed73f3fd7b..46e963771c30 100644 --- a/drivers/char/rio/route.h +++ b/drivers/char/rio/route.h | |||
@@ -67,7 +67,7 @@ | |||
67 | typedef struct COST_ROUTE COST_ROUTE; | 67 | typedef struct COST_ROUTE COST_ROUTE; |
68 | struct COST_ROUTE { | 68 | struct COST_ROUTE { |
69 | unsigned char cost; /* Cost down this link */ | 69 | unsigned char cost; /* Cost down this link */ |
70 | unsigned char route[NODE_BYTES]; /* Nodes thorough this route */ | 70 | unsigned char route[NODE_BYTES]; /* Nodes through this route */ |
71 | }; | 71 | }; |
72 | 72 | ||
73 | typedef struct ROUTE_STR ROUTE_STR; | 73 | typedef struct ROUTE_STR ROUTE_STR; |
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c index 8e67d5c642a4..6bd5f8866c74 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/char/tty_ioctl.c | |||
@@ -315,7 +315,7 @@ EXPORT_SYMBOL(tty_termios_input_baud_rate); | |||
315 | * For maximal back compatibility with legacy SYS5/POSIX *nix behaviour | 315 | * For maximal back compatibility with legacy SYS5/POSIX *nix behaviour |
316 | * we need to carefully set the bits when the user does not get the | 316 | * we need to carefully set the bits when the user does not get the |
317 | * desired speed. We allow small margins and preserve as much of possible | 317 | * desired speed. We allow small margins and preserve as much of possible |
318 | * of the input intent to keep compatiblity. | 318 | * of the input intent to keep compatibility. |
319 | * | 319 | * |
320 | * Locking: Caller should hold termios lock. This is already held | 320 | * Locking: Caller should hold termios lock. This is already held |
321 | * when calling this function from the driver termios handler. | 321 | * when calling this function from the driver termios handler. |
diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c index 70b59642a708..724c164d31c9 100644 --- a/drivers/cpuidle/governor.c +++ b/drivers/cpuidle/governor.c | |||
@@ -21,7 +21,7 @@ struct cpuidle_governor *cpuidle_curr_governor; | |||
21 | * __cpuidle_find_governor - finds a governor of the specified name | 21 | * __cpuidle_find_governor - finds a governor of the specified name |
22 | * @str: the name | 22 | * @str: the name |
23 | * | 23 | * |
24 | * Must be called with cpuidle_lock aquired. | 24 | * Must be called with cpuidle_lock acquired. |
25 | */ | 25 | */ |
26 | static struct cpuidle_governor * __cpuidle_find_governor(const char *str) | 26 | static struct cpuidle_governor * __cpuidle_find_governor(const char *str) |
27 | { | 27 | { |
@@ -39,7 +39,7 @@ static struct cpuidle_governor * __cpuidle_find_governor(const char *str) | |||
39 | * @gov: the new target governor | 39 | * @gov: the new target governor |
40 | * | 40 | * |
41 | * NOTE: "gov" can be NULL to specify disabled | 41 | * NOTE: "gov" can be NULL to specify disabled |
42 | * Must be called with cpuidle_lock aquired. | 42 | * Must be called with cpuidle_lock acquired. |
43 | */ | 43 | */ |
44 | int cpuidle_switch_governor(struct cpuidle_governor *gov) | 44 | int cpuidle_switch_governor(struct cpuidle_governor *gov) |
45 | { | 45 | { |
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c index 5f753fc08730..09ad9154d86c 100644 --- a/drivers/crypto/hifn_795x.c +++ b/drivers/crypto/hifn_795x.c | |||
@@ -863,7 +863,7 @@ static int hifn_init_pubrng(struct hifn_device *dev) | |||
863 | dev->dmareg |= HIFN_DMAIER_PUBDONE; | 863 | dev->dmareg |= HIFN_DMAIER_PUBDONE; |
864 | hifn_write_1(dev, HIFN_1_DMA_IER, dev->dmareg); | 864 | hifn_write_1(dev, HIFN_1_DMA_IER, dev->dmareg); |
865 | 865 | ||
866 | dprintk("Chip %s: Public key engine has been sucessfully " | 866 | dprintk("Chip %s: Public key engine has been successfully " |
867 | "initialised.\n", dev->name); | 867 | "initialised.\n", dev->name); |
868 | } | 868 | } |
869 | 869 | ||
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index 7585c4164bd5..c52ac9efd0bf 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c | |||
@@ -99,7 +99,7 @@ static struct at_desc *atc_alloc_descriptor(struct dma_chan *chan, | |||
99 | } | 99 | } |
100 | 100 | ||
101 | /** | 101 | /** |
102 | * atc_desc_get - get a unsused descriptor from free_list | 102 | * atc_desc_get - get an unused descriptor from free_list |
103 | * @atchan: channel we want a new descriptor for | 103 | * @atchan: channel we want a new descriptor for |
104 | */ | 104 | */ |
105 | static struct at_desc *atc_desc_get(struct at_dma_chan *atchan) | 105 | static struct at_desc *atc_desc_get(struct at_dma_chan *atchan) |
diff --git a/drivers/firewire/core-topology.c b/drivers/firewire/core-topology.c index 9a5f38c80b0e..93ec64cdeef7 100644 --- a/drivers/firewire/core-topology.c +++ b/drivers/firewire/core-topology.c | |||
@@ -183,7 +183,7 @@ static inline struct fw_node *fw_node(struct list_head *l) | |||
183 | * This function builds the tree representation of the topology given | 183 | * This function builds the tree representation of the topology given |
184 | * by the self IDs from the latest bus reset. During the construction | 184 | * by the self IDs from the latest bus reset. During the construction |
185 | * of the tree, the function checks that the self IDs are valid and | 185 | * of the tree, the function checks that the self IDs are valid and |
186 | * internally consistent. On succcess this function returns the | 186 | * internally consistent. On success this function returns the |
187 | * fw_node corresponding to the local card otherwise NULL. | 187 | * fw_node corresponding to the local card otherwise NULL. |
188 | */ | 188 | */ |
189 | static struct fw_node *build_tree(struct fw_card *card, | 189 | static struct fw_node *build_tree(struct fw_card *card, |
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 5cae0b3eee9b..3f7c500b2115 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
@@ -272,7 +272,7 @@ EXPORT_SYMBOL(drm_mode_object_find); | |||
272 | * functions & device file and adds it to the master fd list. | 272 | * functions & device file and adds it to the master fd list. |
273 | * | 273 | * |
274 | * RETURNS: | 274 | * RETURNS: |
275 | * Zero on success, error code on falure. | 275 | * Zero on success, error code on failure. |
276 | */ | 276 | */ |
277 | int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, | 277 | int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, |
278 | const struct drm_framebuffer_funcs *funcs) | 278 | const struct drm_framebuffer_funcs *funcs) |
@@ -2328,7 +2328,7 @@ int drm_mode_connector_property_set_ioctl(struct drm_device *dev, | |||
2328 | } else if (connector->funcs->set_property) | 2328 | } else if (connector->funcs->set_property) |
2329 | ret = connector->funcs->set_property(connector, property, out_resp->value); | 2329 | ret = connector->funcs->set_property(connector, property, out_resp->value); |
2330 | 2330 | ||
2331 | /* store the property value if succesful */ | 2331 | /* store the property value if successful */ |
2332 | if (!ret) | 2332 | if (!ret) |
2333 | drm_connector_property_set_value(connector, property, out_resp->value); | 2333 | drm_connector_property_set_value(connector, property, out_resp->value); |
2334 | out: | 2334 | out: |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index abfc27b0c2ea..a2a3fa599923 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -1309,7 +1309,7 @@ out_free_list: | |||
1309 | * i915_gem_release_mmap - remove physical page mappings | 1309 | * i915_gem_release_mmap - remove physical page mappings |
1310 | * @obj: obj in question | 1310 | * @obj: obj in question |
1311 | * | 1311 | * |
1312 | * Preserve the reservation of the mmaping with the DRM core code, but | 1312 | * Preserve the reservation of the mmapping with the DRM core code, but |
1313 | * relinquish ownership of the pages back to the system. | 1313 | * relinquish ownership of the pages back to the system. |
1314 | * | 1314 | * |
1315 | * It is vital that we remove the page mapping if we have mapped a tiled | 1315 | * It is vital that we remove the page mapping if we have mapped a tiled |
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 2b0fe54cd92c..40fcf6fdef38 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c | |||
@@ -70,7 +70,7 @@ static struct drm_fb_helper_funcs intel_fb_helper_funcs = { | |||
70 | 70 | ||
71 | 71 | ||
72 | /** | 72 | /** |
73 | * Curretly it is assumed that the old framebuffer is reused. | 73 | * Currently it is assumed that the old framebuffer is reused. |
74 | * | 74 | * |
75 | * LOCKING | 75 | * LOCKING |
76 | * caller should hold the mode config lock. | 76 | * caller should hold the mode config lock. |
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 083bec2e50f9..e7fa3279e2f8 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -2726,7 +2726,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device) | |||
2726 | /* Wrap with our custom algo which switches to DDC mode */ | 2726 | /* Wrap with our custom algo which switches to DDC mode */ |
2727 | intel_output->ddc_bus->algo = &intel_sdvo_i2c_bit_algo; | 2727 | intel_output->ddc_bus->algo = &intel_sdvo_i2c_bit_algo; |
2728 | 2728 | ||
2729 | /* In defaut case sdvo lvds is false */ | 2729 | /* In default case sdvo lvds is false */ |
2730 | intel_sdvo_get_capabilities(intel_output, &sdvo_priv->caps); | 2730 | intel_sdvo_get_capabilities(intel_output, &sdvo_priv->caps); |
2731 | 2731 | ||
2732 | if (intel_sdvo_output_setup(intel_output, | 2732 | if (intel_sdvo_output_setup(intel_output, |
diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h index c11ddddfb3b6..6643afc36cea 100644 --- a/drivers/gpu/drm/radeon/atombios.h +++ b/drivers/gpu/drm/radeon/atombios.h | |||
@@ -1141,7 +1141,7 @@ typedef struct _LVDS_ENCODER_CONTROL_PARAMETERS { | |||
1141 | /* ucTableFormatRevision=1,ucTableContentRevision=2 */ | 1141 | /* ucTableFormatRevision=1,ucTableContentRevision=2 */ |
1142 | typedef struct _LVDS_ENCODER_CONTROL_PARAMETERS_V2 { | 1142 | typedef struct _LVDS_ENCODER_CONTROL_PARAMETERS_V2 { |
1143 | USHORT usPixelClock; /* in 10KHz; for bios convenient */ | 1143 | USHORT usPixelClock; /* in 10KHz; for bios convenient */ |
1144 | UCHAR ucMisc; /* see PANEL_ENCODER_MISC_xx defintions below */ | 1144 | UCHAR ucMisc; /* see PANEL_ENCODER_MISC_xx definitions below */ |
1145 | UCHAR ucAction; /* 0: turn off encoder */ | 1145 | UCHAR ucAction; /* 0: turn off encoder */ |
1146 | /* 1: setup and turn on encoder */ | 1146 | /* 1: setup and turn on encoder */ |
1147 | UCHAR ucTruncate; /* bit0=0: Disable truncate */ | 1147 | UCHAR ucTruncate; /* bit0=0: Disable truncate */ |
@@ -1424,7 +1424,7 @@ typedef struct _ATOM_MULTIMEDIA_CONFIG_INFO { | |||
1424 | /* Structures used in FirmwareInfoTable */ | 1424 | /* Structures used in FirmwareInfoTable */ |
1425 | /****************************************************************************/ | 1425 | /****************************************************************************/ |
1426 | 1426 | ||
1427 | /* usBIOSCapability Defintion: */ | 1427 | /* usBIOSCapability Definition: */ |
1428 | /* Bit 0 = 0: Bios image is not Posted, =1:Bios image is Posted; */ | 1428 | /* Bit 0 = 0: Bios image is not Posted, =1:Bios image is Posted; */ |
1429 | /* Bit 1 = 0: Dual CRTC is not supported, =1: Dual CRTC is supported; */ | 1429 | /* Bit 1 = 0: Dual CRTC is not supported, =1: Dual CRTC is supported; */ |
1430 | /* Bit 2 = 0: Extended Desktop is not supported, =1: Extended Desktop is supported; */ | 1430 | /* Bit 2 = 0: Extended Desktop is not supported, =1: Extended Desktop is supported; */ |
@@ -2386,7 +2386,7 @@ typedef struct _ATOM_ANALOG_TV_INFO_V1_2 { | |||
2386 | } ATOM_ANALOG_TV_INFO_V1_2; | 2386 | } ATOM_ANALOG_TV_INFO_V1_2; |
2387 | 2387 | ||
2388 | /**************************************************************************/ | 2388 | /**************************************************************************/ |
2389 | /* VRAM usage and their defintions */ | 2389 | /* VRAM usage and their definitions */ |
2390 | 2390 | ||
2391 | /* One chunk of VRAM used by Bios are for HWICON surfaces,EDID data. */ | 2391 | /* One chunk of VRAM used by Bios are for HWICON surfaces,EDID data. */ |
2392 | /* Current Mode timing and Dail Timing and/or STD timing data EACH device. They can be broken down as below. */ | 2392 | /* Current Mode timing and Dail Timing and/or STD timing data EACH device. They can be broken down as below. */ |
@@ -3046,7 +3046,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO { | |||
3046 | #define ATOM_S0_SYSTEM_POWER_STATE_VALUE_DC 2 | 3046 | #define ATOM_S0_SYSTEM_POWER_STATE_VALUE_DC 2 |
3047 | #define ATOM_S0_SYSTEM_POWER_STATE_VALUE_LITEAC 3 | 3047 | #define ATOM_S0_SYSTEM_POWER_STATE_VALUE_LITEAC 3 |
3048 | 3048 | ||
3049 | /* Byte aligned defintion for BIOS usage */ | 3049 | /* Byte aligned definition for BIOS usage */ |
3050 | #define ATOM_S0_CRT1_MONOb0 0x01 | 3050 | #define ATOM_S0_CRT1_MONOb0 0x01 |
3051 | #define ATOM_S0_CRT1_COLORb0 0x02 | 3051 | #define ATOM_S0_CRT1_COLORb0 0x02 |
3052 | #define ATOM_S0_CRT1_MASKb0 (ATOM_S0_CRT1_MONOb0+ATOM_S0_CRT1_COLORb0) | 3052 | #define ATOM_S0_CRT1_MASKb0 (ATOM_S0_CRT1_MONOb0+ATOM_S0_CRT1_COLORb0) |
@@ -3131,7 +3131,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO { | |||
3131 | #define ATOM_S2_DISPLAY_ROTATION_DEGREE_SHIFT 30 | 3131 | #define ATOM_S2_DISPLAY_ROTATION_DEGREE_SHIFT 30 |
3132 | #define ATOM_S2_DISPLAY_ROTATION_ANGLE_MASK 0xC0000000L | 3132 | #define ATOM_S2_DISPLAY_ROTATION_ANGLE_MASK 0xC0000000L |
3133 | 3133 | ||
3134 | /* Byte aligned defintion for BIOS usage */ | 3134 | /* Byte aligned definition for BIOS usage */ |
3135 | #define ATOM_S2_TV1_STANDARD_MASKb0 0x0F | 3135 | #define ATOM_S2_TV1_STANDARD_MASKb0 0x0F |
3136 | #define ATOM_S2_CURRENT_BL_LEVEL_MASKb1 0xFF | 3136 | #define ATOM_S2_CURRENT_BL_LEVEL_MASKb1 0xFF |
3137 | #define ATOM_S2_CRT1_DPMS_STATEb2 0x01 | 3137 | #define ATOM_S2_CRT1_DPMS_STATEb2 0x01 |
@@ -3190,7 +3190,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO { | |||
3190 | #define ATOM_S3_ALLOW_FAST_PWR_SWITCH 0x40000000L | 3190 | #define ATOM_S3_ALLOW_FAST_PWR_SWITCH 0x40000000L |
3191 | #define ATOM_S3_RQST_GPU_USE_MIN_PWR 0x80000000L | 3191 | #define ATOM_S3_RQST_GPU_USE_MIN_PWR 0x80000000L |
3192 | 3192 | ||
3193 | /* Byte aligned defintion for BIOS usage */ | 3193 | /* Byte aligned definition for BIOS usage */ |
3194 | #define ATOM_S3_CRT1_ACTIVEb0 0x01 | 3194 | #define ATOM_S3_CRT1_ACTIVEb0 0x01 |
3195 | #define ATOM_S3_LCD1_ACTIVEb0 0x02 | 3195 | #define ATOM_S3_LCD1_ACTIVEb0 0x02 |
3196 | #define ATOM_S3_TV1_ACTIVEb0 0x04 | 3196 | #define ATOM_S3_TV1_ACTIVEb0 0x04 |
@@ -3230,7 +3230,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO { | |||
3230 | #define ATOM_S4_LCD1_REFRESH_MASK 0x0000FF00L | 3230 | #define ATOM_S4_LCD1_REFRESH_MASK 0x0000FF00L |
3231 | #define ATOM_S4_LCD1_REFRESH_SHIFT 8 | 3231 | #define ATOM_S4_LCD1_REFRESH_SHIFT 8 |
3232 | 3232 | ||
3233 | /* Byte aligned defintion for BIOS usage */ | 3233 | /* Byte aligned definition for BIOS usage */ |
3234 | #define ATOM_S4_LCD1_PANEL_ID_MASKb0 0x0FF | 3234 | #define ATOM_S4_LCD1_PANEL_ID_MASKb0 0x0FF |
3235 | #define ATOM_S4_LCD1_REFRESH_MASKb1 ATOM_S4_LCD1_PANEL_ID_MASKb0 | 3235 | #define ATOM_S4_LCD1_REFRESH_MASKb1 ATOM_S4_LCD1_PANEL_ID_MASKb0 |
3236 | #define ATOM_S4_VRAM_INFO_MASKb2 ATOM_S4_LCD1_PANEL_ID_MASKb0 | 3236 | #define ATOM_S4_VRAM_INFO_MASKb2 ATOM_S4_LCD1_PANEL_ID_MASKb0 |
@@ -3310,7 +3310,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO { | |||
3310 | #define ATOM_S6_VRI_BRIGHTNESS_CHANGE 0x40000000L | 3310 | #define ATOM_S6_VRI_BRIGHTNESS_CHANGE 0x40000000L |
3311 | #define ATOM_S6_CONFIG_DISPLAY_CHANGE_MASK 0x80000000L | 3311 | #define ATOM_S6_CONFIG_DISPLAY_CHANGE_MASK 0x80000000L |
3312 | 3312 | ||
3313 | /* Byte aligned defintion for BIOS usage */ | 3313 | /* Byte aligned definition for BIOS usage */ |
3314 | #define ATOM_S6_DEVICE_CHANGEb0 0x01 | 3314 | #define ATOM_S6_DEVICE_CHANGEb0 0x01 |
3315 | #define ATOM_S6_SCALER_CHANGEb0 0x02 | 3315 | #define ATOM_S6_SCALER_CHANGEb0 0x02 |
3316 | #define ATOM_S6_LID_CHANGEb0 0x04 | 3316 | #define ATOM_S6_LID_CHANGEb0 0x04 |
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 278f646bc18e..6740ed24358f 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -394,11 +394,11 @@ int r600_mc_init(struct radeon_device *rdev) | |||
394 | * AGP so that GPU can catch out of VRAM/AGP access | 394 | * AGP so that GPU can catch out of VRAM/AGP access |
395 | */ | 395 | */ |
396 | if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) { | 396 | if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) { |
397 | /* Enought place before */ | 397 | /* Enough place before */ |
398 | rdev->mc.vram_location = rdev->mc.gtt_location - | 398 | rdev->mc.vram_location = rdev->mc.gtt_location - |
399 | rdev->mc.mc_vram_size; | 399 | rdev->mc.mc_vram_size; |
400 | } else if (tmp > rdev->mc.mc_vram_size) { | 400 | } else if (tmp > rdev->mc.mc_vram_size) { |
401 | /* Enought place after */ | 401 | /* Enough place after */ |
402 | rdev->mc.vram_location = rdev->mc.gtt_location + | 402 | rdev->mc.vram_location = rdev->mc.gtt_location + |
403 | rdev->mc.gtt_size; | 403 | rdev->mc.gtt_size; |
404 | } else { | 404 | } else { |
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index b38c4c8e2c61..d10eb43645c8 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c | |||
@@ -59,7 +59,7 @@ static struct fb_ops radeonfb_ops = { | |||
59 | }; | 59 | }; |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * Curretly it is assumed that the old framebuffer is reused. | 62 | * Currently it is assumed that the old framebuffer is reused. |
63 | * | 63 | * |
64 | * LOCKING | 64 | * LOCKING |
65 | * caller should hold the mode config lock. | 65 | * caller should hold the mode config lock. |
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c index 38537d971a3e..067167cb39ca 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c | |||
@@ -1950,7 +1950,7 @@ static void radeon_apply_surface_regs(int surf_index, | |||
1950 | * Note that refcount can be at most 2, since during a free refcount=3 | 1950 | * Note that refcount can be at most 2, since during a free refcount=3 |
1951 | * might mean we have to allocate a new surface which might not always | 1951 | * might mean we have to allocate a new surface which might not always |
1952 | * be available. | 1952 | * be available. |
1953 | * For example : we allocate three contigous surfaces ABC. If B is | 1953 | * For example : we allocate three contiguous surfaces ABC. If B is |
1954 | * freed, we suddenly need two surfaces to store A and C, which might | 1954 | * freed, we suddenly need two surfaces to store A and C, which might |
1955 | * not always be available. | 1955 | * not always be available. |
1956 | */ | 1956 | */ |
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 1381e06d6af3..eda4ade24c3a 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c | |||
@@ -378,7 +378,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, | |||
378 | new_mem->mem_type == TTM_PL_SYSTEM) || | 378 | new_mem->mem_type == TTM_PL_SYSTEM) || |
379 | (old_mem->mem_type == TTM_PL_SYSTEM && | 379 | (old_mem->mem_type == TTM_PL_SYSTEM && |
380 | new_mem->mem_type == TTM_PL_TT)) { | 380 | new_mem->mem_type == TTM_PL_TT)) { |
381 | /* bind is enought */ | 381 | /* bind is enough */ |
382 | radeon_move_null(bo, new_mem); | 382 | radeon_move_null(bo, new_mem); |
383 | return 0; | 383 | return 0; |
384 | } | 384 | } |
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index b0efd0ddae7a..5e06ee7076f5 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -829,11 +829,11 @@ int rv770_mc_init(struct radeon_device *rdev) | |||
829 | * AGP so that GPU can catch out of VRAM/AGP access | 829 | * AGP so that GPU can catch out of VRAM/AGP access |
830 | */ | 830 | */ |
831 | if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) { | 831 | if (rdev->mc.gtt_location > rdev->mc.mc_vram_size) { |
832 | /* Enought place before */ | 832 | /* Enough place before */ |
833 | rdev->mc.vram_location = rdev->mc.gtt_location - | 833 | rdev->mc.vram_location = rdev->mc.gtt_location - |
834 | rdev->mc.mc_vram_size; | 834 | rdev->mc.mc_vram_size; |
835 | } else if (tmp > rdev->mc.mc_vram_size) { | 835 | } else if (tmp > rdev->mc.mc_vram_size) { |
836 | /* Enought place after */ | 836 | /* Enough place after */ |
837 | rdev->mc.vram_location = rdev->mc.gtt_location + | 837 | rdev->mc.vram_location = rdev->mc.gtt_location + |
838 | rdev->mc.gtt_size; | 838 | rdev->mc.gtt_size; |
839 | } else { | 839 | } else { |
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index c70927ecda21..61c5572d2b91 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c | |||
@@ -427,7 +427,7 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo, | |||
427 | 427 | ||
428 | /* | 428 | /* |
429 | * We need to use vmap to get the desired page protection | 429 | * We need to use vmap to get the desired page protection |
430 | * or to make the buffer object look contigous. | 430 | * or to make the buffer object look contiguous. |
431 | */ | 431 | */ |
432 | prot = (mem->placement & TTM_PL_FLAG_CACHED) ? | 432 | prot = (mem->placement & TTM_PL_FLAG_CACHED) ? |
433 | PAGE_KERNEL : | 433 | PAGE_KERNEL : |
diff --git a/drivers/hwmon/adm1029.c b/drivers/hwmon/adm1029.c index 36718150b475..e845b75ccee4 100644 --- a/drivers/hwmon/adm1029.c +++ b/drivers/hwmon/adm1029.c | |||
@@ -432,7 +432,7 @@ static int adm1029_remove(struct i2c_client *client) | |||
432 | } | 432 | } |
433 | 433 | ||
434 | /* | 434 | /* |
435 | function that update the status of the chips (temperature for exemple) | 435 | function that update the status of the chips (temperature for example) |
436 | */ | 436 | */ |
437 | static struct adm1029_data *adm1029_update_device(struct device *dev) | 437 | static struct adm1029_data *adm1029_update_device(struct device *dev) |
438 | { | 438 | { |
diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c index fc36cadf36fb..c48a284b8314 100644 --- a/drivers/hwmon/lm93.c +++ b/drivers/hwmon/lm93.c | |||
@@ -928,7 +928,7 @@ static void lm93_update_client_common(struct lm93_data *data, | |||
928 | data->prochot_interval = lm93_read_byte(client, | 928 | data->prochot_interval = lm93_read_byte(client, |
929 | LM93_REG_PROCHOT_INTERVAL); | 929 | LM93_REG_PROCHOT_INTERVAL); |
930 | 930 | ||
931 | /* Fan Boost Termperature registers */ | 931 | /* Fan Boost Temperature registers */ |
932 | for (i = 0; i < 4; i++) | 932 | for (i = 0; i < 4; i++) |
933 | data->boost[i] = lm93_read_byte(client, LM93_REG_BOOST(i)); | 933 | data->boost[i] = lm93_read_byte(client, LM93_REG_BOOST(i)); |
934 | 934 | ||
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 2cd00b5b45b4..9fd4a0d3206e 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c | |||
@@ -125,7 +125,7 @@ | |||
125 | 0 - no debugging messages | 125 | 0 - no debugging messages |
126 | 1 - some debugging messages, but none during DMA frame transmission | 126 | 1 - some debugging messages, but none during DMA frame transmission |
127 | 2 - lots of messages, including during DMA frame transmission | 127 | 2 - lots of messages, including during DMA frame transmission |
128 | (will cause undeflows if your machine is too slow!) | 128 | (will cause underflows if your machine is too slow!) |
129 | */ | 129 | */ |
130 | 130 | ||
131 | #define DV1394_DEBUG_LEVEL 0 | 131 | #define DV1394_DEBUG_LEVEL 0 |
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c index 72ed3396b721..0677fc7dfd51 100644 --- a/drivers/infiniband/hw/cxgb3/cxio_hal.c +++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c | |||
@@ -589,7 +589,7 @@ static int cxio_hal_destroy_ctrl_qp(struct cxio_rdev *rdev_p) | |||
589 | 589 | ||
590 | /* write len bytes of data into addr (32B aligned address) | 590 | /* write len bytes of data into addr (32B aligned address) |
591 | * If data is NULL, clear len byte of memory to zero. | 591 | * If data is NULL, clear len byte of memory to zero. |
592 | * caller aquires the ctrl_qp lock before the call | 592 | * caller acquires the ctrl_qp lock before the call |
593 | */ | 593 | */ |
594 | static int cxio_hal_ctrl_qp_write_mem(struct cxio_rdev *rdev_p, u32 addr, | 594 | static int cxio_hal_ctrl_qp_write_mem(struct cxio_rdev *rdev_p, u32 addr, |
595 | u32 len, void *data) | 595 | u32 len, void *data) |
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c index 4bd39c8af80f..37d12e5efa49 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6110.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c | |||
@@ -381,7 +381,7 @@ static const ipath_err_t infinipath_hwe_htclnkbbyte1crcerr = | |||
381 | #define IPATH_GPIO_SCL \ | 381 | #define IPATH_GPIO_SCL \ |
382 | (1ULL << (_IPATH_GPIO_SCL_NUM+INFINIPATH_EXTC_GPIOOE_SHIFT)) | 382 | (1ULL << (_IPATH_GPIO_SCL_NUM+INFINIPATH_EXTC_GPIOOE_SHIFT)) |
383 | 383 | ||
384 | /* keep the code below somewhat more readonable; not used elsewhere */ | 384 | /* keep the code below somewhat more readable; not used elsewhere */ |
385 | #define _IPATH_HTLINK0_CRCBITS (infinipath_hwe_htclnkabyte0crcerr | \ | 385 | #define _IPATH_HTLINK0_CRCBITS (infinipath_hwe_htclnkabyte0crcerr | \ |
386 | infinipath_hwe_htclnkabyte1crcerr) | 386 | infinipath_hwe_htclnkabyte1crcerr) |
387 | #define _IPATH_HTLINK1_CRCBITS (infinipath_hwe_htclnkbbyte0crcerr | \ | 387 | #define _IPATH_HTLINK1_CRCBITS (infinipath_hwe_htclnkbbyte0crcerr | \ |
diff --git a/drivers/infiniband/hw/ipath/ipath_sd7220.c b/drivers/infiniband/hw/ipath/ipath_sd7220.c index aa47eb549520..2a68d9f624dd 100644 --- a/drivers/infiniband/hw/ipath/ipath_sd7220.c +++ b/drivers/infiniband/hw/ipath/ipath_sd7220.c | |||
@@ -614,7 +614,7 @@ static int epb_trans(struct ipath_devdata *dd, u16 reg, u64 i_val, u64 *o_vp) | |||
614 | * @wd: Write Data - value to set in register | 614 | * @wd: Write Data - value to set in register |
615 | * @mask: ones where data should be spliced into reg. | 615 | * @mask: ones where data should be spliced into reg. |
616 | * | 616 | * |
617 | * Basic register read/modify/write, with un-needed acesses elided. That is, | 617 | * Basic register read/modify/write, with un-needed accesses elided. That is, |
618 | * a mask of zero will prevent write, while a mask of 0xFF will prevent read. | 618 | * a mask of zero will prevent write, while a mask of 0xFF will prevent read. |
619 | * returns current (presumed, if a write was done) contents of selected | 619 | * returns current (presumed, if a write was done) contents of selected |
620 | * register, or <0 if errors. | 620 | * register, or <0 if errors. |
@@ -989,7 +989,7 @@ static struct rxeq_init { | |||
989 | /* Set DFELTHFDR/HDR thresholds */ | 989 | /* Set DFELTHFDR/HDR thresholds */ |
990 | RXEQ_VAL(7, 8, 0, 0, 0, 0), /* FDR */ | 990 | RXEQ_VAL(7, 8, 0, 0, 0, 0), /* FDR */ |
991 | RXEQ_VAL(7, 0x21, 0, 0, 0, 0), /* HDR */ | 991 | RXEQ_VAL(7, 0x21, 0, 0, 0, 0), /* HDR */ |
992 | /* Set TLTHFDR/HDR theshold */ | 992 | /* Set TLTHFDR/HDR threshold */ |
993 | RXEQ_VAL(7, 9, 2, 2, 2, 2), /* FDR */ | 993 | RXEQ_VAL(7, 9, 2, 2, 2, 2), /* FDR */ |
994 | RXEQ_VAL(7, 0x23, 2, 2, 2, 2), /* HDR */ | 994 | RXEQ_VAL(7, 0x23, 2, 2, 2, 2), /* HDR */ |
995 | /* Set Preamp setting 2 (ZFR/ZCNT) */ | 995 | /* Set Preamp setting 2 (ZFR/ZCNT) */ |
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c index 219b10397b4d..256a00c6aeea 100644 --- a/drivers/infiniband/hw/mlx4/qp.c +++ b/drivers/infiniband/hw/mlx4/qp.c | |||
@@ -352,7 +352,7 @@ static int set_kernel_sq_size(struct mlx4_ib_dev *dev, struct ib_qp_cap *cap, | |||
352 | * anymore, so we do this only if selective signaling is off. | 352 | * anymore, so we do this only if selective signaling is off. |
353 | * | 353 | * |
354 | * Further, on 32-bit platforms, we can't use vmap() to make | 354 | * Further, on 32-bit platforms, we can't use vmap() to make |
355 | * the QP buffer virtually contigious. Thus we have to use | 355 | * the QP buffer virtually contiguous. Thus we have to use |
356 | * constant-sized WRs to make sure a WR is always fully within | 356 | * constant-sized WRs to make sure a WR is always fully within |
357 | * a single page-sized chunk. | 357 | * a single page-sized chunk. |
358 | * | 358 | * |
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c index ea9e1556e0d6..8579f32ce38e 100644 --- a/drivers/infiniband/ulp/iser/iser_verbs.c +++ b/drivers/infiniband/ulp/iser/iser_verbs.c | |||
@@ -499,7 +499,7 @@ void iser_conn_init(struct iser_conn *ib_conn) | |||
499 | 499 | ||
500 | /** | 500 | /** |
501 | * starts the process of connecting to the target | 501 | * starts the process of connecting to the target |
502 | * sleeps untill the connection is established or rejected | 502 | * sleeps until the connection is established or rejected |
503 | */ | 503 | */ |
504 | int iser_connect(struct iser_conn *ib_conn, | 504 | int iser_connect(struct iser_conn *ib_conn, |
505 | struct sockaddr_in *src_addr, | 505 | struct sockaddr_in *src_addr, |
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c index 1c9410d1822c..bcc2d30ec245 100644 --- a/drivers/input/serio/hp_sdc.c +++ b/drivers/input/serio/hp_sdc.c | |||
@@ -955,7 +955,7 @@ static int __init hp_sdc_init_hppa(struct parisc_device *d) | |||
955 | INIT_DELAYED_WORK(&moduleloader_work, request_module_delayed); | 955 | INIT_DELAYED_WORK(&moduleloader_work, request_module_delayed); |
956 | 956 | ||
957 | ret = hp_sdc_init(); | 957 | ret = hp_sdc_init(); |
958 | /* after sucessfull initialization give SDC some time to settle | 958 | /* after successfull initialization give SDC some time to settle |
959 | * and then load the hp_sdc_mlc upper layer driver */ | 959 | * and then load the hp_sdc_mlc upper layer driver */ |
960 | if (!ret) | 960 | if (!ret) |
961 | schedule_delayed_work(&moduleloader_work, | 961 | schedule_delayed_work(&moduleloader_work, |
diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c index 820e51673b26..7d2b820ef58d 100644 --- a/drivers/input/serio/hp_sdc_mlc.c +++ b/drivers/input/serio/hp_sdc_mlc.c | |||
@@ -125,7 +125,7 @@ static void hp_sdc_mlc_isr (int irq, void *dev_id, | |||
125 | break; | 125 | break; |
126 | 126 | ||
127 | default: | 127 | default: |
128 | printk(KERN_WARNING PREFIX "Unkown HIL Error status (%x)!\n", data); | 128 | printk(KERN_WARNING PREFIX "Unknown HIL Error status (%x)!\n", data); |
129 | break; | 129 | break; |
130 | } | 130 | } |
131 | 131 | ||
diff --git a/drivers/input/touchscreen/atmel-wm97xx.c b/drivers/input/touchscreen/atmel-wm97xx.c index 35377f583e28..a12242f77e23 100644 --- a/drivers/input/touchscreen/atmel-wm97xx.c +++ b/drivers/input/touchscreen/atmel-wm97xx.c | |||
@@ -59,7 +59,7 @@ | |||
59 | #define ATMEL_WM97XX_AC97C_IRQ (29) | 59 | #define ATMEL_WM97XX_AC97C_IRQ (29) |
60 | #define ATMEL_WM97XX_GPIO_DEFAULT (32+16) /* Pin 16 on port B. */ | 60 | #define ATMEL_WM97XX_GPIO_DEFAULT (32+16) /* Pin 16 on port B. */ |
61 | #else | 61 | #else |
62 | #error Unkown CPU, this driver only supports AT32AP700X CPUs. | 62 | #error Unknown CPU, this driver only supports AT32AP700X CPUs. |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | struct continuous { | 65 | struct continuous { |
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c index 8fc3b08deb3b..6cdcf2a6e036 100644 --- a/drivers/input/touchscreen/mainstone-wm97xx.c +++ b/drivers/input/touchscreen/mainstone-wm97xx.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * | 14 | * |
15 | * Notes: | 15 | * Notes: |
16 | * This is a wm97xx extended touch driver to capture touch | 16 | * This is a wm97xx extended touch driver to capture touch |
17 | * data in a continuous manner on the Intel XScale archictecture | 17 | * data in a continuous manner on the Intel XScale architecture |
18 | * | 18 | * |
19 | * Features: | 19 | * Features: |
20 | * - codecs supported:- WM9705, WM9712, WM9713 | 20 | * - codecs supported:- WM9705, WM9712, WM9713 |
@@ -131,7 +131,7 @@ static int wm97xx_acc_pen_down(struct wm97xx *wm) | |||
131 | /* When the AC97 queue has been drained we need to allow time | 131 | /* When the AC97 queue has been drained we need to allow time |
132 | * to buffer up samples otherwise we end up spinning polling | 132 | * to buffer up samples otherwise we end up spinning polling |
133 | * for samples. The controller can't have a suitably low | 133 | * for samples. The controller can't have a suitably low |
134 | * threashold set to use the notifications it gives. | 134 | * threshold set to use the notifications it gives. |
135 | */ | 135 | */ |
136 | schedule_timeout_uninterruptible(1); | 136 | schedule_timeout_uninterruptible(1); |
137 | 137 | ||
diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c index 41e4359c277c..eca54dbdf493 100644 --- a/drivers/input/touchscreen/zylonite-wm97xx.c +++ b/drivers/input/touchscreen/zylonite-wm97xx.c | |||
@@ -96,7 +96,7 @@ static int wm97xx_acc_pen_down(struct wm97xx *wm) | |||
96 | /* When the AC97 queue has been drained we need to allow time | 96 | /* When the AC97 queue has been drained we need to allow time |
97 | * to buffer up samples otherwise we end up spinning polling | 97 | * to buffer up samples otherwise we end up spinning polling |
98 | * for samples. The controller can't have a suitably low | 98 | * for samples. The controller can't have a suitably low |
99 | * threashold set to use the notifications it gives. | 99 | * threshold set to use the notifications it gives. |
100 | */ | 100 | */ |
101 | msleep(1); | 101 | msleep(1); |
102 | 102 | ||
diff --git a/drivers/isdn/act2000/Kconfig b/drivers/isdn/act2000/Kconfig index 3fc1a5434ef7..fa2673fc69c2 100644 --- a/drivers/isdn/act2000/Kconfig +++ b/drivers/isdn/act2000/Kconfig | |||
@@ -1,6 +1,3 @@ | |||
1 | # | ||
2 | # Config.in for IBM Active 2000 ISDN driver | ||
3 | # | ||
4 | config ISDN_DRV_ACT2000 | 1 | config ISDN_DRV_ACT2000 |
5 | tristate "IBM Active 2000 support" | 2 | tristate "IBM Active 2000 support" |
6 | depends on ISA | 3 | depends on ISA |
@@ -10,4 +7,3 @@ config ISDN_DRV_ACT2000 | |||
10 | into the card using a utility which is part of the latest | 7 | into the card using a utility which is part of the latest |
11 | isdn4k-utils package. Please read the file | 8 | isdn4k-utils package. Please read the file |
12 | <file:Documentation/isdn/README.act2000> for more information. | 9 | <file:Documentation/isdn/README.act2000> for more information. |
13 | |||
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig index e1afd60924fb..b2a04755c96a 100644 --- a/drivers/isdn/capi/Kconfig +++ b/drivers/isdn/capi/Kconfig | |||
@@ -1,6 +1,3 @@ | |||
1 | # | ||
2 | # Config.in for the CAPI subsystem | ||
3 | # | ||
4 | config ISDN_DRV_AVMB1_VERBOSE_REASON | 1 | config ISDN_DRV_AVMB1_VERBOSE_REASON |
5 | bool "Verbose reason code reporting" | 2 | bool "Verbose reason code reporting" |
6 | default y | 3 | default y |
@@ -59,4 +56,3 @@ config ISDN_CAPI_CAPIDRV | |||
59 | the legacy isdn4linux link layer. If you have a card which is | 56 | the legacy isdn4linux link layer. If you have a card which is |
60 | supported by a CAPI driver, but still want to use old features like | 57 | supported by a CAPI driver, but still want to use old features like |
61 | ippp interfaces or ttyI emulation, say Y/M here. | 58 | ippp interfaces or ttyI emulation, say Y/M here. |
62 | |||
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c index 3e6d17f42a98..66b7d7a86474 100644 --- a/drivers/isdn/capi/capidrv.c +++ b/drivers/isdn/capi/capidrv.c | |||
@@ -830,7 +830,7 @@ static void handle_controller(_cmsg * cmsg) | |||
830 | case 0: break; | 830 | case 0: break; |
831 | case 1: s = "unknown class"; break; | 831 | case 1: s = "unknown class"; break; |
832 | case 2: s = "unknown function"; break; | 832 | case 2: s = "unknown function"; break; |
833 | default: s = "unkown error"; break; | 833 | default: s = "unknown error"; break; |
834 | } | 834 | } |
835 | if (s) | 835 | if (s) |
836 | printk(KERN_INFO "capidrv-%d: %s from controller 0x%x function %d: %s\n", | 836 | printk(KERN_INFO "capidrv-%d: %s from controller 0x%x function %d: %s\n", |
diff --git a/drivers/isdn/hardware/eicon/di.c b/drivers/isdn/hardware/eicon/di.c index b029d130eb21..cb14ae3e7154 100644 --- a/drivers/isdn/hardware/eicon/di.c +++ b/drivers/isdn/hardware/eicon/di.c | |||
@@ -806,7 +806,7 @@ static void xdi_xlog_request (byte Adapter, byte Id, | |||
806 | DELIVERY - indication entered isdn_rc function | 806 | DELIVERY - indication entered isdn_rc function |
807 | RNR=... - application had returned RNR=... after the | 807 | RNR=... - application had returned RNR=... after the |
808 | look ahead callback | 808 | look ahead callback |
809 | RNum=0 - aplication had not returned any buffer to copy | 809 | RNum=0 - application had not returned any buffer to copy |
810 | this indication and will copy it self | 810 | this indication and will copy it self |
811 | COMPLETE - XDI had copied the data to the buffers provided | 811 | COMPLETE - XDI had copied the data to the buffers provided |
812 | bu the application and is about to issue the | 812 | bu the application and is about to issue the |
diff --git a/drivers/isdn/hardware/eicon/maintidi.c b/drivers/isdn/hardware/eicon/maintidi.c index 41c26e756452..534978bdf382 100644 --- a/drivers/isdn/hardware/eicon/maintidi.c +++ b/drivers/isdn/hardware/eicon/maintidi.c | |||
@@ -385,7 +385,7 @@ static int SuperTraceMessageInput (void* hLib) { | |||
385 | } | 385 | } |
386 | break; | 386 | break; |
387 | default: | 387 | default: |
388 | diva_mnt_internal_dprintf (0, DLI_ERR, "Unknon IDI Ind (DMA mode): %02x", Ind); | 388 | diva_mnt_internal_dprintf (0, DLI_ERR, "Unknown IDI Ind (DMA mode): %02x", Ind); |
389 | } | 389 | } |
390 | p += (this_ind_length+1); | 390 | p += (this_ind_length+1); |
391 | total_length -= (4 + this_ind_length); | 391 | total_length -= (4 + this_ind_length); |
@@ -420,7 +420,7 @@ static int SuperTraceMessageInput (void* hLib) { | |||
420 | } | 420 | } |
421 | break; | 421 | break; |
422 | default: | 422 | default: |
423 | diva_mnt_internal_dprintf (0, DLI_ERR, "Unknon IDI Ind: %02x", Ind); | 423 | diva_mnt_internal_dprintf (0, DLI_ERR, "Unknown IDI Ind: %02x", Ind); |
424 | } | 424 | } |
425 | } | 425 | } |
426 | } | 426 | } |
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c index fc46a26cb14f..a64bb6c67ba7 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.c +++ b/drivers/isdn/hardware/mISDN/hfcsusb.c | |||
@@ -721,7 +721,7 @@ hfcsusb_setup_bch(struct bchannel *bch, int protocol) | |||
721 | switch (protocol) { | 721 | switch (protocol) { |
722 | case (-1): /* used for init */ | 722 | case (-1): /* used for init */ |
723 | bch->state = -1; | 723 | bch->state = -1; |
724 | /* fall trough */ | 724 | /* fall through */ |
725 | case (ISDN_P_NONE): | 725 | case (ISDN_P_NONE): |
726 | if (bch->state == ISDN_P_NONE) | 726 | if (bch->state == ISDN_P_NONE) |
727 | return 0; /* already in idle state */ | 727 | return 0; /* already in idle state */ |
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.h b/drivers/isdn/hardware/mISDN/hfcsusb.h index 43efe7358fa3..369196adae03 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.h +++ b/drivers/isdn/hardware/mISDN/hfcsusb.h | |||
@@ -150,7 +150,7 @@ symbolic(struct hfcusb_symbolic_list list[], const int num) | |||
150 | for (i = 0; list[i].name != NULL; i++) | 150 | for (i = 0; list[i].name != NULL; i++) |
151 | if (list[i].num == num) | 151 | if (list[i].num == num) |
152 | return list[i].name; | 152 | return list[i].name; |
153 | return "<unkown USB Error>"; | 153 | return "<unknown USB Error>"; |
154 | } | 154 | } |
155 | 155 | ||
156 | /* USB descriptor need to contain one of the following EndPoint combination: */ | 156 | /* USB descriptor need to contain one of the following EndPoint combination: */ |
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c index de352a17673a..09095c747110 100644 --- a/drivers/isdn/hardware/mISDN/mISDNisar.c +++ b/drivers/isdn/hardware/mISDN/mISDNisar.c | |||
@@ -860,7 +860,7 @@ isar_pump_statev_modem(struct isar_ch *ch, u8 devt) { | |||
860 | pr_debug("%s: pump stev GSTN CLEAR\n", ch->is->name); | 860 | pr_debug("%s: pump stev GSTN CLEAR\n", ch->is->name); |
861 | break; | 861 | break; |
862 | default: | 862 | default: |
863 | pr_info("u%s: nknown pump stev %x\n", ch->is->name, devt); | 863 | pr_info("u%s: unknown pump stev %x\n", ch->is->name, devt); |
864 | break; | 864 | break; |
865 | } | 865 | } |
866 | } | 866 | } |
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c index a420b64472e3..aaaeaafd86f4 100644 --- a/drivers/isdn/hisax/hfc_usb.c +++ b/drivers/isdn/hisax/hfc_usb.c | |||
@@ -1086,7 +1086,7 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg) | |||
1086 | break; | 1086 | break; |
1087 | default: | 1087 | default: |
1088 | DBG(HFCUSB_DBG_STATES, | 1088 | DBG(HFCUSB_DBG_STATES, |
1089 | "HFC_USB: hfc_usb_d_l2l1: unkown state : %#x", pr); | 1089 | "HFC_USB: hfc_usb_d_l2l1: unknown state : %#x", pr); |
1090 | break; | 1090 | break; |
1091 | } | 1091 | } |
1092 | } | 1092 | } |
diff --git a/drivers/isdn/hysdn/Kconfig b/drivers/isdn/hysdn/Kconfig index c9e4231968ef..e86bc6583d71 100644 --- a/drivers/isdn/hysdn/Kconfig +++ b/drivers/isdn/hysdn/Kconfig | |||
@@ -1,6 +1,3 @@ | |||
1 | # | ||
2 | # Config.in for HYSDN ISDN driver | ||
3 | # | ||
4 | config HYSDN | 1 | config HYSDN |
5 | tristate "Hypercope HYSDN cards (Champ, Ergo, Metro) support (module only)" | 2 | tristate "Hypercope HYSDN cards (Champ, Ergo, Metro) support (module only)" |
6 | depends on m && PROC_FS && PCI | 3 | depends on m && PROC_FS && PCI |
@@ -15,4 +12,3 @@ config HYSDN_CAPI | |||
15 | depends on HYSDN && ISDN_CAPI | 12 | depends on HYSDN && ISDN_CAPI |
16 | help | 13 | help |
17 | Say Y here if you like to use Hypercope's CAPI 2.0 interface. | 14 | Say Y here if you like to use Hypercope's CAPI 2.0 interface. |
18 | |||
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 90b56ed8651f..507e13d9a57c 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c | |||
@@ -1563,7 +1563,7 @@ isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data) | |||
1563 | *(__be32 *)(p + 4) = cpu_to_be32(CISCO_SLARP_KEEPALIVE); | 1563 | *(__be32 *)(p + 4) = cpu_to_be32(CISCO_SLARP_KEEPALIVE); |
1564 | *(__be32 *)(p + 8) = cpu_to_be32(lp->cisco_myseq); | 1564 | *(__be32 *)(p + 8) = cpu_to_be32(lp->cisco_myseq); |
1565 | *(__be32 *)(p + 12) = cpu_to_be32(lp->cisco_yourseq); | 1565 | *(__be32 *)(p + 12) = cpu_to_be32(lp->cisco_yourseq); |
1566 | *(__be16 *)(p + 16) = cpu_to_be16(0xffff); // reliablity, always 0xffff | 1566 | *(__be16 *)(p + 16) = cpu_to_be16(0xffff); // reliability, always 0xffff |
1567 | p += 18; | 1567 | p += 18; |
1568 | 1568 | ||
1569 | isdn_net_write_super(lp, skb); | 1569 | isdn_net_write_super(lp, skb); |
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 642d5aaf53ce..45df6675e8ed 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
@@ -836,7 +836,7 @@ isdn_ppp_write(int min, struct file *file, const char __user *buf, int count) | |||
836 | unsigned short hl; | 836 | unsigned short hl; |
837 | struct sk_buff *skb; | 837 | struct sk_buff *skb; |
838 | /* | 838 | /* |
839 | * we need to reserve enought space in front of | 839 | * we need to reserve enough space in front of |
840 | * sk_buff. old call to dev_alloc_skb only reserved | 840 | * sk_buff. old call to dev_alloc_skb only reserved |
841 | * 16 bytes, now we are looking what the driver want | 841 | * 16 bytes, now we are looking what the driver want |
842 | */ | 842 | */ |
@@ -1326,7 +1326,7 @@ isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
1326 | struct sk_buff *new_skb; | 1326 | struct sk_buff *new_skb; |
1327 | unsigned short hl; | 1327 | unsigned short hl; |
1328 | /* | 1328 | /* |
1329 | * we need to reserve enought space in front of | 1329 | * we need to reserve enough space in front of |
1330 | * sk_buff. old call to dev_alloc_skb only reserved | 1330 | * sk_buff. old call to dev_alloc_skb only reserved |
1331 | * 16 bytes, now we are looking what the driver want. | 1331 | * 16 bytes, now we are looking what the driver want. |
1332 | */ | 1332 | */ |
@@ -1674,7 +1674,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, | |||
1674 | * - insert new fragment into the proper sequence slot (once that's done | 1674 | * - insert new fragment into the proper sequence slot (once that's done |
1675 | * newfrag will be set to NULL) | 1675 | * newfrag will be set to NULL) |
1676 | * - reassemble any complete fragment sequence (non-null 'start' | 1676 | * - reassemble any complete fragment sequence (non-null 'start' |
1677 | * indicates there is a continguous sequence present) | 1677 | * indicates there is a contiguous sequence present) |
1678 | * - discard any incomplete sequences that are below minseq -- due | 1678 | * - discard any incomplete sequences that are below minseq -- due |
1679 | * to the fact that sender always increment sequence number, if there | 1679 | * to the fact that sender always increment sequence number, if there |
1680 | * is an incomplete sequence below minseq, no new fragments would | 1680 | * is an incomplete sequence below minseq, no new fragments would |
diff --git a/drivers/isdn/i4l/isdn_ttyfax.c b/drivers/isdn/i4l/isdn_ttyfax.c index 78f7660c1d0e..4c41f191d4e2 100644 --- a/drivers/isdn/i4l/isdn_ttyfax.c +++ b/drivers/isdn/i4l/isdn_ttyfax.c | |||
@@ -470,7 +470,7 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info) | |||
470 | } | 470 | } |
471 | return 0; | 471 | return 0; |
472 | } | 472 | } |
473 | /* BADMUL=value - dummy 0=disable errorchk disabled (treshold multiplier) */ | 473 | /* BADMUL=value - dummy 0=disable errorchk disabled (threshold multiplier) */ |
474 | if (!strncmp(p[0], "BADMUL", 6)) { | 474 | if (!strncmp(p[0], "BADMUL", 6)) { |
475 | p[0] += 6; | 475 | p[0] += 6; |
476 | switch (*p[0]) { | 476 | switch (*p[0]) { |
diff --git a/drivers/isdn/icn/Kconfig b/drivers/isdn/icn/Kconfig index 89d15eed765e..4534f21a1852 100644 --- a/drivers/isdn/icn/Kconfig +++ b/drivers/isdn/icn/Kconfig | |||
@@ -1,6 +1,3 @@ | |||
1 | # | ||
2 | # Config.in for ICN ISDN driver | ||
3 | # | ||
4 | config ISDN_DRV_ICN | 1 | config ISDN_DRV_ICN |
5 | tristate "ICN 2B and 4B support" | 2 | tristate "ICN 2B and 4B support" |
6 | depends on ISA | 3 | depends on ISA |
@@ -13,4 +10,3 @@ config ISDN_DRV_ICN | |||
13 | separately. See <file:Documentation/isdn/README> and | 10 | separately. See <file:Documentation/isdn/README> and |
14 | <file:Documentation/isdn/README.icn> for more | 11 | <file:Documentation/isdn/README.icn> for more |
15 | information. | 12 | information. |
16 | |||
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 77ee2867c8b4..43ff4d3b046e 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c | |||
@@ -110,7 +110,7 @@ | |||
110 | * crossconnections and conferences via software if not possible through | 110 | * crossconnections and conferences via software if not possible through |
111 | * hardware. If hardware capability is available, hardware is used. | 111 | * hardware. If hardware capability is available, hardware is used. |
112 | * | 112 | * |
113 | * Echo: Is generated by CMX and is used to check performane of hard and | 113 | * Echo: Is generated by CMX and is used to check performance of hard and |
114 | * software CMX. | 114 | * software CMX. |
115 | * | 115 | * |
116 | * The CMX has special functions for conferences with one, two and more | 116 | * The CMX has special functions for conferences with one, two and more |
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c index e04bad6c5baf..6d4da6095885 100644 --- a/drivers/isdn/mISDN/tei.c +++ b/drivers/isdn/mISDN/tei.c | |||
@@ -725,7 +725,7 @@ tei_id_ver_tout_net(struct FsmInst *fi, int event, void *arg) | |||
725 | if (tm->rcnt == 1) { | 725 | if (tm->rcnt == 1) { |
726 | if (*debug & DEBUG_L2_TEI) | 726 | if (*debug & DEBUG_L2_TEI) |
727 | tm->tei_m.printdebug(fi, | 727 | tm->tei_m.printdebug(fi, |
728 | "check req for tei %d sucessful\n", tm->l2->tei); | 728 | "check req for tei %d successful\n", tm->l2->tei); |
729 | mISDN_FsmChangeState(fi, ST_TEI_NOP); | 729 | mISDN_FsmChangeState(fi, ST_TEI_NOP); |
730 | } else if (tm->rcnt > 1) { | 730 | } else if (tm->rcnt > 1) { |
731 | /* duplicate assignment; remove */ | 731 | /* duplicate assignment; remove */ |
diff --git a/drivers/isdn/pcbit/Kconfig b/drivers/isdn/pcbit/Kconfig index ffba6eca1244..e9b2dd85d410 100644 --- a/drivers/isdn/pcbit/Kconfig +++ b/drivers/isdn/pcbit/Kconfig | |||
@@ -1,6 +1,3 @@ | |||
1 | # | ||
2 | # Config.in for PCBIT ISDN driver | ||
3 | # | ||
4 | config ISDN_DRV_PCBIT | 1 | config ISDN_DRV_PCBIT |
5 | tristate "PCBIT-D support" | 2 | tristate "PCBIT-D support" |
6 | depends on ISA && (BROKEN || X86) | 3 | depends on ISA && (BROKEN || X86) |
@@ -11,4 +8,3 @@ config ISDN_DRV_PCBIT | |||
11 | the card using a utility which is distributed separately. See | 8 | the card using a utility which is distributed separately. See |
12 | <file:Documentation/isdn/README> and | 9 | <file:Documentation/isdn/README> and |
13 | <file:Documentation/isdn/README.pcbit> for more information. | 10 | <file:Documentation/isdn/README.pcbit> for more information. |
14 | |||
diff --git a/drivers/isdn/sc/Kconfig b/drivers/isdn/sc/Kconfig index e6510ca7bf43..7469863a7925 100644 --- a/drivers/isdn/sc/Kconfig +++ b/drivers/isdn/sc/Kconfig | |||
@@ -1,6 +1,3 @@ | |||
1 | # | ||
2 | # Config.in for Spellcaster ISDN driver | ||
3 | # | ||
4 | config ISDN_DRV_SC | 1 | config ISDN_DRV_SC |
5 | tristate "Spellcaster support" | 2 | tristate "Spellcaster support" |
6 | depends on ISA | 3 | depends on ISA |
@@ -9,4 +6,3 @@ config ISDN_DRV_SC | |||
9 | driver currently builds only in a modularized version. | 6 | driver currently builds only in a modularized version. |
10 | To build it, choose M here: the module will be called sc. | 7 | To build it, choose M here: the module will be called sc. |
11 | See <file:Documentation/isdn/README.sc> for more information. | 8 | See <file:Documentation/isdn/README.sc> for more information. |
12 | |||
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 8b9364434aa0..3fbe41b0ac07 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
@@ -15,7 +15,7 @@ | |||
15 | * | 15 | * |
16 | * WARNING: This driver has only been testen on Apple's | 16 | * WARNING: This driver has only been testen on Apple's |
17 | * 1.25 MHz Dual G4 (March 03). It is tuned for a CPU | 17 | * 1.25 MHz Dual G4 (March 03). It is tuned for a CPU |
18 | * temperatur around 57 C. | 18 | * temperature around 57 C. |
19 | * | 19 | * |
20 | * Copyright (C) 2003, 2004 Samuel Rydh (samuel@ibrium.se) | 20 | * Copyright (C) 2003, 2004 Samuel Rydh (samuel@ibrium.se) |
21 | * | 21 | * |
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index ed1038164019..e412980763bd 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
@@ -988,7 +988,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) | |||
988 | goto bad_cipher; | 988 | goto bad_cipher; |
989 | } | 989 | } |
990 | 990 | ||
991 | /* Compatiblity mode for old dm-crypt cipher strings */ | 991 | /* Compatibility mode for old dm-crypt cipher strings */ |
992 | if (!chainmode || (strcmp(chainmode, "plain") == 0 && !ivmode)) { | 992 | if (!chainmode || (strcmp(chainmode, "plain") == 0 && !ivmode)) { |
993 | chainmode = "cbc"; | 993 | chainmode = "cbc"; |
994 | ivmode = "plain"; | 994 | ivmode = "plain"; |
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c index 7e8f56815998..48cb154c7a46 100644 --- a/drivers/media/common/saa7146_i2c.c +++ b/drivers/media/common/saa7146_i2c.c | |||
@@ -98,7 +98,7 @@ static int saa7146_i2c_msg_cleanup(const struct i2c_msg *m, int num, __le32 *op) | |||
98 | 98 | ||
99 | op_count++; | 99 | op_count++; |
100 | 100 | ||
101 | /* loop throgh all bytes of message i */ | 101 | /* loop through all bytes of message i */ |
102 | for(j = 0; j < m[i].len; j++) { | 102 | for(j = 0; j < m[i].len; j++) { |
103 | /* write back all bytes that could have been read */ | 103 | /* write back all bytes that could have been read */ |
104 | m[i].buf[j] = (le32_to_cpu(op[op_count/3]) >> ((3-(op_count%3))*8)); | 104 | m[i].buf[j] = (le32_to_cpu(op[op_count/3]) >> ((3-(op_count%3))*8)); |
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index 810f07d63246..52e4ce4304ee 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h | |||
@@ -160,7 +160,7 @@ struct tuner_state { | |||
160 | * search callback possible return status | 160 | * search callback possible return status |
161 | * | 161 | * |
162 | * DVBFE_ALGO_SEARCH_SUCCESS | 162 | * DVBFE_ALGO_SEARCH_SUCCESS |
163 | * The frontend search algorithm completed and returned succesfully | 163 | * The frontend search algorithm completed and returned successfully |
164 | * | 164 | * |
165 | * DVBFE_ALGO_SEARCH_ASLEEP | 165 | * DVBFE_ALGO_SEARCH_ASLEEP |
166 | * The frontend search algorithm is sleeping | 166 | * The frontend search algorithm is sleeping |
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c index 0241a7c5c34a..8b8558fcb042 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.c +++ b/drivers/media/dvb/dvb-core/dvb_net.c | |||
@@ -1396,7 +1396,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file, | |||
1396 | return ret; | 1396 | return ret; |
1397 | } | 1397 | } |
1398 | 1398 | ||
1399 | /* binary compatiblity cruft */ | 1399 | /* binary compatibility cruft */ |
1400 | case __NET_ADD_IF_OLD: | 1400 | case __NET_ADD_IF_OLD: |
1401 | { | 1401 | { |
1402 | struct __dvb_net_if_old *dvbnetif = parg; | 1402 | struct __dvb_net_if_old *dvbnetif = parg; |
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c index 2ae7f648effe..bb69f3719f9a 100644 --- a/drivers/media/dvb/dvb-usb/anysee.c +++ b/drivers/media/dvb/dvb-usb/anysee.c | |||
@@ -344,7 +344,7 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap) | |||
344 | if (ret) | 344 | if (ret) |
345 | return ret; | 345 | return ret; |
346 | 346 | ||
347 | err("Unkown Anysee version: %02x %02x %02x. "\ | 347 | err("Unknown Anysee version: %02x %02x %02x. "\ |
348 | "Please report the <linux-dvb@linuxtv.org>.", | 348 | "Please report the <linux-dvb@linuxtv.org>.", |
349 | hw_info[0], hw_info[1], hw_info[2]); | 349 | hw_info[0], hw_info[1], hw_info[2]); |
350 | 350 | ||
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c index eeef50bff4f9..5c0126dc1ff9 100644 --- a/drivers/media/dvb/dvb-usb/dibusb-mb.c +++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c | |||
@@ -242,7 +242,7 @@ static struct dvb_usb_device_properties dibusb1_1_properties = { | |||
242 | { &dibusb_dib3000mb_table[9], &dibusb_dib3000mb_table[11], NULL }, | 242 | { &dibusb_dib3000mb_table[9], &dibusb_dib3000mb_table[11], NULL }, |
243 | { &dibusb_dib3000mb_table[10], &dibusb_dib3000mb_table[12], NULL }, | 243 | { &dibusb_dib3000mb_table[10], &dibusb_dib3000mb_table[12], NULL }, |
244 | }, | 244 | }, |
245 | { "Unkown USB1.1 DVB-T device ???? please report the name to the author", | 245 | { "Unknown USB1.1 DVB-T device ???? please report the name to the author", |
246 | { &dibusb_dib3000mb_table[13], NULL }, | 246 | { &dibusb_dib3000mb_table[13], NULL }, |
247 | { &dibusb_dib3000mb_table[14], NULL }, | 247 | { &dibusb_dib3000mb_table[14], NULL }, |
248 | }, | 248 | }, |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c index edde87c6aa3a..6b5ded9e7d5d 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c | |||
@@ -259,7 +259,7 @@ int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *d, | |||
259 | *state = REMOTE_KEY_REPEAT; | 259 | *state = REMOTE_KEY_REPEAT; |
260 | break; | 260 | break; |
261 | default: | 261 | default: |
262 | deb_err("unkown type of remote status: %d\n",keybuf[0]); | 262 | deb_err("unknown type of remote status: %d\n",keybuf[0]); |
263 | break; | 263 | break; |
264 | } | 264 | } |
265 | return 0; | 265 | return 0; |
diff --git a/drivers/media/dvb/dvb-usb/usb-urb.c b/drivers/media/dvb/dvb-usb/usb-urb.c index 9da2cc95ca13..f9702e3756b6 100644 --- a/drivers/media/dvb/dvb-usb/usb-urb.c +++ b/drivers/media/dvb/dvb-usb/usb-urb.c | |||
@@ -56,7 +56,7 @@ static void usb_urb_complete(struct urb *urb) | |||
56 | stream->complete(stream, b, urb->actual_length); | 56 | stream->complete(stream, b, urb->actual_length); |
57 | break; | 57 | break; |
58 | default: | 58 | default: |
59 | err("unkown endpoint type in completition handler."); | 59 | err("unknown endpoint type in completition handler."); |
60 | return; | 60 | return; |
61 | } | 61 | } |
62 | usb_submit_urb(urb,GFP_ATOMIC); | 62 | usb_submit_urb(urb,GFP_ATOMIC); |
@@ -228,7 +228,7 @@ int usb_urb_init(struct usb_data_stream *stream, struct usb_data_stream_properti | |||
228 | case USB_ISOC: | 228 | case USB_ISOC: |
229 | return usb_isoc_urb_init(stream); | 229 | return usb_isoc_urb_init(stream); |
230 | default: | 230 | default: |
231 | err("unkown URB-type for data transfer."); | 231 | err("unknown URB-type for data transfer."); |
232 | return -EINVAL; | 232 | return -EINVAL; |
233 | } | 233 | } |
234 | } | 234 | } |
diff --git a/drivers/media/dvb/frontends/au8522_decoder.c b/drivers/media/dvb/frontends/au8522_decoder.c index 74981ee923c8..7c6431fe33e0 100644 --- a/drivers/media/dvb/frontends/au8522_decoder.c +++ b/drivers/media/dvb/frontends/au8522_decoder.c | |||
@@ -315,7 +315,7 @@ static void setup_decoder_defaults(struct au8522_state *state, u8 input_mode) | |||
315 | if (input_mode == AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH13 || | 315 | if (input_mode == AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH13 || |
316 | input_mode == AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH24) { | 316 | input_mode == AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH24) { |
317 | /* Despite what the table says, for the HVR-950q we still need | 317 | /* Despite what the table says, for the HVR-950q we still need |
318 | to be in CVBS mode for the S-Video input (reason uknown). */ | 318 | to be in CVBS mode for the S-Video input (reason unknown). */ |
319 | /* filter_coef_type = 3; */ | 319 | /* filter_coef_type = 3; */ |
320 | filter_coef_type = 5; | 320 | filter_coef_type = 5; |
321 | } else { | 321 | } else { |
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c index ffbcfabd83f0..00a4e8f03304 100644 --- a/drivers/media/dvb/frontends/cx24110.c +++ b/drivers/media/dvb/frontends/cx24110.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | cx24110 - Single Chip Satellite Channel Receiver driver module | 2 | cx24110 - Single Chip Satellite Channel Receiver driver module |
3 | 3 | ||
4 | Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@htp-tel.de> based on | 4 | Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@htp-tel.de> based on |
@@ -96,7 +96,7 @@ static struct {u8 reg; u8 data;} cx24110_regdata[]= | |||
96 | {0x42,0x00}, /* @ middle bytes " */ | 96 | {0x42,0x00}, /* @ middle bytes " */ |
97 | {0x43,0x00}, /* @ LSB " */ | 97 | {0x43,0x00}, /* @ LSB " */ |
98 | /* leave the carrier tracking loop parameters on default */ | 98 | /* leave the carrier tracking loop parameters on default */ |
99 | /* leave the bit timing loop parameters at gefault */ | 99 | /* leave the bit timing loop parameters at default */ |
100 | {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */ | 100 | {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */ |
101 | /* the cx24108 data sheet for symbol rates above 15MS/s */ | 101 | /* the cx24108 data sheet for symbol rates above 15MS/s */ |
102 | {0x57,0x00}, /* @ Filter sigma delta enabled, positive */ | 102 | {0x57,0x00}, /* @ Filter sigma delta enabled, positive */ |
diff --git a/drivers/media/dvb/frontends/cx24113.c b/drivers/media/dvb/frontends/cx24113.c index 075b2b57cf09..e9ee55592fd3 100644 --- a/drivers/media/dvb/frontends/cx24113.c +++ b/drivers/media/dvb/frontends/cx24113.c | |||
@@ -589,7 +589,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe, | |||
589 | info("detected CX24113 variant\n"); | 589 | info("detected CX24113 variant\n"); |
590 | break; | 590 | break; |
591 | case REV_CX24113: | 591 | case REV_CX24113: |
592 | info("sucessfully detected\n"); | 592 | info("successfully detected\n"); |
593 | break; | 593 | break; |
594 | default: | 594 | default: |
595 | err("unsupported device id: %x\n", state->rev); | 595 | err("unsupported device id: %x\n", state->rev); |
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c index 136b9d2164d7..ad4c8cfd8090 100644 --- a/drivers/media/dvb/frontends/dib3000mb.c +++ b/drivers/media/dvb/frontends/dib3000mb.c | |||
@@ -154,7 +154,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe, | |||
154 | case BANDWIDTH_AUTO: | 154 | case BANDWIDTH_AUTO: |
155 | return -EOPNOTSUPP; | 155 | return -EOPNOTSUPP; |
156 | default: | 156 | default: |
157 | err("unkown bandwidth value."); | 157 | err("unknown bandwidth value."); |
158 | return -EINVAL; | 158 | return -EINVAL; |
159 | } | 159 | } |
160 | } | 160 | } |
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c index 010075535221..868b78bfae75 100644 --- a/drivers/media/dvb/frontends/drx397xD.c +++ b/drivers/media/dvb/frontends/drx397xD.c | |||
@@ -81,7 +81,7 @@ static struct { | |||
81 | #include "drx397xD_fw.h" | 81 | #include "drx397xD_fw.h" |
82 | }; | 82 | }; |
83 | 83 | ||
84 | /* use only with writer lock aquired */ | 84 | /* use only with writer lock acquired */ |
85 | static void _drx_release_fw(struct drx397xD_state *s, enum fw_ix ix) | 85 | static void _drx_release_fw(struct drx397xD_state *s, enum fw_ix ix) |
86 | { | 86 | { |
87 | memset(&fw[ix].data[0], 0, sizeof(fw[0].data)); | 87 | memset(&fw[ix].data[0], 0, sizeof(fw[0].data)); |
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c index 056387b41a8f..43971e63baa7 100644 --- a/drivers/media/dvb/frontends/lgdt330x.c +++ b/drivers/media/dvb/frontends/lgdt330x.c | |||
@@ -479,7 +479,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status) | |||
479 | switch (state->current_modulation) { | 479 | switch (state->current_modulation) { |
480 | case QAM_256: | 480 | case QAM_256: |
481 | case QAM_64: | 481 | case QAM_64: |
482 | /* Need to undestand why there are 3 lock levels here */ | 482 | /* Need to understand why there are 3 lock levels here */ |
483 | if ((buf[0] & 0x07) == 0x07) | 483 | if ((buf[0] & 0x07) == 0x07) |
484 | *status |= FE_HAS_CARRIER; | 484 | *status |= FE_HAS_CARRIER; |
485 | break; | 485 | break; |
@@ -520,7 +520,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status) | |||
520 | switch (state->current_modulation) { | 520 | switch (state->current_modulation) { |
521 | case QAM_256: | 521 | case QAM_256: |
522 | case QAM_64: | 522 | case QAM_64: |
523 | /* Need to undestand why there are 3 lock levels here */ | 523 | /* Need to understand why there are 3 lock levels here */ |
524 | if ((buf[0] & 0x07) == 0x07) | 524 | if ((buf[0] & 0x07) == 0x07) |
525 | *status |= FE_HAS_CARRIER; | 525 | *status |= FE_HAS_CARRIER; |
526 | else | 526 | else |
diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c index a04c782fff8d..1570669837ea 100644 --- a/drivers/media/dvb/frontends/stb0899_drv.c +++ b/drivers/media/dvb/frontends/stb0899_drv.c | |||
@@ -1571,7 +1571,7 @@ static enum dvbfe_search stb0899_search(struct dvb_frontend *fe, struct dvb_fron | |||
1571 | * stb0899_track | 1571 | * stb0899_track |
1572 | * periodically check the signal level against a specified | 1572 | * periodically check the signal level against a specified |
1573 | * threshold level and perform derotator centering. | 1573 | * threshold level and perform derotator centering. |
1574 | * called once we have a lock from a succesful search | 1574 | * called once we have a lock from a successful search |
1575 | * event. | 1575 | * event. |
1576 | * | 1576 | * |
1577 | * Will be called periodically called to maintain the | 1577 | * Will be called periodically called to maintain the |
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index 8d65c652ba50..baf3159a3aa6 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -2425,7 +2425,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev, | |||
2425 | * use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called | 2425 | * use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called |
2426 | */ | 2426 | */ |
2427 | saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); | 2427 | saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); |
2428 | /* set event counter 1 treshold to maximum allowed value (rEC p55) */ | 2428 | /* set event counter 1 threshold to maximum allowed value (rEC p55) */ |
2429 | saa7146_write(dev, ECT1R, 0x3fff ); | 2429 | saa7146_write(dev, ECT1R, 0x3fff ); |
2430 | #endif | 2430 | #endif |
2431 | /* Set RPS1 Address register to point to RPS code (r108 p42) */ | 2431 | /* Set RPS1 Address register to point to RPS code (r108 p42) */ |
@@ -2559,7 +2559,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev, | |||
2559 | * use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called | 2559 | * use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called |
2560 | */ | 2560 | */ |
2561 | saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); | 2561 | saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); |
2562 | /* set event counter 1 treshold to maximum allowed value (rEC p55) */ | 2562 | /* set event counter 1 threshold to maximum allowed value (rEC p55) */ |
2563 | saa7146_write(dev, ECT1R, 0x3fff ); | 2563 | saa7146_write(dev, ECT1R, 0x3fff ); |
2564 | #endif | 2564 | #endif |
2565 | /* Setup BUDGETPATCH MAIN RPS1 "program" (p35) */ | 2565 | /* Setup BUDGETPATCH MAIN RPS1 "program" (p35) */ |
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c index 60136688a9a4..9c92f9ddd223 100644 --- a/drivers/media/dvb/ttpci/budget-patch.c +++ b/drivers/media/dvb/ttpci/budget-patch.c | |||
@@ -456,7 +456,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte | |||
456 | // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled | 456 | // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled |
457 | // use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called | 457 | // use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called |
458 | saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); | 458 | saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); |
459 | // set event counter 1 treshold to maximum allowed value (rEC p55) | 459 | // set event counter 1 threshold to maximum allowed value (rEC p55) |
460 | saa7146_write(dev, ECT1R, 0x3fff ); | 460 | saa7146_write(dev, ECT1R, 0x3fff ); |
461 | #endif | 461 | #endif |
462 | // Fix VSYNC level | 462 | // Fix VSYNC level |
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c index a1239083472d..5f79acb56e48 100644 --- a/drivers/media/radio/radio-mr800.c +++ b/drivers/media/radio/radio-mr800.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * http://av-usbradio.sourceforge.net/index.php | 28 | * http://av-usbradio.sourceforge.net/index.php |
29 | * http://sourceforge.net/projects/av-usbradio/ | 29 | * http://sourceforge.net/projects/av-usbradio/ |
30 | * Latest release of theirs project was in 2005. | 30 | * Latest release of theirs project was in 2005. |
31 | * Probably, this driver could be improved trough using their | 31 | * Probably, this driver could be improved through using their |
32 | * achievements (specifications given). | 32 | * achievements (specifications given). |
33 | * Also, Faidon Liambotis <paravoid@debian.org> wrote nice driver for this radio | 33 | * Also, Faidon Liambotis <paravoid@debian.org> wrote nice driver for this radio |
34 | * in 2007. He allowed to use his driver to improve current mr800 radio driver. | 34 | * in 2007. He allowed to use his driver to improve current mr800 radio driver. |
diff --git a/drivers/media/video/cx18/cx18-av-core.h b/drivers/media/video/cx18/cx18-av-core.h index 9b84a0c58e0e..cafb7e99b9a0 100644 --- a/drivers/media/video/cx18/cx18-av-core.h +++ b/drivers/media/video/cx18/cx18-av-core.h | |||
@@ -294,7 +294,7 @@ struct cx18_av_state { | |||
294 | #define CXADEC_QAM_CONST_DEC 0x924 | 294 | #define CXADEC_QAM_CONST_DEC 0x924 |
295 | #define CXADEC_QAM_ROTATOR_FREQ 0x948 | 295 | #define CXADEC_QAM_ROTATOR_FREQ 0x948 |
296 | 296 | ||
297 | /* Bit defintions / settings used in Mako Audio */ | 297 | /* Bit definitions / settings used in Mako Audio */ |
298 | #define CXADEC_PREF_MODE_MONO_LANGA 0 | 298 | #define CXADEC_PREF_MODE_MONO_LANGA 0 |
299 | #define CXADEC_PREF_MODE_MONO_LANGB 1 | 299 | #define CXADEC_PREF_MODE_MONO_LANGB 1 |
300 | #define CXADEC_PREF_MODE_MONO_LANGC 2 | 300 | #define CXADEC_PREF_MODE_MONO_LANGC 2 |
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 6dd51e27582c..e12082b8a08d 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c | |||
@@ -1200,7 +1200,7 @@ static struct pci_driver cx18_pci_driver = { | |||
1200 | .remove = cx18_remove, | 1200 | .remove = cx18_remove, |
1201 | }; | 1201 | }; |
1202 | 1202 | ||
1203 | static int module_start(void) | 1203 | static int __init module_start(void) |
1204 | { | 1204 | { |
1205 | printk(KERN_INFO "cx18: Start initialization, version %s\n", CX18_VERSION); | 1205 | printk(KERN_INFO "cx18: Start initialization, version %s\n", CX18_VERSION); |
1206 | 1206 | ||
@@ -1224,7 +1224,7 @@ static int module_start(void) | |||
1224 | return 0; | 1224 | return 0; |
1225 | } | 1225 | } |
1226 | 1226 | ||
1227 | static void module_cleanup(void) | 1227 | static void __exit module_cleanup(void) |
1228 | { | 1228 | { |
1229 | pci_unregister_driver(&cx18_pci_driver); | 1229 | pci_unregister_driver(&cx18_pci_driver); |
1230 | } | 1230 | } |
diff --git a/drivers/media/video/cx18/cx18-mailbox.h b/drivers/media/video/cx18/cx18-mailbox.h index e23aaac5b280..522ad534034c 100644 --- a/drivers/media/video/cx18/cx18-mailbox.h +++ b/drivers/media/video/cx18/cx18-mailbox.h | |||
@@ -41,7 +41,7 @@ struct cx18; | |||
41 | /* | 41 | /* |
42 | * This structure is used by CPU to provide completed buffers information | 42 | * This structure is used by CPU to provide completed buffers information |
43 | * Its structure is dictrated by the layout of the SCB, required by the | 43 | * Its structure is dictrated by the layout of the SCB, required by the |
44 | * firmware, but its defintion needs to be here, instead of in cx18-scb.h, | 44 | * firmware, but its definition needs to be here, instead of in cx18-scb.h, |
45 | * for mailbox work order scheduling | 45 | * for mailbox work order scheduling |
46 | */ | 46 | */ |
47 | struct cx18_mdl_ack { | 47 | struct cx18_mdl_ack { |
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c index 28f48f41f218..c2174413ab29 100644 --- a/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/drivers/media/video/cx231xx/cx231xx-avcore.c | |||
@@ -2414,9 +2414,11 @@ int cx231xx_gpio_i2c_read_ack(struct cx231xx *dev) | |||
2414 | cx231xx_info("No ACK after %d msec -GPIO I2C failed!", | 2414 | cx231xx_info("No ACK after %d msec -GPIO I2C failed!", |
2415 | nInit * 10); | 2415 | nInit * 10); |
2416 | 2416 | ||
2417 | /* readAck | 2417 | /* |
2418 | throuth clock stretch ,slave has given a SCL signal, | 2418 | * readAck |
2419 | so the SDA data can be directly read. */ | 2419 | * through clock stretch, slave has given a SCL signal, |
2420 | * so the SDA data can be directly read. | ||
2421 | */ | ||
2420 | status = cx231xx_get_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val); | 2422 | status = cx231xx_get_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val); |
2421 | 2423 | ||
2422 | if ((dev->gpio_val & 1 << dev->board.tuner_sda_gpio) == 0) { | 2424 | if ((dev->gpio_val & 1 << dev->board.tuner_sda_gpio) == 0) { |
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index c31284ba19dd..fa2d350e20fd 100644 --- a/drivers/media/video/cx23885/cx23885-core.c +++ b/drivers/media/video/cx23885/cx23885-core.c | |||
@@ -1957,7 +1957,7 @@ static struct pci_driver cx23885_pci_driver = { | |||
1957 | .resume = NULL, | 1957 | .resume = NULL, |
1958 | }; | 1958 | }; |
1959 | 1959 | ||
1960 | static int cx23885_init(void) | 1960 | static int __init cx23885_init(void) |
1961 | { | 1961 | { |
1962 | printk(KERN_INFO "cx23885 driver version %d.%d.%d loaded\n", | 1962 | printk(KERN_INFO "cx23885 driver version %d.%d.%d loaded\n", |
1963 | (CX23885_VERSION_CODE >> 16) & 0xff, | 1963 | (CX23885_VERSION_CODE >> 16) & 0xff, |
@@ -1970,7 +1970,7 @@ static int cx23885_init(void) | |||
1970 | return pci_register_driver(&cx23885_pci_driver); | 1970 | return pci_register_driver(&cx23885_pci_driver); |
1971 | } | 1971 | } |
1972 | 1972 | ||
1973 | static void cx23885_fini(void) | 1973 | static void __exit cx23885_fini(void) |
1974 | { | 1974 | { |
1975 | pci_unregister_driver(&cx23885_pci_driver); | 1975 | pci_unregister_driver(&cx23885_pci_driver); |
1976 | } | 1976 | } |
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index 45e13ee66dc7..16c6a921f40b 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c | |||
@@ -940,7 +940,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port) | |||
940 | int err, i; | 940 | int err, i; |
941 | 941 | ||
942 | /* Here we need to allocate the correct number of frontends, | 942 | /* Here we need to allocate the correct number of frontends, |
943 | * as reflected in the cards struct. The reality is that currrently | 943 | * as reflected in the cards struct. The reality is that currently |
944 | * no cx23885 boards support this - yet. But, if we don't modify this | 944 | * no cx23885 boards support this - yet. But, if we don't modify this |
945 | * code then the second frontend would never be allocated (later) | 945 | * code then the second frontend would never be allocated (later) |
946 | * and fail with error before the attach in dvb_register(). | 946 | * and fail with error before the attach in dvb_register(). |
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index cf634606ba9a..b35411160f04 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c | |||
@@ -624,7 +624,7 @@ int cx88_reset(struct cx88_core *core) | |||
624 | /* setup image format */ | 624 | /* setup image format */ |
625 | cx_andor(MO_COLOR_CTRL, 0x4000, 0x4000); | 625 | cx_andor(MO_COLOR_CTRL, 0x4000, 0x4000); |
626 | 626 | ||
627 | /* setup FIFO Threshholds */ | 627 | /* setup FIFO Thresholds */ |
628 | cx_write(MO_PDMA_STHRSH, 0x0807); | 628 | cx_write(MO_PDMA_STHRSH, 0x0807); |
629 | cx_write(MO_PDMA_DTHRSH, 0x0807); | 629 | cx_write(MO_PDMA_DTHRSH, 0x0807); |
630 | 630 | ||
diff --git a/drivers/media/video/davinci/dm355_ccdc.c b/drivers/media/video/davinci/dm355_ccdc.c index 4629cabe3f28..314390016370 100644 --- a/drivers/media/video/davinci/dm355_ccdc.c +++ b/drivers/media/video/davinci/dm355_ccdc.c | |||
@@ -285,7 +285,7 @@ static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam) | |||
285 | 285 | ||
286 | if ((ccdcparam->med_filt_thres < 0) || | 286 | if ((ccdcparam->med_filt_thres < 0) || |
287 | (ccdcparam->med_filt_thres > CCDC_MED_FILT_THRESH)) { | 287 | (ccdcparam->med_filt_thres > CCDC_MED_FILT_THRESH)) { |
288 | dev_dbg(dev, "Invalid value of median filter thresold\n"); | 288 | dev_dbg(dev, "Invalid value of median filter threshold\n"); |
289 | return -EINVAL; | 289 | return -EINVAL; |
290 | } | 290 | } |
291 | 291 | ||
@@ -959,7 +959,7 @@ static struct ccdc_hw_device ccdc_hw_dev = { | |||
959 | }, | 959 | }, |
960 | }; | 960 | }; |
961 | 961 | ||
962 | static int dm355_ccdc_init(void) | 962 | static int __init dm355_ccdc_init(void) |
963 | { | 963 | { |
964 | printk(KERN_NOTICE "dm355_ccdc_init\n"); | 964 | printk(KERN_NOTICE "dm355_ccdc_init\n"); |
965 | if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) | 965 | if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) |
@@ -969,7 +969,7 @@ static int dm355_ccdc_init(void) | |||
969 | return 0; | 969 | return 0; |
970 | } | 970 | } |
971 | 971 | ||
972 | static void dm355_ccdc_exit(void) | 972 | static void __exit dm355_ccdc_exit(void) |
973 | { | 973 | { |
974 | vpfe_unregister_ccdc_device(&ccdc_hw_dev); | 974 | vpfe_unregister_ccdc_device(&ccdc_hw_dev); |
975 | } | 975 | } |
diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/video/davinci/dm644x_ccdc.c index 2f19a919f477..d5fa193f32d2 100644 --- a/drivers/media/video/davinci/dm644x_ccdc.c +++ b/drivers/media/video/davinci/dm644x_ccdc.c | |||
@@ -859,7 +859,7 @@ static struct ccdc_hw_device ccdc_hw_dev = { | |||
859 | }, | 859 | }, |
860 | }; | 860 | }; |
861 | 861 | ||
862 | static int dm644x_ccdc_init(void) | 862 | static int __init dm644x_ccdc_init(void) |
863 | { | 863 | { |
864 | printk(KERN_NOTICE "dm644x_ccdc_init\n"); | 864 | printk(KERN_NOTICE "dm644x_ccdc_init\n"); |
865 | if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) | 865 | if (vpfe_register_ccdc_device(&ccdc_hw_dev) < 0) |
@@ -869,7 +869,7 @@ static int dm644x_ccdc_init(void) | |||
869 | return 0; | 869 | return 0; |
870 | } | 870 | } |
871 | 871 | ||
872 | static void dm644x_ccdc_exit(void) | 872 | static void __exit dm644x_ccdc_exit(void) |
873 | { | 873 | { |
874 | vpfe_unregister_ccdc_device(&ccdc_hw_dev); | 874 | vpfe_unregister_ccdc_device(&ccdc_hw_dev); |
875 | } | 875 | } |
diff --git a/drivers/media/video/davinci/vpss.c b/drivers/media/video/davinci/vpss.c index 6d709ca8cfb0..453236bd7559 100644 --- a/drivers/media/video/davinci/vpss.c +++ b/drivers/media/video/davinci/vpss.c | |||
@@ -53,7 +53,7 @@ struct vpss_hw_ops { | |||
53 | int (*enable_clock)(enum vpss_clock_sel clock_sel, int en); | 53 | int (*enable_clock)(enum vpss_clock_sel clock_sel, int en); |
54 | /* select input to ccdc */ | 54 | /* select input to ccdc */ |
55 | void (*select_ccdc_source)(enum vpss_ccdc_source_sel src_sel); | 55 | void (*select_ccdc_source)(enum vpss_ccdc_source_sel src_sel); |
56 | /* clear wbl overlflow bit */ | 56 | /* clear wbl overflow bit */ |
57 | int (*clear_wbl_overflow)(enum vpss_wbl_sel wbl_sel); | 57 | int (*clear_wbl_overflow)(enum vpss_wbl_sel wbl_sel); |
58 | }; | 58 | }; |
59 | 59 | ||
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c index cf3af8de6e97..e39efb45fa1c 100644 --- a/drivers/media/video/gspca/sonixb.c +++ b/drivers/media/video/gspca/sonixb.c | |||
@@ -304,7 +304,7 @@ static const __u8 initOv6650[] = { | |||
304 | }; | 304 | }; |
305 | static const __u8 ov6650_sensor_init[][8] = | 305 | static const __u8 ov6650_sensor_init[][8] = |
306 | { | 306 | { |
307 | /* Bright, contrast, etc are set througth SCBB interface. | 307 | /* Bright, contrast, etc are set through SCBB interface. |
308 | * AVCAP on win2 do not send any data on this controls. */ | 308 | * AVCAP on win2 do not send any data on this controls. */ |
309 | /* Anyway, some registers appears to alter bright and constrat */ | 309 | /* Anyway, some registers appears to alter bright and constrat */ |
310 | 310 | ||
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c index fab7ef85a6c1..7dbd5eea6cc0 100644 --- a/drivers/media/video/gspca/spca500.c +++ b/drivers/media/video/gspca/spca500.c | |||
@@ -589,7 +589,7 @@ static void spca500_reinit(struct gspca_dev *gspca_dev) | |||
589 | int err; | 589 | int err; |
590 | __u8 Data; | 590 | __u8 Data; |
591 | 591 | ||
592 | /* some unknow command from Aiptek pocket dv and family300 */ | 592 | /* some unknown command from Aiptek pocket dv and family300 */ |
593 | 593 | ||
594 | reg_w(gspca_dev, 0x00, 0x0d01, 0x01); | 594 | reg_w(gspca_dev, 0x00, 0x0d01, 0x01); |
595 | reg_w(gspca_dev, 0x00, 0x0d03, 0x00); | 595 | reg_w(gspca_dev, 0x00, 0x0d03, 0x00); |
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c index b74a34218da0..66f9f0056146 100644 --- a/drivers/media/video/gspca/spca501.c +++ b/drivers/media/video/gspca/spca501.c | |||
@@ -1636,7 +1636,7 @@ static const __u16 spca501c_arowana_init_data[][3] = { | |||
1636 | {} | 1636 | {} |
1637 | }; | 1637 | }; |
1638 | 1638 | ||
1639 | /* Unknow camera from Ori Usbid 0x0000:0x0000 */ | 1639 | /* Unknown camera from Ori Usbid 0x0000:0x0000 */ |
1640 | /* Based on snoops from Ori Cohen */ | 1640 | /* Based on snoops from Ori Cohen */ |
1641 | static const __u16 spca501c_mysterious_open_data[][3] = { | 1641 | static const __u16 spca501c_mysterious_open_data[][3] = { |
1642 | {0x02, 0x000f, 0x0005}, | 1642 | {0x02, 0x000f, 0x0005}, |
@@ -1945,7 +1945,7 @@ static int sd_init(struct gspca_dev *gspca_dev) | |||
1945 | goto error; | 1945 | goto error; |
1946 | break; | 1946 | break; |
1947 | case MystFromOriUnknownCamera: | 1947 | case MystFromOriUnknownCamera: |
1948 | /* UnKnow Ori CMOS Camera data */ | 1948 | /* Unknown Ori CMOS Camera data */ |
1949 | if (write_vector(gspca_dev, spca501c_mysterious_open_data)) | 1949 | if (write_vector(gspca_dev, spca501c_mysterious_open_data)) |
1950 | goto error; | 1950 | goto error; |
1951 | break; | 1951 | break; |
@@ -1978,7 +1978,7 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
1978 | write_vector(gspca_dev, spca501c_arowana_open_data); | 1978 | write_vector(gspca_dev, spca501c_arowana_open_data); |
1979 | break; | 1979 | break; |
1980 | case MystFromOriUnknownCamera: | 1980 | case MystFromOriUnknownCamera: |
1981 | /* UnKnow CMOS Camera data */ | 1981 | /* Unknown CMOS Camera data */ |
1982 | write_vector(gspca_dev, spca501c_mysterious_init_data); | 1982 | write_vector(gspca_dev, spca501c_mysterious_init_data); |
1983 | break; | 1983 | break; |
1984 | default: | 1984 | default: |
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c index aa8f995ce04e..1a9af2ebdbef 100644 --- a/drivers/media/video/gspca/sunplus.c +++ b/drivers/media/video/gspca/sunplus.c | |||
@@ -631,7 +631,7 @@ static void spca504A_acknowledged_command(struct gspca_dev *gspca_dev, | |||
631 | count = 200; | 631 | count = 200; |
632 | while (--count > 0) { | 632 | while (--count > 0) { |
633 | msleep(10); | 633 | msleep(10); |
634 | /* gsmart mini2 write a each wait setting 1 ms is enought */ | 634 | /* gsmart mini2 write a each wait setting 1 ms is enough */ |
635 | /* reg_w_riv(dev, req, idx, val); */ | 635 | /* reg_w_riv(dev, req, idx, val); */ |
636 | status = reg_r_12(gspca_dev, 0x01, 0x0001, 1); | 636 | status = reg_r_12(gspca_dev, 0x01, 0x0001, 1); |
637 | if (status == endcode) { | 637 | if (status == endcode) { |
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index cdf3357b4c9f..49c3c1226e0e 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c | |||
@@ -7065,7 +7065,7 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
7065 | break; | 7065 | break; |
7066 | default: | 7066 | default: |
7067 | PDEBUG(D_PROBE, | 7067 | PDEBUG(D_PROBE, |
7068 | "Sensor UNKNOW_0 force Tas5130"); | 7068 | "Sensor UNKNOWN_0 force Tas5130"); |
7069 | sd->sensor = SENSOR_TAS5130CXX; | 7069 | sd->sensor = SENSOR_TAS5130CXX; |
7070 | } | 7070 | } |
7071 | break; | 7071 | break; |
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 463ec3457d7b..7cdbc1a8f218 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
@@ -1361,7 +1361,7 @@ static struct pci_driver ivtv_pci_driver = { | |||
1361 | .remove = ivtv_remove, | 1361 | .remove = ivtv_remove, |
1362 | }; | 1362 | }; |
1363 | 1363 | ||
1364 | static int module_start(void) | 1364 | static int __init module_start(void) |
1365 | { | 1365 | { |
1366 | printk(KERN_INFO "ivtv: Start initialization, version %s\n", IVTV_VERSION); | 1366 | printk(KERN_INFO "ivtv: Start initialization, version %s\n", IVTV_VERSION); |
1367 | 1367 | ||
@@ -1385,7 +1385,7 @@ static int module_start(void) | |||
1385 | return 0; | 1385 | return 0; |
1386 | } | 1386 | } |
1387 | 1387 | ||
1388 | static void module_cleanup(void) | 1388 | static void __exit module_cleanup(void) |
1389 | { | 1389 | { |
1390 | pci_unregister_driver(&ivtv_pci_driver); | 1390 | pci_unregister_driver(&ivtv_pci_driver); |
1391 | } | 1391 | } |
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c index eccb40ab7fec..205229333466 100644 --- a/drivers/media/video/ov772x.c +++ b/drivers/media/video/ov772x.c | |||
@@ -247,7 +247,7 @@ | |||
247 | 247 | ||
248 | /* COM5 */ | 248 | /* COM5 */ |
249 | #define AFR_ON_OFF 0x80 /* Auto frame rate control ON/OFF selection */ | 249 | #define AFR_ON_OFF 0x80 /* Auto frame rate control ON/OFF selection */ |
250 | #define AFR_SPPED 0x40 /* Auto frame rate control speed slection */ | 250 | #define AFR_SPPED 0x40 /* Auto frame rate control speed selection */ |
251 | /* Auto frame rate max rate control */ | 251 | /* Auto frame rate max rate control */ |
252 | #define AFR_NO_RATE 0x00 /* No reduction of frame rate */ | 252 | #define AFR_NO_RATE 0x00 /* No reduction of frame rate */ |
253 | #define AFR_1p2 0x10 /* Max reduction to 1/2 frame rate */ | 253 | #define AFR_1p2 0x10 /* Max reduction to 1/2 frame rate */ |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h index 5b152ff20bd0..5fcad28211d2 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | |||
@@ -332,7 +332,7 @@ struct pvr2_hdw { | |||
332 | 332 | ||
333 | /* Bit mask of PVR2_CVAL_INPUT choices which are valid for the hardware */ | 333 | /* Bit mask of PVR2_CVAL_INPUT choices which are valid for the hardware */ |
334 | unsigned int input_avail_mask; | 334 | unsigned int input_avail_mask; |
335 | /* Bit mask of PVR2_CVAL_INPUT choices which are currenly allowed */ | 335 | /* Bit mask of PVR2_CVAL_INPUT choices which are currently allowed */ |
336 | unsigned int input_allowed_mask; | 336 | unsigned int input_allowed_mask; |
337 | 337 | ||
338 | /* Location of eeprom or a negative number if none */ | 338 | /* Location of eeprom or a negative number if none */ |
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index 2c0bb06cab3b..03d39266d293 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c | |||
@@ -1980,7 +1980,7 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info) | |||
1980 | wake_up(&dev->fw_data->wait_fw); | 1980 | wake_up(&dev->fw_data->wait_fw); |
1981 | break; | 1981 | break; |
1982 | default: | 1982 | default: |
1983 | printk(KERN_INFO "s2255 unknwn resp\n"); | 1983 | printk(KERN_INFO "s2255 unknown resp\n"); |
1984 | } | 1984 | } |
1985 | default: | 1985 | default: |
1986 | pdata++; | 1986 | pdata++; |
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index f87757fccc72..c673901cb2b5 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -1319,7 +1319,7 @@ static struct pci_driver saa7134_pci_driver = { | |||
1319 | #endif | 1319 | #endif |
1320 | }; | 1320 | }; |
1321 | 1321 | ||
1322 | static int saa7134_init(void) | 1322 | static int __init saa7134_init(void) |
1323 | { | 1323 | { |
1324 | INIT_LIST_HEAD(&saa7134_devlist); | 1324 | INIT_LIST_HEAD(&saa7134_devlist); |
1325 | printk(KERN_INFO "saa7130/34: v4l2 driver version %d.%d.%d loaded\n", | 1325 | printk(KERN_INFO "saa7130/34: v4l2 driver version %d.%d.%d loaded\n", |
@@ -1333,7 +1333,7 @@ static int saa7134_init(void) | |||
1333 | return pci_register_driver(&saa7134_pci_driver); | 1333 | return pci_register_driver(&saa7134_pci_driver); |
1334 | } | 1334 | } |
1335 | 1335 | ||
1336 | static void saa7134_fini(void) | 1336 | static void __exit saa7134_fini(void) |
1337 | { | 1337 | { |
1338 | pci_unregister_driver(&saa7134_pci_driver); | 1338 | pci_unregister_driver(&saa7134_pci_driver); |
1339 | } | 1339 | } |
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c index 709affc31042..e6aa0fbd1e91 100644 --- a/drivers/media/video/saa7164/saa7164-core.c +++ b/drivers/media/video/saa7164/saa7164-core.c | |||
@@ -724,13 +724,13 @@ static struct pci_driver saa7164_pci_driver = { | |||
724 | .resume = NULL, | 724 | .resume = NULL, |
725 | }; | 725 | }; |
726 | 726 | ||
727 | static int saa7164_init(void) | 727 | static int __init saa7164_init(void) |
728 | { | 728 | { |
729 | printk(KERN_INFO "saa7164 driver loaded\n"); | 729 | printk(KERN_INFO "saa7164 driver loaded\n"); |
730 | return pci_register_driver(&saa7164_pci_driver); | 730 | return pci_register_driver(&saa7164_pci_driver); |
731 | } | 731 | } |
732 | 732 | ||
733 | static void saa7164_fini(void) | 733 | static void __exit saa7164_fini(void) |
734 | { | 734 | { |
735 | pci_unregister_driver(&saa7164_pci_driver); | 735 | pci_unregister_driver(&saa7164_pci_driver); |
736 | } | 736 | } |
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h index d439c76b27e1..cb1de7ea197a 100644 --- a/drivers/media/video/zoran/zoran.h +++ b/drivers/media/video/zoran/zoran.h | |||
@@ -106,7 +106,7 @@ struct zoran_params { | |||
106 | unsigned long jpeg_markers; /* Which markers should go into the JPEG output. | 106 | unsigned long jpeg_markers; /* Which markers should go into the JPEG output. |
107 | * Unless you exactly know what you do, leave them untouched. | 107 | * Unless you exactly know what you do, leave them untouched. |
108 | * Inluding less markers will make the resulting code | 108 | * Inluding less markers will make the resulting code |
109 | * smaller, but there will be fewer aplications | 109 | * smaller, but there will be fewer applications |
110 | * which can read it. | 110 | * which can read it. |
111 | * The presence of the APP and COM marker is | 111 | * The presence of the APP and COM marker is |
112 | * influenced by APP0_len and COM_len ONLY! */ | 112 | * influenced by APP0_len and COM_len ONLY! */ |
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index d505b68cd372..e39986a78273 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c | |||
@@ -940,7 +940,7 @@ static const struct block_device_operations i2o_block_fops = { | |||
940 | * Allocate memory for the i2o_block_device struct, gendisk and request | 940 | * Allocate memory for the i2o_block_device struct, gendisk and request |
941 | * queue and initialize them as far as no additional information is needed. | 941 | * queue and initialize them as far as no additional information is needed. |
942 | * | 942 | * |
943 | * Returns a pointer to the allocated I2O Block device on succes or a | 943 | * Returns a pointer to the allocated I2O Block device on success or a |
944 | * negative error code on failure. | 944 | * negative error code on failure. |
945 | */ | 945 | */ |
946 | static struct i2o_block_device *i2o_block_device_alloc(void) | 946 | static struct i2o_block_device *i2o_block_device_alloc(void) |
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index 27cf4af0e13d..e5ab62141503 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c | |||
@@ -132,7 +132,7 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr) | |||
132 | * Removes a previously added pointer from the context list and returns | 132 | * Removes a previously added pointer from the context list and returns |
133 | * the matching context id. | 133 | * the matching context id. |
134 | * | 134 | * |
135 | * Returns context id on succes or 0 on failure. | 135 | * Returns context id on success or 0 on failure. |
136 | */ | 136 | */ |
137 | u32 i2o_cntxt_list_remove(struct i2o_controller * c, void *ptr) | 137 | u32 i2o_cntxt_list_remove(struct i2o_controller * c, void *ptr) |
138 | { | 138 | { |
@@ -198,7 +198,7 @@ void *i2o_cntxt_list_get(struct i2o_controller *c, u32 context) | |||
198 | * @c: controller to which the context list belong | 198 | * @c: controller to which the context list belong |
199 | * @ptr: pointer to which the context id should be fetched | 199 | * @ptr: pointer to which the context id should be fetched |
200 | * | 200 | * |
201 | * Returns context id which matches to the pointer on succes or 0 on | 201 | * Returns context id which matches to the pointer on success or 0 on |
202 | * failure. | 202 | * failure. |
203 | */ | 203 | */ |
204 | u32 i2o_cntxt_list_get_ptr(struct i2o_controller * c, void *ptr) | 204 | u32 i2o_cntxt_list_get_ptr(struct i2o_controller * c, void *ptr) |
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c index 41c8fe2a928c..ce5eda985ab0 100644 --- a/drivers/misc/sgi-gru/grufile.c +++ b/drivers/misc/sgi-gru/grufile.c | |||
@@ -92,7 +92,7 @@ static void gru_vma_close(struct vm_area_struct *vma) | |||
92 | /* | 92 | /* |
93 | * gru_file_mmap | 93 | * gru_file_mmap |
94 | * | 94 | * |
95 | * Called when mmaping the device. Initializes the vma with a fault handler | 95 | * Called when mmapping the device. Initializes the vma with a fault handler |
96 | * and private data structure necessary to allocate, track, and free the | 96 | * and private data structure necessary to allocate, track, and free the |
97 | * underlying pages. | 97 | * underlying pages. |
98 | */ | 98 | */ |
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c index 36a8d53ad2a2..b8e7c5ae981e 100644 --- a/drivers/mmc/card/sdio_uart.c +++ b/drivers/mmc/card/sdio_uart.c | |||
@@ -231,7 +231,8 @@ static unsigned int sdio_uart_get_mctrl(struct sdio_uart_port *port) | |||
231 | return ret; | 231 | return ret; |
232 | } | 232 | } |
233 | 233 | ||
234 | static void sdio_uart_write_mctrl(struct sdio_uart_port *port, unsigned int mctrl) | 234 | static void sdio_uart_write_mctrl(struct sdio_uart_port *port, |
235 | unsigned int mctrl) | ||
235 | { | 236 | { |
236 | unsigned char mcr = 0; | 237 | unsigned char mcr = 0; |
237 | 238 | ||
@@ -387,7 +388,8 @@ static void sdio_uart_stop_rx(struct sdio_uart_port *port) | |||
387 | sdio_out(port, UART_IER, port->ier); | 388 | sdio_out(port, UART_IER, port->ier); |
388 | } | 389 | } |
389 | 390 | ||
390 | static void sdio_uart_receive_chars(struct sdio_uart_port *port, unsigned int *status) | 391 | static void sdio_uart_receive_chars(struct sdio_uart_port *port, |
392 | unsigned int *status) | ||
391 | { | 393 | { |
392 | struct tty_struct *tty = port->tty; | 394 | struct tty_struct *tty = port->tty; |
393 | unsigned int ch, flag; | 395 | unsigned int ch, flag; |
@@ -399,7 +401,7 @@ static void sdio_uart_receive_chars(struct sdio_uart_port *port, unsigned int *s | |||
399 | port->icount.rx++; | 401 | port->icount.rx++; |
400 | 402 | ||
401 | if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE | | 403 | if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE | |
402 | UART_LSR_FE | UART_LSR_OE))) { | 404 | UART_LSR_FE | UART_LSR_OE))) { |
403 | /* | 405 | /* |
404 | * For statistics only | 406 | * For statistics only |
405 | */ | 407 | */ |
@@ -417,9 +419,9 @@ static void sdio_uart_receive_chars(struct sdio_uart_port *port, unsigned int *s | |||
417 | * Mask off conditions which should be ignored. | 419 | * Mask off conditions which should be ignored. |
418 | */ | 420 | */ |
419 | *status &= port->read_status_mask; | 421 | *status &= port->read_status_mask; |
420 | if (*status & UART_LSR_BI) { | 422 | if (*status & UART_LSR_BI) |
421 | flag = TTY_BREAK; | 423 | flag = TTY_BREAK; |
422 | } else if (*status & UART_LSR_PE) | 424 | else if (*status & UART_LSR_PE) |
423 | flag = TTY_PARITY; | 425 | flag = TTY_PARITY; |
424 | else if (*status & UART_LSR_FE) | 426 | else if (*status & UART_LSR_FE) |
425 | flag = TTY_FRAME; | 427 | flag = TTY_FRAME; |
@@ -574,7 +576,7 @@ static int sdio_uart_startup(struct sdio_uart_port *port) | |||
574 | */ | 576 | */ |
575 | sdio_out(port, UART_FCR, UART_FCR_ENABLE_FIFO); | 577 | sdio_out(port, UART_FCR, UART_FCR_ENABLE_FIFO); |
576 | sdio_out(port, UART_FCR, UART_FCR_ENABLE_FIFO | | 578 | sdio_out(port, UART_FCR, UART_FCR_ENABLE_FIFO | |
577 | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); | 579 | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); |
578 | sdio_out(port, UART_FCR, 0); | 580 | sdio_out(port, UART_FCR, 0); |
579 | 581 | ||
580 | /* | 582 | /* |
@@ -635,7 +637,7 @@ static void sdio_uart_shutdown(struct sdio_uart_port *port) | |||
635 | if (port->tty->termios->c_cflag & HUPCL) | 637 | if (port->tty->termios->c_cflag & HUPCL) |
636 | sdio_uart_clear_mctrl(port, TIOCM_DTR | TIOCM_RTS); | 638 | sdio_uart_clear_mctrl(port, TIOCM_DTR | TIOCM_RTS); |
637 | 639 | ||
638 | /* Disable interrupts from this port */ | 640 | /* Disable interrupts from this port */ |
639 | sdio_release_irq(port->func); | 641 | sdio_release_irq(port->func); |
640 | port->ier = 0; | 642 | port->ier = 0; |
641 | sdio_out(port, UART_IER, 0); | 643 | sdio_out(port, UART_IER, 0); |
@@ -659,7 +661,7 @@ skip: | |||
659 | free_page((unsigned long)port->xmit.buf); | 661 | free_page((unsigned long)port->xmit.buf); |
660 | } | 662 | } |
661 | 663 | ||
662 | static int sdio_uart_open (struct tty_struct *tty, struct file * filp) | 664 | static int sdio_uart_open(struct tty_struct *tty, struct file *filp) |
663 | { | 665 | { |
664 | struct sdio_uart_port *port; | 666 | struct sdio_uart_port *port; |
665 | int ret; | 667 | int ret; |
@@ -846,7 +848,7 @@ static void sdio_uart_set_termios(struct tty_struct *tty, struct ktermios *old_t | |||
846 | struct sdio_uart_port *port = tty->driver_data; | 848 | struct sdio_uart_port *port = tty->driver_data; |
847 | unsigned int cflag = tty->termios->c_cflag; | 849 | unsigned int cflag = tty->termios->c_cflag; |
848 | 850 | ||
849 | #define RELEVANT_IFLAG(iflag) ((iflag) & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK)) | 851 | #define RELEVANT_IFLAG(iflag) ((iflag) & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK)) |
850 | 852 | ||
851 | if ((cflag ^ old_termios->c_cflag) == 0 && | 853 | if ((cflag ^ old_termios->c_cflag) == 0 && |
852 | RELEVANT_IFLAG(tty->termios->c_iflag ^ old_termios->c_iflag) == 0) | 854 | RELEVANT_IFLAG(tty->termios->c_iflag ^ old_termios->c_iflag) == 0) |
@@ -925,7 +927,7 @@ static int sdio_uart_tiocmset(struct tty_struct *tty, struct file *file, | |||
925 | struct sdio_uart_port *port = tty->driver_data; | 927 | struct sdio_uart_port *port = tty->driver_data; |
926 | int result; | 928 | int result; |
927 | 929 | ||
928 | result =sdio_uart_claim_func(port); | 930 | result = sdio_uart_claim_func(port); |
929 | if(!result) { | 931 | if(!result) { |
930 | sdio_uart_update_mctrl(port, set, clear); | 932 | sdio_uart_update_mctrl(port, set, clear); |
931 | sdio_uart_release_func(port); | 933 | sdio_uart_release_func(port); |
@@ -946,31 +948,31 @@ static int sdio_uart_proc_show(struct seq_file *m, void *v) | |||
946 | seq_printf(m, "%d: uart:SDIO", i); | 948 | seq_printf(m, "%d: uart:SDIO", i); |
947 | if(capable(CAP_SYS_ADMIN)) { | 949 | if(capable(CAP_SYS_ADMIN)) { |
948 | seq_printf(m, " tx:%d rx:%d", | 950 | seq_printf(m, " tx:%d rx:%d", |
949 | port->icount.tx, port->icount.rx); | 951 | port->icount.tx, port->icount.rx); |
950 | if (port->icount.frame) | 952 | if (port->icount.frame) |
951 | seq_printf(m, " fe:%d", | 953 | seq_printf(m, " fe:%d", |
952 | port->icount.frame); | 954 | port->icount.frame); |
953 | if (port->icount.parity) | 955 | if (port->icount.parity) |
954 | seq_printf(m, " pe:%d", | 956 | seq_printf(m, " pe:%d", |
955 | port->icount.parity); | 957 | port->icount.parity); |
956 | if (port->icount.brk) | 958 | if (port->icount.brk) |
957 | seq_printf(m, " brk:%d", | 959 | seq_printf(m, " brk:%d", |
958 | port->icount.brk); | 960 | port->icount.brk); |
959 | if (port->icount.overrun) | 961 | if (port->icount.overrun) |
960 | seq_printf(m, " oe:%d", | 962 | seq_printf(m, " oe:%d", |
961 | port->icount.overrun); | 963 | port->icount.overrun); |
962 | if (port->icount.cts) | 964 | if (port->icount.cts) |
963 | seq_printf(m, " cts:%d", | 965 | seq_printf(m, " cts:%d", |
964 | port->icount.cts); | 966 | port->icount.cts); |
965 | if (port->icount.dsr) | 967 | if (port->icount.dsr) |
966 | seq_printf(m, " dsr:%d", | 968 | seq_printf(m, " dsr:%d", |
967 | port->icount.dsr); | 969 | port->icount.dsr); |
968 | if (port->icount.rng) | 970 | if (port->icount.rng) |
969 | seq_printf(m, " rng:%d", | 971 | seq_printf(m, " rng:%d", |
970 | port->icount.rng); | 972 | port->icount.rng); |
971 | if (port->icount.dcd) | 973 | if (port->icount.dcd) |
972 | seq_printf(m, " dcd:%d", | 974 | seq_printf(m, " dcd:%d", |
973 | port->icount.dcd); | 975 | port->icount.dcd); |
974 | } | 976 | } |
975 | sdio_uart_port_put(port); | 977 | sdio_uart_port_put(port); |
976 | seq_putc(m, '\n'); | 978 | seq_putc(m, '\n'); |
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 99b74a351020..941a4d35ef8d 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c | |||
@@ -1360,7 +1360,7 @@ static struct mmc_host_ops s3cmci_ops = { | |||
1360 | 1360 | ||
1361 | static struct s3c24xx_mci_pdata s3cmci_def_pdata = { | 1361 | static struct s3c24xx_mci_pdata s3cmci_def_pdata = { |
1362 | /* This is currently here to avoid a number of if (host->pdata) | 1362 | /* This is currently here to avoid a number of if (host->pdata) |
1363 | * checks. Any zero fields to ensure reaonable defaults are picked. */ | 1363 | * checks. Any zero fields to ensure reasonable defaults are picked. */ |
1364 | }; | 1364 | }; |
1365 | 1365 | ||
1366 | #ifdef CONFIG_CPU_FREQ | 1366 | #ifdef CONFIG_CPU_FREQ |
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig index 9408099eec48..35c6a23b183b 100644 --- a/drivers/mtd/chips/Kconfig +++ b/drivers/mtd/chips/Kconfig | |||
@@ -1,5 +1,3 @@ | |||
1 | # drivers/mtd/chips/Kconfig | ||
2 | |||
3 | menu "RAM/ROM/Flash chip drivers" | 1 | menu "RAM/ROM/Flash chip drivers" |
4 | depends on MTD!=n | 2 | depends on MTD!=n |
5 | 3 | ||
@@ -242,4 +240,3 @@ config MTD_XIP | |||
242 | then say N. | 240 | then say N. |
243 | 241 | ||
244 | endmenu | 242 | endmenu |
245 | |||
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig index c222514bb70d..35081ce77fbd 100644 --- a/drivers/mtd/devices/Kconfig +++ b/drivers/mtd/devices/Kconfig | |||
@@ -1,5 +1,3 @@ | |||
1 | # drivers/mtd/maps/Kconfig | ||
2 | |||
3 | menu "Self-contained MTD device drivers" | 1 | menu "Self-contained MTD device drivers" |
4 | depends on MTD!=n | 2 | depends on MTD!=n |
5 | 3 | ||
@@ -308,4 +306,3 @@ config MTD_DOCPROBE_55AA | |||
308 | you have managed to wipe the first block. | 306 | you have managed to wipe the first block. |
309 | 307 | ||
310 | endmenu | 308 | endmenu |
311 | |||
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c index 3aa05cd18ea1..592016a0668f 100644 --- a/drivers/mtd/devices/slram.c +++ b/drivers/mtd/devices/slram.c | |||
@@ -18,7 +18,7 @@ | |||
18 | to specify the offset instead of the absolute address | 18 | to specify the offset instead of the absolute address |
19 | 19 | ||
20 | NOTE: | 20 | NOTE: |
21 | With slram it's only possible to map a contigous memory region. Therfore | 21 | With slram it's only possible to map a contiguous memory region. Therefore |
22 | if there's a device mapped somewhere in the region specified slram will | 22 | if there's a device mapped somewhere in the region specified slram will |
23 | fail to load (see kernel log if modprobe fails). | 23 | fail to load (see kernel log if modprobe fails). |
24 | 24 | ||
diff --git a/drivers/mtd/lpddr/Kconfig b/drivers/mtd/lpddr/Kconfig index 5a401d8047ab..265f969817e3 100644 --- a/drivers/mtd/lpddr/Kconfig +++ b/drivers/mtd/lpddr/Kconfig | |||
@@ -1,5 +1,3 @@ | |||
1 | # drivers/mtd/chips/Kconfig | ||
2 | |||
3 | menu "LPDDR flash memory drivers" | 1 | menu "LPDDR flash memory drivers" |
4 | depends on MTD!=n | 2 | depends on MTD!=n |
5 | 3 | ||
@@ -20,4 +18,3 @@ config MTD_QINFO_PROBE | |||
20 | families of devices. This serves similar purpose of CFI on legacy | 18 | families of devices. This serves similar purpose of CFI on legacy |
21 | Flash products | 19 | Flash products |
22 | endmenu | 20 | endmenu |
23 | |||
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 14be0755d7cd..847e214ade59 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -1,5 +1,3 @@ | |||
1 | # drivers/mtd/maps/Kconfig | ||
2 | |||
3 | menu "Mapping drivers for chip access" | 1 | menu "Mapping drivers for chip access" |
4 | depends on MTD!=n | 2 | depends on MTD!=n |
5 | 3 | ||
@@ -389,9 +387,9 @@ config MTD_IXP2000 | |||
389 | depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP2000 | 387 | depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP2000 |
390 | help | 388 | help |
391 | This enables MTD access to flash devices on platforms based | 389 | This enables MTD access to flash devices on platforms based |
392 | on Intel's IXP2000 family of network processors such as the | 390 | on Intel's IXP2000 family of network processors. If you have an |
393 | IXDP425 and Coyote. If you have an IXP2000 based board and | 391 | IXP2000 based board and would like to use the flash chips on it, |
394 | would like to use the flash chips on it, say 'Y'. | 392 | say 'Y'. |
395 | 393 | ||
396 | config MTD_FORTUNET | 394 | config MTD_FORTUNET |
397 | tristate "CFI Flash device mapped on the FortuNet board" | 395 | tristate "CFI Flash device mapped on the FortuNet board" |
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 8f8e87b7ed64..0e35e1aefd22 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
@@ -1,5 +1,3 @@ | |||
1 | # drivers/mtd/nand/Kconfig | ||
2 | |||
3 | menuconfig MTD_NAND | 1 | menuconfig MTD_NAND |
4 | tristate "NAND Device Support" | 2 | tristate "NAND Device Support" |
5 | depends on MTD | 3 | depends on MTD |
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c index e51c1ed7ac18..b126cf887476 100644 --- a/drivers/mtd/nand/diskonchip.c +++ b/drivers/mtd/nand/diskonchip.c | |||
@@ -1056,7 +1056,7 @@ static struct nand_ecclayout doc200x_oobinfo = { | |||
1056 | }; | 1056 | }; |
1057 | 1057 | ||
1058 | /* Find the (I)NFTL Media Header, and optionally also the mirror media header. | 1058 | /* Find the (I)NFTL Media Header, and optionally also the mirror media header. |
1059 | On sucessful return, buf will contain a copy of the media header for | 1059 | On successful return, buf will contain a copy of the media header for |
1060 | further processing. id is the string to scan for, and will presumably be | 1060 | further processing. id is the string to scan for, and will presumably be |
1061 | either "ANAND" or "BNAND". If findmirror=1, also look for the mirror media | 1061 | either "ANAND" or "BNAND". If findmirror=1, also look for the mirror media |
1062 | header. The page #s of the found media headers are placed in mh0_page and | 1062 | header. The page #s of the found media headers are placed in mh0_page and |
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c index db7ae9d6a296..92320a643275 100644 --- a/drivers/mtd/nand/nand_ecc.c +++ b/drivers/mtd/nand/nand_ecc.c | |||
@@ -475,7 +475,7 @@ int __nand_correct_data(unsigned char *buf, | |||
475 | * | 475 | * |
476 | * The b2 shift is there to get rid of the lowest two bits. | 476 | * The b2 shift is there to get rid of the lowest two bits. |
477 | * We could also do addressbits[b2] >> 1 but for the | 477 | * We could also do addressbits[b2] >> 1 but for the |
478 | * performace it does not make any difference | 478 | * performance it does not make any difference |
479 | */ | 479 | */ |
480 | if (eccsize_mult == 1) | 480 | if (eccsize_mult == 1) |
481 | byte_addr = (addressbits[b1] << 4) + addressbits[b0]; | 481 | byte_addr = (addressbits[b1] << 4) + addressbits[b0]; |
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 11dc7e69c4fb..68b5b3a486a9 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
@@ -875,7 +875,7 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info, | |||
875 | * @info: The controller instance. | 875 | * @info: The controller instance. |
876 | * @nmtd: The driver version of the MTD instance. | 876 | * @nmtd: The driver version of the MTD instance. |
877 | * | 877 | * |
878 | * This routine is called after the chip probe has succesfully completed | 878 | * This routine is called after the chip probe has successfully completed |
879 | * and the relevant per-chip information updated. This call ensure that | 879 | * and the relevant per-chip information updated. This call ensure that |
880 | * we update the internal state accordingly. | 880 | * we update the internal state accordingly. |
881 | * | 881 | * |
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig index a38f580c2bb3..3a9f15784600 100644 --- a/drivers/mtd/onenand/Kconfig +++ b/drivers/mtd/onenand/Kconfig | |||
@@ -1,7 +1,3 @@ | |||
1 | # | ||
2 | # linux/drivers/mtd/onenand/Kconfig | ||
3 | # | ||
4 | |||
5 | menuconfig MTD_ONENAND | 1 | menuconfig MTD_ONENAND |
6 | tristate "OneNAND Device Support" | 2 | tristate "OneNAND Device Support" |
7 | depends on MTD | 3 | depends on MTD |
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig index b1cd7a1a2191..0a8c7ea764ae 100644 --- a/drivers/mtd/ubi/Kconfig +++ b/drivers/mtd/ubi/Kconfig | |||
@@ -1,5 +1,3 @@ | |||
1 | # drivers/mtd/ubi/Kconfig | ||
2 | |||
3 | menu "UBI - Unsorted block images" | 1 | menu "UBI - Unsorted block images" |
4 | depends on MTD | 2 | depends on MTD |
5 | 3 | ||
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index ea6b139b812c..1663bc9e45de 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
@@ -19,7 +19,7 @@ | |||
19 | TBD: | 19 | TBD: |
20 | * look at deferring rx frames rather than discarding (as per tulip) | 20 | * look at deferring rx frames rather than discarding (as per tulip) |
21 | * handle tx ring full as per tulip | 21 | * handle tx ring full as per tulip |
22 | * performace test to tune rx_copybreak | 22 | * performance test to tune rx_copybreak |
23 | 23 | ||
24 | Most of my modifications relate to the braindead big-endian | 24 | Most of my modifications relate to the braindead big-endian |
25 | implementation by Intel. When the i596 is operating in | 25 | implementation by Intel. When the i596 is operating in |
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 4e6359fff0e1..766aabfdfc75 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -1633,8 +1633,13 @@ static int amd8111e_enable_link_change(struct amd8111e_priv* lp) | |||
1633 | readl(lp->mmio + CMD7); | 1633 | readl(lp->mmio + CMD7); |
1634 | return 0; | 1634 | return 0; |
1635 | } | 1635 | } |
1636 | /* This function is called when a packet transmission fails to complete within a resonable period, on the assumption that an interrupts have been failed or the interface is locked up. This function will reinitialize the hardware */ | ||
1637 | 1636 | ||
1637 | /* | ||
1638 | * This function is called when a packet transmission fails to complete | ||
1639 | * within a reasonable period, on the assumption that an interrupt have | ||
1640 | * failed or the interface is locked up. This function will reinitialize | ||
1641 | * the hardware. | ||
1642 | */ | ||
1638 | static void amd8111e_tx_timeout(struct net_device *dev) | 1643 | static void amd8111e_tx_timeout(struct net_device *dev) |
1639 | { | 1644 | { |
1640 | struct amd8111e_priv* lp = netdev_priv(dev); | 1645 | struct amd8111e_priv* lp = netdev_priv(dev); |
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 50cecf417471..73b38c204eb9 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
@@ -120,7 +120,7 @@ static int irq = 5; /* Default IRQ */ | |||
120 | * DAYNA driver mode: | 120 | * DAYNA driver mode: |
121 | * Dayna DL2000/DaynaTalk PC (Half Length), COPS LT-95, | 121 | * Dayna DL2000/DaynaTalk PC (Half Length), COPS LT-95, |
122 | * Farallon PhoneNET PC III, Farallon PhoneNET PC II | 122 | * Farallon PhoneNET PC III, Farallon PhoneNET PC II |
123 | * Other cards possibly supported mode unkown though: | 123 | * Other cards possibly supported mode unknown though: |
124 | * Dayna DL2000 (Full length), COPS LT/M (Micro-Channel) | 124 | * Dayna DL2000 (Full length), COPS LT/M (Micro-Channel) |
125 | * | 125 | * |
126 | * Cards NOT supported by this driver but supported by the ltpc.c | 126 | * Cards NOT supported by this driver but supported by the ltpc.c |
diff --git a/drivers/net/ariadne.h b/drivers/net/ariadne.h index bb613f292e04..727be5cdd1ea 100644 --- a/drivers/net/ariadne.h +++ b/drivers/net/ariadne.h | |||
@@ -244,7 +244,7 @@ struct Am79C960 { | |||
244 | #define DLNKTST 0x0010 /* Disable Link Status */ | 244 | #define DLNKTST 0x0010 /* Disable Link Status */ |
245 | #define DAPC 0x0008 /* Disable Automatic Polarity Correction */ | 245 | #define DAPC 0x0008 /* Disable Automatic Polarity Correction */ |
246 | #define MENDECL 0x0004 /* MENDEC Loopback Mode */ | 246 | #define MENDECL 0x0004 /* MENDEC Loopback Mode */ |
247 | #define LRTTSEL 0x0002 /* Low Receive Treshold/Transmit Mode Select */ | 247 | #define LRTTSEL 0x0002 /* Low Receive Threshold/Transmit Mode Select */ |
248 | #define PORTSEL1 0x0001 /* Port Select Bits */ | 248 | #define PORTSEL1 0x0001 /* Port Select Bits */ |
249 | #define PORTSEL2 0x8000 /* Port Select Bits */ | 249 | #define PORTSEL2 0x8000 /* Port Select Bits */ |
250 | #define INTL 0x4000 /* Internal Loopback */ | 250 | #define INTL 0x4000 /* Internal Loopback */ |
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c index 1e2f57d4c367..6eb9241cee0a 100644 --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c | |||
@@ -1540,7 +1540,7 @@ static irqreturn_t atl1c_intr(int irq, void *data) | |||
1540 | if (status & ISR_OVER) | 1540 | if (status & ISR_OVER) |
1541 | if (netif_msg_intr(adapter)) | 1541 | if (netif_msg_intr(adapter)) |
1542 | dev_warn(&pdev->dev, | 1542 | dev_warn(&pdev->dev, |
1543 | "TX/RX over flow (status = 0x%x)\n", | 1543 | "TX/RX overflow (status = 0x%x)\n", |
1544 | status & ISR_OVER); | 1544 | status & ISR_OVER); |
1545 | 1545 | ||
1546 | /* link event */ | 1546 | /* link event */ |
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h index e7323be507d0..92b87ef156ed 100644 --- a/drivers/net/benet/be_cmds.h +++ b/drivers/net/benet/be_cmds.h | |||
@@ -444,7 +444,7 @@ enum be_if_flags { | |||
444 | * filtering capabilities. */ | 444 | * filtering capabilities. */ |
445 | struct be_cmd_req_if_create { | 445 | struct be_cmd_req_if_create { |
446 | struct be_cmd_req_hdr hdr; | 446 | struct be_cmd_req_hdr hdr; |
447 | u32 version; /* ignore currntly */ | 447 | u32 version; /* ignore currently */ |
448 | u32 capability_flags; | 448 | u32 capability_flags; |
449 | u32 enable_flags; | 449 | u32 enable_flags; |
450 | u8 mac_addr[ETH_ALEN]; | 450 | u8 mac_addr[ETH_ALEN]; |
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 957a0f7f2764..24c7d9900baa 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c | |||
@@ -1982,7 +1982,7 @@ int be_load_fw(struct be_adapter *adapter, u8 *func) | |||
1982 | goto fw_exit; | 1982 | goto fw_exit; |
1983 | } | 1983 | } |
1984 | 1984 | ||
1985 | dev_info(&adapter->pdev->dev, "Firmware flashed succesfully\n"); | 1985 | dev_info(&adapter->pdev->dev, "Firmware flashed successfully\n"); |
1986 | 1986 | ||
1987 | fw_exit: | 1987 | fw_exit: |
1988 | release_firmware(fw); | 1988 | release_firmware(fw); |
diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x_reg.h index b668173ffcb4..944964e78c81 100644 --- a/drivers/net/bnx2x_reg.h +++ b/drivers/net/bnx2x_reg.h | |||
@@ -2536,7 +2536,7 @@ | |||
2536 | /* [RC 1] A flag to indicate that overflow error occurred in one of the | 2536 | /* [RC 1] A flag to indicate that overflow error occurred in one of the |
2537 | queues. */ | 2537 | queues. */ |
2538 | #define QM_REG_OVFERROR 0x16805c | 2538 | #define QM_REG_OVFERROR 0x16805c |
2539 | /* [RC 7] the Q were the qverflow occurs */ | 2539 | /* [RC 7] the Q where the overflow occurs */ |
2540 | #define QM_REG_OVFQNUM 0x168058 | 2540 | #define QM_REG_OVFQNUM 0x168058 |
2541 | /* [R 16] Pause state for physical queues 15-0 */ | 2541 | /* [R 16] Pause state for physical queues 15-0 */ |
2542 | #define QM_REG_PAUSESTATE0 0x168410 | 2542 | #define QM_REG_PAUSESTATE0 0x168410 |
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 0d30d1e5e53f..00ab51ef3129 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c | |||
@@ -556,7 +556,7 @@ static void rlb_update_rx_clients(struct bonding *bond) | |||
556 | } | 556 | } |
557 | } | 557 | } |
558 | 558 | ||
559 | /* do not update the entries again untill this counter is zero so that | 559 | /* do not update the entries again until this counter is zero so that |
560 | * not to confuse the clients. | 560 | * not to confuse the clients. |
561 | */ | 561 | */ |
562 | bond_info->rlb_update_delay_counter = RLB_UPDATE_DELAY; | 562 | bond_info->rlb_update_delay_counter = RLB_UPDATE_DELAY; |
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index 49f3de79118c..bdbd14727e4b 100644 --- a/drivers/net/cxgb3/sge.c +++ b/drivers/net/cxgb3/sge.c | |||
@@ -1285,7 +1285,7 @@ netdev_tx_t t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1285 | 1285 | ||
1286 | /* | 1286 | /* |
1287 | * We do not use Tx completion interrupts to free DMAd Tx packets. | 1287 | * We do not use Tx completion interrupts to free DMAd Tx packets. |
1288 | * This is good for performamce but means that we rely on new Tx | 1288 | * This is good for performance but means that we rely on new Tx |
1289 | * packets arriving to run the destructors of completed packets, | 1289 | * packets arriving to run the destructors of completed packets, |
1290 | * which open up space in their sockets' send queues. Sometimes | 1290 | * which open up space in their sockets' send queues. Sometimes |
1291 | * we do not get such new packets causing Tx to stall. A single | 1291 | * we do not get such new packets causing Tx to stall. A single |
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c index d76885223366..75b099ce49c9 100644 --- a/drivers/net/ehea/ehea_ethtool.c +++ b/drivers/net/ehea/ehea_ethtool.c | |||
@@ -118,7 +118,7 @@ doit: | |||
118 | ret = ehea_set_portspeed(port, sp); | 118 | ret = ehea_set_portspeed(port, sp); |
119 | 119 | ||
120 | if (!ret) | 120 | if (!ret) |
121 | ehea_info("%s: Port speed succesfully set: %dMbps " | 121 | ehea_info("%s: Port speed successfully set: %dMbps " |
122 | "%s Duplex", | 122 | "%s Duplex", |
123 | port->netdev->name, port->port_speed, | 123 | port->netdev->name, port->port_speed, |
124 | port->full_duplex == 1 ? "Full" : "Half"); | 124 | port->full_duplex == 1 ? "Full" : "Half"); |
@@ -134,7 +134,7 @@ static int ehea_nway_reset(struct net_device *dev) | |||
134 | ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG); | 134 | ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG); |
135 | 135 | ||
136 | if (!ret) | 136 | if (!ret) |
137 | ehea_info("%s: Port speed succesfully set: %dMbps " | 137 | ehea_info("%s: Port speed successfully set: %dMbps " |
138 | "%s Duplex", | 138 | "%s Duplex", |
139 | port->netdev->name, port->port_speed, | 139 | port->netdev->name, port->port_speed, |
140 | port->full_duplex == 1 ? "Full" : "Half"); | 140 | port->full_duplex == 1 ? "Full" : "Half"); |
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c index ed60fd664273..0cab992b3d1a 100644 --- a/drivers/net/hamradio/baycom_ser_fdx.c +++ b/drivers/net/hamradio/baycom_ser_fdx.c | |||
@@ -35,7 +35,7 @@ | |||
35 | * driver only supports standard serial hardware (8250, 16450, 16550A) | 35 | * driver only supports standard serial hardware (8250, 16450, 16550A) |
36 | * | 36 | * |
37 | * This modem usually draws its supply current out of the otherwise unused | 37 | * This modem usually draws its supply current out of the otherwise unused |
38 | * TXD pin of the serial port. Thus a contignuous stream of 0x00-bytes | 38 | * TXD pin of the serial port. Thus a contiguous stream of 0x00-bytes |
39 | * is transmitted to achieve a positive supply voltage. | 39 | * is transmitted to achieve a positive supply voltage. |
40 | * | 40 | * |
41 | * hsk: This is a 4800 baud FSK modem, designed for TNC use. It works fine | 41 | * hsk: This is a 4800 baud FSK modem, designed for TNC use. It works fine |
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index 1e8dd8c74a64..8f7d0d146f24 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
@@ -115,7 +115,7 @@ struct smsc_ircc_subsystem_configuration { | |||
115 | unsigned short vendor; /* PCI vendor ID */ | 115 | unsigned short vendor; /* PCI vendor ID */ |
116 | unsigned short device; /* PCI vendor ID */ | 116 | unsigned short device; /* PCI vendor ID */ |
117 | unsigned short subvendor; /* PCI subsystem vendor ID */ | 117 | unsigned short subvendor; /* PCI subsystem vendor ID */ |
118 | unsigned short subdevice; /* PCI sybsystem device ID */ | 118 | unsigned short subdevice; /* PCI subsystem device ID */ |
119 | unsigned short sir_io; /* I/O port for SIR */ | 119 | unsigned short sir_io; /* I/O port for SIR */ |
120 | unsigned short fir_io; /* I/O port for FIR */ | 120 | unsigned short fir_io; /* I/O port for FIR */ |
121 | unsigned char fir_irq; /* FIR IRQ */ | 121 | unsigned char fir_irq; /* FIR IRQ */ |
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index 49997194bdd0..16c91910d6c1 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
@@ -1384,7 +1384,7 @@ static inline void veth_build_dma_list(struct dma_chunk *list, | |||
1384 | unsigned long done; | 1384 | unsigned long done; |
1385 | int i = 1; | 1385 | int i = 1; |
1386 | 1386 | ||
1387 | /* FIXME: skbs are continguous in real addresses. Do we | 1387 | /* FIXME: skbs are contiguous in real addresses. Do we |
1388 | * really need to break it into PAGE_SIZE chunks, or can we do | 1388 | * really need to break it into PAGE_SIZE chunks, or can we do |
1389 | * it just at the granularity of iSeries real->absolute | 1389 | * it just at the granularity of iSeries real->absolute |
1390 | * mapping? Indeed, given the way the allocator works, can we | 1390 | * mapping? Indeed, given the way the allocator works, can we |
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index a0c578585a50..b77238dbafb8 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c | |||
@@ -47,7 +47,7 @@ | |||
47 | TBD: | 47 | TBD: |
48 | * look at deferring rx frames rather than discarding (as per tulip) | 48 | * look at deferring rx frames rather than discarding (as per tulip) |
49 | * handle tx ring full as per tulip | 49 | * handle tx ring full as per tulip |
50 | * performace test to tune rx_copybreak | 50 | * performance test to tune rx_copybreak |
51 | 51 | ||
52 | Most of my modifications relate to the braindead big-endian | 52 | Most of my modifications relate to the braindead big-endian |
53 | implementation by Intel. When the i596 is operating in | 53 | implementation by Intel. When the i596 is operating in |
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index 7a07430206e3..b117f7f8b194 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
@@ -47,7 +47,7 @@ | |||
47 | TBD: | 47 | TBD: |
48 | * look at deferring rx frames rather than discarding (as per tulip) | 48 | * look at deferring rx frames rather than discarding (as per tulip) |
49 | * handle tx ring full as per tulip | 49 | * handle tx ring full as per tulip |
50 | * performace test to tune rx_copybreak | 50 | * performance test to tune rx_copybreak |
51 | 51 | ||
52 | Most of my modifications relate to the braindead big-endian | 52 | Most of my modifications relate to the braindead big-endian |
53 | implementation by Intel. When the i596 is operating in | 53 | implementation by Intel. When the i596 is operating in |
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c index 03b781a7a182..829b9ec9ff67 100644 --- a/drivers/net/mlx4/en_rx.c +++ b/drivers/net/mlx4/en_rx.c | |||
@@ -204,7 +204,7 @@ static void mlx4_en_free_rx_desc(struct mlx4_en_priv *priv, | |||
204 | en_dbg(DRV, priv, "Freeing fragment:%d\n", nr); | 204 | en_dbg(DRV, priv, "Freeing fragment:%d\n", nr); |
205 | dma = be64_to_cpu(rx_desc->data[nr].addr); | 205 | dma = be64_to_cpu(rx_desc->data[nr].addr); |
206 | 206 | ||
207 | en_dbg(DRV, priv, "Unmaping buffer at dma:0x%llx\n", (u64) dma); | 207 | en_dbg(DRV, priv, "Unmapping buffer at dma:0x%llx\n", (u64) dma); |
208 | pci_unmap_single(mdev->pdev, dma, skb_frags[nr].size, | 208 | pci_unmap_single(mdev->pdev, dma, skb_frags[nr].size, |
209 | PCI_DMA_FROMDEVICE); | 209 | PCI_DMA_FROMDEVICE); |
210 | put_page(skb_frags[nr].page); | 210 | put_page(skb_frags[nr].page); |
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c index 8c7279965b44..3d1396af9462 100644 --- a/drivers/net/mlx4/en_tx.c +++ b/drivers/net/mlx4/en_tx.c | |||
@@ -47,7 +47,7 @@ enum { | |||
47 | static int inline_thold __read_mostly = MAX_INLINE; | 47 | static int inline_thold __read_mostly = MAX_INLINE; |
48 | 48 | ||
49 | module_param_named(inline_thold, inline_thold, int, 0444); | 49 | module_param_named(inline_thold, inline_thold, int, 0444); |
50 | MODULE_PARM_DESC(inline_thold, "treshold for using inline data"); | 50 | MODULE_PARM_DESC(inline_thold, "threshold for using inline data"); |
51 | 51 | ||
52 | int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, | 52 | int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, |
53 | struct mlx4_en_tx_ring *ring, u32 size, | 53 | struct mlx4_en_tx_ring *ring, u32 size, |
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h index 4376147b0ea0..82c3ebc584e3 100644 --- a/drivers/net/mlx4/mlx4_en.h +++ b/drivers/net/mlx4/mlx4_en.h | |||
@@ -162,7 +162,7 @@ enum { | |||
162 | #define MLX4_EN_DEF_RX_PAUSE 1 | 162 | #define MLX4_EN_DEF_RX_PAUSE 1 |
163 | #define MLX4_EN_DEF_TX_PAUSE 1 | 163 | #define MLX4_EN_DEF_TX_PAUSE 1 |
164 | 164 | ||
165 | /* Interval between sucessive polls in the Tx routine when polling is used | 165 | /* Interval between successive polls in the Tx routine when polling is used |
166 | instead of interrupts (in per-core Tx rings) - should be power of 2 */ | 166 | instead of interrupts (in per-core Tx rings) - should be power of 2 */ |
167 | #define MLX4_EN_TX_POLL_MODER 16 | 167 | #define MLX4_EN_TX_POLL_MODER 16 |
168 | #define MLX4_EN_TX_POLL_TIMEOUT (HZ / 4) | 168 | #define MLX4_EN_TX_POLL_TIMEOUT (HZ / 4) |
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index 89c4948300a5..0c768593aad0 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
@@ -314,7 +314,7 @@ static void gelic_card_reset_chain(struct gelic_card *card, | |||
314 | * @card: card structure | 314 | * @card: card structure |
315 | * @descr: descriptor to re-init | 315 | * @descr: descriptor to re-init |
316 | * | 316 | * |
317 | * return 0 on succes, <0 on failure | 317 | * return 0 on success, <0 on failure |
318 | * | 318 | * |
319 | * allocates a new rx skb, iommu-maps it and attaches it to the descriptor. | 319 | * allocates a new rx skb, iommu-maps it and attaches it to the descriptor. |
320 | * Activate the descriptor state-wise | 320 | * Activate the descriptor state-wise |
diff --git a/drivers/net/ps3_gelic_wireless.h b/drivers/net/ps3_gelic_wireless.h index 5b631c6c9775..0a88b535197a 100644 --- a/drivers/net/ps3_gelic_wireless.h +++ b/drivers/net/ps3_gelic_wireless.h | |||
@@ -199,7 +199,7 @@ struct gelic_eurus_rssi_info { | |||
199 | /* for 'stat' member of gelic_wl_info */ | 199 | /* for 'stat' member of gelic_wl_info */ |
200 | enum gelic_wl_info_status_bit { | 200 | enum gelic_wl_info_status_bit { |
201 | GELIC_WL_STAT_CONFIGURED, | 201 | GELIC_WL_STAT_CONFIGURED, |
202 | GELIC_WL_STAT_CH_INFO, /* ch info aquired */ | 202 | GELIC_WL_STAT_CH_INFO, /* ch info acquired */ |
203 | GELIC_WL_STAT_ESSID_SET, /* ESSID specified by userspace */ | 203 | GELIC_WL_STAT_ESSID_SET, /* ESSID specified by userspace */ |
204 | GELIC_WL_STAT_BSSID_SET, /* BSSID specified by userspace */ | 204 | GELIC_WL_STAT_BSSID_SET, /* BSSID specified by userspace */ |
205 | GELIC_WL_STAT_WPA_PSK_SET, /* PMK specified by userspace */ | 205 | GELIC_WL_STAT_WPA_PSK_SET, /* PMK specified by userspace */ |
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index e3e6bc917c87..dd35066a7f8d 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c | |||
@@ -3651,7 +3651,7 @@ static int ql_adapter_up(struct ql3_adapter *qdev) | |||
3651 | ql_sem_unlock(qdev, QL_DRVR_SEM_MASK); | 3651 | ql_sem_unlock(qdev, QL_DRVR_SEM_MASK); |
3652 | } else { | 3652 | } else { |
3653 | printk(KERN_ERR PFX | 3653 | printk(KERN_ERR PFX |
3654 | "%s: Could not aquire driver lock.\n", | 3654 | "%s: Could not acquire driver lock.\n", |
3655 | ndev->name); | 3655 | ndev->name); |
3656 | goto err_lock; | 3656 | goto err_lock; |
3657 | } | 3657 | } |
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 0dd7839322bc..cc4218667cba 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -3238,7 +3238,7 @@ static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev) | |||
3238 | 3238 | ||
3239 | /** | 3239 | /** |
3240 | * s2io_chk_xpak_counter - Function to check the status of the xpak counters | 3240 | * s2io_chk_xpak_counter - Function to check the status of the xpak counters |
3241 | * @counter : couter value to be updated | 3241 | * @counter : counter value to be updated |
3242 | * @flag : flag to indicate the status | 3242 | * @flag : flag to indicate the status |
3243 | * @type : counter type | 3243 | * @type : counter type |
3244 | * Description: | 3244 | * Description: |
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 9a12d88ac2d9..7360d4bbf75e 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -1760,7 +1760,7 @@ static int sis900_rx(struct net_device *net_dev) | |||
1760 | sis_priv->rx_ring[entry].bufptr, RX_BUF_SIZE, | 1760 | sis_priv->rx_ring[entry].bufptr, RX_BUF_SIZE, |
1761 | PCI_DMA_FROMDEVICE); | 1761 | PCI_DMA_FROMDEVICE); |
1762 | 1762 | ||
1763 | /* refill the Rx buffer, what if there is not enought | 1763 | /* refill the Rx buffer, what if there is not enough |
1764 | * memory for new socket buffer ?? */ | 1764 | * memory for new socket buffer ?? */ |
1765 | if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) { | 1765 | if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) { |
1766 | /* | 1766 | /* |
@@ -1775,7 +1775,7 @@ static int sis900_rx(struct net_device *net_dev) | |||
1775 | } | 1775 | } |
1776 | 1776 | ||
1777 | /* This situation should never happen, but due to | 1777 | /* This situation should never happen, but due to |
1778 | some unknow bugs, it is possible that | 1778 | some unknown bugs, it is possible that |
1779 | we are working on NULL sk_buff :-( */ | 1779 | we are working on NULL sk_buff :-( */ |
1780 | if (sis_priv->rx_skbuff[entry] == NULL) { | 1780 | if (sis_priv->rx_skbuff[entry] == NULL) { |
1781 | if (netif_msg_rx_err(sis_priv)) | 1781 | if (netif_msg_rx_err(sis_priv)) |
diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/skfp/h/smc.h index 1758d9548361..026a83b9f743 100644 --- a/drivers/net/skfp/h/smc.h +++ b/drivers/net/skfp/h/smc.h | |||
@@ -393,10 +393,10 @@ struct smt_config { | |||
393 | */ | 393 | */ |
394 | u_long mac_d_max ; /* MAC : D_Max timer value */ | 394 | u_long mac_d_max ; /* MAC : D_Max timer value */ |
395 | 395 | ||
396 | u_long lct_short ; /* LCT : error threshhold */ | 396 | u_long lct_short ; /* LCT : error threshold */ |
397 | u_long lct_medium ; /* LCT : error threshhold */ | 397 | u_long lct_medium ; /* LCT : error threshold */ |
398 | u_long lct_long ; /* LCT : error threshhold */ | 398 | u_long lct_long ; /* LCT : error threshold */ |
399 | u_long lct_extended ; /* LCT : error threshhold */ | 399 | u_long lct_extended ; /* LCT : error threshold */ |
400 | } ; | 400 | } ; |
401 | 401 | ||
402 | #ifdef DEBUG | 402 | #ifdef DEBUG |
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index b27156eaf267..db216a728503 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
@@ -1002,7 +1002,7 @@ static int skfp_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
1002 | } | 1002 | } |
1003 | break; | 1003 | break; |
1004 | default: | 1004 | default: |
1005 | printk("ioctl for %s: unknow cmd: %04x\n", dev->name, ioc.cmd); | 1005 | printk("ioctl for %s: unknown cmd: %04x\n", dev->name, ioc.cmd); |
1006 | status = -EOPNOTSUPP; | 1006 | status = -EOPNOTSUPP; |
1007 | 1007 | ||
1008 | } // switch | 1008 | } // switch |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 3943d89afb2b..044e6817986f 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -2017,7 +2017,7 @@ static void sky2_link_down(struct sky2_port *sky2) | |||
2017 | 2017 | ||
2018 | netif_carrier_off(sky2->netdev); | 2018 | netif_carrier_off(sky2->netdev); |
2019 | 2019 | ||
2020 | /* Turn on link LED */ | 2020 | /* Turn off link LED */ |
2021 | sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF); | 2021 | sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF); |
2022 | 2022 | ||
2023 | if (netif_msg_link(sky2)) | 2023 | if (netif_msg_link(sky2)) |
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 4d0d5c56bed8..20d6095cf411 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
@@ -816,7 +816,7 @@ static int smsc911x_mii_probe(struct net_device *dev) | |||
816 | SMSC_TRACE(HW, "Passed Loop Back Test"); | 816 | SMSC_TRACE(HW, "Passed Loop Back Test"); |
817 | #endif /* USE_PHY_WORK_AROUND */ | 817 | #endif /* USE_PHY_WORK_AROUND */ |
818 | 818 | ||
819 | SMSC_TRACE(HW, "phy initialised succesfully"); | 819 | SMSC_TRACE(HW, "phy initialised successfully"); |
820 | return 0; | 820 | return 0; |
821 | } | 821 | } |
822 | 822 | ||
diff --git a/drivers/net/smsc911x.h b/drivers/net/smsc911x.h index b5716bd8a597..016360c65ce2 100644 --- a/drivers/net/smsc911x.h +++ b/drivers/net/smsc911x.h | |||
@@ -30,7 +30,7 @@ | |||
30 | #define SMSC_NAPI_WEIGHT 16 | 30 | #define SMSC_NAPI_WEIGHT 16 |
31 | 31 | ||
32 | /* implements a PHY loopback test at initialisation time, to ensure a packet | 32 | /* implements a PHY loopback test at initialisation time, to ensure a packet |
33 | * can be succesfully looped back */ | 33 | * can be successfully looped back */ |
34 | #define USE_PHY_WORK_AROUND | 34 | #define USE_PHY_WORK_AROUND |
35 | 35 | ||
36 | #define DPRINTK(nlevel, klevel, fmt, args...) \ | 36 | #define DPRINTK(nlevel, klevel, fmt, args...) \ |
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 782910cf220f..218524857bfc 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
@@ -410,7 +410,7 @@ spider_net_free_rx_chain_contents(struct spider_net_card *card) | |||
410 | * @card: card structure | 410 | * @card: card structure |
411 | * @descr: descriptor to re-init | 411 | * @descr: descriptor to re-init |
412 | * | 412 | * |
413 | * Return 0 on succes, <0 on failure. | 413 | * Return 0 on success, <0 on failure. |
414 | * | 414 | * |
415 | * Allocates a new rx skb, iommu-maps it and attaches it to the | 415 | * Allocates a new rx skb, iommu-maps it and attaches it to the |
416 | * descriptor. Mark the descriptor as activated, ready-to-use. | 416 | * descriptor. Mark the descriptor as activated, ready-to-use. |
diff --git a/drivers/net/stmmac/gmac.c b/drivers/net/stmmac/gmac.c index b624bb5bae0a..52586ee68953 100644 --- a/drivers/net/stmmac/gmac.c +++ b/drivers/net/stmmac/gmac.c | |||
@@ -112,7 +112,7 @@ static void gmac_dma_operation_mode(unsigned long ioaddr, int txmode, | |||
112 | " (threshold = %d)\n", txmode); | 112 | " (threshold = %d)\n", txmode); |
113 | csr6 &= ~DMA_CONTROL_TSF; | 113 | csr6 &= ~DMA_CONTROL_TSF; |
114 | csr6 &= DMA_CONTROL_TC_TX_MASK; | 114 | csr6 &= DMA_CONTROL_TC_TX_MASK; |
115 | /* Set the transmit threashold */ | 115 | /* Set the transmit threshold */ |
116 | if (txmode <= 32) | 116 | if (txmode <= 32) |
117 | csr6 |= DMA_CONTROL_TTC_32; | 117 | csr6 |= DMA_CONTROL_TTC_32; |
118 | else if (txmode <= 64) | 118 | else if (txmode <= 64) |
diff --git a/drivers/net/stmmac/gmac.h b/drivers/net/stmmac/gmac.h index 684a363120a9..2e82d6c9a148 100644 --- a/drivers/net/stmmac/gmac.h +++ b/drivers/net/stmmac/gmac.h | |||
@@ -154,14 +154,14 @@ enum rx_tx_priority_ratio { | |||
154 | #define DMA_CONTROL_DT 0x04000000 /* Disable Drop TCP/IP csum error */ | 154 | #define DMA_CONTROL_DT 0x04000000 /* Disable Drop TCP/IP csum error */ |
155 | #define DMA_CONTROL_RSF 0x02000000 /* Receive Store and Forward */ | 155 | #define DMA_CONTROL_RSF 0x02000000 /* Receive Store and Forward */ |
156 | #define DMA_CONTROL_DFF 0x01000000 /* Disaable flushing */ | 156 | #define DMA_CONTROL_DFF 0x01000000 /* Disaable flushing */ |
157 | /* Theshold for Activating the FC */ | 157 | /* Threshold for Activating the FC */ |
158 | enum rfa { | 158 | enum rfa { |
159 | act_full_minus_1 = 0x00800000, | 159 | act_full_minus_1 = 0x00800000, |
160 | act_full_minus_2 = 0x00800200, | 160 | act_full_minus_2 = 0x00800200, |
161 | act_full_minus_3 = 0x00800400, | 161 | act_full_minus_3 = 0x00800400, |
162 | act_full_minus_4 = 0x00800600, | 162 | act_full_minus_4 = 0x00800600, |
163 | }; | 163 | }; |
164 | /* Theshold for Deactivating the FC */ | 164 | /* Threshold for Deactivating the FC */ |
165 | enum rfd { | 165 | enum rfd { |
166 | deac_full_minus_1 = 0x00400000, | 166 | deac_full_minus_1 = 0x00400000, |
167 | deac_full_minus_2 = 0x00400800, | 167 | deac_full_minus_2 = 0x00400800, |
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 5db0270957ac..66272f2a0758 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
@@ -96,7 +96,7 @@ | |||
96 | * | 96 | * |
97 | * Change by Mike Sullivan et al.: | 97 | * Change by Mike Sullivan et al.: |
98 | * + added turbo card support. No need to use lanaid to configure | 98 | * + added turbo card support. No need to use lanaid to configure |
99 | * the adapter into isa compatiblity mode. | 99 | * the adapter into isa compatibility mode. |
100 | * | 100 | * |
101 | * Changes by Burt Silverman to allow the computer to behave nicely when | 101 | * Changes by Burt Silverman to allow the computer to behave nicely when |
102 | * a cable is pulled or not in place, or a PCMCIA card is removed hot. | 102 | * a cable is pulled or not in place, or a PCMCIA card is removed hot. |
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index 427a8970b6fe..5401d86a7be4 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
@@ -426,7 +426,7 @@ static int smctr_alloc_shared_memory(struct net_device *dev) | |||
426 | smctr_malloc(dev, 1L); | 426 | smctr_malloc(dev, 1L); |
427 | 427 | ||
428 | /* Allocate Non-MAC receive data buffers. | 428 | /* Allocate Non-MAC receive data buffers. |
429 | * To guarantee a minimum of 256 contigous memory to | 429 | * To guarantee a minimum of 256 contiguous memory to |
430 | * UM_Receive_Packet's lookahead pointer, before a page | 430 | * UM_Receive_Packet's lookahead pointer, before a page |
431 | * change or ring end is encountered, place each rx buffer on | 431 | * change or ring end is encountered, place each rx buffer on |
432 | * a 256 byte boundary. | 432 | * a 256 byte boundary. |
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 9f44c99777a8..afaf088b72ea 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -3798,7 +3798,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
3798 | prop = of_get_property(np, "tx-clock", NULL); | 3798 | prop = of_get_property(np, "tx-clock", NULL); |
3799 | if (!prop) { | 3799 | if (!prop) { |
3800 | printk(KERN_ERR | 3800 | printk(KERN_ERR |
3801 | "ucc_geth: mising tx-clock-name property\n"); | 3801 | "ucc_geth: missing tx-clock-name property\n"); |
3802 | return -EINVAL; | 3802 | return -EINVAL; |
3803 | } | 3803 | } |
3804 | if ((*prop < QE_CLK_NONE) || (*prop > QE_CLK24)) { | 3804 | if ((*prop < QE_CLK_NONE) || (*prop > QE_CLK24)) { |
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h index 03a6ca016d5a..a007e2acf651 100644 --- a/drivers/net/ucc_geth.h +++ b/drivers/net/ucc_geth.h | |||
@@ -80,16 +80,16 @@ struct ucc_geth { | |||
80 | frames) received that were between 128 | 80 | frames) received that were between 128 |
81 | (Including FCS length==4) and 255 octets */ | 81 | (Including FCS length==4) and 255 octets */ |
82 | u32 txok; /* Total number of octets residing in frames | 82 | u32 txok; /* Total number of octets residing in frames |
83 | that where involved in succesfull | 83 | that where involved in successfull |
84 | transmission */ | 84 | transmission */ |
85 | u16 txcf; /* Total number of PAUSE control frames | 85 | u16 txcf; /* Total number of PAUSE control frames |
86 | transmitted by this MAC */ | 86 | transmitted by this MAC */ |
87 | u8 res4[0x2]; | 87 | u8 res4[0x2]; |
88 | u32 tmca; /* Total number of frames that were transmitted | 88 | u32 tmca; /* Total number of frames that were transmitted |
89 | succesfully with the group address bit set | 89 | successfully with the group address bit set |
90 | that are not broadcast frames */ | 90 | that are not broadcast frames */ |
91 | u32 tbca; /* Total number of frames transmitted | 91 | u32 tbca; /* Total number of frames transmitted |
92 | succesfully that had destination address | 92 | successfully that had destination address |
93 | field equal to the broadcast address */ | 93 | field equal to the broadcast address */ |
94 | u32 rxfok; /* Total number of frames received OK */ | 94 | u32 rxfok; /* Total number of frames received OK */ |
95 | u32 rxbok; /* Total number of octets received OK */ | 95 | u32 rxbok; /* Total number of octets received OK */ |
@@ -98,9 +98,9 @@ struct ucc_geth { | |||
98 | HW because it includes octets in frames that | 98 | HW because it includes octets in frames that |
99 | never even reach the UCC */ | 99 | never even reach the UCC */ |
100 | u32 rmca; /* Total number of frames that were received | 100 | u32 rmca; /* Total number of frames that were received |
101 | succesfully with the group address bit set | 101 | successfully with the group address bit set |
102 | that are not broadcast frames */ | 102 | that are not broadcast frames */ |
103 | u32 rbca; /* Total number of frames received succesfully | 103 | u32 rbca; /* Total number of frames received successfully |
104 | that had destination address equal to the | 104 | that had destination address equal to the |
105 | broadcast address */ | 105 | broadcast address */ |
106 | u32 scar; /* Statistics carry register */ | 106 | u32 scar; /* Statistics carry register */ |
@@ -759,15 +759,15 @@ struct ucc_geth_hardware_statistics { | |||
759 | frames) received that were between 128 | 759 | frames) received that were between 128 |
760 | (Including FCS length==4) and 255 octets */ | 760 | (Including FCS length==4) and 255 octets */ |
761 | u32 txok; /* Total number of octets residing in frames | 761 | u32 txok; /* Total number of octets residing in frames |
762 | that where involved in succesfull | 762 | that where involved in successfull |
763 | transmission */ | 763 | transmission */ |
764 | u16 txcf; /* Total number of PAUSE control frames | 764 | u16 txcf; /* Total number of PAUSE control frames |
765 | transmitted by this MAC */ | 765 | transmitted by this MAC */ |
766 | u32 tmca; /* Total number of frames that were transmitted | 766 | u32 tmca; /* Total number of frames that were transmitted |
767 | succesfully with the group address bit set | 767 | successfully with the group address bit set |
768 | that are not broadcast frames */ | 768 | that are not broadcast frames */ |
769 | u32 tbca; /* Total number of frames transmitted | 769 | u32 tbca; /* Total number of frames transmitted |
770 | succesfully that had destination address | 770 | successfully that had destination address |
771 | field equal to the broadcast address */ | 771 | field equal to the broadcast address */ |
772 | u32 rxfok; /* Total number of frames received OK */ | 772 | u32 rxfok; /* Total number of frames received OK */ |
773 | u32 rxbok; /* Total number of octets received OK */ | 773 | u32 rxbok; /* Total number of octets received OK */ |
@@ -776,9 +776,9 @@ struct ucc_geth_hardware_statistics { | |||
776 | HW because it includes octets in frames that | 776 | HW because it includes octets in frames that |
777 | never even reach the UCC */ | 777 | never even reach the UCC */ |
778 | u32 rmca; /* Total number of frames that were received | 778 | u32 rmca; /* Total number of frames that were received |
779 | succesfully with the group address bit set | 779 | successfully with the group address bit set |
780 | that are not broadcast frames */ | 780 | that are not broadcast frames */ |
781 | u32 rbca; /* Total number of frames received succesfully | 781 | u32 rbca; /* Total number of frames received successfully |
782 | that had destination address equal to the | 782 | that had destination address equal to the |
783 | broadcast address */ | 783 | broadcast address */ |
784 | } __attribute__ ((packed)); | 784 | } __attribute__ ((packed)); |
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index c6c922247d05..0c3c738d7419 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c | |||
@@ -748,7 +748,7 @@ static int smsc95xx_phy_initialize(struct usbnet *dev) | |||
748 | mii_nway_restart(&dev->mii); | 748 | mii_nway_restart(&dev->mii); |
749 | 749 | ||
750 | if (netif_msg_ifup(dev)) | 750 | if (netif_msg_ifup(dev)) |
751 | devdbg(dev, "phy initialised succesfully"); | 751 | devdbg(dev, "phy initialised successfully"); |
752 | return 0; | 752 | return 0; |
753 | } | 753 | } |
754 | 754 | ||
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index a7d4fc1a03a2..0e52993e2079 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c | |||
@@ -182,7 +182,7 @@ static inline pvc_device* find_pvc(hdlc_device *hdlc, u16 dlci) | |||
182 | if (pvc->dlci == dlci) | 182 | if (pvc->dlci == dlci) |
183 | return pvc; | 183 | return pvc; |
184 | if (pvc->dlci > dlci) | 184 | if (pvc->dlci > dlci) |
185 | return NULL; /* the listed is sorted */ | 185 | return NULL; /* the list is sorted */ |
186 | pvc = pvc->next; | 186 | pvc = pvc->next; |
187 | } | 187 | } |
188 | 188 | ||
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 2ebe935d1058..4b6f27e7c820 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
@@ -927,7 +927,7 @@ static int __devinit lmc_init_one(struct pci_dev *pdev, | |||
927 | sc->lmc_media = &lmc_t1_media; | 927 | sc->lmc_media = &lmc_t1_media; |
928 | break; | 928 | break; |
929 | default: | 929 | default: |
930 | printk(KERN_WARNING "%s: LMC UNKOWN CARD!\n", dev->name); | 930 | printk(KERN_WARNING "%s: LMC UNKNOWN CARD!\n", dev->name); |
931 | break; | 931 | break; |
932 | } | 932 | } |
933 | 933 | ||
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c index e3d2a9de023c..7ddb173fd4a7 100644 --- a/drivers/net/wimax/i2400m/rx.c +++ b/drivers/net/wimax/i2400m/rx.c | |||
@@ -1194,7 +1194,7 @@ error: | |||
1194 | * device. See the file header for the format. Run all checks on the | 1194 | * device. See the file header for the format. Run all checks on the |
1195 | * buffer header, then run over each payload's descriptors, verify | 1195 | * buffer header, then run over each payload's descriptors, verify |
1196 | * their consistency and act on each payload's contents. If | 1196 | * their consistency and act on each payload's contents. If |
1197 | * everything is succesful, update the device's statistics. | 1197 | * everything is successful, update the device's statistics. |
1198 | * | 1198 | * |
1199 | * Note: You need to set the skb to contain only the length of the | 1199 | * Note: You need to set the skb to contain only the length of the |
1200 | * received buffer; for that, use skb_trim(skb, RECEIVED_SIZE). | 1200 | * received buffer; for that, use skb_trim(skb, RECEIVED_SIZE). |
diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h index b72338c9bde7..952b3a21bbc3 100644 --- a/drivers/net/wireless/ath/ath5k/base.h +++ b/drivers/net/wireless/ath/ath5k/base.h | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | /* | 38 | /* |
39 | * Defintions for the Atheros Wireless LAN controller driver. | 39 | * Definitions for the Atheros Wireless LAN controller driver. |
40 | */ | 40 | */ |
41 | #ifndef _DEV_ATH_ATHVAR_H | 41 | #ifndef _DEV_ATH_ATHVAR_H |
42 | #define _DEV_ATH_ATHVAR_H | 42 | #define _DEV_ATH_ATHVAR_H |
@@ -190,7 +190,7 @@ struct ath5k_softc { | |||
190 | struct ath5k_txq *cabq; /* content after beacon */ | 190 | struct ath5k_txq *cabq; /* content after beacon */ |
191 | 191 | ||
192 | int power_level; /* Requested tx power in dbm */ | 192 | int power_level; /* Requested tx power in dbm */ |
193 | bool assoc; /* assocate state */ | 193 | bool assoc; /* associate state */ |
194 | bool enable_beacon; /* true if beacons are on */ | 194 | bool enable_beacon; /* true if beacons are on */ |
195 | }; | 195 | }; |
196 | 196 | ||
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c index 644962adda97..81ea52c4faff 100644 --- a/drivers/net/wireless/ath/ath5k/eeprom.c +++ b/drivers/net/wireless/ath/ath5k/eeprom.c | |||
@@ -1492,7 +1492,7 @@ ath5k_eeprom_read_target_rate_pwr_info(struct ath5k_hw *ah, unsigned int mode) | |||
1492 | * This info is used to calibrate the baseband power table. Imagine | 1492 | * This info is used to calibrate the baseband power table. Imagine |
1493 | * that for each channel there is a power curve that's hw specific | 1493 | * that for each channel there is a power curve that's hw specific |
1494 | * (depends on amplifier etc) and we try to "correct" this curve using | 1494 | * (depends on amplifier etc) and we try to "correct" this curve using |
1495 | * offests we pass on to phy chip (baseband -> before amplifier) so that | 1495 | * offsets we pass on to phy chip (baseband -> before amplifier) so that |
1496 | * it can use accurate power values when setting tx power (takes amplifier's | 1496 | * it can use accurate power values when setting tx power (takes amplifier's |
1497 | * performance on each channel into account). | 1497 | * performance on each channel into account). |
1498 | * | 1498 | * |
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index bbfdcd5e7cb1..72474c0ccaff 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c | |||
@@ -117,7 +117,7 @@ static unsigned int ath5k_hw_rfb_op(struct ath5k_hw *ah, | |||
117 | 117 | ||
118 | /* | 118 | /* |
119 | * This code is used to optimize rf gain on different environments | 119 | * This code is used to optimize rf gain on different environments |
120 | * (temprature mostly) based on feedback from a power detector. | 120 | * (temperature mostly) based on feedback from a power detector. |
121 | * | 121 | * |
122 | * It's only used on RF5111 and RF5112, later RF chips seem to have | 122 | * It's only used on RF5111 and RF5112, later RF chips seem to have |
123 | * auto adjustment on hw -notice they have a much smaller BANK 7 and | 123 | * auto adjustment on hw -notice they have a much smaller BANK 7 and |
@@ -2746,7 +2746,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah, | |||
2746 | /* Fill curves in reverse order | 2746 | /* Fill curves in reverse order |
2747 | * from lower power (max gain) | 2747 | * from lower power (max gain) |
2748 | * to higher power. Use curve -> idx | 2748 | * to higher power. Use curve -> idx |
2749 | * backmaping we did on eeprom init */ | 2749 | * backmapping we did on eeprom init */ |
2750 | u8 idx = pdg_curve_to_idx[pdg]; | 2750 | u8 idx = pdg_curve_to_idx[pdg]; |
2751 | 2751 | ||
2752 | /* Grab the needed curves by index */ | 2752 | /* Grab the needed curves by index */ |
@@ -2848,7 +2848,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah, | |||
2848 | /* Now we have a set of curves for this | 2848 | /* Now we have a set of curves for this |
2849 | * channel on tmpL (x range is table_max - table_min | 2849 | * channel on tmpL (x range is table_max - table_min |
2850 | * and y values are tmpL[pdg][]) sorted in the same | 2850 | * and y values are tmpL[pdg][]) sorted in the same |
2851 | * order as EEPROM (because we've used the backmaping). | 2851 | * order as EEPROM (because we've used the backmapping). |
2852 | * So for RF5112 it's from higher power to lower power | 2852 | * So for RF5112 it's from higher power to lower power |
2853 | * and for RF2413 it's from lower power to higher power. | 2853 | * and for RF2413 it's from lower power to higher power. |
2854 | * For RF5111 we only have one curve. */ | 2854 | * For RF5111 we only have one curve. */ |
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c index c915954d4d5b..70fdb9d8db82 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c | |||
@@ -880,7 +880,7 @@ static bool ath_rc_update_per(struct ath_softc *sc, | |||
880 | * Since this probe succeeded, we allow the next | 880 | * Since this probe succeeded, we allow the next |
881 | * probe twice as soon. This allows the maxRate | 881 | * probe twice as soon. This allows the maxRate |
882 | * to move up faster if the probes are | 882 | * to move up faster if the probes are |
883 | * succesful. | 883 | * successful. |
884 | */ | 884 | */ |
885 | ath_rc_priv->probe_time = | 885 | ath_rc_priv->probe_time = |
886 | now_msec - rate_table->probe_interval / 2; | 886 | now_msec - rate_table->probe_interval / 2; |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 077480c4916a..71e5c996bd09 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -2955,7 +2955,7 @@ static void do_periodic_work(struct b43_wldev *dev) | |||
2955 | /* Periodic work locking policy: | 2955 | /* Periodic work locking policy: |
2956 | * The whole periodic work handler is protected by | 2956 | * The whole periodic work handler is protected by |
2957 | * wl->mutex. If another lock is needed somewhere in the | 2957 | * wl->mutex. If another lock is needed somewhere in the |
2958 | * pwork callchain, it's aquired in-place, where it's needed. | 2958 | * pwork callchain, it's acquired in-place, where it's needed. |
2959 | */ | 2959 | */ |
2960 | static void b43_periodic_work_handler(struct work_struct *work) | 2960 | static void b43_periodic_work_handler(struct work_struct *work) |
2961 | { | 2961 | { |
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index ab6a18c2e9d9..4a905b6a886b 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
@@ -2277,7 +2277,7 @@ static void do_periodic_work(struct b43legacy_wldev *dev) | |||
2277 | /* Periodic work locking policy: | 2277 | /* Periodic work locking policy: |
2278 | * The whole periodic work handler is protected by | 2278 | * The whole periodic work handler is protected by |
2279 | * wl->mutex. If another lock is needed somewhere in the | 2279 | * wl->mutex. If another lock is needed somewhere in the |
2280 | * pwork callchain, it's aquired in-place, where it's needed. | 2280 | * pwork callchain, it's acquired in-place, where it's needed. |
2281 | */ | 2281 | */ |
2282 | static void b43legacy_periodic_work_handler(struct work_struct *work) | 2282 | static void b43legacy_periodic_work_handler(struct work_struct *work) |
2283 | { | 2283 | { |
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 17a9cb3528fc..56afcf041f81 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
@@ -578,7 +578,7 @@ static int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord, | |||
578 | /* get number of entries */ | 578 | /* get number of entries */ |
579 | field_count = *(((u16 *) & field_info) + 1); | 579 | field_count = *(((u16 *) & field_info) + 1); |
580 | 580 | ||
581 | /* abort if no enought memory */ | 581 | /* abort if no enough memory */ |
582 | total_length = field_len * field_count; | 582 | total_length = field_len * field_count; |
583 | if (total_length > *len) { | 583 | if (total_length > *len) { |
584 | *len = total_length; | 584 | *len = total_length; |
@@ -3127,7 +3127,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv) | |||
3127 | IPW_MAX_BDS)) { | 3127 | IPW_MAX_BDS)) { |
3128 | /* TODO: Support merging buffers if more than | 3128 | /* TODO: Support merging buffers if more than |
3129 | * IPW_MAX_BDS are used */ | 3129 | * IPW_MAX_BDS are used */ |
3130 | IPW_DEBUG_INFO("%s: Maximum BD theshold exceeded. " | 3130 | IPW_DEBUG_INFO("%s: Maximum BD threshold exceeded. " |
3131 | "Increase fragmentation level.\n", | 3131 | "Increase fragmentation level.\n", |
3132 | priv->net_dev->name); | 3132 | priv->net_dev->name); |
3133 | } | 3133 | } |
@@ -6897,7 +6897,7 @@ static int ipw2100_wx_get_range(struct net_device *dev, | |||
6897 | range->max_qual.updated = 7; /* Updated all three */ | 6897 | range->max_qual.updated = 7; /* Updated all three */ |
6898 | 6898 | ||
6899 | range->avg_qual.qual = 70; /* > 8% missed beacons is 'bad' */ | 6899 | range->avg_qual.qual = 70; /* > 8% missed beacons is 'bad' */ |
6900 | /* TODO: Find real 'good' to 'bad' threshol value for RSSI */ | 6900 | /* TODO: Find real 'good' to 'bad' threshold value for RSSI */ |
6901 | range->avg_qual.level = 20 + IPW2100_RSSI_TO_DBM; | 6901 | range->avg_qual.level = 20 + IPW2100_RSSI_TO_DBM; |
6902 | range->avg_qual.noise = 0; | 6902 | range->avg_qual.noise = 0; |
6903 | range->avg_qual.updated = 7; /* Updated all three */ | 6903 | range->avg_qual.updated = 7; /* Updated all three */ |
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index c28984ae46ff..09ddd3e6bedc 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
@@ -792,7 +792,7 @@ static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val, u32 * len) | |||
792 | /* get number of entries */ | 792 | /* get number of entries */ |
793 | field_count = *(((u16 *) & field_info) + 1); | 793 | field_count = *(((u16 *) & field_info) + 1); |
794 | 794 | ||
795 | /* abort if not enought memory */ | 795 | /* abort if not enough memory */ |
796 | total_len = field_len * field_count; | 796 | total_len = field_len * field_count; |
797 | if (total_len > *len) { | 797 | if (total_len > *len) { |
798 | *len = total_len; | 798 | *len = total_len; |
@@ -7760,7 +7760,7 @@ static void ipw_rebuild_decrypted_skb(struct ipw_priv *priv, | |||
7760 | case SEC_LEVEL_0: | 7760 | case SEC_LEVEL_0: |
7761 | break; | 7761 | break; |
7762 | default: | 7762 | default: |
7763 | printk(KERN_ERR "Unknow security level %d\n", | 7763 | printk(KERN_ERR "Unknown security level %d\n", |
7764 | priv->ieee->sec.level); | 7764 | priv->ieee->sec.level); |
7765 | break; | 7765 | break; |
7766 | } | 7766 | } |
@@ -8926,7 +8926,7 @@ static int ipw_wx_get_range(struct net_device *dev, | |||
8926 | range->max_qual.updated = 7; /* Updated all three */ | 8926 | range->max_qual.updated = 7; /* Updated all three */ |
8927 | 8927 | ||
8928 | range->avg_qual.qual = 70; | 8928 | range->avg_qual.qual = 70; |
8929 | /* TODO: Find real 'good' to 'bad' threshol value for RSSI */ | 8929 | /* TODO: Find real 'good' to 'bad' threshold value for RSSI */ |
8930 | range->avg_qual.level = 0; /* FIXME to real average level */ | 8930 | range->avg_qual.level = 0; /* FIXME to real average level */ |
8931 | range->avg_qual.noise = 0; | 8931 | range->avg_qual.noise = 0; |
8932 | range->avg_qual.updated = 7; /* Updated all three */ | 8932 | range->avg_qual.updated = 7; /* Updated all three */ |
@@ -10299,7 +10299,7 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct libipw_txb *txb, | |||
10299 | case SEC_LEVEL_0: | 10299 | case SEC_LEVEL_0: |
10300 | break; | 10300 | break; |
10301 | default: | 10301 | default: |
10302 | printk(KERN_ERR "Unknow security level %d\n", | 10302 | printk(KERN_ERR "Unknown security level %d\n", |
10303 | priv->ieee->sec.level); | 10303 | priv->ieee->sec.level); |
10304 | break; | 10304 | break; |
10305 | } | 10305 | } |
diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c index bf21eb383dbd..1ae0b2b02c38 100644 --- a/drivers/net/wireless/ipw2x00/libipw_module.c +++ b/drivers/net/wireless/ipw2x00/libipw_module.c | |||
@@ -199,7 +199,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv, int monitor) | |||
199 | ieee->host_decrypt = 1; | 199 | ieee->host_decrypt = 1; |
200 | ieee->host_mc_decrypt = 1; | 200 | ieee->host_mc_decrypt = 1; |
201 | 201 | ||
202 | /* Host fragementation in Open mode. Default is enabled. | 202 | /* Host fragmentation in Open mode. Default is enabled. |
203 | * Note: host fragmentation is always enabled if host encryption | 203 | * Note: host fragmentation is always enabled if host encryption |
204 | * is enabled. For cards can do hardware encryption, they must do | 204 | * is enabled. For cards can do hardware encryption, they must do |
205 | * hardware fragmentation as well. So we don't need a variable | 205 | * hardware fragmentation as well. So we don't need a variable |
diff --git a/drivers/net/wireless/iwmc3200wifi/hal.c b/drivers/net/wireless/iwmc3200wifi/hal.c index c430418248b4..d13c8853ee82 100644 --- a/drivers/net/wireless/iwmc3200wifi/hal.c +++ b/drivers/net/wireless/iwmc3200wifi/hal.c | |||
@@ -411,7 +411,7 @@ static void iwm_build_lmac_hdr(struct iwm_priv *iwm, struct iwm_lmac_hdr *hdr, | |||
411 | /* | 411 | /* |
412 | * iwm_hal_send_host_cmd(): sends commands to the UMAC or the LMAC. | 412 | * iwm_hal_send_host_cmd(): sends commands to the UMAC or the LMAC. |
413 | * Sending command to the LMAC is equivalent to sending a | 413 | * Sending command to the LMAC is equivalent to sending a |
414 | * regular UMAC command with the LMAC passtrough or the LMAC | 414 | * regular UMAC command with the LMAC passthrough or the LMAC |
415 | * wrapper UMAC command IDs. | 415 | * wrapper UMAC command IDs. |
416 | */ | 416 | */ |
417 | int iwm_hal_send_host_cmd(struct iwm_priv *iwm, | 417 | int iwm_hal_send_host_cmd(struct iwm_priv *iwm, |
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index 72c27a3e5528..1c57c1f72cba 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c | |||
@@ -1578,7 +1578,7 @@ static void iwm_rx_process_packet(struct iwm_priv *iwm, | |||
1578 | kfree_skb(packet->skb); | 1578 | kfree_skb(packet->skb); |
1579 | break; | 1579 | break; |
1580 | default: | 1580 | default: |
1581 | IWM_ERR(iwm, "Unknow ticket action: %d\n", | 1581 | IWM_ERR(iwm, "Unknown ticket action: %d\n", |
1582 | le16_to_cpu(ticket_node->ticket->action)); | 1582 | le16_to_cpu(ticket_node->ticket->action)); |
1583 | kfree_skb(packet->skb); | 1583 | kfree_skb(packet->skb); |
1584 | } | 1584 | } |
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index 09fcfad742e7..7a73f625273b 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c | |||
@@ -993,7 +993,7 @@ static int if_sdio_probe(struct sdio_func *func, | |||
993 | } | 993 | } |
994 | 994 | ||
995 | if (i == ARRAY_SIZE(if_sdio_models)) { | 995 | if (i == ARRAY_SIZE(if_sdio_models)) { |
996 | lbs_pr_err("unkown card model 0x%x\n", card->model); | 996 | lbs_pr_err("unknown card model 0x%x\n", card->model); |
997 | ret = -ENODEV; | 997 | ret = -ENODEV; |
998 | goto free; | 998 | goto free; |
999 | } | 999 | } |
diff --git a/drivers/net/wireless/orinoco/hermes_dld.c b/drivers/net/wireless/orinoco/hermes_dld.c index a3eefe109df4..84200da900b6 100644 --- a/drivers/net/wireless/orinoco/hermes_dld.c +++ b/drivers/net/wireless/orinoco/hermes_dld.c | |||
@@ -550,7 +550,7 @@ static const struct { \ | |||
550 | 550 | ||
551 | #define DEFAULT_PDR(pid) default_pdr_data_##pid | 551 | #define DEFAULT_PDR(pid) default_pdr_data_##pid |
552 | 552 | ||
553 | /* HWIF Compatiblity */ | 553 | /* HWIF Compatibility */ |
554 | DEFINE_DEFAULT_PDR(0x0005, 10, "\x00\x00\x06\x00\x01\x00\x01\x00\x01\x00"); | 554 | DEFINE_DEFAULT_PDR(0x0005, 10, "\x00\x00\x06\x00\x01\x00\x01\x00\x01\x00"); |
555 | 555 | ||
556 | /* PPPPSign */ | 556 | /* PPPPSign */ |
@@ -656,7 +656,7 @@ int hermes_apply_pda_with_defaults(hermes_t *hw, | |||
656 | record_id + 1, pdi); | 656 | record_id + 1, pdi); |
657 | } | 657 | } |
658 | break; | 658 | break; |
659 | case 0x5: /* HWIF Compatiblity */ | 659 | case 0x5: /* HWIF Compatibility */ |
660 | default_pdi = (struct pdi *) &DEFAULT_PDR(0x0005); | 660 | default_pdi = (struct pdi *) &DEFAULT_PDR(0x0005); |
661 | break; | 661 | break; |
662 | case 0x108: /* PPPPSign */ | 662 | case 0x108: /* PPPPSign */ |
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index bc08464d8323..f7f5c793514b 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c | |||
@@ -1897,7 +1897,7 @@ prism54_get_mac(struct net_device *ndev, struct iw_request_info *info, | |||
1897 | return 0; | 1897 | return 0; |
1898 | } | 1898 | } |
1899 | 1899 | ||
1900 | /* Setting policy also clears the MAC acl, even if we don't change the defaut | 1900 | /* Setting policy also clears the MAC acl, even if we don't change the default |
1901 | * policy | 1901 | * policy |
1902 | */ | 1902 | */ |
1903 | 1903 | ||
@@ -2323,7 +2323,7 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid, | |||
2323 | 2323 | ||
2324 | case DOT11_OID_BEACON: | 2324 | case DOT11_OID_BEACON: |
2325 | send_formatted_event(priv, | 2325 | send_formatted_event(priv, |
2326 | "Received a beacon from an unkown AP", | 2326 | "Received a beacon from an unknown AP", |
2327 | mlme, 0); | 2327 | mlme, 0); |
2328 | break; | 2328 | break; |
2329 | 2329 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.h b/drivers/net/wireless/rt2x00/rt2400pci.h index 6c21ef66dfe0..c3dea697b907 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.h +++ b/drivers/net/wireless/rt2x00/rt2400pci.h | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | /* | 36 | /* |
37 | * Signal information. | 37 | * Signal information. |
38 | * Defaul offset is required for RSSI <-> dBm conversion. | 38 | * Default offset is required for RSSI <-> dBm conversion. |
39 | */ | 39 | */ |
40 | #define DEFAULT_RSSI_OFFSET 100 | 40 | #define DEFAULT_RSSI_OFFSET 100 |
41 | 41 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.h b/drivers/net/wireless/rt2x00/rt2500pci.h index b0075674c09b..c6bd1fcae7eb 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.h +++ b/drivers/net/wireless/rt2x00/rt2500pci.h | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | /* | 47 | /* |
48 | * Signal information. | 48 | * Signal information. |
49 | * Defaul offset is required for RSSI <-> dBm conversion. | 49 | * Default offset is required for RSSI <-> dBm conversion. |
50 | */ | 50 | */ |
51 | #define DEFAULT_RSSI_OFFSET 121 | 51 | #define DEFAULT_RSSI_OFFSET 121 |
52 | 52 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.h b/drivers/net/wireless/rt2x00/rt2500usb.h index 341a70454635..b493306a7eed 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.h +++ b/drivers/net/wireless/rt2x00/rt2500usb.h | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | /* | 47 | /* |
48 | * Signal information. | 48 | * Signal information. |
49 | * Defaul offset is required for RSSI <-> dBm conversion. | 49 | * Default offset is required for RSSI <-> dBm conversion. |
50 | */ | 50 | */ |
51 | #define DEFAULT_RSSI_OFFSET 120 | 51 | #define DEFAULT_RSSI_OFFSET 120 |
52 | 52 | ||
diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/rt2x00/rt61pci.h index 6f33f7f5668c..8f13810622bd 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.h +++ b/drivers/net/wireless/rt2x00/rt61pci.h | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | /* | 38 | /* |
39 | * Signal information. | 39 | * Signal information. |
40 | * Defaul offset is required for RSSI <-> dBm conversion. | 40 | * Default offset is required for RSSI <-> dBm conversion. |
41 | */ | 41 | */ |
42 | #define DEFAULT_RSSI_OFFSET 120 | 42 | #define DEFAULT_RSSI_OFFSET 120 |
43 | 43 | ||
diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/rt2x00/rt73usb.h index e783a099a8f1..7942f810e928 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.h +++ b/drivers/net/wireless/rt2x00/rt73usb.h | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | /* | 38 | /* |
39 | * Signal information. | 39 | * Signal information. |
40 | * Defaul offset is required for RSSI <-> dBm conversion. | 40 | * Default offset is required for RSSI <-> dBm conversion. |
41 | */ | 41 | */ |
42 | #define DEFAULT_RSSI_OFFSET 120 | 42 | #define DEFAULT_RSSI_OFFSET 120 |
43 | 43 | ||
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 8a243732c519..cf51e8f8174b 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
@@ -374,7 +374,7 @@ static void zd_mac_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
374 | * zd_mac_tx_failed - callback for failed frames | 374 | * zd_mac_tx_failed - callback for failed frames |
375 | * @dev: the mac80211 wireless device | 375 | * @dev: the mac80211 wireless device |
376 | * | 376 | * |
377 | * This function is called if a frame couldn't be succesfully be | 377 | * This function is called if a frame couldn't be successfully be |
378 | * transferred. The first frame from the tx queue, will be selected and | 378 | * transferred. The first frame from the tx queue, will be selected and |
379 | * reported as error to the upper layers. | 379 | * reported as error to the upper layers. |
380 | */ | 380 | */ |
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index a6b4a5a53d40..f511e70d454c 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
@@ -650,7 +650,7 @@ ccio_clear_io_tlb(struct ioc *ioc, dma_addr_t iovp, size_t byte_cnt) | |||
650 | * Mark the I/O Pdir entries invalid and blow away the corresponding I/O | 650 | * Mark the I/O Pdir entries invalid and blow away the corresponding I/O |
651 | * TLB entries. | 651 | * TLB entries. |
652 | * | 652 | * |
653 | * FIXME: at some threshhold it might be "cheaper" to just blow | 653 | * FIXME: at some threshold it might be "cheaper" to just blow |
654 | * away the entire I/O TLB instead of individual entries. | 654 | * away the entire I/O TLB instead of individual entries. |
655 | * | 655 | * |
656 | * FIXME: Uturn has 256 TLB entries. We don't need to purge every | 656 | * FIXME: Uturn has 256 TLB entries. We don't need to purge every |
diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig index 9652c3fe7f5e..8390dca2b4e1 100644 --- a/drivers/platform/Kconfig +++ b/drivers/platform/Kconfig | |||
@@ -1,5 +1,3 @@ | |||
1 | # drivers/platform/Kconfig | ||
2 | |||
3 | if X86 | 1 | if X86 |
4 | source "drivers/platform/x86/Kconfig" | 2 | source "drivers/platform/x86/Kconfig" |
5 | endif | 3 | endif |
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index a848c7e20aeb..edb169083840 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
@@ -6545,7 +6545,7 @@ static struct ibm_struct volume_driver_data = { | |||
6545 | * The speeds are stored on handles | 6545 | * The speeds are stored on handles |
6546 | * (FANA:FAN9), (FANC:FANB), (FANE:FAND). | 6546 | * (FANA:FAN9), (FANC:FANB), (FANE:FAND). |
6547 | * | 6547 | * |
6548 | * There are three default speed sets, acessible as handles: | 6548 | * There are three default speed sets, accessible as handles: |
6549 | * FS1L,FS1M,FS1H; FS2L,FS2M,FS2H; FS3L,FS3M,FS3H | 6549 | * FS1L,FS1M,FS1H; FS2L,FS2M,FS2H; FS3L,FS3M,FS3H |
6550 | * | 6550 | * |
6551 | * ACPI DSDT switches which set is in use depending on various | 6551 | * ACPI DSDT switches which set is in use depending on various |
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c index 87b4f49a5251..a5135ebe5f07 100644 --- a/drivers/pnp/pnpbios/rsparser.c +++ b/drivers/pnp/pnpbios/rsparser.c | |||
@@ -191,7 +191,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(struct pnp_dev *dev, | |||
191 | return (unsigned char *)p; | 191 | return (unsigned char *)p; |
192 | break; | 192 | break; |
193 | 193 | ||
194 | default: /* an unkown tag */ | 194 | default: /* an unknown tag */ |
195 | len_err: | 195 | len_err: |
196 | dev_err(&dev->dev, "unknown tag %#x length %d\n", | 196 | dev_err(&dev->dev, "unknown tag %#x length %d\n", |
197 | tag, len); | 197 | tag, len); |
@@ -405,7 +405,7 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end, | |||
405 | case SMALL_TAG_END: | 405 | case SMALL_TAG_END: |
406 | return p + 2; | 406 | return p + 2; |
407 | 407 | ||
408 | default: /* an unkown tag */ | 408 | default: /* an unknown tag */ |
409 | len_err: | 409 | len_err: |
410 | dev_err(&dev->dev, "unknown tag %#x length %d\n", | 410 | dev_err(&dev->dev, "unknown tag %#x length %d\n", |
411 | tag, len); | 411 | tag, len); |
@@ -475,7 +475,7 @@ static unsigned char *pnpbios_parse_compatible_ids(unsigned char *p, | |||
475 | return (unsigned char *)p; | 475 | return (unsigned char *)p; |
476 | break; | 476 | break; |
477 | 477 | ||
478 | default: /* an unkown tag */ | 478 | default: /* an unknown tag */ |
479 | len_err: | 479 | len_err: |
480 | dev_err(&dev->dev, "unknown tag %#x length %d\n", | 480 | dev_err(&dev->dev, "unknown tag %#x length %d\n", |
481 | tag, len); | 481 | tag, len); |
@@ -744,7 +744,7 @@ static unsigned char *pnpbios_encode_allocated_resource_data(struct pnp_dev | |||
744 | return (unsigned char *)p; | 744 | return (unsigned char *)p; |
745 | break; | 745 | break; |
746 | 746 | ||
747 | default: /* an unkown tag */ | 747 | default: /* an unknown tag */ |
748 | len_err: | 748 | len_err: |
749 | dev_err(&dev->dev, "unknown tag %#x length %d\n", | 749 | dev_err(&dev->dev, "unknown tag %#x length %d\n", |
750 | tag, len); | 750 | tag, len); |
diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c index 88cb74088611..3cbaf1811bd0 100644 --- a/drivers/ps3/ps3-sys-manager.c +++ b/drivers/ps3/ps3-sys-manager.c | |||
@@ -46,7 +46,7 @@ | |||
46 | /** | 46 | /** |
47 | * struct ps3_sys_manager_header - System manager message header. | 47 | * struct ps3_sys_manager_header - System manager message header. |
48 | * @version: Header version, currently 1. | 48 | * @version: Header version, currently 1. |
49 | * @size: Header size in bytes, curently 16. | 49 | * @size: Header size in bytes, currently 16. |
50 | * @payload_size: Message payload size in bytes. | 50 | * @payload_size: Message payload size in bytes. |
51 | * @service_id: Message type, one of enum ps3_sys_manager_service_id. | 51 | * @service_id: Message type, one of enum ps3_sys_manager_service_id. |
52 | * @request_tag: Unique number to identify reply. | 52 | * @request_tag: Unique number to identify reply. |
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c index 0b6b7730c716..539676e25fd8 100644 --- a/drivers/rtc/rtc-ds1511.c +++ b/drivers/rtc/rtc-ds1511.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * An rtc driver for the Dallas DS1511 | 2 | * An rtc driver for the Dallas DS1511 |
3 | * | 3 | * |
4 | * Copyright (C) 2006 Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 4 | * Copyright (C) 2006 Atsushi Nemoto <anemo@mba.ocn.ne.jp> |
5 | * Copyright (C) 2007 Andrew Sharp <andy.sharp@onstor.com> | 5 | * Copyright (C) 2007 Andrew Sharp <andy.sharp@lsi.com> |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
@@ -636,7 +636,7 @@ ds1511_rtc_exit(void) | |||
636 | module_init(ds1511_rtc_init); | 636 | module_init(ds1511_rtc_init); |
637 | module_exit(ds1511_rtc_exit); | 637 | module_exit(ds1511_rtc_exit); |
638 | 638 | ||
639 | MODULE_AUTHOR("Andrew Sharp <andy.sharp@onstor.com>"); | 639 | MODULE_AUTHOR("Andrew Sharp <andy.sharp@lsi.com>"); |
640 | MODULE_DESCRIPTION("Dallas DS1511 RTC driver"); | 640 | MODULE_DESCRIPTION("Dallas DS1511 RTC driver"); |
641 | MODULE_LICENSE("GPL"); | 641 | MODULE_LICENSE("GPL"); |
642 | MODULE_VERSION(DRV_VERSION); | 642 | MODULE_VERSION(DRV_VERSION); |
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c index 7d1547b0070e..d491eb265c38 100644 --- a/drivers/rtc/rtc-stk17ta8.c +++ b/drivers/rtc/rtc-stk17ta8.c | |||
@@ -286,7 +286,7 @@ static struct bin_attribute stk17ta8_nvram_attr = { | |||
286 | .write = stk17ta8_nvram_write, | 286 | .write = stk17ta8_nvram_write, |
287 | }; | 287 | }; |
288 | 288 | ||
289 | static int __init stk17ta8_rtc_probe(struct platform_device *pdev) | 289 | static int __devinit stk17ta8_rtc_probe(struct platform_device *pdev) |
290 | { | 290 | { |
291 | struct rtc_device *rtc; | 291 | struct rtc_device *rtc; |
292 | struct resource *res; | 292 | struct resource *res; |
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c index 423cd5a30b10..ad741afd47d8 100644 --- a/drivers/rtc/rtc-v3020.c +++ b/drivers/rtc/rtc-v3020.c | |||
@@ -335,7 +335,7 @@ static int rtc_probe(struct platform_device *pdev) | |||
335 | goto err_io; | 335 | goto err_io; |
336 | } | 336 | } |
337 | 337 | ||
338 | /* Make sure frequency measurment mode, test modes, and lock | 338 | /* Make sure frequency measurement mode, test modes, and lock |
339 | * are all disabled */ | 339 | * are all disabled */ |
340 | v3020_set_reg(chip, V3020_STATUS_0, 0x0); | 340 | v3020_set_reg(chip, V3020_STATUS_0, 0x0); |
341 | 341 | ||
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c index 654daa3cdfda..5f23eca82804 100644 --- a/drivers/s390/block/dasd_proc.c +++ b/drivers/s390/block/dasd_proc.c | |||
@@ -215,7 +215,7 @@ dasd_statistics_read(char *page, char **start, off_t off, | |||
215 | } | 215 | } |
216 | 216 | ||
217 | prof = &dasd_global_profile; | 217 | prof = &dasd_global_profile; |
218 | /* prevent couter 'overflow' on output */ | 218 | /* prevent counter 'overflow' on output */ |
219 | for (factor = 1; (prof->dasd_io_reqs / factor) > 9999999; | 219 | for (factor = 1; (prof->dasd_io_reqs / factor) > 9999999; |
220 | factor *= 10); | 220 | factor *= 10); |
221 | 221 | ||
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c index d449063c30fe..28e4649fa9e4 100644 --- a/drivers/s390/char/fs3270.c +++ b/drivers/s390/char/fs3270.c | |||
@@ -76,7 +76,7 @@ fs3270_do_io(struct raw3270_view *view, struct raw3270_request *rq) | |||
76 | } | 76 | } |
77 | rc = raw3270_start(view, rq); | 77 | rc = raw3270_start(view, rq); |
78 | if (rc == 0) { | 78 | if (rc == 0) { |
79 | /* Started sucessfully. Now wait for completion. */ | 79 | /* Started successfully. Now wait for completion. */ |
80 | wait_event(fp->wait, raw3270_request_final(rq)); | 80 | wait_event(fp->wait, raw3270_request_final(rq)); |
81 | } | 81 | } |
82 | } while (rc == -EACCES); | 82 | } while (rc == -EACCES); |
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c index 8ab51608da55..c268a2e5b7c3 100644 --- a/drivers/s390/cio/chp.c +++ b/drivers/s390/cio/chp.c | |||
@@ -65,7 +65,7 @@ static void set_chp_logically_online(struct chp_id chpid, int onoff) | |||
65 | chpid_to_chp(chpid)->state = onoff; | 65 | chpid_to_chp(chpid)->state = onoff; |
66 | } | 66 | } |
67 | 67 | ||
68 | /* On succes return 0 if channel-path is varied offline, 1 if it is varied | 68 | /* On success return 0 if channel-path is varied offline, 1 if it is varied |
69 | * online. Return -ENODEV if channel-path is not registered. */ | 69 | * online. Return -ENODEV if channel-path is not registered. */ |
70 | int chp_get_status(struct chp_id chpid) | 70 | int chp_get_status(struct chp_id chpid) |
71 | { | 71 | { |
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c index 30f516111307..2985eb439485 100644 --- a/drivers/s390/cio/cmf.c +++ b/drivers/s390/cio/cmf.c | |||
@@ -462,7 +462,7 @@ static struct cmb_area cmb_area = { | |||
462 | * block of memory, which can not be moved as long as any channel | 462 | * block of memory, which can not be moved as long as any channel |
463 | * is active. Therefore, a maximum number of subchannels needs to | 463 | * is active. Therefore, a maximum number of subchannels needs to |
464 | * be defined somewhere. This is a module parameter, defaulting to | 464 | * be defined somewhere. This is a module parameter, defaulting to |
465 | * a resonable value of 1024, or 32 kb of memory. | 465 | * a reasonable value of 1024, or 32 kb of memory. |
466 | * Current kernels don't allow kmalloc with more than 128kb, so the | 466 | * Current kernels don't allow kmalloc with more than 128kb, so the |
467 | * maximum is 4096. | 467 | * maximum is 4096. |
468 | */ | 468 | */ |
diff --git a/drivers/s390/net/qeth_core_mpc.h b/drivers/s390/net/qeth_core_mpc.h index 52c03438dbec..1ba51152f667 100644 --- a/drivers/s390/net/qeth_core_mpc.h +++ b/drivers/s390/net/qeth_core_mpc.h | |||
@@ -528,7 +528,7 @@ extern unsigned char ULP_ENABLE[]; | |||
528 | (PDU_ENCAPSULATION(buffer) + 0x17) | 528 | (PDU_ENCAPSULATION(buffer) + 0x17) |
529 | #define QETH_ULP_ENABLE_RESP_LINK_TYPE(buffer) \ | 529 | #define QETH_ULP_ENABLE_RESP_LINK_TYPE(buffer) \ |
530 | (PDU_ENCAPSULATION(buffer) + 0x2b) | 530 | (PDU_ENCAPSULATION(buffer) + 0x2b) |
531 | /* Layer 2 defintions */ | 531 | /* Layer 2 definitions */ |
532 | #define QETH_PROT_LAYER2 0x08 | 532 | #define QETH_PROT_LAYER2 0x08 |
533 | #define QETH_PROT_TCPIP 0x03 | 533 | #define QETH_PROT_TCPIP 0x03 |
534 | #define QETH_PROT_OSN2 0x0a | 534 | #define QETH_PROT_OSN2 0x0a |
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index 58e583b61e60..aa2b60a868ba 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c | |||
@@ -92,11 +92,11 @@ | |||
92 | #define ENVCTRL_CPUTEMP_MON 1 /* cpu temperature monitor */ | 92 | #define ENVCTRL_CPUTEMP_MON 1 /* cpu temperature monitor */ |
93 | #define ENVCTRL_CPUVOLTAGE_MON 2 /* voltage monitor */ | 93 | #define ENVCTRL_CPUVOLTAGE_MON 2 /* voltage monitor */ |
94 | #define ENVCTRL_FANSTAT_MON 3 /* fan status monitor */ | 94 | #define ENVCTRL_FANSTAT_MON 3 /* fan status monitor */ |
95 | #define ENVCTRL_ETHERTEMP_MON 4 /* ethernet temperarture */ | 95 | #define ENVCTRL_ETHERTEMP_MON 4 /* ethernet temperature */ |
96 | /* monitor */ | 96 | /* monitor */ |
97 | #define ENVCTRL_VOLTAGESTAT_MON 5 /* voltage status monitor */ | 97 | #define ENVCTRL_VOLTAGESTAT_MON 5 /* voltage status monitor */ |
98 | #define ENVCTRL_MTHRBDTEMP_MON 6 /* motherboard temperature */ | 98 | #define ENVCTRL_MTHRBDTEMP_MON 6 /* motherboard temperature */ |
99 | #define ENVCTRL_SCSITEMP_MON 7 /* scsi temperarture */ | 99 | #define ENVCTRL_SCSITEMP_MON 7 /* scsi temperature */ |
100 | #define ENVCTRL_GLOBALADDR_MON 8 /* global address */ | 100 | #define ENVCTRL_GLOBALADDR_MON 8 /* global address */ |
101 | 101 | ||
102 | /* Child device type. | 102 | /* Child device type. |
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index 2d16d49fd3cd..3bf75924741f 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c | |||
@@ -736,7 +736,7 @@ static int twa_chrdev_ioctl(struct inode *inode, struct file *file, unsigned int | |||
736 | break; | 736 | break; |
737 | case TW_IOCTL_GET_COMPATIBILITY_INFO: | 737 | case TW_IOCTL_GET_COMPATIBILITY_INFO: |
738 | tw_ioctl->driver_command.status = 0; | 738 | tw_ioctl->driver_command.status = 0; |
739 | /* Copy compatiblity struct into ioctl data buffer */ | 739 | /* Copy compatibility struct into ioctl data buffer */ |
740 | tw_compat_info = (TW_Compatibility_Info *)tw_ioctl->data_buffer; | 740 | tw_compat_info = (TW_Compatibility_Info *)tw_ioctl->data_buffer; |
741 | memcpy(tw_compat_info, &tw_dev->tw_compat_info, sizeof(TW_Compatibility_Info)); | 741 | memcpy(tw_compat_info, &tw_dev->tw_compat_info, sizeof(TW_Compatibility_Info)); |
742 | break; | 742 | break; |
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index d224294c38fb..f65a1e92340c 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | Copyright (C) 1999-2009 3ware Inc. | 9 | Copyright (C) 1999-2009 3ware Inc. |
10 | 10 | ||
11 | Kernel compatiblity By: Andre Hedrick <andre@suse.com> | 11 | Kernel compatibility By: Andre Hedrick <andre@suse.com> |
12 | Non-Copyright (C) 2000 Andre Hedrick <andre@suse.com> | 12 | Non-Copyright (C) 2000 Andre Hedrick <andre@suse.com> |
13 | 13 | ||
14 | Further tiny build fixes and trivial hoovering Alan Cox | 14 | Further tiny build fixes and trivial hoovering Alan Cox |
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c index 6c60a8060c58..9f4a911a6d8c 100644 --- a/drivers/scsi/53c700.c +++ b/drivers/scsi/53c700.c | |||
@@ -1491,7 +1491,7 @@ NCR_700_intr(int irq, void *dev_id) | |||
1491 | unsigned long flags; | 1491 | unsigned long flags; |
1492 | int handled = 0; | 1492 | int handled = 0; |
1493 | 1493 | ||
1494 | /* Use the host lock to serialise acess to the 53c700 | 1494 | /* Use the host lock to serialise access to the 53c700 |
1495 | * hardware. Note: In future, we may need to take the queue | 1495 | * hardware. Note: In future, we may need to take the queue |
1496 | * lock to enter the done routines. When that happens, we | 1496 | * lock to enter the done routines. When that happens, we |
1497 | * need to ensure that for this driver, the host lock and the | 1497 | * need to ensure that for this driver, the host lock and the |
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index cdbdec9f4fb2..83986ed86556 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h | |||
@@ -526,10 +526,10 @@ struct aac_driver_ident | |||
526 | 526 | ||
527 | /* | 527 | /* |
528 | * The adapter interface specs all queues to be located in the same | 528 | * The adapter interface specs all queues to be located in the same |
529 | * physically contigous block. The host structure that defines the | 529 | * physically contiguous block. The host structure that defines the |
530 | * commuication queues will assume they are each a separate physically | 530 | * commuication queues will assume they are each a separate physically |
531 | * contigous memory region that will support them all being one big | 531 | * contiguous memory region that will support them all being one big |
532 | * contigous block. | 532 | * contiguous block. |
533 | * There is a command and response queue for each level and direction of | 533 | * There is a command and response queue for each level and direction of |
534 | * commuication. These regions are accessed by both the host and adapter. | 534 | * commuication. These regions are accessed by both the host and adapter. |
535 | */ | 535 | */ |
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index d598eba630d0..666d5151d628 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c | |||
@@ -226,7 +226,7 @@ static int aac_comm_init(struct aac_dev * dev) | |||
226 | spin_lock_init(&dev->fib_lock); | 226 | spin_lock_init(&dev->fib_lock); |
227 | 227 | ||
228 | /* | 228 | /* |
229 | * Allocate the physically contigous space for the commuication | 229 | * Allocate the physically contiguous space for the commuication |
230 | * queue headers. | 230 | * queue headers. |
231 | */ | 231 | */ |
232 | 232 | ||
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index b756041f0b26..22626abdb630 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
@@ -7969,7 +7969,7 @@ static int advansys_reset(struct scsi_cmnd *scp) | |||
7969 | ASC_DBG(1, "before AscInitAsc1000Driver()\n"); | 7969 | ASC_DBG(1, "before AscInitAsc1000Driver()\n"); |
7970 | status = AscInitAsc1000Driver(asc_dvc); | 7970 | status = AscInitAsc1000Driver(asc_dvc); |
7971 | 7971 | ||
7972 | /* Refer to ASC_IERR_* defintions for meaning of 'err_code'. */ | 7972 | /* Refer to ASC_IERR_* definitions for meaning of 'err_code'. */ |
7973 | if (asc_dvc->err_code) { | 7973 | if (asc_dvc->err_code) { |
7974 | scmd_printk(KERN_INFO, scp, "SCSI bus reset error: " | 7974 | scmd_printk(KERN_INFO, scp, "SCSI bus reset error: " |
7975 | "0x%x\n", asc_dvc->err_code); | 7975 | "0x%x\n", asc_dvc->err_code); |
diff --git a/drivers/scsi/aic7xxx/aic79xx.seq b/drivers/scsi/aic7xxx/aic79xx.seq index 58bc17591b54..2fb78e35a9e5 100644 --- a/drivers/scsi/aic7xxx/aic79xx.seq +++ b/drivers/scsi/aic7xxx/aic79xx.seq | |||
@@ -217,7 +217,7 @@ BEGIN_CRITICAL; | |||
217 | scbdma_tohost_done: | 217 | scbdma_tohost_done: |
218 | test CCSCBCTL, CCARREN jz fill_qoutfifo_dmadone; | 218 | test CCSCBCTL, CCARREN jz fill_qoutfifo_dmadone; |
219 | /* | 219 | /* |
220 | * An SCB has been succesfully uploaded to the host. | 220 | * An SCB has been successfully uploaded to the host. |
221 | * If the SCB was uploaded for some reason other than | 221 | * If the SCB was uploaded for some reason other than |
222 | * bad SCSI status (currently only for underruns), we | 222 | * bad SCSI status (currently only for underruns), we |
223 | * queue the SCB for normal completion. Otherwise, we | 223 | * queue the SCB for normal completion. Otherwise, we |
@@ -1281,7 +1281,7 @@ END_CRITICAL; | |||
1281 | * Is it a disconnect message? Set a flag in the SCB to remind us | 1281 | * Is it a disconnect message? Set a flag in the SCB to remind us |
1282 | * and await the bus going free. If this is an untagged transaction | 1282 | * and await the bus going free. If this is an untagged transaction |
1283 | * store the SCB id for it in our untagged target table for lookup on | 1283 | * store the SCB id for it in our untagged target table for lookup on |
1284 | * a reselction. | 1284 | * a reselection. |
1285 | */ | 1285 | */ |
1286 | mesgin_disconnect: | 1286 | mesgin_disconnect: |
1287 | /* | 1287 | /* |
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c index 63b521d615f2..4d419c155ce9 100644 --- a/drivers/scsi/aic7xxx/aic79xx_core.c +++ b/drivers/scsi/aic7xxx/aic79xx_core.c | |||
@@ -2487,7 +2487,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat) | |||
2487 | /* | 2487 | /* |
2488 | * Although the driver does not care about the | 2488 | * Although the driver does not care about the |
2489 | * 'Selection in Progress' status bit, the busy | 2489 | * 'Selection in Progress' status bit, the busy |
2490 | * LED does. SELINGO is only cleared by a sucessfull | 2490 | * LED does. SELINGO is only cleared by a successfull |
2491 | * selection, so we must manually clear it to insure | 2491 | * selection, so we must manually clear it to insure |
2492 | * the LED turns off just incase no future successful | 2492 | * the LED turns off just incase no future successful |
2493 | * selections occur (e.g. no devices on the bus). | 2493 | * selections occur (e.g. no devices on the bus). |
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 75b23317bd26..1222a7ac698a 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
@@ -2335,7 +2335,7 @@ ahd_linux_queue_abort_cmd(struct scsi_cmnd *cmd) | |||
2335 | /* | 2335 | /* |
2336 | * The sequencer will never re-reference the | 2336 | * The sequencer will never re-reference the |
2337 | * in-core SCB. To make sure we are notified | 2337 | * in-core SCB. To make sure we are notified |
2338 | * during reslection, set the MK_MESSAGE flag in | 2338 | * during reselection, set the MK_MESSAGE flag in |
2339 | * the card's copy of the SCB. | 2339 | * the card's copy of the SCB. |
2340 | */ | 2340 | */ |
2341 | ahd_outb(ahd, SCB_CONTROL, | 2341 | ahd_outb(ahd, SCB_CONTROL, |
diff --git a/drivers/scsi/aic7xxx/aic7xxx.seq b/drivers/scsi/aic7xxx/aic7xxx.seq index 15196390e28d..5a4cfc954a9f 100644 --- a/drivers/scsi/aic7xxx/aic7xxx.seq +++ b/drivers/scsi/aic7xxx/aic7xxx.seq | |||
@@ -1693,7 +1693,7 @@ if ((ahc->flags & AHC_INITIATORROLE) != 0) { | |||
1693 | * Is it a disconnect message? Set a flag in the SCB to remind us | 1693 | * Is it a disconnect message? Set a flag in the SCB to remind us |
1694 | * and await the bus going free. If this is an untagged transaction | 1694 | * and await the bus going free. If this is an untagged transaction |
1695 | * store the SCB id for it in our untagged target table for lookup on | 1695 | * store the SCB id for it in our untagged target table for lookup on |
1696 | * a reselction. | 1696 | * a reselection. |
1697 | */ | 1697 | */ |
1698 | mesgin_disconnect: | 1698 | mesgin_disconnect: |
1699 | /* | 1699 | /* |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c index 8dfb59d58992..45aa728a76b2 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_core.c +++ b/drivers/scsi/aic7xxx/aic7xxx_core.c | |||
@@ -1733,7 +1733,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat) | |||
1733 | /* | 1733 | /* |
1734 | * Although the driver does not care about the | 1734 | * Although the driver does not care about the |
1735 | * 'Selection in Progress' status bit, the busy | 1735 | * 'Selection in Progress' status bit, the busy |
1736 | * LED does. SELINGO is only cleared by a sucessfull | 1736 | * LED does. SELINGO is only cleared by a successfull |
1737 | * selection, so we must manually clear it to insure | 1737 | * selection, so we must manually clear it to insure |
1738 | * the LED turns off just incase no future successful | 1738 | * the LED turns off just incase no future successful |
1739 | * selections occur (e.g. no devices on the bus). | 1739 | * selections occur (e.g. no devices on the bus). |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index fd2b9785ff4f..8cb05dc8e6a1 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c | |||
@@ -2290,7 +2290,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag) | |||
2290 | * In the non-paging case, the sequencer will | 2290 | * In the non-paging case, the sequencer will |
2291 | * never re-reference the in-core SCB. | 2291 | * never re-reference the in-core SCB. |
2292 | * To make sure we are notified during | 2292 | * To make sure we are notified during |
2293 | * reslection, set the MK_MESSAGE flag in | 2293 | * reselection, set the MK_MESSAGE flag in |
2294 | * the card's copy of the SCB. | 2294 | * the card's copy of the SCB. |
2295 | */ | 2295 | */ |
2296 | if ((ahc->flags & AHC_PAGESCBS) == 0) { | 2296 | if ((ahc->flags & AHC_PAGESCBS) == 0) { |
diff --git a/drivers/scsi/aic94xx/aic94xx_reg_def.h b/drivers/scsi/aic94xx/aic94xx_reg_def.h index a43e8cdf4ee4..28aaf349c111 100644 --- a/drivers/scsi/aic94xx/aic94xx_reg_def.h +++ b/drivers/scsi/aic94xx/aic94xx_reg_def.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Aic94xx SAS/SATA driver hardware registers defintions. | 2 | * Aic94xx SAS/SATA driver hardware registers definitions. |
3 | * | 3 | * |
4 | * Copyright (C) 2004 Adaptec, Inc. All rights reserved. | 4 | * Copyright (C) 2004 Adaptec, Inc. All rights reserved. |
5 | * Copyright (C) 2004 David Chaw <david_chaw@adaptec.com> | 5 | * Copyright (C) 2004 David Chaw <david_chaw@adaptec.com> |
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_pport.h b/drivers/scsi/bfa/include/defs/bfa_defs_pport.h index a000bc4e2d4a..bf320412ee24 100644 --- a/drivers/scsi/bfa/include/defs/bfa_defs_pport.h +++ b/drivers/scsi/bfa/include/defs/bfa_defs_pport.h | |||
@@ -61,7 +61,7 @@ enum bfa_pport_speed { | |||
61 | * Port operational type (in sync with SNIA port type). | 61 | * Port operational type (in sync with SNIA port type). |
62 | */ | 62 | */ |
63 | enum bfa_pport_type { | 63 | enum bfa_pport_type { |
64 | BFA_PPORT_TYPE_UNKNOWN = 1, /* port type is unkown */ | 64 | BFA_PPORT_TYPE_UNKNOWN = 1, /* port type is unknown */ |
65 | BFA_PPORT_TYPE_TRUNKED = 2, /* Trunked mode */ | 65 | BFA_PPORT_TYPE_TRUNKED = 2, /* Trunked mode */ |
66 | BFA_PPORT_TYPE_NPORT = 5, /* P2P with switched fabric */ | 66 | BFA_PPORT_TYPE_NPORT = 5, /* P2P with switched fabric */ |
67 | BFA_PPORT_TYPE_NLPORT = 6, /* public loop */ | 67 | BFA_PPORT_TYPE_NLPORT = 6, /* public loop */ |
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h b/drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h index 31881d218515..ade763dbc8ce 100644 --- a/drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h +++ b/drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h | |||
@@ -25,7 +25,7 @@ | |||
25 | * Temperature sensor status values | 25 | * Temperature sensor status values |
26 | */ | 26 | */ |
27 | enum bfa_tsensor_status { | 27 | enum bfa_tsensor_status { |
28 | BFA_TSENSOR_STATUS_UNKNOWN = 1, /* unkown status */ | 28 | BFA_TSENSOR_STATUS_UNKNOWN = 1, /* unknown status */ |
29 | BFA_TSENSOR_STATUS_FAULTY = 2, /* sensor is faulty */ | 29 | BFA_TSENSOR_STATUS_FAULTY = 2, /* sensor is faulty */ |
30 | BFA_TSENSOR_STATUS_BELOW_MIN = 3, /* temperature below mininum */ | 30 | BFA_TSENSOR_STATUS_BELOW_MIN = 3, /* temperature below mininum */ |
31 | BFA_TSENSOR_STATUS_NOMINAL = 4, /* normal temperature */ | 31 | BFA_TSENSOR_STATUS_NOMINAL = 4, /* normal temperature */ |
diff --git a/drivers/scsi/bfa/include/protocol/ct.h b/drivers/scsi/bfa/include/protocol/ct.h index c8648bcba41a..b82540a230c4 100644 --- a/drivers/scsi/bfa/include/protocol/ct.h +++ b/drivers/scsi/bfa/include/protocol/ct.h | |||
@@ -82,7 +82,7 @@ enum { | |||
82 | }; | 82 | }; |
83 | 83 | ||
84 | /* | 84 | /* |
85 | * defintions for CT reason code | 85 | * definitions for CT reason code |
86 | */ | 86 | */ |
87 | enum { | 87 | enum { |
88 | CT_RSN_INV_CMD = 0x01, | 88 | CT_RSN_INV_CMD = 0x01, |
@@ -129,7 +129,7 @@ enum { | |||
129 | }; | 129 | }; |
130 | 130 | ||
131 | /* | 131 | /* |
132 | * defintions for the explanation code for all servers | 132 | * definitions for the explanation code for all servers |
133 | */ | 133 | */ |
134 | enum { | 134 | enum { |
135 | CT_EXP_AUTH_EXCEPTION = 0xF1, | 135 | CT_EXP_AUTH_EXCEPTION = 0xF1, |
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c index 070118a8f184..132898c88d5e 100644 --- a/drivers/scsi/bnx2i/bnx2i_iscsi.c +++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c | |||
@@ -1879,7 +1879,7 @@ static void bnx2i_ep_disconnect(struct iscsi_endpoint *ep) | |||
1879 | 1879 | ||
1880 | bnx2i_ep = ep->dd_data; | 1880 | bnx2i_ep = ep->dd_data; |
1881 | 1881 | ||
1882 | /* driver should not attempt connection cleanup untill TCP_CONNECT | 1882 | /* driver should not attempt connection cleanup until TCP_CONNECT |
1883 | * completes either successfully or fails. Timeout is 9-secs, so | 1883 | * completes either successfully or fails. Timeout is 9-secs, so |
1884 | * wait for it to complete | 1884 | * wait for it to complete |
1885 | */ | 1885 | */ |
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index 075e2397273c..6c59c02c1ed9 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c | |||
@@ -1509,7 +1509,7 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb, | |||
1509 | * Try anyway? | 1509 | * Try anyway? |
1510 | * | 1510 | * |
1511 | * We could, BUT: Sometimes the TRM_S1040 misses to produce a Selection | 1511 | * We could, BUT: Sometimes the TRM_S1040 misses to produce a Selection |
1512 | * Timeout, a Disconnect or a Reselction IRQ, so we would be screwed! | 1512 | * Timeout, a Disconnect or a Reselection IRQ, so we would be screwed! |
1513 | * (This is likely to be a bug in the hardware. Obviously, most people | 1513 | * (This is likely to be a bug in the hardware. Obviously, most people |
1514 | * only have one initiator per SCSI bus.) | 1514 | * only have one initiator per SCSI bus.) |
1515 | * Instead let this fail and have the timer make sure the command is | 1515 | * Instead let this fail and have the timer make sure the command is |
diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c index fa738ec8692a..207352cc70cc 100644 --- a/drivers/scsi/dmx3191d.c +++ b/drivers/scsi/dmx3191d.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <scsi/scsi_host.h> | 31 | #include <scsi/scsi_host.h> |
32 | 32 | ||
33 | /* | 33 | /* |
34 | * Defintions for the generic 5380 driver. | 34 | * Definitions for the generic 5380 driver. |
35 | */ | 35 | */ |
36 | #define AUTOSENSE | 36 | #define AUTOSENSE |
37 | 37 | ||
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c index 901a3daeb36b..4f0556571f80 100644 --- a/drivers/scsi/hptiop.c +++ b/drivers/scsi/hptiop.c | |||
@@ -834,7 +834,7 @@ static int hptiop_reset_hba(struct hptiop_hba *hba) | |||
834 | atomic_read(&hba->resetting) == 0, 60 * HZ); | 834 | atomic_read(&hba->resetting) == 0, 60 * HZ); |
835 | 835 | ||
836 | if (atomic_read(&hba->resetting)) { | 836 | if (atomic_read(&hba->resetting)) { |
837 | /* IOP is in unkown state, abort reset */ | 837 | /* IOP is in unknown state, abort reset */ |
838 | printk(KERN_ERR "scsi%d: reset failed\n", hba->host->host_no); | 838 | printk(KERN_ERR "scsi%d: reset failed\n", hba->host->host_no); |
839 | return -1; | 839 | return -1; |
840 | } | 840 | } |
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c index bbf4152c9c69..74338c83ad0a 100644 --- a/drivers/scsi/libfc/fc_lport.c +++ b/drivers/scsi/libfc/fc_lport.c | |||
@@ -56,7 +56,7 @@ | |||
56 | * at the same time. | 56 | * at the same time. |
57 | * | 57 | * |
58 | * When discovery succeeds or fails a callback is made to the lport as | 58 | * When discovery succeeds or fails a callback is made to the lport as |
59 | * notification. Currently, succesful discovery causes the lport to take no | 59 | * notification. Currently, successful discovery causes the lport to take no |
60 | * action. A failure will cause the lport to reset. There is likely a circular | 60 | * action. A failure will cause the lport to reset. There is likely a circular |
61 | * locking problem with this implementation. | 61 | * locking problem with this implementation. |
62 | */ | 62 | */ |
diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c index 2e0746d70303..ca25ee5190b0 100644 --- a/drivers/scsi/libiscsi_tcp.c +++ b/drivers/scsi/libiscsi_tcp.c | |||
@@ -1004,7 +1004,7 @@ static struct iscsi_r2t_info *iscsi_tcp_get_curr_r2t(struct iscsi_task *task) | |||
1004 | * iscsi_tcp_task_xmit - xmit normal PDU task | 1004 | * iscsi_tcp_task_xmit - xmit normal PDU task |
1005 | * @task: iscsi command task | 1005 | * @task: iscsi command task |
1006 | * | 1006 | * |
1007 | * We're expected to return 0 when everything was transmitted succesfully, | 1007 | * We're expected to return 0 when everything was transmitted successfully, |
1008 | * -EAGAIN if there's still data in the queue, or != 0 for any other kind | 1008 | * -EAGAIN if there's still data in the queue, or != 0 for any other kind |
1009 | * of error. | 1009 | * of error. |
1010 | */ | 1010 | */ |
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 75523603b91c..91542f786edf 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
@@ -678,7 +678,7 @@ lpfc_selective_reset(struct lpfc_hba *phba) | |||
678 | * Notes: | 678 | * Notes: |
679 | * Assumes any error from lpfc_selective_reset() will be negative. | 679 | * Assumes any error from lpfc_selective_reset() will be negative. |
680 | * If lpfc_selective_reset() returns zero then the length of the buffer | 680 | * If lpfc_selective_reset() returns zero then the length of the buffer |
681 | * is returned which indicates succcess | 681 | * is returned which indicates success |
682 | * | 682 | * |
683 | * Returns: | 683 | * Returns: |
684 | * -EINVAL if the buffer does not contain the string "selective" | 684 | * -EINVAL if the buffer does not contain the string "selective" |
@@ -3363,7 +3363,7 @@ sysfs_ctlreg_write(struct kobject *kobj, struct bin_attribute *bin_attr, | |||
3363 | * sysfs_ctlreg_read - Read method for reading from ctlreg | 3363 | * sysfs_ctlreg_read - Read method for reading from ctlreg |
3364 | * @kobj: kernel kobject that contains the kernel class device. | 3364 | * @kobj: kernel kobject that contains the kernel class device. |
3365 | * @bin_attr: kernel attributes passed to us. | 3365 | * @bin_attr: kernel attributes passed to us. |
3366 | * @buf: if succesful contains the data from the adapter IOREG space. | 3366 | * @buf: if successful contains the data from the adapter IOREG space. |
3367 | * @off: offset into buffer to beginning of data. | 3367 | * @off: offset into buffer to beginning of data. |
3368 | * @count: bytes to transfer. | 3368 | * @count: bytes to transfer. |
3369 | * | 3369 | * |
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index a079bbc03cf8..ce522702a6c1 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c | |||
@@ -815,7 +815,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
815 | 815 | ||
816 | /* FLOGI completes successfully */ | 816 | /* FLOGI completes successfully */ |
817 | lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS, | 817 | lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS, |
818 | "0101 FLOGI completes sucessfully " | 818 | "0101 FLOGI completes successfully " |
819 | "Data: x%x x%x x%x x%x\n", | 819 | "Data: x%x x%x x%x x%x\n", |
820 | irsp->un.ulpWord[4], sp->cmn.e_d_tov, | 820 | irsp->un.ulpWord[4], sp->cmn.e_d_tov, |
821 | sp->cmn.w2.r_a_tov, sp->cmn.edtovResolution); | 821 | sp->cmn.w2.r_a_tov, sp->cmn.edtovResolution); |
@@ -4151,7 +4151,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
4151 | /* Indicate we are walking fc_rscn_id_list on this vport */ | 4151 | /* Indicate we are walking fc_rscn_id_list on this vport */ |
4152 | vport->fc_rscn_flush = 1; | 4152 | vport->fc_rscn_flush = 1; |
4153 | spin_unlock_irq(shost->host_lock); | 4153 | spin_unlock_irq(shost->host_lock); |
4154 | /* Get the array count after sucessfully have the token */ | 4154 | /* Get the array count after successfully have the token */ |
4155 | rscn_cnt = vport->fc_rscn_id_cnt; | 4155 | rscn_cnt = vport->fc_rscn_id_cnt; |
4156 | /* If we are already processing an RSCN, save the received | 4156 | /* If we are already processing an RSCN, save the received |
4157 | * RSCN payload buffer, cmdiocb->context2 to process later. | 4157 | * RSCN payload buffer, cmdiocb->context2 to process later. |
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 0ba35a9a5c5f..226920d15ea1 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c | |||
@@ -646,7 +646,7 @@ lpfc_hba_down_prep(struct lpfc_hba *phba) | |||
646 | * down the SLI Layer. | 646 | * down the SLI Layer. |
647 | * | 647 | * |
648 | * Return codes | 648 | * Return codes |
649 | * 0 - sucess. | 649 | * 0 - success. |
650 | * Any other value - error. | 650 | * Any other value - error. |
651 | **/ | 651 | **/ |
652 | static int | 652 | static int |
@@ -701,7 +701,7 @@ lpfc_hba_down_post_s3(struct lpfc_hba *phba) | |||
701 | * down the SLI Layer. | 701 | * down the SLI Layer. |
702 | * | 702 | * |
703 | * Return codes | 703 | * Return codes |
704 | * 0 - sucess. | 704 | * 0 - success. |
705 | * Any other value - error. | 705 | * Any other value - error. |
706 | **/ | 706 | **/ |
707 | static int | 707 | static int |
@@ -756,7 +756,7 @@ lpfc_hba_down_post_s4(struct lpfc_hba *phba) | |||
756 | * uninitialization after the HBA is reset when bring down the SLI Layer. | 756 | * uninitialization after the HBA is reset when bring down the SLI Layer. |
757 | * | 757 | * |
758 | * Return codes | 758 | * Return codes |
759 | * 0 - sucess. | 759 | * 0 - success. |
760 | * Any other value - error. | 760 | * Any other value - error. |
761 | **/ | 761 | **/ |
762 | int | 762 | int |
@@ -1262,7 +1262,7 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba) | |||
1262 | * routine from the API jump table function pointer from the lpfc_hba struct. | 1262 | * routine from the API jump table function pointer from the lpfc_hba struct. |
1263 | * | 1263 | * |
1264 | * Return codes | 1264 | * Return codes |
1265 | * 0 - sucess. | 1265 | * 0 - success. |
1266 | * Any other value - error. | 1266 | * Any other value - error. |
1267 | **/ | 1267 | **/ |
1268 | void | 1268 | void |
@@ -3234,7 +3234,7 @@ static void lpfc_log_intr_mode(struct lpfc_hba *phba, uint32_t intr_mode) | |||
3234 | * PCI devices. | 3234 | * PCI devices. |
3235 | * | 3235 | * |
3236 | * Return codes | 3236 | * Return codes |
3237 | * 0 - sucessful | 3237 | * 0 - successful |
3238 | * other values - error | 3238 | * other values - error |
3239 | **/ | 3239 | **/ |
3240 | static int | 3240 | static int |
@@ -3330,7 +3330,7 @@ lpfc_reset_hba(struct lpfc_hba *phba) | |||
3330 | * support the SLI-3 HBA device it attached to. | 3330 | * support the SLI-3 HBA device it attached to. |
3331 | * | 3331 | * |
3332 | * Return codes | 3332 | * Return codes |
3333 | * 0 - sucessful | 3333 | * 0 - successful |
3334 | * other values - error | 3334 | * other values - error |
3335 | **/ | 3335 | **/ |
3336 | static int | 3336 | static int |
@@ -3431,7 +3431,7 @@ lpfc_sli_driver_resource_unset(struct lpfc_hba *phba) | |||
3431 | * support the SLI-4 HBA device it attached to. | 3431 | * support the SLI-4 HBA device it attached to. |
3432 | * | 3432 | * |
3433 | * Return codes | 3433 | * Return codes |
3434 | * 0 - sucessful | 3434 | * 0 - successful |
3435 | * other values - error | 3435 | * other values - error |
3436 | **/ | 3436 | **/ |
3437 | static int | 3437 | static int |
@@ -3758,7 +3758,7 @@ lpfc_init_api_table_setup(struct lpfc_hba *phba, uint8_t dev_grp) | |||
3758 | * device specific resource setup to support the HBA device it attached to. | 3758 | * device specific resource setup to support the HBA device it attached to. |
3759 | * | 3759 | * |
3760 | * Return codes | 3760 | * Return codes |
3761 | * 0 - sucessful | 3761 | * 0 - successful |
3762 | * other values - error | 3762 | * other values - error |
3763 | **/ | 3763 | **/ |
3764 | static int | 3764 | static int |
@@ -3804,7 +3804,7 @@ lpfc_setup_driver_resource_phase1(struct lpfc_hba *phba) | |||
3804 | * device specific resource setup to support the HBA device it attached to. | 3804 | * device specific resource setup to support the HBA device it attached to. |
3805 | * | 3805 | * |
3806 | * Return codes | 3806 | * Return codes |
3807 | * 0 - sucessful | 3807 | * 0 - successful |
3808 | * other values - error | 3808 | * other values - error |
3809 | **/ | 3809 | **/ |
3810 | static int | 3810 | static int |
@@ -3869,7 +3869,7 @@ lpfc_free_iocb_list(struct lpfc_hba *phba) | |||
3869 | * list and set up the IOCB tag array accordingly. | 3869 | * list and set up the IOCB tag array accordingly. |
3870 | * | 3870 | * |
3871 | * Return codes | 3871 | * Return codes |
3872 | * 0 - sucessful | 3872 | * 0 - successful |
3873 | * other values - error | 3873 | * other values - error |
3874 | **/ | 3874 | **/ |
3875 | static int | 3875 | static int |
@@ -3988,7 +3988,7 @@ lpfc_free_active_sgl(struct lpfc_hba *phba) | |||
3988 | * list and set up the sgl xritag tag array accordingly. | 3988 | * list and set up the sgl xritag tag array accordingly. |
3989 | * | 3989 | * |
3990 | * Return codes | 3990 | * Return codes |
3991 | * 0 - sucessful | 3991 | * 0 - successful |
3992 | * other values - error | 3992 | * other values - error |
3993 | **/ | 3993 | **/ |
3994 | static int | 3994 | static int |
@@ -4102,7 +4102,7 @@ out_free_mem: | |||
4102 | * enabled and the driver is reinitializing the device. | 4102 | * enabled and the driver is reinitializing the device. |
4103 | * | 4103 | * |
4104 | * Return codes | 4104 | * Return codes |
4105 | * 0 - sucessful | 4105 | * 0 - successful |
4106 | * ENOMEM - No availble memory | 4106 | * ENOMEM - No availble memory |
4107 | * EIO - The mailbox failed to complete successfully. | 4107 | * EIO - The mailbox failed to complete successfully. |
4108 | **/ | 4108 | **/ |
@@ -4262,7 +4262,7 @@ lpfc_sli4_remove_rpi_hdrs(struct lpfc_hba *phba) | |||
4262 | * PCI device data structure is set. | 4262 | * PCI device data structure is set. |
4263 | * | 4263 | * |
4264 | * Return codes | 4264 | * Return codes |
4265 | * pointer to @phba - sucessful | 4265 | * pointer to @phba - successful |
4266 | * NULL - error | 4266 | * NULL - error |
4267 | **/ | 4267 | **/ |
4268 | static struct lpfc_hba * | 4268 | static struct lpfc_hba * |
@@ -4318,7 +4318,7 @@ lpfc_hba_free(struct lpfc_hba *phba) | |||
4318 | * host with it. | 4318 | * host with it. |
4319 | * | 4319 | * |
4320 | * Return codes | 4320 | * Return codes |
4321 | * 0 - sucessful | 4321 | * 0 - successful |
4322 | * other values - error | 4322 | * other values - error |
4323 | **/ | 4323 | **/ |
4324 | static int | 4324 | static int |
@@ -4487,7 +4487,7 @@ lpfc_post_init_setup(struct lpfc_hba *phba) | |||
4487 | * with SLI-3 interface spec. | 4487 | * with SLI-3 interface spec. |
4488 | * | 4488 | * |
4489 | * Return codes | 4489 | * Return codes |
4490 | * 0 - sucessful | 4490 | * 0 - successful |
4491 | * other values - error | 4491 | * other values - error |
4492 | **/ | 4492 | **/ |
4493 | static int | 4493 | static int |
@@ -4782,7 +4782,7 @@ lpfc_sli4_bar2_register_memmap(struct lpfc_hba *phba, uint32_t vf) | |||
4782 | * this routine. | 4782 | * this routine. |
4783 | * | 4783 | * |
4784 | * Return codes | 4784 | * Return codes |
4785 | * 0 - sucessful | 4785 | * 0 - successful |
4786 | * ENOMEM - could not allocated memory. | 4786 | * ENOMEM - could not allocated memory. |
4787 | **/ | 4787 | **/ |
4788 | static int | 4788 | static int |
@@ -4881,7 +4881,7 @@ lpfc_destroy_bootstrap_mbox(struct lpfc_hba *phba) | |||
4881 | * allocation for the port. | 4881 | * allocation for the port. |
4882 | * | 4882 | * |
4883 | * Return codes | 4883 | * Return codes |
4884 | * 0 - sucessful | 4884 | * 0 - successful |
4885 | * ENOMEM - No availble memory | 4885 | * ENOMEM - No availble memory |
4886 | * EIO - The mailbox failed to complete successfully. | 4886 | * EIO - The mailbox failed to complete successfully. |
4887 | **/ | 4887 | **/ |
@@ -4982,7 +4982,7 @@ lpfc_sli4_read_config(struct lpfc_hba *phba) | |||
4982 | * HBA consistent with the SLI-4 interface spec. | 4982 | * HBA consistent with the SLI-4 interface spec. |
4983 | * | 4983 | * |
4984 | * Return codes | 4984 | * Return codes |
4985 | * 0 - sucessful | 4985 | * 0 - successful |
4986 | * ENOMEM - No availble memory | 4986 | * ENOMEM - No availble memory |
4987 | * EIO - The mailbox failed to complete successfully. | 4987 | * EIO - The mailbox failed to complete successfully. |
4988 | **/ | 4988 | **/ |
@@ -5031,7 +5031,7 @@ lpfc_setup_endian_order(struct lpfc_hba *phba) | |||
5031 | * we just use some constant number as place holder. | 5031 | * we just use some constant number as place holder. |
5032 | * | 5032 | * |
5033 | * Return codes | 5033 | * Return codes |
5034 | * 0 - sucessful | 5034 | * 0 - successful |
5035 | * ENOMEM - No availble memory | 5035 | * ENOMEM - No availble memory |
5036 | * EIO - The mailbox failed to complete successfully. | 5036 | * EIO - The mailbox failed to complete successfully. |
5037 | **/ | 5037 | **/ |
@@ -5326,7 +5326,7 @@ out_error: | |||
5326 | * operation. | 5326 | * operation. |
5327 | * | 5327 | * |
5328 | * Return codes | 5328 | * Return codes |
5329 | * 0 - sucessful | 5329 | * 0 - successful |
5330 | * ENOMEM - No availble memory | 5330 | * ENOMEM - No availble memory |
5331 | * EIO - The mailbox failed to complete successfully. | 5331 | * EIO - The mailbox failed to complete successfully. |
5332 | **/ | 5332 | **/ |
@@ -5390,7 +5390,7 @@ lpfc_sli4_queue_destroy(struct lpfc_hba *phba) | |||
5390 | * operation. | 5390 | * operation. |
5391 | * | 5391 | * |
5392 | * Return codes | 5392 | * Return codes |
5393 | * 0 - sucessful | 5393 | * 0 - successful |
5394 | * ENOMEM - No availble memory | 5394 | * ENOMEM - No availble memory |
5395 | * EIO - The mailbox failed to complete successfully. | 5395 | * EIO - The mailbox failed to complete successfully. |
5396 | **/ | 5396 | **/ |
@@ -5635,7 +5635,7 @@ out_error: | |||
5635 | * operation. | 5635 | * operation. |
5636 | * | 5636 | * |
5637 | * Return codes | 5637 | * Return codes |
5638 | * 0 - sucessful | 5638 | * 0 - successful |
5639 | * ENOMEM - No availble memory | 5639 | * ENOMEM - No availble memory |
5640 | * EIO - The mailbox failed to complete successfully. | 5640 | * EIO - The mailbox failed to complete successfully. |
5641 | **/ | 5641 | **/ |
@@ -5680,7 +5680,7 @@ lpfc_sli4_queue_unset(struct lpfc_hba *phba) | |||
5680 | * Later, this can be used for all the slow-path events. | 5680 | * Later, this can be used for all the slow-path events. |
5681 | * | 5681 | * |
5682 | * Return codes | 5682 | * Return codes |
5683 | * 0 - sucessful | 5683 | * 0 - successful |
5684 | * -ENOMEM - No availble memory | 5684 | * -ENOMEM - No availble memory |
5685 | **/ | 5685 | **/ |
5686 | static int | 5686 | static int |
@@ -5841,7 +5841,7 @@ lpfc_sli4_cq_event_release_all(struct lpfc_hba *phba) | |||
5841 | * all resources assigned to the PCI function which originates this request. | 5841 | * all resources assigned to the PCI function which originates this request. |
5842 | * | 5842 | * |
5843 | * Return codes | 5843 | * Return codes |
5844 | * 0 - sucessful | 5844 | * 0 - successful |
5845 | * ENOMEM - No availble memory | 5845 | * ENOMEM - No availble memory |
5846 | * EIO - The mailbox failed to complete successfully. | 5846 | * EIO - The mailbox failed to complete successfully. |
5847 | **/ | 5847 | **/ |
@@ -6004,7 +6004,7 @@ lpfc_sli4_fcfi_unreg(struct lpfc_hba *phba, uint16_t fcfi) | |||
6004 | * with SLI-4 interface spec. | 6004 | * with SLI-4 interface spec. |
6005 | * | 6005 | * |
6006 | * Return codes | 6006 | * Return codes |
6007 | * 0 - sucessful | 6007 | * 0 - successful |
6008 | * other values - error | 6008 | * other values - error |
6009 | **/ | 6009 | **/ |
6010 | static int | 6010 | static int |
@@ -6133,7 +6133,7 @@ lpfc_sli4_pci_mem_unset(struct lpfc_hba *phba) | |||
6133 | * will be left with MSI-X enabled and leaks its vectors. | 6133 | * will be left with MSI-X enabled and leaks its vectors. |
6134 | * | 6134 | * |
6135 | * Return codes | 6135 | * Return codes |
6136 | * 0 - sucessful | 6136 | * 0 - successful |
6137 | * other values - error | 6137 | * other values - error |
6138 | **/ | 6138 | **/ |
6139 | static int | 6139 | static int |
@@ -6265,7 +6265,7 @@ lpfc_sli_disable_msix(struct lpfc_hba *phba) | |||
6265 | * is done in this function. | 6265 | * is done in this function. |
6266 | * | 6266 | * |
6267 | * Return codes | 6267 | * Return codes |
6268 | * 0 - sucessful | 6268 | * 0 - successful |
6269 | * other values - error | 6269 | * other values - error |
6270 | */ | 6270 | */ |
6271 | static int | 6271 | static int |
@@ -6324,7 +6324,7 @@ lpfc_sli_disable_msi(struct lpfc_hba *phba) | |||
6324 | * MSI-X -> MSI -> IRQ. | 6324 | * MSI-X -> MSI -> IRQ. |
6325 | * | 6325 | * |
6326 | * Return codes | 6326 | * Return codes |
6327 | * 0 - sucessful | 6327 | * 0 - successful |
6328 | * other values - error | 6328 | * other values - error |
6329 | **/ | 6329 | **/ |
6330 | static uint32_t | 6330 | static uint32_t |
@@ -6414,7 +6414,7 @@ lpfc_sli_disable_intr(struct lpfc_hba *phba) | |||
6414 | * enabled and leaks its vectors. | 6414 | * enabled and leaks its vectors. |
6415 | * | 6415 | * |
6416 | * Return codes | 6416 | * Return codes |
6417 | * 0 - sucessful | 6417 | * 0 - successful |
6418 | * other values - error | 6418 | * other values - error |
6419 | **/ | 6419 | **/ |
6420 | static int | 6420 | static int |
@@ -6524,7 +6524,7 @@ lpfc_sli4_disable_msix(struct lpfc_hba *phba) | |||
6524 | * which is done in this function. | 6524 | * which is done in this function. |
6525 | * | 6525 | * |
6526 | * Return codes | 6526 | * Return codes |
6527 | * 0 - sucessful | 6527 | * 0 - successful |
6528 | * other values - error | 6528 | * other values - error |
6529 | **/ | 6529 | **/ |
6530 | static int | 6530 | static int |
@@ -6589,7 +6589,7 @@ lpfc_sli4_disable_msi(struct lpfc_hba *phba) | |||
6589 | * MSI-X -> MSI -> IRQ. | 6589 | * MSI-X -> MSI -> IRQ. |
6590 | * | 6590 | * |
6591 | * Return codes | 6591 | * Return codes |
6592 | * 0 - sucessful | 6592 | * 0 - successful |
6593 | * other values - error | 6593 | * other values - error |
6594 | **/ | 6594 | **/ |
6595 | static uint32_t | 6595 | static uint32_t |
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index b3a69f984d95..7935667b81a5 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
@@ -1804,7 +1804,7 @@ lpfc_sli_handle_mb_event(struct lpfc_hba *phba) | |||
1804 | */ | 1804 | */ |
1805 | if (lpfc_sli_chk_mbx_command(pmbox->mbxCommand) == | 1805 | if (lpfc_sli_chk_mbx_command(pmbox->mbxCommand) == |
1806 | MBX_SHUTDOWN) { | 1806 | MBX_SHUTDOWN) { |
1807 | /* Unknow mailbox command compl */ | 1807 | /* Unknown mailbox command compl */ |
1808 | lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI, | 1808 | lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI, |
1809 | "(%d):0323 Unknown Mailbox command " | 1809 | "(%d):0323 Unknown Mailbox command " |
1810 | "x%x (x%x) Cmpl\n", | 1810 | "x%x (x%x) Cmpl\n", |
@@ -4062,7 +4062,7 @@ lpfc_sli4_read_fcoe_params(struct lpfc_hba *phba, | |||
4062 | * addition, this routine gets the port vpd data. | 4062 | * addition, this routine gets the port vpd data. |
4063 | * | 4063 | * |
4064 | * Return codes | 4064 | * Return codes |
4065 | * 0 - sucessful | 4065 | * 0 - successful |
4066 | * ENOMEM - could not allocated memory. | 4066 | * ENOMEM - could not allocated memory. |
4067 | **/ | 4067 | **/ |
4068 | static int | 4068 | static int |
@@ -11428,7 +11428,7 @@ lpfc_sli4_handle_received_buffer(struct lpfc_hba *phba, | |||
11428 | * sequential. | 11428 | * sequential. |
11429 | * | 11429 | * |
11430 | * Return codes | 11430 | * Return codes |
11431 | * 0 - sucessful | 11431 | * 0 - successful |
11432 | * EIO - The mailbox failed to complete successfully. | 11432 | * EIO - The mailbox failed to complete successfully. |
11433 | * When this error occurs, the driver is not guaranteed | 11433 | * When this error occurs, the driver is not guaranteed |
11434 | * to have any rpi regions posted to the device and | 11434 | * to have any rpi regions posted to the device and |
@@ -11466,7 +11466,7 @@ lpfc_sli4_post_all_rpi_hdrs(struct lpfc_hba *phba) | |||
11466 | * maps up to 64 rpi context regions. | 11466 | * maps up to 64 rpi context regions. |
11467 | * | 11467 | * |
11468 | * Return codes | 11468 | * Return codes |
11469 | * 0 - sucessful | 11469 | * 0 - successful |
11470 | * ENOMEM - No available memory | 11470 | * ENOMEM - No available memory |
11471 | * EIO - The mailbox failed to complete successfully. | 11471 | * EIO - The mailbox failed to complete successfully. |
11472 | **/ | 11472 | **/ |
@@ -11528,7 +11528,7 @@ lpfc_sli4_post_rpi_hdr(struct lpfc_hba *phba, struct lpfc_rpi_hdr *rpi_page) | |||
11528 | * PAGE_SIZE modulo 64 rpi context headers. | 11528 | * PAGE_SIZE modulo 64 rpi context headers. |
11529 | * | 11529 | * |
11530 | * Returns | 11530 | * Returns |
11531 | * A nonzero rpi defined as rpi_base <= rpi < max_rpi if sucessful | 11531 | * A nonzero rpi defined as rpi_base <= rpi < max_rpi if successful |
11532 | * LPFC_RPI_ALLOC_ERROR if no rpis are available. | 11532 | * LPFC_RPI_ALLOC_ERROR if no rpis are available. |
11533 | **/ | 11533 | **/ |
11534 | int | 11534 | int |
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index 512c2cc1a33f..d310f49d077e 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h | |||
@@ -381,7 +381,7 @@ typedef struct { | |||
381 | u8 battery_status; /* | 381 | u8 battery_status; /* |
382 | * BIT 0: battery module missing | 382 | * BIT 0: battery module missing |
383 | * BIT 1: VBAD | 383 | * BIT 1: VBAD |
384 | * BIT 2: temprature high | 384 | * BIT 2: temperature high |
385 | * BIT 3: battery pack missing | 385 | * BIT 3: battery pack missing |
386 | * BIT 4,5: | 386 | * BIT 4,5: |
387 | * 00 - charge complete | 387 | * 00 - charge complete |
diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h index b25b74764ec3..ce2487a888ed 100644 --- a/drivers/scsi/megaraid/mbox_defs.h +++ b/drivers/scsi/megaraid/mbox_defs.h | |||
@@ -497,7 +497,7 @@ typedef struct { | |||
497 | * @inserted_drive : channel:Id of inserted drive | 497 | * @inserted_drive : channel:Id of inserted drive |
498 | * @battery_status : bit 0: battery module missing | 498 | * @battery_status : bit 0: battery module missing |
499 | * bit 1: VBAD | 499 | * bit 1: VBAD |
500 | * bit 2: temprature high | 500 | * bit 2: temperature high |
501 | * bit 3: battery pack missing | 501 | * bit 3: battery pack missing |
502 | * bit 4,5: | 502 | * bit 4,5: |
503 | * 00 - charge complete | 503 | * 00 - charge complete |
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index fd181c2a8ae4..7f977967b884 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
@@ -2709,7 +2709,7 @@ megaraid_reset_handler(struct scsi_cmnd *scp) | |||
2709 | } | 2709 | } |
2710 | else { | 2710 | else { |
2711 | con_log(CL_ANN, (KERN_NOTICE | 2711 | con_log(CL_ANN, (KERN_NOTICE |
2712 | "megaraid mbox: reset sequence completed sucessfully\n")); | 2712 | "megaraid mbox: reset sequence completed successfully\n")); |
2713 | } | 2713 | } |
2714 | 2714 | ||
2715 | 2715 | ||
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index 55ee014a7e08..efabea1a3ce4 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c | |||
@@ -2987,7 +2987,7 @@ _scsih_normalize_sense(char *sense_buffer, struct sense_info *data) | |||
2987 | 2987 | ||
2988 | #ifdef CONFIG_SCSI_MPT2SAS_LOGGING | 2988 | #ifdef CONFIG_SCSI_MPT2SAS_LOGGING |
2989 | /** | 2989 | /** |
2990 | * _scsih_scsi_ioc_info - translated non-succesfull SCSI_IO request | 2990 | * _scsih_scsi_ioc_info - translated non-successfull SCSI_IO request |
2991 | * @ioc: per adapter object | 2991 | * @ioc: per adapter object |
2992 | * @scmd: pointer to scsi command object | 2992 | * @scmd: pointer to scsi command object |
2993 | * @mpi_reply: reply mf payload returned from firmware | 2993 | * @mpi_reply: reply mf payload returned from firmware |
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c index e3c482aa87b5..a2d569828308 100644 --- a/drivers/scsi/ncr53c8xx.c +++ b/drivers/scsi/ncr53c8xx.c | |||
@@ -6495,7 +6495,7 @@ static void ncr_int_ma (struct ncb *np) | |||
6495 | ** we force a SIR_NEGO_PROTO interrupt (it is a hack that avoids | 6495 | ** we force a SIR_NEGO_PROTO interrupt (it is a hack that avoids |
6496 | ** bloat for such a should_not_happen situation). | 6496 | ** bloat for such a should_not_happen situation). |
6497 | ** In all other situation, we reset the BUS. | 6497 | ** In all other situation, we reset the BUS. |
6498 | ** Are these assumptions reasonnable ? (Wait and see ...) | 6498 | ** Are these assumptions reasonable ? (Wait and see ...) |
6499 | */ | 6499 | */ |
6500 | unexpected_phase: | 6500 | unexpected_phase: |
6501 | dsp -= 8; | 6501 | dsp -= 8; |
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index 2be7d5b018d2..2c98a6ee973b 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c | |||
@@ -1419,7 +1419,7 @@ static irqreturn_t do_nsp32_isr(int irq, void *dev_id) | |||
1419 | nsp32_msg(KERN_ERR, "Received unexpected BMCNTERR IRQ! "); | 1419 | nsp32_msg(KERN_ERR, "Received unexpected BMCNTERR IRQ! "); |
1420 | /* | 1420 | /* |
1421 | * TODO: To be implemented improving bus master | 1421 | * TODO: To be implemented improving bus master |
1422 | * transfer reliablity when BMCNTERR is occurred in | 1422 | * transfer reliability when BMCNTERR is occurred in |
1423 | * AutoSCSI phase described in specification. | 1423 | * AutoSCSI phase described in specification. |
1424 | */ | 1424 | */ |
1425 | } | 1425 | } |
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 4874dd62a62f..34c6b896a91b 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
@@ -3347,7 +3347,7 @@ static int pmcraid_chr_fasync(int fd, struct file *filep, int mode) | |||
3347 | * @direction : data transfer direction | 3347 | * @direction : data transfer direction |
3348 | * | 3348 | * |
3349 | * Return value | 3349 | * Return value |
3350 | * 0 on sucess, non-zero error code on failure | 3350 | * 0 on success, non-zero error code on failure |
3351 | */ | 3351 | */ |
3352 | static int pmcraid_build_passthrough_ioadls( | 3352 | static int pmcraid_build_passthrough_ioadls( |
3353 | struct pmcraid_cmd *cmd, | 3353 | struct pmcraid_cmd *cmd, |
@@ -3406,7 +3406,7 @@ static int pmcraid_build_passthrough_ioadls( | |||
3406 | * @direction: data transfer direction | 3406 | * @direction: data transfer direction |
3407 | * | 3407 | * |
3408 | * Return value | 3408 | * Return value |
3409 | * 0 on sucess, non-zero error code on failure | 3409 | * 0 on success, non-zero error code on failure |
3410 | */ | 3410 | */ |
3411 | static void pmcraid_release_passthrough_ioadls( | 3411 | static void pmcraid_release_passthrough_ioadls( |
3412 | struct pmcraid_cmd *cmd, | 3412 | struct pmcraid_cmd *cmd, |
@@ -3434,7 +3434,7 @@ static void pmcraid_release_passthrough_ioadls( | |||
3434 | * @arg: pointer to pmcraid_passthrough_buffer user buffer | 3434 | * @arg: pointer to pmcraid_passthrough_buffer user buffer |
3435 | * | 3435 | * |
3436 | * Return value | 3436 | * Return value |
3437 | * 0 on sucess, non-zero error code on failure | 3437 | * 0 on success, non-zero error code on failure |
3438 | */ | 3438 | */ |
3439 | static long pmcraid_ioctl_passthrough( | 3439 | static long pmcraid_ioctl_passthrough( |
3440 | struct pmcraid_instance *pinstance, | 3440 | struct pmcraid_instance *pinstance, |
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h index 3441b3f90827..2752b56cad56 100644 --- a/drivers/scsi/pmcraid.h +++ b/drivers/scsi/pmcraid.h | |||
@@ -771,11 +771,11 @@ static struct pmcraid_ioasc_error pmcraid_ioasc_error_table[] = { | |||
771 | {0x01180600, IOASC_LOG_LEVEL_MUST, | 771 | {0x01180600, IOASC_LOG_LEVEL_MUST, |
772 | "Recovered Error, soft media error, sector reassignment suggested"}, | 772 | "Recovered Error, soft media error, sector reassignment suggested"}, |
773 | {0x015D0000, IOASC_LOG_LEVEL_MUST, | 773 | {0x015D0000, IOASC_LOG_LEVEL_MUST, |
774 | "Recovered Error, failure prediction thresold exceeded"}, | 774 | "Recovered Error, failure prediction threshold exceeded"}, |
775 | {0x015D9200, IOASC_LOG_LEVEL_MUST, | 775 | {0x015D9200, IOASC_LOG_LEVEL_MUST, |
776 | "Recovered Error, soft Cache Card Battery error thresold"}, | 776 | "Recovered Error, soft Cache Card Battery error threshold"}, |
777 | {0x015D9200, IOASC_LOG_LEVEL_MUST, | 777 | {0x015D9200, IOASC_LOG_LEVEL_MUST, |
778 | "Recovered Error, soft Cache Card Battery error thresold"}, | 778 | "Recovered Error, soft Cache Card Battery error threshold"}, |
779 | {0x02048000, IOASC_LOG_LEVEL_MUST, | 779 | {0x02048000, IOASC_LOG_LEVEL_MUST, |
780 | "Not Ready, IOA Reset Required"}, | 780 | "Not Ready, IOA Reset Required"}, |
781 | {0x02408500, IOASC_LOG_LEVEL_MUST, | 781 | {0x02408500, IOASC_LOG_LEVEL_MUST, |
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c index 723fdecd91bd..0fd6ae6911ad 100644 --- a/drivers/scsi/scsi_netlink.c +++ b/drivers/scsi/scsi_netlink.c | |||
@@ -613,7 +613,7 @@ EXPORT_SYMBOL_GPL(scsi_nl_send_transport_msg); | |||
613 | * @data_buf: pointer to vendor unique data buffer | 613 | * @data_buf: pointer to vendor unique data buffer |
614 | * | 614 | * |
615 | * Returns: | 615 | * Returns: |
616 | * 0 on succesful return | 616 | * 0 on successful return |
617 | * otherwise, failing error code | 617 | * otherwise, failing error code |
618 | * | 618 | * |
619 | * Notes: | 619 | * Notes: |
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c index fd47cb1bee1b..f27e52d963d3 100644 --- a/drivers/scsi/scsi_transport_sas.c +++ b/drivers/scsi/scsi_transport_sas.c | |||
@@ -666,7 +666,7 @@ EXPORT_SYMBOL(sas_phy_add); | |||
666 | * | 666 | * |
667 | * Note: | 667 | * Note: |
668 | * This function must only be called on a PHY that has not | 668 | * This function must only be called on a PHY that has not |
669 | * sucessfully been added using sas_phy_add(). | 669 | * successfully been added using sas_phy_add(). |
670 | */ | 670 | */ |
671 | void sas_phy_free(struct sas_phy *phy) | 671 | void sas_phy_free(struct sas_phy *phy) |
672 | { | 672 | { |
@@ -896,7 +896,7 @@ EXPORT_SYMBOL(sas_port_add); | |||
896 | * | 896 | * |
897 | * Note: | 897 | * Note: |
898 | * This function must only be called on a PORT that has not | 898 | * This function must only be called on a PORT that has not |
899 | * sucessfully been added using sas_port_add(). | 899 | * successfully been added using sas_port_add(). |
900 | */ | 900 | */ |
901 | void sas_port_free(struct sas_port *port) | 901 | void sas_port_free(struct sas_port *port) |
902 | { | 902 | { |
@@ -1476,7 +1476,7 @@ EXPORT_SYMBOL(sas_rphy_add); | |||
1476 | * | 1476 | * |
1477 | * Note: | 1477 | * Note: |
1478 | * This function must only be called on a remote | 1478 | * This function must only be called on a remote |
1479 | * PHY that has not sucessfully been added using | 1479 | * PHY that has not successfully been added using |
1480 | * sas_rphy_add() (or has been sas_rphy_remove()'d) | 1480 | * sas_rphy_add() (or has been sas_rphy_remove()'d) |
1481 | */ | 1481 | */ |
1482 | void sas_rphy_free(struct sas_rphy *rphy) | 1482 | void sas_rphy_free(struct sas_rphy *rphy) |
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index 45374d66d26a..2b38f6ad6e11 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c | |||
@@ -1864,7 +1864,7 @@ static pci_ers_result_t sym2_io_slot_dump(struct pci_dev *pdev) | |||
1864 | * | 1864 | * |
1865 | * This routine is similar to sym_set_workarounds(), except | 1865 | * This routine is similar to sym_set_workarounds(), except |
1866 | * that, at this point, we already know that the device was | 1866 | * that, at this point, we already know that the device was |
1867 | * succesfully intialized at least once before, and so most | 1867 | * successfully intialized at least once before, and so most |
1868 | * of the steps taken there are un-needed here. | 1868 | * of the steps taken there are un-needed here. |
1869 | */ | 1869 | */ |
1870 | static void sym2_reset_workarounds(struct pci_dev *pdev) | 1870 | static void sym2_reset_workarounds(struct pci_dev *pdev) |
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c index 297deb817a5d..a7bc8b7b09ac 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c | |||
@@ -2692,7 +2692,7 @@ static void sym_int_ma (struct sym_hcb *np) | |||
2692 | * we force a SIR_NEGO_PROTO interrupt (it is a hack that avoids | 2692 | * we force a SIR_NEGO_PROTO interrupt (it is a hack that avoids |
2693 | * bloat for such a should_not_happen situation). | 2693 | * bloat for such a should_not_happen situation). |
2694 | * In all other situation, we reset the BUS. | 2694 | * In all other situation, we reset the BUS. |
2695 | * Are these assumptions reasonnable ? (Wait and see ...) | 2695 | * Are these assumptions reasonable ? (Wait and see ...) |
2696 | */ | 2696 | */ |
2697 | unexpected_phase: | 2697 | unexpected_phase: |
2698 | dsp -= 8; | 2698 | dsp -= 8; |
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.h b/drivers/scsi/sym53c8xx_2/sym_hipd.h index 053e63c86822..5a80cbac3f92 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.h +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.h | |||
@@ -54,7 +54,7 @@ | |||
54 | * | 54 | * |
55 | * SYM_OPT_LIMIT_COMMAND_REORDERING | 55 | * SYM_OPT_LIMIT_COMMAND_REORDERING |
56 | * When this option is set, the driver tries to limit tagged | 56 | * When this option is set, the driver tries to limit tagged |
57 | * command reordering to some reasonnable value. | 57 | * command reordering to some reasonable value. |
58 | * (set for Linux) | 58 | * (set for Linux) |
59 | */ | 59 | */ |
60 | #if 0 | 60 | #if 0 |
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c index 093610bcfcce..2f6e9d8eaf71 100644 --- a/drivers/scsi/wd7000.c +++ b/drivers/scsi/wd7000.c | |||
@@ -161,7 +161,7 @@ | |||
161 | * | 161 | * |
162 | * 2003/02/12 - Christoph Hellwig <hch@infradead.org> | 162 | * 2003/02/12 - Christoph Hellwig <hch@infradead.org> |
163 | * | 163 | * |
164 | * Cleaned up host template defintion | 164 | * Cleaned up host template definition |
165 | * Removed now obsolete wd7000.h | 165 | * Removed now obsolete wd7000.h |
166 | */ | 166 | */ |
167 | 167 | ||
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c index d71dfe398940..36ede02ceacf 100644 --- a/drivers/serial/8250_pnp.c +++ b/drivers/serial/8250_pnp.c | |||
@@ -361,9 +361,9 @@ static const struct pnp_device_id pnp_dev_table[] = { | |||
361 | { "LTS0001", 0 }, | 361 | { "LTS0001", 0 }, |
362 | /* Rockwell's (PORALiNK) 33600 INT PNP */ | 362 | /* Rockwell's (PORALiNK) 33600 INT PNP */ |
363 | { "WCI0003", 0 }, | 363 | { "WCI0003", 0 }, |
364 | /* Unkown PnP modems */ | 364 | /* Unknown PnP modems */ |
365 | { "PNPCXXX", UNKNOWN_DEV }, | 365 | { "PNPCXXX", UNKNOWN_DEV }, |
366 | /* More unkown PnP modems */ | 366 | /* More unknown PnP modems */ |
367 | { "PNPDXXX", UNKNOWN_DEV }, | 367 | { "PNPDXXX", UNKNOWN_DEV }, |
368 | { "", 0 } | 368 | { "", 0 } |
369 | }; | 369 | }; |
diff --git a/drivers/serial/pmac_zilog.h b/drivers/serial/pmac_zilog.h index 570b0d925e83..f6e77f12acd5 100644 --- a/drivers/serial/pmac_zilog.h +++ b/drivers/serial/pmac_zilog.h | |||
@@ -73,7 +73,7 @@ static inline struct uart_pmac_port *pmz_get_port_A(struct uart_pmac_port *uap) | |||
73 | } | 73 | } |
74 | 74 | ||
75 | /* | 75 | /* |
76 | * Register acessors. Note that we don't need to enforce a recovery | 76 | * Register accessors. Note that we don't need to enforce a recovery |
77 | * delay on PCI PowerMac hardware, it's dealt in HW by the MacIO chip, | 77 | * delay on PCI PowerMac hardware, it's dealt in HW by the MacIO chip, |
78 | * though if we try to use this driver on older machines, we might have | 78 | * though if we try to use this driver on older machines, we might have |
79 | * to add it back | 79 | * to add it back |
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c index 0c08f286a2ef..46de564aaea0 100644 --- a/drivers/serial/ucc_uart.c +++ b/drivers/serial/ucc_uart.c | |||
@@ -313,7 +313,7 @@ static void qe_uart_stop_tx(struct uart_port *port) | |||
313 | * This function will attempt to stuff of all the characters from the | 313 | * This function will attempt to stuff of all the characters from the |
314 | * kernel's transmit buffer into TX BDs. | 314 | * kernel's transmit buffer into TX BDs. |
315 | * | 315 | * |
316 | * A return value of non-zero indicates that it sucessfully stuffed all | 316 | * A return value of non-zero indicates that it successfully stuffed all |
317 | * characters from the kernel buffer. | 317 | * characters from the kernel buffer. |
318 | * | 318 | * |
319 | * A return value of zero indicates that there are still characters in the | 319 | * A return value of zero indicates that there are still characters in the |
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 815a65012cbf..20d7322e2f71 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c | |||
@@ -41,7 +41,7 @@ | |||
41 | * This supports acccess to SPI devices using normal userspace I/O calls. | 41 | * This supports acccess to SPI devices using normal userspace I/O calls. |
42 | * Note that while traditional UNIX/POSIX I/O semantics are half duplex, | 42 | * Note that while traditional UNIX/POSIX I/O semantics are half duplex, |
43 | * and often mask message boundaries, full SPI support requires full duplex | 43 | * and often mask message boundaries, full SPI support requires full duplex |
44 | * transfers. There are several kinds of of internal message boundaries to | 44 | * transfers. There are several kinds of internal message boundaries to |
45 | * handle chipselect management and other protocol options. | 45 | * handle chipselect management and other protocol options. |
46 | * | 46 | * |
47 | * SPI has a character major number assigned. We allocate minor numbers | 47 | * SPI has a character major number assigned. We allocate minor numbers |
diff --git a/drivers/staging/otus/80211core/pub_zfi.h b/drivers/staging/otus/80211core/pub_zfi.h index a35bd5d41d2c..60b7d1c56dee 100644 --- a/drivers/staging/otus/80211core/pub_zfi.h +++ b/drivers/staging/otus/80211core/pub_zfi.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #include "../oal_dt.h" | 20 | #include "../oal_dt.h" |
21 | 21 | ||
22 | /***** Section 1 : Tunable Parameters *****/ | 22 | /***** Section 1 : Tunable Parameters *****/ |
23 | /* The defintions in this section are tunabel parameters */ | 23 | /* The definitions in this section are tunabel parameters */ |
24 | 24 | ||
25 | /* Maximum number of BSS that could be scaned */ | 25 | /* Maximum number of BSS that could be scaned */ |
26 | #define ZM_MAX_BSS 128 | 26 | #define ZM_MAX_BSS 128 |
diff --git a/drivers/staging/otus/zdcompat.h b/drivers/staging/otus/zdcompat.h index 84ac43356b77..cdcaef54afcd 100644 --- a/drivers/staging/otus/zdcompat.h +++ b/drivers/staging/otus/zdcompat.h | |||
@@ -17,7 +17,7 @@ | |||
17 | /* Module Name : zdcompat.h */ | 17 | /* Module Name : zdcompat.h */ |
18 | /* */ | 18 | /* */ |
19 | /* Abstract */ | 19 | /* Abstract */ |
20 | /* This module contains function defintion for compatibility. */ | 20 | /* This module contains function definition for compatibility. */ |
21 | /* */ | 21 | /* */ |
22 | /* NOTES */ | 22 | /* NOTES */ |
23 | /* Platform dependent. */ | 23 | /* Platform dependent. */ |
diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h index 8216d7e96d60..35ed60be891a 100644 --- a/drivers/staging/rtl8187se/r8180.h +++ b/drivers/staging/rtl8187se/r8180.h | |||
@@ -521,7 +521,7 @@ typedef struct r8180_priv | |||
521 | //u32 NumTxOkInPeriod; //YJ,del,080828 | 521 | //u32 NumTxOkInPeriod; //YJ,del,080828 |
522 | u8 TxPollingTimes; | 522 | u8 TxPollingTimes; |
523 | 523 | ||
524 | bool bApBufOurFrame;// TRUE if AP buffer our unicast data , we will keep eAwake untill receive data or timeout. | 524 | bool bApBufOurFrame;// TRUE if AP buffer our unicast data , we will keep eAwake until receive data or timeout. |
525 | u8 WaitBufDataBcnCount; | 525 | u8 WaitBufDataBcnCount; |
526 | u8 WaitBufDataTimeOut; | 526 | u8 WaitBufDataTimeOut; |
527 | 527 | ||
diff --git a/drivers/staging/rtl8192su/r8192S_phyreg.h b/drivers/staging/rtl8192su/r8192S_phyreg.h index 96c7cfa92542..acf644f430aa 100644 --- a/drivers/staging/rtl8192su/r8192S_phyreg.h +++ b/drivers/staging/rtl8192su/r8192S_phyreg.h | |||
@@ -38,7 +38,7 @@ | |||
38 | // 2. 0x800/0x900/0xA00/0xC00/0xD00/0xE00 | 38 | // 2. 0x800/0x900/0xA00/0xC00/0xD00/0xE00 |
39 | // 3. RF register 0x00-2E | 39 | // 3. RF register 0x00-2E |
40 | // 4. Bit Mask for BB/RF register | 40 | // 4. Bit Mask for BB/RF register |
41 | // 5. Other defintion for BB/RF R/W | 41 | // 5. Other definition for BB/RF R/W |
42 | // | 42 | // |
43 | 43 | ||
44 | 44 | ||
diff --git a/drivers/staging/wavelan/wavelan_cs.c b/drivers/staging/wavelan/wavelan_cs.c index 33918fd5b231..10c702b5be4a 100644 --- a/drivers/staging/wavelan/wavelan_cs.c +++ b/drivers/staging/wavelan/wavelan_cs.c | |||
@@ -3987,7 +3987,7 @@ wavelan_interrupt(int irq, | |||
3987 | #endif | 3987 | #endif |
3988 | 3988 | ||
3989 | /* Prevent reentrancy. We need to do that because we may have | 3989 | /* Prevent reentrancy. We need to do that because we may have |
3990 | * multiple interrupt handler running concurently. | 3990 | * multiple interrupt handler running concurrently. |
3991 | * It is safe because interrupts are disabled before aquiring | 3991 | * It is safe because interrupts are disabled before aquiring |
3992 | * the spinlock. */ | 3992 | * the spinlock. */ |
3993 | spin_lock(&lp->spinlock); | 3993 | spin_lock(&lp->spinlock); |
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index 40de151f2789..e89304c72568 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c | |||
@@ -4190,7 +4190,7 @@ static void ixj_aec_start(IXJ *j, int level) | |||
4190 | ixj_WriteDSPCommand(0x1224, j); | 4190 | ixj_WriteDSPCommand(0x1224, j); |
4191 | 4191 | ||
4192 | ixj_WriteDSPCommand(0xE014, j); | 4192 | ixj_WriteDSPCommand(0xE014, j); |
4193 | ixj_WriteDSPCommand(0x0003, j); /* Lock threashold at 3dB */ | 4193 | ixj_WriteDSPCommand(0x0003, j); /* Lock threshold at 3dB */ |
4194 | 4194 | ||
4195 | ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */ | 4195 | ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */ |
4196 | 4196 | ||
@@ -4235,7 +4235,7 @@ static void ixj_aec_start(IXJ *j, int level) | |||
4235 | ixj_WriteDSPCommand(0x1224, j); | 4235 | ixj_WriteDSPCommand(0x1224, j); |
4236 | 4236 | ||
4237 | ixj_WriteDSPCommand(0xE014, j); | 4237 | ixj_WriteDSPCommand(0xE014, j); |
4238 | ixj_WriteDSPCommand(0x0003, j); /* Lock threashold at 3dB */ | 4238 | ixj_WriteDSPCommand(0x0003, j); /* Lock threshold at 3dB */ |
4239 | 4239 | ||
4240 | ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */ | 4240 | ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */ |
4241 | 4241 | ||
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c index d171b563e94c..bba4d3eabe0f 100644 --- a/drivers/usb/atm/ueagle-atm.c +++ b/drivers/usb/atm/ueagle-atm.c | |||
@@ -1958,7 +1958,7 @@ static void uea_dispatch_cmv_e1(struct uea_softc *sc, struct intr_pkt *intr) | |||
1958 | goto bad1; | 1958 | goto bad1; |
1959 | 1959 | ||
1960 | /* FIXME : ADI930 reply wrong preambule (func = 2, sub = 2) to | 1960 | /* FIXME : ADI930 reply wrong preambule (func = 2, sub = 2) to |
1961 | * the first MEMACESS cmv. Ignore it... | 1961 | * the first MEMACCESS cmv. Ignore it... |
1962 | */ | 1962 | */ |
1963 | if (cmv->bFunction != dsc->function) { | 1963 | if (cmv->bFunction != dsc->function) { |
1964 | if (UEA_CHIP_VERSION(sc) == ADI930 | 1964 | if (UEA_CHIP_VERSION(sc) == ADI930 |
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 2473cf0c6b1d..b4bd2411c666 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * drivers/usb/class/usbtmc.c - USB Test & Measurment class driver | 2 | * drivers/usb/class/usbtmc.c - USB Test & Measurement class driver |
3 | * | 3 | * |
4 | * Copyright (C) 2007 Stefan Kopp, Gechingen, Germany | 4 | * Copyright (C) 2007 Stefan Kopp, Gechingen, Germany |
5 | * Copyright (C) 2008 Novell, Inc. | 5 | * Copyright (C) 2008 Novell, Inc. |
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index da718e84d58d..e80f1af438c8 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -1890,7 +1890,7 @@ static void cancel_async_set_config(struct usb_device *udev) | |||
1890 | * routine gets around the normal restrictions by using a work thread to | 1890 | * routine gets around the normal restrictions by using a work thread to |
1891 | * submit the change-config request. | 1891 | * submit the change-config request. |
1892 | * | 1892 | * |
1893 | * Returns 0 if the request was succesfully queued, error code otherwise. | 1893 | * Returns 0 if the request was successfully queued, error code otherwise. |
1894 | * The caller has no way to know whether the queued request will eventually | 1894 | * The caller has no way to know whether the queued request will eventually |
1895 | * succeed. | 1895 | * succeed. |
1896 | */ | 1896 | */ |
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c index 7953948bfe4a..4e3657808b0f 100644 --- a/drivers/usb/gadget/f_acm.c +++ b/drivers/usb/gadget/f_acm.c | |||
@@ -432,7 +432,7 @@ static void acm_disable(struct usb_function *f) | |||
432 | * @length: size of data | 432 | * @length: size of data |
433 | * Context: irqs blocked, acm->lock held, acm_notify_req non-null | 433 | * Context: irqs blocked, acm->lock held, acm_notify_req non-null |
434 | * | 434 | * |
435 | * Returns zero on sucess or a negative errno. | 435 | * Returns zero on success or a negative errno. |
436 | * | 436 | * |
437 | * See section 6.3.5 of the CDC 1.1 specification for information | 437 | * See section 6.3.5 of the CDC 1.1 specification for information |
438 | * about the only notification we issue: SerialState change. | 438 | * about the only notification we issue: SerialState change. |
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 1937d8c7b433..adda1208a1ec 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
@@ -1524,7 +1524,7 @@ static int pxa_udc_get_frame(struct usb_gadget *_gadget) | |||
1524 | * pxa_udc_wakeup - Force udc device out of suspend | 1524 | * pxa_udc_wakeup - Force udc device out of suspend |
1525 | * @_gadget: usb gadget | 1525 | * @_gadget: usb gadget |
1526 | * | 1526 | * |
1527 | * Returns 0 if succesfull, error code otherwise | 1527 | * Returns 0 if successfull, error code otherwise |
1528 | */ | 1528 | */ |
1529 | static int pxa_udc_wakeup(struct usb_gadget *_gadget) | 1529 | static int pxa_udc_wakeup(struct usb_gadget *_gadget) |
1530 | { | 1530 | { |
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index f5f5601701c9..d8f4aaa616f2 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -210,7 +210,7 @@ static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr, | |||
210 | if (error) { | 210 | if (error) { |
211 | ehci_halt(ehci); | 211 | ehci_halt(ehci); |
212 | ehci_to_hcd(ehci)->state = HC_STATE_HALT; | 212 | ehci_to_hcd(ehci)->state = HC_STATE_HALT; |
213 | ehci_err(ehci, "force halt; handhake %p %08x %08x -> %d\n", | 213 | ehci_err(ehci, "force halt; handshake %p %08x %08x -> %d\n", |
214 | ptr, mask, done, error); | 214 | ptr, mask, done, error); |
215 | } | 215 | } |
216 | 216 | ||
diff --git a/drivers/usb/host/fhci-sched.c b/drivers/usb/host/fhci-sched.c index 62a226b61670..00a29855d0c4 100644 --- a/drivers/usb/host/fhci-sched.c +++ b/drivers/usb/host/fhci-sched.c | |||
@@ -627,7 +627,7 @@ irqreturn_t fhci_irq(struct usb_hcd *hcd) | |||
627 | 627 | ||
628 | 628 | ||
629 | /* | 629 | /* |
630 | * Process normal completions(error or sucess) and clean the schedule. | 630 | * Process normal completions(error or success) and clean the schedule. |
631 | * | 631 | * |
632 | * This is the main path for handing urbs back to drivers. The only other patth | 632 | * This is the main path for handing urbs back to drivers. The only other patth |
633 | * is process_del_list(),which unlinks URBs by scanning EDs,instead of scanning | 633 | * is process_del_list(),which unlinks URBs by scanning EDs,instead of scanning |
diff --git a/drivers/usb/wusbcore/crypto.c b/drivers/usb/wusbcore/crypto.c index 9ec7fd5da489..9579cf4c38bf 100644 --- a/drivers/usb/wusbcore/crypto.c +++ b/drivers/usb/wusbcore/crypto.c | |||
@@ -111,7 +111,7 @@ struct aes_ccm_b1 { | |||
111 | * | 111 | * |
112 | * CCM uses Ax blocks to generate a keystream with which the MIC and | 112 | * CCM uses Ax blocks to generate a keystream with which the MIC and |
113 | * the message's payload are encoded. A0 always encrypts/decrypts the | 113 | * the message's payload are encoded. A0 always encrypts/decrypts the |
114 | * MIC. Ax (x>0) are used for the sucesive payload blocks. | 114 | * MIC. Ax (x>0) are used for the successive payload blocks. |
115 | * | 115 | * |
116 | * The x is the counter, and is increased for each block. | 116 | * The x is the counter, and is increased for each block. |
117 | */ | 117 | */ |
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c index 613a5fc490d3..489b47833e2c 100644 --- a/drivers/usb/wusbcore/wa-xfer.c +++ b/drivers/usb/wusbcore/wa-xfer.c | |||
@@ -558,7 +558,7 @@ static void wa_seg_dto_cb(struct urb *urb) | |||
558 | /* | 558 | /* |
559 | * Callback for the segment request | 559 | * Callback for the segment request |
560 | * | 560 | * |
561 | * If succesful transition state (unless already transitioned or | 561 | * If successful transition state (unless already transitioned or |
562 | * outbound transfer); otherwise, take a note of the error, mark this | 562 | * outbound transfer); otherwise, take a note of the error, mark this |
563 | * segment done and try completion. | 563 | * segment done and try completion. |
564 | * | 564 | * |
@@ -1364,7 +1364,7 @@ segment_aborted: | |||
1364 | /* | 1364 | /* |
1365 | * Callback for the IN data phase | 1365 | * Callback for the IN data phase |
1366 | * | 1366 | * |
1367 | * If succesful transition state; otherwise, take a note of the | 1367 | * If successful transition state; otherwise, take a note of the |
1368 | * error, mark this segment done and try completion. | 1368 | * error, mark this segment done and try completion. |
1369 | * | 1369 | * |
1370 | * Note we don't access until we are sure that the transfer hasn't | 1370 | * Note we don't access until we are sure that the transfer hasn't |
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c index c7080d497311..0bb665a0c024 100644 --- a/drivers/uwb/i1480/dfu/usb.c +++ b/drivers/uwb/i1480/dfu/usb.c | |||
@@ -229,7 +229,7 @@ void i1480_usb_neep_cb(struct urb *urb) | |||
229 | * will verify it. | 229 | * will verify it. |
230 | * | 230 | * |
231 | * Set i1480->evt_result with the result of getting the event or its | 231 | * Set i1480->evt_result with the result of getting the event or its |
232 | * size (if succesful). | 232 | * size (if successful). |
233 | * | 233 | * |
234 | * Delivers the data directly to i1480->evt_buf | 234 | * Delivers the data directly to i1480->evt_buf |
235 | */ | 235 | */ |
diff --git a/drivers/uwb/neh.c b/drivers/uwb/neh.c index 0af8916d9bef..78510a1f410d 100644 --- a/drivers/uwb/neh.c +++ b/drivers/uwb/neh.c | |||
@@ -150,7 +150,7 @@ void uwb_rc_neh_put(struct uwb_rc_neh *neh) | |||
150 | * 0xff is invalid, so they must not be used. Initialization | 150 | * 0xff is invalid, so they must not be used. Initialization |
151 | * fills up those two in the bitmap so they are not allocated. | 151 | * fills up those two in the bitmap so they are not allocated. |
152 | * | 152 | * |
153 | * We spread the allocation around to reduce the posiblity of two | 153 | * We spread the allocation around to reduce the possibility of two |
154 | * consecutive opened @neh's getting the same context ID assigned (to | 154 | * consecutive opened @neh's getting the same context ID assigned (to |
155 | * avoid surprises with late events that timed out long time ago). So | 155 | * avoid surprises with late events that timed out long time ago). So |
156 | * first we search from where @rc->ctx_roll is, if not found, we | 156 | * first we search from where @rc->ctx_roll is, if not found, we |
diff --git a/drivers/uwb/wlp/txrx.c b/drivers/uwb/wlp/txrx.c index 86a853b84119..7350ed6909f8 100644 --- a/drivers/uwb/wlp/txrx.c +++ b/drivers/uwb/wlp/txrx.c | |||
@@ -282,7 +282,7 @@ EXPORT_SYMBOL_GPL(wlp_receive_frame); | |||
282 | * and transmission will be done by the calling function. | 282 | * and transmission will be done by the calling function. |
283 | * @dst: On return this will contain the device address to which the | 283 | * @dst: On return this will contain the device address to which the |
284 | * frame is destined. | 284 | * frame is destined. |
285 | * @returns: 0 on success no tx : WLP header sucessfully applied to skb buffer, | 285 | * @returns: 0 on success no tx : WLP header successfully applied to skb buffer, |
286 | * calling function can proceed with tx | 286 | * calling function can proceed with tx |
287 | * 1 on success with tx : WLP will take over transmission of this | 287 | * 1 on success with tx : WLP will take over transmission of this |
288 | * frame | 288 | * frame |
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index d5e801076d33..3d886c6902f9 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
@@ -964,7 +964,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) | |||
964 | if (sinfo->atmel_lcdfb_power_control) | 964 | if (sinfo->atmel_lcdfb_power_control) |
965 | sinfo->atmel_lcdfb_power_control(1); | 965 | sinfo->atmel_lcdfb_power_control(1); |
966 | 966 | ||
967 | dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %lu\n", | 967 | dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %d\n", |
968 | info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base); | 968 | info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base); |
969 | 969 | ||
970 | return 0; | 970 | return 0; |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 913b4a47ae52..1ddeb4c34763 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -3276,7 +3276,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base) | |||
3276 | txtformat = "24 bit interface"; | 3276 | txtformat = "24 bit interface"; |
3277 | break; | 3277 | break; |
3278 | default: | 3278 | default: |
3279 | txtformat = "unkown format"; | 3279 | txtformat = "unknown format"; |
3280 | } | 3280 | } |
3281 | } else { | 3281 | } else { |
3282 | switch (format & 7) { | 3282 | switch (format & 7) { |
@@ -3299,7 +3299,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base) | |||
3299 | txtformat = "262144 colours (FDPI-2 mode)"; | 3299 | txtformat = "262144 colours (FDPI-2 mode)"; |
3300 | break; | 3300 | break; |
3301 | default: | 3301 | default: |
3302 | txtformat = "unkown format"; | 3302 | txtformat = "unknown format"; |
3303 | } | 3303 | } |
3304 | } | 3304 | } |
3305 | PRINTKI("%s%s %s monitor detected: %s\n", | 3305 | PRINTKI("%s%s %s monitor detected: %s\n", |
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c index 505c0823a105..2cf7ba52f67c 100644 --- a/drivers/video/backlight/atmel-pwm-bl.c +++ b/drivers/video/backlight/atmel-pwm-bl.c | |||
@@ -158,7 +158,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) | |||
158 | goto err_free_pwm; | 158 | goto err_free_pwm; |
159 | } | 159 | } |
160 | 160 | ||
161 | /* Turn display off by defatult. */ | 161 | /* Turn display off by default. */ |
162 | retval = gpio_direction_output(pwmbl->gpio_on, | 162 | retval = gpio_direction_output(pwmbl->gpio_on, |
163 | 0 ^ pdata->on_active_low); | 163 | 0 ^ pdata->on_active_low); |
164 | if (retval) | 164 | if (retval) |
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c index 50ec17dfc517..fa32b94a4546 100644 --- a/drivers/video/backlight/tosa_lcd.c +++ b/drivers/video/backlight/tosa_lcd.c | |||
@@ -177,7 +177,7 @@ static int __devinit tosa_lcd_probe(struct spi_device *spi) | |||
177 | if (!data) | 177 | if (!data) |
178 | return -ENOMEM; | 178 | return -ENOMEM; |
179 | 179 | ||
180 | data->is_vga = true; /* defaut to VGA mode */ | 180 | data->is_vga = true; /* default to VGA mode */ |
181 | 181 | ||
182 | /* | 182 | /* |
183 | * bits_per_word cannot be configured in platform data | 183 | * bits_per_word cannot be configured in platform data |
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c index 857b3668b3ba..6468a297e341 100644 --- a/drivers/video/console/sticore.c +++ b/drivers/video/console/sticore.c | |||
@@ -436,7 +436,7 @@ sti_init_glob_cfg(struct sti_struct *sti, | |||
436 | (offs < PCI_BASE_ADDRESS_0 || | 436 | (offs < PCI_BASE_ADDRESS_0 || |
437 | offs > PCI_BASE_ADDRESS_5)) { | 437 | offs > PCI_BASE_ADDRESS_5)) { |
438 | printk (KERN_WARNING | 438 | printk (KERN_WARNING |
439 | "STI pci region maping for region %d (%02x) can't be mapped\n", | 439 | "STI pci region mapping for region %d (%02x) can't be mapped\n", |
440 | i,sti->rm_entry[i]); | 440 | i,sti->rm_entry[i]); |
441 | continue; | 441 | continue; |
442 | } | 442 | } |
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c index c27ab1ed9604..e59c08320886 100644 --- a/drivers/video/fb_defio.c +++ b/drivers/video/fb_defio.c | |||
@@ -71,7 +71,7 @@ int fb_deferred_io_fsync(struct file *file, struct dentry *dentry, int datasync) | |||
71 | { | 71 | { |
72 | struct fb_info *info = file->private_data; | 72 | struct fb_info *info = file->private_data; |
73 | 73 | ||
74 | /* Skip if deferred io is complied-in but disabled on this fbdev */ | 74 | /* Skip if deferred io is compiled-in but disabled on this fbdev */ |
75 | if (!info->fbdefio) | 75 | if (!info->fbdefio) |
76 | return 0; | 76 | return 0; |
77 | 77 | ||
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c index f67db4268374..695fa013fe7e 100644 --- a/drivers/video/gbefb.c +++ b/drivers/video/gbefb.c | |||
@@ -701,7 +701,7 @@ static int gbefb_set_par(struct fb_info *info) | |||
701 | blocks of 512x128, 256x128 or 128x128 pixels, respectively for 8bit, | 701 | blocks of 512x128, 256x128 or 128x128 pixels, respectively for 8bit, |
702 | 16bit and 32 bit modes (64 kB). They cover the screen with partial | 702 | 16bit and 32 bit modes (64 kB). They cover the screen with partial |
703 | tiles on the right and/or bottom of the screen if needed. | 703 | tiles on the right and/or bottom of the screen if needed. |
704 | For exemple in 640x480 8 bit mode the mapping is: | 704 | For example in 640x480 8 bit mode the mapping is: |
705 | 705 | ||
706 | <-------- 640 -----> | 706 | <-------- 640 -----> |
707 | <---- 512 ----><128|384 offscreen> | 707 | <---- 512 ----><128|384 offscreen> |
diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c index 3d5277252ca3..b3973ebd1b0f 100644 --- a/drivers/video/omap/lcd_ams_delta.c +++ b/drivers/video/omap/lcd_ams_delta.c | |||
@@ -123,12 +123,12 @@ struct platform_driver ams_delta_panel_driver = { | |||
123 | }, | 123 | }, |
124 | }; | 124 | }; |
125 | 125 | ||
126 | static int ams_delta_panel_drv_init(void) | 126 | static int __init ams_delta_panel_drv_init(void) |
127 | { | 127 | { |
128 | return platform_driver_register(&ams_delta_panel_driver); | 128 | return platform_driver_register(&ams_delta_panel_driver); |
129 | } | 129 | } |
130 | 130 | ||
131 | static void ams_delta_panel_drv_cleanup(void) | 131 | static void __exit ams_delta_panel_drv_cleanup(void) |
132 | { | 132 | { |
133 | platform_driver_unregister(&ams_delta_panel_driver); | 133 | platform_driver_unregister(&ams_delta_panel_driver); |
134 | } | 134 | } |
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c index 2162eb09e0fe..8f3e2b4bb4f3 100644 --- a/drivers/video/omap/lcd_mipid.c +++ b/drivers/video/omap/lcd_mipid.c | |||
@@ -607,7 +607,7 @@ static struct spi_driver mipid_spi_driver = { | |||
607 | .remove = __devexit_p(mipid_spi_remove), | 607 | .remove = __devexit_p(mipid_spi_remove), |
608 | }; | 608 | }; |
609 | 609 | ||
610 | static int mipid_drv_init(void) | 610 | static int __init mipid_drv_init(void) |
611 | { | 611 | { |
612 | spi_register_driver(&mipid_spi_driver); | 612 | spi_register_driver(&mipid_spi_driver); |
613 | 613 | ||
@@ -615,7 +615,7 @@ static int mipid_drv_init(void) | |||
615 | } | 615 | } |
616 | module_init(mipid_drv_init); | 616 | module_init(mipid_drv_init); |
617 | 617 | ||
618 | static void mipid_drv_cleanup(void) | 618 | static void __exit mipid_drv_cleanup(void) |
619 | { | 619 | { |
620 | spi_unregister_driver(&mipid_spi_driver); | 620 | spi_unregister_driver(&mipid_spi_driver); |
621 | } | 621 | } |
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c index bba53714a7b1..f86012239bff 100644 --- a/drivers/video/sgivwfb.c +++ b/drivers/video/sgivwfb.c | |||
@@ -260,13 +260,13 @@ static int sgivwfb_check_var(struct fb_var_screeninfo *var, | |||
260 | var->grayscale = 0; /* No grayscale for now */ | 260 | var->grayscale = 0; /* No grayscale for now */ |
261 | 261 | ||
262 | /* determine valid resolution and timing */ | 262 | /* determine valid resolution and timing */ |
263 | for (min_mode = 0; min_mode < DBE_VT_SIZE; min_mode++) { | 263 | for (min_mode = 0; min_mode < ARRAY_SIZE(dbeVTimings); min_mode++) { |
264 | if (dbeVTimings[min_mode].width >= var->xres && | 264 | if (dbeVTimings[min_mode].width >= var->xres && |
265 | dbeVTimings[min_mode].height >= var->yres) | 265 | dbeVTimings[min_mode].height >= var->yres) |
266 | break; | 266 | break; |
267 | } | 267 | } |
268 | 268 | ||
269 | if (min_mode == DBE_VT_SIZE) | 269 | if (min_mode == ARRAY_SIZE(dbeVTimings)) |
270 | return -EINVAL; /* Resolution to high */ | 270 | return -EINVAL; /* Resolution to high */ |
271 | 271 | ||
272 | /* XXX FIXME - should try to pick best refresh rate */ | 272 | /* XXX FIXME - should try to pick best refresh rate */ |
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c index 6120f0c526fe..876648e15e9d 100644 --- a/drivers/video/stifb.c +++ b/drivers/video/stifb.c | |||
@@ -756,9 +756,9 @@ hyperResetPlanes(struct stifb_info *fb, int enable) | |||
756 | if (fb->info.var.bits_per_pixel == 32) | 756 | if (fb->info.var.bits_per_pixel == 32) |
757 | controlPlaneReg = 0x04000F00; | 757 | controlPlaneReg = 0x04000F00; |
758 | else | 758 | else |
759 | controlPlaneReg = 0x00000F00; /* 0x00000800 should be enought, but lets clear all 4 bits */ | 759 | controlPlaneReg = 0x00000F00; /* 0x00000800 should be enough, but lets clear all 4 bits */ |
760 | else | 760 | else |
761 | controlPlaneReg = 0x00000F00; /* 0x00000100 should be enought, but lets clear all 4 bits */ | 761 | controlPlaneReg = 0x00000F00; /* 0x00000100 should be enough, but lets clear all 4 bits */ |
762 | 762 | ||
763 | switch (enable) { | 763 | switch (enable) { |
764 | case ENABLE: | 764 | case ENABLE: |
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index ff43c8885028..980548390048 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c | |||
@@ -52,7 +52,7 @@ | |||
52 | * | 52 | * |
53 | * 0.1.3 (released 1999-11-02) added Attila's panning support, code | 53 | * 0.1.3 (released 1999-11-02) added Attila's panning support, code |
54 | * reorg, hwcursor address page size alignment | 54 | * reorg, hwcursor address page size alignment |
55 | * (for mmaping both frame buffer and regs), | 55 | * (for mmapping both frame buffer and regs), |
56 | * and my changes to get rid of hardcoded | 56 | * and my changes to get rid of hardcoded |
57 | * VGA i/o register locations (uses PCI | 57 | * VGA i/o register locations (uses PCI |
58 | * configuration info now) | 58 | * configuration info now) |
diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c index c5c32b6b6e6c..67b36932212b 100644 --- a/drivers/video/via/dvi.c +++ b/drivers/video/via/dvi.c | |||
@@ -467,7 +467,7 @@ static int dvi_get_panel_size_from_DDCv1(void) | |||
467 | default: | 467 | default: |
468 | viaparinfo->tmds_setting_info->dvi_panel_size = | 468 | viaparinfo->tmds_setting_info->dvi_panel_size = |
469 | VIA_RES_1024X768; | 469 | VIA_RES_1024X768; |
470 | DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d !\ | 470 | DEBUG_MSG(KERN_INFO "Unknown panel size max resolution = %d !\ |
471 | set default panel size.\n", max_h); | 471 | set default panel size.\n", max_h); |
472 | break; | 472 | break; |
473 | } | 473 | } |
@@ -534,7 +534,7 @@ static int dvi_get_panel_size_from_DDCv2(void) | |||
534 | default: | 534 | default: |
535 | viaparinfo->tmds_setting_info->dvi_panel_size = | 535 | viaparinfo->tmds_setting_info->dvi_panel_size = |
536 | VIA_RES_1024X768; | 536 | VIA_RES_1024X768; |
537 | DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d!\ | 537 | DEBUG_MSG(KERN_INFO "Unknown panel size max resolution = %d!\ |
538 | set default panel size.\n", HSize); | 538 | set default panel size.\n", HSize); |
539 | break; | 539 | break; |
540 | } | 540 | } |
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c index 3df17dc8c3d7..65ccd215d496 100644 --- a/drivers/video/vt8623fb.c +++ b/drivers/video/vt8623fb.c | |||
@@ -446,7 +446,7 @@ static int vt8623fb_set_par(struct fb_info *info) | |||
446 | 446 | ||
447 | svga_wseq_mask(0x1E, 0xF0, 0xF0); // DI/DVP bus | 447 | svga_wseq_mask(0x1E, 0xF0, 0xF0); // DI/DVP bus |
448 | svga_wseq_mask(0x2A, 0x0F, 0x0F); // DI/DVP bus | 448 | svga_wseq_mask(0x2A, 0x0F, 0x0F); // DI/DVP bus |
449 | svga_wseq_mask(0x16, 0x08, 0xBF); // FIFO read treshold | 449 | svga_wseq_mask(0x16, 0x08, 0xBF); // FIFO read threshold |
450 | vga_wseq(NULL, 0x17, 0x1F); // FIFO depth | 450 | vga_wseq(NULL, 0x17, 0x1F); // FIFO depth |
451 | vga_wseq(NULL, 0x18, 0x4E); | 451 | vga_wseq(NULL, 0x18, 0x4E); |
452 | svga_wseq_mask(0x1A, 0x08, 0x08); // enable MMIO ? | 452 | svga_wseq_mask(0x1A, 0x08, 0x08); // enable MMIO ? |
diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c index 381026c0bd7b..923cc68dba26 100644 --- a/drivers/watchdog/coh901327_wdt.c +++ b/drivers/watchdog/coh901327_wdt.c | |||
@@ -508,7 +508,7 @@ void coh901327_watchdog_reset(void) | |||
508 | * deactivating the watchdog before it is shut down by it. | 508 | * deactivating the watchdog before it is shut down by it. |
509 | * | 509 | * |
510 | * NOTE: on future versions of the watchdog, this restriction is | 510 | * NOTE: on future versions of the watchdog, this restriction is |
511 | * gone: the watchdog will be reloaded with a defaul value (1 min) | 511 | * gone: the watchdog will be reloaded with a default value (1 min) |
512 | * instead of last value, and you can conveniently set the watchdog | 512 | * instead of last value, and you can conveniently set the watchdog |
513 | * timeout to 10ms (value = 1) without any problems. | 513 | * timeout to 10ms (value = 1) without any problems. |
514 | */ | 514 | */ |
diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c index b6b3f59ab446..47d719717a3b 100644 --- a/drivers/watchdog/machzwd.c +++ b/drivers/watchdog/machzwd.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * wd#1 - 2 seconds; | 21 | * wd#1 - 2 seconds; |
22 | * wd#2 - 7.2 ms; | 22 | * wd#2 - 7.2 ms; |
23 | * After the expiration of wd#1, it can generate a NMI, SCI, SMI, or | 23 | * After the expiration of wd#1, it can generate a NMI, SCI, SMI, or |
24 | * a system RESET and it starts wd#2 that unconditionaly will RESET | 24 | * a system RESET and it starts wd#2 that unconditionally will RESET |
25 | * the system when the counter reaches zero. | 25 | * the system when the counter reaches zero. |
26 | * | 26 | * |
27 | * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> | 27 | * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> |
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c index 9748eed73196..c8eadd478175 100644 --- a/drivers/watchdog/sb_wdog.c +++ b/drivers/watchdog/sb_wdog.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Watchdog driver for SiByte SB1 SoCs | 2 | * Watchdog driver for SiByte SB1 SoCs |
3 | * | 3 | * |
4 | * Copyright (C) 2007 OnStor, Inc. * Andrew Sharp <andy.sharp@onstor.com> | 4 | * Copyright (C) 2007 OnStor, Inc. * Andrew Sharp <andy.sharp@lsi.com> |
5 | * | 5 | * |
6 | * This driver is intended to make the second of two hardware watchdogs | 6 | * This driver is intended to make the second of two hardware watchdogs |
7 | * on the Sibyte 12XX and 11XX SoCs available to the user. There are two | 7 | * on the Sibyte 12XX and 11XX SoCs available to the user. There are two |
@@ -326,7 +326,7 @@ static void __exit sbwdog_exit(void) | |||
326 | module_init(sbwdog_init); | 326 | module_init(sbwdog_init); |
327 | module_exit(sbwdog_exit); | 327 | module_exit(sbwdog_exit); |
328 | 328 | ||
329 | MODULE_AUTHOR("Andrew Sharp <andy.sharp@onstor.com>"); | 329 | MODULE_AUTHOR("Andrew Sharp <andy.sharp@lsi.com>"); |
330 | MODULE_DESCRIPTION("SiByte Watchdog"); | 330 | MODULE_DESCRIPTION("SiByte Watchdog"); |
331 | 331 | ||
332 | module_param(timeout, ulong, 0); | 332 | module_param(timeout, ulong, 0); |
diff --git a/drivers/watchdog/wdrtas.c b/drivers/watchdog/wdrtas.c index 3bde56bce63a..5bfb1f2c5319 100644 --- a/drivers/watchdog/wdrtas.c +++ b/drivers/watchdog/wdrtas.c | |||
@@ -542,7 +542,7 @@ static struct notifier_block wdrtas_notifier = { | |||
542 | /** | 542 | /** |
543 | * wdrtas_get_tokens - reads in RTAS tokens | 543 | * wdrtas_get_tokens - reads in RTAS tokens |
544 | * | 544 | * |
545 | * returns 0 on succes, <0 on failure | 545 | * returns 0 on success, <0 on failure |
546 | * | 546 | * |
547 | * wdrtas_get_tokens reads in the tokens for the RTAS calls used in | 547 | * wdrtas_get_tokens reads in the tokens for the RTAS calls used in |
548 | * this watchdog driver. It tolerates, if "get-sensor-state" and | 548 | * this watchdog driver. It tolerates, if "get-sensor-state" and |
@@ -598,7 +598,7 @@ static void wdrtas_unregister_devs(void) | |||
598 | /** | 598 | /** |
599 | * wdrtas_register_devs - registers the misc dev handlers | 599 | * wdrtas_register_devs - registers the misc dev handlers |
600 | * | 600 | * |
601 | * returns 0 on succes, <0 on failure | 601 | * returns 0 on success, <0 on failure |
602 | * | 602 | * |
603 | * wdrtas_register_devs registers the watchdog and temperature watchdog | 603 | * wdrtas_register_devs registers the watchdog and temperature watchdog |
604 | * misc devs | 604 | * misc devs |
@@ -630,7 +630,7 @@ static int wdrtas_register_devs(void) | |||
630 | /** | 630 | /** |
631 | * wdrtas_init - init function of the watchdog driver | 631 | * wdrtas_init - init function of the watchdog driver |
632 | * | 632 | * |
633 | * returns 0 on succes, <0 on failure | 633 | * returns 0 on success, <0 on failure |
634 | * | 634 | * |
635 | * registers the file handlers and the reboot notifier | 635 | * registers the file handlers and the reboot notifier |
636 | */ | 636 | */ |