diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
commit | 008d23e4852d78bb2618f2035f8b2110b6a6b968 (patch) | |
tree | 81c88f744f6f3fc84132527c1ddc0b4da410c5e2 | |
parent | 8f685fbda43deccd130d192c9fcef1444649eaca (diff) | |
parent | bfc672dcf323877228682aff79dff8ecd9f30ff8 (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
Documentation/trace/events.txt: Remove obsolete sched_signal_send.
writeback: fix global_dirty_limits comment runtime -> real-time
ppc: fix comment typo singal -> signal
drivers: fix comment typo diable -> disable.
m68k: fix comment typo diable -> disable.
wireless: comment typo fix diable -> disable.
media: comment typo fix diable -> disable.
remove doc for obsolete dynamic-printk kernel-parameter
remove extraneous 'is' from Documentation/iostats.txt
Fix spelling milisec -> ms in snd_ps3 module parameter description
Fix spelling mistakes in comments
Revert conflicting V4L changes
i7core_edac: fix typos in comments
mm/rmap.c: fix comment
sound, ca0106: Fix assignment to 'channel'.
hrtimer: fix a typo in comment
init/Kconfig: fix typo
anon_inodes: fix wrong function name in comment
fix comment typos concerning "consistent"
poll: fix a typo in comment
...
Fix up trivial conflicts in:
- drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
- fs/ext4/ext4.h
Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
325 files changed, 440 insertions, 434 deletions
diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl index 020ac80d4682..620eb3f6a90a 100644 --- a/Documentation/DocBook/mtdnand.tmpl +++ b/Documentation/DocBook/mtdnand.tmpl | |||
@@ -250,7 +250,7 @@ static void board_hwcontrol(struct mtd_info *mtd, int cmd) | |||
250 | <title>Device ready function</title> | 250 | <title>Device ready function</title> |
251 | <para> | 251 | <para> |
252 | If the hardware interface has the ready busy pin of the NAND chip connected to a | 252 | If the hardware interface has the ready busy pin of the NAND chip connected to a |
253 | GPIO or other accesible I/O pin, this function is used to read back the state of the | 253 | GPIO or other accessible I/O pin, this function is used to read back the state of the |
254 | pin. The function has no arguments and should return 0, if the device is busy (R/B pin | 254 | pin. The function has no arguments and should return 0, if the device is busy (R/B pin |
255 | is low) and 1, if the device is ready (R/B pin is high). | 255 | is low) and 1, if the device is ready (R/B pin is high). |
256 | If the hardware interface does not give access to the ready busy pin, then | 256 | If the hardware interface does not give access to the ready busy pin, then |
diff --git a/Documentation/cgroups/cgroup_event_listener.c b/Documentation/cgroups/cgroup_event_listener.c index 8c2bfc4a6358..3e082f96dc12 100644 --- a/Documentation/cgroups/cgroup_event_listener.c +++ b/Documentation/cgroups/cgroup_event_listener.c | |||
@@ -91,7 +91,7 @@ int main(int argc, char **argv) | |||
91 | 91 | ||
92 | if (ret == -1) { | 92 | if (ret == -1) { |
93 | perror("cgroup.event_control " | 93 | perror("cgroup.event_control " |
94 | "is not accessable any more"); | 94 | "is not accessible any more"); |
95 | break; | 95 | break; |
96 | } | 96 | } |
97 | 97 | ||
diff --git a/Documentation/cgroups/memcg_test.txt b/Documentation/cgroups/memcg_test.txt index b7eececfb195..fc8fa97a09ac 100644 --- a/Documentation/cgroups/memcg_test.txt +++ b/Documentation/cgroups/memcg_test.txt | |||
@@ -398,7 +398,7 @@ Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y. | |||
398 | written to move_charge_at_immigrate. | 398 | written to move_charge_at_immigrate. |
399 | 399 | ||
400 | 9.10 Memory thresholds | 400 | 9.10 Memory thresholds |
401 | Memory controler implements memory thresholds using cgroups notification | 401 | Memory controller implements memory thresholds using cgroups notification |
402 | API. You can use Documentation/cgroups/cgroup_event_listener.c to test | 402 | API. You can use Documentation/cgroups/cgroup_event_listener.c to test |
403 | it. | 403 | it. |
404 | 404 | ||
diff --git a/Documentation/iostats.txt b/Documentation/iostats.txt index 59a69ec67c40..f6dece5b7014 100644 --- a/Documentation/iostats.txt +++ b/Documentation/iostats.txt | |||
@@ -81,7 +81,7 @@ Field 9 -- # of I/Os currently in progress | |||
81 | The only field that should go to zero. Incremented as requests are | 81 | The only field that should go to zero. Incremented as requests are |
82 | given to appropriate struct request_queue and decremented as they finish. | 82 | given to appropriate struct request_queue and decremented as they finish. |
83 | Field 10 -- # of milliseconds spent doing I/Os | 83 | Field 10 -- # of milliseconds spent doing I/Os |
84 | This field is increases so long as field 9 is nonzero. | 84 | This field increases so long as field 9 is nonzero. |
85 | Field 11 -- weighted # of milliseconds spent doing I/Os | 85 | Field 11 -- weighted # of milliseconds spent doing I/Os |
86 | This field is incremented at each I/O start, I/O completion, I/O | 86 | This field is incremented at each I/O start, I/O completion, I/O |
87 | merge, or read of these stats by the number of I/Os in progress | 87 | merge, or read of these stats by the number of I/Os in progress |
diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt index cab61d842259..7a9e0b4b2903 100644 --- a/Documentation/kdump/kdump.txt +++ b/Documentation/kdump/kdump.txt | |||
@@ -65,18 +65,21 @@ Install kexec-tools | |||
65 | 65 | ||
66 | 2) Download the kexec-tools user-space package from the following URL: | 66 | 2) Download the kexec-tools user-space package from the following URL: |
67 | 67 | ||
68 | http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools.tar.gz | 68 | http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools.tar.gz |
69 | 69 | ||
70 | This is a symlink to the latest version. | 70 | This is a symlink to the latest version. |
71 | 71 | ||
72 | The latest kexec-tools git tree is available at: | 72 | The latest kexec-tools git tree is available at: |
73 | 73 | ||
74 | git://git.kernel.org/pub/scm/linux/kernel/git/horms/kexec-tools.git | 74 | git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git |
75 | or | 75 | and |
76 | http://www.kernel.org/git/?p=linux/kernel/git/horms/kexec-tools.git | 76 | http://www.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git |
77 | |||
78 | There is also a gitweb interface available at | ||
79 | http://www.kernel.org/git/?p=utils/kernel/kexec/kexec-tools.git | ||
77 | 80 | ||
78 | More information about kexec-tools can be found at | 81 | More information about kexec-tools can be found at |
79 | http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/README.html | 82 | http://www.kernel.org/pub/linux/utils/kernel/kexec/README.html |
80 | 83 | ||
81 | 3) Unpack the tarball with the tar command, as follows: | 84 | 3) Unpack the tarball with the tar command, as follows: |
82 | 85 | ||
@@ -439,6 +442,6 @@ To Do | |||
439 | Contact | 442 | Contact |
440 | ======= | 443 | ======= |
441 | 444 | ||
442 | Vivek Goyal (vgoyal@in.ibm.com) | 445 | Vivek Goyal (vgoyal@redhat.com) |
443 | Maneesh Soni (maneesh@in.ibm.com) | 446 | Maneesh Soni (maneesh@in.ibm.com) |
444 | 447 | ||
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 5e4d9a65d550..338c96ea0855 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -659,11 +659,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
659 | 659 | ||
660 | dscc4.setup= [NET] | 660 | dscc4.setup= [NET] |
661 | 661 | ||
662 | dynamic_printk Enables pr_debug()/dev_dbg() calls if | ||
663 | CONFIG_DYNAMIC_PRINTK_DEBUG has been enabled. | ||
664 | These can also be switched on/off via | ||
665 | <debugfs>/dynamic_printk/modules | ||
666 | |||
667 | earlycon= [KNL] Output early console device and options. | 662 | earlycon= [KNL] Output early console device and options. |
668 | uart[8250],io,<addr>[,options] | 663 | uart[8250],io,<addr>[,options] |
669 | uart[8250],mmio,<addr>[,options] | 664 | uart[8250],mmio,<addr>[,options] |
diff --git a/Documentation/ko_KR/HOWTO b/Documentation/ko_KR/HOWTO index e3a55b6091e9..ab5189ae3428 100644 --- a/Documentation/ko_KR/HOWTO +++ b/Documentation/ko_KR/HOWTO | |||
@@ -391,8 +391,8 @@ bugme-new ë©”ì¼ë§ 리스트나(새로운 버그 리í¬íŠ¸ë“¤ë§Œì´ ì´ê³³ì—ì„ | |||
391 | bugme-janitor ë©”ì¼ë§ 리스트(bugzillaì— ëª¨ë“ ë³€í™”ë“¤ì´ ì—¬ê¸°ì„œ ë©”ì¼ë¡œ ì „í•´ì§„ë‹¤) | 391 | bugme-janitor ë©”ì¼ë§ 리스트(bugzillaì— ëª¨ë“ ë³€í™”ë“¤ì´ ì—¬ê¸°ì„œ ë©”ì¼ë¡œ ì „í•´ì§„ë‹¤) |
392 | ì— ë“±ë¡í•˜ë©´ ëœë‹¤. | 392 | ì— ë“±ë¡í•˜ë©´ ëœë‹¤. |
393 | 393 | ||
394 | http://lists.osdl.org/mailman/listinfo/bugme-new | 394 | https://lists.linux-foundation.org/mailman/listinfo/bugme-new |
395 | http://lists.osdl.org/mailman/listinfo/bugme-janitors | 395 | https://lists.linux-foundation.org/mailman/listinfo/bugme-janitors |
396 | 396 | ||
397 | 397 | ||
398 | 398 | ||
diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt index 741fe66d6eca..0cfb00fd86ff 100644 --- a/Documentation/kprobes.txt +++ b/Documentation/kprobes.txt | |||
@@ -598,7 +598,7 @@ a 5-byte jump instruction. So there are several limitations. | |||
598 | a) The instructions in DCR must be relocatable. | 598 | a) The instructions in DCR must be relocatable. |
599 | b) The instructions in DCR must not include a call instruction. | 599 | b) The instructions in DCR must not include a call instruction. |
600 | c) JTPR must not be targeted by any jump or call instruction. | 600 | c) JTPR must not be targeted by any jump or call instruction. |
601 | d) DCR must not straddle the border betweeen functions. | 601 | d) DCR must not straddle the border between functions. |
602 | 602 | ||
603 | Anyway, these limitations are checked by the in-kernel instruction | 603 | Anyway, these limitations are checked by the in-kernel instruction |
604 | decoder, so you don't need to worry about that. | 604 | decoder, so you don't need to worry about that. |
diff --git a/Documentation/kvm/api.txt b/Documentation/kvm/api.txt index b336266bea5e..50713e37c695 100644 --- a/Documentation/kvm/api.txt +++ b/Documentation/kvm/api.txt | |||
@@ -874,7 +874,7 @@ Possible values are: | |||
874 | - KVM_MP_STATE_HALTED: the vcpu has executed a HLT instruction and | 874 | - KVM_MP_STATE_HALTED: the vcpu has executed a HLT instruction and |
875 | is waiting for an interrupt | 875 | is waiting for an interrupt |
876 | - KVM_MP_STATE_SIPI_RECEIVED: the vcpu has just received a SIPI (vector | 876 | - KVM_MP_STATE_SIPI_RECEIVED: the vcpu has just received a SIPI (vector |
877 | accesible via KVM_GET_VCPU_EVENTS) | 877 | accessible via KVM_GET_VCPU_EVENTS) |
878 | 878 | ||
879 | This ioctl is only useful after KVM_CREATE_IRQCHIP. Without an in-kernel | 879 | This ioctl is only useful after KVM_CREATE_IRQCHIP. Without an in-kernel |
880 | irqchip, the multiprocessing state must be maintained by userspace. | 880 | irqchip, the multiprocessing state must be maintained by userspace. |
diff --git a/Documentation/lguest/lguest.txt b/Documentation/lguest/lguest.txt index efb3a6a045a2..6ccaf8e1a00e 100644 --- a/Documentation/lguest/lguest.txt +++ b/Documentation/lguest/lguest.txt | |||
@@ -111,8 +111,11 @@ Running Lguest: | |||
111 | 111 | ||
112 | Then use --tunnet=bridge:lg0 when launching the guest. | 112 | Then use --tunnet=bridge:lg0 when launching the guest. |
113 | 113 | ||
114 | See http://linux-net.osdl.org/index.php/Bridge for general information | 114 | See: |
115 | on how to get bridging working. | 115 | |
116 | http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge | ||
117 | |||
118 | for general information on how to get bridging to work. | ||
116 | 119 | ||
117 | There is a helpful mailing list at http://ozlabs.org/mailman/listinfo/lguest | 120 | There is a helpful mailing list at http://ozlabs.org/mailman/listinfo/lguest |
118 | 121 | ||
diff --git a/Documentation/networking/bridge.txt b/Documentation/networking/bridge.txt index bec69a8a1697..a7ba5e4e2c91 100644 --- a/Documentation/networking/bridge.txt +++ b/Documentation/networking/bridge.txt | |||
@@ -1,8 +1,8 @@ | |||
1 | In order to use the Ethernet bridging functionality, you'll need the | 1 | In order to use the Ethernet bridging functionality, you'll need the |
2 | userspace tools. These programs and documentation are available | 2 | userspace tools. These programs and documentation are available |
3 | at http://www.linux-foundation.org/en/Net:Bridge. The download page is | 3 | at http://www.linuxfoundation.org/en/Net:Bridge. The download page is |
4 | http://prdownloads.sourceforge.net/bridge. | 4 | http://prdownloads.sourceforge.net/bridge. |
5 | 5 | ||
6 | If you still have questions, don't hesitate to post to the mailing list | 6 | If you still have questions, don't hesitate to post to the mailing list |
7 | (more info http://lists.osdl.org/mailman/listinfo/bridge). | 7 | (more info https://lists.linux-foundation.org/mailman/listinfo/bridge). |
8 | 8 | ||
diff --git a/Documentation/networking/caif/spi_porting.txt b/Documentation/networking/caif/spi_porting.txt index 61d7c9247453..0cb8cb9098f4 100644 --- a/Documentation/networking/caif/spi_porting.txt +++ b/Documentation/networking/caif/spi_porting.txt | |||
@@ -32,7 +32,7 @@ the physical hardware, both with regard to SPI and to GPIOs. | |||
32 | This function is called by the CAIF SPI interface to give | 32 | This function is called by the CAIF SPI interface to give |
33 | you a chance to set up your hardware to be ready to receive | 33 | you a chance to set up your hardware to be ready to receive |
34 | a stream of data from the master. The xfer structure contains | 34 | a stream of data from the master. The xfer structure contains |
35 | both physical and logical adresses, as well as the total length | 35 | both physical and logical addresses, as well as the total length |
36 | of the transfer in both directions.The dev parameter can be used | 36 | of the transfer in both directions.The dev parameter can be used |
37 | to map to different CAIF SPI slave devices. | 37 | to map to different CAIF SPI slave devices. |
38 | 38 | ||
diff --git a/Documentation/networking/dccp.txt b/Documentation/networking/dccp.txt index 811872b45bee..d718bc2ff1cf 100644 --- a/Documentation/networking/dccp.txt +++ b/Documentation/networking/dccp.txt | |||
@@ -38,11 +38,11 @@ The Linux DCCP implementation does not currently support all the features that a | |||
38 | specified in RFCs 4340...42. | 38 | specified in RFCs 4340...42. |
39 | 39 | ||
40 | The known bugs are at: | 40 | The known bugs are at: |
41 | http://linux-net.osdl.org/index.php/TODO#DCCP | 41 | http://www.linuxfoundation.org/collaborate/workgroups/networking/todo#DCCP |
42 | 42 | ||
43 | For more up-to-date versions of the DCCP implementation, please consider using | 43 | For more up-to-date versions of the DCCP implementation, please consider using |
44 | the experimental DCCP test tree; instructions for checking this out are on: | 44 | the experimental DCCP test tree; instructions for checking this out are on: |
45 | http://linux-net.osdl.org/index.php/DCCP_Testing#Experimental_DCCP_source_tree | 45 | http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp_testing#Experimental_DCCP_source_tree |
46 | 46 | ||
47 | 47 | ||
48 | Socket options | 48 | Socket options |
diff --git a/Documentation/networking/generic_netlink.txt b/Documentation/networking/generic_netlink.txt index d4f8b8b9b53c..3e071115ca90 100644 --- a/Documentation/networking/generic_netlink.txt +++ b/Documentation/networking/generic_netlink.txt | |||
@@ -1,3 +1,3 @@ | |||
1 | A wiki document on how to use Generic Netlink can be found here: | 1 | A wiki document on how to use Generic Netlink can be found here: |
2 | 2 | ||
3 | * http://linux-net.osdl.org/index.php/Generic_Netlink_HOWTO | 3 | * http://www.linuxfoundation.org/collaborate/workgroups/networking/generic_netlink_howto |
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index 3272ed59dec7..7400d7555dc3 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
@@ -1098,7 +1098,7 @@ supported currently at the toplevel. | |||
1098 | * an arbitrary array of bytes | 1098 | * an arbitrary array of bytes |
1099 | */ | 1099 | */ |
1100 | 1100 | ||
1101 | childnode@addresss { /* define a child node named "childnode" | 1101 | childnode@address { /* define a child node named "childnode" |
1102 | * whose unit name is "childnode at | 1102 | * whose unit name is "childnode at |
1103 | * address" | 1103 | * address" |
1104 | */ | 1104 | */ |
diff --git a/Documentation/scheduler/00-INDEX b/Documentation/scheduler/00-INDEX index 3c00c9c3219e..d2651c47ae27 100644 --- a/Documentation/scheduler/00-INDEX +++ b/Documentation/scheduler/00-INDEX | |||
@@ -3,7 +3,7 @@ | |||
3 | sched-arch.txt | 3 | sched-arch.txt |
4 | - CPU Scheduler implementation hints for architecture specific code. | 4 | - CPU Scheduler implementation hints for architecture specific code. |
5 | sched-design-CFS.txt | 5 | sched-design-CFS.txt |
6 | - goals, design and implementation of the Complete Fair Scheduler. | 6 | - goals, design and implementation of the Completely Fair Scheduler. |
7 | sched-domains.txt | 7 | sched-domains.txt |
8 | - information on scheduling domains. | 8 | - information on scheduling domains. |
9 | sched-nice-design.txt | 9 | sched-nice-design.txt |
diff --git a/Documentation/scsi/ChangeLog.lpfc b/Documentation/scsi/ChangeLog.lpfc index 337c924cc81f..5e83769c6aa9 100644 --- a/Documentation/scsi/ChangeLog.lpfc +++ b/Documentation/scsi/ChangeLog.lpfc | |||
@@ -573,7 +573,7 @@ Changes from 20041018 to 20041123 | |||
573 | * Backround nodev_timeout processing to DPC This enables us to | 573 | * Backround nodev_timeout processing to DPC This enables us to |
574 | unblock (stop dev_loss_tmo) when appopriate. | 574 | unblock (stop dev_loss_tmo) when appopriate. |
575 | * Fix array discovery with multiple luns. The max_luns was 0 at | 575 | * Fix array discovery with multiple luns. The max_luns was 0 at |
576 | the time the host structure was intialized. lpfc_cfg_params | 576 | the time the host structure was initialized. lpfc_cfg_params |
577 | then set the max_luns to the correct value afterwards. | 577 | then set the max_luns to the correct value afterwards. |
578 | * Remove unused define LPFC_MAX_LUN and set the default value of | 578 | * Remove unused define LPFC_MAX_LUN and set the default value of |
579 | lpfc_max_lun parameter to 512. | 579 | lpfc_max_lun parameter to 512. |
diff --git a/Documentation/timers/timer_stats.txt b/Documentation/timers/timer_stats.txt index 9bd00fc2e823..8abd40b22b7f 100644 --- a/Documentation/timers/timer_stats.txt +++ b/Documentation/timers/timer_stats.txt | |||
@@ -19,7 +19,7 @@ Linux system over a sample period: | |||
19 | 19 | ||
20 | - the pid of the task(process) which initialized the timer | 20 | - the pid of the task(process) which initialized the timer |
21 | - the name of the process which initialized the timer | 21 | - the name of the process which initialized the timer |
22 | - the function where the timer was intialized | 22 | - the function where the timer was initialized |
23 | - the callback function which is associated to the timer | 23 | - the callback function which is associated to the timer |
24 | - the number of events (callbacks) | 24 | - the number of events (callbacks) |
25 | 25 | ||
diff --git a/Documentation/trace/events.txt b/Documentation/trace/events.txt index 09bd8e902989..b510564aac7e 100644 --- a/Documentation/trace/events.txt +++ b/Documentation/trace/events.txt | |||
@@ -125,7 +125,7 @@ is the size of the data item, in bytes. | |||
125 | For example, here's the information displayed for the 'sched_wakeup' | 125 | For example, here's the information displayed for the 'sched_wakeup' |
126 | event: | 126 | event: |
127 | 127 | ||
128 | # cat /debug/tracing/events/sched/sched_wakeup/format | 128 | # cat /sys/kernel/debug/tracing/events/sched/sched_wakeup/format |
129 | 129 | ||
130 | name: sched_wakeup | 130 | name: sched_wakeup |
131 | ID: 60 | 131 | ID: 60 |
@@ -201,19 +201,19 @@ to the 'filter' file for the given event. | |||
201 | 201 | ||
202 | For example: | 202 | For example: |
203 | 203 | ||
204 | # cd /debug/tracing/events/sched/sched_wakeup | 204 | # cd /sys/kernel/debug/tracing/events/sched/sched_wakeup |
205 | # echo "common_preempt_count > 4" > filter | 205 | # echo "common_preempt_count > 4" > filter |
206 | 206 | ||
207 | A slightly more involved example: | 207 | A slightly more involved example: |
208 | 208 | ||
209 | # cd /debug/tracing/events/sched/sched_signal_send | 209 | # cd /sys/kernel/debug/tracing/events/signal/signal_generate |
210 | # echo "((sig >= 10 && sig < 15) || sig == 17) && comm != bash" > filter | 210 | # echo "((sig >= 10 && sig < 15) || sig == 17) && comm != bash" > filter |
211 | 211 | ||
212 | If there is an error in the expression, you'll get an 'Invalid | 212 | If there is an error in the expression, you'll get an 'Invalid |
213 | argument' error when setting it, and the erroneous string along with | 213 | argument' error when setting it, and the erroneous string along with |
214 | an error message can be seen by looking at the filter e.g.: | 214 | an error message can be seen by looking at the filter e.g.: |
215 | 215 | ||
216 | # cd /debug/tracing/events/sched/sched_signal_send | 216 | # cd /sys/kernel/debug/tracing/events/signal/signal_generate |
217 | # echo "((sig >= 10 && sig < 15) || dsig == 17) && comm != bash" > filter | 217 | # echo "((sig >= 10 && sig < 15) || dsig == 17) && comm != bash" > filter |
218 | -bash: echo: write error: Invalid argument | 218 | -bash: echo: write error: Invalid argument |
219 | # cat filter | 219 | # cat filter |
diff --git a/Documentation/zh_CN/HOWTO b/Documentation/zh_CN/HOWTO index 69160779e432..faf976c0c731 100644 --- a/Documentation/zh_CN/HOWTO +++ b/Documentation/zh_CN/HOWTO | |||
@@ -347,8 +347,8 @@ bugzilla.kernel.org是Linuxå†…æ ¸å¼€å‘者们用æ¥è·Ÿè¸ªå†…æ ¸Bugçš„ç½‘ç«™ã€‚æˆ | |||
347 | 最新bug的通知,å¯ä»¥è®¢é˜…bugme-new邮件列表(åªæœ‰æ–°çš„bug报告会被寄到这里) | 347 | 最新bug的通知,å¯ä»¥è®¢é˜…bugme-new邮件列表(åªæœ‰æ–°çš„bug报告会被寄到这里) |
348 | 或者订阅bugme-janitor邮件列表(所有bugzillaçš„å˜åŠ¨éƒ½ä¼šè¢«å¯„到这里)。 | 348 | 或者订阅bugme-janitor邮件列表(所有bugzillaçš„å˜åŠ¨éƒ½ä¼šè¢«å¯„到这里)。 |
349 | 349 | ||
350 | http://lists.osdl.org/mailman/listinfo/bugme-new | 350 | https://lists.linux-foundation.org/mailman/listinfo/bugme-new |
351 | http://lists.osdl.org/mailman/listinfo/bugme-janitors | 351 | https://lists.linux-foundation.org/mailman/listinfo/bugme-janitors |
352 | 352 | ||
353 | 353 | ||
354 | 邮件列表 | 354 | 邮件列表 |
diff --git a/Documentation/zh_CN/SubmittingDrivers b/Documentation/zh_CN/SubmittingDrivers index c27b0f6cdd39..5889f8df6312 100644 --- a/Documentation/zh_CN/SubmittingDrivers +++ b/Documentation/zh_CN/SubmittingDrivers | |||
@@ -61,7 +61,7 @@ Linux 2.4: | |||
61 | Linux 2.6: | 61 | Linux 2.6: |
62 | 除了éµå¾ªå’Œ 2.4 ç‰ˆå†…æ ¸åŒæ ·çš„è§„åˆ™å¤–ï¼Œä½ è¿˜éœ€è¦åœ¨ linux-kernel 邮件 | 62 | 除了éµå¾ªå’Œ 2.4 ç‰ˆå†…æ ¸åŒæ ·çš„è§„åˆ™å¤–ï¼Œä½ è¿˜éœ€è¦åœ¨ linux-kernel 邮件 |
63 | 列表上跟踪最新的 API å˜åŒ–ã€‚å‘ Linux 2.6 å†…æ ¸æ交驱动的顶级è”系人 | 63 | 列表上跟踪最新的 API å˜åŒ–ã€‚å‘ Linux 2.6 å†…æ ¸æ交驱动的顶级è”系人 |
64 | 是 Andrew Morton <akpm@osdl.org>。 | 64 | 是 Andrew Morton <akpm@linux-foundation.org>。 |
65 | 65 | ||
66 | 决定设备驱动能å¦è¢«æŽ¥å—çš„æ¡ä»¶ | 66 | 决定设备驱动能å¦è¢«æŽ¥å—çš„æ¡ä»¶ |
67 | ---------------------------- | 67 | ---------------------------- |
diff --git a/MAINTAINERS b/MAINTAINERS index 5a9d67aec0e7..78162c4f9544 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2007,7 +2007,7 @@ F: drivers/scsi/dc395x.* | |||
2007 | DCCP PROTOCOL | 2007 | DCCP PROTOCOL |
2008 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2008 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> |
2009 | L: dccp@vger.kernel.org | 2009 | L: dccp@vger.kernel.org |
2010 | W: http://linux-net.osdl.org/index.php/DCCP | 2010 | W: http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp |
2011 | S: Maintained | 2011 | S: Maintained |
2012 | F: include/linux/dccp.h | 2012 | F: include/linux/dccp.h |
2013 | F: include/linux/tfrc.h | 2013 | F: include/linux/tfrc.h |
@@ -2429,7 +2429,7 @@ ETHERNET BRIDGE | |||
2429 | M: Stephen Hemminger <shemminger@linux-foundation.org> | 2429 | M: Stephen Hemminger <shemminger@linux-foundation.org> |
2430 | L: bridge@lists.linux-foundation.org | 2430 | L: bridge@lists.linux-foundation.org |
2431 | L: netdev@vger.kernel.org | 2431 | L: netdev@vger.kernel.org |
2432 | W: http://www.linux-foundation.org/en/Net:Bridge | 2432 | W: http://www.linuxfoundation.org/en/Net:Bridge |
2433 | S: Maintained | 2433 | S: Maintained |
2434 | F: include/linux/netfilter_bridge/ | 2434 | F: include/linux/netfilter_bridge/ |
2435 | F: net/bridge/ | 2435 | F: net/bridge/ |
@@ -4633,7 +4633,7 @@ M: Jeremy Fitzhardinge <jeremy@xensource.com> | |||
4633 | M: Chris Wright <chrisw@sous-sol.org> | 4633 | M: Chris Wright <chrisw@sous-sol.org> |
4634 | M: Alok Kataria <akataria@vmware.com> | 4634 | M: Alok Kataria <akataria@vmware.com> |
4635 | M: Rusty Russell <rusty@rustcorp.com.au> | 4635 | M: Rusty Russell <rusty@rustcorp.com.au> |
4636 | L: virtualization@lists.osdl.org | 4636 | L: virtualization@lists.linux-foundation.org |
4637 | S: Supported | 4637 | S: Supported |
4638 | F: Documentation/ia64/paravirt_ops.txt | 4638 | F: Documentation/ia64/paravirt_ops.txt |
4639 | F: arch/*/kernel/paravirt* | 4639 | F: arch/*/kernel/paravirt* |
@@ -6530,7 +6530,7 @@ F: include/linux/virtio_console.h | |||
6530 | VIRTIO HOST (VHOST) | 6530 | VIRTIO HOST (VHOST) |
6531 | M: "Michael S. Tsirkin" <mst@redhat.com> | 6531 | M: "Michael S. Tsirkin" <mst@redhat.com> |
6532 | L: kvm@vger.kernel.org | 6532 | L: kvm@vger.kernel.org |
6533 | L: virtualization@lists.osdl.org | 6533 | L: virtualization@lists.linux-foundation.org |
6534 | L: netdev@vger.kernel.org | 6534 | L: netdev@vger.kernel.org |
6535 | S: Maintained | 6535 | S: Maintained |
6536 | F: drivers/vhost/ | 6536 | F: drivers/vhost/ |
@@ -6800,7 +6800,7 @@ XEN HYPERVISOR INTERFACE | |||
6800 | M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 6800 | M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> |
6801 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 6801 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
6802 | L: xen-devel@lists.xensource.com (moderated for non-subscribers) | 6802 | L: xen-devel@lists.xensource.com (moderated for non-subscribers) |
6803 | L: virtualization@lists.osdl.org | 6803 | L: virtualization@lists.linux-foundation.org |
6804 | S: Supported | 6804 | S: Supported |
6805 | F: arch/x86/xen/ | 6805 | F: arch/x86/xen/ |
6806 | F: drivers/*/xen-*front.c | 6806 | F: drivers/*/xen-*front.c |
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c index 42ff90b46dfb..665ebf7e62a6 100644 --- a/arch/arm/common/it8152.c +++ b/arch/arm/common/it8152.c | |||
@@ -236,7 +236,7 @@ static struct resource it8152_mem = { | |||
236 | 236 | ||
237 | /* | 237 | /* |
238 | * The following functions are needed for DMA bouncing. | 238 | * The following functions are needed for DMA bouncing. |
239 | * ITE8152 chip can addrees up to 64MByte, so all the devices | 239 | * ITE8152 chip can address up to 64MByte, so all the devices |
240 | * connected to ITE8152 (PCI and USB) should have limited DMA window | 240 | * connected to ITE8152 (PCI and USB) should have limited DMA window |
241 | */ | 241 | */ |
242 | 242 | ||
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index ba65f6eedca6..cb660bc54d7a 100644 --- a/arch/arm/common/vic.c +++ b/arch/arm/common/vic.c | |||
@@ -70,7 +70,7 @@ static inline struct vic_device *to_vic(struct sys_device *sys) | |||
70 | * vic_init2 - common initialisation code | 70 | * vic_init2 - common initialisation code |
71 | * @base: Base of the VIC. | 71 | * @base: Base of the VIC. |
72 | * | 72 | * |
73 | * Common initialisation code for registeration | 73 | * Common initialisation code for registration |
74 | * and resume. | 74 | * and resume. |
75 | */ | 75 | */ |
76 | static void vic_init2(void __iomem *base) | 76 | static void vic_init2(void __iomem *base) |
diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c index 7b58c948a957..de2fd04e7c8a 100644 --- a/arch/arm/mach-at91/board-ecbat91.c +++ b/arch/arm/mach-at91/board-ecbat91.c | |||
@@ -128,17 +128,17 @@ static struct spi_board_info __initdata ecb_at91spi_devices[] = { | |||
128 | .platform_data = &my_flash0_platform, | 128 | .platform_data = &my_flash0_platform, |
129 | #endif | 129 | #endif |
130 | }, | 130 | }, |
131 | { /* User accessable spi - cs1 (250KHz) */ | 131 | { /* User accessible spi - cs1 (250KHz) */ |
132 | .modalias = "spi-cs1", | 132 | .modalias = "spi-cs1", |
133 | .chip_select = 1, | 133 | .chip_select = 1, |
134 | .max_speed_hz = 250 * 1000, | 134 | .max_speed_hz = 250 * 1000, |
135 | }, | 135 | }, |
136 | { /* User accessable spi - cs2 (1MHz) */ | 136 | { /* User accessible spi - cs2 (1MHz) */ |
137 | .modalias = "spi-cs2", | 137 | .modalias = "spi-cs2", |
138 | .chip_select = 2, | 138 | .chip_select = 2, |
139 | .max_speed_hz = 1 * 1000 * 1000, | 139 | .max_speed_hz = 1 * 1000 * 1000, |
140 | }, | 140 | }, |
141 | { /* User accessable spi - cs3 (10MHz) */ | 141 | { /* User accessible spi - cs3 (10MHz) */ |
142 | .modalias = "spi-cs3", | 142 | .modalias = "spi-cs3", |
143 | .chip_select = 3, | 143 | .chip_select = 3, |
144 | .max_speed_hz = 10 * 1000 * 1000, | 144 | .max_speed_hz = 10 * 1000 * 1000, |
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index dafbacc25eb1..ea53f4d9b283 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c | |||
@@ -301,7 +301,7 @@ static void at91_pm_end(void) | |||
301 | } | 301 | } |
302 | 302 | ||
303 | 303 | ||
304 | static struct platform_suspend_ops at91_pm_ops ={ | 304 | static const struct platform_suspend_ops at91_pm_ops = { |
305 | .valid = at91_pm_valid_state, | 305 | .valid = at91_pm_valid_state, |
306 | .begin = at91_pm_begin, | 306 | .begin = at91_pm_begin, |
307 | .enter = at91_pm_enter, | 307 | .enter = at91_pm_enter, |
diff --git a/arch/arm/mach-bcmring/csp/chipc/chipcHw.c b/arch/arm/mach-bcmring/csp/chipc/chipcHw.c index b3a61d860c65..96273ff34956 100644 --- a/arch/arm/mach-bcmring/csp/chipc/chipcHw.c +++ b/arch/arm/mach-bcmring/csp/chipc/chipcHw.c | |||
@@ -757,7 +757,7 @@ static int chipcHw_divide(int num, int denom) | |||
757 | t = t << 1; | 757 | t = t << 1; |
758 | } | 758 | } |
759 | 759 | ||
760 | /* Intialize the result */ | 760 | /* Initialize the result */ |
761 | r = 0; | 761 | r = 0; |
762 | 762 | ||
763 | do { | 763 | do { |
diff --git a/arch/arm/mach-bcmring/csp/dmac/dmacHw.c b/arch/arm/mach-bcmring/csp/dmac/dmacHw.c index 7b9bac2d79a5..6b9be2e98e51 100644 --- a/arch/arm/mach-bcmring/csp/dmac/dmacHw.c +++ b/arch/arm/mach-bcmring/csp/dmac/dmacHw.c | |||
@@ -893,7 +893,7 @@ int dmacHw_setDataDescriptor(dmacHw_CONFIG_t *pConfig, /* [ IN ] Configuration | |||
893 | */ | 893 | */ |
894 | /****************************************************************************/ | 894 | /****************************************************************************/ |
895 | uint32_t dmacHw_getDmaControllerAttribute(dmacHw_HANDLE_t handle, /* [ IN ] DMA Channel handle */ | 895 | uint32_t dmacHw_getDmaControllerAttribute(dmacHw_HANDLE_t handle, /* [ IN ] DMA Channel handle */ |
896 | dmacHw_CONTROLLER_ATTRIB_e attr /* [ IN ] DMA Controler attribute of type dmacHw_CONTROLLER_ATTRIB_e */ | 896 | dmacHw_CONTROLLER_ATTRIB_e attr /* [ IN ] DMA Controller attribute of type dmacHw_CONTROLLER_ATTRIB_e */ |
897 | ) { | 897 | ) { |
898 | dmacHw_CBLK_t *pCblk = dmacHw_HANDLE_TO_CBLK(handle); | 898 | dmacHw_CBLK_t *pCblk = dmacHw_HANDLE_TO_CBLK(handle); |
899 | 899 | ||
diff --git a/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c b/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c index ff7b436d0935..77f84b40dda9 100644 --- a/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c +++ b/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | |||
@@ -316,7 +316,7 @@ static void DisplayDescRing(void *pDescriptor, /* [ IN ] Descriptor buffer */ | |||
316 | /** | 316 | /** |
317 | * @brief Check if DMA channel is the flow controller | 317 | * @brief Check if DMA channel is the flow controller |
318 | * | 318 | * |
319 | * @return 1 : If DMA is a flow controler | 319 | * @return 1 : If DMA is a flow controller |
320 | * 0 : Peripheral is the flow controller | 320 | * 0 : Peripheral is the flow controller |
321 | * | 321 | * |
322 | * @note | 322 | * @note |
diff --git a/arch/arm/mach-bcmring/csp/tmr/tmrHw.c b/arch/arm/mach-bcmring/csp/tmr/tmrHw.c index 5c1c9a0e5ed2..16225e43f3c3 100644 --- a/arch/arm/mach-bcmring/csp/tmr/tmrHw.c +++ b/arch/arm/mach-bcmring/csp/tmr/tmrHw.c | |||
@@ -558,7 +558,7 @@ static int tmrHw_divide(int num, int denom) | |||
558 | t = t << 1; | 558 | t = t << 1; |
559 | } | 559 | } |
560 | 560 | ||
561 | /* Intialize the result */ | 561 | /* Initialize the result */ |
562 | r = 0; | 562 | r = 0; |
563 | 563 | ||
564 | do { | 564 | do { |
diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c index 77eb35c89cd0..8d1baf3f4683 100644 --- a/arch/arm/mach-bcmring/dma.c +++ b/arch/arm/mach-bcmring/dma.c | |||
@@ -671,7 +671,7 @@ static int ConfigChannel(DMA_Handle_t handle) | |||
671 | 671 | ||
672 | /****************************************************************************/ | 672 | /****************************************************************************/ |
673 | /** | 673 | /** |
674 | * Intializes all of the data structures associated with the DMA. | 674 | * Initializes all of the data structures associated with the DMA. |
675 | * @return | 675 | * @return |
676 | * >= 0 - Initialization was successfull. | 676 | * >= 0 - Initialization was successfull. |
677 | * | 677 | * |
diff --git a/arch/arm/mach-bcmring/include/csp/dmacHw.h b/arch/arm/mach-bcmring/include/csp/dmacHw.h index 5d510130a25f..6c8da2b9fc1f 100644 --- a/arch/arm/mach-bcmring/include/csp/dmacHw.h +++ b/arch/arm/mach-bcmring/include/csp/dmacHw.h | |||
@@ -590,7 +590,7 @@ void dmacHw_printDebugInfo(dmacHw_HANDLE_t handle, /* [ IN ] DMA Channel handle | |||
590 | */ | 590 | */ |
591 | /****************************************************************************/ | 591 | /****************************************************************************/ |
592 | uint32_t dmacHw_getDmaControllerAttribute(dmacHw_HANDLE_t handle, /* [ IN ] DMA Channel handle */ | 592 | uint32_t dmacHw_getDmaControllerAttribute(dmacHw_HANDLE_t handle, /* [ IN ] DMA Channel handle */ |
593 | dmacHw_CONTROLLER_ATTRIB_e attr /* [ IN ] DMA Controler attribute of type dmacHw_CONTROLLER_ATTRIB_e */ | 593 | dmacHw_CONTROLLER_ATTRIB_e attr /* [ IN ] DMA Controller attribute of type dmacHw_CONTROLLER_ATTRIB_e */ |
594 | ); | 594 | ); |
595 | 595 | ||
596 | #endif /* _DMACHW_H */ | 596 | #endif /* _DMACHW_H */ |
diff --git a/arch/arm/mach-bcmring/include/csp/tmrHw.h b/arch/arm/mach-bcmring/include/csp/tmrHw.h index f1236d00cb97..2cbb530db8ea 100644 --- a/arch/arm/mach-bcmring/include/csp/tmrHw.h +++ b/arch/arm/mach-bcmring/include/csp/tmrHw.h | |||
@@ -76,7 +76,7 @@ tmrHw_RATE_t tmrHw_setPeriodicTimerRate(tmrHw_ID_t timerId, /* [ IN ] Timer Id | |||
76 | * certain time interval | 76 | * certain time interval |
77 | * | 77 | * |
78 | * This function initializes a periodic timer to generate timer interrupt | 78 | * This function initializes a periodic timer to generate timer interrupt |
79 | * after every time interval in milisecond | 79 | * after every time interval in millisecond |
80 | * | 80 | * |
81 | * @return On success: Effective interval set in mili-second | 81 | * @return On success: Effective interval set in mili-second |
82 | * On failure: 0 | 82 | * On failure: 0 |
@@ -93,7 +93,7 @@ tmrHw_INTERVAL_t tmrHw_setPeriodicTimerInterval(tmrHw_ID_t timerId, /* [ IN ] T | |||
93 | * after certain time interval | 93 | * after certain time interval |
94 | * | 94 | * |
95 | * This function initializes a periodic timer to generate a single ticks after | 95 | * This function initializes a periodic timer to generate a single ticks after |
96 | * certain time interval in milisecond | 96 | * certain time interval in millisecond |
97 | * | 97 | * |
98 | * @return On success: Effective interval set in mili-second | 98 | * @return On success: Effective interval set in mili-second |
99 | * On failure: 0 | 99 | * On failure: 0 |
diff --git a/arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h b/arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h index cbf334d1c761..d67e2f8c22de 100644 --- a/arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h +++ b/arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | /* Data type for DMA Link List Item */ | 29 | /* Data type for DMA Link List Item */ |
30 | typedef struct { | 30 | typedef struct { |
31 | uint32_t sar; /* Source Adress Register. | 31 | uint32_t sar; /* Source Address Register. |
32 | Address must be aligned to CTLx.SRC_TR_WIDTH. */ | 32 | Address must be aligned to CTLx.SRC_TR_WIDTH. */ |
33 | uint32_t dar; /* Destination Address Register. | 33 | uint32_t dar; /* Destination Address Register. |
34 | Address must be aligned to CTLx.DST_TR_WIDTH. */ | 34 | Address must be aligned to CTLx.DST_TR_WIDTH. */ |
diff --git a/arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h b/arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h index 891cea87e333..f1ecf96f2da5 100644 --- a/arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h +++ b/arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | |||
@@ -35,7 +35,7 @@ typedef struct { | |||
35 | 35 | ||
36 | /* Data type representing DMA channel registers */ | 36 | /* Data type representing DMA channel registers */ |
37 | typedef struct { | 37 | typedef struct { |
38 | dmacHw_REG64_t ChannelSar; /* Source Adress Register. 64 bits (upper 32 bits are reserved) | 38 | dmacHw_REG64_t ChannelSar; /* Source Address Register. 64 bits (upper 32 bits are reserved) |
39 | Address must be aligned to CTLx.SRC_TR_WIDTH. | 39 | Address must be aligned to CTLx.SRC_TR_WIDTH. |
40 | */ | 40 | */ |
41 | dmacHw_REG64_t ChannelDar; /* Destination Address Register.64 bits (upper 32 bits are reserved) | 41 | dmacHw_REG64_t ChannelDar; /* Destination Address Register.64 bits (upper 32 bits are reserved) |
diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c index fab953b43dea..1bd73a04be20 100644 --- a/arch/arm/mach-davinci/pm.c +++ b/arch/arm/mach-davinci/pm.c | |||
@@ -110,7 +110,7 @@ static int davinci_pm_enter(suspend_state_t state) | |||
110 | return ret; | 110 | return ret; |
111 | } | 111 | } |
112 | 112 | ||
113 | static struct platform_suspend_ops davinci_pm_ops = { | 113 | static const struct platform_suspend_ops davinci_pm_ops = { |
114 | .enter = davinci_pm_enter, | 114 | .enter = davinci_pm_enter, |
115 | .valid = suspend_valid_only_mem, | 115 | .valid = suspend_valid_only_mem, |
116 | }; | 116 | }; |
diff --git a/arch/arm/mach-gemini/include/mach/hardware.h b/arch/arm/mach-gemini/include/mach/hardware.h index 213a4fcfeb1c..8c950e1d06be 100644 --- a/arch/arm/mach-gemini/include/mach/hardware.h +++ b/arch/arm/mach-gemini/include/mach/hardware.h | |||
@@ -33,7 +33,7 @@ | |||
33 | #define GEMINI_LPC_HOST_BASE 0x47000000 | 33 | #define GEMINI_LPC_HOST_BASE 0x47000000 |
34 | #define GEMINI_LPC_IO_BASE 0x47800000 | 34 | #define GEMINI_LPC_IO_BASE 0x47800000 |
35 | #define GEMINI_INTERRUPT_BASE 0x48000000 | 35 | #define GEMINI_INTERRUPT_BASE 0x48000000 |
36 | /* TODO: Different interrupt controlers when SMP | 36 | /* TODO: Different interrupt controllers when SMP |
37 | * #define GEMINI_INTERRUPT0_BASE 0x48000000 | 37 | * #define GEMINI_INTERRUPT0_BASE 0x48000000 |
38 | * #define GEMINI_INTERRUPT1_BASE 0x49000000 | 38 | * #define GEMINI_INTERRUPT1_BASE 0x49000000 |
39 | */ | 39 | */ |
diff --git a/arch/arm/mach-imx/pm-imx27.c b/arch/arm/mach-imx/pm-imx27.c index 6bf81ceea137..acf17691d2cc 100644 --- a/arch/arm/mach-imx/pm-imx27.c +++ b/arch/arm/mach-imx/pm-imx27.c | |||
@@ -32,7 +32,7 @@ static int mx27_suspend_enter(suspend_state_t state) | |||
32 | return 0; | 32 | return 0; |
33 | } | 33 | } |
34 | 34 | ||
35 | static struct platform_suspend_ops mx27_suspend_ops = { | 35 | static const struct platform_suspend_ops mx27_suspend_ops = { |
36 | .enter = mx27_suspend_enter, | 36 | .enter = mx27_suspend_enter, |
37 | .valid = suspend_valid_only_mem, | 37 | .valid = suspend_valid_only_mem, |
38 | }; | 38 | }; |
diff --git a/arch/arm/mach-lpc32xx/pm.c b/arch/arm/mach-lpc32xx/pm.c index a6e2aed9a49f..e76d41bb7056 100644 --- a/arch/arm/mach-lpc32xx/pm.c +++ b/arch/arm/mach-lpc32xx/pm.c | |||
@@ -123,7 +123,7 @@ static int lpc32xx_pm_enter(suspend_state_t state) | |||
123 | return 0; | 123 | return 0; |
124 | } | 124 | } |
125 | 125 | ||
126 | static struct platform_suspend_ops lpc32xx_pm_ops = { | 126 | static const struct platform_suspend_ops lpc32xx_pm_ops = { |
127 | .valid = suspend_valid_only_mem, | 127 | .valid = suspend_valid_only_mem, |
128 | .enter = lpc32xx_pm_enter, | 128 | .enter = lpc32xx_pm_enter, |
129 | }; | 129 | }; |
diff --git a/arch/arm/mach-msm/include/mach/entry-macro-qgic.S b/arch/arm/mach-msm/include/mach/entry-macro-qgic.S index 4dc99aa65d07..12467157afb9 100644 --- a/arch/arm/mach-msm/include/mach/entry-macro-qgic.S +++ b/arch/arm/mach-msm/include/mach/entry-macro-qgic.S | |||
@@ -26,7 +26,7 @@ | |||
26 | * The interrupt numbering scheme is defined in the | 26 | * The interrupt numbering scheme is defined in the |
27 | * interrupt controller spec. To wit: | 27 | * interrupt controller spec. To wit: |
28 | * | 28 | * |
29 | * Migrated the code from ARM MP port to be more consistant | 29 | * Migrated the code from ARM MP port to be more consistent |
30 | * with interrupt processing , the following still holds true | 30 | * with interrupt processing , the following still holds true |
31 | * however, all interrupts are treated the same regardless of | 31 | * however, all interrupts are treated the same regardless of |
32 | * if they are local IPI or PPI | 32 | * if they are local IPI or PPI |
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c index 800f327a7ecc..1260007a9dd1 100644 --- a/arch/arm/mach-msm/io.c +++ b/arch/arm/mach-msm/io.c | |||
@@ -154,7 +154,7 @@ __msm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype) | |||
154 | { | 154 | { |
155 | if (mtype == MT_DEVICE) { | 155 | if (mtype == MT_DEVICE) { |
156 | /* The peripherals in the 88000000 - D0000000 range | 156 | /* The peripherals in the 88000000 - D0000000 range |
157 | * are only accessable by type MT_DEVICE_NONSHARED. | 157 | * are only accessible by type MT_DEVICE_NONSHARED. |
158 | * Adjust mtype as necessary to make this "just work." | 158 | * Adjust mtype as necessary to make this "just work." |
159 | */ | 159 | */ |
160 | if ((phys_addr >= 0x88000000) && (phys_addr < 0xD0000000)) | 160 | if ((phys_addr >= 0x88000000) && (phys_addr < 0xD0000000)) |
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 0cca23a85175..98ba9784aa15 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq = { | |||
647 | 647 | ||
648 | 648 | ||
649 | 649 | ||
650 | static struct platform_suspend_ops omap_pm_ops ={ | 650 | static const struct platform_suspend_ops omap_pm_ops = { |
651 | .prepare = omap_pm_prepare, | 651 | .prepare = omap_pm_prepare, |
652 | .enter = omap_pm_enter, | 652 | .enter = omap_pm_enter, |
653 | .finish = omap_pm_finish, | 653 | .finish = omap_pm_finish, |
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index f3e043fe5eb8..11b89e9687f3 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c | |||
@@ -252,7 +252,7 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev, | |||
252 | * FIXME: we currently manage device-specific idle states | 252 | * FIXME: we currently manage device-specific idle states |
253 | * for PER and CORE in combination with CPU-specific | 253 | * for PER and CORE in combination with CPU-specific |
254 | * idle states. This is wrong, and device-specific | 254 | * idle states. This is wrong, and device-specific |
255 | * idle managment needs to be separated out into | 255 | * idle management needs to be separated out into |
256 | * its own code. | 256 | * its own code. |
257 | */ | 257 | */ |
258 | 258 | ||
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index dac2d1d9987d..9e5dc8ed51e9 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c | |||
@@ -350,7 +350,7 @@ static void omap2_pm_end(void) | |||
350 | enable_hlt(); | 350 | enable_hlt(); |
351 | } | 351 | } |
352 | 352 | ||
353 | static struct platform_suspend_ops omap_pm_ops = { | 353 | static const struct platform_suspend_ops omap_pm_ops = { |
354 | .begin = omap2_pm_begin, | 354 | .begin = omap2_pm_begin, |
355 | .enter = omap2_pm_enter, | 355 | .enter = omap2_pm_enter, |
356 | .end = omap2_pm_end, | 356 | .end = omap2_pm_end, |
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 5b323f28da2d..8cbbeade4b8a 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -605,7 +605,7 @@ static void omap3_pm_end(void) | |||
605 | return; | 605 | return; |
606 | } | 606 | } |
607 | 607 | ||
608 | static struct platform_suspend_ops omap_pm_ops = { | 608 | static const struct platform_suspend_ops omap_pm_ops = { |
609 | .begin = omap3_pm_begin, | 609 | .begin = omap3_pm_begin, |
610 | .end = omap3_pm_end, | 610 | .end = omap3_pm_end, |
611 | .enter = omap3_pm_enter, | 611 | .enter = omap3_pm_enter, |
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index e9f4862c4de4..76cfff2db514 100644 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c | |||
@@ -65,7 +65,7 @@ static void omap4_pm_end(void) | |||
65 | return; | 65 | return; |
66 | } | 66 | } |
67 | 67 | ||
68 | static struct platform_suspend_ops omap_pm_ops = { | 68 | static const struct platform_suspend_ops omap_pm_ops = { |
69 | .begin = omap4_pm_begin, | 69 | .begin = omap4_pm_begin, |
70 | .end = omap4_pm_end, | 70 | .end = omap4_pm_end, |
71 | .enter = omap4_pm_enter, | 71 | .enter = omap4_pm_enter, |
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index c64578853a8d..302da7403a10 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
@@ -852,7 +852,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) | |||
852 | } | 852 | } |
853 | 853 | ||
854 | /** | 854 | /** |
855 | * omap_serial_init() - intialize all supported serial ports | 855 | * omap_serial_init() - initialize all supported serial ports |
856 | * | 856 | * |
857 | * Initializes all available UARTs as serial ports. Platforms | 857 | * Initializes all available UARTs as serial ports. Platforms |
858 | * can call this function when they want to have default behaviour | 858 | * can call this function when they want to have default behaviour |
diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c index ee3c29c57ae3..f3e60a049f98 100644 --- a/arch/arm/mach-pnx4008/pm.c +++ b/arch/arm/mach-pnx4008/pm.c | |||
@@ -119,7 +119,7 @@ static int pnx4008_pm_valid(suspend_state_t state) | |||
119 | (state == PM_SUSPEND_MEM); | 119 | (state == PM_SUSPEND_MEM); |
120 | } | 120 | } |
121 | 121 | ||
122 | static struct platform_suspend_ops pnx4008_pm_ops = { | 122 | static const struct platform_suspend_ops pnx4008_pm_ops = { |
123 | .enter = pnx4008_pm_enter, | 123 | .enter = pnx4008_pm_enter, |
124 | .valid = pnx4008_pm_valid, | 124 | .valid = pnx4008_pm_valid, |
125 | }; | 125 | }; |
diff --git a/arch/arm/mach-pxa/mxm8x10.c b/arch/arm/mach-pxa/mxm8x10.c index 462167ac05f9..cdf7f41e2bb3 100644 --- a/arch/arm/mach-pxa/mxm8x10.c +++ b/arch/arm/mach-pxa/mxm8x10.c | |||
@@ -337,7 +337,7 @@ void __init mxm_8x10_mmc_init(void) | |||
337 | } | 337 | } |
338 | #endif | 338 | #endif |
339 | 339 | ||
340 | /* USB Open Host Controler Interface */ | 340 | /* USB Open Host Controller Interface */ |
341 | static struct pxaohci_platform_data mxm_8x10_ohci_platform_data = { | 341 | static struct pxaohci_platform_data mxm_8x10_ohci_platform_data = { |
342 | .port_mode = PMM_NPS_MODE, | 342 | .port_mode = PMM_NPS_MODE, |
343 | .flags = ENABLE_PORT_ALL | 343 | .flags = ENABLE_PORT_ALL |
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index 166c15f62916..978e1b289544 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c | |||
@@ -96,7 +96,7 @@ void pxa_pm_finish(void) | |||
96 | pxa_cpu_pm_fns->finish(); | 96 | pxa_cpu_pm_fns->finish(); |
97 | } | 97 | } |
98 | 98 | ||
99 | static struct platform_suspend_ops pxa_pm_ops = { | 99 | static const struct platform_suspend_ops pxa_pm_ops = { |
100 | .valid = pxa_pm_valid, | 100 | .valid = pxa_pm_valid, |
101 | .enter = pxa_pm_enter, | 101 | .enter = pxa_pm_enter, |
102 | .prepare = pxa_pm_prepare, | 102 | .prepare = pxa_pm_prepare, |
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index e68d46d415f3..785880f67b60 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c | |||
@@ -869,7 +869,7 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info) | |||
869 | } | 869 | } |
870 | 870 | ||
871 | #ifdef CONFIG_PM | 871 | #ifdef CONFIG_PM |
872 | static struct platform_suspend_ops sharpsl_pm_ops = { | 872 | static const struct platform_suspend_ops sharpsl_pm_ops = { |
873 | .prepare = pxa_pm_prepare, | 873 | .prepare = pxa_pm_prepare, |
874 | .finish = pxa_pm_finish, | 874 | .finish = pxa_pm_finish, |
875 | .enter = corgi_pxa_pm_enter, | 875 | .enter = corgi_pxa_pm_enter, |
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c index e7d03ab41d80..372ea6855454 100644 --- a/arch/arm/mach-s3c64xx/dma.c +++ b/arch/arm/mach-s3c64xx/dma.c | |||
@@ -740,7 +740,7 @@ static int __init s3c64xx_dma_init(void) | |||
740 | /* Set all DMA configuration to be DMA, not SDMA */ | 740 | /* Set all DMA configuration to be DMA, not SDMA */ |
741 | writel(0xffffff, S3C_SYSREG(0x110)); | 741 | writel(0xffffff, S3C_SYSREG(0x110)); |
742 | 742 | ||
743 | /* Register standard DMA controlers */ | 743 | /* Register standard DMA controllers */ |
744 | s3c64xx_dma_init1(0, DMACH_UART0, IRQ_DMA0, 0x75000000); | 744 | s3c64xx_dma_init1(0, DMACH_UART0, IRQ_DMA0, 0x75000000); |
745 | s3c64xx_dma_init1(8, DMACH_PCM1_TX, IRQ_DMA1, 0x75100000); | 745 | s3c64xx_dma_init1(8, DMACH_PCM1_TX, IRQ_DMA1, 0x75100000); |
746 | 746 | ||
diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c index c83fdc80edfd..ab9fc4470d36 100644 --- a/arch/arm/mach-sa1100/pm.c +++ b/arch/arm/mach-sa1100/pm.c | |||
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) | |||
120 | return virt_to_phys(sp); | 120 | return virt_to_phys(sp); |
121 | } | 121 | } |
122 | 122 | ||
123 | static struct platform_suspend_ops sa11x0_pm_ops = { | 123 | static const struct platform_suspend_ops sa11x0_pm_ops = { |
124 | .enter = sa11x0_pm_enter, | 124 | .enter = sa11x0_pm_enter, |
125 | .valid = suspend_valid_only_mem, | 125 | .valid = suspend_valid_only_mem, |
126 | }; | 126 | }; |
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c index 3560f8c1e723..5aa2d54ebfaa 100644 --- a/arch/arm/mach-spear3xx/spear300.c +++ b/arch/arm/mach-spear3xx/spear300.c | |||
@@ -371,7 +371,7 @@ struct pmx_driver pmx_driver = { | |||
371 | }; | 371 | }; |
372 | 372 | ||
373 | /* Add spear300 specific devices here */ | 373 | /* Add spear300 specific devices here */ |
374 | /* arm gpio1 device registeration */ | 374 | /* arm gpio1 device registration */ |
375 | static struct pl061_platform_data gpio1_plat_data = { | 375 | static struct pl061_platform_data gpio1_plat_data = { |
376 | .gpio_base = 8, | 376 | .gpio_base = 8, |
377 | .irq_base = SPEAR_GPIO1_INT_BASE, | 377 | .irq_base = SPEAR_GPIO1_INT_BASE, |
@@ -451,7 +451,7 @@ void __init spear300_init(void) | |||
451 | /* call spear3xx family common init function */ | 451 | /* call spear3xx family common init function */ |
452 | spear3xx_init(); | 452 | spear3xx_init(); |
453 | 453 | ||
454 | /* shared irq registeration */ | 454 | /* shared irq registration */ |
455 | shirq_ras1.regs.base = | 455 | shirq_ras1.regs.base = |
456 | ioremap(SPEAR300_TELECOM_BASE, SPEAR300_TELECOM_REG_SIZE); | 456 | ioremap(SPEAR300_TELECOM_BASE, SPEAR300_TELECOM_REG_SIZE); |
457 | if (shirq_ras1.regs.base) { | 457 | if (shirq_ras1.regs.base) { |
diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c index 96a1ab824bac..53b41b52d7ee 100644 --- a/arch/arm/mach-spear3xx/spear310.c +++ b/arch/arm/mach-spear3xx/spear310.c | |||
@@ -266,7 +266,7 @@ void __init spear310_init(void) | |||
266 | /* call spear3xx family common init function */ | 266 | /* call spear3xx family common init function */ |
267 | spear3xx_init(); | 267 | spear3xx_init(); |
268 | 268 | ||
269 | /* shared irq registeration */ | 269 | /* shared irq registration */ |
270 | base = ioremap(SPEAR310_SOC_CONFIG_BASE, SPEAR310_SOC_CONFIG_SIZE); | 270 | base = ioremap(SPEAR310_SOC_CONFIG_BASE, SPEAR310_SOC_CONFIG_SIZE); |
271 | if (base) { | 271 | if (base) { |
272 | /* shirq 1 */ | 272 | /* shirq 1 */ |
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c index 6a1219549369..88b465284c36 100644 --- a/arch/arm/mach-spear3xx/spear320.c +++ b/arch/arm/mach-spear3xx/spear320.c | |||
@@ -519,7 +519,7 @@ void __init spear320_init(void) | |||
519 | /* call spear3xx family common init function */ | 519 | /* call spear3xx family common init function */ |
520 | spear3xx_init(); | 520 | spear3xx_init(); |
521 | 521 | ||
522 | /* shared irq registeration */ | 522 | /* shared irq registration */ |
523 | base = ioremap(SPEAR320_SOC_CONFIG_BASE, SPEAR320_SOC_CONFIG_SIZE); | 523 | base = ioremap(SPEAR320_SOC_CONFIG_BASE, SPEAR320_SOC_CONFIG_SIZE); |
524 | if (base) { | 524 | if (base) { |
525 | /* shirq 1 */ | 525 | /* shirq 1 */ |
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index e87313aeae20..52f553c8c46d 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear3xx/spear3xx.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <mach/spear.h> | 22 | #include <mach/spear.h> |
23 | 23 | ||
24 | /* Add spear3xx machines common devices here */ | 24 | /* Add spear3xx machines common devices here */ |
25 | /* gpio device registeration */ | 25 | /* gpio device registration */ |
26 | static struct pl061_platform_data gpio_plat_data = { | 26 | static struct pl061_platform_data gpio_plat_data = { |
27 | .gpio_base = 0, | 27 | .gpio_base = 0, |
28 | .irq_base = SPEAR_GPIO_INT_BASE, | 28 | .irq_base = SPEAR_GPIO_INT_BASE, |
@@ -41,7 +41,7 @@ struct amba_device gpio_device = { | |||
41 | .irq = {IRQ_BASIC_GPIO, NO_IRQ}, | 41 | .irq = {IRQ_BASIC_GPIO, NO_IRQ}, |
42 | }; | 42 | }; |
43 | 43 | ||
44 | /* uart device registeration */ | 44 | /* uart device registration */ |
45 | struct amba_device uart_device = { | 45 | struct amba_device uart_device = { |
46 | .dev = { | 46 | .dev = { |
47 | .init_name = "uart", | 47 | .init_name = "uart", |
@@ -543,6 +543,6 @@ void spear_pmx_init(struct pmx_driver *pmx_driver, uint base, uint size) | |||
543 | 543 | ||
544 | pmx_fail: | 544 | pmx_fail: |
545 | if (ret) | 545 | if (ret) |
546 | printk(KERN_ERR "padmux: registeration failed. err no: %d\n", | 546 | printk(KERN_ERR "padmux: registration failed. err no: %d\n", |
547 | ret); | 547 | ret); |
548 | } | 548 | } |
diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c index baf6bcc3169c..f2fe14e8471d 100644 --- a/arch/arm/mach-spear6xx/spear6xx.c +++ b/arch/arm/mach-spear6xx/spear6xx.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <mach/spear.h> | 23 | #include <mach/spear.h> |
24 | 24 | ||
25 | /* Add spear6xx machines common devices here */ | 25 | /* Add spear6xx machines common devices here */ |
26 | /* uart device registeration */ | 26 | /* uart device registration */ |
27 | struct amba_device uart_device[] = { | 27 | struct amba_device uart_device[] = { |
28 | { | 28 | { |
29 | .dev = { | 29 | .dev = { |
@@ -50,7 +50,7 @@ struct amba_device uart_device[] = { | |||
50 | } | 50 | } |
51 | }; | 51 | }; |
52 | 52 | ||
53 | /* gpio device registeration */ | 53 | /* gpio device registration */ |
54 | static struct pl061_platform_data gpio_plat_data[] = { | 54 | static struct pl061_platform_data gpio_plat_data[] = { |
55 | { | 55 | { |
56 | .gpio_base = 0, | 56 | .gpio_base = 0, |
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig index 801b21e7f677..32a7b0f7e9f7 100644 --- a/arch/arm/mach-u300/Kconfig +++ b/arch/arm/mach-u300/Kconfig | |||
@@ -64,7 +64,7 @@ config MACH_U300_DUAL_RAM | |||
64 | bool "Dual RAM" | 64 | bool "Dual RAM" |
65 | help | 65 | help |
66 | Select this if you want support for Dual RAM phones. | 66 | Select this if you want support for Dual RAM phones. |
67 | This is two RAM memorys on different EMIFs. | 67 | This is two RAM memories on different EMIFs. |
68 | endchoice | 68 | endchoice |
69 | 69 | ||
70 | config U300_DEBUG | 70 | config U300_DEBUG |
diff --git a/arch/arm/mach-u300/include/mach/coh901318.h b/arch/arm/mach-u300/include/mach/coh901318.h index 193da2df732c..6193aaa47794 100644 --- a/arch/arm/mach-u300/include/mach/coh901318.h +++ b/arch/arm/mach-u300/include/mach/coh901318.h | |||
@@ -24,7 +24,7 @@ | |||
24 | * @src_addr: transfer source address | 24 | * @src_addr: transfer source address |
25 | * @dst_addr: transfer destination address | 25 | * @dst_addr: transfer destination address |
26 | * @link_addr: physical address to next lli | 26 | * @link_addr: physical address to next lli |
27 | * @virt_link_addr: virtual addres of next lli (only used by pool_free) | 27 | * @virt_link_addr: virtual address of next lli (only used by pool_free) |
28 | * @phy_this: physical address of current lli (only used by pool_free) | 28 | * @phy_this: physical address of current lli (only used by pool_free) |
29 | */ | 29 | */ |
30 | struct coh901318_lli { | 30 | struct coh901318_lli { |
@@ -90,7 +90,7 @@ struct powersave { | |||
90 | * struct coh901318_platform - platform arch structure | 90 | * struct coh901318_platform - platform arch structure |
91 | * @chans_slave: specifying dma slave channels | 91 | * @chans_slave: specifying dma slave channels |
92 | * @chans_memcpy: specifying dma memcpy channels | 92 | * @chans_memcpy: specifying dma memcpy channels |
93 | * @access_memory_state: requesting DMA memeory access (on / off) | 93 | * @access_memory_state: requesting DMA memory access (on / off) |
94 | * @chan_conf: dma channel configurations | 94 | * @chan_conf: dma channel configurations |
95 | * @max_channels: max number of dma chanenls | 95 | * @max_channels: max number of dma chanenls |
96 | */ | 96 | */ |
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index c29f2839f1d2..2b269c955524 100644 --- a/arch/arm/mm/flush.c +++ b/arch/arm/mm/flush.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <asm/smp_plat.h> | 18 | #include <asm/smp_plat.h> |
19 | #include <asm/system.h> | 19 | #include <asm/system.h> |
20 | #include <asm/tlbflush.h> | 20 | #include <asm/tlbflush.h> |
21 | #include <asm/smp_plat.h> | ||
22 | 21 | ||
23 | #include "mm.h" | 22 | #include "mm.h" |
24 | 23 | ||
diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h index 58a49cc83797..ba65c9231a78 100644 --- a/arch/arm/plat-mxc/include/mach/irqs.h +++ b/arch/arm/plat-mxc/include/mach/irqs.h | |||
@@ -70,7 +70,7 @@ extern int imx_irq_set_priority(unsigned char irq, unsigned char prio); | |||
70 | 70 | ||
71 | /* all normal IRQs can be FIQs */ | 71 | /* all normal IRQs can be FIQs */ |
72 | #define FIQ_START 0 | 72 | #define FIQ_START 0 |
73 | /* switch betwean IRQ and FIQ */ | 73 | /* switch between IRQ and FIQ */ |
74 | extern int mxc_set_irq_fiq(unsigned int irq, unsigned int type); | 74 | extern int mxc_set_irq_fiq(unsigned int irq, unsigned int type); |
75 | 75 | ||
76 | #endif /* __ASM_ARCH_MXC_IRQS_H__ */ | 76 | #endif /* __ASM_ARCH_MXC_IRQS_H__ */ |
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 6864a997f2ca..1eee85a8abb3 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h | |||
@@ -351,7 +351,7 @@ struct omap_hwmod_omap2_prcm { | |||
351 | /** | 351 | /** |
352 | * struct omap_hwmod_omap4_prcm - OMAP4-specific PRCM data | 352 | * struct omap_hwmod_omap4_prcm - OMAP4-specific PRCM data |
353 | * @clkctrl_reg: PRCM address of the clock control register | 353 | * @clkctrl_reg: PRCM address of the clock control register |
354 | * @rstctrl_reg: adress of the XXX_RSTCTRL register located in the PRM | 354 | * @rstctrl_reg: address of the XXX_RSTCTRL register located in the PRM |
355 | * @submodule_wkdep_bit: bit shift of the WKDEP range | 355 | * @submodule_wkdep_bit: bit shift of the WKDEP range |
356 | */ | 356 | */ |
357 | struct omap_hwmod_omap4_prcm { | 357 | struct omap_hwmod_omap4_prcm { |
diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index 27cfca597699..5bf3f2f09e74 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c | |||
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void) | |||
355 | s3c_pm_check_cleanup(); | 355 | s3c_pm_check_cleanup(); |
356 | } | 356 | } |
357 | 357 | ||
358 | static struct platform_suspend_ops s3c_pm_ops = { | 358 | static const struct platform_suspend_ops s3c_pm_ops = { |
359 | .enter = s3c_pm_enter, | 359 | .enter = s3c_pm_enter, |
360 | .prepare = s3c_pm_prepare, | 360 | .prepare = s3c_pm_prepare, |
361 | .finish = s3c_pm_finish, | 361 | .finish = s3c_pm_finish, |
diff --git a/arch/avr32/mach-at32ap/pm.c b/arch/avr32/mach-at32ap/pm.c index f021edfeaab0..32d680eb6f48 100644 --- a/arch/avr32/mach-at32ap/pm.c +++ b/arch/avr32/mach-at32ap/pm.c | |||
@@ -176,7 +176,7 @@ out: | |||
176 | return 0; | 176 | return 0; |
177 | } | 177 | } |
178 | 178 | ||
179 | static struct platform_suspend_ops avr32_pm_ops = { | 179 | static const struct platform_suspend_ops avr32_pm_ops = { |
180 | .valid = avr32_pm_valid_state, | 180 | .valid = avr32_pm_valid_state, |
181 | .enter = avr32_pm_enter, | 181 | .enter = avr32_pm_enter, |
182 | }; | 182 | }; |
diff --git a/arch/blackfin/mach-bf537/include/mach/defBF534.h b/arch/blackfin/mach-bf537/include/mach/defBF534.h index 32529a03b266..725bb35f3aaa 100644 --- a/arch/blackfin/mach-bf537/include/mach/defBF534.h +++ b/arch/blackfin/mach-bf537/include/mach/defBF534.h | |||
@@ -1418,7 +1418,7 @@ | |||
1418 | #define SADD_LEN 0x0002 /* Slave Address Length */ | 1418 | #define SADD_LEN 0x0002 /* Slave Address Length */ |
1419 | #define STDVAL 0x0004 /* Slave Transmit Data Valid */ | 1419 | #define STDVAL 0x0004 /* Slave Transmit Data Valid */ |
1420 | #define NAK 0x0008 /* NAK/ACK* Generated At Conclusion Of Transfer */ | 1420 | #define NAK 0x0008 /* NAK/ACK* Generated At Conclusion Of Transfer */ |
1421 | #define GEN 0x0010 /* General Call Adrress Matching Enabled */ | 1421 | #define GEN 0x0010 /* General Call Address Matching Enabled */ |
1422 | 1422 | ||
1423 | /* TWI_SLAVE_STAT Masks */ | 1423 | /* TWI_SLAVE_STAT Masks */ |
1424 | #define SDIR 0x0001 /* Slave Transfer Direction (Transmit/Receive*) */ | 1424 | #define SDIR 0x0001 /* Slave Transfer Direction (Transmit/Receive*) */ |
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index 42fa87e8375c..3c648a077e75 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c | |||
@@ -223,7 +223,7 @@ static int bfin_pm_enter(suspend_state_t state) | |||
223 | return 0; | 223 | return 0; |
224 | } | 224 | } |
225 | 225 | ||
226 | struct platform_suspend_ops bfin_pm_ops = { | 226 | static const struct platform_suspend_ops bfin_pm_ops = { |
227 | .enter = bfin_pm_enter, | 227 | .enter = bfin_pm_enter, |
228 | .valid = bfin_pm_valid, | 228 | .valid = bfin_pm_valid, |
229 | }; | 229 | }; |
diff --git a/arch/cris/arch-v32/lib/nand_init.S b/arch/cris/arch-v32/lib/nand_init.S index e705f5cce969..d671fed451c9 100644 --- a/arch/cris/arch-v32/lib/nand_init.S +++ b/arch/cris/arch-v32/lib/nand_init.S | |||
@@ -139,7 +139,7 @@ copy_nand_to_ram: | |||
139 | lsrq 8, $r4 | 139 | lsrq 8, $r4 |
140 | move.b $r4, [$r1] ; Row address | 140 | move.b $r4, [$r1] ; Row address |
141 | lsrq 8, $r4 | 141 | lsrq 8, $r4 |
142 | move.b $r4, [$r1] ; Row adddress | 142 | move.b $r4, [$r1] ; Row address |
143 | moveq 20, $r4 | 143 | moveq 20, $r4 |
144 | 2: bne 2b | 144 | 2: bne 2b |
145 | subq 1, $r4 | 145 | subq 1, $r4 |
diff --git a/arch/cris/include/asm/etraxgpio.h b/arch/cris/include/asm/etraxgpio.h index d474818a537e..461c089db765 100644 --- a/arch/cris/include/asm/etraxgpio.h +++ b/arch/cris/include/asm/etraxgpio.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * The following devices are accessable using this driver using | 2 | * The following devices are accessible using this driver using |
3 | * GPIO_MAJOR (120) and a couple of minor numbers. | 3 | * GPIO_MAJOR (120) and a couple of minor numbers. |
4 | * | 4 | * |
5 | * For ETRAX 100LX (CONFIG_ETRAX_ARCH_V10): | 5 | * For ETRAX 100LX (CONFIG_ETRAX_ARCH_V10): |
diff --git a/arch/h8300/Kconfig.debug b/arch/h8300/Kconfig.debug index ee671c3f2c74..e8d1b236ad8c 100644 --- a/arch/h8300/Kconfig.debug +++ b/arch/h8300/Kconfig.debug | |||
@@ -48,7 +48,7 @@ config DEFAULT_CMDLINE | |||
48 | builtin kernel commandline enabled. | 48 | builtin kernel commandline enabled. |
49 | 49 | ||
50 | config KERNEL_COMMAND | 50 | config KERNEL_COMMAND |
51 | string "Buildin commmand string" | 51 | string "Buildin command string" |
52 | depends on DEFAULT_CMDLINE | 52 | depends on DEFAULT_CMDLINE |
53 | help | 53 | help |
54 | builtin kernel commandline strings. | 54 | builtin kernel commandline strings. |
diff --git a/arch/ia64/kvm/mmio.c b/arch/ia64/kvm/mmio.c index fb8f9f59a1ed..f1e17d3d6cd9 100644 --- a/arch/ia64/kvm/mmio.c +++ b/arch/ia64/kvm/mmio.c | |||
@@ -130,7 +130,7 @@ static void mmio_access(struct kvm_vcpu *vcpu, u64 src_pa, u64 *dest, | |||
130 | 130 | ||
131 | local_irq_save(psr); | 131 | local_irq_save(psr); |
132 | 132 | ||
133 | /*Intercept the acces for PIB range*/ | 133 | /*Intercept the access for PIB range*/ |
134 | if (iot == GPFN_PIB) { | 134 | if (iot == GPFN_PIB) { |
135 | if (!dir) | 135 | if (!dir) |
136 | lsapic_write(vcpu, src_pa, s, *dest); | 136 | lsapic_write(vcpu, src_pa, s, *dest); |
diff --git a/arch/m68k/ifpsp060/src/fpsp.S b/arch/m68k/ifpsp060/src/fpsp.S index 73613b5f1ee5..26e85e2b7a5e 100644 --- a/arch/m68k/ifpsp060/src/fpsp.S +++ b/arch/m68k/ifpsp060/src/fpsp.S | |||
@@ -3881,7 +3881,7 @@ _fpsp_fline: | |||
3881 | # FP Unimplemented Instruction stack frame and jump to that entry | 3881 | # FP Unimplemented Instruction stack frame and jump to that entry |
3882 | # point. | 3882 | # point. |
3883 | # | 3883 | # |
3884 | # but, if the FPU is disabled, then we need to jump to the FPU diabled | 3884 | # but, if the FPU is disabled, then we need to jump to the FPU disabled |
3885 | # entry point. | 3885 | # entry point. |
3886 | movc %pcr,%d0 | 3886 | movc %pcr,%d0 |
3887 | btst &0x1,%d0 | 3887 | btst &0x1,%d0 |
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c index ba6ccab64018..a4c3eb60706e 100644 --- a/arch/m68k/mac/psc.c +++ b/arch/m68k/mac/psc.c | |||
@@ -88,7 +88,7 @@ void __init psc_init(void) | |||
88 | 88 | ||
89 | /* | 89 | /* |
90 | * The PSC is always at the same spot, but using psc | 90 | * The PSC is always at the same spot, but using psc |
91 | * keeps things consisant with the psc_xxxx functions. | 91 | * keeps things consistent with the psc_xxxx functions. |
92 | */ | 92 | */ |
93 | 93 | ||
94 | psc = (void *) PSC_BASE; | 94 | psc = (void *) PSC_BASE; |
diff --git a/arch/mips/alchemy/common/power.c b/arch/mips/alchemy/common/power.c index e5916a516e58..647e518c90bc 100644 --- a/arch/mips/alchemy/common/power.c +++ b/arch/mips/alchemy/common/power.c | |||
@@ -130,7 +130,7 @@ static void restore_core_regs(void) | |||
130 | au_writel(sleep_usb[1], USBD_ENABLE); | 130 | au_writel(sleep_usb[1], USBD_ENABLE); |
131 | au_sync(); | 131 | au_sync(); |
132 | #else | 132 | #else |
133 | /* enable accces to OTG memory */ | 133 | /* enable access to OTG memory */ |
134 | au_writel(au_readl(USB_MSR_BASE + 4) | (1 << 6), USB_MSR_BASE + 4); | 134 | au_writel(au_readl(USB_MSR_BASE + 4) | (1 << 6), USB_MSR_BASE + 4); |
135 | au_sync(); | 135 | au_sync(); |
136 | 136 | ||
diff --git a/arch/mips/alchemy/devboards/pm.c b/arch/mips/alchemy/devboards/pm.c index 4bbd3133e451..acaf91b5e461 100644 --- a/arch/mips/alchemy/devboards/pm.c +++ b/arch/mips/alchemy/devboards/pm.c | |||
@@ -110,7 +110,7 @@ static void db1x_pm_end(void) | |||
110 | 110 | ||
111 | } | 111 | } |
112 | 112 | ||
113 | static struct platform_suspend_ops db1x_pm_ops = { | 113 | static const struct platform_suspend_ops db1x_pm_ops = { |
114 | .valid = suspend_valid_only_mem, | 114 | .valid = suspend_valid_only_mem, |
115 | .begin = db1x_pm_begin, | 115 | .begin = db1x_pm_begin, |
116 | .enter = db1x_pm_enter, | 116 | .enter = db1x_pm_enter, |
diff --git a/arch/mips/include/asm/mach-powertv/ioremap.h b/arch/mips/include/asm/mach-powertv/ioremap.h index 076f2eeaa575..c86ef094ec37 100644 --- a/arch/mips/include/asm/mach-powertv/ioremap.h +++ b/arch/mips/include/asm/mach-powertv/ioremap.h | |||
@@ -88,7 +88,7 @@ static inline dma_addr_t _dma_to_phys_offset_raw(dma_addr_t dma) | |||
88 | } | 88 | } |
89 | 89 | ||
90 | /* These are not portable and should not be used in drivers. Drivers should | 90 | /* These are not portable and should not be used in drivers. Drivers should |
91 | * be using ioremap() and friends to map physical addreses to virtual | 91 | * be using ioremap() and friends to map physical addresses to virtual |
92 | * addresses and dma_map*() and friends to map virtual addresses into DMA | 92 | * addresses and dma_map*() and friends to map virtual addresses into DMA |
93 | * addresses and back. | 93 | * addresses and back. |
94 | */ | 94 | */ |
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c index 5c0a3575877c..2c0e107966ad 100644 --- a/arch/mips/jz4740/board-qi_lb60.c +++ b/arch/mips/jz4740/board-qi_lb60.c | |||
@@ -65,7 +65,7 @@ static struct nand_ecclayout qi_lb60_ecclayout_1gb = { | |||
65 | 65 | ||
66 | /* Early prototypes of the QI LB60 had only 1GB of NAND. | 66 | /* Early prototypes of the QI LB60 had only 1GB of NAND. |
67 | * In order to support these devices aswell the partition and ecc layout is | 67 | * In order to support these devices aswell the partition and ecc layout is |
68 | * initalized depending on the NAND size */ | 68 | * initialized depending on the NAND size */ |
69 | static struct mtd_partition qi_lb60_partitions_1gb[] = { | 69 | static struct mtd_partition qi_lb60_partitions_1gb[] = { |
70 | { | 70 | { |
71 | .name = "NAND BOOT partition", | 71 | .name = "NAND BOOT partition", |
@@ -464,7 +464,7 @@ static int __init qi_lb60_board_setup(void) | |||
464 | board_gpio_setup(); | 464 | board_gpio_setup(); |
465 | 465 | ||
466 | if (qi_lb60_init_platform_devices()) | 466 | if (qi_lb60_init_platform_devices()) |
467 | panic("Failed to initalize platform devices\n"); | 467 | panic("Failed to initialize platform devices\n"); |
468 | 468 | ||
469 | return 0; | 469 | return 0; |
470 | } | 470 | } |
diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c index 38f60f35156c..88e6aeda5bf1 100644 --- a/arch/mips/jz4740/gpio.c +++ b/arch/mips/jz4740/gpio.c | |||
@@ -546,7 +546,7 @@ static int __init jz4740_gpio_init(void) | |||
546 | for (i = 0; i < ARRAY_SIZE(jz4740_gpio_chips); ++i) | 546 | for (i = 0; i < ARRAY_SIZE(jz4740_gpio_chips); ++i) |
547 | jz4740_gpio_chip_init(&jz4740_gpio_chips[i], i); | 547 | jz4740_gpio_chip_init(&jz4740_gpio_chips[i], i); |
548 | 548 | ||
549 | printk(KERN_INFO "JZ4740 GPIO initalized\n"); | 549 | printk(KERN_INFO "JZ4740 GPIO initialized\n"); |
550 | 550 | ||
551 | return 0; | 551 | return 0; |
552 | } | 552 | } |
diff --git a/arch/mips/jz4740/pm.c b/arch/mips/jz4740/pm.c index a9994585424d..902d5b50124c 100644 --- a/arch/mips/jz4740/pm.c +++ b/arch/mips/jz4740/pm.c | |||
@@ -42,7 +42,7 @@ static int jz4740_pm_enter(suspend_state_t state) | |||
42 | return 0; | 42 | return 0; |
43 | } | 43 | } |
44 | 44 | ||
45 | static struct platform_suspend_ops jz4740_pm_ops = { | 45 | static const struct platform_suspend_ops jz4740_pm_ops = { |
46 | .valid = suspend_valid_only_mem, | 46 | .valid = suspend_valid_only_mem, |
47 | .enter = jz4740_pm_enter, | 47 | .enter = jz4740_pm_enter, |
48 | }; | 48 | }; |
diff --git a/arch/mips/loongson/common/pm.c b/arch/mips/loongson/common/pm.c index 6c1fd9001712..f55e07aee071 100644 --- a/arch/mips/loongson/common/pm.c +++ b/arch/mips/loongson/common/pm.c | |||
@@ -147,7 +147,7 @@ static int loongson_pm_valid_state(suspend_state_t state) | |||
147 | } | 147 | } |
148 | } | 148 | } |
149 | 149 | ||
150 | static struct platform_suspend_ops loongson_pm_ops = { | 150 | static const struct platform_suspend_ops loongson_pm_ops = { |
151 | .valid = loongson_pm_valid_state, | 151 | .valid = loongson_pm_valid_state, |
152 | .enter = loongson_pm_enter, | 152 | .enter = loongson_pm_enter, |
153 | }; | 153 | }; |
diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c index b27419c84919..a96d281f9221 100644 --- a/arch/mips/mti-malta/malta-memory.c +++ b/arch/mips/mti-malta/malta-memory.c | |||
@@ -43,7 +43,7 @@ static struct prom_pmemblock mdesc[PROM_MAX_PMEMBLOCKS]; | |||
43 | static char *mtypes[3] = { | 43 | static char *mtypes[3] = { |
44 | "Dont use memory", | 44 | "Dont use memory", |
45 | "YAMON PROM memory", | 45 | "YAMON PROM memory", |
46 | "Free memmory", | 46 | "Free memory", |
47 | }; | 47 | }; |
48 | #endif | 48 | #endif |
49 | 49 | ||
diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c index 385f035b24e4..0583c463e5f1 100644 --- a/arch/mips/pci/pcie-octeon.c +++ b/arch/mips/pci/pcie-octeon.c | |||
@@ -900,7 +900,7 @@ static int cvmx_pcie_rc_initialize(int pcie_port) | |||
900 | mem_access_subid.s.ror = 0; | 900 | mem_access_subid.s.ror = 0; |
901 | /* Disable Relaxed Ordering for Writes. */ | 901 | /* Disable Relaxed Ordering for Writes. */ |
902 | mem_access_subid.s.row = 0; | 902 | mem_access_subid.s.row = 0; |
903 | /* PCIe Adddress Bits <63:34>. */ | 903 | /* PCIe Address Bits <63:34>. */ |
904 | mem_access_subid.s.ba = 0; | 904 | mem_access_subid.s.ba = 0; |
905 | 905 | ||
906 | /* | 906 | /* |
diff --git a/arch/mips/powertv/memory.c b/arch/mips/powertv/memory.c index 73880ad29bc2..fb3d29660c42 100644 --- a/arch/mips/powertv/memory.c +++ b/arch/mips/powertv/memory.c | |||
@@ -57,7 +57,7 @@ | |||
57 | unsigned long ptv_memsize; | 57 | unsigned long ptv_memsize; |
58 | 58 | ||
59 | /* | 59 | /* |
60 | * struct low_mem_reserved - Items in low memmory that are reserved | 60 | * struct low_mem_reserved - Items in low memory that are reserved |
61 | * @start: Physical address of item | 61 | * @start: Physical address of item |
62 | * @size: Size, in bytes, of this item | 62 | * @size: Size, in bytes, of this item |
63 | * @is_aliased: True if this is RAM aliased from another location. If false, | 63 | * @is_aliased: True if this is RAM aliased from another location. If false, |
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c index 9a0be810cafa..96e69a00ffc8 100644 --- a/arch/mips/txx9/generic/pci.c +++ b/arch/mips/txx9/generic/pci.c | |||
@@ -107,7 +107,7 @@ int txx9_pci_mem_high __initdata; | |||
107 | 107 | ||
108 | /* | 108 | /* |
109 | * allocate pci_controller and resources. | 109 | * allocate pci_controller and resources. |
110 | * mem_base, io_base: physical addresss. 0 for auto assignment. | 110 | * mem_base, io_base: physical address. 0 for auto assignment. |
111 | * mem_size and io_size means max size on auto assignment. | 111 | * mem_size and io_size means max size on auto assignment. |
112 | * pcic must be &txx9_primary_pcic or NULL. | 112 | * pcic must be &txx9_primary_pcic or NULL. |
113 | */ | 113 | */ |
diff --git a/arch/powerpc/include/asm/8xx_immap.h b/arch/powerpc/include/asm/8xx_immap.h index 4b0e15206006..6b6dc20b0beb 100644 --- a/arch/powerpc/include/asm/8xx_immap.h +++ b/arch/powerpc/include/asm/8xx_immap.h | |||
@@ -93,7 +93,7 @@ typedef struct mem_ctlr { | |||
93 | } memctl8xx_t; | 93 | } memctl8xx_t; |
94 | 94 | ||
95 | /*----------------------------------------------------------------------- | 95 | /*----------------------------------------------------------------------- |
96 | * BR - Memory Controler: Base Register 16-9 | 96 | * BR - Memory Controller: Base Register 16-9 |
97 | */ | 97 | */ |
98 | #define BR_BA_MSK 0xffff8000 /* Base Address Mask */ | 98 | #define BR_BA_MSK 0xffff8000 /* Base Address Mask */ |
99 | #define BR_AT_MSK 0x00007000 /* Address Type Mask */ | 99 | #define BR_AT_MSK 0x00007000 /* Address Type Mask */ |
@@ -110,7 +110,7 @@ typedef struct mem_ctlr { | |||
110 | #define BR_V 0x00000001 /* Bank Valid */ | 110 | #define BR_V 0x00000001 /* Bank Valid */ |
111 | 111 | ||
112 | /*----------------------------------------------------------------------- | 112 | /*----------------------------------------------------------------------- |
113 | * OR - Memory Controler: Option Register 16-11 | 113 | * OR - Memory Controller: Option Register 16-11 |
114 | */ | 114 | */ |
115 | #define OR_AM_MSK 0xffff8000 /* Address Mask Mask */ | 115 | #define OR_AM_MSK 0xffff8000 /* Address Mask Mask */ |
116 | #define OR_ATM_MSK 0x00007000 /* Address Type Mask Mask */ | 116 | #define OR_ATM_MSK 0x00007000 /* Address Type Mask Mask */ |
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c index 7fd90d02d8c6..c4d2b7167568 100644 --- a/arch/powerpc/oprofile/op_model_cell.c +++ b/arch/powerpc/oprofile/op_model_cell.c | |||
@@ -1469,7 +1469,7 @@ static int cell_global_start(struct op_counter_config *ctr) | |||
1469 | * The pm_interval register is setup to write the SPU PC value into the | 1469 | * The pm_interval register is setup to write the SPU PC value into the |
1470 | * trace buffer at the maximum rate possible. The trace buffer is configured | 1470 | * trace buffer at the maximum rate possible. The trace buffer is configured |
1471 | * to store the PCs, wrapping when it is full. The performance counter is | 1471 | * to store the PCs, wrapping when it is full. The performance counter is |
1472 | * intialized to the max hardware count minus the number of events, N, between | 1472 | * initialized to the max hardware count minus the number of events, N, between |
1473 | * samples. Once the N events have occured, a HW counter overflow occurs | 1473 | * samples. Once the N events have occured, a HW counter overflow occurs |
1474 | * causing the generation of a HW counter interrupt which also stops the | 1474 | * causing the generation of a HW counter interrupt which also stops the |
1475 | * writing of the SPU PC values to the trace buffer. Hence the last PC | 1475 | * writing of the SPU PC values to the trace buffer. Hence the last PC |
diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c index 80234e5921f5..eda0fc2a3914 100644 --- a/arch/powerpc/platforms/52xx/lite5200_pm.c +++ b/arch/powerpc/platforms/52xx/lite5200_pm.c | |||
@@ -232,7 +232,7 @@ static void lite5200_pm_end(void) | |||
232 | lite5200_pm_target_state = PM_SUSPEND_ON; | 232 | lite5200_pm_target_state = PM_SUSPEND_ON; |
233 | } | 233 | } |
234 | 234 | ||
235 | static struct platform_suspend_ops lite5200_pm_ops = { | 235 | static const struct platform_suspend_ops lite5200_pm_ops = { |
236 | .valid = lite5200_pm_valid, | 236 | .valid = lite5200_pm_valid, |
237 | .begin = lite5200_pm_begin, | 237 | .begin = lite5200_pm_begin, |
238 | .prepare = lite5200_pm_prepare, | 238 | .prepare = lite5200_pm_prepare, |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/arch/powerpc/platforms/52xx/mpc52xx_pm.c index 568cef636275..8310e8b5b57f 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c | |||
@@ -186,7 +186,7 @@ void mpc52xx_pm_finish(void) | |||
186 | iounmap(mbar); | 186 | iounmap(mbar); |
187 | } | 187 | } |
188 | 188 | ||
189 | static struct platform_suspend_ops mpc52xx_pm_ops = { | 189 | static const struct platform_suspend_ops mpc52xx_pm_ops = { |
190 | .valid = mpc52xx_pm_valid, | 190 | .valid = mpc52xx_pm_valid, |
191 | .prepare = mpc52xx_pm_prepare, | 191 | .prepare = mpc52xx_pm_prepare, |
192 | .enter = mpc52xx_pm_enter, | 192 | .enter = mpc52xx_pm_enter, |
diff --git a/arch/powerpc/platforms/83xx/suspend-asm.S b/arch/powerpc/platforms/83xx/suspend-asm.S index 1930543c98d3..3d1ecd211776 100644 --- a/arch/powerpc/platforms/83xx/suspend-asm.S +++ b/arch/powerpc/platforms/83xx/suspend-asm.S | |||
@@ -231,7 +231,7 @@ _GLOBAL(mpc83xx_enter_deep_sleep) | |||
231 | ori r4, r4, 0x002a | 231 | ori r4, r4, 0x002a |
232 | mtspr SPRN_DBAT0L, r4 | 232 | mtspr SPRN_DBAT0L, r4 |
233 | lis r8, TMP_VIRT_IMMR@h | 233 | lis r8, TMP_VIRT_IMMR@h |
234 | ori r4, r8, 0x001e /* 1 MByte accessable from Kernel Space only */ | 234 | ori r4, r8, 0x001e /* 1 MByte accessible from Kernel Space only */ |
235 | mtspr SPRN_DBAT0U, r4 | 235 | mtspr SPRN_DBAT0U, r4 |
236 | isync | 236 | isync |
237 | 237 | ||
@@ -241,7 +241,7 @@ _GLOBAL(mpc83xx_enter_deep_sleep) | |||
241 | ori r4, r4, 0x002a | 241 | ori r4, r4, 0x002a |
242 | mtspr SPRN_DBAT1L, r4 | 242 | mtspr SPRN_DBAT1L, r4 |
243 | lis r9, (TMP_VIRT_IMMR + 0x01000000)@h | 243 | lis r9, (TMP_VIRT_IMMR + 0x01000000)@h |
244 | ori r4, r9, 0x001e /* 1 MByte accessable from Kernel Space only */ | 244 | ori r4, r9, 0x001e /* 1 MByte accessible from Kernel Space only */ |
245 | mtspr SPRN_DBAT1U, r4 | 245 | mtspr SPRN_DBAT1U, r4 |
246 | isync | 246 | isync |
247 | 247 | ||
@@ -253,7 +253,7 @@ _GLOBAL(mpc83xx_enter_deep_sleep) | |||
253 | li r4, 0x0002 | 253 | li r4, 0x0002 |
254 | mtspr SPRN_DBAT2L, r4 | 254 | mtspr SPRN_DBAT2L, r4 |
255 | lis r4, KERNELBASE@h | 255 | lis r4, KERNELBASE@h |
256 | ori r4, r4, 0x001e /* 1 MByte accessable from Kernel Space only */ | 256 | ori r4, r4, 0x001e /* 1 MByte accessible from Kernel Space only */ |
257 | mtspr SPRN_DBAT2U, r4 | 257 | mtspr SPRN_DBAT2U, r4 |
258 | isync | 258 | isync |
259 | 259 | ||
diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c index 75ae77f1af6a..fd4f2f2f19e6 100644 --- a/arch/powerpc/platforms/83xx/suspend.c +++ b/arch/powerpc/platforms/83xx/suspend.c | |||
@@ -311,7 +311,7 @@ static int mpc83xx_is_pci_agent(void) | |||
311 | return ret; | 311 | return ret; |
312 | } | 312 | } |
313 | 313 | ||
314 | static struct platform_suspend_ops mpc83xx_suspend_ops = { | 314 | static const struct platform_suspend_ops mpc83xx_suspend_ops = { |
315 | .valid = mpc83xx_suspend_valid, | 315 | .valid = mpc83xx_suspend_valid, |
316 | .begin = mpc83xx_suspend_begin, | 316 | .begin = mpc83xx_suspend_begin, |
317 | .enter = mpc83xx_suspend_enter, | 317 | .enter = mpc83xx_suspend_enter, |
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index aa34cac4eb5c..747d1ee661fd 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c | |||
@@ -309,7 +309,7 @@ static void __init mpc85xx_mds_qe_init(void) | |||
309 | /* P1021 has pins muxed for QE and other functions. To | 309 | /* P1021 has pins muxed for QE and other functions. To |
310 | * enable QE UEC mode, we need to set bit QE0 for UCC1 | 310 | * enable QE UEC mode, we need to set bit QE0 for UCC1 |
311 | * in Eth mode, QE0 and QE3 for UCC5 in Eth mode, QE9 | 311 | * in Eth mode, QE0 and QE3 for UCC5 in Eth mode, QE9 |
312 | * and QE12 for QE MII management singals in PMUXCR | 312 | * and QE12 for QE MII management signals in PMUXCR |
313 | * register. | 313 | * register. |
314 | */ | 314 | */ |
315 | setbits32(pmuxcr, MPC85xx_PMUXCR_QE0 | | 315 | setbits32(pmuxcr, MPC85xx_PMUXCR_QE0 | |
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c index b341018326df..6c4b5837fc8a 100644 --- a/arch/powerpc/platforms/ps3/device-init.c +++ b/arch/powerpc/platforms/ps3/device-init.c | |||
@@ -566,10 +566,10 @@ static int ps3_setup_dynamic_device(const struct ps3_repository_device *repo) | |||
566 | case PS3_DEV_TYPE_STOR_DISK: | 566 | case PS3_DEV_TYPE_STOR_DISK: |
567 | result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK); | 567 | result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK); |
568 | 568 | ||
569 | /* Some devices are not accessable from the Other OS lpar. */ | 569 | /* Some devices are not accessible from the Other OS lpar. */ |
570 | if (result == -ENODEV) { | 570 | if (result == -ENODEV) { |
571 | result = 0; | 571 | result = 0; |
572 | pr_debug("%s:%u: not accessable\n", __func__, | 572 | pr_debug("%s:%u: not accessible\n", __func__, |
573 | __LINE__); | 573 | __LINE__); |
574 | } | 574 | } |
575 | 575 | ||
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c index 59d9712d7364..92290ff4761a 100644 --- a/arch/powerpc/platforms/ps3/interrupt.c +++ b/arch/powerpc/platforms/ps3/interrupt.c | |||
@@ -44,7 +44,7 @@ | |||
44 | * @lock: | 44 | * @lock: |
45 | * @ipi_debug_brk_mask: | 45 | * @ipi_debug_brk_mask: |
46 | * | 46 | * |
47 | * The HV mantains per SMT thread mappings of HV outlet to HV plug on | 47 | * The HV maintains per SMT thread mappings of HV outlet to HV plug on |
48 | * behalf of the guest. These mappings are implemented as 256 bit guest | 48 | * behalf of the guest. These mappings are implemented as 256 bit guest |
49 | * supplied bitmaps indexed by plug number. The addresses of the bitmaps | 49 | * supplied bitmaps indexed by plug number. The addresses of the bitmaps |
50 | * are registered with the HV through lv1_configure_irq_state_bitmap(). | 50 | * are registered with the HV through lv1_configure_irq_state_bitmap(). |
diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c index e19ff021e711..f106662f4381 100644 --- a/arch/powerpc/platforms/pseries/hvCall_inst.c +++ b/arch/powerpc/platforms/pseries/hvCall_inst.c | |||
@@ -55,7 +55,7 @@ static void hc_stop(struct seq_file *m, void *p) | |||
55 | static int hc_show(struct seq_file *m, void *p) | 55 | static int hc_show(struct seq_file *m, void *p) |
56 | { | 56 | { |
57 | unsigned long h_num = (unsigned long)p; | 57 | unsigned long h_num = (unsigned long)p; |
58 | struct hcall_stats *hs = (struct hcall_stats *)m->private; | 58 | struct hcall_stats *hs = m->private; |
59 | 59 | ||
60 | if (hs[h_num].num_calls) { | 60 | if (hs[h_num].num_calls) { |
61 | if (cpu_has_feature(CPU_FTR_PURR)) | 61 | if (cpu_has_feature(CPU_FTR_PURR)) |
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c index ed72098bb4e3..a8ca289ff267 100644 --- a/arch/powerpc/platforms/pseries/suspend.c +++ b/arch/powerpc/platforms/pseries/suspend.c | |||
@@ -153,7 +153,7 @@ static struct sysdev_class suspend_sysdev_class = { | |||
153 | .name = "power", | 153 | .name = "power", |
154 | }; | 154 | }; |
155 | 155 | ||
156 | static struct platform_suspend_ops pseries_suspend_ops = { | 156 | static const struct platform_suspend_ops pseries_suspend_ops = { |
157 | .valid = suspend_valid_only_mem, | 157 | .valid = suspend_valid_only_mem, |
158 | .begin = pseries_suspend_begin, | 158 | .begin = pseries_suspend_begin, |
159 | .prepare_late = pseries_prepare_late, | 159 | .prepare_late = pseries_prepare_late, |
diff --git a/arch/powerpc/sysdev/fsl_pmc.c b/arch/powerpc/sysdev/fsl_pmc.c index 44de8559c975..e9381bfefb21 100644 --- a/arch/powerpc/sysdev/fsl_pmc.c +++ b/arch/powerpc/sysdev/fsl_pmc.c | |||
@@ -53,7 +53,7 @@ static int pmc_suspend_valid(suspend_state_t state) | |||
53 | return 1; | 53 | return 1; |
54 | } | 54 | } |
55 | 55 | ||
56 | static struct platform_suspend_ops pmc_suspend_ops = { | 56 | static const struct platform_suspend_ops pmc_suspend_ops = { |
57 | .valid = pmc_suspend_valid, | 57 | .valid = pmc_suspend_valid, |
58 | .enter = pmc_suspend_enter, | 58 | .enter = pmc_suspend_enter, |
59 | }; | 59 | }; |
diff --git a/arch/sh/boards/mach-hp6xx/pm.c b/arch/sh/boards/mach-hp6xx/pm.c index 4499a3749d40..adc9b4bba828 100644 --- a/arch/sh/boards/mach-hp6xx/pm.c +++ b/arch/sh/boards/mach-hp6xx/pm.c | |||
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_t state) | |||
143 | return 0; | 143 | return 0; |
144 | } | 144 | } |
145 | 145 | ||
146 | static struct platform_suspend_ops hp6x0_pm_ops = { | 146 | static const struct platform_suspend_ops hp6x0_pm_ops = { |
147 | .enter = hp6x0_pm_enter, | 147 | .enter = hp6x0_pm_enter, |
148 | .valid = suspend_valid_only_mem, | 148 | .valid = suspend_valid_only_mem, |
149 | }; | 149 | }; |
diff --git a/arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/shmobile/pm.c index e55968712706..a6f95ae4aae7 100644 --- a/arch/sh/kernel/cpu/shmobile/pm.c +++ b/arch/sh/kernel/cpu/shmobile/pm.c | |||
@@ -141,7 +141,7 @@ static int sh_pm_enter(suspend_state_t state) | |||
141 | return 0; | 141 | return 0; |
142 | } | 142 | } |
143 | 143 | ||
144 | static struct platform_suspend_ops sh_pm_ops = { | 144 | static const struct platform_suspend_ops sh_pm_ops = { |
145 | .enter = sh_pm_enter, | 145 | .enter = sh_pm_enter, |
146 | .valid = suspend_valid_only_mem, | 146 | .valid = suspend_valid_only_mem, |
147 | }; | 147 | }; |
diff --git a/arch/sh/mm/cache-sh5.c b/arch/sh/mm/cache-sh5.c index eb4cc4ec7952..d1bffbcd9d52 100644 --- a/arch/sh/mm/cache-sh5.c +++ b/arch/sh/mm/cache-sh5.c | |||
@@ -568,7 +568,7 @@ static void sh5_flush_dcache_page(void *page) | |||
568 | } | 568 | } |
569 | 569 | ||
570 | /* | 570 | /* |
571 | * Flush the range [start,end] of kernel virtual adddress space from | 571 | * Flush the range [start,end] of kernel virtual address space from |
572 | * the I-cache. The corresponding range must be purged from the | 572 | * the I-cache. The corresponding range must be purged from the |
573 | * D-cache also because the SH-5 doesn't have cache snooping between | 573 | * D-cache also because the SH-5 doesn't have cache snooping between |
574 | * the caches. The addresses will be visible through the superpage | 574 | * the caches. The addresses will be visible through the superpage |
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index 42ad2ba85010..1e9770936c3b 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c | |||
@@ -622,7 +622,7 @@ static const char CHAFSR_PERR_msg[] = | |||
622 | static const char CHAFSR_IERR_msg[] = | 622 | static const char CHAFSR_IERR_msg[] = |
623 | "Internal processor error"; | 623 | "Internal processor error"; |
624 | static const char CHAFSR_ISAP_msg[] = | 624 | static const char CHAFSR_ISAP_msg[] = |
625 | "System request parity error on incoming addresss"; | 625 | "System request parity error on incoming address"; |
626 | static const char CHAFSR_UCU_msg[] = | 626 | static const char CHAFSR_UCU_msg[] = |
627 | "Uncorrectable E-cache ECC error for ifetch/data"; | 627 | "Uncorrectable E-cache ECC error for ifetch/data"; |
628 | static const char CHAFSR_UCC_msg[] = | 628 | static const char CHAFSR_UCC_msg[] = |
diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h index 271de94c3810..b4389a468fb6 100644 --- a/arch/x86/include/asm/pgalloc.h +++ b/arch/x86/include/asm/pgalloc.h | |||
@@ -92,7 +92,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) | |||
92 | extern void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd); | 92 | extern void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd); |
93 | 93 | ||
94 | static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd, | 94 | static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd, |
95 | unsigned long adddress) | 95 | unsigned long address) |
96 | { | 96 | { |
97 | ___pmd_free_tlb(tlb, pmd); | 97 | ___pmd_free_tlb(tlb, pmd); |
98 | } | 98 | } |
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index c6efecf85a6a..53fd1d5a1fe0 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h | |||
@@ -901,7 +901,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk); | |||
901 | /* | 901 | /* |
902 | * The below -8 is to reserve 8 bytes on top of the ring0 stack. | 902 | * The below -8 is to reserve 8 bytes on top of the ring0 stack. |
903 | * This is necessary to guarantee that the entire "struct pt_regs" | 903 | * This is necessary to guarantee that the entire "struct pt_regs" |
904 | * is accessable even if the CPU haven't stored the SS/ESP registers | 904 | * is accessible even if the CPU haven't stored the SS/ESP registers |
905 | * on the stack (interrupt gate does not save these registers | 905 | * on the stack (interrupt gate does not save these registers |
906 | * when switching to the same priv ring). | 906 | * when switching to the same priv ring). |
907 | * Therefore beware: accessing the ss/esp fields of the | 907 | * Therefore beware: accessing the ss/esp fields of the |
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index d2fdb0826df2..57ca77787220 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -1086,7 +1086,7 @@ static int alloc_new_range(struct dma_ops_domain *dma_dom, | |||
1086 | 1086 | ||
1087 | dma_dom->aperture_size += APERTURE_RANGE_SIZE; | 1087 | dma_dom->aperture_size += APERTURE_RANGE_SIZE; |
1088 | 1088 | ||
1089 | /* Intialize the exclusion range if necessary */ | 1089 | /* Initialize the exclusion range if necessary */ |
1090 | for_each_iommu(iommu) { | 1090 | for_each_iommu(iommu) { |
1091 | if (iommu->exclusion_start && | 1091 | if (iommu->exclusion_start && |
1092 | iommu->exclusion_start >= dma_dom->aperture[index]->offset | 1092 | iommu->exclusion_start >= dma_dom->aperture[index]->offset |
@@ -1353,7 +1353,7 @@ static void dma_ops_domain_free(struct dma_ops_domain *dom) | |||
1353 | 1353 | ||
1354 | /* | 1354 | /* |
1355 | * Allocates a new protection domain usable for the dma_ops functions. | 1355 | * Allocates a new protection domain usable for the dma_ops functions. |
1356 | * It also intializes the page table and the address allocator data | 1356 | * It also initializes the page table and the address allocator data |
1357 | * structures required for the dma_ops interface | 1357 | * structures required for the dma_ops interface |
1358 | */ | 1358 | */ |
1359 | static struct dma_ops_domain *dma_ops_domain_alloc(void) | 1359 | static struct dma_ops_domain *dma_ops_domain_alloc(void) |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 9f54b209c378..fc293dc8dc35 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -126,7 +126,7 @@ ENTRY(startup_32) | |||
126 | movsl | 126 | movsl |
127 | movl pa(boot_params) + NEW_CL_POINTER,%esi | 127 | movl pa(boot_params) + NEW_CL_POINTER,%esi |
128 | andl %esi,%esi | 128 | andl %esi,%esi |
129 | jz 1f # No comand line | 129 | jz 1f # No command line |
130 | movl $pa(boot_command_line),%edi | 130 | movl $pa(boot_command_line),%edi |
131 | movl $(COMMAND_LINE_SIZE/4),%ecx | 131 | movl $(COMMAND_LINE_SIZE/4),%ecx |
132 | rep | 132 | rep |
diff --git a/arch/x86/platform/mrst/early_printk_mrst.c b/arch/x86/platform/mrst/early_printk_mrst.c index 65df603622b2..25bfdbb5b130 100644 --- a/arch/x86/platform/mrst/early_printk_mrst.c +++ b/arch/x86/platform/mrst/early_printk_mrst.c | |||
@@ -103,7 +103,7 @@ struct dw_spi_reg { | |||
103 | static unsigned long mrst_spi_paddr = MRST_REGBASE_SPI0; | 103 | static unsigned long mrst_spi_paddr = MRST_REGBASE_SPI0; |
104 | 104 | ||
105 | static u32 *pclk_spi0; | 105 | static u32 *pclk_spi0; |
106 | /* Always contains an accessable address, start with 0 */ | 106 | /* Always contains an accessible address, start with 0 */ |
107 | static struct dw_spi_reg *pspi; | 107 | static struct dw_spi_reg *pspi; |
108 | 108 | ||
109 | static struct kmsg_dumper dw_dumper; | 109 | static struct kmsg_dumper dw_dumper; |
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 4cd59b0d7c15..78ee4b1d4e85 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -1030,7 +1030,7 @@ cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create) | |||
1030 | 1030 | ||
1031 | /* | 1031 | /* |
1032 | * Add group onto cgroup list. It might happen that bdi->dev is | 1032 | * Add group onto cgroup list. It might happen that bdi->dev is |
1033 | * not initiliazed yet. Initialize this new group without major | 1033 | * not initialized yet. Initialize this new group without major |
1034 | * and minor info and this info will be filled in once a new thread | 1034 | * and minor info and this info will be filled in once a new thread |
1035 | * comes for IO. See code above. | 1035 | * comes for IO. See code above. |
1036 | */ | 1036 | */ |
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h index bdbfaf22bd14..962a3ccff6fd 100644 --- a/drivers/acpi/acpica/acobject.h +++ b/drivers/acpi/acpica/acobject.h | |||
@@ -93,7 +93,7 @@ | |||
93 | 93 | ||
94 | #define AOPOBJ_AML_CONSTANT 0x01 /* Integer is an AML constant */ | 94 | #define AOPOBJ_AML_CONSTANT 0x01 /* Integer is an AML constant */ |
95 | #define AOPOBJ_STATIC_POINTER 0x02 /* Data is part of an ACPI table, don't delete */ | 95 | #define AOPOBJ_STATIC_POINTER 0x02 /* Data is part of an ACPI table, don't delete */ |
96 | #define AOPOBJ_DATA_VALID 0x04 /* Object is intialized and data is valid */ | 96 | #define AOPOBJ_DATA_VALID 0x04 /* Object is initialized and data is valid */ |
97 | #define AOPOBJ_OBJECT_INITIALIZED 0x08 /* Region is initialized, _REG was run */ | 97 | #define AOPOBJ_OBJECT_INITIALIZED 0x08 /* Region is initialized, _REG was run */ |
98 | #define AOPOBJ_SETUP_COMPLETE 0x10 /* Region setup is complete */ | 98 | #define AOPOBJ_SETUP_COMPLETE 0x10 /* Region setup is complete */ |
99 | #define AOPOBJ_INVALID 0x20 /* Host OS won't allow a Region address */ | 99 | #define AOPOBJ_INVALID 0x20 /* Host OS won't allow a Region address */ |
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index cf29df69380b..096aebfe7f32 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #define EINJ_PFX "EINJ: " | 39 | #define EINJ_PFX "EINJ: " |
40 | 40 | ||
41 | #define SPIN_UNIT 100 /* 100ns */ | 41 | #define SPIN_UNIT 100 /* 100ns */ |
42 | /* Firmware should respond within 1 miliseconds */ | 42 | /* Firmware should respond within 1 milliseconds */ |
43 | #define FIRMWARE_TIMEOUT (1 * NSEC_PER_MSEC) | 43 | #define FIRMWARE_TIMEOUT (1 * NSEC_PER_MSEC) |
44 | 44 | ||
45 | /* | 45 | /* |
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c index 5850d320404c..cf6db6b7662a 100644 --- a/drivers/acpi/apei/erst.c +++ b/drivers/acpi/apei/erst.c | |||
@@ -53,7 +53,7 @@ | |||
53 | sizeof(struct acpi_table_erst))) | 53 | sizeof(struct acpi_table_erst))) |
54 | 54 | ||
55 | #define SPIN_UNIT 100 /* 100ns */ | 55 | #define SPIN_UNIT 100 /* 100ns */ |
56 | /* Firmware should respond within 1 miliseconds */ | 56 | /* Firmware should respond within 1 milliseconds */ |
57 | #define FIRMWARE_TIMEOUT (1 * NSEC_PER_MSEC) | 57 | #define FIRMWARE_TIMEOUT (1 * NSEC_PER_MSEC) |
58 | #define FIRMWARE_MAX_STALL 50 /* 50us */ | 58 | #define FIRMWARE_MAX_STALL 50 /* 50us */ |
59 | 59 | ||
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index febb153b5a68..c423231b952b 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -319,7 +319,7 @@ static int acpi_suspend_state_valid(suspend_state_t pm_state) | |||
319 | } | 319 | } |
320 | } | 320 | } |
321 | 321 | ||
322 | static struct platform_suspend_ops acpi_suspend_ops = { | 322 | static const struct platform_suspend_ops acpi_suspend_ops = { |
323 | .valid = acpi_suspend_state_valid, | 323 | .valid = acpi_suspend_state_valid, |
324 | .begin = acpi_suspend_begin, | 324 | .begin = acpi_suspend_begin, |
325 | .prepare_late = acpi_pm_prepare, | 325 | .prepare_late = acpi_pm_prepare, |
@@ -347,7 +347,7 @@ static int acpi_suspend_begin_old(suspend_state_t pm_state) | |||
347 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has | 347 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has |
348 | * been requested. | 348 | * been requested. |
349 | */ | 349 | */ |
350 | static struct platform_suspend_ops acpi_suspend_ops_old = { | 350 | static const struct platform_suspend_ops acpi_suspend_ops_old = { |
351 | .valid = acpi_suspend_state_valid, | 351 | .valid = acpi_suspend_state_valid, |
352 | .begin = acpi_suspend_begin_old, | 352 | .begin = acpi_suspend_begin_old, |
353 | .prepare_late = acpi_pm_pre_suspend, | 353 | .prepare_late = acpi_pm_pre_suspend, |
@@ -506,7 +506,7 @@ static void acpi_pm_thaw(void) | |||
506 | acpi_enable_all_runtime_gpes(); | 506 | acpi_enable_all_runtime_gpes(); |
507 | } | 507 | } |
508 | 508 | ||
509 | static struct platform_hibernation_ops acpi_hibernation_ops = { | 509 | static const struct platform_hibernation_ops acpi_hibernation_ops = { |
510 | .begin = acpi_hibernation_begin, | 510 | .begin = acpi_hibernation_begin, |
511 | .end = acpi_pm_end, | 511 | .end = acpi_pm_end, |
512 | .pre_snapshot = acpi_pm_prepare, | 512 | .pre_snapshot = acpi_pm_prepare, |
@@ -549,7 +549,7 @@ static int acpi_hibernation_begin_old(void) | |||
549 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has | 549 | * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has |
550 | * been requested. | 550 | * been requested. |
551 | */ | 551 | */ |
552 | static struct platform_hibernation_ops acpi_hibernation_ops_old = { | 552 | static const struct platform_hibernation_ops acpi_hibernation_ops_old = { |
553 | .begin = acpi_hibernation_begin_old, | 553 | .begin = acpi_hibernation_begin_old, |
554 | .end = acpi_pm_end, | 554 | .end = acpi_pm_end, |
555 | .pre_snapshot = acpi_pm_pre_suspend, | 555 | .pre_snapshot = acpi_pm_pre_suspend, |
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 5cd0228d2daa..15a0fde4b32a 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -260,7 +260,7 @@ static int acpi_video_set_brightness(struct backlight_device *bd) | |||
260 | vd->brightness->levels[request_level]); | 260 | vd->brightness->levels[request_level]); |
261 | } | 261 | } |
262 | 262 | ||
263 | static struct backlight_ops acpi_backlight_ops = { | 263 | static const struct backlight_ops acpi_backlight_ops = { |
264 | .get_brightness = acpi_video_get_brightness, | 264 | .get_brightness = acpi_video_get_brightness, |
265 | .update_status = acpi_video_set_brightness, | 265 | .update_status = acpi_video_set_brightness, |
266 | }; | 266 | }; |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 0a6a943b3779..a31fe96f7de6 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -2240,7 +2240,7 @@ int ata_dev_configure(struct ata_device *dev) | |||
2240 | if (id[ATA_ID_CFA_KEY_MGMT] & 1) | 2240 | if (id[ATA_ID_CFA_KEY_MGMT] & 1) |
2241 | ata_dev_printk(dev, KERN_WARNING, | 2241 | ata_dev_printk(dev, KERN_WARNING, |
2242 | "supports DRM functions and may " | 2242 | "supports DRM functions and may " |
2243 | "not be fully accessable.\n"); | 2243 | "not be fully accessible.\n"); |
2244 | snprintf(revbuf, 7, "CFA"); | 2244 | snprintf(revbuf, 7, "CFA"); |
2245 | } else { | 2245 | } else { |
2246 | snprintf(revbuf, 7, "ATA-%d", ata_id_major_version(id)); | 2246 | snprintf(revbuf, 7, "ATA-%d", ata_id_major_version(id)); |
@@ -2248,7 +2248,7 @@ int ata_dev_configure(struct ata_device *dev) | |||
2248 | if (ata_id_has_tpm(id)) | 2248 | if (ata_id_has_tpm(id)) |
2249 | ata_dev_printk(dev, KERN_WARNING, | 2249 | ata_dev_printk(dev, KERN_WARNING, |
2250 | "supports DRM functions and may " | 2250 | "supports DRM functions and may " |
2251 | "not be fully accessable.\n"); | 2251 | "not be fully accessible.\n"); |
2252 | } | 2252 | } |
2253 | 2253 | ||
2254 | dev->n_sectors = ata_id_n_sectors(id); | 2254 | dev->n_sectors = ata_id_n_sectors(id); |
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c index b777176ff494..e079cf29ed5d 100644 --- a/drivers/ata/sata_vsc.c +++ b/drivers/ata/sata_vsc.c | |||
@@ -370,7 +370,7 @@ static int __devinit vsc_sata_init_one(struct pci_dev *pdev, | |||
370 | if (pci_resource_len(pdev, 0) == 0) | 370 | if (pci_resource_len(pdev, 0) == 0) |
371 | return -ENODEV; | 371 | return -ENODEV; |
372 | 372 | ||
373 | /* map IO regions and intialize host accordingly */ | 373 | /* map IO regions and initialize host accordingly */ |
374 | rc = pcim_iomap_regions(pdev, 1 << VSC_MMIO_BAR, DRV_NAME); | 374 | rc = pcim_iomap_regions(pdev, 1 << VSC_MMIO_BAR, DRV_NAME); |
375 | if (rc == -EBUSY) | 375 | if (rc == -EBUSY) |
376 | pcim_pin_device(pdev); | 376 | pcim_pin_device(pdev); |
diff --git a/drivers/atm/idt77252.h b/drivers/atm/idt77252.h index 5042bb2dab15..f53a43ae2bbe 100644 --- a/drivers/atm/idt77252.h +++ b/drivers/atm/idt77252.h | |||
@@ -572,7 +572,7 @@ struct idt77252_dev | |||
572 | #define SAR_STAT_TSQF 0x00001000 /* Transmit Status Queue full */ | 572 | #define SAR_STAT_TSQF 0x00001000 /* Transmit Status Queue full */ |
573 | #define SAR_STAT_TMROF 0x00000800 /* Timer overflow */ | 573 | #define SAR_STAT_TMROF 0x00000800 /* Timer overflow */ |
574 | #define SAR_STAT_PHYI 0x00000400 /* PHY device Interrupt flag */ | 574 | #define SAR_STAT_PHYI 0x00000400 /* PHY device Interrupt flag */ |
575 | #define SAR_STAT_CMDBZ 0x00000200 /* ABR SAR Comand Busy Flag */ | 575 | #define SAR_STAT_CMDBZ 0x00000200 /* ABR SAR Command Busy Flag */ |
576 | #define SAR_STAT_FBQ3A 0x00000100 /* Free Buffer Queue 3 Attention */ | 576 | #define SAR_STAT_FBQ3A 0x00000100 /* Free Buffer Queue 3 Attention */ |
577 | #define SAR_STAT_FBQ2A 0x00000080 /* Free Buffer Queue 2 Attention */ | 577 | #define SAR_STAT_FBQ2A 0x00000080 /* Free Buffer Queue 2 Attention */ |
578 | #define SAR_STAT_RSQF 0x00000040 /* Receive Status Queue full */ | 578 | #define SAR_STAT_RSQF 0x00000040 /* Receive Status Queue full */ |
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 729254053758..d80d51b62a1a 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
@@ -2063,7 +2063,7 @@ static int tx_init(struct atm_dev *dev) | |||
2063 | - UBR Table size is 4K | 2063 | - UBR Table size is 4K |
2064 | - UBR wait queue is 4K | 2064 | - UBR wait queue is 4K |
2065 | since the table and wait queues are contiguous, all the bytes | 2065 | since the table and wait queues are contiguous, all the bytes |
2066 | can be initialized by one memeset. | 2066 | can be initialized by one memeset. |
2067 | */ | 2067 | */ |
2068 | 2068 | ||
2069 | vcsize_sel = 0; | 2069 | vcsize_sel = 0; |
@@ -2089,7 +2089,7 @@ static int tx_init(struct atm_dev *dev) | |||
2089 | - ABR Table size is 2K | 2089 | - ABR Table size is 2K |
2090 | - ABR wait queue is 2K | 2090 | - ABR wait queue is 2K |
2091 | since the table and wait queues are contiguous, all the bytes | 2091 | since the table and wait queues are contiguous, all the bytes |
2092 | can be intialized by one memeset. | 2092 | can be initialized by one memeset. |
2093 | */ | 2093 | */ |
2094 | i = ABR_SCHED_TABLE * iadev->memSize; | 2094 | i = ABR_SCHED_TABLE * iadev->memSize; |
2095 | writew((i >> 11) & 0xffff, iadev->seg_reg+ABR_SBPTR_BASE); | 2095 | writew((i >> 11) & 0xffff, iadev->seg_reg+ABR_SBPTR_BASE); |
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index e243bd49764b..000e7b2006f8 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c | |||
@@ -975,7 +975,7 @@ struct klist *bus_get_device_klist(struct bus_type *bus) | |||
975 | EXPORT_SYMBOL_GPL(bus_get_device_klist); | 975 | EXPORT_SYMBOL_GPL(bus_get_device_klist); |
976 | 976 | ||
977 | /* | 977 | /* |
978 | * Yes, this forcably breaks the klist abstraction temporarily. It | 978 | * Yes, this forcibly breaks the klist abstraction temporarily. It |
979 | * just wants to sort the klist, not change reference counts and | 979 | * just wants to sort the klist, not change reference counts and |
980 | * take/drop locks rapidly in the process. It does all this while | 980 | * take/drop locks rapidly in the process. It does all this while |
981 | * holding the lock for the list, so objects can't otherwise be | 981 | * holding the lock for the list, so objects can't otherwise be |
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 2a52270aeb30..83404973f97a 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * | 8 | * |
9 | * | 9 | * |
10 | * The driver model core calls device_pm_add() when a device is registered. | 10 | * The driver model core calls device_pm_add() when a device is registered. |
11 | * This will intialize the embedded device_pm_info object in the device | 11 | * This will initialize the embedded device_pm_info object in the device |
12 | * and add it to the list of power-controlled devices. sysfs entries for | 12 | * and add it to the list of power-controlled devices. sysfs entries for |
13 | * controlling device power management will also be added. | 13 | * controlling device power management will also be added. |
14 | * | 14 | * |
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c index 3109bd94bc4f..78266382797e 100644 --- a/drivers/dma/intel_mid_dma.c +++ b/drivers/dma/intel_mid_dma.c | |||
@@ -1060,8 +1060,8 @@ static irqreturn_t intel_mid_dma_interrupt2(int irq, void *data) | |||
1060 | * mid_setup_dma - Setup the DMA controller | 1060 | * mid_setup_dma - Setup the DMA controller |
1061 | * @pdev: Controller PCI device structure | 1061 | * @pdev: Controller PCI device structure |
1062 | * | 1062 | * |
1063 | * Initilize the DMA controller, channels, registers with DMA engine, | 1063 | * Initialize the DMA controller, channels, registers with DMA engine, |
1064 | * ISR. Initilize DMA controller channels. | 1064 | * ISR. Initialize DMA controller channels. |
1065 | */ | 1065 | */ |
1066 | static int mid_setup_dma(struct pci_dev *pdev) | 1066 | static int mid_setup_dma(struct pci_dev *pdev) |
1067 | { | 1067 | { |
@@ -1217,7 +1217,7 @@ static void middma_shutdown(struct pci_dev *pdev) | |||
1217 | * @pdev: Controller PCI device structure | 1217 | * @pdev: Controller PCI device structure |
1218 | * @id: pci device id structure | 1218 | * @id: pci device id structure |
1219 | * | 1219 | * |
1220 | * Initilize the PCI device, map BARs, query driver data. | 1220 | * Initialize the PCI device, map BARs, query driver data. |
1221 | * Call setup_dma to complete contoller and chan initilzation | 1221 | * Call setup_dma to complete contoller and chan initilzation |
1222 | */ | 1222 | */ |
1223 | static int __devinit intel_mid_dma_probe(struct pci_dev *pdev, | 1223 | static int __devinit intel_mid_dma_probe(struct pci_dev *pdev, |
diff --git a/drivers/edac/amd8131_edac.h b/drivers/edac/amd8131_edac.h index 60e0d1c72dee..6f8b07131ec4 100644 --- a/drivers/edac/amd8131_edac.h +++ b/drivers/edac/amd8131_edac.h | |||
@@ -99,7 +99,7 @@ struct amd8131_dev_info { | |||
99 | 99 | ||
100 | /* | 100 | /* |
101 | * AMD8131 chipset has two pairs of PCIX Bridge and related IOAPIC | 101 | * AMD8131 chipset has two pairs of PCIX Bridge and related IOAPIC |
102 | * Controler, and ATCA-6101 has two AMD8131 chipsets, so there are | 102 | * Controller, and ATCA-6101 has two AMD8131 chipsets, so there are |
103 | * four PCIX Bridges on ATCA-6101 altogether. | 103 | * four PCIX Bridges on ATCA-6101 altogether. |
104 | * | 104 | * |
105 | * These PCIX Bridges share the same PCI Device ID and are all of | 105 | * These PCIX Bridges share the same PCI Device ID and are all of |
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c index c973004c002c..db1df59ae2b6 100644 --- a/drivers/edac/cell_edac.c +++ b/drivers/edac/cell_edac.c | |||
@@ -47,7 +47,7 @@ static void cell_edac_count_ce(struct mem_ctl_info *mci, int chan, u64 ar) | |||
47 | offset = address & ~PAGE_MASK; | 47 | offset = address & ~PAGE_MASK; |
48 | syndrome = (ar & 0x000000001fe00000ul) >> 21; | 48 | syndrome = (ar & 0x000000001fe00000ul) >> 21; |
49 | 49 | ||
50 | /* TODO: Decoding of the error addresss */ | 50 | /* TODO: Decoding of the error address */ |
51 | edac_mc_handle_ce(mci, csrow->first_page + pfn, offset, | 51 | edac_mc_handle_ce(mci, csrow->first_page + pfn, offset, |
52 | syndrome, 0, chan, ""); | 52 | syndrome, 0, chan, ""); |
53 | } | 53 | } |
@@ -68,7 +68,7 @@ static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar) | |||
68 | pfn = address >> PAGE_SHIFT; | 68 | pfn = address >> PAGE_SHIFT; |
69 | offset = address & ~PAGE_MASK; | 69 | offset = address & ~PAGE_MASK; |
70 | 70 | ||
71 | /* TODO: Decoding of the error addresss */ | 71 | /* TODO: Decoding of the error address */ |
72 | edac_mc_handle_ue(mci, csrow->first_page + pfn, offset, 0, ""); | 72 | edac_mc_handle_ue(mci, csrow->first_page + pfn, offset, 0, ""); |
73 | } | 73 | } |
74 | 74 | ||
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index ff1eb7bb26c6..3d965347a673 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h | |||
@@ -259,7 +259,7 @@ enum scrub_type { | |||
259 | * for single channel are 64 bits, for dual channel 128 | 259 | * for single channel are 64 bits, for dual channel 128 |
260 | * bits. | 260 | * bits. |
261 | * | 261 | * |
262 | * Single-Ranked stick: A Single-ranked stick has 1 chip-select row of memmory. | 262 | * Single-Ranked stick: A Single-ranked stick has 1 chip-select row of memory. |
263 | * Motherboards commonly drive two chip-select pins to | 263 | * Motherboards commonly drive two chip-select pins to |
264 | * a memory stick. A single-ranked stick, will occupy | 264 | * a memory stick. A single-ranked stick, will occupy |
265 | * only one of those rows. The other will be unused. | 265 | * only one of those rows. The other will be unused. |
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 362861c15779..81154ab296b6 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* Intel i7 core/Nehalem Memory Controller kernel module | 1 | /* Intel i7 core/Nehalem Memory Controller kernel module |
2 | * | 2 | * |
3 | * This driver supports yhe memory controllers found on the Intel | 3 | * This driver supports the memory controllers found on the Intel |
4 | * processor families i7core, i7core 7xx/8xx, i5core, Xeon 35xx, | 4 | * processor families i7core, i7core 7xx/8xx, i5core, Xeon 35xx, |
5 | * Xeon 55xx and Xeon 56xx also known as Nehalem, Nehalem-EP, Lynnfield | 5 | * Xeon 55xx and Xeon 56xx also known as Nehalem, Nehalem-EP, Lynnfield |
6 | * and Westmere-EP. | 6 | * and Westmere-EP. |
@@ -1271,7 +1271,7 @@ static void __init i7core_xeon_pci_fixup(const struct pci_id_table *table) | |||
1271 | int i; | 1271 | int i; |
1272 | 1272 | ||
1273 | /* | 1273 | /* |
1274 | * On Xeon 55xx, the Intel Quckpath Arch Generic Non-core pci buses | 1274 | * On Xeon 55xx, the Intel Quick Path Arch Generic Non-core pci buses |
1275 | * aren't announced by acpi. So, we need to use a legacy scan probing | 1275 | * aren't announced by acpi. So, we need to use a legacy scan probing |
1276 | * to detect them | 1276 | * to detect them |
1277 | */ | 1277 | */ |
@@ -1864,7 +1864,7 @@ static int i7core_mce_check_error(void *priv, struct mce *mce) | |||
1864 | if (mce->mcgstatus & 1) | 1864 | if (mce->mcgstatus & 1) |
1865 | i7core_check_error(mci); | 1865 | i7core_check_error(mci); |
1866 | 1866 | ||
1867 | /* Advice mcelog that the error were handled */ | 1867 | /* Advise mcelog that the errors were handled */ |
1868 | return 1; | 1868 | return 1; |
1869 | } | 1869 | } |
1870 | 1870 | ||
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index 070cea41b661..b9f0c20df1aa 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c | |||
@@ -873,7 +873,7 @@ ppc4xx_edac_get_mtype(u32 mcopt1) | |||
873 | } | 873 | } |
874 | 874 | ||
875 | /** | 875 | /** |
876 | * ppc4xx_edac_init_csrows - intialize driver instance rows | 876 | * ppc4xx_edac_init_csrows - initialize driver instance rows |
877 | * @mci: A pointer to the EDAC memory controller instance | 877 | * @mci: A pointer to the EDAC memory controller instance |
878 | * associated with the ibm,sdram-4xx-ddr2 controller for which | 878 | * associated with the ibm,sdram-4xx-ddr2 controller for which |
879 | * the csrows (i.e. banks/ranks) are being initialized. | 879 | * the csrows (i.e. banks/ranks) are being initialized. |
@@ -881,7 +881,7 @@ ppc4xx_edac_get_mtype(u32 mcopt1) | |||
881 | * currently set for the controller, from which bank width | 881 | * currently set for the controller, from which bank width |
882 | * and memory typ information is derived. | 882 | * and memory typ information is derived. |
883 | * | 883 | * |
884 | * This routine intializes the virtual "chip select rows" associated | 884 | * This routine initializes the virtual "chip select rows" associated |
885 | * with the EDAC memory controller instance. An ibm,sdram-4xx-ddr2 | 885 | * with the EDAC memory controller instance. An ibm,sdram-4xx-ddr2 |
886 | * controller bank/rank is mapped to a row. | 886 | * controller bank/rank is mapped to a row. |
887 | * | 887 | * |
@@ -992,7 +992,7 @@ ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1) | |||
992 | } | 992 | } |
993 | 993 | ||
994 | /** | 994 | /** |
995 | * ppc4xx_edac_mc_init - intialize driver instance | 995 | * ppc4xx_edac_mc_init - initialize driver instance |
996 | * @mci: A pointer to the EDAC memory controller instance being | 996 | * @mci: A pointer to the EDAC memory controller instance being |
997 | * initialized. | 997 | * initialized. |
998 | * @op: A pointer to the OpenFirmware device tree node associated | 998 | * @op: A pointer to the OpenFirmware device tree node associated |
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c index b14c81110575..d3a9c6e02477 100644 --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c | |||
@@ -59,7 +59,7 @@ static int nv40_set_intensity(struct backlight_device *bd) | |||
59 | return 0; | 59 | return 0; |
60 | } | 60 | } |
61 | 61 | ||
62 | static struct backlight_ops nv40_bl_ops = { | 62 | static const struct backlight_ops nv40_bl_ops = { |
63 | .options = BL_CORE_SUSPENDRESUME, | 63 | .options = BL_CORE_SUSPENDRESUME, |
64 | .get_brightness = nv40_get_intensity, | 64 | .get_brightness = nv40_get_intensity, |
65 | .update_status = nv40_set_intensity, | 65 | .update_status = nv40_set_intensity, |
@@ -82,7 +82,7 @@ static int nv50_set_intensity(struct backlight_device *bd) | |||
82 | return 0; | 82 | return 0; |
83 | } | 83 | } |
84 | 84 | ||
85 | static struct backlight_ops nv50_bl_ops = { | 85 | static const struct backlight_ops nv50_bl_ops = { |
86 | .options = BL_CORE_SUSPENDRESUME, | 86 | .options = BL_CORE_SUSPENDRESUME, |
87 | .get_brightness = nv50_get_intensity, | 87 | .get_brightness = nv50_get_intensity, |
88 | .update_status = nv50_set_intensity, | 88 | .update_status = nv50_set_intensity, |
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index d3046559bf05..2aef5cd3acf5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c | |||
@@ -1927,7 +1927,7 @@ init_ltime(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) | |||
1927 | * offset (8 bit): opcode | 1927 | * offset (8 bit): opcode |
1928 | * offset + 1 (16 bit): time | 1928 | * offset + 1 (16 bit): time |
1929 | * | 1929 | * |
1930 | * Sleep for "time" miliseconds. | 1930 | * Sleep for "time" milliseconds. |
1931 | */ | 1931 | */ |
1932 | 1932 | ||
1933 | unsigned time = ROM16(bios->data[offset + 1]); | 1933 | unsigned time = ROM16(bios->data[offset + 1]); |
@@ -1935,7 +1935,7 @@ init_ltime(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) | |||
1935 | if (!iexec->execute) | 1935 | if (!iexec->execute) |
1936 | return 3; | 1936 | return 3; |
1937 | 1937 | ||
1938 | BIOSLOG(bios, "0x%04X: Sleeping for 0x%04X miliseconds\n", | 1938 | BIOSLOG(bios, "0x%04X: Sleeping for 0x%04X milliseconds\n", |
1939 | offset, time); | 1939 | offset, time); |
1940 | 1940 | ||
1941 | msleep(time); | 1941 | msleep(time); |
diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h index 58a0cd02c0a2..04b269d14a59 100644 --- a/drivers/gpu/drm/radeon/atombios.h +++ b/drivers/gpu/drm/radeon/atombios.h | |||
@@ -1629,7 +1629,7 @@ typedef struct _GET_ENGINE_CLOCK_PARAMETERS | |||
1629 | typedef struct _READ_EDID_FROM_HW_I2C_DATA_PARAMETERS | 1629 | typedef struct _READ_EDID_FROM_HW_I2C_DATA_PARAMETERS |
1630 | { | 1630 | { |
1631 | USHORT usPrescale; //Ratio between Engine clock and I2C clock | 1631 | USHORT usPrescale; //Ratio between Engine clock and I2C clock |
1632 | USHORT usVRAMAddress; //Adress in Frame Buffer where to pace raw EDID | 1632 | USHORT usVRAMAddress; //Address in Frame Buffer where to pace raw EDID |
1633 | USHORT usStatus; //When use output: lower byte EDID checksum, high byte hardware status | 1633 | USHORT usStatus; //When use output: lower byte EDID checksum, high byte hardware status |
1634 | //WHen use input: lower byte as 'byte to read':currently limited to 128byte or 1byte | 1634 | //WHen use input: lower byte as 'byte to read':currently limited to 128byte or 1byte |
1635 | UCHAR ucSlaveAddr; //Read from which slave | 1635 | UCHAR ucSlaveAddr; //Read from which slave |
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index c9fffd0389fe..2bd3469b3071 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c | |||
@@ -434,7 +434,7 @@ static int read_i2c(struct nmk_i2c_dev *dev) | |||
434 | } | 434 | } |
435 | 435 | ||
436 | if (timeout == 0) { | 436 | if (timeout == 0) { |
437 | /* controler has timedout, re-init the h/w */ | 437 | /* controller has timedout, re-init the h/w */ |
438 | dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n"); | 438 | dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n"); |
439 | (void) init_hw(dev); | 439 | (void) init_hw(dev); |
440 | status = -ETIMEDOUT; | 440 | status = -ETIMEDOUT; |
@@ -498,7 +498,7 @@ static int write_i2c(struct nmk_i2c_dev *dev) | |||
498 | } | 498 | } |
499 | 499 | ||
500 | if (timeout == 0) { | 500 | if (timeout == 0) { |
501 | /* controler has timedout, re-init the h/w */ | 501 | /* controller has timedout, re-init the h/w */ |
502 | dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n"); | 502 | dev_err(&dev->pdev->dev, "controller timed out, re-init h/w\n"); |
503 | (void) init_hw(dev); | 503 | (void) init_hw(dev); |
504 | status = -ETIMEDOUT; | 504 | status = -ETIMEDOUT; |
diff --git a/drivers/infiniband/hw/cxgb3/cxio_wr.h b/drivers/infiniband/hw/cxgb3/cxio_wr.h index 4bb997aa39d0..83d2e19d31ae 100644 --- a/drivers/infiniband/hw/cxgb3/cxio_wr.h +++ b/drivers/infiniband/hw/cxgb3/cxio_wr.h | |||
@@ -689,7 +689,7 @@ struct t3_swrq { | |||
689 | * A T3 WQ implements both the SQ and RQ. | 689 | * A T3 WQ implements both the SQ and RQ. |
690 | */ | 690 | */ |
691 | struct t3_wq { | 691 | struct t3_wq { |
692 | union t3_wr *queue; /* DMA accessable memory */ | 692 | union t3_wr *queue; /* DMA accessible memory */ |
693 | dma_addr_t dma_addr; /* DMA address for HW */ | 693 | dma_addr_t dma_addr; /* DMA address for HW */ |
694 | DEFINE_DMA_UNMAP_ADDR(mapping); /* unmap kruft */ | 694 | DEFINE_DMA_UNMAP_ADDR(mapping); /* unmap kruft */ |
695 | u32 error; /* 1 once we go to ERROR */ | 695 | u32 error; /* 1 once we go to ERROR */ |
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h index cc600c2dd0b3..2fe19ec9ba60 100644 --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <linux/timer.h> | 46 | #include <linux/timer.h> |
47 | #include <linux/io.h> | 47 | #include <linux/io.h> |
48 | #include <linux/kfifo.h> | 48 | #include <linux/kfifo.h> |
49 | #include <linux/mutex.h> | ||
50 | 49 | ||
51 | #include <asm/byteorder.h> | 50 | #include <asm/byteorder.h> |
52 | 51 | ||
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c index dbbb0e85afe4..abd409d592ef 100644 --- a/drivers/infiniband/hw/qib/qib_iba7322.c +++ b/drivers/infiniband/hw/qib/qib_iba7322.c | |||
@@ -332,7 +332,7 @@ MODULE_PARM_DESC(txselect, \ | |||
332 | #define krp_serdesctrl KREG_IBPORT_IDX(IBSerdesCtrl) | 332 | #define krp_serdesctrl KREG_IBPORT_IDX(IBSerdesCtrl) |
333 | 333 | ||
334 | /* | 334 | /* |
335 | * Per-context kernel registers. Acess only with qib_read_kreg_ctxt() | 335 | * Per-context kernel registers. Access only with qib_read_kreg_ctxt() |
336 | * or qib_write_kreg_ctxt() | 336 | * or qib_write_kreg_ctxt() |
337 | */ | 337 | */ |
338 | #define krc_rcvhdraddr KREG_IDX(RcvHdrAddr0) | 338 | #define krc_rcvhdraddr KREG_IDX(RcvHdrAddr0) |
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index bcb1fdedb595..307eef77a172 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig | |||
@@ -229,7 +229,7 @@ config SERIO_PS2MULT | |||
229 | tristate "TQC PS/2 multiplexer" | 229 | tristate "TQC PS/2 multiplexer" |
230 | help | 230 | help |
231 | Say Y here if you have the PS/2 line multiplexer like the one | 231 | Say Y here if you have the PS/2 line multiplexer like the one |
232 | present on TQC boads. | 232 | present on TQC boards. |
233 | 233 | ||
234 | To compile this driver as a module, choose M here: the | 234 | To compile this driver as a module, choose M here: the |
235 | module will be called ps2mult. | 235 | module will be called ps2mult. |
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 07ac77d393a4..0c9f4b158ff0 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig | |||
@@ -610,7 +610,7 @@ config TOUCHSCREEN_USB_ZYTRONIC | |||
610 | 610 | ||
611 | config TOUCHSCREEN_USB_ETT_TC45USB | 611 | config TOUCHSCREEN_USB_ETT_TC45USB |
612 | default y | 612 | default y |
613 | bool "ET&T USB series TC4UM/TC5UH touchscreen controler support" if EMBEDDED | 613 | bool "ET&T USB series TC4UM/TC5UH touchscreen controller support" if EMBEDDED |
614 | depends on TOUCHSCREEN_USB_COMPOSITE | 614 | depends on TOUCHSCREEN_USB_COMPOSITE |
615 | 615 | ||
616 | config TOUCHSCREEN_USB_NEXIO | 616 | config TOUCHSCREEN_USB_NEXIO |
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c index 178942a2ee61..8a3c5cfc4fea 100644 --- a/drivers/isdn/gigaset/bas-gigaset.c +++ b/drivers/isdn/gigaset/bas-gigaset.c | |||
@@ -2318,7 +2318,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
2318 | __func__, le16_to_cpu(udev->descriptor.idVendor), | 2318 | __func__, le16_to_cpu(udev->descriptor.idVendor), |
2319 | le16_to_cpu(udev->descriptor.idProduct)); | 2319 | le16_to_cpu(udev->descriptor.idProduct)); |
2320 | 2320 | ||
2321 | /* allocate memory for our device state and intialize it */ | 2321 | /* allocate memory for our device state and initialize it */ |
2322 | cs = gigaset_initcs(driver, BAS_CHANNELS, 0, 0, cidmode, | 2322 | cs = gigaset_initcs(driver, BAS_CHANNELS, 0, 0, cidmode, |
2323 | GIGASET_MODULENAME); | 2323 | GIGASET_MODULENAME); |
2324 | if (!cs) | 2324 | if (!cs) |
@@ -2576,7 +2576,7 @@ static int __init bas_gigaset_init(void) | |||
2576 | { | 2576 | { |
2577 | int result; | 2577 | int result; |
2578 | 2578 | ||
2579 | /* allocate memory for our driver state and intialize it */ | 2579 | /* allocate memory for our driver state and initialize it */ |
2580 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, | 2580 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, |
2581 | GIGASET_MODULENAME, GIGASET_DEVNAME, | 2581 | GIGASET_MODULENAME, GIGASET_DEVNAME, |
2582 | &gigops, THIS_MODULE); | 2582 | &gigops, THIS_MODULE); |
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c index d151dcbf770d..0ef09d0eb96b 100644 --- a/drivers/isdn/gigaset/ser-gigaset.c +++ b/drivers/isdn/gigaset/ser-gigaset.c | |||
@@ -513,7 +513,7 @@ gigaset_tty_open(struct tty_struct *tty) | |||
513 | return -ENODEV; | 513 | return -ENODEV; |
514 | } | 514 | } |
515 | 515 | ||
516 | /* allocate memory for our device state and intialize it */ | 516 | /* allocate memory for our device state and initialize it */ |
517 | cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME); | 517 | cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME); |
518 | if (!cs) | 518 | if (!cs) |
519 | goto error; | 519 | goto error; |
@@ -771,7 +771,7 @@ static int __init ser_gigaset_init(void) | |||
771 | return rc; | 771 | return rc; |
772 | } | 772 | } |
773 | 773 | ||
774 | /* allocate memory for our driver state and intialize it */ | 774 | /* allocate memory for our driver state and initialize it */ |
775 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, | 775 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, |
776 | GIGASET_MODULENAME, GIGASET_DEVNAME, | 776 | GIGASET_MODULENAME, GIGASET_DEVNAME, |
777 | &ops, THIS_MODULE); | 777 | &ops, THIS_MODULE); |
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c index 4a66338f4e7d..5e3300d8a2a5 100644 --- a/drivers/isdn/gigaset/usb-gigaset.c +++ b/drivers/isdn/gigaset/usb-gigaset.c | |||
@@ -695,7 +695,7 @@ static int gigaset_probe(struct usb_interface *interface, | |||
695 | 695 | ||
696 | dev_info(&udev->dev, "%s: Device matched ... !\n", __func__); | 696 | dev_info(&udev->dev, "%s: Device matched ... !\n", __func__); |
697 | 697 | ||
698 | /* allocate memory for our device state and intialize it */ | 698 | /* allocate memory for our device state and initialize it */ |
699 | cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME); | 699 | cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME); |
700 | if (!cs) | 700 | if (!cs) |
701 | return -ENODEV; | 701 | return -ENODEV; |
@@ -894,7 +894,7 @@ static int __init usb_gigaset_init(void) | |||
894 | { | 894 | { |
895 | int result; | 895 | int result; |
896 | 896 | ||
897 | /* allocate memory for our driver state and intialize it */ | 897 | /* allocate memory for our driver state and initialize it */ |
898 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, | 898 | driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, |
899 | GIGASET_MODULENAME, GIGASET_DEVNAME, | 899 | GIGASET_MODULENAME, GIGASET_DEVNAME, |
900 | &ops, THIS_MODULE); | 900 | &ops, THIS_MODULE); |
diff --git a/drivers/isdn/hardware/mISDN/ipac.h b/drivers/isdn/hardware/mISDN/ipac.h index 74a6ccf9065c..8121e046b739 100644 --- a/drivers/isdn/hardware/mISDN/ipac.h +++ b/drivers/isdn/hardware/mISDN/ipac.h | |||
@@ -29,7 +29,7 @@ struct isac_hw { | |||
29 | u32 type; | 29 | u32 type; |
30 | u32 off; /* offset to isac regs */ | 30 | u32 off; /* offset to isac regs */ |
31 | char *name; | 31 | char *name; |
32 | spinlock_t *hwlock; /* lock HW acccess */ | 32 | spinlock_t *hwlock; /* lock HW access */ |
33 | read_reg_func *read_reg; | 33 | read_reg_func *read_reg; |
34 | write_reg_func *write_reg; | 34 | write_reg_func *write_reg; |
35 | fifo_func *read_fifo; | 35 | fifo_func *read_fifo; |
@@ -70,7 +70,7 @@ struct ipac_hw { | |||
70 | struct hscx_hw hscx[2]; | 70 | struct hscx_hw hscx[2]; |
71 | char *name; | 71 | char *name; |
72 | void *hw; | 72 | void *hw; |
73 | spinlock_t *hwlock; /* lock HW acccess */ | 73 | spinlock_t *hwlock; /* lock HW access */ |
74 | struct module *owner; | 74 | struct module *owner; |
75 | u32 type; | 75 | u32 type; |
76 | read_reg_func *read_reg; | 76 | read_reg_func *read_reg; |
diff --git a/drivers/isdn/hardware/mISDN/isar.h b/drivers/isdn/hardware/mISDN/isar.h index 4a134acd44d0..9962bdf699c7 100644 --- a/drivers/isdn/hardware/mISDN/isar.h +++ b/drivers/isdn/hardware/mISDN/isar.h | |||
@@ -44,7 +44,7 @@ struct isar_ch { | |||
44 | struct isar_hw { | 44 | struct isar_hw { |
45 | struct isar_ch ch[2]; | 45 | struct isar_ch ch[2]; |
46 | void *hw; | 46 | void *hw; |
47 | spinlock_t *hwlock; /* lock HW acccess */ | 47 | spinlock_t *hwlock; /* lock HW access */ |
48 | char *name; | 48 | char *name; |
49 | struct module *owner; | 49 | struct module *owner; |
50 | read_reg_func *read_reg; | 50 | read_reg_func *read_reg; |
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c index 76d9e673b4e1..309bacf1fadc 100644 --- a/drivers/isdn/mISDN/dsp_cmx.c +++ b/drivers/isdn/mISDN/dsp_cmx.c | |||
@@ -112,7 +112,7 @@ | |||
112 | * Disable rx-data: | 112 | * Disable rx-data: |
113 | * If cmx is realized in hardware, rx data will be disabled if requested by | 113 | * If cmx is realized in hardware, rx data will be disabled if requested by |
114 | * the upper layer. If dtmf decoding is done by software and enabled, rx data | 114 | * the upper layer. If dtmf decoding is done by software and enabled, rx data |
115 | * will not be diabled but blocked to the upper layer. | 115 | * will not be disabled but blocked to the upper layer. |
116 | * | 116 | * |
117 | * HFC conference engine: | 117 | * HFC conference engine: |
118 | * If it is possible to realize all features using hardware, hardware will be | 118 | * If it is possible to realize all features using hardware, hardware will be |
diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c index 1cec02f6c431..ade1e656bfb2 100644 --- a/drivers/macintosh/via-pmu-backlight.c +++ b/drivers/macintosh/via-pmu-backlight.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #define MAX_PMU_LEVEL 0xFF | 16 | #define MAX_PMU_LEVEL 0xFF |
17 | 17 | ||
18 | static struct backlight_ops pmu_backlight_data; | 18 | static const struct backlight_ops pmu_backlight_data; |
19 | static DEFINE_SPINLOCK(pmu_backlight_lock); | 19 | static DEFINE_SPINLOCK(pmu_backlight_lock); |
20 | static int sleeping, uses_pmu_bl; | 20 | static int sleeping, uses_pmu_bl; |
21 | static u8 bl_curve[FB_BACKLIGHT_LEVELS]; | 21 | static u8 bl_curve[FB_BACKLIGHT_LEVELS]; |
@@ -115,7 +115,7 @@ static int pmu_backlight_get_brightness(struct backlight_device *bd) | |||
115 | return bd->props.brightness; | 115 | return bd->props.brightness; |
116 | } | 116 | } |
117 | 117 | ||
118 | static struct backlight_ops pmu_backlight_data = { | 118 | static const struct backlight_ops pmu_backlight_data = { |
119 | .get_brightness = pmu_backlight_get_brightness, | 119 | .get_brightness = pmu_backlight_get_brightness, |
120 | .update_status = pmu_backlight_update_status, | 120 | .update_status = pmu_backlight_update_status, |
121 | 121 | ||
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index cd29c8248386..8b021eb0d48c 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
@@ -2257,7 +2257,7 @@ static int pmu_sleep_valid(suspend_state_t state) | |||
2257 | && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); | 2257 | && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); |
2258 | } | 2258 | } |
2259 | 2259 | ||
2260 | static struct platform_suspend_ops pmu_pm_ops = { | 2260 | static const struct platform_suspend_ops pmu_pm_ops = { |
2261 | .enter = powerbook_sleep, | 2261 | .enter = powerbook_sleep, |
2262 | .valid = pmu_sleep_valid, | 2262 | .valid = pmu_sleep_valid, |
2263 | }; | 2263 | }; |
diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h index 2c00980acfcb..7e40035028d2 100644 --- a/drivers/media/video/cx18/cx23418.h +++ b/drivers/media/video/cx18/cx23418.h | |||
@@ -177,7 +177,7 @@ | |||
177 | IN[0] - Task handle. | 177 | IN[0] - Task handle. |
178 | IN[1] - luma type: 0 = disable, 1 = 1D horizontal only, 2 = 1D vertical only, | 178 | IN[1] - luma type: 0 = disable, 1 = 1D horizontal only, 2 = 1D vertical only, |
179 | 3 = 2D H/V separable, 4 = 2D symmetric non-separable | 179 | 3 = 2D H/V separable, 4 = 2D symmetric non-separable |
180 | IN[2] - chroma type: 0 - diable, 1 = 1D horizontal | 180 | IN[2] - chroma type: 0 - disable, 1 = 1D horizontal |
181 | ReturnCode - One of the ERR_CAPTURE_... */ | 181 | ReturnCode - One of the ERR_CAPTURE_... */ |
182 | #define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C) | 182 | #define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C) |
183 | 183 | ||
diff --git a/drivers/media/video/cx25840/cx25840-ir.c b/drivers/media/video/cx25840/cx25840-ir.c index 627926f6bde8..7eb79af28aa3 100644 --- a/drivers/media/video/cx25840/cx25840-ir.c +++ b/drivers/media/video/cx25840/cx25840-ir.c | |||
@@ -261,7 +261,7 @@ static u16 ns_to_pulse_width_count(u32 ns, u16 divider) | |||
261 | u32 rem; | 261 | u32 rem; |
262 | 262 | ||
263 | /* | 263 | /* |
264 | * The 2 lsb's of the pulse width timer count are not accessable, hence | 264 | * The 2 lsb's of the pulse width timer count are not accessible, hence |
265 | * the (1 << 2) | 265 | * the (1 << 2) |
266 | */ | 266 | */ |
267 | n = ((u64) ns) * CX25840_IR_REFCLK_FREQ / 1000000; /* millicycles */ | 267 | n = ((u64) ns) * CX25840_IR_REFCLK_FREQ / 1000000; /* millicycles */ |
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h index 188841b476e0..ebd5c4338ebb 100644 --- a/drivers/media/video/davinci/vpif.h +++ b/drivers/media/video/davinci/vpif.h | |||
@@ -33,7 +33,7 @@ extern spinlock_t vpif_lock; | |||
33 | #define regr(reg) readl((reg) + vpif_base) | 33 | #define regr(reg) readl((reg) + vpif_base) |
34 | #define regw(value, reg) writel(value, (reg + vpif_base)) | 34 | #define regw(value, reg) writel(value, (reg + vpif_base)) |
35 | 35 | ||
36 | /* Register Addresss Offsets */ | 36 | /* Register Address Offsets */ |
37 | #define VPIF_PID (0x0000) | 37 | #define VPIF_PID (0x0000) |
38 | #define VPIF_CH0_CTRL (0x0004) | 38 | #define VPIF_CH0_CTRL (0x0004) |
39 | #define VPIF_CH1_CTRL (0x0008) | 39 | #define VPIF_CH1_CTRL (0x0008) |
diff --git a/drivers/media/video/davinci/vpss.c b/drivers/media/video/davinci/vpss.c index 7918680917d0..3e5cf27ec2b2 100644 --- a/drivers/media/video/davinci/vpss.c +++ b/drivers/media/video/davinci/vpss.c | |||
@@ -85,7 +85,7 @@ enum vpss_platform_type { | |||
85 | /* | 85 | /* |
86 | * vpss operations. Depends on platform. Not all functions are available | 86 | * vpss operations. Depends on platform. Not all functions are available |
87 | * on all platforms. The api, first check if a functio is available before | 87 | * on all platforms. The api, first check if a functio is available before |
88 | * invoking it. In the probe, the function ptrs are intialized based on | 88 | * invoking it. In the probe, the function ptrs are initialized based on |
89 | * vpss name. vpss name can be "dm355_vpss", "dm644x_vpss" etc. | 89 | * vpss name. vpss name can be "dm355_vpss", "dm644x_vpss" etc. |
90 | */ | 90 | */ |
91 | struct vpss_hw_ops { | 91 | struct vpss_hw_ops { |
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index 83de97ad971e..029a4babfd61 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c | |||
@@ -1286,7 +1286,7 @@ static int omap_vout_release(struct file *file) | |||
1286 | videobuf_mmap_free(q); | 1286 | videobuf_mmap_free(q); |
1287 | 1287 | ||
1288 | /* Even if apply changes fails we should continue | 1288 | /* Even if apply changes fails we should continue |
1289 | freeing allocated memeory */ | 1289 | freeing allocated memory */ |
1290 | if (vout->streaming) { | 1290 | if (vout->streaming) { |
1291 | u32 mask = 0; | 1291 | u32 mask = 0; |
1292 | 1292 | ||
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c index d6bf3f82cc34..58af67f2278b 100644 --- a/drivers/media/video/saa7164/saa7164-core.c +++ b/drivers/media/video/saa7164/saa7164-core.c | |||
@@ -655,8 +655,8 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id) | |||
655 | goto out; | 655 | goto out; |
656 | } | 656 | } |
657 | 657 | ||
658 | /* Check that the hardware is accessable. If the status bytes are | 658 | /* Check that the hardware is accessible. If the status bytes are |
659 | * 0xFF then the device is not accessable, the the IRQ belongs | 659 | * 0xFF then the device is not accessible, the the IRQ belongs |
660 | * to another driver. | 660 | * to another driver. |
661 | * 4 x u32 interrupt registers. | 661 | * 4 x u32 interrupt registers. |
662 | */ | 662 | */ |
diff --git a/drivers/media/video/sn9c102/sn9c102_sensor.h b/drivers/media/video/sn9c102/sn9c102_sensor.h index 494957b10bac..7f38549715b6 100644 --- a/drivers/media/video/sn9c102/sn9c102_sensor.h +++ b/drivers/media/video/sn9c102/sn9c102_sensor.h | |||
@@ -147,7 +147,7 @@ enum sn9c102_i2c_interface { | |||
147 | 147 | ||
148 | struct sn9c102_sensor { | 148 | struct sn9c102_sensor { |
149 | char name[32], /* sensor name */ | 149 | char name[32], /* sensor name */ |
150 | maintainer[64]; /* name of the mantainer <email> */ | 150 | maintainer[64]; /* name of the maintainer <email> */ |
151 | 151 | ||
152 | enum sn9c102_bridge supported_bridge; /* supported SN9C1xx bridges */ | 152 | enum sn9c102_bridge supported_bridge; /* supported SN9C1xx bridges */ |
153 | 153 | ||
diff --git a/drivers/media/video/tvp7002.c b/drivers/media/video/tvp7002.c index e63b40f5a706..c799e4eb6fcd 100644 --- a/drivers/media/video/tvp7002.c +++ b/drivers/media/video/tvp7002.c | |||
@@ -789,7 +789,7 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd, | |||
789 | * Get the value of a TVP7002 decoder device register. | 789 | * Get the value of a TVP7002 decoder device register. |
790 | * Returns zero when successful, -EINVAL if register read fails or | 790 | * Returns zero when successful, -EINVAL if register read fails or |
791 | * access to I2C client fails, -EPERM if the call is not allowed | 791 | * access to I2C client fails, -EPERM if the call is not allowed |
792 | * by diabled CAP_SYS_ADMIN. | 792 | * by disabled CAP_SYS_ADMIN. |
793 | */ | 793 | */ |
794 | static int tvp7002_g_register(struct v4l2_subdev *sd, | 794 | static int tvp7002_g_register(struct v4l2_subdev *sd, |
795 | struct v4l2_dbg_register *reg) | 795 | struct v4l2_dbg_register *reg) |
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c index e25aca5759fb..2f973cd56408 100644 --- a/drivers/media/video/via-camera.c +++ b/drivers/media/video/via-camera.c | |||
@@ -13,14 +13,12 @@ | |||
13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
14 | #include <linux/gpio.h> | 14 | #include <linux/gpio.h> |
15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
16 | #include <linux/pci.h> | ||
17 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
18 | #include <linux/videodev2.h> | 17 | #include <linux/videodev2.h> |
19 | #include <media/v4l2-device.h> | 18 | #include <media/v4l2-device.h> |
20 | #include <media/v4l2-ioctl.h> | 19 | #include <media/v4l2-ioctl.h> |
21 | #include <media/v4l2-chip-ident.h> | 20 | #include <media/v4l2-chip-ident.h> |
22 | #include <media/videobuf-dma-sg.h> | 21 | #include <media/videobuf-dma-sg.h> |
23 | #include <linux/device.h> | ||
24 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
25 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
26 | #include <linux/pm_qos_params.h> | 24 | #include <linux/pm_qos_params.h> |
diff --git a/drivers/message/fusion/lsi/mpi_log_sas.h b/drivers/message/fusion/lsi/mpi_log_sas.h index 691620dbedd2..8b04810df469 100644 --- a/drivers/message/fusion/lsi/mpi_log_sas.h +++ b/drivers/message/fusion/lsi/mpi_log_sas.h | |||
@@ -268,7 +268,7 @@ | |||
268 | 268 | ||
269 | /* Compatibility Error : IR Disabled */ | 269 | /* Compatibility Error : IR Disabled */ |
270 | #define IR_LOGINFO_COMPAT_ERROR_RAID_DISABLED (0x00010030) | 270 | #define IR_LOGINFO_COMPAT_ERROR_RAID_DISABLED (0x00010030) |
271 | /* Compatibility Error : Inquiry Comand failed */ | 271 | /* Compatibility Error : Inquiry Command failed */ |
272 | #define IR_LOGINFO_COMPAT_ERROR_INQUIRY_FAILED (0x00010031) | 272 | #define IR_LOGINFO_COMPAT_ERROR_INQUIRY_FAILED (0x00010031) |
273 | /* Compatibility Error : Device not direct access device */ | 273 | /* Compatibility Error : Device not direct access device */ |
274 | #define IR_LOGINFO_COMPAT_ERROR_NOT_DIRECT_ACCESS (0x00010032) | 274 | #define IR_LOGINFO_COMPAT_ERROR_NOT_DIRECT_ACCESS (0x00010032) |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 3e57b61ca446..3358c0af3466 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -7977,7 +7977,7 @@ mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info) | |||
7977 | NULL, /* 2Eh */ | 7977 | NULL, /* 2Eh */ |
7978 | NULL, /* 2Fh */ | 7978 | NULL, /* 2Fh */ |
7979 | "Compatibility Error: IR Disabled", /* 30h */ | 7979 | "Compatibility Error: IR Disabled", /* 30h */ |
7980 | "Compatibility Error: Inquiry Comand Failed", /* 31h */ | 7980 | "Compatibility Error: Inquiry Command Failed", /* 31h */ |
7981 | "Compatibility Error: Device not Direct Access " | 7981 | "Compatibility Error: Device not Direct Access " |
7982 | "Device ", /* 32h */ | 7982 | "Device ", /* 32h */ |
7983 | "Compatibility Error: Removable Device Found", /* 33h */ | 7983 | "Compatibility Error: Removable Device Found", /* 33h */ |
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index d48c2c6058e1..8aefb1829fcd 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c | |||
@@ -1146,7 +1146,7 @@ mptsas_target_reset_queue(MPT_ADAPTER *ioc, | |||
1146 | * | 1146 | * |
1147 | * This function will delete scheduled target reset from the list and | 1147 | * This function will delete scheduled target reset from the list and |
1148 | * try to send next target reset. This will be called from completion | 1148 | * try to send next target reset. This will be called from completion |
1149 | * context of any Task managment command. | 1149 | * context of any Task management command. |
1150 | */ | 1150 | */ |
1151 | 1151 | ||
1152 | void | 1152 | void |
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index f87a9d405a5e..ae7cad185898 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c | |||
@@ -309,7 +309,7 @@ static inline void i2o_block_request_free(struct i2o_block_request *ireq) | |||
309 | * @ireq: I2O block request | 309 | * @ireq: I2O block request |
310 | * @mptr: message body pointer | 310 | * @mptr: message body pointer |
311 | * | 311 | * |
312 | * Builds the SG list and map it to be accessable by the controller. | 312 | * Builds the SG list and map it to be accessible by the controller. |
313 | * | 313 | * |
314 | * Returns 0 on failure or 1 on success. | 314 | * Returns 0 on failure or 1 on success. |
315 | */ | 315 | */ |
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 4d073f1e4502..1e1a4be8eb6c 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -402,7 +402,7 @@ config TI_DAC7512 | |||
402 | DAC7512 16-bit digital-to-analog converter. | 402 | DAC7512 16-bit digital-to-analog converter. |
403 | 403 | ||
404 | This driver can also be built as a module. If so, the module | 404 | This driver can also be built as a module. If so, the module |
405 | will be calles ti_dac7512. | 405 | will be called ti_dac7512. |
406 | 406 | ||
407 | config VMWARE_BALLOON | 407 | config VMWARE_BALLOON |
408 | tristate "VMware Balloon Driver" | 408 | tristate "VMware Balloon Driver" |
diff --git a/drivers/misc/arm-charlcd.c b/drivers/misc/arm-charlcd.c index 9e3879ef58f2..fe8616a8d287 100644 --- a/drivers/misc/arm-charlcd.c +++ b/drivers/misc/arm-charlcd.c | |||
@@ -313,7 +313,7 @@ static int __init charlcd_probe(struct platform_device *pdev) | |||
313 | INIT_DELAYED_WORK(&lcd->init_work, charlcd_init_work); | 313 | INIT_DELAYED_WORK(&lcd->init_work, charlcd_init_work); |
314 | schedule_delayed_work(&lcd->init_work, 0); | 314 | schedule_delayed_work(&lcd->init_work, 0); |
315 | 315 | ||
316 | dev_info(&pdev->dev, "initalized ARM character LCD at %08x\n", | 316 | dev_info(&pdev->dev, "initialized ARM character LCD at %08x\n", |
317 | lcd->phybase); | 317 | lcd->phybase); |
318 | 318 | ||
319 | return 0; | 319 | return 0; |
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 217f82037fc1..bfc8a8ae55df 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c | |||
@@ -257,7 +257,7 @@ static u32 get_card_status(struct mmc_card *card, struct request *req) | |||
257 | cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC; | 257 | cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC; |
258 | err = mmc_wait_for_cmd(card->host, &cmd, 0); | 258 | err = mmc_wait_for_cmd(card->host, &cmd, 0); |
259 | if (err) | 259 | if (err) |
260 | printk(KERN_ERR "%s: error %d sending status comand", | 260 | printk(KERN_ERR "%s: error %d sending status command", |
261 | req->rq_disk->disk_name, err); | 261 | req->rq_disk->disk_name, err); |
262 | return cmd.resp[0]; | 262 | return cmd.resp[0]; |
263 | } | 263 | } |
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index c22a4c039988..afe8c6fa166a 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -501,7 +501,7 @@ config MMC_SH_MMCIF | |||
501 | tristate "SuperH Internal MMCIF support" | 501 | tristate "SuperH Internal MMCIF support" |
502 | depends on MMC_BLOCK && (SUPERH || ARCH_SHMOBILE) | 502 | depends on MMC_BLOCK && (SUPERH || ARCH_SHMOBILE) |
503 | help | 503 | help |
504 | This selects the MMC Host Interface controler (MMCIF). | 504 | This selects the MMC Host Interface controller (MMCIF). |
505 | 505 | ||
506 | This driver supports MMCIF in sh7724/sh7757/sh7372. | 506 | This driver supports MMCIF in sh7724/sh7757/sh7372. |
507 | 507 | ||
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index 41e5a60493ad..ef72e874ca36 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c | |||
@@ -192,7 +192,7 @@ static inline void SEND_STOP(struct au1xmmc_host *host) | |||
192 | au_writel(config2 | SD_CONFIG2_DF, HOST_CONFIG2(host)); | 192 | au_writel(config2 | SD_CONFIG2_DF, HOST_CONFIG2(host)); |
193 | au_sync(); | 193 | au_sync(); |
194 | 194 | ||
195 | /* Send the stop commmand */ | 195 | /* Send the stop command */ |
196 | au_writel(STOP_CMD, HOST_CMD(host)); | 196 | au_writel(STOP_CMD, HOST_CMD(host)); |
197 | } | 197 | } |
198 | 198 | ||
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c index f472c2714eb8..bbc298fd2a15 100644 --- a/drivers/mmc/host/sdricoh_cs.c +++ b/drivers/mmc/host/sdricoh_cs.c | |||
@@ -446,7 +446,7 @@ static int sdricoh_init_mmc(struct pci_dev *pci_dev, | |||
446 | mmc->max_seg_size = 1024 * 512; | 446 | mmc->max_seg_size = 1024 * 512; |
447 | mmc->max_blk_size = 512; | 447 | mmc->max_blk_size = 512; |
448 | 448 | ||
449 | /* reset the controler */ | 449 | /* reset the controller */ |
450 | if (sdricoh_reset(host)) { | 450 | if (sdricoh_reset(host)) { |
451 | dev_dbg(dev, "could not reset\n"); | 451 | dev_dbg(dev, "could not reset\n"); |
452 | result = -EIO; | 452 | result = -EIO; |
@@ -478,7 +478,7 @@ static int sdricoh_pcmcia_probe(struct pcmcia_device *pcmcia_dev) | |||
478 | dev_info(&pcmcia_dev->dev, "Searching MMC controller for pcmcia device" | 478 | dev_info(&pcmcia_dev->dev, "Searching MMC controller for pcmcia device" |
479 | " %s %s ...\n", pcmcia_dev->prod_id[0], pcmcia_dev->prod_id[1]); | 479 | " %s %s ...\n", pcmcia_dev->prod_id[0], pcmcia_dev->prod_id[1]); |
480 | 480 | ||
481 | /* search pci cardbus bridge that contains the mmc controler */ | 481 | /* search pci cardbus bridge that contains the mmc controller */ |
482 | /* the io region is already claimed by yenta_socket... */ | 482 | /* the io region is already claimed by yenta_socket... */ |
483 | while ((pci_dev = | 483 | while ((pci_dev = |
484 | pci_get_device(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, | 484 | pci_get_device(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, |
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 1f75a1b1f7c3..31bf376b82a0 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
@@ -821,7 +821,7 @@ retry: | |||
821 | * | 821 | * |
822 | * Wait for command done. This is a helper function for nand_wait used when | 822 | * Wait for command done. This is a helper function for nand_wait used when |
823 | * we are in interrupt context. May happen when in panic and trying to write | 823 | * we are in interrupt context. May happen when in panic and trying to write |
824 | * an oops trough mtdoops. | 824 | * an oops through mtdoops. |
825 | */ | 825 | */ |
826 | static void panic_nand_wait(struct mtd_info *mtd, struct nand_chip *chip, | 826 | static void panic_nand_wait(struct mtd_info *mtd, struct nand_chip *chip, |
827 | unsigned long timeo) | 827 | unsigned long timeo) |
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 6a858a29db56..a6cd335c9436 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h | |||
@@ -1415,12 +1415,12 @@ struct bnx2x_func_init_params { | |||
1415 | else | 1415 | else |
1416 | 1416 | ||
1417 | /* skip rx queue | 1417 | /* skip rx queue |
1418 | * if FCOE l2 support is diabled and this is the fcoe L2 queue | 1418 | * if FCOE l2 support is disabled and this is the fcoe L2 queue |
1419 | */ | 1419 | */ |
1420 | #define skip_rx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) | 1420 | #define skip_rx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) |
1421 | 1421 | ||
1422 | /* skip tx queue | 1422 | /* skip tx queue |
1423 | * if FCOE l2 support is diabled and this is the fcoe L2 queue | 1423 | * if FCOE l2 support is disabled and this is the fcoe L2 queue |
1424 | */ | 1424 | */ |
1425 | #define skip_tx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) | 1425 | #define skip_tx_queue(bp, idx) (NO_FCOE(bp) && IS_FCOE_IDX(idx)) |
1426 | 1426 | ||
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 84e1af4d65e1..8cdcf5b39d1e 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c | |||
@@ -5037,7 +5037,7 @@ static int bnx2x_init_hw_common(struct bnx2x *bp, u32 load_code) | |||
5037 | memset(&ilt_cli, 0, sizeof(struct ilt_client_info)); | 5037 | memset(&ilt_cli, 0, sizeof(struct ilt_client_info)); |
5038 | memset(&ilt, 0, sizeof(struct bnx2x_ilt)); | 5038 | memset(&ilt, 0, sizeof(struct bnx2x_ilt)); |
5039 | 5039 | ||
5040 | /* initalize dummy TM client */ | 5040 | /* initialize dummy TM client */ |
5041 | ilt_cli.start = 0; | 5041 | ilt_cli.start = 0; |
5042 | ilt_cli.end = ILT_NUM_PAGE_ENTRIES - 1; | 5042 | ilt_cli.end = ILT_NUM_PAGE_ENTRIES - 1; |
5043 | ilt_cli.client_num = ILT_CLIENT_TM; | 5043 | ilt_cli.client_num = ILT_CLIENT_TM; |
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h index 38ef7ca9f21d..c939683e3d61 100644 --- a/drivers/net/bnx2x/bnx2x_reg.h +++ b/drivers/net/bnx2x/bnx2x_reg.h | |||
@@ -1633,7 +1633,7 @@ | |||
1633 | (~misc_registers_sw_timer_cfg_4.sw_timer_cfg_4[1] ) is set */ | 1633 | (~misc_registers_sw_timer_cfg_4.sw_timer_cfg_4[1] ) is set */ |
1634 | #define MISC_REG_SW_TIMER_RELOAD_VAL_4 0xa2fc | 1634 | #define MISC_REG_SW_TIMER_RELOAD_VAL_4 0xa2fc |
1635 | /* [RW 32] the value of the counter for sw timers1-8. there are 8 addresses | 1635 | /* [RW 32] the value of the counter for sw timers1-8. there are 8 addresses |
1636 | in this register. addres 0 - timer 1; address 1 - timer 2, ... address 7 - | 1636 | in this register. address 0 - timer 1; address 1 - timer 2, ... address 7 - |
1637 | timer 8 */ | 1637 | timer 8 */ |
1638 | #define MISC_REG_SW_TIMER_VAL 0xa5c0 | 1638 | #define MISC_REG_SW_TIMER_VAL 0xa5c0 |
1639 | /* [RW 1] Set by the MCP to remember if one or more of the drivers is/are | 1639 | /* [RW 1] Set by the MCP to remember if one or more of the drivers is/are |
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 48cf24ff4e6f..171782e2bb39 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c | |||
@@ -840,7 +840,7 @@ static int ad_lacpdu_send(struct port *port) | |||
840 | lacpdu_header = (struct lacpdu_header *)skb_put(skb, length); | 840 | lacpdu_header = (struct lacpdu_header *)skb_put(skb, length); |
841 | 841 | ||
842 | memcpy(lacpdu_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); | 842 | memcpy(lacpdu_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); |
843 | /* Note: source addres is set to be the member's PERMANENT address, | 843 | /* Note: source address is set to be the member's PERMANENT address, |
844 | because we use it to identify loopback lacpdus in receive. */ | 844 | because we use it to identify loopback lacpdus in receive. */ |
845 | memcpy(lacpdu_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); | 845 | memcpy(lacpdu_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); |
846 | lacpdu_header->hdr.h_proto = PKT_TYPE_LACPDU; | 846 | lacpdu_header->hdr.h_proto = PKT_TYPE_LACPDU; |
@@ -881,7 +881,7 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker) | |||
881 | marker_header = (struct bond_marker_header *)skb_put(skb, length); | 881 | marker_header = (struct bond_marker_header *)skb_put(skb, length); |
882 | 882 | ||
883 | memcpy(marker_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); | 883 | memcpy(marker_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN); |
884 | /* Note: source addres is set to be the member's PERMANENT address, | 884 | /* Note: source address is set to be the member's PERMANENT address, |
885 | because we use it to identify loopback MARKERs in receive. */ | 885 | because we use it to identify loopback MARKERs in receive. */ |
886 | memcpy(marker_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); | 886 | memcpy(marker_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN); |
887 | marker_header->hdr.h_proto = PKT_TYPE_LACPDU; | 887 | marker_header->hdr.h_proto = PKT_TYPE_LACPDU; |
@@ -1916,7 +1916,7 @@ int bond_3ad_bind_slave(struct slave *slave) | |||
1916 | return -1; | 1916 | return -1; |
1917 | } | 1917 | } |
1918 | 1918 | ||
1919 | //check that the slave has not been intialized yet. | 1919 | //check that the slave has not been initialized yet. |
1920 | if (SLAVE_AD_INFO(slave).port.slave != slave) { | 1920 | if (SLAVE_AD_INFO(slave).port.slave != slave) { |
1921 | 1921 | ||
1922 | // port initialization | 1922 | // port initialization |
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/chelsio/subr.c index 63ebf76d2390..8a43c7e19701 100644 --- a/drivers/net/chelsio/subr.c +++ b/drivers/net/chelsio/subr.c | |||
@@ -556,7 +556,7 @@ struct chelsio_vpd_t { | |||
556 | #define EEPROM_MAX_POLL 4 | 556 | #define EEPROM_MAX_POLL 4 |
557 | 557 | ||
558 | /* | 558 | /* |
559 | * Read SEEPROM. A zero is written to the flag register when the addres is | 559 | * Read SEEPROM. A zero is written to the flag register when the address is |
560 | * written to the Control register. The hardware device will set the flag to a | 560 | * written to the Control register. The hardware device will set the flag to a |
561 | * one when 4B have been transferred to the Data register. | 561 | * one when 4B have been transferred to the Data register. |
562 | */ | 562 | */ |
diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/cxgb3/mc5.c index a8766fb2f9ab..e13b7fe9d082 100644 --- a/drivers/net/cxgb3/mc5.c +++ b/drivers/net/cxgb3/mc5.c | |||
@@ -318,7 +318,7 @@ static void mc5_dbgi_mode_disable(const struct mc5 *mc5) | |||
318 | 318 | ||
319 | /* | 319 | /* |
320 | * Initialization that requires the OS and protocol layers to already | 320 | * Initialization that requires the OS and protocol layers to already |
321 | * be intialized goes here. | 321 | * be initialized goes here. |
322 | */ | 322 | */ |
323 | int t3_mc5_init(struct mc5 *mc5, unsigned int nservers, unsigned int nfilters, | 323 | int t3_mc5_init(struct mc5 *mc5, unsigned int nservers, unsigned int nfilters, |
324 | unsigned int nroutes) | 324 | unsigned int nroutes) |
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index ec8579a0a808..d55db6b38e7b 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c | |||
@@ -607,7 +607,7 @@ struct t3_vpd { | |||
607 | * | 607 | * |
608 | * Read a 32-bit word from a location in VPD EEPROM using the card's PCI | 608 | * Read a 32-bit word from a location in VPD EEPROM using the card's PCI |
609 | * VPD ROM capability. A zero is written to the flag bit when the | 609 | * VPD ROM capability. A zero is written to the flag bit when the |
610 | * addres is written to the control register. The hardware device will | 610 | * address is written to the control register. The hardware device will |
611 | * set the flag to 1 when 4 bytes have been read into the data register. | 611 | * set the flag to 1 when 4 bytes have been read into the data register. |
612 | */ | 612 | */ |
613 | int t3_seeprom_read(struct adapter *adapter, u32 addr, __le32 *data) | 613 | int t3_seeprom_read(struct adapter *adapter, u32 addr, __le32 *data) |
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index f5514a0d5be6..196eeda2dd6c 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h | |||
@@ -41,7 +41,7 @@ struct e1000_hw; | |||
41 | struct e1000_hw_stats; | 41 | struct e1000_hw_stats; |
42 | 42 | ||
43 | /* Enumerated types specific to the e1000 hardware */ | 43 | /* Enumerated types specific to the e1000 hardware */ |
44 | /* Media Access Controlers */ | 44 | /* Media Access Controllers */ |
45 | typedef enum { | 45 | typedef enum { |
46 | e1000_undefined = 0, | 46 | e1000_undefined = 0, |
47 | e1000_82542_rev2_0, | 47 | e1000_82542_rev2_0, |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 4ff88a683f61..de69c54301c1 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -2233,7 +2233,7 @@ static void e1000_set_rx_mode(struct net_device *netdev) | |||
2233 | * addresses take precedence to avoid disabling unicast filtering | 2233 | * addresses take precedence to avoid disabling unicast filtering |
2234 | * when possible. | 2234 | * when possible. |
2235 | * | 2235 | * |
2236 | * RAR 0 is used for the station MAC adddress | 2236 | * RAR 0 is used for the station MAC address |
2237 | * if there are not 14 addresses, go ahead and clear the filters | 2237 | * if there are not 14 addresses, go ahead and clear the filters |
2238 | */ | 2238 | */ |
2239 | i = 1; | 2239 | i = 1; |
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c index cb6c7b1c1fb8..1397da118f0d 100644 --- a/drivers/net/e1000e/82571.c +++ b/drivers/net/e1000e/82571.c | |||
@@ -328,7 +328,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) | |||
328 | 328 | ||
329 | /* | 329 | /* |
330 | * Ensure that the inter-port SWSM.SMBI lock bit is clear before | 330 | * Ensure that the inter-port SWSM.SMBI lock bit is clear before |
331 | * first NVM or PHY acess. This should be done for single-port | 331 | * first NVM or PHY access. This should be done for single-port |
332 | * devices, and for one port only on dual-port devices so that | 332 | * devices, and for one port only on dual-port devices so that |
333 | * for those devices we can still use the SMBI lock to synchronize | 333 | * for those devices we can still use the SMBI lock to synchronize |
334 | * inter-port accesses to the PHY & NVM. | 334 | * inter-port accesses to the PHY & NVM. |
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 5328a2927731..5bb65b7382db 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c | |||
@@ -321,7 +321,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) | |||
321 | } | 321 | } |
322 | 322 | ||
323 | /* | 323 | /* |
324 | * Reset the PHY before any acccess to it. Doing so, ensures that | 324 | * Reset the PHY before any access to it. Doing so, ensures that |
325 | * the PHY is in a known good state before we read/write PHY registers. | 325 | * the PHY is in a known good state before we read/write PHY registers. |
326 | * The generic reset is sufficient here, because we haven't determined | 326 | * The generic reset is sufficient here, because we haven't determined |
327 | * the PHY type yet. | 327 | * the PHY type yet. |
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c index a640f1c369ae..00f89e8a9fa0 100644 --- a/drivers/net/e1000e/phy.c +++ b/drivers/net/e1000e/phy.c | |||
@@ -2986,7 +2986,7 @@ s32 e1000_write_phy_reg_hv_locked(struct e1000_hw *hw, u32 offset, u16 data) | |||
2986 | } | 2986 | } |
2987 | 2987 | ||
2988 | /** | 2988 | /** |
2989 | * e1000_get_phy_addr_for_hv_page - Get PHY adrress based on page | 2989 | * e1000_get_phy_addr_for_hv_page - Get PHY address based on page |
2990 | * @page: page to be accessed | 2990 | * @page: page to be accessed |
2991 | **/ | 2991 | **/ |
2992 | static u32 e1000_get_phy_addr_for_hv_page(u32 page) | 2992 | static u32 e1000_get_phy_addr_for_hv_page(u32 page) |
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 4fa8d2a4aef3..eb35951a2442 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
@@ -1761,7 +1761,7 @@ module_param_array(io, int, NULL, 0); | |||
1761 | module_param_array(irq, int, NULL, 0); | 1761 | module_param_array(irq, int, NULL, 0); |
1762 | module_param_array(mem, int, NULL, 0); | 1762 | module_param_array(mem, int, NULL, 0); |
1763 | module_param(autodetect, int, 0); | 1763 | module_param(autodetect, int, 0); |
1764 | MODULE_PARM_DESC(io, "EtherExpress Pro/10 I/O base addres(es)"); | 1764 | MODULE_PARM_DESC(io, "EtherExpress Pro/10 I/O base address(es)"); |
1765 | MODULE_PARM_DESC(irq, "EtherExpress Pro/10 IRQ number(s)"); | 1765 | MODULE_PARM_DESC(irq, "EtherExpress Pro/10 IRQ number(s)"); |
1766 | MODULE_PARM_DESC(mem, "EtherExpress Pro/10 Rx buffer size(es) in kB (3-29)"); | 1766 | MODULE_PARM_DESC(mem, "EtherExpress Pro/10 Rx buffer size(es) in kB (3-29)"); |
1767 | MODULE_PARM_DESC(autodetect, "EtherExpress Pro/10 force board(s) detection (0-1)"); | 1767 | MODULE_PARM_DESC(autodetect, "EtherExpress Pro/10 force board(s) detection (0-1)"); |
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h index 4dc39e5f0156..77fcf4459161 100644 --- a/drivers/net/irda/donauboe.h +++ b/drivers/net/irda/donauboe.h | |||
@@ -30,7 +30,7 @@ | |||
30 | * or the type-DO IR port. | 30 | * or the type-DO IR port. |
31 | * | 31 | * |
32 | * IrDA chip set list from Toshiba Computer Engineering Corp. | 32 | * IrDA chip set list from Toshiba Computer Engineering Corp. |
33 | * model method maker controler Version | 33 | * model method maker controller Version |
34 | * Portege 320CT FIR,SIR Toshiba Oboe(Triangle) | 34 | * Portege 320CT FIR,SIR Toshiba Oboe(Triangle) |
35 | * Portege 3010CT FIR,SIR Toshiba Oboe(Sydney) | 35 | * Portege 3010CT FIR,SIR Toshiba Oboe(Sydney) |
36 | * Portege 3015CT FIR,SIR Toshiba Oboe(Sydney) | 36 | * Portege 3015CT FIR,SIR Toshiba Oboe(Sydney) |
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c index 8d316d9cd29d..a21f5817685b 100644 --- a/drivers/net/ixgbe/ixgbe_82599.c +++ b/drivers/net/ixgbe/ixgbe_82599.c | |||
@@ -1079,7 +1079,7 @@ s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc) | |||
1079 | 1079 | ||
1080 | /* | 1080 | /* |
1081 | * The defaults in the HW for RX PB 1-7 are not zero and so should be | 1081 | * The defaults in the HW for RX PB 1-7 are not zero and so should be |
1082 | * intialized to zero for non DCB mode otherwise actual total RX PB | 1082 | * initialized to zero for non DCB mode otherwise actual total RX PB |
1083 | * would be bigger than programmed and filter space would run into | 1083 | * would be bigger than programmed and filter space would run into |
1084 | * the PB 0 region. | 1084 | * the PB 0 region. |
1085 | */ | 1085 | */ |
@@ -1167,7 +1167,7 @@ s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc) | |||
1167 | 1167 | ||
1168 | /* | 1168 | /* |
1169 | * The defaults in the HW for RX PB 1-7 are not zero and so should be | 1169 | * The defaults in the HW for RX PB 1-7 are not zero and so should be |
1170 | * intialized to zero for non DCB mode otherwise actual total RX PB | 1170 | * initialized to zero for non DCB mode otherwise actual total RX PB |
1171 | * would be bigger than programmed and filter space would run into | 1171 | * would be bigger than programmed and filter space would run into |
1172 | * the PB 0 region. | 1172 | * the PB 0 region. |
1173 | */ | 1173 | */ |
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index 183765cb7f25..f35554d11441 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c | |||
@@ -238,7 +238,7 @@ static int temac_dma_bd_init(struct net_device *ndev) | |||
238 | goto out; | 238 | goto out; |
239 | } | 239 | } |
240 | /* allocate the tx and rx ring buffer descriptors. */ | 240 | /* allocate the tx and rx ring buffer descriptors. */ |
241 | /* returns a virtual addres and a physical address. */ | 241 | /* returns a virtual address and a physical address. */ |
242 | lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent, | 242 | lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent, |
243 | sizeof(*lp->tx_bd_v) * TX_BD_NUM, | 243 | sizeof(*lp->tx_bd_v) * TX_BD_NUM, |
244 | &lp->tx_bd_p, GFP_KERNEL); | 244 | &lp->tx_bd_p, GFP_KERNEL); |
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 581836867098..5976d1d51df1 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -36,7 +36,7 @@ | |||
36 | Rev 1.07.06 Nov. 7 2000 Jeff Garzik <jgarzik@pobox.com> some bug fix and cleaning | 36 | Rev 1.07.06 Nov. 7 2000 Jeff Garzik <jgarzik@pobox.com> some bug fix and cleaning |
37 | Rev 1.07.05 Nov. 6 2000 metapirat<metapirat@gmx.de> contribute media type select by ifconfig | 37 | Rev 1.07.05 Nov. 6 2000 metapirat<metapirat@gmx.de> contribute media type select by ifconfig |
38 | Rev 1.07.04 Sep. 6 2000 Lei-Chun Chang added ICS1893 PHY support | 38 | Rev 1.07.04 Sep. 6 2000 Lei-Chun Chang added ICS1893 PHY support |
39 | Rev 1.07.03 Aug. 24 2000 Lei-Chun Chang (lcchang@sis.com.tw) modified 630E eqaulizer workaround rule | 39 | Rev 1.07.03 Aug. 24 2000 Lei-Chun Chang (lcchang@sis.com.tw) modified 630E equalizer workaround rule |
40 | Rev 1.07.01 Aug. 08 2000 Ollie Lho minor update for SiS 630E and SiS 630E A1 | 40 | Rev 1.07.01 Aug. 08 2000 Ollie Lho minor update for SiS 630E and SiS 630E A1 |
41 | Rev 1.07 Mar. 07 2000 Ollie Lho bug fix in Rx buffer ring | 41 | Rev 1.07 Mar. 07 2000 Ollie Lho bug fix in Rx buffer ring |
42 | Rev 1.06.04 Feb. 11 2000 Jeff Garzik <jgarzik@pobox.com> softnet and init for kernel 2.4 | 42 | Rev 1.06.04 Feb. 11 2000 Jeff Garzik <jgarzik@pobox.com> softnet and init for kernel 2.4 |
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 296000bf5a25..3397618d4d96 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -12,7 +12,7 @@ | |||
12 | /* | 12 | /* |
13 | * RX HW/SW interaction overview | 13 | * RX HW/SW interaction overview |
14 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 14 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
15 | * There are 2 types of RX communication channels betwean driver and NIC. | 15 | * There are 2 types of RX communication channels between driver and NIC. |
16 | * 1) RX Free Fifo - RXF - holds descriptors of empty buffers to accept incoming | 16 | * 1) RX Free Fifo - RXF - holds descriptors of empty buffers to accept incoming |
17 | * traffic. This Fifo is filled by SW and is readen by HW. Each descriptor holds | 17 | * traffic. This Fifo is filled by SW and is readen by HW. Each descriptor holds |
18 | * info about buffer's location, size and ID. An ID field is used to identify a | 18 | * info about buffer's location, size and ID. An ID field is used to identify a |
@@ -821,7 +821,7 @@ static void bdx_setmulti(struct net_device *ndev) | |||
821 | } | 821 | } |
822 | 822 | ||
823 | /* use PMF to accept first MAC_MCST_NUM (15) addresses */ | 823 | /* use PMF to accept first MAC_MCST_NUM (15) addresses */ |
824 | /* TBD: sort addreses and write them in ascending order | 824 | /* TBD: sort addresses and write them in ascending order |
825 | * into RX_MAC_MCST regs. we skip this phase now and accept ALL | 825 | * into RX_MAC_MCST regs. we skip this phase now and accept ALL |
826 | * multicast frames throu IMF */ | 826 | * multicast frames throu IMF */ |
827 | /* accept the rest of addresses throu IMF */ | 827 | /* accept the rest of addresses throu IMF */ |
@@ -1346,7 +1346,7 @@ static void print_rxfd(struct rxf_desc *rxfd) | |||
1346 | /* | 1346 | /* |
1347 | * TX HW/SW interaction overview | 1347 | * TX HW/SW interaction overview |
1348 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 1348 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
1349 | * There are 2 types of TX communication channels betwean driver and NIC. | 1349 | * There are 2 types of TX communication channels between driver and NIC. |
1350 | * 1) TX Free Fifo - TXF - holds ack descriptors for sent packets | 1350 | * 1) TX Free Fifo - TXF - holds ack descriptors for sent packets |
1351 | * 2) TX Data Fifo - TXD - holds descriptors of full buffers. | 1351 | * 2) TX Data Fifo - TXD - holds descriptors of full buffers. |
1352 | * | 1352 | * |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 7599c457abd1..b100bd50a0d7 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
@@ -1309,7 +1309,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, | |||
1309 | break; | 1309 | break; |
1310 | 1310 | ||
1311 | case SIOCGIFHWADDR: | 1311 | case SIOCGIFHWADDR: |
1312 | /* Get hw addres */ | 1312 | /* Get hw address */ |
1313 | memcpy(ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr, ETH_ALEN); | 1313 | memcpy(ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr, ETH_ALEN); |
1314 | ifr.ifr_hwaddr.sa_family = tun->dev->type; | 1314 | ifr.ifr_hwaddr.sa_family = tun->dev->type; |
1315 | if (copy_to_user(argp, &ifr, ifreq_len)) | 1315 | if (copy_to_user(argp, &ifr, ifreq_len)) |
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index cab96ad49e60..09cac704fdd7 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -898,7 +898,7 @@ static int velocity_set_media_mode(struct velocity_info *vptr, u32 mii_status) | |||
898 | set_mii_flow_control(vptr); | 898 | set_mii_flow_control(vptr); |
899 | 899 | ||
900 | /* | 900 | /* |
901 | Check if new status is consisent with current status | 901 | Check if new status is consistent with current status |
902 | if (((mii_status & curr_status) & VELOCITY_AUTONEG_ENABLE) || | 902 | if (((mii_status & curr_status) & VELOCITY_AUTONEG_ENABLE) || |
903 | (mii_status==curr_status)) { | 903 | (mii_status==curr_status)) { |
904 | vptr->mii_status=mii_check_media_mode(vptr->mac_regs); | 904 | vptr->mii_status=mii_check_media_mode(vptr->mac_regs); |
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h index 8c3103fb6442..d48486d6afa1 100644 --- a/drivers/net/vxge/vxge-traffic.h +++ b/drivers/net/vxge/vxge-traffic.h | |||
@@ -1695,7 +1695,7 @@ struct vxge_hw_device_stats_sw_err { | |||
1695 | * struct vxge_hw_device_stats - Contains HW per-device statistics, | 1695 | * struct vxge_hw_device_stats - Contains HW per-device statistics, |
1696 | * including hw. | 1696 | * including hw. |
1697 | * @devh: HW device handle. | 1697 | * @devh: HW device handle. |
1698 | * @dma_addr: DMA addres of the %hw_info. Given to device to fill-in the stats. | 1698 | * @dma_addr: DMA address of the %hw_info. Given to device to fill-in the stats. |
1699 | * @hw_info_dmah: DMA handle used to map hw statistics onto the device memory | 1699 | * @hw_info_dmah: DMA handle used to map hw statistics onto the device memory |
1700 | * space. | 1700 | * space. |
1701 | * @hw_info_dma_acch: One more DMA handle used subsequently to free the | 1701 | * @hw_info_dma_acch: One more DMA handle used subsequently to free the |
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index 34cff6ce6d27..4578e5b4b411 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c | |||
@@ -125,7 +125,7 @@ static u32 dscc4_pci_config_store[16]; | |||
125 | /* Module parameters */ | 125 | /* Module parameters */ |
126 | 126 | ||
127 | MODULE_AUTHOR("Maintainer: Francois Romieu <romieu@cogenit.fr>"); | 127 | MODULE_AUTHOR("Maintainer: Francois Romieu <romieu@cogenit.fr>"); |
128 | MODULE_DESCRIPTION("Siemens PEB20534 PCI Controler"); | 128 | MODULE_DESCRIPTION("Siemens PEB20534 PCI Controller"); |
129 | MODULE_LICENSE("GPL"); | 129 | MODULE_LICENSE("GPL"); |
130 | module_param(debug, int, 0); | 130 | module_param(debug, int, 0); |
131 | MODULE_PARM_DESC(debug,"Enable/disable extra messages"); | 131 | MODULE_PARM_DESC(debug,"Enable/disable extra messages"); |
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c index f0603327aafa..65bc334ed57b 100644 --- a/drivers/net/wimax/i2400m/driver.c +++ b/drivers/net/wimax/i2400m/driver.c | |||
@@ -232,7 +232,7 @@ int i2400m_check_mac_addr(struct i2400m *i2400m) | |||
232 | result); | 232 | result); |
233 | goto error; | 233 | goto error; |
234 | } | 234 | } |
235 | /* Extract MAC addresss */ | 235 | /* Extract MAC address */ |
236 | ddi = (void *) skb->data; | 236 | ddi = (void *) skb->data; |
237 | BUILD_BUG_ON(ETH_ALEN != sizeof(ddi->mac_address)); | 237 | BUILD_BUG_ON(ETH_ALEN != sizeof(ddi->mac_address)); |
238 | d_printf(2, dev, "GET DEVICE INFO: mac addr %pM\n", | 238 | d_printf(2, dev, "GET DEVICE INFO: mac addr %pM\n", |
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h index 17ecaa41a807..030cbfd31704 100644 --- a/drivers/net/wimax/i2400m/i2400m.h +++ b/drivers/net/wimax/i2400m/i2400m.h | |||
@@ -186,7 +186,7 @@ enum { | |||
186 | * struct i2400m_poke_table - Hardware poke table for the Intel 2400m | 186 | * struct i2400m_poke_table - Hardware poke table for the Intel 2400m |
187 | * | 187 | * |
188 | * This structure will be used to create a device specific poke table | 188 | * This structure will be used to create a device specific poke table |
189 | * to put the device in a consistant state at boot time. | 189 | * to put the device in a consistent state at boot time. |
190 | * | 190 | * |
191 | * @address: The device address to poke | 191 | * @address: The device address to poke |
192 | * | 192 | * |
@@ -703,7 +703,7 @@ enum i2400m_bm_cmd_flags { | |||
703 | * @I2400M_BRI_MAC_REINIT: We need to reinitialize the boot | 703 | * @I2400M_BRI_MAC_REINIT: We need to reinitialize the boot |
704 | * rom after reading the MAC address. This is quite a dirty hack, | 704 | * rom after reading the MAC address. This is quite a dirty hack, |
705 | * if you ask me -- the device requires the bootrom to be | 705 | * if you ask me -- the device requires the bootrom to be |
706 | * intialized after reading the MAC address. | 706 | * initialized after reading the MAC address. |
707 | */ | 707 | */ |
708 | enum i2400m_bri { | 708 | enum i2400m_bri { |
709 | I2400M_BRI_SOFT = 1 << 1, | 709 | I2400M_BRI_SOFT = 1 << 1, |
diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h index 7ad05d401ab5..fd14b9103951 100644 --- a/drivers/net/wireless/ath/ath5k/reg.h +++ b/drivers/net/wireless/ath/ath5k/reg.h | |||
@@ -1064,7 +1064,7 @@ | |||
1064 | /* | 1064 | /* |
1065 | * EEPROM command register | 1065 | * EEPROM command register |
1066 | */ | 1066 | */ |
1067 | #define AR5K_EEPROM_CMD 0x6008 /* Register Addres */ | 1067 | #define AR5K_EEPROM_CMD 0x6008 /* Register Address */ |
1068 | #define AR5K_EEPROM_CMD_READ 0x00000001 /* EEPROM read */ | 1068 | #define AR5K_EEPROM_CMD_READ 0x00000001 /* EEPROM read */ |
1069 | #define AR5K_EEPROM_CMD_WRITE 0x00000002 /* EEPROM write */ | 1069 | #define AR5K_EEPROM_CMD_WRITE 0x00000002 /* EEPROM write */ |
1070 | #define AR5K_EEPROM_CMD_RESET 0x00000004 /* EEPROM reset */ | 1070 | #define AR5K_EEPROM_CMD_RESET 0x00000004 /* EEPROM reset */ |
@@ -1084,7 +1084,7 @@ | |||
1084 | /* | 1084 | /* |
1085 | * EEPROM config register | 1085 | * EEPROM config register |
1086 | */ | 1086 | */ |
1087 | #define AR5K_EEPROM_CFG 0x6010 /* Register Addres */ | 1087 | #define AR5K_EEPROM_CFG 0x6010 /* Register Address */ |
1088 | #define AR5K_EEPROM_CFG_SIZE 0x00000003 /* Size determination override */ | 1088 | #define AR5K_EEPROM_CFG_SIZE 0x00000003 /* Size determination override */ |
1089 | #define AR5K_EEPROM_CFG_SIZE_AUTO 0 | 1089 | #define AR5K_EEPROM_CFG_SIZE_AUTO 0 |
1090 | #define AR5K_EEPROM_CFG_SIZE_4KBIT 1 | 1090 | #define AR5K_EEPROM_CFG_SIZE_4KBIT 1 |
@@ -1126,7 +1126,7 @@ | |||
1126 | * Second station id register (Upper 16 bits of MAC address + PCU settings) | 1126 | * Second station id register (Upper 16 bits of MAC address + PCU settings) |
1127 | */ | 1127 | */ |
1128 | #define AR5K_STA_ID1 0x8004 /* Register Address */ | 1128 | #define AR5K_STA_ID1 0x8004 /* Register Address */ |
1129 | #define AR5K_STA_ID1_ADDR_U16 0x0000ffff /* Upper 16 bits of MAC addres */ | 1129 | #define AR5K_STA_ID1_ADDR_U16 0x0000ffff /* Upper 16 bits of MAC address */ |
1130 | #define AR5K_STA_ID1_AP 0x00010000 /* Set AP mode */ | 1130 | #define AR5K_STA_ID1_AP 0x00010000 /* Set AP mode */ |
1131 | #define AR5K_STA_ID1_ADHOC 0x00020000 /* Set Ad-Hoc mode */ | 1131 | #define AR5K_STA_ID1_ADHOC 0x00020000 /* Set Ad-Hoc mode */ |
1132 | #define AR5K_STA_ID1_PWR_SV 0x00040000 /* Power save reporting */ | 1132 | #define AR5K_STA_ID1_PWR_SV 0x00040000 /* Power save reporting */ |
diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c index 0dc33b65e86b..be4828167012 100644 --- a/drivers/net/wireless/b43/phy_g.c +++ b/drivers/net/wireless/b43/phy_g.c | |||
@@ -1919,7 +1919,7 @@ static void b43_hardware_pctl_init_gphy(struct b43_wldev *dev) | |||
1919 | b43_hf_write(dev, b43_hf_read(dev) | B43_HF_HWPCTL); | 1919 | b43_hf_write(dev, b43_hf_read(dev) | B43_HF_HWPCTL); |
1920 | } | 1920 | } |
1921 | 1921 | ||
1922 | /* Intialize B/G PHY power control */ | 1922 | /* Initialize B/G PHY power control */ |
1923 | static void b43_phy_init_pctl(struct b43_wldev *dev) | 1923 | static void b43_phy_init_pctl(struct b43_wldev *dev) |
1924 | { | 1924 | { |
1925 | struct ssb_bus *bus = dev->dev->bus; | 1925 | struct ssb_bus *bus = dev->dev->bus; |
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c index 35033dd342ce..28e477d01587 100644 --- a/drivers/net/wireless/b43legacy/phy.c +++ b/drivers/net/wireless/b43legacy/phy.c | |||
@@ -153,7 +153,7 @@ void b43legacy_phy_calibrate(struct b43legacy_wldev *dev) | |||
153 | phy->calibrated = 1; | 153 | phy->calibrated = 1; |
154 | } | 154 | } |
155 | 155 | ||
156 | /* intialize B PHY power control | 156 | /* initialize B PHY power control |
157 | * as described in http://bcm-specs.sipsolutions.net/InitPowerControl | 157 | * as described in http://bcm-specs.sipsolutions.net/InitPowerControl |
158 | */ | 158 | */ |
159 | static void b43legacy_phy_init_pctl(struct b43legacy_wldev *dev) | 159 | static void b43legacy_phy_init_pctl(struct b43legacy_wldev *dev) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c index a5dbfea1bfad..b5cb3be0eb4b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c | |||
@@ -197,7 +197,7 @@ static irqreturn_t iwl_isr(int irq, void *data) | |||
197 | 197 | ||
198 | none: | 198 | none: |
199 | /* re-enable interrupts here since we don't have anything to service. */ | 199 | /* re-enable interrupts here since we don't have anything to service. */ |
200 | /* only Re-enable if diabled by irq and no schedules tasklet. */ | 200 | /* only Re-enable if disabled by irq and no schedules tasklet. */ |
201 | if (test_bit(STATUS_INT_ENABLED, &priv->status) && !priv->_agn.inta) | 201 | if (test_bit(STATUS_INT_ENABLED, &priv->status) && !priv->_agn.inta) |
202 | iwl_enable_interrupts(priv); | 202 | iwl_enable_interrupts(priv); |
203 | 203 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index f13a83a7e62b..36335b1b54d4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1154,7 +1154,7 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv) | |||
1154 | } | 1154 | } |
1155 | 1155 | ||
1156 | /* Re-enable all interrupts */ | 1156 | /* Re-enable all interrupts */ |
1157 | /* only Re-enable if diabled by irq */ | 1157 | /* only Re-enable if disabled by irq */ |
1158 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) | 1158 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) |
1159 | iwl_enable_interrupts(priv); | 1159 | iwl_enable_interrupts(priv); |
1160 | 1160 | ||
@@ -1368,7 +1368,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) | |||
1368 | } | 1368 | } |
1369 | 1369 | ||
1370 | /* Re-enable all interrupts */ | 1370 | /* Re-enable all interrupts */ |
1371 | /* only Re-enable if diabled by irq */ | 1371 | /* only Re-enable if disabled by irq */ |
1372 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) | 1372 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) |
1373 | iwl_enable_interrupts(priv); | 1373 | iwl_enable_interrupts(priv); |
1374 | } | 1374 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-legacy.c b/drivers/net/wireless/iwlwifi/iwl-legacy.c index a08b4e56e6b1..bb1a742a98a0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-legacy.c +++ b/drivers/net/wireless/iwlwifi/iwl-legacy.c | |||
@@ -619,7 +619,7 @@ unplugged: | |||
619 | 619 | ||
620 | none: | 620 | none: |
621 | /* re-enable interrupts here since we don't have anything to service. */ | 621 | /* re-enable interrupts here since we don't have anything to service. */ |
622 | /* only Re-enable if diabled by irq */ | 622 | /* only Re-enable if disabled by irq */ |
623 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) | 623 | if (test_bit(STATUS_INT_ENABLED, &priv->status)) |
624 | iwl_enable_interrupts(priv); | 624 | iwl_enable_interrupts(priv); |
625 | spin_unlock_irqrestore(&priv->lock, flags); | 625 | spin_unlock_irqrestore(&priv->lock, flags); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 4776323b1eba..49493d176515 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -107,7 +107,7 @@ static int iwl_process_add_sta_resp(struct iwl_priv *priv, | |||
107 | /* | 107 | /* |
108 | * XXX: The MAC address in the command buffer is often changed from | 108 | * XXX: The MAC address in the command buffer is often changed from |
109 | * the original sent to the device. That is, the MAC address | 109 | * the original sent to the device. That is, the MAC address |
110 | * written to the command buffer often is not the same MAC adress | 110 | * written to the command buffer often is not the same MAC address |
111 | * read from the command buffer when the command returns. This | 111 | * read from the command buffer when the command returns. This |
112 | * issue has not yet been resolved and this debugging is left to | 112 | * issue has not yet been resolved and this debugging is left to |
113 | * observe the problem. | 113 | * observe the problem. |
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index 2c8cc954d1b6..ec2c75d77cea 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c | |||
@@ -630,7 +630,7 @@ islpci_alloc_memory(islpci_private *priv) | |||
630 | printk(KERN_DEBUG "islpci_alloc_memory\n"); | 630 | printk(KERN_DEBUG "islpci_alloc_memory\n"); |
631 | #endif | 631 | #endif |
632 | 632 | ||
633 | /* remap the PCI device base address to accessable */ | 633 | /* remap the PCI device base address to accessible */ |
634 | if (!(priv->device_base = | 634 | if (!(priv->device_base = |
635 | ioremap(pci_resource_start(priv->pdev, 0), | 635 | ioremap(pci_resource_start(priv->pdev, 0), |
636 | ISL38XX_PCI_MEM_SIZE))) { | 636 | ISL38XX_PCI_MEM_SIZE))) { |
@@ -709,7 +709,7 @@ islpci_alloc_memory(islpci_private *priv) | |||
709 | PCI_DMA_FROMDEVICE); | 709 | PCI_DMA_FROMDEVICE); |
710 | if (!priv->pci_map_rx_address[counter]) { | 710 | if (!priv->pci_map_rx_address[counter]) { |
711 | /* error mapping the buffer to device | 711 | /* error mapping the buffer to device |
712 | accessable memory address */ | 712 | accessible memory address */ |
713 | printk(KERN_ERR "failed to map skb DMA'able\n"); | 713 | printk(KERN_ERR "failed to map skb DMA'able\n"); |
714 | goto out_free; | 714 | goto out_free; |
715 | } | 715 | } |
@@ -773,7 +773,7 @@ islpci_free_memory(islpci_private *priv) | |||
773 | priv->data_low_rx[counter] = NULL; | 773 | priv->data_low_rx[counter] = NULL; |
774 | } | 774 | } |
775 | 775 | ||
776 | /* Free the acces control list and the WPA list */ | 776 | /* Free the access control list and the WPA list */ |
777 | prism54_acl_clean(&priv->acl); | 777 | prism54_acl_clean(&priv->acl); |
778 | prism54_wpa_bss_ie_clean(priv); | 778 | prism54_wpa_bss_ie_clean(priv); |
779 | mgt_clean(priv); | 779 | mgt_clean(priv); |
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c index 2fc52bc2d7dd..d44f8e20cce0 100644 --- a/drivers/net/wireless/prism54/islpci_eth.c +++ b/drivers/net/wireless/prism54/islpci_eth.c | |||
@@ -450,7 +450,7 @@ islpci_eth_receive(islpci_private *priv) | |||
450 | MAX_FRAGMENT_SIZE_RX + 2, | 450 | MAX_FRAGMENT_SIZE_RX + 2, |
451 | PCI_DMA_FROMDEVICE); | 451 | PCI_DMA_FROMDEVICE); |
452 | if (unlikely(!priv->pci_map_rx_address[index])) { | 452 | if (unlikely(!priv->pci_map_rx_address[index])) { |
453 | /* error mapping the buffer to device accessable memory address */ | 453 | /* error mapping the buffer to device accessible memory address */ |
454 | DEBUG(SHOW_ERROR_MESSAGES, | 454 | DEBUG(SHOW_ERROR_MESSAGES, |
455 | "Error mapping DMA address\n"); | 455 | "Error mapping DMA address\n"); |
456 | 456 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 658542d2efe1..f3da051df39e 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -273,7 +273,7 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw, | |||
273 | intf->beacon = entry; | 273 | intf->beacon = entry; |
274 | 274 | ||
275 | /* | 275 | /* |
276 | * The MAC adddress must be configured after the device | 276 | * The MAC address must be configured after the device |
277 | * has been initialized. Otherwise the device can reset | 277 | * has been initialized. Otherwise the device can reset |
278 | * the MAC registers. | 278 | * the MAC registers. |
279 | * The BSSID address must only be configured in AP mode, | 279 | * The BSSID address must only be configured in AP mode, |
diff --git a/drivers/net/wireless/wl1251/acx.h b/drivers/net/wireless/wl1251/acx.h index e54b21a4f8b1..efcc3aaca14f 100644 --- a/drivers/net/wireless/wl1251/acx.h +++ b/drivers/net/wireless/wl1251/acx.h | |||
@@ -1272,10 +1272,10 @@ struct wl1251_acx_tid_cfg { | |||
1272 | /* OBSOLETE */ | 1272 | /* OBSOLETE */ |
1273 | #define WL1251_ACX_INTR_WAKE_ON_HOST BIT(6) | 1273 | #define WL1251_ACX_INTR_WAKE_ON_HOST BIT(6) |
1274 | 1274 | ||
1275 | /* Trace meassge on MBOX #A */ | 1275 | /* Trace message on MBOX #A */ |
1276 | #define WL1251_ACX_INTR_TRACE_A BIT(7) | 1276 | #define WL1251_ACX_INTR_TRACE_A BIT(7) |
1277 | 1277 | ||
1278 | /* Trace meassge on MBOX #B */ | 1278 | /* Trace message on MBOX #B */ |
1279 | #define WL1251_ACX_INTR_TRACE_B BIT(8) | 1279 | #define WL1251_ACX_INTR_TRACE_B BIT(8) |
1280 | 1280 | ||
1281 | /* Command processing completion */ | 1281 | /* Command processing completion */ |
diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/wl1251/wl1251.h index 13fbeeccf609..c0ce2c8b43b8 100644 --- a/drivers/net/wireless/wl1251/wl1251.h +++ b/drivers/net/wireless/wl1251/wl1251.h | |||
@@ -419,7 +419,7 @@ void wl1251_disable_interrupts(struct wl1251 *wl); | |||
419 | #define WL1251_FW_NAME "wl1251-fw.bin" | 419 | #define WL1251_FW_NAME "wl1251-fw.bin" |
420 | #define WL1251_NVS_NAME "wl1251-nvs.bin" | 420 | #define WL1251_NVS_NAME "wl1251-nvs.bin" |
421 | 421 | ||
422 | #define WL1251_POWER_ON_SLEEP 10 /* in miliseconds */ | 422 | #define WL1251_POWER_ON_SLEEP 10 /* in milliseconds */ |
423 | 423 | ||
424 | #define WL1251_PART_DOWN_MEM_START 0x0 | 424 | #define WL1251_PART_DOWN_MEM_START 0x0 |
425 | #define WL1251_PART_DOWN_MEM_SIZE 0x16800 | 425 | #define WL1251_PART_DOWN_MEM_SIZE 0x16800 |
diff --git a/drivers/net/wireless/wl12xx/acx.h b/drivers/net/wireless/wl12xx/acx.h index 9cbc3f40c8dd..7bd8e4db4a71 100644 --- a/drivers/net/wireless/wl12xx/acx.h +++ b/drivers/net/wireless/wl12xx/acx.h | |||
@@ -47,9 +47,9 @@ | |||
47 | #define WL1271_ACX_INTR_HW_AVAILABLE BIT(5) | 47 | #define WL1271_ACX_INTR_HW_AVAILABLE BIT(5) |
48 | /* The MISC bit is used for aggregation of RX, TxComplete and TX rate update */ | 48 | /* The MISC bit is used for aggregation of RX, TxComplete and TX rate update */ |
49 | #define WL1271_ACX_INTR_DATA BIT(6) | 49 | #define WL1271_ACX_INTR_DATA BIT(6) |
50 | /* Trace meassge on MBOX #A */ | 50 | /* Trace message on MBOX #A */ |
51 | #define WL1271_ACX_INTR_TRACE_A BIT(7) | 51 | #define WL1271_ACX_INTR_TRACE_A BIT(7) |
52 | /* Trace meassge on MBOX #B */ | 52 | /* Trace message on MBOX #B */ |
53 | #define WL1271_ACX_INTR_TRACE_B BIT(8) | 53 | #define WL1271_ACX_INTR_TRACE_B BIT(8) |
54 | 54 | ||
55 | #define WL1271_ACX_INTR_ALL 0xFFFFFFFF | 55 | #define WL1271_ACX_INTR_ALL 0xFFFFFFFF |
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h index ce3d31f98c55..9050dd9b62d2 100644 --- a/drivers/net/wireless/wl12xx/wl12xx.h +++ b/drivers/net/wireless/wl12xx/wl12xx.h | |||
@@ -416,8 +416,8 @@ int wl1271_plt_stop(struct wl1271 *wl); | |||
416 | 416 | ||
417 | /* WL1271 needs a 200ms sleep after power on, and a 20ms sleep before power | 417 | /* WL1271 needs a 200ms sleep after power on, and a 20ms sleep before power |
418 | on in case is has been shut down shortly before */ | 418 | on in case is has been shut down shortly before */ |
419 | #define WL1271_PRE_POWER_ON_SLEEP 20 /* in miliseconds */ | 419 | #define WL1271_PRE_POWER_ON_SLEEP 20 /* in milliseconds */ |
420 | #define WL1271_POWER_ON_SLEEP 200 /* in miliseconds */ | 420 | #define WL1271_POWER_ON_SLEEP 200 /* in milliseconds */ |
421 | 421 | ||
422 | /* Macros to handle wl1271.sta_rate_set */ | 422 | /* Macros to handle wl1271.sta_rate_set */ |
423 | #define HW_BG_RATES_MASK 0xffff | 423 | #define HW_BG_RATES_MASK 0xffff |
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index ee82df62e646..3e5befe4d03b 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -192,7 +192,7 @@ static inline void wl3501_switch_page(struct wl3501_card *this, u8 page) | |||
192 | } | 192 | } |
193 | 193 | ||
194 | /* | 194 | /* |
195 | * Get Ethernet MAC addresss. | 195 | * Get Ethernet MAC address. |
196 | * | 196 | * |
197 | * WARNING: We switch to FPAGE0 and switc back again. | 197 | * WARNING: We switch to FPAGE0 and switc back again. |
198 | * Making sure there is no other WL function beening called by ISR. | 198 | * Making sure there is no other WL function beening called by ISR. |
diff --git a/drivers/pcmcia/m32r_cfc.h b/drivers/pcmcia/m32r_cfc.h index 8146e3bee2e8..f558e1adf954 100644 --- a/drivers/pcmcia/m32r_cfc.h +++ b/drivers/pcmcia/m32r_cfc.h | |||
@@ -9,7 +9,7 @@ | |||
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | /* | 11 | /* |
12 | * M32R PC Card Controler | 12 | * M32R PC Card Controller |
13 | */ | 13 | */ |
14 | #define M32R_PCC0_BASE 0x00ef7000 | 14 | #define M32R_PCC0_BASE 0x00ef7000 |
15 | #define M32R_PCC1_BASE 0x00ef7020 | 15 | #define M32R_PCC1_BASE 0x00ef7020 |
diff --git a/drivers/pcmcia/m32r_pcc.h b/drivers/pcmcia/m32r_pcc.h index e4fffe417ba9..f95c58563bc8 100644 --- a/drivers/pcmcia/m32r_pcc.h +++ b/drivers/pcmcia/m32r_pcc.h | |||
@@ -5,7 +5,7 @@ | |||
5 | #define M32R_MAX_PCC 2 | 5 | #define M32R_MAX_PCC 2 |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * M32R PC Card Controler | 8 | * M32R PC Card Controller |
9 | */ | 9 | */ |
10 | #define M32R_PCC0_BASE 0x00ef7000 | 10 | #define M32R_PCC0_BASE 0x00ef7000 |
11 | #define M32R_PCC1_BASE 0x00ef7020 | 11 | #define M32R_PCC1_BASE 0x00ef7020 |
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 99d4f23cb435..0db482771fb5 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -1198,7 +1198,7 @@ static int __init m8xx_probe(struct platform_device *ofdev, | |||
1198 | out_be32(M8XX_PGCRX(1), | 1198 | out_be32(M8XX_PGCRX(1), |
1199 | M8XX_PGCRX_CXOE | (mk_int_int_mask(hwirq) << 16)); | 1199 | M8XX_PGCRX_CXOE | (mk_int_int_mask(hwirq) << 16)); |
1200 | 1200 | ||
1201 | /* intialize the fixed memory windows */ | 1201 | /* initialize the fixed memory windows */ |
1202 | 1202 | ||
1203 | for (i = 0; i < PCMCIA_SOCKETS_NO; i++) { | 1203 | for (i = 0; i < PCMCIA_SOCKETS_NO; i++) { |
1204 | for (m = 0; m < PCMCIA_MEM_WIN_NO; m++) { | 1204 | for (m = 0; m < PCMCIA_MEM_WIN_NO; m++) { |
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index ee40d681edd0..c5c4b8c32eb8 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c | |||
@@ -1021,7 +1021,7 @@ static int update_bl_status(struct backlight_device *bd) | |||
1021 | return 0; | 1021 | return 0; |
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | static struct backlight_ops acer_bl_ops = { | 1024 | static const struct backlight_ops acer_bl_ops = { |
1025 | .get_brightness = read_brightness, | 1025 | .get_brightness = read_brightness, |
1026 | .update_status = update_bl_status, | 1026 | .update_status = update_bl_status, |
1027 | }; | 1027 | }; |
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index d235f44fd7a3..f3aa6a7fdab6 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c | |||
@@ -640,7 +640,7 @@ static int update_bl_status(struct backlight_device *bd) | |||
640 | return asus_lcd_set(asus, value); | 640 | return asus_lcd_set(asus, value); |
641 | } | 641 | } |
642 | 642 | ||
643 | static struct backlight_ops asusbl_ops = { | 643 | static const struct backlight_ops asusbl_ops = { |
644 | .get_brightness = asus_read_brightness, | 644 | .get_brightness = asus_read_brightness, |
645 | .update_status = update_bl_status, | 645 | .update_status = update_bl_status, |
646 | }; | 646 | }; |
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c index ca05aefd03bf..4633fd8532cc 100644 --- a/drivers/platform/x86/asus_acpi.c +++ b/drivers/platform/x86/asus_acpi.c | |||
@@ -1467,7 +1467,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type) | |||
1467 | return 0; | 1467 | return 0; |
1468 | } | 1468 | } |
1469 | 1469 | ||
1470 | static struct backlight_ops asus_backlight_data = { | 1470 | static const struct backlight_ops asus_backlight_data = { |
1471 | .get_brightness = read_brightness, | 1471 | .get_brightness = read_brightness, |
1472 | .update_status = set_brightness_status, | 1472 | .update_status = set_brightness_status, |
1473 | }; | 1473 | }; |
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index cf8a89a0d8f5..34657f96b5a5 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c | |||
@@ -546,7 +546,7 @@ out: | |||
546 | return buffer->output[1]; | 546 | return buffer->output[1]; |
547 | } | 547 | } |
548 | 548 | ||
549 | static struct backlight_ops dell_ops = { | 549 | static const struct backlight_ops dell_ops = { |
550 | .get_brightness = dell_get_intensity, | 550 | .get_brightness = dell_get_intensity, |
551 | .update_status = dell_send_intensity, | 551 | .update_status = dell_send_intensity, |
552 | }; | 552 | }; |
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index e9fc530e7dc2..49d9ad708f89 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c | |||
@@ -1126,7 +1126,7 @@ static int update_bl_status(struct backlight_device *bd) | |||
1126 | return set_brightness(bd, bd->props.brightness); | 1126 | return set_brightness(bd, bd->props.brightness); |
1127 | } | 1127 | } |
1128 | 1128 | ||
1129 | static struct backlight_ops eeepcbl_ops = { | 1129 | static const struct backlight_ops eeepcbl_ops = { |
1130 | .get_brightness = read_brightness, | 1130 | .get_brightness = read_brightness, |
1131 | .update_status = update_bl_status, | 1131 | .update_status = update_bl_status, |
1132 | }; | 1132 | }; |
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index ad88b2ec34a1..19e92b2a7f7e 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c | |||
@@ -437,7 +437,7 @@ static int bl_update_status(struct backlight_device *b) | |||
437 | return ret; | 437 | return ret; |
438 | } | 438 | } |
439 | 439 | ||
440 | static struct backlight_ops fujitsubl_ops = { | 440 | static const struct backlight_ops fujitsubl_ops = { |
441 | .get_brightness = bl_get_brightness, | 441 | .get_brightness = bl_get_brightness, |
442 | .update_status = bl_update_status, | 442 | .update_status = bl_update_status, |
443 | }; | 443 | }; |
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index b4a95bb2f232..5e83370b0812 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c | |||
@@ -858,7 +858,7 @@ static int sony_backlight_get_brightness(struct backlight_device *bd) | |||
858 | } | 858 | } |
859 | 859 | ||
860 | static struct backlight_device *sony_backlight_device; | 860 | static struct backlight_device *sony_backlight_device; |
861 | static struct backlight_ops sony_backlight_ops = { | 861 | static const struct backlight_ops sony_backlight_ops = { |
862 | .update_status = sony_backlight_update_status, | 862 | .update_status = sony_backlight_update_status, |
863 | .get_brightness = sony_backlight_get_brightness, | 863 | .get_brightness = sony_backlight_get_brightness, |
864 | }; | 864 | }; |
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index a974ca383cb9..dd599585c6a9 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
@@ -6110,7 +6110,7 @@ static void tpacpi_brightness_notify_change(void) | |||
6110 | BACKLIGHT_UPDATE_HOTKEY); | 6110 | BACKLIGHT_UPDATE_HOTKEY); |
6111 | } | 6111 | } |
6112 | 6112 | ||
6113 | static struct backlight_ops ibm_backlight_data = { | 6113 | static const struct backlight_ops ibm_backlight_data = { |
6114 | .get_brightness = brightness_get, | 6114 | .get_brightness = brightness_get, |
6115 | .update_status = brightness_update_status, | 6115 | .update_status = brightness_update_status, |
6116 | }; | 6116 | }; |
@@ -7194,7 +7194,7 @@ static struct ibm_struct volume_driver_data = { | |||
7194 | * TPACPI_FAN_WR_ACPI_FANS (X31/X40/X41) | 7194 | * TPACPI_FAN_WR_ACPI_FANS (X31/X40/X41) |
7195 | * | 7195 | * |
7196 | * FIRMWARE BUG: on some models, EC 0x2f might not be initialized at | 7196 | * FIRMWARE BUG: on some models, EC 0x2f might not be initialized at |
7197 | * boot. Apparently the EC does not intialize it, so unless ACPI DSDT | 7197 | * boot. Apparently the EC does not initialize it, so unless ACPI DSDT |
7198 | * does so, its initial value is meaningless (0x07). | 7198 | * does so, its initial value is meaningless (0x07). |
7199 | * | 7199 | * |
7200 | * For firmware bugs, refer to: | 7200 | * For firmware bugs, refer to: |
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 4276da7291b8..209cced786c6 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c | |||
@@ -841,7 +841,7 @@ static void remove_toshiba_proc_entries(void) | |||
841 | remove_proc_entry("version", toshiba_proc_dir); | 841 | remove_proc_entry("version", toshiba_proc_dir); |
842 | } | 842 | } |
843 | 843 | ||
844 | static struct backlight_ops toshiba_backlight_data = { | 844 | static const struct backlight_ops toshiba_backlight_data = { |
845 | .get_brightness = get_lcd, | 845 | .get_brightness = get_lcd, |
846 | .update_status = set_lcd_status, | 846 | .update_status = set_lcd_status, |
847 | }; | 847 | }; |
diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c index fe16b482e912..4a8ae3935b3b 100644 --- a/drivers/power/s3c_adc_battery.c +++ b/drivers/power/s3c_adc_battery.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * iPAQ h1930/h1940/rx1950 battery controler driver | 2 | * iPAQ h1930/h1940/rx1950 battery controller driver |
3 | * Copyright (c) Vasily Khoruzhick | 3 | * Copyright (c) Vasily Khoruzhick |
4 | * Based on h1940_battery.c by Arnaud Patard | 4 | * Based on h1940_battery.c by Arnaud Patard |
5 | * | 5 | * |
@@ -427,5 +427,5 @@ static void __exit s3c_adc_bat_exit(void) | |||
427 | module_exit(s3c_adc_bat_exit); | 427 | module_exit(s3c_adc_bat_exit); |
428 | 428 | ||
429 | MODULE_AUTHOR("Vasily Khoruzhick <anarsoul@gmail.com>"); | 429 | MODULE_AUTHOR("Vasily Khoruzhick <anarsoul@gmail.com>"); |
430 | MODULE_DESCRIPTION("iPAQ H1930/H1940/RX1950 battery controler driver"); | 430 | MODULE_DESCRIPTION("iPAQ H1930/H1940/RX1950 battery controller driver"); |
431 | MODULE_LICENSE("GPL"); | 431 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 09e7a053c844..30b2a820e670 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
@@ -841,7 +841,7 @@ lcs_notify_lancmd_waiters(struct lcs_card *card, struct lcs_cmd *cmd) | |||
841 | } | 841 | } |
842 | 842 | ||
843 | /** | 843 | /** |
844 | * Emit buffer of a lan comand. | 844 | * Emit buffer of a lan command. |
845 | */ | 845 | */ |
846 | static void | 846 | static void |
847 | lcs_lancmd_timeout(unsigned long data) | 847 | lcs_lancmd_timeout(unsigned long data) |
diff --git a/drivers/s390/scsi/zfcp_cfdc.c b/drivers/s390/scsi/zfcp_cfdc.c index 46342fee394d..303dde09d294 100644 --- a/drivers/s390/scsi/zfcp_cfdc.c +++ b/drivers/s390/scsi/zfcp_cfdc.c | |||
@@ -317,7 +317,7 @@ static void zfcp_act_eval_err(struct zfcp_adapter *adapter, u32 table) | |||
317 | 317 | ||
318 | /** | 318 | /** |
319 | * zfcp_cfdc_port_denied - Process "access denied" for port | 319 | * zfcp_cfdc_port_denied - Process "access denied" for port |
320 | * @port: The port where the acces has been denied | 320 | * @port: The port where the access has been denied |
321 | * @qual: The FSF status qualifier for the access denied FSF status | 321 | * @qual: The FSF status qualifier for the access denied FSF status |
322 | */ | 322 | */ |
323 | void zfcp_cfdc_port_denied(struct zfcp_port *port, | 323 | void zfcp_cfdc_port_denied(struct zfcp_port *port, |
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c index dc5ac6e528c4..a391090a17c5 100644 --- a/drivers/scsi/a100u2w.c +++ b/drivers/scsi/a100u2w.c | |||
@@ -416,7 +416,7 @@ static u8 orc_load_firmware(struct orc_host * host) | |||
416 | /* Go back and check they match */ | 416 | /* Go back and check they match */ |
417 | 417 | ||
418 | outb(PRGMRST | DOWNLOAD, host->base + ORC_RISCCTL); /* Reset program count 0 */ | 418 | outb(PRGMRST | DOWNLOAD, host->base + ORC_RISCCTL); /* Reset program count 0 */ |
419 | bios_addr -= 0x1000; /* Reset the BIOS adddress */ | 419 | bios_addr -= 0x1000; /* Reset the BIOS address */ |
420 | for (i = 0, data32_ptr = (u8 *) & data32; /* Check the code */ | 420 | for (i = 0, data32_ptr = (u8 *) & data32; /* Check the code */ |
421 | i < 0x1000; /* Firmware code size = 4K */ | 421 | i < 0x1000; /* Firmware code size = 4K */ |
422 | i++, bios_addr++) { | 422 | i++, bios_addr++) { |
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index afc9aeba5edb..060ac4bd5a14 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c | |||
@@ -91,7 +91,7 @@ void aac_fib_map_free(struct aac_dev *dev) | |||
91 | * aac_fib_setup - setup the fibs | 91 | * aac_fib_setup - setup the fibs |
92 | * @dev: Adapter to set up | 92 | * @dev: Adapter to set up |
93 | * | 93 | * |
94 | * Allocate the PCI space for the fibs, map it and then intialise the | 94 | * Allocate the PCI space for the fibs, map it and then initialise the |
95 | * fib area, the unmapped fib data and also the free list | 95 | * fib area, the unmapped fib data and also the free list |
96 | */ | 96 | */ |
97 | 97 | ||
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx.seq b/drivers/scsi/aic7xxx_old/aic7xxx.seq index 5997e7c3a191..1565be9ebd49 100644 --- a/drivers/scsi/aic7xxx_old/aic7xxx.seq +++ b/drivers/scsi/aic7xxx_old/aic7xxx.seq | |||
@@ -1178,7 +1178,7 @@ notFound: | |||
1178 | /* | 1178 | /* |
1179 | * Retrieve an SCB by SCBID first searching the disconnected list falling | 1179 | * Retrieve an SCB by SCBID first searching the disconnected list falling |
1180 | * back to DMA'ing the SCB down from the host. This routine assumes that | 1180 | * back to DMA'ing the SCB down from the host. This routine assumes that |
1181 | * ARG_1 is the SCBID of interrest and that SINDEX is the position in the | 1181 | * ARG_1 is the SCBID of interest and that SINDEX is the position in the |
1182 | * disconnected list to start the search from. If SINDEX is SCB_LIST_NULL, | 1182 | * disconnected list to start the search from. If SINDEX is SCB_LIST_NULL, |
1183 | * we go directly to the host for the SCB. | 1183 | * we go directly to the host for the SCB. |
1184 | */ | 1184 | */ |
diff --git a/drivers/scsi/aic94xx/aic94xx_reg_def.h b/drivers/scsi/aic94xx/aic94xx_reg_def.h index 28aaf349c111..40273a747d29 100644 --- a/drivers/scsi/aic94xx/aic94xx_reg_def.h +++ b/drivers/scsi/aic94xx/aic94xx_reg_def.h | |||
@@ -1689,7 +1689,7 @@ | |||
1689 | #define PHY_START_CAL 0x01 | 1689 | #define PHY_START_CAL 0x01 |
1690 | 1690 | ||
1691 | /* | 1691 | /* |
1692 | * HST_PCIX2 Registers, Addresss Range: (0x00-0xFC) | 1692 | * HST_PCIX2 Registers, Address Range: (0x00-0xFC) |
1693 | */ | 1693 | */ |
1694 | #define PCIX_REG_BASE_ADR 0xB8040000 | 1694 | #define PCIX_REG_BASE_ADR 0xB8040000 |
1695 | 1695 | ||
@@ -1802,7 +1802,7 @@ | |||
1802 | #define PCIC_TP_CTRL 0xFC | 1802 | #define PCIC_TP_CTRL 0xFC |
1803 | 1803 | ||
1804 | /* | 1804 | /* |
1805 | * EXSI Registers, Addresss Range: (0x00-0xFC) | 1805 | * EXSI Registers, Address Range: (0x00-0xFC) |
1806 | */ | 1806 | */ |
1807 | #define EXSI_REG_BASE_ADR REG_BASE_ADDR_EXSI | 1807 | #define EXSI_REG_BASE_ADR REG_BASE_ADDR_EXSI |
1808 | 1808 | ||
diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c index c43698b1cb64..29593275201a 100644 --- a/drivers/scsi/aic94xx/aic94xx_scb.c +++ b/drivers/scsi/aic94xx/aic94xx_scb.c | |||
@@ -867,7 +867,7 @@ void asd_build_initiate_link_adm_task(struct asd_ascb *ascb, int phy_id, | |||
867 | * resources they have with this SCB, and then call this one at the | 867 | * resources they have with this SCB, and then call this one at the |
868 | * end of their timeout function. To do this, one should initialize | 868 | * end of their timeout function. To do this, one should initialize |
869 | * the ascb->timer.{function, data, expires} prior to calling the post | 869 | * the ascb->timer.{function, data, expires} prior to calling the post |
870 | * funcion. The timer is started by the post function. | 870 | * function. The timer is started by the post function. |
871 | */ | 871 | */ |
872 | void asd_ascb_timedout(unsigned long data) | 872 | void asd_ascb_timedout(unsigned long data) |
873 | { | 873 | { |
diff --git a/drivers/scsi/aic94xx/aic94xx_seq.c b/drivers/scsi/aic94xx/aic94xx_seq.c index 74374618010c..390168f62a13 100644 --- a/drivers/scsi/aic94xx/aic94xx_seq.c +++ b/drivers/scsi/aic94xx/aic94xx_seq.c | |||
@@ -797,7 +797,7 @@ static void asd_init_lseq_mdp(struct asd_ha_struct *asd_ha, int lseq) | |||
797 | int j; | 797 | int j; |
798 | /* Start from Page 1 of Mode 0 and 1. */ | 798 | /* Start from Page 1 of Mode 0 and 1. */ |
799 | moffs = LSEQ_PAGE_SIZE + i*LSEQ_MODE_SCRATCH_SIZE; | 799 | moffs = LSEQ_PAGE_SIZE + i*LSEQ_MODE_SCRATCH_SIZE; |
800 | /* All the fields of page 1 can be intialized to 0. */ | 800 | /* All the fields of page 1 can be initialized to 0. */ |
801 | for (j = 0; j < LSEQ_PAGE_SIZE; j += 4) | 801 | for (j = 0; j < LSEQ_PAGE_SIZE; j += 4) |
802 | asd_write_reg_dword(asd_ha, LmSCRATCH(lseq)+moffs+j,0); | 802 | asd_write_reg_dword(asd_ha, LmSCRATCH(lseq)+moffs+j,0); |
803 | } | 803 | } |
@@ -938,7 +938,7 @@ static void asd_init_cseq_cio(struct asd_ha_struct *asd_ha) | |||
938 | asd_write_reg_dword(asd_ha, SCBPRO, 0); | 938 | asd_write_reg_dword(asd_ha, SCBPRO, 0); |
939 | asd_write_reg_dword(asd_ha, CSEQCON, 0); | 939 | asd_write_reg_dword(asd_ha, CSEQCON, 0); |
940 | 940 | ||
941 | /* Intialize CSEQ Mode 11 Interrupt Vectors. | 941 | /* Initialize CSEQ Mode 11 Interrupt Vectors. |
942 | * The addresses are 16 bit wide and in dword units. | 942 | * The addresses are 16 bit wide and in dword units. |
943 | * The values of their macros are in byte units. | 943 | * The values of their macros are in byte units. |
944 | * Thus we have to divide by 4. */ | 944 | * Thus we have to divide by 4. */ |
@@ -961,7 +961,7 @@ static void asd_init_cseq_cio(struct asd_ha_struct *asd_ha) | |||
961 | asd_write_reg_word(asd_ha, CPRGMCNT, cseq_idle_loop); | 961 | asd_write_reg_word(asd_ha, CPRGMCNT, cseq_idle_loop); |
962 | 962 | ||
963 | for (i = 0; i < 8; i++) { | 963 | for (i = 0; i < 8; i++) { |
964 | /* Intialize Mode n Link m Interrupt Enable. */ | 964 | /* Initialize Mode n Link m Interrupt Enable. */ |
965 | asd_write_reg_dword(asd_ha, CMnINTEN(i), EN_CMnRSPMBXF); | 965 | asd_write_reg_dword(asd_ha, CMnINTEN(i), EN_CMnRSPMBXF); |
966 | /* Initialize Mode n Request Mailbox. */ | 966 | /* Initialize Mode n Request Mailbox. */ |
967 | asd_write_reg_dword(asd_ha, CMnREQMBX(i), 0); | 967 | asd_write_reg_dword(asd_ha, CMnREQMBX(i), 0); |
diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c index 9c410b21db6d..c0353cdca929 100644 --- a/drivers/scsi/bfa/bfa_fcpim.c +++ b/drivers/scsi/bfa/bfa_fcpim.c | |||
@@ -1838,7 +1838,7 @@ bfa_ioim_sm_cleanup_qfull(struct bfa_ioim_s *ioim, enum bfa_ioim_event event) | |||
1838 | 1838 | ||
1839 | case BFA_IOIM_SM_ABORT: | 1839 | case BFA_IOIM_SM_ABORT: |
1840 | /* | 1840 | /* |
1841 | * IO is alraedy being cleaned up implicitly | 1841 | * IO is already being cleaned up implicitly |
1842 | */ | 1842 | */ |
1843 | ioim->io_cbfn = __bfa_cb_ioim_abort; | 1843 | ioim->io_cbfn = __bfa_cb_ioim_abort; |
1844 | break; | 1844 | break; |
diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c index 4e2eb92ba028..43fa986bb586 100644 --- a/drivers/scsi/bfa/bfa_fcs_lport.c +++ b/drivers/scsi/bfa/bfa_fcs_lport.c | |||
@@ -5646,7 +5646,7 @@ bfa_cb_lps_fdisc_comp(void *bfad, void *uarg, bfa_status_t status) | |||
5646 | switch (status) { | 5646 | switch (status) { |
5647 | case BFA_STATUS_OK: | 5647 | case BFA_STATUS_OK: |
5648 | /* | 5648 | /* |
5649 | * Initialiaze the V-Port fields | 5649 | * Initialize the V-Port fields |
5650 | */ | 5650 | */ |
5651 | __vport_fcid(vport) = vport->lps->lp_pid; | 5651 | __vport_fcid(vport) = vport->lps->lp_pid; |
5652 | vport->vport_stats.fdisc_accepts++; | 5652 | vport->vport_stats.fdisc_accepts++; |
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index 8f1b5c8bf903..b0f8523e665f 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c | |||
@@ -3796,7 +3796,7 @@ static struct DeviceCtlBlk *device_alloc(struct AdapterCtlBlk *acb, | |||
3796 | * adapter_add_device - Adds the device instance to the adaptor instance. | 3796 | * adapter_add_device - Adds the device instance to the adaptor instance. |
3797 | * | 3797 | * |
3798 | * @acb: The adapter device to be updated | 3798 | * @acb: The adapter device to be updated |
3799 | * @dcb: A newly created and intialised device instance to add. | 3799 | * @dcb: A newly created and initialised device instance to add. |
3800 | **/ | 3800 | **/ |
3801 | static void adapter_add_device(struct AdapterCtlBlk *acb, | 3801 | static void adapter_add_device(struct AdapterCtlBlk *acb, |
3802 | struct DeviceCtlBlk *dcb) | 3802 | struct DeviceCtlBlk *dcb) |
@@ -4498,7 +4498,7 @@ static void __devinit adapter_init_chip(struct AdapterCtlBlk *acb) | |||
4498 | * init_adapter - Grab the resource for the card, setup the adapter | 4498 | * init_adapter - Grab the resource for the card, setup the adapter |
4499 | * information, set the card into a known state, create the various | 4499 | * information, set the card into a known state, create the various |
4500 | * tables etc etc. This basically gets all adapter information all up | 4500 | * tables etc etc. This basically gets all adapter information all up |
4501 | * to date, intialised and gets the chip in sync with it. | 4501 | * to date, initialised and gets the chip in sync with it. |
4502 | * | 4502 | * |
4503 | * @host: This hosts adapter structure | 4503 | * @host: This hosts adapter structure |
4504 | * @io_port: The base I/O port | 4504 | * @io_port: The base I/O port |
@@ -4789,7 +4789,7 @@ static void banner_display(void) | |||
4789 | * that it finds in the system. The pci_dev strcuture indicates which | 4789 | * that it finds in the system. The pci_dev strcuture indicates which |
4790 | * instance we are being called from. | 4790 | * instance we are being called from. |
4791 | * | 4791 | * |
4792 | * @dev: The PCI device to intialize. | 4792 | * @dev: The PCI device to initialize. |
4793 | * @id: Looks like a pointer to the entry in our pci device table | 4793 | * @id: Looks like a pointer to the entry in our pci device table |
4794 | * that was actually matched by the PCI subsystem. | 4794 | * that was actually matched by the PCI subsystem. |
4795 | * | 4795 | * |
@@ -4860,7 +4860,7 @@ fail: | |||
4860 | * dc395x_remove_one - Called to remove a single instance of the | 4860 | * dc395x_remove_one - Called to remove a single instance of the |
4861 | * adapter. | 4861 | * adapter. |
4862 | * | 4862 | * |
4863 | * @dev: The PCI device to intialize. | 4863 | * @dev: The PCI device to initialize. |
4864 | **/ | 4864 | **/ |
4865 | static void __devexit dc395x_remove_one(struct pci_dev *dev) | 4865 | static void __devexit dc395x_remove_one(struct pci_dev *dev) |
4866 | { | 4866 | { |
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index cdc06cda76e5..5962d1a5a674 100644 --- a/drivers/scsi/libfc/fc_fcp.c +++ b/drivers/scsi/libfc/fc_fcp.c | |||
@@ -1250,7 +1250,7 @@ static void fc_lun_reset_send(unsigned long data) | |||
1250 | /** | 1250 | /** |
1251 | * fc_lun_reset() - Send a LUN RESET command to a device | 1251 | * fc_lun_reset() - Send a LUN RESET command to a device |
1252 | * and wait for the reply | 1252 | * and wait for the reply |
1253 | * @lport: The local port to sent the comand on | 1253 | * @lport: The local port to sent the command on |
1254 | * @fsp: The FCP packet that identifies the LUN to be reset | 1254 | * @fsp: The FCP packet that identifies the LUN to be reset |
1255 | * @id: The SCSI command ID | 1255 | * @id: The SCSI command ID |
1256 | * @lun: The LUN ID to be reset | 1256 | * @lun: The LUN ID to be reset |
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index c06491b5862f..3512abb8a587 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
@@ -1335,7 +1335,7 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \ | |||
1335 | } | 1335 | } |
1336 | 1336 | ||
1337 | /** | 1337 | /** |
1338 | * lpfc_param_init - Intializes a cfg attribute | 1338 | * lpfc_param_init - Initializes a cfg attribute |
1339 | * | 1339 | * |
1340 | * Description: | 1340 | * Description: |
1341 | * Macro that given an attr e.g. hba_queue_depth expands | 1341 | * Macro that given an attr e.g. hba_queue_depth expands |
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index f9f160ab2ee9..bb015960dbc9 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c | |||
@@ -2852,7 +2852,7 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la) | |||
2852 | if (unlikely(!fcf_record)) { | 2852 | if (unlikely(!fcf_record)) { |
2853 | lpfc_printf_log(phba, KERN_ERR, | 2853 | lpfc_printf_log(phba, KERN_ERR, |
2854 | LOG_MBOX | LOG_SLI, | 2854 | LOG_MBOX | LOG_SLI, |
2855 | "2554 Could not allocate memmory for " | 2855 | "2554 Could not allocate memory for " |
2856 | "fcf record\n"); | 2856 | "fcf record\n"); |
2857 | rc = -ENODEV; | 2857 | rc = -ENODEV; |
2858 | goto out; | 2858 | goto out; |
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 462242dcdd0a..6d0b36aa3389 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c | |||
@@ -8071,7 +8071,7 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev) | |||
8071 | * the HBA. | 8071 | * the HBA. |
8072 | */ | 8072 | */ |
8073 | 8073 | ||
8074 | /* HBA interrupt will be diabled after this call */ | 8074 | /* HBA interrupt will be disabled after this call */ |
8075 | lpfc_sli_hba_down(phba); | 8075 | lpfc_sli_hba_down(phba); |
8076 | /* Stop kthread signal shall trigger work_done one more time */ | 8076 | /* Stop kthread signal shall trigger work_done one more time */ |
8077 | kthread_stop(phba->worker_thread); | 8077 | kthread_stop(phba->worker_thread); |
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 634b2fea9c4d..a359d2b873ce 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
@@ -10172,7 +10172,7 @@ lpfc_sli4_intr_handler(int irq, void *dev_id) | |||
10172 | * lpfc_sli4_queue_free - free a queue structure and associated memory | 10172 | * lpfc_sli4_queue_free - free a queue structure and associated memory |
10173 | * @queue: The queue structure to free. | 10173 | * @queue: The queue structure to free. |
10174 | * | 10174 | * |
10175 | * This function frees a queue structure and the DMAable memeory used for | 10175 | * This function frees a queue structure and the DMAable memory used for |
10176 | * the host resident queue. This function must be called after destroying the | 10176 | * the host resident queue. This function must be called after destroying the |
10177 | * queue on the HBA. | 10177 | * queue on the HBA. |
10178 | **/ | 10178 | **/ |
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index f5644745e24e..853411911b2e 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* | 15 | /* |
16 | * Comand coalescing - This feature allows the driver to be able to combine | 16 | * Command coalescing - This feature allows the driver to be able to combine |
17 | * two or more commands and issue as one command in order to boost I/O | 17 | * two or more commands and issue as one command in order to boost I/O |
18 | * performance. Useful if the nature of the I/O is sequential. It is not very | 18 | * performance. Useful if the nature of the I/O is sequential. It is not very |
19 | * useful for random natured I/Os. | 19 | * useful for random natured I/Os. |
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c index a7008c0c24f9..25506c777381 100644 --- a/drivers/scsi/megaraid/megaraid_mm.c +++ b/drivers/scsi/megaraid/megaraid_mm.c | |||
@@ -224,7 +224,7 @@ mraid_mm_unlocked_ioctl(struct file *filep, unsigned int cmd, | |||
224 | { | 224 | { |
225 | int err; | 225 | int err; |
226 | 226 | ||
227 | /* inconsistant: mraid_mm_compat_ioctl doesn't take the BKL */ | 227 | /* inconsistent: mraid_mm_compat_ioctl doesn't take the BKL */ |
228 | mutex_lock(&mraid_mm_mutex); | 228 | mutex_lock(&mraid_mm_mutex); |
229 | err = mraid_mm_ioctl(filep, cmd, arg); | 229 | err = mraid_mm_ioctl(filep, cmd, arg); |
230 | mutex_unlock(&mraid_mm_mutex); | 230 | mutex_unlock(&mraid_mm_mutex); |
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index f8c86b28f03f..b95285f3383f 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c | |||
@@ -603,7 +603,7 @@ static u32 pm8001_request_irq(struct pm8001_hba_info *pm8001_ha) | |||
603 | #endif | 603 | #endif |
604 | 604 | ||
605 | intx: | 605 | intx: |
606 | /* intialize the INT-X interrupt */ | 606 | /* initialize the INT-X interrupt */ |
607 | rc = request_irq(pdev->irq, irq_handler, IRQF_SHARED, DRV_NAME, | 607 | rc = request_irq(pdev->irq, irq_handler, IRQF_SHARED, DRV_NAME, |
608 | SHOST_TO_SAS_HA(pm8001_ha->shost)); | 608 | SHOST_TO_SAS_HA(pm8001_ha->shost)); |
609 | return rc; | 609 | return rc; |
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c index d53e6503c6d5..a2ed201885ae 100644 --- a/drivers/scsi/scsi_netlink.c +++ b/drivers/scsi/scsi_netlink.c | |||
@@ -477,7 +477,7 @@ EXPORT_SYMBOL_GPL(scsi_nl_remove_driver); | |||
477 | 477 | ||
478 | 478 | ||
479 | /** | 479 | /** |
480 | * scsi_netlink_init - Called by SCSI subsystem to intialize | 480 | * scsi_netlink_init - Called by SCSI subsystem to initialize |
481 | * the SCSI transport netlink interface | 481 | * the SCSI transport netlink interface |
482 | * | 482 | * |
483 | **/ | 483 | **/ |
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 4c68d36f9ac2..490ce213204e 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c | |||
@@ -864,13 +864,15 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) | |||
864 | 864 | ||
865 | error = device_add(&sdev->sdev_gendev); | 865 | error = device_add(&sdev->sdev_gendev); |
866 | if (error) { | 866 | if (error) { |
867 | printk(KERN_INFO "error 1\n"); | 867 | sdev_printk(KERN_INFO, sdev, |
868 | "failed to add device: %d\n", error); | ||
868 | return error; | 869 | return error; |
869 | } | 870 | } |
870 | device_enable_async_suspend(&sdev->sdev_dev); | 871 | device_enable_async_suspend(&sdev->sdev_dev); |
871 | error = device_add(&sdev->sdev_dev); | 872 | error = device_add(&sdev->sdev_dev); |
872 | if (error) { | 873 | if (error) { |
873 | printk(KERN_INFO "error 2\n"); | 874 | sdev_printk(KERN_INFO, sdev, |
875 | "failed to add class device: %d\n", error); | ||
874 | device_del(&sdev->sdev_gendev); | 876 | device_del(&sdev->sdev_gendev); |
875 | return error; | 877 | return error; |
876 | } | 878 | } |
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index 6b97ded9d45d..b4543f575f46 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c | |||
@@ -1866,7 +1866,7 @@ static pci_ers_result_t sym2_io_slot_dump(struct pci_dev *pdev) | |||
1866 | * | 1866 | * |
1867 | * This routine is similar to sym_set_workarounds(), except | 1867 | * This routine is similar to sym_set_workarounds(), except |
1868 | * that, at this point, we already know that the device was | 1868 | * that, at this point, we already know that the device was |
1869 | * successfully intialized at least once before, and so most | 1869 | * successfully initialized at least once before, and so most |
1870 | * of the steps taken there are un-needed here. | 1870 | * of the steps taken there are un-needed here. |
1871 | */ | 1871 | */ |
1872 | static void sym2_reset_workarounds(struct pci_dev *pdev) | 1872 | static void sym2_reset_workarounds(struct pci_dev *pdev) |
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index a067046c9da2..1a478bf88c9d 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c | |||
@@ -341,9 +341,9 @@ static void atmel_spi_next_message(struct spi_master *master) | |||
341 | /* | 341 | /* |
342 | * For DMA, tx_buf/tx_dma have the same relationship as rx_buf/rx_dma: | 342 | * For DMA, tx_buf/tx_dma have the same relationship as rx_buf/rx_dma: |
343 | * - The buffer is either valid for CPU access, else NULL | 343 | * - The buffer is either valid for CPU access, else NULL |
344 | * - If the buffer is valid, so is its DMA addresss | 344 | * - If the buffer is valid, so is its DMA address |
345 | * | 345 | * |
346 | * This driver manages the dma addresss unless message->is_dma_mapped. | 346 | * This driver manages the dma address unless message->is_dma_mapped. |
347 | */ | 347 | */ |
348 | static int | 348 | static int |
349 | atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer) | 349 | atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer) |
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 4e6245e67995..603428213d21 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | 39 | ||
40 | /* | 40 | /* |
41 | * This supports acccess to SPI devices using normal userspace I/O calls. | 41 | * This supports access to SPI devices using normal userspace I/O calls. |
42 | * Note that while traditional UNIX/POSIX I/O semantics are half duplex, | 42 | * Note that while traditional UNIX/POSIX I/O semantics are half duplex, |
43 | * and often mask message boundaries, full SPI support requires full duplex | 43 | * and often mask message boundaries, full SPI support requires full duplex |
44 | * transfers. There are several kinds of internal message boundaries to | 44 | * transfers. There are several kinds of internal message boundaries to |
diff --git a/drivers/staging/msm/msm_fb_bl.c b/drivers/staging/msm/msm_fb_bl.c index 033fc9486e01..2a8077511fc0 100644 --- a/drivers/staging/msm/msm_fb_bl.c +++ b/drivers/staging/msm/msm_fb_bl.c | |||
@@ -42,7 +42,7 @@ static int msm_fb_bl_update_status(struct backlight_device *pbd) | |||
42 | return 0; | 42 | return 0; |
43 | } | 43 | } |
44 | 44 | ||
45 | static struct backlight_ops msm_fb_bl_ops = { | 45 | static const struct backlight_ops msm_fb_bl_ops = { |
46 | .get_brightness = msm_fb_bl_get_brightness, | 46 | .get_brightness = msm_fb_bl_get_brightness, |
47 | .update_status = msm_fb_bl_update_status, | 47 | .update_status = msm_fb_bl_update_status, |
48 | }; | 48 | }; |
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index da040c12fbf9..9f26dc9408bb 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/drivers/staging/olpc_dcon/olpc_dcon.c | |||
@@ -614,7 +614,7 @@ static struct device_attribute dcon_device_files[] = { | |||
614 | __ATTR(resumeline, 0644, dcon_resumeline_show, dcon_resumeline_store), | 614 | __ATTR(resumeline, 0644, dcon_resumeline_show, dcon_resumeline_store), |
615 | }; | 615 | }; |
616 | 616 | ||
617 | static struct backlight_ops dcon_bl_ops = { | 617 | static const struct backlight_ops dcon_bl_ops = { |
618 | .get_brightness = dconbl_get, | 618 | .get_brightness = dconbl_get, |
619 | .update_status = dconbl_set | 619 | .update_status = dconbl_set |
620 | }; | 620 | }; |
diff --git a/drivers/staging/samsung-laptop/samsung-laptop.c b/drivers/staging/samsung-laptop/samsung-laptop.c index ac2bf11e1119..701e8d52a9fa 100644 --- a/drivers/staging/samsung-laptop/samsung-laptop.c +++ b/drivers/staging/samsung-laptop/samsung-laptop.c | |||
@@ -269,7 +269,7 @@ static int update_status(struct backlight_device *bd) | |||
269 | return 0; | 269 | return 0; |
270 | } | 270 | } |
271 | 271 | ||
272 | static struct backlight_ops backlight_ops = { | 272 | static const struct backlight_ops backlight_ops = { |
273 | .get_brightness = get_brightness, | 273 | .get_brightness = get_brightness, |
274 | .update_status = update_status, | 274 | .update_status = update_status, |
275 | }; | 275 | }; |
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index c4bc8d5a9d18..b00101972f20 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c | |||
@@ -6580,7 +6580,8 @@ static long do_ixj_ioctl(struct file *file_p, unsigned int cmd, unsigned long ar | |||
6580 | case IXJCTL_SET_FILTER: | 6580 | case IXJCTL_SET_FILTER: |
6581 | if (copy_from_user(&jf, argp, sizeof(jf))) | 6581 | if (copy_from_user(&jf, argp, sizeof(jf))) |
6582 | retval = -EFAULT; | 6582 | retval = -EFAULT; |
6583 | retval = ixj_init_filter(j, &jf); | 6583 | else |
6584 | retval = ixj_init_filter(j, &jf); | ||
6584 | break; | 6585 | break; |
6585 | case IXJCTL_SET_FILTER_RAW: | 6586 | case IXJCTL_SET_FILTER_RAW: |
6586 | if (copy_from_user(&jfr, argp, sizeof(jfr))) | 6587 | if (copy_from_user(&jfr, argp, sizeof(jfr))) |
diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c index 1210534822d6..5408186afc35 100644 --- a/drivers/usb/gadget/imx_udc.c +++ b/drivers/usb/gadget/imx_udc.c | |||
@@ -1320,7 +1320,7 @@ static struct imx_udc_struct controller = { | |||
1320 | }; | 1320 | }; |
1321 | 1321 | ||
1322 | /******************************************************************************* | 1322 | /******************************************************************************* |
1323 | * USB gadged driver functions | 1323 | * USB gadget driver functions |
1324 | ******************************************************************************* | 1324 | ******************************************************************************* |
1325 | */ | 1325 | */ |
1326 | int usb_gadget_probe_driver(struct usb_gadget_driver *driver, | 1326 | int usb_gadget_probe_driver(struct usb_gadget_driver *driver, |
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c index 777972454e3e..1eca8b47ce3c 100644 --- a/drivers/usb/gadget/langwell_udc.c +++ b/drivers/usb/gadget/langwell_udc.c | |||
@@ -3086,7 +3086,7 @@ static void langwell_udc_remove(struct pci_dev *pdev) | |||
3086 | 3086 | ||
3087 | kfree(dev->ep); | 3087 | kfree(dev->ep); |
3088 | 3088 | ||
3089 | /* diable IRQ handler */ | 3089 | /* disable IRQ handler */ |
3090 | if (dev->got_irq) | 3090 | if (dev->got_irq) |
3091 | free_irq(pdev->irq, dev); | 3091 | free_irq(pdev->irq, dev); |
3092 | 3092 | ||
@@ -3406,7 +3406,7 @@ static int langwell_udc_suspend(struct pci_dev *pdev, pm_message_t state) | |||
3406 | /* disable interrupt and set controller to stop state */ | 3406 | /* disable interrupt and set controller to stop state */ |
3407 | langwell_udc_stop(dev); | 3407 | langwell_udc_stop(dev); |
3408 | 3408 | ||
3409 | /* diable IRQ handler */ | 3409 | /* disable IRQ handler */ |
3410 | if (dev->got_irq) | 3410 | if (dev->got_irq) |
3411 | free_irq(pdev->irq, dev); | 3411 | free_irq(pdev->irq, dev); |
3412 | dev->got_irq = 0; | 3412 | dev->got_irq = 0; |
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 20092a27a1e8..12fd184226f2 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c | |||
@@ -98,13 +98,13 @@ void fhci_usb_enable_interrupt(struct fhci_usb *usb) | |||
98 | usb->intr_nesting_cnt--; | 98 | usb->intr_nesting_cnt--; |
99 | } | 99 | } |
100 | 100 | ||
101 | /* diable the usb interrupt */ | 101 | /* disable the usb interrupt */ |
102 | void fhci_usb_disable_interrupt(struct fhci_usb *usb) | 102 | void fhci_usb_disable_interrupt(struct fhci_usb *usb) |
103 | { | 103 | { |
104 | struct fhci_hcd *fhci = usb->fhci; | 104 | struct fhci_hcd *fhci = usb->fhci; |
105 | 105 | ||
106 | if (usb->intr_nesting_cnt == 0) { | 106 | if (usb->intr_nesting_cnt == 0) { |
107 | /* diable the timer interrupt */ | 107 | /* disable the timer interrupt */ |
108 | disable_irq_nosync(fhci->timer->irq); | 108 | disable_irq_nosync(fhci->timer->irq); |
109 | 109 | ||
110 | /* disable the usb interrupt */ | 110 | /* disable the usb interrupt */ |
diff --git a/drivers/usb/host/fhci-tds.c b/drivers/usb/host/fhci-tds.c index 7be548ca2183..38fe058fbe61 100644 --- a/drivers/usb/host/fhci-tds.c +++ b/drivers/usb/host/fhci-tds.c | |||
@@ -271,8 +271,8 @@ void fhci_init_ep_registers(struct fhci_usb *usb, struct endpoint *ep, | |||
271 | 271 | ||
272 | /* | 272 | /* |
273 | * Collect the submitted frames and inform the application about them | 273 | * Collect the submitted frames and inform the application about them |
274 | * It is also prepearing the TDs for new frames. If the Tx interrupts | 274 | * It is also preparing the TDs for new frames. If the Tx interrupts |
275 | * are diabled, the application should call that routine to get | 275 | * are disabled, the application should call that routine to get |
276 | * confirmation about the submitted frames. Otherwise, the routine is | 276 | * confirmation about the submitted frames. Otherwise, the routine is |
277 | * called frome the interrupt service routine during the Tx interrupt. | 277 | * called frome the interrupt service routine during the Tx interrupt. |
278 | * In that case the application is informed by calling the application | 278 | * In that case the application is informed by calling the application |
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c index e49b75a78000..f90d003f2302 100644 --- a/drivers/usb/host/imx21-hcd.c +++ b/drivers/usb/host/imx21-hcd.c | |||
@@ -1658,7 +1658,7 @@ static int imx21_hc_reset(struct usb_hcd *hcd) | |||
1658 | 1658 | ||
1659 | spin_lock_irqsave(&imx21->lock, flags); | 1659 | spin_lock_irqsave(&imx21->lock, flags); |
1660 | 1660 | ||
1661 | /* Reset the Host controler modules */ | 1661 | /* Reset the Host controller modules */ |
1662 | writel(USBOTG_RST_RSTCTRL | USBOTG_RST_RSTRH | | 1662 | writel(USBOTG_RST_RSTCTRL | USBOTG_RST_RSTRH | |
1663 | USBOTG_RST_RSTHSIE | USBOTG_RST_RSTHC, | 1663 | USBOTG_RST_RSTHSIE | USBOTG_RST_RSTHC, |
1664 | imx21->regs + USBOTG_RST_CTRL); | 1664 | imx21->regs + USBOTG_RST_CTRL); |
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c index 32149be4ad8e..e0cb12b573f9 100644 --- a/drivers/usb/host/oxu210hp-hcd.c +++ b/drivers/usb/host/oxu210hp-hcd.c | |||
@@ -3094,7 +3094,7 @@ static int oxu_hub_status_data(struct usb_hcd *hcd, char *buf) | |||
3094 | 3094 | ||
3095 | /* Some boards (mostly VIA?) report bogus overcurrent indications, | 3095 | /* Some boards (mostly VIA?) report bogus overcurrent indications, |
3096 | * causing massive log spam unless we completely ignore them. It | 3096 | * causing massive log spam unless we completely ignore them. It |
3097 | * may be relevant that VIA VT8235 controlers, where PORT_POWER is | 3097 | * may be relevant that VIA VT8235 controllers, where PORT_POWER is |
3098 | * always set, seem to clear PORT_OCC and PORT_CSC when writing to | 3098 | * always set, seem to clear PORT_OCC and PORT_CSC when writing to |
3099 | * PORT_POWER; that's surprising, but maybe within-spec. | 3099 | * PORT_POWER; that's surprising, but maybe within-spec. |
3100 | */ | 3100 | */ |
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c index 44f8b9225054..a6afd15f6a46 100644 --- a/drivers/usb/misc/adutux.c +++ b/drivers/usb/misc/adutux.c | |||
@@ -717,7 +717,7 @@ static int adu_probe(struct usb_interface *interface, | |||
717 | goto exit; | 717 | goto exit; |
718 | } | 718 | } |
719 | 719 | ||
720 | /* allocate memory for our device state and intialize it */ | 720 | /* allocate memory for our device state and initialize it */ |
721 | dev = kzalloc(sizeof(struct adu_device), GFP_KERNEL); | 721 | dev = kzalloc(sizeof(struct adu_device), GFP_KERNEL); |
722 | if (dev == NULL) { | 722 | if (dev == NULL) { |
723 | dev_err(&interface->dev, "Out of memory\n"); | 723 | dev_err(&interface->dev, "Out of memory\n"); |
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index c9078e4e1f4d..e573e4704015 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c | |||
@@ -769,7 +769,7 @@ static int iowarrior_probe(struct usb_interface *interface, | |||
769 | int i; | 769 | int i; |
770 | int retval = -ENOMEM; | 770 | int retval = -ENOMEM; |
771 | 771 | ||
772 | /* allocate memory for our device state and intialize it */ | 772 | /* allocate memory for our device state and initialize it */ |
773 | dev = kzalloc(sizeof(struct iowarrior), GFP_KERNEL); | 773 | dev = kzalloc(sizeof(struct iowarrior), GFP_KERNEL); |
774 | if (dev == NULL) { | 774 | if (dev == NULL) { |
775 | dev_err(&interface->dev, "Out of memory\n"); | 775 | dev_err(&interface->dev, "Out of memory\n"); |
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index edffef642337..eefb8275bb7e 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c | |||
@@ -642,7 +642,7 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id * | |||
642 | int i; | 642 | int i; |
643 | int retval = -ENOMEM; | 643 | int retval = -ENOMEM; |
644 | 644 | ||
645 | /* allocate memory for our device state and intialize it */ | 645 | /* allocate memory for our device state and initialize it */ |
646 | 646 | ||
647 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 647 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
648 | if (dev == NULL) { | 648 | if (dev == NULL) { |
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 9b162dfaa4fb..ed58c6c8f15c 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c | |||
@@ -1684,7 +1684,7 @@ static inline void __init musb_g_init_endpoints(struct musb *musb) | |||
1684 | struct musb_hw_ep *hw_ep; | 1684 | struct musb_hw_ep *hw_ep; |
1685 | unsigned count = 0; | 1685 | unsigned count = 0; |
1686 | 1686 | ||
1687 | /* intialize endpoint list just once */ | 1687 | /* initialize endpoint list just once */ |
1688 | INIT_LIST_HEAD(&(musb->g.ep_list)); | 1688 | INIT_LIST_HEAD(&(musb->g.ep_list)); |
1689 | 1689 | ||
1690 | for (epnum = 0, hw_ep = musb->endpoints; | 1690 | for (epnum = 0, hw_ep = musb->endpoints; |
@@ -1765,7 +1765,7 @@ void musb_gadget_cleanup(struct musb *musb) | |||
1765 | * | 1765 | * |
1766 | * -EINVAL something went wrong (not driver) | 1766 | * -EINVAL something went wrong (not driver) |
1767 | * -EBUSY another gadget is already using the controller | 1767 | * -EBUSY another gadget is already using the controller |
1768 | * -ENOMEM no memeory to perform the operation | 1768 | * -ENOMEM no memory to perform the operation |
1769 | * | 1769 | * |
1770 | * @param driver the gadget driver | 1770 | * @param driver the gadget driver |
1771 | * @param bind the driver's bind function | 1771 | * @param bind the driver's bind function |
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c index c7b1d8108de9..8cb9d80207fa 100644 --- a/drivers/usb/wusbcore/wa-rpipe.c +++ b/drivers/usb/wusbcore/wa-rpipe.c | |||
@@ -49,7 +49,7 @@ | |||
49 | * | 49 | * |
50 | * USB Stack port number 4 (1 based) | 50 | * USB Stack port number 4 (1 based) |
51 | * WUSB code port index 3 (0 based) | 51 | * WUSB code port index 3 (0 based) |
52 | * USB Addresss 5 (2 based -- 0 is for default, 1 for root hub) | 52 | * USB Address 5 (2 based -- 0 is for default, 1 for root hub) |
53 | * | 53 | * |
54 | * Now, because we don't use the concept as default address exactly | 54 | * Now, because we don't use the concept as default address exactly |
55 | * like the (wired) USB code does, we need to kind of skip it. So we | 55 | * like the (wired) USB code does, we need to kind of skip it. So we |
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 8dce25126330..bac163450216 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
@@ -111,7 +111,7 @@ static int atmel_bl_get_brightness(struct backlight_device *bl) | |||
111 | return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); | 111 | return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); |
112 | } | 112 | } |
113 | 113 | ||
114 | static struct backlight_ops atmel_lcdc_bl_ops = { | 114 | static const struct backlight_ops atmel_lcdc_bl_ops = { |
115 | .update_status = atmel_bl_update_status, | 115 | .update_status = atmel_bl_update_status, |
116 | .get_brightness = atmel_bl_get_brightness, | 116 | .get_brightness = atmel_bl_get_brightness, |
117 | }; | 117 | }; |
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index 34a0851bcbfa..dd9de2e80580 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c | |||
@@ -1786,7 +1786,7 @@ static int aty128_bl_get_brightness(struct backlight_device *bd) | |||
1786 | return bd->props.brightness; | 1786 | return bd->props.brightness; |
1787 | } | 1787 | } |
1788 | 1788 | ||
1789 | static struct backlight_ops aty128_bl_data = { | 1789 | static const struct backlight_ops aty128_bl_data = { |
1790 | .get_brightness = aty128_bl_get_brightness, | 1790 | .get_brightness = aty128_bl_get_brightness, |
1791 | .update_status = aty128_bl_update_status, | 1791 | .update_status = aty128_bl_update_status, |
1792 | }; | 1792 | }; |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 5a3ce3ad1ec8..767ab4fb1a05 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -2221,7 +2221,7 @@ static int aty_bl_get_brightness(struct backlight_device *bd) | |||
2221 | return bd->props.brightness; | 2221 | return bd->props.brightness; |
2222 | } | 2222 | } |
2223 | 2223 | ||
2224 | static struct backlight_ops aty_bl_data = { | 2224 | static const struct backlight_ops aty_bl_data = { |
2225 | .get_brightness = aty_bl_get_brightness, | 2225 | .get_brightness = aty_bl_get_brightness, |
2226 | .update_status = aty_bl_update_status, | 2226 | .update_status = aty_bl_update_status, |
2227 | }; | 2227 | }; |
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c index 256966e9667d..9b811ddbce83 100644 --- a/drivers/video/aty/radeon_backlight.c +++ b/drivers/video/aty/radeon_backlight.c | |||
@@ -128,7 +128,7 @@ static int radeon_bl_get_brightness(struct backlight_device *bd) | |||
128 | return bd->props.brightness; | 128 | return bd->props.brightness; |
129 | } | 129 | } |
130 | 130 | ||
131 | static struct backlight_ops radeon_bl_data = { | 131 | static const struct backlight_ops radeon_bl_data = { |
132 | .get_brightness = radeon_bl_get_brightness, | 132 | .get_brightness = radeon_bl_get_brightness, |
133 | .update_status = radeon_bl_update_status, | 133 | .update_status = radeon_bl_update_status, |
134 | }; | 134 | }; |
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c index 38ffc3fbcbe4..c789c46e38af 100644 --- a/drivers/video/backlight/88pm860x_bl.c +++ b/drivers/video/backlight/88pm860x_bl.c | |||
@@ -155,7 +155,7 @@ out: | |||
155 | return -EINVAL; | 155 | return -EINVAL; |
156 | } | 156 | } |
157 | 157 | ||
158 | static struct backlight_ops pm860x_backlight_ops = { | 158 | static const struct backlight_ops pm860x_backlight_ops = { |
159 | .options = BL_CORE_SUSPENDRESUME, | 159 | .options = BL_CORE_SUSPENDRESUME, |
160 | .update_status = pm860x_backlight_update_status, | 160 | .update_status = pm860x_backlight_update_status, |
161 | .get_brightness = pm860x_backlight_get_brightness, | 161 | .get_brightness = pm860x_backlight_get_brightness, |
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c index b2b2c7ba1f63..209acc105cbc 100644 --- a/drivers/video/backlight/max8925_bl.c +++ b/drivers/video/backlight/max8925_bl.c | |||
@@ -92,7 +92,7 @@ static int max8925_backlight_get_brightness(struct backlight_device *bl) | |||
92 | return ret; | 92 | return ret; |
93 | } | 93 | } |
94 | 94 | ||
95 | static struct backlight_ops max8925_backlight_ops = { | 95 | static const struct backlight_ops max8925_backlight_ops = { |
96 | .options = BL_CORE_SUSPENDRESUME, | 96 | .options = BL_CORE_SUSPENDRESUME, |
97 | .update_status = max8925_backlight_update_status, | 97 | .update_status = max8925_backlight_update_status, |
98 | .get_brightness = max8925_backlight_get_brightness, | 98 | .get_brightness = max8925_backlight_get_brightness, |
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c index 2fb552a6f32c..6aac6d1b937b 100644 --- a/drivers/video/nvidia/nv_backlight.c +++ b/drivers/video/nvidia/nv_backlight.c | |||
@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(struct backlight_device *bd) | |||
87 | return bd->props.brightness; | 87 | return bd->props.brightness; |
88 | } | 88 | } |
89 | 89 | ||
90 | static struct backlight_ops nvidia_bl_ops = { | 90 | static const struct backlight_ops nvidia_bl_ops = { |
91 | .get_brightness = nvidia_bl_get_brightness, | 91 | .get_brightness = nvidia_bl_get_brightness, |
92 | .update_status = nvidia_bl_update_status, | 92 | .update_status = nvidia_bl_update_status, |
93 | }; | 93 | }; |
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index e1c765d11419..61026f96ad20 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c | |||
@@ -465,7 +465,7 @@ static int taal_bl_get_intensity(struct backlight_device *dev) | |||
465 | return 0; | 465 | return 0; |
466 | } | 466 | } |
467 | 467 | ||
468 | static struct backlight_ops taal_bl_ops = { | 468 | static const struct backlight_ops taal_bl_ops = { |
469 | .get_brightness = taal_bl_get_intensity, | 469 | .get_brightness = taal_bl_get_intensity, |
470 | .update_status = taal_bl_update_status, | 470 | .update_status = taal_bl_update_status, |
471 | }; | 471 | }; |
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 618f36bec10d..da388186d617 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct backlight_device *bd) | |||
331 | return bd->props.brightness; | 331 | return bd->props.brightness; |
332 | } | 332 | } |
333 | 333 | ||
334 | static struct backlight_ops riva_bl_ops = { | 334 | static const struct backlight_ops riva_bl_ops = { |
335 | .get_brightness = riva_bl_get_brightness, | 335 | .get_brightness = riva_bl_get_brightness, |
336 | .update_status = riva_bl_update_status, | 336 | .update_status = riva_bl_update_status, |
337 | }; | 337 | }; |
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c index dee64c3b1e67..2ab704118c44 100644 --- a/drivers/video/sstfb.c +++ b/drivers/video/sstfb.c | |||
@@ -536,7 +536,7 @@ static int sstfb_set_par(struct fb_info *info) | |||
536 | fbiinit2 = sst_read(FBIINIT2); | 536 | fbiinit2 = sst_read(FBIINIT2); |
537 | fbiinit3 = sst_read(FBIINIT3); | 537 | fbiinit3 = sst_read(FBIINIT3); |
538 | 538 | ||
539 | /* everything is reset. we enable fbiinit2/3 remap : dac acces ok */ | 539 | /* everything is reset. we enable fbiinit2/3 remap : dac access ok */ |
540 | pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, | 540 | pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, |
541 | PCI_EN_INIT_WR | PCI_REMAP_DAC ); | 541 | PCI_EN_INIT_WR | PCI_REMAP_DAC ); |
542 | 542 | ||
diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c index 5fd38112a6ca..98edb657b84d 100644 --- a/fs/anon_inodes.c +++ b/fs/anon_inodes.c | |||
@@ -64,9 +64,9 @@ static const struct address_space_operations anon_aops = { | |||
64 | }; | 64 | }; |
65 | 65 | ||
66 | /** | 66 | /** |
67 | * anon_inode_getfd - creates a new file instance by hooking it up to an | 67 | * anon_inode_getfile - creates a new file instance by hooking it up to an |
68 | * anonymous inode, and a dentry that describe the "class" | 68 | * anonymous inode, and a dentry that describe the "class" |
69 | * of the file | 69 | * of the file |
70 | * | 70 | * |
71 | * @name: [in] name of the "class" of the new file | 71 | * @name: [in] name of the "class" of the new file |
72 | * @fops: [in] file operations for the new file | 72 | * @fops: [in] file operations for the new file |
diff --git a/fs/coda/inode.c b/fs/coda/inode.c index 50dc7d189f56..f065a5d31a19 100644 --- a/fs/coda/inode.c +++ b/fs/coda/inode.c | |||
@@ -45,7 +45,7 @@ static struct kmem_cache * coda_inode_cachep; | |||
45 | static struct inode *coda_alloc_inode(struct super_block *sb) | 45 | static struct inode *coda_alloc_inode(struct super_block *sb) |
46 | { | 46 | { |
47 | struct coda_inode_info *ei; | 47 | struct coda_inode_info *ei; |
48 | ei = (struct coda_inode_info *)kmem_cache_alloc(coda_inode_cachep, GFP_KERNEL); | 48 | ei = kmem_cache_alloc(coda_inode_cachep, GFP_KERNEL); |
49 | if (!ei) | 49 | if (!ei) |
50 | return NULL; | 50 | return NULL; |
51 | memset(&ei->c_fid, 0, sizeof(struct CodaFid)); | 51 | memset(&ei->c_fid, 0, sizeof(struct CodaFid)); |
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index bab2387fba43..1de65f572033 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -561,7 +561,7 @@ struct ext4_new_group_data { | |||
561 | #define EXT4_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION | 561 | #define EXT4_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION |
562 | #endif | 562 | #endif |
563 | 563 | ||
564 | /* Max physical block we can addres w/o extents */ | 564 | /* Max physical block we can address w/o extents */ |
565 | #define EXT4_MAX_BLOCK_FILE_PHYS 0xFFFFFFFF | 565 | #define EXT4_MAX_BLOCK_FILE_PHYS 0xFFFFFFFF |
566 | 566 | ||
567 | /* | 567 | /* |
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index e910720e8bb8..d202d765dad2 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
@@ -2845,14 +2845,14 @@ fix_extent_len: | |||
2845 | * to an uninitialized extent. | 2845 | * to an uninitialized extent. |
2846 | * | 2846 | * |
2847 | * Writing to an uninitized extent may result in splitting the uninitialized | 2847 | * Writing to an uninitized extent may result in splitting the uninitialized |
2848 | * extent into multiple /intialized unintialized extents (up to three) | 2848 | * extent into multiple /initialized uninitialized extents (up to three) |
2849 | * There are three possibilities: | 2849 | * There are three possibilities: |
2850 | * a> There is no split required: Entire extent should be uninitialized | 2850 | * a> There is no split required: Entire extent should be uninitialized |
2851 | * b> Splits in two extents: Write is happening at either end of the extent | 2851 | * b> Splits in two extents: Write is happening at either end of the extent |
2852 | * c> Splits in three extents: Somone is writing in middle of the extent | 2852 | * c> Splits in three extents: Somone is writing in middle of the extent |
2853 | * | 2853 | * |
2854 | * One of more index blocks maybe needed if the extent tree grow after | 2854 | * One of more index blocks maybe needed if the extent tree grow after |
2855 | * the unintialized extent split. To prevent ENOSPC occur at the IO | 2855 | * the uninitialized extent split. To prevent ENOSPC occur at the IO |
2856 | * complete, we need to split the uninitialized extent before DIO submit | 2856 | * complete, we need to split the uninitialized extent before DIO submit |
2857 | * the IO. The uninitialized extent called at this time will be split | 2857 | * the IO. The uninitialized extent called at this time will be split |
2858 | * into three uninitialized extent(at most). After IO complete, the part | 2858 | * into three uninitialized extent(at most). After IO complete, the part |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 549465fef7e9..9f7f9e49914f 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -3380,7 +3380,7 @@ int ext4_alloc_da_blocks(struct inode *inode) | |||
3380 | * doing I/O at all. | 3380 | * doing I/O at all. |
3381 | * | 3381 | * |
3382 | * We could call write_cache_pages(), and then redirty all of | 3382 | * We could call write_cache_pages(), and then redirty all of |
3383 | * the pages by calling redirty_page_for_writeback() but that | 3383 | * the pages by calling redirty_page_for_writepage() but that |
3384 | * would be ugly in the extreme. So instead we would need to | 3384 | * would be ugly in the extreme. So instead we would need to |
3385 | * replicate parts of the code in the above functions, | 3385 | * replicate parts of the code in the above functions, |
3386 | * simplifying them becuase we wouldn't actually intend to | 3386 | * simplifying them becuase we wouldn't actually intend to |
@@ -3762,9 +3762,9 @@ retry: | |||
3762 | * preallocated extents, and those write extend the file, no need to | 3762 | * preallocated extents, and those write extend the file, no need to |
3763 | * fall back to buffered IO. | 3763 | * fall back to buffered IO. |
3764 | * | 3764 | * |
3765 | * For holes, we fallocate those blocks, mark them as unintialized | 3765 | * For holes, we fallocate those blocks, mark them as uninitialized |
3766 | * If those blocks were preallocated, we mark sure they are splited, but | 3766 | * If those blocks were preallocated, we mark sure they are splited, but |
3767 | * still keep the range to write as unintialized. | 3767 | * still keep the range to write as uninitialized. |
3768 | * | 3768 | * |
3769 | * The unwrritten extents will be converted to written when DIO is completed. | 3769 | * The unwrritten extents will be converted to written when DIO is completed. |
3770 | * For async direct IO, since the IO may still pending when return, we | 3770 | * For async direct IO, since the IO may still pending when return, we |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 846a3f314111..5b2e4c30a2a1 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -207,7 +207,7 @@ repeat_locked: | |||
207 | * the committing transaction. Really, we only need to give it | 207 | * the committing transaction. Really, we only need to give it |
208 | * committing_transaction->t_outstanding_credits plus "enough" for | 208 | * committing_transaction->t_outstanding_credits plus "enough" for |
209 | * the log control blocks. | 209 | * the log control blocks. |
210 | * Also, this test is inconsitent with the matching one in | 210 | * Also, this test is inconsistent with the matching one in |
211 | * journal_extend(). | 211 | * journal_extend(). |
212 | */ | 212 | */ |
213 | if (__log_space_left(journal) < jbd_space_needed(journal)) { | 213 | if (__log_space_left(journal) < jbd_space_needed(journal)) { |
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 394893242ae3..faad2bd787c7 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
@@ -251,7 +251,7 @@ repeat: | |||
251 | * the committing transaction. Really, we only need to give it | 251 | * the committing transaction. Really, we only need to give it |
252 | * committing_transaction->t_outstanding_credits plus "enough" for | 252 | * committing_transaction->t_outstanding_credits plus "enough" for |
253 | * the log control blocks. | 253 | * the log control blocks. |
254 | * Also, this test is inconsitent with the matching one in | 254 | * Also, this test is inconsistent with the matching one in |
255 | * jbd2_journal_extend(). | 255 | * jbd2_journal_extend(). |
256 | */ | 256 | */ |
257 | if (__jbd2_log_space_left(journal) < jbd_space_needed(journal)) { | 257 | if (__jbd2_log_space_left(journal) < jbd_space_needed(journal)) { |
diff --git a/fs/notify/fanotify/Kconfig b/fs/notify/fanotify/Kconfig index 3ac36b7bf6b9..7dceff005a67 100644 --- a/fs/notify/fanotify/Kconfig +++ b/fs/notify/fanotify/Kconfig | |||
@@ -6,7 +6,7 @@ config FANOTIFY | |||
6 | ---help--- | 6 | ---help--- |
7 | Say Y here to enable fanotify suport. fanotify is a file access | 7 | Say Y here to enable fanotify suport. fanotify is a file access |
8 | notification system which differs from inotify in that it sends | 8 | notification system which differs from inotify in that it sends |
9 | and open file descriptor to the userspace listener along with | 9 | an open file descriptor to the userspace listener along with |
10 | the event. | 10 | the event. |
11 | 11 | ||
12 | If unsure, say Y. | 12 | If unsure, say Y. |
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index f935fd6600dd..4068c6c4c6f6 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c | |||
@@ -434,7 +434,7 @@ static int ocfs2_read_locked_inode(struct inode *inode, | |||
434 | * #1 and #2 can be simply solved by never taking the lock | 434 | * #1 and #2 can be simply solved by never taking the lock |
435 | * here for system files (which are the only type we read | 435 | * here for system files (which are the only type we read |
436 | * during mount). It's a heavier approach, but our main | 436 | * during mount). It's a heavier approach, but our main |
437 | * concern is user-accesible files anyway. | 437 | * concern is user-accessible files anyway. |
438 | * | 438 | * |
439 | * #3 works itself out because we'll eventually take the | 439 | * #3 works itself out because we'll eventually take the |
440 | * cluster lock before trusting anything anyway. | 440 | * cluster lock before trusting anything anyway. |
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c index 5fed60de7630..71998d4d61d5 100644 --- a/fs/ocfs2/suballoc.c +++ b/fs/ocfs2/suballoc.c | |||
@@ -1916,7 +1916,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac, | |||
1916 | if (res->sr_bg_blkno) { | 1916 | if (res->sr_bg_blkno) { |
1917 | /* Attempt to short-circuit the usual search mechanism | 1917 | /* Attempt to short-circuit the usual search mechanism |
1918 | * by jumping straight to the most recently used | 1918 | * by jumping straight to the most recently used |
1919 | * allocation group. This helps us mantain some | 1919 | * allocation group. This helps us maintain some |
1920 | * contiguousness across allocations. */ | 1920 | * contiguousness across allocations. */ |
1921 | status = ocfs2_search_one_group(ac, handle, bits_wanted, | 1921 | status = ocfs2_search_one_group(ac, handle, bits_wanted, |
1922 | min_bits, res, &bits_left); | 1922 | min_bits, res, &bits_left); |
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index c51faaa5e291..a10f6416e563 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
@@ -947,7 +947,7 @@ out_reclaim: | |||
947 | * Slab object creation initialisation for the XFS inode. | 947 | * Slab object creation initialisation for the XFS inode. |
948 | * This covers only the idempotent fields in the XFS inode; | 948 | * This covers only the idempotent fields in the XFS inode; |
949 | * all other fields need to be initialised on allocation | 949 | * all other fields need to be initialised on allocation |
950 | * from the slab. This avoids the need to repeatedly intialise | 950 | * from the slab. This avoids the need to repeatedly initialise |
951 | * fields in the xfs inode that left in the initialise state | 951 | * fields in the xfs inode that left in the initialise state |
952 | * when freeing the inode. | 952 | * when freeing the inode. |
953 | */ | 953 | */ |
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index c637b75b9f3f..cd77aa75c962 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h | |||
@@ -119,7 +119,7 @@ struct acpi_whea_header { | |||
119 | struct acpi_table_bert { | 119 | struct acpi_table_bert { |
120 | struct acpi_table_header header; /* Common ACPI table header */ | 120 | struct acpi_table_header header; /* Common ACPI table header */ |
121 | u32 region_length; /* Length of the boot error region */ | 121 | u32 region_length; /* Length of the boot error region */ |
122 | u64 address; /* Physical addresss of the error region */ | 122 | u64 address; /* Physical address of the error region */ |
123 | }; | 123 | }; |
124 | 124 | ||
125 | /* Boot Error Region (not a subtable, pointed to by Address field above) */ | 125 | /* Boot Error Region (not a subtable, pointed to by Address field above) */ |
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index ed4ba111bc8d..ce104e33cd22 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
@@ -564,7 +564,7 @@ struct cgroup_iter { | |||
564 | /* | 564 | /* |
565 | * To iterate across the tasks in a cgroup: | 565 | * To iterate across the tasks in a cgroup: |
566 | * | 566 | * |
567 | * 1) call cgroup_iter_start to intialize an iterator | 567 | * 1) call cgroup_iter_start to initialize an iterator |
568 | * | 568 | * |
569 | * 2) call cgroup_iter_next() to retrieve member tasks until it | 569 | * 2) call cgroup_iter_next() to retrieve member tasks until it |
570 | * returns NULL or until you want to end the iteration | 570 | * returns NULL or until you want to end the iteration |
diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h index 68c642d8843d..59ea406be7f6 100644 --- a/include/linux/firewire-cdev.h +++ b/include/linux/firewire-cdev.h | |||
@@ -273,7 +273,7 @@ struct fw_cdev_event_iso_interrupt { | |||
273 | * @closure: See &fw_cdev_event_common; | 273 | * @closure: See &fw_cdev_event_common; |
274 | * set by %FW_CDEV_CREATE_ISO_CONTEXT ioctl | 274 | * set by %FW_CDEV_CREATE_ISO_CONTEXT ioctl |
275 | * @type: %FW_CDEV_EVENT_ISO_INTERRUPT_MULTICHANNEL | 275 | * @type: %FW_CDEV_EVENT_ISO_INTERRUPT_MULTICHANNEL |
276 | * @completed: Offset into the receive buffer; data before this offest is valid | 276 | * @completed: Offset into the receive buffer; data before this offset is valid |
277 | * | 277 | * |
278 | * This event is sent in multichannel contexts (context type | 278 | * This event is sent in multichannel contexts (context type |
279 | * %FW_CDEV_ISO_CONTEXT_RECEIVE_MULTICHANNEL) for &fw_cdev_iso_packet buffer | 279 | * %FW_CDEV_ISO_CONTEXT_RECEIVE_MULTICHANNEL) for &fw_cdev_iso_packet buffer |
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h index cb93d80aa642..5582ab3d3e48 100644 --- a/include/linux/mfd/core.h +++ b/include/linux/mfd/core.h | |||
@@ -39,7 +39,7 @@ struct mfd_cell { | |||
39 | size_t data_size; | 39 | size_t data_size; |
40 | 40 | ||
41 | /* | 41 | /* |
42 | * This resources can be specified relatievly to the parent device. | 42 | * This resources can be specified relatively to the parent device. |
43 | * For accessing device you should use resources from device | 43 | * For accessing device you should use resources from device |
44 | */ | 44 | */ |
45 | int num_resources; | 45 | int num_resources; |
diff --git a/include/linux/poll.h b/include/linux/poll.h index 56e76af78102..1a2ccd6f3823 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h | |||
@@ -57,7 +57,7 @@ struct poll_table_entry { | |||
57 | }; | 57 | }; |
58 | 58 | ||
59 | /* | 59 | /* |
60 | * Structures and helpers for sys_poll/sys_poll | 60 | * Structures and helpers for select/poll syscall |
61 | */ | 61 | */ |
62 | struct poll_wqueues { | 62 | struct poll_wqueues { |
63 | poll_table pt; | 63 | poll_table pt; |
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 144b34be5c32..c1f499835b2a 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h | |||
@@ -122,7 +122,7 @@ struct platform_suspend_ops { | |||
122 | * suspend_set_ops - set platform dependent suspend operations | 122 | * suspend_set_ops - set platform dependent suspend operations |
123 | * @ops: The new suspend operations to set. | 123 | * @ops: The new suspend operations to set. |
124 | */ | 124 | */ |
125 | extern void suspend_set_ops(struct platform_suspend_ops *ops); | 125 | extern void suspend_set_ops(const struct platform_suspend_ops *ops); |
126 | extern int suspend_valid_only_mem(suspend_state_t state); | 126 | extern int suspend_valid_only_mem(suspend_state_t state); |
127 | 127 | ||
128 | /** | 128 | /** |
@@ -147,7 +147,7 @@ extern int pm_suspend(suspend_state_t state); | |||
147 | #else /* !CONFIG_SUSPEND */ | 147 | #else /* !CONFIG_SUSPEND */ |
148 | #define suspend_valid_only_mem NULL | 148 | #define suspend_valid_only_mem NULL |
149 | 149 | ||
150 | static inline void suspend_set_ops(struct platform_suspend_ops *ops) {} | 150 | static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {} |
151 | static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; } | 151 | static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; } |
152 | #endif /* !CONFIG_SUSPEND */ | 152 | #endif /* !CONFIG_SUSPEND */ |
153 | 153 | ||
@@ -245,7 +245,7 @@ extern void swsusp_set_page_free(struct page *); | |||
245 | extern void swsusp_unset_page_free(struct page *); | 245 | extern void swsusp_unset_page_free(struct page *); |
246 | extern unsigned long get_safe_page(gfp_t gfp_mask); | 246 | extern unsigned long get_safe_page(gfp_t gfp_mask); |
247 | 247 | ||
248 | extern void hibernation_set_ops(struct platform_hibernation_ops *ops); | 248 | extern void hibernation_set_ops(const struct platform_hibernation_ops *ops); |
249 | extern int hibernate(void); | 249 | extern int hibernate(void); |
250 | extern bool system_entering_hibernation(void); | 250 | extern bool system_entering_hibernation(void); |
251 | #else /* CONFIG_HIBERNATION */ | 251 | #else /* CONFIG_HIBERNATION */ |
@@ -253,7 +253,7 @@ static inline int swsusp_page_is_forbidden(struct page *p) { return 0; } | |||
253 | static inline void swsusp_set_page_free(struct page *p) {} | 253 | static inline void swsusp_set_page_free(struct page *p) {} |
254 | static inline void swsusp_unset_page_free(struct page *p) {} | 254 | static inline void swsusp_unset_page_free(struct page *p) {} |
255 | 255 | ||
256 | static inline void hibernation_set_ops(struct platform_hibernation_ops *ops) {} | 256 | static inline void hibernation_set_ops(const struct platform_hibernation_ops *ops) {} |
257 | static inline int hibernate(void) { return -ENOSYS; } | 257 | static inline int hibernate(void) { return -ENOSYS; } |
258 | static inline bool system_entering_hibernation(void) { return false; } | 258 | static inline bool system_entering_hibernation(void) { return false; } |
259 | #endif /* CONFIG_HIBERNATION */ | 259 | #endif /* CONFIG_HIBERNATION */ |
diff --git a/include/linux/u64_stats_sync.h b/include/linux/u64_stats_sync.h index fa261a0da280..8da8c4e87da3 100644 --- a/include/linux/u64_stats_sync.h +++ b/include/linux/u64_stats_sync.h | |||
@@ -67,21 +67,21 @@ struct u64_stats_sync { | |||
67 | #endif | 67 | #endif |
68 | }; | 68 | }; |
69 | 69 | ||
70 | static void inline u64_stats_update_begin(struct u64_stats_sync *syncp) | 70 | static inline void u64_stats_update_begin(struct u64_stats_sync *syncp) |
71 | { | 71 | { |
72 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) | 72 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) |
73 | write_seqcount_begin(&syncp->seq); | 73 | write_seqcount_begin(&syncp->seq); |
74 | #endif | 74 | #endif |
75 | } | 75 | } |
76 | 76 | ||
77 | static void inline u64_stats_update_end(struct u64_stats_sync *syncp) | 77 | static inline void u64_stats_update_end(struct u64_stats_sync *syncp) |
78 | { | 78 | { |
79 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) | 79 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) |
80 | write_seqcount_end(&syncp->seq); | 80 | write_seqcount_end(&syncp->seq); |
81 | #endif | 81 | #endif |
82 | } | 82 | } |
83 | 83 | ||
84 | static unsigned int inline u64_stats_fetch_begin(const struct u64_stats_sync *syncp) | 84 | static inline unsigned int u64_stats_fetch_begin(const struct u64_stats_sync *syncp) |
85 | { | 85 | { |
86 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) | 86 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) |
87 | return read_seqcount_begin(&syncp->seq); | 87 | return read_seqcount_begin(&syncp->seq); |
@@ -93,7 +93,7 @@ static unsigned int inline u64_stats_fetch_begin(const struct u64_stats_sync *sy | |||
93 | #endif | 93 | #endif |
94 | } | 94 | } |
95 | 95 | ||
96 | static bool inline u64_stats_fetch_retry(const struct u64_stats_sync *syncp, | 96 | static inline bool u64_stats_fetch_retry(const struct u64_stats_sync *syncp, |
97 | unsigned int start) | 97 | unsigned int start) |
98 | { | 98 | { |
99 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) | 99 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) |
@@ -112,7 +112,7 @@ static bool inline u64_stats_fetch_retry(const struct u64_stats_sync *syncp, | |||
112 | * - UP 32bit must disable BH. | 112 | * - UP 32bit must disable BH. |
113 | * - 64bit have no problem atomically reading u64 values, irq safe. | 113 | * - 64bit have no problem atomically reading u64 values, irq safe. |
114 | */ | 114 | */ |
115 | static unsigned int inline u64_stats_fetch_begin_bh(const struct u64_stats_sync *syncp) | 115 | static inline unsigned int u64_stats_fetch_begin_bh(const struct u64_stats_sync *syncp) |
116 | { | 116 | { |
117 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) | 117 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) |
118 | return read_seqcount_begin(&syncp->seq); | 118 | return read_seqcount_begin(&syncp->seq); |
@@ -124,7 +124,7 @@ static unsigned int inline u64_stats_fetch_begin_bh(const struct u64_stats_sync | |||
124 | #endif | 124 | #endif |
125 | } | 125 | } |
126 | 126 | ||
127 | static bool inline u64_stats_fetch_retry_bh(const struct u64_stats_sync *syncp, | 127 | static inline bool u64_stats_fetch_retry_bh(const struct u64_stats_sync *syncp, |
128 | unsigned int start) | 128 | unsigned int start) |
129 | { | 129 | { |
130 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) | 130 | #if BITS_PER_LONG==32 && defined(CONFIG_SMP) |
diff --git a/include/media/davinci/vpss.h b/include/media/davinci/vpss.h index c59cc029c74a..b586495bcd53 100644 --- a/include/media/davinci/vpss.h +++ b/include/media/davinci/vpss.h | |||
@@ -44,7 +44,7 @@ struct vpss_pg_frame_size { | |||
44 | short pplen; | 44 | short pplen; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | /* Used for enable/diable VPSS Clock */ | 47 | /* Used for enable/disable VPSS Clock */ |
48 | enum vpss_clock_sel { | 48 | enum vpss_clock_sel { |
49 | /* DM355/DM365 */ | 49 | /* DM355/DM365 */ |
50 | VPSS_CCDC_CLOCK, | 50 | VPSS_CCDC_CLOCK, |
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h index 2b2769c5ca9f..2a128c8c2718 100644 --- a/include/net/sctp/user.h +++ b/include/net/sctp/user.h | |||
@@ -99,8 +99,8 @@ typedef __s32 sctp_assoc_t; | |||
99 | #define SCTP_SOCKOPT_PEELOFF 102 /* peel off association. */ | 99 | #define SCTP_SOCKOPT_PEELOFF 102 /* peel off association. */ |
100 | /* Options 104-106 are deprecated and removed. Do not use this space */ | 100 | /* Options 104-106 are deprecated and removed. Do not use this space */ |
101 | #define SCTP_SOCKOPT_CONNECTX_OLD 107 /* CONNECTX old requests. */ | 101 | #define SCTP_SOCKOPT_CONNECTX_OLD 107 /* CONNECTX old requests. */ |
102 | #define SCTP_GET_PEER_ADDRS 108 /* Get all peer addresss. */ | 102 | #define SCTP_GET_PEER_ADDRS 108 /* Get all peer address. */ |
103 | #define SCTP_GET_LOCAL_ADDRS 109 /* Get all local addresss. */ | 103 | #define SCTP_GET_LOCAL_ADDRS 109 /* Get all local address. */ |
104 | #define SCTP_SOCKOPT_CONNECTX 110 /* CONNECTX requests. */ | 104 | #define SCTP_SOCKOPT_CONNECTX 110 /* CONNECTX requests. */ |
105 | #define SCTP_SOCKOPT_CONNECTX3 111 /* CONNECTX requests (updated) */ | 105 | #define SCTP_SOCKOPT_CONNECTX3 111 /* CONNECTX requests (updated) */ |
106 | 106 | ||
diff --git a/include/scsi/fc/fc_fcp.h b/include/scsi/fc/fc_fcp.h index 8e9b222251c2..8a143ca79878 100644 --- a/include/scsi/fc/fc_fcp.h +++ b/include/scsi/fc/fc_fcp.h | |||
@@ -46,7 +46,7 @@ | |||
46 | */ | 46 | */ |
47 | struct fcp_cmnd { | 47 | struct fcp_cmnd { |
48 | __u8 fc_lun[8]; /* logical unit number */ | 48 | __u8 fc_lun[8]; /* logical unit number */ |
49 | __u8 fc_cmdref; /* commmand reference number */ | 49 | __u8 fc_cmdref; /* command reference number */ |
50 | __u8 fc_pri_ta; /* priority and task attribute */ | 50 | __u8 fc_pri_ta; /* priority and task attribute */ |
51 | __u8 fc_tm_flags; /* task management flags */ | 51 | __u8 fc_tm_flags; /* task management flags */ |
52 | __u8 fc_flags; /* additional len & flags */ | 52 | __u8 fc_flags; /* additional len & flags */ |
@@ -58,7 +58,7 @@ struct fcp_cmnd { | |||
58 | 58 | ||
59 | struct fcp_cmnd32 { | 59 | struct fcp_cmnd32 { |
60 | __u8 fc_lun[8]; /* logical unit number */ | 60 | __u8 fc_lun[8]; /* logical unit number */ |
61 | __u8 fc_cmdref; /* commmand reference number */ | 61 | __u8 fc_cmdref; /* command reference number */ |
62 | __u8 fc_pri_ta; /* priority and task attribute */ | 62 | __u8 fc_pri_ta; /* priority and task attribute */ |
63 | __u8 fc_tm_flags; /* task management flags */ | 63 | __u8 fc_tm_flags; /* task management flags */ |
64 | __u8 fc_flags; /* additional len & flags */ | 64 | __u8 fc_flags; /* additional len & flags */ |
diff --git a/init/Kconfig b/init/Kconfig index ea176e8edbdd..4f6cdbf523eb 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -691,7 +691,7 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED | |||
691 | help | 691 | help |
692 | Memory Resource Controller Swap Extension comes with its price in | 692 | Memory Resource Controller Swap Extension comes with its price in |
693 | a bigger memory consumption. General purpose distribution kernels | 693 | a bigger memory consumption. General purpose distribution kernels |
694 | which want to enable the feautre but keep it disabled by default | 694 | which want to enable the feature but keep it disabled by default |
695 | and let the user enable it by swapaccount boot command line | 695 | and let the user enable it by swapaccount boot command line |
696 | parameter should have this option unselected. | 696 | parameter should have this option unselected. |
697 | For those who want to have the feature enabled by default should | 697 | For those who want to have the feature enabled by default should |
diff --git a/kernel/audit.c b/kernel/audit.c index 77770a034d59..e4956244ae50 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
@@ -400,7 +400,7 @@ static void kauditd_send_skb(struct sk_buff *skb) | |||
400 | if (err < 0) { | 400 | if (err < 0) { |
401 | BUG_ON(err != -ECONNREFUSED); /* Shouldn't happen */ | 401 | BUG_ON(err != -ECONNREFUSED); /* Shouldn't happen */ |
402 | printk(KERN_ERR "audit: *NO* daemon at audit_pid=%d\n", audit_pid); | 402 | printk(KERN_ERR "audit: *NO* daemon at audit_pid=%d\n", audit_pid); |
403 | audit_log_lost("auditd dissapeared\n"); | 403 | audit_log_lost("auditd disappeared\n"); |
404 | audit_pid = 0; | 404 | audit_pid = 0; |
405 | /* we might get lucky and get this in the next auditd */ | 405 | /* we might get lucky and get this in the next auditd */ |
406 | audit_hold_skb(skb); | 406 | audit_hold_skb(skb); |
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index a6e729766821..bd3e8e29caa3 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c | |||
@@ -2914,7 +2914,7 @@ static void __init kdb_cmd_init(void) | |||
2914 | } | 2914 | } |
2915 | } | 2915 | } |
2916 | 2916 | ||
2917 | /* Intialize kdb_printf, breakpoint tables and kdb state */ | 2917 | /* Initialize kdb_printf, breakpoint tables and kdb state */ |
2918 | void __init kdb_init(int lvl) | 2918 | void __init kdb_init(int lvl) |
2919 | { | 2919 | { |
2920 | static int kdb_init_lvl = KDB_NOT_INITIALIZED; | 2920 | static int kdb_init_lvl = KDB_NOT_INITIALIZED; |
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 45da2b6920ab..0c8d7c048615 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -1745,7 +1745,7 @@ schedule_hrtimeout_range_clock(ktime_t *expires, unsigned long delta, | |||
1745 | } | 1745 | } |
1746 | 1746 | ||
1747 | /* | 1747 | /* |
1748 | * A NULL parameter means "inifinte" | 1748 | * A NULL parameter means "infinite" |
1749 | */ | 1749 | */ |
1750 | if (!expires) { | 1750 | if (!expires) { |
1751 | schedule(); | 1751 | schedule(); |
diff --git a/kernel/kexec.c b/kernel/kexec.c index b55045bc7563..ec19b92c7ebd 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -163,7 +163,7 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry, | |||
163 | * just verifies it is an address we can use. | 163 | * just verifies it is an address we can use. |
164 | * | 164 | * |
165 | * Since the kernel does everything in page size chunks ensure | 165 | * Since the kernel does everything in page size chunks ensure |
166 | * the destination addreses are page aligned. Too many | 166 | * the destination addresses are page aligned. Too many |
167 | * special cases crop of when we don't do this. The most | 167 | * special cases crop of when we don't do this. The most |
168 | * insidious is getting overlapping destination addresses | 168 | * insidious is getting overlapping destination addresses |
169 | * simply because addresses are changed to page size | 169 | * simply because addresses are changed to page size |
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index b782b7a79f00..05ebe841270b 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
@@ -4664,7 +4664,7 @@ int perf_swevent_get_recursion_context(void) | |||
4664 | } | 4664 | } |
4665 | EXPORT_SYMBOL_GPL(perf_swevent_get_recursion_context); | 4665 | EXPORT_SYMBOL_GPL(perf_swevent_get_recursion_context); |
4666 | 4666 | ||
4667 | void inline perf_swevent_put_recursion_context(int rctx) | 4667 | inline void perf_swevent_put_recursion_context(int rctx) |
4668 | { | 4668 | { |
4669 | struct swevent_htable *swhash = &__get_cpu_var(swevent_htable); | 4669 | struct swevent_htable *swhash = &__get_cpu_var(swevent_htable); |
4670 | 4670 | ||
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 870f72bc72ae..1832bd264219 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c | |||
@@ -51,14 +51,14 @@ enum { | |||
51 | 51 | ||
52 | static int hibernation_mode = HIBERNATION_SHUTDOWN; | 52 | static int hibernation_mode = HIBERNATION_SHUTDOWN; |
53 | 53 | ||
54 | static struct platform_hibernation_ops *hibernation_ops; | 54 | static const struct platform_hibernation_ops *hibernation_ops; |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * hibernation_set_ops - set the global hibernate operations | 57 | * hibernation_set_ops - set the global hibernate operations |
58 | * @ops: the hibernation operations to use in subsequent hibernation transitions | 58 | * @ops: the hibernation operations to use in subsequent hibernation transitions |
59 | */ | 59 | */ |
60 | 60 | ||
61 | void hibernation_set_ops(struct platform_hibernation_ops *ops) | 61 | void hibernation_set_ops(const struct platform_hibernation_ops *ops) |
62 | { | 62 | { |
63 | if (ops && !(ops->begin && ops->end && ops->pre_snapshot | 63 | if (ops && !(ops->begin && ops->end && ops->pre_snapshot |
64 | && ops->prepare && ops->finish && ops->enter && ops->pre_restore | 64 | && ops->prepare && ops->finish && ops->enter && ops->pre_restore |
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 8850df68794d..de6f86bfa303 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c | |||
@@ -31,13 +31,13 @@ const char *const pm_states[PM_SUSPEND_MAX] = { | |||
31 | [PM_SUSPEND_MEM] = "mem", | 31 | [PM_SUSPEND_MEM] = "mem", |
32 | }; | 32 | }; |
33 | 33 | ||
34 | static struct platform_suspend_ops *suspend_ops; | 34 | static const struct platform_suspend_ops *suspend_ops; |
35 | 35 | ||
36 | /** | 36 | /** |
37 | * suspend_set_ops - Set the global suspend method table. | 37 | * suspend_set_ops - Set the global suspend method table. |
38 | * @ops: Pointer to ops structure. | 38 | * @ops: Pointer to ops structure. |
39 | */ | 39 | */ |
40 | void suspend_set_ops(struct platform_suspend_ops *ops) | 40 | void suspend_set_ops(const struct platform_suspend_ops *ops) |
41 | { | 41 | { |
42 | mutex_lock(&pm_mutex); | 42 | mutex_lock(&pm_mutex); |
43 | suspend_ops = ops; | 43 | suspend_ops = ops; |
diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 8c7e4832b9be..69425889bd40 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c | |||
@@ -888,7 +888,7 @@ out_finish: | |||
888 | /** | 888 | /** |
889 | * swsusp_read - read the hibernation image. | 889 | * swsusp_read - read the hibernation image. |
890 | * @flags_p: flags passed by the "frozen" kernel in the image header should | 890 | * @flags_p: flags passed by the "frozen" kernel in the image header should |
891 | * be written into this memeory location | 891 | * be written into this memory location |
892 | */ | 892 | */ |
893 | 893 | ||
894 | int swsusp_read(unsigned int *flags_p) | 894 | int swsusp_read(unsigned int *flags_p) |
diff --git a/kernel/sched.c b/kernel/sched.c index a0eb0941fa84..ea3e5eff3878 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -2505,7 +2505,7 @@ out: | |||
2505 | * try_to_wake_up_local - try to wake up a local task with rq lock held | 2505 | * try_to_wake_up_local - try to wake up a local task with rq lock held |
2506 | * @p: the thread to be awakened | 2506 | * @p: the thread to be awakened |
2507 | * | 2507 | * |
2508 | * Put @p on the run-queue if it's not alredy there. The caller must | 2508 | * Put @p on the run-queue if it's not already there. The caller must |
2509 | * ensure that this_rq() is locked, @p is bound to this_rq() and not | 2509 | * ensure that this_rq() is locked, @p is bound to this_rq() and not |
2510 | * the current task. this_rq() stays locked over invocation. | 2510 | * the current task. this_rq() stays locked over invocation. |
2511 | */ | 2511 | */ |
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 4b2545a136ff..b875bedf7c9a 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c | |||
@@ -1192,7 +1192,7 @@ static ssize_t bin_dn_node_address(struct file *file, | |||
1192 | 1192 | ||
1193 | buf[result] = '\0'; | 1193 | buf[result] = '\0'; |
1194 | 1194 | ||
1195 | /* Convert the decnet addresss to binary */ | 1195 | /* Convert the decnet address to binary */ |
1196 | result = -EIO; | 1196 | result = -EIO; |
1197 | nodep = strchr(buf, '.') + 1; | 1197 | nodep = strchr(buf, '.') + 1; |
1198 | if (!nodep) | 1198 | if (!nodep) |
diff --git a/kernel/time.c b/kernel/time.c index ba9b338d1835..32174359576f 100644 --- a/kernel/time.c +++ b/kernel/time.c | |||
@@ -238,7 +238,7 @@ EXPORT_SYMBOL(current_fs_time); | |||
238 | * Avoid unnecessary multiplications/divisions in the | 238 | * Avoid unnecessary multiplications/divisions in the |
239 | * two most common HZ cases: | 239 | * two most common HZ cases: |
240 | */ | 240 | */ |
241 | unsigned int inline jiffies_to_msecs(const unsigned long j) | 241 | inline unsigned int jiffies_to_msecs(const unsigned long j) |
242 | { | 242 | { |
243 | #if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ) | 243 | #if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ) |
244 | return (MSEC_PER_SEC / HZ) * j; | 244 | return (MSEC_PER_SEC / HZ) * j; |
@@ -254,7 +254,7 @@ unsigned int inline jiffies_to_msecs(const unsigned long j) | |||
254 | } | 254 | } |
255 | EXPORT_SYMBOL(jiffies_to_msecs); | 255 | EXPORT_SYMBOL(jiffies_to_msecs); |
256 | 256 | ||
257 | unsigned int inline jiffies_to_usecs(const unsigned long j) | 257 | inline unsigned int jiffies_to_usecs(const unsigned long j) |
258 | { | 258 | { |
259 | #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) | 259 | #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) |
260 | return (USEC_PER_SEC / HZ) * j; | 260 | return (USEC_PER_SEC / HZ) * j; |
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index df140cd3ea47..c50a034de30f 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -679,7 +679,7 @@ EXPORT_SYMBOL_GPL(__clocksource_updatefreq_scale); | |||
679 | int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq) | 679 | int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq) |
680 | { | 680 | { |
681 | 681 | ||
682 | /* Intialize mult/shift and max_idle_ns */ | 682 | /* Initialize mult/shift and max_idle_ns */ |
683 | __clocksource_updatefreq_scale(cs, scale, freq); | 683 | __clocksource_updatefreq_scale(cs, scale, freq); |
684 | 684 | ||
685 | /* Add clocksource to the clcoksource list */ | 685 | /* Add clocksource to the clcoksource list */ |
diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h index e3dfecaf13e6..6cf223764be8 100644 --- a/kernel/trace/trace_entries.h +++ b/kernel/trace/trace_entries.h | |||
@@ -53,7 +53,7 @@ | |||
53 | */ | 53 | */ |
54 | 54 | ||
55 | /* | 55 | /* |
56 | * Function trace entry - function address and parent function addres: | 56 | * Function trace entry - function address and parent function address: |
57 | */ | 57 | */ |
58 | FTRACE_ENTRY(function, ftrace_entry, | 58 | FTRACE_ENTRY(function, ftrace_entry, |
59 | 59 | ||
diff --git a/lib/nlattr.c b/lib/nlattr.c index 00e8a02681a6..5021cbc34411 100644 --- a/lib/nlattr.c +++ b/lib/nlattr.c | |||
@@ -167,7 +167,7 @@ nla_policy_len(const struct nla_policy *p, int n) | |||
167 | * @policy: validation policy | 167 | * @policy: validation policy |
168 | * | 168 | * |
169 | * Parses a stream of attributes and stores a pointer to each attribute in | 169 | * Parses a stream of attributes and stores a pointer to each attribute in |
170 | * the tb array accessable via the attribute type. Attributes with a type | 170 | * the tb array accessible via the attribute type. Attributes with a type |
171 | * exceeding maxtype will be silently ignored for backwards compatibility | 171 | * exceeding maxtype will be silently ignored for backwards compatibility |
172 | * reasons. policy may be set to NULL if no validation is required. | 172 | * reasons. policy may be set to NULL if no validation is required. |
173 | * | 173 | * |
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 7c06ee51a29a..c47bbe11b804 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
@@ -60,7 +60,7 @@ int swiotlb_force; | |||
60 | static char *io_tlb_start, *io_tlb_end; | 60 | static char *io_tlb_start, *io_tlb_end; |
61 | 61 | ||
62 | /* | 62 | /* |
63 | * The number of IO TLB blocks (in groups of 64) betweeen io_tlb_start and | 63 | * The number of IO TLB blocks (in groups of 64) between io_tlb_start and |
64 | * io_tlb_end. This is command line adjustable via setup_io_tlb_npages. | 64 | * io_tlb_end. This is command line adjustable via setup_io_tlb_npages. |
65 | */ | 65 | */ |
66 | static unsigned long io_tlb_nslabs; | 66 | static unsigned long io_tlb_nslabs; |
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index b4edfe7ce06c..b5d8a1f820a0 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
@@ -404,7 +404,7 @@ unsigned long determine_dirtyable_memory(void) | |||
404 | * - vm.dirty_background_ratio or vm.dirty_background_bytes | 404 | * - vm.dirty_background_ratio or vm.dirty_background_bytes |
405 | * - vm.dirty_ratio or vm.dirty_bytes | 405 | * - vm.dirty_ratio or vm.dirty_bytes |
406 | * The dirty limits will be lifted by 1/4 for PF_LESS_THROTTLE (ie. nfsd) and | 406 | * The dirty limits will be lifted by 1/4 for PF_LESS_THROTTLE (ie. nfsd) and |
407 | * runtime tasks. | 407 | * real-time tasks. |
408 | */ | 408 | */ |
409 | void global_dirty_limits(unsigned long *pbackground, unsigned long *pdirty) | 409 | void global_dirty_limits(unsigned long *pbackground, unsigned long *pdirty) |
410 | { | 410 | { |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ff7e15872398..826ba6922e84 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -4014,7 +4014,7 @@ static void __init setup_usemap(struct pglist_data *pgdat, | |||
4014 | zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize); | 4014 | zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize); |
4015 | } | 4015 | } |
4016 | #else | 4016 | #else |
4017 | static void inline setup_usemap(struct pglist_data *pgdat, | 4017 | static inline void setup_usemap(struct pglist_data *pgdat, |
4018 | struct zone *zone, unsigned long zonesize) {} | 4018 | struct zone *zone, unsigned long zonesize) {} |
4019 | #endif /* CONFIG_SPARSEMEM */ | 4019 | #endif /* CONFIG_SPARSEMEM */ |
4020 | 4020 | ||
diff --git a/mm/percpu.c b/mm/percpu.c index 3dd4984bdef8..3f930018aa60 100644 --- a/mm/percpu.c +++ b/mm/percpu.c | |||
@@ -258,7 +258,7 @@ static void __maybe_unused pcpu_next_pop(struct pcpu_chunk *chunk, | |||
258 | 258 | ||
259 | /* | 259 | /* |
260 | * (Un)populated page region iterators. Iterate over (un)populated | 260 | * (Un)populated page region iterators. Iterate over (un)populated |
261 | * page regions betwen @start and @end in @chunk. @rs and @re should | 261 | * page regions between @start and @end in @chunk. @rs and @re should |
262 | * be integer variables and will be set to start and end page index of | 262 | * be integer variables and will be set to start and end page index of |
263 | * the current region. | 263 | * the current region. |
264 | */ | 264 | */ |
@@ -94,7 +94,7 @@ static void anon_vma_chain_free(struct anon_vma_chain *anon_vma_chain) | |||
94 | * anonymous pages mapped into it with that anon_vma. | 94 | * anonymous pages mapped into it with that anon_vma. |
95 | * | 95 | * |
96 | * The common case will be that we already have one, but if | 96 | * The common case will be that we already have one, but if |
97 | * if not we either need to find an adjacent mapping that we | 97 | * not we either need to find an adjacent mapping that we |
98 | * can re-use the anon_vma from (very common when the only | 98 | * can re-use the anon_vma from (very common when the only |
99 | * reason for splitting a vma has been mprotect()), or we | 99 | * reason for splitting a vma has been mprotect()), or we |
100 | * allocate a new one. | 100 | * allocate a new one. |
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 29d6cbffb283..64b984091edb 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * | 9 | * |
10 | * However, virtual mappings need a page table and TLBs. Many Linux | 10 | * However, virtual mappings need a page table and TLBs. Many Linux |
11 | * architectures already map their physical space using 1-1 mappings | 11 | * architectures already map their physical space using 1-1 mappings |
12 | * via TLBs. For those arches the virtual memmory map is essentially | 12 | * via TLBs. For those arches the virtual memory map is essentially |
13 | * for free if we use the same page size as the 1-1 mappings. In that | 13 | * for free if we use the same page size as the 1-1 mappings. In that |
14 | * case the overhead consists of a few additional pages that are | 14 | * case the overhead consists of a few additional pages that are |
15 | * allocated to create a view of memory for vmemmap. | 15 | * allocated to create a view of memory for vmemmap. |
diff --git a/net/Kconfig b/net/Kconfig index ad0aafe903f8..72840626284b 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
@@ -253,7 +253,9 @@ config NET_TCPPROBE | |||
253 | what was just said, you don't need it: say N. | 253 | what was just said, you don't need it: say N. |
254 | 254 | ||
255 | Documentation on how to use TCP connection probing can be found | 255 | Documentation on how to use TCP connection probing can be found |
256 | at http://linux-net.osdl.org/index.php/TcpProbe | 256 | at: |
257 | |||
258 | http://www.linuxfoundation.org/collaborate/workgroups/networking/tcpprobe | ||
257 | 259 | ||
258 | To compile this code as a module, choose M here: the | 260 | To compile this code as a module, choose M here: the |
259 | module will be called tcp_probe. | 261 | module will be called tcp_probe. |
diff --git a/net/core/dev.c b/net/core/dev.c index a3ef808b5e36..06d0e7b25385 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -6218,7 +6218,7 @@ static void __net_exit default_device_exit(struct net *net) | |||
6218 | static void __net_exit default_device_exit_batch(struct list_head *net_list) | 6218 | static void __net_exit default_device_exit_batch(struct list_head *net_list) |
6219 | { | 6219 | { |
6220 | /* At exit all network devices most be removed from a network | 6220 | /* At exit all network devices most be removed from a network |
6221 | * namespace. Do this in the reverse order of registeration. | 6221 | * namespace. Do this in the reverse order of registration. |
6222 | * Do this across as many network namespaces as possible to | 6222 | * Do this across as many network namespaces as possible to |
6223 | * improve batching efficiency. | 6223 | * improve batching efficiency. |
6224 | */ | 6224 | */ |
diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig index ad6dffd9070e..b75968a04017 100644 --- a/net/dccp/Kconfig +++ b/net/dccp/Kconfig | |||
@@ -49,7 +49,9 @@ config NET_DCCPPROBE | |||
49 | what was just said, you don't need it: say N. | 49 | what was just said, you don't need it: say N. |
50 | 50 | ||
51 | Documentation on how to use DCCP connection probing can be found | 51 | Documentation on how to use DCCP connection probing can be found |
52 | at http://linux-net.osdl.org/index.php/DccpProbe | 52 | at: |
53 | |||
54 | http://www.linuxfoundation.org/collaborate/workgroups/networking/dccpprobe | ||
53 | 55 | ||
54 | To compile this code as a module, choose M here: the | 56 | To compile this code as a module, choose M here: the |
55 | module will be called dccp_probe. | 57 | module will be called dccp_probe. |
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 0ba15633c418..0dcaa903e00e 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
@@ -1130,7 +1130,7 @@ static struct dn_dev *dn_dev_create(struct net_device *dev, int *err) | |||
1130 | /* | 1130 | /* |
1131 | * This processes a device up event. We only start up | 1131 | * This processes a device up event. We only start up |
1132 | * the loopback device & ethernet devices with correct | 1132 | * the loopback device & ethernet devices with correct |
1133 | * MAC addreses automatically. Others must be started | 1133 | * MAC addresses automatically. Others must be started |
1134 | * specifically. | 1134 | * specifically. |
1135 | * | 1135 | * |
1136 | * FIXME: How should we configure the loopback address ? If we could dispense | 1136 | * FIXME: How should we configure the loopback address ? If we could dispense |
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 9e95d7fb6d5a..a5a1050595d1 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
@@ -432,7 +432,9 @@ config INET_DIAG | |||
432 | ---help--- | 432 | ---help--- |
433 | Support for INET (TCP, DCCP, etc) socket monitoring interface used by | 433 | Support for INET (TCP, DCCP, etc) socket monitoring interface used by |
434 | native Linux tools such as ss. ss is included in iproute2, currently | 434 | native Linux tools such as ss. ss is included in iproute2, currently |
435 | downloadable at <http://linux-net.osdl.org/index.php/Iproute2>. | 435 | downloadable at: |
436 | |||
437 | http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 | ||
436 | 438 | ||
437 | If unsure, say Y. | 439 | If unsure, say Y. |
438 | 440 | ||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index dc7c096ddfef..406f320336e6 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -1350,7 +1350,7 @@ static inline unsigned int tcp_cwnd_test(struct tcp_sock *tp, | |||
1350 | return 0; | 1350 | return 0; |
1351 | } | 1351 | } |
1352 | 1352 | ||
1353 | /* Intialize TSO state of a skb. | 1353 | /* Initialize TSO state of a skb. |
1354 | * This must be invoked the first time we consider transmitting | 1354 | * This must be invoked the first time we consider transmitting |
1355 | * SKB onto the wire. | 1355 | * SKB onto the wire. |
1356 | */ | 1356 | */ |
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 059a3de647db..978e80e2c4a8 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -300,7 +300,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
300 | goto out; | 300 | goto out; |
301 | } | 301 | } |
302 | 302 | ||
303 | /* Reproduce AF_INET checks to make the bindings consitant */ | 303 | /* Reproduce AF_INET checks to make the bindings consistent */ |
304 | v4addr = addr->sin6_addr.s6_addr32[3]; | 304 | v4addr = addr->sin6_addr.s6_addr32[3]; |
305 | chk_addr_ret = inet_addr_type(net, v4addr); | 305 | chk_addr_ret = inet_addr_type(net, v4addr); |
306 | if (!sysctl_ip_nonlocal_bind && | 306 | if (!sysctl_ip_nonlocal_bind && |
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index a36270a994d7..f04d4a484d53 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig | |||
@@ -24,7 +24,7 @@ menuconfig NET_SCHED | |||
24 | To administer these schedulers, you'll need the user-level utilities | 24 | To administer these schedulers, you'll need the user-level utilities |
25 | from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>. | 25 | from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>. |
26 | That package also contains some documentation; for more, check out | 26 | That package also contains some documentation; for more, check out |
27 | <http://linux-net.osdl.org/index.php/Iproute2>. | 27 | <http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2>. |
28 | 28 | ||
29 | This Quality of Service (QoS) support will enable you to use | 29 | This Quality of Service (QoS) support will enable you to use |
30 | Differentiated Services (diffserv) and Resource Reservation Protocol | 30 | Differentiated Services (diffserv) and Resource Reservation Protocol |
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 97d2259ae999..e8fba959fffb 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
@@ -1615,7 +1615,7 @@ static void section_rel(const char *modname, struct elf_info *elf, | |||
1615 | * A module includes a number of sections that are discarded | 1615 | * A module includes a number of sections that are discarded |
1616 | * either when loaded or when used as built-in. | 1616 | * either when loaded or when used as built-in. |
1617 | * For loaded modules all functions marked __init and all data | 1617 | * For loaded modules all functions marked __init and all data |
1618 | * marked __initdata will be discarded when the module has been intialized. | 1618 | * marked __initdata will be discarded when the module has been initialized. |
1619 | * Likewise for modules used built-in the sections marked __exit | 1619 | * Likewise for modules used built-in the sections marked __exit |
1620 | * are discarded because __exit marked function are supposed to be called | 1620 | * are discarded because __exit marked function are supposed to be called |
1621 | * only when a module is unloaded which never happens for built-in modules. | 1621 | * only when a module is unloaded which never happens for built-in modules. |
diff --git a/security/apparmor/include/match.h b/security/apparmor/include/match.h index 19ba16e8aacd..a4a863997bd5 100644 --- a/security/apparmor/include/match.h +++ b/security/apparmor/include/match.h | |||
@@ -28,7 +28,7 @@ | |||
28 | * The format used for transition tables is based on the GNU flex table | 28 | * The format used for transition tables is based on the GNU flex table |
29 | * file format (--tables-file option; see Table File Format in the flex | 29 | * file format (--tables-file option; see Table File Format in the flex |
30 | * info pages and the flex sources for documentation). The magic number | 30 | * info pages and the flex sources for documentation). The magic number |
31 | * used in the header is 0x1B5E783D insted of 0xF13C57B1 though, because | 31 | * used in the header is 0x1B5E783D instead of 0xF13C57B1 though, because |
32 | * the YY_ID_CHK (check) and YY_ID_DEF (default) tables are used | 32 | * the YY_ID_CHK (check) and YY_ID_DEF (default) tables are used |
33 | * slightly differently (see the apparmor-parser package). | 33 | * slightly differently (see the apparmor-parser package). |
34 | */ | 34 | */ |
diff --git a/sound/core/init.c b/sound/core/init.c index 57b792e2439a..3e65da21a08c 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
@@ -642,7 +642,7 @@ static struct device_attribute card_number_attrs = | |||
642 | * external accesses. Thus, you should call this function at the end | 642 | * external accesses. Thus, you should call this function at the end |
643 | * of the initialization of the card. | 643 | * of the initialization of the card. |
644 | * | 644 | * |
645 | * Returns zero otherwise a negative error code if the registrain failed. | 645 | * Returns zero otherwise a negative error code if the registration failed. |
646 | */ | 646 | */ |
647 | int snd_card_register(struct snd_card *card) | 647 | int snd_card_register(struct snd_card *card) |
648 | { | 648 | { |
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index e82c1f97d99e..c0ebb5162e95 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
@@ -984,7 +984,7 @@ static int snd_pcm_do_pause(struct snd_pcm_substream *substream, int push) | |||
984 | if (push) | 984 | if (push) |
985 | snd_pcm_update_hw_ptr(substream); | 985 | snd_pcm_update_hw_ptr(substream); |
986 | /* The jiffies check in snd_pcm_update_hw_ptr*() is done by | 986 | /* The jiffies check in snd_pcm_update_hw_ptr*() is done by |
987 | * a delta betwen the current jiffies, this gives a large enough | 987 | * a delta between the current jiffies, this gives a large enough |
988 | * delta, effectively to skip the check once. | 988 | * delta, effectively to skip the check once. |
989 | */ | 989 | */ |
990 | substream->runtime->hw_ptr_jiffies = jiffies - HZ * 1000; | 990 | substream->runtime->hw_ptr_jiffies = jiffies - HZ * 1000; |
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 265abcce9dba..9b915e27b5bd 100644 --- a/sound/isa/opl3sa2.c +++ b/sound/isa/opl3sa2.c | |||
@@ -264,7 +264,7 @@ static int __devinit snd_opl3sa2_detect(struct snd_card *card) | |||
264 | snd_printd("OPL3-SA [0x%lx] detect (1) = 0x%x (0x%x)\n", port, tmp, tmp1); | 264 | snd_printd("OPL3-SA [0x%lx] detect (1) = 0x%x (0x%x)\n", port, tmp, tmp1); |
265 | return -ENODEV; | 265 | return -ENODEV; |
266 | } | 266 | } |
267 | /* try if the MIC register is accesible */ | 267 | /* try if the MIC register is accessible */ |
268 | tmp = snd_opl3sa2_read(chip, OPL3SA2_MIC); | 268 | tmp = snd_opl3sa2_read(chip, OPL3SA2_MIC); |
269 | snd_opl3sa2_write(chip, OPL3SA2_MIC, 0x8a); | 269 | snd_opl3sa2_write(chip, OPL3SA2_MIC, 0x8a); |
270 | if (((tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MIC)) & 0x9f) != 0x8a) { | 270 | if (((tmp1 = snd_opl3sa2_read(chip, OPL3SA2_MIC)) & 0x9f) != 0x8a) { |
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h index f19c11077255..fc53b9bca26d 100644 --- a/sound/pci/ca0106/ca0106.h +++ b/sound/pci/ca0106/ca0106.h | |||
@@ -188,7 +188,7 @@ | |||
188 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ | 188 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ |
189 | /* PTR[5:0], Default: 0x0 */ | 189 | /* PTR[5:0], Default: 0x0 */ |
190 | #define PLAYBACK_UNKNOWN3 0x03 /* Not used ?? */ | 190 | #define PLAYBACK_UNKNOWN3 0x03 /* Not used ?? */ |
191 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA addresss */ | 191 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA address */ |
192 | /* DMA[31:0], Default: 0x0 */ | 192 | /* DMA[31:0], Default: 0x0 */ |
193 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */ | 193 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */ |
194 | /* SIZE[31:16], Default: 0x0 */ | 194 | /* SIZE[31:16], Default: 0x0 */ |
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index d2d12c08f937..01b49388fafd 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -1082,7 +1082,7 @@ snd_ca0106_pcm_pointer_capture(struct snd_pcm_substream *substream) | |||
1082 | struct snd_pcm_runtime *runtime = substream->runtime; | 1082 | struct snd_pcm_runtime *runtime = substream->runtime; |
1083 | struct snd_ca0106_pcm *epcm = runtime->private_data; | 1083 | struct snd_ca0106_pcm *epcm = runtime->private_data; |
1084 | snd_pcm_uframes_t ptr, ptr1, ptr2 = 0; | 1084 | snd_pcm_uframes_t ptr, ptr1, ptr2 = 0; |
1085 | int channel = channel=epcm->channel_id; | 1085 | int channel = epcm->channel_id; |
1086 | 1086 | ||
1087 | if (!epcm->running) | 1087 | if (!epcm->running) |
1088 | return 0; | 1088 | return 0; |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index df47f738098d..0c701e4ec8a5 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -114,7 +114,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard."); | |||
114 | */ | 114 | */ |
115 | #define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ | 115 | #define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ |
116 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ | 116 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ |
117 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA addresss */ | 117 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA address */ |
118 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size */ | 118 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size */ |
119 | #define PLAYBACK_POINTER 0x06 /* Playback period pointer. Sample currently in DAC */ | 119 | #define PLAYBACK_POINTER 0x06 /* Playback period pointer. Sample currently in DAC */ |
120 | #define PLAYBACK_UNKNOWN1 0x07 | 120 | #define PLAYBACK_UNKNOWN1 0x07 |
diff --git a/sound/pci/emu10k1/p16v.h b/sound/pci/emu10k1/p16v.h index 153214940336..00f4817533b1 100644 --- a/sound/pci/emu10k1/p16v.h +++ b/sound/pci/emu10k1/p16v.h | |||
@@ -96,7 +96,7 @@ | |||
96 | #define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ | 96 | #define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ |
97 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ | 97 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ |
98 | #define PLAYBACK_UNKNOWN3 0x03 /* Not used */ | 98 | #define PLAYBACK_UNKNOWN3 0x03 /* Not used */ |
99 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA addresss */ | 99 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA address */ |
100 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */ | 100 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */ |
101 | #define PLAYBACK_POINTER 0x06 /* Playback period pointer. Used with PLAYBACK_LIST_PTR to determine buffer position currently in DAC */ | 101 | #define PLAYBACK_POINTER 0x06 /* Playback period pointer. Used with PLAYBACK_LIST_PTR to determine buffer position currently in DAC */ |
102 | #define PLAYBACK_FIFO_END_ADDRESS 0x07 /* Playback FIFO end address */ | 102 | #define PLAYBACK_FIFO_END_ADDRESS 0x07 /* Playback FIFO end address */ |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 23a58f0d6cb9..7c17f45d876d 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -220,7 +220,7 @@ MODULE_PARM_DESC(joystick, "Enable joystick."); | |||
220 | #define RINGB_EN_2CODEC 0x0020 | 220 | #define RINGB_EN_2CODEC 0x0020 |
221 | #define RINGB_SING_BIT_DUAL 0x0040 | 221 | #define RINGB_SING_BIT_DUAL 0x0040 |
222 | 222 | ||
223 | /* ****Port Adresses**** */ | 223 | /* ****Port Addresses**** */ |
224 | 224 | ||
225 | /* Write & Read */ | 225 | /* Write & Read */ |
226 | #define ESM_INDEX 0x02 | 226 | #define ESM_INDEX 0x02 |
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 0c98ef9156d8..f5eadfc0672a 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c | |||
@@ -487,7 +487,7 @@ struct hdspm { | |||
487 | struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS]; | 487 | struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS]; |
488 | /* but input to much, so not used */ | 488 | /* but input to much, so not used */ |
489 | struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS]; | 489 | struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS]; |
490 | /* full mixer accessable over mixer ioctl or hwdep-device */ | 490 | /* full mixer accessible over mixer ioctl or hwdep-device */ |
491 | struct hdspm_mixer *mixer; | 491 | struct hdspm_mixer *mixer; |
492 | 492 | ||
493 | }; | 493 | }; |
@@ -550,7 +550,7 @@ static inline int HDSPM_bit2freq(int n) | |||
550 | return bit2freq_tab[n]; | 550 | return bit2freq_tab[n]; |
551 | } | 551 | } |
552 | 552 | ||
553 | /* Write/read to/from HDSPM with Adresses in Bytes | 553 | /* Write/read to/from HDSPM with Addresses in Bytes |
554 | not words but only 32Bit writes are allowed */ | 554 | not words but only 32Bit writes are allowed */ |
555 | 555 | ||
556 | static inline void hdspm_write(struct hdspm * hdspm, unsigned int reg, | 556 | static inline void hdspm_write(struct hdspm * hdspm, unsigned int reg, |
@@ -2908,7 +2908,7 @@ static int snd_hdspm_create_controls(struct snd_card *card, struct hdspm * hdspm | |||
2908 | 2908 | ||
2909 | /* Channel playback mixer as default control | 2909 | /* Channel playback mixer as default control |
2910 | Note: the whole matrix would be 128*HDSPM_MIXER_CHANNELS Faders, | 2910 | Note: the whole matrix would be 128*HDSPM_MIXER_CHANNELS Faders, |
2911 | thats too * big for any alsamixer they are accesible via special | 2911 | thats too * big for any alsamixer they are accessible via special |
2912 | IOCTL on hwdep and the mixer 2dimensional mixer control | 2912 | IOCTL on hwdep and the mixer 2dimensional mixer control |
2913 | */ | 2913 | */ |
2914 | 2914 | ||
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index 581a670e8261..edce8a27e3ee 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c | |||
@@ -51,7 +51,7 @@ static struct snd_ps3_card_info the_card; | |||
51 | static int snd_ps3_start_delay = CONFIG_SND_PS3_DEFAULT_START_DELAY; | 51 | static int snd_ps3_start_delay = CONFIG_SND_PS3_DEFAULT_START_DELAY; |
52 | 52 | ||
53 | module_param_named(start_delay, snd_ps3_start_delay, uint, 0644); | 53 | module_param_named(start_delay, snd_ps3_start_delay, uint, 0644); |
54 | MODULE_PARM_DESC(start_delay, "time to insert silent data in milisec"); | 54 | MODULE_PARM_DESC(start_delay, "time to insert silent data in ms"); |
55 | 55 | ||
56 | static int index = SNDRV_DEFAULT_IDX1; | 56 | static int index = SNDRV_DEFAULT_IDX1; |
57 | static char *id = SNDRV_DEFAULT_STR1; | 57 | static char *id = SNDRV_DEFAULT_STR1; |
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 6447dbb2f123..72f0dbc6e0f2 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c | |||
@@ -1957,7 +1957,7 @@ static int max98088_probe(struct snd_soc_codec *codec) | |||
1957 | return ret; | 1957 | return ret; |
1958 | } | 1958 | } |
1959 | 1959 | ||
1960 | /* initalize private data */ | 1960 | /* initialize private data */ |
1961 | 1961 | ||
1962 | max98088->sysclk = (unsigned)-1; | 1962 | max98088->sysclk = (unsigned)-1; |
1963 | max98088->eq_textcnt = 0; | 1963 | max98088->eq_textcnt = 0; |
diff --git a/sound/soc/s3c24xx/smdk_spdif.c b/sound/soc/s3c24xx/smdk_spdif.c index c8bd90488a87..761e02b4a6e0 100644 --- a/sound/soc/s3c24xx/smdk_spdif.c +++ b/sound/soc/s3c24xx/smdk_spdif.c | |||
@@ -61,7 +61,7 @@ static int set_audio_clock_heirachy(struct platform_device *pdev) | |||
61 | goto out3; | 61 | goto out3; |
62 | } | 62 | } |
63 | 63 | ||
64 | /* Set audio clock heirachy for S/PDIF */ | 64 | /* Set audio clock hierarchy for S/PDIF */ |
65 | clk_set_parent(mout_epll, fout_epll); | 65 | clk_set_parent(mout_epll, fout_epll); |
66 | clk_set_parent(sclk_audio0, mout_epll); | 66 | clk_set_parent(sclk_audio0, mout_epll); |
67 | clk_set_parent(sclk_spdif, sclk_audio0); | 67 | clk_set_parent(sclk_spdif, sclk_audio0); |
@@ -79,7 +79,7 @@ out1: | |||
79 | 79 | ||
80 | /* We should haved to set clock directly on this part because of clock | 80 | /* We should haved to set clock directly on this part because of clock |
81 | * scheme of Samsudng SoCs did not support to set rates from abstrct | 81 | * scheme of Samsudng SoCs did not support to set rates from abstrct |
82 | * clock of it's heirachy. | 82 | * clock of it's hierarchy. |
83 | */ | 83 | */ |
84 | static int set_audio_clock_rate(unsigned long epll_rate, | 84 | static int set_audio_clock_rate(unsigned long epll_rate, |
85 | unsigned long audio_rate) | 85 | unsigned long audio_rate) |
@@ -197,7 +197,7 @@ static int __init smdk_init(void) | |||
197 | if (ret) | 197 | if (ret) |
198 | goto err1; | 198 | goto err1; |
199 | 199 | ||
200 | /* Set audio clock heirachy manually */ | 200 | /* Set audio clock hierarchy manually */ |
201 | ret = set_audio_clock_heirachy(smdk_snd_spdif_device); | 201 | ret = set_audio_clock_heirachy(smdk_snd_spdif_device); |
202 | if (ret) | 202 | if (ret) |
203 | goto err1; | 203 | goto err1; |