diff options
490 files changed, 720 insertions, 831 deletions
diff --git a/Documentation/ABI/testing/procfs-diskstats b/Documentation/ABI/testing/procfs-diskstats index 99233902e09e..f91a973a37fe 100644 --- a/Documentation/ABI/testing/procfs-diskstats +++ b/Documentation/ABI/testing/procfs-diskstats | |||
| @@ -8,7 +8,7 @@ Description: | |||
| 8 | 1 - major number | 8 | 1 - major number |
| 9 | 2 - minor mumber | 9 | 2 - minor mumber |
| 10 | 3 - device name | 10 | 3 - device name |
| 11 | 4 - reads completed succesfully | 11 | 4 - reads completed successfully |
| 12 | 5 - reads merged | 12 | 5 - reads merged |
| 13 | 6 - sectors read | 13 | 6 - sectors read |
| 14 | 7 - time spent reading (ms) | 14 | 7 - time spent reading (ms) |
diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block index 5f3bedaf8e35..d2f90334bb93 100644 --- a/Documentation/ABI/testing/sysfs-block +++ b/Documentation/ABI/testing/sysfs-block | |||
| @@ -4,7 +4,7 @@ Contact: Jerome Marchand <jmarchan@redhat.com> | |||
| 4 | Description: | 4 | Description: |
| 5 | The /sys/block/<disk>/stat files displays the I/O | 5 | The /sys/block/<disk>/stat files displays the I/O |
| 6 | statistics of disk <disk>. They contain 11 fields: | 6 | statistics of disk <disk>. They contain 11 fields: |
| 7 | 1 - reads completed succesfully | 7 | 1 - reads completed successfully |
| 8 | 2 - reads merged | 8 | 2 - reads merged |
| 9 | 3 - sectors read | 9 | 3 - sectors read |
| 10 | 4 - time spent reading (ms) | 10 | 4 - time spent reading (ms) |
diff --git a/Documentation/DocBook/genericirq.tmpl b/Documentation/DocBook/genericirq.tmpl index c671a0168096..1448b33fd222 100644 --- a/Documentation/DocBook/genericirq.tmpl +++ b/Documentation/DocBook/genericirq.tmpl | |||
| @@ -417,8 +417,8 @@ desc->chip->end(); | |||
| 417 | </para> | 417 | </para> |
| 418 | <para> | 418 | <para> |
| 419 | To make use of the split implementation, replace the call to | 419 | To make use of the split implementation, replace the call to |
| 420 | __do_IRQ by a call to desc->chip->handle_irq() and associate | 420 | __do_IRQ by a call to desc->handle_irq() and associate |
| 421 | the appropriate handler function to desc->chip->handle_irq(). | 421 | the appropriate handler function to desc->handle_irq(). |
| 422 | In most cases the generic handler implementations should | 422 | In most cases the generic handler implementations should |
| 423 | be sufficient. | 423 | be sufficient. |
| 424 | </para> | 424 | </para> |
diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl index df0d089d0fb9..f508a8a27fea 100644 --- a/Documentation/DocBook/mtdnand.tmpl +++ b/Documentation/DocBook/mtdnand.tmpl | |||
| @@ -362,7 +362,7 @@ module_exit(board_cleanup); | |||
| 362 | <sect1 id="Multiple_chip_control"> | 362 | <sect1 id="Multiple_chip_control"> |
| 363 | <title>Multiple chip control</title> | 363 | <title>Multiple chip control</title> |
| 364 | <para> | 364 | <para> |
| 365 | The nand driver can control chip arrays. Therefor the | 365 | The nand driver can control chip arrays. Therefore the |
| 366 | board driver must provide an own select_chip function. This | 366 | board driver must provide an own select_chip function. This |
| 367 | function must (de)select the requested chip. | 367 | function must (de)select the requested chip. |
| 368 | The function pointer in the nand_chip structure must | 368 | The function pointer in the nand_chip structure must |
diff --git a/Documentation/DocBook/v4l/videodev2.h.xml b/Documentation/DocBook/v4l/videodev2.h.xml index 97002060ac4f..26303e58345f 100644 --- a/Documentation/DocBook/v4l/videodev2.h.xml +++ b/Documentation/DocBook/v4l/videodev2.h.xml | |||
| @@ -492,7 +492,7 @@ struct <link linkend="v4l2-jpegcompression">v4l2_jpegcompression</link> { | |||
| 492 | * you do, leave them untouched. | 492 | * you do, leave them untouched. |
| 493 | * Inluding less markers will make the | 493 | * Inluding less markers will make the |
| 494 | * resulting code smaller, but there will | 494 | * resulting code smaller, but there will |
| 495 | * be fewer aplications which can read it. | 495 | * be fewer applications which can read it. |
| 496 | * The presence of the APP and COM marker | 496 | * The presence of the APP and COM marker |
| 497 | * is influenced by APP_len and COM_len | 497 | * is influenced by APP_len and COM_len |
| 498 | * ONLY, not by this property! */ | 498 | * ONLY, not by this property! */ |
diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl index 7a2e0e98986a..0d0f7b4d4b1a 100644 --- a/Documentation/DocBook/writing-an-alsa-driver.tmpl +++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl | |||
| @@ -5318,7 +5318,7 @@ struct _snd_pcm_runtime { | |||
| 5318 | pages of the given size and map them onto the virtually contiguous | 5318 | pages of the given size and map them onto the virtually contiguous |
| 5319 | memory. The virtual pointer is addressed in runtime->dma_area. | 5319 | memory. The virtual pointer is addressed in runtime->dma_area. |
| 5320 | The physical address (runtime->dma_addr) is set to zero, | 5320 | The physical address (runtime->dma_addr) is set to zero, |
| 5321 | because the buffer is physically non-contigous. | 5321 | because the buffer is physically non-contiguous. |
| 5322 | The physical address table is set up in sgbuf->table. | 5322 | The physical address table is set up in sgbuf->table. |
| 5323 | You can get the physical address at a certain offset via | 5323 | You can get the physical address at a certain offset via |
| 5324 | <function>snd_pcm_sgbuf_get_addr()</function>. | 5324 | <function>snd_pcm_sgbuf_get_addr()</function>. |
diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb index bf2a9cdfe7bb..c8238e44ed6b 100644 --- a/Documentation/dvb/README.dvb-usb +++ b/Documentation/dvb/README.dvb-usb | |||
| @@ -85,7 +85,7 @@ http://www.linuxtv.org/wiki/index.php/DVB_USB | |||
| 85 | - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems | 85 | - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems |
| 86 | better settled there (added xfer_ops-struct) | 86 | better settled there (added xfer_ops-struct) |
| 87 | - created a common files for frontends (mc/p/mb) | 87 | - created a common files for frontends (mc/p/mb) |
| 88 | 2004-09-28 - added support for a new device (Unkown, vendor ID is Hyper-Paltek) | 88 | 2004-09-28 - added support for a new device (Unknown, vendor ID is Hyper-Paltek) |
| 89 | 2004-09-20 - added support for a new device (Compro DVB-U2000), thanks | 89 | 2004-09-20 - added support for a new device (Compro DVB-U2000), thanks |
| 90 | to Amaury Demol for reporting | 90 | to Amaury Demol for reporting |
| 91 | - changed usb TS transfer method (several urbs, stopping transfer | 91 | - changed usb TS transfer method (several urbs, stopping transfer |
diff --git a/Documentation/edac.txt b/Documentation/edac.txt index 06f8f46692dc..79c533223762 100644 --- a/Documentation/edac.txt +++ b/Documentation/edac.txt | |||
| @@ -80,7 +80,7 @@ is: | |||
| 80 | 80 | ||
| 81 | broken_parity_status | 81 | broken_parity_status |
| 82 | 82 | ||
| 83 | as is located in /sys/devices/pci<XXX>/0000:XX:YY.Z directorys for | 83 | as is located in /sys/devices/pci<XXX>/0000:XX:YY.Z directories for |
| 84 | PCI devices. | 84 | PCI devices. |
| 85 | 85 | ||
| 86 | FUTURE HARDWARE SCANNING | 86 | FUTURE HARDWARE SCANNING |
| @@ -288,9 +288,8 @@ Total UE count that had no information attribute fileY: | |||
| 288 | 288 | ||
| 289 | 'ue_noinfo_count' | 289 | 'ue_noinfo_count' |
| 290 | 290 | ||
| 291 | This attribute file displays the number of UEs that | 291 | This attribute file displays the number of UEs that have occurred |
| 292 | have occurred have occurred with no informations as to which DIMM | 292 | with no information as to which DIMM slot is having errors. |
| 293 | slot is having errors. | ||
| 294 | 293 | ||
| 295 | 294 | ||
| 296 | Total Correctable Errors count attribute file: | 295 | Total Correctable Errors count attribute file: |
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c index 098de5bce00a..42208511b5c0 100644 --- a/Documentation/lguest/lguest.c +++ b/Documentation/lguest/lguest.c | |||
| @@ -304,7 +304,7 @@ static void *map_zeroed_pages(unsigned int num) | |||
| 304 | addr = mmap(NULL, getpagesize() * num, | 304 | addr = mmap(NULL, getpagesize() * num, |
| 305 | PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, fd, 0); | 305 | PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, fd, 0); |
| 306 | if (addr == MAP_FAILED) | 306 | if (addr == MAP_FAILED) |
| 307 | err(1, "Mmaping %u pages of /dev/zero", num); | 307 | err(1, "Mmapping %u pages of /dev/zero", num); |
| 308 | 308 | ||
| 309 | /* | 309 | /* |
| 310 | * One neat mmap feature is that you can close the fd, and it | 310 | * One neat mmap feature is that you can close the fd, and it |
diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt index b152e81da592..c10c022b911c 100644 --- a/Documentation/oops-tracing.txt +++ b/Documentation/oops-tracing.txt | |||
| @@ -257,6 +257,8 @@ characters, each representing a particular tainted value. | |||
| 257 | 257 | ||
| 258 | 10: 'W' if a warning has previously been issued by the kernel. | 258 | 10: 'W' if a warning has previously been issued by the kernel. |
| 259 | 259 | ||
| 260 | 11: 'C' if a staging driver has been loaded. | ||
| 261 | |||
| 260 | The primary reason for the 'Tainted: ' string is to tell kernel | 262 | The primary reason for the 'Tainted: ' string is to tell kernel |
| 261 | debuggers if this is a clean kernel or if anything unusual has | 263 | debuggers if this is a clean kernel or if anything unusual has |
| 262 | occurred. Tainting is permanent: even if an offending module is | 264 | occurred. Tainting is permanent: even if an offending module is |
diff --git a/Documentation/power/regulator/consumer.txt b/Documentation/power/regulator/consumer.txt index 5f83fd24ea84..cdebb5145c25 100644 --- a/Documentation/power/regulator/consumer.txt +++ b/Documentation/power/regulator/consumer.txt | |||
| @@ -104,7 +104,7 @@ to set the limit to 500mA when supplying power. | |||
| 104 | 104 | ||
| 105 | Consumers can control their supply current limit by calling :- | 105 | Consumers can control their supply current limit by calling :- |
| 106 | 106 | ||
| 107 | int regulator_set_current_limit(regulator, min_uV, max_uV); | 107 | int regulator_set_current_limit(regulator, min_uA, max_uA); |
| 108 | 108 | ||
| 109 | Where min_uA and max_uA are the minimum and maximum acceptable current limit in | 109 | Where min_uA and max_uA are the minimum and maximum acceptable current limit in |
| 110 | microamps. | 110 | microamps. |
diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/scsi/ChangeLog.megaraid_sas index 151a7b718b8c..17ffa0607712 100644 --- a/Documentation/scsi/ChangeLog.megaraid_sas +++ b/Documentation/scsi/ChangeLog.megaraid_sas | |||
| @@ -247,7 +247,7 @@ ii. FW enables WCE bit in Mode Sense cmd for drives that are configured | |||
| 247 | Disks are exposed with WCE=1. User is advised to enable Write Back | 247 | Disks are exposed with WCE=1. User is advised to enable Write Back |
| 248 | mode only when the controller has battery backup. At this time | 248 | mode only when the controller has battery backup. At this time |
| 249 | Synhronize cache is not supported by the FW. Driver will short-cycle | 249 | Synhronize cache is not supported by the FW. Driver will short-cycle |
| 250 | the cmd and return sucess without sending down to FW. | 250 | the cmd and return success without sending down to FW. |
| 251 | 251 | ||
| 252 | 1 Release Date : Sun Jan. 14 11:21:32 PDT 2007 - | 252 | 1 Release Date : Sun Jan. 14 11:21:32 PDT 2007 - |
| 253 | Sumant Patro <Sumant.Patro@lsil.com>/Bo Yang | 253 | Sumant Patro <Sumant.Patro@lsil.com>/Bo Yang |
diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary index deab51ddc33e..4884cb33845d 100644 --- a/Documentation/spi/spi-summary +++ b/Documentation/spi/spi-summary | |||
| @@ -538,7 +538,7 @@ SPI MESSAGE QUEUE | |||
| 538 | The bulk of the driver will be managing the I/O queue fed by transfer(). | 538 | The bulk of the driver will be managing the I/O queue fed by transfer(). |
| 539 | 539 | ||
| 540 | That queue could be purely conceptual. For example, a driver used only | 540 | That queue could be purely conceptual. For example, a driver used only |
| 541 | for low-frequency sensor acess might be fine using synchronous PIO. | 541 | for low-frequency sensor access might be fine using synchronous PIO. |
| 542 | 542 | ||
| 543 | But the queue will probably be very real, using message->queue, PIO, | 543 | But the queue will probably be very real, using message->queue, PIO, |
| 544 | often DMA (especially if the root filesystem is in SPI flash), and | 544 | often DMA (especially if the root filesystem is in SPI flash), and |
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index a028b92001ed..8f7a0e73ef44 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt | |||
| @@ -139,9 +139,9 @@ core_pattern is used to specify a core dumpfile pattern name. | |||
| 139 | core_pipe_limit: | 139 | core_pipe_limit: |
| 140 | 140 | ||
| 141 | This sysctl is only applicable when core_pattern is configured to pipe core | 141 | This sysctl is only applicable when core_pattern is configured to pipe core |
| 142 | files to user space helper a (when the first character of core_pattern is a '|', | 142 | files to a user space helper (when the first character of core_pattern is a '|', |
| 143 | see above). When collecting cores via a pipe to an application, it is | 143 | see above). When collecting cores via a pipe to an application, it is |
| 144 | occasionally usefull for the collecting application to gather data about the | 144 | occasionally useful for the collecting application to gather data about the |
| 145 | crashing process from its /proc/pid directory. In order to do this safely, the | 145 | crashing process from its /proc/pid directory. In order to do this safely, the |
| 146 | kernel must wait for the collecting process to exit, so as not to remove the | 146 | kernel must wait for the collecting process to exit, so as not to remove the |
| 147 | crashing processes proc files prematurely. This in turn creates the possibility | 147 | crashing processes proc files prematurely. This in turn creates the possibility |
| @@ -152,7 +152,7 @@ applications in parallel. If this value is exceeded, then those crashing | |||
| 152 | processes above that value are noted via the kernel log and their cores are | 152 | processes above that value are noted via the kernel log and their cores are |
| 153 | skipped. 0 is a special value, indicating that unlimited processes may be | 153 | skipped. 0 is a special value, indicating that unlimited processes may be |
| 154 | captured in parallel, but that no waiting will take place (i.e. the collecting | 154 | captured in parallel, but that no waiting will take place (i.e. the collecting |
| 155 | process is not guaranteed access to /proc/<crahing pid>/). This value defaults | 155 | process is not guaranteed access to /proc/<crashing pid>/). This value defaults |
| 156 | to 0. | 156 | to 0. |
| 157 | 157 | ||
| 158 | ============================================================== | 158 | ============================================================== |
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt index a6e360d2055c..fc5790d36cd9 100644 --- a/Documentation/sysctl/vm.txt +++ b/Documentation/sysctl/vm.txt | |||
| @@ -370,7 +370,7 @@ The default is 1 percent. | |||
| 370 | mmap_min_addr | 370 | mmap_min_addr |
| 371 | 371 | ||
| 372 | This file indicates the amount of address space which a user process will | 372 | This file indicates the amount of address space which a user process will |
| 373 | be restricted from mmaping. Since kernel null dereference bugs could | 373 | be restricted from mmapping. Since kernel null dereference bugs could |
| 374 | accidentally operate based on the information in the first couple of pages | 374 | accidentally operate based on the information in the first couple of pages |
| 375 | of memory userspace processes should not be allowed to write to them. By | 375 | of memory userspace processes should not be allowed to write to them. By |
| 376 | default this value is set to 0 and no protections will be enforced by the | 376 | default this value is set to 0 and no protections will be enforced by the |
diff --git a/Documentation/timers/hpet.txt b/Documentation/timers/hpet.txt index 04763a325520..16d25e6b5a00 100644 --- a/Documentation/timers/hpet.txt +++ b/Documentation/timers/hpet.txt | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | The High Precision Event Timer (HPET) hardware follows a specification | 3 | The High Precision Event Timer (HPET) hardware follows a specification |
| 4 | by Intel and Microsoft which can be found at | 4 | by Intel and Microsoft which can be found at |
| 5 | 5 | ||
| 6 | http://www.intel.com/technology/architecture/hpetspec.htm | 6 | http://www.intel.com/hardwaredesign/hpetspec_1.pdf |
| 7 | 7 | ||
| 8 | Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision") | 8 | Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision") |
| 9 | and up to 32 comparators. Normally three or more comparators are provided, | 9 | and up to 32 comparators. Normally three or more comparators are provided, |
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt index 3f61825be499..6b29555b58b7 100644 --- a/Documentation/video4linux/gspca.txt +++ b/Documentation/video4linux/gspca.txt | |||
| @@ -6,7 +6,7 @@ The modules are: | |||
| 6 | 6 | ||
| 7 | xxxx vend:prod | 7 | xxxx vend:prod |
| 8 | ---- | 8 | ---- |
| 9 | spca501 0000:0000 MystFromOri Unknow Camera | 9 | spca501 0000:0000 MystFromOri Unknown Camera |
| 10 | m5602 0402:5602 ALi Video Camera Controller | 10 | m5602 0402:5602 ALi Video Camera Controller |
| 11 | spca501 040a:0002 Kodak DVC-325 | 11 | spca501 040a:0002 Kodak DVC-325 |
| 12 | spca500 040a:0300 Kodak EZ200 | 12 | spca500 040a:0300 Kodak EZ200 |
diff --git a/Documentation/vm/page-types.c b/Documentation/vm/page-types.c index 4793c6aac733..ea44ea502da1 100644 --- a/Documentation/vm/page-types.c +++ b/Documentation/vm/page-types.c | |||
| @@ -301,7 +301,7 @@ static char *page_flag_name(uint64_t flags) | |||
| 301 | present = (flags >> i) & 1; | 301 | present = (flags >> i) & 1; |
| 302 | if (!page_flag_names[i]) { | 302 | if (!page_flag_names[i]) { |
| 303 | if (present) | 303 | if (present) |
| 304 | fatal("unkown flag bit %d\n", i); | 304 | fatal("unknown flag bit %d\n", i); |
| 305 | continue; | 305 | continue; |
| 306 | } | 306 | } |
| 307 | buf[j++] = present ? page_flag_names[i][0] : '_'; | 307 | buf[j++] = present ? page_flag_names[i][0] : '_'; |
diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt index 510917ff59ed..b37300edf27c 100644 --- a/Documentation/vm/slub.txt +++ b/Documentation/vm/slub.txt | |||
| @@ -245,7 +245,7 @@ been overwritten. Here a string of 8 characters was written into a slab that | |||
| 245 | has the length of 8 characters. However, a 8 character string needs a | 245 | has the length of 8 characters. However, a 8 character string needs a |
| 246 | terminating 0. That zero has overwritten the first byte of the Redzone field. | 246 | terminating 0. That zero has overwritten the first byte of the Redzone field. |
| 247 | After reporting the details of the issue encountered the FIX SLUB message | 247 | After reporting the details of the issue encountered the FIX SLUB message |
| 248 | tell us that SLUB has restored the Redzone to its proper value and then | 248 | tells us that SLUB has restored the Redzone to its proper value and then |
| 249 | system operations continue. | 249 | system operations continue. |
| 250 | 250 | ||
| 251 | Emergency operations: | 251 | Emergency operations: |
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c index 10b403554b65..7b2c56d8f930 100644 --- a/arch/alpha/mm/numa.c +++ b/arch/alpha/mm/numa.c | |||
| @@ -197,7 +197,7 @@ setup_memory_node(int nid, void *kernel_end) | |||
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | if (bootmap_start == -1) | 199 | if (bootmap_start == -1) |
| 200 | panic("couldn't find a contigous place for the bootmap"); | 200 | panic("couldn't find a contiguous place for the bootmap"); |
| 201 | 201 | ||
| 202 | /* Allocate the bootmap and mark the whole MM as reserved. */ | 202 | /* Allocate the bootmap and mark the whole MM as reserved. */ |
| 203 | bootmap_size = init_bootmem_node(NODE_DATA(nid), bootmap_start, | 203 | bootmap_size = init_bootmem_node(NODE_DATA(nid), bootmap_start, |
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index 7713a08bb10c..37bda5f3dde3 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c | |||
| @@ -82,7 +82,7 @@ static int scoop_gpio_get(struct gpio_chip *chip, unsigned offset) | |||
| 82 | { | 82 | { |
| 83 | struct scoop_dev *sdev = container_of(chip, struct scoop_dev, gpio); | 83 | struct scoop_dev *sdev = container_of(chip, struct scoop_dev, gpio); |
| 84 | 84 | ||
| 85 | /* XXX: I'm usure, but it seems so */ | 85 | /* XXX: I'm unsure, but it seems so */ |
| 86 | return ioread16(sdev->base + SCOOP_GPRR) & (1 << (offset + 1)); | 86 | return ioread16(sdev->base + SCOOP_GPRR) & (1 << (offset + 1)); |
| 87 | } | 87 | } |
| 88 | 88 | ||
diff --git a/arch/arm/mach-bcmring/include/csp/reg.h b/arch/arm/mach-bcmring/include/csp/reg.h index e5f60bf5a1f3..56654d23c3d7 100644 --- a/arch/arm/mach-bcmring/include/csp/reg.h +++ b/arch/arm/mach-bcmring/include/csp/reg.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | /** | 16 | /** |
| 17 | * @file reg.h | 17 | * @file reg.h |
| 18 | * | 18 | * |
| 19 | * @brief Generic register defintions used in CSP | 19 | * @brief Generic register definitions used in CSP |
| 20 | */ | 20 | */ |
| 21 | /****************************************************************************/ | 21 | /****************************************************************************/ |
| 22 | 22 | ||
diff --git a/arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h b/arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h index 375066ad0186..cbf334d1c761 100644 --- a/arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h +++ b/arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h | |||
| @@ -83,7 +83,7 @@ typedef struct { | |||
| 83 | * @brief Get next available transaction width | 83 | * @brief Get next available transaction width |
| 84 | * | 84 | * |
| 85 | * | 85 | * |
| 86 | * @return On sucess : Next avail able transaction width | 86 | * @return On success : Next available transaction width |
| 87 | * On failure : dmacHw_TRANSACTION_WIDTH_8 | 87 | * On failure : dmacHw_TRANSACTION_WIDTH_8 |
| 88 | * | 88 | * |
| 89 | * @note | 89 | * @note |
diff --git a/arch/arm/mach-bcmring/include/mach/csp/mm_addr.h b/arch/arm/mach-bcmring/include/mach/csp/mm_addr.h index 86bb58d4f58c..ad58cf873377 100644 --- a/arch/arm/mach-bcmring/include/mach/csp/mm_addr.h +++ b/arch/arm/mach-bcmring/include/mach/csp/mm_addr.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | /** | 16 | /** |
| 17 | * @file mm_addr.h | 17 | * @file mm_addr.h |
| 18 | * | 18 | * |
| 19 | * @brief Memory Map address defintions | 19 | * @brief Memory Map address definitions |
| 20 | * | 20 | * |
| 21 | * @note | 21 | * @note |
| 22 | * None | 22 | * None |
diff --git a/arch/arm/mach-bcmring/include/mach/dma.h b/arch/arm/mach-bcmring/include/mach/dma.h index 847980c85c88..1f2c5319c056 100644 --- a/arch/arm/mach-bcmring/include/mach/dma.h +++ b/arch/arm/mach-bcmring/include/mach/dma.h | |||
| @@ -651,7 +651,7 @@ int dma_map_add_region(DMA_MemMap_t *memMap, /* Stores state information about t | |||
| 651 | /** | 651 | /** |
| 652 | * Creates a descriptor ring from a memory mapping. | 652 | * Creates a descriptor ring from a memory mapping. |
| 653 | * | 653 | * |
| 654 | * @return 0 on sucess, error code otherwise. | 654 | * @return 0 on success, error code otherwise. |
| 655 | */ | 655 | */ |
| 656 | /****************************************************************************/ | 656 | /****************************************************************************/ |
| 657 | 657 | ||
diff --git a/arch/arm/mach-lh7a40x/include/mach/hardware.h b/arch/arm/mach-lh7a40x/include/mach/hardware.h index 48e827d2fa56..59d2ace35217 100644 --- a/arch/arm/mach-lh7a40x/include/mach/hardware.h +++ b/arch/arm/mach-lh7a40x/include/mach/hardware.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | /* | 31 | /* |
| 32 | * This __REG() version gives the same results as the one above, except | 32 | * This __REG() version gives the same results as the one above, except |
| 33 | * that we are fooling gcc somehow so it generates far better and smaller | 33 | * that we are fooling gcc somehow so it generates far better and smaller |
| 34 | * assembly code for access to contigous registers. It's a shame that gcc | 34 | * assembly code for access to contiguous registers. It's a shame that gcc |
| 35 | * doesn't guess this by itself. | 35 | * doesn't guess this by itself. |
| 36 | */ | 36 | */ |
| 37 | #include <asm/types.h> | 37 | #include <asm/types.h> |
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 36dc5413cc97..bdf96eb523bc 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c | |||
| @@ -463,7 +463,7 @@ static void __init orion5x_setup_pci_wins(struct mbus_dram_target_info *dram) | |||
| 463 | writel(win_enable, PCI_BAR_ENABLE); | 463 | writel(win_enable, PCI_BAR_ENABLE); |
| 464 | 464 | ||
| 465 | /* | 465 | /* |
| 466 | * Disable automatic update of address remaping when writing to BARs. | 466 | * Disable automatic update of address remapping when writing to BARs. |
| 467 | */ | 467 | */ |
| 468 | orion5x_setbits(PCI_ADDR_DECODE_CTRL, 1); | 468 | orion5x_setbits(PCI_ADDR_DECODE_CTRL, 1); |
| 469 | } | 469 | } |
diff --git a/arch/arm/mach-pxa/include/mach/palmld.h b/arch/arm/mach-pxa/include/mach/palmld.h index 8721b8010221..ae536e86d8e8 100644 --- a/arch/arm/mach-pxa/include/mach/palmld.h +++ b/arch/arm/mach-pxa/include/mach/palmld.h | |||
| @@ -91,7 +91,7 @@ | |||
| 91 | /* BATTERY */ | 91 | /* BATTERY */ |
| 92 | #define PALMLD_BAT_MAX_VOLTAGE 4000 /* 4.00V maximum voltage */ | 92 | #define PALMLD_BAT_MAX_VOLTAGE 4000 /* 4.00V maximum voltage */ |
| 93 | #define PALMLD_BAT_MIN_VOLTAGE 3550 /* 3.55V critical voltage */ | 93 | #define PALMLD_BAT_MIN_VOLTAGE 3550 /* 3.55V critical voltage */ |
| 94 | #define PALMLD_BAT_MAX_CURRENT 0 /* unknokn */ | 94 | #define PALMLD_BAT_MAX_CURRENT 0 /* unknown */ |
| 95 | #define PALMLD_BAT_MIN_CURRENT 0 /* unknown */ | 95 | #define PALMLD_BAT_MIN_CURRENT 0 /* unknown */ |
| 96 | #define PALMLD_BAT_MAX_CHARGE 1 /* unknown */ | 96 | #define PALMLD_BAT_MAX_CHARGE 1 /* unknown */ |
| 97 | #define PALMLD_BAT_MIN_CHARGE 1 /* unknown */ | 97 | #define PALMLD_BAT_MIN_CHARGE 1 /* unknown */ |
diff --git a/arch/arm/mach-pxa/include/mach/palmt5.h b/arch/arm/mach-pxa/include/mach/palmt5.h index d15662aba008..6baf7469d4ec 100644 --- a/arch/arm/mach-pxa/include/mach/palmt5.h +++ b/arch/arm/mach-pxa/include/mach/palmt5.h | |||
| @@ -66,7 +66,7 @@ | |||
| 66 | /* BATTERY */ | 66 | /* BATTERY */ |
| 67 | #define PALMT5_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */ | 67 | #define PALMT5_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */ |
| 68 | #define PALMT5_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */ | 68 | #define PALMT5_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */ |
| 69 | #define PALMT5_BAT_MAX_CURRENT 0 /* unknokn */ | 69 | #define PALMT5_BAT_MAX_CURRENT 0 /* unknown */ |
| 70 | #define PALMT5_BAT_MIN_CURRENT 0 /* unknown */ | 70 | #define PALMT5_BAT_MIN_CURRENT 0 /* unknown */ |
| 71 | #define PALMT5_BAT_MAX_CHARGE 1 /* unknown */ | 71 | #define PALMT5_BAT_MAX_CHARGE 1 /* unknown */ |
| 72 | #define PALMT5_BAT_MIN_CHARGE 1 /* unknown */ | 72 | #define PALMT5_BAT_MIN_CHARGE 1 /* unknown */ |
diff --git a/arch/arm/mach-pxa/include/mach/palmtc.h b/arch/arm/mach-pxa/include/mach/palmtc.h index 3dc9b074ab46..3f9dd3fd4638 100644 --- a/arch/arm/mach-pxa/include/mach/palmtc.h +++ b/arch/arm/mach-pxa/include/mach/palmtc.h | |||
| @@ -68,7 +68,7 @@ | |||
| 68 | /* BATTERY */ | 68 | /* BATTERY */ |
| 69 | #define PALMTC_BAT_MAX_VOLTAGE 4000 /* 4.00V maximum voltage */ | 69 | #define PALMTC_BAT_MAX_VOLTAGE 4000 /* 4.00V maximum voltage */ |
| 70 | #define PALMTC_BAT_MIN_VOLTAGE 3550 /* 3.55V critical voltage */ | 70 | #define PALMTC_BAT_MIN_VOLTAGE 3550 /* 3.55V critical voltage */ |
| 71 | #define PALMTC_BAT_MAX_CURRENT 0 /* unknokn */ | 71 | #define PALMTC_BAT_MAX_CURRENT 0 /* unknown */ |
| 72 | #define PALMTC_BAT_MIN_CURRENT 0 /* unknown */ | 72 | #define PALMTC_BAT_MIN_CURRENT 0 /* unknown */ |
| 73 | #define PALMTC_BAT_MAX_CHARGE 1 /* unknown */ | 73 | #define PALMTC_BAT_MAX_CHARGE 1 /* unknown */ |
| 74 | #define PALMTC_BAT_MIN_CHARGE 1 /* unknown */ | 74 | #define PALMTC_BAT_MIN_CHARGE 1 /* unknown */ |
diff --git a/arch/arm/mach-pxa/include/mach/palmte2.h b/arch/arm/mach-pxa/include/mach/palmte2.h index 12361341f9d8..f89e989a7637 100644 --- a/arch/arm/mach-pxa/include/mach/palmte2.h +++ b/arch/arm/mach-pxa/include/mach/palmte2.h | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | /* BATTERY */ | 59 | /* BATTERY */ |
| 60 | #define PALMTE2_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */ | 60 | #define PALMTE2_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */ |
| 61 | #define PALMTE2_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */ | 61 | #define PALMTE2_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */ |
| 62 | #define PALMTE2_BAT_MAX_CURRENT 0 /* unknokn */ | 62 | #define PALMTE2_BAT_MAX_CURRENT 0 /* unknown */ |
| 63 | #define PALMTE2_BAT_MIN_CURRENT 0 /* unknown */ | 63 | #define PALMTE2_BAT_MIN_CURRENT 0 /* unknown */ |
| 64 | #define PALMTE2_BAT_MAX_CHARGE 1 /* unknown */ | 64 | #define PALMTE2_BAT_MAX_CHARGE 1 /* unknown */ |
| 65 | #define PALMTE2_BAT_MIN_CHARGE 1 /* unknown */ | 65 | #define PALMTE2_BAT_MIN_CHARGE 1 /* unknown */ |
diff --git a/arch/arm/mach-pxa/include/mach/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h index 1be0db6ed55e..10abc4f2e8e4 100644 --- a/arch/arm/mach-pxa/include/mach/palmtx.h +++ b/arch/arm/mach-pxa/include/mach/palmtx.h | |||
| @@ -94,7 +94,7 @@ | |||
| 94 | /* BATTERY */ | 94 | /* BATTERY */ |
| 95 | #define PALMTX_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */ | 95 | #define PALMTX_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */ |
| 96 | #define PALMTX_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */ | 96 | #define PALMTX_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */ |
| 97 | #define PALMTX_BAT_MAX_CURRENT 0 /* unknokn */ | 97 | #define PALMTX_BAT_MAX_CURRENT 0 /* unknown */ |
| 98 | #define PALMTX_BAT_MIN_CURRENT 0 /* unknown */ | 98 | #define PALMTX_BAT_MIN_CURRENT 0 /* unknown */ |
| 99 | #define PALMTX_BAT_MAX_CHARGE 1 /* unknown */ | 99 | #define PALMTX_BAT_MAX_CHARGE 1 /* unknown */ |
| 100 | #define PALMTX_BAT_MIN_CHARGE 1 /* unknown */ | 100 | #define PALMTX_BAT_MIN_CHARGE 1 /* unknown */ |
diff --git a/arch/arm/mach-pxa/include/mach/palmz72.h b/arch/arm/mach-pxa/include/mach/palmz72.h index 2806ef69ba5a..2bbcf70dd935 100644 --- a/arch/arm/mach-pxa/include/mach/palmz72.h +++ b/arch/arm/mach-pxa/include/mach/palmz72.h | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | /* Battery */ | 49 | /* Battery */ |
| 50 | #define PALMZ72_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */ | 50 | #define PALMZ72_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */ |
| 51 | #define PALMZ72_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */ | 51 | #define PALMZ72_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */ |
| 52 | #define PALMZ72_BAT_MAX_CURRENT 0 /* unknokn */ | 52 | #define PALMZ72_BAT_MAX_CURRENT 0 /* unknown */ |
| 53 | #define PALMZ72_BAT_MIN_CURRENT 0 /* unknown */ | 53 | #define PALMZ72_BAT_MIN_CURRENT 0 /* unknown */ |
| 54 | #define PALMZ72_BAT_MAX_CHARGE 1 /* unknown */ | 54 | #define PALMZ72_BAT_MAX_CHARGE 1 /* unknown */ |
| 55 | #define PALMZ72_BAT_MIN_CHARGE 1 /* unknown */ | 55 | #define PALMZ72_BAT_MIN_CHARGE 1 /* unknown */ |
diff --git a/arch/arm/mach-s3c2400/Kconfig b/arch/arm/mach-s3c2400/Kconfig index deab0722836e..fdd8f5e96faf 100644 --- a/arch/arm/mach-s3c2400/Kconfig +++ b/arch/arm/mach-s3c2400/Kconfig | |||
| @@ -1,13 +1,7 @@ | |||
| 1 | # arch/arm/mach-s3c2400/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
| 4 | # | 2 | # |
| 5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
| 6 | 4 | ||
| 7 | |||
| 8 | |||
| 9 | menu "S3C2400 Machines" | 5 | menu "S3C2400 Machines" |
| 10 | 6 | ||
| 11 | |||
| 12 | endmenu | 7 | endmenu |
| 13 | |||
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index dd1fcc7e6708..554731868b07 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/mach-s3c2410/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
| 4 | # | 2 | # |
| 5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig index c2bdc4635d12..9a8c0657ae50 100644 --- a/arch/arm/mach-s3c2412/Kconfig +++ b/arch/arm/mach-s3c2412/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/mach-s3c2412/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
| 4 | # | 2 | # |
| 5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
| @@ -90,6 +88,4 @@ config MACH_VSTMS | |||
| 90 | help | 88 | help |
| 91 | Say Y here if you are using an VSTMS board | 89 | Say Y here if you are using an VSTMS board |
| 92 | 90 | ||
| 93 | |||
| 94 | endmenu | 91 | endmenu |
| 95 | |||
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index cf10e14b7b49..80879358eb2f 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/mach-s3c2440/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
| 4 | # | 2 | # |
| 5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
| @@ -122,4 +120,3 @@ config MACH_MINI2440 | |||
| 122 | available via various sources. It can come with a 3.5" or 7" touch LCD. | 120 | available via various sources. It can come with a 3.5" or 7" touch LCD. |
| 123 | 121 | ||
| 124 | endmenu | 122 | endmenu |
| 125 | |||
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig index 103e913f2258..8d3811852fc7 100644 --- a/arch/arm/mach-s3c2442/Kconfig +++ b/arch/arm/mach-s3c2442/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/mach-s3c2442/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
| 4 | # | 2 | # |
| 5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
| @@ -36,6 +34,4 @@ config MACH_NEO1973_GTA02 | |||
| 36 | help | 34 | help |
| 37 | Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone | 35 | Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone |
| 38 | 36 | ||
| 39 | |||
| 40 | endmenu | 37 | endmenu |
| 41 | |||
diff --git a/arch/arm/mach-s3c2443/Kconfig b/arch/arm/mach-s3c2443/Kconfig index 212141baebec..4314c4424909 100644 --- a/arch/arm/mach-s3c2443/Kconfig +++ b/arch/arm/mach-s3c2443/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/mach-s3c2443/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
| 4 | # | 2 | # |
| 5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
diff --git a/arch/arm/mach-s3c6400/Kconfig b/arch/arm/mach-s3c6400/Kconfig index 770b72067e3d..a250bf68709f 100644 --- a/arch/arm/mach-s3c6400/Kconfig +++ b/arch/arm/mach-s3c6400/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/mach-s3c6400/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2008 Openmoko, Inc. | 1 | # Copyright 2008 Openmoko, Inc. |
| 4 | # Simtec Electronics, Ben Dooks <ben@simtec.co.uk> | 2 | # Simtec Electronics, Ben Dooks <ben@simtec.co.uk> |
| 5 | # | 3 | # |
diff --git a/arch/arm/mach-s3c6400/setup-sdhci.c b/arch/arm/mach-s3c6400/setup-sdhci.c index b93dafbee1f4..1039937403be 100644 --- a/arch/arm/mach-s3c6400/setup-sdhci.c +++ b/arch/arm/mach-s3c6400/setup-sdhci.c | |||
| @@ -30,7 +30,7 @@ char *s3c6400_hsmmc_clksrcs[4] = { | |||
| 30 | [0] = "hsmmc", | 30 | [0] = "hsmmc", |
| 31 | [1] = "hsmmc", | 31 | [1] = "hsmmc", |
| 32 | [2] = "mmc_bus", | 32 | [2] = "mmc_bus", |
| 33 | /* [3] = "48m", - note not succesfully used yet */ | 33 | /* [3] = "48m", - note not successfully used yet */ |
| 34 | }; | 34 | }; |
| 35 | 35 | ||
| 36 | void s3c6400_setup_sdhci_cfg_card(struct platform_device *dev, | 36 | void s3c6400_setup_sdhci_cfg_card(struct platform_device *dev, |
diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig index 72d4b11b2077..162f4561f80f 100644 --- a/arch/arm/mach-s3c6410/Kconfig +++ b/arch/arm/mach-s3c6410/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/mach-s3c6410/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2008 Openmoko, Inc. | 1 | # Copyright 2008 Openmoko, Inc. |
| 4 | # Copyright 2008 Simtec Electronics | 2 | # Copyright 2008 Simtec Electronics |
| 5 | # | 3 | # |
diff --git a/arch/arm/mach-s3c6410/setup-sdhci.c b/arch/arm/mach-s3c6410/setup-sdhci.c index 20666f3bd478..816d2d9f9ef8 100644 --- a/arch/arm/mach-s3c6410/setup-sdhci.c +++ b/arch/arm/mach-s3c6410/setup-sdhci.c | |||
| @@ -30,7 +30,7 @@ char *s3c6410_hsmmc_clksrcs[4] = { | |||
| 30 | [0] = "hsmmc", | 30 | [0] = "hsmmc", |
| 31 | [1] = "hsmmc", | 31 | [1] = "hsmmc", |
| 32 | [2] = "mmc_bus", | 32 | [2] = "mmc_bus", |
| 33 | /* [3] = "48m", - note not succesfully used yet */ | 33 | /* [3] = "48m", - note not successfully used yet */ |
| 34 | }; | 34 | }; |
| 35 | 35 | ||
| 36 | 36 | ||
diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig index 0dd2b8c6eabe..27ec167d2808 100644 --- a/arch/arm/mach-s5pc100/Kconfig +++ b/arch/arm/mach-s5pc100/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/mach-s5pc100/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2009 Samsung Electronics Co. | 1 | # Copyright 2009 Samsung Electronics Co. |
| 4 | # Byungho Min <bhmin@samsung.com> | 2 | # Byungho Min <bhmin@samsung.com> |
| 5 | # | 3 | # |
diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c index cb4521a6f42d..ad660350c296 100644 --- a/arch/arm/mach-sa1100/dma.c +++ b/arch/arm/mach-sa1100/dma.c | |||
| @@ -65,7 +65,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id) | |||
| 65 | 65 | ||
| 66 | 66 | ||
| 67 | /** | 67 | /** |
| 68 | * sa1100_request_dma - allocate one of the SA11x0's DMA chanels | 68 | * sa1100_request_dma - allocate one of the SA11x0's DMA channels |
| 69 | * @device: The SA11x0 peripheral targeted by this request | 69 | * @device: The SA11x0 peripheral targeted by this request |
| 70 | * @device_id: An ascii name for the claiming device | 70 | * @device_id: An ascii name for the claiming device |
| 71 | * @callback: Function to be called when the DMA completes | 71 | * @callback: Function to be called when the DMA completes |
diff --git a/arch/arm/mach-u300/include/mach/u300-regs.h b/arch/arm/mach-u300/include/mach/u300-regs.h index 88333dfb19fc..56721a0cd2af 100644 --- a/arch/arm/mach-u300/include/mach/u300-regs.h +++ b/arch/arm/mach-u300/include/mach/u300-regs.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * Copyright (C) 2006-2009 ST-Ericsson AB | 6 | * Copyright (C) 2006-2009 ST-Ericsson AB |
| 7 | * License terms: GNU General Public License (GPL) version 2 | 7 | * License terms: GNU General Public License (GPL) version 2 |
| 8 | * Basic register address definitions in physical memory and | 8 | * Basic register address definitions in physical memory and |
| 9 | * some block defintions for core devices like the timer. | 9 | * some block definitions for core devices like the timer. |
| 10 | * Author: Linus Walleij <linus.walleij@stericsson.com> | 10 | * Author: Linus Walleij <linus.walleij@stericsson.com> |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx3.h b/arch/arm/plat-mxc/include/mach/iomux-mx3.h index eaabd4e96925..e1fc6da1cd10 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx3.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx3.h | |||
| @@ -112,7 +112,7 @@ enum iomux_gp_func { | |||
| 112 | * setups a single pin: | 112 | * setups a single pin: |
| 113 | * - reserves the pin so that it is not claimed by another driver | 113 | * - reserves the pin so that it is not claimed by another driver |
| 114 | * - setups the iomux according to the configuration | 114 | * - setups the iomux according to the configuration |
| 115 | * - if the pin is configured as a GPIO, we claim it throug kernel gpiolib | 115 | * - if the pin is configured as a GPIO, we claim it through kernel gpiolib |
| 116 | */ | 116 | */ |
| 117 | int mxc_iomux_alloc_pin(const unsigned int pin, const char *label); | 117 | int mxc_iomux_alloc_pin(const unsigned int pin, const char *label); |
| 118 | /* | 118 | /* |
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mxc91231.h b/arch/arm/plat-mxc/include/mach/iomux-mxc91231.h index 9f13061192c8..3887f3fe29d4 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mxc91231.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | |||
| @@ -48,7 +48,7 @@ | |||
| 48 | * setups a single pin: | 48 | * setups a single pin: |
| 49 | * - reserves the pin so that it is not claimed by another driver | 49 | * - reserves the pin so that it is not claimed by another driver |
| 50 | * - setups the iomux according to the configuration | 50 | * - setups the iomux according to the configuration |
| 51 | * - if the pin is configured as a GPIO, we claim it throug kernel gpiolib | 51 | * - if the pin is configured as a GPIO, we claim it through kernel gpiolib |
| 52 | */ | 52 | */ |
| 53 | int mxc_iomux_alloc_pin(const unsigned int pin_mode, const char *label); | 53 | int mxc_iomux_alloc_pin(const unsigned int pin_mode, const char *label); |
| 54 | /* | 54 | /* |
diff --git a/arch/arm/plat-mxc/pwm.c b/arch/arm/plat-mxc/pwm.c index 5cdbd605ac05..4ff6dfe04283 100644 --- a/arch/arm/plat-mxc/pwm.c +++ b/arch/arm/plat-mxc/pwm.c | |||
| @@ -94,7 +94,7 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) | |||
| 94 | * register to follow the ratio of duty_ns vs. period_ns | 94 | * register to follow the ratio of duty_ns vs. period_ns |
| 95 | * accordingly. | 95 | * accordingly. |
| 96 | * | 96 | * |
| 97 | * This is good enought for programming the brightness of | 97 | * This is good enough for programming the brightness of |
| 98 | * the LCD backlight. | 98 | * the LCD backlight. |
| 99 | * | 99 | * |
| 100 | * The real implementation would divide PERCLK[0] first by | 100 | * The real implementation would divide PERCLK[0] first by |
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index be4ce070fb4c..d17375e06a1e 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
| @@ -1252,7 +1252,7 @@ static void create_dma_lch_chain(int lch_head, int lch_queue) | |||
| 1252 | * OMAP_DMA_DYNAMIC_CHAIN | 1252 | * OMAP_DMA_DYNAMIC_CHAIN |
| 1253 | * @params - Channel parameters | 1253 | * @params - Channel parameters |
| 1254 | * | 1254 | * |
| 1255 | * @return - Succes : 0 | 1255 | * @return - Success : 0 |
| 1256 | * Failure: -EINVAL/-ENOMEM | 1256 | * Failure: -EINVAL/-ENOMEM |
| 1257 | */ | 1257 | */ |
| 1258 | int omap_request_dma_chain(int dev_id, const char *dev_name, | 1258 | int omap_request_dma_chain(int dev_id, const char *dev_name, |
diff --git a/arch/arm/plat-omap/include/plat/omap16xx.h b/arch/arm/plat-omap/include/plat/omap16xx.h index 0e69b504c25f..7560b4d583a3 100644 --- a/arch/arm/plat-omap/include/plat/omap16xx.h +++ b/arch/arm/plat-omap/include/plat/omap16xx.h | |||
| @@ -124,7 +124,7 @@ | |||
| 124 | #define TIPB_SWITCH_BASE (0xfffbc800) | 124 | #define TIPB_SWITCH_BASE (0xfffbc800) |
| 125 | #define OMAP16XX_MMCSD2_SSW_MPU_CONF (TIPB_SWITCH_BASE + 0x160) | 125 | #define OMAP16XX_MMCSD2_SSW_MPU_CONF (TIPB_SWITCH_BASE + 0x160) |
| 126 | 126 | ||
| 127 | /* UART3 Registers Maping through MPU bus */ | 127 | /* UART3 Registers Mapping through MPU bus */ |
| 128 | #define UART3_RHR (OMAP_UART3_BASE + 0) | 128 | #define UART3_RHR (OMAP_UART3_BASE + 0) |
| 129 | #define UART3_THR (OMAP_UART3_BASE + 0) | 129 | #define UART3_THR (OMAP_UART3_BASE + 0) |
| 130 | #define UART3_DLL (OMAP_UART3_BASE + 0) | 130 | #define UART3_DLL (OMAP_UART3_BASE + 0) |
diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig index e139a72c2149..9e9d0286e48f 100644 --- a/arch/arm/plat-s3c/Kconfig +++ b/arch/arm/plat-s3c/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/plat-s3c/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
| 4 | # | 2 | # |
| 5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig index 20fbf936bb93..342647eb91d8 100644 --- a/arch/arm/plat-s3c24xx/Kconfig +++ b/arch/arm/plat-s3c24xx/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/plat-s3c24xx/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2007 Simtec Electronics | 1 | # Copyright 2007 Simtec Electronics |
| 4 | # | 2 | # |
| 5 | # Licensed under GPLv2 | 3 | # Licensed under GPLv2 |
diff --git a/arch/arm/plat-s3c24xx/include/plat/map.h b/arch/arm/plat-s3c24xx/include/plat/map.h index c4d133436fc7..bd534d32b993 100644 --- a/arch/arm/plat-s3c24xx/include/plat/map.h +++ b/arch/arm/plat-s3c24xx/include/plat/map.h | |||
| @@ -64,7 +64,7 @@ | |||
| 64 | /* the calculation for the VA of this must ensure that | 64 | /* the calculation for the VA of this must ensure that |
| 65 | * it is the same distance apart from the UART in the | 65 | * it is the same distance apart from the UART in the |
| 66 | * phsyical address space, as the initial mapping for the IO | 66 | * phsyical address space, as the initial mapping for the IO |
| 67 | * is done as a 1:1 maping. This puts it (currently) at | 67 | * is done as a 1:1 mapping. This puts it (currently) at |
| 68 | * 0xFA800000, which is not in the way of any current mapping | 68 | * 0xFA800000, which is not in the way of any current mapping |
| 69 | * by the base system. | 69 | * by the base system. |
| 70 | */ | 70 | */ |
diff --git a/arch/arm/plat-s3c64xx/Kconfig b/arch/arm/plat-s3c64xx/Kconfig index bcfa778614d8..e6da87a5885c 100644 --- a/arch/arm/plat-s3c64xx/Kconfig +++ b/arch/arm/plat-s3c64xx/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/plat-s3c64xx/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2008 Openmoko, Inc. | 1 | # Copyright 2008 Openmoko, Inc. |
| 4 | # Copyright 2008 Simtec Electronics | 2 | # Copyright 2008 Simtec Electronics |
| 5 | # Ben Dooks <ben@simtec.co.uk> | 3 | # Ben Dooks <ben@simtec.co.uk> |
diff --git a/arch/arm/plat-s5pc1xx/Kconfig b/arch/arm/plat-s5pc1xx/Kconfig index 1608e62b0c9d..b7b9e91c0243 100644 --- a/arch/arm/plat-s5pc1xx/Kconfig +++ b/arch/arm/plat-s5pc1xx/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # arch/arm/plat-s5pc1xx/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright 2009 Samsung Electronics Co. | 1 | # Copyright 2009 Samsung Electronics Co. |
| 4 | # Byungho Min <bhmin@samsung.com> | 2 | # Byungho Min <bhmin@samsung.com> |
| 5 | # | 3 | # |
diff --git a/arch/avr32/boards/hammerhead/Kconfig b/arch/avr32/boards/hammerhead/Kconfig index fda2331f9789..5c13d785cc70 100644 --- a/arch/avr32/boards/hammerhead/Kconfig +++ b/arch/avr32/boards/hammerhead/Kconfig | |||
| @@ -24,7 +24,7 @@ config BOARD_HAMMERHEAD_SND | |||
| 24 | bool "Atmel AC97 Sound support" | 24 | bool "Atmel AC97 Sound support" |
| 25 | help | 25 | help |
| 26 | This enables Sound support for the Hammerhead board. You may | 26 | This enables Sound support for the Hammerhead board. You may |
| 27 | also go trough the ALSA settings to get it working. | 27 | also go through the ALSA settings to get it working. |
| 28 | 28 | ||
| 29 | Choose 'Y' here if you have ordered a Corona daugther board and | 29 | Choose 'Y' here if you have ordered a Corona daugther board and |
| 30 | want to make your board funky. | 30 | want to make your board funky. |
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index 6b7325d634af..78cb3d38f899 100644 --- a/arch/blackfin/kernel/traps.c +++ b/arch/blackfin/kernel/traps.c | |||
| @@ -619,7 +619,7 @@ asmlinkage notrace void trap_c(struct pt_regs *fp) | |||
| 619 | 619 | ||
| 620 | /* | 620 | /* |
| 621 | * Similar to get_user, do some address checking, then dereference | 621 | * Similar to get_user, do some address checking, then dereference |
| 622 | * Return true on sucess, false on bad address | 622 | * Return true on success, false on bad address |
| 623 | */ | 623 | */ |
| 624 | static bool get_instruction(unsigned short *val, unsigned short *address) | 624 | static bool get_instruction(unsigned short *val, unsigned short *address) |
| 625 | { | 625 | { |
diff --git a/arch/blackfin/mach-bf518/include/mach/defBF51x_base.h b/arch/blackfin/mach-bf518/include/mach/defBF51x_base.h index e06f4112c695..f9fd2b2a2956 100644 --- a/arch/blackfin/mach-bf518/include/mach/defBF51x_base.h +++ b/arch/blackfin/mach-bf518/include/mach/defBF51x_base.h | |||
| @@ -542,7 +542,7 @@ | |||
| 542 | #define HMDMA0_CONTROL 0xFFC03300 /* Handshake MDMA0 Control Register */ | 542 | #define HMDMA0_CONTROL 0xFFC03300 /* Handshake MDMA0 Control Register */ |
| 543 | #define HMDMA0_ECINIT 0xFFC03304 /* HMDMA0 Initial Edge Count Register */ | 543 | #define HMDMA0_ECINIT 0xFFC03304 /* HMDMA0 Initial Edge Count Register */ |
| 544 | #define HMDMA0_BCINIT 0xFFC03308 /* HMDMA0 Initial Block Count Register */ | 544 | #define HMDMA0_BCINIT 0xFFC03308 /* HMDMA0 Initial Block Count Register */ |
| 545 | #define HMDMA0_ECURGENT 0xFFC0330C /* HMDMA0 Urgent Edge Count Threshhold Register */ | 545 | #define HMDMA0_ECURGENT 0xFFC0330C /* HMDMA0 Urgent Edge Count Threshold Register */ |
| 546 | #define HMDMA0_ECOVERFLOW 0xFFC03310 /* HMDMA0 Edge Count Overflow Interrupt Register */ | 546 | #define HMDMA0_ECOVERFLOW 0xFFC03310 /* HMDMA0 Edge Count Overflow Interrupt Register */ |
| 547 | #define HMDMA0_ECOUNT 0xFFC03314 /* HMDMA0 Current Edge Count Register */ | 547 | #define HMDMA0_ECOUNT 0xFFC03314 /* HMDMA0 Current Edge Count Register */ |
| 548 | #define HMDMA0_BCOUNT 0xFFC03318 /* HMDMA0 Current Block Count Register */ | 548 | #define HMDMA0_BCOUNT 0xFFC03318 /* HMDMA0 Current Block Count Register */ |
| @@ -550,7 +550,7 @@ | |||
| 550 | #define HMDMA1_CONTROL 0xFFC03340 /* Handshake MDMA1 Control Register */ | 550 | #define HMDMA1_CONTROL 0xFFC03340 /* Handshake MDMA1 Control Register */ |
| 551 | #define HMDMA1_ECINIT 0xFFC03344 /* HMDMA1 Initial Edge Count Register */ | 551 | #define HMDMA1_ECINIT 0xFFC03344 /* HMDMA1 Initial Edge Count Register */ |
| 552 | #define HMDMA1_BCINIT 0xFFC03348 /* HMDMA1 Initial Block Count Register */ | 552 | #define HMDMA1_BCINIT 0xFFC03348 /* HMDMA1 Initial Block Count Register */ |
| 553 | #define HMDMA1_ECURGENT 0xFFC0334C /* HMDMA1 Urgent Edge Count Threshhold Register */ | 553 | #define HMDMA1_ECURGENT 0xFFC0334C /* HMDMA1 Urgent Edge Count Threshold Register */ |
| 554 | #define HMDMA1_ECOVERFLOW 0xFFC03350 /* HMDMA1 Edge Count Overflow Interrupt Register */ | 554 | #define HMDMA1_ECOVERFLOW 0xFFC03350 /* HMDMA1 Edge Count Overflow Interrupt Register */ |
| 555 | #define HMDMA1_ECOUNT 0xFFC03354 /* HMDMA1 Current Edge Count Register */ | 555 | #define HMDMA1_ECOUNT 0xFFC03354 /* HMDMA1 Current Edge Count Register */ |
| 556 | #define HMDMA1_BCOUNT 0xFFC03358 /* HMDMA1 Current Block Count Register */ | 556 | #define HMDMA1_BCOUNT 0xFFC03358 /* HMDMA1 Current Block Count Register */ |
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h index f821700716ee..b9dbb73d7ef0 100644 --- a/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h | |||
| @@ -544,7 +544,7 @@ | |||
| 544 | #define HMDMA0_CONTROL 0xFFC03300 /* Handshake MDMA0 Control Register */ | 544 | #define HMDMA0_CONTROL 0xFFC03300 /* Handshake MDMA0 Control Register */ |
| 545 | #define HMDMA0_ECINIT 0xFFC03304 /* HMDMA0 Initial Edge Count Register */ | 545 | #define HMDMA0_ECINIT 0xFFC03304 /* HMDMA0 Initial Edge Count Register */ |
| 546 | #define HMDMA0_BCINIT 0xFFC03308 /* HMDMA0 Initial Block Count Register */ | 546 | #define HMDMA0_BCINIT 0xFFC03308 /* HMDMA0 Initial Block Count Register */ |
| 547 | #define HMDMA0_ECURGENT 0xFFC0330C /* HMDMA0 Urgent Edge Count Threshhold Register */ | 547 | #define HMDMA0_ECURGENT 0xFFC0330C /* HMDMA0 Urgent Edge Count Threshold Register */ |
| 548 | #define HMDMA0_ECOVERFLOW 0xFFC03310 /* HMDMA0 Edge Count Overflow Interrupt Register */ | 548 | #define HMDMA0_ECOVERFLOW 0xFFC03310 /* HMDMA0 Edge Count Overflow Interrupt Register */ |
| 549 | #define HMDMA0_ECOUNT 0xFFC03314 /* HMDMA0 Current Edge Count Register */ | 549 | #define HMDMA0_ECOUNT 0xFFC03314 /* HMDMA0 Current Edge Count Register */ |
| 550 | #define HMDMA0_BCOUNT 0xFFC03318 /* HMDMA0 Current Block Count Register */ | 550 | #define HMDMA0_BCOUNT 0xFFC03318 /* HMDMA0 Current Block Count Register */ |
| @@ -552,7 +552,7 @@ | |||
| 552 | #define HMDMA1_CONTROL 0xFFC03340 /* Handshake MDMA1 Control Register */ | 552 | #define HMDMA1_CONTROL 0xFFC03340 /* Handshake MDMA1 Control Register */ |
| 553 | #define HMDMA1_ECINIT 0xFFC03344 /* HMDMA1 Initial Edge Count Register */ | 553 | #define HMDMA1_ECINIT 0xFFC03344 /* HMDMA1 Initial Edge Count Register */ |
| 554 | #define HMDMA1_BCINIT 0xFFC03348 /* HMDMA1 Initial Block Count Register */ | 554 | #define HMDMA1_BCINIT 0xFFC03348 /* HMDMA1 Initial Block Count Register */ |
| 555 | #define HMDMA1_ECURGENT 0xFFC0334C /* HMDMA1 Urgent Edge Count Threshhold Register */ | 555 | #define HMDMA1_ECURGENT 0xFFC0334C /* HMDMA1 Urgent Edge Count Threshold Register */ |
| 556 | #define HMDMA1_ECOVERFLOW 0xFFC03350 /* HMDMA1 Edge Count Overflow Interrupt Register */ | 556 | #define HMDMA1_ECOVERFLOW 0xFFC03350 /* HMDMA1 Edge Count Overflow Interrupt Register */ |
| 557 | #define HMDMA1_ECOUNT 0xFFC03354 /* HMDMA1 Current Edge Count Register */ | 557 | #define HMDMA1_ECOUNT 0xFFC03354 /* HMDMA1 Current Edge Count Register */ |
| 558 | #define HMDMA1_BCOUNT 0xFFC03358 /* HMDMA1 Current Block Count Register */ | 558 | #define HMDMA1_BCOUNT 0xFFC03358 /* HMDMA1 Current Block Count Register */ |
diff --git a/arch/blackfin/mach-bf537/include/mach/defBF534.h b/arch/blackfin/mach-bf537/include/mach/defBF534.h index cebb14feb1ba..a6d20ca57683 100644 --- a/arch/blackfin/mach-bf537/include/mach/defBF534.h +++ b/arch/blackfin/mach-bf537/include/mach/defBF534.h | |||
| @@ -934,7 +934,7 @@ | |||
| 934 | #define HMDMA0_CONTROL 0xFFC03300 /* Handshake MDMA0 Control Register */ | 934 | #define HMDMA0_CONTROL 0xFFC03300 /* Handshake MDMA0 Control Register */ |
| 935 | #define HMDMA0_ECINIT 0xFFC03304 /* HMDMA0 Initial Edge Count Register */ | 935 | #define HMDMA0_ECINIT 0xFFC03304 /* HMDMA0 Initial Edge Count Register */ |
| 936 | #define HMDMA0_BCINIT 0xFFC03308 /* HMDMA0 Initial Block Count Register */ | 936 | #define HMDMA0_BCINIT 0xFFC03308 /* HMDMA0 Initial Block Count Register */ |
| 937 | #define HMDMA0_ECURGENT 0xFFC0330C /* HMDMA0 Urgent Edge Count Threshhold Register */ | 937 | #define HMDMA0_ECURGENT 0xFFC0330C /* HMDMA0 Urgent Edge Count Threshold Register */ |
| 938 | #define HMDMA0_ECOVERFLOW 0xFFC03310 /* HMDMA0 Edge Count Overflow Interrupt Register */ | 938 | #define HMDMA0_ECOVERFLOW 0xFFC03310 /* HMDMA0 Edge Count Overflow Interrupt Register */ |
| 939 | #define HMDMA0_ECOUNT 0xFFC03314 /* HMDMA0 Current Edge Count Register */ | 939 | #define HMDMA0_ECOUNT 0xFFC03314 /* HMDMA0 Current Edge Count Register */ |
| 940 | #define HMDMA0_BCOUNT 0xFFC03318 /* HMDMA0 Current Block Count Register */ | 940 | #define HMDMA0_BCOUNT 0xFFC03318 /* HMDMA0 Current Block Count Register */ |
| @@ -942,7 +942,7 @@ | |||
| 942 | #define HMDMA1_CONTROL 0xFFC03340 /* Handshake MDMA1 Control Register */ | 942 | #define HMDMA1_CONTROL 0xFFC03340 /* Handshake MDMA1 Control Register */ |
| 943 | #define HMDMA1_ECINIT 0xFFC03344 /* HMDMA1 Initial Edge Count Register */ | 943 | #define HMDMA1_ECINIT 0xFFC03344 /* HMDMA1 Initial Edge Count Register */ |
| 944 | #define HMDMA1_BCINIT 0xFFC03348 /* HMDMA1 Initial Block Count Register */ | 944 | #define HMDMA1_BCINIT 0xFFC03348 /* HMDMA1 Initial Block Count Register */ |
| 945 | #define HMDMA1_ECURGENT 0xFFC0334C /* HMDMA1 Urgent Edge Count Threshhold Register */ | 945 | #define HMDMA1_ECURGENT 0xFFC0334C /* HMDMA1 Urgent Edge Count Threshold Register */ |
| 946 | #define HMDMA1_ECOVERFLOW 0xFFC03350 /* HMDMA1 Edge Count Overflow Interrupt Register */ | 946 | #define HMDMA1_ECOVERFLOW 0xFFC03350 /* HMDMA1 Edge Count Overflow Interrupt Register */ |
| 947 | #define HMDMA1_ECOUNT 0xFFC03354 /* HMDMA1 Current Edge Count Register */ | 947 | #define HMDMA1_ECOUNT 0xFFC03354 /* HMDMA1 Current Edge Count Register */ |
| 948 | #define HMDMA1_BCOUNT 0xFFC03358 /* HMDMA1 Current Block Count Register */ | 948 | #define HMDMA1_BCOUNT 0xFFC03358 /* HMDMA1 Current Block Count Register */ |
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF544.h b/arch/blackfin/mach-bf548/include/mach/defBF544.h index dd414ae4ba4c..39f588dcd382 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF544.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF544.h | |||
| @@ -491,7 +491,7 @@ | |||
| 491 | #define HMDMA0_CONTROL 0xffc04500 /* Handshake MDMA0 Control Register */ | 491 | #define HMDMA0_CONTROL 0xffc04500 /* Handshake MDMA0 Control Register */ |
| 492 | #define HMDMA0_ECINIT 0xffc04504 /* Handshake MDMA0 Initial Edge Count Register */ | 492 | #define HMDMA0_ECINIT 0xffc04504 /* Handshake MDMA0 Initial Edge Count Register */ |
| 493 | #define HMDMA0_BCINIT 0xffc04508 /* Handshake MDMA0 Initial Block Count Register */ | 493 | #define HMDMA0_BCINIT 0xffc04508 /* Handshake MDMA0 Initial Block Count Register */ |
| 494 | #define HMDMA0_ECURGENT 0xffc0450c /* Handshake MDMA0 Urgent Edge Count Threshhold Register */ | 494 | #define HMDMA0_ECURGENT 0xffc0450c /* Handshake MDMA0 Urgent Edge Count Threshold Register */ |
| 495 | #define HMDMA0_ECOVERFLOW 0xffc04510 /* Handshake MDMA0 Edge Count Overflow Interrupt Register */ | 495 | #define HMDMA0_ECOVERFLOW 0xffc04510 /* Handshake MDMA0 Edge Count Overflow Interrupt Register */ |
| 496 | #define HMDMA0_ECOUNT 0xffc04514 /* Handshake MDMA0 Current Edge Count Register */ | 496 | #define HMDMA0_ECOUNT 0xffc04514 /* Handshake MDMA0 Current Edge Count Register */ |
| 497 | #define HMDMA0_BCOUNT 0xffc04518 /* Handshake MDMA0 Current Block Count Register */ | 497 | #define HMDMA0_BCOUNT 0xffc04518 /* Handshake MDMA0 Current Block Count Register */ |
| @@ -501,7 +501,7 @@ | |||
| 501 | #define HMDMA1_CONTROL 0xffc04540 /* Handshake MDMA1 Control Register */ | 501 | #define HMDMA1_CONTROL 0xffc04540 /* Handshake MDMA1 Control Register */ |
| 502 | #define HMDMA1_ECINIT 0xffc04544 /* Handshake MDMA1 Initial Edge Count Register */ | 502 | #define HMDMA1_ECINIT 0xffc04544 /* Handshake MDMA1 Initial Edge Count Register */ |
| 503 | #define HMDMA1_BCINIT 0xffc04548 /* Handshake MDMA1 Initial Block Count Register */ | 503 | #define HMDMA1_BCINIT 0xffc04548 /* Handshake MDMA1 Initial Block Count Register */ |
| 504 | #define HMDMA1_ECURGENT 0xffc0454c /* Handshake MDMA1 Urgent Edge Count Threshhold Register */ | 504 | #define HMDMA1_ECURGENT 0xffc0454c /* Handshake MDMA1 Urgent Edge Count Threshold Register */ |
| 505 | #define HMDMA1_ECOVERFLOW 0xffc04550 /* Handshake MDMA1 Edge Count Overflow Interrupt Register */ | 505 | #define HMDMA1_ECOVERFLOW 0xffc04550 /* Handshake MDMA1 Edge Count Overflow Interrupt Register */ |
| 506 | #define HMDMA1_ECOUNT 0xffc04554 /* Handshake MDMA1 Current Edge Count Register */ | 506 | #define HMDMA1_ECOUNT 0xffc04554 /* Handshake MDMA1 Current Edge Count Register */ |
| 507 | #define HMDMA1_BCOUNT 0xffc04558 /* Handshake MDMA1 Current Block Count Register */ | 507 | #define HMDMA1_BCOUNT 0xffc04558 /* Handshake MDMA1 Current Block Count Register */ |
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF547.h b/arch/blackfin/mach-bf548/include/mach/defBF547.h index 5a9dbabe0a68..c4dcf302d9f5 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF547.h | |||
| @@ -470,7 +470,7 @@ | |||
| 470 | #define HMDMA0_CONTROL 0xffc04500 /* Handshake MDMA0 Control Register */ | 470 | #define HMDMA0_CONTROL 0xffc04500 /* Handshake MDMA0 Control Register */ |
| 471 | #define HMDMA0_ECINIT 0xffc04504 /* Handshake MDMA0 Initial Edge Count Register */ | 471 | #define HMDMA0_ECINIT 0xffc04504 /* Handshake MDMA0 Initial Edge Count Register */ |
| 472 | #define HMDMA0_BCINIT 0xffc04508 /* Handshake MDMA0 Initial Block Count Register */ | 472 | #define HMDMA0_BCINIT 0xffc04508 /* Handshake MDMA0 Initial Block Count Register */ |
| 473 | #define HMDMA0_ECURGENT 0xffc0450c /* Handshake MDMA0 Urgent Edge Count Threshhold Register */ | 473 | #define HMDMA0_ECURGENT 0xffc0450c /* Handshake MDMA0 Urgent Edge Count Threshold Register */ |
| 474 | #define HMDMA0_ECOVERFLOW 0xffc04510 /* Handshake MDMA0 Edge Count Overflow Interrupt Register */ | 474 | #define HMDMA0_ECOVERFLOW 0xffc04510 /* Handshake MDMA0 Edge Count Overflow Interrupt Register */ |
| 475 | #define HMDMA0_ECOUNT 0xffc04514 /* Handshake MDMA0 Current Edge Count Register */ | 475 | #define HMDMA0_ECOUNT 0xffc04514 /* Handshake MDMA0 Current Edge Count Register */ |
| 476 | #define HMDMA0_BCOUNT 0xffc04518 /* Handshake MDMA0 Current Block Count Register */ | 476 | #define HMDMA0_BCOUNT 0xffc04518 /* Handshake MDMA0 Current Block Count Register */ |
| @@ -480,7 +480,7 @@ | |||
| 480 | #define HMDMA1_CONTROL 0xffc04540 /* Handshake MDMA1 Control Register */ | 480 | #define HMDMA1_CONTROL 0xffc04540 /* Handshake MDMA1 Control Register */ |
| 481 | #define HMDMA1_ECINIT 0xffc04544 /* Handshake MDMA1 Initial Edge Count Register */ | 481 | #define HMDMA1_ECINIT 0xffc04544 /* Handshake MDMA1 Initial Edge Count Register */ |
| 482 | #define HMDMA1_BCINIT 0xffc04548 /* Handshake MDMA1 Initial Block Count Register */ | 482 | #define HMDMA1_BCINIT 0xffc04548 /* Handshake MDMA1 Initial Block Count Register */ |
| 483 | #define HMDMA1_ECURGENT 0xffc0454c /* Handshake MDMA1 Urgent Edge Count Threshhold Register */ | 483 | #define HMDMA1_ECURGENT 0xffc0454c /* Handshake MDMA1 Urgent Edge Count Threshold Register */ |
| 484 | #define HMDMA1_ECOVERFLOW 0xffc04550 /* Handshake MDMA1 Edge Count Overflow Interrupt Register */ | 484 | #define HMDMA1_ECOVERFLOW 0xffc04550 /* Handshake MDMA1 Edge Count Overflow Interrupt Register */ |
| 485 | #define HMDMA1_ECOUNT 0xffc04554 /* Handshake MDMA1 Current Edge Count Register */ | 485 | #define HMDMA1_ECOUNT 0xffc04554 /* Handshake MDMA1 Current Edge Count Register */ |
| 486 | #define HMDMA1_BCOUNT 0xffc04558 /* Handshake MDMA1 Current Block Count Register */ | 486 | #define HMDMA1_BCOUNT 0xffc04558 /* Handshake MDMA1 Current Block Count Register */ |
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF548.h b/arch/blackfin/mach-bf548/include/mach/defBF548.h index 82cd593f7391..a5079980968c 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF548.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF548.h | |||
| @@ -853,7 +853,7 @@ | |||
| 853 | #define HMDMA0_CONTROL 0xffc04500 /* Handshake MDMA0 Control Register */ | 853 | #define HMDMA0_CONTROL 0xffc04500 /* Handshake MDMA0 Control Register */ |
| 854 | #define HMDMA0_ECINIT 0xffc04504 /* Handshake MDMA0 Initial Edge Count Register */ | 854 | #define HMDMA0_ECINIT 0xffc04504 /* Handshake MDMA0 Initial Edge Count Register */ |
| 855 | #define HMDMA0_BCINIT 0xffc04508 /* Handshake MDMA0 Initial Block Count Register */ | 855 | #define HMDMA0_BCINIT 0xffc04508 /* Handshake MDMA0 Initial Block Count Register */ |
| 856 | #define HMDMA0_ECURGENT 0xffc0450c /* Handshake MDMA0 Urgent Edge Count Threshhold Register */ | 856 | #define HMDMA0_ECURGENT 0xffc0450c /* Handshake MDMA0 Urgent Edge Count Threshold Register */ |
| 857 | #define HMDMA0_ECOVERFLOW 0xffc04510 /* Handshake MDMA0 Edge Count Overflow Interrupt Register */ | 857 | #define HMDMA0_ECOVERFLOW 0xffc04510 /* Handshake MDMA0 Edge Count Overflow Interrupt Register */ |
| 858 | #define HMDMA0_ECOUNT 0xffc04514 /* Handshake MDMA0 Current Edge Count Register */ | 858 | #define HMDMA0_ECOUNT 0xffc04514 /* Handshake MDMA0 Current Edge Count Register */ |
| 859 | #define HMDMA0_BCOUNT 0xffc04518 /* Handshake MDMA0 Current Block Count Register */ | 859 | #define HMDMA0_BCOUNT 0xffc04518 /* Handshake MDMA0 Current Block Count Register */ |
| @@ -863,7 +863,7 @@ | |||
| 863 | #define HMDMA1_CONTROL 0xffc04540 /* Handshake MDMA1 Control Register */ | 863 | #define HMDMA1_CONTROL 0xffc04540 /* Handshake MDMA1 Control Register */ |
| 864 | #define HMDMA1_ECINIT 0xffc04544 /* Handshake MDMA1 Initial Edge Count Register */ | 864 | #define HMDMA1_ECINIT 0xffc04544 /* Handshake MDMA1 Initial Edge Count Register */ |
| 865 | #define HMDMA1_BCINIT 0xffc04548 /* Handshake MDMA1 Initial Block Count Register */ | 865 | #define HMDMA1_BCINIT 0xffc04548 /* Handshake MDMA1 Initial Block Count Register */ |
| 866 | #define HMDMA1_ECURGENT 0xffc0454c /* Handshake MDMA1 Urgent Edge Count Threshhold Register */ | 866 | #define HMDMA1_ECURGENT 0xffc0454c /* Handshake MDMA1 Urgent Edge Count Threshold Register */ |
| 867 | #define HMDMA1_ECOVERFLOW 0xffc04550 /* Handshake MDMA1 Edge Count Overflow Interrupt Register */ | 867 | #define HMDMA1_ECOVERFLOW 0xffc04550 /* Handshake MDMA1 Edge Count Overflow Interrupt Register */ |
| 868 | #define HMDMA1_ECOUNT 0xffc04554 /* Handshake MDMA1 Current Edge Count Register */ | 868 | #define HMDMA1_ECOUNT 0xffc04554 /* Handshake MDMA1 Current Edge Count Register */ |
| 869 | #define HMDMA1_BCOUNT 0xffc04558 /* Handshake MDMA1 Current Block Count Register */ | 869 | #define HMDMA1_BCOUNT 0xffc04558 /* Handshake MDMA1 Current Block Count Register */ |
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF549.h b/arch/blackfin/mach-bf548/include/mach/defBF549.h index 6fc6e39ab61b..f7f043560c6f 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF549.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF549.h | |||
| @@ -1024,7 +1024,7 @@ | |||
| 1024 | #define HMDMA0_CONTROL 0xffc04500 /* Handshake MDMA0 Control Register */ | 1024 | #define HMDMA0_CONTROL 0xffc04500 /* Handshake MDMA0 Control Register */ |
| 1025 | #define HMDMA0_ECINIT 0xffc04504 /* Handshake MDMA0 Initial Edge Count Register */ | 1025 | #define HMDMA0_ECINIT 0xffc04504 /* Handshake MDMA0 Initial Edge Count Register */ |
| 1026 | #define HMDMA0_BCINIT 0xffc04508 /* Handshake MDMA0 Initial Block Count Register */ | 1026 | #define HMDMA0_BCINIT 0xffc04508 /* Handshake MDMA0 Initial Block Count Register */ |
| 1027 | #define HMDMA0_ECURGENT 0xffc0450c /* Handshake MDMA0 Urgent Edge Count Threshhold Register */ | 1027 | #define HMDMA0_ECURGENT 0xffc0450c /* Handshake MDMA0 Urgent Edge Count Threshold Register */ |
| 1028 | #define HMDMA0_ECOVERFLOW 0xffc04510 /* Handshake MDMA0 Edge Count Overflow Interrupt Register */ | 1028 | #define HMDMA0_ECOVERFLOW 0xffc04510 /* Handshake MDMA0 Edge Count Overflow Interrupt Register */ |
| 1029 | #define HMDMA0_ECOUNT 0xffc04514 /* Handshake MDMA0 Current Edge Count Register */ | 1029 | #define HMDMA0_ECOUNT 0xffc04514 /* Handshake MDMA0 Current Edge Count Register */ |
| 1030 | #define HMDMA0_BCOUNT 0xffc04518 /* Handshake MDMA0 Current Block Count Register */ | 1030 | #define HMDMA0_BCOUNT 0xffc04518 /* Handshake MDMA0 Current Block Count Register */ |
| @@ -1034,7 +1034,7 @@ | |||
| 1034 | #define HMDMA1_CONTROL 0xffc04540 /* Handshake MDMA1 Control Register */ | 1034 | #define HMDMA1_CONTROL 0xffc04540 /* Handshake MDMA1 Control Register */ |
| 1035 | #define HMDMA1_ECINIT 0xffc04544 /* Handshake MDMA1 Initial Edge Count Register */ | 1035 | #define HMDMA1_ECINIT 0xffc04544 /* Handshake MDMA1 Initial Edge Count Register */ |
| 1036 | #define HMDMA1_BCINIT 0xffc04548 /* Handshake MDMA1 Initial Block Count Register */ | 1036 | #define HMDMA1_BCINIT 0xffc04548 /* Handshake MDMA1 Initial Block Count Register */ |
| 1037 | #define HMDMA1_ECURGENT 0xffc0454c /* Handshake MDMA1 Urgent Edge Count Threshhold Register */ | 1037 | #define HMDMA1_ECURGENT 0xffc0454c /* Handshake MDMA1 Urgent Edge Count Threshold Register */ |
| 1038 | #define HMDMA1_ECOVERFLOW 0xffc04550 /* Handshake MDMA1 Edge Count Overflow Interrupt Register */ | 1038 | #define HMDMA1_ECOVERFLOW 0xffc04550 /* Handshake MDMA1 Edge Count Overflow Interrupt Register */ |
| 1039 | #define HMDMA1_ECOUNT 0xffc04554 /* Handshake MDMA1 Current Edge Count Register */ | 1039 | #define HMDMA1_ECOUNT 0xffc04554 /* Handshake MDMA1 Current Edge Count Register */ |
| 1040 | #define HMDMA1_BCOUNT 0xffc04558 /* Handshake MDMA1 Current Block Count Register */ | 1040 | #define HMDMA1_BCOUNT 0xffc04558 /* Handshake MDMA1 Current Block Count Register */ |
diff --git a/arch/cris/arch-v10/mm/fault.c b/arch/cris/arch-v10/mm/fault.c index 087a2096f221..ed60588f8467 100644 --- a/arch/cris/arch-v10/mm/fault.c +++ b/arch/cris/arch-v10/mm/fault.c | |||
| @@ -80,8 +80,7 @@ handle_mmu_bus_fault(struct pt_regs *regs) | |||
| 80 | * do_page_fault may have flushed the TLB so we have to restore | 80 | * do_page_fault may have flushed the TLB so we have to restore |
| 81 | * the MMU registers. | 81 | * the MMU registers. |
| 82 | */ | 82 | */ |
| 83 | local_save_flags(flags); | 83 | local_irq_save(flags); |
| 84 | local_irq_disable(); | ||
| 85 | pmd = (pmd_t *)(pgd + pgd_index(address)); | 84 | pmd = (pmd_t *)(pgd + pgd_index(address)); |
| 86 | if (pmd_none(*pmd)) | 85 | if (pmd_none(*pmd)) |
| 87 | goto exit; | 86 | goto exit; |
diff --git a/arch/cris/arch-v10/mm/tlb.c b/arch/cris/arch-v10/mm/tlb.c index 4a496e4ffacc..21d78c599bab 100644 --- a/arch/cris/arch-v10/mm/tlb.c +++ b/arch/cris/arch-v10/mm/tlb.c | |||
| @@ -134,28 +134,6 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr) | |||
| 134 | local_irq_restore(flags); | 134 | local_irq_restore(flags); |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | /* dump the entire TLB for debug purposes */ | ||
| 138 | |||
| 139 | #if 0 | ||
| 140 | void | ||
| 141 | dump_tlb_all(void) | ||
| 142 | { | ||
| 143 | int i; | ||
| 144 | unsigned long flags; | ||
| 145 | |||
| 146 | printk("TLB dump. LO is: pfn | reserved | global | valid | kernel | we |\n"); | ||
| 147 | |||
| 148 | local_save_flags(flags); | ||
| 149 | local_irq_disable(); | ||
| 150 | for(i = 0; i < NUM_TLB_ENTRIES; i++) { | ||
| 151 | *R_TLB_SELECT = ( IO_FIELD(R_TLB_SELECT, index, i) ); | ||
| 152 | printk("Entry %d: HI 0x%08lx, LO 0x%08lx\n", | ||
| 153 | i, *R_TLB_HI, *R_TLB_LO); | ||
| 154 | } | ||
| 155 | local_irq_restore(flags); | ||
| 156 | } | ||
| 157 | #endif | ||
| 158 | |||
| 159 | /* | 137 | /* |
| 160 | * Initialize the context related info for a new mm_struct | 138 | * Initialize the context related info for a new mm_struct |
| 161 | * instance. | 139 | * instance. |
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c index 4a7cdd9ea1ee..380df1a73a6e 100644 --- a/arch/cris/mm/fault.c +++ b/arch/cris/mm/fault.c | |||
| @@ -209,7 +209,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs, | |||
| 209 | /* Are we prepared to handle this kernel fault? | 209 | /* Are we prepared to handle this kernel fault? |
| 210 | * | 210 | * |
| 211 | * (The kernel has valid exception-points in the source | 211 | * (The kernel has valid exception-points in the source |
| 212 | * when it acesses user-memory. When it fails in one | 212 | * when it accesses user-memory. When it fails in one |
| 213 | * of those points, we find it in a table and do a jump | 213 | * of those points, we find it in a table and do a jump |
| 214 | * to some fixup code that loads an appropriate error | 214 | * to some fixup code that loads an appropriate error |
| 215 | * code) | 215 | * code) |
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 674a8374c6d9..f332e3fe4237 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
| @@ -1381,7 +1381,7 @@ sba_coalesce_chunks(struct ioc *ioc, struct device *dev, | |||
| 1381 | #endif | 1381 | #endif |
| 1382 | 1382 | ||
| 1383 | /* | 1383 | /* |
| 1384 | ** Not virtually contigous. | 1384 | ** Not virtually contiguous. |
| 1385 | ** Terminate prev chunk. | 1385 | ** Terminate prev chunk. |
| 1386 | ** Start a new chunk. | 1386 | ** Start a new chunk. |
| 1387 | ** | 1387 | ** |
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S index 10c37510f4b4..2fd7479aa216 100644 --- a/arch/ia64/ia32/ia32_entry.S +++ b/arch/ia64/ia32/ia32_entry.S | |||
| @@ -79,7 +79,7 @@ GLOBAL_ENTRY(ia32_ret_from_clone) | |||
| 79 | (p6) br.cond.spnt .ia32_strace_check_retval | 79 | (p6) br.cond.spnt .ia32_strace_check_retval |
| 80 | ;; // prevent RAW on r8 | 80 | ;; // prevent RAW on r8 |
| 81 | END(ia32_ret_from_clone) | 81 | END(ia32_ret_from_clone) |
| 82 | // fall thrugh | 82 | // fall through |
| 83 | GLOBAL_ENTRY(ia32_ret_from_syscall) | 83 | GLOBAL_ENTRY(ia32_ret_from_syscall) |
| 84 | PT_REGS_UNWIND_INFO(0) | 84 | PT_REGS_UNWIND_INFO(0) |
| 85 | 85 | ||
diff --git a/arch/ia64/include/asm/perfmon_default_smpl.h b/arch/ia64/include/asm/perfmon_default_smpl.h index 48822c0811d8..74724b24c2b7 100644 --- a/arch/ia64/include/asm/perfmon_default_smpl.h +++ b/arch/ia64/include/asm/perfmon_default_smpl.h | |||
| @@ -67,7 +67,7 @@ typedef struct { | |||
| 67 | unsigned long ip; /* where did the overflow interrupt happened */ | 67 | unsigned long ip; /* where did the overflow interrupt happened */ |
| 68 | unsigned long tstamp; /* ar.itc when entering perfmon intr. handler */ | 68 | unsigned long tstamp; /* ar.itc when entering perfmon intr. handler */ |
| 69 | 69 | ||
| 70 | unsigned short cpu; /* cpu on which the overfow occured */ | 70 | unsigned short cpu; /* cpu on which the overflow occured */ |
| 71 | unsigned short set; /* event set active when overflow ocurred */ | 71 | unsigned short set; /* event set active when overflow ocurred */ |
| 72 | int tgid; /* thread group id (for NPTL, this is getpid()) */ | 72 | int tgid; /* thread group id (for NPTL, this is getpid()) */ |
| 73 | } pfm_default_smpl_entry_t; | 73 | } pfm_default_smpl_entry_t; |
diff --git a/arch/ia64/include/asm/sn/shubio.h b/arch/ia64/include/asm/sn/shubio.h index 22a6f18a5313..6052422a22b3 100644 --- a/arch/ia64/include/asm/sn/shubio.h +++ b/arch/ia64/include/asm/sn/shubio.h | |||
| @@ -3289,7 +3289,7 @@ typedef ii_icrb0_e_u_t icrbe_t; | |||
| 3289 | #define IIO_IIDSR_LVL_SHIFT 0 | 3289 | #define IIO_IIDSR_LVL_SHIFT 0 |
| 3290 | #define IIO_IIDSR_LVL_MASK 0x000000ff | 3290 | #define IIO_IIDSR_LVL_MASK 0x000000ff |
| 3291 | 3291 | ||
| 3292 | /* Xtalk timeout threshhold register (IIO_IXTT) */ | 3292 | /* Xtalk timeout threshold register (IIO_IXTT) */ |
| 3293 | #define IXTT_RRSP_TO_SHFT 55 /* read response timeout */ | 3293 | #define IXTT_RRSP_TO_SHFT 55 /* read response timeout */ |
| 3294 | #define IXTT_RRSP_TO_MASK (0x1FULL << IXTT_RRSP_TO_SHFT) | 3294 | #define IXTT_RRSP_TO_MASK (0x1FULL << IXTT_RRSP_TO_SHFT) |
| 3295 | #define IXTT_RRSP_PS_SHFT 32 /* read responsed TO prescalar */ | 3295 | #define IXTT_RRSP_PS_SHFT 32 /* read responsed TO prescalar */ |
diff --git a/arch/ia64/kernel/esi.c b/arch/ia64/kernel/esi.c index d5764a3d74af..b091111270cb 100644 --- a/arch/ia64/kernel/esi.c +++ b/arch/ia64/kernel/esi.c | |||
| @@ -84,7 +84,7 @@ static int __init esi_init (void) | |||
| 84 | case ESI_DESC_ENTRY_POINT: | 84 | case ESI_DESC_ENTRY_POINT: |
| 85 | break; | 85 | break; |
| 86 | default: | 86 | default: |
| 87 | printk(KERN_WARNING "Unkown table type %d found in " | 87 | printk(KERN_WARNING "Unknown table type %d found in " |
| 88 | "ESI table, ignoring rest of table\n", *p); | 88 | "ESI table, ignoring rest of table\n", *p); |
| 89 | return -ENODEV; | 89 | return -ENODEV; |
| 90 | } | 90 | } |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 402698b6689f..599b233bef75 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -3517,7 +3517,7 @@ pfm_use_debug_registers(struct task_struct *task) | |||
| 3517 | * IA64_THREAD_DBG_VALID set. This indicates a task which was | 3517 | * IA64_THREAD_DBG_VALID set. This indicates a task which was |
| 3518 | * able to use the debug registers for debugging purposes via | 3518 | * able to use the debug registers for debugging purposes via |
| 3519 | * ptrace(). Therefore we know it was not using them for | 3519 | * ptrace(). Therefore we know it was not using them for |
| 3520 | * perfmormance monitoring, so we only decrement the number | 3520 | * performance monitoring, so we only decrement the number |
| 3521 | * of "ptraced" debug register users to keep the count up to date | 3521 | * of "ptraced" debug register users to keep the count up to date |
| 3522 | */ | 3522 | */ |
| 3523 | int | 3523 | int |
diff --git a/arch/m68k/ifpsp060/src/fpsp.S b/arch/m68k/ifpsp060/src/fpsp.S index 6c1a9a217887..73613b5f1ee5 100644 --- a/arch/m68k/ifpsp060/src/fpsp.S +++ b/arch/m68k/ifpsp060/src/fpsp.S | |||
| @@ -753,7 +753,7 @@ fovfl_ovfl_on: | |||
| 753 | 753 | ||
| 754 | bra.l _real_ovfl | 754 | bra.l _real_ovfl |
| 755 | 755 | ||
| 756 | # overflow occurred but is disabled. meanwhile, inexact is enabled. therefore, | 756 | # overflow occurred but is disabled. meanwhile, inexact is enabled. Therefore, |
| 757 | # we must jump to real_inex(). | 757 | # we must jump to real_inex(). |
| 758 | fovfl_inex_on: | 758 | fovfl_inex_on: |
| 759 | 759 | ||
| @@ -1015,7 +1015,7 @@ funfl_unfl_on2: | |||
| 1015 | 1015 | ||
| 1016 | bra.l _real_unfl | 1016 | bra.l _real_unfl |
| 1017 | 1017 | ||
| 1018 | # undeflow occurred but is disabled. meanwhile, inexact is enabled. therefore, | 1018 | # underflow occurred but is disabled. meanwhile, inexact is enabled. Therefore, |
| 1019 | # we must jump to real_inex(). | 1019 | # we must jump to real_inex(). |
| 1020 | funfl_inex_on: | 1020 | funfl_inex_on: |
| 1021 | 1021 | ||
| @@ -2963,7 +2963,7 @@ iea_disabled: | |||
| 2963 | 2963 | ||
| 2964 | tst.w %d0 # is instr fmovm? | 2964 | tst.w %d0 # is instr fmovm? |
| 2965 | bmi.b iea_dis_fmovm # yes | 2965 | bmi.b iea_dis_fmovm # yes |
| 2966 | # instruction is using an extended precision immediate operand. therefore, | 2966 | # instruction is using an extended precision immediate operand. Therefore, |
| 2967 | # the total instruction length is 16 bytes. | 2967 | # the total instruction length is 16 bytes. |
| 2968 | iea_dis_immed: | 2968 | iea_dis_immed: |
| 2969 | mov.l &0x10,%d0 # 16 bytes of instruction | 2969 | mov.l &0x10,%d0 # 16 bytes of instruction |
| @@ -9624,7 +9624,7 @@ sok_dnrm: | |||
| 9624 | bge.b sok_norm2 # thank goodness no | 9624 | bge.b sok_norm2 # thank goodness no |
| 9625 | 9625 | ||
| 9626 | # the multiply factor that we're trying to create should be a denorm | 9626 | # the multiply factor that we're trying to create should be a denorm |
| 9627 | # for the multiply to work. therefore, we're going to actually do a | 9627 | # for the multiply to work. Therefore, we're going to actually do a |
| 9628 | # multiply with a denorm which will cause an unimplemented data type | 9628 | # multiply with a denorm which will cause an unimplemented data type |
| 9629 | # exception to be put into the machine which will be caught and corrected | 9629 | # exception to be put into the machine which will be caught and corrected |
| 9630 | # later. we don't do this with the DENORMs above because this method | 9630 | # later. we don't do this with the DENORMs above because this method |
| @@ -12216,7 +12216,7 @@ fin_sd_unfl_dis: | |||
| 12216 | 12216 | ||
| 12217 | # | 12217 | # |
| 12218 | # operand will underflow AND underflow or inexact is enabled. | 12218 | # operand will underflow AND underflow or inexact is enabled. |
| 12219 | # therefore, we must return the result rounded to extended precision. | 12219 | # Therefore, we must return the result rounded to extended precision. |
| 12220 | # | 12220 | # |
| 12221 | fin_sd_unfl_ena: | 12221 | fin_sd_unfl_ena: |
| 12222 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) | 12222 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) |
| @@ -12746,7 +12746,7 @@ fdiv_zero_load_p: | |||
| 12746 | 12746 | ||
| 12747 | # | 12747 | # |
| 12748 | # The destination was In Range and the source was a ZERO. The result, | 12748 | # The destination was In Range and the source was a ZERO. The result, |
| 12749 | # therefore, is an INF w/ the proper sign. | 12749 | # Therefore, is an INF w/ the proper sign. |
| 12750 | # So, determine the sign and return a new INF (w/ the j-bit cleared). | 12750 | # So, determine the sign and return a new INF (w/ the j-bit cleared). |
| 12751 | # | 12751 | # |
| 12752 | global fdiv_inf_load # global for fsgldiv | 12752 | global fdiv_inf_load # global for fsgldiv |
| @@ -12996,7 +12996,7 @@ fneg_sd_unfl_dis: | |||
| 12996 | 12996 | ||
| 12997 | # | 12997 | # |
| 12998 | # operand will underflow AND underflow is enabled. | 12998 | # operand will underflow AND underflow is enabled. |
| 12999 | # therefore, we must return the result rounded to extended precision. | 12999 | # Therefore, we must return the result rounded to extended precision. |
| 13000 | # | 13000 | # |
| 13001 | fneg_sd_unfl_ena: | 13001 | fneg_sd_unfl_ena: |
| 13002 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) | 13002 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) |
| @@ -13611,7 +13611,7 @@ fabs_sd_unfl_dis: | |||
| 13611 | 13611 | ||
| 13612 | # | 13612 | # |
| 13613 | # operand will underflow AND underflow is enabled. | 13613 | # operand will underflow AND underflow is enabled. |
| 13614 | # therefore, we must return the result rounded to extended precision. | 13614 | # Therefore, we must return the result rounded to extended precision. |
| 13615 | # | 13615 | # |
| 13616 | fabs_sd_unfl_ena: | 13616 | fabs_sd_unfl_ena: |
| 13617 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) | 13617 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) |
| @@ -14973,7 +14973,7 @@ fadd_zero_2: | |||
| 14973 | 14973 | ||
| 14974 | # | 14974 | # |
| 14975 | # the ZEROes have opposite signs: | 14975 | # the ZEROes have opposite signs: |
| 14976 | # - therefore, we return +ZERO if the rounding modes are RN,RZ, or RP. | 14976 | # - Therefore, we return +ZERO if the rounding modes are RN,RZ, or RP. |
| 14977 | # - -ZERO is returned in the case of RM. | 14977 | # - -ZERO is returned in the case of RM. |
| 14978 | # | 14978 | # |
| 14979 | fadd_zero_2_chk_rm: | 14979 | fadd_zero_2_chk_rm: |
| @@ -15425,7 +15425,7 @@ fsub_zero_2: | |||
| 15425 | 15425 | ||
| 15426 | # | 15426 | # |
| 15427 | # the ZEROes have the same signs: | 15427 | # the ZEROes have the same signs: |
| 15428 | # - therefore, we return +ZERO if the rounding mode is RN,RZ, or RP | 15428 | # - Therefore, we return +ZERO if the rounding mode is RN,RZ, or RP |
| 15429 | # - -ZERO is returned in the case of RM. | 15429 | # - -ZERO is returned in the case of RM. |
| 15430 | # | 15430 | # |
| 15431 | fsub_zero_2_chk_rm: | 15431 | fsub_zero_2_chk_rm: |
| @@ -15693,7 +15693,7 @@ fsqrt_sd_unfl_dis: | |||
| 15693 | 15693 | ||
| 15694 | # | 15694 | # |
| 15695 | # operand will underflow AND underflow is enabled. | 15695 | # operand will underflow AND underflow is enabled. |
| 15696 | # therefore, we must return the result rounded to extended precision. | 15696 | # Therefore, we must return the result rounded to extended precision. |
| 15697 | # | 15697 | # |
| 15698 | fsqrt_sd_unfl_ena: | 15698 | fsqrt_sd_unfl_ena: |
| 15699 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) | 15699 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) |
| @@ -21000,7 +21000,7 @@ fout_pack_type: | |||
| 21000 | tst.l %d0 | 21000 | tst.l %d0 |
| 21001 | bne.b fout_pack_set | 21001 | bne.b fout_pack_set |
| 21002 | # "mantissa" is all zero which means that the answer is zero. but, the '040 | 21002 | # "mantissa" is all zero which means that the answer is zero. but, the '040 |
| 21003 | # algorithm allows the exponent to be non-zero. the 881/2 do not. therefore, | 21003 | # algorithm allows the exponent to be non-zero. the 881/2 do not. Therefore, |
| 21004 | # if the mantissa is zero, I will zero the exponent, too. | 21004 | # if the mantissa is zero, I will zero the exponent, too. |
| 21005 | # the question now is whether the exponents sign bit is allowed to be non-zero | 21005 | # the question now is whether the exponents sign bit is allowed to be non-zero |
| 21006 | # for a zero, also... | 21006 | # for a zero, also... |
| @@ -21743,7 +21743,7 @@ denorm_set_stky: | |||
| 21743 | rts | 21743 | rts |
| 21744 | 21744 | ||
| 21745 | # # | 21745 | # # |
| 21746 | # dnrm_lp(): normalize exponent/mantissa to specified threshhold # | 21746 | # dnrm_lp(): normalize exponent/mantissa to specified threshold # |
| 21747 | # # | 21747 | # # |
| 21748 | # INPUT: # | 21748 | # INPUT: # |
| 21749 | # %a0 : points to the operand to be denormalized # | 21749 | # %a0 : points to the operand to be denormalized # |
| @@ -22402,7 +22402,7 @@ unnorm_shift: | |||
| 22402 | bgt.b unnorm_nrm_zero # yes; denorm only until exp = 0 | 22402 | bgt.b unnorm_nrm_zero # yes; denorm only until exp = 0 |
| 22403 | 22403 | ||
| 22404 | # | 22404 | # |
| 22405 | # exponent would not go < 0. therefore, number stays normalized | 22405 | # exponent would not go < 0. Therefore, number stays normalized |
| 22406 | # | 22406 | # |
| 22407 | sub.w %d0, %d1 # shift exponent value | 22407 | sub.w %d0, %d1 # shift exponent value |
| 22408 | mov.w FTEMP_EX(%a0), %d0 # load old exponent | 22408 | mov.w FTEMP_EX(%a0), %d0 # load old exponent |
diff --git a/arch/m68k/ifpsp060/src/pfpsp.S b/arch/m68k/ifpsp060/src/pfpsp.S index 51b9f7d879dd..e71ba0ab013c 100644 --- a/arch/m68k/ifpsp060/src/pfpsp.S +++ b/arch/m68k/ifpsp060/src/pfpsp.S | |||
| @@ -752,7 +752,7 @@ fovfl_ovfl_on: | |||
| 752 | 752 | ||
| 753 | bra.l _real_ovfl | 753 | bra.l _real_ovfl |
| 754 | 754 | ||
| 755 | # overflow occurred but is disabled. meanwhile, inexact is enabled. therefore, | 755 | # overflow occurred but is disabled. meanwhile, inexact is enabled. Therefore, |
| 756 | # we must jump to real_inex(). | 756 | # we must jump to real_inex(). |
| 757 | fovfl_inex_on: | 757 | fovfl_inex_on: |
| 758 | 758 | ||
| @@ -1014,7 +1014,7 @@ funfl_unfl_on2: | |||
| 1014 | 1014 | ||
| 1015 | bra.l _real_unfl | 1015 | bra.l _real_unfl |
| 1016 | 1016 | ||
| 1017 | # undeflow occurred but is disabled. meanwhile, inexact is enabled. therefore, | 1017 | # underflow occurred but is disabled. meanwhile, inexact is enabled. Therefore, |
| 1018 | # we must jump to real_inex(). | 1018 | # we must jump to real_inex(). |
| 1019 | funfl_inex_on: | 1019 | funfl_inex_on: |
| 1020 | 1020 | ||
| @@ -2962,7 +2962,7 @@ iea_disabled: | |||
| 2962 | 2962 | ||
| 2963 | tst.w %d0 # is instr fmovm? | 2963 | tst.w %d0 # is instr fmovm? |
| 2964 | bmi.b iea_dis_fmovm # yes | 2964 | bmi.b iea_dis_fmovm # yes |
| 2965 | # instruction is using an extended precision immediate operand. therefore, | 2965 | # instruction is using an extended precision immediate operand. Therefore, |
| 2966 | # the total instruction length is 16 bytes. | 2966 | # the total instruction length is 16 bytes. |
| 2967 | iea_dis_immed: | 2967 | iea_dis_immed: |
| 2968 | mov.l &0x10,%d0 # 16 bytes of instruction | 2968 | mov.l &0x10,%d0 # 16 bytes of instruction |
| @@ -5865,7 +5865,7 @@ denorm_set_stky: | |||
| 5865 | rts | 5865 | rts |
| 5866 | 5866 | ||
| 5867 | # # | 5867 | # # |
| 5868 | # dnrm_lp(): normalize exponent/mantissa to specified threshhold # | 5868 | # dnrm_lp(): normalize exponent/mantissa to specified threshold # |
| 5869 | # # | 5869 | # # |
| 5870 | # INPUT: # | 5870 | # INPUT: # |
| 5871 | # %a0 : points to the operand to be denormalized # | 5871 | # %a0 : points to the operand to be denormalized # |
| @@ -6524,7 +6524,7 @@ unnorm_shift: | |||
| 6524 | bgt.b unnorm_nrm_zero # yes; denorm only until exp = 0 | 6524 | bgt.b unnorm_nrm_zero # yes; denorm only until exp = 0 |
| 6525 | 6525 | ||
| 6526 | # | 6526 | # |
| 6527 | # exponent would not go < 0. therefore, number stays normalized | 6527 | # exponent would not go < 0. Therefore, number stays normalized |
| 6528 | # | 6528 | # |
| 6529 | sub.w %d0, %d1 # shift exponent value | 6529 | sub.w %d0, %d1 # shift exponent value |
| 6530 | mov.w FTEMP_EX(%a0), %d0 # load old exponent | 6530 | mov.w FTEMP_EX(%a0), %d0 # load old exponent |
| @@ -7901,7 +7901,7 @@ fout_pack_type: | |||
| 7901 | tst.l %d0 | 7901 | tst.l %d0 |
| 7902 | bne.b fout_pack_set | 7902 | bne.b fout_pack_set |
| 7903 | # "mantissa" is all zero which means that the answer is zero. but, the '040 | 7903 | # "mantissa" is all zero which means that the answer is zero. but, the '040 |
| 7904 | # algorithm allows the exponent to be non-zero. the 881/2 do not. therefore, | 7904 | # algorithm allows the exponent to be non-zero. the 881/2 do not. Therefore, |
| 7905 | # if the mantissa is zero, I will zero the exponent, too. | 7905 | # if the mantissa is zero, I will zero the exponent, too. |
| 7906 | # the question now is whether the exponents sign bit is allowed to be non-zero | 7906 | # the question now is whether the exponents sign bit is allowed to be non-zero |
| 7907 | # for a zero, also... | 7907 | # for a zero, also... |
| @@ -8647,7 +8647,7 @@ fin_sd_unfl_dis: | |||
| 8647 | 8647 | ||
| 8648 | # | 8648 | # |
| 8649 | # operand will underflow AND underflow or inexact is enabled. | 8649 | # operand will underflow AND underflow or inexact is enabled. |
| 8650 | # therefore, we must return the result rounded to extended precision. | 8650 | # Therefore, we must return the result rounded to extended precision. |
| 8651 | # | 8651 | # |
| 8652 | fin_sd_unfl_ena: | 8652 | fin_sd_unfl_ena: |
| 8653 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) | 8653 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) |
| @@ -9177,7 +9177,7 @@ fdiv_zero_load_p: | |||
| 9177 | 9177 | ||
| 9178 | # | 9178 | # |
| 9179 | # The destination was In Range and the source was a ZERO. The result, | 9179 | # The destination was In Range and the source was a ZERO. The result, |
| 9180 | # therefore, is an INF w/ the proper sign. | 9180 | # Therefore, is an INF w/ the proper sign. |
| 9181 | # So, determine the sign and return a new INF (w/ the j-bit cleared). | 9181 | # So, determine the sign and return a new INF (w/ the j-bit cleared). |
| 9182 | # | 9182 | # |
| 9183 | global fdiv_inf_load # global for fsgldiv | 9183 | global fdiv_inf_load # global for fsgldiv |
| @@ -9427,7 +9427,7 @@ fneg_sd_unfl_dis: | |||
| 9427 | 9427 | ||
| 9428 | # | 9428 | # |
| 9429 | # operand will underflow AND underflow is enabled. | 9429 | # operand will underflow AND underflow is enabled. |
| 9430 | # therefore, we must return the result rounded to extended precision. | 9430 | # Therefore, we must return the result rounded to extended precision. |
| 9431 | # | 9431 | # |
| 9432 | fneg_sd_unfl_ena: | 9432 | fneg_sd_unfl_ena: |
| 9433 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) | 9433 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) |
| @@ -10042,7 +10042,7 @@ fabs_sd_unfl_dis: | |||
| 10042 | 10042 | ||
| 10043 | # | 10043 | # |
| 10044 | # operand will underflow AND underflow is enabled. | 10044 | # operand will underflow AND underflow is enabled. |
| 10045 | # therefore, we must return the result rounded to extended precision. | 10045 | # Therefore, we must return the result rounded to extended precision. |
| 10046 | # | 10046 | # |
| 10047 | fabs_sd_unfl_ena: | 10047 | fabs_sd_unfl_ena: |
| 10048 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) | 10048 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) |
| @@ -11404,7 +11404,7 @@ fadd_zero_2: | |||
| 11404 | 11404 | ||
| 11405 | # | 11405 | # |
| 11406 | # the ZEROes have opposite signs: | 11406 | # the ZEROes have opposite signs: |
| 11407 | # - therefore, we return +ZERO if the rounding modes are RN,RZ, or RP. | 11407 | # - Therefore, we return +ZERO if the rounding modes are RN,RZ, or RP. |
| 11408 | # - -ZERO is returned in the case of RM. | 11408 | # - -ZERO is returned in the case of RM. |
| 11409 | # | 11409 | # |
| 11410 | fadd_zero_2_chk_rm: | 11410 | fadd_zero_2_chk_rm: |
| @@ -11856,7 +11856,7 @@ fsub_zero_2: | |||
| 11856 | 11856 | ||
| 11857 | # | 11857 | # |
| 11858 | # the ZEROes have the same signs: | 11858 | # the ZEROes have the same signs: |
| 11859 | # - therefore, we return +ZERO if the rounding mode is RN,RZ, or RP | 11859 | # - Therefore, we return +ZERO if the rounding mode is RN,RZ, or RP |
| 11860 | # - -ZERO is returned in the case of RM. | 11860 | # - -ZERO is returned in the case of RM. |
| 11861 | # | 11861 | # |
| 11862 | fsub_zero_2_chk_rm: | 11862 | fsub_zero_2_chk_rm: |
| @@ -12124,7 +12124,7 @@ fsqrt_sd_unfl_dis: | |||
| 12124 | 12124 | ||
| 12125 | # | 12125 | # |
| 12126 | # operand will underflow AND underflow is enabled. | 12126 | # operand will underflow AND underflow is enabled. |
| 12127 | # therefore, we must return the result rounded to extended precision. | 12127 | # Therefore, we must return the result rounded to extended precision. |
| 12128 | # | 12128 | # |
| 12129 | fsqrt_sd_unfl_ena: | 12129 | fsqrt_sd_unfl_ena: |
| 12130 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) | 12130 | mov.l FP_SCR0_HI(%a6),FP_SCR1_HI(%a6) |
diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h index fb8a06b9ab6a..67e7a78ad96b 100644 --- a/arch/m68k/include/asm/bootinfo.h +++ b/arch/m68k/include/asm/bootinfo.h | |||
| @@ -145,7 +145,7 @@ struct bi_record { | |||
| 145 | 145 | ||
| 146 | /* | 146 | /* |
| 147 | * Macintosh hardware profile data - unused, see macintosh.h for | 147 | * Macintosh hardware profile data - unused, see macintosh.h for |
| 148 | * resonable type values | 148 | * reasonable type values |
| 149 | */ | 149 | */ |
| 150 | 150 | ||
| 151 | #define BI_MAC_VIA1BASE 0x8010 /* Mac VIA1 base address (always present) */ | 151 | #define BI_MAC_VIA1BASE 0x8010 /* Mac VIA1 base address (always present) */ |
diff --git a/arch/microblaze/lib/memcpy.c b/arch/microblaze/lib/memcpy.c index 6a907c58a4bc..cc2108b6b260 100644 --- a/arch/microblaze/lib/memcpy.c +++ b/arch/microblaze/lib/memcpy.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * It is based on demo code originally Copyright 2001 by Intel Corp, taken from | 9 | * It is based on demo code originally Copyright 2001 by Intel Corp, taken from |
| 10 | * http://www.embedded.com/showArticle.jhtml?articleID=19205567 | 10 | * http://www.embedded.com/showArticle.jhtml?articleID=19205567 |
| 11 | * | 11 | * |
| 12 | * Attempts were made, unsuccesfully, to contact the original | 12 | * Attempts were made, unsuccessfully, to contact the original |
| 13 | * author of this code (Michael Morrow, Intel). Below is the original | 13 | * author of this code (Michael Morrow, Intel). Below is the original |
| 14 | * copyright notice. | 14 | * copyright notice. |
| 15 | * | 15 | * |
diff --git a/arch/microblaze/lib/memmove.c b/arch/microblaze/lib/memmove.c index d4e9f49a71f7..0929198c5e68 100644 --- a/arch/microblaze/lib/memmove.c +++ b/arch/microblaze/lib/memmove.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * It is based on demo code originally Copyright 2001 by Intel Corp, taken from | 9 | * It is based on demo code originally Copyright 2001 by Intel Corp, taken from |
| 10 | * http://www.embedded.com/showArticle.jhtml?articleID=19205567 | 10 | * http://www.embedded.com/showArticle.jhtml?articleID=19205567 |
| 11 | * | 11 | * |
| 12 | * Attempts were made, unsuccesfully, to contact the original | 12 | * Attempts were made, unsuccessfully, to contact the original |
| 13 | * author of this code (Michael Morrow, Intel). Below is the original | 13 | * author of this code (Michael Morrow, Intel). Below is the original |
| 14 | * copyright notice. | 14 | * copyright notice. |
| 15 | * | 15 | * |
diff --git a/arch/microblaze/lib/memset.c b/arch/microblaze/lib/memset.c index 941dc8f94b03..4df851d41a29 100644 --- a/arch/microblaze/lib/memset.c +++ b/arch/microblaze/lib/memset.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * It is based on demo code originally Copyright 2001 by Intel Corp, taken from | 9 | * It is based on demo code originally Copyright 2001 by Intel Corp, taken from |
| 10 | * http://www.embedded.com/showArticle.jhtml?articleID=19205567 | 10 | * http://www.embedded.com/showArticle.jhtml?articleID=19205567 |
| 11 | * | 11 | * |
| 12 | * Attempts were made, unsuccesfully, to contact the original | 12 | * Attempts were made, unsuccessfully, to contact the original |
| 13 | * author of this code (Michael Morrow, Intel). Below is the original | 13 | * author of this code (Michael Morrow, Intel). Below is the original |
| 14 | * copyright notice. | 14 | * copyright notice. |
| 15 | * | 15 | * |
diff --git a/arch/mips/include/asm/mach-pnx833x/gpio.h b/arch/mips/include/asm/mach-pnx833x/gpio.h index 8de0eb9c98a3..ed3a88da70f6 100644 --- a/arch/mips/include/asm/mach-pnx833x/gpio.h +++ b/arch/mips/include/asm/mach-pnx833x/gpio.h | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | /* BIG FAT WARNING: races danger! | 25 | /* BIG FAT WARNING: races danger! |
| 26 | No protections exist here. Current users are only early init code, | 26 | No protections exist here. Current users are only early init code, |
| 27 | when locking is not needed because no cuncurency yet exists there, | 27 | when locking is not needed because no concurrency yet exists there, |
| 28 | and GPIO IRQ dispatcher, which does locking. | 28 | and GPIO IRQ dispatcher, which does locking. |
| 29 | However, if many uses will ever happen, proper locking will be needed | 29 | However, if many uses will ever happen, proper locking will be needed |
| 30 | - including locking between different uses | 30 | - including locking between different uses |
diff --git a/arch/mips/include/asm/sgi/ioc.h b/arch/mips/include/asm/sgi/ioc.h index 343ed15f8dc4..57a971904cfe 100644 --- a/arch/mips/include/asm/sgi/ioc.h +++ b/arch/mips/include/asm/sgi/ioc.h | |||
| @@ -164,7 +164,7 @@ struct sgioc_regs { | |||
| 164 | u32 _unused5; | 164 | u32 _unused5; |
| 165 | u8 _write[3]; | 165 | u8 _write[3]; |
| 166 | volatile u8 write; | 166 | volatile u8 write; |
| 167 | #define SGIOC_WRITE_NTHRESH 0x01 /* use 4.5db threshhold */ | 167 | #define SGIOC_WRITE_NTHRESH 0x01 /* use 4.5db threshold */ |
| 168 | #define SGIOC_WRITE_TPSPEED 0x02 /* use 100ohm TP speed */ | 168 | #define SGIOC_WRITE_TPSPEED 0x02 /* use 100ohm TP speed */ |
| 169 | #define SGIOC_WRITE_EPSEL 0x04 /* force cable mode: 1=AUI 0=TP */ | 169 | #define SGIOC_WRITE_EPSEL 0x04 /* force cable mode: 1=AUI 0=TP */ |
| 170 | #define SGIOC_WRITE_EASEL 0x08 /* 1=autoselect 0=manual cable selection */ | 170 | #define SGIOC_WRITE_EASEL 0x08 /* 1=autoselect 0=manual cable selection */ |
diff --git a/arch/mips/include/asm/sibyte/sb1250_mac.h b/arch/mips/include/asm/sibyte/sb1250_mac.h index b6faf08ca81d..591b9061fd8e 100644 --- a/arch/mips/include/asm/sibyte/sb1250_mac.h +++ b/arch/mips/include/asm/sibyte/sb1250_mac.h | |||
| @@ -212,7 +212,7 @@ | |||
| 212 | #define G_MAC_TXD_WEIGHT1(x) _SB_GETVALUE(x, S_MAC_TXD_WEIGHT1, M_MAC_TXD_WEIGHT1) | 212 | #define G_MAC_TXD_WEIGHT1(x) _SB_GETVALUE(x, S_MAC_TXD_WEIGHT1, M_MAC_TXD_WEIGHT1) |
| 213 | 213 | ||
| 214 | /* | 214 | /* |
| 215 | * MAC Fifo Threshhold registers (Table 9-14) | 215 | * MAC Fifo Threshold registers (Table 9-14) |
| 216 | * Register: MAC_THRSH_CFG_0 | 216 | * Register: MAC_THRSH_CFG_0 |
| 217 | * Register: MAC_THRSH_CFG_1 | 217 | * Register: MAC_THRSH_CFG_1 |
| 218 | * Register: MAC_THRSH_CFG_2 | 218 | * Register: MAC_THRSH_CFG_2 |
diff --git a/arch/mips/include/asm/sn/sn0/hubio.h b/arch/mips/include/asm/sn/sn0/hubio.h index d0c29d4de084..31c76c021bb6 100644 --- a/arch/mips/include/asm/sn/sn0/hubio.h +++ b/arch/mips/include/asm/sn/sn0/hubio.h | |||
| @@ -825,7 +825,7 @@ typedef union iprb_u { | |||
| 825 | struct { | 825 | struct { |
| 826 | u64 rsvd1: 15, | 826 | u64 rsvd1: 15, |
| 827 | error: 1, /* Widget rcvd wr resp pkt w/ error */ | 827 | error: 1, /* Widget rcvd wr resp pkt w/ error */ |
| 828 | ovflow: 5, /* Over flow count. perf measurement */ | 828 | ovflow: 5, /* Overflow count. perf measurement */ |
| 829 | fire_and_forget: 1, /* Launch Write without response */ | 829 | fire_and_forget: 1, /* Launch Write without response */ |
| 830 | mode: 2, /* Widget operation Mode */ | 830 | mode: 2, /* Widget operation Mode */ |
| 831 | rsvd2: 2, | 831 | rsvd2: 2, |
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 24630fd8ef60..a38e3ee95515 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
| @@ -1331,7 +1331,7 @@ void smtc_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu) | |||
| 1331 | if (!((asid += ASID_INC) & ASID_MASK) ) { | 1331 | if (!((asid += ASID_INC) & ASID_MASK) ) { |
| 1332 | if (cpu_has_vtag_icache) | 1332 | if (cpu_has_vtag_icache) |
| 1333 | flush_icache_all(); | 1333 | flush_icache_all(); |
| 1334 | /* Traverse all online CPUs (hack requires contigous range) */ | 1334 | /* Traverse all online CPUs (hack requires contiguous range) */ |
| 1335 | for_each_online_cpu(i) { | 1335 | for_each_online_cpu(i) { |
| 1336 | /* | 1336 | /* |
| 1337 | * We don't need to worry about our own CPU, nor those of | 1337 | * We don't need to worry about our own CPU, nor those of |
diff --git a/arch/mips/math-emu/dp_sub.c b/arch/mips/math-emu/dp_sub.c index b30c5b1f1a2c..a2127d685a0d 100644 --- a/arch/mips/math-emu/dp_sub.c +++ b/arch/mips/math-emu/dp_sub.c | |||
| @@ -110,7 +110,7 @@ ieee754dp ieee754dp_sub(ieee754dp x, ieee754dp y) | |||
| 110 | 110 | ||
| 111 | case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_DNORM): | 111 | case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_DNORM): |
| 112 | DPDNORMX; | 112 | DPDNORMX; |
| 113 | /* FAAL THOROUGH */ | 113 | /* FALL THROUGH */ |
| 114 | 114 | ||
| 115 | case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_DNORM): | 115 | case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_DNORM): |
| 116 | /* normalize ym,ye */ | 116 | /* normalize ym,ye */ |
diff --git a/arch/mips/txx9/generic/smsc_fdc37m81x.c b/arch/mips/txx9/generic/smsc_fdc37m81x.c index a2b2d62d88e3..8ebc3848f3ac 100644 --- a/arch/mips/txx9/generic/smsc_fdc37m81x.c +++ b/arch/mips/txx9/generic/smsc_fdc37m81x.c | |||
| @@ -117,7 +117,7 @@ unsigned long __init smsc_fdc37m81x_init(unsigned long port) | |||
| 117 | if (chip_id == SMSC_FDC37M81X_CHIP_ID) | 117 | if (chip_id == SMSC_FDC37M81X_CHIP_ID) |
| 118 | smsc_fdc37m81x_config_end(); | 118 | smsc_fdc37m81x_config_end(); |
| 119 | else { | 119 | else { |
| 120 | printk(KERN_WARNING "%s: unknow chip id 0x%02x\n", __func__, | 120 | printk(KERN_WARNING "%s: unknown chip id 0x%02x\n", __func__, |
| 121 | chip_id); | 121 | chip_id); |
| 122 | g_smsc_fdc37m81x_base = 0; | 122 | g_smsc_fdc37m81x_base = 0; |
| 123 | } | 123 | } |
diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c index 75099efb3bf3..f9f6783e4bdd 100644 --- a/arch/parisc/kernel/perf.c +++ b/arch/parisc/kernel/perf.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | * | 24 | * |
| 25 | * This driver programs the PCX-U/PCX-W performance counters | 25 | * This driver programs the PCX-U/PCX-W performance counters |
| 26 | * on the PA-RISC 2.0 chips. The driver keeps all images now | 26 | * on the PA-RISC 2.0 chips. The driver keeps all images now |
| 27 | * internally to the kernel to hopefully eliminate the possiblity | 27 | * internally to the kernel to hopefully eliminate the possibility |
| 28 | * of a bad image halting the CPU. Also, there are different | 28 | * of a bad image halting the CPU. Also, there are different |
| 29 | * images for the PCX-W and later chips vs the PCX-U chips. | 29 | * images for the PCX-W and later chips vs the PCX-U chips. |
| 30 | * | 30 | * |
diff --git a/arch/powerpc/include/asm/reg_fsl_emb.h b/arch/powerpc/include/asm/reg_fsl_emb.h index 1e180a594589..0de404dfee8b 100644 --- a/arch/powerpc/include/asm/reg_fsl_emb.h +++ b/arch/powerpc/include/asm/reg_fsl_emb.h | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #define PMRN_PMLCB2 0x112 /* PM Local Control B2 */ | 39 | #define PMRN_PMLCB2 0x112 /* PM Local Control B2 */ |
| 40 | #define PMRN_PMLCB3 0x113 /* PM Local Control B3 */ | 40 | #define PMRN_PMLCB3 0x113 /* PM Local Control B3 */ |
| 41 | 41 | ||
| 42 | #define PMLCB_THRESHMUL_MASK 0x0700 /* Threshhold Multiple Field */ | 42 | #define PMLCB_THRESHMUL_MASK 0x0700 /* Threshold Multiple Field */ |
| 43 | #define PMLCB_THRESHMUL_SHIFT 8 | 43 | #define PMLCB_THRESHMUL_SHIFT 8 |
| 44 | 44 | ||
| 45 | #define PMLCB_THRESHOLD_MASK 0x003f /* Threshold Field */ | 45 | #define PMLCB_THRESHOLD_MASK 0x003f /* Threshold Field */ |
diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c index 641c74bb8e27..b6bd1eaa1c24 100644 --- a/arch/powerpc/kernel/kgdb.c +++ b/arch/powerpc/kernel/kgdb.c | |||
| @@ -52,7 +52,7 @@ static struct hard_trap_info | |||
| 52 | { 0x2030, 0x08 /* SIGFPE */ }, /* spe fp data */ | 52 | { 0x2030, 0x08 /* SIGFPE */ }, /* spe fp data */ |
| 53 | { 0x2040, 0x08 /* SIGFPE */ }, /* spe fp data */ | 53 | { 0x2040, 0x08 /* SIGFPE */ }, /* spe fp data */ |
| 54 | { 0x2050, 0x08 /* SIGFPE */ }, /* spe fp round */ | 54 | { 0x2050, 0x08 /* SIGFPE */ }, /* spe fp round */ |
| 55 | { 0x2060, 0x0e /* SIGILL */ }, /* performace monitor */ | 55 | { 0x2060, 0x0e /* SIGILL */ }, /* performance monitor */ |
| 56 | { 0x2900, 0x08 /* SIGFPE */ }, /* apu unavailable */ | 56 | { 0x2900, 0x08 /* SIGFPE */ }, /* apu unavailable */ |
| 57 | { 0x3100, 0x0e /* SIGALRM */ }, /* fixed interval timer */ | 57 | { 0x3100, 0x0e /* SIGALRM */ }, /* fixed interval timer */ |
| 58 | { 0x3200, 0x02 /* SIGINT */ }, /* watchdog */ | 58 | { 0x3200, 0x02 /* SIGINT */ }, /* watchdog */ |
diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c index c3a56d65c5a9..a753b72efbc0 100644 --- a/arch/powerpc/kernel/tau_6xx.c +++ b/arch/powerpc/kernel/tau_6xx.c | |||
| @@ -59,7 +59,7 @@ void set_thresholds(unsigned long cpu) | |||
| 59 | mtspr(SPRN_THRM1, THRM1_THRES(tau[cpu].low) | THRM1_V | THRM1_TIE | THRM1_TID); | 59 | mtspr(SPRN_THRM1, THRM1_THRES(tau[cpu].low) | THRM1_V | THRM1_TIE | THRM1_TID); |
| 60 | 60 | ||
| 61 | /* setup THRM2, | 61 | /* setup THRM2, |
| 62 | * threshold, valid bit, enable interrupts, interrupt when above threshhold | 62 | * threshold, valid bit, enable interrupts, interrupt when above threshold |
| 63 | */ | 63 | */ |
| 64 | mtspr (SPRN_THRM2, THRM1_THRES(tau[cpu].high) | THRM1_V | THRM1_TIE); | 64 | mtspr (SPRN_THRM2, THRM1_THRES(tau[cpu].high) | THRM1_V | THRM1_TIE); |
| 65 | #else | 65 | #else |
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index 137dc22afa42..d84d19224a95 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
| @@ -721,7 +721,7 @@ static int __init vdso_init(void) | |||
| 721 | 721 | ||
| 722 | #ifdef CONFIG_PPC64 | 722 | #ifdef CONFIG_PPC64 |
| 723 | /* | 723 | /* |
| 724 | * Fill up the "systemcfg" stuff for backward compatiblity | 724 | * Fill up the "systemcfg" stuff for backward compatibility |
| 725 | */ | 725 | */ |
| 726 | strcpy((char *)vdso_data->eye_catcher, "SYSTEMCFG:PPC64"); | 726 | strcpy((char *)vdso_data->eye_catcher, "SYSTEMCFG:PPC64"); |
| 727 | vdso_data->version.major = SYSTEMCFG_MAJOR; | 727 | vdso_data->version.major = SYSTEMCFG_MAJOR; |
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c index ae06c6236d9c..2c9e52267292 100644 --- a/arch/powerpc/oprofile/op_model_cell.c +++ b/arch/powerpc/oprofile/op_model_cell.c | |||
| @@ -248,7 +248,7 @@ static int pm_rtas_activate_signals(u32 node, u32 count) | |||
| 248 | * There is no debug setup required for the cycles event. | 248 | * There is no debug setup required for the cycles event. |
| 249 | * Note that only events in the same group can be used. | 249 | * Note that only events in the same group can be used. |
| 250 | * Otherwise, there will be conflicts in correctly routing | 250 | * Otherwise, there will be conflicts in correctly routing |
| 251 | * the signals on the debug bus. It is the responsiblity | 251 | * the signals on the debug bus. It is the responsibility |
| 252 | * of the OProfile user tool to check the events are in | 252 | * of the OProfile user tool to check the events are in |
| 253 | * the same group. | 253 | * the same group. |
| 254 | */ | 254 | */ |
| @@ -1594,7 +1594,7 @@ static void cell_handle_interrupt_spu(struct pt_regs *regs, | |||
| 1594 | * to a latch. The new values (interrupt setting bits, reset | 1594 | * to a latch. The new values (interrupt setting bits, reset |
| 1595 | * counter value etc.) are not copied to the actual registers | 1595 | * counter value etc.) are not copied to the actual registers |
| 1596 | * until the performance monitor is enabled. In order to get | 1596 | * until the performance monitor is enabled. In order to get |
| 1597 | * this to work as desired, the permormance monitor needs to | 1597 | * this to work as desired, the performance monitor needs to |
| 1598 | * be disabled while writing to the latches. This is a | 1598 | * be disabled while writing to the latches. This is a |
| 1599 | * HW design issue. | 1599 | * HW design issue. |
| 1600 | */ | 1600 | */ |
| @@ -1668,7 +1668,7 @@ static void cell_handle_interrupt_ppu(struct pt_regs *regs, | |||
| 1668 | * to a latch. The new values (interrupt setting bits, reset | 1668 | * to a latch. The new values (interrupt setting bits, reset |
| 1669 | * counter value etc.) are not copied to the actual registers | 1669 | * counter value etc.) are not copied to the actual registers |
| 1670 | * until the performance monitor is enabled. In order to get | 1670 | * until the performance monitor is enabled. In order to get |
| 1671 | * this to work as desired, the permormance monitor needs to | 1671 | * this to work as desired, the performance monitor needs to |
| 1672 | * be disabled while writing to the latches. This is a | 1672 | * be disabled while writing to the latches. This is a |
| 1673 | * HW design issue. | 1673 | * HW design issue. |
| 1674 | */ | 1674 | */ |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c index dd43114e9684..da110bd88346 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c | |||
| @@ -100,7 +100,7 @@ const struct of_device_id mpc52xx_pci_ids[] __initdata = { | |||
| 100 | }; | 100 | }; |
| 101 | 101 | ||
| 102 | /* ======================================================================== */ | 102 | /* ======================================================================== */ |
| 103 | /* PCI configuration acess */ | 103 | /* PCI configuration access */ |
| 104 | /* ======================================================================== */ | 104 | /* ======================================================================== */ |
| 105 | 105 | ||
| 106 | static int | 106 | static int |
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index e81403b245b5..ab2027cdf893 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c | |||
| @@ -302,7 +302,7 @@ static void __init setup_chaos(struct pci_controller *hose, | |||
| 302 | * 1 -> Skip the device but act as if the access was successfull | 302 | * 1 -> Skip the device but act as if the access was successfull |
| 303 | * (return 0xff's on reads, eventually, cache config space | 303 | * (return 0xff's on reads, eventually, cache config space |
| 304 | * accesses in a later version) | 304 | * accesses in a later version) |
| 305 | * -1 -> Hide the device (unsuccessful acess) | 305 | * -1 -> Hide the device (unsuccessful access) |
| 306 | */ | 306 | */ |
| 307 | static int u3_ht_skip_device(struct pci_controller *hose, | 307 | static int u3_ht_skip_device(struct pci_controller *hose, |
| 308 | struct pci_bus *bus, unsigned int devfn) | 308 | struct pci_bus *bus, unsigned int devfn) |
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index ae3c4db86fe8..bafc3f85360d 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c | |||
| @@ -160,7 +160,7 @@ static int dart_build(struct iommu_table *tbl, long index, | |||
| 160 | 160 | ||
| 161 | dp = ((unsigned int*)tbl->it_base) + index; | 161 | dp = ((unsigned int*)tbl->it_base) + index; |
| 162 | 162 | ||
| 163 | /* On U3, all memory is contigous, so we can move this | 163 | /* On U3, all memory is contiguous, so we can move this |
| 164 | * out of the loop. | 164 | * out of the loop. |
| 165 | */ | 165 | */ |
| 166 | l = npages; | 166 | l = npages; |
diff --git a/arch/s390/math-emu/math.c b/arch/s390/math-emu/math.c index 3ee78ccb617d..cd4e9c168dd7 100644 --- a/arch/s390/math-emu/math.c +++ b/arch/s390/math-emu/math.c | |||
| @@ -2088,7 +2088,7 @@ int math_emu_ldr(__u8 *opcode) { | |||
| 2088 | __u16 opc = *((__u16 *) opcode); | 2088 | __u16 opc = *((__u16 *) opcode); |
| 2089 | 2089 | ||
| 2090 | if ((opc & 0x90) == 0) { /* test if rx in {0,2,4,6} */ | 2090 | if ((opc & 0x90) == 0) { /* test if rx in {0,2,4,6} */ |
| 2091 | /* we got an exception therfore ry can't be in {0,2,4,6} */ | 2091 | /* we got an exception therefore ry can't be in {0,2,4,6} */ |
| 2092 | asm volatile( /* load rx from fp_regs.fprs[ry] */ | 2092 | asm volatile( /* load rx from fp_regs.fprs[ry] */ |
| 2093 | " bras 1,0f\n" | 2093 | " bras 1,0f\n" |
| 2094 | " ld 0,0(%1)\n" | 2094 | " ld 0,0(%1)\n" |
| @@ -2118,7 +2118,7 @@ int math_emu_ler(__u8 *opcode) { | |||
| 2118 | __u16 opc = *((__u16 *) opcode); | 2118 | __u16 opc = *((__u16 *) opcode); |
| 2119 | 2119 | ||
| 2120 | if ((opc & 0x90) == 0) { /* test if rx in {0,2,4,6} */ | 2120 | if ((opc & 0x90) == 0) { /* test if rx in {0,2,4,6} */ |
| 2121 | /* we got an exception therfore ry can't be in {0,2,4,6} */ | 2121 | /* we got an exception therefore ry can't be in {0,2,4,6} */ |
| 2122 | asm volatile( /* load rx from fp_regs.fprs[ry] */ | 2122 | asm volatile( /* load rx from fp_regs.fprs[ry] */ |
| 2123 | " bras 1,0f\n" | 2123 | " bras 1,0f\n" |
| 2124 | " le 0,0(%1)\n" | 2124 | " le 0,0(%1)\n" |
diff --git a/arch/sh/include/mach-common/mach/titan.h b/arch/sh/include/mach-common/mach/titan.h index 03f3583c8918..4a674d27cbb8 100644 --- a/arch/sh/include/mach-common/mach/titan.h +++ b/arch/sh/include/mach-common/mach/titan.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Platform defintions for Titan | 2 | * Platform definitions for Titan |
| 3 | */ | 3 | */ |
| 4 | #ifndef _ASM_SH_TITAN_H | 4 | #ifndef _ASM_SH_TITAN_H |
| 5 | #define _ASM_SH_TITAN_H | 5 | #define _ASM_SH_TITAN_H |
diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h index 9d6684849fd9..278441f39856 100644 --- a/arch/x86/include/asm/desc_defs.h +++ b/arch/x86/include/asm/desc_defs.h | |||
| @@ -12,9 +12,9 @@ | |||
| 12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 13 | 13 | ||
| 14 | /* | 14 | /* |
| 15 | * FIXME: Acessing the desc_struct through its fields is more elegant, | 15 | * FIXME: Accessing the desc_struct through its fields is more elegant, |
| 16 | * and should be the one valid thing to do. However, a lot of open code | 16 | * and should be the one valid thing to do. However, a lot of open code |
| 17 | * still touches the a and b acessors, and doing this allow us to do it | 17 | * still touches the a and b accessors, and doing this allow us to do it |
| 18 | * incrementally. We keep the signature as a struct, rather than an union, | 18 | * incrementally. We keep the signature as a struct, rather than an union, |
| 19 | * so we can get rid of it transparently in the future -- glommer | 19 | * so we can get rid of it transparently in the future -- glommer |
| 20 | */ | 20 | */ |
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h index ede6998bd92c..91df7c51806c 100644 --- a/arch/x86/include/asm/mmzone_32.h +++ b/arch/x86/include/asm/mmzone_32.h | |||
| @@ -47,7 +47,7 @@ static inline void resume_map_numa_kva(pgd_t *pgd) {} | |||
| 47 | /* | 47 | /* |
| 48 | * generic node memory support, the following assumptions apply: | 48 | * generic node memory support, the following assumptions apply: |
| 49 | * | 49 | * |
| 50 | * 1) memory comes in 64Mb contigious chunks which are either present or not | 50 | * 1) memory comes in 64Mb contiguous chunks which are either present or not |
| 51 | * 2) we will not have more than 64Gb in total | 51 | * 2) we will not have more than 64Gb in total |
| 52 | * | 52 | * |
| 53 | * for now assume that 64Gb is max amount of RAM for whole system | 53 | * for now assume that 64Gb is max amount of RAM for whole system |
diff --git a/arch/x86/include/asm/sigcontext.h b/arch/x86/include/asm/sigcontext.h index 72e5a4491661..04459d25e66e 100644 --- a/arch/x86/include/asm/sigcontext.h +++ b/arch/x86/include/asm/sigcontext.h | |||
| @@ -124,7 +124,7 @@ struct sigcontext { | |||
| 124 | * fpstate is really (struct _fpstate *) or (struct _xstate *) | 124 | * fpstate is really (struct _fpstate *) or (struct _xstate *) |
| 125 | * depending on the FP_XSTATE_MAGIC1 encoded in the SW reserved | 125 | * depending on the FP_XSTATE_MAGIC1 encoded in the SW reserved |
| 126 | * bytes of (struct _fpstate) and FP_XSTATE_MAGIC2 present at the end | 126 | * bytes of (struct _fpstate) and FP_XSTATE_MAGIC2 present at the end |
| 127 | * of extended memory layout. See comments at the defintion of | 127 | * of extended memory layout. See comments at the definition of |
| 128 | * (struct _fpx_sw_bytes) | 128 | * (struct _fpx_sw_bytes) |
| 129 | */ | 129 | */ |
| 130 | void __user *fpstate; /* zero when no FPU/extended context */ | 130 | void __user *fpstate; /* zero when no FPU/extended context */ |
| @@ -219,7 +219,7 @@ struct sigcontext { | |||
| 219 | * fpstate is really (struct _fpstate *) or (struct _xstate *) | 219 | * fpstate is really (struct _fpstate *) or (struct _xstate *) |
| 220 | * depending on the FP_XSTATE_MAGIC1 encoded in the SW reserved | 220 | * depending on the FP_XSTATE_MAGIC1 encoded in the SW reserved |
| 221 | * bytes of (struct _fpstate) and FP_XSTATE_MAGIC2 present at the end | 221 | * bytes of (struct _fpstate) and FP_XSTATE_MAGIC2 present at the end |
| 222 | * of extended memory layout. See comments at the defintion of | 222 | * of extended memory layout. See comments at the definition of |
| 223 | * (struct _fpx_sw_bytes) | 223 | * (struct _fpx_sw_bytes) |
| 224 | */ | 224 | */ |
| 225 | void __user *fpstate; /* zero when no FPU/extended context */ | 225 | void __user *fpstate; /* zero when no FPU/extended context */ |
diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h index 80e2984f521c..b414d2b401f6 100644 --- a/arch/x86/include/asm/uv/uv_bau.h +++ b/arch/x86/include/asm/uv/uv_bau.h | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | #define DESC_STATUS_SOURCE_TIMEOUT 3 | 55 | #define DESC_STATUS_SOURCE_TIMEOUT 3 |
| 56 | 56 | ||
| 57 | /* | 57 | /* |
| 58 | * source side threshholds at which message retries print a warning | 58 | * source side thresholds at which message retries print a warning |
| 59 | */ | 59 | */ |
| 60 | #define SOURCE_TIMEOUT_LIMIT 20 | 60 | #define SOURCE_TIMEOUT_LIMIT 20 |
| 61 | #define DESTINATION_TIMEOUT_LIMIT 20 | 61 | #define DESTINATION_TIMEOUT_LIMIT 20 |
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 87eee07da21f..fb1035cd9a6a 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
| @@ -1123,7 +1123,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) | |||
| 1123 | if (!acpi_sci_override_gsi) | 1123 | if (!acpi_sci_override_gsi) |
| 1124 | acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0); | 1124 | acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0); |
| 1125 | 1125 | ||
| 1126 | /* Fill in identity legacy mapings where no override */ | 1126 | /* Fill in identity legacy mappings where no override */ |
| 1127 | mp_config_acpi_legacy_irqs(); | 1127 | mp_config_acpi_legacy_irqs(); |
| 1128 | 1128 | ||
| 1129 | count = | 1129 | count = |
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 32fb09102a13..1c0fb4d4ad55 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
| @@ -1783,7 +1783,7 @@ retry: | |||
| 1783 | goto out; | 1783 | goto out; |
| 1784 | 1784 | ||
| 1785 | /* | 1785 | /* |
| 1786 | * aperture was sucessfully enlarged by 128 MB, try | 1786 | * aperture was successfully enlarged by 128 MB, try |
| 1787 | * allocation again | 1787 | * allocation again |
| 1788 | */ | 1788 | */ |
| 1789 | goto retry; | 1789 | goto retry; |
| @@ -2490,7 +2490,7 @@ int __init amd_iommu_init_passthrough(void) | |||
| 2490 | struct pci_dev *dev = NULL; | 2490 | struct pci_dev *dev = NULL; |
| 2491 | u16 devid; | 2491 | u16 devid; |
| 2492 | 2492 | ||
| 2493 | /* allocate passthroug domain */ | 2493 | /* allocate passthrough domain */ |
| 2494 | pt_domain = protection_domain_alloc(); | 2494 | pt_domain = protection_domain_alloc(); |
| 2495 | if (!pt_domain) | 2495 | if (!pt_domain) |
| 2496 | return -ENOMEM; | 2496 | return -ENOMEM; |
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index c1bbed1021d9..ab1a8a89b984 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
| @@ -1286,7 +1286,7 @@ x86_perf_event_set_period(struct perf_event *event, | |||
| 1286 | return 0; | 1286 | return 0; |
| 1287 | 1287 | ||
| 1288 | /* | 1288 | /* |
| 1289 | * If we are way outside a reasoable range then just skip forward: | 1289 | * If we are way outside a reasonable range then just skip forward: |
| 1290 | */ | 1290 | */ |
| 1291 | if (unlikely(left <= -period)) { | 1291 | if (unlikely(left <= -period)) { |
| 1292 | left = period; | 1292 | left = period; |
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c index 1f3186ce213c..5b8c7505b3bc 100644 --- a/arch/x86/kernel/kprobes.c +++ b/arch/x86/kernel/kprobes.c | |||
| @@ -481,7 +481,7 @@ static int __kprobes reenter_kprobe(struct kprobe *p, struct pt_regs *regs, | |||
| 481 | 481 | ||
| 482 | /* | 482 | /* |
| 483 | * Interrupts are disabled on entry as trap3 is an interrupt gate and they | 483 | * Interrupts are disabled on entry as trap3 is an interrupt gate and they |
| 484 | * remain disabled thorough out this function. | 484 | * remain disabled throughout this function. |
| 485 | */ | 485 | */ |
| 486 | static int __kprobes kprobe_handler(struct pt_regs *regs) | 486 | static int __kprobes kprobe_handler(struct pt_regs *regs) |
| 487 | { | 487 | { |
| @@ -818,7 +818,7 @@ no_change: | |||
| 818 | 818 | ||
| 819 | /* | 819 | /* |
| 820 | * Interrupts are disabled on entry as trap1 is an interrupt gate and they | 820 | * Interrupts are disabled on entry as trap1 is an interrupt gate and they |
| 821 | * remain disabled thoroughout this function. | 821 | * remain disabled throughout this function. |
| 822 | */ | 822 | */ |
| 823 | static int __kprobes post_kprobe_handler(struct pt_regs *regs) | 823 | static int __kprobes post_kprobe_handler(struct pt_regs *regs) |
| 824 | { | 824 | { |
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c index 11a4ad4d6253..07bcc309cfda 100644 --- a/arch/x86/mm/kmmio.c +++ b/arch/x86/mm/kmmio.c | |||
| @@ -203,7 +203,7 @@ static void disarm_kmmio_fault_page(struct kmmio_fault_page *f) | |||
| 203 | */ | 203 | */ |
| 204 | /* | 204 | /* |
| 205 | * Interrupts are disabled on entry as trap3 is an interrupt gate | 205 | * Interrupts are disabled on entry as trap3 is an interrupt gate |
| 206 | * and they remain disabled thorough out this function. | 206 | * and they remain disabled throughout this function. |
| 207 | */ | 207 | */ |
| 208 | int kmmio_handler(struct pt_regs *regs, unsigned long addr) | 208 | int kmmio_handler(struct pt_regs *regs, unsigned long addr) |
| 209 | { | 209 | { |
| @@ -302,7 +302,7 @@ no_kmmio: | |||
| 302 | 302 | ||
| 303 | /* | 303 | /* |
| 304 | * Interrupts are disabled on entry as trap1 is an interrupt gate | 304 | * Interrupts are disabled on entry as trap1 is an interrupt gate |
| 305 | * and they remain disabled thorough out this function. | 305 | * and they remain disabled throughout this function. |
| 306 | * This must always get called as the pair to kmmio_handler(). | 306 | * This must always get called as the pair to kmmio_handler(). |
| 307 | */ | 307 | */ |
| 308 | static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs) | 308 | static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs) |
diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c index ca564202ed7a..58916afbbda5 100644 --- a/block/blk-iopoll.c +++ b/block/blk-iopoll.c | |||
| @@ -28,7 +28,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_iopoll); | |||
| 28 | * Description: | 28 | * Description: |
| 29 | * Add this blk_iopoll structure to the pending poll list and trigger the | 29 | * Add this blk_iopoll structure to the pending poll list and trigger the |
| 30 | * raise of the blk iopoll softirq. The driver must already have gotten a | 30 | * raise of the blk iopoll softirq. The driver must already have gotten a |
| 31 | * succesful return from blk_iopoll_sched_prep() before calling this. | 31 | * successful return from blk_iopoll_sched_prep() before calling this. |
| 32 | **/ | 32 | **/ |
| 33 | void blk_iopoll_sched(struct blk_iopoll *iop) | 33 | void blk_iopoll_sched(struct blk_iopoll *iop) |
| 34 | { | 34 | { |
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 | */ |
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index b9b3bb51b1e4..d15ea1790bfb 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
| @@ -767,7 +767,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
| 767 | 767 | ||
| 768 | current->mm->start_stack = bprm->p; | 768 | current->mm->start_stack = bprm->p; |
| 769 | 769 | ||
| 770 | /* Now we do a little grungy work by mmaping the ELF image into | 770 | /* Now we do a little grungy work by mmapping the ELF image into |
| 771 | the correct location in memory. */ | 771 | the correct location in memory. */ |
| 772 | for(i = 0, elf_ppnt = elf_phdata; | 772 | for(i = 0, elf_ppnt = elf_phdata; |
| 773 | i < loc->elf_ex.e_phnum; i++, elf_ppnt++) { | 773 | i < loc->elf_ex.e_phnum; i++, elf_ppnt++) { |
| @@ -272,7 +272,7 @@ EXPORT_SYMBOL(bio_init); | |||
| 272 | * for a &struct bio to become free. If a %NULL @bs is passed in, we will | 272 | * for a &struct bio to become free. If a %NULL @bs is passed in, we will |
| 273 | * fall back to just using @kmalloc to allocate the required memory. | 273 | * fall back to just using @kmalloc to allocate the required memory. |
| 274 | * | 274 | * |
| 275 | * Note that the caller must set ->bi_destructor on succesful return | 275 | * Note that the caller must set ->bi_destructor on successful return |
| 276 | * of a bio, to do the appropriate freeing of the bio once the reference | 276 | * of a bio, to do the appropriate freeing of the bio once the reference |
| 277 | * count drops to zero. | 277 | * count drops to zero. |
| 278 | **/ | 278 | **/ |
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index ccbdcb54ec5d..46bea0f4dc7b 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c | |||
| @@ -256,7 +256,7 @@ out: | |||
| 256 | * Insert @em into @tree or perform a simple forward/backward merge with | 256 | * Insert @em into @tree or perform a simple forward/backward merge with |
| 257 | * existing mappings. The extent_map struct passed in will be inserted | 257 | * existing mappings. The extent_map struct passed in will be inserted |
| 258 | * into the tree directly, with an additional reference taken, or a | 258 | * into the tree directly, with an additional reference taken, or a |
| 259 | * reference dropped if the merge attempt was sucessfull. | 259 | * reference dropped if the merge attempt was successfull. |
| 260 | */ | 260 | */ |
| 261 | int add_extent_mapping(struct extent_map_tree *tree, | 261 | int add_extent_mapping(struct extent_map_tree *tree, |
| 262 | struct extent_map *em) | 262 | struct extent_map *em) |
diff --git a/fs/cifs/README b/fs/cifs/README index 79c1a93400be..a727b7cb075f 100644 --- a/fs/cifs/README +++ b/fs/cifs/README | |||
| @@ -423,7 +423,7 @@ A partial list of the supported mount options follows: | |||
| 423 | source name to use to represent the client netbios machine | 423 | source name to use to represent the client netbios machine |
| 424 | name when doing the RFC1001 netbios session initialize. | 424 | name when doing the RFC1001 netbios session initialize. |
| 425 | direct Do not do inode data caching on files opened on this mount. | 425 | direct Do not do inode data caching on files opened on this mount. |
| 426 | This precludes mmaping files on this mount. In some cases | 426 | This precludes mmapping files on this mount. In some cases |
| 427 | with fast networks and little or no caching benefits on the | 427 | with fast networks and little or no caching benefits on the |
| 428 | client (e.g. when the application is doing large sequential | 428 | client (e.g. when the application is doing large sequential |
| 429 | reads bigger than page size without rereading the same data) | 429 | reads bigger than page size without rereading the same data) |
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 5d0fde18039c..4b35f7ec0583 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | 39 | ||
| 40 | /* | 40 | /* |
| 41 | * MAX_REQ is the maximum number of requests that WE will send | 41 | * MAX_REQ is the maximum number of requests that WE will send |
| 42 | * on one socket concurently. It also matches the most common | 42 | * on one socket concurrently. It also matches the most common |
| 43 | * value of max multiplex returned by servers. We may | 43 | * value of max multiplex returned by servers. We may |
| 44 | * eventually want to use the negotiated value (in case | 44 | * eventually want to use the negotiated value (in case |
| 45 | * future servers can handle more) when we are more confident that | 45 | * future servers can handle more) when we are more confident that |
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index 2d07f890a842..3877737f96a6 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h | |||
| @@ -1227,7 +1227,7 @@ typedef struct smb_com_setattr_rsp { | |||
| 1227 | /* empty wct response to setattr */ | 1227 | /* empty wct response to setattr */ |
| 1228 | 1228 | ||
| 1229 | /*******************************************************/ | 1229 | /*******************************************************/ |
| 1230 | /* NT Transact structure defintions follow */ | 1230 | /* NT Transact structure definitions follow */ |
| 1231 | /* Currently only ioctl, acl (get security descriptor) */ | 1231 | /* Currently only ioctl, acl (get security descriptor) */ |
| 1232 | /* and notify are implemented */ | 1232 | /* and notify are implemented */ |
| 1233 | /*******************************************************/ | 1233 | /*******************************************************/ |
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index cababd8a52df..cf18ee765590 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
| @@ -914,8 +914,8 @@ undo_setattr: | |||
| 914 | /* | 914 | /* |
| 915 | * If dentry->d_inode is null (usually meaning the cached dentry | 915 | * If dentry->d_inode is null (usually meaning the cached dentry |
| 916 | * is a negative dentry) then we would attempt a standard SMB delete, but | 916 | * is a negative dentry) then we would attempt a standard SMB delete, but |
| 917 | * if that fails we can not attempt the fall back mechanisms on EACESS | 917 | * if that fails we can not attempt the fall back mechanisms on EACCESS |
| 918 | * but will return the EACESS to the caller. Note that the VFS does not call | 918 | * but will return the EACCESS to the caller. Note that the VFS does not call |
| 919 | * unlink on negative dentries currently. | 919 | * unlink on negative dentries currently. |
| 920 | */ | 920 | */ |
| 921 | int cifs_unlink(struct inode *dir, struct dentry *dentry) | 921 | int cifs_unlink(struct inode *dir, struct dentry *dentry) |
diff --git a/fs/cifs/smbdes.c b/fs/cifs/smbdes.c index 224a1f478966..b6b6dcb500bf 100644 --- a/fs/cifs/smbdes.c +++ b/fs/cifs/smbdes.c | |||
| @@ -371,7 +371,7 @@ E_P24(unsigned char *p21, const unsigned char *c8, unsigned char *p24) | |||
| 371 | smbhash(p24 + 16, c8, p21 + 14, 1); | 371 | smbhash(p24 + 16, c8, p21 + 14, 1); |
| 372 | } | 372 | } |
| 373 | 373 | ||
| 374 | #if 0 /* currently unsued */ | 374 | #if 0 /* currently unused */ |
| 375 | static void | 375 | static void |
| 376 | D_P16(unsigned char *p14, unsigned char *in, unsigned char *out) | 376 | D_P16(unsigned char *p14, unsigned char *in, unsigned char *out) |
| 377 | { | 377 | { |
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 229e72218165..2346895b3a77 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -1920,7 +1920,7 @@ COMPATIBLE_IOCTL(TIOCSLTC) | |||
| 1920 | #endif | 1920 | #endif |
| 1921 | #ifdef TIOCSTART | 1921 | #ifdef TIOCSTART |
| 1922 | /* | 1922 | /* |
| 1923 | * For these two we have defintions in ioctls.h and/or termios.h on | 1923 | * For these two we have definitions in ioctls.h and/or termios.h on |
| 1924 | * some architectures but no actual implemention. Some applications | 1924 | * some architectures but no actual implemention. Some applications |
| 1925 | * like bash call them if they are defined in the headers, so we provide | 1925 | * like bash call them if they are defined in the headers, so we provide |
| 1926 | * entries here to avoid syslog message spew. | 1926 | * entries here to avoid syslog message spew. |
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index d22438ef7674..0d23b52dd22c 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
| @@ -184,7 +184,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode, | |||
| 184 | /** | 184 | /** |
| 185 | * debugfs_create_file - create a file in the debugfs filesystem | 185 | * debugfs_create_file - create a file in the debugfs filesystem |
| 186 | * @name: a pointer to a string containing the name of the file to create. | 186 | * @name: a pointer to a string containing the name of the file to create. |
| 187 | * @mode: the permission that the file should have | 187 | * @mode: the permission that the file should have. |
| 188 | * @parent: a pointer to the parent dentry for this file. This should be a | 188 | * @parent: a pointer to the parent dentry for this file. This should be a |
| 189 | * directory dentry if set. If this paramater is NULL, then the | 189 | * directory dentry if set. If this paramater is NULL, then the |
| 190 | * file will be created in the root of the debugfs filesystem. | 190 | * file will be created in the root of the debugfs filesystem. |
| @@ -195,8 +195,8 @@ static int debugfs_create_by_name(const char *name, mode_t mode, | |||
| 195 | * this file. | 195 | * this file. |
| 196 | * | 196 | * |
| 197 | * This is the basic "create a file" function for debugfs. It allows for a | 197 | * This is the basic "create a file" function for debugfs. It allows for a |
| 198 | * wide range of flexibility in createing a file, or a directory (if you | 198 | * wide range of flexibility in creating a file, or a directory (if you want |
| 199 | * want to create a directory, the debugfs_create_dir() function is | 199 | * to create a directory, the debugfs_create_dir() function is |
| 200 | * recommended to be used instead.) | 200 | * recommended to be used instead.) |
| 201 | * | 201 | * |
| 202 | * This function will return a pointer to a dentry if it succeeds. This | 202 | * This function will return a pointer to a dentry if it succeeds. This |
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index 16f682e26c07..b540aa5d1f61 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c | |||
| @@ -143,7 +143,7 @@ out: | |||
| 143 | } | 143 | } |
| 144 | EXPORT_SYMBOL_GPL(dlm_posix_lock); | 144 | EXPORT_SYMBOL_GPL(dlm_posix_lock); |
| 145 | 145 | ||
| 146 | /* Returns failure iff a succesful lock operation should be canceled */ | 146 | /* Returns failure iff a successful lock operation should be canceled */ |
| 147 | static int dlm_plock_callback(struct plock_op *op) | 147 | static int dlm_plock_callback(struct plock_op *op) |
| 148 | { | 148 | { |
| 149 | struct file *file; | 149 | struct file *file; |
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 354ed3b47b30..2db957778903 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c | |||
| @@ -2033,7 +2033,7 @@ static Indirect *ext3_find_shared(struct inode *inode, int depth, | |||
| 2033 | int k, err; | 2033 | int k, err; |
| 2034 | 2034 | ||
| 2035 | *top = 0; | 2035 | *top = 0; |
| 2036 | /* Make k index the deepest non-null offest + 1 */ | 2036 | /* Make k index the deepest non-null offset + 1 */ |
| 2037 | for (k = depth; k > 1 && !offsets[k-1]; k--) | 2037 | for (k = depth; k > 1 && !offsets[k-1]; k--) |
| 2038 | ; | 2038 | ; |
| 2039 | partial = ext3_get_branch(inode, k, offsets, chain, &err); | 2039 | partial = ext3_get_branch(inode, k, offsets, chain, &err); |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 2c8caa51addb..4e8e2f15b8bd 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
| @@ -2933,7 +2933,7 @@ retry: | |||
| 2933 | ret = write_cache_pages(mapping, wbc, __mpage_da_writepage, | 2933 | ret = write_cache_pages(mapping, wbc, __mpage_da_writepage, |
| 2934 | &mpd); | 2934 | &mpd); |
| 2935 | /* | 2935 | /* |
| 2936 | * If we have a contigous extent of pages and we | 2936 | * If we have a contiguous extent of pages and we |
| 2937 | * haven't done the I/O yet, map the blocks and submit | 2937 | * haven't done the I/O yet, map the blocks and submit |
| 2938 | * them for I/O. | 2938 | * them for I/O. |
| 2939 | */ | 2939 | */ |
| @@ -4064,7 +4064,7 @@ static Indirect *ext4_find_shared(struct inode *inode, int depth, | |||
| 4064 | int k, err; | 4064 | int k, err; |
| 4065 | 4065 | ||
| 4066 | *top = 0; | 4066 | *top = 0; |
| 4067 | /* Make k index the deepest non-null offest + 1 */ | 4067 | /* Make k index the deepest non-null offset + 1 */ |
| 4068 | for (k = depth; k > 1 && !offsets[k-1]; k--) | 4068 | for (k = depth; k > 1 && !offsets[k-1]; k--) |
| 4069 | ; | 4069 | ; |
| 4070 | partial = ext4_get_branch(inode, k, offsets, chain, &err); | 4070 | partial = ext4_get_branch(inode, k, offsets, chain, &err); |
| @@ -5376,7 +5376,7 @@ static int ext4_index_trans_blocks(struct inode *inode, int nrblocks, int chunk) | |||
| 5376 | * worse case, the indexs blocks spread over different block groups | 5376 | * worse case, the indexs blocks spread over different block groups |
| 5377 | * | 5377 | * |
| 5378 | * If datablocks are discontiguous, they are possible to spread over | 5378 | * If datablocks are discontiguous, they are possible to spread over |
| 5379 | * different block groups too. If they are contiugous, with flexbg, | 5379 | * different block groups too. If they are contiuguous, with flexbg, |
| 5380 | * they could still across block group boundary. | 5380 | * they could still across block group boundary. |
| 5381 | * | 5381 | * |
| 5382 | * Also account for superblock, inode, quota and xattr blocks | 5382 | * Also account for superblock, inode, quota and xattr blocks |
| @@ -5452,7 +5452,7 @@ int ext4_writepage_trans_blocks(struct inode *inode) | |||
| 5452 | * Calculate the journal credits for a chunk of data modification. | 5452 | * Calculate the journal credits for a chunk of data modification. |
| 5453 | * | 5453 | * |
| 5454 | * This is called from DIO, fallocate or whoever calling | 5454 | * This is called from DIO, fallocate or whoever calling |
| 5455 | * ext4_get_blocks() to map/allocate a chunk of contigous disk blocks. | 5455 | * ext4_get_blocks() to map/allocate a chunk of contiguous disk blocks. |
| 5456 | * | 5456 | * |
| 5457 | * journal buffers for data blocks are not included here, as DIO | 5457 | * journal buffers for data blocks are not included here, as DIO |
| 5458 | * and fallocate do no need to journal data buffers. | 5458 | * and fallocate do no need to journal data buffers. |
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index bba12824defa..74e495dabe09 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
| @@ -142,7 +142,7 @@ | |||
| 142 | * 2 blocks and the order of allocation is >= sbi->s_mb_order2_reqs. The | 142 | * 2 blocks and the order of allocation is >= sbi->s_mb_order2_reqs. The |
| 143 | * value of s_mb_order2_reqs can be tuned via | 143 | * value of s_mb_order2_reqs can be tuned via |
| 144 | * /sys/fs/ext4/<partition>/mb_order2_req. If the request len is equal to | 144 | * /sys/fs/ext4/<partition>/mb_order2_req. If the request len is equal to |
| 145 | * stripe size (sbi->s_stripe), we try to search for contigous block in | 145 | * stripe size (sbi->s_stripe), we try to search for contiguous block in |
| 146 | * stripe size. This should result in better allocation on RAID setups. If | 146 | * stripe size. This should result in better allocation on RAID setups. If |
| 147 | * not, we search in the specific group using bitmap for best extents. The | 147 | * not, we search in the specific group using bitmap for best extents. The |
| 148 | * tunable min_to_scan and max_to_scan control the behaviour here. | 148 | * tunable min_to_scan and max_to_scan control the behaviour here. |
diff --git a/fs/jffs2/compr.c b/fs/jffs2/compr.c index f25e70c1b51c..f0294410868d 100644 --- a/fs/jffs2/compr.c +++ b/fs/jffs2/compr.c | |||
| @@ -177,7 +177,7 @@ uint16_t jffs2_compress(struct jffs2_sb_info *c, struct jffs2_inode_info *f, | |||
| 177 | spin_unlock(&jffs2_compressor_list_lock); | 177 | spin_unlock(&jffs2_compressor_list_lock); |
| 178 | break; | 178 | break; |
| 179 | default: | 179 | default: |
| 180 | printk(KERN_ERR "JFFS2: unknow compression mode.\n"); | 180 | printk(KERN_ERR "JFFS2: unknown compression mode.\n"); |
| 181 | } | 181 | } |
| 182 | out: | 182 | out: |
| 183 | if (ret == JFFS2_COMPR_NONE) { | 183 | if (ret == JFFS2_COMPR_NONE) { |
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c index 1a80301004b8..378991cfe40f 100644 --- a/fs/jffs2/readinode.c +++ b/fs/jffs2/readinode.c | |||
| @@ -931,7 +931,7 @@ static inline int read_unknown(struct jffs2_sb_info *c, struct jffs2_raw_node_re | |||
| 931 | * Helper function for jffs2_get_inode_nodes(). | 931 | * Helper function for jffs2_get_inode_nodes(). |
| 932 | * The function detects whether more data should be read and reads it if yes. | 932 | * The function detects whether more data should be read and reads it if yes. |
| 933 | * | 933 | * |
| 934 | * Returns: 0 on succes; | 934 | * Returns: 0 on success; |
| 935 | * negative error code on failure. | 935 | * negative error code on failure. |
| 936 | */ | 936 | */ |
| 937 | static int read_more(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref, | 937 | static int read_more(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref, |
diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c index 082e844ab2db..4b107881acd5 100644 --- a/fs/jffs2/xattr.c +++ b/fs/jffs2/xattr.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | * is used to release xattr name/value pair and detach from c->xattrindex. | 31 | * is used to release xattr name/value pair and detach from c->xattrindex. |
| 32 | * reclaim_xattr_datum(c) | 32 | * reclaim_xattr_datum(c) |
| 33 | * is used to reclaim xattr name/value pairs on the xattr name/value pair cache when | 33 | * is used to reclaim xattr name/value pairs on the xattr name/value pair cache when |
| 34 | * memory usage by cache is over c->xdatum_mem_threshold. Currentry, this threshold | 34 | * memory usage by cache is over c->xdatum_mem_threshold. Currently, this threshold |
| 35 | * is hard coded as 32KiB. | 35 | * is hard coded as 32KiB. |
| 36 | * do_verify_xattr_datum(c, xd) | 36 | * do_verify_xattr_datum(c, xd) |
| 37 | * is used to load the xdatum informations without name/value pair from the medium. | 37 | * is used to load the xdatum informations without name/value pair from the medium. |
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index 2bc7d8aa5740..d9b031cf69f5 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c | |||
| @@ -755,7 +755,7 @@ int dbAlloc(struct inode *ip, s64 hint, s64 nblocks, s64 * results) | |||
| 755 | * allocation group. | 755 | * allocation group. |
| 756 | */ | 756 | */ |
| 757 | if ((blkno & (bmp->db_agsize - 1)) == 0) | 757 | if ((blkno & (bmp->db_agsize - 1)) == 0) |
| 758 | /* check if the AG is currenly being written to. | 758 | /* check if the AG is currently being written to. |
| 759 | * if so, call dbNextAG() to find a non-busy | 759 | * if so, call dbNextAG() to find a non-busy |
| 760 | * AG with sufficient free space. | 760 | * AG with sufficient free space. |
| 761 | */ | 761 | */ |
| @@ -3337,7 +3337,7 @@ int dbExtendFS(struct inode *ipbmap, s64 blkno, s64 nblocks) | |||
| 3337 | for (i = 0, n = 0; i < agno; n++) { | 3337 | for (i = 0, n = 0; i < agno; n++) { |
| 3338 | bmp->db_agfree[n] = 0; /* init collection point */ | 3338 | bmp->db_agfree[n] = 0; /* init collection point */ |
| 3339 | 3339 | ||
| 3340 | /* coalesce cotiguous k AGs; */ | 3340 | /* coalesce contiguous k AGs; */ |
| 3341 | for (j = 0; j < k && i < agno; j++, i++) { | 3341 | for (j = 0; j < k && i < agno; j++, i++) { |
| 3342 | /* merge AGi to AGn */ | 3342 | /* merge AGi to AGn */ |
| 3343 | bmp->db_agfree[n] += bmp->db_agfree[i]; | 3343 | bmp->db_agfree[n] += bmp->db_agfree[i]; |
diff --git a/fs/ncpfs/ioctl.c b/fs/ncpfs/ioctl.c index 0d58caf4a6e1..ec8f45f12e05 100644 --- a/fs/ncpfs/ioctl.c +++ b/fs/ncpfs/ioctl.c | |||
| @@ -835,7 +835,7 @@ static int ncp_ioctl_need_write(unsigned int cmd) | |||
| 835 | case NCP_IOC_SETROOT: | 835 | case NCP_IOC_SETROOT: |
| 836 | return 0; | 836 | return 0; |
| 837 | default: | 837 | default: |
| 838 | /* unkown IOCTL command, assume write */ | 838 | /* unknown IOCTL command, assume write */ |
| 839 | return 1; | 839 | return 1; |
| 840 | } | 840 | } |
| 841 | } | 841 | } |
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index 1d1d1a2765dd..5ef5f365a5c8 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c | |||
| @@ -741,10 +741,6 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname, | |||
| 741 | 741 | ||
| 742 | /* create/update an inode mark */ | 742 | /* create/update an inode mark */ |
| 743 | ret = inotify_update_watch(group, inode, mask); | 743 | ret = inotify_update_watch(group, inode, mask); |
| 744 | if (unlikely(ret)) | ||
| 745 | goto path_put_and_out; | ||
| 746 | |||
| 747 | path_put_and_out: | ||
| 748 | path_put(&path); | 744 | path_put(&path); |
| 749 | fput_and_out: | 745 | fput_and_out: |
| 750 | fput_light(filp, fput_needed); | 746 | fput_light(filp, fput_needed); |
diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c index 9669541d0119..08f7530e9341 100644 --- a/fs/ntfs/compress.c +++ b/fs/ntfs/compress.c | |||
| @@ -927,7 +927,7 @@ lock_retry_remap: | |||
| 927 | return 0; | 927 | return 0; |
| 928 | 928 | ||
| 929 | ntfs_debug("Failed. Returning error code %s.", err == -EOVERFLOW ? | 929 | ntfs_debug("Failed. Returning error code %s.", err == -EOVERFLOW ? |
| 930 | "EOVERFLOW" : (!err ? "EIO" : "unkown error")); | 930 | "EOVERFLOW" : (!err ? "EIO" : "unknown error")); |
| 931 | return err < 0 ? err : -EIO; | 931 | return err < 0 ? err : -EIO; |
| 932 | 932 | ||
| 933 | read_err: | 933 | read_err: |
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index 663c0e341f8b..43179ddd336f 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c | |||
| @@ -399,7 +399,7 @@ static inline void ntfs_fault_in_pages_readable_iovec(const struct iovec *iov, | |||
| 399 | * @cached_page: allocated but as yet unused page | 399 | * @cached_page: allocated but as yet unused page |
| 400 | * @lru_pvec: lru-buffering pagevec of caller | 400 | * @lru_pvec: lru-buffering pagevec of caller |
| 401 | * | 401 | * |
| 402 | * Obtain @nr_pages locked page cache pages from the mapping @maping and | 402 | * Obtain @nr_pages locked page cache pages from the mapping @mapping and |
| 403 | * starting at index @index. | 403 | * starting at index @index. |
| 404 | * | 404 | * |
| 405 | * If a page is newly created, increment its refcount and add it to the | 405 | * If a page is newly created, increment its refcount and add it to the |
| @@ -1281,7 +1281,7 @@ rl_not_mapped_enoent: | |||
| 1281 | 1281 | ||
| 1282 | /* | 1282 | /* |
| 1283 | * Copy as much as we can into the pages and return the number of bytes which | 1283 | * Copy as much as we can into the pages and return the number of bytes which |
| 1284 | * were sucessfully copied. If a fault is encountered then clear the pages | 1284 | * were successfully copied. If a fault is encountered then clear the pages |
| 1285 | * out to (ofs + bytes) and return the number of bytes which were copied. | 1285 | * out to (ofs + bytes) and return the number of bytes which were copied. |
| 1286 | */ | 1286 | */ |
| 1287 | static inline size_t ntfs_copy_from_user(struct page **pages, | 1287 | static inline size_t ntfs_copy_from_user(struct page **pages, |
diff --git a/fs/ntfs/logfile.c b/fs/ntfs/logfile.c index 89b02985c054..4dadcdf3d451 100644 --- a/fs/ntfs/logfile.c +++ b/fs/ntfs/logfile.c | |||
| @@ -338,7 +338,7 @@ err_out: | |||
| 338 | * copy of the complete multi sector transfer deprotected page. On failure, | 338 | * copy of the complete multi sector transfer deprotected page. On failure, |
| 339 | * *@wrp is undefined. | 339 | * *@wrp is undefined. |
| 340 | * | 340 | * |
| 341 | * Simillarly, if @lsn is not NULL, on succes *@lsn will be set to the current | 341 | * Simillarly, if @lsn is not NULL, on success *@lsn will be set to the current |
| 342 | * logfile lsn according to this restart page. On failure, *@lsn is undefined. | 342 | * logfile lsn according to this restart page. On failure, *@lsn is undefined. |
| 343 | * | 343 | * |
| 344 | * The following error codes are defined: | 344 | * The following error codes are defined: |
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 38a42f5d59ff..7c7198a5bc90 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c | |||
| @@ -2398,7 +2398,7 @@ static int ocfs2_leftmost_rec_contains(struct ocfs2_extent_list *el, u32 cpos) | |||
| 2398 | * | 2398 | * |
| 2399 | * The array is assumed to be large enough to hold an entire path (tree depth). | 2399 | * The array is assumed to be large enough to hold an entire path (tree depth). |
| 2400 | * | 2400 | * |
| 2401 | * Upon succesful return from this function: | 2401 | * Upon successful return from this function: |
| 2402 | * | 2402 | * |
| 2403 | * - The 'right_path' array will contain a path to the leaf block | 2403 | * - The 'right_path' array will contain a path to the leaf block |
| 2404 | * whose range contains e_cpos. | 2404 | * whose range contains e_cpos. |
diff --git a/fs/ocfs2/blockcheck.c b/fs/ocfs2/blockcheck.c index a1163b8b417c..b7428c5d0d3b 100644 --- a/fs/ocfs2/blockcheck.c +++ b/fs/ocfs2/blockcheck.c | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | * Calculate the bit offset in the hamming code buffer based on the bit's | 47 | * Calculate the bit offset in the hamming code buffer based on the bit's |
| 48 | * offset in the data buffer. Since the hamming code reserves all | 48 | * offset in the data buffer. Since the hamming code reserves all |
| 49 | * power-of-two bits for parity, the data bit number and the code bit | 49 | * power-of-two bits for parity, the data bit number and the code bit |
| 50 | * number are offest by all the parity bits beforehand. | 50 | * number are offset by all the parity bits beforehand. |
| 51 | * | 51 | * |
| 52 | * Recall that bit numbers in hamming code are 1-based. This function | 52 | * Recall that bit numbers in hamming code are 1-based. This function |
| 53 | * takes the 0-based data bit from the caller. | 53 | * takes the 0-based data bit from the caller. |
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index 83bcaf266b35..03ccf9a7b1f4 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c | |||
| @@ -2586,7 +2586,7 @@ fail: | |||
| 2586 | * is complete everywhere. if the target dies while this is | 2586 | * is complete everywhere. if the target dies while this is |
| 2587 | * going on, some nodes could potentially see the target as the | 2587 | * going on, some nodes could potentially see the target as the |
| 2588 | * master, so it is important that my recovery finds the migration | 2588 | * master, so it is important that my recovery finds the migration |
| 2589 | * mle and sets the master to UNKNONWN. */ | 2589 | * mle and sets the master to UNKNOWN. */ |
| 2590 | 2590 | ||
| 2591 | 2591 | ||
| 2592 | /* wait for new node to assert master */ | 2592 | /* wait for new node to assert master */ |
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 0d38d67194cb..c5e4a49e3a12 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c | |||
| @@ -1855,7 +1855,7 @@ int ocfs2_file_lock(struct file *file, int ex, int trylock) | |||
| 1855 | * outstanding lock request, so a cancel convert is | 1855 | * outstanding lock request, so a cancel convert is |
| 1856 | * required. We intentionally overwrite 'ret' - if the | 1856 | * required. We intentionally overwrite 'ret' - if the |
| 1857 | * cancel fails and the lock was granted, it's easier | 1857 | * cancel fails and the lock was granted, it's easier |
| 1858 | * to just bubble sucess back up to the user. | 1858 | * to just bubble success back up to the user. |
| 1859 | */ | 1859 | */ |
| 1860 | ret = ocfs2_flock_handle_signal(lockres, level); | 1860 | ret = ocfs2_flock_handle_signal(lockres, level); |
| 1861 | } else if (!ret && (level > lockres->l_level)) { | 1861 | } else if (!ret && (level > lockres->l_level)) { |
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 54c16b66327e..bf34c491ae96 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c | |||
| @@ -659,7 +659,7 @@ static int __ocfs2_journal_access(handle_t *handle, | |||
| 659 | 659 | ||
| 660 | default: | 660 | default: |
| 661 | status = -EINVAL; | 661 | status = -EINVAL; |
| 662 | mlog(ML_ERROR, "Uknown access type!\n"); | 662 | mlog(ML_ERROR, "Unknown access type!\n"); |
| 663 | } | 663 | } |
| 664 | if (!status && ocfs2_meta_ecc(osb) && triggers) | 664 | if (!status && ocfs2_meta_ecc(osb) && triggers) |
| 665 | jbd2_journal_set_triggers(bh, &triggers->ot_triggers); | 665 | jbd2_journal_set_triggers(bh, &triggers->ot_triggers); |
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index 3a0df7a1b810..30967e3f5e43 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c | |||
| @@ -2431,7 +2431,7 @@ out: | |||
| 2431 | * we gonna touch and whether we need to create new blocks. | 2431 | * we gonna touch and whether we need to create new blocks. |
| 2432 | * | 2432 | * |
| 2433 | * Normally the refcount blocks store these refcount should be | 2433 | * Normally the refcount blocks store these refcount should be |
| 2434 | * continguous also, so that we can get the number easily. | 2434 | * contiguous also, so that we can get the number easily. |
| 2435 | * As for meta_ac, we will at most add split 2 refcount record and | 2435 | * As for meta_ac, we will at most add split 2 refcount record and |
| 2436 | * 2 more refcount block, so just check it in a rough way. | 2436 | * 2 more refcount block, so just check it in a rough way. |
| 2437 | * | 2437 | * |
diff --git a/fs/omfs/bitmap.c b/fs/omfs/bitmap.c index e1c0ec0ae989..082234581d05 100644 --- a/fs/omfs/bitmap.c +++ b/fs/omfs/bitmap.c | |||
| @@ -85,7 +85,7 @@ out: | |||
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | /* | 87 | /* |
| 88 | * Tries to allocate exactly one block. Returns true if sucessful. | 88 | * Tries to allocate exactly one block. Returns true if successful. |
| 89 | */ | 89 | */ |
| 90 | int omfs_allocate_block(struct super_block *sb, u64 block) | 90 | int omfs_allocate_block(struct super_block *sb, u64 block) |
| 91 | { | 91 | { |
diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c index 0afba069d567..32f5d131a644 100644 --- a/fs/qnx4/bitmap.c +++ b/fs/qnx4/bitmap.c | |||
| @@ -67,7 +67,7 @@ unsigned long qnx4_count_free_blocks(struct super_block *sb) | |||
| 67 | 67 | ||
| 68 | while (total < size) { | 68 | while (total < size) { |
| 69 | if ((bh = sb_bread(sb, start + offset)) == NULL) { | 69 | if ((bh = sb_bread(sb, start + offset)) == NULL) { |
| 70 | printk("qnx4: I/O error in counting free blocks\n"); | 70 | printk(KERN_ERR "qnx4: I/O error in counting free blocks\n"); |
| 71 | break; | 71 | break; |
| 72 | } | 72 | } |
| 73 | count_bits(bh->b_data, size - total, &total_free); | 73 | count_bits(bh->b_data, size - total, &total_free); |
diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c index 86cc39cb1398..6f30c3d5bcbf 100644 --- a/fs/qnx4/dir.c +++ b/fs/qnx4/dir.c | |||
| @@ -26,8 +26,8 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
| 26 | int ix, ino; | 26 | int ix, ino; |
| 27 | int size; | 27 | int size; |
| 28 | 28 | ||
| 29 | QNX4DEBUG(("qnx4_readdir:i_size = %ld\n", (long) inode->i_size)); | 29 | QNX4DEBUG((KERN_INFO "qnx4_readdir:i_size = %ld\n", (long) inode->i_size)); |
| 30 | QNX4DEBUG(("filp->f_pos = %ld\n", (long) filp->f_pos)); | 30 | QNX4DEBUG((KERN_INFO "filp->f_pos = %ld\n", (long) filp->f_pos)); |
| 31 | 31 | ||
| 32 | lock_kernel(); | 32 | lock_kernel(); |
| 33 | 33 | ||
| @@ -50,7 +50,7 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
| 50 | size = QNX4_NAME_MAX; | 50 | size = QNX4_NAME_MAX; |
| 51 | 51 | ||
| 52 | if ( ( de->di_status & (QNX4_FILE_USED|QNX4_FILE_LINK) ) != 0 ) { | 52 | if ( ( de->di_status & (QNX4_FILE_USED|QNX4_FILE_LINK) ) != 0 ) { |
| 53 | QNX4DEBUG(("qnx4_readdir:%.*s\n", size, de->di_fname)); | 53 | QNX4DEBUG((KERN_INFO "qnx4_readdir:%.*s\n", size, de->di_fname)); |
| 54 | if ( ( de->di_status & QNX4_FILE_LINK ) == 0 ) | 54 | if ( ( de->di_status & QNX4_FILE_LINK ) == 0 ) |
| 55 | ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1; | 55 | ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1; |
| 56 | else { | 56 | else { |
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index d2cd1798d8c4..449f5a66dd34 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
| @@ -107,7 +107,7 @@ static int qnx4_get_block( struct inode *inode, sector_t iblock, struct buffer_h | |||
| 107 | { | 107 | { |
| 108 | unsigned long phys; | 108 | unsigned long phys; |
| 109 | 109 | ||
| 110 | QNX4DEBUG(("qnx4: qnx4_get_block inode=[%ld] iblock=[%ld]\n",inode->i_ino,iblock)); | 110 | QNX4DEBUG((KERN_INFO "qnx4: qnx4_get_block inode=[%ld] iblock=[%ld]\n",inode->i_ino,iblock)); |
| 111 | 111 | ||
| 112 | phys = qnx4_block_map( inode, iblock ); | 112 | phys = qnx4_block_map( inode, iblock ); |
| 113 | if ( phys ) { | 113 | if ( phys ) { |
| @@ -142,12 +142,12 @@ unsigned long qnx4_block_map( struct inode *inode, long iblock ) | |||
| 142 | // read next xtnt block. | 142 | // read next xtnt block. |
| 143 | bh = sb_bread(inode->i_sb, i_xblk - 1); | 143 | bh = sb_bread(inode->i_sb, i_xblk - 1); |
| 144 | if ( !bh ) { | 144 | if ( !bh ) { |
| 145 | QNX4DEBUG(("qnx4: I/O error reading xtnt block [%ld])\n", i_xblk - 1)); | 145 | QNX4DEBUG((KERN_ERR "qnx4: I/O error reading xtnt block [%ld])\n", i_xblk - 1)); |
| 146 | return -EIO; | 146 | return -EIO; |
| 147 | } | 147 | } |
| 148 | xblk = (struct qnx4_xblk*)bh->b_data; | 148 | xblk = (struct qnx4_xblk*)bh->b_data; |
| 149 | if ( memcmp( xblk->xblk_signature, "IamXblk", 7 ) ) { | 149 | if ( memcmp( xblk->xblk_signature, "IamXblk", 7 ) ) { |
| 150 | QNX4DEBUG(("qnx4: block at %ld is not a valid xtnt\n", qnx4_inode->i_xblk)); | 150 | QNX4DEBUG((KERN_ERR "qnx4: block at %ld is not a valid xtnt\n", qnx4_inode->i_xblk)); |
| 151 | return -EIO; | 151 | return -EIO; |
| 152 | } | 152 | } |
| 153 | } | 153 | } |
| @@ -168,7 +168,7 @@ unsigned long qnx4_block_map( struct inode *inode, long iblock ) | |||
| 168 | brelse( bh ); | 168 | brelse( bh ); |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | QNX4DEBUG(("qnx4: mapping block %ld of inode %ld = %ld\n",iblock,inode->i_ino,block)); | 171 | QNX4DEBUG((KERN_INFO "qnx4: mapping block %ld of inode %ld = %ld\n",iblock,inode->i_ino,block)); |
| 172 | return block; | 172 | return block; |
| 173 | } | 173 | } |
| 174 | 174 | ||
| @@ -209,7 +209,7 @@ static const char *qnx4_checkroot(struct super_block *sb) | |||
| 209 | if (*(qnx4_sb(sb)->sb->RootDir.di_fname) != '/') { | 209 | if (*(qnx4_sb(sb)->sb->RootDir.di_fname) != '/') { |
| 210 | return "no qnx4 filesystem (no root dir)."; | 210 | return "no qnx4 filesystem (no root dir)."; |
| 211 | } else { | 211 | } else { |
| 212 | QNX4DEBUG(("QNX4 filesystem found on dev %s.\n", sb->s_id)); | 212 | QNX4DEBUG((KERN_NOTICE "QNX4 filesystem found on dev %s.\n", sb->s_id)); |
| 213 | rd = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_blk) - 1; | 213 | rd = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_blk) - 1; |
| 214 | rl = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_size); | 214 | rl = le32_to_cpu(qnx4_sb(sb)->sb->RootDir.di_first_xtnt.xtnt_size); |
| 215 | for (j = 0; j < rl; j++) { | 215 | for (j = 0; j < rl; j++) { |
| @@ -220,7 +220,7 @@ static const char *qnx4_checkroot(struct super_block *sb) | |||
| 220 | for (i = 0; i < QNX4_INODES_PER_BLOCK; i++) { | 220 | for (i = 0; i < QNX4_INODES_PER_BLOCK; i++) { |
| 221 | rootdir = (struct qnx4_inode_entry *) (bh->b_data + i * QNX4_DIR_ENTRY_SIZE); | 221 | rootdir = (struct qnx4_inode_entry *) (bh->b_data + i * QNX4_DIR_ENTRY_SIZE); |
| 222 | if (rootdir->di_fname != NULL) { | 222 | if (rootdir->di_fname != NULL) { |
| 223 | QNX4DEBUG(("Rootdir entry found : [%s]\n", rootdir->di_fname)); | 223 | QNX4DEBUG((KERN_INFO "rootdir entry found : [%s]\n", rootdir->di_fname)); |
| 224 | if (!strncmp(rootdir->di_fname, QNX4_BMNAME, sizeof QNX4_BMNAME)) { | 224 | if (!strncmp(rootdir->di_fname, QNX4_BMNAME, sizeof QNX4_BMNAME)) { |
| 225 | found = 1; | 225 | found = 1; |
| 226 | qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL ); | 226 | qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL ); |
| @@ -265,12 +265,12 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent) | |||
| 265 | if we don't belong here... */ | 265 | if we don't belong here... */ |
| 266 | bh = sb_bread(s, 1); | 266 | bh = sb_bread(s, 1); |
| 267 | if (!bh) { | 267 | if (!bh) { |
| 268 | printk("qnx4: unable to read the superblock\n"); | 268 | printk(KERN_ERR "qnx4: unable to read the superblock\n"); |
| 269 | goto outnobh; | 269 | goto outnobh; |
| 270 | } | 270 | } |
| 271 | if ( le32_to_cpup((__le32*) bh->b_data) != QNX4_SUPER_MAGIC ) { | 271 | if ( le32_to_cpup((__le32*) bh->b_data) != QNX4_SUPER_MAGIC ) { |
| 272 | if (!silent) | 272 | if (!silent) |
| 273 | printk("qnx4: wrong fsid in superblock.\n"); | 273 | printk(KERN_ERR "qnx4: wrong fsid in superblock.\n"); |
| 274 | goto out; | 274 | goto out; |
| 275 | } | 275 | } |
| 276 | s->s_op = &qnx4_sops; | 276 | s->s_op = &qnx4_sops; |
| @@ -284,14 +284,14 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent) | |||
| 284 | errmsg = qnx4_checkroot(s); | 284 | errmsg = qnx4_checkroot(s); |
| 285 | if (errmsg != NULL) { | 285 | if (errmsg != NULL) { |
| 286 | if (!silent) | 286 | if (!silent) |
| 287 | printk("qnx4: %s\n", errmsg); | 287 | printk(KERN_ERR "qnx4: %s\n", errmsg); |
| 288 | goto out; | 288 | goto out; |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | /* does root not have inode number QNX4_ROOT_INO ?? */ | 291 | /* does root not have inode number QNX4_ROOT_INO ?? */ |
| 292 | root = qnx4_iget(s, QNX4_ROOT_INO * QNX4_INODES_PER_BLOCK); | 292 | root = qnx4_iget(s, QNX4_ROOT_INO * QNX4_INODES_PER_BLOCK); |
| 293 | if (IS_ERR(root)) { | 293 | if (IS_ERR(root)) { |
| 294 | printk("qnx4: get inode failed\n"); | 294 | printk(KERN_ERR "qnx4: get inode failed\n"); |
| 295 | ret = PTR_ERR(root); | 295 | ret = PTR_ERR(root); |
| 296 | goto out; | 296 | goto out; |
| 297 | } | 297 | } |
| @@ -374,7 +374,7 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino) | |||
| 374 | qnx4_inode = qnx4_raw_inode(inode); | 374 | qnx4_inode = qnx4_raw_inode(inode); |
| 375 | inode->i_mode = 0; | 375 | inode->i_mode = 0; |
| 376 | 376 | ||
| 377 | QNX4DEBUG(("Reading inode : [%d]\n", ino)); | 377 | QNX4DEBUG((KERN_INFO "reading inode : [%d]\n", ino)); |
| 378 | if (!ino) { | 378 | if (!ino) { |
| 379 | printk(KERN_ERR "qnx4: bad inode number on dev %s: %lu is " | 379 | printk(KERN_ERR "qnx4: bad inode number on dev %s: %lu is " |
| 380 | "out of range\n", | 380 | "out of range\n", |
| @@ -385,7 +385,7 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino) | |||
| 385 | block = ino / QNX4_INODES_PER_BLOCK; | 385 | block = ino / QNX4_INODES_PER_BLOCK; |
| 386 | 386 | ||
| 387 | if (!(bh = sb_bread(sb, block))) { | 387 | if (!(bh = sb_bread(sb, block))) { |
| 388 | printk("qnx4: major problem: unable to read inode from dev " | 388 | printk(KERN_ERR "qnx4: major problem: unable to read inode from dev " |
| 389 | "%s\n", sb->s_id); | 389 | "%s\n", sb->s_id); |
| 390 | iget_failed(inode); | 390 | iget_failed(inode); |
| 391 | return ERR_PTR(-EIO); | 391 | return ERR_PTR(-EIO); |
| @@ -499,7 +499,7 @@ static int __init init_qnx4_fs(void) | |||
| 499 | return err; | 499 | return err; |
| 500 | } | 500 | } |
| 501 | 501 | ||
| 502 | printk("QNX4 filesystem 0.2.3 registered.\n"); | 502 | printk(KERN_INFO "QNX4 filesystem 0.2.3 registered.\n"); |
| 503 | return 0; | 503 | return 0; |
| 504 | } | 504 | } |
| 505 | 505 | ||
diff --git a/fs/qnx4/namei.c b/fs/qnx4/namei.c index ae1e7edbacd6..58703ebba879 100644 --- a/fs/qnx4/namei.c +++ b/fs/qnx4/namei.c | |||
| @@ -30,7 +30,7 @@ static int qnx4_match(int len, const char *name, | |||
| 30 | int namelen, thislen; | 30 | int namelen, thislen; |
| 31 | 31 | ||
| 32 | if (bh == NULL) { | 32 | if (bh == NULL) { |
| 33 | printk("qnx4: matching unassigned buffer !\n"); | 33 | printk(KERN_WARNING "qnx4: matching unassigned buffer !\n"); |
| 34 | return 0; | 34 | return 0; |
| 35 | } | 35 | } |
| 36 | de = (struct qnx4_inode_entry *) (bh->b_data + *offset); | 36 | de = (struct qnx4_inode_entry *) (bh->b_data + *offset); |
| @@ -66,7 +66,7 @@ static struct buffer_head *qnx4_find_entry(int len, struct inode *dir, | |||
| 66 | 66 | ||
| 67 | *res_dir = NULL; | 67 | *res_dir = NULL; |
| 68 | if (!dir->i_sb) { | 68 | if (!dir->i_sb) { |
| 69 | printk("qnx4: no superblock on dir.\n"); | 69 | printk(KERN_WARNING "qnx4: no superblock on dir.\n"); |
| 70 | return NULL; | 70 | return NULL; |
| 71 | } | 71 | } |
| 72 | bh = NULL; | 72 | bh = NULL; |
| @@ -124,7 +124,7 @@ struct dentry * qnx4_lookup(struct inode *dir, struct dentry *dentry, struct nam | |||
| 124 | foundinode = qnx4_iget(dir->i_sb, ino); | 124 | foundinode = qnx4_iget(dir->i_sb, ino); |
| 125 | if (IS_ERR(foundinode)) { | 125 | if (IS_ERR(foundinode)) { |
| 126 | unlock_kernel(); | 126 | unlock_kernel(); |
| 127 | QNX4DEBUG(("qnx4: lookup->iget -> error %ld\n", | 127 | QNX4DEBUG((KERN_ERR "qnx4: lookup->iget -> error %ld\n", |
| 128 | PTR_ERR(foundinode))); | 128 | PTR_ERR(foundinode))); |
| 129 | return ERR_CAST(foundinode); | 129 | return ERR_CAST(foundinode); |
| 130 | } | 130 | } |
diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c index d2f31330dcae..6591cb21edf6 100644 --- a/fs/reiserfs/fix_node.c +++ b/fs/reiserfs/fix_node.c | |||
| @@ -831,7 +831,7 @@ static int get_empty_nodes(struct tree_balance *tb, int h) | |||
| 831 | RFALSE(buffer_dirty(new_bh) || | 831 | RFALSE(buffer_dirty(new_bh) || |
| 832 | buffer_journaled(new_bh) || | 832 | buffer_journaled(new_bh) || |
| 833 | buffer_journal_dirty(new_bh), | 833 | buffer_journal_dirty(new_bh), |
| 834 | "PAP-8140: journlaled or dirty buffer %b for the new block", | 834 | "PAP-8140: journaled or dirty buffer %b for the new block", |
| 835 | new_bh); | 835 | new_bh); |
| 836 | 836 | ||
| 837 | /* Put empty buffers into the array. */ | 837 | /* Put empty buffers into the array. */ |
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index f94ddf7efba0..868a55ee080f 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | /* | 23 | /* |
| 24 | * This file implements functions needed to recover from unclean un-mounts. | 24 | * This file implements functions needed to recover from unclean un-mounts. |
| 25 | * When UBIFS is mounted, it checks a flag on the master node to determine if | 25 | * When UBIFS is mounted, it checks a flag on the master node to determine if |
| 26 | * an un-mount was completed sucessfully. If not, the process of mounting | 26 | * an un-mount was completed successfully. If not, the process of mounting |
| 27 | * incorparates additional checking and fixing of on-flash data structures. | 27 | * incorparates additional checking and fixing of on-flash data structures. |
| 28 | * UBIFS always cleans away all remnants of an unclean un-mount, so that | 28 | * UBIFS always cleans away all remnants of an unclean un-mount, so that |
| 29 | * errors do not accumulate. However UBIFS defers recovery if it is mounted | 29 | * errors do not accumulate. However UBIFS defers recovery if it is mounted |
diff --git a/fs/xfs/quota/xfs_dquot.h b/fs/xfs/quota/xfs_dquot.h index 6533ead9b889..a2c16bcee90b 100644 --- a/fs/xfs/quota/xfs_dquot.h +++ b/fs/xfs/quota/xfs_dquot.h | |||
| @@ -98,7 +98,7 @@ typedef struct xfs_dquot { | |||
| 98 | #define dq_flags q_lists.dqm_flags | 98 | #define dq_flags q_lists.dqm_flags |
| 99 | 99 | ||
| 100 | /* | 100 | /* |
| 101 | * Lock hierachy for q_qlock: | 101 | * Lock hierarchy for q_qlock: |
| 102 | * XFS_QLOCK_NORMAL is the implicit default, | 102 | * XFS_QLOCK_NORMAL is the implicit default, |
| 103 | * XFS_QLOCK_NESTED is the dquot with the higher id in xfs_dqlock2 | 103 | * XFS_QLOCK_NESTED is the dquot with the higher id in xfs_dqlock2 |
| 104 | */ | 104 | */ |
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index 4c8d0afae711..fb2d63f13f4c 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | 47 | ||
| 48 | #elif defined(CONFIG_SPARSEMEM_VMEMMAP) | 48 | #elif defined(CONFIG_SPARSEMEM_VMEMMAP) |
| 49 | 49 | ||
| 50 | /* memmap is virtually contigious. */ | 50 | /* memmap is virtually contiguous. */ |
| 51 | #define __pfn_to_page(pfn) (vmemmap + (pfn)) | 51 | #define __pfn_to_page(pfn) (vmemmap + (pfn)) |
| 52 | #define __page_to_pfn(page) (unsigned long)((page) - vmemmap) | 52 | #define __page_to_pfn(page) (unsigned long)((page) - vmemmap) |
| 53 | 53 | ||
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h index d76b66acea95..7c38c147e5e6 100644 --- a/include/asm-generic/unistd.h +++ b/include/asm-generic/unistd.h | |||
| @@ -631,7 +631,7 @@ __SYSCALL(__NR_perf_event_open, sys_perf_event_open) | |||
| 631 | * these are provided for both review and as a porting | 631 | * these are provided for both review and as a porting |
| 632 | * help for the C library version. | 632 | * help for the C library version. |
| 633 | * | 633 | * |
| 634 | * Last chance: are any of these important enought to | 634 | * Last chance: are any of these important enough to |
| 635 | * enable by default? | 635 | * enable by default? |
| 636 | */ | 636 | */ |
| 637 | #ifdef __ARCH_WANT_SYSCALL_NO_AT | 637 | #ifdef __ARCH_WANT_SYSCALL_NO_AT |
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h index cb57c30081a8..eb130b4d8e72 100644 --- a/include/linux/cciss_ioctl.h +++ b/include/linux/cciss_ioctl.h | |||
| @@ -39,7 +39,7 @@ typedef __u32 DriverVer_type; | |||
| 39 | #ifndef CCISS_CMD_H | 39 | #ifndef CCISS_CMD_H |
| 40 | // This defines are duplicated in cciss_cmd.h in the driver directory | 40 | // This defines are duplicated in cciss_cmd.h in the driver directory |
| 41 | 41 | ||
| 42 | //general boundary defintions | 42 | //general boundary definitions |
| 43 | #define SENSEINFOBYTES 32//note that this value may vary between host implementations | 43 | #define SENSEINFOBYTES 32//note that this value may vary between host implementations |
| 44 | 44 | ||
| 45 | //Command Status value | 45 | //Command Status value |
diff --git a/include/linux/chio.h b/include/linux/chio.h index 519248d8b2b6..d9bac7f97282 100644 --- a/include/linux/chio.h +++ b/include/linux/chio.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * query vendor-specific element types | 21 | * query vendor-specific element types |
| 22 | * | 22 | * |
| 23 | * accessing elements works by specifing type and unit of the element. | 23 | * accessing elements works by specifing type and unit of the element. |
| 24 | * for eample, storage elements are addressed with type = CHET_ST and | 24 | * for example, storage elements are addressed with type = CHET_ST and |
| 25 | * unit = 0 .. cp_nslots-1 | 25 | * unit = 0 .. cp_nslots-1 |
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
diff --git a/include/linux/dm-log-userspace.h b/include/linux/dm-log-userspace.h index 8a1f972c0fe9..0c3c3a2110c4 100644 --- a/include/linux/dm-log-userspace.h +++ b/include/linux/dm-log-userspace.h | |||
| @@ -363,7 +363,7 @@ | |||
| 363 | * various request types above. The remaining 24-bits are currently | 363 | * various request types above. The remaining 24-bits are currently |
| 364 | * set to zero and are reserved for future use and compatibility concerns. | 364 | * set to zero and are reserved for future use and compatibility concerns. |
| 365 | * | 365 | * |
| 366 | * User-space should always use DM_ULOG_REQUEST_TYPE to aquire the | 366 | * User-space should always use DM_ULOG_REQUEST_TYPE to acquire the |
| 367 | * request type from the 'request_type' field to maintain forward compatibility. | 367 | * request type from the 'request_type' field to maintain forward compatibility. |
| 368 | */ | 368 | */ |
| 369 | #define DM_ULOG_REQUEST_MASK 0xFF | 369 | #define DM_ULOG_REQUEST_MASK 0xFF |
diff --git a/include/linux/in6.h b/include/linux/in6.h index dfa29168e6ab..bd55c6e46b2e 100644 --- a/include/linux/in6.h +++ b/include/linux/in6.h | |||
| @@ -110,7 +110,7 @@ struct in6_flowlabel_req { | |||
| 110 | #define IPV6_FLOWINFO_FLOWLABEL 0x000fffff | 110 | #define IPV6_FLOWINFO_FLOWLABEL 0x000fffff |
| 111 | #define IPV6_FLOWINFO_PRIORITY 0x0ff00000 | 111 | #define IPV6_FLOWINFO_PRIORITY 0x0ff00000 |
| 112 | 112 | ||
| 113 | /* These defintions are obsolete */ | 113 | /* These definitions are obsolete */ |
| 114 | #define IPV6_PRIORITY_UNCHARACTERIZED 0x0000 | 114 | #define IPV6_PRIORITY_UNCHARACTERIZED 0x0000 |
| 115 | #define IPV6_PRIORITY_FILLER 0x0100 | 115 | #define IPV6_PRIORITY_FILLER 0x0100 |
| 116 | #define IPV6_PRIORITY_UNATTENDED 0x0200 | 116 | #define IPV6_PRIORITY_UNATTENDED 0x0200 |
diff --git a/include/linux/irq.h b/include/linux/irq.h index ae9653dbcd78..a287cfc0b1a6 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
| @@ -282,7 +282,7 @@ extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action); | |||
| 282 | 282 | ||
| 283 | /* | 283 | /* |
| 284 | * Built-in IRQ handlers for various IRQ types, | 284 | * Built-in IRQ handlers for various IRQ types, |
| 285 | * callable via desc->chip->handle_irq() | 285 | * callable via desc->handle_irq() |
| 286 | */ | 286 | */ |
| 287 | extern void handle_level_irq(unsigned int irq, struct irq_desc *desc); | 287 | extern void handle_level_irq(unsigned int irq, struct irq_desc *desc); |
| 288 | extern void handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc); | 288 | extern void handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc); |
diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h index e5124ceea769..3402042ddc31 100644 --- a/include/linux/mfd/ezx-pcap.h +++ b/include/linux/mfd/ezx-pcap.h | |||
| @@ -45,7 +45,7 @@ void pcap_set_ts_bits(struct pcap_chip *, u32); | |||
| 45 | #define PCAP_CLEAR_INTERRUPT_REGISTER 0x01ffffff | 45 | #define PCAP_CLEAR_INTERRUPT_REGISTER 0x01ffffff |
| 46 | #define PCAP_MASK_ALL_INTERRUPT 0x01ffffff | 46 | #define PCAP_MASK_ALL_INTERRUPT 0x01ffffff |
| 47 | 47 | ||
| 48 | /* registers acessible by both pcap ports */ | 48 | /* registers accessible by both pcap ports */ |
| 49 | #define PCAP_REG_ISR 0x0 /* Interrupt Status */ | 49 | #define PCAP_REG_ISR 0x0 /* Interrupt Status */ |
| 50 | #define PCAP_REG_MSR 0x1 /* Interrupt Mask */ | 50 | #define PCAP_REG_MSR 0x1 /* Interrupt Mask */ |
| 51 | #define PCAP_REG_PSTAT 0x2 /* Processor Status */ | 51 | #define PCAP_REG_PSTAT 0x2 /* Processor Status */ |
| @@ -67,7 +67,7 @@ void pcap_set_ts_bits(struct pcap_chip *, u32); | |||
| 67 | #define PCAP_REG_VENDOR_TEST1 0x1e | 67 | #define PCAP_REG_VENDOR_TEST1 0x1e |
| 68 | #define PCAP_REG_VENDOR_TEST2 0x1f | 68 | #define PCAP_REG_VENDOR_TEST2 0x1f |
| 69 | 69 | ||
| 70 | /* registers acessible by pcap port 1 only (a1200, e2 & e6) */ | 70 | /* registers accessible by pcap port 1 only (a1200, e2 & e6) */ |
| 71 | #define PCAP_REG_INT_SEL 0x3 /* Interrupt Select */ | 71 | #define PCAP_REG_INT_SEL 0x3 /* Interrupt Select */ |
| 72 | #define PCAP_REG_SWCTRL 0x4 /* Switching Regulator Control */ | 72 | #define PCAP_REG_SWCTRL 0x4 /* Switching Regulator Control */ |
| 73 | #define PCAP_REG_VREG1 0x5 /* Regulator Bank 1 Control */ | 73 | #define PCAP_REG_VREG1 0x5 /* Regulator Bank 1 Control */ |
diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h index d745f5b6c7b0..76e5053e1fac 100644 --- a/include/linux/pktcdvd.h +++ b/include/linux/pktcdvd.h | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | /* | 31 | /* |
| 32 | * use drive write caching -- we need deferred error handling to be | 32 | * use drive write caching -- we need deferred error handling to be |
| 33 | * able to sucessfully recover with this option (drive will return good | 33 | * able to successfully recover with this option (drive will return good |
| 34 | * status as soon as the cdb is validated). | 34 | * status as soon as the cdb is validated). |
| 35 | */ | 35 | */ |
| 36 | #if defined(CONFIG_CDROM_PKTCDVD_WCACHE) | 36 | #if defined(CONFIG_CDROM_PKTCDVD_WCACHE) |
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 850db2e80510..cf9327c051ad 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h | |||
| @@ -216,10 +216,10 @@ | |||
| 216 | 216 | ||
| 217 | #define UART_IIR_TOD 0x08 /* Character Timeout Indication Detected */ | 217 | #define UART_IIR_TOD 0x08 /* Character Timeout Indication Detected */ |
| 218 | 218 | ||
| 219 | #define UART_FCR_PXAR1 0x00 /* receive FIFO treshold = 1 */ | 219 | #define UART_FCR_PXAR1 0x00 /* receive FIFO threshold = 1 */ |
| 220 | #define UART_FCR_PXAR8 0x40 /* receive FIFO treshold = 8 */ | 220 | #define UART_FCR_PXAR8 0x40 /* receive FIFO threshold = 8 */ |
| 221 | #define UART_FCR_PXAR16 0x80 /* receive FIFO treshold = 16 */ | 221 | #define UART_FCR_PXAR16 0x80 /* receive FIFO threshold = 16 */ |
| 222 | #define UART_FCR_PXAR32 0xc0 /* receive FIFO treshold = 32 */ | 222 | #define UART_FCR_PXAR32 0xc0 /* receive FIFO threshold = 32 */ |
| 223 | 223 | ||
| 224 | 224 | ||
| 225 | 225 | ||
diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h index eed4254bd503..3274c507b8a9 100644 --- a/include/linux/spi/spi_bitbang.h +++ b/include/linux/spi/spi_bitbang.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * Some hardware works well with requests at spi_transfer scope: | 15 | * Some hardware works well with requests at spi_transfer scope: |
| 16 | * | 16 | * |
| 17 | * - Drivers leveraging smarter hardware, with fifos or DMA; or for half | 17 | * - Drivers leveraging smarter hardware, with fifos or DMA; or for half |
| 18 | * duplex (MicroWire) controllers. Provide chipslect() and txrx_bufs(), | 18 | * duplex (MicroWire) controllers. Provide chipselect() and txrx_bufs(), |
| 19 | * and custom setup()/cleanup() methods. | 19 | * and custom setup()/cleanup() methods. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 56af3ca75e24..877ba039e6a4 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
| @@ -89,8 +89,8 @@ enum | |||
| 89 | KERN_VERSION=4, /* string: compile time info */ | 89 | KERN_VERSION=4, /* string: compile time info */ |
| 90 | KERN_SECUREMASK=5, /* struct: maximum rights mask */ | 90 | KERN_SECUREMASK=5, /* struct: maximum rights mask */ |
| 91 | KERN_PROF=6, /* table: profiling information */ | 91 | KERN_PROF=6, /* table: profiling information */ |
| 92 | KERN_NODENAME=7, | 92 | KERN_NODENAME=7, /* string: hostname */ |
| 93 | KERN_DOMAINNAME=8, | 93 | KERN_DOMAINNAME=8, /* string: domainname */ |
| 94 | 94 | ||
| 95 | KERN_PANIC=15, /* int: panic timeout */ | 95 | KERN_PANIC=15, /* int: panic timeout */ |
| 96 | KERN_REALROOTDEV=16, /* real root device to mount after initrd */ | 96 | KERN_REALROOTDEV=16, /* real root device to mount after initrd */ |
| @@ -102,8 +102,8 @@ enum | |||
| 102 | KERN_PPC_HTABRECLAIM=25, /* turn htab reclaimation on/off on PPC */ | 102 | KERN_PPC_HTABRECLAIM=25, /* turn htab reclaimation on/off on PPC */ |
| 103 | KERN_PPC_ZEROPAGED=26, /* turn idle page zeroing on/off on PPC */ | 103 | KERN_PPC_ZEROPAGED=26, /* turn idle page zeroing on/off on PPC */ |
| 104 | KERN_PPC_POWERSAVE_NAP=27, /* use nap mode for power saving */ | 104 | KERN_PPC_POWERSAVE_NAP=27, /* use nap mode for power saving */ |
| 105 | KERN_MODPROBE=28, | 105 | KERN_MODPROBE=28, /* string: modprobe path */ |
| 106 | KERN_SG_BIG_BUFF=29, | 106 | KERN_SG_BIG_BUFF=29, /* int: sg driver reserved buffer size */ |
| 107 | KERN_ACCT=30, /* BSD process accounting parameters */ | 107 | KERN_ACCT=30, /* BSD process accounting parameters */ |
| 108 | KERN_PPC_L2CR=31, /* l2cr register on PPC */ | 108 | KERN_PPC_L2CR=31, /* l2cr register on PPC */ |
| 109 | 109 | ||
| @@ -150,7 +150,7 @@ enum | |||
| 150 | KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */ | 150 | KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */ |
| 151 | KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */ | 151 | KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */ |
| 152 | KERN_COMPAT_LOG=73, /* int: print compat layer messages */ | 152 | KERN_COMPAT_LOG=73, /* int: print compat layer messages */ |
| 153 | KERN_MAX_LOCK_DEPTH=74, | 153 | KERN_MAX_LOCK_DEPTH=74, /* int: rtmutex's maximum lock depth */ |
| 154 | KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */ | 154 | KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */ |
| 155 | KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ | 155 | KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ |
| 156 | }; | 156 | }; |
diff --git a/include/linux/usb/wusb.h b/include/linux/usb/wusb.h index 429c631d2aad..63ebdcc5dda6 100644 --- a/include/linux/usb/wusb.h +++ b/include/linux/usb/wusb.h | |||
| @@ -74,7 +74,7 @@ enum { | |||
| 74 | * WUSB defines that CHIDs, CDIDs and CKs are a 16 byte string of | 74 | * WUSB defines that CHIDs, CDIDs and CKs are a 16 byte string of |
| 75 | * data. In order to avoid confusion and enforce types, we wrap it. | 75 | * data. In order to avoid confusion and enforce types, we wrap it. |
| 76 | * | 76 | * |
| 77 | * Make it packed, as we use it in some hw defintions. | 77 | * Make it packed, as we use it in some hw definitions. |
| 78 | */ | 78 | */ |
| 79 | struct wusb_ckhdid { | 79 | struct wusb_ckhdid { |
| 80 | u8 data[16]; | 80 | u8 data[16]; |
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index b59e78c57161..dfd4745a955f 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -490,7 +490,7 @@ struct v4l2_jpegcompression { | |||
| 490 | * you do, leave them untouched. | 490 | * you do, leave them untouched. |
| 491 | * Inluding less markers will make the | 491 | * Inluding less markers will make the |
| 492 | * resulting code smaller, but there will | 492 | * resulting code smaller, but there will |
| 493 | * be fewer aplications which can read it. | 493 | * be fewer applications which can read it. |
| 494 | * The presence of the APP and COM marker | 494 | * The presence of the APP and COM marker |
| 495 | * is influenced by APP_len and COM_len | 495 | * is influenced by APP_len and COM_len |
| 496 | * ONLY, not by this property! */ | 496 | * ONLY, not by this property! */ |
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 7571e32723bf..ff3017744711 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
| @@ -989,7 +989,7 @@ struct sctp_transport { | |||
| 989 | int init_sent_count; | 989 | int init_sent_count; |
| 990 | 990 | ||
| 991 | /* state : The current state of this destination, | 991 | /* state : The current state of this destination, |
| 992 | * : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKOWN. | 992 | * : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKNOWN. |
| 993 | */ | 993 | */ |
| 994 | int state; | 994 | int state; |
| 995 | 995 | ||
diff --git a/include/net/tcp.h b/include/net/tcp.h index e2d2ca2509be..5740b85bc5a0 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
| @@ -1262,7 +1262,7 @@ static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_bu | |||
| 1262 | skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp) | 1262 | skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp) |
| 1263 | 1263 | ||
| 1264 | /* This function calculates a "timeout" which is equivalent to the timeout of a | 1264 | /* This function calculates a "timeout" which is equivalent to the timeout of a |
| 1265 | * TCP connection after "boundary" unsucessful, exponentially backed-off | 1265 | * TCP connection after "boundary" unsuccessful, exponentially backed-off |
| 1266 | * retransmissions with an initial RTO of TCP_RTO_MIN. | 1266 | * retransmissions with an initial RTO of TCP_RTO_MIN. |
| 1267 | */ | 1267 | */ |
| 1268 | static inline bool retransmits_timed_out(const struct sock *sk, | 1268 | static inline bool retransmits_timed_out(const struct sock *sk, |
diff --git a/include/net/wimax.h b/include/net/wimax.h index d69c4a7a1267..3461aa1df1e0 100644 --- a/include/net/wimax.h +++ b/include/net/wimax.h | |||
| @@ -79,7 +79,7 @@ | |||
| 79 | * drivers have to only report state changes due to external | 79 | * drivers have to only report state changes due to external |
| 80 | * conditions. | 80 | * conditions. |
| 81 | * | 81 | * |
| 82 | * All API operations are 'atomic', serialized thorough a mutex in the | 82 | * All API operations are 'atomic', serialized through a mutex in the |
| 83 | * `struct wimax_dev`. | 83 | * `struct wimax_dev`. |
| 84 | * | 84 | * |
| 85 | * EXPORTING TO USER SPACE THROUGH GENERIC NETLINK | 85 | * EXPORTING TO USER SPACE THROUGH GENERIC NETLINK |
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 3dae3f799b9b..49400459b477 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h | |||
| @@ -593,7 +593,7 @@ enum { | |||
| 593 | 593 | ||
| 594 | struct ac97_quirk { | 594 | struct ac97_quirk { |
| 595 | unsigned short subvendor; /* PCI subsystem vendor id */ | 595 | unsigned short subvendor; /* PCI subsystem vendor id */ |
| 596 | unsigned short subdevice; /* PCI sybsystem device id */ | 596 | unsigned short subdevice; /* PCI subsystem device id */ |
| 597 | unsigned short mask; /* device id bit mask, 0 = accept all */ | 597 | unsigned short mask; /* device id bit mask, 0 = accept all */ |
| 598 | unsigned int codec_id; /* codec id (if any), 0 = accept all */ | 598 | unsigned int codec_id; /* codec id (if any), 0 = accept all */ |
| 599 | const char *name; /* name shown as info */ | 599 | const char *name; /* name shown as info */ |
diff --git a/include/sound/wm8993.h b/include/sound/wm8993.h index 9c661f2f8cda..eee19f63c0d8 100644 --- a/include/sound/wm8993.h +++ b/include/sound/wm8993.h | |||
| @@ -36,7 +36,7 @@ struct wm8993_platform_data { | |||
| 36 | unsigned int micbias1_lvl:1; | 36 | unsigned int micbias1_lvl:1; |
| 37 | unsigned int micbias2_lvl:1; | 37 | unsigned int micbias2_lvl:1; |
| 38 | 38 | ||
| 39 | /* Jack detect threashold levels, see datasheet for values */ | 39 | /* Jack detect threshold levels, see datasheet for values */ |
| 40 | unsigned int jd_scthr:2; | 40 | unsigned int jd_scthr:2; |
| 41 | unsigned int jd_thr:2; | 41 | unsigned int jd_thr:2; |
| 42 | }; | 42 | }; |
diff --git a/include/video/sgivw.h b/include/video/sgivw.h index 55f2a7c024af..f6aa5692e74b 100644 --- a/include/video/sgivw.h +++ b/include/video/sgivw.h | |||
| @@ -351,7 +351,7 @@ typedef enum { | |||
| 351 | struct dbe_timing_info | 351 | struct dbe_timing_info |
| 352 | { | 352 | { |
| 353 | dbe_timing_t type; | 353 | dbe_timing_t type; |
| 354 | int flags; | 354 | int flags; |
| 355 | short width; /* Monitor resolution */ | 355 | short width; /* Monitor resolution */ |
| 356 | short height; | 356 | short height; |
| 357 | int fields_sec; /* fields/sec (Hz -3 dec. places */ | 357 | int fields_sec; /* fields/sec (Hz -3 dec. places */ |
| @@ -389,11 +389,11 @@ struct dbe_timing_info dbeVTimings[] = { | |||
| 389 | { | 389 | { |
| 390 | DBE_VT_640_480_60, | 390 | DBE_VT_640_480_60, |
| 391 | /* flags, width, height, fields_sec, cfreq */ | 391 | /* flags, width, height, fields_sec, cfreq */ |
| 392 | 0, 640, 480, 59940, 25175, | 392 | 0, 640, 480, 59940, 25175, |
| 393 | /* htotal, hblank_start, hblank_end, hsync_start, hsync_end */ | 393 | /* htotal, hblank_start, hblank_end, hsync_start, hsync_end */ |
| 394 | 800, 640, 800, 656, 752, | 394 | 800, 640, 800, 656, 752, |
| 395 | /* vtotal, vblank_start, vblank_end, vsync_start, vsync_end */ | 395 | /* vtotal, vblank_start, vblank_end, vsync_start, vsync_end */ |
| 396 | 525, 480, 525, 490, 492, | 396 | 525, 480, 525, 490, 492, |
| 397 | /* pll_m, pll_n, pll_p */ | 397 | /* pll_m, pll_n, pll_p */ |
| 398 | 15, 2, 3 | 398 | 15, 2, 3 |
| 399 | }, | 399 | }, |
| @@ -650,7 +650,7 @@ struct dbe_timing_info dbeVTimings[] = { | |||
| 650 | /* pll_m, pll_n, pll_p */ | 650 | /* pll_m, pll_n, pll_p */ |
| 651 | 6, 1, 0 | 651 | 6, 1, 0 |
| 652 | }, | 652 | }, |
| 653 | 653 | ||
| 654 | { | 654 | { |
| 655 | DBE_VT_1920_1200_60, | 655 | DBE_VT_1920_1200_60, |
| 656 | /* flags, width, height, fields_sec, cfreq */ | 656 | /* flags, width, height, fields_sec, cfreq */ |
| @@ -676,7 +676,6 @@ struct dbe_timing_info dbeVTimings[] = { | |||
| 676 | } | 676 | } |
| 677 | }; | 677 | }; |
| 678 | 678 | ||
| 679 | #define DBE_VT_SIZE (sizeof(dbeVTimings)/sizeof(dbeVTimings[0])) | ||
| 680 | #endif // INCLUDE_TIMING_TABLE_DATA | 679 | #endif // INCLUDE_TIMING_TABLE_DATA |
| 681 | 680 | ||
| 682 | #endif // ! __SGIVWFB_H__ | 681 | #endif // ! __SGIVWFB_H__ |
| @@ -412,7 +412,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, | |||
| 412 | struct msqid_ds __user *buf, int version) | 412 | struct msqid_ds __user *buf, int version) |
| 413 | { | 413 | { |
| 414 | struct kern_ipc_perm *ipcp; | 414 | struct kern_ipc_perm *ipcp; |
| 415 | struct msqid64_ds msqid64; | 415 | struct msqid64_ds uninitialized_var(msqid64); |
| 416 | struct msg_queue *msq; | 416 | struct msg_queue *msq; |
| 417 | int err; | 417 | int err; |
| 418 | 418 | ||
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 22b0a6eedf24..e49ea1c5232d 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
| @@ -220,7 +220,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc, | |||
| 220 | /* | 220 | /* |
| 221 | * If we are seeing only the odd spurious IRQ caused by | 221 | * If we are seeing only the odd spurious IRQ caused by |
| 222 | * bus asynchronicity then don't eventually trigger an error, | 222 | * bus asynchronicity then don't eventually trigger an error, |
| 223 | * otherwise the couter becomes a doomsday timer for otherwise | 223 | * otherwise the counter becomes a doomsday timer for otherwise |
| 224 | * working systems | 224 | * working systems |
| 225 | */ | 225 | */ |
| 226 | if (time_after(jiffies, desc->last_unhandled + HZ/10)) | 226 | if (time_after(jiffies, desc->last_unhandled + HZ/10)) |
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 6b7ddba1dd64..40a996ec39fa 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
| @@ -476,7 +476,7 @@ static void perf_event_remove_from_context(struct perf_event *event) | |||
| 476 | if (!task) { | 476 | if (!task) { |
| 477 | /* | 477 | /* |
| 478 | * Per cpu events are removed via an smp call and | 478 | * Per cpu events are removed via an smp call and |
| 479 | * the removal is always sucessful. | 479 | * the removal is always successful. |
| 480 | */ | 480 | */ |
| 481 | smp_call_function_single(event->cpu, | 481 | smp_call_function_single(event->cpu, |
| 482 | __perf_event_remove_from_context, | 482 | __perf_event_remove_from_context, |
| @@ -845,7 +845,7 @@ perf_install_in_context(struct perf_event_context *ctx, | |||
| 845 | if (!task) { | 845 | if (!task) { |
| 846 | /* | 846 | /* |
| 847 | * Per cpu events are installed via an smp call and | 847 | * Per cpu events are installed via an smp call and |
| 848 | * the install is always sucessful. | 848 | * the install is always successful. |
| 849 | */ | 849 | */ |
| 850 | smp_call_function_single(cpu, __perf_install_in_context, | 850 | smp_call_function_single(cpu, __perf_install_in_context, |
| 851 | event, 1); | 851 | event, 1); |
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index d422c7b2236b..e85c23404d34 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
| @@ -677,7 +677,7 @@ sysfs_show_current_clocksources(struct sys_device *dev, | |||
| 677 | * @count: length of buffer | 677 | * @count: length of buffer |
| 678 | * | 678 | * |
| 679 | * Takes input from sysfs interface for manually overriding the default | 679 | * Takes input from sysfs interface for manually overriding the default |
| 680 | * clocksource selction. | 680 | * clocksource selection. |
| 681 | */ | 681 | */ |
| 682 | static ssize_t sysfs_override_clocksource(struct sys_device *dev, | 682 | static ssize_t sysfs_override_clocksource(struct sys_device *dev, |
| 683 | struct sysdev_attribute *attr, | 683 | struct sysdev_attribute *attr, |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 0b8f35918a36..96c620a0c59c 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -105,7 +105,7 @@ config DEBUG_SECTION_MISMATCH | |||
| 105 | bool "Enable full Section mismatch analysis" | 105 | bool "Enable full Section mismatch analysis" |
| 106 | depends on UNDEFINED | 106 | depends on UNDEFINED |
| 107 | # This option is on purpose disabled for now. | 107 | # This option is on purpose disabled for now. |
| 108 | # It will be enabled when we are down to a resonable number | 108 | # It will be enabled when we are down to a reasonable number |
| 109 | # of section mismatch warnings (< 10 for an allyesconfig build) | 109 | # of section mismatch warnings (< 10 for an allyesconfig build) |
| 110 | help | 110 | help |
| 111 | The section mismatch analysis checks if there are illegal | 111 | The section mismatch analysis checks if there are illegal |
diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c index 600f473a5610..76074209f9a2 100644 --- a/lib/decompress_bunzip2.c +++ b/lib/decompress_bunzip2.c | |||
| @@ -299,7 +299,7 @@ static int INIT get_next_block(struct bunzip_data *bd) | |||
| 299 | again when using them (during symbol decoding).*/ | 299 | again when using them (during symbol decoding).*/ |
| 300 | base = hufGroup->base-1; | 300 | base = hufGroup->base-1; |
| 301 | limit = hufGroup->limit-1; | 301 | limit = hufGroup->limit-1; |
| 302 | /* Calculate permute[]. Concurently, initialize | 302 | /* Calculate permute[]. Concurrently, initialize |
| 303 | * temp[] and limit[]. */ | 303 | * temp[] and limit[]. */ |
| 304 | pp = 0; | 304 | pp = 0; |
| 305 | for (i = minLen; i <= maxLen; i++) { | 305 | for (i = minLen; i <= maxLen; i++) { |
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index ce6b7eabf674..d9b08e0f7f55 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
| @@ -259,7 +259,7 @@ static struct dma_debug_entry *hash_bucket_find(struct hash_bucket *bucket, | |||
| 259 | * times. Without a hardware IOMMU this results in the | 259 | * times. Without a hardware IOMMU this results in the |
| 260 | * same device addresses being put into the dma-debug | 260 | * same device addresses being put into the dma-debug |
| 261 | * hash multiple times too. This can result in false | 261 | * hash multiple times too. This can result in false |
| 262 | * positives being reported. Therfore we implement a | 262 | * positives being reported. Therefore we implement a |
| 263 | * best-fit algorithm here which returns the entry from | 263 | * best-fit algorithm here which returns the entry from |
| 264 | * the hash which fits best to the reference value | 264 | * the hash which fits best to the reference value |
| 265 | * instead of the first-fit. | 265 | * instead of the first-fit. |
| @@ -281,7 +281,7 @@ static int idr_get_new_above_int(struct idr *idp, void *ptr, int starting_id) | |||
| 281 | /** | 281 | /** |
| 282 | * idr_get_new_above - allocate new idr entry above or equal to a start id | 282 | * idr_get_new_above - allocate new idr entry above or equal to a start id |
| 283 | * @idp: idr handle | 283 | * @idp: idr handle |
| 284 | * @ptr: pointer you want associated with the ide | 284 | * @ptr: pointer you want associated with the id |
| 285 | * @start_id: id to start search at | 285 | * @start_id: id to start search at |
| 286 | * @id: pointer to the allocated handle | 286 | * @id: pointer to the allocated handle |
| 287 | * | 287 | * |
| @@ -313,7 +313,7 @@ EXPORT_SYMBOL(idr_get_new_above); | |||
| 313 | /** | 313 | /** |
| 314 | * idr_get_new - allocate new idr entry | 314 | * idr_get_new - allocate new idr entry |
| 315 | * @idp: idr handle | 315 | * @idp: idr handle |
| 316 | * @ptr: pointer you want associated with the ide | 316 | * @ptr: pointer you want associated with the id |
| 317 | * @id: pointer to the allocated handle | 317 | * @id: pointer to the allocated handle |
| 318 | * | 318 | * |
| 319 | * This is the allocate id function. It should be called with any | 319 | * This is the allocate id function. It should be called with any |
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 795472d8ae24..5bc01803f8f8 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
| @@ -485,7 +485,7 @@ do_unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir) | |||
| 485 | 485 | ||
| 486 | /* | 486 | /* |
| 487 | * Return the buffer to the free list by setting the corresponding | 487 | * Return the buffer to the free list by setting the corresponding |
| 488 | * entries to indicate the number of contigous entries available. | 488 | * entries to indicate the number of contiguous entries available. |
| 489 | * While returning the entries to the free list, we merge the entries | 489 | * While returning the entries to the free list, we merge the entries |
| 490 | * with slots below and above the pool being returned. | 490 | * with slots below and above the pool being returned. |
| 491 | */ | 491 | */ |
diff --git a/mm/filemap.c b/mm/filemap.c index ef169f37156d..c3d3506ecaba 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -1844,7 +1844,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr, | |||
| 1844 | 1844 | ||
| 1845 | /* | 1845 | /* |
| 1846 | * Copy as much as we can into the page and return the number of bytes which | 1846 | * Copy as much as we can into the page and return the number of bytes which |
| 1847 | * were sucessfully copied. If a fault is encountered then return the number of | 1847 | * were successfully copied. If a fault is encountered then return the number of |
| 1848 | * bytes which were copied. | 1848 | * bytes which were copied. |
| 1849 | */ | 1849 | */ |
| 1850 | size_t iov_iter_copy_from_user_atomic(struct page *page, | 1850 | size_t iov_iter_copy_from_user_atomic(struct page *page, |
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 8bf765c4f58d..13f33b3081ec 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c | |||
| @@ -1050,8 +1050,8 @@ static void scan_object(struct kmemleak_object *object) | |||
| 1050 | unsigned long flags; | 1050 | unsigned long flags; |
| 1051 | 1051 | ||
| 1052 | /* | 1052 | /* |
| 1053 | * Once the object->lock is aquired, the corresponding memory block | 1053 | * Once the object->lock is acquired, the corresponding memory block |
| 1054 | * cannot be freed (the same lock is aquired in delete_object). | 1054 | * cannot be freed (the same lock is acquired in delete_object). |
| 1055 | */ | 1055 | */ |
| 1056 | spin_lock_irqsave(&object->lock, flags); | 1056 | spin_lock_irqsave(&object->lock, flags); |
| 1057 | if (object->flags & OBJECT_NO_SCAN) | 1057 | if (object->flags & OBJECT_NO_SCAN) |
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f99f5991d6bb..c31a310aa146 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
| @@ -209,7 +209,7 @@ struct mem_cgroup { | |||
| 209 | int prev_priority; /* for recording reclaim priority */ | 209 | int prev_priority; /* for recording reclaim priority */ |
| 210 | 210 | ||
| 211 | /* | 211 | /* |
| 212 | * While reclaiming in a hiearchy, we cache the last child we | 212 | * While reclaiming in a hierarchy, we cache the last child we |
| 213 | * reclaimed from. | 213 | * reclaimed from. |
| 214 | */ | 214 | */ |
| 215 | int last_scanned_child; | 215 | int last_scanned_child; |
| @@ -1720,7 +1720,7 @@ int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm, | |||
| 1720 | /* | 1720 | /* |
| 1721 | * While swap-in, try_charge -> commit or cancel, the page is locked. | 1721 | * While swap-in, try_charge -> commit or cancel, the page is locked. |
| 1722 | * And when try_charge() successfully returns, one refcnt to memcg without | 1722 | * And when try_charge() successfully returns, one refcnt to memcg without |
| 1723 | * struct page_cgroup is aquired. This refcnt will be cumsumed by | 1723 | * struct page_cgroup is acquired. This refcnt will be consumed by |
| 1724 | * "commit()" or removed by "cancel()" | 1724 | * "commit()" or removed by "cancel()" |
| 1725 | */ | 1725 | */ |
| 1726 | int mem_cgroup_try_charge_swapin(struct mm_struct *mm, | 1726 | int mem_cgroup_try_charge_swapin(struct mm_struct *mm, |
| @@ -2466,7 +2466,7 @@ static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft, | |||
| 2466 | 2466 | ||
| 2467 | cgroup_lock(); | 2467 | cgroup_lock(); |
| 2468 | /* | 2468 | /* |
| 2469 | * If parent's use_hiearchy is set, we can't make any modifications | 2469 | * If parent's use_hierarchy is set, we can't make any modifications |
| 2470 | * in the child subtrees. If it is unset, then the change can | 2470 | * in the child subtrees. If it is unset, then the change can |
| 2471 | * occur, provided the current cgroup has no children. | 2471 | * occur, provided the current cgroup has no children. |
| 2472 | * | 2472 | * |
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index dacc64183874..1ac49fef95ab 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c | |||
| @@ -174,7 +174,7 @@ static void kill_procs_ao(struct list_head *to_kill, int doit, int trapno, | |||
| 174 | list_for_each_entry_safe (tk, next, to_kill, nd) { | 174 | list_for_each_entry_safe (tk, next, to_kill, nd) { |
| 175 | if (doit) { | 175 | if (doit) { |
| 176 | /* | 176 | /* |
| 177 | * In case something went wrong with munmaping | 177 | * In case something went wrong with munmapping |
| 178 | * make sure the process doesn't catch the | 178 | * make sure the process doesn't catch the |
| 179 | * signal and then access the memory. Just kill it. | 179 | * signal and then access the memory. Just kill it. |
| 180 | * the signal handlers | 180 | * the signal handlers |
diff --git a/mm/truncate.c b/mm/truncate.c index 450cebdabfc0..2c147a7e5f2c 100644 --- a/mm/truncate.c +++ b/mm/truncate.c | |||
| @@ -490,7 +490,7 @@ EXPORT_SYMBOL_GPL(invalidate_inode_pages2_range); | |||
| 490 | * Any pages which are found to be mapped into pagetables are unmapped prior to | 490 | * Any pages which are found to be mapped into pagetables are unmapped prior to |
| 491 | * invalidation. | 491 | * invalidation. |
| 492 | * | 492 | * |
| 493 | * Returns -EIO if any pages could not be invalidated. | 493 | * Returns -EBUSY if any pages could not be invalidated. |
| 494 | */ | 494 | */ |
| 495 | int invalidate_inode_pages2(struct address_space *mapping) | 495 | int invalidate_inode_pages2(struct address_space *mapping) |
| 496 | { | 496 | { |
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index 29b1b220d6cf..ef09c7b3a858 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c | |||
| @@ -78,7 +78,7 @@ static struct bnep_session *__bnep_get_session(u8 *dst) | |||
| 78 | static void __bnep_link_session(struct bnep_session *s) | 78 | static void __bnep_link_session(struct bnep_session *s) |
| 79 | { | 79 | { |
| 80 | /* It's safe to call __module_get() here because sessions are added | 80 | /* It's safe to call __module_get() here because sessions are added |
| 81 | by the socket layer which has to hold the refference to this module. | 81 | by the socket layer which has to hold the reference to this module. |
| 82 | */ | 82 | */ |
| 83 | __module_get(THIS_MODULE); | 83 | __module_get(THIS_MODULE); |
| 84 | list_add(&s->list, &bnep_session_list); | 84 | list_add(&s->list, &bnep_session_list); |
| @@ -632,7 +632,7 @@ int bnep_del_connection(struct bnep_conndel_req *req) | |||
| 632 | s = __bnep_get_session(req->dst); | 632 | s = __bnep_get_session(req->dst); |
| 633 | if (s) { | 633 | if (s) { |
| 634 | /* Wakeup user-space which is polling for socket errors. | 634 | /* Wakeup user-space which is polling for socket errors. |
| 635 | * This is temporary hack untill we have shutdown in L2CAP */ | 635 | * This is temporary hack until we have shutdown in L2CAP */ |
| 636 | s->sock->sk->sk_err = EUNATCH; | 636 | s->sock->sk->sk_err = EUNATCH; |
| 637 | 637 | ||
| 638 | /* Kill session thread */ | 638 | /* Kill session thread */ |
diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c index 549e206cdd42..ea5cea2415c1 100644 --- a/net/ipv4/netfilter/ipt_ECN.c +++ b/net/ipv4/netfilter/ipt_ECN.c | |||
| @@ -50,7 +50,7 @@ set_ect_tcp(struct sk_buff *skb, const struct ipt_ECN_info *einfo) | |||
| 50 | struct tcphdr _tcph, *tcph; | 50 | struct tcphdr _tcph, *tcph; |
| 51 | __be16 oldval; | 51 | __be16 oldval; |
| 52 | 52 | ||
| 53 | /* Not enought header? */ | 53 | /* Not enough header? */ |
| 54 | tcph = skb_header_pointer(skb, ip_hdrlen(skb), sizeof(_tcph), &_tcph); | 54 | tcph = skb_header_pointer(skb, ip_hdrlen(skb), sizeof(_tcph), &_tcph); |
| 55 | if (!tcph) | 55 | if (!tcph) |
| 56 | return false; | 56 | return false; |
diff --git a/net/irda/irlap.c b/net/irda/irlap.c index 356e65b1dc42..783c5f367d29 100644 --- a/net/irda/irlap.c +++ b/net/irda/irlap.c | |||
| @@ -450,10 +450,10 @@ void irlap_disconnect_request(struct irlap_cb *self) | |||
| 450 | 450 | ||
| 451 | /* Check if we are in the right state for disconnecting */ | 451 | /* Check if we are in the right state for disconnecting */ |
| 452 | switch (self->state) { | 452 | switch (self->state) { |
| 453 | case LAP_XMIT_P: /* FALLTROUGH */ | 453 | case LAP_XMIT_P: /* FALLTHROUGH */ |
| 454 | case LAP_XMIT_S: /* FALLTROUGH */ | 454 | case LAP_XMIT_S: /* FALLTHROUGH */ |
| 455 | case LAP_CONN: /* FALLTROUGH */ | 455 | case LAP_CONN: /* FALLTHROUGH */ |
| 456 | case LAP_RESET_WAIT: /* FALLTROUGH */ | 456 | case LAP_RESET_WAIT: /* FALLTHROUGH */ |
| 457 | case LAP_RESET_CHECK: | 457 | case LAP_RESET_CHECK: |
| 458 | irlap_do_event(self, DISCONNECT_REQUEST, NULL, NULL); | 458 | irlap_do_event(self, DISCONNECT_REQUEST, NULL, NULL); |
| 459 | break; | 459 | break; |
| @@ -485,9 +485,9 @@ void irlap_disconnect_indication(struct irlap_cb *self, LAP_REASON reason) | |||
| 485 | IRDA_DEBUG(1, "%s(), Sending reset request!\n", __func__); | 485 | IRDA_DEBUG(1, "%s(), Sending reset request!\n", __func__); |
| 486 | irlap_do_event(self, RESET_REQUEST, NULL, NULL); | 486 | irlap_do_event(self, RESET_REQUEST, NULL, NULL); |
| 487 | break; | 487 | break; |
| 488 | case LAP_NO_RESPONSE: /* FALLTROUGH */ | 488 | case LAP_NO_RESPONSE: /* FALLTHROUGH */ |
| 489 | case LAP_DISC_INDICATION: /* FALLTROUGH */ | 489 | case LAP_DISC_INDICATION: /* FALLTHROUGH */ |
| 490 | case LAP_FOUND_NONE: /* FALLTROUGH */ | 490 | case LAP_FOUND_NONE: /* FALLTHROUGH */ |
| 491 | case LAP_MEDIA_BUSY: | 491 | case LAP_MEDIA_BUSY: |
| 492 | irlmp_link_disconnect_indication(self->notify.instance, self, | 492 | irlmp_link_disconnect_indication(self->notify.instance, self, |
| 493 | reason, NULL); | 493 | reason, NULL); |
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c index c5c51959e3ce..94a9884d7146 100644 --- a/net/irda/irlap_event.c +++ b/net/irda/irlap_event.c | |||
| @@ -1741,7 +1741,7 @@ static int irlap_state_reset(struct irlap_cb *self, IRLAP_EVENT event, | |||
| 1741 | * Function irlap_state_xmit_s (event, skb, info) | 1741 | * Function irlap_state_xmit_s (event, skb, info) |
| 1742 | * | 1742 | * |
| 1743 | * XMIT_S, The secondary station has been given the right to transmit, | 1743 | * XMIT_S, The secondary station has been given the right to transmit, |
| 1744 | * and we therefor do not expect to receive any transmissions from other | 1744 | * and we therefore do not expect to receive any transmissions from other |
| 1745 | * stations. | 1745 | * stations. |
| 1746 | */ | 1746 | */ |
| 1747 | static int irlap_state_xmit_s(struct irlap_cb *self, IRLAP_EVENT event, | 1747 | static int irlap_state_xmit_s(struct irlap_cb *self, IRLAP_EVENT event, |
diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c index 7bf5b913828b..0e7d8bde145d 100644 --- a/net/irda/irlmp.c +++ b/net/irda/irlmp.c | |||
| @@ -105,7 +105,7 @@ int __init irlmp_init(void) | |||
| 105 | 105 | ||
| 106 | init_timer(&irlmp->discovery_timer); | 106 | init_timer(&irlmp->discovery_timer); |
| 107 | 107 | ||
| 108 | /* Do discovery every 3 seconds, conditionaly */ | 108 | /* Do discovery every 3 seconds, conditionally */ |
| 109 | if (sysctl_discovery) | 109 | if (sysctl_discovery) |
| 110 | irlmp_start_discovery_timer(irlmp, | 110 | irlmp_start_discovery_timer(irlmp, |
| 111 | sysctl_discovery_timeout*HZ); | 111 | sysctl_discovery_timeout*HZ); |
| @@ -1842,7 +1842,7 @@ LM_REASON irlmp_convert_lap_reason( LAP_REASON lap_reason) | |||
| 1842 | reason = LM_CONNECT_FAILURE; | 1842 | reason = LM_CONNECT_FAILURE; |
| 1843 | break; | 1843 | break; |
| 1844 | default: | 1844 | default: |
| 1845 | IRDA_DEBUG(1, "%s(), Unknow IrLAP disconnect reason %d!\n", | 1845 | IRDA_DEBUG(1, "%s(), Unknown IrLAP disconnect reason %d!\n", |
| 1846 | __func__, lap_reason); | 1846 | __func__, lap_reason); |
| 1847 | reason = LM_LAP_DISCONNECT; | 1847 | reason = LM_LAP_DISCONNECT; |
| 1848 | break; | 1848 | break; |
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index a8da23905c70..0192cfdacae4 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c | |||
| @@ -244,7 +244,7 @@ struct mesh_path *mesh_path_lookup_by_idx(int idx, struct ieee80211_sub_if_data | |||
| 244 | * @addr: destination address of the path (ETH_ALEN length) | 244 | * @addr: destination address of the path (ETH_ALEN length) |
| 245 | * @sdata: local subif | 245 | * @sdata: local subif |
| 246 | * | 246 | * |
| 247 | * Returns: 0 on sucess | 247 | * Returns: 0 on success |
| 248 | * | 248 | * |
| 249 | * State: the initial state of the new path is set to 0 | 249 | * State: the initial state of the new path is set to 0 |
| 250 | */ | 250 | */ |
| @@ -532,7 +532,7 @@ static void mesh_path_node_reclaim(struct rcu_head *rp) | |||
| 532 | * @addr: dst address (ETH_ALEN length) | 532 | * @addr: dst address (ETH_ALEN length) |
| 533 | * @sdata: local subif | 533 | * @sdata: local subif |
| 534 | * | 534 | * |
| 535 | * Returns: 0 if succesful | 535 | * Returns: 0 if successful |
| 536 | */ | 536 | */ |
| 537 | int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata) | 537 | int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata) |
| 538 | { | 538 | { |
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c index 7a10bbe02c13..c5d9f97ef217 100644 --- a/net/netlabel/netlabel_domainhash.c +++ b/net/netlabel/netlabel_domainhash.c | |||
| @@ -682,7 +682,7 @@ struct netlbl_domaddr6_map *netlbl_domhsh_getentry_af6(const char *domain, | |||
| 682 | * buckets and @skip_chain entries. For each entry in the table call | 682 | * buckets and @skip_chain entries. For each entry in the table call |
| 683 | * @callback, if @callback returns a negative value stop 'walking' through the | 683 | * @callback, if @callback returns a negative value stop 'walking' through the |
| 684 | * table and return. Updates the values in @skip_bkt and @skip_chain on | 684 | * table and return. Updates the values in @skip_bkt and @skip_chain on |
| 685 | * return. Returns zero on succcess, negative values on failure. | 685 | * return. Returns zero on success, negative values on failure. |
| 686 | * | 686 | * |
| 687 | */ | 687 | */ |
| 688 | int netlbl_domhsh_walk(u32 *skip_bkt, | 688 | int netlbl_domhsh_walk(u32 *skip_bkt, |
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 2a740035aa6b..64f5e328cee9 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
| @@ -598,7 +598,7 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a, | |||
| 598 | goto errout; | 598 | goto errout; |
| 599 | 599 | ||
| 600 | /* compat_mode being true specifies a call that is supposed | 600 | /* compat_mode being true specifies a call that is supposed |
| 601 | * to add additional backward compatiblity statistic TLVs. | 601 | * to add additional backward compatibility statistic TLVs. |
| 602 | */ | 602 | */ |
| 603 | if (compat_mode) { | 603 | if (compat_mode) { |
| 604 | if (a->type == TCA_OLD_COMPAT) | 604 | if (a->type == TCA_OLD_COMPAT) |
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index d771cc1b777a..4e4ca65cd320 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c | |||
| @@ -717,7 +717,7 @@ static void sctp_cmd_new_state(sctp_cmd_seq_t *cmds, | |||
| 717 | 717 | ||
| 718 | if (sctp_style(sk, TCP)) { | 718 | if (sctp_style(sk, TCP)) { |
| 719 | /* Change the sk->sk_state of a TCP-style socket that has | 719 | /* Change the sk->sk_state of a TCP-style socket that has |
| 720 | * sucessfully completed a connect() call. | 720 | * successfully completed a connect() call. |
| 721 | */ | 721 | */ |
| 722 | if (sctp_state(asoc, ESTABLISHED) && sctp_sstate(sk, CLOSED)) | 722 | if (sctp_state(asoc, ESTABLISHED) && sctp_sstate(sk, CLOSED)) |
| 723 | sk->sk_state = SCTP_SS_ESTABLISHED; | 723 | sk->sk_state = SCTP_SS_ESTABLISHED; |
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 1ef9de9bbae9..47bc20d3a85b 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
| @@ -3577,7 +3577,7 @@ sctp_disposition_t sctp_sf_do_asconf(const struct sctp_endpoint *ep, | |||
| 3577 | * To do this properly, we'll set the destination address of the chunk | 3577 | * To do this properly, we'll set the destination address of the chunk |
| 3578 | * and at the transmit time, will try look up the transport to use. | 3578 | * and at the transmit time, will try look up the transport to use. |
| 3579 | * Since ASCONFs may be bundled, the correct transport may not be | 3579 | * Since ASCONFs may be bundled, the correct transport may not be |
| 3580 | * created untill we process the entire packet, thus this workaround. | 3580 | * created until we process the entire packet, thus this workaround. |
| 3581 | */ | 3581 | */ |
| 3582 | asconf_ack->dest = chunk->source; | 3582 | asconf_ack->dest = chunk->source; |
| 3583 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(asconf_ack)); | 3583 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(asconf_ack)); |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c index f11be72a1a80..b15e1ebb2bfa 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | * Assumptions: | 54 | * Assumptions: |
| 55 | * - head[0] is physically contiguous. | 55 | * - head[0] is physically contiguous. |
| 56 | * - tail[0] is physically contiguous. | 56 | * - tail[0] is physically contiguous. |
| 57 | * - pages[] is not physically or virtually contigous and consists of | 57 | * - pages[] is not physically or virtually contiguous and consists of |
| 58 | * PAGE_SIZE elements. | 58 | * PAGE_SIZE elements. |
| 59 | * | 59 | * |
| 60 | * Output: | 60 | * Output: |
diff --git a/net/wimax/op-reset.c b/net/wimax/op-reset.c index ca269178c4d4..35f370091f4f 100644 --- a/net/wimax/op-reset.c +++ b/net/wimax/op-reset.c | |||
| @@ -62,7 +62,7 @@ | |||
| 62 | * Called when wanting to reset the device for any reason. Device is | 62 | * Called when wanting to reset the device for any reason. Device is |
| 63 | * taken back to power on status. | 63 | * taken back to power on status. |
| 64 | * | 64 | * |
| 65 | * This call blocks; on succesful return, the device has completed the | 65 | * This call blocks; on successful return, the device has completed the |
| 66 | * reset process and is ready to operate. | 66 | * reset process and is ready to operate. |
| 67 | */ | 67 | */ |
| 68 | int wimax_reset(struct wimax_dev *wimax_dev) | 68 | int wimax_reset(struct wimax_dev *wimax_dev) |
diff --git a/samples/Kconfig b/samples/Kconfig index e4be84ac3d38..8924f72f0629 100644 --- a/samples/Kconfig +++ b/samples/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # samples/Kconfig | ||
| 2 | |||
| 3 | menuconfig SAMPLES | 1 | menuconfig SAMPLES |
| 4 | bool "Sample kernel code" | 2 | bool "Sample kernel code" |
| 5 | help | 3 | help |
| @@ -47,4 +45,3 @@ config SAMPLE_HW_BREAKPOINT | |||
| 47 | This builds kernel hardware breakpoint example modules. | 45 | This builds kernel hardware breakpoint example modules. |
| 48 | 46 | ||
| 49 | endif # SAMPLES | 47 | endif # SAMPLES |
| 50 | |||
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index d82953573588..8413cf38ed27 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
| @@ -213,7 +213,7 @@ load_config_help[] = N_( | |||
| 213 | "to modify that configuration.\n" | 213 | "to modify that configuration.\n" |
| 214 | "\n" | 214 | "\n" |
| 215 | "If you are uncertain, then you have probably never used alternate\n" | 215 | "If you are uncertain, then you have probably never used alternate\n" |
| 216 | "configuration files. You should therefor leave this blank to abort.\n"), | 216 | "configuration files. You should therefore leave this blank to abort.\n"), |
| 217 | save_config_text[] = N_( | 217 | save_config_text[] = N_( |
| 218 | "Enter a filename to which this configuration should be saved " | 218 | "Enter a filename to which this configuration should be saved " |
| 219 | "as an alternate. Leave blank to abort."), | 219 | "as an alternate. Leave blank to abort."), |
diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c index e68823741ad5..2534400317c5 100644 --- a/security/selinux/netlabel.c +++ b/security/selinux/netlabel.c | |||
| @@ -204,7 +204,7 @@ int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, | |||
| 204 | * | 204 | * |
| 205 | * Description | 205 | * Description |
| 206 | * Call the NetLabel mechanism to set the label of a packet using @sid. | 206 | * Call the NetLabel mechanism to set the label of a packet using @sid. |
| 207 | * Returns zero on auccess, negative values on failure. | 207 | * Returns zero on success, negative values on failure. |
| 208 | * | 208 | * |
| 209 | */ | 209 | */ |
| 210 | int selinux_netlbl_skbuff_setsid(struct sk_buff *skb, | 210 | int selinux_netlbl_skbuff_setsid(struct sk_buff *skb, |
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index d6bb20cbad62..b3efae204ac7 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
| @@ -836,7 +836,7 @@ int security_bounded_transition(u32 old_sid, u32 new_sid) | |||
| 836 | goto out; | 836 | goto out; |
| 837 | } | 837 | } |
| 838 | 838 | ||
| 839 | /* type/domain unchaned */ | 839 | /* type/domain unchanged */ |
| 840 | if (old_context->type == new_context->type) { | 840 | if (old_context->type == new_context->type) { |
| 841 | rc = 0; | 841 | rc = 0; |
| 842 | goto out; | 842 | goto out; |
diff --git a/sound/Kconfig b/sound/Kconfig index b3e53e616ec9..fcad760f5691 100644 --- a/sound/Kconfig +++ b/sound/Kconfig | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # sound/Config.in | ||
| 2 | # | ||
| 3 | |||
| 4 | menuconfig SOUND | 1 | menuconfig SOUND |
| 5 | tristate "Sound card support" | 2 | tristate "Sound card support" |
| 6 | depends on HAS_IOMEM | 3 | depends on HAS_IOMEM |
| @@ -136,4 +133,3 @@ config AC97_BUS | |||
| 136 | sound subsystem and other function drivers completely unrelated to | 133 | sound subsystem and other function drivers completely unrelated to |
| 137 | sound although they're sharing the AC97 bus. Concerned drivers | 134 | sound although they're sharing the AC97 bus. Concerned drivers |
| 138 | should "select" this. | 135 | should "select" this. |
| 139 | |||
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index 93fa6720d197..cc15d1d65a22 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c | |||
| @@ -177,7 +177,7 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] = { | |||
| 177 | { .id = "CSC0437", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, | 177 | { .id = "CSC0437", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, |
| 178 | /* Digital PC 5000 Onboard - CS4236B */ | 178 | /* Digital PC 5000 Onboard - CS4236B */ |
| 179 | { .id = "CSC0735", .devs = { { "CSC0000" }, { "CSC0010" } } }, | 179 | { .id = "CSC0735", .devs = { { "CSC0000" }, { "CSC0010" } } }, |
| 180 | /* some uknown CS4236B */ | 180 | /* some unknown CS4236B */ |
| 181 | { .id = "CSC0b35", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, | 181 | { .id = "CSC0b35", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, |
| 182 | /* Intel PR440FX Onboard sound */ | 182 | /* Intel PR440FX Onboard sound */ |
| 183 | { .id = "CSC0b36", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, | 183 | { .id = "CSC0b36", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, |
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index 6123c7531110..b865e45a8f9b 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c | |||
| @@ -133,7 +133,7 @@ struct snd_miro { | |||
| 133 | static struct snd_miro_aci aci_device; | 133 | static struct snd_miro_aci aci_device; |
| 134 | 134 | ||
| 135 | static char * snd_opti9xx_names[] = { | 135 | static char * snd_opti9xx_names[] = { |
| 136 | "unkown", | 136 | "unknown", |
| 137 | "82C928", "82C929", | 137 | "82C928", "82C929", |
| 138 | "82C924", "82C925", | 138 | "82C924", "82C925", |
| 139 | "82C930", "82C931", "82C933" | 139 | "82C930", "82C931", "82C933" |
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index d08c38906449..d622d2906862 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
| @@ -177,7 +177,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids); | |||
| 177 | #endif | 177 | #endif |
| 178 | 178 | ||
| 179 | static char * snd_opti9xx_names[] = { | 179 | static char * snd_opti9xx_names[] = { |
| 180 | "unkown", | 180 | "unknown", |
| 181 | "82C928", "82C929", | 181 | "82C928", "82C929", |
| 182 | "82C924", "82C925", | 182 | "82C924", "82C925", |
| 183 | "82C930", "82C931", "82C933" | 183 | "82C930", "82C931", "82C933" |
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 135a2b77cc4a..a513651fa149 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # drivers/sound/Config.in | ||
| 2 | # | ||
| 3 | # 18 Apr 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net> | 1 | # 18 Apr 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net> |
| 4 | # More hacking for modularisation. | 2 | # More hacking for modularisation. |
| 5 | # | 3 | # |
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c index 06e9e88e4c05..bb14e4c67e89 100644 --- a/sound/oss/dmasound/dmasound_paula.c +++ b/sound/oss/dmasound/dmasound_paula.c | |||
| @@ -657,7 +657,7 @@ static int AmiStateInfo(char *buffer, size_t space) | |||
| 657 | len += sprintf(buffer+len, "\tsound.volume_right = %d [0...64]\n", | 657 | len += sprintf(buffer+len, "\tsound.volume_right = %d [0...64]\n", |
| 658 | dmasound.volume_right); | 658 | dmasound.volume_right); |
| 659 | if (len >= space) { | 659 | if (len >= space) { |
| 660 | printk(KERN_ERR "dmasound_paula: overlowed state buffer alloc.\n") ; | 660 | printk(KERN_ERR "dmasound_paula: overflowed state buffer alloc.\n") ; |
| 661 | len = space ; | 661 | len = space ; |
| 662 | } | 662 | } |
| 663 | return len; | 663 | return len; |
diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c index 15523e60351c..0470461cc03e 100644 --- a/sound/pci/ca0106/ca0106_proc.c +++ b/sound/pci/ca0106/ca0106_proc.c | |||
| @@ -233,7 +233,7 @@ static void snd_ca0106_proc_dump_iec958( struct snd_info_buffer *buffer, u32 val | |||
| 233 | snd_iprintf(buffer, "user-defined\n"); | 233 | snd_iprintf(buffer, "user-defined\n"); |
| 234 | break; | 234 | break; |
| 235 | default: | 235 | default: |
| 236 | snd_iprintf(buffer, "unkown\n"); | 236 | snd_iprintf(buffer, "unknown\n"); |
| 237 | break; | 237 | break; |
| 238 | } | 238 | } |
| 239 | snd_iprintf(buffer, "Sample Bits: "); | 239 | snd_iprintf(buffer, "Sample Bits: "); |
diff --git a/sound/pci/cs46xx/imgs/cwcdma.asp b/sound/pci/cs46xx/imgs/cwcdma.asp index 09d24c76f034..a65e1193c89a 100644 --- a/sound/pci/cs46xx/imgs/cwcdma.asp +++ b/sound/pci/cs46xx/imgs/cwcdma.asp | |||
| @@ -26,10 +26,11 @@ | |||
| 26 | // | 26 | // |
| 27 | // | 27 | // |
| 28 | // The purpose of this code is very simple: make it possible to tranfser | 28 | // The purpose of this code is very simple: make it possible to tranfser |
| 29 | // the samples 'as they are' with no alteration from a PCMreader SCB (DMA from host) | 29 | // the samples 'as they are' with no alteration from a PCMreader |
| 30 | // to any other SCB. This is useful for AC3 throug SPDIF. SRC (source rate converters) | 30 | // SCB (DMA from host) to any other SCB. This is useful for AC3 through SPDIF. |
| 31 | // task always alters the samples in some how, however it's from 48khz -> 48khz. The | 31 | // SRC (source rate converters) task always alters the samples in somehow, |
| 32 | // alterations are not audible, but AC3 wont work. | 32 | // however it's from 48khz -> 48khz. |
| 33 | // The alterations are not audible, but AC3 wont work. | ||
| 33 | // | 34 | // |
| 34 | // ... | 35 | // ... |
| 35 | // | | 36 | // | |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 6b8ae7b5cd54..1d369ff73805 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
| @@ -184,7 +184,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard."); | |||
| 184 | * The hardware has 3 channels for playback and 1 for capture. | 184 | * The hardware has 3 channels for playback and 1 for capture. |
| 185 | * - channel 0 is the front channel | 185 | * - channel 0 is the front channel |
| 186 | * - channel 1 is the rear channel | 186 | * - channel 1 is the rear channel |
| 187 | * - channel 2 is the center/lfe chanel | 187 | * - channel 2 is the center/lfe channel |
| 188 | * Volume is controlled by the AC97 for the front and rear channels by | 188 | * Volume is controlled by the AC97 for the front and rear channels by |
| 189 | * the PCM Playback Volume, Sigmatel Surround Playback Volume and | 189 | * the PCM Playback Volume, Sigmatel Surround Playback Volume and |
| 190 | * Surround Playback Volume. The Sigmatel 4-Speaker Stereo switch affects | 190 | * Surround Playback Volume. The Sigmatel 4-Speaker Stereo switch affects |
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 2439e84dcb21..4b200da1bd18 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c | |||
| @@ -938,7 +938,7 @@ static void init_input(struct hda_codec *codec) | |||
| 938 | coef |= 0x0500; /* DMIC2 enable 2 channels, disable GPIO1 */ | 938 | coef |= 0x0500; /* DMIC2 enable 2 channels, disable GPIO1 */ |
| 939 | if (is_active_pin(codec, CS_DMIC1_PIN_NID)) | 939 | if (is_active_pin(codec, CS_DMIC1_PIN_NID)) |
| 940 | coef |= 0x1800; /* DMIC1 enable 2 channels, disable GPIO0 | 940 | coef |= 0x1800; /* DMIC1 enable 2 channels, disable GPIO0 |
| 941 | * No effect if SPDIF_OUT2 is slected in | 941 | * No effect if SPDIF_OUT2 is selected in |
| 942 | * IDX_SPDIF_CTL. | 942 | * IDX_SPDIF_CTL. |
| 943 | */ | 943 | */ |
| 944 | cs_vendor_coef_set(codec, IDX_ADC_CFG, coef); | 944 | cs_vendor_coef_set(codec, IDX_ADC_CFG, coef); |
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c index 85c81feb10cf..a45c1169762b 100644 --- a/sound/pci/hda/patch_cmedia.c +++ b/sound/pci/hda/patch_cmedia.c | |||
| @@ -66,7 +66,7 @@ struct cmi_spec { | |||
| 66 | 66 | ||
| 67 | struct hda_pcm pcm_rec[2]; /* PCM information */ | 67 | struct hda_pcm pcm_rec[2]; /* PCM information */ |
| 68 | 68 | ||
| 69 | /* pin deafault configuration */ | 69 | /* pin default configuration */ |
| 70 | hda_nid_t pin_nid[NUM_PINS]; | 70 | hda_nid_t pin_nid[NUM_PINS]; |
| 71 | unsigned int def_conf[NUM_PINS]; | 71 | unsigned int def_conf[NUM_PINS]; |
| 72 | unsigned int pin_def_confs; | 72 | unsigned int pin_def_confs; |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index d967836f36bb..db4a7367b625 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -6618,7 +6618,7 @@ static struct hda_input_mux alc889A_mb31_capture_source = { | |||
| 6618 | /* Front Mic (0x01) unused */ | 6618 | /* Front Mic (0x01) unused */ |
| 6619 | { "Line", 0x2 }, | 6619 | { "Line", 0x2 }, |
| 6620 | /* Line 2 (0x03) unused */ | 6620 | /* Line 2 (0x03) unused */ |
| 6621 | /* CD (0x04) unsused? */ | 6621 | /* CD (0x04) unused? */ |
| 6622 | }, | 6622 | }, |
| 6623 | }; | 6623 | }; |
| 6624 | 6624 | ||
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index 0c9413d5341b..98bc3b7681b5 100644 --- a/sound/pci/ice1712/juli.c +++ b/sound/pci/ice1712/juli.c | |||
| @@ -380,7 +380,7 @@ static struct snd_kcontrol_new juli_mute_controls[] __devinitdata = { | |||
| 380 | * inputs) are fed from Xilinx. | 380 | * inputs) are fed from Xilinx. |
| 381 | * | 381 | * |
| 382 | * I even checked traces on board and coded a support in driver for | 382 | * I even checked traces on board and coded a support in driver for |
| 383 | * an alternative possiblity - the unused I2S ICE output channels | 383 | * an alternative possibility - the unused I2S ICE output channels |
| 384 | * switched to HW-IN/SPDIF-IN and providing the monitoring signal to | 384 | * switched to HW-IN/SPDIF-IN and providing the monitoring signal to |
| 385 | * the DAC - to no avail. The I2S outputs seem to be unconnected. | 385 | * the DAC - to no avail. The I2S outputs seem to be unconnected. |
| 386 | * | 386 | * |
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 0dce331a2a3b..a1b10d1a384d 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c | |||
| @@ -3017,7 +3017,7 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry, | |||
| 3017 | insel = "Coaxial"; | 3017 | insel = "Coaxial"; |
| 3018 | break; | 3018 | break; |
| 3019 | default: | 3019 | default: |
| 3020 | insel = "Unkown"; | 3020 | insel = "Unknown"; |
| 3021 | } | 3021 | } |
| 3022 | 3022 | ||
| 3023 | switch (hdspm->control_register & HDSPM_SyncRefMask) { | 3023 | switch (hdspm->control_register & HDSPM_SyncRefMask) { |
| @@ -3028,7 +3028,7 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry, | |||
| 3028 | syncref = "MADI"; | 3028 | syncref = "MADI"; |
| 3029 | break; | 3029 | break; |
| 3030 | default: | 3030 | default: |
| 3031 | syncref = "Unkown"; | 3031 | syncref = "Unknown"; |
| 3032 | } | 3032 | } |
| 3033 | snd_iprintf(buffer, "Inputsel = %s, SyncRef = %s\n", insel, | 3033 | snd_iprintf(buffer, "Inputsel = %s, SyncRef = %s\n", insel, |
| 3034 | syncref); | 3034 | syncref); |
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index aa40d985138f..3e99fe5131dd 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c | |||
| @@ -101,7 +101,7 @@ static int uda134x_write(struct snd_soc_codec *codec, unsigned int reg, | |||
| 101 | pr_debug("%s reg: %02X, value:%02X\n", __func__, reg, value); | 101 | pr_debug("%s reg: %02X, value:%02X\n", __func__, reg, value); |
| 102 | 102 | ||
| 103 | if (reg >= UDA134X_REGS_NUM) { | 103 | if (reg >= UDA134X_REGS_NUM) { |
| 104 | printk(KERN_ERR "%s unkown register: reg: %u", | 104 | printk(KERN_ERR "%s unknown register: reg: %u", |
| 105 | __func__, reg); | 105 | __func__, reg); |
| 106 | return -EINVAL; | 106 | return -EINVAL; |
| 107 | } | 107 | } |
| @@ -552,7 +552,7 @@ static int uda134x_soc_probe(struct platform_device *pdev) | |||
| 552 | ARRAY_SIZE(uda1341_snd_controls)); | 552 | ARRAY_SIZE(uda1341_snd_controls)); |
| 553 | break; | 553 | break; |
| 554 | default: | 554 | default: |
| 555 | printk(KERN_ERR "%s unkown codec type: %d", | 555 | printk(KERN_ERR "%s unknown codec type: %d", |
| 556 | __func__, pd->model); | 556 | __func__, pd->model); |
| 557 | return -EINVAL; | 557 | return -EINVAL; |
| 558 | } | 558 | } |
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index b8cae1758642..ce5515e3f2b0 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
| @@ -607,7 +607,7 @@ SOC_SINGLE("Right Input PGA Common Mode Switch", WM8903_ANALOGUE_RIGHT_INPUT_1, | |||
| 607 | SOC_SINGLE("DRC Switch", WM8903_DRC_0, 15, 1, 0), | 607 | SOC_SINGLE("DRC Switch", WM8903_DRC_0, 15, 1, 0), |
| 608 | SOC_ENUM("DRC Compressor Slope R0", drc_slope_r0), | 608 | SOC_ENUM("DRC Compressor Slope R0", drc_slope_r0), |
| 609 | SOC_ENUM("DRC Compressor Slope R1", drc_slope_r1), | 609 | SOC_ENUM("DRC Compressor Slope R1", drc_slope_r1), |
| 610 | SOC_SINGLE_TLV("DRC Compressor Threashold Volume", WM8903_DRC_3, 5, 124, 1, | 610 | SOC_SINGLE_TLV("DRC Compressor Threshold Volume", WM8903_DRC_3, 5, 124, 1, |
| 611 | drc_tlv_thresh), | 611 | drc_tlv_thresh), |
| 612 | SOC_SINGLE_TLV("DRC Volume", WM8903_DRC_3, 0, 30, 1, drc_tlv_amp), | 612 | SOC_SINGLE_TLV("DRC Volume", WM8903_DRC_3, 0, 30, 1, drc_tlv_amp), |
| 613 | SOC_SINGLE_TLV("DRC Minimum Gain Volume", WM8903_DRC_1, 2, 3, 1, drc_tlv_min), | 613 | SOC_SINGLE_TLV("DRC Minimum Gain Volume", WM8903_DRC_1, 2, 3, 1, drc_tlv_min), |
| @@ -617,11 +617,11 @@ SOC_ENUM("DRC Decay Rate", drc_decay), | |||
| 617 | SOC_ENUM("DRC FF Delay", drc_ff_delay), | 617 | SOC_ENUM("DRC FF Delay", drc_ff_delay), |
| 618 | SOC_SINGLE("DRC Anticlip Switch", WM8903_DRC_0, 1, 1, 0), | 618 | SOC_SINGLE("DRC Anticlip Switch", WM8903_DRC_0, 1, 1, 0), |
| 619 | SOC_SINGLE("DRC QR Switch", WM8903_DRC_0, 2, 1, 0), | 619 | SOC_SINGLE("DRC QR Switch", WM8903_DRC_0, 2, 1, 0), |
| 620 | SOC_SINGLE_TLV("DRC QR Threashold Volume", WM8903_DRC_0, 6, 3, 0, drc_tlv_max), | 620 | SOC_SINGLE_TLV("DRC QR Threshold Volume", WM8903_DRC_0, 6, 3, 0, drc_tlv_max), |
| 621 | SOC_ENUM("DRC QR Decay Rate", drc_qr_decay), | 621 | SOC_ENUM("DRC QR Decay Rate", drc_qr_decay), |
| 622 | SOC_SINGLE("DRC Smoothing Switch", WM8903_DRC_0, 3, 1, 0), | 622 | SOC_SINGLE("DRC Smoothing Switch", WM8903_DRC_0, 3, 1, 0), |
| 623 | SOC_SINGLE("DRC Smoothing Hysteresis Switch", WM8903_DRC_0, 0, 1, 0), | 623 | SOC_SINGLE("DRC Smoothing Hysteresis Switch", WM8903_DRC_0, 0, 1, 0), |
| 624 | SOC_ENUM("DRC Smoothing Threashold", drc_smoothing), | 624 | SOC_ENUM("DRC Smoothing Threshold", drc_smoothing), |
| 625 | SOC_SINGLE_TLV("DRC Startup Volume", WM8903_DRC_0, 6, 18, 0, drc_tlv_startup), | 625 | SOC_SINGLE_TLV("DRC Startup Volume", WM8903_DRC_0, 6, 18, 0, drc_tlv_startup), |
| 626 | 626 | ||
| 627 | SOC_DOUBLE_R_TLV("Digital Capture Volume", WM8903_ADC_DIGITAL_VOLUME_LEFT, | 627 | SOC_DOUBLE_R_TLV("Digital Capture Volume", WM8903_ADC_DIGITAL_VOLUME_LEFT, |
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index 5e32f2ed5fc2..2981afae842c 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c | |||
| @@ -689,7 +689,7 @@ SOC_DOUBLE_TLV("Digital Sidetone Volume", WM8993_DIGITAL_SIDE_TONE, | |||
| 689 | 689 | ||
| 690 | SOC_SINGLE("DRC Switch", WM8993_DRC_CONTROL_1, 15, 1, 0), | 690 | SOC_SINGLE("DRC Switch", WM8993_DRC_CONTROL_1, 15, 1, 0), |
| 691 | SOC_ENUM("DRC Path", drc_path), | 691 | SOC_ENUM("DRC Path", drc_path), |
| 692 | SOC_SINGLE_TLV("DRC Compressor Threashold Volume", WM8993_DRC_CONTROL_2, | 692 | SOC_SINGLE_TLV("DRC Compressor Threshold Volume", WM8993_DRC_CONTROL_2, |
| 693 | 2, 60, 1, drc_comp_threash), | 693 | 2, 60, 1, drc_comp_threash), |
| 694 | SOC_SINGLE_TLV("DRC Compressor Amplitude Volume", WM8993_DRC_CONTROL_3, | 694 | SOC_SINGLE_TLV("DRC Compressor Amplitude Volume", WM8993_DRC_CONTROL_3, |
| 695 | 11, 30, 1, drc_comp_amp), | 695 | 11, 30, 1, drc_comp_amp), |
| @@ -709,7 +709,7 @@ SOC_SINGLE_TLV("DRC Quick Release Volume", WM8993_DRC_CONTROL_3, 2, 3, 0, | |||
| 709 | SOC_ENUM("DRC Quick Release Rate", drc_qr_rate), | 709 | SOC_ENUM("DRC Quick Release Rate", drc_qr_rate), |
| 710 | SOC_SINGLE("DRC Smoothing Switch", WM8993_DRC_CONTROL_1, 11, 1, 0), | 710 | SOC_SINGLE("DRC Smoothing Switch", WM8993_DRC_CONTROL_1, 11, 1, 0), |
| 711 | SOC_SINGLE("DRC Smoothing Hysteresis Switch", WM8993_DRC_CONTROL_1, 8, 1, 0), | 711 | SOC_SINGLE("DRC Smoothing Hysteresis Switch", WM8993_DRC_CONTROL_1, 8, 1, 0), |
| 712 | SOC_ENUM("DRC Smoothing Hysteresis Threashold", drc_smooth), | 712 | SOC_ENUM("DRC Smoothing Hysteresis Threshold", drc_smooth), |
| 713 | SOC_SINGLE_TLV("DRC Startup Volume", WM8993_DRC_CONTROL_4, 8, 18, 0, | 713 | SOC_SINGLE_TLV("DRC Startup Volume", WM8993_DRC_CONTROL_4, 8, 18, 0, |
| 714 | drc_startup_tlv), | 714 | drc_startup_tlv), |
| 715 | 715 | ||
diff --git a/sound/soc/s3c24xx/s3c24xx_simtec.c b/sound/soc/s3c24xx/s3c24xx_simtec.c index 507b2ed5d58b..d441c3b64631 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec.c | |||
| @@ -270,7 +270,7 @@ static int attach_gpio_amp(struct device *dev, | |||
| 270 | gpio_direction_output(pd->amp_gain[1], 0); | 270 | gpio_direction_output(pd->amp_gain[1], 0); |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | /* note, curently we assume GPA0 isn't valid amp */ | 273 | /* note, currently we assume GPA0 isn't valid amp */ |
| 274 | if (pdata->amp_gpio > 0) { | 274 | if (pdata->amp_gpio > 0) { |
| 275 | ret = gpio_request(pd->amp_gpio, "gpio-amp"); | 275 | ret = gpio_request(pd->amp_gpio, "gpio-amp"); |
| 276 | if (ret) { | 276 | if (ret) { |
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c index 0eb1722f6581..1d61109e09fa 100644 --- a/sound/soc/s6000/s6000-pcm.c +++ b/sound/soc/s6000/s6000-pcm.c | |||
| @@ -196,7 +196,7 @@ static int s6000_pcm_start(struct snd_pcm_substream *substream) | |||
| 196 | 0 /* destination skip after chunk (impossible) */, | 196 | 0 /* destination skip after chunk (impossible) */, |
| 197 | 4 /* 16 byte burst size */, | 197 | 4 /* 16 byte burst size */, |
| 198 | -1 /* don't conserve bandwidth */, | 198 | -1 /* don't conserve bandwidth */, |
| 199 | 0 /* low watermark irq descriptor theshold */, | 199 | 0 /* low watermark irq descriptor threshold */, |
| 200 | 0 /* disable hardware timestamps */, | 200 | 0 /* disable hardware timestamps */, |
| 201 | 1 /* enable channel */); | 201 | 1 /* enable channel */); |
| 202 | 202 | ||
diff --git a/sound/sound_core.c b/sound/sound_core.c index 49c998186592..dbca7c909a31 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c | |||
| @@ -353,7 +353,7 @@ static struct sound_unit *chains[SOUND_STEP]; | |||
| 353 | * @dev: device pointer | 353 | * @dev: device pointer |
| 354 | * | 354 | * |
| 355 | * Allocate a special sound device by minor number from the sound | 355 | * Allocate a special sound device by minor number from the sound |
| 356 | * subsystem. The allocated number is returned on succes. On failure | 356 | * subsystem. The allocated number is returned on success. On failure |
| 357 | * a negative error code is returned. | 357 | * a negative error code is returned. |
| 358 | */ | 358 | */ |
| 359 | 359 | ||
diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c index 63c8f45c0c22..67c91230c197 100644 --- a/sound/synth/emux/soundfont.c +++ b/sound/synth/emux/soundfont.c | |||
| @@ -374,7 +374,7 @@ sf_zone_new(struct snd_sf_list *sflist, struct snd_soundfont *sf) | |||
| 374 | 374 | ||
| 375 | 375 | ||
| 376 | /* | 376 | /* |
| 377 | * increment sample couter | 377 | * increment sample counter |
| 378 | */ | 378 | */ |
| 379 | static void | 379 | static void |
| 380 | set_sample_counter(struct snd_sf_list *sflist, struct snd_soundfont *sf, | 380 | set_sample_counter(struct snd_sf_list *sflist, struct snd_soundfont *sf, |