diff options
175 files changed, 254 insertions, 257 deletions
@@ -328,7 +328,7 @@ S: Haifa, Israel | |||
328 | N: Johannes Berg | 328 | N: Johannes Berg |
329 | E: johannes@sipsolutions.net | 329 | E: johannes@sipsolutions.net |
330 | W: http://johannes.sipsolutions.net/ | 330 | W: http://johannes.sipsolutions.net/ |
331 | P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5 | 331 | P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D 8532 E0F3 73F3 7BF9 099A |
332 | D: powerpc & 802.11 hacker | 332 | D: powerpc & 802.11 hacker |
333 | 333 | ||
334 | N: Stephen R. van den Berg (AKA BuGless) | 334 | N: Stephen R. van den Berg (AKA BuGless) |
diff --git a/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt b/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt index a7e155a023b8..36afa322b04b 100644 --- a/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt +++ b/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt | |||
@@ -127,7 +127,7 @@ Nintendo Wii device tree | |||
127 | - reg : should contain the SDHCI registers location and length | 127 | - reg : should contain the SDHCI registers location and length |
128 | - interrupts : should contain the SDHCI interrupt | 128 | - interrupts : should contain the SDHCI interrupt |
129 | 129 | ||
130 | 1.j) The Inter-Processsor Communication (IPC) node | 130 | 1.j) The Inter-Processor Communication (IPC) node |
131 | 131 | ||
132 | Represent the Inter-Processor Communication interface. This interface | 132 | Represent the Inter-Processor Communication interface. This interface |
133 | enables communications between the Broadway and the Starlet processors. | 133 | enables communications between the Broadway and the Starlet processors. |
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 4cba260e3059..19132cadc18d 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -215,7 +215,7 @@ Who: Zhang Rui <rui.zhang@intel.com> | |||
215 | What: CONFIG_ACPI_PROCFS_POWER | 215 | What: CONFIG_ACPI_PROCFS_POWER |
216 | When: 2.6.39 | 216 | When: 2.6.39 |
217 | Why: sysfs I/F for ACPI power devices, including AC and Battery, | 217 | Why: sysfs I/F for ACPI power devices, including AC and Battery, |
218 | has been working in upstream kenrel since 2.6.24, Sep 2007. | 218 | has been working in upstream kernel since 2.6.24, Sep 2007. |
219 | In 2.6.37, we make the sysfs I/F always built in and this option | 219 | In 2.6.37, we make the sysfs I/F always built in and this option |
220 | disabled by default. | 220 | disabled by default. |
221 | Remove this option and the ACPI power procfs interface in 2.6.39. | 221 | Remove this option and the ACPI power procfs interface in 2.6.39. |
diff --git a/Documentation/stable_api_nonsense.txt b/Documentation/stable_api_nonsense.txt index 847b342b7b20..db3be892afb2 100644 --- a/Documentation/stable_api_nonsense.txt +++ b/Documentation/stable_api_nonsense.txt | |||
@@ -122,7 +122,7 @@ operating system to suffer. | |||
122 | 122 | ||
123 | In both of these instances, all developers agreed that these were | 123 | In both of these instances, all developers agreed that these were |
124 | important changes that needed to be made, and they were made, with | 124 | important changes that needed to be made, and they were made, with |
125 | relatively little pain. If Linux had to ensure that it preserve a | 125 | relatively little pain. If Linux had to ensure that it will preserve a |
126 | stable source interface, a new interface would have been created, and | 126 | stable source interface, a new interface would have been created, and |
127 | the older, broken one would have had to be maintained over time, leading | 127 | the older, broken one would have had to be maintained over time, leading |
128 | to extra work for the USB developers. Since all Linux USB developers do | 128 | to extra work for the USB developers. Since all Linux USB developers do |
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt index 30289fab86eb..96f0ee825bed 100644 --- a/Documentation/sysctl/vm.txt +++ b/Documentation/sysctl/vm.txt | |||
@@ -481,10 +481,10 @@ the DMA zone. | |||
481 | Type(A) is called as "Node" order. Type (B) is "Zone" order. | 481 | Type(A) is called as "Node" order. Type (B) is "Zone" order. |
482 | 482 | ||
483 | "Node order" orders the zonelists by node, then by zone within each node. | 483 | "Node order" orders the zonelists by node, then by zone within each node. |
484 | Specify "[Nn]ode" for zone order | 484 | Specify "[Nn]ode" for node order |
485 | 485 | ||
486 | "Zone Order" orders the zonelists by zone type, then by node within each | 486 | "Zone Order" orders the zonelists by zone type, then by node within each |
487 | zone. Specify "[Zz]one"for zode order. | 487 | zone. Specify "[Zz]one" for zone order. |
488 | 488 | ||
489 | Specify "[Dd]efault" to request automatic configuration. Autoconfiguration | 489 | Specify "[Dd]efault" to request automatic configuration. Autoconfiguration |
490 | will select "node" order in following case. | 490 | will select "node" order in following case. |
diff --git a/Documentation/timers/timers-howto.txt b/Documentation/timers/timers-howto.txt index c9ef29d2ede3..038f8c77a076 100644 --- a/Documentation/timers/timers-howto.txt +++ b/Documentation/timers/timers-howto.txt | |||
@@ -24,7 +24,7 @@ ATOMIC CONTEXT: | |||
24 | 24 | ||
25 | ndelay(unsigned long nsecs) | 25 | ndelay(unsigned long nsecs) |
26 | udelay(unsigned long usecs) | 26 | udelay(unsigned long usecs) |
27 | mdelay(unsgined long msecs) | 27 | mdelay(unsigned long msecs) |
28 | 28 | ||
29 | udelay is the generally preferred API; ndelay-level | 29 | udelay is the generally preferred API; ndelay-level |
30 | precision may not actually exist on many non-PC devices. | 30 | precision may not actually exist on many non-PC devices. |
diff --git a/MAINTAINERS b/MAINTAINERS index 1026e61c7d98..a301ffa78eab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -730,7 +730,7 @@ ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6) | |||
730 | M: Daniel Ribeiro <drwyrm@gmail.com> | 730 | M: Daniel Ribeiro <drwyrm@gmail.com> |
731 | M: Stefan Schmidt <stefan@openezx.org> | 731 | M: Stefan Schmidt <stefan@openezx.org> |
732 | M: Harald Welte <laforge@openezx.org> | 732 | M: Harald Welte <laforge@openezx.org> |
733 | L: openezx-devel@lists.openezx.org (subscribers-only) | 733 | L: openezx-devel@lists.openezx.org (moderated for non-subscribers) |
734 | W: http://www.openezx.org/ | 734 | W: http://www.openezx.org/ |
735 | S: Maintained | 735 | S: Maintained |
736 | T: topgit git://git.openezx.org/openezx.git | 736 | T: topgit git://git.openezx.org/openezx.git |
@@ -6230,6 +6230,7 @@ TRIVIAL PATCHES | |||
6230 | M: Jiri Kosina <trivial@kernel.org> | 6230 | M: Jiri Kosina <trivial@kernel.org> |
6231 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git | 6231 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git |
6232 | S: Maintained | 6232 | S: Maintained |
6233 | K: ^Subject:.*(?i)trivial | ||
6233 | 6234 | ||
6234 | TTY LAYER | 6235 | TTY LAYER |
6235 | M: Greg Kroah-Hartman <gregkh@suse.de> | 6236 | M: Greg Kroah-Hartman <gregkh@suse.de> |
diff --git a/arch/Kconfig b/arch/Kconfig index f78c2be4242b..8d24bacaa61e 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
@@ -144,9 +144,6 @@ config HAVE_CLK | |||
144 | config HAVE_DMA_API_DEBUG | 144 | config HAVE_DMA_API_DEBUG |
145 | bool | 145 | bool |
146 | 146 | ||
147 | config HAVE_DEFAULT_NO_SPIN_MUTEXES | ||
148 | bool | ||
149 | |||
150 | config HAVE_HW_BREAKPOINT | 147 | config HAVE_HW_BREAKPOINT |
151 | bool | 148 | bool |
152 | depends on PERF_EVENTS | 149 | depends on PERF_EVENTS |
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c index 9ffbf3a2dfea..21020ceb2f3a 100644 --- a/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c | |||
@@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) | |||
171 | */ | 171 | */ |
172 | usba_udc_data.pdata.vbus_pin = -EINVAL; | 172 | usba_udc_data.pdata.vbus_pin = -EINVAL; |
173 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); | 173 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); |
174 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; | 174 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); |
175 | 175 | ||
176 | if (data && data->vbus_pin > 0) { | 176 | if (data && data->vbus_pin > 0) { |
177 | at91_set_gpio_input(data->vbus_pin, 0); | 177 | at91_set_gpio_input(data->vbus_pin, 0); |
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 1e8f275c17f6..5e9f8a4c38df 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c | |||
@@ -256,7 +256,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) | |||
256 | { | 256 | { |
257 | usba_udc_data.pdata.vbus_pin = -EINVAL; | 257 | usba_udc_data.pdata.vbus_pin = -EINVAL; |
258 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); | 258 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); |
259 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; | 259 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); |
260 | 260 | ||
261 | if (data && data->vbus_pin > 0) { | 261 | if (data && data->vbus_pin > 0) { |
262 | at91_set_gpio_input(data->vbus_pin, 0); | 262 | at91_set_gpio_input(data->vbus_pin, 0); |
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c index 53aaa94df75a..c49262bddd85 100644 --- a/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/arch/arm/mach-at91/at91sam9rl_devices.c | |||
@@ -145,7 +145,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) | |||
145 | */ | 145 | */ |
146 | usba_udc_data.pdata.vbus_pin = -EINVAL; | 146 | usba_udc_data.pdata.vbus_pin = -EINVAL; |
147 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); | 147 | usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); |
148 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; | 148 | memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep)); |
149 | 149 | ||
150 | if (data && data->vbus_pin > 0) { | 150 | if (data && data->vbus_pin > 0) { |
151 | at91_set_gpio_input(data->vbus_pin, 0); | 151 | at91_set_gpio_input(data->vbus_pin, 0); |
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h index c98c7591f3b8..2f494b6a9d0a 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap.h | |||
@@ -55,7 +55,7 @@ | |||
55 | 55 | ||
56 | #include "msm_iomap-8960.h" | 56 | #include "msm_iomap-8960.h" |
57 | 57 | ||
58 | /* Virtual addressses shared across all MSM targets. */ | 58 | /* Virtual addresses shared across all MSM targets. */ |
59 | #define MSM_CSR_BASE IOMEM(0xE0001000) | 59 | #define MSM_CSR_BASE IOMEM(0xE0001000) |
60 | #define MSM_QGIC_DIST_BASE IOMEM(0xF0000000) | 60 | #define MSM_QGIC_DIST_BASE IOMEM(0xF0000000) |
61 | #define MSM_QGIC_CPU_BASE IOMEM(0xF0001000) | 61 | #define MSM_QGIC_CPU_BASE IOMEM(0xF0001000) |
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index c2804c1c4efd..a016c8b59e00 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h | |||
@@ -236,7 +236,7 @@ | |||
236 | #define OMAP343X_CONTROL_WKUP_DEBOBS3 (OMAP343X_CONTROL_GENERAL_WKUP + 0x014) | 236 | #define OMAP343X_CONTROL_WKUP_DEBOBS3 (OMAP343X_CONTROL_GENERAL_WKUP + 0x014) |
237 | #define OMAP343X_CONTROL_WKUP_DEBOBS4 (OMAP343X_CONTROL_GENERAL_WKUP + 0x018) | 237 | #define OMAP343X_CONTROL_WKUP_DEBOBS4 (OMAP343X_CONTROL_GENERAL_WKUP + 0x018) |
238 | 238 | ||
239 | /* 36xx-only RTA - Retention till Accesss control registers and bits */ | 239 | /* 36xx-only RTA - Retention till Access control registers and bits */ |
240 | #define OMAP36XX_CONTROL_MEM_RTA_CTRL 0x40C | 240 | #define OMAP36XX_CONTROL_MEM_RTA_CTRL 0x40C |
241 | #define OMAP36XX_RTA_DISABLE 0x0 | 241 | #define OMAP36XX_RTA_DISABLE 0x0 |
242 | 242 | ||
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c index 4459470c052d..bb618075fab6 100644 --- a/arch/arm/mach-tegra/tegra2_clocks.c +++ b/arch/arm/mach-tegra/tegra2_clocks.c | |||
@@ -337,7 +337,7 @@ static int tegra2_super_clk_set_parent(struct clk *c, struct clk *p) | |||
337 | const struct clk_mux_sel *sel; | 337 | const struct clk_mux_sel *sel; |
338 | int shift; | 338 | int shift; |
339 | 339 | ||
340 | val = clk_readl(c->reg + SUPER_CLK_MUX);; | 340 | val = clk_readl(c->reg + SUPER_CLK_MUX); |
341 | BUG_ON(((val & SUPER_STATE_MASK) != SUPER_STATE_RUN) && | 341 | BUG_ON(((val & SUPER_STATE_MASK) != SUPER_STATE_RUN) && |
342 | ((val & SUPER_STATE_MASK) != SUPER_STATE_IDLE)); | 342 | ((val & SUPER_STATE_MASK) != SUPER_STATE_IDLE)); |
343 | shift = ((val & SUPER_STATE_MASK) == SUPER_STATE_IDLE) ? | 343 | shift = ((val & SUPER_STATE_MASK) == SUPER_STATE_IDLE) ? |
diff --git a/arch/arm/mach-ux500/mbox-db5500.c b/arch/arm/mach-ux500/mbox-db5500.c index a4ffb9f4f461..2b2d51caf9d8 100644 --- a/arch/arm/mach-ux500/mbox-db5500.c +++ b/arch/arm/mach-ux500/mbox-db5500.c | |||
@@ -416,8 +416,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t *mbox_cb, void *priv) | |||
416 | dev_dbg(&(mbox->pdev->dev), | 416 | dev_dbg(&(mbox->pdev->dev), |
417 | "Resource name: %s start: 0x%X, end: 0x%X\n", | 417 | "Resource name: %s start: 0x%X, end: 0x%X\n", |
418 | resource->name, resource->start, resource->end); | 418 | resource->name, resource->start, resource->end); |
419 | mbox->virtbase_peer = | 419 | mbox->virtbase_peer = ioremap(resource->start, resource_size(resource)); |
420 | ioremap(resource->start, resource->end - resource->start); | ||
421 | if (!mbox->virtbase_peer) { | 420 | if (!mbox->virtbase_peer) { |
422 | dev_err(&(mbox->pdev->dev), "Unable to ioremap peer mbox\n"); | 421 | dev_err(&(mbox->pdev->dev), "Unable to ioremap peer mbox\n"); |
423 | mbox = NULL; | 422 | mbox = NULL; |
@@ -440,8 +439,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t *mbox_cb, void *priv) | |||
440 | dev_dbg(&(mbox->pdev->dev), | 439 | dev_dbg(&(mbox->pdev->dev), |
441 | "Resource name: %s start: 0x%X, end: 0x%X\n", | 440 | "Resource name: %s start: 0x%X, end: 0x%X\n", |
442 | resource->name, resource->start, resource->end); | 441 | resource->name, resource->start, resource->end); |
443 | mbox->virtbase_local = | 442 | mbox->virtbase_local = ioremap(resource->start, resource_size(resource)); |
444 | ioremap(resource->start, resource->end - resource->start); | ||
445 | if (!mbox->virtbase_local) { | 443 | if (!mbox->virtbase_local) { |
446 | dev_err(&(mbox->pdev->dev), "Unable to ioremap local mbox\n"); | 444 | dev_err(&(mbox->pdev->dev), "Unable to ioremap local mbox\n"); |
447 | mbox = NULL; | 445 | mbox = NULL; |
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c index 07f23bb42bed..7cdc5161ff2b 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
18 | #include <linux/time.h> | 18 | #include <linux/time.h> |
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/sched.h> | ||
21 | #include <linux/timex.h> | 20 | #include <linux/timex.h> |
22 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
23 | #include <linux/io.h> | 22 | #include <linux/io.h> |
diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c index 4268a2bdf145..74aac96cda20 100644 --- a/arch/arm/plat-mxc/cpufreq.c +++ b/arch/arm/plat-mxc/cpufreq.c | |||
@@ -153,8 +153,8 @@ static int __init mxc_cpufreq_init(struct cpufreq_policy *policy) | |||
153 | ret = cpufreq_frequency_table_cpuinfo(policy, imx_freq_table); | 153 | ret = cpufreq_frequency_table_cpuinfo(policy, imx_freq_table); |
154 | 154 | ||
155 | if (ret < 0) { | 155 | if (ret < 0) { |
156 | printk(KERN_ERR "%s: failed to register i.MXC CPUfreq \ | 156 | printk(KERN_ERR "%s: failed to register i.MXC CPUfreq with error code %d\n", |
157 | with error code %d\n", __func__, ret); | 157 | __func__, ret); |
158 | goto err; | 158 | goto err; |
159 | } | 159 | } |
160 | 160 | ||
diff --git a/arch/cris/arch-v32/mach-fs/Makefile b/arch/cris/arch-v32/mach-fs/Makefile index 4ff407a1b931..41fa6a6893a9 100644 --- a/arch/cris/arch-v32/mach-fs/Makefile +++ b/arch/cris/arch-v32/mach-fs/Makefile | |||
@@ -4,7 +4,7 @@ | |||
4 | # | 4 | # |
5 | 5 | ||
6 | obj-y := dma.o pinmux.o io.o arbiter.o | 6 | obj-y := dma.o pinmux.o io.o arbiter.o |
7 | bj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o | 7 | obj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o |
8 | obj-$(CONFIG_CPU_FREQ) += cpufreq.o | 8 | obj-$(CONFIG_CPU_FREQ) += cpufreq.o |
9 | 9 | ||
10 | clean: | 10 | clean: |
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index c04dd576f333..80241fe03f50 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
@@ -1064,7 +1064,7 @@ static void sba_unmap_page(struct device *dev, dma_addr_t iova, size_t size, | |||
1064 | /* | 1064 | /* |
1065 | ** Address does not fall w/in IOVA, must be bypassing | 1065 | ** Address does not fall w/in IOVA, must be bypassing |
1066 | */ | 1066 | */ |
1067 | DBG_BYPASS("sba_unmap_single_atttrs() bypass addr: 0x%lx\n", | 1067 | DBG_BYPASS("sba_unmap_single_attrs() bypass addr: 0x%lx\n", |
1068 | iova); | 1068 | iova); |
1069 | 1069 | ||
1070 | #ifdef ENABLE_MARK_CLEAN | 1070 | #ifdef ENABLE_MARK_CLEAN |
diff --git a/arch/m68k/include/asm/MC68EZ328.h b/arch/m68k/include/asm/MC68EZ328.h index 69b7f9139e5e..d1bde58ab0dd 100644 --- a/arch/m68k/include/asm/MC68EZ328.h +++ b/arch/m68k/include/asm/MC68EZ328.h | |||
@@ -1047,7 +1047,7 @@ typedef volatile struct { | |||
1047 | 1047 | ||
1048 | #define WATCHDOG_EN 0x0001 /* Watchdog Enabled */ | 1048 | #define WATCHDOG_EN 0x0001 /* Watchdog Enabled */ |
1049 | #define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */ | 1049 | #define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */ |
1050 | #define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occcured */ | 1050 | #define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occurred */ |
1051 | #define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */ | 1051 | #define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */ |
1052 | #define WATCHDOG_CNT_SHIFT 8 | 1052 | #define WATCHDOG_CNT_SHIFT 8 |
1053 | 1053 | ||
diff --git a/arch/m68k/include/asm/MC68VZ328.h b/arch/m68k/include/asm/MC68VZ328.h index 2b9bf626a0a5..6bd1bf1f85ea 100644 --- a/arch/m68k/include/asm/MC68VZ328.h +++ b/arch/m68k/include/asm/MC68VZ328.h | |||
@@ -1143,7 +1143,7 @@ typedef struct { | |||
1143 | 1143 | ||
1144 | #define WATCHDOG_EN 0x0001 /* Watchdog Enabled */ | 1144 | #define WATCHDOG_EN 0x0001 /* Watchdog Enabled */ |
1145 | #define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */ | 1145 | #define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */ |
1146 | #define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occcured */ | 1146 | #define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occurred */ |
1147 | #define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */ | 1147 | #define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */ |
1148 | #define WATCHDOG_CNT_SHIFT 8 | 1148 | #define WATCHDOG_CNT_SHIFT 8 |
1149 | 1149 | ||
diff --git a/arch/mips/fw/arc/cmdline.c b/arch/mips/fw/arc/cmdline.c index 5c8603c85f20..9fdf07e50f1b 100644 --- a/arch/mips/fw/arc/cmdline.c +++ b/arch/mips/fw/arc/cmdline.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * cmdline.c: Kernel command line creation using ARCS argc/argv. | 6 | * cmdline.c: Kernel command line creation using ARCS argc/argv. |
7 | * | 7 | * |
8 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 8 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
9 | */ | 9 | */ |
10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
diff --git a/arch/mips/fw/arc/env.c b/arch/mips/fw/arc/env.c index 6f5dd42b96e2..1118a26b32ee 100644 --- a/arch/mips/fw/arc/env.c +++ b/arch/mips/fw/arc/env.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * env.c: ARCS environment variable routines. | 6 | * env.c: ARCS environment variable routines. |
7 | * | 7 | * |
8 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 8 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
9 | */ | 9 | */ |
10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c index 0ce9acf10c39..788060a53dce 100644 --- a/arch/mips/fw/arc/identify.c +++ b/arch/mips/fw/arc/identify.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * | 9 | * |
10 | * This code is based on arch/mips/sgi/kernel/system.c, which is | 10 | * This code is based on arch/mips/sgi/kernel/system.c, which is |
11 | * | 11 | * |
12 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 12 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
13 | */ | 13 | */ |
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
diff --git a/arch/mips/fw/arc/init.c b/arch/mips/fw/arc/init.c index 3ad8788b6eaa..629b24db0d3a 100644 --- a/arch/mips/fw/arc/init.c +++ b/arch/mips/fw/arc/init.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * PROM library initialisation code. | 6 | * PROM library initialisation code. |
7 | * | 7 | * |
8 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 8 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
9 | */ | 9 | */ |
10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
diff --git a/arch/mips/fw/arc/misc.c b/arch/mips/fw/arc/misc.c index e527c5fd5a32..29627fbae7ad 100644 --- a/arch/mips/fw/arc/misc.c +++ b/arch/mips/fw/arc/misc.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Miscellaneous ARCS PROM routines. | 6 | * Miscellaneous ARCS PROM routines. |
7 | * | 7 | * |
8 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 8 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
9 | * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) | 9 | * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) |
10 | * Copyright (C) 1999 Silicon Graphics, Inc. | 10 | * Copyright (C) 1999 Silicon Graphics, Inc. |
11 | */ | 11 | */ |
diff --git a/arch/mips/fw/arc/salone.c b/arch/mips/fw/arc/salone.c index e6afb64723d0..9b568950d1fd 100644 --- a/arch/mips/fw/arc/salone.c +++ b/arch/mips/fw/arc/salone.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * Routines to load into memory and execute stand-along program images using | 2 | * Routines to load into memory and execute stand-along program images using |
3 | * ARCS PROM firmware. | 3 | * ARCS PROM firmware. |
4 | * | 4 | * |
5 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 5 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
6 | */ | 6 | */ |
7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
8 | #include <asm/sgialib.h> | 8 | #include <asm/sgialib.h> |
diff --git a/arch/mips/fw/arc/time.c b/arch/mips/fw/arc/time.c index 42138c837d48..190cdb50b895 100644 --- a/arch/mips/fw/arc/time.c +++ b/arch/mips/fw/arc/time.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Extracting time information from ARCS prom. | 6 | * Extracting time information from ARCS prom. |
7 | * | 7 | * |
8 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 8 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
9 | */ | 9 | */ |
10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
11 | 11 | ||
diff --git a/arch/mips/fw/arc/tree.c b/arch/mips/fw/arc/tree.c index d68e5a59c1f6..924a37dc2569 100644 --- a/arch/mips/fw/arc/tree.c +++ b/arch/mips/fw/arc/tree.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * PROM component device tree code. | 6 | * PROM component device tree code. |
7 | * | 7 | * |
8 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 8 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
9 | * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) | 9 | * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) |
10 | * Copyright (C) 1999 Silicon Graphics, Inc. | 10 | * Copyright (C) 1999 Silicon Graphics, Inc. |
11 | */ | 11 | */ |
diff --git a/arch/mips/include/asm/asmmacro-32.h b/arch/mips/include/asm/asmmacro-32.h index 5de3963f511e..2413afe21b33 100644 --- a/arch/mips/include/asm/asmmacro-32.h +++ b/arch/mips/include/asm/asmmacro-32.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * asmmacro.h: Assembler macros to make things easier to read. | 2 | * asmmacro.h: Assembler macros to make things easier to read. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
5 | * Copyright (C) 1998, 1999, 2003 Ralf Baechle | 5 | * Copyright (C) 1998, 1999, 2003 Ralf Baechle |
6 | */ | 6 | */ |
7 | #ifndef _ASM_ASMMACRO_32_H | 7 | #ifndef _ASM_ASMMACRO_32_H |
diff --git a/arch/mips/include/asm/asmmacro-64.h b/arch/mips/include/asm/asmmacro-64.h index 225feefcb25d..08a527dfe4a3 100644 --- a/arch/mips/include/asm/asmmacro-64.h +++ b/arch/mips/include/asm/asmmacro-64.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * asmmacro.h: Assembler macros to make things easier to read. | 2 | * asmmacro.h: Assembler macros to make things easier to read. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
5 | * Copyright (C) 1998, 1999 Ralf Baechle | 5 | * Copyright (C) 1998, 1999 Ralf Baechle |
6 | * Copyright (C) 1999 Silicon Graphics, Inc. | 6 | * Copyright (C) 1999 Silicon Graphics, Inc. |
7 | */ | 7 | */ |
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h index 34c0d3cb116f..5f95a4bfc735 100644 --- a/arch/mips/include/asm/cpu.h +++ b/arch/mips/include/asm/cpu.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * cpu.h: Values of the PRId register used to match up | 2 | * cpu.h: Values of the PRId register used to match up |
3 | * various MIPS cpu types. | 3 | * various MIPS cpu types. |
4 | * | 4 | * |
5 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 5 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
6 | * Copyright (C) 2004 Maciej W. Rozycki | 6 | * Copyright (C) 2004 Maciej W. Rozycki |
7 | */ | 7 | */ |
8 | #ifndef _ASM_CPU_H | 8 | #ifndef _ASM_CPU_H |
diff --git a/arch/mips/include/asm/r4kcache.h b/arch/mips/include/asm/r4kcache.h index 387bf59f1e37..54ea47da59a1 100644 --- a/arch/mips/include/asm/r4kcache.h +++ b/arch/mips/include/asm/r4kcache.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Inline assembly cache operations. | 6 | * Inline assembly cache operations. |
7 | * | 7 | * |
8 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 8 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
9 | * Copyright (C) 1997 - 2002 Ralf Baechle (ralf@gnu.org) | 9 | * Copyright (C) 1997 - 2002 Ralf Baechle (ralf@gnu.org) |
10 | * Copyright (C) 2004 Ralf Baechle (ralf@linux-mips.org) | 10 | * Copyright (C) 2004 Ralf Baechle (ralf@linux-mips.org) |
11 | */ | 11 | */ |
diff --git a/arch/mips/include/asm/sgialib.h b/arch/mips/include/asm/sgialib.h index 2a2f1bddc276..f58115769457 100644 --- a/arch/mips/include/asm/sgialib.h +++ b/arch/mips/include/asm/sgialib.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * SGI ARCS firmware interface library for the Linux kernel. | 6 | * SGI ARCS firmware interface library for the Linux kernel. |
7 | * | 7 | * |
8 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 8 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
9 | * Copyright (C) 2001, 2002 Ralf Baechle (ralf@gnu.org) | 9 | * Copyright (C) 2001, 2002 Ralf Baechle (ralf@gnu.org) |
10 | */ | 10 | */ |
11 | #ifndef _ASM_SGIALIB_H | 11 | #ifndef _ASM_SGIALIB_H |
diff --git a/arch/mips/include/asm/sgiarcs.h b/arch/mips/include/asm/sgiarcs.h index 721327f88601..149342951436 100644 --- a/arch/mips/include/asm/sgiarcs.h +++ b/arch/mips/include/asm/sgiarcs.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * ARC firmware interface defines. | 6 | * ARC firmware interface defines. |
7 | * | 7 | * |
8 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 8 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
9 | * Copyright (C) 1999, 2001 Ralf Baechle (ralf@gnu.org) | 9 | * Copyright (C) 1999, 2001 Ralf Baechle (ralf@gnu.org) |
10 | * Copyright (C) 1999 Silicon Graphics, Inc. | 10 | * Copyright (C) 1999 Silicon Graphics, Inc. |
11 | */ | 11 | */ |
diff --git a/arch/mips/kernel/octeon_switch.S b/arch/mips/kernel/octeon_switch.S index dd18b26a358a..ce89c8061708 100644 --- a/arch/mips/kernel/octeon_switch.S +++ b/arch/mips/kernel/octeon_switch.S | |||
@@ -4,7 +4,7 @@ | |||
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 1994, 1995, 1996, 1998, 1999, 2002, 2003 Ralf Baechle | 6 | * Copyright (C) 1994, 1995, 1996, 1998, 1999, 2002, 2003 Ralf Baechle |
7 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 7 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
8 | * Copyright (C) 1994, 1995, 1996, by Andreas Busse | 8 | * Copyright (C) 1994, 1995, 1996, by Andreas Busse |
9 | * Copyright (C) 1999 Silicon Graphics, Inc. | 9 | * Copyright (C) 1999 Silicon Graphics, Inc. |
10 | * Copyright (C) 2000 MIPS Technologies, Inc. | 10 | * Copyright (C) 2000 MIPS Technologies, Inc. |
diff --git a/arch/mips/kernel/r2300_fpu.S b/arch/mips/kernel/r2300_fpu.S index ac68e68339db..61c8a0f2a60c 100644 --- a/arch/mips/kernel/r2300_fpu.S +++ b/arch/mips/kernel/r2300_fpu.S | |||
@@ -6,7 +6,7 @@ | |||
6 | * Copyright (C) 1996, 1998 by Ralf Baechle | 6 | * Copyright (C) 1996, 1998 by Ralf Baechle |
7 | * | 7 | * |
8 | * Multi-arch abstraction and asm macros for easier reading: | 8 | * Multi-arch abstraction and asm macros for easier reading: |
9 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 9 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
10 | * | 10 | * |
11 | * Further modifications to make this work: | 11 | * Further modifications to make this work: |
12 | * Copyright (c) 1998 Harald Koerfgen | 12 | * Copyright (c) 1998 Harald Koerfgen |
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S index 698414b7a253..293898391e67 100644 --- a/arch/mips/kernel/r2300_switch.S +++ b/arch/mips/kernel/r2300_switch.S | |||
@@ -5,7 +5,7 @@ | |||
5 | * Copyright (C) 1994, 1995, 1996 by Andreas Busse | 5 | * Copyright (C) 1994, 1995, 1996 by Andreas Busse |
6 | * | 6 | * |
7 | * Multi-cpu abstraction and macros for easier reading: | 7 | * Multi-cpu abstraction and macros for easier reading: |
8 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 8 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
9 | * | 9 | * |
10 | * Further modifications to make this work: | 10 | * Further modifications to make this work: |
11 | * Copyright (c) 1998-2000 Harald Koerfgen | 11 | * Copyright (c) 1998-2000 Harald Koerfgen |
diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S index dbd42adc52ed..55ffe149dae9 100644 --- a/arch/mips/kernel/r4k_fpu.S +++ b/arch/mips/kernel/r4k_fpu.S | |||
@@ -6,7 +6,7 @@ | |||
6 | * Copyright (C) 1996, 98, 99, 2000, 01 Ralf Baechle | 6 | * Copyright (C) 1996, 98, 99, 2000, 01 Ralf Baechle |
7 | * | 7 | * |
8 | * Multi-arch abstraction and asm macros for easier reading: | 8 | * Multi-arch abstraction and asm macros for easier reading: |
9 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 9 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
10 | * | 10 | * |
11 | * Carsten Langgaard, carstenl@mips.com | 11 | * Carsten Langgaard, carstenl@mips.com |
12 | * Copyright (C) 2000 MIPS Technologies, Inc. | 12 | * Copyright (C) 2000 MIPS Technologies, Inc. |
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S index 8893ee1a2368..9414f9354469 100644 --- a/arch/mips/kernel/r4k_switch.S +++ b/arch/mips/kernel/r4k_switch.S | |||
@@ -4,7 +4,7 @@ | |||
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 1994, 1995, 1996, 1998, 1999, 2002, 2003 Ralf Baechle | 6 | * Copyright (C) 1994, 1995, 1996, 1998, 1999, 2002, 2003 Ralf Baechle |
7 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 7 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
8 | * Copyright (C) 1994, 1995, 1996, by Andreas Busse | 8 | * Copyright (C) 1994, 1995, 1996, by Andreas Busse |
9 | * Copyright (C) 1999 Silicon Graphics, Inc. | 9 | * Copyright (C) 1999 Silicon Graphics, Inc. |
10 | * Copyright (C) 2000 MIPS Technologies, Inc. | 10 | * Copyright (C) 2000 MIPS Technologies, Inc. |
diff --git a/arch/mips/kernel/r6000_fpu.S b/arch/mips/kernel/r6000_fpu.S index 43cda53f5af6..da0fbe46d83b 100644 --- a/arch/mips/kernel/r6000_fpu.S +++ b/arch/mips/kernel/r6000_fpu.S | |||
@@ -8,7 +8,7 @@ | |||
8 | * Copyright (C) 1996 by Ralf Baechle | 8 | * Copyright (C) 1996 by Ralf Baechle |
9 | * | 9 | * |
10 | * Multi-arch abstraction and asm macros for easier reading: | 10 | * Multi-arch abstraction and asm macros for easier reading: |
11 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 11 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
12 | */ | 12 | */ |
13 | #include <asm/asm.h> | 13 | #include <asm/asm.h> |
14 | #include <asm/fpregdef.h> | 14 | #include <asm/fpregdef.h> |
diff --git a/arch/mips/mm/c-r3k.c b/arch/mips/mm/c-r3k.c index 54e5f7b9f440..e6b0efd3f6a4 100644 --- a/arch/mips/mm/c-r3k.c +++ b/arch/mips/mm/c-r3k.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * r2300.c: R2000 and R3000 specific mmu/cache code. | 2 | * r2300.c: R2000 and R3000 specific mmu/cache code. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
5 | * | 5 | * |
6 | * with a lot of changes to make this thing work for R3000s | 6 | * with a lot of changes to make this thing work for R3000s |
7 | * Tx39XX R4k style caches added. HK | 7 | * Tx39XX R4k style caches added. HK |
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index d9bc5d3593b6..eeb642e4066e 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 6 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
7 | * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Ralf Baechle (ralf@gnu.org) | 7 | * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Ralf Baechle (ralf@gnu.org) |
8 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. | 8 | * Copyright (C) 1999, 2000 Silicon Graphics, Inc. |
9 | */ | 9 | */ |
diff --git a/arch/mips/mm/c-tx39.c b/arch/mips/mm/c-tx39.c index 6515b4418714..d352fad3e451 100644 --- a/arch/mips/mm/c-tx39.c +++ b/arch/mips/mm/c-tx39.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * r2300.c: R2000 and R3000 specific mmu/cache code. | 2 | * r2300.c: R2000 and R3000 specific mmu/cache code. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
5 | * | 5 | * |
6 | * with a lot of changes to make this thing work for R3000s | 6 | * with a lot of changes to make this thing work for R3000s |
7 | * Tx39XX R4k style caches added. HK | 7 | * Tx39XX R4k style caches added. HK |
diff --git a/arch/mips/mm/sc-ip22.c b/arch/mips/mm/sc-ip22.c index 13adb5782110..a6bd11fba7bf 100644 --- a/arch/mips/mm/sc-ip22.c +++ b/arch/mips/mm/sc-ip22.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * sc-ip22.c: Indy cache management functions. | 2 | * sc-ip22.c: Indy cache management functions. |
3 | * | 3 | * |
4 | * Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org), | 4 | * Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org), |
5 | * derived from r4xx0.c by David S. Miller (dm@engr.sgi.com). | 5 | * derived from r4xx0.c by David S. Miller (davem@davemloft.net). |
6 | */ | 6 | */ |
7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
diff --git a/arch/mips/mm/sc-r5k.c b/arch/mips/mm/sc-r5k.c index f330d38e5575..ae1e533a096e 100644 --- a/arch/mips/mm/sc-r5k.c +++ b/arch/mips/mm/sc-r5k.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org), | 2 | * Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org), |
3 | * derived from r4xx0.c by David S. Miller (dm@engr.sgi.com). | 3 | * derived from r4xx0.c by David S. Miller (davem@davemloft.net). |
4 | */ | 4 | */ |
5 | #include <linux/init.h> | 5 | #include <linux/init.h> |
6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c index 0f5ab236ab69..40424affef83 100644 --- a/arch/mips/mm/tlb-r3k.c +++ b/arch/mips/mm/tlb-r3k.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * r2300.c: R2000 and R3000 specific mmu/cache code. | 2 | * r2300.c: R2000 and R3000 specific mmu/cache code. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
5 | * | 5 | * |
6 | * with a lot of changes to make this thing work for R3000s | 6 | * with a lot of changes to make this thing work for R3000s |
7 | * Tx39XX R4k style caches added. HK | 7 | * Tx39XX R4k style caches added. HK |
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c index c618eed933a1..ba40325caea6 100644 --- a/arch/mips/mm/tlb-r4k.c +++ b/arch/mips/mm/tlb-r4k.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 6 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
7 | * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org | 7 | * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org |
8 | * Carsten Langgaard, carstenl@mips.com | 8 | * Carsten Langgaard, carstenl@mips.com |
9 | * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. | 9 | * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. |
diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c index 2b82f23df1a1..3d95f76c106b 100644 --- a/arch/mips/mm/tlb-r8k.c +++ b/arch/mips/mm/tlb-r8k.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 6 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
7 | * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org | 7 | * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org |
8 | * Carsten Langgaard, carstenl@mips.com | 8 | * Carsten Langgaard, carstenl@mips.com |
9 | * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. | 9 | * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. |
diff --git a/arch/mips/sgi-ip22/ip22-hpc.c b/arch/mips/sgi-ip22/ip22-hpc.c index 5c00cdd20d8e..bb70589b5f74 100644 --- a/arch/mips/sgi-ip22/ip22-hpc.c +++ b/arch/mips/sgi-ip22/ip22-hpc.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * ip22-hpc.c: Routines for generic manipulation of the HPC controllers. | 2 | * ip22-hpc.c: Routines for generic manipulation of the HPC controllers. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
5 | * Copyright (C) 1998 Ralf Baechle | 5 | * Copyright (C) 1998 Ralf Baechle |
6 | */ | 6 | */ |
7 | 7 | ||
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c index 476423a01296..b4d08e4d2ea9 100644 --- a/arch/mips/sgi-ip22/ip22-int.c +++ b/arch/mips/sgi-ip22/ip22-int.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * ip22-int.c: Routines for generic manipulation of the INT[23] ASIC | 2 | * ip22-int.c: Routines for generic manipulation of the INT[23] ASIC |
3 | * found on INDY and Indigo2 workstations. | 3 | * found on INDY and Indigo2 workstations. |
4 | * | 4 | * |
5 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 5 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
6 | * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org) | 6 | * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org) |
7 | * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) | 7 | * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) |
8 | * - Indigo2 changes | 8 | * - Indigo2 changes |
diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c index 5268ac187bbd..d22262ee6853 100644 --- a/arch/mips/sgi-ip22/ip22-mc.c +++ b/arch/mips/sgi-ip22/ip22-mc.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * ip22-mc.c: Routines for manipulating SGI Memory Controller. | 2 | * ip22-mc.c: Routines for manipulating SGI Memory Controller. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
5 | * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) - Indigo2 changes | 5 | * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) - Indigo2 changes |
6 | * Copyright (C) 2003 Ladislav Michl (ladis@linux-mips.org) | 6 | * Copyright (C) 2003 Ladislav Michl (ladis@linux-mips.org) |
7 | * Copyright (C) 2004 Peter Fuerst (pf@net.alphadv.de) - IP28 | 7 | * Copyright (C) 2004 Peter Fuerst (pf@net.alphadv.de) - IP28 |
diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c index 5deeb68b6c9c..5e6621349471 100644 --- a/arch/mips/sgi-ip22/ip22-setup.c +++ b/arch/mips/sgi-ip22/ip22-setup.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * ip22-setup.c: SGI specific setup, including init of the feature struct. | 2 | * ip22-setup.c: SGI specific setup, including init of the feature struct. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
5 | * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org) | 5 | * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org) |
6 | */ | 6 | */ |
7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
diff --git a/arch/powerpc/include/asm/pte-hash64-64k.h b/arch/powerpc/include/asm/pte-hash64-64k.h index c4490f9c67c4..59247e816ac5 100644 --- a/arch/powerpc/include/asm/pte-hash64-64k.h +++ b/arch/powerpc/include/asm/pte-hash64-64k.h | |||
@@ -22,7 +22,7 @@ | |||
22 | #define _PAGE_HASHPTE _PAGE_HPTE_SUB | 22 | #define _PAGE_HASHPTE _PAGE_HPTE_SUB |
23 | 23 | ||
24 | /* Note the full page bits must be in the same location as for normal | 24 | /* Note the full page bits must be in the same location as for normal |
25 | * 4k pages as the same asssembly will be used to insert 64K pages | 25 | * 4k pages as the same assembly will be used to insert 64K pages |
26 | * wether the kernel has CONFIG_PPC_64K_PAGES or not | 26 | * wether the kernel has CONFIG_PPC_64K_PAGES or not |
27 | */ | 27 | */ |
28 | #define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */ | 28 | #define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */ |
diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c index bd9d35f59cf4..76a6e40a6f7c 100644 --- a/arch/powerpc/kernel/kgdb.c +++ b/arch/powerpc/kernel/kgdb.c | |||
@@ -142,7 +142,7 @@ static int kgdb_singlestep(struct pt_regs *regs) | |||
142 | return 0; | 142 | return 0; |
143 | 143 | ||
144 | /* | 144 | /* |
145 | * On Book E and perhaps other processsors, singlestep is handled on | 145 | * On Book E and perhaps other processors, singlestep is handled on |
146 | * the critical exception stack. This causes current_thread_info() | 146 | * the critical exception stack. This causes current_thread_info() |
147 | * to fail, since it it locates the thread_info by masking off | 147 | * to fail, since it it locates the thread_info by masking off |
148 | * the low bits of the current stack pointer. We work around | 148 | * the low bits of the current stack pointer. We work around |
diff --git a/arch/s390/hypfs/hypfs.h b/arch/s390/hypfs/hypfs.h index 80c1526f2af3..d9df5a060a83 100644 --- a/arch/s390/hypfs/hypfs.h +++ b/arch/s390/hypfs/hypfs.h | |||
@@ -47,7 +47,7 @@ struct hypfs_dbfs_data { | |||
47 | void *buf; | 47 | void *buf; |
48 | void *buf_free_ptr; | 48 | void *buf_free_ptr; |
49 | size_t size; | 49 | size_t size; |
50 | struct hypfs_dbfs_file *dbfs_file;; | 50 | struct hypfs_dbfs_file *dbfs_file; |
51 | struct kref kref; | 51 | struct kref kref; |
52 | }; | 52 | }; |
53 | 53 | ||
diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c index 7e0619c2c2c6..c0ef803c7c70 100644 --- a/arch/um/drivers/mmapper_kern.c +++ b/arch/um/drivers/mmapper_kern.c | |||
@@ -116,7 +116,7 @@ static int __init mmapper_init(void) | |||
116 | if (err) { | 116 | if (err) { |
117 | printk(KERN_ERR "mmapper - misc_register failed, err = %d\n", | 117 | printk(KERN_ERR "mmapper - misc_register failed, err = %d\n", |
118 | err); | 118 | err); |
119 | return err;; | 119 | return err; |
120 | } | 120 | } |
121 | return 0; | 121 | return 0; |
122 | } | 122 | } |
diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c index bfd0632fe65e..b480d4207a4c 100644 --- a/arch/x86/xen/pci-swiotlb-xen.c +++ b/arch/x86/xen/pci-swiotlb-xen.c | |||
@@ -36,7 +36,7 @@ int __init pci_xen_swiotlb_detect(void) | |||
36 | 36 | ||
37 | /* If running as PV guest, either iommu=soft, or swiotlb=force will | 37 | /* If running as PV guest, either iommu=soft, or swiotlb=force will |
38 | * activate this IOMMU. If running as PV privileged, activate it | 38 | * activate this IOMMU. If running as PV privileged, activate it |
39 | * irregardlesss. | 39 | * irregardless. |
40 | */ | 40 | */ |
41 | if ((xen_initial_domain() || swiotlb || swiotlb_force) && | 41 | if ((xen_initial_domain() || swiotlb || swiotlb_force) && |
42 | (xen_pv_domain())) | 42 | (xen_pv_domain())) |
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig index 42b7feba71b7..4891abbf16bc 100644 --- a/arch/xtensa/configs/s6105_defconfig +++ b/arch/xtensa/configs/s6105_defconfig | |||
@@ -23,7 +23,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | |||
23 | # | 23 | # |
24 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
25 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
26 | CONFIG_LOCK_KERNEL=y | ||
27 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
28 | CONFIG_LOCALVERSION="" | 27 | CONFIG_LOCALVERSION="" |
29 | CONFIG_LOCALVERSION_AUTO=y | 28 | CONFIG_LOCALVERSION_AUTO=y |
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c index 84e051844247..6ffd3a8bdaa5 100644 --- a/drivers/acpi/acpica/utresrc.c +++ b/drivers/acpi/acpica/utresrc.c | |||
@@ -50,7 +50,7 @@ ACPI_MODULE_NAME("utresrc") | |||
50 | #if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER) | 50 | #if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER) |
51 | /* | 51 | /* |
52 | * Strings used to decode resource descriptors. | 52 | * Strings used to decode resource descriptors. |
53 | * Used by both the disasssembler and the debugger resource dump routines | 53 | * Used by both the disassembler and the debugger resource dump routines |
54 | */ | 54 | */ |
55 | const char *acpi_gbl_bm_decode[] = { | 55 | const char *acpi_gbl_bm_decode[] = { |
56 | "NotBusMaster", | 56 | "NotBusMaster", |
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index ec574fc8fbc6..db39e9e607d8 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -1521,7 +1521,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data) | |||
1521 | acpi_bus_generate_proc_event(device, event, 0); | 1521 | acpi_bus_generate_proc_event(device, event, 0); |
1522 | keycode = KEY_BRIGHTNESSDOWN; | 1522 | keycode = KEY_BRIGHTNESSDOWN; |
1523 | break; | 1523 | break; |
1524 | case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */ | 1524 | case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightness */ |
1525 | if (brightness_switch_enabled) | 1525 | if (brightness_switch_enabled) |
1526 | acpi_video_switch_brightness(video_device, event); | 1526 | acpi_video_switch_brightness(video_device, event); |
1527 | acpi_bus_generate_proc_event(device, event, 0); | 1527 | acpi_bus_generate_proc_event(device, event, 0); |
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 0a134a424a37..9f9b2359f718 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c | |||
@@ -389,15 +389,14 @@ memory_probe_store(struct class *class, struct class_attribute *attr, | |||
389 | ret = add_memory(nid, phys_addr, | 389 | ret = add_memory(nid, phys_addr, |
390 | PAGES_PER_SECTION << PAGE_SHIFT); | 390 | PAGES_PER_SECTION << PAGE_SHIFT); |
391 | if (ret) | 391 | if (ret) |
392 | break; | 392 | goto out; |
393 | 393 | ||
394 | phys_addr += MIN_MEMORY_BLOCK_SIZE; | 394 | phys_addr += MIN_MEMORY_BLOCK_SIZE; |
395 | } | 395 | } |
396 | 396 | ||
397 | if (ret) | 397 | ret = count; |
398 | count = ret; | 398 | out: |
399 | 399 | return ret; | |
400 | return count; | ||
401 | } | 400 | } |
402 | static CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store); | 401 | static CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store); |
403 | 402 | ||
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index e0888cb538d4..b4f5c32b6a47 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c | |||
@@ -56,8 +56,8 @@ MODULE_PARM_DESC(pq_sources, | |||
56 | 56 | ||
57 | static int timeout = 3000; | 57 | static int timeout = 3000; |
58 | module_param(timeout, uint, S_IRUGO); | 58 | module_param(timeout, uint, S_IRUGO); |
59 | MODULE_PARM_DESC(timeout, "Transfer Timeout in msec (default: 3000), \ | 59 | MODULE_PARM_DESC(timeout, "Transfer Timeout in msec (default: 3000), " |
60 | Pass -1 for infinite timeout"); | 60 | "Pass -1 for infinite timeout"); |
61 | 61 | ||
62 | /* | 62 | /* |
63 | * Initialization patterns. All bytes in the source buffer has bit 7 | 63 | * Initialization patterns. All bytes in the source buffer has bit 7 |
@@ -634,5 +634,5 @@ static void __exit dmatest_exit(void) | |||
634 | } | 634 | } |
635 | module_exit(dmatest_exit); | 635 | module_exit(dmatest_exit); |
636 | 636 | ||
637 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); | 637 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |
638 | MODULE_LICENSE("GPL v2"); | 638 | MODULE_LICENSE("GPL v2"); |
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c index 9c25c7d099e4..2a2e2fa00e91 100644 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c | |||
@@ -1486,4 +1486,4 @@ module_exit(dw_exit); | |||
1486 | 1486 | ||
1487 | MODULE_LICENSE("GPL v2"); | 1487 | MODULE_LICENSE("GPL v2"); |
1488 | MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver"); | 1488 | MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver"); |
1489 | MODULE_AUTHOR("Haavard Skinnemoen <haavard.skinnemoen@atmel.com>"); | 1489 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index a2d2f1f0d4f3..5f29aafd4462 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c | |||
@@ -321,7 +321,7 @@ efivar_show_raw(struct efivar_entry *entry, char *buf) | |||
321 | 321 | ||
322 | /* | 322 | /* |
323 | * Generic read/write functions that call the specific functions of | 323 | * Generic read/write functions that call the specific functions of |
324 | * the atttributes... | 324 | * the attributes... |
325 | */ | 325 | */ |
326 | static ssize_t efivar_attr_show(struct kobject *kobj, struct attribute *attr, | 326 | static ssize_t efivar_attr_show(struct kobject *kobj, struct attribute *attr, |
327 | char *buf) | 327 | char *buf) |
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 6148a1c67895..ce33f4626957 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c | |||
@@ -87,8 +87,8 @@ | |||
87 | #define IBFT_ISCSI_VERSION "0.5.0" | 87 | #define IBFT_ISCSI_VERSION "0.5.0" |
88 | #define IBFT_ISCSI_DATE "2010-Feb-25" | 88 | #define IBFT_ISCSI_DATE "2010-Feb-25" |
89 | 89 | ||
90 | MODULE_AUTHOR("Peter Jones <pjones@redhat.com> and \ | 90 | MODULE_AUTHOR("Peter Jones <pjones@redhat.com> and " |
91 | Konrad Rzeszutek <ketuzsezr@darnok.org>"); | 91 | "Konrad Rzeszutek <ketuzsezr@darnok.org>"); |
92 | MODULE_DESCRIPTION("sysfs interface to BIOS iBFT information"); | 92 | MODULE_DESCRIPTION("sysfs interface to BIOS iBFT information"); |
93 | MODULE_LICENSE("GPL"); | 93 | MODULE_LICENSE("GPL"); |
94 | MODULE_VERSION(IBFT_ISCSI_VERSION); | 94 | MODULE_VERSION(IBFT_ISCSI_VERSION); |
diff --git a/drivers/gpio/ab8500-gpio.c b/drivers/gpio/ab8500-gpio.c index e7b834d054b7..970053c89ff7 100644 --- a/drivers/gpio/ab8500-gpio.c +++ b/drivers/gpio/ab8500-gpio.c | |||
@@ -482,8 +482,8 @@ static int __devexit ab8500_gpio_remove(struct platform_device *pdev) | |||
482 | 482 | ||
483 | ret = gpiochip_remove(&ab8500_gpio->chip); | 483 | ret = gpiochip_remove(&ab8500_gpio->chip); |
484 | if (ret < 0) { | 484 | if (ret < 0) { |
485 | dev_err(ab8500_gpio->dev, "unable to remove gpiochip:\ | 485 | dev_err(ab8500_gpio->dev, "unable to remove gpiochip: %d\n", |
486 | %d\n", ret); | 486 | ret); |
487 | return ret; | 487 | return ret; |
488 | } | 488 | } |
489 | 489 | ||
@@ -516,7 +516,6 @@ static void __exit ab8500_gpio_exit(void) | |||
516 | module_exit(ab8500_gpio_exit); | 516 | module_exit(ab8500_gpio_exit); |
517 | 517 | ||
518 | MODULE_AUTHOR("BIBEK BASU <bibek.basu@stericsson.com>"); | 518 | MODULE_AUTHOR("BIBEK BASU <bibek.basu@stericsson.com>"); |
519 | MODULE_DESCRIPTION("Driver allows to use AB8500 unused pins\ | 519 | MODULE_DESCRIPTION("Driver allows to use AB8500 unused pins to be used as GPIO"); |
520 | to be used as GPIO"); | ||
521 | MODULE_ALIAS("AB8500 GPIO driver"); | 520 | MODULE_ALIAS("AB8500 GPIO driver"); |
522 | MODULE_LICENSE("GPL v2"); | 521 | MODULE_LICENSE("GPL v2"); |
diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c index 560ab648cf18..1b06f67e1f69 100644 --- a/drivers/gpio/langwell_gpio.c +++ b/drivers/gpio/langwell_gpio.c | |||
@@ -122,7 +122,7 @@ static int lnw_gpio_direction_output(struct gpio_chip *chip, | |||
122 | lnw_gpio_set(chip, offset, value); | 122 | lnw_gpio_set(chip, offset, value); |
123 | spin_lock_irqsave(&lnw->lock, flags); | 123 | spin_lock_irqsave(&lnw->lock, flags); |
124 | value = readl(gpdr); | 124 | value = readl(gpdr); |
125 | value |= BIT(offset % 32);; | 125 | value |= BIT(offset % 32); |
126 | writel(value, gpdr); | 126 | writel(value, gpdr); |
127 | spin_unlock_irqrestore(&lnw->lock, flags); | 127 | spin_unlock_irqrestore(&lnw->lock, flags); |
128 | return 0; | 128 | return 0; |
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index bbcd1dd7bac0..1f8229436570 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c | |||
@@ -322,7 +322,7 @@ void radeon_fence_unref(struct radeon_fence **fence) | |||
322 | 322 | ||
323 | *fence = NULL; | 323 | *fence = NULL; |
324 | if (tmp) { | 324 | if (tmp) { |
325 | kref_put(&tmp->kref, &radeon_fence_destroy); | 325 | kref_put(&tmp->kref, radeon_fence_destroy); |
326 | } | 326 | } |
327 | } | 327 | } |
328 | 328 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index c6776e48fdde..08c0233db1b8 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c | |||
@@ -194,7 +194,7 @@ int radeon_ib_pool_init(struct radeon_device *rdev) | |||
194 | r = radeon_bo_kmap(rdev->ib_pool.robj, &ptr); | 194 | r = radeon_bo_kmap(rdev->ib_pool.robj, &ptr); |
195 | radeon_bo_unreserve(rdev->ib_pool.robj); | 195 | radeon_bo_unreserve(rdev->ib_pool.robj); |
196 | if (r) { | 196 | if (r) { |
197 | DRM_ERROR("radeon: failed to map ib poll (%d).\n", r); | 197 | DRM_ERROR("radeon: failed to map ib pool (%d).\n", r); |
198 | return r; | 198 | return r; |
199 | } | 199 | } |
200 | for (i = 0; i < RADEON_IB_POOL_SIZE; i++) { | 200 | for (i = 0; i < RADEON_IB_POOL_SIZE; i++) { |
diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c index 75e9d6f86ba4..ebddd443d91a 100644 --- a/drivers/gpu/drm/ttm/ttm_object.c +++ b/drivers/gpu/drm/ttm/ttm_object.c | |||
@@ -206,7 +206,7 @@ void ttm_base_object_unref(struct ttm_base_object **p_base) | |||
206 | */ | 206 | */ |
207 | 207 | ||
208 | write_lock(&tdev->object_lock); | 208 | write_lock(&tdev->object_lock); |
209 | (void)kref_put(&base->refcount, &ttm_release_base); | 209 | kref_put(&base->refcount, ttm_release_base); |
210 | write_unlock(&tdev->object_lock); | 210 | write_unlock(&tdev->object_lock); |
211 | } | 211 | } |
212 | EXPORT_SYMBOL(ttm_base_object_unref); | 212 | EXPORT_SYMBOL(ttm_base_object_unref); |
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index d9aa9a649e35..a651779d9ff7 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c | |||
@@ -219,7 +219,7 @@ static void __exit i2c_gpio_exit(void) | |||
219 | } | 219 | } |
220 | module_exit(i2c_gpio_exit); | 220 | module_exit(i2c_gpio_exit); |
221 | 221 | ||
222 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); | 222 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |
223 | MODULE_DESCRIPTION("Platform-independent bitbanging I2C driver"); | 223 | MODULE_DESCRIPTION("Platform-independent bitbanging I2C driver"); |
224 | MODULE_LICENSE("GPL"); | 224 | MODULE_LICENSE("GPL"); |
225 | MODULE_ALIAS("platform:i2c-gpio"); | 225 | MODULE_ALIAS("platform:i2c-gpio"); |
diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c index 06a5bb484707..126ca7955f6e 100644 --- a/drivers/leds/leds-mc13783.c +++ b/drivers/leds/leds-mc13783.c | |||
@@ -235,7 +235,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev) | |||
235 | MC13783_LED_Cx_PERIOD; | 235 | MC13783_LED_Cx_PERIOD; |
236 | 236 | ||
237 | if (pdata->flags & MC13783_LED_TRIODE_TC3) | 237 | if (pdata->flags & MC13783_LED_TRIODE_TC3) |
238 | reg |= MC13783_LED_Cx_TRIODE_TC_BIT;; | 238 | reg |= MC13783_LED_Cx_TRIODE_TC_BIT; |
239 | 239 | ||
240 | ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg); | 240 | ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg); |
241 | if (ret) | 241 | if (ret) |
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index bb8b722a9783..0ff92c208005 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
@@ -44,11 +44,11 @@ | |||
44 | * TODO: - Check MPU structure version/signature | 44 | * TODO: - Check MPU structure version/signature |
45 | * - Add things like /sbin/overtemp for non-critical | 45 | * - Add things like /sbin/overtemp for non-critical |
46 | * overtemp conditions so userland can take some policy | 46 | * overtemp conditions so userland can take some policy |
47 | * decisions, like slewing down CPUs | 47 | * decisions, like slowing down CPUs |
48 | * - Deal with fan and i2c failures in a better way | 48 | * - Deal with fan and i2c failures in a better way |
49 | * - Maybe do a generic PID based on params used for | 49 | * - Maybe do a generic PID based on params used for |
50 | * U3 and Drives ? Definitely need to factor code a bit | 50 | * U3 and Drives ? Definitely need to factor code a bit |
51 | * bettter... also make sensor detection more robust using | 51 | * better... also make sensor detection more robust using |
52 | * the device-tree to probe for them | 52 | * the device-tree to probe for them |
53 | * - Figure out how to get the slots consumption and set the | 53 | * - Figure out how to get the slots consumption and set the |
54 | * slots fan accordingly | 54 | * slots fan accordingly |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 34dd54539f7b..346e69bfdab3 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -3958,7 +3958,7 @@ static int make_request(mddev_t *mddev, struct bio * bi) | |||
3958 | /* spinlock is needed as reshape_progress may be | 3958 | /* spinlock is needed as reshape_progress may be |
3959 | * 64bit on a 32bit platform, and so it might be | 3959 | * 64bit on a 32bit platform, and so it might be |
3960 | * possible to see a half-updated value | 3960 | * possible to see a half-updated value |
3961 | * Ofcourse reshape_progress could change after | 3961 | * Of course reshape_progress could change after |
3962 | * the lock is dropped, so once we get a reference | 3962 | * the lock is dropped, so once we get a reference |
3963 | * to the stripe that we think it is, we will have | 3963 | * to the stripe that we think it is, we will have |
3964 | * to check again. | 3964 | * to check again. |
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c index f5b9da18f611..d312323504a4 100644 --- a/drivers/media/dvb/dvb-usb/dw2102.c +++ b/drivers/media/dvb/dvb-usb/dw2102.c | |||
@@ -1377,7 +1377,7 @@ static struct rc_map_table rc_map_su3000_table[] = { | |||
1377 | { 0x0f, KEY_BLUE }, /* bottom yellow button */ | 1377 | { 0x0f, KEY_BLUE }, /* bottom yellow button */ |
1378 | { 0x14, KEY_AUDIO }, /* Snapshot */ | 1378 | { 0x14, KEY_AUDIO }, /* Snapshot */ |
1379 | { 0x38, KEY_TV }, /* TV/Radio */ | 1379 | { 0x38, KEY_TV }, /* TV/Radio */ |
1380 | { 0x0c, KEY_ESC } /* upper Red buttton */ | 1380 | { 0x0c, KEY_ESC } /* upper Red button */ |
1381 | }; | 1381 | }; |
1382 | 1382 | ||
1383 | static struct rc_map_dvb_usb_table_table keys_tables[] = { | 1383 | static struct rc_map_dvb_usb_table_table keys_tables[] = { |
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c index 8126622fb4f5..de5d481b0328 100644 --- a/drivers/media/video/msp3400-driver.c +++ b/drivers/media/video/msp3400-driver.c | |||
@@ -96,7 +96,7 @@ MODULE_PARM_DESC(debug, "Enable debug messages [0-3]"); | |||
96 | MODULE_PARM_DESC(stereo_threshold, "Sets signal threshold to activate stereo"); | 96 | MODULE_PARM_DESC(stereo_threshold, "Sets signal threshold to activate stereo"); |
97 | MODULE_PARM_DESC(standard, "Specify audio standard: 32 = NTSC, 64 = radio, Default: Autodetect"); | 97 | MODULE_PARM_DESC(standard, "Specify audio standard: 32 = NTSC, 64 = radio, Default: Autodetect"); |
98 | MODULE_PARM_DESC(amsound, "Hardwire AM sound at 6.5Hz (France), FM can autoscan"); | 98 | MODULE_PARM_DESC(amsound, "Hardwire AM sound at 6.5Hz (France), FM can autoscan"); |
99 | MODULE_PARM_DESC(dolby, "Activates Dolby processsing"); | 99 | MODULE_PARM_DESC(dolby, "Activates Dolby processing"); |
100 | 100 | ||
101 | /* ---------------------------------------------------------------------- */ | 101 | /* ---------------------------------------------------------------------- */ |
102 | 102 | ||
diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c index f9d594698832..400364569c8d 100644 --- a/drivers/media/video/saa7164/saa7164-encoder.c +++ b/drivers/media/video/saa7164/saa7164-encoder.c | |||
@@ -177,7 +177,7 @@ static int saa7164_encoder_buffers_alloc(struct saa7164_port *port) | |||
177 | } | 177 | } |
178 | } | 178 | } |
179 | 179 | ||
180 | /* Allocate some kenrel kernel buffers for copying | 180 | /* Allocate some kernel buffers for copying |
181 | * to userpsace. | 181 | * to userpsace. |
182 | */ | 182 | */ |
183 | len = params->numberoflines * params->pitch; | 183 | len = params->numberoflines * params->pitch; |
diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c index 9e5b01c29cf5..bc1fcedba874 100644 --- a/drivers/media/video/saa7164/saa7164-vbi.c +++ b/drivers/media/video/saa7164/saa7164-vbi.c | |||
@@ -148,7 +148,7 @@ static int saa7164_vbi_buffers_alloc(struct saa7164_port *port) | |||
148 | } | 148 | } |
149 | } | 149 | } |
150 | 150 | ||
151 | /* Allocate some kenrel kernel buffers for copying | 151 | /* Allocate some kernel buffers for copying |
152 | * to userpsace. | 152 | * to userpsace. |
153 | */ | 153 | */ |
154 | len = params->numberoflines * params->pitch; | 154 | len = params->numberoflines * params->pitch; |
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index 6083137f0bf8..9855fbe5927a 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
@@ -70,8 +70,9 @@ | |||
70 | #include "usbvision.h" | 70 | #include "usbvision.h" |
71 | #include "usbvision-cards.h" | 71 | #include "usbvision-cards.h" |
72 | 72 | ||
73 | #define DRIVER_AUTHOR "Joerg Heckenbach <joerg@heckenbach-aw.de>, \ | 73 | #define DRIVER_AUTHOR \ |
74 | Dwaine Garden <DwaineGarden@rogers.com>" | 74 | "Joerg Heckenbach <joerg@heckenbach-aw.de>, " \ |
75 | "Dwaine Garden <DwaineGarden@rogers.com>" | ||
75 | #define DRIVER_NAME "usbvision" | 76 | #define DRIVER_NAME "usbvision" |
76 | #define DRIVER_ALIAS "USBVision" | 77 | #define DRIVER_ALIAS "USBVision" |
77 | #define DRIVER_DESC "USBVision USB Video Device Driver for Linux" | 78 | #define DRIVER_DESC "USBVision USB Video Device Driver for Linux" |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index fa15e853d4e8..7956a10f9488 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -83,19 +83,18 @@ MODULE_VERSION(my_VERSION); | |||
83 | 83 | ||
84 | static int mpt_msi_enable_spi; | 84 | static int mpt_msi_enable_spi; |
85 | module_param(mpt_msi_enable_spi, int, 0); | 85 | module_param(mpt_msi_enable_spi, int, 0); |
86 | MODULE_PARM_DESC(mpt_msi_enable_spi, " Enable MSI Support for SPI \ | 86 | MODULE_PARM_DESC(mpt_msi_enable_spi, |
87 | controllers (default=0)"); | 87 | " Enable MSI Support for SPI controllers (default=0)"); |
88 | 88 | ||
89 | static int mpt_msi_enable_fc; | 89 | static int mpt_msi_enable_fc; |
90 | module_param(mpt_msi_enable_fc, int, 0); | 90 | module_param(mpt_msi_enable_fc, int, 0); |
91 | MODULE_PARM_DESC(mpt_msi_enable_fc, " Enable MSI Support for FC \ | 91 | MODULE_PARM_DESC(mpt_msi_enable_fc, |
92 | controllers (default=0)"); | 92 | " Enable MSI Support for FC controllers (default=0)"); |
93 | 93 | ||
94 | static int mpt_msi_enable_sas; | 94 | static int mpt_msi_enable_sas; |
95 | module_param(mpt_msi_enable_sas, int, 0); | 95 | module_param(mpt_msi_enable_sas, int, 0); |
96 | MODULE_PARM_DESC(mpt_msi_enable_sas, " Enable MSI Support for SAS \ | 96 | MODULE_PARM_DESC(mpt_msi_enable_sas, |
97 | controllers (default=0)"); | 97 | " Enable MSI Support for SAS controllers (default=0)"); |
98 | |||
99 | 98 | ||
100 | static int mpt_channel_mapping; | 99 | static int mpt_channel_mapping; |
101 | module_param(mpt_channel_mapping, int, 0); | 100 | module_param(mpt_channel_mapping, int, 0); |
@@ -105,15 +104,14 @@ static int mpt_debug_level; | |||
105 | static int mpt_set_debug_level(const char *val, struct kernel_param *kp); | 104 | static int mpt_set_debug_level(const char *val, struct kernel_param *kp); |
106 | module_param_call(mpt_debug_level, mpt_set_debug_level, param_get_int, | 105 | module_param_call(mpt_debug_level, mpt_set_debug_level, param_get_int, |
107 | &mpt_debug_level, 0600); | 106 | &mpt_debug_level, 0600); |
108 | MODULE_PARM_DESC(mpt_debug_level, " debug level - refer to mptdebug.h \ | 107 | MODULE_PARM_DESC(mpt_debug_level, |
109 | - (default=0)"); | 108 | " debug level - refer to mptdebug.h - (default=0)"); |
110 | 109 | ||
111 | int mpt_fwfault_debug; | 110 | int mpt_fwfault_debug; |
112 | EXPORT_SYMBOL(mpt_fwfault_debug); | 111 | EXPORT_SYMBOL(mpt_fwfault_debug); |
113 | module_param(mpt_fwfault_debug, int, 0600); | 112 | module_param(mpt_fwfault_debug, int, 0600); |
114 | MODULE_PARM_DESC(mpt_fwfault_debug, "Enable detection of Firmware fault" | 113 | MODULE_PARM_DESC(mpt_fwfault_debug, |
115 | " and halt Firmware on fault - (default=0)"); | 114 | "Enable detection of Firmware fault and halt Firmware on fault - (default=0)"); |
116 | |||
117 | 115 | ||
118 | static char MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS][50]; | 116 | static char MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS][50]; |
119 | 117 | ||
diff --git a/drivers/message/i2o/README.ioctl b/drivers/message/i2o/README.ioctl index 65c0c47aeb79..5fb195af43e2 100644 --- a/drivers/message/i2o/README.ioctl +++ b/drivers/message/i2o/README.ioctl | |||
@@ -110,7 +110,7 @@ V. Getting Logical Configuration Table | |||
110 | ENOBUFS Buffer not large enough. If this occurs, the required | 110 | ENOBUFS Buffer not large enough. If this occurs, the required |
111 | buffer length is written into *(lct->reslen) | 111 | buffer length is written into *(lct->reslen) |
112 | 112 | ||
113 | VI. Settting Parameters | 113 | VI. Setting Parameters |
114 | 114 | ||
115 | SYNOPSIS | 115 | SYNOPSIS |
116 | 116 | ||
diff --git a/drivers/misc/bh1780gli.c b/drivers/misc/bh1780gli.c index d07cd67c951c..82fe2d067827 100644 --- a/drivers/misc/bh1780gli.c +++ b/drivers/misc/bh1780gli.c | |||
@@ -49,8 +49,8 @@ static int bh1780_write(struct bh1780_data *ddata, u8 reg, u8 val, char *msg) | |||
49 | int ret = i2c_smbus_write_byte_data(ddata->client, reg, val); | 49 | int ret = i2c_smbus_write_byte_data(ddata->client, reg, val); |
50 | if (ret < 0) | 50 | if (ret < 0) |
51 | dev_err(&ddata->client->dev, | 51 | dev_err(&ddata->client->dev, |
52 | "i2c_smbus_write_byte_data failed error %d\ | 52 | "i2c_smbus_write_byte_data failed error %d Register (%s)\n", |
53 | Register (%s)\n", ret, msg); | 53 | ret, msg); |
54 | return ret; | 54 | return ret; |
55 | } | 55 | } |
56 | 56 | ||
@@ -59,8 +59,8 @@ static int bh1780_read(struct bh1780_data *ddata, u8 reg, char *msg) | |||
59 | int ret = i2c_smbus_read_byte_data(ddata->client, reg); | 59 | int ret = i2c_smbus_read_byte_data(ddata->client, reg); |
60 | if (ret < 0) | 60 | if (ret < 0) |
61 | dev_err(&ddata->client->dev, | 61 | dev_err(&ddata->client->dev, |
62 | "i2c_smbus_read_byte_data failed error %d\ | 62 | "i2c_smbus_read_byte_data failed error %d Register (%s)\n", |
63 | Register (%s)\n", ret, msg); | 63 | ret, msg); |
64 | return ret; | 64 | return ret; |
65 | } | 65 | } |
66 | 66 | ||
diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c index d02d302ee6d5..e01e08c8c88b 100644 --- a/drivers/misc/cs5535-mfgpt.c +++ b/drivers/misc/cs5535-mfgpt.c | |||
@@ -329,7 +329,7 @@ done: | |||
329 | return err; | 329 | return err; |
330 | } | 330 | } |
331 | 331 | ||
332 | static struct platform_driver cs5535_mfgpt_drv = { | 332 | static struct platform_driver cs5535_mfgpt_driver = { |
333 | .driver = { | 333 | .driver = { |
334 | .name = DRV_NAME, | 334 | .name = DRV_NAME, |
335 | .owner = THIS_MODULE, | 335 | .owner = THIS_MODULE, |
@@ -340,7 +340,7 @@ static struct platform_driver cs5535_mfgpt_drv = { | |||
340 | 340 | ||
341 | static int __init cs5535_mfgpt_init(void) | 341 | static int __init cs5535_mfgpt_init(void) |
342 | { | 342 | { |
343 | return platform_driver_register(&cs5535_mfgpt_drv); | 343 | return platform_driver_register(&cs5535_mfgpt_driver); |
344 | } | 344 | } |
345 | 345 | ||
346 | module_init(cs5535_mfgpt_init); | 346 | module_init(cs5535_mfgpt_init); |
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c index d2d5d23416dd..89947723a27d 100644 --- a/drivers/misc/ibmasm/ibmasmfs.c +++ b/drivers/misc/ibmasm/ibmasmfs.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | /* | 30 | /* |
31 | * The IBMASM file virtual filesystem. It creates the following hierarchy | 31 | * The IBMASM file virtual filesystem. It creates the following hierarchy |
32 | * dymamically when mounted from user space: | 32 | * dynamically when mounted from user space: |
33 | * | 33 | * |
34 | * /ibmasm | 34 | * /ibmasm |
35 | * |-- 0 | 35 | * |-- 0 |
diff --git a/drivers/misc/spear13xx_pcie_gadget.c b/drivers/misc/spear13xx_pcie_gadget.c index ec3b8c911833..7aded90f9daa 100644 --- a/drivers/misc/spear13xx_pcie_gadget.c +++ b/drivers/misc/spear13xx_pcie_gadget.c | |||
@@ -787,8 +787,8 @@ static int __devinit spear_pcie_gadget_probe(struct platform_device *pdev) | |||
787 | 787 | ||
788 | status = request_irq(irq, spear_pcie_gadget_irq, 0, pdev->name, NULL); | 788 | status = request_irq(irq, spear_pcie_gadget_irq, 0, pdev->name, NULL); |
789 | if (status) { | 789 | if (status) { |
790 | dev_err(&pdev->dev, "pcie gadget interrupt IRQ%d already \ | 790 | dev_err(&pdev->dev, |
791 | claimed\n", irq); | 791 | "pcie gadget interrupt IRQ%d already claimed\n", irq); |
792 | goto err_iounmap; | 792 | goto err_iounmap; |
793 | } | 793 | } |
794 | 794 | ||
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index ea3888b65d5d..aa8039f473c4 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c | |||
@@ -1899,5 +1899,5 @@ late_initcall(atmci_init); /* try to load after dma driver when built-in */ | |||
1899 | module_exit(atmci_exit); | 1899 | module_exit(atmci_exit); |
1900 | 1900 | ||
1901 | MODULE_DESCRIPTION("Atmel Multimedia Card Interface driver"); | 1901 | MODULE_DESCRIPTION("Atmel Multimedia Card Interface driver"); |
1902 | MODULE_AUTHOR("Haavard Skinnemoen <haavard.skinnemoen@atmel.com>"); | 1902 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |
1903 | MODULE_LICENSE("GPL v2"); | 1903 | MODULE_LICENSE("GPL v2"); |
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index c5298d1ab744..cd5789ff3726 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -83,8 +83,9 @@ | |||
83 | #include "atl1.h" | 83 | #include "atl1.h" |
84 | 84 | ||
85 | #define ATLX_DRIVER_VERSION "2.1.3" | 85 | #define ATLX_DRIVER_VERSION "2.1.3" |
86 | MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \ | 86 | MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, " |
87 | Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>"); | 87 | "Chris Snook <csnook@redhat.com>, " |
88 | "Jay Cliburn <jcliburn@gmail.com>"); | ||
88 | MODULE_LICENSE("GPL"); | 89 | MODULE_LICENSE("GPL"); |
89 | MODULE_VERSION(ATLX_DRIVER_VERSION); | 90 | MODULE_VERSION(ATLX_DRIVER_VERSION); |
90 | 91 | ||
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c index e54712b22c27..d11fbb2b95ff 100644 --- a/drivers/net/can/pch_can.c +++ b/drivers/net/can/pch_can.c | |||
@@ -653,7 +653,7 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota) | |||
653 | u16 data_reg; | 653 | u16 data_reg; |
654 | 654 | ||
655 | do { | 655 | do { |
656 | /* Reading the messsage object from the Message RAM */ | 656 | /* Reading the message object from the Message RAM */ |
657 | iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask); | 657 | iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask); |
658 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_num); | 658 | pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_num); |
659 | 659 | ||
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c index 7a70709d5608..60a49e5a2a53 100644 --- a/drivers/net/can/softing/softing_main.c +++ b/drivers/net/can/softing/softing_main.c | |||
@@ -797,7 +797,7 @@ static __devinit int softing_pdev_probe(struct platform_device *pdev) | |||
797 | ret = -EINVAL; | 797 | ret = -EINVAL; |
798 | pres = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 798 | pres = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
799 | if (!pres) | 799 | if (!pres) |
800 | goto platform_resource_failed;; | 800 | goto platform_resource_failed; |
801 | card->dpram_phys = pres->start; | 801 | card->dpram_phys = pres->start; |
802 | card->dpram_size = pres->end - pres->start + 1; | 802 | card->dpram_size = pres->end - pres->start + 1; |
803 | card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size); | 803 | card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size); |
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 872183f29ec4..d532dde5120f 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -1800,7 +1800,7 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self) | |||
1800 | MessageCount = inb(iobase+ FIR_LSR)&0x07; | 1800 | MessageCount = inb(iobase+ FIR_LSR)&0x07; |
1801 | 1801 | ||
1802 | if (MessageCount > 0) | 1802 | if (MessageCount > 0) |
1803 | IRDA_DEBUG(0, "%s(), Messsage count = %d,\n", __func__ , MessageCount); | 1803 | IRDA_DEBUG(0, "%s(), Message count = %d,\n", __func__ , MessageCount); |
1804 | 1804 | ||
1805 | for (i=0; i<=MessageCount; i++) | 1805 | for (i=0; i<=MessageCount; i++) |
1806 | { | 1806 | { |
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 629bd2649c0c..6c6a02869dfc 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
@@ -1356,5 +1356,5 @@ module_exit(macb_exit); | |||
1356 | 1356 | ||
1357 | MODULE_LICENSE("GPL"); | 1357 | MODULE_LICENSE("GPL"); |
1358 | MODULE_DESCRIPTION("Atmel MACB Ethernet driver"); | 1358 | MODULE_DESCRIPTION("Atmel MACB Ethernet driver"); |
1359 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); | 1359 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |
1360 | MODULE_ALIAS("platform:macb"); | 1360 | MODULE_ALIAS("platform:macb"); |
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index a9a5f5ed19c6..df0d2c8ecc09 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -7163,7 +7163,7 @@ static void do_s2io_card_down(struct s2io_nic *sp, int do_io) | |||
7163 | /* As per the HW requirement we need to replenish the | 7163 | /* As per the HW requirement we need to replenish the |
7164 | * receive buffer to avoid the ring bump. Since there is | 7164 | * receive buffer to avoid the ring bump. Since there is |
7165 | * no intention of processing the Rx frame at this pointwe are | 7165 | * no intention of processing the Rx frame at this pointwe are |
7166 | * just settting the ownership bit of rxd in Each Rx | 7166 | * just setting the ownership bit of rxd in Each Rx |
7167 | * ring to HW and set the appropriate buffer size | 7167 | * ring to HW and set the appropriate buffer size |
7168 | * based on the ring mode | 7168 | * based on the ring mode |
7169 | */ | 7169 | */ |
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c index dd03bf619988..54415c7b84a2 100644 --- a/drivers/net/sgiseeq.c +++ b/drivers/net/sgiseeq.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * sgiseeq.c: Seeq8003 ethernet driver for SGI machines. | 2 | * sgiseeq.c: Seeq8003 ethernet driver for SGI machines. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #undef DEBUG | 7 | #undef DEBUG |
diff --git a/drivers/net/sgiseeq.h b/drivers/net/sgiseeq.h index 523104de6830..2211e2987a8d 100644 --- a/drivers/net/sgiseeq.h +++ b/drivers/net/sgiseeq.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * sgiseeq.h: Defines for the Seeq8003 ethernet controller. | 2 | * sgiseeq.h: Defines for the Seeq8003 ethernet controller. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 4 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
5 | */ | 5 | */ |
6 | #ifndef _SGISEEQ_H | 6 | #ifndef _SGISEEQ_H |
7 | #define _SGISEEQ_H | 7 | #define _SGISEEQ_H |
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ucc_geth_ethtool.c index 537fbc0a4401..a97257f91a3d 100644 --- a/drivers/net/ucc_geth_ethtool.c +++ b/drivers/net/ucc_geth_ethtool.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Author: Li Yang <leoli@freescale.com> | 6 | * Author: Li Yang <leoli@freescale.com> |
7 | * | 7 | * |
8 | * Limitation: | 8 | * Limitation: |
9 | * Can only get/set setttings of the first queue. | 9 | * Can only get/set settings of the first queue. |
10 | * Need to re-open the interface manually after changing some parameters. | 10 | * Need to re-open the interface manually after changing some parameters. |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or modify it | 12 | * This program is free software; you can redistribute it and/or modify it |
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index e6dd24466965..ce395fe5de26 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
@@ -109,7 +109,7 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf) | |||
109 | 109 | ||
110 | /* take the first altsetting with in-bulk + out-bulk; | 110 | /* take the first altsetting with in-bulk + out-bulk; |
111 | * remember any status endpoint, just in case; | 111 | * remember any status endpoint, just in case; |
112 | * ignore other endpoints and altsetttings. | 112 | * ignore other endpoints and altsettings. |
113 | */ | 113 | */ |
114 | for (ep = 0; ep < alt->desc.bNumEndpoints; ep++) { | 114 | for (ep = 0; ep < alt->desc.bNumEndpoints; ep++) { |
115 | struct usb_host_endpoint *e; | 115 | struct usb_host_endpoint *e; |
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index f875cfae3093..737b59f1a8dc 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
@@ -1445,7 +1445,7 @@ static void falc_update_stats(pc300_t * card, int ch) | |||
1445 | * Description: In the remote loopback mode the clock and data recovered | 1445 | * Description: In the remote loopback mode the clock and data recovered |
1446 | * from the line inputs RL1/2 or RDIP/RDIN are routed back | 1446 | * from the line inputs RL1/2 or RDIP/RDIN are routed back |
1447 | * to the line outputs XL1/2 or XDOP/XDON via the analog | 1447 | * to the line outputs XL1/2 or XDOP/XDON via the analog |
1448 | * transmitter. As in normal mode they are processsed by | 1448 | * transmitter. As in normal mode they are processed by |
1449 | * the synchronizer and then sent to the system interface. | 1449 | * the synchronizer and then sent to the system interface. |
1450 | *---------------------------------------------------------------------------- | 1450 | *---------------------------------------------------------------------------- |
1451 | */ | 1451 | */ |
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 4e5c7a11f04a..a70c512f05d2 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -242,9 +242,8 @@ static int airo_perm = 0555; | |||
242 | static int proc_perm = 0644; | 242 | static int proc_perm = 0644; |
243 | 243 | ||
244 | MODULE_AUTHOR("Benjamin Reed"); | 244 | MODULE_AUTHOR("Benjamin Reed"); |
245 | MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet \ | 245 | MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet cards. " |
246 | cards. Direct support for ISA/PCI/MPI cards and support \ | 246 | "Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs."); |
247 | for PCMCIA when used with airo_cs."); | ||
248 | MODULE_LICENSE("Dual BSD/GPL"); | 247 | MODULE_LICENSE("Dual BSD/GPL"); |
249 | MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350"); | 248 | MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350"); |
250 | module_param_array(io, int, NULL, 0); | 249 | module_param_array(io, int, NULL, 0); |
@@ -252,18 +251,20 @@ module_param_array(irq, int, NULL, 0); | |||
252 | module_param_array(rates, int, NULL, 0); | 251 | module_param_array(rates, int, NULL, 0); |
253 | module_param_array(ssids, charp, NULL, 0); | 252 | module_param_array(ssids, charp, NULL, 0); |
254 | module_param(auto_wep, int, 0); | 253 | module_param(auto_wep, int, 0); |
255 | MODULE_PARM_DESC(auto_wep, "If non-zero, the driver will keep looping through \ | 254 | MODULE_PARM_DESC(auto_wep, |
256 | the authentication options until an association is made. The value of \ | 255 | "If non-zero, the driver will keep looping through the authentication options until an association is made. " |
257 | auto_wep is number of the wep keys to check. A value of 2 will try using \ | 256 | "The value of auto_wep is number of the wep keys to check. " |
258 | the key at index 0 and index 1."); | 257 | "A value of 2 will try using the key at index 0 and index 1."); |
259 | module_param(aux_bap, int, 0); | 258 | module_param(aux_bap, int, 0); |
260 | MODULE_PARM_DESC(aux_bap, "If non-zero, the driver will switch into a mode \ | 259 | MODULE_PARM_DESC(aux_bap, |
261 | than seems to work better for older cards with some older buses. Before \ | 260 | "If non-zero, the driver will switch into a mode that seems to work better for older cards with some older buses. " |
262 | switching it checks that the switch is needed."); | 261 | "Before switching it checks that the switch is needed."); |
263 | module_param(maxencrypt, int, 0); | 262 | module_param(maxencrypt, int, 0); |
264 | MODULE_PARM_DESC(maxencrypt, "The maximum speed that the card can do \ | 263 | MODULE_PARM_DESC(maxencrypt, |
265 | encryption. Units are in 512kbs. Zero (default) means there is no limit. \ | 264 | "The maximum speed that the card can do encryption. " |
266 | Older cards used to be limited to 2mbs (4)."); | 265 | "Units are in 512kbs. " |
266 | "Zero (default) means there is no limit. " | ||
267 | "Older cards used to be limited to 2mbs (4)."); | ||
267 | module_param(adhoc, int, 0); | 268 | module_param(adhoc, int, 0); |
268 | MODULE_PARM_DESC(adhoc, "If non-zero, the card will start in adhoc mode."); | 269 | MODULE_PARM_DESC(adhoc, "If non-zero, the card will start in adhoc mode."); |
269 | module_param(probe, int, 0); | 270 | module_param(probe, int, 0); |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index 1e220354e4be..d985841ff401 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |||
@@ -3327,26 +3327,26 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah, | |||
3327 | else | 3327 | else |
3328 | cptr = AR9300_BASE_ADDR; | 3328 | cptr = AR9300_BASE_ADDR; |
3329 | ath_dbg(common, ATH_DBG_EEPROM, | 3329 | ath_dbg(common, ATH_DBG_EEPROM, |
3330 | "Trying EEPROM accesss at Address 0x%04x\n", cptr); | 3330 | "Trying EEPROM access at Address 0x%04x\n", cptr); |
3331 | if (ar9300_check_eeprom_header(ah, read, cptr)) | 3331 | if (ar9300_check_eeprom_header(ah, read, cptr)) |
3332 | goto found; | 3332 | goto found; |
3333 | 3333 | ||
3334 | cptr = AR9300_BASE_ADDR_512; | 3334 | cptr = AR9300_BASE_ADDR_512; |
3335 | ath_dbg(common, ATH_DBG_EEPROM, | 3335 | ath_dbg(common, ATH_DBG_EEPROM, |
3336 | "Trying EEPROM accesss at Address 0x%04x\n", cptr); | 3336 | "Trying EEPROM access at Address 0x%04x\n", cptr); |
3337 | if (ar9300_check_eeprom_header(ah, read, cptr)) | 3337 | if (ar9300_check_eeprom_header(ah, read, cptr)) |
3338 | goto found; | 3338 | goto found; |
3339 | 3339 | ||
3340 | read = ar9300_read_otp; | 3340 | read = ar9300_read_otp; |
3341 | cptr = AR9300_BASE_ADDR; | 3341 | cptr = AR9300_BASE_ADDR; |
3342 | ath_dbg(common, ATH_DBG_EEPROM, | 3342 | ath_dbg(common, ATH_DBG_EEPROM, |
3343 | "Trying OTP accesss at Address 0x%04x\n", cptr); | 3343 | "Trying OTP access at Address 0x%04x\n", cptr); |
3344 | if (ar9300_check_eeprom_header(ah, read, cptr)) | 3344 | if (ar9300_check_eeprom_header(ah, read, cptr)) |
3345 | goto found; | 3345 | goto found; |
3346 | 3346 | ||
3347 | cptr = AR9300_BASE_ADDR_512; | 3347 | cptr = AR9300_BASE_ADDR_512; |
3348 | ath_dbg(common, ATH_DBG_EEPROM, | 3348 | ath_dbg(common, ATH_DBG_EEPROM, |
3349 | "Trying OTP accesss at Address 0x%04x\n", cptr); | 3349 | "Trying OTP access at Address 0x%04x\n", cptr); |
3350 | if (ar9300_check_eeprom_header(ah, read, cptr)) | 3350 | if (ar9300_check_eeprom_header(ah, read, cptr)) |
3351 | goto found; | 3351 | goto found; |
3352 | 3352 | ||
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index 229f4388f790..ebc93c1bb5e7 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h | |||
@@ -648,8 +648,8 @@ struct b43_request_fw_context { | |||
648 | char errors[B43_NR_FWTYPES][128]; | 648 | char errors[B43_NR_FWTYPES][128]; |
649 | /* Temporary buffer for storing the firmware name. */ | 649 | /* Temporary buffer for storing the firmware name. */ |
650 | char fwname[64]; | 650 | char fwname[64]; |
651 | /* A fatal error occurred while requesting. Firmware reqest | 651 | /* A fatal error occurred while requesting. Firmware request |
652 | * can not continue, as any other reqest will also fail. */ | 652 | * can not continue, as any other request will also fail. */ |
653 | int fatal_failure; | 653 | int fatal_failure; |
654 | }; | 654 | }; |
655 | 655 | ||
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 42c3fe37af64..87813c33bdc2 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
@@ -7430,7 +7430,7 @@ static int ipw_associate_network(struct ipw_priv *priv, | |||
7430 | priv->assoc_request.capability &= | 7430 | priv->assoc_request.capability &= |
7431 | ~cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); | 7431 | ~cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); |
7432 | 7432 | ||
7433 | IPW_DEBUG_ASSOC("%sssocation attempt: '%s', channel %d, " | 7433 | IPW_DEBUG_ASSOC("%ssociation attempt: '%s', channel %d, " |
7434 | "802.11%c [%d], %s[:%s], enc=%s%s%s%c%c\n", | 7434 | "802.11%c [%d], %s[:%s], enc=%s%s%s%c%c\n", |
7435 | roaming ? "Rea" : "A", | 7435 | roaming ? "Rea" : "A", |
7436 | print_ssid(ssid, priv->essid, priv->essid_len), | 7436 | print_ssid(ssid, priv->essid, priv->essid_len), |
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-calib.c b/drivers/net/wireless/iwlegacy/iwl-4965-calib.c index 81d6a25eb04f..162d877e6869 100644 --- a/drivers/net/wireless/iwlegacy/iwl-4965-calib.c +++ b/drivers/net/wireless/iwlegacy/iwl-4965-calib.c | |||
@@ -713,8 +713,8 @@ iwl4965_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig, | |||
713 | iwl4965_find_first_chain(priv->cfg->valid_tx_ant); | 713 | iwl4965_find_first_chain(priv->cfg->valid_tx_ant); |
714 | data->disconn_array[first_chain] = 0; | 714 | data->disconn_array[first_chain] = 0; |
715 | active_chains |= BIT(first_chain); | 715 | active_chains |= BIT(first_chain); |
716 | IWL_DEBUG_CALIB(priv, "All Tx chains are disconnected \ | 716 | IWL_DEBUG_CALIB(priv, |
717 | W/A - declare %d as connected\n", | 717 | "All Tx chains are disconnected W/A - declare %d as connected\n", |
718 | first_chain); | 718 | first_chain); |
719 | break; | 719 | break; |
720 | } | 720 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c index 0f6bb9b2e642..39d1e47a0978 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c | |||
@@ -817,8 +817,8 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig, | |||
817 | find_first_chain(priv->cfg->valid_tx_ant); | 817 | find_first_chain(priv->cfg->valid_tx_ant); |
818 | data->disconn_array[first_chain] = 0; | 818 | data->disconn_array[first_chain] = 0; |
819 | active_chains |= BIT(first_chain); | 819 | active_chains |= BIT(first_chain); |
820 | IWL_DEBUG_CALIB(priv, "All Tx chains are disconnected \ | 820 | IWL_DEBUG_CALIB(priv, |
821 | W/A - declare %d as connected\n", | 821 | "All Tx chains are disconnected W/A - declare %d as connected\n", |
822 | first_chain); | 822 | first_chain); |
823 | break; | 823 | break; |
824 | } | 824 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 3ecc3198d9bf..08e3cae4fa5a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1766,7 +1766,7 @@ static const char *desc_lookup(u32 num) | |||
1766 | max = ARRAY_SIZE(advanced_lookup) - 1; | 1766 | max = ARRAY_SIZE(advanced_lookup) - 1; |
1767 | for (i = 0; i < max; i++) { | 1767 | for (i = 0; i < max; i++) { |
1768 | if (advanced_lookup[i].num == num) | 1768 | if (advanced_lookup[i].num == num) |
1769 | break;; | 1769 | break; |
1770 | } | 1770 | } |
1771 | return advanced_lookup[i].name; | 1771 | return advanced_lookup[i].name; |
1772 | } | 1772 | } |
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c index fc89cd8c8320..d2ec2535aa3c 100644 --- a/drivers/net/wireless/rtlwifi/core.c +++ b/drivers/net/wireless/rtlwifi/core.c | |||
@@ -783,7 +783,7 @@ static void rtl_op_set_tsf(struct ieee80211_hw *hw, u64 tsf) | |||
783 | { | 783 | { |
784 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 784 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
785 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); | 785 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
786 | u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0;; | 786 | u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0; |
787 | 787 | ||
788 | mac->tsf = tsf; | 788 | mac->tsf = tsf; |
789 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *) (&bibss)); | 789 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *) (&bibss)); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c index 4a56138eb33c..defb4370cf74 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |||
@@ -697,7 +697,7 @@ static bool _rtl92ce_init_mac(struct ieee80211_hw *hw) | |||
697 | rtl_write_word(rtlpriv, REG_CR, 0x2ff); | 697 | rtl_write_word(rtlpriv, REG_CR, 0x2ff); |
698 | 698 | ||
699 | if (_rtl92ce_llt_table_init(hw) == false) | 699 | if (_rtl92ce_llt_table_init(hw) == false) |
700 | return false;; | 700 | return false; |
701 | 701 | ||
702 | rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff); | 702 | rtl_write_dword(rtlpriv, REG_HISR, 0xffffffff); |
703 | rtl_write_byte(rtlpriv, REG_HISRE, 0xff); | 703 | rtl_write_byte(rtlpriv, REG_HISRE, 0xff); |
@@ -754,7 +754,7 @@ static bool _rtl92ce_init_mac(struct ieee80211_hw *hw) | |||
754 | 754 | ||
755 | rtl_write_dword(rtlpriv, REG_MCUTST_1, 0x0); | 755 | rtl_write_dword(rtlpriv, REG_MCUTST_1, 0x0); |
756 | 756 | ||
757 | return true;; | 757 | return true; |
758 | } | 758 | } |
759 | 759 | ||
760 | static void _rtl92ce_hw_configure(struct ieee80211_hw *hw) | 760 | static void _rtl92ce_hw_configure(struct ieee80211_hw *hw) |
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 0485e394712a..485c09eef424 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
@@ -111,7 +111,7 @@ config DELL_WMI_AIO | |||
111 | All-In-One machines. | 111 | All-In-One machines. |
112 | 112 | ||
113 | To compile this driver as a module, choose M here: the module will | 113 | To compile this driver as a module, choose M here: the module will |
114 | be called dell-wmi. | 114 | be called dell-wmi-aio. |
115 | 115 | ||
116 | 116 | ||
117 | config FUJITSU_LAPTOP | 117 | config FUJITSU_LAPTOP |
diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c index bce3a01da2f0..cffcb7c00b00 100644 --- a/drivers/power/intel_mid_battery.c +++ b/drivers/power/intel_mid_battery.c | |||
@@ -522,7 +522,7 @@ static int pmic_battery_set_charger(struct pmic_power_module_info *pbi, | |||
522 | if (retval) { | 522 | if (retval) { |
523 | dev_warn(pbi->dev, "%s(): ipc pmic read failed\n", | 523 | dev_warn(pbi->dev, "%s(): ipc pmic read failed\n", |
524 | __func__); | 524 | __func__); |
525 | return retval;; | 525 | return retval; |
526 | } | 526 | } |
527 | 527 | ||
528 | return 0; | 528 | return 0; |
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c index 43410266f993..f57e9c42fdb4 100644 --- a/drivers/regulator/max8998.c +++ b/drivers/regulator/max8998.c | |||
@@ -405,8 +405,8 @@ static int max8998_set_voltage_buck(struct regulator_dev *rdev, | |||
405 | switch (buck) { | 405 | switch (buck) { |
406 | case MAX8998_BUCK1: | 406 | case MAX8998_BUCK1: |
407 | dev_dbg(max8998->dev, | 407 | dev_dbg(max8998->dev, |
408 | "BUCK1, i:%d, buck1_vol1:%d, buck1_vol2:%d\n\ | 408 | "BUCK1, i:%d, buck1_vol1:%d, buck1_vol2:%d\n" |
409 | buck1_vol3:%d, buck1_vol4:%d\n", | 409 | "buck1_vol3:%d, buck1_vol4:%d\n", |
410 | i, max8998->buck1_vol[0], max8998->buck1_vol[1], | 410 | i, max8998->buck1_vol[0], max8998->buck1_vol[1], |
411 | max8998->buck1_vol[2], max8998->buck1_vol[3]); | 411 | max8998->buck1_vol[2], max8998->buck1_vol[3]); |
412 | 412 | ||
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c index 23249cb0a8bd..b8a00c7fa441 100644 --- a/drivers/regulator/mc13783-regulator.c +++ b/drivers/regulator/mc13783-regulator.c | |||
@@ -341,7 +341,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev) | |||
341 | struct mc13783_regulator_init_data *init_data; | 341 | struct mc13783_regulator_init_data *init_data; |
342 | int i, ret; | 342 | int i, ret; |
343 | 343 | ||
344 | dev_dbg(&pdev->dev, "mc13783_regulator_probe id %d\n", pdev->id); | 344 | dev_dbg(&pdev->dev, "%s id %d\n", __func__, pdev->id); |
345 | 345 | ||
346 | priv = kzalloc(sizeof(*priv) + | 346 | priv = kzalloc(sizeof(*priv) + |
347 | pdata->num_regulators * sizeof(priv->regulators[0]), | 347 | pdata->num_regulators * sizeof(priv->regulators[0]), |
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c index 078ed600f47a..232aff1fe784 100644 --- a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c +++ b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Aic7xxx SCSI host adapter firmware asssembler symbol table implementation | 2 | * Aic7xxx SCSI host adapter firmware assembler symbol table implementation |
3 | * | 3 | * |
4 | * Copyright (c) 1997 Justin T. Gibbs. | 4 | * Copyright (c) 1997 Justin T. Gibbs. |
5 | * Copyright (c) 2002 Adaptec Inc. | 5 | * Copyright (c) 2002 Adaptec Inc. |
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h index 2ba73ae7c777..34bbcad7f83f 100644 --- a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h +++ b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Aic7xxx SCSI host adapter firmware asssembler symbol table definitions | 2 | * Aic7xxx SCSI host adapter firmware assembler symbol table definitions |
3 | * | 3 | * |
4 | * Copyright (c) 1997 Justin T. Gibbs. | 4 | * Copyright (c) 1997 Justin T. Gibbs. |
5 | * Copyright (c) 2002 Adaptec Inc. | 5 | * Copyright (c) 2002 Adaptec Inc. |
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index cea9b275965c..94b9a07845d5 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c | |||
@@ -619,7 +619,7 @@ static void beiscsi_get_params(struct beiscsi_hba *phba) | |||
619 | + BE2_NOPOUT_REQ)); | 619 | + BE2_NOPOUT_REQ)); |
620 | phba->params.cxns_per_ctrl = phba->fw_config.iscsi_cid_count; | 620 | phba->params.cxns_per_ctrl = phba->fw_config.iscsi_cid_count; |
621 | phba->params.asyncpdus_per_ctrl = phba->fw_config.iscsi_cid_count * 2; | 621 | phba->params.asyncpdus_per_ctrl = phba->fw_config.iscsi_cid_count * 2; |
622 | phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count;; | 622 | phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count; |
623 | phba->params.num_sge_per_io = BE2_SGE; | 623 | phba->params.num_sge_per_io = BE2_SGE; |
624 | phba->params.defpdu_hdr_sz = BE2_DEFPDU_HDR_SZ; | 624 | phba->params.defpdu_hdr_sz = BE2_DEFPDU_HDR_SZ; |
625 | phba->params.defpdu_data_sz = BE2_DEFPDU_DATA_SZ; | 625 | phba->params.defpdu_data_sz = BE2_DEFPDU_DATA_SZ; |
@@ -782,7 +782,7 @@ static irqreturn_t be_isr(int irq, void *dev_id) | |||
782 | int isr; | 782 | int isr; |
783 | 783 | ||
784 | phba = dev_id; | 784 | phba = dev_id; |
785 | ctrl = &phba->ctrl;; | 785 | ctrl = &phba->ctrl; |
786 | isr = ioread32(ctrl->csr + CEV_ISR0_OFFSET + | 786 | isr = ioread32(ctrl->csr + CEV_ISR0_OFFSET + |
787 | (PCI_FUNC(ctrl->pdev->devfn) * CEV_ISR_SIZE)); | 787 | (PCI_FUNC(ctrl->pdev->devfn) * CEV_ISR_SIZE)); |
788 | if (!isr) | 788 | if (!isr) |
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c index 60d2ef291646..450e011f981a 100644 --- a/drivers/scsi/constants.c +++ b/drivers/scsi/constants.c | |||
@@ -34,7 +34,7 @@ | |||
34 | static const char * cdb_byte0_names[] = { | 34 | static const char * cdb_byte0_names[] = { |
35 | /* 00-03 */ "Test Unit Ready", "Rezero Unit/Rewind", NULL, "Request Sense", | 35 | /* 00-03 */ "Test Unit Ready", "Rezero Unit/Rewind", NULL, "Request Sense", |
36 | /* 04-07 */ "Format Unit/Medium", "Read Block Limits", NULL, | 36 | /* 04-07 */ "Format Unit/Medium", "Read Block Limits", NULL, |
37 | "Reasssign Blocks", | 37 | "Reassign Blocks", |
38 | /* 08-0d */ "Read(6)", NULL, "Write(6)", "Seek(6)", NULL, NULL, | 38 | /* 08-0d */ "Read(6)", NULL, "Write(6)", "Seek(6)", NULL, NULL, |
39 | /* 0e-12 */ NULL, "Read Reverse", "Write Filemarks", "Space", "Inquiry", | 39 | /* 0e-12 */ NULL, "Read Reverse", "Write Filemarks", "Space", "Inquiry", |
40 | /* 13-16 */ "Verify(6)", "Recover Buffered Data", "Mode Select(6)", | 40 | /* 13-16 */ "Verify(6)", "Recover Buffered Data", "Mode Select(6)", |
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c index 9a1af1d6071a..394ed9e79fd4 100644 --- a/drivers/scsi/esp_scsi.c +++ b/drivers/scsi/esp_scsi.c | |||
@@ -1058,7 +1058,7 @@ static struct esp_cmd_entry *esp_reconnect_with_tag(struct esp *esp, | |||
1058 | esp->ops->send_dma_cmd(esp, esp->command_block_dma, | 1058 | esp->ops->send_dma_cmd(esp, esp->command_block_dma, |
1059 | 2, 2, 1, ESP_CMD_DMA | ESP_CMD_TI); | 1059 | 2, 2, 1, ESP_CMD_DMA | ESP_CMD_TI); |
1060 | 1060 | ||
1061 | /* ACK the msssage. */ | 1061 | /* ACK the message. */ |
1062 | scsi_esp_cmd(esp, ESP_CMD_MOK); | 1062 | scsi_esp_cmd(esp, ESP_CMD_MOK); |
1063 | 1063 | ||
1064 | for (i = 0; i < ESP_RESELECT_TAG_LIMIT; i++) { | 1064 | for (i = 0; i < ESP_RESELECT_TAG_LIMIT; i++) { |
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 17d789325f40..8dcbf8fff673 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
@@ -4532,7 +4532,7 @@ lpfc_set_vport_symbolic_name(struct fc_vport *fc_vport) | |||
4532 | * | 4532 | * |
4533 | * This function is called by the lpfc_get_cfgparam() routine to set the | 4533 | * This function is called by the lpfc_get_cfgparam() routine to set the |
4534 | * module lpfc_log_verbose into the @phba cfg_log_verbose for use with | 4534 | * module lpfc_log_verbose into the @phba cfg_log_verbose for use with |
4535 | * log messsage according to the module's lpfc_log_verbose parameter setting | 4535 | * log message according to the module's lpfc_log_verbose parameter setting |
4536 | * before hba port or vport created. | 4536 | * before hba port or vport created. |
4537 | **/ | 4537 | **/ |
4538 | static void | 4538 | static void |
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c index 37e2a1272f86..853e5042f39c 100644 --- a/drivers/scsi/lpfc/lpfc_bsg.c +++ b/drivers/scsi/lpfc/lpfc_bsg.c | |||
@@ -598,7 +598,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job) | |||
598 | dd_data->context_un.iocb.cmdiocbq = cmdiocbq; | 598 | dd_data->context_un.iocb.cmdiocbq = cmdiocbq; |
599 | dd_data->context_un.iocb.rspiocbq = rspiocbq; | 599 | dd_data->context_un.iocb.rspiocbq = rspiocbq; |
600 | dd_data->context_un.iocb.set_job = job; | 600 | dd_data->context_un.iocb.set_job = job; |
601 | dd_data->context_un.iocb.bmp = NULL;; | 601 | dd_data->context_un.iocb.bmp = NULL; |
602 | dd_data->context_un.iocb.ndlp = ndlp; | 602 | dd_data->context_un.iocb.ndlp = ndlp; |
603 | 603 | ||
604 | if (phba->cfg_poll & DISABLE_FCP_RING_INT) { | 604 | if (phba->cfg_poll & DISABLE_FCP_RING_INT) { |
diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h index 95f11ed79463..86b6f7e6686a 100644 --- a/drivers/scsi/lpfc/lpfc_hw.h +++ b/drivers/scsi/lpfc/lpfc_hw.h | |||
@@ -1002,7 +1002,7 @@ typedef struct _ELS_PKT { /* Structure is in Big Endian format */ | |||
1002 | #define SLI_MGMT_GRPL 0x102 /* Get registered Port list */ | 1002 | #define SLI_MGMT_GRPL 0x102 /* Get registered Port list */ |
1003 | #define SLI_MGMT_GPAT 0x110 /* Get Port attributes */ | 1003 | #define SLI_MGMT_GPAT 0x110 /* Get Port attributes */ |
1004 | #define SLI_MGMT_RHBA 0x200 /* Register HBA */ | 1004 | #define SLI_MGMT_RHBA 0x200 /* Register HBA */ |
1005 | #define SLI_MGMT_RHAT 0x201 /* Register HBA atttributes */ | 1005 | #define SLI_MGMT_RHAT 0x201 /* Register HBA attributes */ |
1006 | #define SLI_MGMT_RPRT 0x210 /* Register Port */ | 1006 | #define SLI_MGMT_RPRT 0x210 /* Register Port */ |
1007 | #define SLI_MGMT_RPA 0x211 /* Register Port attributes */ | 1007 | #define SLI_MGMT_RPA 0x211 /* Register Port attributes */ |
1008 | #define SLI_MGMT_DHBA 0x300 /* De-register HBA */ | 1008 | #define SLI_MGMT_DHBA 0x300 /* De-register HBA */ |
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 837d272cb2d6..fd5835e1c039 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
@@ -3040,7 +3040,7 @@ lpfc_sli_sp_handle_rspiocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
3040 | list_add_tail(&rspiocbp->list, &(pring->iocb_continueq)); | 3040 | list_add_tail(&rspiocbp->list, &(pring->iocb_continueq)); |
3041 | pring->iocb_continueq_cnt++; | 3041 | pring->iocb_continueq_cnt++; |
3042 | 3042 | ||
3043 | /* Now, determine whetehr the list is completed for processing */ | 3043 | /* Now, determine whether the list is completed for processing */ |
3044 | irsp = &rspiocbp->iocb; | 3044 | irsp = &rspiocbp->iocb; |
3045 | if (irsp->ulpLe) { | 3045 | if (irsp->ulpLe) { |
3046 | /* | 3046 | /* |
diff --git a/drivers/scsi/nsp32_debug.c b/drivers/scsi/nsp32_debug.c index 2fb3fb58858d..58806f432a16 100644 --- a/drivers/scsi/nsp32_debug.c +++ b/drivers/scsi/nsp32_debug.c | |||
@@ -13,7 +13,7 @@ static const char unknown[] = "UNKNOWN"; | |||
13 | 13 | ||
14 | static const char * group_0_commands[] = { | 14 | static const char * group_0_commands[] = { |
15 | /* 00-03 */ "Test Unit Ready", "Rezero Unit", unknown, "Request Sense", | 15 | /* 00-03 */ "Test Unit Ready", "Rezero Unit", unknown, "Request Sense", |
16 | /* 04-07 */ "Format Unit", "Read Block Limits", unknown, "Reasssign Blocks", | 16 | /* 04-07 */ "Format Unit", "Read Block Limits", unknown, "Reassign Blocks", |
17 | /* 08-0d */ "Read (6)", unknown, "Write (6)", "Seek (6)", unknown, unknown, | 17 | /* 08-0d */ "Read (6)", unknown, "Write (6)", "Seek (6)", unknown, unknown, |
18 | /* 0e-12 */ unknown, "Read Reverse", "Write Filemarks", "Space", "Inquiry", | 18 | /* 0e-12 */ unknown, "Read Reverse", "Write Filemarks", "Space", "Inquiry", |
19 | /* 13-16 */ unknown, "Recover Buffered Data", "Mode Select", "Reserve", | 19 | /* 13-16 */ unknown, "Recover Buffered Data", "Mode Select", "Reserve", |
diff --git a/drivers/scsi/pcmcia/nsp_debug.c b/drivers/scsi/pcmcia/nsp_debug.c index 3c6ef64fcbff..6aa7d269d3b3 100644 --- a/drivers/scsi/pcmcia/nsp_debug.c +++ b/drivers/scsi/pcmcia/nsp_debug.c | |||
@@ -15,7 +15,7 @@ static const char unknown[] = "UNKNOWN"; | |||
15 | 15 | ||
16 | static const char * group_0_commands[] = { | 16 | static const char * group_0_commands[] = { |
17 | /* 00-03 */ "Test Unit Ready", "Rezero Unit", unknown, "Request Sense", | 17 | /* 00-03 */ "Test Unit Ready", "Rezero Unit", unknown, "Request Sense", |
18 | /* 04-07 */ "Format Unit", "Read Block Limits", unknown, "Reasssign Blocks", | 18 | /* 04-07 */ "Format Unit", "Read Block Limits", unknown, "Reassign Blocks", |
19 | /* 08-0d */ "Read (6)", unknown, "Write (6)", "Seek (6)", unknown, unknown, | 19 | /* 08-0d */ "Read (6)", unknown, "Write (6)", "Seek (6)", unknown, unknown, |
20 | /* 0e-12 */ unknown, "Read Reverse", "Write Filemarks", "Space", "Inquiry", | 20 | /* 0e-12 */ unknown, "Read Reverse", "Write Filemarks", "Space", "Inquiry", |
21 | /* 13-16 */ unknown, "Recover Buffered Data", "Mode Select", "Reserve", | 21 | /* 13-16 */ unknown, "Recover Buffered Data", "Mode Select", "Reserve", |
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 002360da01e3..172cefb6deb9 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c | |||
@@ -160,7 +160,7 @@ static void pm8001_free(struct pm8001_hba_info *pm8001_ha) | |||
160 | static void pm8001_tasklet(unsigned long opaque) | 160 | static void pm8001_tasklet(unsigned long opaque) |
161 | { | 161 | { |
162 | struct pm8001_hba_info *pm8001_ha; | 162 | struct pm8001_hba_info *pm8001_ha; |
163 | pm8001_ha = (struct pm8001_hba_info *)opaque;; | 163 | pm8001_ha = (struct pm8001_hba_info *)opaque; |
164 | if (unlikely(!pm8001_ha)) | 164 | if (unlikely(!pm8001_ha)) |
165 | BUG_ON(1); | 165 | BUG_ON(1); |
166 | PM8001_CHIP_DISP->isr(pm8001_ha); | 166 | PM8001_CHIP_DISP->isr(pm8001_ha); |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 9c0f0e3389eb..1b60a95adb50 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
@@ -1060,7 +1060,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req, | |||
1060 | } | 1060 | } |
1061 | DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt))); | 1061 | DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt))); |
1062 | } else { | 1062 | } else { |
1063 | bsg_job->reply->result = DID_OK << 16;; | 1063 | bsg_job->reply->result = DID_OK << 16; |
1064 | bsg_job->reply->reply_payload_rcv_len = | 1064 | bsg_job->reply->reply_payload_rcv_len = |
1065 | bsg_job->reply_payload.payload_len; | 1065 | bsg_job->reply_payload.payload_len; |
1066 | bsg_job->reply_len = 0; | 1066 | bsg_job->reply_len = 0; |
@@ -1155,7 +1155,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req, | |||
1155 | DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt))); | 1155 | DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt))); |
1156 | } | 1156 | } |
1157 | else { | 1157 | else { |
1158 | bsg_job->reply->result = DID_OK << 16;; | 1158 | bsg_job->reply->result = DID_OK << 16; |
1159 | bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len; | 1159 | bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len; |
1160 | bsg_job->reply_len = 0; | 1160 | bsg_job->reply_len = 0; |
1161 | } | 1161 | } |
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c index f9d81c8372c3..d78b58dc5011 100644 --- a/drivers/scsi/qla4xxx/ql4_mbx.c +++ b/drivers/scsi/qla4xxx/ql4_mbx.c | |||
@@ -19,7 +19,7 @@ | |||
19 | * @mbx_cmd: data pointer for mailbox in registers. | 19 | * @mbx_cmd: data pointer for mailbox in registers. |
20 | * @mbx_sts: data pointer for mailbox out registers. | 20 | * @mbx_sts: data pointer for mailbox out registers. |
21 | * | 21 | * |
22 | * This routine isssue mailbox commands and waits for completion. | 22 | * This routine issue mailbox commands and waits for completion. |
23 | * If outCount is 0, this routine completes successfully WITHOUT waiting | 23 | * If outCount is 0, this routine completes successfully WITHOUT waiting |
24 | * for the mailbox command to complete. | 24 | * for the mailbox command to complete. |
25 | **/ | 25 | **/ |
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c index fef0e3c75b16..3a9d85ca6047 100644 --- a/drivers/scsi/sgiwd93.c +++ b/drivers/scsi/sgiwd93.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 6 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
7 | * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) | 7 | * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) |
8 | * Copyright (C) 2001 Florian Lohoff (flo@rfc822.org) | 8 | * Copyright (C) 2001 Florian Lohoff (flo@rfc822.org) |
9 | * Copyright (C) 2003, 07 Ralf Baechle (ralf@linux-mips.org) | 9 | * Copyright (C) 2003, 07 Ralf Baechle (ralf@linux-mips.org) |
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index 1a478bf88c9d..08711e9202ab 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c | |||
@@ -935,6 +935,6 @@ static void __exit atmel_spi_exit(void) | |||
935 | module_exit(atmel_spi_exit); | 935 | module_exit(atmel_spi_exit); |
936 | 936 | ||
937 | MODULE_DESCRIPTION("Atmel AT32/AT91 SPI Controller driver"); | 937 | MODULE_DESCRIPTION("Atmel AT32/AT91 SPI Controller driver"); |
938 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); | 938 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |
939 | MODULE_LICENSE("GPL"); | 939 | MODULE_LICENSE("GPL"); |
940 | MODULE_ALIAS("platform:atmel_spi"); | 940 | MODULE_ALIAS("platform:atmel_spi"); |
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c index 30cbb743d9ba..47abb42d9c36 100644 --- a/drivers/target/target_core_alua.c +++ b/drivers/target/target_core_alua.c | |||
@@ -1036,7 +1036,7 @@ core_alua_allocate_lu_gp(const char *name, int def_group) | |||
1036 | lu_gp = kmem_cache_zalloc(t10_alua_lu_gp_cache, GFP_KERNEL); | 1036 | lu_gp = kmem_cache_zalloc(t10_alua_lu_gp_cache, GFP_KERNEL); |
1037 | if (!(lu_gp)) { | 1037 | if (!(lu_gp)) { |
1038 | printk(KERN_ERR "Unable to allocate struct t10_alua_lu_gp\n"); | 1038 | printk(KERN_ERR "Unable to allocate struct t10_alua_lu_gp\n"); |
1039 | return ERR_PTR(-ENOMEM);; | 1039 | return ERR_PTR(-ENOMEM); |
1040 | } | 1040 | } |
1041 | INIT_LIST_HEAD(&lu_gp->lu_gp_list); | 1041 | INIT_LIST_HEAD(&lu_gp->lu_gp_list); |
1042 | INIT_LIST_HEAD(&lu_gp->lu_gp_mem_list); | 1042 | INIT_LIST_HEAD(&lu_gp->lu_gp_mem_list); |
@@ -1044,7 +1044,7 @@ core_alua_allocate_lu_gp(const char *name, int def_group) | |||
1044 | atomic_set(&lu_gp->lu_gp_ref_cnt, 0); | 1044 | atomic_set(&lu_gp->lu_gp_ref_cnt, 0); |
1045 | 1045 | ||
1046 | if (def_group) { | 1046 | if (def_group) { |
1047 | lu_gp->lu_gp_id = se_global->alua_lu_gps_counter++;; | 1047 | lu_gp->lu_gp_id = se_global->alua_lu_gps_counter++; |
1048 | lu_gp->lu_gp_valid_id = 1; | 1048 | lu_gp->lu_gp_valid_id = 1; |
1049 | se_global->alua_lu_gps_count++; | 1049 | se_global->alua_lu_gps_count++; |
1050 | } | 1050 | } |
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 9583b23c9c84..b9d3501bdd91 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
@@ -2128,7 +2128,7 @@ static void transport_failure_reset_queue_depth(struct se_device *dev) | |||
2128 | { | 2128 | { |
2129 | unsigned long flags; | 2129 | unsigned long flags; |
2130 | 2130 | ||
2131 | spin_lock_irqsave(&SE_HBA(dev)->hba_queue_lock, flags);; | 2131 | spin_lock_irqsave(&SE_HBA(dev)->hba_queue_lock, flags); |
2132 | atomic_inc(&dev->depth_left); | 2132 | atomic_inc(&dev->depth_left); |
2133 | atomic_inc(&SE_HBA(dev)->left_queue_depth); | 2133 | atomic_inc(&SE_HBA(dev)->left_queue_depth); |
2134 | spin_unlock_irqrestore(&SE_HBA(dev)->hba_queue_lock, flags); | 2134 | spin_unlock_irqrestore(&SE_HBA(dev)->hba_queue_lock, flags); |
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 74273e638c0d..77623b936538 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c | |||
@@ -2128,7 +2128,7 @@ static int gsmld_attach_gsm(struct tty_struct *tty, struct gsm_mux *gsm) | |||
2128 | 2128 | ||
2129 | /** | 2129 | /** |
2130 | * gsmld_detach_gsm - stop doing 0710 mux | 2130 | * gsmld_detach_gsm - stop doing 0710 mux |
2131 | * @tty: tty atttached to the mux | 2131 | * @tty: tty attached to the mux |
2132 | * @gsm: mux | 2132 | * @gsm: mux |
2133 | * | 2133 | * |
2134 | * Shutdown and then clean up the resources used by the line discipline | 2134 | * Shutdown and then clean up the resources used by the line discipline |
diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c index c3ec0a61d859..891d194ae754 100644 --- a/drivers/tty/serial/bfin_sport_uart.c +++ b/drivers/tty/serial/bfin_sport_uart.c | |||
@@ -296,8 +296,7 @@ static int sport_startup(struct uart_port *port) | |||
296 | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | | 296 | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | |
297 | IRQF_DISABLED, "BFIN_SPORT_UART_CTS", up)) { | 297 | IRQF_DISABLED, "BFIN_SPORT_UART_CTS", up)) { |
298 | up->cts_pin = -1; | 298 | up->cts_pin = -1; |
299 | dev_info(port->dev, "Unable to attach BlackFin UART \ | 299 | dev_info(port->dev, "Unable to attach BlackFin UART over SPORT CTS interrupt. So, disable it.\n"); |
300 | over SPORT CTS interrupt. So, disable it.\n"); | ||
301 | } | 300 | } |
302 | } | 301 | } |
303 | if (up->rts_pin >= 0) | 302 | if (up->rts_pin >= 0) |
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c index c111f36f5d21..cab52f4a88b0 100644 --- a/drivers/tty/serial/mfd.c +++ b/drivers/tty/serial/mfd.c | |||
@@ -49,8 +49,8 @@ | |||
49 | 49 | ||
50 | static int hsu_dma_enable; | 50 | static int hsu_dma_enable; |
51 | module_param(hsu_dma_enable, int, 0); | 51 | module_param(hsu_dma_enable, int, 0); |
52 | MODULE_PARM_DESC(hsu_dma_enable, "It is a bitmap to set working mode, if \ | 52 | MODULE_PARM_DESC(hsu_dma_enable, |
53 | bit[x] is 1, then port[x] will work in DMA mode, otherwise in PIO mode."); | 53 | "It is a bitmap to set working mode, if bit[x] is 1, then port[x] will work in DMA mode, otherwise in PIO mode."); |
54 | 54 | ||
55 | struct hsu_dma_buffer { | 55 | struct hsu_dma_buffer { |
56 | u8 *buf; | 56 | u8 *buf; |
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c index 2f548af4e98a..1bd28450ca40 100644 --- a/drivers/tty/serial/mrst_max3110.c +++ b/drivers/tty/serial/mrst_max3110.c | |||
@@ -56,7 +56,7 @@ struct uart_max3110 { | |||
56 | wait_queue_head_t wq; | 56 | wait_queue_head_t wq; |
57 | struct task_struct *main_thread; | 57 | struct task_struct *main_thread; |
58 | struct task_struct *read_thread; | 58 | struct task_struct *read_thread; |
59 | struct mutex thread_mutex;; | 59 | struct mutex thread_mutex; |
60 | 60 | ||
61 | u32 baud; | 61 | u32 baud; |
62 | u16 cur_conf; | 62 | u16 cur_conf; |
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c index 21574cb32343..620c971422b6 100644 --- a/drivers/tty/tty_ioctl.c +++ b/drivers/tty/tty_ioctl.c | |||
@@ -309,7 +309,7 @@ EXPORT_SYMBOL(tty_termios_input_baud_rate); | |||
309 | * @ospeed: output speed | 309 | * @ospeed: output speed |
310 | * | 310 | * |
311 | * Encode the speeds set into the passed termios structure. This is | 311 | * Encode the speeds set into the passed termios structure. This is |
312 | * used as a library helper for drivers os that they can report back | 312 | * used as a library helper for drivers so that they can report back |
313 | * the actual speed selected when it differs from the speed requested | 313 | * the actual speed selected when it differs from the speed requested |
314 | * | 314 | * |
315 | * For maximal back compatibility with legacy SYS5/POSIX *nix behaviour | 315 | * For maximal back compatibility with legacy SYS5/POSIX *nix behaviour |
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index e7c65a4408fb..db1a659702ba 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c | |||
@@ -2095,6 +2095,6 @@ static void __exit udc_exit(void) | |||
2095 | module_exit(udc_exit); | 2095 | module_exit(udc_exit); |
2096 | 2096 | ||
2097 | MODULE_DESCRIPTION("Atmel USBA UDC driver"); | 2097 | MODULE_DESCRIPTION("Atmel USBA UDC driver"); |
2098 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); | 2098 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |
2099 | MODULE_LICENSE("GPL"); | 2099 | MODULE_LICENSE("GPL"); |
2100 | MODULE_ALIAS("platform:atmel_usba_udc"); | 2100 | MODULE_ALIAS("platform:atmel_usba_udc"); |
diff --git a/drivers/usb/host/imx21-dbg.c b/drivers/usb/host/imx21-dbg.c index 512f647448ca..6d7533427163 100644 --- a/drivers/usb/host/imx21-dbg.c +++ b/drivers/usb/host/imx21-dbg.c | |||
@@ -384,7 +384,7 @@ static void debug_isoc_show_one(struct seq_file *s, | |||
384 | seq_printf(s, "%s %d:\n" | 384 | seq_printf(s, "%s %d:\n" |
385 | "cc=0X%02X\n" | 385 | "cc=0X%02X\n" |
386 | "scheduled frame %d (%d)\n" | 386 | "scheduled frame %d (%d)\n" |
387 | "submittted frame %d (%d)\n" | 387 | "submitted frame %d (%d)\n" |
388 | "completed frame %d (%d)\n" | 388 | "completed frame %d (%d)\n" |
389 | "requested length=%d\n" | 389 | "requested length=%d\n" |
390 | "completed length=%d\n\n", | 390 | "completed length=%d\n\n", |
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 4f65b14e5e08..448b9d1f0e70 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
@@ -53,9 +53,10 @@ | |||
53 | /* | 53 | /* |
54 | * Version Information | 54 | * Version Information |
55 | */ | 55 | */ |
56 | #define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, \ | 56 | #define DRIVER_AUTHOR \ |
57 | Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber, \ | 57 | "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, " \ |
58 | Alan Stern" | 58 | "Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, " \ |
59 | "Roman Weissgaerber, Alan Stern" | ||
59 | #define DRIVER_DESC "USB Universal Host Controller Interface driver" | 60 | #define DRIVER_DESC "USB Universal Host Controller Interface driver" |
60 | 61 | ||
61 | /* for flakey hardware, ignore overcurrent indicators */ | 62 | /* for flakey hardware, ignore overcurrent indicators */ |
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c index 388cc128072a..ff9a01f8d405 100644 --- a/drivers/usb/misc/usbtest.c +++ b/drivers/usb/misc/usbtest.c | |||
@@ -104,7 +104,7 @@ get_endpoints(struct usbtest_dev *dev, struct usb_interface *intf) | |||
104 | alt = intf->altsetting + tmp; | 104 | alt = intf->altsetting + tmp; |
105 | 105 | ||
106 | /* take the first altsetting with in-bulk + out-bulk; | 106 | /* take the first altsetting with in-bulk + out-bulk; |
107 | * ignore other endpoints and altsetttings. | 107 | * ignore other endpoints and altsettings. |
108 | */ | 108 | */ |
109 | for (ep = 0; ep < alt->desc.bNumEndpoints; ep++) { | 109 | for (ep = 0; ep < alt->desc.bNumEndpoints; ep++) { |
110 | struct usb_host_endpoint *e; | 110 | struct usb_host_endpoint *e; |
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c index 0e5aafda4537..31645afff5fc 100644 --- a/drivers/usb/storage/ene_ub6250.c +++ b/drivers/usb/storage/ene_ub6250.c | |||
@@ -715,8 +715,8 @@ static int ene_ub6250_probe(struct usb_interface *intf, | |||
715 | 715 | ||
716 | if (!(misc_reg03 & 0x01)) { | 716 | if (!(misc_reg03 & 0x01)) { |
717 | result = -ENODEV; | 717 | result = -ENODEV; |
718 | printk(KERN_NOTICE "ums_eneub6250: The driver only supports SD\ | 718 | printk(KERN_NOTICE "ums_eneub6250: The driver only supports SD card. " |
719 | card. To use SM/MS card, please build driver/stagging/keucr\n"); | 719 | "To use SM/MS card, please build driver/staging/keucr\n"); |
720 | usb_stor_disconnect(intf); | 720 | usb_stor_disconnect(intf); |
721 | } | 721 | } |
722 | 722 | ||
diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c index dd0e84a9bd2f..cca43c06d3c8 100644 --- a/drivers/video/backlight/ltv350qv.c +++ b/drivers/video/backlight/ltv350qv.c | |||
@@ -333,7 +333,7 @@ static void __exit ltv350qv_exit(void) | |||
333 | module_init(ltv350qv_init); | 333 | module_init(ltv350qv_init); |
334 | module_exit(ltv350qv_exit); | 334 | module_exit(ltv350qv_exit); |
335 | 335 | ||
336 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); | 336 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |
337 | MODULE_DESCRIPTION("Samsung LTV350QV LCD Driver"); | 337 | MODULE_DESCRIPTION("Samsung LTV350QV LCD Driver"); |
338 | MODULE_LICENSE("GPL"); | 338 | MODULE_LICENSE("GPL"); |
339 | MODULE_ALIAS("spi:ltv350qv"); | 339 | MODULE_ALIAS("spi:ltv350qv"); |
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c index 3772433c49d1..93317b5b8740 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | * This driver is based on sgicons.c and cons_newport. | 7 | * This driver is based on sgicons.c and cons_newport. |
8 | * | 8 | * |
9 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 9 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
10 | * Copyright (C) 1997 Miguel de Icaza (miguel@nuclecu.unam.mx) | 10 | * Copyright (C) 1997 Miguel de Icaza (miguel@nuclecu.unam.mx) |
11 | */ | 11 | */ |
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c index b66d86ac7cea..178b0720bd79 100644 --- a/drivers/video/msm/mddi.c +++ b/drivers/video/msm/mddi.c | |||
@@ -679,7 +679,7 @@ static int __devinit mddi_probe(struct platform_device *pdev) | |||
679 | printk(KERN_ERR "mddi: no associated mem resource!\n"); | 679 | printk(KERN_ERR "mddi: no associated mem resource!\n"); |
680 | return -ENOMEM; | 680 | return -ENOMEM; |
681 | } | 681 | } |
682 | mddi->base = ioremap(resource->start, resource->end - resource->start); | 682 | mddi->base = ioremap(resource->start, resource_size(resource)); |
683 | if (!mddi->base) { | 683 | if (!mddi->base) { |
684 | printk(KERN_ERR "mddi: failed to remap base!\n"); | 684 | printk(KERN_ERR "mddi: failed to remap base!\n"); |
685 | ret = -EINVAL; | 685 | ret = -EINVAL; |
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 7d0284882984..0b2f2dd41416 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c | |||
@@ -401,7 +401,7 @@ static int mxsfb_set_par(struct fb_info *fb_info) | |||
401 | writel(CTRL1_FIFO_CLEAR, host->base + LCDC_CTRL1 + REG_SET); | 401 | writel(CTRL1_FIFO_CLEAR, host->base + LCDC_CTRL1 + REG_SET); |
402 | 402 | ||
403 | ctrl = CTRL_BYPASS_COUNT | CTRL_MASTER | | 403 | ctrl = CTRL_BYPASS_COUNT | CTRL_MASTER | |
404 | CTRL_SET_BUS_WIDTH(host->ld_intf_width);; | 404 | CTRL_SET_BUS_WIDTH(host->ld_intf_width); |
405 | 405 | ||
406 | switch (fb_info->var.bits_per_pixel) { | 406 | switch (fb_info->var.bits_per_pixel) { |
407 | case 16: | 407 | case 16: |
diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c index 3c5045a206dd..5064e8317521 100644 --- a/drivers/watchdog/bcm63xx_wdt.c +++ b/drivers/watchdog/bcm63xx_wdt.c | |||
@@ -248,7 +248,7 @@ static int __devinit bcm63xx_wdt_probe(struct platform_device *pdev) | |||
248 | return -ENODEV; | 248 | return -ENODEV; |
249 | } | 249 | } |
250 | 250 | ||
251 | bcm63xx_wdt_device.regs = ioremap_nocache(r->start, r->end - r->start); | 251 | bcm63xx_wdt_device.regs = ioremap_nocache(r->start, resource_size(r)); |
252 | if (!bcm63xx_wdt_device.regs) { | 252 | if (!bcm63xx_wdt_device.regs) { |
253 | dev_err(&pdev->dev, "failed to remap I/O resources\n"); | 253 | dev_err(&pdev->dev, "failed to remap I/O resources\n"); |
254 | return -ENXIO; | 254 | return -ENXIO; |
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c index ef11daf0cafe..dbc13e94b612 100644 --- a/drivers/xen/evtchn.c +++ b/drivers/xen/evtchn.c | |||
@@ -470,7 +470,7 @@ static int evtchn_open(struct inode *inode, struct file *filp) | |||
470 | 470 | ||
471 | filp->private_data = u; | 471 | filp->private_data = u; |
472 | 472 | ||
473 | return nonseekable_open(inode, filp);; | 473 | return nonseekable_open(inode, filp); |
474 | } | 474 | } |
475 | 475 | ||
476 | static int evtchn_release(struct inode *inode, struct file *filp) | 476 | static int evtchn_release(struct inode *inode, struct file *filp) |
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 54469c3eeacd..65ea21a97492 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c | |||
@@ -54,7 +54,7 @@ u64 start_dma_addr; | |||
54 | 54 | ||
55 | static dma_addr_t xen_phys_to_bus(phys_addr_t paddr) | 55 | static dma_addr_t xen_phys_to_bus(phys_addr_t paddr) |
56 | { | 56 | { |
57 | return phys_to_machine(XPADDR(paddr)).maddr;; | 57 | return phys_to_machine(XPADDR(paddr)).maddr; |
58 | } | 58 | } |
59 | 59 | ||
60 | static phys_addr_t xen_bus_to_phys(dma_addr_t baddr) | 60 | static phys_addr_t xen_bus_to_phys(dma_addr_t baddr) |
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 199a80134312..f340f7c99d09 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c | |||
@@ -709,7 +709,7 @@ again: | |||
709 | WARN_ON(cur->checked); | 709 | WARN_ON(cur->checked); |
710 | if (!list_empty(&cur->upper)) { | 710 | if (!list_empty(&cur->upper)) { |
711 | /* | 711 | /* |
712 | * the backref was added previously when processsing | 712 | * the backref was added previously when processing |
713 | * backref of type BTRFS_TREE_BLOCK_REF_KEY | 713 | * backref of type BTRFS_TREE_BLOCK_REF_KEY |
714 | */ | 714 | */ |
715 | BUG_ON(!list_is_singular(&cur->upper)); | 715 | BUG_ON(!list_is_singular(&cur->upper)); |
diff --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c index 2ba6719ac612..1a4311437a8b 100644 --- a/fs/freevxfs/vxfs_inode.c +++ b/fs/freevxfs/vxfs_inode.c | |||
@@ -272,7 +272,7 @@ vxfs_get_fake_inode(struct super_block *sbp, struct vxfs_inode_info *vip) | |||
272 | * *ip: VFS inode | 272 | * *ip: VFS inode |
273 | * | 273 | * |
274 | * Description: | 274 | * Description: |
275 | * vxfs_put_fake_inode frees all data asssociated with @ip. | 275 | * vxfs_put_fake_inode frees all data associated with @ip. |
276 | */ | 276 | */ |
277 | void | 277 | void |
278 | vxfs_put_fake_inode(struct inode *ip) | 278 | vxfs_put_fake_inode(struct inode *ip) |
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c index 9e22085231b3..d8d09380c7de 100644 --- a/fs/logfs/readwrite.c +++ b/fs/logfs/readwrite.c | |||
@@ -481,7 +481,7 @@ static int inode_write_alias(struct super_block *sb, | |||
481 | val = inode_val0(inode); | 481 | val = inode_val0(inode); |
482 | break; | 482 | break; |
483 | case INODE_USED_OFS: | 483 | case INODE_USED_OFS: |
484 | val = cpu_to_be64(li->li_used_bytes);; | 484 | val = cpu_to_be64(li->li_used_bytes); |
485 | break; | 485 | break; |
486 | case INODE_SIZE_OFS: | 486 | case INODE_SIZE_OFS: |
487 | val = cpu_to_be64(i_size_read(inode)); | 487 | val = cpu_to_be64(i_size_read(inode)); |
diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c index 5232d3e8fb2f..a2e2402b2afb 100644 --- a/fs/nfsd/stats.c +++ b/fs/nfsd/stats.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Statistsics for the reply cache | 8 | * Statistsics for the reply cache |
9 | * fh <stale> <total-lookups> <anonlookups> <dir-not-in-dcache> <nondir-not-in-dcache> | 9 | * fh <stale> <total-lookups> <anonlookups> <dir-not-in-dcache> <nondir-not-in-dcache> |
10 | * statistics for filehandle lookup | 10 | * statistics for filehandle lookup |
11 | * io <bytes-read> <bytes-writtten> | 11 | * io <bytes-read> <bytes-written> |
12 | * statistics for IO throughput | 12 | * statistics for IO throughput |
13 | * th <threads> <fullcnt> <10%-20%> <20%-30%> ... <90%-100%> <100%> | 13 | * th <threads> <fullcnt> <10%-20%> <20%-30%> ... <90%-100%> <100%> |
14 | * time (seconds) when nfsd thread usage above thresholds | 14 | * time (seconds) when nfsd thread usage above thresholds |
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index 5d32749c896d..3c7606cff1ab 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c | |||
@@ -3706,7 +3706,7 @@ int ocfs2_refcount_cow_xattr(struct inode *inode, | |||
3706 | context->cow_start = cow_start; | 3706 | context->cow_start = cow_start; |
3707 | context->cow_len = cow_len; | 3707 | context->cow_len = cow_len; |
3708 | context->ref_tree = ref_tree; | 3708 | context->ref_tree = ref_tree; |
3709 | context->ref_root_bh = ref_root_bh;; | 3709 | context->ref_root_bh = ref_root_bh; |
3710 | context->cow_object = xv; | 3710 | context->cow_object = xv; |
3711 | 3711 | ||
3712 | context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd; | 3712 | context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd; |
diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c index a29d5ccf3d54..af9fdf046769 100644 --- a/fs/partitions/ldm.c +++ b/fs/partitions/ldm.c | |||
@@ -565,7 +565,7 @@ static bool ldm_validate_partition_table(struct parsed_partitions *state) | |||
565 | 565 | ||
566 | data = read_part_sector(state, 0, §); | 566 | data = read_part_sector(state, 0, §); |
567 | if (!data) { | 567 | if (!data) { |
568 | ldm_crit ("Disk read failed."); | 568 | ldm_info ("Disk read failed."); |
569 | return false; | 569 | return false; |
570 | } | 570 | } |
571 | 571 | ||
diff --git a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig index efc309fa3035..7797218d0b30 100644 --- a/fs/squashfs/Kconfig +++ b/fs/squashfs/Kconfig | |||
@@ -42,7 +42,7 @@ config SQUASHFS_LZO | |||
42 | select LZO_DECOMPRESS | 42 | select LZO_DECOMPRESS |
43 | help | 43 | help |
44 | Saying Y here includes support for reading Squashfs file systems | 44 | Saying Y here includes support for reading Squashfs file systems |
45 | compressed with LZO compresssion. LZO compression is mainly | 45 | compressed with LZO compression. LZO compression is mainly |
46 | aimed at embedded systems with slower CPUs where the overheads | 46 | aimed at embedded systems with slower CPUs where the overheads |
47 | of zlib are too high. | 47 | of zlib are too high. |
48 | 48 | ||
@@ -57,7 +57,7 @@ config SQUASHFS_XZ | |||
57 | select XZ_DEC | 57 | select XZ_DEC |
58 | help | 58 | help |
59 | Saying Y here includes support for reading Squashfs file systems | 59 | Saying Y here includes support for reading Squashfs file systems |
60 | compressed with XZ compresssion. XZ gives better compression than | 60 | compressed with XZ compression. XZ gives better compression than |
61 | the default zlib compression, at the expense of greater CPU and | 61 | the default zlib compression, at the expense of greater CPU and |
62 | memory overhead. | 62 | memory overhead. |
63 | 63 | ||
diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c index c37b520132ff..4b5a3fbb1f1f 100644 --- a/fs/squashfs/cache.c +++ b/fs/squashfs/cache.c | |||
@@ -29,7 +29,7 @@ | |||
29 | * plus functions layered ontop of the generic cache implementation to | 29 | * plus functions layered ontop of the generic cache implementation to |
30 | * access the metadata and fragment caches. | 30 | * access the metadata and fragment caches. |
31 | * | 31 | * |
32 | * To avoid out of memory and fragmentation isssues with vmalloc the cache | 32 | * To avoid out of memory and fragmentation issues with vmalloc the cache |
33 | * uses sequences of kmalloced PAGE_CACHE_SIZE buffers. | 33 | * uses sequences of kmalloced PAGE_CACHE_SIZE buffers. |
34 | * | 34 | * |
35 | * It should be noted that the cache is not used for file datablocks, these | 35 | * It should be noted that the cache is not used for file datablocks, these |
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index e765743cf9f3..b4d791a83207 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c | |||
@@ -409,7 +409,7 @@ out: | |||
409 | } | 409 | } |
410 | 410 | ||
411 | /** | 411 | /** |
412 | * ufs_getfrag_bloc() - `get_block_t' function, interface between UFS and | 412 | * ufs_getfrag_block() - `get_block_t' function, interface between UFS and |
413 | * readpage, writepage and so on | 413 | * readpage, writepage and so on |
414 | */ | 414 | */ |
415 | 415 | ||
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index a37480a6e023..d11ce613d692 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -1470,7 +1470,7 @@ xfs_itruncate_finish( | |||
1470 | * file but the log buffers containing the free and reallocation | 1470 | * file but the log buffers containing the free and reallocation |
1471 | * don't, then we'd end up with garbage in the blocks being freed. | 1471 | * don't, then we'd end up with garbage in the blocks being freed. |
1472 | * As long as we make the new_size permanent before actually | 1472 | * As long as we make the new_size permanent before actually |
1473 | * freeing any blocks it doesn't matter if they get writtten to. | 1473 | * freeing any blocks it doesn't matter if they get written to. |
1474 | * | 1474 | * |
1475 | * The callers must signal into us whether or not the size | 1475 | * The callers must signal into us whether or not the size |
1476 | * setting here must be synchronous. There are a few cases | 1476 | * setting here must be synchronous. There are a few cases |
diff --git a/include/linux/leds-regulator.h b/include/linux/leds-regulator.h index 5a8eb389aab8..e2337a8c90b0 100644 --- a/include/linux/leds-regulator.h +++ b/include/linux/leds-regulator.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * Use "vled" as supply id when declaring the regulator consumer: | 16 | * Use "vled" as supply id when declaring the regulator consumer: |
17 | * | 17 | * |
18 | * static struct regulator_consumer_supply pcap_regulator_VVIB_consumers [] = { | 18 | * static struct regulator_consumer_supply pcap_regulator_VVIB_consumers [] = { |
19 | * { .dev_name = "leds-regulator.0", supply = "vled" }, | 19 | * { .dev_name = "leds-regulator.0", .supply = "vled" }, |
20 | * }; | 20 | * }; |
21 | * | 21 | * |
22 | * If you have several regulator driven LEDs, you can append a numerical id to | 22 | * If you have several regulator driven LEDs, you can append a numerical id to |
diff --git a/include/linux/posix-clock.h b/include/linux/posix-clock.h index 7f1183dcd119..34c4498b800f 100644 --- a/include/linux/posix-clock.h +++ b/include/linux/posix-clock.h | |||
@@ -45,7 +45,7 @@ struct posix_clock; | |||
45 | * @timer_create: Create a new timer | 45 | * @timer_create: Create a new timer |
46 | * @timer_delete: Remove a previously created timer | 46 | * @timer_delete: Remove a previously created timer |
47 | * @timer_gettime: Get remaining time and interval of a timer | 47 | * @timer_gettime: Get remaining time and interval of a timer |
48 | * @timer_setttime: Set a timer's initial expiration and interval | 48 | * @timer_settime: Set a timer's initial expiration and interval |
49 | * @fasync: Optional character device fasync method | 49 | * @fasync: Optional character device fasync method |
50 | * @mmap: Optional character device mmap method | 50 | * @mmap: Optional character device mmap method |
51 | * @open: Optional character device open method | 51 | * @open: Optional character device open method |
diff --git a/include/net/genetlink.h b/include/net/genetlink.h index b4c7c1cbcf40..d420f28b6d60 100644 --- a/include/net/genetlink.h +++ b/include/net/genetlink.h | |||
@@ -260,7 +260,7 @@ static inline int genlmsg_reply(struct sk_buff *skb, struct genl_info *info) | |||
260 | 260 | ||
261 | /** | 261 | /** |
262 | * gennlmsg_data - head of message payload | 262 | * gennlmsg_data - head of message payload |
263 | * @gnlh: genetlink messsage header | 263 | * @gnlh: genetlink message header |
264 | */ | 264 | */ |
265 | static inline void *genlmsg_data(const struct genlmsghdr *gnlh) | 265 | static inline void *genlmsg_data(const struct genlmsghdr *gnlh) |
266 | { | 266 | { |
diff --git a/include/net/netlink.h b/include/net/netlink.h index 8a3906a08f5f..02740a94f108 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h | |||
@@ -290,7 +290,7 @@ static inline int nlmsg_padlen(int payload) | |||
290 | 290 | ||
291 | /** | 291 | /** |
292 | * nlmsg_data - head of message payload | 292 | * nlmsg_data - head of message payload |
293 | * @nlh: netlink messsage header | 293 | * @nlh: netlink message header |
294 | */ | 294 | */ |
295 | static inline void *nlmsg_data(const struct nlmsghdr *nlh) | 295 | static inline void *nlmsg_data(const struct nlmsghdr *nlh) |
296 | { | 296 | { |
diff --git a/include/video/newport.h b/include/video/newport.h index 3d7c4b492ec6..de980a3b60c9 100644 --- a/include/video/newport.h +++ b/include/video/newport.h | |||
@@ -3,7 +3,7 @@ | |||
3 | * newport.h: Defines and register layout for NEWPORT graphics | 3 | * newport.h: Defines and register layout for NEWPORT graphics |
4 | * hardware. | 4 | * hardware. |
5 | * | 5 | * |
6 | * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) | 6 | * Copyright (C) 1996 David S. Miller (davem@davemloft.net) |
7 | * | 7 | * |
8 | * Ulf Carlsson - Compatibility with the IRIX structures added | 8 | * Ulf Carlsson - Compatibility with the IRIX structures added |
9 | */ | 9 | */ |
diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks index 88c92fb44618..5068e2a4e75f 100644 --- a/kernel/Kconfig.locks +++ b/kernel/Kconfig.locks | |||
@@ -199,4 +199,4 @@ config INLINE_WRITE_UNLOCK_IRQRESTORE | |||
199 | def_bool !DEBUG_SPINLOCK && ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE | 199 | def_bool !DEBUG_SPINLOCK && ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE |
200 | 200 | ||
201 | config MUTEX_SPIN_ON_OWNER | 201 | config MUTEX_SPIN_ON_OWNER |
202 | def_bool SMP && !DEBUG_MUTEXES && !HAVE_DEFAULT_NO_SPIN_MUTEXES | 202 | def_bool SMP && !DEBUG_MUTEXES |
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index b33513a08beb..00d79df03e76 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -443,17 +443,25 @@ static int match_tree_refs(struct audit_context *ctx, struct audit_tree *tree) | |||
443 | 443 | ||
444 | /* Determine if any context name data matches a rule's watch data */ | 444 | /* Determine if any context name data matches a rule's watch data */ |
445 | /* Compare a task_struct with an audit_rule. Return 1 on match, 0 | 445 | /* Compare a task_struct with an audit_rule. Return 1 on match, 0 |
446 | * otherwise. */ | 446 | * otherwise. |
447 | * | ||
448 | * If task_creation is true, this is an explicit indication that we are | ||
449 | * filtering a task rule at task creation time. This and tsk == current are | ||
450 | * the only situations where tsk->cred may be accessed without an rcu read lock. | ||
451 | */ | ||
447 | static int audit_filter_rules(struct task_struct *tsk, | 452 | static int audit_filter_rules(struct task_struct *tsk, |
448 | struct audit_krule *rule, | 453 | struct audit_krule *rule, |
449 | struct audit_context *ctx, | 454 | struct audit_context *ctx, |
450 | struct audit_names *name, | 455 | struct audit_names *name, |
451 | enum audit_state *state) | 456 | enum audit_state *state, |
457 | bool task_creation) | ||
452 | { | 458 | { |
453 | const struct cred *cred = get_task_cred(tsk); | 459 | const struct cred *cred; |
454 | int i, j, need_sid = 1; | 460 | int i, j, need_sid = 1; |
455 | u32 sid; | 461 | u32 sid; |
456 | 462 | ||
463 | cred = rcu_dereference_check(tsk->cred, tsk == current || task_creation); | ||
464 | |||
457 | for (i = 0; i < rule->field_count; i++) { | 465 | for (i = 0; i < rule->field_count; i++) { |
458 | struct audit_field *f = &rule->fields[i]; | 466 | struct audit_field *f = &rule->fields[i]; |
459 | int result = 0; | 467 | int result = 0; |
@@ -637,10 +645,8 @@ static int audit_filter_rules(struct task_struct *tsk, | |||
637 | break; | 645 | break; |
638 | } | 646 | } |
639 | 647 | ||
640 | if (!result) { | 648 | if (!result) |
641 | put_cred(cred); | ||
642 | return 0; | 649 | return 0; |
643 | } | ||
644 | } | 650 | } |
645 | 651 | ||
646 | if (ctx) { | 652 | if (ctx) { |
@@ -656,7 +662,6 @@ static int audit_filter_rules(struct task_struct *tsk, | |||
656 | case AUDIT_NEVER: *state = AUDIT_DISABLED; break; | 662 | case AUDIT_NEVER: *state = AUDIT_DISABLED; break; |
657 | case AUDIT_ALWAYS: *state = AUDIT_RECORD_CONTEXT; break; | 663 | case AUDIT_ALWAYS: *state = AUDIT_RECORD_CONTEXT; break; |
658 | } | 664 | } |
659 | put_cred(cred); | ||
660 | return 1; | 665 | return 1; |
661 | } | 666 | } |
662 | 667 | ||
@@ -671,7 +676,8 @@ static enum audit_state audit_filter_task(struct task_struct *tsk, char **key) | |||
671 | 676 | ||
672 | rcu_read_lock(); | 677 | rcu_read_lock(); |
673 | list_for_each_entry_rcu(e, &audit_filter_list[AUDIT_FILTER_TASK], list) { | 678 | list_for_each_entry_rcu(e, &audit_filter_list[AUDIT_FILTER_TASK], list) { |
674 | if (audit_filter_rules(tsk, &e->rule, NULL, NULL, &state)) { | 679 | if (audit_filter_rules(tsk, &e->rule, NULL, NULL, |
680 | &state, true)) { | ||
675 | if (state == AUDIT_RECORD_CONTEXT) | 681 | if (state == AUDIT_RECORD_CONTEXT) |
676 | *key = kstrdup(e->rule.filterkey, GFP_ATOMIC); | 682 | *key = kstrdup(e->rule.filterkey, GFP_ATOMIC); |
677 | rcu_read_unlock(); | 683 | rcu_read_unlock(); |
@@ -705,7 +711,7 @@ static enum audit_state audit_filter_syscall(struct task_struct *tsk, | |||
705 | list_for_each_entry_rcu(e, list, list) { | 711 | list_for_each_entry_rcu(e, list, list) { |
706 | if ((e->rule.mask[word] & bit) == bit && | 712 | if ((e->rule.mask[word] & bit) == bit && |
707 | audit_filter_rules(tsk, &e->rule, ctx, NULL, | 713 | audit_filter_rules(tsk, &e->rule, ctx, NULL, |
708 | &state)) { | 714 | &state, false)) { |
709 | rcu_read_unlock(); | 715 | rcu_read_unlock(); |
710 | ctx->current_state = state; | 716 | ctx->current_state = state; |
711 | return state; | 717 | return state; |
@@ -743,7 +749,8 @@ void audit_filter_inodes(struct task_struct *tsk, struct audit_context *ctx) | |||
743 | 749 | ||
744 | list_for_each_entry_rcu(e, list, list) { | 750 | list_for_each_entry_rcu(e, list, list) { |
745 | if ((e->rule.mask[word] & bit) == bit && | 751 | if ((e->rule.mask[word] & bit) == bit && |
746 | audit_filter_rules(tsk, &e->rule, ctx, n, &state)) { | 752 | audit_filter_rules(tsk, &e->rule, ctx, n, |
753 | &state, false)) { | ||
747 | rcu_read_unlock(); | 754 | rcu_read_unlock(); |
748 | ctx->current_state = state; | 755 | ctx->current_state = state; |
749 | return; | 756 | return; |
diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c index 0da058bff8eb..beb184689af9 100644 --- a/kernel/pm_qos_params.c +++ b/kernel/pm_qos_params.c | |||
@@ -385,7 +385,7 @@ static ssize_t pm_qos_power_read(struct file *filp, char __user *buf, | |||
385 | s32 value; | 385 | s32 value; |
386 | unsigned long flags; | 386 | unsigned long flags; |
387 | struct pm_qos_object *o; | 387 | struct pm_qos_object *o; |
388 | struct pm_qos_request_list *pm_qos_req = filp->private_data;; | 388 | struct pm_qos_request_list *pm_qos_req = filp->private_data; |
389 | 389 | ||
390 | if (!pm_qos_req) | 390 | if (!pm_qos_req) |
391 | return -EINVAL; | 391 | return -EINVAL; |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 10ef61981149..0efcdca9751a 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -7,7 +7,8 @@ config PRINTK_TIME | |||
7 | included in printk output. This allows you to measure | 7 | included in printk output. This allows you to measure |
8 | the interval between kernel operations, including bootup | 8 | the interval between kernel operations, including bootup |
9 | operations. This is useful for identifying long delays | 9 | operations. This is useful for identifying long delays |
10 | in kernel startup. | 10 | in kernel startup. Or add printk.time=1 at boot-time. |
11 | See Documentation/kernel-parameters.txt | ||
11 | 12 | ||
12 | config DEFAULT_MESSAGE_LOGLEVEL | 13 | config DEFAULT_MESSAGE_LOGLEVEL |
13 | int "Default message log level (1-7)" | 14 | int "Default message log level (1-7)" |
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index dfd60192bc2e..1d659d7bb0f8 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
@@ -1161,8 +1161,7 @@ qualifier: | |||
1161 | * return is greater than or equal to @size, the resulting | 1161 | * return is greater than or equal to @size, the resulting |
1162 | * string is truncated. | 1162 | * string is truncated. |
1163 | * | 1163 | * |
1164 | * Call this function if you are already dealing with a va_list. | 1164 | * If you're not already dealing with a va_list consider using snprintf(). |
1165 | * You probably want snprintf() instead. | ||
1166 | */ | 1165 | */ |
1167 | int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) | 1166 | int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) |
1168 | { | 1167 | { |
@@ -1336,8 +1335,7 @@ EXPORT_SYMBOL(vsnprintf); | |||
1336 | * the @buf not including the trailing '\0'. If @size is == 0 the function | 1335 | * the @buf not including the trailing '\0'. If @size is == 0 the function |
1337 | * returns 0. | 1336 | * returns 0. |
1338 | * | 1337 | * |
1339 | * Call this function if you are already dealing with a va_list. | 1338 | * If you're not already dealing with a va_list consider using scnprintf(). |
1340 | * You probably want scnprintf() instead. | ||
1341 | * | 1339 | * |
1342 | * See the vsnprintf() documentation for format string extensions over C99. | 1340 | * See the vsnprintf() documentation for format string extensions over C99. |
1343 | */ | 1341 | */ |
@@ -1416,8 +1414,7 @@ EXPORT_SYMBOL(scnprintf); | |||
1416 | * into @buf. Use vsnprintf() or vscnprintf() in order to avoid | 1414 | * into @buf. Use vsnprintf() or vscnprintf() in order to avoid |
1417 | * buffer overflows. | 1415 | * buffer overflows. |
1418 | * | 1416 | * |
1419 | * Call this function if you are already dealing with a va_list. | 1417 | * If you're not already dealing with a va_list consider using sprintf(). |
1420 | * You probably want sprintf() instead. | ||
1421 | * | 1418 | * |
1422 | * See the vsnprintf() documentation for format string extensions over C99. | 1419 | * See the vsnprintf() documentation for format string extensions over C99. |
1423 | */ | 1420 | */ |
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 8ee3bd8ec5b5..bbb4a5bbb958 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -475,7 +475,7 @@ static struct page *dequeue_huge_page_vma(struct hstate *h, | |||
475 | 475 | ||
476 | /* If reserves cannot be used, ensure enough pages are in the pool */ | 476 | /* If reserves cannot be used, ensure enough pages are in the pool */ |
477 | if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0) | 477 | if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0) |
478 | goto err;; | 478 | goto err; |
479 | 479 | ||
480 | for_each_zone_zonelist_nodemask(zone, z, zonelist, | 480 | for_each_zone_zonelist_nodemask(zone, z, zonelist, |
481 | MAX_NR_ZONES - 1, nodemask) { | 481 | MAX_NR_ZONES - 1, nodemask) { |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d49df7840541..9d5498e2d0f5 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -3541,7 +3541,7 @@ static void setup_pagelist_highmark(struct per_cpu_pageset *p, | |||
3541 | pcp->batch = PAGE_SHIFT * 8; | 3541 | pcp->batch = PAGE_SHIFT * 8; |
3542 | } | 3542 | } |
3543 | 3543 | ||
3544 | static __meminit void setup_zone_pageset(struct zone *zone) | 3544 | static void setup_zone_pageset(struct zone *zone) |
3545 | { | 3545 | { |
3546 | int cpu; | 3546 | int cpu; |
3547 | 3547 | ||
diff --git a/net/netfilter/ipset/ip_set_bitmap_ip.c b/net/netfilter/ipset/ip_set_bitmap_ip.c index a113ff066928..ba2d16607f48 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ip.c +++ b/net/netfilter/ipset/ip_set_bitmap_ip.c | |||
@@ -293,7 +293,7 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *tb[], | |||
293 | 293 | ||
294 | for (; !before(ip_to, ip); ip += map->hosts) { | 294 | for (; !before(ip_to, ip); ip += map->hosts) { |
295 | id = ip_to_id(map, ip); | 295 | id = ip_to_id(map, ip); |
296 | ret = adtfn(set, &id, timeout);; | 296 | ret = adtfn(set, &id, timeout); |
297 | 297 | ||
298 | if (ret && !ip_set_eexist(ret, flags)) | 298 | if (ret && !ip_set_eexist(ret, flags)) |
299 | return ret; | 299 | return ret; |
diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c index 1419d0cdbbac..4195233c4914 100644 --- a/net/sunrpc/addr.c +++ b/net/sunrpc/addr.c | |||
@@ -151,7 +151,7 @@ static size_t rpc_pton4(const char *buf, const size_t buflen, | |||
151 | return 0; | 151 | return 0; |
152 | 152 | ||
153 | sin->sin_family = AF_INET; | 153 | sin->sin_family = AF_INET; |
154 | return sizeof(struct sockaddr_in);; | 154 | return sizeof(struct sockaddr_in); |
155 | } | 155 | } |
156 | 156 | ||
157 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 157 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index 1a10dcd999ea..6c014dd3a20b 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c | |||
@@ -333,7 +333,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt) | |||
333 | } | 333 | } |
334 | 334 | ||
335 | /* | 335 | /* |
336 | * Processs a completion context | 336 | * Process a completion context |
337 | */ | 337 | */ |
338 | static void process_context(struct svcxprt_rdma *xprt, | 338 | static void process_context(struct svcxprt_rdma *xprt, |
339 | struct svc_rdma_op_ctxt *ctxt) | 339 | struct svc_rdma_op_ctxt *ctxt) |
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl index 1afff6658a7d..17e384396705 100755 --- a/scripts/checkstack.pl +++ b/scripts/checkstack.pl | |||
@@ -12,7 +12,7 @@ | |||
12 | # sh64 port by Paul Mundt | 12 | # sh64 port by Paul Mundt |
13 | # Random bits by Matt Mackall <mpm@selenic.com> | 13 | # Random bits by Matt Mackall <mpm@selenic.com> |
14 | # M68k port by Geert Uytterhoeven and Andreas Schwab | 14 | # M68k port by Geert Uytterhoeven and Andreas Schwab |
15 | # AVR32 port by Haavard Skinnemoen <hskinnemoen@atmel.com> | 15 | # AVR32 port by Haavard Skinnemoen (Atmel) |
16 | # PARISC port by Kyle McMartin <kyle@parisc-linux.org> | 16 | # PARISC port by Kyle McMartin <kyle@parisc-linux.org> |
17 | # sparc port by Martin Habets <errandir_news@mph.eclipse.co.uk> | 17 | # sparc port by Martin Habets <errandir_news@mph.eclipse.co.uk> |
18 | # | 18 | # |
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index c0e1a0f52462..2d3373b2e256 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
@@ -280,7 +280,7 @@ static ssize_t sel_write_disable(struct file *file, const char __user *buf, | |||
280 | 280 | ||
281 | length = -ENOMEM; | 281 | length = -ENOMEM; |
282 | if (count >= PAGE_SIZE) | 282 | if (count >= PAGE_SIZE) |
283 | goto out;; | 283 | goto out; |
284 | 284 | ||
285 | /* No partial writes. */ | 285 | /* No partial writes. */ |
286 | length = -EINVAL; | 286 | length = -EINVAL; |
@@ -876,12 +876,12 @@ static ssize_t sel_write_user(struct file *file, char *buf, size_t size) | |||
876 | 876 | ||
877 | length = task_has_security(current, SECURITY__COMPUTE_USER); | 877 | length = task_has_security(current, SECURITY__COMPUTE_USER); |
878 | if (length) | 878 | if (length) |
879 | goto out;; | 879 | goto out; |
880 | 880 | ||
881 | length = -ENOMEM; | 881 | length = -ENOMEM; |
882 | con = kzalloc(size + 1, GFP_KERNEL); | 882 | con = kzalloc(size + 1, GFP_KERNEL); |
883 | if (!con) | 883 | if (!con) |
884 | goto out;; | 884 | goto out; |
885 | 885 | ||
886 | length = -ENOMEM; | 886 | length = -ENOMEM; |
887 | user = kzalloc(size + 1, GFP_KERNEL); | 887 | user = kzalloc(size + 1, GFP_KERNEL); |
@@ -941,7 +941,7 @@ static ssize_t sel_write_member(struct file *file, char *buf, size_t size) | |||
941 | length = -ENOMEM; | 941 | length = -ENOMEM; |
942 | scon = kzalloc(size + 1, GFP_KERNEL); | 942 | scon = kzalloc(size + 1, GFP_KERNEL); |
943 | if (!scon) | 943 | if (!scon) |
944 | goto out;; | 944 | goto out; |
945 | 945 | ||
946 | length = -ENOMEM; | 946 | length = -ENOMEM; |
947 | tcon = kzalloc(size + 1, GFP_KERNEL); | 947 | tcon = kzalloc(size + 1, GFP_KERNEL); |
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c index 15633d608133..0229723aceb3 100644 --- a/tools/perf/util/ui/browsers/annotate.c +++ b/tools/perf/util/ui/browsers/annotate.c | |||
@@ -5,7 +5,6 @@ | |||
5 | #include "../../hist.h" | 5 | #include "../../hist.h" |
6 | #include "../../sort.h" | 6 | #include "../../sort.h" |
7 | #include "../../symbol.h" | 7 | #include "../../symbol.h" |
8 | #include "../../annotate.h" | ||
9 | #include <pthread.h> | 8 | #include <pthread.h> |
10 | 9 | ||
11 | static void ui__error_window(const char *fmt, ...) | 10 | static void ui__error_window(const char *fmt, ...) |
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 362a0cb448db..6d8ef4a3a9b5 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c | |||
@@ -990,7 +990,7 @@ int fork_it(char **argv) | |||
990 | if (!retval) | 990 | if (!retval) |
991 | print_counters(cnt_delta); | 991 | print_counters(cnt_delta); |
992 | 992 | ||
993 | fprintf(stderr, "%.6f sec\n", tv_delta.tv_sec + tv_delta.tv_usec/1000000.0);; | 993 | fprintf(stderr, "%.6f sec\n", tv_delta.tv_sec + tv_delta.tv_usec/1000000.0); |
994 | 994 | ||
995 | return 0; | 995 | return 0; |
996 | } | 996 | } |