aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/DocBook/media/dvb/dvbproperty.xml6
-rw-r--r--Documentation/cgroups/memory.txt2
-rw-r--r--Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt2
-rw-r--r--Documentation/devicetree/bindings/leds/tca6507.txt2
-rw-r--r--Documentation/devicetree/bindings/metag/meta-intc.txt2
-rw-r--r--Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt2
-rw-r--r--Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt2
-rw-r--r--Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt2
-rw-r--r--Documentation/devicetree/bindings/regulator/max8997-regulator.txt2
-rw-r--r--Documentation/devicetree/bindings/usb/samsung-usbphy.txt2
-rw-r--r--Documentation/iostats.txt2
-rw-r--r--Documentation/kernel-parameters.txt4
-rw-r--r--Documentation/trace/tracepoints.txt15
-rw-r--r--Documentation/virtual/virtio-spec.txt6
-rw-r--r--arch/arc/kernel/disasm.c2
-rw-r--r--arch/arc/plat-arcfpga/Kconfig2
-rw-r--r--arch/arm/kernel/topology.c2
-rw-r--r--arch/arm/kvm/arm.c2
-rw-r--r--arch/arm/mach-mvebu/irq-armada-370-xp.c2
-rw-r--r--arch/arm/mach-omap2/pm44xx.c4
-rw-r--r--arch/blackfin/include/asm/bfin_sport3.h2
-rw-r--r--arch/m32r/kernel/traps.c6
-rw-r--r--arch/powerpc/kernel/nvram_64.c3
-rw-r--r--arch/powerpc/kvm/book3s_pr.c2
-rw-r--r--arch/s390/kernel/irq.c2
-rw-r--r--arch/s390/kvm/trace.h2
-rw-r--r--arch/x86/include/asm/cmpxchg.h2
-rw-r--r--drivers/ata/pata_pdc2027x.c2
-rw-r--r--drivers/ata/sata_fsl.c2
-rw-r--r--drivers/clk/mvebu/clk-core.c4
-rw-r--r--drivers/crypto/caam/ctrl.c2
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c2
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_irq_kms.c2
-rw-r--r--drivers/i2c/busses/i2c-puv3.c2
-rw-r--r--drivers/irqchip/irq-versatile-fpga.c2
-rw-r--r--drivers/isdn/i4l/isdn_tty.c1
-rw-r--r--drivers/media/pci/saa7164/saa7164-core.c2
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c2
-rw-r--r--drivers/media/radio/radio-shark.c2
-rw-r--r--drivers/media/radio/radio-shark2.c2
-rw-r--r--drivers/media/usb/dvb-usb/opera1.c2
-rw-r--r--drivers/misc/mei/amthif.c6
-rw-r--r--drivers/misc/mei/client.c24
-rw-r--r--drivers/misc/mei/hbm.c9
-rw-r--r--drivers/misc/mei/hw-me.c8
-rw-r--r--drivers/misc/mei/interrupt.c4
-rw-r--r--drivers/misc/mei/pci-me.c1
-rw-r--r--drivers/misc/mei/wd.c1
-rw-r--r--drivers/net/ethernet/atheros/atl1c/atl1c_hw.c2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c4
-rw-r--r--drivers/net/ethernet/sfc/Kconfig2
-rw-r--r--drivers/net/ethernet/ti/cpts.c2
-rw-r--r--drivers/power/pm2301_charger.c2
-rw-r--r--drivers/remoteproc/remoteproc_core.c2
-rw-r--r--drivers/rtc/Kconfig4
-rw-r--r--drivers/rtc/rtc-max8997.c2
-rw-r--r--drivers/scsi/be2iscsi/be_iscsi.c2
-rw-r--r--drivers/scsi/be2iscsi/be_mgmt.c2
-rw-r--r--drivers/scsi/bnx2i/bnx2i.h12
-rw-r--r--drivers/scsi/csiostor/csio_mb.c12
-rw-r--r--drivers/scsi/lpfc/lpfc_bsg.c2
-rw-r--r--drivers/scsi/mpt3sas/mpt3sas_config.c2
-rw-r--r--drivers/scsi/osd/osd_initiator.c2
-rw-r--r--drivers/scsi/qla4xxx/ql4_nx.c2
-rw-r--r--drivers/usb/misc/iowarrior.c4
-rw-r--r--drivers/usb/misc/uss720.c2
-rw-r--r--drivers/video/amifb.c2
-rw-r--r--drivers/video/auo_k190x.c2
-rw-r--r--drivers/video/exynos/exynos_dp_core.c4
-rw-r--r--drivers/video/goldfishfb.c2
-rw-r--r--drivers/video/s1d13xxxfb.c2
-rw-r--r--drivers/video/ssd1307fb.c4
-rw-r--r--fs/befs/btree.c3
-rw-r--r--fs/f2fs/f2fs.h2
-rw-r--r--fs/f2fs/gc.c2
-rw-r--r--fs/f2fs/super.c2
-rw-r--r--fs/gfs2/glock.c4
-rw-r--r--fs/gfs2/trans.c3
-rw-r--r--fs/nfs/objlayout/objio_osd.c2
-rw-r--r--fs/nfs/objlayout/objlayout.h2
-rw-r--r--fs/ufs/util.c3
-rw-r--r--include/linux/evm.h2
-rw-r--r--include/linux/iio/gyro/itg3200.h2
-rw-r--r--include/linux/ima.h4
-rw-r--r--include/linux/integrity.h2
-rw-r--r--include/linux/mmzone.h2
-rw-r--r--include/net/sctp/sctp.h2
-rw-r--r--include/sound/pcm.h2
-rw-r--r--include/trace/events/timer.h10
-rw-r--r--mm/hugetlb.c4
-rw-r--r--mm/memory.c8
-rw-r--r--mm/slab.c8
-rw-r--r--net/sctp/protocol.c2
-rw-r--r--sound/pci/mixart/mixart.c2
-rw-r--r--sound/soc/codecs/wm8974.c2
-rw-r--r--sound/soc/ux500/Kconfig4
-rw-r--r--tools/perf/tests/attr.c2
-rw-r--r--tools/perf/tests/parse-events.c2
-rw-r--r--tools/power/cpupower/debug/i386/intel_gsic.c2
100 files changed, 157 insertions, 174 deletions
diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml
index 4a5eaeed0b9e..31dc4dfd1d6a 100644
--- a/Documentation/DocBook/media/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/media/dvb/dvbproperty.xml
@@ -1,6 +1,6 @@
1<section id="FE_GET_SET_PROPERTY"> 1<section id="FE_GET_SET_PROPERTY">
2<title><constant>FE_GET_PROPERTY/FE_SET_PROPERTY</constant></title> 2<title><constant>FE_GET_PROPERTY/FE_SET_PROPERTY</constant></title>
3<para>This section describes the DVB version 5 extention of the DVB-API, also 3<para>This section describes the DVB version 5 extension of the DVB-API, also
4called "S2API", as this API were added to provide support for DVB-S2. It was 4called "S2API", as this API were added to provide support for DVB-S2. It was
5designed to be able to replace the old frontend API. Yet, the DISEQC and 5designed to be able to replace the old frontend API. Yet, the DISEQC and
6the capability ioctls weren't implemented yet via the new way.</para> 6the capability ioctls weren't implemented yet via the new way.</para>
@@ -952,7 +952,7 @@ enum fe_interleaving {
952 <para>Measures the amount of bits received before the inner code block, during the same period as 952 <para>Measures the amount of bits received before the inner code block, during the same period as
953 <link linkend="DTV-STAT-PRE-ERROR-BIT-COUNT"><constant>DTV_STAT_PRE_ERROR_BIT_COUNT</constant></link> measurement was taken.</para> 953 <link linkend="DTV-STAT-PRE-ERROR-BIT-COUNT"><constant>DTV_STAT_PRE_ERROR_BIT_COUNT</constant></link> measurement was taken.</para>
954 <para>It should be noticed that this measurement can be smaller than the total amount of bits on the transport stream, 954 <para>It should be noticed that this measurement can be smaller than the total amount of bits on the transport stream,
955 as the frontend may need to manually restart the measurement, loosing some data between each measurement interval.</para> 955 as the frontend may need to manually restart the measurement, losing some data between each measurement interval.</para>
956 <para>This measurement is monotonically increased, as the frontend gets more bit count measurements. 956 <para>This measurement is monotonically increased, as the frontend gets more bit count measurements.
957 The frontend may reset it when a channel/transponder is tuned.</para> 957 The frontend may reset it when a channel/transponder is tuned.</para>
958 <para>Possible scales for this metric are:</para> 958 <para>Possible scales for this metric are:</para>
@@ -981,7 +981,7 @@ enum fe_interleaving {
981 <para>Measures the amount of bits received after the inner coding, during the same period as 981 <para>Measures the amount of bits received after the inner coding, during the same period as
982 <link linkend="DTV-STAT-POST-ERROR-BIT-COUNT"><constant>DTV_STAT_POST_ERROR_BIT_COUNT</constant></link> measurement was taken.</para> 982 <link linkend="DTV-STAT-POST-ERROR-BIT-COUNT"><constant>DTV_STAT_POST_ERROR_BIT_COUNT</constant></link> measurement was taken.</para>
983 <para>It should be noticed that this measurement can be smaller than the total amount of bits on the transport stream, 983 <para>It should be noticed that this measurement can be smaller than the total amount of bits on the transport stream,
984 as the frontend may need to manually restart the measurement, loosing some data between each measurement interval.</para> 984 as the frontend may need to manually restart the measurement, losing some data between each measurement interval.</para>
985 <para>This measurement is monotonically increased, as the frontend gets more bit count measurements. 985 <para>This measurement is monotonically increased, as the frontend gets more bit count measurements.
986 The frontend may reset it when a channel/transponder is tuned.</para> 986 The frontend may reset it when a channel/transponder is tuned.</para>
987 <para>Possible scales for this metric are:</para> 987 <para>Possible scales for this metric are:</para>
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index f336ede58e62..09027a9fece5 100644
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
@@ -196,7 +196,7 @@ the cgroup that brought it in -- this will happen on memory pressure).
196But see section 8.2: when moving a task to another cgroup, its pages may 196But see section 8.2: when moving a task to another cgroup, its pages may
197be recharged to the new cgroup, if move_charge_at_immigrate has been chosen. 197be recharged to the new cgroup, if move_charge_at_immigrate has been chosen.
198 198
199Exception: If CONFIG_CGROUP_CGROUP_MEMCG_SWAP is not used. 199Exception: If CONFIG_MEMCG_SWAP is not used.
200When you do swapoff and make swapped-out pages of shmem(tmpfs) to 200When you do swapoff and make swapped-out pages of shmem(tmpfs) to
201be backed into memory in force, charges for pages are accounted against the 201be backed into memory in force, charges for pages are accounted against the
202caller of swapoff rather than the users of shmem. 202caller of swapoff rather than the users of shmem.
diff --git a/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt b/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt
index f98d4c5b5cca..296eb4536129 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt
@@ -26,7 +26,7 @@ Required for all cases except "samsung,s3c2440-hdmiphy-i2c":
26 - pinctrl-names: Should contain only one value - "default". 26 - pinctrl-names: Should contain only one value - "default".
27 27
28Optional properties: 28Optional properties:
29 - samsung,i2c-slave-addr: Slave address in multi-master enviroment. If not 29 - samsung,i2c-slave-addr: Slave address in multi-master environment. If not
30 specified, default value is 0. 30 specified, default value is 0.
31 - samsung,i2c-max-bus-freq: Desired frequency in Hz of the bus. If not 31 - samsung,i2c-max-bus-freq: Desired frequency in Hz of the bus. If not
32 specified, the default value in Hz is 100000. 32 specified, the default value in Hz is 100000.
diff --git a/Documentation/devicetree/bindings/leds/tca6507.txt b/Documentation/devicetree/bindings/leds/tca6507.txt
index 2b6693b972fb..80ff3dfb1f32 100644
--- a/Documentation/devicetree/bindings/leds/tca6507.txt
+++ b/Documentation/devicetree/bindings/leds/tca6507.txt
@@ -1,4 +1,4 @@
1LEDs conected to tca6507 1LEDs connected to tca6507
2 2
3Required properties: 3Required properties:
4- compatible : should be : "ti,tca6507". 4- compatible : should be : "ti,tca6507".
diff --git a/Documentation/devicetree/bindings/metag/meta-intc.txt b/Documentation/devicetree/bindings/metag/meta-intc.txt
index 8c47dcbfabc6..80994adab392 100644
--- a/Documentation/devicetree/bindings/metag/meta-intc.txt
+++ b/Documentation/devicetree/bindings/metag/meta-intc.txt
@@ -12,7 +12,7 @@ Required properties:
12 handle 32 interrupt sources). 12 handle 32 interrupt sources).
13 13
14 - interrupt-controller: The presence of this property identifies the node 14 - interrupt-controller: The presence of this property identifies the node
15 as an interupt controller. No property value shall be defined. 15 as an interrupt controller. No property value shall be defined.
16 16
17 - #interrupt-cells: Specifies the number of cells needed to encode an 17 - #interrupt-cells: Specifies the number of cells needed to encode an
18 interrupt source. The type shall be a <u32> and the value shall be 2. 18 interrupt source. The type shall be a <u32> and the value shall be 2.
diff --git a/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
index bc50899e0c81..648d60eb9fd8 100644
--- a/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
@@ -1,6 +1,6 @@
1* Atmel AT91 Pinmux Controller 1* Atmel AT91 Pinmux Controller
2 2
3The AT91 Pinmux Controler, enables the IC 3The AT91 Pinmux Controller, enables the IC
4to share one PAD to several functional blocks. The sharing is done by 4to share one PAD to several functional blocks. The sharing is done by
5multiplexing the PAD input/output signals. For each PAD there are up to 5multiplexing the PAD input/output signals. For each PAD there are up to
68 muxing options (called periph modes). Since different modules require 68 muxing options (called periph modes). Since different modules require
diff --git a/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt b/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt
index 8edc20e1b09e..2569866c692f 100644
--- a/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt
+++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt
@@ -5,7 +5,7 @@ controller, and pinmux/control device.
5 5
6Required properties: 6Required properties:
7- compatible: "brcm,bcm2835-gpio" 7- compatible: "brcm,bcm2835-gpio"
8- reg: Should contain the physical address of the GPIO module's registes. 8- reg: Should contain the physical address of the GPIO module's registers.
9- gpio-controller: Marks the device node as a GPIO controller. 9- gpio-controller: Marks the device node as a GPIO controller.
10- #gpio-cells : Should be two. The first cell is the pin number and the 10- #gpio-cells : Should be two. The first cell is the pin number and the
11 second cell is used to specify optional parameters: 11 second cell is used to specify optional parameters:
diff --git a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
index 9a599d27bd75..0347d8350d94 100644
--- a/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
+++ b/Documentation/devicetree/bindings/power_supply/qnap-poweroff.txt
@@ -2,7 +2,7 @@
2 2
3QNAP NAS devices have a microcontroller controlling the main power 3QNAP NAS devices have a microcontroller controlling the main power
4supply. This microcontroller is connected to UART1 of the Kirkwood and 4supply. This microcontroller is connected to UART1 of the Kirkwood and
5Orion5x SoCs. Sending the charactor 'A', at 19200 baud, tells the 5Orion5x SoCs. Sending the character 'A', at 19200 baud, tells the
6microcontroller to turn the power off. This driver adds a handler to 6microcontroller to turn the power off. This driver adds a handler to
7pm_power_off which is called to turn the power off. 7pm_power_off which is called to turn the power off.
8 8
diff --git a/Documentation/devicetree/bindings/regulator/max8997-regulator.txt b/Documentation/devicetree/bindings/regulator/max8997-regulator.txt
index 9fd69a18b0ba..9e5e51d78868 100644
--- a/Documentation/devicetree/bindings/regulator/max8997-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/max8997-regulator.txt
@@ -28,7 +28,7 @@ Required properties:
28 safe operating voltage). 28 safe operating voltage).
29 29
30 If either of the 'max8997,pmic-buck[1/2/5]-uses-gpio-dvs' optional 30 If either of the 'max8997,pmic-buck[1/2/5]-uses-gpio-dvs' optional
31 property is specified, then all the eigth voltage values for the 31 property is specified, then all the eight voltage values for the
32 'max8997,pmic-buck[1/2/5]-dvs-voltage' should be specified. 32 'max8997,pmic-buck[1/2/5]-dvs-voltage' should be specified.
33 33
34Optional properties: 34Optional properties:
diff --git a/Documentation/devicetree/bindings/usb/samsung-usbphy.txt b/Documentation/devicetree/bindings/usb/samsung-usbphy.txt
index f575302e5173..33fd3543f3f8 100644
--- a/Documentation/devicetree/bindings/usb/samsung-usbphy.txt
+++ b/Documentation/devicetree/bindings/usb/samsung-usbphy.txt
@@ -6,7 +6,7 @@ The Samsung's usb 2.0 phy transceiver is used for controlling
6usb 2.0 phy for s3c-hsotg as well as ehci-s5p and ohci-exynos 6usb 2.0 phy for s3c-hsotg as well as ehci-s5p and ohci-exynos
7usb controllers across Samsung SOCs. 7usb controllers across Samsung SOCs.
8TODO: Adding the PHY binding with controller(s) according to the under 8TODO: Adding the PHY binding with controller(s) according to the under
9developement generic PHY driver. 9development generic PHY driver.
10 10
11Required properties: 11Required properties:
12 12
diff --git a/Documentation/iostats.txt b/Documentation/iostats.txt
index c76c21d87e85..65f694f2d1c9 100644
--- a/Documentation/iostats.txt
+++ b/Documentation/iostats.txt
@@ -71,6 +71,8 @@ Field 4 -- # of milliseconds spent reading
71 measured from __make_request() to end_that_request_last()). 71 measured from __make_request() to end_that_request_last()).
72Field 5 -- # of writes completed 72Field 5 -- # of writes completed
73 This is the total number of writes completed successfully. 73 This is the total number of writes completed successfully.
74Field 6 -- # of writes merged
75 See the description of field 2.
74Field 7 -- # of sectors written 76Field 7 -- # of sectors written
75 This is the total number of sectors written successfully. 77 This is the total number of sectors written successfully.
76Field 8 -- # of milliseconds spent writing 78Field 8 -- # of milliseconds spent writing
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b801a332fb6f..8c01a0218a1e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1675,7 +1675,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
1675 module.sig_enforce 1675 module.sig_enforce
1676 [KNL] When CONFIG_MODULE_SIG is set, this means that 1676 [KNL] When CONFIG_MODULE_SIG is set, this means that
1677 modules without (valid) signatures will fail to load. 1677 modules without (valid) signatures will fail to load.
1678 Note that if CONFIG_MODULE_SIG_ENFORCE is set, that 1678 Note that if CONFIG_MODULE_SIG_FORCE is set, that
1679 is always true, so this option does nothing. 1679 is always true, so this option does nothing.
1680 1680
1681 mousedev.tap_time= 1681 mousedev.tap_time=
@@ -2024,8 +2024,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
2024 noreplace-smp [X86-32,SMP] Don't replace SMP instructions 2024 noreplace-smp [X86-32,SMP] Don't replace SMP instructions
2025 with UP alternatives 2025 with UP alternatives
2026 2026
2027 noresidual [PPC] Don't use residual data on PReP machines.
2028
2029 nordrand [X86] Disable the direct use of the RDRAND 2027 nordrand [X86] Disable the direct use of the RDRAND
2030 instruction even if it is supported by the 2028 instruction even if it is supported by the
2031 processor. RDRAND is still available to user 2029 processor. RDRAND is still available to user
diff --git a/Documentation/trace/tracepoints.txt b/Documentation/trace/tracepoints.txt
index c0e1ceed75a4..da49437d5aeb 100644
--- a/Documentation/trace/tracepoints.txt
+++ b/Documentation/trace/tracepoints.txt
@@ -81,7 +81,6 @@ tracepoint_synchronize_unregister() must be called before the end of
81the module exit function to make sure there is no caller left using 81the module exit function to make sure there is no caller left using
82the probe. This, and the fact that preemption is disabled around the 82the probe. This, and the fact that preemption is disabled around the
83probe call, make sure that probe removal and module unload are safe. 83probe call, make sure that probe removal and module unload are safe.
84See the "Probe example" section below for a sample probe module.
85 84
86The tracepoint mechanism supports inserting multiple instances of the 85The tracepoint mechanism supports inserting multiple instances of the
87same tracepoint, but a single definition must be made of a given 86same tracepoint, but a single definition must be made of a given
@@ -100,17 +99,3 @@ core kernel image or in modules.
100If the tracepoint has to be used in kernel modules, an 99If the tracepoint has to be used in kernel modules, an
101EXPORT_TRACEPOINT_SYMBOL_GPL() or EXPORT_TRACEPOINT_SYMBOL() can be 100EXPORT_TRACEPOINT_SYMBOL_GPL() or EXPORT_TRACEPOINT_SYMBOL() can be
102used to export the defined tracepoints. 101used to export the defined tracepoints.
103
104* Probe / tracepoint example
105
106See the example provided in samples/tracepoints
107
108Compile them with your kernel. They are built during 'make' (not
109'make modules') when CONFIG_SAMPLE_TRACEPOINTS=m.
110
111Run, as root :
112modprobe tracepoint-sample (insmod order is not important)
113modprobe tracepoint-probe-sample
114cat /proc/tracepoint-sample (returns an expected error)
115rmmod tracepoint-sample tracepoint-probe-sample
116dmesg
diff --git a/Documentation/virtual/virtio-spec.txt b/Documentation/virtual/virtio-spec.txt
index 0d6ec85481cb..eb094039b50d 100644
--- a/Documentation/virtual/virtio-spec.txt
+++ b/Documentation/virtual/virtio-spec.txt
@@ -1389,7 +1389,7 @@ segmentation, if both guests are amenable.
1389 1389
1390Packets are transmitted by placing them in the transmitq, and 1390Packets are transmitted by placing them in the transmitq, and
1391buffers for incoming packets are placed in the receiveq. In each 1391buffers for incoming packets are placed in the receiveq. In each
1392case, the packet itself is preceeded by a header: 1392case, the packet itself is preceded by a header:
1393 1393
1394struct virtio_net_hdr { 1394struct virtio_net_hdr {
1395 1395
@@ -1631,7 +1631,7 @@ struct virtio_net_ctrl_mac {
1631 1631
1632The device can filter incoming packets by any number of 1632The device can filter incoming packets by any number of
1633destination MAC addresses.[footnote: 1633destination MAC addresses.[footnote:
1634Since there are no guarentees, it can use a hash filter 1634Since there are no guarantees, it can use a hash filter
1635orsilently switch to allmulti or promiscuous mode if it is given 1635orsilently switch to allmulti or promiscuous mode if it is given
1636too many addresses. 1636too many addresses.
1637] This table is set using the class VIRTIO_NET_CTRL_MAC and the 1637] This table is set using the class VIRTIO_NET_CTRL_MAC and the
@@ -1822,7 +1822,7 @@ the FLUSH and FLUSH_OUT types are equivalent, the device does not
1822distinguish between them 1822distinguish between them
1823]). If the device has VIRTIO_BLK_F_BARRIER feature the high bit 1823]). If the device has VIRTIO_BLK_F_BARRIER feature the high bit
1824(VIRTIO_BLK_T_BARRIER) indicates that this request acts as a 1824(VIRTIO_BLK_T_BARRIER) indicates that this request acts as a
1825barrier and that all preceeding requests must be complete before 1825barrier and that all preceding requests must be complete before
1826this one, and all following requests must not be started until 1826this one, and all following requests must not be started until
1827this is complete. Note that a barrier does not flush caches in 1827this is complete. Note that a barrier does not flush caches in
1828the underlying backend device in host, and thus does not serve as 1828the underlying backend device in host, and thus does not serve as
diff --git a/arch/arc/kernel/disasm.c b/arch/arc/kernel/disasm.c
index 2f390289a792..d14764ae2c60 100644
--- a/arch/arc/kernel/disasm.c
+++ b/arch/arc/kernel/disasm.c
@@ -535,4 +535,4 @@ int __kprobes disasm_next_pc(unsigned long pc, struct pt_regs *regs,
535 return instr.is_branch; 535 return instr.is_branch;
536} 536}
537 537
538#endif /* CONFIG_KGDB || CONFIG_MISALIGN_ACCESS || CONFIG_KPROBES */ 538#endif /* CONFIG_KGDB || CONFIG_ARC_MISALIGN_ACCESS || CONFIG_KPROBES */
diff --git a/arch/arc/plat-arcfpga/Kconfig b/arch/arc/plat-arcfpga/Kconfig
index b41e786cdbc0..295cefeb25d3 100644
--- a/arch/arc/plat-arcfpga/Kconfig
+++ b/arch/arc/plat-arcfpga/Kconfig
@@ -53,7 +53,7 @@ menuconfig ARC_HAS_BVCI_LAT_UNIT
53 bool "BVCI Bus Latency Unit" 53 bool "BVCI Bus Latency Unit"
54 depends on ARC_BOARD_ML509 || ARC_BOARD_ANGEL4 54 depends on ARC_BOARD_ML509 || ARC_BOARD_ANGEL4
55 help 55 help
56 IP to add artifical latency to BVCI Bus Based FPGA builds. 56 IP to add artificial latency to BVCI Bus Based FPGA builds.
57 The default latency (even worst case) for FPGA is non-realistic 57 The default latency (even worst case) for FPGA is non-realistic
58 (~10 SDRAM, ~5 SSRAM). 58 (~10 SDRAM, ~5 SSRAM).
59 59
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index 79282ebcd939..f10316b4ecdc 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -100,7 +100,7 @@ static void __init parse_dt_topology(void)
100 int alloc_size, cpu = 0; 100 int alloc_size, cpu = 0;
101 101
102 alloc_size = nr_cpu_ids * sizeof(struct cpu_capacity); 102 alloc_size = nr_cpu_ids * sizeof(struct cpu_capacity);
103 cpu_capacity = (struct cpu_capacity *)kzalloc(alloc_size, GFP_NOWAIT); 103 cpu_capacity = kzalloc(alloc_size, GFP_NOWAIT);
104 104
105 while ((cn = of_find_node_by_type(cn, "cpu"))) { 105 while ((cn = of_find_node_by_type(cn, "cpu"))) {
106 const u32 *rate, *reg; 106 const u32 *rate, *reg;
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index c1fe498983ac..842098d78f58 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -614,7 +614,7 @@ static int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,
614 614
615 if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers) 615 if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers)
616 || !arm_exit_handlers[hsr_ec]) { 616 || !arm_exit_handlers[hsr_ec]) {
617 kvm_err("Unkown exception class: %#08lx, " 617 kvm_err("Unknown exception class: %#08lx, "
618 "hsr: %#08x\n", hsr_ec, 618 "hsr: %#08x\n", hsr_ec,
619 (unsigned int)vcpu->arch.hsr); 619 (unsigned int)vcpu->arch.hsr);
620 BUG(); 620 BUG();
diff --git a/arch/arm/mach-mvebu/irq-armada-370-xp.c b/arch/arm/mach-mvebu/irq-armada-370-xp.c
index d5970f5a1e8d..830139a3e2ba 100644
--- a/arch/arm/mach-mvebu/irq-armada-370-xp.c
+++ b/arch/arm/mach-mvebu/irq-armada-370-xp.c
@@ -57,7 +57,7 @@ static struct irq_domain *armada_370_xp_mpic_domain;
57/* 57/*
58 * In SMP mode: 58 * In SMP mode:
59 * For shared global interrupts, mask/unmask global enable bit 59 * For shared global interrupts, mask/unmask global enable bit
60 * For CPU interrtups, mask/unmask the calling CPU's bit 60 * For CPU interrupts, mask/unmask the calling CPU's bit
61 */ 61 */
62static void armada_370_xp_irq_mask(struct irq_data *d) 62static void armada_370_xp_irq_mask(struct irq_data *d)
63{ 63{
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index ea62e75ef21d..152a10cf4f1d 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -126,8 +126,8 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
126 * omap_default_idle - OMAP4 default ilde routine.' 126 * omap_default_idle - OMAP4 default ilde routine.'
127 * 127 *
128 * Implements OMAP4 memory, IO ordering requirements which can't be addressed 128 * Implements OMAP4 memory, IO ordering requirements which can't be addressed
129 * with default cpu_do_idle() hook. Used by all CPUs with !CONFIG_CPUIDLE and 129 * with default cpu_do_idle() hook. Used by all CPUs with !CONFIG_CPU_IDLE and
130 * by secondary CPU with CONFIG_CPUIDLE. 130 * by secondary CPU with CONFIG_CPU_IDLE.
131 */ 131 */
132static void omap_default_idle(void) 132static void omap_default_idle(void)
133{ 133{
diff --git a/arch/blackfin/include/asm/bfin_sport3.h b/arch/blackfin/include/asm/bfin_sport3.h
index 03c00220d69b..d82f5fa0ad9f 100644
--- a/arch/blackfin/include/asm/bfin_sport3.h
+++ b/arch/blackfin/include/asm/bfin_sport3.h
@@ -41,7 +41,7 @@
41#define SPORT_CTL_LAFS 0x00020000 /* Late Transmit frame select */ 41#define SPORT_CTL_LAFS 0x00020000 /* Late Transmit frame select */
42#define SPORT_CTL_RJUST 0x00040000 /* Right Justified mode select */ 42#define SPORT_CTL_RJUST 0x00040000 /* Right Justified mode select */
43#define SPORT_CTL_FSED 0x00080000 /* External frame sync edge select */ 43#define SPORT_CTL_FSED 0x00080000 /* External frame sync edge select */
44#define SPORT_CTL_TFIEN 0x00100000 /* Transmit finish interrrupt enable select */ 44#define SPORT_CTL_TFIEN 0x00100000 /* Transmit finish interrupt enable select */
45#define SPORT_CTL_GCLKEN 0x00200000 /* Gated clock mode select */ 45#define SPORT_CTL_GCLKEN 0x00200000 /* Gated clock mode select */
46#define SPORT_CTL_SPENSEC 0x01000000 /* Enable secondary channel */ 46#define SPORT_CTL_SPENSEC 0x01000000 /* Enable secondary channel */
47#define SPORT_CTL_SPTRAN 0x02000000 /* Data direction control */ 47#define SPORT_CTL_SPTRAN 0x02000000 /* Data direction control */
diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c
index 3bcb207e5b6d..9fe3467a5133 100644
--- a/arch/m32r/kernel/traps.c
+++ b/arch/m32r/kernel/traps.c
@@ -132,10 +132,8 @@ static void show_trace(struct task_struct *task, unsigned long *stack)
132 printk("Call Trace: "); 132 printk("Call Trace: ");
133 while (!kstack_end(stack)) { 133 while (!kstack_end(stack)) {
134 addr = *stack++; 134 addr = *stack++;
135 if (__kernel_text_address(addr)) { 135 if (__kernel_text_address(addr))
136 printk("[<%08lx>] ", addr); 136 printk("[<%08lx>] %pSR\n", addr, (void *)addr);
137 print_symbol("%s\n", addr);
138 }
139 } 137 }
140 printk("\n"); 138 printk("\n");
141} 139}
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index bec1e930ed73..48fbc2b97e95 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -511,8 +511,7 @@ int __init nvram_scan_partitions(void)
511 "detected: 0-length partition\n"); 511 "detected: 0-length partition\n");
512 goto out; 512 goto out;
513 } 513 }
514 tmp_part = (struct nvram_partition *) 514 tmp_part = kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
515 kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
516 err = -ENOMEM; 515 err = -ENOMEM;
517 if (!tmp_part) { 516 if (!tmp_part) {
518 printk(KERN_ERR "nvram_scan_partitions: kmalloc failed\n"); 517 printk(KERN_ERR "nvram_scan_partitions: kmalloc failed\n");
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 5e93438afb06..dbdc15aa8127 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -1039,7 +1039,7 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
1039 if (!vcpu_book3s) 1039 if (!vcpu_book3s)
1040 goto out; 1040 goto out;
1041 1041
1042 vcpu_book3s->shadow_vcpu = (struct kvmppc_book3s_shadow_vcpu *) 1042 vcpu_book3s->shadow_vcpu =
1043 kzalloc(sizeof(*vcpu_book3s->shadow_vcpu), GFP_KERNEL); 1043 kzalloc(sizeof(*vcpu_book3s->shadow_vcpu), GFP_KERNEL);
1044 if (!vcpu_book3s->shadow_vcpu) 1044 if (!vcpu_book3s->shadow_vcpu)
1045 goto free_vcpu; 1045 goto free_vcpu;
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 1630f439cd2a..4f5ef62934a4 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -33,7 +33,7 @@ struct irq_class {
33}; 33};
34 34
35/* 35/*
36 * The list of "main" irq classes on s390. This is the list of interrrupts 36 * The list of "main" irq classes on s390. This is the list of interrupts
37 * that appear both in /proc/stat ("intr" line) and /proc/interrupts. 37 * that appear both in /proc/stat ("intr" line) and /proc/interrupts.
38 * Historically only external and I/O interrupts have been part of /proc/stat. 38 * Historically only external and I/O interrupts have been part of /proc/stat.
39 * We can't add the split external and I/O sub classes since the first field 39 * We can't add the split external and I/O sub classes since the first field
diff --git a/arch/s390/kvm/trace.h b/arch/s390/kvm/trace.h
index 53252d2d4720..c2f582bb1cb2 100644
--- a/arch/s390/kvm/trace.h
+++ b/arch/s390/kvm/trace.h
@@ -67,7 +67,7 @@ TRACE_EVENT(kvm_s390_sie_fault,
67#define sie_intercept_code \ 67#define sie_intercept_code \
68 {0x04, "Instruction"}, \ 68 {0x04, "Instruction"}, \
69 {0x08, "Program interruption"}, \ 69 {0x08, "Program interruption"}, \
70 {0x0C, "Instruction and program interuption"}, \ 70 {0x0C, "Instruction and program interruption"}, \
71 {0x10, "External request"}, \ 71 {0x10, "External request"}, \
72 {0x14, "External interruption"}, \ 72 {0x14, "External interruption"}, \
73 {0x18, "I/O request"}, \ 73 {0x18, "I/O request"}, \
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
index 8d871eaddb66..d47786acb016 100644
--- a/arch/x86/include/asm/cmpxchg.h
+++ b/arch/x86/include/asm/cmpxchg.h
@@ -35,7 +35,7 @@ extern void __add_wrong_size(void)
35 35
36/* 36/*
37 * An exchange-type operation, which takes a value and a pointer, and 37 * An exchange-type operation, which takes a value and a pointer, and
38 * returns a the old value. 38 * returns the old value.
39 */ 39 */
40#define __xchg_op(ptr, arg, op, lock) \ 40#define __xchg_op(ptr, arg, op, lock) \
41 ({ \ 41 ({ \
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 3f94a886bb35..c76e65927b0e 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -63,7 +63,9 @@ enum {
63}; 63};
64 64
65static int pdc2027x_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); 65static int pdc2027x_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
66#ifdef CONFIG_PM
66static int pdc2027x_reinit_one(struct pci_dev *pdev); 67static int pdc2027x_reinit_one(struct pci_dev *pdev);
68#endif
67static int pdc2027x_prereset(struct ata_link *link, unsigned long deadline); 69static int pdc2027x_prereset(struct ata_link *link, unsigned long deadline);
68static void pdc2027x_set_piomode(struct ata_port *ap, struct ata_device *adev); 70static void pdc2027x_set_piomode(struct ata_port *ap, struct ata_device *adev);
69static void pdc2027x_set_dmamode(struct ata_port *ap, struct ata_device *adev); 71static void pdc2027x_set_dmamode(struct ata_port *ap, struct ata_device *adev);
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 608f82fed632..dfc6fd0ac119 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -311,7 +311,7 @@ static void fsl_sata_set_irq_coalescing(struct ata_host *host,
311 intr_coalescing_ticks = ticks; 311 intr_coalescing_ticks = ticks;
312 spin_unlock(&host->lock); 312 spin_unlock(&host->lock);
313 313
314 DPRINTK("intrrupt coalescing, count = 0x%x, ticks = %x\n", 314 DPRINTK("interrupt coalescing, count = 0x%x, ticks = %x\n",
315 intr_coalescing_count, intr_coalescing_ticks); 315 intr_coalescing_count, intr_coalescing_ticks);
316 DPRINTK("ICC register status: (hcr base: 0x%x) = 0x%x\n", 316 DPRINTK("ICC register status: (hcr base: 0x%x) = 0x%x\n",
317 hcr_base, ioread32(hcr_base + ICC)); 317 hcr_base, ioread32(hcr_base + ICC));
diff --git a/drivers/clk/mvebu/clk-core.c b/drivers/clk/mvebu/clk-core.c
index 2628610c1929..0a53edbae8b8 100644
--- a/drivers/clk/mvebu/clk-core.c
+++ b/drivers/clk/mvebu/clk-core.c
@@ -157,7 +157,7 @@ static u32 __init armada_370_get_cpu_freq(void __iomem *sar)
157 cpu_freq_select = ((readl(sar) >> SARL_A370_PCLK_FREQ_OPT) & 157 cpu_freq_select = ((readl(sar) >> SARL_A370_PCLK_FREQ_OPT) &
158 SARL_A370_PCLK_FREQ_OPT_MASK); 158 SARL_A370_PCLK_FREQ_OPT_MASK);
159 if (cpu_freq_select >= ARRAY_SIZE(armada_370_cpu_frequencies)) { 159 if (cpu_freq_select >= ARRAY_SIZE(armada_370_cpu_frequencies)) {
160 pr_err("CPU freq select unsuported %d\n", cpu_freq_select); 160 pr_err("CPU freq select unsupported %d\n", cpu_freq_select);
161 cpu_freq = 0; 161 cpu_freq = 0;
162 } else 162 } else
163 cpu_freq = armada_370_cpu_frequencies[cpu_freq_select]; 163 cpu_freq = armada_370_cpu_frequencies[cpu_freq_select];
@@ -279,7 +279,7 @@ static u32 __init armada_xp_get_cpu_freq(void __iomem *sar)
279 SARH_AXP_PCLK_FREQ_OPT_MASK) 279 SARH_AXP_PCLK_FREQ_OPT_MASK)
280 << SARH_AXP_PCLK_FREQ_OPT_SHIFT); 280 << SARH_AXP_PCLK_FREQ_OPT_SHIFT);
281 if (cpu_freq_select >= ARRAY_SIZE(armada_xp_cpu_frequencies)) { 281 if (cpu_freq_select >= ARRAY_SIZE(armada_xp_cpu_frequencies)) {
282 pr_err("CPU freq select unsuported: %d\n", cpu_freq_select); 282 pr_err("CPU freq select unsupported: %d\n", cpu_freq_select);
283 cpu_freq = 0; 283 cpu_freq = 0;
284 } else 284 } else
285 cpu_freq = armada_xp_cpu_frequencies[cpu_freq_select]; 285 cpu_freq = armada_xp_cpu_frequencies[cpu_freq_select];
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 1c56f63524f2..8acf00490fd5 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -66,7 +66,7 @@ static void build_instantiation_desc(u32 *desc)
66 66
67 /* 67 /*
68 * load 1 to clear written reg: 68 * load 1 to clear written reg:
69 * resets the done interrrupt and returns the RNG to idle. 69 * resets the done interrupt and returns the RNG to idle.
70 */ 70 */
71 append_load_imm_u32(desc, 1, LDST_SRCDST_WORD_CLRW); 71 append_load_imm_u32(desc, 1, LDST_SRCDST_WORD_CLRW);
72 72
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 8fc93f90a7cd..c3f5bd8a5077 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2028,7 +2028,7 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp)
2028 } 2028 }
2029 2029
2030 if (channel_eq) 2030 if (channel_eq)
2031 DRM_DEBUG_KMS("Channel EQ done. DP Training successfull\n"); 2031 DRM_DEBUG_KMS("Channel EQ done. DP Training successful\n");
2032 2032
2033 intel_dp_set_link_train(intel_dp, DP, DP_TRAINING_PATTERN_DISABLE); 2033 intel_dp_set_link_train(intel_dp, DP, DP_TRAINING_PATTERN_DISABLE);
2034} 2034}
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index d07a8cdf998e..78413ec623c9 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -451,7 +451,7 @@ static bool intel_sdvo_write_cmd(struct intel_sdvo *intel_sdvo, u8 cmd,
451 int i, ret = true; 451 int i, ret = true;
452 452
453 /* Would be simpler to allocate both in one go ? */ 453 /* Would be simpler to allocate both in one go ? */
454 buf = (u8 *)kzalloc(args_len * 2 + 2, GFP_KERNEL); 454 buf = kzalloc(args_len * 2 + 2, GFP_KERNEL);
455 if (!buf) 455 if (!buf)
456 return false; 456 return false;
457 457
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index 48f80cd42d8f..5a99d433fc35 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -270,7 +270,7 @@ int radeon_irq_kms_init(struct radeon_device *rdev)
270} 270}
271 271
272/** 272/**
273 * radeon_irq_kms_fini - tear down driver interrrupt info 273 * radeon_irq_kms_fini - tear down driver interrupt info
274 * 274 *
275 * @rdev: radeon device pointer 275 * @rdev: radeon device pointer
276 * 276 *
diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c
index 261d7db437e2..8acef657abf3 100644
--- a/drivers/i2c/busses/i2c-puv3.c
+++ b/drivers/i2c/busses/i2c-puv3.c
@@ -199,7 +199,7 @@ static int puv3_i2c_probe(struct platform_device *pdev)
199 199
200 adapter = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL); 200 adapter = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
201 if (adapter == NULL) { 201 if (adapter == NULL) {
202 dev_err(&pdev->dev, "can't allocate inteface!\n"); 202 dev_err(&pdev->dev, "can't allocate interface!\n");
203 rc = -ENOMEM; 203 rc = -ENOMEM;
204 goto fail_nomem; 204 goto fail_nomem;
205 } 205 }
diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c
index 9dbd82b716d3..065b7a31a478 100644
--- a/drivers/irqchip/irq-versatile-fpga.c
+++ b/drivers/irqchip/irq-versatile-fpga.c
@@ -139,7 +139,7 @@ void __init fpga_irq_init(void __iomem *base, const char *name, int irq_start,
139 int i; 139 int i;
140 140
141 if (fpga_irq_id >= ARRAY_SIZE(fpga_irq_devices)) { 141 if (fpga_irq_id >= ARRAY_SIZE(fpga_irq_devices)) {
142 pr_err("%s: too few FPGA IRQ controllers, increase CONFIG_PLAT_VERSATILE_FPGA_IRQ_NR\n", __func__); 142 pr_err("%s: too few FPGA IRQ controllers, increase CONFIG_VERSATILE_FPGA_IRQ_NR\n", __func__);
143 return; 143 return;
144 } 144 }
145 f = &fpga_irq_devices[fpga_irq_id]; 145 f = &fpga_irq_devices[fpga_irq_id];
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index b72afd81a7bb..3c5f2491a16f 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -3424,7 +3424,6 @@ isdn_tty_parse_at(modem_info *info)
3424 p++; 3424 p++;
3425 isdn_tty_cmd_ATA(info); 3425 isdn_tty_cmd_ATA(info);
3426 return; 3426 return;
3427 break;
3428 case 'D': 3427 case 'D':
3429 /* D - Dial */ 3428 /* D - Dial */
3430 if (info->msr & UART_MSR_DCD) 3429 if (info->msr & UART_MSR_DCD)
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index 63502e7a2a76..7618fdae811e 100644
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -54,7 +54,7 @@ MODULE_PARM_DESC(debug, "enable debug messages");
54 54
55unsigned int fw_debug; 55unsigned int fw_debug;
56module_param(fw_debug, int, 0644); 56module_param(fw_debug, int, 0644);
57MODULE_PARM_DESC(fw_debug, "Firware debug level def:2"); 57MODULE_PARM_DESC(fw_debug, "Firmware debug level def:2");
58 58
59unsigned int encoder_buffers = SAA7164_MAX_ENCODER_BUFFERS; 59unsigned int encoder_buffers = SAA7164_MAX_ENCODER_BUFFERS;
60module_param(encoder_buffers, int, 0644); 60module_param(encoder_buffers, int, 0644);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index beb6dbacebd9..98a9c093a6b9 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -1312,7 +1312,7 @@ static inline int s5p_mfc_get_new_ctx(struct s5p_mfc_dev *dev)
1312 int cnt; 1312 int cnt;
1313 1313
1314 spin_lock_irqsave(&dev->condlock, flags); 1314 spin_lock_irqsave(&dev->condlock, flags);
1315 mfc_debug(2, "Previos context: %d (bits %08lx)\n", dev->curr_ctx, 1315 mfc_debug(2, "Previous context: %d (bits %08lx)\n", dev->curr_ctx,
1316 dev->ctx_work_bits); 1316 dev->ctx_work_bits);
1317 new_ctx = (dev->curr_ctx + 1) % MFC_NUM_CONTEXTS; 1317 new_ctx = (dev->curr_ctx + 1) % MFC_NUM_CONTEXTS;
1318 cnt = 0; 1318 cnt = 0;
diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
index 8c309c7134d7..8fa18ab5b725 100644
--- a/drivers/media/radio/radio-shark.c
+++ b/drivers/media/radio/radio-shark.c
@@ -284,7 +284,7 @@ static void shark_resume_leds(struct shark_device *shark)
284static int shark_register_leds(struct shark_device *shark, struct device *dev) 284static int shark_register_leds(struct shark_device *shark, struct device *dev)
285{ 285{
286 v4l2_warn(&shark->v4l2_dev, 286 v4l2_warn(&shark->v4l2_dev,
287 "CONFIG_LED_CLASS not enabled, LED support disabled\n"); 287 "CONFIG_LEDS_CLASS not enabled, LED support disabled\n");
288 return 0; 288 return 0;
289} 289}
290static inline void shark_unregister_leds(struct shark_device *shark) { } 290static inline void shark_unregister_leds(struct shark_device *shark) { }
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
index ef65ebbd5364..9fb669721e66 100644
--- a/drivers/media/radio/radio-shark2.c
+++ b/drivers/media/radio/radio-shark2.c
@@ -250,7 +250,7 @@ static void shark_resume_leds(struct shark_device *shark)
250static int shark_register_leds(struct shark_device *shark, struct device *dev) 250static int shark_register_leds(struct shark_device *shark, struct device *dev)
251{ 251{
252 v4l2_warn(&shark->v4l2_dev, 252 v4l2_warn(&shark->v4l2_dev,
253 "CONFIG_LED_CLASS not enabled, LED support disabled\n"); 253 "CONFIG_LEDS_CLASS not enabled, LED support disabled\n");
254 return 0; 254 return 0;
255} 255}
256static inline void shark_unregister_leds(struct shark_device *shark) { } 256static inline void shark_unregister_leds(struct shark_device *shark) { }
diff --git a/drivers/media/usb/dvb-usb/opera1.c b/drivers/media/usb/dvb-usb/opera1.c
index c8a95042dfbc..16ba90acf539 100644
--- a/drivers/media/usb/dvb-usb/opera1.c
+++ b/drivers/media/usb/dvb-usb/opera1.c
@@ -151,7 +151,7 @@ static int opera1_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
151 break; 151 break;
152 } 152 }
153 if (dvb_usb_opera1_debug & 0x10) 153 if (dvb_usb_opera1_debug & 0x10)
154 info("sending i2c mesage %d %d", tmp, msg[i].len); 154 info("sending i2c message %d %d", tmp, msg[i].len);
155 } 155 }
156 mutex_unlock(&d->i2c_mutex); 156 mutex_unlock(&d->i2c_mutex);
157 return num; 157 return num;
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 31a6212cb8b1..b3e50984d2c8 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -60,7 +60,7 @@ void mei_amthif_reset_params(struct mei_device *dev)
60} 60}
61 61
62/** 62/**
63 * mei_amthif_host_init_ - mei initialization amthif client. 63 * mei_amthif_host_init - mei initialization amthif client.
64 * 64 *
65 * @dev: the device structure 65 * @dev: the device structure
66 * 66 *
@@ -433,7 +433,7 @@ unsigned int mei_amthif_poll(struct mei_device *dev,
433 433
434 434
435/** 435/**
436 * mei_amthif_irq_process_completed - processes completed iamthif operation. 436 * mei_amthif_irq_write_completed - processes completed iamthif operation.
437 * 437 *
438 * @dev: the device structure. 438 * @dev: the device structure.
439 * @slots: free slots. 439 * @slots: free slots.
@@ -704,7 +704,7 @@ static bool mei_clear_lists(struct mei_device *dev, struct file *file)
704/** 704/**
705* mei_amthif_release - the release function 705* mei_amthif_release - the release function
706* 706*
707* @inode: pointer to inode structure 707* @dev: device structure
708* @file: pointer to file structure 708* @file: pointer to file structure
709* 709*
710* returns 0 on success, <0 on error 710* returns 0 on success, <0 on error
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 71892745e2e8..e310ca6ed1a3 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -109,7 +109,7 @@ void mei_io_cb_free(struct mei_cl_cb *cb)
109 * mei_io_cb_init - allocate and initialize io callback 109 * mei_io_cb_init - allocate and initialize io callback
110 * 110 *
111 * @cl - mei client 111 * @cl - mei client
112 * @file: pointer to file structure 112 * @fp: pointer to file structure
113 * 113 *
114 * returns mei_cl_cb pointer or NULL; 114 * returns mei_cl_cb pointer or NULL;
115 */ 115 */
@@ -132,8 +132,8 @@ struct mei_cl_cb *mei_io_cb_init(struct mei_cl *cl, struct file *fp)
132/** 132/**
133 * mei_io_cb_alloc_req_buf - allocate request buffer 133 * mei_io_cb_alloc_req_buf - allocate request buffer
134 * 134 *
135 * @cb - io callback structure 135 * @cb: io callback structure
136 * @size: size of the buffer 136 * @length: size of the buffer
137 * 137 *
138 * returns 0 on success 138 * returns 0 on success
139 * -EINVAL if cb is NULL 139 * -EINVAL if cb is NULL
@@ -154,10 +154,10 @@ int mei_io_cb_alloc_req_buf(struct mei_cl_cb *cb, size_t length)
154 return 0; 154 return 0;
155} 155}
156/** 156/**
157 * mei_io_cb_alloc_req_buf - allocate respose buffer 157 * mei_io_cb_alloc_resp_buf - allocate respose buffer
158 * 158 *
159 * @cb - io callback structure 159 * @cb: io callback structure
160 * @size: size of the buffer 160 * @length: size of the buffer
161 * 161 *
162 * returns 0 on success 162 * returns 0 on success
163 * -EINVAL if cb is NULL 163 * -EINVAL if cb is NULL
@@ -183,7 +183,6 @@ int mei_io_cb_alloc_resp_buf(struct mei_cl_cb *cb, size_t length)
183/** 183/**
184 * mei_cl_flush_queues - flushes queue lists belonging to cl. 184 * mei_cl_flush_queues - flushes queue lists belonging to cl.
185 * 185 *
186 * @dev: the device structure
187 * @cl: host client 186 * @cl: host client
188 */ 187 */
189int mei_cl_flush_queues(struct mei_cl *cl) 188int mei_cl_flush_queues(struct mei_cl *cl)
@@ -244,7 +243,8 @@ struct mei_cl *mei_cl_allocate(struct mei_device *dev)
244/** 243/**
245 * mei_cl_find_read_cb - find this cl's callback in the read list 244 * mei_cl_find_read_cb - find this cl's callback in the read list
246 * 245 *
247 * @dev: device structure 246 * @cl: host client
247 *
248 * returns cb on success, NULL on error 248 * returns cb on success, NULL on error
249 */ 249 */
250struct mei_cl_cb *mei_cl_find_read_cb(struct mei_cl *cl) 250struct mei_cl_cb *mei_cl_find_read_cb(struct mei_cl *cl)
@@ -263,6 +263,7 @@ struct mei_cl_cb *mei_cl_find_read_cb(struct mei_cl *cl)
263 * 263 *
264 * @cl - host client 264 * @cl - host client
265 * @id - fixed host id or -1 for genereting one 265 * @id - fixed host id or -1 for genereting one
266 *
266 * returns 0 on success 267 * returns 0 on success
267 * -EINVAL on incorrect values 268 * -EINVAL on incorrect values
268 * -ENONET if client not found 269 * -ENONET if client not found
@@ -302,7 +303,7 @@ int mei_cl_link(struct mei_cl *cl, int id)
302/** 303/**
303 * mei_cl_unlink - remove me_cl from the list 304 * mei_cl_unlink - remove me_cl from the list
304 * 305 *
305 * @dev: the device structure 306 * @cl: host client
306 */ 307 */
307int mei_cl_unlink(struct mei_cl *cl) 308int mei_cl_unlink(struct mei_cl *cl)
308{ 309{
@@ -538,7 +539,6 @@ out:
538/** 539/**
539 * mei_cl_flow_ctrl_creds - checks flow_control credits for cl. 540 * mei_cl_flow_ctrl_creds - checks flow_control credits for cl.
540 * 541 *
541 * @dev: the device structure
542 * @cl: private data of the file object 542 * @cl: private data of the file object
543 * 543 *
544 * returns 1 if mei_flow_ctrl_creds >0, 0 - otherwise. 544 * returns 1 if mei_flow_ctrl_creds >0, 0 - otherwise.
@@ -579,8 +579,8 @@ int mei_cl_flow_ctrl_creds(struct mei_cl *cl)
579/** 579/**
580 * mei_cl_flow_ctrl_reduce - reduces flow_control. 580 * mei_cl_flow_ctrl_reduce - reduces flow_control.
581 * 581 *
582 * @dev: the device structure
583 * @cl: private data of the file object 582 * @cl: private data of the file object
583 *
584 * @returns 584 * @returns
585 * 0 on success 585 * 0 on success
586 * -ENOENT when me client is not found 586 * -ENOENT when me client is not found
@@ -618,7 +618,7 @@ int mei_cl_flow_ctrl_reduce(struct mei_cl *cl)
618} 618}
619 619
620/** 620/**
621 * mei_cl_start_read - the start read client message function. 621 * mei_cl_read_start - the start read client message function.
622 * 622 *
623 * @cl: host client 623 * @cl: host client
624 * 624 *
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index db605f5cf187..6916045166eb 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -62,6 +62,7 @@ static void mei_hbm_me_cl_allocate(struct mei_device *dev)
62 62
63/** 63/**
64 * mei_hbm_cl_hdr - construct client hbm header 64 * mei_hbm_cl_hdr - construct client hbm header
65 *
65 * @cl: - client 66 * @cl: - client
66 * @hbm_cmd: host bus message command 67 * @hbm_cmd: host bus message command
67 * @buf: buffer for cl header 68 * @buf: buffer for cl header
@@ -206,7 +207,7 @@ static void mei_hbm_enum_clients_req(struct mei_device *dev)
206} 207}
207 208
208/** 209/**
209 * mei_hbm_prop_requsest - request property for a single client 210 * mei_hbm_prop_req - request property for a single client
210 * 211 *
211 * @dev: the device structure 212 * @dev: the device structure
212 * 213 *
@@ -306,9 +307,9 @@ int mei_hbm_cl_flow_control_req(struct mei_device *dev, struct mei_cl *cl)
306} 307}
307 308
308/** 309/**
309 * add_single_flow_creds - adds single buffer credentials. 310 * mei_hbm_add_single_flow_creds - adds single buffer credentials.
310 * 311 *
311 * @file: private data ot the file object. 312 * @dev: the device structure
312 * @flow: flow control. 313 * @flow: flow control.
313 */ 314 */
314static void mei_hbm_add_single_flow_creds(struct mei_device *dev, 315static void mei_hbm_add_single_flow_creds(struct mei_device *dev,
@@ -500,7 +501,7 @@ static void mei_hbm_cl_connect_res(struct mei_device *dev,
500 501
501 502
502/** 503/**
503 * mei_client_disconnect_request - disconnect request initiated by me 504 * mei_hbm_fw_disconnect_req - disconnect request initiated by me
504 * host sends disoconnect response 505 * host sends disoconnect response
505 * 506 *
506 * @dev: the device structure. 507 * @dev: the device structure.
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index fc032270916a..822170f00348 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -103,7 +103,7 @@ static inline void mei_hcsr_set(struct mei_me_hw *hw, u32 hcsr)
103 103
104 104
105/** 105/**
106 * me_hw_config - configure hw dependent settings 106 * mei_me_hw_config - configure hw dependent settings
107 * 107 *
108 * @dev: mei device 108 * @dev: mei device
109 */ 109 */
@@ -169,7 +169,7 @@ static void mei_me_hw_reset_release(struct mei_device *dev)
169 * mei_me_hw_reset - resets fw via mei csr register. 169 * mei_me_hw_reset - resets fw via mei csr register.
170 * 170 *
171 * @dev: the device structure 171 * @dev: the device structure
172 * @interrupts_enabled: if interrupt should be enabled after reset. 172 * @intr_enable: if interrupt should be enabled after reset.
173 */ 173 */
174static void mei_me_hw_reset(struct mei_device *dev, bool intr_enable) 174static void mei_me_hw_reset(struct mei_device *dev, bool intr_enable)
175{ 175{
@@ -285,7 +285,7 @@ static unsigned char mei_hbuf_filled_slots(struct mei_device *dev)
285} 285}
286 286
287/** 287/**
288 * mei_hbuf_is_empty - checks if host buffer is empty. 288 * mei_me_hbuf_is_empty - checks if host buffer is empty.
289 * 289 *
290 * @dev: the device structure 290 * @dev: the device structure
291 * 291 *
@@ -554,7 +554,7 @@ static const struct mei_hw_ops mei_me_hw_ops = {
554}; 554};
555 555
556/** 556/**
557 * init_mei_device - allocates and initializes the mei device structure 557 * mei_me_dev_init - allocates and initializes the mei device structure
558 * 558 *
559 * @pdev: The pci device structure 559 * @pdev: The pci device structure
560 * 560 *
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 1473cfdbc426..2ad736989410 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -230,7 +230,7 @@ static int _mei_irq_thread_close(struct mei_device *dev, s32 *slots,
230 230
231 231
232/** 232/**
233 * _mei_hb_read - processes read related operation. 233 * _mei_irq_thread_read - processes read related operation.
234 * 234 *
235 * @dev: the device structure. 235 * @dev: the device structure.
236 * @slots: free slots. 236 * @slots: free slots.
@@ -369,7 +369,7 @@ static int mei_irq_thread_write_complete(struct mei_device *dev, s32 *slots,
369} 369}
370 370
371/** 371/**
372 * mei_irq_thread_read_handler - bottom half read routine after ISR to 372 * mei_irq_read_handler - bottom half read routine after ISR to
373 * handle the read processing. 373 * handle the read processing.
374 * 374 *
375 * @dev: the device structure 375 * @dev: the device structure
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 88aec6a90ff4..a727464e9c3f 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -92,6 +92,7 @@ static DEFINE_MUTEX(mei_mutex);
92 92
93/** 93/**
94 * mei_quirk_probe - probe for devices that doesn't valid ME interface 94 * mei_quirk_probe - probe for devices that doesn't valid ME interface
95 *
95 * @pdev: PCI device structure 96 * @pdev: PCI device structure
96 * @ent: entry into pci_device_table 97 * @ent: entry into pci_device_table
97 * 98 *
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index eb3f05c8d7d0..6251a4ee7067 100644
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -58,6 +58,7 @@ static void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout)
58 * mei_wd_host_init - connect to the watchdog client 58 * mei_wd_host_init - connect to the watchdog client
59 * 59 *
60 * @dev: the device structure 60 * @dev: the device structure
61 *
61 * returns -ENENT if wd client cannot be found 62 * returns -ENENT if wd client cannot be found
62 * -EIO if write has failed 63 * -EIO if write has failed
63 * 0 on success 64 * 0 on success
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
index 21e261ffbe10..3ef7092e3f1c 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
@@ -810,7 +810,7 @@ int atl1c_power_saving(struct atl1c_hw *hw, u32 wufc)
810 if (wufc & AT_WUFC_LNKC) { 810 if (wufc & AT_WUFC_LNKC) {
811 wol_ctrl |= WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN; 811 wol_ctrl |= WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN;
812 if (atl1c_write_phy_reg(hw, MII_IER, IER_LINK_UP) != 0) { 812 if (atl1c_write_phy_reg(hw, MII_IER, IER_LINK_UP) != 0) {
813 dev_dbg(&pdev->dev, "%s: write phy MII_IER faild.\n", 813 dev_dbg(&pdev->dev, "%s: write phy MII_IER failed.\n",
814 atl1c_driver_name); 814 atl1c_driver_name);
815 } 815 }
816 } 816 }
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
index 91ecd6a00d05..4b077a7f16af 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
@@ -591,7 +591,7 @@ static int bnx2x_dcbx_read_shmem_remote_mib(struct bnx2x *bp)
591 DCBX_READ_REMOTE_MIB); 591 DCBX_READ_REMOTE_MIB);
592 592
593 if (rc) { 593 if (rc) {
594 BNX2X_ERR("Faild to read remote mib from FW\n"); 594 BNX2X_ERR("Failed to read remote mib from FW\n");
595 return rc; 595 return rc;
596 } 596 }
597 597
@@ -619,7 +619,7 @@ static int bnx2x_dcbx_read_shmem_neg_results(struct bnx2x *bp)
619 DCBX_READ_LOCAL_MIB); 619 DCBX_READ_LOCAL_MIB);
620 620
621 if (rc) { 621 if (rc) {
622 BNX2X_ERR("Faild to read local mib from FW\n"); 622 BNX2X_ERR("Failed to read local mib from FW\n");
623 return rc; 623 return rc;
624 } 624 }
625 625
diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig
index 435b4f1e3488..4136ccc4a954 100644
--- a/drivers/net/ethernet/sfc/Kconfig
+++ b/drivers/net/ethernet/sfc/Kconfig
@@ -24,7 +24,7 @@ config SFC_MCDI_MON
24 bool "Solarflare SFC9000-family hwmon support" 24 bool "Solarflare SFC9000-family hwmon support"
25 depends on SFC && HWMON && !(SFC=y && HWMON=m) 25 depends on SFC && HWMON && !(SFC=y && HWMON=m)
26 default y 26 default y
27 ----help--- 27 ---help---
28 This exposes the on-board firmware-managed sensors as a 28 This exposes the on-board firmware-managed sensors as a
29 hardware monitor device. 29 hardware monitor device.
30config SFC_SRIOV 30config SFC_SRIOV
diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c
index 463597f919f1..8c351f100aca 100644
--- a/drivers/net/ethernet/ti/cpts.c
+++ b/drivers/net/ethernet/ti/cpts.c
@@ -94,7 +94,7 @@ static int cpts_fifo_read(struct cpts *cpts, int match)
94 case CPTS_EV_HW: 94 case CPTS_EV_HW:
95 break; 95 break;
96 default: 96 default:
97 pr_err("cpts: unkown event type\n"); 97 pr_err("cpts: unknown event type\n");
98 break; 98 break;
99 } 99 }
100 if (type == match) 100 if (type == match)
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index ed48d75bb786..ee346d443571 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -235,7 +235,7 @@ out:
235 235
236static int pm2xxx_charger_wd_exp_mngt(struct pm2xxx_charger *pm2, int val) 236static int pm2xxx_charger_wd_exp_mngt(struct pm2xxx_charger *pm2, int val)
237{ 237{
238 dev_dbg(pm2->dev , "20 minutes watchdog occured\n"); 238 dev_dbg(pm2->dev , "20 minutes watchdog expired\n");
239 239
240 pm2->ac.wd_expired = true; 240 pm2->ac.wd_expired = true;
241 power_supply_changed(&pm2->ac_chg.psy); 241 power_supply_changed(&pm2->ac_chg.psy);
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 8edb4aed5d36..814af5ab8a72 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -59,7 +59,7 @@ static const char *rproc_crash_to_string(enum rproc_crash_type type)
59{ 59{
60 if (type < ARRAY_SIZE(rproc_crash_names)) 60 if (type < ARRAY_SIZE(rproc_crash_names))
61 return rproc_crash_names[type]; 61 return rproc_crash_names[type];
62 return "unkown"; 62 return "unknown";
63} 63}
64 64
65/* 65/*
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 79fbe3832dfc..0c81915b1997 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -402,7 +402,7 @@ config RTC_DRV_TPS6586X
402 tristate "TI TPS6586X RTC driver" 402 tristate "TI TPS6586X RTC driver"
403 depends on MFD_TPS6586X 403 depends on MFD_TPS6586X
404 help 404 help
405 TI Power Managment IC TPS6586X supports RTC functionality 405 TI Power Management IC TPS6586X supports RTC functionality
406 along with alarm. This driver supports the RTC driver for 406 along with alarm. This driver supports the RTC driver for
407 the TPS6586X RTC module. 407 the TPS6586X RTC module.
408 408
@@ -420,7 +420,7 @@ config RTC_DRV_TPS80031
420 tristate "TI TPS80031/TPS80032 RTC driver" 420 tristate "TI TPS80031/TPS80032 RTC driver"
421 depends on MFD_TPS80031 421 depends on MFD_TPS80031
422 help 422 help
423 TI Power Managment IC TPS80031 supports RTC functionality 423 TI Power Management IC TPS80031 supports RTC functionality
424 along with alarm. This driver supports the RTC driver for 424 along with alarm. This driver supports the RTC driver for
425 the TPS80031 RTC module. 425 the TPS80031 RTC module.
426 426
diff --git a/drivers/rtc/rtc-max8997.c b/drivers/rtc/rtc-max8997.c
index 5693619614f4..dacf48db7925 100644
--- a/drivers/rtc/rtc-max8997.c
+++ b/drivers/rtc/rtc-max8997.c
@@ -24,7 +24,7 @@
24/* Module parameter for WTSR function control */ 24/* Module parameter for WTSR function control */
25static int wtsr_en = 1; 25static int wtsr_en = 1;
26module_param(wtsr_en, int, 0444); 26module_param(wtsr_en, int, 0444);
27MODULE_PARM_DESC(wtsr_en, "Wachdog Timeout & Sofware Reset (default=on)"); 27MODULE_PARM_DESC(wtsr_en, "Watchdog Timeout & Software Reset (default=on)");
28/* Module parameter for SMPL function control */ 28/* Module parameter for SMPL function control */
29static int smpl_en = 1; 29static int smpl_en = 1;
30module_param(smpl_en, int, 0444); 30module_param(smpl_en, int, 0444);
diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index 214d691adb53..9014690fe841 100644
--- a/drivers/scsi/be2iscsi/be_iscsi.c
+++ b/drivers/scsi/be2iscsi/be_iscsi.c
@@ -369,7 +369,7 @@ beiscsi_set_vlan_tag(struct Scsi_Host *shost,
369 break; 369 break;
370 default: 370 default:
371 beiscsi_log(phba, KERN_WARNING, BEISCSI_LOG_CONFIG, 371 beiscsi_log(phba, KERN_WARNING, BEISCSI_LOG_CONFIG,
372 "BS_%d : Unkown Param Type : %d\n", 372 "BS_%d : Unknown Param Type : %d\n",
373 iface_param->param); 373 iface_param->param);
374 return -ENOSYS; 374 return -ENOSYS;
375 } 375 }
diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index a6c2fe4b4d65..55cc9902263d 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -1292,7 +1292,7 @@ beiscsi_adap_family_disp(struct device *dev, struct device_attribute *attr,
1292 break; 1292 break;
1293 default: 1293 default:
1294 return snprintf(buf, PAGE_SIZE, 1294 return snprintf(buf, PAGE_SIZE,
1295 "Unkown Adapter Family: 0x%x\n", dev_id); 1295 "Unknown Adapter Family: 0x%x\n", dev_id);
1296 break; 1296 break;
1297 } 1297 }
1298} 1298}
diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h
index b44d04e41b0d..f109e3b073c3 100644
--- a/drivers/scsi/bnx2i/bnx2i.h
+++ b/drivers/scsi/bnx2i/bnx2i.h
@@ -580,8 +580,8 @@ struct bnx2i_5771x_dbell {
580 * @sq_mem_size: SQ size 580 * @sq_mem_size: SQ size
581 * @sq_prod_qe: SQ producer entry pointer 581 * @sq_prod_qe: SQ producer entry pointer
582 * @sq_cons_qe: SQ consumer entry pointer 582 * @sq_cons_qe: SQ consumer entry pointer
583 * @sq_first_qe: virtaul address of first entry in SQ 583 * @sq_first_qe: virtual address of first entry in SQ
584 * @sq_last_qe: virtaul address of last entry in SQ 584 * @sq_last_qe: virtual address of last entry in SQ
585 * @sq_prod_idx: SQ producer index 585 * @sq_prod_idx: SQ producer index
586 * @sq_cons_idx: SQ consumer index 586 * @sq_cons_idx: SQ consumer index
587 * @sqe_left: number sq entry left 587 * @sqe_left: number sq entry left
@@ -593,8 +593,8 @@ struct bnx2i_5771x_dbell {
593 * @cq_mem_size: CQ size 593 * @cq_mem_size: CQ size
594 * @cq_prod_qe: CQ producer entry pointer 594 * @cq_prod_qe: CQ producer entry pointer
595 * @cq_cons_qe: CQ consumer entry pointer 595 * @cq_cons_qe: CQ consumer entry pointer
596 * @cq_first_qe: virtaul address of first entry in CQ 596 * @cq_first_qe: virtual address of first entry in CQ
597 * @cq_last_qe: virtaul address of last entry in CQ 597 * @cq_last_qe: virtual address of last entry in CQ
598 * @cq_prod_idx: CQ producer index 598 * @cq_prod_idx: CQ producer index
599 * @cq_cons_idx: CQ consumer index 599 * @cq_cons_idx: CQ consumer index
600 * @cqe_left: number cq entry left 600 * @cqe_left: number cq entry left
@@ -608,8 +608,8 @@ struct bnx2i_5771x_dbell {
608 * @rq_mem_size: RQ size 608 * @rq_mem_size: RQ size
609 * @rq_prod_qe: RQ producer entry pointer 609 * @rq_prod_qe: RQ producer entry pointer
610 * @rq_cons_qe: RQ consumer entry pointer 610 * @rq_cons_qe: RQ consumer entry pointer
611 * @rq_first_qe: virtaul address of first entry in RQ 611 * @rq_first_qe: virtual address of first entry in RQ
612 * @rq_last_qe: virtaul address of last entry in RQ 612 * @rq_last_qe: virtual address of last entry in RQ
613 * @rq_prod_idx: RQ producer index 613 * @rq_prod_idx: RQ producer index
614 * @rq_cons_idx: RQ consumer index 614 * @rq_cons_idx: RQ consumer index
615 * @rqe_left: number rq entry left 615 * @rqe_left: number rq entry left
diff --git a/drivers/scsi/csiostor/csio_mb.c b/drivers/scsi/csiostor/csio_mb.c
index 5b27c48f6836..f5d9ee1fda62 100644
--- a/drivers/scsi/csiostor/csio_mb.c
+++ b/drivers/scsi/csiostor/csio_mb.c
@@ -182,7 +182,7 @@ csio_mb_reset(struct csio_hw *hw, struct csio_mb *mbp, uint32_t tmo,
182 * @tmo: Command timeout. 182 * @tmo: Command timeout.
183 * @pf: PF number. 183 * @pf: PF number.
184 * @vf: VF number. 184 * @vf: VF number.
185 * @nparams: Number of paramters 185 * @nparams: Number of parameters
186 * @params: Parameter mnemonic array. 186 * @params: Parameter mnemonic array.
187 * @val: Parameter value array. 187 * @val: Parameter value array.
188 * @wr: Write/Read PARAMS. 188 * @wr: Write/Read PARAMS.
@@ -721,7 +721,7 @@ csio_mb_iq_free(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
721 * @mbp: Mailbox structure to initialize 721 * @mbp: Mailbox structure to initialize
722 * @priv: Private data 722 * @priv: Private data
723 * @mb_tmo: Mailbox time-out period (in ms). 723 * @mb_tmo: Mailbox time-out period (in ms).
724 * @eq_ofld_params: (Offload) Egress queue paramters. 724 * @eq_ofld_params: (Offload) Egress queue parameters.
725 * @cbfn: The call-back function 725 * @cbfn: The call-back function
726 * 726 *
727 * 727 *
@@ -752,7 +752,7 @@ csio_mb_eq_ofld_alloc(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
752 * @priv: Private data 752 * @priv: Private data
753 * @mb_tmo: Mailbox time-out period (in ms). 753 * @mb_tmo: Mailbox time-out period (in ms).
754 * @cascaded_req: TRUE - if this request is cascased with Eq-alloc request. 754 * @cascaded_req: TRUE - if this request is cascased with Eq-alloc request.
755 * @eq_ofld_params: (Offload) Egress queue paramters. 755 * @eq_ofld_params: (Offload) Egress queue parameters.
756 * @cbfn: The call-back function 756 * @cbfn: The call-back function
757 * 757 *
758 * 758 *
@@ -817,7 +817,7 @@ csio_mb_eq_ofld_write(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
817 * @mbp: Mailbox structure to initialize 817 * @mbp: Mailbox structure to initialize
818 * @priv: Private data. 818 * @priv: Private data.
819 * @mb_tmo: Mailbox time-out period (in ms). 819 * @mb_tmo: Mailbox time-out period (in ms).
820 * @eq_ofld_params: (Offload) Egress queue paramters. 820 * @eq_ofld_params: (Offload) Egress queue parameters.
821 * @cbfn: The call-back function 821 * @cbfn: The call-back function
822 * 822 *
823 * 823 *
@@ -840,7 +840,7 @@ csio_mb_eq_ofld_alloc_write(struct csio_hw *hw, struct csio_mb *mbp,
840 * @hw: The HW structure. 840 * @hw: The HW structure.
841 * @mbp: Mailbox structure to initialize. 841 * @mbp: Mailbox structure to initialize.
842 * @retval: Firmware return value. 842 * @retval: Firmware return value.
843 * @eq_ofld_params: (Offload) Egress queue paramters. 843 * @eq_ofld_params: (Offload) Egress queue parameters.
844 * 844 *
845 */ 845 */
846void 846void
@@ -870,7 +870,7 @@ csio_mb_eq_ofld_alloc_write_rsp(struct csio_hw *hw,
870 * @mbp: Mailbox structure to initialize 870 * @mbp: Mailbox structure to initialize
871 * @priv: Private data area. 871 * @priv: Private data area.
872 * @mb_tmo: Mailbox time-out period (in ms). 872 * @mb_tmo: Mailbox time-out period (in ms).
873 * @eq_ofld_params: (Offload) Egress queue paramters, that is to be freed. 873 * @eq_ofld_params: (Offload) Egress queue parameters, that is to be freed.
874 * @cbfn: The call-back function 874 * @cbfn: The call-back function
875 * 875 *
876 * 876 *
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 32d5683e6181..f5d106456f1d 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -4741,7 +4741,7 @@ lpfc_bsg_mbox_cmd(struct fc_bsg_job *job)
4741 if (job->request_len < 4741 if (job->request_len <
4742 sizeof(struct fc_bsg_request) + sizeof(struct dfc_mbox_req)) { 4742 sizeof(struct fc_bsg_request) + sizeof(struct dfc_mbox_req)) {
4743 lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC, 4743 lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,
4744 "2737 Mix-and-match backward compability " 4744 "2737 Mix-and-match backward compatibility "
4745 "between MBOX_REQ old size:%d and " 4745 "between MBOX_REQ old size:%d and "
4746 "new request size:%d\n", 4746 "new request size:%d\n",
4747 (int)(job->request_len - 4747 (int)(job->request_len -
diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c
index 1df9ed4f371d..4db0c7a18bd8 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_config.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_config.c
@@ -148,7 +148,7 @@ _config_display_some_debug(struct MPT3SAS_ADAPTER *ioc, u16 smid,
148 desc = "raid_config"; 148 desc = "raid_config";
149 break; 149 break;
150 case MPI2_CONFIG_EXTPAGETYPE_DRIVER_MAPPING: 150 case MPI2_CONFIG_EXTPAGETYPE_DRIVER_MAPPING:
151 desc = "driver_mappping"; 151 desc = "driver_mapping";
152 break; 152 break;
153 } 153 }
154 break; 154 break;
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index d8293f25ca33..aa66361ed44b 100644
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -1049,7 +1049,7 @@ static struct bio *_create_sg_bios(struct osd_request *or,
1049 1049
1050 bio = bio_kmalloc(GFP_KERNEL, numentries); 1050 bio = bio_kmalloc(GFP_KERNEL, numentries);
1051 if (unlikely(!bio)) { 1051 if (unlikely(!bio)) {
1052 OSD_DEBUG("Faild to allocate BIO size=%u\n", numentries); 1052 OSD_DEBUG("Failed to allocate BIO size=%u\n", numentries);
1053 return ERR_PTR(-ENOMEM); 1053 return ERR_PTR(-ENOMEM);
1054 } 1054 }
1055 1055
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 71d3d234f526..9299400d3c9e 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -2089,7 +2089,7 @@ static int qla4_8xxx_minidump_process_rdmem(struct scsi_qla_host *ha,
2089 2089
2090 if (r_addr & 0xf) { 2090 if (r_addr & 0xf) {
2091 DEBUG2(ql4_printk(KERN_INFO, ha, 2091 DEBUG2(ql4_printk(KERN_INFO, ha,
2092 "[%s]: Read addr 0x%x not 16 bytes alligned\n", 2092 "[%s]: Read addr 0x%x not 16 bytes aligned\n",
2093 __func__, r_addr)); 2093 __func__, r_addr));
2094 return QLA_ERROR; 2094 return QLA_ERROR;
2095 } 2095 }
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index db46143c67a6..d36f34e25bed 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -672,7 +672,7 @@ static int iowarrior_release(struct inode *inode, struct file *file)
672 retval = -ENODEV; /* close called more than once */ 672 retval = -ENODEV; /* close called more than once */
673 mutex_unlock(&dev->mutex); 673 mutex_unlock(&dev->mutex);
674 } else { 674 } else {
675 dev->opened = 0; /* we're closeing now */ 675 dev->opened = 0; /* we're closing now */
676 retval = 0; 676 retval = 0;
677 if (dev->present) { 677 if (dev->present) {
678 /* 678 /*
@@ -802,7 +802,7 @@ static int iowarrior_probe(struct usb_interface *interface,
802 /* this one will match for the IOWarrior56 only */ 802 /* this one will match for the IOWarrior56 only */
803 dev->int_out_endpoint = endpoint; 803 dev->int_out_endpoint = endpoint;
804 } 804 }
805 /* we have to check the report_size often, so remember it in the endianess suitable for our machine */ 805 /* we have to check the report_size often, so remember it in the endianness suitable for our machine */
806 dev->report_size = usb_endpoint_maxp(dev->int_in_endpoint); 806 dev->report_size = usb_endpoint_maxp(dev->int_in_endpoint);
807 if ((dev->interface->cur_altsetting->desc.bInterfaceNumber == 0) && 807 if ((dev->interface->cur_altsetting->desc.bInterfaceNumber == 0) &&
808 (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW56)) 808 (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW56))
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 29cad9e0a7a9..e129cf661223 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -705,7 +705,7 @@ static int uss720_probe(struct usb_interface *intf,
705 return -ENODEV; 705 return -ENODEV;
706 } 706 }
707 i = usb_set_interface(usbdev, intf->altsetting->desc.bInterfaceNumber, 2); 707 i = usb_set_interface(usbdev, intf->altsetting->desc.bInterfaceNumber, 2);
708 dev_dbg(&intf->dev, "set inteface result %d\n", i); 708 dev_dbg(&intf->dev, "set interface result %d\n", i);
709 709
710 interface = intf->cur_altsetting; 710 interface = intf->cur_altsetting;
711 711
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 77cb4ffa1fe4..a6780eecff0e 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -1181,7 +1181,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
1181 } 1181 }
1182 1182
1183 /* 1183 /*
1184 * FB_VMODE_SMOOTH_XPAN will be cleared, if one of the folloing 1184 * FB_VMODE_SMOOTH_XPAN will be cleared, if one of the following
1185 * checks failed and smooth scrolling is not possible 1185 * checks failed and smooth scrolling is not possible
1186 */ 1186 */
1187 1187
diff --git a/drivers/video/auo_k190x.c b/drivers/video/auo_k190x.c
index b1f19b266da7..8d2499d1cafb 100644
--- a/drivers/video/auo_k190x.c
+++ b/drivers/video/auo_k190x.c
@@ -1088,7 +1088,7 @@ int auok190x_common_probe(struct platform_device *pdev,
1088 goto err_defio; 1088 goto err_defio;
1089 } 1089 }
1090 1090
1091 dev_dbg(info->device, "targetting %d frames per second\n", board->fps); 1091 dev_dbg(info->device, "targeting %d frames per second\n", board->fps);
1092 info->fbdefio->delay = HZ / board->fps; 1092 info->fbdefio->delay = HZ / board->fps;
1093 info->fbdefio->first_io = auok190xfb_dpy_first_io, 1093 info->fbdefio->first_io = auok190xfb_dpy_first_io,
1094 info->fbdefio->deferred_io = auok190xfb_dpy_deferred_io, 1094 info->fbdefio->deferred_io = auok190xfb_dpy_deferred_io,
diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
index de9d4da0e3da..12bbede3b091 100644
--- a/drivers/video/exynos/exynos_dp_core.c
+++ b/drivers/video/exynos/exynos_dp_core.c
@@ -976,14 +976,14 @@ static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
976 } 976 }
977 977
978 if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) { 978 if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) {
979 dev_err(dp->dev, "faild to get reg for dptx-phy\n"); 979 dev_err(dp->dev, "failed to get reg for dptx-phy\n");
980 ret = -EINVAL; 980 ret = -EINVAL;
981 goto err; 981 goto err;
982 } 982 }
983 983
984 if (of_property_read_u32(dp_phy_node, "samsung,enable-mask", 984 if (of_property_read_u32(dp_phy_node, "samsung,enable-mask",
985 &dp->enable_mask)) { 985 &dp->enable_mask)) {
986 dev_err(dp->dev, "faild to get enable-mask for dptx-phy\n"); 986 dev_err(dp->dev, "failed to get enable-mask for dptx-phy\n");
987 ret = -EINVAL; 987 ret = -EINVAL;
988 goto err; 988 goto err;
989 } 989 }
diff --git a/drivers/video/goldfishfb.c b/drivers/video/goldfishfb.c
index 489abb32fc04..7f6c9e6cfc6c 100644
--- a/drivers/video/goldfishfb.c
+++ b/drivers/video/goldfishfb.c
@@ -148,7 +148,7 @@ static int goldfish_fb_pan_display(struct fb_var_screeninfo *var,
148 wait_event_timeout(fb->wait, 148 wait_event_timeout(fb->wait,
149 fb->base_update_count != base_update_count, HZ / 15); 149 fb->base_update_count != base_update_count, HZ / 15);
150 if (fb->base_update_count == base_update_count) 150 if (fb->base_update_count == base_update_count)
151 pr_err("goldfish_fb_pan_display: timeout wating for base update\n"); 151 pr_err("goldfish_fb_pan_display: timeout waiting for base update\n");
152 return 0; 152 return 0;
153} 153}
154 154
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index 76d9053d88c1..05c2dc3d4bc0 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -862,7 +862,7 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
862 printk(KERN_INFO PFX 862 printk(KERN_INFO PFX
863 "unknown chip production id %i, revision %i\n", 863 "unknown chip production id %i, revision %i\n",
864 prod_id, revision); 864 prod_id, revision);
865 printk(KERN_INFO PFX "please contant maintainer\n"); 865 printk(KERN_INFO PFX "please contact maintainer\n");
866 goto bail; 866 goto bail;
867 } 867 }
868 868
diff --git a/drivers/video/ssd1307fb.c b/drivers/video/ssd1307fb.c
index 395cb6a8d8f3..9ef05d3ef68a 100644
--- a/drivers/video/ssd1307fb.c
+++ b/drivers/video/ssd1307fb.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Driver for the Solomon SSD1307 OLED controler 2 * Driver for the Solomon SSD1307 OLED controller
3 * 3 *
4 * Copyright 2012 Free Electrons 4 * Copyright 2012 Free Electrons
5 * 5 *
@@ -392,6 +392,6 @@ static struct i2c_driver ssd1307fb_driver = {
392 392
393module_i2c_driver(ssd1307fb_driver); 393module_i2c_driver(ssd1307fb_driver);
394 394
395MODULE_DESCRIPTION("FB driver for the Solomon SSD1307 OLED controler"); 395MODULE_DESCRIPTION("FB driver for the Solomon SSD1307 OLED controller");
396MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>"); 396MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
397MODULE_LICENSE("GPL"); 397MODULE_LICENSE("GPL");
diff --git a/fs/befs/btree.c b/fs/befs/btree.c
index a66c9b1136e0..74e397db0b8b 100644
--- a/fs/befs/btree.c
+++ b/fs/befs/btree.c
@@ -436,8 +436,7 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds,
436 goto error; 436 goto error;
437 } 437 }
438 438
439 if ((this_node = (befs_btree_node *) 439 if ((this_node = kmalloc(sizeof (befs_btree_node), GFP_NOFS)) == NULL) {
440 kmalloc(sizeof (befs_btree_node), GFP_NOFS)) == NULL) {
441 befs_error(sb, "befs_btree_read() failed to allocate %u " 440 befs_error(sb, "befs_btree_read() failed to allocate %u "
442 "bytes of memory", sizeof (befs_btree_node)); 441 "bytes of memory", sizeof (befs_btree_node));
443 goto error; 442 goto error;
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index cc2213afdcc7..201c8d3b0f86 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -137,7 +137,7 @@ struct extent_info {
137 rwlock_t ext_lock; /* rwlock for consistency */ 137 rwlock_t ext_lock; /* rwlock for consistency */
138 unsigned int fofs; /* start offset in a file */ 138 unsigned int fofs; /* start offset in a file */
139 u32 blk_addr; /* start block address of the extent */ 139 u32 blk_addr; /* start block address of the extent */
140 unsigned int len; /* lenth of the extent */ 140 unsigned int len; /* length of the extent */
141}; 141};
142 142
143/* 143/*
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 94b8a0c48453..2e3eb2d4fc30 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -222,7 +222,7 @@ static unsigned int get_gc_cost(struct f2fs_sb_info *sbi, unsigned int segno,
222} 222}
223 223
224/* 224/*
225 * This function is called from two pathes. 225 * This function is called from two paths.
226 * One is garbage collection and the other is SSR segment selection. 226 * One is garbage collection and the other is SSR segment selection.
227 * When it is called during GC, it just gets a victim segment 227 * When it is called during GC, it just gets a victim segment
228 * and it does not remove it from dirty seglist. 228 * and it does not remove it from dirty seglist.
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index fea6e582a2ed..62e017743af6 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -82,7 +82,7 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb)
82 82
83 init_once((void *) fi); 83 init_once((void *) fi);
84 84
85 /* Initilize f2fs-specific inode info */ 85 /* Initialize f2fs-specific inode info */
86 fi->vfs_inode.i_version = 1; 86 fi->vfs_inode.i_version = 1;
87 atomic_set(&fi->dirty_dents, 0); 87 atomic_set(&fi->dirty_dents, 0);
88 fi->i_current_depth = 1; 88 fi->i_current_depth = 1;
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index cf3515546739..bd8223595495 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1017,11 +1017,11 @@ do_cancel:
1017 return; 1017 return;
1018 1018
1019trap_recursive: 1019trap_recursive:
1020 print_symbol(KERN_ERR "original: %s\n", gh2->gh_ip); 1020 printk(KERN_ERR "original: %pSR\n", (void *)gh2->gh_ip);
1021 printk(KERN_ERR "pid: %d\n", pid_nr(gh2->gh_owner_pid)); 1021 printk(KERN_ERR "pid: %d\n", pid_nr(gh2->gh_owner_pid));
1022 printk(KERN_ERR "lock type: %d req lock state : %d\n", 1022 printk(KERN_ERR "lock type: %d req lock state : %d\n",
1023 gh2->gh_gl->gl_name.ln_type, gh2->gh_state); 1023 gh2->gh_gl->gl_name.ln_type, gh2->gh_state);
1024 print_symbol(KERN_ERR "new: %s\n", gh->gh_ip); 1024 printk(KERN_ERR "new: %pSR\n", (void *)gh->gh_ip);
1025 printk(KERN_ERR "pid: %d\n", pid_nr(gh->gh_owner_pid)); 1025 printk(KERN_ERR "pid: %d\n", pid_nr(gh->gh_owner_pid));
1026 printk(KERN_ERR "lock type: %d req lock state : %d\n", 1026 printk(KERN_ERR "lock type: %d req lock state : %d\n",
1027 gh->gh_gl->gl_name.ln_type, gh->gh_state); 1027 gh->gh_gl->gl_name.ln_type, gh->gh_state);
diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 88162fae27a5..5bc023ea38ac 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -96,7 +96,8 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)
96 96
97static void gfs2_print_trans(const struct gfs2_trans *tr) 97static void gfs2_print_trans(const struct gfs2_trans *tr)
98{ 98{
99 print_symbol(KERN_WARNING "GFS2: Transaction created at: %s\n", tr->tr_ip); 99 printk(KERN_WARNING "GFS2: Transaction created at: %pSR\n",
100 (void *)tr->tr_ip);
100 printk(KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n", 101 printk(KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n",
101 tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); 102 tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched);
102 printk(KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n", 103 printk(KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n",
diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
index 88f9611a945c..5457745dd4f1 100644
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
@@ -234,7 +234,7 @@ static int __alloc_objio_seg(unsigned numdevs, gfp_t gfp_flags,
234 234
235 lseg = kzalloc(lseg_size, gfp_flags); 235 lseg = kzalloc(lseg_size, gfp_flags);
236 if (unlikely(!lseg)) { 236 if (unlikely(!lseg)) {
237 dprintk("%s: Faild allocation numdevs=%d size=%zd\n", __func__, 237 dprintk("%s: Failed allocation numdevs=%d size=%zd\n", __func__,
238 numdevs, lseg_size); 238 numdevs, lseg_size);
239 return -ENOMEM; 239 return -ENOMEM;
240 } 240 }
diff --git a/fs/nfs/objlayout/objlayout.h b/fs/nfs/objlayout/objlayout.h
index 880ba086be94..87aa1dec6120 100644
--- a/fs/nfs/objlayout/objlayout.h
+++ b/fs/nfs/objlayout/objlayout.h
@@ -114,7 +114,7 @@ extern int objio_alloc_lseg(struct pnfs_layout_segment **outp,
114 gfp_t gfp_flags); 114 gfp_t gfp_flags);
115extern void objio_free_lseg(struct pnfs_layout_segment *lseg); 115extern void objio_free_lseg(struct pnfs_layout_segment *lseg);
116 116
117/* objio_free_result will free these @oir structs recieved from 117/* objio_free_result will free these @oir structs received from
118 * objlayout_{read,write}_done 118 * objlayout_{read,write}_done
119 */ 119 */
120extern void objio_free_result(struct objlayout_io_res *oir); 120extern void objio_free_result(struct objlayout_io_res *oir);
diff --git a/fs/ufs/util.c b/fs/ufs/util.c
index 95425b59ce0a..b6c2f94e041e 100644
--- a/fs/ufs/util.c
+++ b/fs/ufs/util.c
@@ -26,8 +26,7 @@ struct ufs_buffer_head * _ubh_bread_ (struct ufs_sb_private_info * uspi,
26 count = size >> uspi->s_fshift; 26 count = size >> uspi->s_fshift;
27 if (count > UFS_MAXFRAG) 27 if (count > UFS_MAXFRAG)
28 return NULL; 28 return NULL;
29 ubh = (struct ufs_buffer_head *) 29 ubh = kmalloc (sizeof (struct ufs_buffer_head), GFP_NOFS);
30 kmalloc (sizeof (struct ufs_buffer_head), GFP_NOFS);
31 if (!ubh) 30 if (!ubh)
32 return NULL; 31 return NULL;
33 ubh->fragment = fragment; 32 ubh->fragment = fragment;
diff --git a/include/linux/evm.h b/include/linux/evm.h
index 9fc13a760928..1fcb88ca88de 100644
--- a/include/linux/evm.h
+++ b/include/linux/evm.h
@@ -96,5 +96,5 @@ static inline int evm_inode_init_security(struct inode *inode,
96 return 0; 96 return 0;
97} 97}
98 98
99#endif /* CONFIG_EVM_H */ 99#endif /* CONFIG_EVM */
100#endif /* LINUX_EVM_H */ 100#endif /* LINUX_EVM_H */
diff --git a/include/linux/iio/gyro/itg3200.h b/include/linux/iio/gyro/itg3200.h
index c53f16914b77..2a820850f284 100644
--- a/include/linux/iio/gyro/itg3200.h
+++ b/include/linux/iio/gyro/itg3200.h
@@ -149,6 +149,6 @@ static inline void itg3200_buffer_unconfigure(struct iio_dev *indio_dev)
149{ 149{
150} 150}
151 151
152#endif /* CONFIG_IIO_RING_BUFFER */ 152#endif /* CONFIG_IIO_BUFFER */
153 153
154#endif /* ITG3200_H_ */ 154#endif /* ITG3200_H_ */
diff --git a/include/linux/ima.h b/include/linux/ima.h
index 86c361e947b9..1b7f268cddce 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -46,7 +46,7 @@ static inline int ima_module_check(struct file *file)
46 return 0; 46 return 0;
47} 47}
48 48
49#endif /* CONFIG_IMA_H */ 49#endif /* CONFIG_IMA */
50 50
51#ifdef CONFIG_IMA_APPRAISE 51#ifdef CONFIG_IMA_APPRAISE
52extern void ima_inode_post_setattr(struct dentry *dentry); 52extern void ima_inode_post_setattr(struct dentry *dentry);
@@ -72,5 +72,5 @@ static inline int ima_inode_removexattr(struct dentry *dentry,
72{ 72{
73 return 0; 73 return 0;
74} 74}
75#endif /* CONFIG_IMA_APPRAISE_H */ 75#endif /* CONFIG_IMA_APPRAISE */
76#endif /* _LINUX_IMA_H */ 76#endif /* _LINUX_IMA_H */
diff --git a/include/linux/integrity.h b/include/linux/integrity.h
index 66c5fe9550a5..83222cebd47b 100644
--- a/include/linux/integrity.h
+++ b/include/linux/integrity.h
@@ -36,5 +36,5 @@ static inline void integrity_inode_free(struct inode *inode)
36{ 36{
37 return; 37 return;
38} 38}
39#endif /* CONFIG_INTEGRITY_H */ 39#endif /* CONFIG_INTEGRITY */
40#endif /* _LINUX_INTEGRITY_H */ 40#endif /* _LINUX_INTEGRITY_H */
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index c74092eebf5c..5c76737d836b 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -450,7 +450,7 @@ struct zone {
450 * 450 *
451 * present_pages is physical pages existing within the zone, which 451 * present_pages is physical pages existing within the zone, which
452 * is calculated as: 452 * is calculated as:
453 * present_pages = spanned_pages - absent_pages(pags in holes); 453 * present_pages = spanned_pages - absent_pages(pages in holes);
454 * 454 *
455 * managed_pages is present pages managed by the buddy system, which 455 * managed_pages is present pages managed by the buddy system, which
456 * is calculated as (reserved_pages includes pages allocated by the 456 * is calculated as (reserved_pages includes pages allocated by the
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index df85a0c0f2d5..cd89510eab2a 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -576,7 +576,7 @@ for (pos = chunk->subh.fwdtsn_hdr->skip;\
576#define WORD_ROUND(s) (((s)+3)&~3) 576#define WORD_ROUND(s) (((s)+3)&~3)
577 577
578/* Make a new instance of type. */ 578/* Make a new instance of type. */
579#define t_new(type, flags) (type *)kzalloc(sizeof(type), flags) 579#define t_new(type, flags) kzalloc(sizeof(type), flags)
580 580
581/* Compare two timevals. */ 581/* Compare two timevals. */
582#define tv_lt(s, t) \ 582#define tv_lt(s, t) \
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 45c1981c9ca2..5ec42dbd2308 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -867,7 +867,7 @@ int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */
867ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples); 867ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
868const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format); 868const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format);
869int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int frames); 869int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int frames);
870snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsignd, int big_endian); 870snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsigned, int big_endian);
871 871
872void snd_pcm_set_ops(struct snd_pcm * pcm, int direction, struct snd_pcm_ops *ops); 872void snd_pcm_set_ops(struct snd_pcm * pcm, int direction, struct snd_pcm_ops *ops);
873void snd_pcm_set_sync(struct snd_pcm_substream *substream); 873void snd_pcm_set_sync(struct snd_pcm_substream *substream);
diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h
index 425bcfe56c62..8d219470624f 100644
--- a/include/trace/events/timer.h
+++ b/include/trace/events/timer.h
@@ -123,7 +123,7 @@ DEFINE_EVENT(timer_class, timer_cancel,
123 123
124/** 124/**
125 * hrtimer_init - called when the hrtimer is initialized 125 * hrtimer_init - called when the hrtimer is initialized
126 * @timer: pointer to struct hrtimer 126 * @hrtimer: pointer to struct hrtimer
127 * @clockid: the hrtimers clock 127 * @clockid: the hrtimers clock
128 * @mode: the hrtimers mode 128 * @mode: the hrtimers mode
129 */ 129 */
@@ -155,7 +155,7 @@ TRACE_EVENT(hrtimer_init,
155 155
156/** 156/**
157 * hrtimer_start - called when the hrtimer is started 157 * hrtimer_start - called when the hrtimer is started
158 * @timer: pointer to struct hrtimer 158 * @hrtimer: pointer to struct hrtimer
159 */ 159 */
160TRACE_EVENT(hrtimer_start, 160TRACE_EVENT(hrtimer_start,
161 161
@@ -186,8 +186,8 @@ TRACE_EVENT(hrtimer_start,
186); 186);
187 187
188/** 188/**
189 * htimmer_expire_entry - called immediately before the hrtimer callback 189 * hrtimer_expire_entry - called immediately before the hrtimer callback
190 * @timer: pointer to struct hrtimer 190 * @hrtimer: pointer to struct hrtimer
191 * @now: pointer to variable which contains current time of the 191 * @now: pointer to variable which contains current time of the
192 * timers base. 192 * timers base.
193 * 193 *
@@ -234,7 +234,7 @@ DECLARE_EVENT_CLASS(hrtimer_class,
234 234
235/** 235/**
236 * hrtimer_expire_exit - called immediately after the hrtimer callback returns 236 * hrtimer_expire_exit - called immediately after the hrtimer callback returns
237 * @timer: pointer to struct hrtimer 237 * @hrtimer: pointer to struct hrtimer
238 * 238 *
239 * When used in combination with the hrtimer_expire_entry tracepoint we can 239 * When used in combination with the hrtimer_expire_entry tracepoint we can
240 * determine the runtime of the callback function. 240 * determine the runtime of the callback function.
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 9b9aeef8e590..f8feeeca6686 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1761,7 +1761,7 @@ static struct hstate *kobj_to_node_hstate(struct kobject *kobj, int *nidp)
1761 * Unregister hstate attributes from a single node device. 1761 * Unregister hstate attributes from a single node device.
1762 * No-op if no hstate attributes attached. 1762 * No-op if no hstate attributes attached.
1763 */ 1763 */
1764void hugetlb_unregister_node(struct node *node) 1764static void hugetlb_unregister_node(struct node *node)
1765{ 1765{
1766 struct hstate *h; 1766 struct hstate *h;
1767 struct node_hstate *nhs = &node_hstates[node->dev.id]; 1767 struct node_hstate *nhs = &node_hstates[node->dev.id];
@@ -1805,7 +1805,7 @@ static void hugetlb_unregister_all_nodes(void)
1805 * Register hstate attributes for a single node device. 1805 * Register hstate attributes for a single node device.
1806 * No-op if attributes already registered. 1806 * No-op if attributes already registered.
1807 */ 1807 */
1808void hugetlb_register_node(struct node *node) 1808static void hugetlb_register_node(struct node *node)
1809{ 1809{
1810 struct hstate *h; 1810 struct hstate *h;
1811 struct node_hstate *nhs = &node_hstates[node->dev.id]; 1811 struct node_hstate *nhs = &node_hstates[node->dev.id];
diff --git a/mm/memory.c b/mm/memory.c
index f7a1fba85d14..6dc1882fbd72 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -715,11 +715,11 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
715 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y 715 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
716 */ 716 */
717 if (vma->vm_ops) 717 if (vma->vm_ops)
718 print_symbol(KERN_ALERT "vma->vm_ops->fault: %s\n", 718 printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
719 (unsigned long)vma->vm_ops->fault); 719 vma->vm_ops->fault);
720 if (vma->vm_file && vma->vm_file->f_op) 720 if (vma->vm_file && vma->vm_file->f_op)
721 print_symbol(KERN_ALERT "vma->vm_file->f_op->mmap: %s\n", 721 printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
722 (unsigned long)vma->vm_file->f_op->mmap); 722 vma->vm_file->f_op->mmap);
723 dump_stack(); 723 dump_stack();
724 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); 724 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
725} 725}
diff --git a/mm/slab.c b/mm/slab.c
index 856e4a192d25..96079244c860 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2040,11 +2040,9 @@ static void print_objinfo(struct kmem_cache *cachep, void *objp, int lines)
2040 } 2040 }
2041 2041
2042 if (cachep->flags & SLAB_STORE_USER) { 2042 if (cachep->flags & SLAB_STORE_USER) {
2043 printk(KERN_ERR "Last user: [<%p>]", 2043 printk(KERN_ERR "Last user: [<%p>](%pSR)\n",
2044 *dbg_userword(cachep, objp)); 2044 *dbg_userword(cachep, objp),
2045 print_symbol("(%s)", 2045 *dbg_userword(cachep, objp));
2046 (unsigned long)*dbg_userword(cachep, objp));
2047 printk("\n");
2048 } 2046 }
2049 realobj = (char *)objp + obj_offset(cachep); 2047 realobj = (char *)objp + obj_offset(cachep);
2050 size = cachep->object_size; 2048 size = cachep->object_size;
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 1c2e46cb9191..eaee00c61139 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -1403,7 +1403,7 @@ SCTP_STATIC __init int sctp_init(void)
1403 1403
1404 /* Allocate and initialize the endpoint hash table. */ 1404 /* Allocate and initialize the endpoint hash table. */
1405 sctp_ep_hashsize = 64; 1405 sctp_ep_hashsize = 64;
1406 sctp_ep_hashtable = (struct sctp_hashbucket *) 1406 sctp_ep_hashtable =
1407 kmalloc(64 * sizeof(struct sctp_hashbucket), GFP_KERNEL); 1407 kmalloc(64 * sizeof(struct sctp_hashbucket), GFP_KERNEL);
1408 if (!sctp_ep_hashtable) { 1408 if (!sctp_ep_hashtable) {
1409 pr_err("Failed endpoint_hash alloc\n"); 1409 pr_err("Failed endpoint_hash alloc\n");
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 01f7f37a8410..934dec98e2ce 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1175,7 +1175,7 @@ static void snd_mixart_proc_read(struct snd_info_entry *entry,
1175 1175
1176 snd_iprintf(buffer, "\tstreaming : %d\n", streaming); 1176 snd_iprintf(buffer, "\tstreaming : %d\n", streaming);
1177 snd_iprintf(buffer, "\tmailbox : %d\n", mailbox); 1177 snd_iprintf(buffer, "\tmailbox : %d\n", mailbox);
1178 snd_iprintf(buffer, "\tinterrups handling : %d\n\n", interr); 1178 snd_iprintf(buffer, "\tinterrupts handling : %d\n\n", interr);
1179 } 1179 }
1180 } /* endif elf loaded */ 1180 } /* endif elf loaded */
1181} 1181}
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index b47c252ef901..a2d01d10a5dd 100644
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -125,7 +125,7 @@ SOC_ENUM("Equaliser EQ4 Bandwidth", wm8974_enum[9]),
125SOC_ENUM("EQ4 Cut Off", wm8974_enum[10]), 125SOC_ENUM("EQ4 Cut Off", wm8974_enum[10]),
126SOC_SINGLE_TLV("EQ4 Volume", WM8974_EQ4, 0, 24, 1, eq_tlv), 126SOC_SINGLE_TLV("EQ4 Volume", WM8974_EQ4, 0, 24, 1, eq_tlv),
127 127
128SOC_ENUM("Equaliser EQ5 Bandwith", wm8974_enum[11]), 128SOC_ENUM("Equaliser EQ5 Bandwidth", wm8974_enum[11]),
129SOC_ENUM("EQ5 Cut Off", wm8974_enum[12]), 129SOC_ENUM("EQ5 Cut Off", wm8974_enum[12]),
130SOC_SINGLE_TLV("EQ5 Volume", WM8974_EQ5, 0, 24, 1, eq_tlv), 130SOC_SINGLE_TLV("EQ5 Volume", WM8974_EQ5, 0, 24, 1, eq_tlv),
131 131
diff --git a/sound/soc/ux500/Kconfig b/sound/soc/ux500/Kconfig
index 069330d82be5..6b799c0e88df 100644
--- a/sound/soc/ux500/Kconfig
+++ b/sound/soc/ux500/Kconfig
@@ -20,8 +20,8 @@ config SND_SOC_UX500_PLAT_DMA
20 help 20 help
21 Say Y if you want to enable the Ux500 platform-driver. 21 Say Y if you want to enable the Ux500 platform-driver.
22 22
23+config SND_SOC_UX500_MACH_MOP500 23config SND_SOC_UX500_MACH_MOP500
24+ tristate "Machine - MOP500 (Ux500 + AB8500)" 24 tristate "Machine - MOP500 (Ux500 + AB8500)"
25 depends on AB8500_CORE && AB8500_GPADC && SND_SOC_UX500 25 depends on AB8500_CORE && AB8500_GPADC && SND_SOC_UX500
26 select SND_SOC_AB8500_CODEC 26 select SND_SOC_AB8500_CODEC
27 select SND_SOC_UX500_PLAT_MSP_I2S 27 select SND_SOC_UX500_PLAT_MSP_I2S
diff --git a/tools/perf/tests/attr.c b/tools/perf/tests/attr.c
index 038de3ecb8cb..00218f503b2e 100644
--- a/tools/perf/tests/attr.c
+++ b/tools/perf/tests/attr.c
@@ -178,6 +178,6 @@ int test__attr(void)
178 !lstat(path_perf, &st)) 178 !lstat(path_perf, &st))
179 return run_dir(path_dir, path_perf); 179 return run_dir(path_dir, path_perf);
180 180
181 fprintf(stderr, " (ommitted)"); 181 fprintf(stderr, " (omitted)");
182 return 0; 182 return 0;
183} 183}
diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index 88e2f44cb157..0275bab4ea9e 100644
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -1321,7 +1321,7 @@ static int test_pmu_events(void)
1321 1321
1322 ret = stat(path, &st); 1322 ret = stat(path, &st);
1323 if (ret) { 1323 if (ret) {
1324 pr_debug("ommiting PMU cpu events tests\n"); 1324 pr_debug("omitting PMU cpu events tests\n");
1325 return 0; 1325 return 0;
1326 } 1326 }
1327 1327
diff --git a/tools/power/cpupower/debug/i386/intel_gsic.c b/tools/power/cpupower/debug/i386/intel_gsic.c
index 53f5293c9c9a..d032c826d42e 100644
--- a/tools/power/cpupower/debug/i386/intel_gsic.c
+++ b/tools/power/cpupower/debug/i386/intel_gsic.c
@@ -66,7 +66,7 @@ int main (void)
66 printf("ecx = 0x%.8x\n", r.ecx); 66 printf("ecx = 0x%.8x\n", r.ecx);
67 printf("edx = 0x%.8x\n", r.edx); 67 printf("edx = 0x%.8x\n", r.edx);
68 printf("Note also that some BIOS do not support the initial " 68 printf("Note also that some BIOS do not support the initial "
69 "GSIC call, but the newer\nspeeedstep-smi driver may " 69 "GSIC call, but the newer\nspeedstep-smi driver may "
70 "work.\nFor this, you need to pass some arguments to " 70 "work.\nFor this, you need to pass some arguments to "
71 "the speedstep-smi driver:\n"); 71 "the speedstep-smi driver:\n");
72 printf("\tsmi_cmd=0x?? smi_port=0x?? smi_sig=1\n"); 72 printf("\tsmi_cmd=0x?? smi_port=0x?? smi_sig=1\n");