diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:51:45 -0400 |
commit | 342ff1a1b558ebbdb8cbd55ab6a63eca8b2473ca (patch) | |
tree | 1f967f283dade6e03897169bb29513354f49f910 | |
parent | 50223e486cabdcf7e540e519da1f26bab3084e5d (diff) | |
parent | 24ed7a97464db44592495f98cff8bcee02f92bc2 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
trivial: fix typo in aic7xxx comment
trivial: fix comment typo in drivers/ata/pata_hpt37x.c
trivial: typo in kernel-parameters.txt
trivial: fix typo in tracing documentation
trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c
trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c
trivial: remove unnecessary semicolons
trivial: Fix duplicated word "options" in comment
trivial: kbuild: remove extraneous blank line after declaration of usage()
trivial: improve help text for mm debug config options
trivial: doc: hpfall: accept disk device to unload as argument
trivial: doc: hpfall: reduce risk that hpfall can do harm
trivial: SubmittingPatches: Fix reference to renumbered step
trivial: fix typos "man[ae]g?ment" -> "management"
trivial: media/video/cx88: add __init/__exit macros to cx88 drivers
trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
trivial: fix missing printk space in amd_k7_smp_check
trivial: fix typo s/ketymap/keymap/ in comment
trivial: fix typo "to to" in multiple files
trivial: fix typos in comments s/DGBU/DBGU/
...
170 files changed, 299 insertions, 266 deletions
diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl index 8e145857fc9d..df0d089d0fb9 100644 --- a/Documentation/DocBook/mtdnand.tmpl +++ b/Documentation/DocBook/mtdnand.tmpl | |||
@@ -568,7 +568,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip) | |||
568 | <para> | 568 | <para> |
569 | The blocks in which the tables are stored are procteted against | 569 | The blocks in which the tables are stored are procteted against |
570 | accidental access by marking them bad in the memory bad block | 570 | accidental access by marking them bad in the memory bad block |
571 | table. The bad block table managment functions are allowed | 571 | table. The bad block table management functions are allowed |
572 | to circumvernt this protection. | 572 | to circumvernt this protection. |
573 | </para> | 573 | </para> |
574 | <para> | 574 | <para> |
diff --git a/Documentation/DocBook/scsi.tmpl b/Documentation/DocBook/scsi.tmpl index 10a150ae2a7e..d87f4569e768 100644 --- a/Documentation/DocBook/scsi.tmpl +++ b/Documentation/DocBook/scsi.tmpl | |||
@@ -317,7 +317,7 @@ | |||
317 | <para> | 317 | <para> |
318 | The SAS transport class contains common code to deal with SAS HBAs, | 318 | The SAS transport class contains common code to deal with SAS HBAs, |
319 | an aproximated representation of SAS topologies in the driver model, | 319 | an aproximated representation of SAS topologies in the driver model, |
320 | and various sysfs attributes to expose these topologies and managment | 320 | and various sysfs attributes to expose these topologies and management |
321 | interfaces to userspace. | 321 | interfaces to userspace. |
322 | </para> | 322 | </para> |
323 | <para> | 323 | <para> |
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 5c555a8b39e5..b7f9d3b4bbf6 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches | |||
@@ -183,7 +183,7 @@ the MAN-PAGES maintainer (as listed in the MAINTAINERS file) | |||
183 | a man-pages patch, or at least a notification of the change, | 183 | a man-pages patch, or at least a notification of the change, |
184 | so that some information makes its way into the manual pages. | 184 | so that some information makes its way into the manual pages. |
185 | 185 | ||
186 | Even if the maintainer did not respond in step #4, make sure to ALWAYS | 186 | Even if the maintainer did not respond in step #5, make sure to ALWAYS |
187 | copy the maintainer when you change their code. | 187 | copy the maintainer when you change their code. |
188 | 188 | ||
189 | For small patches you may want to CC the Trivial Patch Monkey | 189 | For small patches you may want to CC the Trivial Patch Monkey |
diff --git a/Documentation/filesystems/nfsroot.txt b/Documentation/filesystems/nfsroot.txt index 68baddf3c3e0..3ba0b945aaf8 100644 --- a/Documentation/filesystems/nfsroot.txt +++ b/Documentation/filesystems/nfsroot.txt | |||
@@ -105,7 +105,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> | |||
105 | the client address and this parameter is NOT empty only | 105 | the client address and this parameter is NOT empty only |
106 | replies from the specified server are accepted. | 106 | replies from the specified server are accepted. |
107 | 107 | ||
108 | Only required for for NFS root. That is autoconfiguration | 108 | Only required for NFS root. That is autoconfiguration |
109 | will not be triggered if it is missing and NFS root is not | 109 | will not be triggered if it is missing and NFS root is not |
110 | in operation. | 110 | in operation. |
111 | 111 | ||
diff --git a/Documentation/gcov.txt b/Documentation/gcov.txt index 40ec63352760..e7ca6478cd93 100644 --- a/Documentation/gcov.txt +++ b/Documentation/gcov.txt | |||
@@ -47,7 +47,7 @@ Possible uses: | |||
47 | 47 | ||
48 | Configure the kernel with: | 48 | Configure the kernel with: |
49 | 49 | ||
50 | CONFIG_DEBUGFS=y | 50 | CONFIG_DEBUG_FS=y |
51 | CONFIG_GCOV_KERNEL=y | 51 | CONFIG_GCOV_KERNEL=y |
52 | 52 | ||
53 | and to get coverage data for the entire kernel: | 53 | and to get coverage data for the entire kernel: |
diff --git a/Documentation/hwmon/hpfall.c b/Documentation/hwmon/hpfall.c index bbea1ccfd46a..681ec22b9d0e 100644 --- a/Documentation/hwmon/hpfall.c +++ b/Documentation/hwmon/hpfall.c | |||
@@ -16,6 +16,34 @@ | |||
16 | #include <stdint.h> | 16 | #include <stdint.h> |
17 | #include <errno.h> | 17 | #include <errno.h> |
18 | #include <signal.h> | 18 | #include <signal.h> |
19 | #include <sys/mman.h> | ||
20 | #include <sched.h> | ||
21 | |||
22 | char unload_heads_path[64]; | ||
23 | |||
24 | int set_unload_heads_path(char *device) | ||
25 | { | ||
26 | char devname[64]; | ||
27 | |||
28 | if (strlen(device) <= 5 || strncmp(device, "/dev/", 5) != 0) | ||
29 | return -EINVAL; | ||
30 | strncpy(devname, device + 5, sizeof(devname)); | ||
31 | |||
32 | snprintf(unload_heads_path, sizeof(unload_heads_path), | ||
33 | "/sys/block/%s/device/unload_heads", devname); | ||
34 | return 0; | ||
35 | } | ||
36 | int valid_disk(void) | ||
37 | { | ||
38 | int fd = open(unload_heads_path, O_RDONLY); | ||
39 | if (fd < 0) { | ||
40 | perror(unload_heads_path); | ||
41 | return 0; | ||
42 | } | ||
43 | |||
44 | close(fd); | ||
45 | return 1; | ||
46 | } | ||
19 | 47 | ||
20 | void write_int(char *path, int i) | 48 | void write_int(char *path, int i) |
21 | { | 49 | { |
@@ -40,7 +68,7 @@ void set_led(int on) | |||
40 | 68 | ||
41 | void protect(int seconds) | 69 | void protect(int seconds) |
42 | { | 70 | { |
43 | write_int("/sys/block/sda/device/unload_heads", seconds*1000); | 71 | write_int(unload_heads_path, seconds*1000); |
44 | } | 72 | } |
45 | 73 | ||
46 | int on_ac(void) | 74 | int on_ac(void) |
@@ -57,45 +85,62 @@ void ignore_me(void) | |||
57 | { | 85 | { |
58 | protect(0); | 86 | protect(0); |
59 | set_led(0); | 87 | set_led(0); |
60 | |||
61 | } | 88 | } |
62 | 89 | ||
63 | int main(int argc, char* argv[]) | 90 | int main(int argc, char **argv) |
64 | { | 91 | { |
65 | int fd, ret; | 92 | int fd, ret; |
93 | struct sched_param param; | ||
94 | |||
95 | if (argc == 1) | ||
96 | ret = set_unload_heads_path("/dev/sda"); | ||
97 | else if (argc == 2) | ||
98 | ret = set_unload_heads_path(argv[1]); | ||
99 | else | ||
100 | ret = -EINVAL; | ||
101 | |||
102 | if (ret || !valid_disk()) { | ||
103 | fprintf(stderr, "usage: %s <device> (default: /dev/sda)\n", | ||
104 | argv[0]); | ||
105 | exit(1); | ||
106 | } | ||
107 | |||
108 | fd = open("/dev/freefall", O_RDONLY); | ||
109 | if (fd < 0) { | ||
110 | perror("/dev/freefall"); | ||
111 | return EXIT_FAILURE; | ||
112 | } | ||
66 | 113 | ||
67 | fd = open("/dev/freefall", O_RDONLY); | 114 | daemon(0, 0); |
68 | if (fd < 0) { | 115 | param.sched_priority = sched_get_priority_max(SCHED_FIFO); |
69 | perror("open"); | 116 | sched_setscheduler(0, SCHED_FIFO, ¶m); |
70 | return EXIT_FAILURE; | 117 | mlockall(MCL_CURRENT|MCL_FUTURE); |
71 | } | ||
72 | 118 | ||
73 | signal(SIGALRM, ignore_me); | 119 | signal(SIGALRM, ignore_me); |
74 | 120 | ||
75 | for (;;) { | 121 | for (;;) { |
76 | unsigned char count; | 122 | unsigned char count; |
77 | 123 | ||
78 | ret = read(fd, &count, sizeof(count)); | 124 | ret = read(fd, &count, sizeof(count)); |
79 | alarm(0); | 125 | alarm(0); |
80 | if ((ret == -1) && (errno == EINTR)) { | 126 | if ((ret == -1) && (errno == EINTR)) { |
81 | /* Alarm expired, time to unpark the heads */ | 127 | /* Alarm expired, time to unpark the heads */ |
82 | continue; | 128 | continue; |
83 | } | 129 | } |
84 | 130 | ||
85 | if (ret != sizeof(count)) { | 131 | if (ret != sizeof(count)) { |
86 | perror("read"); | 132 | perror("read"); |
87 | break; | 133 | break; |
88 | } | 134 | } |
89 | 135 | ||
90 | protect(21); | 136 | protect(21); |
91 | set_led(1); | 137 | set_led(1); |
92 | if (1 || on_ac() || lid_open()) { | 138 | if (1 || on_ac() || lid_open()) |
93 | alarm(2); | 139 | alarm(2); |
94 | } else { | 140 | else |
95 | alarm(20); | 141 | alarm(20); |
96 | } | 142 | } |
97 | } | 143 | |
98 | 144 | close(fd); | |
99 | close(fd); | 145 | return EXIT_SUCCESS; |
100 | return EXIT_SUCCESS; | ||
101 | } | 146 | } |
diff --git a/Documentation/hwmon/pc87427 b/Documentation/hwmon/pc87427 index d1ebbe510f35..db5cc1227a83 100644 --- a/Documentation/hwmon/pc87427 +++ b/Documentation/hwmon/pc87427 | |||
@@ -34,5 +34,5 @@ Fan rotation speeds are reported as 14-bit values from a gated clock | |||
34 | signal. Speeds down to 83 RPM can be measured. | 34 | signal. Speeds down to 83 RPM can be measured. |
35 | 35 | ||
36 | An alarm is triggered if the rotation speed drops below a programmable | 36 | An alarm is triggered if the rotation speed drops below a programmable |
37 | limit. Another alarm is triggered if the speed is too low to to be measured | 37 | limit. Another alarm is triggered if the speed is too low to be measured |
38 | (including stalled or missing fan). | 38 | (including stalled or missing fan). |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 0f17d16dc101..c363840cdcea 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -933,7 +933,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
933 | 1 -- enable informational integrity auditing messages. | 933 | 1 -- enable informational integrity auditing messages. |
934 | 934 | ||
935 | ima_hash= [IMA] | 935 | ima_hash= [IMA] |
936 | Formt: { "sha1" | "md5" } | 936 | Format: { "sha1" | "md5" } |
937 | default: "sha1" | 937 | default: "sha1" |
938 | 938 | ||
939 | ima_tcb [IMA] | 939 | ima_tcb [IMA] |
diff --git a/Documentation/networking/regulatory.txt b/Documentation/networking/regulatory.txt index eaa1a25946c1..ee31369e9e5b 100644 --- a/Documentation/networking/regulatory.txt +++ b/Documentation/networking/regulatory.txt | |||
@@ -96,7 +96,7 @@ Example code - drivers hinting an alpha2: | |||
96 | 96 | ||
97 | This example comes from the zd1211rw device driver. You can start | 97 | This example comes from the zd1211rw device driver. You can start |
98 | by having a mapping of your device's EEPROM country/regulatory | 98 | by having a mapping of your device's EEPROM country/regulatory |
99 | domain value to to a specific alpha2 as follows: | 99 | domain value to a specific alpha2 as follows: |
100 | 100 | ||
101 | static struct zd_reg_alpha2_map reg_alpha2_map[] = { | 101 | static struct zd_reg_alpha2_map reg_alpha2_map[] = { |
102 | { ZD_REGDOMAIN_FCC, "US" }, | 102 | { ZD_REGDOMAIN_FCC, "US" }, |
diff --git a/Documentation/powerpc/dts-bindings/marvell.txt b/Documentation/powerpc/dts-bindings/marvell.txt index 3708a2fd4747..f1533d91953a 100644 --- a/Documentation/powerpc/dts-bindings/marvell.txt +++ b/Documentation/powerpc/dts-bindings/marvell.txt | |||
@@ -32,7 +32,7 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd. | |||
32 | devices. This field represents the number of cells needed to | 32 | devices. This field represents the number of cells needed to |
33 | represent the address of the memory-mapped registers of devices | 33 | represent the address of the memory-mapped registers of devices |
34 | within the system controller chip. | 34 | within the system controller chip. |
35 | - #size-cells : Size representation for for the memory-mapped | 35 | - #size-cells : Size representation for the memory-mapped |
36 | registers within the system controller chip. | 36 | registers within the system controller chip. |
37 | - #interrupt-cells : Defines the width of cells used to represent | 37 | - #interrupt-cells : Defines the width of cells used to represent |
38 | interrupts. | 38 | interrupts. |
diff --git a/Documentation/scsi/ChangeLog.megaraid b/Documentation/scsi/ChangeLog.megaraid index eaa4801f2ce6..38e9e7cadc90 100644 --- a/Documentation/scsi/ChangeLog.megaraid +++ b/Documentation/scsi/ChangeLog.megaraid | |||
@@ -514,7 +514,7 @@ iv. Remove yield() while mailbox handshake in synchronous commands | |||
514 | 514 | ||
515 | v. Remove redundant __megaraid_busywait_mbox routine | 515 | v. Remove redundant __megaraid_busywait_mbox routine |
516 | 516 | ||
517 | vi. Fix bug in the managment module, which causes a system lockup when the | 517 | vi. Fix bug in the management module, which causes a system lockup when the |
518 | IO module is loaded and then unloaded, followed by executing any | 518 | IO module is loaded and then unloaded, followed by executing any |
519 | management utility. The current version of management module does not | 519 | management utility. The current version of management module does not |
520 | handle the adapter unregister properly. | 520 | handle the adapter unregister properly. |
diff --git a/Documentation/scsi/scsi_fc_transport.txt b/Documentation/scsi/scsi_fc_transport.txt index d7f181701dc2..aec6549ab097 100644 --- a/Documentation/scsi/scsi_fc_transport.txt +++ b/Documentation/scsi/scsi_fc_transport.txt | |||
@@ -378,7 +378,7 @@ Vport Disable/Enable: | |||
378 | int vport_disable(struct fc_vport *vport, bool disable) | 378 | int vport_disable(struct fc_vport *vport, bool disable) |
379 | 379 | ||
380 | where: | 380 | where: |
381 | vport: Is vport to to be enabled or disabled | 381 | vport: Is vport to be enabled or disabled |
382 | disable: If "true", the vport is to be disabled. | 382 | disable: If "true", the vport is to be disabled. |
383 | If "false", the vport is to be enabled. | 383 | If "false", the vport is to be enabled. |
384 | 384 | ||
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 97eebd63bedc..f1708b79f963 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
@@ -387,7 +387,7 @@ STAC92HD73* | |||
387 | STAC92HD83* | 387 | STAC92HD83* |
388 | =========== | 388 | =========== |
389 | ref Reference board | 389 | ref Reference board |
390 | mic-ref Reference board with power managment for ports | 390 | mic-ref Reference board with power management for ports |
391 | dell-s14 Dell laptop | 391 | dell-s14 Dell laptop |
392 | auto BIOS setup (default) | 392 | auto BIOS setup (default) |
393 | 393 | ||
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index 2dbff53369d0..3e5b63ebb821 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt | |||
@@ -319,25 +319,29 @@ This option can be used to select the type of process address | |||
319 | space randomization that is used in the system, for architectures | 319 | space randomization that is used in the system, for architectures |
320 | that support this feature. | 320 | that support this feature. |
321 | 321 | ||
322 | 0 - Turn the process address space randomization off by default. | 322 | 0 - Turn the process address space randomization off. This is the |
323 | default for architectures that do not support this feature anyways, | ||
324 | and kernels that are booted with the "norandmaps" parameter. | ||
323 | 325 | ||
324 | 1 - Make the addresses of mmap base, stack and VDSO page randomized. | 326 | 1 - Make the addresses of mmap base, stack and VDSO page randomized. |
325 | This, among other things, implies that shared libraries will be | 327 | This, among other things, implies that shared libraries will be |
326 | loaded to random addresses. Also for PIE-linked binaries, the location | 328 | loaded to random addresses. Also for PIE-linked binaries, the |
327 | of code start is randomized. | 329 | location of code start is randomized. This is the default if the |
330 | CONFIG_COMPAT_BRK option is enabled. | ||
328 | 331 | ||
329 | With heap randomization, the situation is a little bit more | 332 | 2 - Additionally enable heap randomization. This is the default if |
330 | complicated. | 333 | CONFIG_COMPAT_BRK is disabled. |
331 | There a few legacy applications out there (such as some ancient | 334 | |
335 | There are a few legacy applications out there (such as some ancient | ||
332 | versions of libc.so.5 from 1996) that assume that brk area starts | 336 | versions of libc.so.5 from 1996) that assume that brk area starts |
333 | just after the end of the code+bss. These applications break when | 337 | just after the end of the code+bss. These applications break when |
334 | start of the brk area is randomized. There are however no known | 338 | start of the brk area is randomized. There are however no known |
335 | non-legacy applications that would be broken this way, so for most | 339 | non-legacy applications that would be broken this way, so for most |
336 | systems it is safe to choose full randomization. However there is | 340 | systems it is safe to choose full randomization. |
337 | a CONFIG_COMPAT_BRK option for systems with ancient and/or broken | 341 | |
338 | binaries, that makes heap non-randomized, but keeps all other | 342 | Systems with ancient and/or broken binaries should be configured |
339 | parts of process address space randomized if randomize_va_space | 343 | with CONFIG_COMPAT_BRK enabled, which excludes the heap from process |
340 | sysctl is turned on. | 344 | address space randomization. |
341 | 345 | ||
342 | ============================================================== | 346 | ============================================================== |
343 | 347 | ||
diff --git a/Documentation/trace/events.txt b/Documentation/trace/events.txt index 78c45a87be57..02ac6ed38b2d 100644 --- a/Documentation/trace/events.txt +++ b/Documentation/trace/events.txt | |||
@@ -72,7 +72,7 @@ To enable all events in sched subsystem: | |||
72 | 72 | ||
73 | # echo 1 > /sys/kernel/debug/tracing/events/sched/enable | 73 | # echo 1 > /sys/kernel/debug/tracing/events/sched/enable |
74 | 74 | ||
75 | To eanble all events: | 75 | To enable all events: |
76 | 76 | ||
77 | # echo 1 > /sys/kernel/debug/tracing/events/enable | 77 | # echo 1 > /sys/kernel/debug/tracing/events/enable |
78 | 78 | ||
diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt index 1b6292bbdd6d..957b22fde2df 100644 --- a/Documentation/trace/ftrace.txt +++ b/Documentation/trace/ftrace.txt | |||
@@ -133,7 +133,7 @@ of ftrace. Here is a list of some of the key files: | |||
133 | than requested, the rest of the page will be used, | 133 | than requested, the rest of the page will be used, |
134 | making the actual allocation bigger than requested. | 134 | making the actual allocation bigger than requested. |
135 | ( Note, the size may not be a multiple of the page size | 135 | ( Note, the size may not be a multiple of the page size |
136 | due to buffer managment overhead. ) | 136 | due to buffer management overhead. ) |
137 | 137 | ||
138 | This can only be updated when the current_tracer | 138 | This can only be updated when the current_tracer |
139 | is set to "nop". | 139 | is set to "nop". |
diff --git a/MAINTAINERS b/MAINTAINERS index da7a811f76a6..d24c8823a8cb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2958,7 +2958,7 @@ F: scripts/Makefile.* | |||
2958 | KERNEL JANITORS | 2958 | KERNEL JANITORS |
2959 | L: kernel-janitors@vger.kernel.org | 2959 | L: kernel-janitors@vger.kernel.org |
2960 | W: http://www.kerneljanitors.org/ | 2960 | W: http://www.kerneljanitors.org/ |
2961 | S: Odd fixes | 2961 | S: Maintained |
2962 | 2962 | ||
2963 | KERNEL NFSD, SUNRPC, AND LOCKD SERVERS | 2963 | KERNEL NFSD, SUNRPC, AND LOCKD SERVERS |
2964 | M: "J. Bruce Fields" <bfields@fieldses.org> | 2964 | M: "J. Bruce Fields" <bfields@fieldses.org> |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 7350557a81e0..54661125a8bf 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -25,7 +25,7 @@ KBUILD_CFLAGS +=$(call cc-option,-marm,) | |||
25 | # Select a platform tht is kept up-to-date | 25 | # Select a platform tht is kept up-to-date |
26 | KBUILD_DEFCONFIG := versatile_defconfig | 26 | KBUILD_DEFCONFIG := versatile_defconfig |
27 | 27 | ||
28 | # defines filename extension depending memory manement type. | 28 | # defines filename extension depending memory management type. |
29 | ifeq ($(CONFIG_MMU),) | 29 | ifeq ($(CONFIG_MMU),) |
30 | MMUEXT := -nommu | 30 | MMUEXT := -nommu |
31 | endif | 31 | endif |
diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c index 61e52b66bc72..50667bed7cc9 100644 --- a/arch/arm/mach-at91/board-afeb-9260v1.c +++ b/arch/arm/mach-at91/board-afeb-9260v1.c | |||
@@ -53,7 +53,7 @@ static void __init afeb9260_map_io(void) | |||
53 | /* Initialize processor: 18.432 MHz crystal */ | 53 | /* Initialize processor: 18.432 MHz crystal */ |
54 | at91sam9260_initialize(18432000); | 54 | at91sam9260_initialize(18432000); |
55 | 55 | ||
56 | /* DGBU on ttyS0. (Rx & Tx only) */ | 56 | /* DBGU on ttyS0. (Rx & Tx only) */ |
57 | at91_register_uart(0, 0, 0); | 57 | at91_register_uart(0, 0, 0); |
58 | 58 | ||
59 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ | 59 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ |
diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c index d3ba29c5d8c8..02138af631e7 100644 --- a/arch/arm/mach-at91/board-cam60.c +++ b/arch/arm/mach-at91/board-cam60.c | |||
@@ -50,7 +50,7 @@ static void __init cam60_map_io(void) | |||
50 | /* Initialize processor: 10 MHz crystal */ | 50 | /* Initialize processor: 10 MHz crystal */ |
51 | at91sam9260_initialize(10000000); | 51 | at91sam9260_initialize(10000000); |
52 | 52 | ||
53 | /* DGBU on ttyS0. (Rx & Tx only) */ | 53 | /* DBGU on ttyS0. (Rx & Tx only) */ |
54 | at91_register_uart(0, 0, 0); | 54 | at91_register_uart(0, 0, 0); |
55 | 55 | ||
56 | /* set serial console to ttyS0 (ie, DBGU) */ | 56 | /* set serial console to ttyS0 (ie, DBGU) */ |
diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c index 9ba7ba2cc3b1..8c0b71c95be4 100644 --- a/arch/arm/mach-at91/board-neocore926.c +++ b/arch/arm/mach-at91/board-neocore926.c | |||
@@ -56,7 +56,7 @@ static void __init neocore926_map_io(void) | |||
56 | /* Initialize processor: 20 MHz crystal */ | 56 | /* Initialize processor: 20 MHz crystal */ |
57 | at91sam9263_initialize(20000000); | 57 | at91sam9263_initialize(20000000); |
58 | 58 | ||
59 | /* DGBU on ttyS0. (Rx & Tx only) */ | 59 | /* DBGU on ttyS0. (Rx & Tx only) */ |
60 | at91_register_uart(0, 0, 0); | 60 | at91_register_uart(0, 0, 0); |
61 | 61 | ||
62 | /* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */ | 62 | /* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */ |
diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c index 4cff9a7e61d2..664938e8f661 100644 --- a/arch/arm/mach-at91/board-qil-a9260.c +++ b/arch/arm/mach-at91/board-qil-a9260.c | |||
@@ -53,7 +53,7 @@ static void __init ek_map_io(void) | |||
53 | /* Initialize processor: 12.000 MHz crystal */ | 53 | /* Initialize processor: 12.000 MHz crystal */ |
54 | at91sam9260_initialize(12000000); | 54 | at91sam9260_initialize(12000000); |
55 | 55 | ||
56 | /* DGBU on ttyS0. (Rx & Tx only) */ | 56 | /* DBGU on ttyS0. (Rx & Tx only) */ |
57 | at91_register_uart(0, 0, 0); | 57 | at91_register_uart(0, 0, 0); |
58 | 58 | ||
59 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ | 59 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ |
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index 93a0f8b100eb..ba9d501b5c50 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c | |||
@@ -54,7 +54,7 @@ static void __init ek_map_io(void) | |||
54 | /* Initialize processor: 18.432 MHz crystal */ | 54 | /* Initialize processor: 18.432 MHz crystal */ |
55 | at91sam9260_initialize(18432000); | 55 | at91sam9260_initialize(18432000); |
56 | 56 | ||
57 | /* DGBU on ttyS0. (Rx & Tx only) */ | 57 | /* DBGU on ttyS0. (Rx & Tx only) */ |
58 | at91_register_uart(0, 0, 0); | 58 | at91_register_uart(0, 0, 0); |
59 | 59 | ||
60 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ | 60 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ |
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c index f9b19993a7a9..c4c8865d52d7 100644 --- a/arch/arm/mach-at91/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c | |||
@@ -61,7 +61,7 @@ static void __init ek_map_io(void) | |||
61 | /* Setup the LEDs */ | 61 | /* Setup the LEDs */ |
62 | at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14); | 62 | at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14); |
63 | 63 | ||
64 | /* DGBU on ttyS0. (Rx & Tx only) */ | 64 | /* DBGU on ttyS0. (Rx & Tx only) */ |
65 | at91_register_uart(0, 0, 0); | 65 | at91_register_uart(0, 0, 0); |
66 | 66 | ||
67 | /* set serial console to ttyS0 (ie, DBGU) */ | 67 | /* set serial console to ttyS0 (ie, DBGU) */ |
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c index 1bf7bd4cbe13..26f1aa6049af 100644 --- a/arch/arm/mach-at91/board-sam9263ek.c +++ b/arch/arm/mach-at91/board-sam9263ek.c | |||
@@ -57,7 +57,7 @@ static void __init ek_map_io(void) | |||
57 | /* Initialize processor: 16.367 MHz crystal */ | 57 | /* Initialize processor: 16.367 MHz crystal */ |
58 | at91sam9263_initialize(16367660); | 58 | at91sam9263_initialize(16367660); |
59 | 59 | ||
60 | /* DGBU on ttyS0. (Rx & Tx only) */ | 60 | /* DBGU on ttyS0. (Rx & Tx only) */ |
61 | at91_register_uart(0, 0, 0); | 61 | at91_register_uart(0, 0, 0); |
62 | 62 | ||
63 | /* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */ | 63 | /* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */ |
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index ca470d504ea0..29cf83177484 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
@@ -50,7 +50,7 @@ static void __init ek_map_io(void) | |||
50 | /* Initialize processor: 18.432 MHz crystal */ | 50 | /* Initialize processor: 18.432 MHz crystal */ |
51 | at91sam9260_initialize(18432000); | 51 | at91sam9260_initialize(18432000); |
52 | 52 | ||
53 | /* DGBU on ttyS0. (Rx & Tx only) */ | 53 | /* DBGU on ttyS0. (Rx & Tx only) */ |
54 | at91_register_uart(0, 0, 0); | 54 | at91_register_uart(0, 0, 0); |
55 | 55 | ||
56 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ | 56 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ |
diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c index 9d07679efce7..94ffb5c103b9 100644 --- a/arch/arm/mach-at91/board-sam9rlek.c +++ b/arch/arm/mach-at91/board-sam9rlek.c | |||
@@ -43,7 +43,7 @@ static void __init ek_map_io(void) | |||
43 | /* Initialize processor: 12.000 MHz crystal */ | 43 | /* Initialize processor: 12.000 MHz crystal */ |
44 | at91sam9rl_initialize(12000000); | 44 | at91sam9rl_initialize(12000000); |
45 | 45 | ||
46 | /* DGBU on ttyS0. (Rx & Tx only) */ | 46 | /* DBGU on ttyS0. (Rx & Tx only) */ |
47 | at91_register_uart(0, 0, 0); | 47 | at91_register_uart(0, 0, 0); |
48 | 48 | ||
49 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS) */ | 49 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS) */ |
diff --git a/arch/arm/mach-at91/board-usb-a9260.c b/arch/arm/mach-at91/board-usb-a9260.c index d13304c0bc45..905d6ef76807 100644 --- a/arch/arm/mach-at91/board-usb-a9260.c +++ b/arch/arm/mach-at91/board-usb-a9260.c | |||
@@ -53,7 +53,7 @@ static void __init ek_map_io(void) | |||
53 | /* Initialize processor: 12.000 MHz crystal */ | 53 | /* Initialize processor: 12.000 MHz crystal */ |
54 | at91sam9260_initialize(12000000); | 54 | at91sam9260_initialize(12000000); |
55 | 55 | ||
56 | /* DGBU on ttyS0. (Rx & Tx only) */ | 56 | /* DBGU on ttyS0. (Rx & Tx only) */ |
57 | at91_register_uart(0, 0, 0); | 57 | at91_register_uart(0, 0, 0); |
58 | 58 | ||
59 | /* set serial console to ttyS0 (ie, DBGU) */ | 59 | /* set serial console to ttyS0 (ie, DBGU) */ |
diff --git a/arch/arm/mach-at91/board-usb-a9263.c b/arch/arm/mach-at91/board-usb-a9263.c index d96405b7d578..b6a3480383e5 100644 --- a/arch/arm/mach-at91/board-usb-a9263.c +++ b/arch/arm/mach-at91/board-usb-a9263.c | |||
@@ -52,7 +52,7 @@ static void __init ek_map_io(void) | |||
52 | /* Initialize processor: 12.00 MHz crystal */ | 52 | /* Initialize processor: 12.00 MHz crystal */ |
53 | at91sam9263_initialize(12000000); | 53 | at91sam9263_initialize(12000000); |
54 | 54 | ||
55 | /* DGBU on ttyS0. (Rx & Tx only) */ | 55 | /* DBGU on ttyS0. (Rx & Tx only) */ |
56 | at91_register_uart(0, 0, 0); | 56 | at91_register_uart(0, 0, 0); |
57 | 57 | ||
58 | /* set serial console to ttyS0 (ie, DBGU) */ | 58 | /* set serial console to ttyS0 (ie, DBGU) */ |
diff --git a/arch/blackfin/mach-bf538/include/mach/defBF539.h b/arch/blackfin/mach-bf538/include/mach/defBF539.h index bdc330cd0e1c..1c58914a8740 100644 --- a/arch/blackfin/mach-bf538/include/mach/defBF539.h +++ b/arch/blackfin/mach-bf538/include/mach/defBF539.h | |||
@@ -2325,7 +2325,7 @@ | |||
2325 | #define AMBEN_B0_B1 0x0004 /* Enable Asynchronous Memory Banks 0 & 1 only */ | 2325 | #define AMBEN_B0_B1 0x0004 /* Enable Asynchronous Memory Banks 0 & 1 only */ |
2326 | #define AMBEN_B0_B1_B2 0x0006 /* Enable Asynchronous Memory Banks 0, 1, and 2 */ | 2326 | #define AMBEN_B0_B1_B2 0x0006 /* Enable Asynchronous Memory Banks 0, 1, and 2 */ |
2327 | #define AMBEN_ALL 0x0008 /* Enable Asynchronous Memory Banks (all) 0, 1, 2, and 3 */ | 2327 | #define AMBEN_ALL 0x0008 /* Enable Asynchronous Memory Banks (all) 0, 1, 2, and 3 */ |
2328 | #define CDPRIO 0x0100 /* DMA has priority over core for for external accesses */ | 2328 | #define CDPRIO 0x0100 /* DMA has priority over core for external accesses */ |
2329 | 2329 | ||
2330 | /* EBIU_AMGCTL Bit Positions */ | 2330 | /* EBIU_AMGCTL Bit Positions */ |
2331 | #define AMCKEN_P 0x0000 /* Enable CLKOUT */ | 2331 | #define AMCKEN_P 0x0000 /* Enable CLKOUT */ |
diff --git a/arch/frv/lib/cache.S b/arch/frv/lib/cache.S index 0e10ad8dc462..0c4fb204911b 100644 --- a/arch/frv/lib/cache.S +++ b/arch/frv/lib/cache.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* cache.S: cache managment routines | 1 | /* cache.S: cache management routines |
2 | * | 2 | * |
3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. |
4 | * Written by David Howells (dhowells@redhat.com) | 4 | * Written by David Howells (dhowells@redhat.com) |
diff --git a/arch/h8300/kernel/timer/tpu.c b/arch/h8300/kernel/timer/tpu.c index e7c6e614a758..2193a2e2859a 100644 --- a/arch/h8300/kernel/timer/tpu.c +++ b/arch/h8300/kernel/timer/tpu.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * | 7 | * |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index 16ef61a91d95..625ed8f76fce 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c | |||
@@ -1270,7 +1270,7 @@ putreg (struct task_struct *child, int regno, unsigned int value) | |||
1270 | case PT_CS: | 1270 | case PT_CS: |
1271 | if (value != __USER_CS) | 1271 | if (value != __USER_CS) |
1272 | printk(KERN_ERR | 1272 | printk(KERN_ERR |
1273 | "ia32.putreg: attempt to to set invalid segment register %d = %x\n", | 1273 | "ia32.putreg: attempt to set invalid segment register %d = %x\n", |
1274 | regno, value); | 1274 | regno, value); |
1275 | break; | 1275 | break; |
1276 | default: | 1276 | default: |
diff --git a/arch/mn10300/include/asm/cacheflush.h b/arch/mn10300/include/asm/cacheflush.h index 2db746a251f8..1a55d61f0d06 100644 --- a/arch/mn10300/include/asm/cacheflush.h +++ b/arch/mn10300/include/asm/cacheflush.h | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
18 | 18 | ||
19 | /* | 19 | /* |
20 | * virtually-indexed cache managment (our cache is physically indexed) | 20 | * virtually-indexed cache management (our cache is physically indexed) |
21 | */ | 21 | */ |
22 | #define flush_cache_all() do {} while (0) | 22 | #define flush_cache_all() do {} while (0) |
23 | #define flush_cache_mm(mm) do {} while (0) | 23 | #define flush_cache_mm(mm) do {} while (0) |
@@ -31,7 +31,7 @@ | |||
31 | #define flush_dcache_mmap_unlock(mapping) do {} while (0) | 31 | #define flush_dcache_mmap_unlock(mapping) do {} while (0) |
32 | 32 | ||
33 | /* | 33 | /* |
34 | * physically-indexed cache managment | 34 | * physically-indexed cache management |
35 | */ | 35 | */ |
36 | #ifndef CONFIG_MN10300_CACHE_DISABLED | 36 | #ifndef CONFIG_MN10300_CACHE_DISABLED |
37 | 37 | ||
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c index acb74a17bbbf..b4b167b33643 100644 --- a/arch/powerpc/kernel/udbg_16550.c +++ b/arch/powerpc/kernel/udbg_16550.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * udbg for for NS16550 compatable serial ports | 2 | * udbg for NS16550 compatable serial ports |
3 | * | 3 | * |
4 | * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp | 4 | * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp |
5 | * | 5 | * |
diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c b/arch/powerpc/platforms/powermac/udbg_scc.c index 572771fd8463..9490157da62e 100644 --- a/arch/powerpc/platforms/powermac/udbg_scc.c +++ b/arch/powerpc/platforms/powermac/udbg_scc.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * udbg for for zilog scc ports as found on Apple PowerMacs | 2 | * udbg for zilog scc ports as found on Apple PowerMacs |
3 | * | 3 | * |
4 | * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp | 4 | * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp |
5 | * | 5 | * |
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index dc2d66683859..341aff2687a5 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c | |||
@@ -496,7 +496,7 @@ static int __init hypfs_init(void) | |||
496 | } | 496 | } |
497 | s390_kobj = kobject_create_and_add("s390", hypervisor_kobj); | 497 | s390_kobj = kobject_create_and_add("s390", hypervisor_kobj); |
498 | if (!s390_kobj) { | 498 | if (!s390_kobj) { |
499 | rc = -ENOMEM;; | 499 | rc = -ENOMEM; |
500 | goto fail_sysfs; | 500 | goto fail_sysfs; |
501 | } | 501 | } |
502 | rc = register_filesystem(&hypfs_type); | 502 | rc = register_filesystem(&hypfs_type); |
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 2c2f98353415..43486c2408e1 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c | |||
@@ -478,7 +478,7 @@ int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code) | |||
478 | if (!inti) | 478 | if (!inti) |
479 | return -ENOMEM; | 479 | return -ENOMEM; |
480 | 480 | ||
481 | inti->type = KVM_S390_PROGRAM_INT;; | 481 | inti->type = KVM_S390_PROGRAM_INT; |
482 | inti->pgm.code = code; | 482 | inti->pgm.code = code; |
483 | 483 | ||
484 | VCPU_EVENT(vcpu, 3, "inject: program check %d (from kernel)", code); | 484 | VCPU_EVENT(vcpu, 3, "inject: program check %d (from kernel)", code); |
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c index 8daab33fc17d..8ab1d4728a4b 100644 --- a/arch/sparc/kernel/irq_64.c +++ b/arch/sparc/kernel/irq_64.c | |||
@@ -229,7 +229,7 @@ static unsigned int sun4u_compute_tid(unsigned long imap, unsigned long cpuid) | |||
229 | tid = ((a << IMAP_AID_SHIFT) | | 229 | tid = ((a << IMAP_AID_SHIFT) | |
230 | (n << IMAP_NID_SHIFT)); | 230 | (n << IMAP_NID_SHIFT)); |
231 | tid &= (IMAP_AID_SAFARI | | 231 | tid &= (IMAP_AID_SAFARI | |
232 | IMAP_NID_SAFARI);; | 232 | IMAP_NID_SAFARI); |
233 | } | 233 | } |
234 | } else { | 234 | } else { |
235 | tid = cpuid << IMAP_TID_SHIFT; | 235 | tid = cpuid << IMAP_TID_SHIFT; |
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index f114813ae258..a74245ae3a84 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
@@ -533,7 +533,7 @@ static int eth_parse(char *str, int *index_out, char **str_out, | |||
533 | char **error_out) | 533 | char **error_out) |
534 | { | 534 | { |
535 | char *end; | 535 | char *end; |
536 | int n, err = -EINVAL;; | 536 | int n, err = -EINVAL; |
537 | 537 | ||
538 | n = simple_strtoul(str, &end, 0); | 538 | n = simple_strtoul(str, &end, 0); |
539 | if (end == str) { | 539 | if (end == str) { |
diff --git a/arch/um/include/shared/ptrace_user.h b/arch/um/include/shared/ptrace_user.h index 4bce6e012889..7fd8539bc19a 100644 --- a/arch/um/include/shared/ptrace_user.h +++ b/arch/um/include/shared/ptrace_user.h | |||
@@ -29,7 +29,7 @@ extern int ptrace_setregs(long pid, unsigned long *regs_in); | |||
29 | * recompilation. So, we use PTRACE_OLDSETOPTIONS in UML. | 29 | * recompilation. So, we use PTRACE_OLDSETOPTIONS in UML. |
30 | * We also want to be able to build the kernel on 2.4, which doesn't | 30 | * We also want to be able to build the kernel on 2.4, which doesn't |
31 | * have PTRACE_OLDSETOPTIONS. So, if it is missing, we declare | 31 | * have PTRACE_OLDSETOPTIONS. So, if it is missing, we declare |
32 | * PTRACE_OLDSETOPTIONS to to be the same as PTRACE_SETOPTIONS. | 32 | * PTRACE_OLDSETOPTIONS to be the same as PTRACE_SETOPTIONS. |
33 | * | 33 | * |
34 | * On architectures, that start to support PTRACE_O_TRACESYSGOOD on | 34 | * On architectures, that start to support PTRACE_O_TRACESYSGOOD on |
35 | * linux 2.6, PTRACE_OLDSETOPTIONS never is defined, and also isn't | 35 | * linux 2.6, PTRACE_OLDSETOPTIONS never is defined, and also isn't |
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index f32fa71ccf97..c910a716a71c 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -184,7 +184,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) | |||
184 | * approved Athlon | 184 | * approved Athlon |
185 | */ | 185 | */ |
186 | WARN_ONCE(1, "WARNING: This combination of AMD" | 186 | WARN_ONCE(1, "WARNING: This combination of AMD" |
187 | "processors is not suitable for SMP.\n"); | 187 | " processors is not suitable for SMP.\n"); |
188 | if (!test_taint(TAINT_UNSAFE_SMP)) | 188 | if (!test_taint(TAINT_UNSAFE_SMP)) |
189 | add_taint(TAINT_UNSAFE_SMP); | 189 | add_taint(TAINT_UNSAFE_SMP); |
190 | 190 | ||
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c index 122c786449a9..d0a7df2e5ca7 100644 --- a/drivers/ata/pata_hpt37x.c +++ b/drivers/ata/pata_hpt37x.c | |||
@@ -624,7 +624,7 @@ static struct ata_port_operations hpt374_fn1_port_ops = { | |||
624 | }; | 624 | }; |
625 | 625 | ||
626 | /** | 626 | /** |
627 | * htp37x_clock_slot - Turn timing to PC clock entry | 627 | * hpt37x_clock_slot - Turn timing to PC clock entry |
628 | * @freq: Reported frequency timing | 628 | * @freq: Reported frequency timing |
629 | * @base: Base timing | 629 | * @base: Base timing |
630 | * | 630 | * |
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 8b50af381a8e..c77b6f3c28ea 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c | |||
@@ -6653,7 +6653,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, | |||
6653 | else ErrorCode = get_user(ControllerNumber, | 6653 | else ErrorCode = get_user(ControllerNumber, |
6654 | &UserSpaceControllerInfo->ControllerNumber); | 6654 | &UserSpaceControllerInfo->ControllerNumber); |
6655 | if (ErrorCode != 0) | 6655 | if (ErrorCode != 0) |
6656 | break;; | 6656 | break; |
6657 | ErrorCode = -ENXIO; | 6657 | ErrorCode = -ENXIO; |
6658 | if (ControllerNumber < 0 || | 6658 | if (ControllerNumber < 0 || |
6659 | ControllerNumber > DAC960_ControllerCount - 1) { | 6659 | ControllerNumber > DAC960_ControllerCount - 1) { |
@@ -6661,7 +6661,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, | |||
6661 | } | 6661 | } |
6662 | Controller = DAC960_Controllers[ControllerNumber]; | 6662 | Controller = DAC960_Controllers[ControllerNumber]; |
6663 | if (Controller == NULL) | 6663 | if (Controller == NULL) |
6664 | break;; | 6664 | break; |
6665 | memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T)); | 6665 | memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T)); |
6666 | ControllerInfo.ControllerNumber = ControllerNumber; | 6666 | ControllerInfo.ControllerNumber = ControllerNumber; |
6667 | ControllerInfo.FirmwareType = Controller->FirmwareType; | 6667 | ControllerInfo.FirmwareType = Controller->FirmwareType; |
@@ -7210,7 +7210,7 @@ static struct pci_driver DAC960_pci_driver = { | |||
7210 | .remove = DAC960_Remove, | 7210 | .remove = DAC960_Remove, |
7211 | }; | 7211 | }; |
7212 | 7212 | ||
7213 | static int DAC960_init_module(void) | 7213 | static int __init DAC960_init_module(void) |
7214 | { | 7214 | { |
7215 | int ret; | 7215 | int ret; |
7216 | 7216 | ||
@@ -7222,7 +7222,7 @@ static int DAC960_init_module(void) | |||
7222 | return ret; | 7222 | return ret; |
7223 | } | 7223 | } |
7224 | 7224 | ||
7225 | static void DAC960_cleanup_module(void) | 7225 | static void __exit DAC960_cleanup_module(void) |
7226 | { | 7226 | { |
7227 | int i; | 7227 | int i; |
7228 | 7228 | ||
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index e39e3820fef9..6380ad8d91bd 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c | |||
@@ -1062,7 +1062,7 @@ static int swim3_add_device(struct macio_dev *mdev, int index) | |||
1062 | goto out_release; | 1062 | goto out_release; |
1063 | } | 1063 | } |
1064 | fs->swim3_intr = macio_irq(mdev, 0); | 1064 | fs->swim3_intr = macio_irq(mdev, 0); |
1065 | fs->dma_intr = macio_irq(mdev, 1);; | 1065 | fs->dma_intr = macio_irq(mdev, 1); |
1066 | fs->cur_cyl = -1; | 1066 | fs->cur_cyl = -1; |
1067 | fs->cur_sector = -1; | 1067 | fs->cur_sector = -1; |
1068 | fs->secpercyl = 36; | 1068 | fs->secpercyl = 36; |
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index 20ef1bf5e726..703959eba45a 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
@@ -270,7 +270,7 @@ static void uninorth_agp_enable(struct agp_bridge_data *bridge, u32 mode) | |||
270 | 270 | ||
271 | if ((uninorth_rev >= 0x30) && (uninorth_rev <= 0x33)) { | 271 | if ((uninorth_rev >= 0x30) && (uninorth_rev <= 0x33)) { |
272 | /* | 272 | /* |
273 | * We need to to set REQ_DEPTH to 7 for U3 versions 1.0, 2.1, | 273 | * We need to set REQ_DEPTH to 7 for U3 versions 1.0, 2.1, |
274 | * 2.2 and 2.3, Darwin do so. | 274 | * 2.2 and 2.3, Darwin do so. |
275 | */ | 275 | */ |
276 | if ((command >> AGPSTAT_RQ_DEPTH_SHIFT) > 7) | 276 | if ((command >> AGPSTAT_RQ_DEPTH_SHIFT) > 7) |
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index ff647ca1c489..9d589e3144de 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c | |||
@@ -2239,7 +2239,7 @@ static void do_softint(struct work_struct *work) | |||
2239 | struct channel *ch = container_of(work, struct channel, tqueue); | 2239 | struct channel *ch = container_of(work, struct channel, tqueue); |
2240 | /* Called in response to a modem change event */ | 2240 | /* Called in response to a modem change event */ |
2241 | if (ch && ch->magic == EPCA_MAGIC) { | 2241 | if (ch && ch->magic == EPCA_MAGIC) { |
2242 | struct tty_struct *tty = tty_port_tty_get(&ch->port);; | 2242 | struct tty_struct *tty = tty_port_tty_get(&ch->port); |
2243 | 2243 | ||
2244 | if (tty && tty->driver_data) { | 2244 | if (tty && tty->driver_data) { |
2245 | if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) { | 2245 | if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) { |
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c index a261bd735dfb..2e66b5f773dd 100644 --- a/drivers/char/ipmi/ipmi_poweroff.c +++ b/drivers/char/ipmi/ipmi_poweroff.c | |||
@@ -691,7 +691,7 @@ static struct ctl_table_header *ipmi_table_header; | |||
691 | /* | 691 | /* |
692 | * Startup and shutdown functions. | 692 | * Startup and shutdown functions. |
693 | */ | 693 | */ |
694 | static int ipmi_poweroff_init(void) | 694 | static int __init ipmi_poweroff_init(void) |
695 | { | 695 | { |
696 | int rv; | 696 | int rv; |
697 | 697 | ||
@@ -725,7 +725,7 @@ static int ipmi_poweroff_init(void) | |||
725 | } | 725 | } |
726 | 726 | ||
727 | #ifdef MODULE | 727 | #ifdef MODULE |
728 | static __exit void ipmi_poweroff_cleanup(void) | 728 | static void __exit ipmi_poweroff_cleanup(void) |
729 | { | 729 | { |
730 | int rv; | 730 | int rv; |
731 | 731 | ||
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index 871c13b4c148..12f355cafdbe 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h | |||
@@ -286,7 +286,7 @@ enum scrub_type { | |||
286 | * is irrespective of the memory devices being mounted | 286 | * is irrespective of the memory devices being mounted |
287 | * on both sides of the memory stick. | 287 | * on both sides of the memory stick. |
288 | * | 288 | * |
289 | * Socket set: All of the memory sticks that are required for for | 289 | * Socket set: All of the memory sticks that are required for |
290 | * a single memory access or all of the memory sticks | 290 | * a single memory access or all of the memory sticks |
291 | * spanned by a chip-select row. A single socket set | 291 | * spanned by a chip-select row. A single socket set |
292 | * has two chip-select rows and if double-sided sticks | 292 | * has two chip-select rows and if double-sided sticks |
diff --git a/drivers/gpio/bt8xxgpio.c b/drivers/gpio/bt8xxgpio.c index 984b587f0f96..55904140213b 100644 --- a/drivers/gpio/bt8xxgpio.c +++ b/drivers/gpio/bt8xxgpio.c | |||
@@ -331,13 +331,13 @@ static struct pci_driver bt8xxgpio_pci_driver = { | |||
331 | .resume = bt8xxgpio_resume, | 331 | .resume = bt8xxgpio_resume, |
332 | }; | 332 | }; |
333 | 333 | ||
334 | static int bt8xxgpio_init(void) | 334 | static int __init bt8xxgpio_init(void) |
335 | { | 335 | { |
336 | return pci_register_driver(&bt8xxgpio_pci_driver); | 336 | return pci_register_driver(&bt8xxgpio_pci_driver); |
337 | } | 337 | } |
338 | module_init(bt8xxgpio_init) | 338 | module_init(bt8xxgpio_init) |
339 | 339 | ||
340 | static void bt8xxgpio_exit(void) | 340 | static void __exit bt8xxgpio_exit(void) |
341 | { | 341 | { |
342 | pci_unregister_driver(&bt8xxgpio_pci_driver); | 342 | pci_unregister_driver(&bt8xxgpio_pci_driver); |
343 | } | 343 | } |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 2b914d732076..f4856a510476 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -232,7 +232,7 @@ intel_dp_aux_ch(struct intel_output *intel_output, | |||
232 | for (try = 0; try < 5; try++) { | 232 | for (try = 0; try < 5; try++) { |
233 | /* Load the send data into the aux channel data registers */ | 233 | /* Load the send data into the aux channel data registers */ |
234 | for (i = 0; i < send_bytes; i += 4) { | 234 | for (i = 0; i < send_bytes; i += 4) { |
235 | uint32_t d = pack_aux(send + i, send_bytes - i);; | 235 | uint32_t d = pack_aux(send + i, send_bytes - i); |
236 | 236 | ||
237 | I915_WRITE(ch_data + i, d); | 237 | I915_WRITE(ch_data + i, d); |
238 | } | 238 | } |
diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c index b710fab21cb3..a53b848e0f17 100644 --- a/drivers/gpu/drm/mga/mga_state.c +++ b/drivers/gpu/drm/mga/mga_state.c | |||
@@ -239,7 +239,7 @@ static __inline__ void mga_g200_emit_pipe(drm_mga_private_t * dev_priv) | |||
239 | MGA_WR34, 0x00000000, | 239 | MGA_WR34, 0x00000000, |
240 | MGA_WR42, 0x0000ffff, MGA_WR60, 0x0000ffff); | 240 | MGA_WR42, 0x0000ffff, MGA_WR60, 0x0000ffff); |
241 | 241 | ||
242 | /* Padding required to to hardware bug. | 242 | /* Padding required due to hardware bug. |
243 | */ | 243 | */ |
244 | DMA_BLOCK(MGA_DMAPAD, 0xffffffff, | 244 | DMA_BLOCK(MGA_DMAPAD, 0xffffffff, |
245 | MGA_DMAPAD, 0xffffffff, | 245 | MGA_DMAPAD, 0xffffffff, |
@@ -317,7 +317,7 @@ static __inline__ void mga_g400_emit_pipe(drm_mga_private_t * dev_priv) | |||
317 | MGA_WR52, MGA_G400_WR_MAGIC, /* tex1 width */ | 317 | MGA_WR52, MGA_G400_WR_MAGIC, /* tex1 width */ |
318 | MGA_WR60, MGA_G400_WR_MAGIC); /* tex1 height */ | 318 | MGA_WR60, MGA_G400_WR_MAGIC); /* tex1 height */ |
319 | 319 | ||
320 | /* Padding required to to hardware bug */ | 320 | /* Padding required due to hardware bug */ |
321 | DMA_BLOCK(MGA_DMAPAD, 0xffffffff, | 321 | DMA_BLOCK(MGA_DMAPAD, 0xffffffff, |
322 | MGA_DMAPAD, 0xffffffff, | 322 | MGA_DMAPAD, 0xffffffff, |
323 | MGA_DMAPAD, 0xffffffff, | 323 | MGA_DMAPAD, 0xffffffff, |
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 8de442cbee94..63c53d65e875 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1212,7 +1212,7 @@ static int ide_find_port_slot(const struct ide_port_info *d) | |||
1212 | { | 1212 | { |
1213 | int idx = -ENOENT; | 1213 | int idx = -ENOENT; |
1214 | u8 bootable = (d && (d->host_flags & IDE_HFLAG_NON_BOOTABLE)) ? 0 : 1; | 1214 | u8 bootable = (d && (d->host_flags & IDE_HFLAG_NON_BOOTABLE)) ? 0 : 1; |
1215 | u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0;; | 1215 | u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0; |
1216 | 1216 | ||
1217 | /* | 1217 | /* |
1218 | * Claim an unassigned slot. | 1218 | * Claim an unassigned slot. |
diff --git a/drivers/ide/umc8672.c b/drivers/ide/umc8672.c index 0608d41fb6d0..60f936e2319c 100644 --- a/drivers/ide/umc8672.c +++ b/drivers/ide/umc8672.c | |||
@@ -170,9 +170,9 @@ static int __init umc8672_init(void) | |||
170 | goto out; | 170 | goto out; |
171 | 171 | ||
172 | if (umc8672_probe() == 0) | 172 | if (umc8672_probe() == 0) |
173 | return 0;; | 173 | return 0; |
174 | out: | 174 | out: |
175 | return -ENODEV;; | 175 | return -ENODEV; |
176 | } | 176 | } |
177 | 177 | ||
178 | module_init(umc8672_init); | 178 | module_init(umc8672_init); |
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c index 02831ad070b8..4bd39c8af80f 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6110.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c | |||
@@ -809,7 +809,7 @@ static int ipath_setup_ht_reset(struct ipath_devdata *dd) | |||
809 | * errors. We only bother to do this at load time, because it's OK if | 809 | * errors. We only bother to do this at load time, because it's OK if |
810 | * it happened before we were loaded (first time after boot/reset), | 810 | * it happened before we were loaded (first time after boot/reset), |
811 | * but any time after that, it's fatal anyway. Also need to not check | 811 | * but any time after that, it's fatal anyway. Also need to not check |
812 | * for for upper byte errors if we are in 8 bit mode, so figure out | 812 | * for upper byte errors if we are in 8 bit mode, so figure out |
813 | * our width. For now, at least, also complain if it's 8 bit. | 813 | * our width. For now, at least, also complain if it's 8 bit. |
814 | */ | 814 | */ |
815 | static void slave_or_pri_blk(struct ipath_devdata *dd, struct pci_dev *pdev, | 815 | static void slave_or_pri_blk(struct ipath_devdata *dd, struct pci_dev *pdev, |
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index c9523e48c6ad..adb09e2ba394 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
@@ -229,7 +229,7 @@ struct atkbd { | |||
229 | }; | 229 | }; |
230 | 230 | ||
231 | /* | 231 | /* |
232 | * System-specific ketymap fixup routine | 232 | * System-specific keymap fixup routine |
233 | */ | 233 | */ |
234 | static void (*atkbd_platform_fixup)(struct atkbd *, const void *data); | 234 | static void (*atkbd_platform_fixup)(struct atkbd *, const void *data); |
235 | static void *atkbd_platform_fixup_data; | 235 | static void *atkbd_platform_fixup_data; |
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c index 16f2e465e5f9..26626eead828 100644 --- a/drivers/isdn/capi/capiutil.c +++ b/drivers/isdn/capi/capiutil.c | |||
@@ -1019,7 +1019,7 @@ int __init cdebug_init(void) | |||
1019 | if (!g_debbuf->buf) { | 1019 | if (!g_debbuf->buf) { |
1020 | kfree(g_cmsg); | 1020 | kfree(g_cmsg); |
1021 | kfree(g_debbuf); | 1021 | kfree(g_debbuf); |
1022 | return -ENOMEM;; | 1022 | return -ENOMEM; |
1023 | } | 1023 | } |
1024 | g_debbuf->size = CDEBUG_GSIZE; | 1024 | g_debbuf->size = CDEBUG_GSIZE; |
1025 | g_debbuf->buf[0] = 0; | 1025 | g_debbuf->buf[0] = 0; |
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 7188c59a76ff..adb1e8c36b46 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
@@ -761,7 +761,7 @@ isdn_getnum(char **p) | |||
761 | * Be aware that this is not an atomic operation when sleep != 0, even though | 761 | * Be aware that this is not an atomic operation when sleep != 0, even though |
762 | * interrupts are turned off! Well, like that we are currently only called | 762 | * interrupts are turned off! Well, like that we are currently only called |
763 | * on behalf of a read system call on raw device files (which are documented | 763 | * on behalf of a read system call on raw device files (which are documented |
764 | * to be dangerous and for for debugging purpose only). The inode semaphore | 764 | * to be dangerous and for debugging purpose only). The inode semaphore |
765 | * takes care that this is not called for the same minor device number while | 765 | * takes care that this is not called for the same minor device number while |
766 | * we are sleeping, but access is not serialized against simultaneous read() | 766 | * we are sleeping, but access is not serialized against simultaneous read() |
767 | * from the corresponding ttyI device. Can other ugly events, like changes | 767 | * from the corresponding ttyI device. Can other ugly events, like changes |
@@ -873,7 +873,7 @@ isdn_readbchan(int di, int channel, u_char * buf, u_char * fp, int len, wait_que | |||
873 | * Be aware that this is not an atomic operation when sleep != 0, even though | 873 | * Be aware that this is not an atomic operation when sleep != 0, even though |
874 | * interrupts are turned off! Well, like that we are currently only called | 874 | * interrupts are turned off! Well, like that we are currently only called |
875 | * on behalf of a read system call on raw device files (which are documented | 875 | * on behalf of a read system call on raw device files (which are documented |
876 | * to be dangerous and for for debugging purpose only). The inode semaphore | 876 | * to be dangerous and for debugging purpose only). The inode semaphore |
877 | * takes care that this is not called for the same minor device number while | 877 | * takes care that this is not called for the same minor device number while |
878 | * we are sleeping, but access is not serialized against simultaneous read() | 878 | * we are sleeping, but access is not serialized against simultaneous read() |
879 | * from the corresponding ttyI device. Can other ugly events, like changes | 879 | * from the corresponding ttyI device. Can other ugly events, like changes |
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c index a8d0aee3bc0e..8aaad65c3bb5 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c | |||
@@ -894,7 +894,7 @@ void guest_set_pte(struct lg_cpu *cpu, | |||
894 | * tells us they've changed. When the Guest tries to use the new entry it will | 894 | * tells us they've changed. When the Guest tries to use the new entry it will |
895 | * fault and demand_page() will fix it up. | 895 | * fault and demand_page() will fix it up. |
896 | * | 896 | * |
897 | * So with that in mind here's our code to to update a (top-level) PGD entry: | 897 | * So with that in mind here's our code to update a (top-level) PGD entry: |
898 | */ | 898 | */ |
899 | void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 idx) | 899 | void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 idx) |
900 | { | 900 | { |
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index a98ab72adf95..93fb32038b14 100644 --- a/drivers/macintosh/rack-meter.c +++ b/drivers/macintosh/rack-meter.c | |||
@@ -274,7 +274,7 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm) | |||
274 | 274 | ||
275 | if (cpu > 1) | 275 | if (cpu > 1) |
276 | continue; | 276 | continue; |
277 | rcpu = &rm->cpu[cpu];; | 277 | rcpu = &rm->cpu[cpu]; |
278 | rcpu->prev_idle = get_cpu_idle_time(cpu); | 278 | rcpu->prev_idle = get_cpu_idle_time(cpu); |
279 | rcpu->prev_wall = jiffies64_to_cputime64(get_jiffies_64()); | 279 | rcpu->prev_wall = jiffies64_to_cputime64(get_jiffies_64()); |
280 | schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer, | 280 | schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer, |
diff --git a/drivers/md/md.h b/drivers/md/md.h index f8fc188bc762..f55d2ff95133 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h | |||
@@ -201,7 +201,7 @@ struct mddev_s | |||
201 | * INTR: resync needs to be aborted for some reason | 201 | * INTR: resync needs to be aborted for some reason |
202 | * DONE: thread is done and is waiting to be reaped | 202 | * DONE: thread is done and is waiting to be reaped |
203 | * REQUEST: user-space has requested a sync (used with SYNC) | 203 | * REQUEST: user-space has requested a sync (used with SYNC) |
204 | * CHECK: user-space request for for check-only, no repair | 204 | * CHECK: user-space request for check-only, no repair |
205 | * RESHAPE: A reshape is happening | 205 | * RESHAPE: A reshape is happening |
206 | * | 206 | * |
207 | * If neither SYNC or RESHAPE are set, then it is a recovery. | 207 | * If neither SYNC or RESHAPE are set, then it is a recovery. |
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c index bd9ab9d0d12a..fa6a62369a78 100644 --- a/drivers/media/dvb/siano/smscoreapi.c +++ b/drivers/media/dvb/siano/smscoreapi.c | |||
@@ -1367,7 +1367,7 @@ int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level) | |||
1367 | &msg, sizeof(msg)); | 1367 | &msg, sizeof(msg)); |
1368 | } | 1368 | } |
1369 | 1369 | ||
1370 | /* new GPIO managment implementation */ | 1370 | /* new GPIO management implementation */ |
1371 | static int GetGpioPinParams(u32 PinNum, u32 *pTranslatedPinNum, | 1371 | static int GetGpioPinParams(u32 PinNum, u32 *pTranslatedPinNum, |
1372 | u32 *pGroupNum, u32 *pGroupCfg) { | 1372 | u32 *pGroupNum, u32 *pGroupCfg) { |
1373 | 1373 | ||
diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h index f1108c64e895..eec18aaf5512 100644 --- a/drivers/media/dvb/siano/smscoreapi.h +++ b/drivers/media/dvb/siano/smscoreapi.h | |||
@@ -657,12 +657,12 @@ struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev); | |||
657 | extern void smscore_putbuffer(struct smscore_device_t *coredev, | 657 | extern void smscore_putbuffer(struct smscore_device_t *coredev, |
658 | struct smscore_buffer_t *cb); | 658 | struct smscore_buffer_t *cb); |
659 | 659 | ||
660 | /* old GPIO managment */ | 660 | /* old GPIO management */ |
661 | int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin, | 661 | int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin, |
662 | struct smscore_config_gpio *pinconfig); | 662 | struct smscore_config_gpio *pinconfig); |
663 | int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level); | 663 | int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level); |
664 | 664 | ||
665 | /* new GPIO managment */ | 665 | /* new GPIO management */ |
666 | extern int smscore_gpio_configure(struct smscore_device_t *coredev, u8 PinNum, | 666 | extern int smscore_gpio_configure(struct smscore_device_t *coredev, u8 PinNum, |
667 | struct smscore_gpio_config *pGpioConfig); | 667 | struct smscore_gpio_config *pGpioConfig); |
668 | extern int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 PinNum, | 668 | extern int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 PinNum, |
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c index 575bf9d89419..a1239083472d 100644 --- a/drivers/media/radio/radio-mr800.c +++ b/drivers/media/radio/radio-mr800.c | |||
@@ -46,7 +46,7 @@ | |||
46 | * Version 0.11: Converted to v4l2_device. | 46 | * Version 0.11: Converted to v4l2_device. |
47 | * | 47 | * |
48 | * Many things to do: | 48 | * Many things to do: |
49 | * - Correct power managment of device (suspend & resume) | 49 | * - Correct power management of device (suspend & resume) |
50 | * - Add code for scanning and smooth tuning | 50 | * - Add code for scanning and smooth tuning |
51 | * - Add code for sensitivity value | 51 | * - Add code for sensitivity value |
52 | * - Correct mistakes | 52 | * - Correct mistakes |
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 356d6896da3f..fbdc1cde56a6 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -1371,7 +1371,7 @@ static struct cx8802_driver cx8802_blackbird_driver = { | |||
1371 | .advise_release = cx8802_blackbird_advise_release, | 1371 | .advise_release = cx8802_blackbird_advise_release, |
1372 | }; | 1372 | }; |
1373 | 1373 | ||
1374 | static int blackbird_init(void) | 1374 | static int __init blackbird_init(void) |
1375 | { | 1375 | { |
1376 | printk(KERN_INFO "cx2388x blackbird driver version %d.%d.%d loaded\n", | 1376 | printk(KERN_INFO "cx2388x blackbird driver version %d.%d.%d loaded\n", |
1377 | (CX88_VERSION_CODE >> 16) & 0xff, | 1377 | (CX88_VERSION_CODE >> 16) & 0xff, |
@@ -1384,7 +1384,7 @@ static int blackbird_init(void) | |||
1384 | return cx8802_register_driver(&cx8802_blackbird_driver); | 1384 | return cx8802_register_driver(&cx8802_blackbird_driver); |
1385 | } | 1385 | } |
1386 | 1386 | ||
1387 | static void blackbird_fini(void) | 1387 | static void __exit blackbird_fini(void) |
1388 | { | 1388 | { |
1389 | cx8802_unregister_driver(&cx8802_blackbird_driver); | 1389 | cx8802_unregister_driver(&cx8802_blackbird_driver); |
1390 | } | 1390 | } |
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index 6e5d142b5b00..518bcfe18bcb 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
@@ -1350,7 +1350,7 @@ static struct cx8802_driver cx8802_dvb_driver = { | |||
1350 | .advise_release = cx8802_dvb_advise_release, | 1350 | .advise_release = cx8802_dvb_advise_release, |
1351 | }; | 1351 | }; |
1352 | 1352 | ||
1353 | static int dvb_init(void) | 1353 | static int __init dvb_init(void) |
1354 | { | 1354 | { |
1355 | printk(KERN_INFO "cx88/2: cx2388x dvb driver version %d.%d.%d loaded\n", | 1355 | printk(KERN_INFO "cx88/2: cx2388x dvb driver version %d.%d.%d loaded\n", |
1356 | (CX88_VERSION_CODE >> 16) & 0xff, | 1356 | (CX88_VERSION_CODE >> 16) & 0xff, |
@@ -1363,7 +1363,7 @@ static int dvb_init(void) | |||
1363 | return cx8802_register_driver(&cx8802_dvb_driver); | 1363 | return cx8802_register_driver(&cx8802_dvb_driver); |
1364 | } | 1364 | } |
1365 | 1365 | ||
1366 | static void dvb_fini(void) | 1366 | static void __exit dvb_fini(void) |
1367 | { | 1367 | { |
1368 | cx8802_unregister_driver(&cx8802_dvb_driver); | 1368 | cx8802_unregister_driver(&cx8802_dvb_driver); |
1369 | } | 1369 | } |
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c index 7172dcf2a4fa..de9ff0fc741f 100644 --- a/drivers/media/video/cx88/cx88-mpeg.c +++ b/drivers/media/video/cx88/cx88-mpeg.c | |||
@@ -870,7 +870,7 @@ static struct pci_driver cx8802_pci_driver = { | |||
870 | .remove = __devexit_p(cx8802_remove), | 870 | .remove = __devexit_p(cx8802_remove), |
871 | }; | 871 | }; |
872 | 872 | ||
873 | static int cx8802_init(void) | 873 | static int __init cx8802_init(void) |
874 | { | 874 | { |
875 | printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %d.%d.%d loaded\n", | 875 | printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %d.%d.%d loaded\n", |
876 | (CX88_VERSION_CODE >> 16) & 0xff, | 876 | (CX88_VERSION_CODE >> 16) & 0xff, |
@@ -883,7 +883,7 @@ static int cx8802_init(void) | |||
883 | return pci_register_driver(&cx8802_pci_driver); | 883 | return pci_register_driver(&cx8802_pci_driver); |
884 | } | 884 | } |
885 | 885 | ||
886 | static void cx8802_fini(void) | 886 | static void __exit cx8802_fini(void) |
887 | { | 887 | { |
888 | pci_unregister_driver(&cx8802_pci_driver); | 888 | pci_unregister_driver(&cx8802_pci_driver); |
889 | } | 889 | } |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 81d2b5dea18e..57e6b1241090 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -2113,7 +2113,7 @@ static struct pci_driver cx8800_pci_driver = { | |||
2113 | #endif | 2113 | #endif |
2114 | }; | 2114 | }; |
2115 | 2115 | ||
2116 | static int cx8800_init(void) | 2116 | static int __init cx8800_init(void) |
2117 | { | 2117 | { |
2118 | printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %d.%d.%d loaded\n", | 2118 | printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %d.%d.%d loaded\n", |
2119 | (CX88_VERSION_CODE >> 16) & 0xff, | 2119 | (CX88_VERSION_CODE >> 16) & 0xff, |
@@ -2126,7 +2126,7 @@ static int cx8800_init(void) | |||
2126 | return pci_register_driver(&cx8800_pci_driver); | 2126 | return pci_register_driver(&cx8800_pci_driver); |
2127 | } | 2127 | } |
2128 | 2128 | ||
2129 | static void cx8800_fini(void) | 2129 | static void __exit cx8800_fini(void) |
2130 | { | 2130 | { |
2131 | pci_unregister_driver(&cx8800_pci_driver); | 2131 | pci_unregister_driver(&cx8800_pci_driver); |
2132 | } | 2132 | } |
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c index 8a5bba16ff32..7f1e5415850b 100644 --- a/drivers/media/video/gspca/m5602/m5602_core.c +++ b/drivers/media/video/gspca/m5602/m5602_core.c | |||
@@ -56,7 +56,7 @@ int m5602_read_bridge(struct sd *sd, const u8 address, u8 *i2c_data) | |||
56 | return (err < 0) ? err : 0; | 56 | return (err < 0) ? err : 0; |
57 | } | 57 | } |
58 | 58 | ||
59 | /* Writes a byte to to the m5602 */ | 59 | /* Writes a byte to the m5602 */ |
60 | int m5602_write_bridge(struct sd *sd, const u8 address, const u8 i2c_data) | 60 | int m5602_write_bridge(struct sd *sd, const u8 address, const u8 i2c_data) |
61 | { | 61 | { |
62 | int err; | 62 | int err; |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 76fa2ee0b574..610e914abe6c 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -6821,7 +6821,7 @@ mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buffer, int *size, int len, int sh | |||
6821 | *size = y; | 6821 | *size = y; |
6822 | } | 6822 | } |
6823 | /** | 6823 | /** |
6824 | * mpt_set_taskmgmt_in_progress_flag - set flags associated with task managment | 6824 | * mpt_set_taskmgmt_in_progress_flag - set flags associated with task management |
6825 | * @ioc: Pointer to MPT_ADAPTER structure | 6825 | * @ioc: Pointer to MPT_ADAPTER structure |
6826 | * | 6826 | * |
6827 | * Returns 0 for SUCCESS or -1 if FAILED. | 6827 | * Returns 0 for SUCCESS or -1 if FAILED. |
@@ -6854,7 +6854,7 @@ mpt_set_taskmgmt_in_progress_flag(MPT_ADAPTER *ioc) | |||
6854 | EXPORT_SYMBOL(mpt_set_taskmgmt_in_progress_flag); | 6854 | EXPORT_SYMBOL(mpt_set_taskmgmt_in_progress_flag); |
6855 | 6855 | ||
6856 | /** | 6856 | /** |
6857 | * mpt_clear_taskmgmt_in_progress_flag - clear flags associated with task managment | 6857 | * mpt_clear_taskmgmt_in_progress_flag - clear flags associated with task management |
6858 | * @ioc: Pointer to MPT_ADAPTER structure | 6858 | * @ioc: Pointer to MPT_ADAPTER structure |
6859 | * | 6859 | * |
6860 | **/ | 6860 | **/ |
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index bc14bb1b0579..88671529c45d 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c | |||
@@ -512,7 +512,7 @@ static void mxcmci_cmd_done(struct mxcmci_host *host, unsigned int stat) | |||
512 | } | 512 | } |
513 | 513 | ||
514 | /* For the DMA case the DMA engine handles the data transfer | 514 | /* For the DMA case the DMA engine handles the data transfer |
515 | * automatically. For non DMA we have to to it ourselves. | 515 | * automatically. For non DMA we have to do it ourselves. |
516 | * Don't do it in interrupt context though. | 516 | * Don't do it in interrupt context though. |
517 | */ | 517 | */ |
518 | if (!mxcmci_use_dma(host) && host->data) | 518 | if (!mxcmci_use_dma(host) && host->data) |
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 10ed195c0c1c..eb495d83064f 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
@@ -776,13 +776,13 @@ static struct spi_driver m25p80_driver = { | |||
776 | }; | 776 | }; |
777 | 777 | ||
778 | 778 | ||
779 | static int m25p80_init(void) | 779 | static int __init m25p80_init(void) |
780 | { | 780 | { |
781 | return spi_register_driver(&m25p80_driver); | 781 | return spi_register_driver(&m25p80_driver); |
782 | } | 782 | } |
783 | 783 | ||
784 | 784 | ||
785 | static void m25p80_exit(void) | 785 | static void __exit m25p80_exit(void) |
786 | { | 786 | { |
787 | spi_unregister_driver(&m25p80_driver); | 787 | spi_unregister_driver(&m25p80_driver); |
788 | } | 788 | } |
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c index 00248e81ecd5..7d846e9173da 100644 --- a/drivers/mtd/devices/slram.c +++ b/drivers/mtd/devices/slram.c | |||
@@ -303,7 +303,7 @@ __setup("slram=", mtd_slram_setup); | |||
303 | 303 | ||
304 | #endif | 304 | #endif |
305 | 305 | ||
306 | static int init_slram(void) | 306 | static int __init init_slram(void) |
307 | { | 307 | { |
308 | char *devname; | 308 | char *devname; |
309 | int i; | 309 | int i; |
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c index a790c062af1f..e56d6b42f020 100644 --- a/drivers/mtd/ftl.c +++ b/drivers/mtd/ftl.c | |||
@@ -1099,7 +1099,7 @@ static struct mtd_blktrans_ops ftl_tr = { | |||
1099 | .owner = THIS_MODULE, | 1099 | .owner = THIS_MODULE, |
1100 | }; | 1100 | }; |
1101 | 1101 | ||
1102 | static int init_ftl(void) | 1102 | static int __init init_ftl(void) |
1103 | { | 1103 | { |
1104 | return register_mtd_blktrans(&ftl_tr); | 1104 | return register_mtd_blktrans(&ftl_tr); |
1105 | } | 1105 | } |
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c index d4fb9a3ab4df..1bdf0ee6d0b6 100644 --- a/drivers/mtd/maps/ixp2000.c +++ b/drivers/mtd/maps/ixp2000.c | |||
@@ -184,7 +184,7 @@ static int ixp2000_flash_probe(struct platform_device *dev) | |||
184 | info->map.bankwidth = 1; | 184 | info->map.bankwidth = 1; |
185 | 185 | ||
186 | /* | 186 | /* |
187 | * map_priv_2 is used to store a ptr to to the bank_setup routine | 187 | * map_priv_2 is used to store a ptr to the bank_setup routine |
188 | */ | 188 | */ |
189 | info->map.map_priv_2 = (unsigned long) ixp_data->bank_setup; | 189 | info->map.map_priv_2 = (unsigned long) ixp_data->bank_setup; |
190 | 190 | ||
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index 29acd06b1c39..1b4690bdfdb3 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c | |||
@@ -903,12 +903,12 @@ static struct pci_driver cafe_nand_pci_driver = { | |||
903 | .resume = cafe_nand_resume, | 903 | .resume = cafe_nand_resume, |
904 | }; | 904 | }; |
905 | 905 | ||
906 | static int cafe_nand_init(void) | 906 | static int __init cafe_nand_init(void) |
907 | { | 907 | { |
908 | return pci_register_driver(&cafe_nand_pci_driver); | 908 | return pci_register_driver(&cafe_nand_pci_driver); |
909 | } | 909 | } |
910 | 910 | ||
911 | static void cafe_nand_exit(void) | 911 | static void __exit cafe_nand_exit(void) |
912 | { | 912 | { |
913 | pci_unregister_driver(&cafe_nand_pci_driver); | 913 | pci_unregister_driver(&cafe_nand_pci_driver); |
914 | } | 914 | } |
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c index 10081e656a6f..826cacffcefc 100644 --- a/drivers/mtd/nand/cmx270_nand.c +++ b/drivers/mtd/nand/cmx270_nand.c | |||
@@ -147,7 +147,7 @@ static int cmx270_device_ready(struct mtd_info *mtd) | |||
147 | /* | 147 | /* |
148 | * Main initialization routine | 148 | * Main initialization routine |
149 | */ | 149 | */ |
150 | static int cmx270_init(void) | 150 | static int __init cmx270_init(void) |
151 | { | 151 | { |
152 | struct nand_chip *this; | 152 | struct nand_chip *this; |
153 | const char *part_type; | 153 | const char *part_type; |
@@ -261,7 +261,7 @@ module_init(cmx270_init); | |||
261 | /* | 261 | /* |
262 | * Clean up routine | 262 | * Clean up routine |
263 | */ | 263 | */ |
264 | static void cmx270_cleanup(void) | 264 | static void __exit cmx270_cleanup(void) |
265 | { | 265 | { |
266 | /* Release resources, unregister device */ | 266 | /* Release resources, unregister device */ |
267 | nand_release(cmx270_nand_mtd); | 267 | nand_release(cmx270_nand_mtd); |
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index e4d9ef0c965a..9f87c99189a9 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c | |||
@@ -1065,7 +1065,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to, | |||
1065 | } | 1065 | } |
1066 | 1066 | ||
1067 | /* | 1067 | /* |
1068 | * Now we have got to calculate how much data we have to to copy. In | 1068 | * Now we have got to calculate how much data we have to copy. In |
1069 | * case of a static volume it is fairly easy - the VID header contains | 1069 | * case of a static volume it is fairly easy - the VID header contains |
1070 | * the data size. In case of a dynamic volume it is more difficult - we | 1070 | * the data size. In case of a dynamic volume it is more difficult - we |
1071 | * have to read the contents, cut 0xFF bytes from the end and copy only | 1071 | * have to read the contents, cut 0xFF bytes from the end and copy only |
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index c290f51dd178..1af08178defd 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h | |||
@@ -570,7 +570,7 @@ void ubi_do_get_volume_info(struct ubi_device *ubi, struct ubi_volume *vol, | |||
570 | 570 | ||
571 | /* | 571 | /* |
572 | * ubi_rb_for_each_entry - walk an RB-tree. | 572 | * ubi_rb_for_each_entry - walk an RB-tree. |
573 | * @rb: a pointer to type 'struct rb_node' to to use as a loop counter | 573 | * @rb: a pointer to type 'struct rb_node' to use as a loop counter |
574 | * @pos: a pointer to RB-tree entry type to use as a loop counter | 574 | * @pos: a pointer to RB-tree entry type to use as a loop counter |
575 | * @root: RB-tree's root | 575 | * @root: RB-tree's root |
576 | * @member: the name of the 'struct rb_node' within the RB-tree entry | 576 | * @member: the name of the 'struct rb_node' within the RB-tree entry |
diff --git a/drivers/net/arcnet/arc-rawmode.c b/drivers/net/arcnet/arc-rawmode.c index 646dfc5f50c9..8ea9c7545c12 100644 --- a/drivers/net/arcnet/arc-rawmode.c +++ b/drivers/net/arcnet/arc-rawmode.c | |||
@@ -123,7 +123,6 @@ static void rx(struct net_device *dev, int bufnum, | |||
123 | BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); | 123 | BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); |
124 | 124 | ||
125 | skb->protocol = cpu_to_be16(ETH_P_ARCNET); | 125 | skb->protocol = cpu_to_be16(ETH_P_ARCNET); |
126 | ; | ||
127 | netif_rx(skb); | 126 | netif_rx(skb); |
128 | } | 127 | } |
129 | 128 | ||
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c index 083e21094b20..66bcbbb6babc 100644 --- a/drivers/net/arcnet/capmode.c +++ b/drivers/net/arcnet/capmode.c | |||
@@ -149,7 +149,6 @@ static void rx(struct net_device *dev, int bufnum, | |||
149 | BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); | 149 | BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); |
150 | 150 | ||
151 | skb->protocol = cpu_to_be16(ETH_P_ARCNET); | 151 | skb->protocol = cpu_to_be16(ETH_P_ARCNET); |
152 | ; | ||
153 | netif_rx(skb); | 152 | netif_rx(skb); |
154 | } | 153 | } |
155 | 154 | ||
diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x_reg.h index 0695be14cf91..aa76cbada5e2 100644 --- a/drivers/net/bnx2x_reg.h +++ b/drivers/net/bnx2x_reg.h | |||
@@ -3122,7 +3122,7 @@ | |||
3122 | The fields are:[4:0] - tail pointer; [10:5] - Link List size; 15:11] - | 3122 | The fields are:[4:0] - tail pointer; [10:5] - Link List size; 15:11] - |
3123 | header pointer. */ | 3123 | header pointer. */ |
3124 | #define TCM_REG_XX_TABLE 0x50240 | 3124 | #define TCM_REG_XX_TABLE 0x50240 |
3125 | /* [RW 4] Load value for for cfc ac credit cnt. */ | 3125 | /* [RW 4] Load value for cfc ac credit cnt. */ |
3126 | #define TM_REG_CFC_AC_CRDCNT_VAL 0x164208 | 3126 | #define TM_REG_CFC_AC_CRDCNT_VAL 0x164208 |
3127 | /* [RW 4] Load value for cfc cld credit cnt. */ | 3127 | /* [RW 4] Load value for cfc cld credit cnt. */ |
3128 | #define TM_REG_CFC_CLD_CRDCNT_VAL 0x164210 | 3128 | #define TM_REG_CFC_CLD_CRDCNT_VAL 0x164210 |
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index cea5cfe23b71..c3fa31c9f2a7 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c | |||
@@ -1987,7 +1987,7 @@ void bond_3ad_unbind_slave(struct slave *slave) | |||
1987 | // find new aggregator for the related port(s) | 1987 | // find new aggregator for the related port(s) |
1988 | new_aggregator = __get_first_agg(port); | 1988 | new_aggregator = __get_first_agg(port); |
1989 | for (; new_aggregator; new_aggregator = __get_next_agg(new_aggregator)) { | 1989 | for (; new_aggregator; new_aggregator = __get_next_agg(new_aggregator)) { |
1990 | // if the new aggregator is empty, or it connected to to our port only | 1990 | // if the new aggregator is empty, or it is connected to our port only |
1991 | if (!new_aggregator->lag_ports || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator)) { | 1991 | if (!new_aggregator->lag_ports || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator)) { |
1992 | break; | 1992 | break; |
1993 | } | 1993 | } |
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index cda6b397550d..45ac225a7aaa 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c | |||
@@ -3035,7 +3035,7 @@ s32 e1000_check_for_link(struct e1000_hw *hw) | |||
3035 | /* If TBI compatibility is was previously off, turn it on. For | 3035 | /* If TBI compatibility is was previously off, turn it on. For |
3036 | * compatibility with a TBI link partner, we will store bad | 3036 | * compatibility with a TBI link partner, we will store bad |
3037 | * packets. Some frames have an additional byte on the end and | 3037 | * packets. Some frames have an additional byte on the end and |
3038 | * will look like CRC errors to to the hardware. | 3038 | * will look like CRC errors to the hardware. |
3039 | */ | 3039 | */ |
3040 | if (!hw->tbi_compatibility_on) { | 3040 | if (!hw->tbi_compatibility_on) { |
3041 | hw->tbi_compatibility_on = true; | 3041 | hw->tbi_compatibility_on = true; |
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c index 2234118eedbb..6c144b525b47 100644 --- a/drivers/net/gianfar_ethtool.c +++ b/drivers/net/gianfar_ethtool.c | |||
@@ -293,7 +293,7 @@ static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals | |||
293 | rxtime = get_ictt_value(priv->rxic); | 293 | rxtime = get_ictt_value(priv->rxic); |
294 | rxcount = get_icft_value(priv->rxic); | 294 | rxcount = get_icft_value(priv->rxic); |
295 | txtime = get_ictt_value(priv->txic); | 295 | txtime = get_ictt_value(priv->txic); |
296 | txcount = get_icft_value(priv->txic);; | 296 | txcount = get_icft_value(priv->txic); |
297 | cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, rxtime); | 297 | cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, rxtime); |
298 | cvals->rx_max_coalesced_frames = rxcount; | 298 | cvals->rx_max_coalesced_frames = rxcount; |
299 | 299 | ||
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 1d7d7fef414f..89c82c5e63e4 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
@@ -2556,13 +2556,13 @@ static int __devinit emac_init_config(struct emac_instance *dev) | |||
2556 | if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0)) | 2556 | if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0)) |
2557 | dev->mdio_ph = 0; | 2557 | dev->mdio_ph = 0; |
2558 | if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0)) | 2558 | if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0)) |
2559 | dev->zmii_ph = 0;; | 2559 | dev->zmii_ph = 0; |
2560 | if (emac_read_uint_prop(np, "zmii-channel", &dev->zmii_port, 0)) | 2560 | if (emac_read_uint_prop(np, "zmii-channel", &dev->zmii_port, 0)) |
2561 | dev->zmii_port = 0xffffffff;; | 2561 | dev->zmii_port = 0xffffffff; |
2562 | if (emac_read_uint_prop(np, "rgmii-device", &dev->rgmii_ph, 0)) | 2562 | if (emac_read_uint_prop(np, "rgmii-device", &dev->rgmii_ph, 0)) |
2563 | dev->rgmii_ph = 0;; | 2563 | dev->rgmii_ph = 0; |
2564 | if (emac_read_uint_prop(np, "rgmii-channel", &dev->rgmii_port, 0)) | 2564 | if (emac_read_uint_prop(np, "rgmii-channel", &dev->rgmii_port, 0)) |
2565 | dev->rgmii_port = 0xffffffff;; | 2565 | dev->rgmii_port = 0xffffffff; |
2566 | if (emac_read_uint_prop(np, "fifo-entry-size", &dev->fifo_entry_size, 0)) | 2566 | if (emac_read_uint_prop(np, "fifo-entry-size", &dev->fifo_entry_size, 0)) |
2567 | dev->fifo_entry_size = 16; | 2567 | dev->fifo_entry_size = 16; |
2568 | if (emac_read_uint_prop(np, "mal-burst-size", &dev->mal_burst_size, 0)) | 2568 | if (emac_read_uint_prop(np, "mal-burst-size", &dev->mal_burst_size, 0)) |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index d2639c4a086d..5d6c1530a8c0 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -3966,7 +3966,7 @@ static int igb_set_vf_multicasts(struct igb_adapter *adapter, | |||
3966 | /* VFs are limited to using the MTA hash table for their multicast | 3966 | /* VFs are limited to using the MTA hash table for their multicast |
3967 | * addresses */ | 3967 | * addresses */ |
3968 | for (i = 0; i < n; i++) | 3968 | for (i = 0; i < n; i++) |
3969 | vf_data->vf_mc_hashes[i] = hash_list[i];; | 3969 | vf_data->vf_mc_hashes[i] = hash_list[i]; |
3970 | 3970 | ||
3971 | /* Flush and reset the mta with the new values */ | 3971 | /* Flush and reset the mta with the new values */ |
3972 | igb_set_rx_mode(adapter->netdev); | 3972 | igb_set_rx_mode(adapter->netdev); |
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index da8d0a0ca94f..f2a197fd47a5 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c | |||
@@ -865,7 +865,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match) | |||
865 | dcrs = dcr_resource_start(np, 0); | 865 | dcrs = dcr_resource_start(np, 0); |
866 | if (dcrs == 0) { | 866 | if (dcrs == 0) { |
867 | dev_err(&op->dev, "could not get DMA register address\n"); | 867 | dev_err(&op->dev, "could not get DMA register address\n"); |
868 | goto nodev;; | 868 | goto nodev; |
869 | } | 869 | } |
870 | lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0)); | 870 | lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0)); |
871 | dev_dbg(&op->dev, "DCR base: %x\n", dcrs); | 871 | dev_dbg(&op->dev, "DCR base: %x\n", dcrs); |
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index fb65b427c692..1d0d4d9ab623 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
@@ -241,7 +241,7 @@ static int macb_mii_init(struct macb *bp) | |||
241 | struct eth_platform_data *pdata; | 241 | struct eth_platform_data *pdata; |
242 | int err = -ENXIO, i; | 242 | int err = -ENXIO, i; |
243 | 243 | ||
244 | /* Enable managment port */ | 244 | /* Enable management port */ |
245 | macb_writel(bp, NCR, MACB_BIT(MPE)); | 245 | macb_writel(bp, NCR, MACB_BIT(MPE)); |
246 | 246 | ||
247 | bp->mii_bus = mdiobus_alloc(); | 247 | bp->mii_bus = mdiobus_alloc(); |
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c index bd0ac690d12c..aad3b370c562 100644 --- a/drivers/net/ni52.c +++ b/drivers/net/ni52.c | |||
@@ -615,10 +615,10 @@ static int init586(struct net_device *dev) | |||
615 | /* addr_len |!src_insert |pre-len |loopback */ | 615 | /* addr_len |!src_insert |pre-len |loopback */ |
616 | writeb(0x2e, &cfg_cmd->adr_len); | 616 | writeb(0x2e, &cfg_cmd->adr_len); |
617 | writeb(0x00, &cfg_cmd->priority); | 617 | writeb(0x00, &cfg_cmd->priority); |
618 | writeb(0x60, &cfg_cmd->ifs);; | 618 | writeb(0x60, &cfg_cmd->ifs); |
619 | writeb(0x00, &cfg_cmd->time_low); | 619 | writeb(0x00, &cfg_cmd->time_low); |
620 | writeb(0xf2, &cfg_cmd->time_high); | 620 | writeb(0xf2, &cfg_cmd->time_high); |
621 | writeb(0x00, &cfg_cmd->promisc);; | 621 | writeb(0x00, &cfg_cmd->promisc); |
622 | if (dev->flags & IFF_ALLMULTI) { | 622 | if (dev->flags & IFF_ALLMULTI) { |
623 | int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6; | 623 | int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6; |
624 | if (num_addrs > len) { | 624 | if (num_addrs > len) { |
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 220529257828..7783c5db81dc 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -2630,7 +2630,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring) | |||
2630 | FLAGS_LI; /* Load irq delay values */ | 2630 | FLAGS_LI; /* Load irq delay values */ |
2631 | if (rx_ring->lbq_len) { | 2631 | if (rx_ring->lbq_len) { |
2632 | cqicb->flags |= FLAGS_LL; /* Load lbq values */ | 2632 | cqicb->flags |= FLAGS_LL; /* Load lbq values */ |
2633 | tmp = (u64)rx_ring->lbq_base_dma;; | 2633 | tmp = (u64)rx_ring->lbq_base_dma; |
2634 | base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect; | 2634 | base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect; |
2635 | page_entries = 0; | 2635 | page_entries = 0; |
2636 | do { | 2636 | do { |
@@ -2654,7 +2654,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring) | |||
2654 | } | 2654 | } |
2655 | if (rx_ring->sbq_len) { | 2655 | if (rx_ring->sbq_len) { |
2656 | cqicb->flags |= FLAGS_LS; /* Load sbq values */ | 2656 | cqicb->flags |= FLAGS_LS; /* Load sbq values */ |
2657 | tmp = (u64)rx_ring->sbq_base_dma;; | 2657 | tmp = (u64)rx_ring->sbq_base_dma; |
2658 | base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect; | 2658 | base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect; |
2659 | page_entries = 0; | 2659 | page_entries = 0; |
2660 | do { | 2660 | do { |
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c index bc98e7f69ee9..ede937ee50c7 100644 --- a/drivers/net/rionet.c +++ b/drivers/net/rionet.c | |||
@@ -72,7 +72,7 @@ static int rionet_check = 0; | |||
72 | static int rionet_capable = 1; | 72 | static int rionet_capable = 1; |
73 | 73 | ||
74 | /* | 74 | /* |
75 | * This is a fast lookup table for for translating TX | 75 | * This is a fast lookup table for translating TX |
76 | * Ethernet packets into a destination RIO device. It | 76 | * Ethernet packets into a destination RIO device. It |
77 | * could be made into a hash table to save memory depending | 77 | * could be made into a hash table to save memory depending |
78 | * on system trade-offs. | 78 | * on system trade-offs. |
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c index f1df2ec8ad41..e6b33ee05ede 100644 --- a/drivers/net/skfp/pcmplc.c +++ b/drivers/net/skfp/pcmplc.c | |||
@@ -960,7 +960,7 @@ static void pcm_fsm(struct s_smc *smc, struct s_phy *phy, int cmd) | |||
960 | /*PC88b*/ | 960 | /*PC88b*/ |
961 | if (!phy->cf_join) { | 961 | if (!phy->cf_join) { |
962 | phy->cf_join = TRUE ; | 962 | phy->cf_join = TRUE ; |
963 | queue_event(smc,EVENT_CFM,CF_JOIN+np) ; ; | 963 | queue_event(smc,EVENT_CFM,CF_JOIN+np) ; |
964 | } | 964 | } |
965 | if (cmd == PC_JOIN) | 965 | if (cmd == PC_JOIN) |
966 | GO_STATE(PC8_ACTIVE) ; | 966 | GO_STATE(PC8_ACTIVE) ; |
diff --git a/drivers/net/skfp/pmf.c b/drivers/net/skfp/pmf.c index 79e665e0853d..a320fdb3727d 100644 --- a/drivers/net/skfp/pmf.c +++ b/drivers/net/skfp/pmf.c | |||
@@ -807,9 +807,9 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para, | |||
807 | mib_p->fddiPORTLerFlag ; | 807 | mib_p->fddiPORTLerFlag ; |
808 | sp->p4050_pad = 0 ; | 808 | sp->p4050_pad = 0 ; |
809 | sp->p4050_cutoff = | 809 | sp->p4050_cutoff = |
810 | mib_p->fddiPORTLer_Cutoff ; ; | 810 | mib_p->fddiPORTLer_Cutoff ; |
811 | sp->p4050_alarm = | 811 | sp->p4050_alarm = |
812 | mib_p->fddiPORTLer_Alarm ; ; | 812 | mib_p->fddiPORTLer_Alarm ; |
813 | sp->p4050_estimate = | 813 | sp->p4050_estimate = |
814 | mib_p->fddiPORTLer_Estimate ; | 814 | mib_p->fddiPORTLer_Estimate ; |
815 | sp->p4050_reject_ct = | 815 | sp->p4050_reject_ct = |
@@ -829,7 +829,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para, | |||
829 | sp->p4051_porttype = | 829 | sp->p4051_porttype = |
830 | mib_p->fddiPORTMy_Type ; | 830 | mib_p->fddiPORTMy_Type ; |
831 | sp->p4051_connectstate = | 831 | sp->p4051_connectstate = |
832 | mib_p->fddiPORTConnectState ; ; | 832 | mib_p->fddiPORTConnectState ; |
833 | sp->p4051_pc_neighbor = | 833 | sp->p4051_pc_neighbor = |
834 | mib_p->fddiPORTNeighborType ; | 834 | mib_p->fddiPORTNeighborType ; |
835 | sp->p4051_pc_withhold = | 835 | sp->p4051_pc_withhold = |
@@ -853,7 +853,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para, | |||
853 | struct smt_p_4053 *sp ; | 853 | struct smt_p_4053 *sp ; |
854 | sp = (struct smt_p_4053 *) to ; | 854 | sp = (struct smt_p_4053 *) to ; |
855 | sp->p4053_multiple = | 855 | sp->p4053_multiple = |
856 | mib_p->fddiPORTMultiple_P ; ; | 856 | mib_p->fddiPORTMultiple_P ; |
857 | sp->p4053_availablepaths = | 857 | sp->p4053_availablepaths = |
858 | mib_p->fddiPORTAvailablePaths ; | 858 | mib_p->fddiPORTAvailablePaths ; |
859 | sp->p4053_currentpath = | 859 | sp->p4053_currentpath = |
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 62e852e21ab2..55bad4081966 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
@@ -215,7 +215,7 @@ static void skge_wol_init(struct skge_port *skge) | |||
215 | if (skge->wol & WAKE_MAGIC) | 215 | if (skge->wol & WAKE_MAGIC) |
216 | ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT; | 216 | ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT; |
217 | else | 217 | else |
218 | ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;; | 218 | ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT; |
219 | 219 | ||
220 | ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT; | 220 | ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT; |
221 | skge_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl); | 221 | skge_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl); |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 4bb52e9cd371..15140f9f2e92 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -765,7 +765,7 @@ static void sky2_wol_init(struct sky2_port *sky2) | |||
765 | if (sky2->wol & WAKE_MAGIC) | 765 | if (sky2->wol & WAKE_MAGIC) |
766 | ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT; | 766 | ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT; |
767 | else | 767 | else |
768 | ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;; | 768 | ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT; |
769 | 769 | ||
770 | ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT; | 770 | ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT; |
771 | sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl); | 771 | sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl); |
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h index 62779a520ca1..3e94f0ce0900 100644 --- a/drivers/net/vxge/vxge-config.h +++ b/drivers/net/vxge/vxge-config.h | |||
@@ -1541,7 +1541,7 @@ void vxge_hw_ring_rxd_1b_info_get( | |||
1541 | rxd_info->l4_cksum_valid = | 1541 | rxd_info->l4_cksum_valid = |
1542 | (u32)VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET(rxdp->control_0); | 1542 | (u32)VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET(rxdp->control_0); |
1543 | rxd_info->l4_cksum = | 1543 | rxd_info->l4_cksum = |
1544 | (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);; | 1544 | (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0); |
1545 | rxd_info->frame = | 1545 | rxd_info->frame = |
1546 | (u32)VXGE_HW_RING_RXD_ETHER_ENCAP_GET(rxdp->control_0); | 1546 | (u32)VXGE_HW_RING_RXD_ETHER_ENCAP_GET(rxdp->control_0); |
1547 | rxd_info->proto = | 1547 | rxd_info->proto = |
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c index b378037a29b5..068d7a9d3e36 100644 --- a/drivers/net/vxge/vxge-main.c +++ b/drivers/net/vxge/vxge-main.c | |||
@@ -2350,7 +2350,7 @@ static int vxge_enable_msix(struct vxgedev *vdev) | |||
2350 | enum vxge_hw_status status; | 2350 | enum vxge_hw_status status; |
2351 | /* 0 - Tx, 1 - Rx */ | 2351 | /* 0 - Tx, 1 - Rx */ |
2352 | int tim_msix_id[4]; | 2352 | int tim_msix_id[4]; |
2353 | int alarm_msix_id = 0, msix_intr_vect = 0;; | 2353 | int alarm_msix_id = 0, msix_intr_vect = 0; |
2354 | vdev->intr_cnt = 0; | 2354 | vdev->intr_cnt = 0; |
2355 | 2355 | ||
2356 | /* allocate msix vectors */ | 2356 | /* allocate msix vectors */ |
diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h index debad07d9900..c63ea6afd96f 100644 --- a/drivers/net/wireless/ath/ath5k/reg.h +++ b/drivers/net/wireless/ath/ath5k/reg.h | |||
@@ -982,7 +982,7 @@ | |||
982 | #define AR5K_5414_CBCFG_BUF_DIS 0x10 /* Disable buffer */ | 982 | #define AR5K_5414_CBCFG_BUF_DIS 0x10 /* Disable buffer */ |
983 | 983 | ||
984 | /* | 984 | /* |
985 | * PCI-E Power managment configuration | 985 | * PCI-E Power management configuration |
986 | * and status register [5424+] | 986 | * and status register [5424+] |
987 | */ | 987 | */ |
988 | #define AR5K_PCIE_PM_CTL 0x4068 /* Register address */ | 988 | #define AR5K_PCIE_PM_CTL 0x4068 /* Register address */ |
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index a3b36b3a9d67..cce188837d10 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -3330,7 +3330,7 @@ static void atmel_smooth_qual(struct atmel_private *priv) | |||
3330 | priv->wstats.qual.updated &= ~IW_QUAL_QUAL_INVALID; | 3330 | priv->wstats.qual.updated &= ~IW_QUAL_QUAL_INVALID; |
3331 | } | 3331 | } |
3332 | 3332 | ||
3333 | /* deals with incoming managment frames. */ | 3333 | /* deals with incoming management frames. */ |
3334 | static void atmel_management_frame(struct atmel_private *priv, | 3334 | static void atmel_management_frame(struct atmel_private *priv, |
3335 | struct ieee80211_hdr *header, | 3335 | struct ieee80211_hdr *header, |
3336 | u16 frame_len, u8 rssi) | 3336 | u16 frame_len, u8 rssi) |
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c index 5e110a2328ae..4e79a9800134 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/drivers/net/wireless/zd1211rw/zd_chip.c | |||
@@ -368,7 +368,7 @@ error: | |||
368 | return r; | 368 | return r; |
369 | } | 369 | } |
370 | 370 | ||
371 | /* MAC address: if custom mac addresses are to to be used CR_MAC_ADDR_P1 and | 371 | /* MAC address: if custom mac addresses are to be used CR_MAC_ADDR_P1 and |
372 | * CR_MAC_ADDR_P2 must be overwritten | 372 | * CR_MAC_ADDR_P2 must be overwritten |
373 | */ | 373 | */ |
374 | int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr) | 374 | int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr) |
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index bd1ce8e2bc18..0587d53987fe 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c | |||
@@ -430,7 +430,7 @@ fail: | |||
430 | 430 | ||
431 | static int __exit omap_rtc_remove(struct platform_device *pdev) | 431 | static int __exit omap_rtc_remove(struct platform_device *pdev) |
432 | { | 432 | { |
433 | struct rtc_device *rtc = platform_get_drvdata(pdev);; | 433 | struct rtc_device *rtc = platform_get_drvdata(pdev); |
434 | 434 | ||
435 | device_init_wakeup(&pdev->dev, 0); | 435 | device_init_wakeup(&pdev->dev, 0); |
436 | 436 | ||
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index a1ce573648a2..bd9fe2e36dce 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c | |||
@@ -706,7 +706,7 @@ static int dasd_eckd_generate_uid(struct dasd_device *device, | |||
706 | sizeof(uid->serial) - 1); | 706 | sizeof(uid->serial) - 1); |
707 | EBCASC(uid->serial, sizeof(uid->serial) - 1); | 707 | EBCASC(uid->serial, sizeof(uid->serial) - 1); |
708 | uid->ssid = private->gneq->subsystemID; | 708 | uid->ssid = private->gneq->subsystemID; |
709 | uid->real_unit_addr = private->ned->unit_addr;; | 709 | uid->real_unit_addr = private->ned->unit_addr; |
710 | if (private->sneq) { | 710 | if (private->sneq) { |
711 | uid->type = private->sneq->sua_flags; | 711 | uid->type = private->sneq->sua_flags; |
712 | if (uid->type == UA_BASE_PAV_ALIAS) | 712 | if (uid->type == UA_BASE_PAV_ALIAS) |
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index a4b2c576144b..c84eadd3602a 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c | |||
@@ -2113,7 +2113,7 @@ static ssize_t remove_write (struct device_driver *drv, | |||
2113 | IUCV_DBF_TEXT(trace, 3, __func__); | 2113 | IUCV_DBF_TEXT(trace, 3, __func__); |
2114 | 2114 | ||
2115 | if (count >= IFNAMSIZ) | 2115 | if (count >= IFNAMSIZ) |
2116 | count = IFNAMSIZ - 1;; | 2116 | count = IFNAMSIZ - 1; |
2117 | 2117 | ||
2118 | for (i = 0, p = buf; i < count && *p; i++, p++) { | 2118 | for (i = 0, p = buf; i < count && *p; i++, p++) { |
2119 | if (*p == '\n' || *p == ' ') | 2119 | if (*p == '\n' || *p == ' ') |
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index 3ff726afafc6..0e1a34627a2e 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c | |||
@@ -102,7 +102,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt, | |||
102 | if (unlikely((status & ZFCP_STATUS_COMMON_ERP_FAILED) || | 102 | if (unlikely((status & ZFCP_STATUS_COMMON_ERP_FAILED) || |
103 | !(status & ZFCP_STATUS_COMMON_RUNNING))) { | 103 | !(status & ZFCP_STATUS_COMMON_RUNNING))) { |
104 | zfcp_scsi_command_fail(scpnt, DID_ERROR); | 104 | zfcp_scsi_command_fail(scpnt, DID_ERROR); |
105 | return 0;; | 105 | return 0; |
106 | } | 106 | } |
107 | 107 | ||
108 | ret = zfcp_fsf_send_fcp_command_task(unit, scpnt); | 108 | ret = zfcp_fsf_send_fcp_command_task(unit, scpnt); |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c index e6f2bb7365e6..8dfb59d58992 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_core.c +++ b/drivers/scsi/aic7xxx/aic7xxx_core.c | |||
@@ -5223,7 +5223,7 @@ ahc_chip_init(struct ahc_softc *ahc) | |||
5223 | 5223 | ||
5224 | /* | 5224 | /* |
5225 | * Setup the allowed SCSI Sequences based on operational mode. | 5225 | * Setup the allowed SCSI Sequences based on operational mode. |
5226 | * If we are a target, we'll enalbe select in operations once | 5226 | * If we are a target, we'll enable select in operations once |
5227 | * we've had a lun enabled. | 5227 | * we've had a lun enabled. |
5228 | */ | 5228 | */ |
5229 | scsiseq_template = ENSELO|ENAUTOATNO|ENAUTOATNP; | 5229 | scsiseq_template = ENSELO|ENAUTOATNO|ENAUTOATNP; |
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c index 906cef5cda86..41e1b0e7e2ef 100644 --- a/drivers/scsi/bnx2i/bnx2i_hwi.c +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c | |||
@@ -1340,7 +1340,7 @@ static int bnx2i_process_login_resp(struct iscsi_session *session, | |||
1340 | resp_hdr->opcode = login->op_code; | 1340 | resp_hdr->opcode = login->op_code; |
1341 | resp_hdr->flags = login->response_flags; | 1341 | resp_hdr->flags = login->response_flags; |
1342 | resp_hdr->max_version = login->version_max; | 1342 | resp_hdr->max_version = login->version_max; |
1343 | resp_hdr->active_version = login->version_active;; | 1343 | resp_hdr->active_version = login->version_active; |
1344 | resp_hdr->hlength = 0; | 1344 | resp_hdr->hlength = 0; |
1345 | 1345 | ||
1346 | hton24(resp_hdr->dlength, login->data_length); | 1346 | hton24(resp_hdr->dlength, login->data_length); |
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index 9df7ed38e1be..9a1bd9534d74 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c | |||
@@ -1207,7 +1207,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, | |||
1207 | vport->ct_flags &= ~FC_CT_RFF_ID; | 1207 | vport->ct_flags &= ~FC_CT_RFF_ID; |
1208 | CtReq->CommandResponse.bits.CmdRsp = | 1208 | CtReq->CommandResponse.bits.CmdRsp = |
1209 | be16_to_cpu(SLI_CTNS_RFF_ID); | 1209 | be16_to_cpu(SLI_CTNS_RFF_ID); |
1210 | CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);; | 1210 | CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID); |
1211 | CtReq->un.rff.fbits = FC4_FEATURE_INIT; | 1211 | CtReq->un.rff.fbits = FC4_FEATURE_INIT; |
1212 | CtReq->un.rff.type_code = FC_FCP_DATA; | 1212 | CtReq->un.rff.type_code = FC_FCP_DATA; |
1213 | cmpl = lpfc_cmpl_ct_cmd_rff_id; | 1213 | cmpl = lpfc_cmpl_ct_cmd_rff_id; |
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index 7dc3d1894b1a..a39addc3a596 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
@@ -718,7 +718,7 @@ megasas_build_dcdb(struct megasas_instance *instance, struct scsi_cmnd *scp, | |||
718 | * megasas_build_ldio - Prepares IOs to logical devices | 718 | * megasas_build_ldio - Prepares IOs to logical devices |
719 | * @instance: Adapter soft state | 719 | * @instance: Adapter soft state |
720 | * @scp: SCSI command | 720 | * @scp: SCSI command |
721 | * @cmd: Command to to be prepared | 721 | * @cmd: Command to be prepared |
722 | * | 722 | * |
723 | * Frames (and accompanying SGLs) for regular SCSI IOs use this function. | 723 | * Frames (and accompanying SGLs) for regular SCSI IOs use this function. |
724 | */ | 724 | */ |
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 40e3cafb3a9c..83c8b5e4fc8b 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
@@ -1422,7 +1422,7 @@ static void qla4xxx_slave_destroy(struct scsi_device *sdev) | |||
1422 | /** | 1422 | /** |
1423 | * qla4xxx_del_from_active_array - returns an active srb | 1423 | * qla4xxx_del_from_active_array - returns an active srb |
1424 | * @ha: Pointer to host adapter structure. | 1424 | * @ha: Pointer to host adapter structure. |
1425 | * @index: index into to the active_array | 1425 | * @index: index into the active_array |
1426 | * | 1426 | * |
1427 | * This routine removes and returns the srb at the specified index | 1427 | * This routine removes and returns the srb at the specified index |
1428 | **/ | 1428 | **/ |
@@ -1500,7 +1500,7 @@ static int qla4xxx_wait_for_hba_online(struct scsi_qla_host *ha) | |||
1500 | 1500 | ||
1501 | /** | 1501 | /** |
1502 | * qla4xxx_eh_wait_for_commands - wait for active cmds to finish. | 1502 | * qla4xxx_eh_wait_for_commands - wait for active cmds to finish. |
1503 | * @ha: pointer to to HBA | 1503 | * @ha: pointer to HBA |
1504 | * @t: target id | 1504 | * @t: target id |
1505 | * @l: lun id | 1505 | * @l: lun id |
1506 | * | 1506 | * |
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c index 8980a5640bd9..e75ba9b28898 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c | |||
@@ -213,7 +213,7 @@ static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t) | |||
213 | unsigned bits = ust->bits_per_word; | 213 | unsigned bits = ust->bits_per_word; |
214 | unsigned bytes; | 214 | unsigned bytes; |
215 | u16 val, w; | 215 | u16 val, w; |
216 | int status = 0;; | 216 | int status = 0; |
217 | 217 | ||
218 | if (!t->tx_buf && !t->rx_buf) | 218 | if (!t->tx_buf && !t->rx_buf) |
219 | return 0; | 219 | return 0; |
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index 3f3119d760db..6ba8aece90b5 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
@@ -388,7 +388,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev) | |||
388 | 388 | ||
389 | err_no_iores: | 389 | err_no_iores: |
390 | err_no_pdata: | 390 | err_no_pdata: |
391 | spi_master_put(hw->master);; | 391 | spi_master_put(hw->master); |
392 | 392 | ||
393 | err_nomem: | 393 | err_nomem: |
394 | return err; | 394 | return err; |
diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h index 3f498f6f3ff6..90fd40f24734 100644 --- a/drivers/staging/rt2860/rtmp.h +++ b/drivers/staging/rt2860/rtmp.h | |||
@@ -2060,7 +2060,7 @@ typedef struct _STA_ADMIN_CONFIG { | |||
2060 | BOOLEAN AdhocBGJoined; // Indicate Adhoc B/G Join. | 2060 | BOOLEAN AdhocBGJoined; // Indicate Adhoc B/G Join. |
2061 | BOOLEAN Adhoc20NJoined; // Indicate Adhoc 20MHz N Join. | 2061 | BOOLEAN Adhoc20NJoined; // Indicate Adhoc 20MHz N Join. |
2062 | #endif | 2062 | #endif |
2063 | // New for WPA, windows want us to to keep association information and | 2063 | // New for WPA, windows want us to keep association information and |
2064 | // Fixed IEs from last association response | 2064 | // Fixed IEs from last association response |
2065 | NDIS_802_11_ASSOCIATION_INFORMATION AssocInfo; | 2065 | NDIS_802_11_ASSOCIATION_INFORMATION AssocInfo; |
2066 | USHORT ReqVarIELen; // Length of next VIE include EID & Length | 2066 | USHORT ReqVarIELen; // Length of next VIE include EID & Length |
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index ba589d4ca8bc..8c64c018b676 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c | |||
@@ -506,8 +506,6 @@ static int wdm_open(struct inode *inode, struct file *file) | |||
506 | desc = usb_get_intfdata(intf); | 506 | desc = usb_get_intfdata(intf); |
507 | if (test_bit(WDM_DISCONNECTING, &desc->flags)) | 507 | if (test_bit(WDM_DISCONNECTING, &desc->flags)) |
508 | goto out; | 508 | goto out; |
509 | |||
510 | ; | ||
511 | file->private_data = desc; | 509 | file->private_data = desc; |
512 | 510 | ||
513 | rv = usb_autopm_get_interface(desc->intf); | 511 | rv = usb_autopm_get_interface(desc->intf); |
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index c2f1b7df918c..b5b83c43898a 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c | |||
@@ -242,7 +242,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd) | |||
242 | * System suspend currently expects to be able to suspend the entire | 242 | * System suspend currently expects to be able to suspend the entire |
243 | * device tree, device-at-a-time. If we failed selective suspend | 243 | * device tree, device-at-a-time. If we failed selective suspend |
244 | * reports, system suspend would fail; so the root hub code must claim | 244 | * reports, system suspend would fail; so the root hub code must claim |
245 | * success. That's lying to usbcore, and it matters for for runtime | 245 | * success. That's lying to usbcore, and it matters for runtime |
246 | * PM scenarios with selective suspend and remote wakeup... | 246 | * PM scenarios with selective suspend and remote wakeup... |
247 | */ | 247 | */ |
248 | if (ehci->no_selective_suspend && device_can_wakeup(&pdev->dev)) | 248 | if (ehci->no_selective_suspend && device_can_wakeup(&pdev->dev)) |
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 2bfff30f4704..48b9e889a18b 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
@@ -37,7 +37,7 @@ typedef __u16 __bitwise __hc16; | |||
37 | #define __hc16 __le16 | 37 | #define __hc16 __le16 |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | /* statistics can be kept for for tuning/monitoring */ | 40 | /* statistics can be kept for tuning/monitoring */ |
41 | struct ehci_stats { | 41 | struct ehci_stats { |
42 | /* irq usage */ | 42 | /* irq usage */ |
43 | unsigned long normal; | 43 | unsigned long normal; |
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c index c2d80f80448b..16fecb8ecc39 100644 --- a/drivers/usb/host/ohci-q.c +++ b/drivers/usb/host/ohci-q.c | |||
@@ -418,7 +418,7 @@ static struct ed *ed_get ( | |||
418 | is_out = !(ep->desc.bEndpointAddress & USB_DIR_IN); | 418 | is_out = !(ep->desc.bEndpointAddress & USB_DIR_IN); |
419 | 419 | ||
420 | /* FIXME usbcore changes dev->devnum before SET_ADDRESS | 420 | /* FIXME usbcore changes dev->devnum before SET_ADDRESS |
421 | * suceeds ... otherwise we wouldn't need "pipe". | 421 | * succeeds ... otherwise we wouldn't need "pipe". |
422 | */ | 422 | */ |
423 | info = usb_pipedevice (pipe); | 423 | info = usb_pipedevice (pipe); |
424 | ed->type = usb_pipetype(pipe); | 424 | ed->type = usb_pipetype(pipe); |
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index d31d32206ba3..ffe1625d4e1b 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
@@ -1150,7 +1150,7 @@ void xhci_dbg_cmd_ptrs(struct xhci_hcd *xhci); | |||
1150 | void xhci_dbg_ring_ptrs(struct xhci_hcd *xhci, struct xhci_ring *ring); | 1150 | void xhci_dbg_ring_ptrs(struct xhci_hcd *xhci, struct xhci_ring *ring); |
1151 | void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep); | 1151 | void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep); |
1152 | 1152 | ||
1153 | /* xHCI memory managment */ | 1153 | /* xHCI memory management */ |
1154 | void xhci_mem_cleanup(struct xhci_hcd *xhci); | 1154 | void xhci_mem_cleanup(struct xhci_hcd *xhci); |
1155 | int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags); | 1155 | int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags); |
1156 | void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id); | 1156 | void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id); |
diff --git a/drivers/usb/serial/cypress_m8.h b/drivers/usb/serial/cypress_m8.h index e772b01ac3ac..1fd360e04065 100644 --- a/drivers/usb/serial/cypress_m8.h +++ b/drivers/usb/serial/cypress_m8.h | |||
@@ -57,7 +57,7 @@ | |||
57 | #define UART_RI 0x10 /* ring indicator - modem - device to host */ | 57 | #define UART_RI 0x10 /* ring indicator - modem - device to host */ |
58 | #define UART_CD 0x40 /* carrier detect - modem - device to host */ | 58 | #define UART_CD 0x40 /* carrier detect - modem - device to host */ |
59 | #define CYP_ERROR 0x08 /* received from input report - device to host */ | 59 | #define CYP_ERROR 0x08 /* received from input report - device to host */ |
60 | /* Note - the below has nothing to to with the "feature report" reset */ | 60 | /* Note - the below has nothing to do with the "feature report" reset */ |
61 | #define CONTROL_RESET 0x08 /* sent with output report - host to device */ | 61 | #define CONTROL_RESET 0x08 /* sent with output report - host to device */ |
62 | 62 | ||
63 | /* End of RS-232 protocol definitions */ | 63 | /* End of RS-232 protocol definitions */ |
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index dc0f832657e6..b97960ac92f2 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
@@ -2540,7 +2540,7 @@ static int calc_baud_rate_divisor(int baudrate, int *divisor) | |||
2540 | 2540 | ||
2541 | /***************************************************************************** | 2541 | /***************************************************************************** |
2542 | * send_cmd_write_uart_register | 2542 | * send_cmd_write_uart_register |
2543 | * this function builds up a uart register message and sends to to the device. | 2543 | * this function builds up a uart register message and sends to the device. |
2544 | *****************************************************************************/ | 2544 | *****************************************************************************/ |
2545 | static int send_cmd_write_uart_register(struct edgeport_port *edge_port, | 2545 | static int send_cmd_write_uart_register(struct edgeport_port *edge_port, |
2546 | __u8 regNum, __u8 regValue) | 2546 | __u8 regNum, __u8 regValue) |
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c index a61673133d7d..f7373371b137 100644 --- a/drivers/usb/serial/kl5kusb105.c +++ b/drivers/usb/serial/kl5kusb105.c | |||
@@ -38,7 +38,7 @@ | |||
38 | * 0.3a - implemented pools of write URBs | 38 | * 0.3a - implemented pools of write URBs |
39 | * 0.3 - alpha version for public testing | 39 | * 0.3 - alpha version for public testing |
40 | * 0.2 - TIOCMGET works, so autopilot(1) can be used! | 40 | * 0.2 - TIOCMGET works, so autopilot(1) can be used! |
41 | * 0.1 - can be used to to pilot-xfer -p /dev/ttyUSB0 -l | 41 | * 0.1 - can be used to do pilot-xfer -p /dev/ttyUSB0 -l |
42 | * | 42 | * |
43 | * The driver skeleton is mainly based on mct_u232.c and various other | 43 | * The driver skeleton is mainly based on mct_u232.c and various other |
44 | * pieces of code shamelessly copied from the drivers/usb/serial/ directory. | 44 | * pieces of code shamelessly copied from the drivers/usb/serial/ directory. |
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c index 61e7c40b94fb..1e58220403d1 100644 --- a/drivers/usb/serial/spcp8x5.c +++ b/drivers/usb/serial/spcp8x5.c | |||
@@ -544,7 +544,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty, | |||
544 | } | 544 | } |
545 | 545 | ||
546 | /* Set Baud Rate */ | 546 | /* Set Baud Rate */ |
547 | baud = tty_get_baud_rate(tty);; | 547 | baud = tty_get_baud_rate(tty); |
548 | switch (baud) { | 548 | switch (baud) { |
549 | case 300: buf[0] = 0x00; break; | 549 | case 300: buf[0] = 0x00; break; |
550 | case 600: buf[0] = 0x01; break; | 550 | case 600: buf[0] = 0x01; break; |
diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h index 586d350cdb4d..d6bea3e0b54a 100644 --- a/drivers/usb/wusbcore/wa-hc.h +++ b/drivers/usb/wusbcore/wa-hc.h | |||
@@ -47,7 +47,7 @@ | |||
47 | * to an endpoint on a WUSB device that is connected to a | 47 | * to an endpoint on a WUSB device that is connected to a |
48 | * HWA RC. | 48 | * HWA RC. |
49 | * | 49 | * |
50 | * xfer Transfer managment -- this is all the code that gets a | 50 | * xfer Transfer management -- this is all the code that gets a |
51 | * buffer and pushes it to a device (or viceversa). * | 51 | * buffer and pushes it to a device (or viceversa). * |
52 | * | 52 | * |
53 | * Some day a lot of this code will be shared between this driver and | 53 | * Some day a lot of this code will be shared between this driver and |
diff --git a/drivers/uwb/i1480/i1480u-wlp/netdev.c b/drivers/uwb/i1480/i1480u-wlp/netdev.c index 73055530e60f..b236e6969942 100644 --- a/drivers/uwb/i1480/i1480u-wlp/netdev.c +++ b/drivers/uwb/i1480/i1480u-wlp/netdev.c | |||
@@ -214,7 +214,7 @@ int i1480u_open(struct net_device *net_dev) | |||
214 | 214 | ||
215 | netif_wake_queue(net_dev); | 215 | netif_wake_queue(net_dev); |
216 | #ifdef i1480u_FLOW_CONTROL | 216 | #ifdef i1480u_FLOW_CONTROL |
217 | result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL);; | 217 | result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL); |
218 | if (result < 0) { | 218 | if (result < 0) { |
219 | dev_err(dev, "Can't submit notification URB: %d\n", result); | 219 | dev_err(dev, "Can't submit notification URB: %d\n", result); |
220 | goto error_notif_urb_submit; | 220 | goto error_notif_urb_submit; |
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c index df03f3776dcc..79e5f40e6486 100644 --- a/drivers/video/cfbcopyarea.c +++ b/drivers/video/cfbcopyarea.c | |||
@@ -114,7 +114,7 @@ bitcpy(struct fb_info *p, unsigned long __iomem *dst, int dst_idx, | |||
114 | d0 >>= right; | 114 | d0 >>= right; |
115 | } else if (src_idx+n <= bits) { | 115 | } else if (src_idx+n <= bits) { |
116 | // Single source word | 116 | // Single source word |
117 | d0 <<= left;; | 117 | d0 <<= left; |
118 | } else { | 118 | } else { |
119 | // 2 source words | 119 | // 2 source words |
120 | d1 = FB_READL(src + 1); | 120 | d1 = FB_READL(src + 1); |
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index 30ae3022f633..66358fa825f3 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c | |||
@@ -710,7 +710,7 @@ static int __init imxfb_probe(struct platform_device *pdev) | |||
710 | 710 | ||
711 | fbi->clk = clk_get(&pdev->dev, NULL); | 711 | fbi->clk = clk_get(&pdev->dev, NULL); |
712 | if (IS_ERR(fbi->clk)) { | 712 | if (IS_ERR(fbi->clk)) { |
713 | ret = PTR_ERR(fbi->clk);; | 713 | ret = PTR_ERR(fbi->clk); |
714 | dev_err(&pdev->dev, "unable to get clock: %d\n", ret); | 714 | dev_err(&pdev->dev, "unable to get clock: %d\n", ret); |
715 | goto failed_getclock; | 715 | goto failed_getclock; |
716 | } | 716 | } |
diff --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c index 2486237ebba5..417ae5efa8bb 100644 --- a/drivers/video/omap/lcd_h3.c +++ b/drivers/video/omap/lcd_h3.c | |||
@@ -124,12 +124,12 @@ struct platform_driver h3_panel_driver = { | |||
124 | }, | 124 | }, |
125 | }; | 125 | }; |
126 | 126 | ||
127 | static int h3_panel_drv_init(void) | 127 | static int __init h3_panel_drv_init(void) |
128 | { | 128 | { |
129 | return platform_driver_register(&h3_panel_driver); | 129 | return platform_driver_register(&h3_panel_driver); |
130 | } | 130 | } |
131 | 131 | ||
132 | static void h3_panel_drv_cleanup(void) | 132 | static void __exit h3_panel_drv_cleanup(void) |
133 | { | 133 | { |
134 | platform_driver_unregister(&h3_panel_driver); | 134 | platform_driver_unregister(&h3_panel_driver); |
135 | } | 135 | } |
diff --git a/drivers/video/omap/lcd_h4.c b/drivers/video/omap/lcd_h4.c index 6ff56430341b..0c398bda7601 100644 --- a/drivers/video/omap/lcd_h4.c +++ b/drivers/video/omap/lcd_h4.c | |||
@@ -102,12 +102,12 @@ static struct platform_driver h4_panel_driver = { | |||
102 | }, | 102 | }, |
103 | }; | 103 | }; |
104 | 104 | ||
105 | static int h4_panel_drv_init(void) | 105 | static int __init h4_panel_drv_init(void) |
106 | { | 106 | { |
107 | return platform_driver_register(&h4_panel_driver); | 107 | return platform_driver_register(&h4_panel_driver); |
108 | } | 108 | } |
109 | 109 | ||
110 | static void h4_panel_drv_cleanup(void) | 110 | static void __exit h4_panel_drv_cleanup(void) |
111 | { | 111 | { |
112 | platform_driver_unregister(&h4_panel_driver); | 112 | platform_driver_unregister(&h4_panel_driver); |
113 | } | 113 | } |
diff --git a/drivers/video/omap/lcd_inn1510.c b/drivers/video/omap/lcd_inn1510.c index 6953ed4b5820..cdbd8bb607be 100644 --- a/drivers/video/omap/lcd_inn1510.c +++ b/drivers/video/omap/lcd_inn1510.c | |||
@@ -109,12 +109,12 @@ struct platform_driver innovator1510_panel_driver = { | |||
109 | }, | 109 | }, |
110 | }; | 110 | }; |
111 | 111 | ||
112 | static int innovator1510_panel_drv_init(void) | 112 | static int __init innovator1510_panel_drv_init(void) |
113 | { | 113 | { |
114 | return platform_driver_register(&innovator1510_panel_driver); | 114 | return platform_driver_register(&innovator1510_panel_driver); |
115 | } | 115 | } |
116 | 116 | ||
117 | static void innovator1510_panel_drv_cleanup(void) | 117 | static void __exit innovator1510_panel_drv_cleanup(void) |
118 | { | 118 | { |
119 | platform_driver_unregister(&innovator1510_panel_driver); | 119 | platform_driver_unregister(&innovator1510_panel_driver); |
120 | } | 120 | } |
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c index 4c4f7ee6d733..268f7f808a4e 100644 --- a/drivers/video/omap/lcd_inn1610.c +++ b/drivers/video/omap/lcd_inn1610.c | |||
@@ -133,12 +133,12 @@ struct platform_driver innovator1610_panel_driver = { | |||
133 | }, | 133 | }, |
134 | }; | 134 | }; |
135 | 135 | ||
136 | static int innovator1610_panel_drv_init(void) | 136 | static int __init innovator1610_panel_drv_init(void) |
137 | { | 137 | { |
138 | return platform_driver_register(&innovator1610_panel_driver); | 138 | return platform_driver_register(&innovator1610_panel_driver); |
139 | } | 139 | } |
140 | 140 | ||
141 | static void innovator1610_panel_drv_cleanup(void) | 141 | static void __exit innovator1610_panel_drv_cleanup(void) |
142 | { | 142 | { |
143 | platform_driver_unregister(&innovator1610_panel_driver); | 143 | platform_driver_unregister(&innovator1610_panel_driver); |
144 | } | 144 | } |
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c index 379c96d36da5..b3fa88bc6269 100644 --- a/drivers/video/omap/lcd_osk.c +++ b/drivers/video/omap/lcd_osk.c | |||
@@ -127,12 +127,12 @@ struct platform_driver osk_panel_driver = { | |||
127 | }, | 127 | }, |
128 | }; | 128 | }; |
129 | 129 | ||
130 | static int osk_panel_drv_init(void) | 130 | static int __init osk_panel_drv_init(void) |
131 | { | 131 | { |
132 | return platform_driver_register(&osk_panel_driver); | 132 | return platform_driver_register(&osk_panel_driver); |
133 | } | 133 | } |
134 | 134 | ||
135 | static void osk_panel_drv_cleanup(void) | 135 | static void __exit osk_panel_drv_cleanup(void) |
136 | { | 136 | { |
137 | platform_driver_unregister(&osk_panel_driver); | 137 | platform_driver_unregister(&osk_panel_driver); |
138 | } | 138 | } |
diff --git a/drivers/video/omap/lcd_palmte.c b/drivers/video/omap/lcd_palmte.c index 218317366e6e..4bf3c79f3cc7 100644 --- a/drivers/video/omap/lcd_palmte.c +++ b/drivers/video/omap/lcd_palmte.c | |||
@@ -108,12 +108,12 @@ struct platform_driver palmte_panel_driver = { | |||
108 | }, | 108 | }, |
109 | }; | 109 | }; |
110 | 110 | ||
111 | static int palmte_panel_drv_init(void) | 111 | static int __init palmte_panel_drv_init(void) |
112 | { | 112 | { |
113 | return platform_driver_register(&palmte_panel_driver); | 113 | return platform_driver_register(&palmte_panel_driver); |
114 | } | 114 | } |
115 | 115 | ||
116 | static void palmte_panel_drv_cleanup(void) | 116 | static void __exit palmte_panel_drv_cleanup(void) |
117 | { | 117 | { |
118 | platform_driver_unregister(&palmte_panel_driver); | 118 | platform_driver_unregister(&palmte_panel_driver); |
119 | } | 119 | } |
diff --git a/drivers/video/omap/lcd_palmtt.c b/drivers/video/omap/lcd_palmtt.c index 57b0f6cf6a5a..48ea1f9f2cbf 100644 --- a/drivers/video/omap/lcd_palmtt.c +++ b/drivers/video/omap/lcd_palmtt.c | |||
@@ -113,12 +113,12 @@ struct platform_driver palmtt_panel_driver = { | |||
113 | }, | 113 | }, |
114 | }; | 114 | }; |
115 | 115 | ||
116 | static int palmtt_panel_drv_init(void) | 116 | static int __init palmtt_panel_drv_init(void) |
117 | { | 117 | { |
118 | return platform_driver_register(&palmtt_panel_driver); | 118 | return platform_driver_register(&palmtt_panel_driver); |
119 | } | 119 | } |
120 | 120 | ||
121 | static void palmtt_panel_drv_cleanup(void) | 121 | static void __exit palmtt_panel_drv_cleanup(void) |
122 | { | 122 | { |
123 | platform_driver_unregister(&palmtt_panel_driver); | 123 | platform_driver_unregister(&palmtt_panel_driver); |
124 | } | 124 | } |
diff --git a/drivers/video/omap/lcd_palmz71.c b/drivers/video/omap/lcd_palmz71.c index d33d78b11723..0697d29b4d3b 100644 --- a/drivers/video/omap/lcd_palmz71.c +++ b/drivers/video/omap/lcd_palmz71.c | |||
@@ -109,12 +109,12 @@ struct platform_driver palmz71_panel_driver = { | |||
109 | }, | 109 | }, |
110 | }; | 110 | }; |
111 | 111 | ||
112 | static int palmz71_panel_drv_init(void) | 112 | static int __init palmz71_panel_drv_init(void) |
113 | { | 113 | { |
114 | return platform_driver_register(&palmz71_panel_driver); | 114 | return platform_driver_register(&palmz71_panel_driver); |
115 | } | 115 | } |
116 | 116 | ||
117 | static void palmz71_panel_drv_cleanup(void) | 117 | static void __exit palmz71_panel_drv_cleanup(void) |
118 | { | 118 | { |
119 | platform_driver_unregister(&palmz71_panel_driver); | 119 | platform_driver_unregister(&palmz71_panel_driver); |
120 | } | 120 | } |
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index 7da0027e2409..5ffca2adc6a8 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -1119,7 +1119,7 @@ int __init s3c2410fb_init(void) | |||
1119 | int ret = platform_driver_register(&s3c2410fb_driver); | 1119 | int ret = platform_driver_register(&s3c2410fb_driver); |
1120 | 1120 | ||
1121 | if (ret == 0) | 1121 | if (ret == 0) |
1122 | ret = platform_driver_register(&s3c2412fb_driver);; | 1122 | ret = platform_driver_register(&s3c2412fb_driver); |
1123 | 1123 | ||
1124 | return ret; | 1124 | return ret; |
1125 | } | 1125 | } |
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 1b7123eb5d7b..d31505b6f7a4 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c | |||
@@ -210,7 +210,7 @@ static int increase_reservation(unsigned long nr_pages) | |||
210 | page = balloon_first_page(); | 210 | page = balloon_first_page(); |
211 | for (i = 0; i < nr_pages; i++) { | 211 | for (i = 0; i < nr_pages; i++) { |
212 | BUG_ON(page == NULL); | 212 | BUG_ON(page == NULL); |
213 | frame_list[i] = page_to_pfn(page);; | 213 | frame_list[i] = page_to_pfn(page); |
214 | page = balloon_next_page(page); | 214 | page = balloon_next_page(page); |
215 | } | 215 | } |
216 | 216 | ||
diff --git a/fs/autofs/dirhash.c b/fs/autofs/dirhash.c index 2316e944a109..e947915109e5 100644 --- a/fs/autofs/dirhash.c +++ b/fs/autofs/dirhash.c | |||
@@ -90,7 +90,7 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb, | |||
90 | DPRINTK(("autofs: not expirable (not a mounted directory): %s\n", ent->name)); | 90 | DPRINTK(("autofs: not expirable (not a mounted directory): %s\n", ent->name)); |
91 | continue; | 91 | continue; |
92 | } | 92 | } |
93 | while (d_mountpoint(path.dentry) && follow_down(&path)); | 93 | while (d_mountpoint(path.dentry) && follow_down(&path)) |
94 | ; | 94 | ; |
95 | umount_ok = may_umount(path.mnt); | 95 | umount_ok = may_umount(path.mnt); |
96 | path_put(&path); | 96 | path_put(&path); |
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index d91b0de7c502..30c0d45c1b5e 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -2605,7 +2605,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, | |||
2605 | extent); | 2605 | extent); |
2606 | cs = btrfs_file_extent_offset(src, extent); | 2606 | cs = btrfs_file_extent_offset(src, extent); |
2607 | cl = btrfs_file_extent_num_bytes(src, | 2607 | cl = btrfs_file_extent_num_bytes(src, |
2608 | extent);; | 2608 | extent); |
2609 | if (btrfs_file_extent_compression(src, | 2609 | if (btrfs_file_extent_compression(src, |
2610 | extent)) { | 2610 | extent)) { |
2611 | cs = 0; | 2611 | cs = 0; |
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index 6889c0d07b82..fea9e898c4ba 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c | |||
@@ -142,7 +142,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata, | |||
142 | rc = dns_resolve_server_name_to_ip(*devname, &srvIP); | 142 | rc = dns_resolve_server_name_to_ip(*devname, &srvIP); |
143 | if (rc != 0) { | 143 | if (rc != 0) { |
144 | cERROR(1, ("%s: Failed to resolve server part of %s to IP: %d", | 144 | cERROR(1, ("%s: Failed to resolve server part of %s to IP: %d", |
145 | __func__, *devname, rc));; | 145 | __func__, *devname, rc)); |
146 | goto compose_mount_options_err; | 146 | goto compose_mount_options_err; |
147 | } | 147 | } |
148 | /* md_len = strlen(...) + 12 for 'sep+prefixpath=' | 148 | /* md_len = strlen(...) + 12 for 'sep+prefixpath=' |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 4abd683b963d..3a798737e305 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -2337,7 +2337,7 @@ static int __mpage_da_writepage(struct page *page, | |||
2337 | /* | 2337 | /* |
2338 | * Rest of the page in the page_vec | 2338 | * Rest of the page in the page_vec |
2339 | * redirty then and skip then. We will | 2339 | * redirty then and skip then. We will |
2340 | * try to to write them again after | 2340 | * try to write them again after |
2341 | * starting a new transaction | 2341 | * starting a new transaction |
2342 | */ | 2342 | */ |
2343 | redirty_page_for_writepage(wbc, page); | 2343 | redirty_page_for_writepage(wbc, page); |
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 28c590b7c9da..8f1cfb02a6cb 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
@@ -179,7 +179,7 @@ static inline u64 gfs2_bit_search(const __le64 *ptr, u64 mask, u8 state) | |||
179 | * always aligned to a 64 bit boundary. | 179 | * always aligned to a 64 bit boundary. |
180 | * | 180 | * |
181 | * The size of the buffer is in bytes, but is it assumed that it is | 181 | * The size of the buffer is in bytes, but is it assumed that it is |
182 | * always ok to to read a complete multiple of 64 bits at the end | 182 | * always ok to read a complete multiple of 64 bits at the end |
183 | * of the block in case the end is no aligned to a natural boundary. | 183 | * of the block in case the end is no aligned to a natural boundary. |
184 | * | 184 | * |
185 | * Return: the block number (bitmap buffer scope) that was found | 185 | * Return: the block number (bitmap buffer scope) that was found |
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index e5a2dac5f715..76b0aa0f73bf 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c | |||
@@ -222,7 +222,7 @@ static unsigned decode_sessionid(struct xdr_stream *xdr, | |||
222 | 222 | ||
223 | p = read_buf(xdr, len); | 223 | p = read_buf(xdr, len); |
224 | if (unlikely(p == NULL)) | 224 | if (unlikely(p == NULL)) |
225 | return htonl(NFS4ERR_RESOURCE);; | 225 | return htonl(NFS4ERR_RESOURCE); |
226 | 226 | ||
227 | memcpy(sid->data, p, len); | 227 | memcpy(sid->data, p, len); |
228 | return 0; | 228 | return 0; |
diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h index 50931b1ce4b9..8b2549f672bf 100644 --- a/fs/ntfs/layout.h +++ b/fs/ntfs/layout.h | |||
@@ -829,7 +829,7 @@ enum { | |||
829 | /* Note, FILE_ATTR_VALID_SET_FLAGS masks out the old DOS VolId, the | 829 | /* Note, FILE_ATTR_VALID_SET_FLAGS masks out the old DOS VolId, the |
830 | F_A_DEVICE, F_A_DIRECTORY, F_A_SPARSE_FILE, F_A_REPARSE_POINT, | 830 | F_A_DEVICE, F_A_DIRECTORY, F_A_SPARSE_FILE, F_A_REPARSE_POINT, |
831 | F_A_COMPRESSED, and F_A_ENCRYPTED and preserves the rest. This mask | 831 | F_A_COMPRESSED, and F_A_ENCRYPTED and preserves the rest. This mask |
832 | is used to to obtain all flags that are valid for setting. */ | 832 | is used to obtain all flags that are valid for setting. */ |
833 | /* | 833 | /* |
834 | * The flag FILE_ATTR_DUP_FILENAME_INDEX_PRESENT is present in all | 834 | * The flag FILE_ATTR_DUP_FILENAME_INDEX_PRESENT is present in all |
835 | * FILENAME_ATTR attributes but not in the STANDARD_INFORMATION | 835 | * FILENAME_ATTR attributes but not in the STANDARD_INFORMATION |
diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c index 3af4954d537b..3cf0ec0acdd5 100644 --- a/fs/ocfs2/quota_global.c +++ b/fs/ocfs2/quota_global.c | |||
@@ -154,7 +154,7 @@ static int ocfs2_get_quota_block(struct inode *inode, int block, | |||
154 | err = -EIO; | 154 | err = -EIO; |
155 | mlog_errno(err); | 155 | mlog_errno(err); |
156 | } | 156 | } |
157 | return err;; | 157 | return err; |
158 | } | 158 | } |
159 | 159 | ||
160 | /* Read data from global quotafile - avoid pagecache and such because we cannot | 160 | /* Read data from global quotafile - avoid pagecache and such because we cannot |
diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h index c4ea51b55dce..f52ac276277e 100644 --- a/fs/xfs/xfs_fs.h +++ b/fs/xfs/xfs_fs.h | |||
@@ -117,7 +117,7 @@ struct getbmapx { | |||
117 | #define BMV_IF_VALID \ | 117 | #define BMV_IF_VALID \ |
118 | (BMV_IF_ATTRFORK|BMV_IF_NO_DMAPI_READ|BMV_IF_PREALLOC|BMV_IF_DELALLOC) | 118 | (BMV_IF_ATTRFORK|BMV_IF_NO_DMAPI_READ|BMV_IF_PREALLOC|BMV_IF_DELALLOC) |
119 | 119 | ||
120 | /* bmv_oflags values - returned for for each non-header segment */ | 120 | /* bmv_oflags values - returned for each non-header segment */ |
121 | #define BMV_OF_PREALLOC 0x1 /* segment = unwritten pre-allocation */ | 121 | #define BMV_OF_PREALLOC 0x1 /* segment = unwritten pre-allocation */ |
122 | #define BMV_OF_DELALLOC 0x2 /* segment = delayed allocation */ | 122 | #define BMV_OF_DELALLOC 0x2 /* segment = delayed allocation */ |
123 | #define BMV_OF_LAST 0x4 /* segment is the last in the file */ | 123 | #define BMV_OF_LAST 0x4 /* segment is the last in the file */ |
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 37ba576d06e8..8052236d1a3d 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -288,7 +288,7 @@ typedef u32 acpi_physical_address; | |||
288 | /* | 288 | /* |
289 | * Some compilers complain about unused variables. Sometimes we don't want to | 289 | * Some compilers complain about unused variables. Sometimes we don't want to |
290 | * use all the variables (for example, _acpi_module_name). This allows us | 290 | * use all the variables (for example, _acpi_module_name). This allows us |
291 | * to to tell the compiler in a per-variable manner that a variable | 291 | * to tell the compiler in a per-variable manner that a variable |
292 | * is unused | 292 | * is unused |
293 | */ | 293 | */ |
294 | #ifndef ACPI_UNUSED_VAR | 294 | #ifndef ACPI_UNUSED_VAR |
diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h index 935c5d7fc86e..6aadbf84ae71 100644 --- a/include/acpi/platform/acgcc.h +++ b/include/acpi/platform/acgcc.h | |||
@@ -57,7 +57,7 @@ | |||
57 | /* | 57 | /* |
58 | * Some compilers complain about unused variables. Sometimes we don't want to | 58 | * Some compilers complain about unused variables. Sometimes we don't want to |
59 | * use all the variables (for example, _acpi_module_name). This allows us | 59 | * use all the variables (for example, _acpi_module_name). This allows us |
60 | * to to tell the compiler warning in a per-variable manner that a variable | 60 | * to tell the compiler warning in a per-variable manner that a variable |
61 | * is unused. | 61 | * is unused. |
62 | */ | 62 | */ |
63 | #define ACPI_UNUSED_VAR __attribute__ ((unused)) | 63 | #define ACPI_UNUSED_VAR __attribute__ ((unused)) |
diff --git a/include/linux/capability.h b/include/linux/capability.h index c3021105edc0..c8f2a5f70ed5 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * See here for the libcap library ("POSIX draft" compliance): | 8 | * See here for the libcap library ("POSIX draft" compliance): |
9 | * | 9 | * |
10 | * ftp://linux.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/ | 10 | * ftp://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/ |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #ifndef _LINUX_CAPABILITY_H | 13 | #ifndef _LINUX_CAPABILITY_H |
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h index 536ca12442ca..78c3bed1c3f5 100644 --- a/include/linux/mISDNif.h +++ b/include/linux/mISDNif.h | |||
@@ -104,7 +104,7 @@ | |||
104 | #define DL_UNITDATA_IND 0x3108 | 104 | #define DL_UNITDATA_IND 0x3108 |
105 | #define DL_INFORMATION_IND 0x0008 | 105 | #define DL_INFORMATION_IND 0x0008 |
106 | 106 | ||
107 | /* intern layer 2 managment */ | 107 | /* intern layer 2 management */ |
108 | #define MDL_ASSIGN_REQ 0x1804 | 108 | #define MDL_ASSIGN_REQ 0x1804 |
109 | #define MDL_ASSIGN_IND 0x1904 | 109 | #define MDL_ASSIGN_IND 0x1904 |
110 | #define MDL_REMOVE_REQ 0x1A04 | 110 | #define MDL_REMOVE_REQ 0x1A04 |
diff --git a/include/linux/namei.h b/include/linux/namei.h index d870ae2faedc..ec0f607b364a 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h | |||
@@ -40,7 +40,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND}; | |||
40 | * - follow links at the end | 40 | * - follow links at the end |
41 | * - require a directory | 41 | * - require a directory |
42 | * - ending slashes ok even for nonexistent files | 42 | * - ending slashes ok even for nonexistent files |
43 | * - internal "there are more path compnents" flag | 43 | * - internal "there are more path components" flag |
44 | * - locked when lookup done with dcache_lock held | 44 | * - locked when lookup done with dcache_lock held |
45 | * - dentry cache is untrusted; force a real lookup | 45 | * - dentry cache is untrusted; force a real lookup |
46 | */ | 46 | */ |
diff --git a/include/linux/usb.h b/include/linux/usb.h index a8fe05f224e5..19fabc487beb 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -1071,7 +1071,7 @@ typedef void (*usb_complete_t)(struct urb *); | |||
1071 | * @start_frame: Returns the initial frame for isochronous transfers. | 1071 | * @start_frame: Returns the initial frame for isochronous transfers. |
1072 | * @number_of_packets: Lists the number of ISO transfer buffers. | 1072 | * @number_of_packets: Lists the number of ISO transfer buffers. |
1073 | * @interval: Specifies the polling interval for interrupt or isochronous | 1073 | * @interval: Specifies the polling interval for interrupt or isochronous |
1074 | * transfers. The units are frames (milliseconds) for for full and low | 1074 | * transfers. The units are frames (milliseconds) for full and low |
1075 | * speed devices, and microframes (1/8 millisecond) for highspeed ones. | 1075 | * speed devices, and microframes (1/8 millisecond) for highspeed ones. |
1076 | * @error_count: Returns the number of ISO transfers that reported errors. | 1076 | * @error_count: Returns the number of ISO transfers that reported errors. |
1077 | * @context: For use in completion functions. This normally points to | 1077 | * @context: For use in completion functions. This normally points to |
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 6273fa97b527..7ef0c7b94f31 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h | |||
@@ -94,7 +94,7 @@ struct execute_work { | |||
94 | /* | 94 | /* |
95 | * initialize all of a work item in one go | 95 | * initialize all of a work item in one go |
96 | * | 96 | * |
97 | * NOTE! No point in using "atomic_long_set()": useing a direct | 97 | * NOTE! No point in using "atomic_long_set()": using a direct |
98 | * assignment of the work data initializer allows the compiler | 98 | * assignment of the work data initializer allows the compiler |
99 | * to generate better code. | 99 | * to generate better code. |
100 | */ | 100 | */ |
diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h index 938858304300..c8f94e8db69c 100644 --- a/include/rdma/ib_cm.h +++ b/include/rdma/ib_cm.h | |||
@@ -482,7 +482,7 @@ int ib_send_cm_rej(struct ib_cm_id *cm_id, | |||
482 | * message. | 482 | * message. |
483 | * @cm_id: Connection identifier associated with the connection message. | 483 | * @cm_id: Connection identifier associated with the connection message. |
484 | * @service_timeout: The lower 5-bits specify the maximum time required for | 484 | * @service_timeout: The lower 5-bits specify the maximum time required for |
485 | * the sender to reply to to the connection message. The upper 3-bits | 485 | * the sender to reply to the connection message. The upper 3-bits |
486 | * specify additional control flags. | 486 | * specify additional control flags. |
487 | * @private_data: Optional user-defined private data sent with the | 487 | * @private_data: Optional user-defined private data sent with the |
488 | * message receipt acknowledgement. | 488 | * message receipt acknowledgement. |
diff --git a/include/scsi/fc/fc_fc2.h b/include/scsi/fc/fc_fc2.h index cff8a8c22f50..f87777d0d5bd 100644 --- a/include/scsi/fc/fc_fc2.h +++ b/include/scsi/fc/fc_fc2.h | |||
@@ -92,8 +92,7 @@ struct fc_esb { | |||
92 | __u8 _esb_resvd[4]; | 92 | __u8 _esb_resvd[4]; |
93 | __u8 esb_service_params[112]; /* TBD */ | 93 | __u8 esb_service_params[112]; /* TBD */ |
94 | __u8 esb_seq_status[8]; /* sequence statuses, 8 bytes each */ | 94 | __u8 esb_seq_status[8]; /* sequence statuses, 8 bytes each */ |
95 | } __attribute__((packed));; | 95 | } __attribute__((packed)); |
96 | |||
97 | 96 | ||
98 | /* | 97 | /* |
99 | * Define expected size for ASSERTs. | 98 | * Define expected size for ASSERTs. |
diff --git a/kernel/panic.c b/kernel/panic.c index 512ab73b0ca3..bcdef26e3332 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
@@ -177,7 +177,7 @@ static const struct tnt tnts[] = { | |||
177 | * 'W' - Taint on warning. | 177 | * 'W' - Taint on warning. |
178 | * 'C' - modules from drivers/staging are loaded. | 178 | * 'C' - modules from drivers/staging are loaded. |
179 | * | 179 | * |
180 | * The string is overwritten by the next call to print_taint(). | 180 | * The string is overwritten by the next call to print_tainted(). |
181 | */ | 181 | */ |
182 | const char *print_tainted(void) | 182 | const char *print_tainted(void) |
183 | { | 183 | { |
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index e71634604400..b416512ad17f 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig | |||
@@ -83,7 +83,7 @@ config RING_BUFFER_ALLOW_SWAP | |||
83 | # This allows those options to appear when no other tracer is selected. But the | 83 | # This allows those options to appear when no other tracer is selected. But the |
84 | # options do not appear when something else selects it. We need the two options | 84 | # options do not appear when something else selects it. We need the two options |
85 | # GENERIC_TRACER and TRACING to avoid circular dependencies to accomplish the | 85 | # GENERIC_TRACER and TRACING to avoid circular dependencies to accomplish the |
86 | # hidding of the automatic options options. | 86 | # hidding of the automatic options. |
87 | 87 | ||
88 | config TRACING | 88 | config TRACING |
89 | bool | 89 | bool |
diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c index ca7d7c4d0c2a..23b63859130e 100644 --- a/kernel/trace/trace_hw_branches.c +++ b/kernel/trace/trace_hw_branches.c | |||
@@ -155,7 +155,7 @@ static enum print_line_t bts_trace_print_line(struct trace_iterator *iter) | |||
155 | seq_print_ip_sym(seq, it->from, symflags) && | 155 | seq_print_ip_sym(seq, it->from, symflags) && |
156 | trace_seq_printf(seq, "\n")) | 156 | trace_seq_printf(seq, "\n")) |
157 | return TRACE_TYPE_HANDLED; | 157 | return TRACE_TYPE_HANDLED; |
158 | return TRACE_TYPE_PARTIAL_LINE;; | 158 | return TRACE_TYPE_PARTIAL_LINE; |
159 | } | 159 | } |
160 | return TRACE_TYPE_UNHANDLED; | 160 | return TRACE_TYPE_UNHANDLED; |
161 | } | 161 | } |
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c index 9489a0a9b1be..cc89be5bc0f8 100644 --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c | |||
@@ -48,7 +48,7 @@ static struct hlist_head tracepoint_table[TRACEPOINT_TABLE_SIZE]; | |||
48 | 48 | ||
49 | /* | 49 | /* |
50 | * Note about RCU : | 50 | * Note about RCU : |
51 | * It is used to to delay the free of multiple probes array until a quiescent | 51 | * It is used to delay the free of multiple probes array until a quiescent |
52 | * state is reached. | 52 | * state is reached. |
53 | * Tracepoint entries modifications are protected by the tracepoints_mutex. | 53 | * Tracepoint entries modifications are protected by the tracepoints_mutex. |
54 | */ | 54 | */ |
diff --git a/lib/zlib_deflate/deflate.c b/lib/zlib_deflate/deflate.c index c3e4a2baf835..46a31e5f49c3 100644 --- a/lib/zlib_deflate/deflate.c +++ b/lib/zlib_deflate/deflate.c | |||
@@ -135,7 +135,7 @@ static const config configuration_table[10] = { | |||
135 | 135 | ||
136 | /* =========================================================================== | 136 | /* =========================================================================== |
137 | * Update a hash value with the given input byte | 137 | * Update a hash value with the given input byte |
138 | * IN assertion: all calls to to UPDATE_HASH are made with consecutive | 138 | * IN assertion: all calls to UPDATE_HASH are made with consecutive |
139 | * input characters, so that a running hash key can be computed from the | 139 | * input characters, so that a running hash key can be computed from the |
140 | * previous key instead of complete recalculation each time. | 140 | * previous key instead of complete recalculation each time. |
141 | */ | 141 | */ |
@@ -146,7 +146,7 @@ static const config configuration_table[10] = { | |||
146 | * Insert string str in the dictionary and set match_head to the previous head | 146 | * Insert string str in the dictionary and set match_head to the previous head |
147 | * of the hash chain (the most recent string with same hash key). Return | 147 | * of the hash chain (the most recent string with same hash key). Return |
148 | * the previous length of the hash chain. | 148 | * the previous length of the hash chain. |
149 | * IN assertion: all calls to to INSERT_STRING are made with consecutive | 149 | * IN assertion: all calls to INSERT_STRING are made with consecutive |
150 | * input characters and the first MIN_MATCH bytes of str are valid | 150 | * input characters and the first MIN_MATCH bytes of str are valid |
151 | * (except for the last MIN_MATCH-1 bytes of the input file). | 151 | * (except for the last MIN_MATCH-1 bytes of the input file). |
152 | */ | 152 | */ |
diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug index aa99fd1f7109..af7cfb43d2f0 100644 --- a/mm/Kconfig.debug +++ b/mm/Kconfig.debug | |||
@@ -6,7 +6,7 @@ config DEBUG_PAGEALLOC | |||
6 | ---help--- | 6 | ---help--- |
7 | Unmap pages from the kernel linear mapping after free_pages(). | 7 | Unmap pages from the kernel linear mapping after free_pages(). |
8 | This results in a large slowdown, but helps to find certain types | 8 | This results in a large slowdown, but helps to find certain types |
9 | of memory corruptions. | 9 | of memory corruption. |
10 | 10 | ||
11 | config WANT_PAGE_DEBUG_FLAGS | 11 | config WANT_PAGE_DEBUG_FLAGS |
12 | bool | 12 | bool |
@@ -17,11 +17,11 @@ config PAGE_POISONING | |||
17 | depends on !HIBERNATION | 17 | depends on !HIBERNATION |
18 | select DEBUG_PAGEALLOC | 18 | select DEBUG_PAGEALLOC |
19 | select WANT_PAGE_DEBUG_FLAGS | 19 | select WANT_PAGE_DEBUG_FLAGS |
20 | help | 20 | ---help--- |
21 | Fill the pages with poison patterns after free_pages() and verify | 21 | Fill the pages with poison patterns after free_pages() and verify |
22 | the patterns before alloc_pages(). This results in a large slowdown, | 22 | the patterns before alloc_pages(). This results in a large slowdown, |
23 | but helps to find certain types of memory corruptions. | 23 | but helps to find certain types of memory corruption. |
24 | 24 | ||
25 | This option cannot enalbe with hibernation. Otherwise, it will get | 25 | This option cannot be enabled in combination with hibernation as |
26 | wrong messages for memory corruption because the free pages are not | 26 | that would result in incorrect warnings of memory corruption after |
27 | saved to the suspend image. | 27 | a resume because free pages are not saved to the suspend image. |
diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c index d9231245a79a..bc0019f704fe 100644 --- a/net/rxrpc/ar-call.c +++ b/net/rxrpc/ar-call.c | |||
@@ -96,7 +96,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp) | |||
96 | } | 96 | } |
97 | 97 | ||
98 | /* | 98 | /* |
99 | * allocate a new client call and attempt to to get a connection slot for it | 99 | * allocate a new client call and attempt to get a connection slot for it |
100 | */ | 100 | */ |
101 | static struct rxrpc_call *rxrpc_alloc_client_call( | 101 | static struct rxrpc_call *rxrpc_alloc_client_call( |
102 | struct rxrpc_sock *rx, | 102 | struct rxrpc_sock *rx, |
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 375d64cb1a3d..2c5c76be18f8 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
@@ -77,7 +77,7 @@ | |||
77 | * The service curve parameters are converted to the internal | 77 | * The service curve parameters are converted to the internal |
78 | * representation. The slope values are scaled to avoid overflow. | 78 | * representation. The slope values are scaled to avoid overflow. |
79 | * the inverse slope values as well as the y-projection of the 1st | 79 | * the inverse slope values as well as the y-projection of the 1st |
80 | * segment are kept in order to to avoid 64-bit divide operations | 80 | * segment are kept in order to avoid 64-bit divide operations |
81 | * that are expensive on 32-bit architectures. | 81 | * that are expensive on 32-bit architectures. |
82 | */ | 82 | */ |
83 | 83 | ||
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 429dd06a4ecc..561a45cf2a6a 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c | |||
@@ -834,7 +834,7 @@ int cfg80211_wext_siwtxpower(struct net_device *dev, | |||
834 | return 0; | 834 | return 0; |
835 | } | 835 | } |
836 | 836 | ||
837 | return rdev->ops->set_tx_power(wdev->wiphy, type, dbm);; | 837 | return rdev->ops->set_tx_power(wdev->wiphy, type, dbm); |
838 | } | 838 | } |
839 | EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower); | 839 | EXPORT_SYMBOL_GPL(cfg80211_wext_siwtxpower); |
840 | 840 | ||
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 72c15205bb2b..8ab448611680 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c | |||
@@ -16,8 +16,7 @@ | |||
16 | * tells make when to remake a file. | 16 | * tells make when to remake a file. |
17 | * | 17 | * |
18 | * To use this list as-is however has the drawback that virtually | 18 | * To use this list as-is however has the drawback that virtually |
19 | * every file in the kernel includes <linux/config.h> which then again | 19 | * every file in the kernel includes <linux/autoconf.h>. |
20 | * includes <linux/autoconf.h> | ||
21 | * | 20 | * |
22 | * If the user re-runs make *config, linux/autoconf.h will be | 21 | * If the user re-runs make *config, linux/autoconf.h will be |
23 | * regenerated. make notices that and will rebuild every file which | 22 | * regenerated. make notices that and will rebuild every file which |
@@ -126,7 +125,6 @@ char *depfile; | |||
126 | char *cmdline; | 125 | char *cmdline; |
127 | 126 | ||
128 | void usage(void) | 127 | void usage(void) |
129 | |||
130 | { | 128 | { |
131 | fprintf(stderr, "Usage: fixdep <depfile> <target> <cmdline>\n"); | 129 | fprintf(stderr, "Usage: fixdep <depfile> <target> <cmdline>\n"); |
132 | exit(1); | 130 | exit(1); |
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c index aadc5223dcdb..ecf9c7dc1825 100644 --- a/scripts/mod/sumversion.c +++ b/scripts/mod/sumversion.c | |||
@@ -334,8 +334,6 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md) | |||
334 | deps_drivers/net/dummy.o := \ | 334 | deps_drivers/net/dummy.o := \ |
335 | drivers/net/dummy.c \ | 335 | drivers/net/dummy.c \ |
336 | $(wildcard include/config/net/fastroute.h) \ | 336 | $(wildcard include/config/net/fastroute.h) \ |
337 | include/linux/config.h \ | ||
338 | $(wildcard include/config/h.h) \ | ||
339 | include/linux/module.h \ | 337 | include/linux/module.h \ |
340 | 338 | ||
341 | Sum all files in the same dir or subdirs. | 339 | Sum all files in the same dir or subdirs. |
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c index 1edab7b4ea83..3136c88eacdf 100644 --- a/sound/oss/swarm_cs4297a.c +++ b/sound/oss/swarm_cs4297a.c | |||
@@ -110,9 +110,6 @@ static void start_adc(struct cs4297a_state *s); | |||
110 | // rather than 64k as some of the games work more responsively. | 110 | // rather than 64k as some of the games work more responsively. |
111 | // log base 2( buff sz = 32k). | 111 | // log base 2( buff sz = 32k). |
112 | 112 | ||
113 | //static unsigned long defaultorder = 3; | ||
114 | //MODULE_PARM(defaultorder, "i"); | ||
115 | |||
116 | // | 113 | // |
117 | // Turn on/off debugging compilation by commenting out "#define CSDEBUG" | 114 | // Turn on/off debugging compilation by commenting out "#define CSDEBUG" |
118 | // | 115 | // |
diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c index 107534477a2f..8db6aefe15e4 100644 --- a/sound/oss/sys_timer.c +++ b/sound/oss/sys_timer.c | |||
@@ -100,9 +100,6 @@ def_tmr_open(int dev, int mode) | |||
100 | curr_tempo = 60; | 100 | curr_tempo = 60; |
101 | curr_timebase = 100; | 101 | curr_timebase = 100; |
102 | opened = 1; | 102 | opened = 1; |
103 | |||
104 | ; | ||
105 | |||
106 | { | 103 | { |
107 | def_tmr.expires = (1) + jiffies; | 104 | def_tmr.expires = (1) + jiffies; |
108 | add_timer(&def_tmr); | 105 | add_timer(&def_tmr); |
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index c64e55aa63b6..686e5aa97206 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c | |||
@@ -1027,7 +1027,7 @@ static int wm9081_hw_params(struct snd_pcm_substream *substream, | |||
1027 | - wm9081->fs); | 1027 | - wm9081->fs); |
1028 | for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) { | 1028 | for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) { |
1029 | cur_val = abs((wm9081->sysclk_rate / | 1029 | cur_val = abs((wm9081->sysclk_rate / |
1030 | clk_sys_rates[i].ratio) - wm9081->fs);; | 1030 | clk_sys_rates[i].ratio) - wm9081->fs); |
1031 | if (cur_val < best_val) { | 1031 | if (cur_val < best_val) { |
1032 | best = i; | 1032 | best = i; |
1033 | best_val = cur_val; | 1033 | best_val = cur_val; |
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 5b9ed6464789..d11a6d7e384a 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c | |||
@@ -351,7 +351,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, | |||
351 | do_div(tmp, freq_out); | 351 | do_div(tmp, freq_out); |
352 | val = tmp; | 352 | val = tmp; |
353 | 353 | ||
354 | val = (val << 16) | 64;; | 354 | val = (val << 16) | 64; |
355 | ssp_write_reg(ssp, SSACDD, val); | 355 | ssp_write_reg(ssp, SSACDD, val); |
356 | 356 | ||
357 | ssacd |= (0x6 << 4); | 357 | ssacd |= (0x6 << 4); |
diff --git a/sound/soc/s3c24xx/s3c24xx_uda134x.c b/sound/soc/s3c24xx/s3c24xx_uda134x.c index 8e79a416db57..c215d32d6322 100644 --- a/sound/soc/s3c24xx/s3c24xx_uda134x.c +++ b/sound/soc/s3c24xx/s3c24xx_uda134x.c | |||
@@ -67,7 +67,7 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) | |||
67 | { | 67 | { |
68 | int ret = 0; | 68 | int ret = 0; |
69 | #ifdef ENFORCE_RATES | 69 | #ifdef ENFORCE_RATES |
70 | struct snd_pcm_runtime *runtime = substream->runtime;; | 70 | struct snd_pcm_runtime *runtime = substream->runtime; |
71 | #endif | 71 | #endif |
72 | 72 | ||
73 | mutex_lock(&clk_lock); | 73 | mutex_lock(&clk_lock); |