Merge tag 'staging-4.15-rc1' into v4l_for_linus

There are some conflicts between staging and media trees,
as reported by Stephen Rothwell <sfr@canb.auug.org.au>.

So, merge from staging.

* tag 'staging-4.15-rc1': (775 commits)
  staging: lustre: add SPDX identifiers to all lustre files
  staging: greybus: Remove redundant license text
  staging: greybus: add SPDX identifiers to all greybus driver files
  staging: ccree: simplify ioread/iowrite
  staging: ccree: simplify registers access
  staging: ccree: simplify error handling logic
  staging: ccree: remove dead code
  staging: ccree: handle limiting of DMA masks
  staging: ccree: copy IV to DMAable memory
  staging: fbtft: remove redundant initialization of buf
  staging: sm750fb: Fix parameter mistake in poke32
  staging: wilc1000: Fix bssid buffer offset in Txq
  staging: fbtft: fb_ssd1331: fix mirrored display
  staging: android: Fix checkpatch.pl error
  staging: greybus: loopback: convert loopback to use generic async operations
  staging: greybus: operation: add private data with get/set accessors
  staging: greybus: loopback: Fix iteration count on async path
  staging: greybus: loopback: Hold per-connection mutex across operations
  staging: greybus/loopback: use ktime_get() for time intervals
  staging: fsl-dpaa2/eth: Extra headroom in RX buffers
  ...

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

1302 files changed, 12056 insertions, 9850 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 7eead5f97e02..2e3f919485f4 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -522,6 +522,7 @@ Description:
                 Specifies the output powerdown mode.
                 DAC output stage is disconnected from the amplifier and
                 1kohm_to_gnd: connected to ground via an 1kOhm resistor,
+                2.5kohm_to_gnd: connected to ground via a 2.5kOhm resistor,
                 6kohm_to_gnd: connected to ground via a 6kOhm resistor,
                 20kohm_to_gnd: connected to ground via a 20kOhm resistor,
                 90kohm_to_gnd: connected to ground via a 90kOhm resistor,
@@ -1242,9 +1243,9 @@ What:		/sys/.../iio:deviceX/in_distance_raw
 KernelVersion:  4.0
 Contact:        linux-iio@vger.kernel.org
 Description:
-                This attribute is used to read the distance covered by the user
-                since the last reboot while activated. Units after application
-                of scale are meters.
+                This attribute is used to read the measured distance to an object
+                or the distance covered by the user since the last reboot while
+                activated. Units after application of scale are meters.
 
 What:           /sys/bus/iio/devices/iio:deviceX/store_eeprom
 KernelVersion:  3.4.0
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-cros-ec b/Documentation/ABI/testing/sysfs-bus-iio-cros-ec
index 297b9720f024..0e95c2ca105c 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio-cros-ec
+++ b/Documentation/ABI/testing/sysfs-bus-iio-cros-ec
@@ -16,3 +16,13 @@ Description:
                 the motion sensor is placed. For example, in a laptop a motion
                 sensor can be located on the base or on the lid. Current valid
                 values are 'base' and 'lid'.
+
+What:           /sys/bus/iio/devices/iio:deviceX/id
+Date:           Septembre 2017
+KernelVersion:  4.14
+Contact:        linux-iio@vger.kernel.org
+Description:
+                This attribute is exposed by the CrOS EC legacy accelerometer
+                driver and represents the sensor ID as exposed by the EC. This
+                ID is used by the Android sensor service hardware abstraction
+                layer (sensor HAL) through the Android container on ChromeOS.
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935 b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
index 33e96f740639..147d4e8a1403 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
+++ b/Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
@@ -14,3 +14,11 @@ Description:
                 Show or set the gain boost of the amp, from 0-31 range.
                 18 = indoors (default)
                 14 = outdoors
+
+What            /sys/bus/iio/devices/iio:deviceX/noise_level_tripped
+Date:           May 2017
+KernelVersion:  4.13
+Contact:        Matt Ranostay <matt.ranostay@konsulko.com>
+Description:
+                When 1 the noise level is over the trip level and not reporting
+                valid data
diff --git a/Documentation/core-api/kernel-api.rst b/Documentation/core-api/kernel-api.rst
index 8282099e0cbf..5da10184d908 100644
--- a/Documentation/core-api/kernel-api.rst
+++ b/Documentation/core-api/kernel-api.rst
@@ -352,44 +352,30 @@ Read-Copy Update (RCU)
 ----------------------
 
 .. kernel-doc:: include/linux/rcupdate.h
-   :external:
 
 .. kernel-doc:: include/linux/rcupdate_wait.h
-   :external:
 
 .. kernel-doc:: include/linux/rcutree.h
-   :external:
 
 .. kernel-doc:: kernel/rcu/tree.c
-   :external:
 
 .. kernel-doc:: kernel/rcu/tree_plugin.h
-   :external:
 
 .. kernel-doc:: kernel/rcu/tree_exp.h
-   :external:
 
 .. kernel-doc:: kernel/rcu/update.c
-   :external:
 
 .. kernel-doc:: include/linux/srcu.h
-   :external:
 
 .. kernel-doc:: kernel/rcu/srcutree.c
-   :external:
 
 .. kernel-doc:: include/linux/rculist_bl.h
-   :external:
 
 .. kernel-doc:: include/linux/rculist.h
-   :external:
 
 .. kernel-doc:: include/linux/rculist_nulls.h
-   :external:
 
 .. kernel-doc:: include/linux/rcu_sync.h
-   :external:
 
 .. kernel-doc:: kernel/rcu/sync.c
-   :external:
 
diff --git a/Documentation/devicetree/bindings/iio/adc/mcp320x.txt b/Documentation/devicetree/bindings/iio/adc/mcp320x.txt
index bcd3ac8e6e0c..7d64753df949 100644
--- a/Documentation/devicetree/bindings/iio/adc/mcp320x.txt
+++ b/Documentation/devicetree/bindings/iio/adc/mcp320x.txt
@@ -29,15 +29,29 @@ Required properties:
                                 "microchip,mcp3204"
                                 "microchip,mcp3208"
                                 "microchip,mcp3301"
+                                "microchip,mcp3550-50"
+                                "microchip,mcp3550-60"
+                                "microchip,mcp3551"
+                                "microchip,mcp3553"
 
                         NOTE: The use of the compatibles with no vendor prefix
                         is deprecated and only listed because old DT use them.
 
+        - spi-cpha, spi-cpol (boolean):
+                        Either SPI mode (0,0) or (1,1) must be used, so specify
+                        none or both of spi-cpha, spi-cpol.  The MCP3550/1/3
+                        is more efficient in mode (1,1) as only 3 instead of
+                        4 bytes need to be read from the ADC, but not all SPI
+                        masters support it.
+
+        - vref-supply:  Phandle to the external reference voltage supply.
+
 Examples:
 spi_controller {
         mcp3x0x@0 {
                 compatible = "mcp3002";
                 reg = <0>;
                 spi-max-frequency = <1000000>;
+                vref-supply = <&vref_reg>;
         };
 };
diff --git a/Documentation/devicetree/bindings/iio/adc/mt6577_auxadc.txt b/Documentation/devicetree/bindings/iio/adc/mt6577_auxadc.txt
index 64dc4843c180..0df9befdaecc 100644
--- a/Documentation/devicetree/bindings/iio/adc/mt6577_auxadc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/mt6577_auxadc.txt
@@ -12,6 +12,7 @@ for the Thermal Controller which holds a phandle to the AUXADC.
 Required properties:
   - compatible: Should be one of:
     - "mediatek,mt2701-auxadc": For MT2701 family of SoCs
+    - "mediatek,mt2712-auxadc": For MT2712 family of SoCs
     - "mediatek,mt7622-auxadc": For MT7622 family of SoCs
     - "mediatek,mt8173-auxadc": For MT8173 family of SoCs
   - reg: Address range of the AUXADC unit.
diff --git a/Documentation/devicetree/bindings/iio/dac/ds4424.txt b/Documentation/devicetree/bindings/iio/dac/ds4424.txt
new file mode 100644
index 000000000000..eaebbf8dab40
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/dac/ds4424.txt
@@ -0,0 +1,20 @@
+Maxim Integrated DS4422/DS4424 7-bit Sink/Source Current DAC Device Driver
+
+Datasheet publicly available at:
+https://datasheets.maximintegrated.com/en/ds/DS4422-DS4424.pdf
+
+Required properties:
+        - compatible: Should be one of
+                maxim,ds4422
+                maxim,ds4424
+        - reg: Should contain the DAC I2C address
+
+Optional properties:
+        - vcc-supply: Power supply is optional. If not defined, driver will ignore it.
+
+Example:
+        ds4224@10 {
+                compatible = "maxim,ds4424";
+                reg = <0x10>; /* When A0, A1 pins are ground */
+                vcc-supply = <&vcc_3v3>;
+        };
diff --git a/Documentation/devicetree/bindings/iio/dac/ti-dac082s085.txt b/Documentation/devicetree/bindings/iio/dac/ti-dac082s085.txt
new file mode 100644
index 000000000000..9cb0e10df704
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/dac/ti-dac082s085.txt
@@ -0,0 +1,34 @@
+Texas Instruments 8/10/12-bit 2/4-channel DAC driver
+
+Required properties:
+ - compatible:          Must be one of:
+                        "ti,dac082s085"
+                        "ti,dac102s085"
+                        "ti,dac122s085"
+                        "ti,dac084s085"
+                        "ti,dac104s085"
+                        "ti,dac124s085"
+ - reg:                 Chip select number.
+ - spi-cpha, spi-cpol:  SPI mode (0,1) or (1,0) must be used, so specify
+                        either spi-cpha or spi-cpol (but not both).
+ - vref-supply:         Phandle to the external reference voltage supply.
+
+For other required and optional properties of SPI slave nodes please refer to
+../../spi/spi-bus.txt.
+
+Example:
+        vref_2v5_reg: regulator-vref {
+                compatible = "regulator-fixed";
+                regulator-name = "2v5";
+                regulator-min-microvolt = <2500000>;
+                regulator-max-microvolt = <2500000>;
+                regulator-always-on;
+        };
+
+        dac@0 {
+                compatible = "ti,dac082s085";
+                reg = <0>;
+                spi-max-frequency = <40000000>;
+                spi-cpol;
+                vref-supply = <&vref_2v5_reg>;
+        };
diff --git a/Documentation/devicetree/bindings/iio/health/max30100.txt b/Documentation/devicetree/bindings/iio/health/max30100.txt
index 295a9edfa4fd..8d8176459d09 100644
--- a/Documentation/devicetree/bindings/iio/health/max30100.txt
+++ b/Documentation/devicetree/bindings/iio/health/max30100.txt
@@ -20,9 +20,9 @@ Optional properties:
 
 Example:
 
-max30100@057 {
+max30100@57 {
         compatible = "maxim,max30100";
-        reg = <57>;
+        reg = <0x57>;
         maxim,led-current-microamp = <24000 50000>;
         interrupt-parent = <&gpio1>;
         interrupts = <16 2>;
diff --git a/Documentation/devicetree/bindings/iio/health/max30102.txt b/Documentation/devicetree/bindings/iio/health/max30102.txt
index c695e7cbeefb..8629c18b0e78 100644
--- a/Documentation/devicetree/bindings/iio/health/max30102.txt
+++ b/Documentation/devicetree/bindings/iio/health/max30102.txt
@@ -20,7 +20,7 @@ Optional properties:
 
 Example:
 
-max30100@57 {
+max30102@57 {
         compatible = "maxim,max30102";
         reg = <0x57>;
         maxim,red-led-current-microamp = <7000>;
diff --git a/Documentation/devicetree/bindings/iio/proximity/as3935.txt b/Documentation/devicetree/bindings/iio/proximity/as3935.txt
index 38d74314b7ab..b6c1afa6f02d 100644
--- a/Documentation/devicetree/bindings/iio/proximity/as3935.txt
+++ b/Documentation/devicetree/bindings/iio/proximity/as3935.txt
@@ -16,6 +16,10 @@ Optional properties:
         - ams,tuning-capacitor-pf: Calibration tuning capacitor stepping
           value 0 - 120pF. This will require using the calibration data from
           the manufacturer.
+        - ams,nflwdth: Set the noise and watchdog threshold register on
+          startup. This will need to set according to the noise from the
+          MCU board, and possibly the local environment. Refer to the
+          datasheet for the threshold settings.
 
 Example:
 
@@ -27,4 +31,5 @@ as3935@0 {
         interrupt-parent = <&gpio1>;
         interrupts = <16 1>;
         ams,tuning-capacitor-pf = <80>;
+        ams,nflwdth = <0x44>;
 };
diff --git a/Documentation/devicetree/bindings/iio/st-sensors.txt b/Documentation/devicetree/bindings/iio/st-sensors.txt
index 9ec6f5ce54fc..6f626f73417e 100644
--- a/Documentation/devicetree/bindings/iio/st-sensors.txt
+++ b/Documentation/devicetree/bindings/iio/st-sensors.txt
@@ -46,6 +46,8 @@ Accelerometers:
 - st,h3lis331dl-accel
 - st,lng2dm-accel
 - st,lis3l02dq
+- st,lis2dw12
+- st,lis3dhh
 
 Gyroscopes:
 - st,l3g4200d-gyro
@@ -71,3 +73,5 @@ Pressure sensors:
 - st,lps25h-press
 - st,lps331ap-press
 - st,lps22hb-press
+- st,lps33hw
+- st,lps35hw
diff --git a/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt b/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
index 4c29cdab0ea5..5eb108e180fa 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
@@ -99,7 +99,7 @@ Examples:
                         compatible = "arm,gic-v3-its";
                         msi-controller;
                         #msi-cells = <1>;
-                        reg = <0x0 0x2c200000 0 0x200000>;
+                        reg = <0x0 0x2c200000 0 0x20000>;
                 };
         };
 
@@ -124,14 +124,14 @@ Examples:
                         compatible = "arm,gic-v3-its";
                         msi-controller;
                         #msi-cells = <1>;
-                        reg = <0x0 0x2c200000 0 0x200000>;
+                        reg = <0x0 0x2c200000 0 0x20000>;
                 };
 
                 gic-its@2c400000 {
                         compatible = "arm,gic-v3-its";
                         msi-controller;
                         #msi-cells = <1>;
-                        reg = <0x0 0x2c400000 0 0x200000>;
+                        reg = <0x0 0x2c400000 0 0x20000>;
                 };
 
                 ppi-partitions {
diff --git a/Documentation/process/index.rst b/Documentation/process/index.rst
index 82fc399fcd33..61e43cc3ed17 100644
--- a/Documentation/process/index.rst
+++ b/Documentation/process/index.rst
@@ -25,6 +25,7 @@ Below are the essential guides that every developer should read.
    submitting-patches
    coding-style
    email-clients
+   kernel-enforcement-statement
 
 Other guides to the community that are of interest to most developers are: 
 
diff --git a/Documentation/process/kernel-enforcement-statement.rst b/Documentation/process/kernel-enforcement-statement.rst
new file mode 100644
index 000000000000..1e23d4227337
--- /dev/null
+++ b/Documentation/process/kernel-enforcement-statement.rst
@@ -0,0 +1,147 @@
+Linux Kernel Enforcement Statement
+----------------------------------
+
+As developers of the Linux kernel, we have a keen interest in how our software
+is used and how the license for our software is enforced.  Compliance with the
+reciprocal sharing obligations of GPL-2.0 is critical to the long-term
+sustainability of our software and community.
+
+Although there is a right to enforce the separate copyright interests in the
+contributions made to our community, we share an interest in ensuring that
+individual enforcement actions are conducted in a manner that benefits our
+community and do not have an unintended negative impact on the health and
+growth of our software ecosystem.  In order to deter unhelpful enforcement
+actions, we agree that it is in the best interests of our development
+community to undertake the following commitment to users of the Linux kernel
+on behalf of ourselves and any successors to our copyright interests:
+
+    Notwithstanding the termination provisions of the GPL-2.0, we agree that
+    it is in the best interests of our development community to adopt the
+    following provisions of GPL-3.0 as additional permissions under our
+    license with respect to any non-defensive assertion of rights under the
+    license.
+
+        However, if you cease all violation of this License, then your license
+        from a particular copyright holder is reinstated (a) provisionally,
+        unless and until the copyright holder explicitly and finally
+        terminates your license, and (b) permanently, if the copyright holder
+        fails to notify you of the violation by some reasonable means prior to
+        60 days after the cessation.
+
+        Moreover, your license from a particular copyright holder is
+        reinstated permanently if the copyright holder notifies you of the
+        violation by some reasonable means, this is the first time you have
+        received notice of violation of this License (for any work) from that
+        copyright holder, and you cure the violation prior to 30 days after
+        your receipt of the notice.
+
+Our intent in providing these assurances is to encourage more use of the
+software.  We want companies and individuals to use, modify and distribute
+this software.  We want to work with users in an open and transparent way to
+eliminate any uncertainty about our expectations regarding compliance or
+enforcement that might limit adoption of our software.  We view legal action
+as a last resort, to be initiated only when other community efforts have
+failed to resolve the problem.
+
+Finally, once a non-compliance issue is resolved, we hope the user will feel
+welcome to join us in our efforts on this project.  Working together, we will
+be stronger.
+
+Except where noted below, we speak only for ourselves, and not for any company
+we might work for today, have in the past, or will in the future.
+
+  - Bjorn Andersson (Linaro)
+  - Andrea Arcangeli (Red Hat)
+  - Neil Armstrong
+  - Jens Axboe
+  - Pablo Neira Ayuso
+  - Khalid Aziz
+  - Ralf Baechle
+  - Felipe Balbi
+  - Arnd Bergmann
+  - Ard Biesheuvel
+  - Paolo Bonzini (Red Hat)
+  - Christian Borntraeger
+  - Mark Brown (Linaro)
+  - Paul Burton
+  - Javier Martinez Canillas
+  - Rob Clark
+  - Jonathan Corbet
+  - Vivien Didelot (Savoir-faire Linux)
+  - Hans de Goede (Red Hat)
+  - Mel Gorman (SUSE)
+  - Sven Eckelmann
+  - Alex Elder (Linaro)
+  - Fabio Estevam
+  - Larry Finger
+  - Bhumika Goyal
+  - Andy Gross
+  - Juergen Gross
+  - Shawn Guo
+  - Ulf Hansson
+  - Tejun Heo
+  - Rob Herring
+  - Masami Hiramatsu
+  - Michal Hocko
+  - Simon Horman
+  - Johan Hovold (Hovold Consulting AB)
+  - Christophe JAILLET
+  - Olof Johansson
+  - Lee Jones (Linaro)
+  - Heiner Kallweit
+  - Srinivas Kandagatla
+  - Jan Kara
+  - Shuah Khan (Samsung)
+  - David Kershner
+  - Jaegeuk Kim
+  - Namhyung Kim
+  - Colin Ian King
+  - Jeff Kirsher
+  - Greg Kroah-Hartman (Linux Foundation)
+  - Christian König
+  - Vinod Koul
+  - Krzysztof Kozlowski
+  - Viresh Kumar
+  - Aneesh Kumar K.V
+  - Julia Lawall
+  - Doug Ledford (Red Hat)
+  - Chuck Lever (Oracle)
+  - Daniel Lezcano
+  - Shaohua Li
+  - Xin Long (Red Hat)
+  - Tony Luck
+  - Mike Marshall
+  - Chris Mason
+  - Paul E. McKenney
+  - David S. Miller
+  - Ingo Molnar
+  - Kuninori Morimoto
+  - Borislav Petkov
+  - Jiri Pirko
+  - Josh Poimboeuf
+  - Sebastian Reichel (Collabora)
+  - Guenter Roeck
+  - Joerg Roedel
+  - Leon Romanovsky
+  - Steven Rostedt (VMware)
+  - Ivan Safonov
+  - Ivan Safonov
+  - Anna Schumaker
+  - Jes Sorensen
+  - K.Y. Srinivasan
+  - Heiko Stuebner
+  - Jiri Kosina (SUSE)
+  - Dmitry Torokhov
+  - Linus Torvalds
+  - Thierry Reding
+  - Rik van Riel
+  - Geert Uytterhoeven (Glider bvba)
+  - Daniel Vetter
+  - Linus Walleij
+  - Richard Weinberger
+  - Dan Williams
+  - Rafael J. Wysocki
+  - Arvind Yadav
+  - Masahiro Yamada
+  - Wei Yongjun
+  - Lv Zheng
diff --git a/MAINTAINERS b/MAINTAINERS
index adbf69306e9e..ff987d898609 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9230,7 +9230,6 @@ F:	include/linux/isicom.h
 MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
 M:      Bin Liu <b-liu@ti.com>
 L:      linux-usb@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:      Maintained
 F:      drivers/usb/musb/
 
@@ -10577,6 +10576,8 @@ M:	Peter Zijlstra <peterz@infradead.org>
 M:      Ingo Molnar <mingo@redhat.com>
 M:      Arnaldo Carvalho de Melo <acme@kernel.org>
 R:      Alexander Shishkin <alexander.shishkin@linux.intel.com>
+R:      Jiri Olsa <jolsa@redhat.com>
+R:      Namhyung Kim <namhyung@kernel.org>
 L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 S:      Supported
diff --git a/Makefile b/Makefile
index 46bfb0ed2257..01875d606f44 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 14
 SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
 NAME = Fearless Coyote
 
 # *DOCUMENTATION*
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 47d3a1ab08d2..817e5cfef83a 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -131,7 +131,7 @@ endif
 KBUILD_CFLAGS   +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
 KBUILD_AFLAGS   +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float
 
-CHECKFLAGS      += -D__arm__
+CHECKFLAGS      += -D__arm__ -m32
 
 #Default value
 head-y          := arch/arm/kernel/head$(MMUEXT).o
diff --git a/arch/arm/boot/compressed/debug.S b/arch/arm/boot/compressed/debug.S
index 5392ee63338f..8f6e37177de1 100644
--- a/arch/arm/boot/compressed/debug.S
+++ b/arch/arm/boot/compressed/debug.S
@@ -23,7 +23,11 @@ ENTRY(putc)
         strb    r0, [r1]
         mov     r0, #0x03               @ SYS_WRITEC
    ARM( svc     #0x123456       )
+#ifdef CONFIG_CPU_V7M
+ THUMB( bkpt    #0xab           )
+#else
  THUMB( svc     #0xab           )
+#endif
         mov     pc, lr
         .align  2
 1:      .word   _GLOBAL_OFFSET_TABLE_ - .
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 7ff0811e61db..4960722aab32 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -178,7 +178,7 @@
                         };
 
                         i2c0: i2c@11000 {
-                                compatible = "marvell,mv64xxx-i2c";
+                                compatible = "marvell,mv78230-a0-i2c", "marvell,mv64xxx-i2c";
                                 reg = <0x11000 0x20>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
@@ -189,7 +189,7 @@
                         };
 
                         i2c1: i2c@11100 {
-                                compatible = "marvell,mv64xxx-i2c";
+                                compatible = "marvell,mv78230-a0-i2c", "marvell,mv64xxx-i2c";
                                 reg = <0x11100 0x20>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
diff --git a/arch/arm/boot/dts/at91-sama5d27_som1.dtsi b/arch/arm/boot/dts/at91-sama5d27_som1.dtsi
index 63a5af898165..cf0087b4c9e1 100644
--- a/arch/arm/boot/dts/at91-sama5d27_som1.dtsi
+++ b/arch/arm/boot/dts/at91-sama5d27_som1.dtsi
@@ -67,8 +67,8 @@
                                 pinctrl-0 = <&pinctrl_macb0_default>;
                                 phy-mode = "rmii";
 
-                                ethernet-phy@1 {
-                                        reg = <0x1>;
+                                ethernet-phy@0 {
+                                        reg = <0x0>;
                                         interrupt-parent = <&pioA>;
                                         interrupts = <PIN_PD31 IRQ_TYPE_LEVEL_LOW>;
                                         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
index c7e9ccf2bc87..cbc26001247b 100644
--- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
@@ -309,7 +309,7 @@
                                 vddana-supply = <&vdd_3v3_lp_reg>;
                                 vref-supply = <&vdd_3v3_lp_reg>;
                                 pinctrl-names = "default";
-                                pinctrl-0 = <&pinctrl_adc_default>;
+                                pinctrl-0 = <&pinctrl_adc_default &pinctrl_adtrg_default>;
                                 status = "okay";
                         };
 
@@ -340,6 +340,20 @@
                                         bias-disable;
                                 };
 
+                                /*
+                                 * The ADTRG pin can work on any edge type.
+                                 * In here it's being pulled up, so need to
+                                 * connect it to ground to get an edge e.g.
+                                 * Trigger can be configured on falling, rise
+                                 * or any edge, and the pull-up can be changed
+                                 * to pull-down or left floating according to
+                                 * needs.
+                                 */
+                                pinctrl_adtrg_default: adtrg_default {
+                                        pinmux = <PIN_PD31__ADTRG>;
+                                        bias-pull-up;
+                                };
+
                                 pinctrl_charger_chglev: charger_chglev {
                                         pinmux = <PIN_PA12__GPIO>;
                                         bias-disable;
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index 82651c3eb682..b8565fc33eea 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -18,12 +18,9 @@
         compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
         model = "Raspberry Pi Zero W";
 
-        /* Needed by firmware to properly init UARTs */
-        aliases {
-                uart0 = "/soc/serial@7e201000";
-                uart1 = "/soc/serial@7e215040";
-                serial0 = "/soc/serial@7e201000";
-                serial1 = "/soc/serial@7e215040";
+        chosen {
+                /* 8250 auxiliary UART instead of pl011 */
+                stdout-path = "serial1:115200n8";
         };
 
         leds {
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index 20725ca487f3..c71a0d73d2a2 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -8,6 +8,11 @@
         compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
         model = "Raspberry Pi 3 Model B";
 
+        chosen {
+                /* 8250 auxiliary UART instead of pl011 */
+                stdout-path = "serial1:115200n8";
+        };
+
         memory {
                 reg = <0 0x40000000>;
         };
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 431dcfc900c0..013431e3d7c3 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -20,8 +20,13 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                serial0 = &uart0;
+                serial1 = &uart1;
+        };
+
         chosen {
-                bootargs = "earlyprintk console=ttyAMA0";
+                stdout-path = "serial0:115200n8";
         };
 
         thermal-zones {
diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi
index c68e8d430234..f0d178c77153 100644
--- a/arch/arm/boot/dts/gemini.dtsi
+++ b/arch/arm/boot/dts/gemini.dtsi
@@ -145,11 +145,12 @@
                 };
 
                 watchdog@41000000 {
-                        compatible = "cortina,gemini-watchdog";
+                        compatible = "cortina,gemini-watchdog", "faraday,ftwdt010";
                         reg = <0x41000000 0x1000>;
                         interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
                         resets = <&syscon GEMINI_RESET_WDOG>;
                         clocks = <&syscon GEMINI_CLK_APB>;
+                        clock-names = "PCLK";
                 };
 
                 uart0: serial@42000000 {
diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index f46814a7ea44..4d308d17f040 100644
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -144,10 +144,10 @@
                 interrupt-names = "msi";
                 #interrupt-cells = <1>;
                 interrupt-map-mask = <0 0 0 0x7>;
-                interrupt-map = <0 0 0 1 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                                <0 0 0 2 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                                <0 0 0 3 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                                <0 0 0 4 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-map = <0 0 0 1 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                <0 0 0 2 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                <0 0 0 3 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                <0 0 0 4 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&clks IMX7D_PCIE_CTRL_ROOT_CLK>,
                          <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>,
                          <&clks IMX7D_PCIE_PHY_ROOT_CLK>;
diff --git a/arch/arm/boot/dts/moxart.dtsi b/arch/arm/boot/dts/moxart.dtsi
index 1f4c795d3f72..da7b3237bfe9 100644
--- a/arch/arm/boot/dts/moxart.dtsi
+++ b/arch/arm/boot/dts/moxart.dtsi
@@ -87,9 +87,10 @@
                 };
 
                 watchdog: watchdog@98500000 {
-                        compatible = "moxa,moxart-watchdog";
+                        compatible = "moxa,moxart-watchdog", "faraday,ftwdt010";
                         reg = <0x98500000 0x10>;
                         clocks = <&clk_apb>;
+                        clock-names = "PCLK";
                 };
 
                 sdhci: sdhci@98e00000 {
diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 38d2216c7ead..b1a26b42d190 100644
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -1430,6 +1430,7 @@
                                 atmel,min-sample-rate-hz = <200000>;
                                 atmel,max-sample-rate-hz = <20000000>;
                                 atmel,startup-time-ms = <4>;
+                                atmel,trigger-edge-type = <IRQ_TYPE_EDGE_RISING>;
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index b147cb0dc14b..eef072a21acc 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -311,8 +311,8 @@
                                         #size-cells = <0>;
                                         reg = <0>;
 
-                                        tcon1_in_drc1: endpoint@0 {
-                                                reg = <0>;
+                                        tcon1_in_drc1: endpoint@1 {
+                                                reg = <1>;
                                                 remote-endpoint = <&drc1_out_tcon1>;
                                         };
                                 };
@@ -1012,8 +1012,8 @@
                                         #size-cells = <0>;
                                         reg = <1>;
 
-                                        be1_out_drc1: endpoint@0 {
-                                                reg = <0>;
+                                        be1_out_drc1: endpoint@1 {
+                                                reg = <1>;
                                                 remote-endpoint = <&drc1_in_be1>;
                                         };
                                 };
@@ -1042,8 +1042,8 @@
                                         #size-cells = <0>;
                                         reg = <0>;
 
-                                        drc1_in_be1: endpoint@0 {
-                                                reg = <0>;
+                                        drc1_in_be1: endpoint@1 {
+                                                reg = <1>;
                                                 remote-endpoint = <&be1_out_drc1>;
                                         };
                                 };
@@ -1053,8 +1053,8 @@
                                         #size-cells = <0>;
                                         reg = <1>;
 
-                                        drc1_out_tcon1: endpoint@0 {
-                                                reg = <0>;
+                                        drc1_out_tcon1: endpoint@1 {
+                                                reg = <1>;
                                                 remote-endpoint = <&tcon1_in_drc1>;
                                         };
                                 };
diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig
index d5e1370ec303..830e817a028a 100644
--- a/arch/arm/configs/pxa_defconfig
+++ b/arch/arm/configs/pxa_defconfig
@@ -219,7 +219,8 @@ CONFIG_AD525X_DPOT_I2C=m
 CONFIG_ICS932S401=m
 CONFIG_APDS9802ALS=m
 CONFIG_ISL29003=m
-CONFIG_TI_DAC7512=m
+CONFIG_IIO=m
+CONFIG_AD5446=m
 CONFIG_EEPROM_AT24=m
 CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_IDE=m
diff --git a/arch/arm/configs/raumfeld_defconfig b/arch/arm/configs/raumfeld_defconfig
index e3dc80ead465..77a56c23c6ef 100644
--- a/arch/arm/configs/raumfeld_defconfig
+++ b/arch/arm/configs/raumfeld_defconfig
@@ -37,7 +37,8 @@ CONFIG_MTD_NAND_PXA3xx=y
 CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_ISL29003=y
-CONFIG_TI_DAC7512=y
+CONFIG_IIO=y
+CONFIG_AD5446=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index ea9646cc2a0e..0a498cb3fad8 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -115,7 +115,11 @@ ENTRY(printascii)
                 mov     r1, r0
                 mov     r0, #0x04               @ SYS_WRITE0
         ARM(    svc     #0x123456       )
+#ifdef CONFIG_CPU_V7M
+        THUMB(  bkpt    #0xab           )
+#else
         THUMB(  svc     #0xab           )
+#endif
                 ret     lr
 ENDPROC(printascii)
 
@@ -124,7 +128,11 @@ ENTRY(printch)
                 strb    r0, [r1]
                 mov     r0, #0x03               @ SYS_WRITEC
         ARM(    svc     #0x123456       )
+#ifdef CONFIG_CPU_V7M
+        THUMB(  bkpt    #0xab           )
+#else
         THUMB(  svc     #0xab           )
+#endif
                 ret     lr
 ENDPROC(printch)
 
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 71a34e8c345a..57058ac46f49 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -32,6 +32,7 @@
 #include <asm/mach/arch.h>
 
 #include "db8500-regs.h"
+#include "pm_domains.h"
 
 static int __init ux500_l2x0_unlock(void)
 {
@@ -157,6 +158,9 @@ static const struct of_device_id u8500_local_bus_nodes[] = {
 
 static void __init u8500_init_machine(void)
 {
+        /* Initialize ux500 power domains */
+        ux500_pm_domains_init();
+
         /* automatically probe child nodes of dbx5x0 devices */
         if (of_machine_is_compatible("st-ericsson,u8540"))
                 of_platform_populate(NULL, u8500_local_bus_nodes,
diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
index a970e7fcba9e..f6c33a0c1c61 100644
--- a/arch/arm/mach-ux500/pm.c
+++ b/arch/arm/mach-ux500/pm.c
@@ -19,7 +19,6 @@
 #include <linux/of_address.h>
 
 #include "db8500-regs.h"
-#include "pm_domains.h"
 
 /* ARM WFI Standby signal register */
 #define PRCM_ARM_WFI_STANDBY    (prcmu_base + 0x130)
@@ -203,7 +202,4 @@ void __init ux500_pm_init(u32 phy_base, u32 size)
 
         /* Set up ux500 suspend callbacks. */
         suspend_set_ops(UX500_SUSPEND_OPS);
-
-        /* Initialize ux500 power domains */
-        ux500_pm_domains_init();
 }
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
index 3b8e728cc944..91537d90f5f5 100644
--- a/arch/arm/mm/nommu.c
+++ b/arch/arm/mm/nommu.c
@@ -344,6 +344,11 @@ void __init arm_mm_memblock_reserve(void)
          * reserved here.
          */
 #endif
+        /*
+         * In any case, always ensure address 0 is never used as many things
+         * get very confused if 0 is returned as a legitimate address.
+         */
+        memblock_reserve(0, 1);
 }
 
 void __init adjust_lowmem_bounds(void)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
index caf8b6fbe5e3..d06e34b5d192 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
@@ -61,13 +61,6 @@
         chosen {
                 stdout-path = "serial0:115200n8";
         };
-
-        reg_vcc3v3: vcc3v3 {
-                compatible = "regulator-fixed";
-                regulator-name = "vcc3v3";
-                regulator-min-microvolt = <3300000>;
-                regulator-max-microvolt = <3300000>;
-        };
 };
 
 &ehci0 {
@@ -91,7 +84,7 @@
 &mmc0 {
         pinctrl-names = "default";
         pinctrl-0 = <&mmc0_pins>;
-        vmmc-supply = <&reg_vcc3v3>;
+        vmmc-supply = <&reg_dcdc1>;
         cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
         cd-inverted;
         disable-wp;
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index 8263a8a504a8..f2aa2a81de4d 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -336,7 +336,7 @@
                                 /* non-prefetchable memory */
                                 0x82000000 0 0xf6000000 0  0xf6000000 0 0xf00000>;
                         interrupt-map-mask = <0 0 0 0>;
-                        interrupt-map = <0 0 0 0 &cpm_icu 0 ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-map = <0 0 0 0 &cpm_icu ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
                         interrupts = <ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
                         num-lanes = <1>;
                         clocks = <&cpm_clk 1 13>;
@@ -362,7 +362,7 @@
                                 /* non-prefetchable memory */
                                 0x82000000 0 0xf7000000 0  0xf7000000 0 0xf00000>;
                         interrupt-map-mask = <0 0 0 0>;
-                        interrupt-map = <0 0 0 0 &cpm_icu 0 ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-map = <0 0 0 0 &cpm_icu ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
                         interrupts = <ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
 
                         num-lanes = <1>;
@@ -389,7 +389,7 @@
                                 /* non-prefetchable memory */
                                 0x82000000 0 0xf8000000 0  0xf8000000 0 0xf00000>;
                         interrupt-map-mask = <0 0 0 0>;
-                        interrupt-map = <0 0 0 0 &cpm_icu 0 ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-map = <0 0 0 0 &cpm_icu ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
                         interrupts = <ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
 
                         num-lanes = <1>;
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index b71ee6c83668..4fe70323abb3 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -335,7 +335,7 @@
                                 /* non-prefetchable memory */
                                 0x82000000 0 0xfa000000 0  0xfa000000 0 0xf00000>;
                         interrupt-map-mask = <0 0 0 0>;
-                        interrupt-map = <0 0 0 0 &cps_icu 0 ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-map = <0 0 0 0 &cps_icu ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
                         interrupts = <ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
                         num-lanes = <1>;
                         clocks = <&cps_clk 1 13>;
@@ -361,7 +361,7 @@
                                 /* non-prefetchable memory */
                                 0x82000000 0 0xfb000000 0  0xfb000000 0 0xf00000>;
                         interrupt-map-mask = <0 0 0 0>;
-                        interrupt-map = <0 0 0 0 &cps_icu 0 ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-map = <0 0 0 0 &cps_icu ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
                         interrupts = <ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
 
                         num-lanes = <1>;
@@ -388,7 +388,7 @@
                                 /* non-prefetchable memory */
                                 0x82000000 0 0xfc000000 0  0xfc000000 0 0xf00000>;
                         interrupt-map-mask = <0 0 0 0>;
-                        interrupt-map = <0 0 0 0 &cps_icu 0 ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-map = <0 0 0 0 &cps_icu ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
                         interrupts = <ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
 
                         num-lanes = <1>;
diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
index 4786c67b5e65..d9d885006a8e 100644
--- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
@@ -62,6 +62,7 @@
                 brightness-levels = <256 128 64 16 8 4 0>;
                 default-brightness-level = <6>;
 
+                power-supply = <&reg_12v>;
                 enable-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;
         };
 
@@ -83,6 +84,15 @@
                 regulator-always-on;
         };
 
+        reg_12v: regulator2 {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-12V";
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+
         rsnd_ak4613: sound {
                 compatible = "simple-audio-card";
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 6d615cb6e64d..41d61840fb99 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -582,7 +582,7 @@
         vop_mmu: iommu@ff373f00 {
                 compatible = "rockchip,iommu";
                 reg = <0x0 0xff373f00 0x0 0x100>;
-                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>;
+                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
                 interrupt-names = "vop_mmu";
                 #iommu-cells = <0>;
                 status = "disabled";
diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index 19fbaa5e7bdd..1070c8264c13 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -740,7 +740,7 @@
         iep_mmu: iommu@ff900800 {
                 compatible = "rockchip,iommu";
                 reg = <0x0 0xff900800 0x0 0x100>;
-                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH 0>;
+                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
                 interrupt-names = "iep_mmu";
                 #iommu-cells = <0>;
                 status = "disabled";
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
index 7fd4bfcaa38e..fef82274a39d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
@@ -371,10 +371,10 @@
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <3300000>;
+                                regulator-max-microvolt = <3000000>;
                                 regulator-state-mem {
                                         regulator-on-in-suspend;
-                                        regulator-suspend-microvolt = <3300000>;
+                                        regulator-suspend-microvolt = <3000000>;
                                 };
                         };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index 53ff3d191a1d..910628d18add 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -325,12 +325,12 @@
                         vcc_sd: LDO_REG4 {
                                 regulator-name = "vcc_sd";
                                 regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <3300000>;
+                                regulator-max-microvolt = <3000000>;
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-state-mem {
                                         regulator-on-in-suspend;
-                                        regulator-suspend-microvolt = <3300000>;
+                                        regulator-suspend-microvolt = <3000000>;
                                 };
                         };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index 6c30bb02210d..0f873c897d0d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -315,10 +315,10 @@
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <3300000>;
+                                regulator-max-microvolt = <3000000>;
                                 regulator-state-mem {
                                         regulator-on-in-suspend;
-                                        regulator-suspend-microvolt = <3300000>;
+                                        regulator-suspend-microvolt = <3000000>;
                                 };
                         };
 
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c
index c6d6272a934f..7baa2265d439 100644
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
@@ -35,12 +35,12 @@ EXPORT_SYMBOL(memset);
 EXPORT_SYMBOL(__xchg8);
 EXPORT_SYMBOL(__xchg32);
 EXPORT_SYMBOL(__cmpxchg_u32);
+EXPORT_SYMBOL(__cmpxchg_u64);
 #ifdef CONFIG_SMP
 EXPORT_SYMBOL(__atomic_hash);
 #endif
 #ifdef CONFIG_64BIT
 EXPORT_SYMBOL(__xchg64);
-EXPORT_SYMBOL(__cmpxchg_u64);
 #endif
 
 #include <linux/uaccess.h>
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 23de307c3052..41e60a9c7db2 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -742,7 +742,7 @@ lws_compare_and_swap_2:
 10:     ldd     0(%r25), %r25
 11:     ldd     0(%r24), %r24
 #else
-        /* Load new value into r22/r23 - high/low */
+        /* Load old value into r22/r23 - high/low */
 10:     ldw     0(%r25), %r22
 11:     ldw     4(%r25), %r23
         /* Load new value into fr4 for atomic store later */
@@ -834,11 +834,11 @@ cas2_action:
         copy    %r0, %r28
 #else
         /* Compare first word */
-19:     ldw,ma  0(%r26), %r29
+19:     ldw     0(%r26), %r29
         sub,=   %r29, %r22, %r0
         b,n     cas2_end
         /* Compare second word */
-20:     ldw,ma  4(%r26), %r29
+20:     ldw     4(%r26), %r29
         sub,=   %r29, %r23, %r0
         b,n     cas2_end
         /* Perform the store */
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 2d956aa0a38a..8c0105a49839 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -253,7 +253,10 @@ static int __init init_cr16_clocksource(void)
                 cpu0_loc = per_cpu(cpu_data, 0).cpu_loc;
 
                 for_each_online_cpu(cpu) {
-                        if (cpu0_loc == per_cpu(cpu_data, cpu).cpu_loc)
+                        if (cpu == 0)
+                                continue;
+                        if ((cpu0_loc != 0) &&
+                            (cpu0_loc == per_cpu(cpu_data, cpu).cpu_loc))
                                 continue;
 
                         clocksource_cr16.name = "cr16_unstable";
diff --git a/arch/s390/configs/zfcpdump_defconfig b/arch/s390/configs/zfcpdump_defconfig
index afa46a7406ea..04e042edbab7 100644
--- a/arch/s390/configs/zfcpdump_defconfig
+++ b/arch/s390/configs/zfcpdump_defconfig
@@ -27,6 +27,7 @@ CONFIG_NET=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_BLK_DEV_RAM=y
 # CONFIG_BLK_DEV_XPRAM is not set
 # CONFIG_DCSSBLK is not set
 # CONFIG_DASD is not set
@@ -59,6 +60,7 @@ CONFIG_CONFIGFS_FS=y
 # CONFIG_NETWORK_FILESYSTEMS is not set
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_PANIC_ON_OOPS=y
 # CONFIG_SCHED_DEBUG is not set
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 1cee6753d47a..495ff6959dec 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -293,7 +293,10 @@ static void pcpu_attach_task(struct pcpu *pcpu, struct task_struct *tsk)
         lc->lpp = LPP_MAGIC;
         lc->current_pid = tsk->pid;
         lc->user_timer = tsk->thread.user_timer;
+        lc->guest_timer = tsk->thread.guest_timer;
         lc->system_timer = tsk->thread.system_timer;
+        lc->hardirq_timer = tsk->thread.hardirq_timer;
+        lc->softirq_timer = tsk->thread.softirq_timer;
         lc->steal_timer = 0;
 }
 
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index c40a95c33bb8..322d25ae23ab 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -110,6 +110,10 @@ build_mmio_write(__writeq, "q", unsigned long, "r", )
 
 #endif
 
+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
+extern int valid_phys_addr_range(phys_addr_t addr, size_t size);
+extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
+
 /**
  *      virt_to_phys    -       map virtual addresses to physical
  *      @address: address to remap
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index d362161d3291..c4aed0de565e 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -82,12 +82,21 @@ static inline u64 inc_mm_tlb_gen(struct mm_struct *mm)
 #define __flush_tlb_single(addr) __native_flush_tlb_single(addr)
 #endif
 
-/*
- * If tlb_use_lazy_mode is true, then we try to avoid switching CR3 to point
- * to init_mm when we switch to a kernel thread (e.g. the idle thread).  If
- * it's false, then we immediately switch CR3 when entering a kernel thread.
- */
-DECLARE_STATIC_KEY_TRUE(tlb_use_lazy_mode);
+static inline bool tlb_defer_switch_to_init_mm(void)
+{
+        /*
+         * If we have PCID, then switching to init_mm is reasonably
+         * fast.  If we don't have PCID, then switching to init_mm is
+         * quite slow, so we try to defer it in the hopes that we can
+         * avoid it entirely.  The latter approach runs the risk of
+         * receiving otherwise unnecessary IPIs.
+         *
+         * This choice is just a heuristic.  The tlb code can handle this
+         * function returning true or false regardless of whether we have
+         * PCID.
+         */
+        return !static_cpu_has(X86_FEATURE_PCID);
+}
 
 /*
  * 6 because 6 should be plenty and struct tlb_state will fit in
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 24f749324c0f..9990a71e311f 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -831,7 +831,6 @@ static int __cache_amd_cpumap_setup(unsigned int cpu, int index,
         } else if (boot_cpu_has(X86_FEATURE_TOPOEXT)) {
                 unsigned int apicid, nshared, first, last;
 
-                this_leaf = this_cpu_ci->info_list + index;
                 nshared = base->eax.split.num_threads_sharing + 1;
                 apicid = cpu_data(cpu).apicid;
                 first = apicid - (apicid % nshared);
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index 8f7a9bbad514..7dbcb7adf797 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -34,6 +34,7 @@
 #include <linux/mm.h>
 
 #include <asm/microcode_intel.h>
+#include <asm/intel-family.h>
 #include <asm/processor.h>
 #include <asm/tlbflush.h>
 #include <asm/setup.h>
@@ -918,6 +919,18 @@ static int get_ucode_fw(void *to, const void *from, size_t n)
         return 0;
 }
 
+static bool is_blacklisted(unsigned int cpu)
+{
+        struct cpuinfo_x86 *c = &cpu_data(cpu);
+
+        if (c->x86 == 6 && c->x86_model == INTEL_FAM6_BROADWELL_X) {
+                pr_err_once("late loading on model 79 is disabled.\n");
+                return true;
+        }
+
+        return false;
+}
+
 static enum ucode_state request_microcode_fw(int cpu, struct device *device,
                                              bool refresh_fw)
 {
@@ -926,6 +939,9 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
         const struct firmware *firmware;
         enum ucode_state ret;
 
+        if (is_blacklisted(cpu))
+                return UCODE_NFOUND;
+
         sprintf(name, "intel-ucode/%02x-%02x-%02x",
                 c->x86, c->x86_model, c->x86_mask);
 
@@ -950,6 +966,9 @@ static int get_ucode_user(void *to, const void *from, size_t n)
 static enum ucode_state
 request_microcode_user(int cpu, const void __user *buf, size_t size)
 {
+        if (is_blacklisted(cpu))
+                return UCODE_NFOUND;
+
         return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
 }
 
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index cf2ce063f65a..2902ca4d5993 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -30,10 +30,11 @@ static void __init i386_default_early_setup(void)
 
 asmlinkage __visible void __init i386_start_kernel(void)
 {
-        cr4_init_shadow();
-
+        /* Make sure IDT is set up before any exception happens */
         idt_setup_early_handler();
 
+        cr4_init_shadow();
+
         sanitize_boot_params(&boot_params);
 
         x86_early_init_platform_quirks();
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
index a99679826846..320c6237e1d1 100644
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
@@ -174,3 +174,15 @@ const char *arch_vma_name(struct vm_area_struct *vma)
                 return "[mpx]";
         return NULL;
 }
+
+int valid_phys_addr_range(phys_addr_t addr, size_t count)
+{
+        return addr + count <= __pa(high_memory);
+}
+
+int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
+{
+        phys_addr_t addr = (phys_addr_t)pfn << PAGE_SHIFT;
+
+        return valid_phys_addr_range(addr, count);
+}
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 658bf0090565..0f3d0cea4d00 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -30,7 +30,6 @@
 
 atomic64_t last_mm_ctx_id = ATOMIC64_INIT(1);
 
-DEFINE_STATIC_KEY_TRUE(tlb_use_lazy_mode);
 
 static void choose_new_asid(struct mm_struct *next, u64 next_tlb_gen,
                             u16 *new_asid, bool *need_flush)
@@ -147,8 +146,8 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
         this_cpu_write(cpu_tlbstate.is_lazy, false);
 
         if (real_prev == next) {
-                VM_BUG_ON(this_cpu_read(cpu_tlbstate.ctxs[prev_asid].ctx_id) !=
-                          next->context.ctx_id);
+                VM_WARN_ON(this_cpu_read(cpu_tlbstate.ctxs[prev_asid].ctx_id) !=
+                           next->context.ctx_id);
 
                 /*
                  * We don't currently support having a real mm loaded without
@@ -213,6 +212,9 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
 }
 
 /*
+ * Please ignore the name of this function.  It should be called
+ * switch_to_kernel_thread().
+ *
  * enter_lazy_tlb() is a hint from the scheduler that we are entering a
  * kernel thread or other context without an mm.  Acceptable implementations
  * include doing nothing whatsoever, switching to init_mm, or various clever
@@ -227,7 +229,7 @@ void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
         if (this_cpu_read(cpu_tlbstate.loaded_mm) == &init_mm)
                 return;
 
-        if (static_branch_unlikely(&tlb_use_lazy_mode)) {
+        if (tlb_defer_switch_to_init_mm()) {
                 /*
                  * There's a significant optimization that may be possible
                  * here.  We have accurate enough TLB flush tracking that we
@@ -626,57 +628,3 @@ static int __init create_tlb_single_page_flush_ceiling(void)
         return 0;
 }
 late_initcall(create_tlb_single_page_flush_ceiling);
-
-static ssize_t tlblazy_read_file(struct file *file, char __user *user_buf,
-                                 size_t count, loff_t *ppos)
-{
-        char buf[2];
-
-        buf[0] = static_branch_likely(&tlb_use_lazy_mode) ? '1' : '0';
-        buf[1] = '\n';
-
-        return simple_read_from_buffer(user_buf, count, ppos, buf, 2);
-}
-
-static ssize_t tlblazy_write_file(struct file *file,
-                 const char __user *user_buf, size_t count, loff_t *ppos)
-{
-        bool val;
-
-        if (kstrtobool_from_user(user_buf, count, &val))
-                return -EINVAL;
-
-        if (val)
-                static_branch_enable(&tlb_use_lazy_mode);
-        else
-                static_branch_disable(&tlb_use_lazy_mode);
-
-        return count;
-}
-
-static const struct file_operations fops_tlblazy = {
-        .read = tlblazy_read_file,
-        .write = tlblazy_write_file,
-        .llseek = default_llseek,
-};
-
-static int __init init_tlb_use_lazy_mode(void)
-{
-        if (boot_cpu_has(X86_FEATURE_PCID)) {
-                /*
-                 * Heuristic: with PCID on, switching to and from
-                 * init_mm is reasonably fast, but remote flush IPIs
-                 * as expensive as ever, so turn off lazy TLB mode.
-                 *
-                 * We can't do this in setup_pcid() because static keys
-                 * haven't been initialized yet, and it would blow up
-                 * badly.
-                 */
-                static_branch_disable(&tlb_use_lazy_mode);
-        }
-
-        debugfs_create_file("tlb_use_lazy_mode", S_IRUSR | S_IWUSR,
-                            arch_debugfs_dir, NULL, &fops_tlblazy);
-        return 0;
-}
-late_initcall(init_tlb_use_lazy_mode);
diff --git a/crypto/asymmetric_keys/asymmetric_type.c b/crypto/asymmetric_keys/asymmetric_type.c
index e4b0ed386bc8..39aecad286fe 100644
--- a/crypto/asymmetric_keys/asymmetric_type.c
+++ b/crypto/asymmetric_keys/asymmetric_type.c
@@ -57,6 +57,8 @@ struct key *find_asymmetric_key(struct key *keyring,
         char *req, *p;
         int len;
 
+        BUG_ON(!id_0 && !id_1);
+
         if (id_0) {
                 lookup = id_0->data;
                 len = id_0->len;
@@ -105,7 +107,7 @@ struct key *find_asymmetric_key(struct key *keyring,
         if (id_0 && id_1) {
                 const struct asymmetric_key_ids *kids = asymmetric_key_ids(key);
 
-                if (!kids->id[0]) {
+                if (!kids->id[1]) {
                         pr_debug("First ID matches, but second is missing\n");
                         goto reject;
                 }
diff --git a/crypto/asymmetric_keys/pkcs7_parser.c b/crypto/asymmetric_keys/pkcs7_parser.c
index af4cd8649117..d140d8bb2c96 100644
--- a/crypto/asymmetric_keys/pkcs7_parser.c
+++ b/crypto/asymmetric_keys/pkcs7_parser.c
@@ -88,6 +88,9 @@ static int pkcs7_check_authattrs(struct pkcs7_message *msg)
         bool want = false;
 
         sinfo = msg->signed_infos;
+        if (!sinfo)
+                goto inconsistent;
+
         if (sinfo->authattrs) {
                 want = true;
                 msg->have_authattrs = true;
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 0621a95b8597..fddf76ef5bd6 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -3662,12 +3662,6 @@ static void binder_stat_br(struct binder_proc *proc,
         }
 }
 
-static int binder_has_thread_work(struct binder_thread *thread)
-{
-        return !binder_worklist_empty(thread->proc, &thread->todo) ||
-                thread->looper_need_return;
-}
-
 static int binder_put_node_cmd(struct binder_proc *proc,
                                struct binder_thread *thread,
                                void __user **ptrp,
@@ -4297,12 +4291,9 @@ static unsigned int binder_poll(struct file *filp,
 
         binder_inner_proc_unlock(thread->proc);
 
-        if (binder_has_work(thread, wait_for_proc_work))
-                return POLLIN;
-
         poll_wait(filp, &thread->wait, wait);
 
-        if (binder_has_thread_work(thread))
+        if (binder_has_work(thread, wait_for_proc_work))
                 return POLLIN;
 
         return 0;
diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
index 064f5e31ec55..c2819a3d58a6 100644
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -215,17 +215,12 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate,
                 }
         }
 
-        if (!vma && need_mm)
-                mm = get_task_mm(alloc->tsk);
+        if (!vma && need_mm && mmget_not_zero(alloc->vma_vm_mm))
+                mm = alloc->vma_vm_mm;
 
         if (mm) {
                 down_write(&mm->mmap_sem);
                 vma = alloc->vma;
-                if (vma && mm != alloc->vma_vm_mm) {
-                        pr_err("%d: vma mm and task mm mismatch\n",
-                                alloc->pid);
-                        vma = NULL;
-                }
         }
 
         if (!vma && need_mm) {
@@ -565,7 +560,7 @@ static void binder_delete_free_buffer(struct binder_alloc *alloc,
                 binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
                                    "%d: merge free, buffer %pK do not share page with %pK or %pK\n",
                                    alloc->pid, buffer->data,
-                                   prev->data, next->data);
+                                   prev->data, next ? next->data : NULL);
                 binder_update_page_range(alloc, 0, buffer_start_page(buffer),
                                          buffer_start_page(buffer) + PAGE_SIZE,
                                          NULL);
@@ -720,6 +715,7 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc,
         barrier();
         alloc->vma = vma;
         alloc->vma_vm_mm = vma->vm_mm;
+        mmgrab(alloc->vma_vm_mm);
 
         return 0;
 
@@ -795,6 +791,8 @@ void binder_alloc_deferred_release(struct binder_alloc *alloc)
                 vfree(alloc->buffer);
         }
         mutex_unlock(&alloc->mutex);
+        if (alloc->vma_vm_mm)
+                mmdrop(alloc->vma_vm_mm);
 
         binder_alloc_debug(BINDER_DEBUG_OPEN_CLOSE,
                      "%s: %d buffers %d, pages %d\n",
@@ -889,7 +887,6 @@ int binder_alloc_get_allocated_count(struct binder_alloc *alloc)
 void binder_alloc_vma_close(struct binder_alloc *alloc)
 {
         WRITE_ONCE(alloc->vma, NULL);
-        WRITE_ONCE(alloc->vma_vm_mm, NULL);
 }
 
 /**
@@ -926,9 +923,9 @@ enum lru_status binder_alloc_free_page(struct list_head *item,
         page_addr = (uintptr_t)alloc->buffer + index * PAGE_SIZE;
         vma = alloc->vma;
         if (vma) {
-                mm = get_task_mm(alloc->tsk);
-                if (!mm)
-                        goto err_get_task_mm_failed;
+                if (!mmget_not_zero(alloc->vma_vm_mm))
+                        goto err_mmget;
+                mm = alloc->vma_vm_mm;
                 if (!down_write_trylock(&mm->mmap_sem))
                         goto err_down_write_mmap_sem_failed;
         }
@@ -963,7 +960,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item,
 
 err_down_write_mmap_sem_failed:
         mmput_async(mm);
-err_get_task_mm_failed:
+err_mmget:
 err_page_already_freed:
         mutex_unlock(&alloc->mutex);
 err_get_alloc_mutex_failed:
@@ -1002,7 +999,6 @@ struct shrinker binder_shrinker = {
  */
 void binder_alloc_init(struct binder_alloc *alloc)
 {
-        alloc->tsk = current->group_leader;
         alloc->pid = current->group_leader->pid;
         mutex_init(&alloc->mutex);
         INIT_LIST_HEAD(&alloc->buffers);
diff --git a/drivers/android/binder_alloc.h b/drivers/android/binder_alloc.h
index a3a3602c689c..2dd33b6df104 100644
--- a/drivers/android/binder_alloc.h
+++ b/drivers/android/binder_alloc.h
@@ -100,7 +100,6 @@ struct binder_lru_page {
  */
 struct binder_alloc {
         struct mutex mutex;
-        struct task_struct *tsk;
         struct vm_area_struct *vma;
         struct mm_struct *vma_vm_mm;
         void *buffer;
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 883dfebd3014..baebbdfd74d5 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -243,7 +243,6 @@ static void nbd_size_set(struct nbd_device *nbd, loff_t blocksize,
         struct nbd_config *config = nbd->config;
         config->blksize = blocksize;
         config->bytesize = blocksize * nr_blocks;
-        nbd_size_update(nbd);
 }
 
 static void nbd_complete_rq(struct request *req)
@@ -1094,6 +1093,7 @@ static int nbd_start_device(struct nbd_device *nbd)
                 args->index = i;
                 queue_work(recv_workqueue, &args->work);
         }
+        nbd_size_update(nbd);
         return error;
 }
 
diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index 7cedb4295e9d..64d0fc17c174 100644
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -2604,7 +2604,7 @@ static void *skd_alloc_dma(struct skd_device *skdev, struct kmem_cache *s,
                 return NULL;
         *dma_handle = dma_map_single(dev, buf, s->size, dir);
         if (dma_mapping_error(dev, *dma_handle)) {
-                kfree(buf);
+                kmem_cache_free(s, buf);
                 buf = NULL;
         }
         return buf;
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index c7f396903184..70db4d5638a6 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -720,7 +720,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus)
                         if (mbus->hw_io_coherency)
                                 w->mbus_attr |= ATTR_HW_COHERENCY;
                         w->base = base & DDR_BASE_CS_LOW_MASK;
-                        w->size = (size | ~DDR_SIZE_MASK) + 1;
+                        w->size = (u64)(size | ~DDR_SIZE_MASK) + 1;
                 }
         }
         mvebu_mbus_dram_info.num_cs = cs;
diff --git a/drivers/clocksource/cs5535-clockevt.c b/drivers/clocksource/cs5535-clockevt.c
index a1df588343f2..1de8cac99a0e 100644
--- a/drivers/clocksource/cs5535-clockevt.c
+++ b/drivers/clocksource/cs5535-clockevt.c
@@ -117,7 +117,8 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id)
         /* Turn off the clock (and clear the event) */
         disable_timer(cs5535_event_clock);
 
-        if (clockevent_state_shutdown(&cs5535_clockevent))
+        if (clockevent_state_detached(&cs5535_clockevent) ||
+            clockevent_state_shutdown(&cs5535_clockevent))
                 return IRQ_HANDLED;
 
         /* Clear the counter */
diff --git a/drivers/dma/altera-msgdma.c b/drivers/dma/altera-msgdma.c
index 339186f25a2a..55f9c62ee54b 100644
--- a/drivers/dma/altera-msgdma.c
+++ b/drivers/dma/altera-msgdma.c
@@ -344,7 +344,7 @@ msgdma_prep_memcpy(struct dma_chan *dchan, dma_addr_t dma_dst,
 
         spin_lock_irqsave(&mdev->lock, irqflags);
         if (desc_cnt > mdev->desc_free_cnt) {
-                spin_unlock_bh(&mdev->lock);
+                spin_unlock_irqrestore(&mdev->lock, irqflags);
                 dev_dbg(mdev->dev, "mdev %p descs are not available\n", mdev);
                 return NULL;
         }
@@ -407,7 +407,7 @@ msgdma_prep_slave_sg(struct dma_chan *dchan, struct scatterlist *sgl,
 
         spin_lock_irqsave(&mdev->lock, irqflags);
         if (desc_cnt > mdev->desc_free_cnt) {
-                spin_unlock_bh(&mdev->lock);
+                spin_unlock_irqrestore(&mdev->lock, irqflags);
                 dev_dbg(mdev->dev, "mdev %p descs are not available\n", mdev);
                 return NULL;
         }
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index 97c94f9683fa..38cea6fb25a8 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -205,32 +205,17 @@ void amd_sched_entity_fini(struct amd_gpu_scheduler *sched,
                            struct amd_sched_entity *entity)
 {
         struct amd_sched_rq *rq = entity->rq;
-        int r;
 
         if (!amd_sched_entity_is_initialized(sched, entity))
                 return;
+
         /**
          * The client will not queue more IBs during this fini, consume existing
-         * queued IBs or discard them on SIGKILL
+         * queued IBs
         */
-        if ((current->flags & PF_SIGNALED) && current->exit_code == SIGKILL)
-                r = -ERESTARTSYS;
-        else
-                r = wait_event_killable(sched->job_scheduled,
-                                        amd_sched_entity_is_idle(entity));
-        amd_sched_rq_remove_entity(rq, entity);
-        if (r) {
-                struct amd_sched_job *job;
+        wait_event(sched->job_scheduled, amd_sched_entity_is_idle(entity));
 
-                /* Park the kernel for a moment to make sure it isn't processing
-                 * our enity.
-                 */
-                kthread_park(sched->thread);
-                kthread_unpark(sched->thread);
-                while (kfifo_out(&entity->job_queue, &job, sizeof(job)))
-                        sched->ops->free_job(job);
-
-        }
+        amd_sched_rq_remove_entity(rq, entity);
         kfifo_free(&entity->job_queue);
 }
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index e651a58c18cf..82b72425a42f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -168,11 +168,13 @@ static struct drm_driver exynos_drm_driver = {
 static int exynos_drm_suspend(struct device *dev)
 {
         struct drm_device *drm_dev = dev_get_drvdata(dev);
-        struct exynos_drm_private *private = drm_dev->dev_private;
+        struct exynos_drm_private *private;
 
         if (pm_runtime_suspended(dev) || !drm_dev)
                 return 0;
 
+        private = drm_dev->dev_private;
+
         drm_kms_helper_poll_disable(drm_dev);
         exynos_drm_fbdev_suspend(drm_dev);
         private->suspend_state = drm_atomic_helper_suspend(drm_dev);
@@ -188,11 +190,12 @@ static int exynos_drm_suspend(struct device *dev)
 static int exynos_drm_resume(struct device *dev)
 {
         struct drm_device *drm_dev = dev_get_drvdata(dev);
-        struct exynos_drm_private *private = drm_dev->dev_private;
+        struct exynos_drm_private *private;
 
         if (pm_runtime_suspended(dev) || !drm_dev)
                 return 0;
 
+        private = drm_dev->dev_private;
         drm_atomic_helper_resume(drm_dev, private->suspend_state);
         exynos_drm_fbdev_resume(drm_dev);
         drm_kms_helper_poll_enable(drm_dev);
@@ -427,6 +430,7 @@ static void exynos_drm_unbind(struct device *dev)
 
         kfree(drm->dev_private);
         drm->dev_private = NULL;
+        dev_set_drvdata(dev, NULL);
 
         drm_dev_unref(drm);
 }
diff --git a/drivers/gpu/drm/i915/gvt/sched_policy.c b/drivers/gpu/drm/i915/gvt/sched_policy.c
index 436377da41ba..03532dfc0cd5 100644
--- a/drivers/gpu/drm/i915/gvt/sched_policy.c
+++ b/drivers/gpu/drm/i915/gvt/sched_policy.c
@@ -308,20 +308,8 @@ static int tbs_sched_init_vgpu(struct intel_vgpu *vgpu)
 
 static void tbs_sched_clean_vgpu(struct intel_vgpu *vgpu)
 {
-        struct intel_gvt_workload_scheduler *scheduler = &vgpu->gvt->scheduler;
-        int ring_id;
-
         kfree(vgpu->sched_data);
         vgpu->sched_data = NULL;
-
-        spin_lock_bh(&scheduler->mmio_context_lock);
-        for (ring_id = 0; ring_id < I915_NUM_ENGINES; ring_id++) {
-                if (scheduler->engine_owner[ring_id] == vgpu) {
-                        intel_gvt_switch_mmio(vgpu, NULL, ring_id);
-                        scheduler->engine_owner[ring_id] = NULL;
-                }
-        }
-        spin_unlock_bh(&scheduler->mmio_context_lock);
 }
 
 static void tbs_sched_start_schedule(struct intel_vgpu *vgpu)
@@ -388,6 +376,7 @@ void intel_vgpu_stop_schedule(struct intel_vgpu *vgpu)
 {
         struct intel_gvt_workload_scheduler *scheduler =
                 &vgpu->gvt->scheduler;
+        int ring_id;
 
         gvt_dbg_core("vgpu%d: stop schedule\n", vgpu->id);
 
@@ -401,4 +390,13 @@ void intel_vgpu_stop_schedule(struct intel_vgpu *vgpu)
                 scheduler->need_reschedule = true;
                 scheduler->current_vgpu = NULL;
         }
+
+        spin_lock_bh(&scheduler->mmio_context_lock);
+        for (ring_id = 0; ring_id < I915_NUM_ENGINES; ring_id++) {
+                if (scheduler->engine_owner[ring_id] == vgpu) {
+                        intel_gvt_switch_mmio(vgpu, NULL, ring_id);
+                        scheduler->engine_owner[ring_id] = NULL;
+                }
+        }
+        spin_unlock_bh(&scheduler->mmio_context_lock);
 }
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index af289d35b77a..32e857dc507c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2657,6 +2657,9 @@ i915_gem_object_pwrite_gtt(struct drm_i915_gem_object *obj,
         if (READ_ONCE(obj->mm.pages))
                 return -ENODEV;
 
+        if (obj->mm.madv != I915_MADV_WILLNEED)
+                return -EFAULT;
+
         /* Before the pages are instantiated the object is treated as being
          * in the CPU domain. The pages will be clflushed as required before
          * use, and we can freely write into the pages directly. If userspace
diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
index 4df039ef2ce3..e161d383b526 100644
--- a/drivers/gpu/drm/i915/i915_gem_evict.c
+++ b/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -33,21 +33,20 @@
 #include "intel_drv.h"
 #include "i915_trace.h"
 
-static bool ggtt_is_idle(struct drm_i915_private *dev_priv)
+static bool ggtt_is_idle(struct drm_i915_private *i915)
 {
-        struct i915_ggtt *ggtt = &dev_priv->ggtt;
-        struct intel_engine_cs *engine;
-        enum intel_engine_id id;
+       struct intel_engine_cs *engine;
+       enum intel_engine_id id;
 
-        for_each_engine(engine, dev_priv, id) {
-                struct intel_timeline *tl;
+       if (i915->gt.active_requests)
+               return false;
 
-                tl = &ggtt->base.timeline.engine[engine->id];
-                if (i915_gem_active_isset(&tl->last_request))
-                        return false;
-        }
+       for_each_engine(engine, i915, id) {
+               if (engine->last_retired_context != i915->kernel_context)
+                       return false;
+       }
 
-        return true;
+       return true;
 }
 
 static int ggtt_flush(struct drm_i915_private *i915)
@@ -157,7 +156,8 @@ i915_gem_evict_something(struct i915_address_space *vm,
                                     min_size, alignment, cache_level,
                                     start, end, mode);
 
-        /* Retire before we search the active list. Although we have
+        /*
+         * Retire before we search the active list. Although we have
          * reasonable accuracy in our retirement lists, we may have
          * a stray pin (preventing eviction) that can only be resolved by
          * retiring.
@@ -182,7 +182,8 @@ search_again:
                 BUG_ON(ret);
         }
 
-        /* Can we unpin some objects such as idle hw contents,
+        /*
+         * Can we unpin some objects such as idle hw contents,
          * or pending flips? But since only the GGTT has global entries
          * such as scanouts, rinbuffers and contexts, we can skip the
          * purge when inspecting per-process local address spaces.
@@ -190,19 +191,33 @@ search_again:
         if (!i915_is_ggtt(vm) || flags & PIN_NONBLOCK)
                 return -ENOSPC;
 
-        if (ggtt_is_idle(dev_priv)) {
-                /* If we still have pending pageflip completions, drop
-                 * back to userspace to give our workqueues time to
-                 * acquire our locks and unpin the old scanouts.
-                 */
-                return intel_has_pending_fb_unpin(dev_priv) ? -EAGAIN : -ENOSPC;
-        }
+        /*
+         * Not everything in the GGTT is tracked via VMA using
+         * i915_vma_move_to_active(), otherwise we could evict as required
+         * with minimal stalling. Instead we are forced to idle the GPU and
+         * explicitly retire outstanding requests which will then remove
+         * the pinning for active objects such as contexts and ring,
+         * enabling us to evict them on the next iteration.
+         *
+         * To ensure that all user contexts are evictable, we perform
+         * a switch to the perma-pinned kernel context. This all also gives
+         * us a termination condition, when the last retired context is
+         * the kernel's there is no more we can evict.
+         */
+        if (!ggtt_is_idle(dev_priv)) {
+                ret = ggtt_flush(dev_priv);
+                if (ret)
+                        return ret;
 
-        ret = ggtt_flush(dev_priv);
-        if (ret)
-                return ret;
+                goto search_again;
+        }
 
-        goto search_again;
+        /*
+         * If we still have pending pageflip completions, drop
+         * back to userspace to give our workqueues time to
+         * acquire our locks and unpin the old scanouts.
+         */
+        return intel_has_pending_fb_unpin(dev_priv) ? -EAGAIN : -ENOSPC;
 
 found:
         /* drm_mm doesn't allow any other other operations while
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index ed7cd9ee2c2a..c9bcc6c45012 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6998,6 +6998,7 @@ enum {
  */
 #define  L3_GENERAL_PRIO_CREDITS(x)             (((x) >> 1) << 19)
 #define  L3_HIGH_PRIO_CREDITS(x)                (((x) >> 1) << 14)
+#define  L3_PRIO_CREDITS_MASK                   ((0x1f << 19) | (0x1f << 14))
 
 #define GEN7_L3CNTLREG1                         _MMIO(0xB01C)
 #define  GEN7_WA_FOR_GEN7_L3_CONTROL                    0x3C47FF8C
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 476681d5940c..5e5fe03b638c 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -664,8 +664,8 @@ intel_ddi_get_buf_trans_fdi(struct drm_i915_private *dev_priv,
                             int *n_entries)
 {
         if (IS_BROADWELL(dev_priv)) {
-                *n_entries = ARRAY_SIZE(hsw_ddi_translations_fdi);
-                return hsw_ddi_translations_fdi;
+                *n_entries = ARRAY_SIZE(bdw_ddi_translations_fdi);
+                return bdw_ddi_translations_fdi;
         } else if (IS_HASWELL(dev_priv)) {
                 *n_entries = ARRAY_SIZE(hsw_ddi_translations_fdi);
                 return hsw_ddi_translations_fdi;
@@ -2102,8 +2102,7 @@ static void intel_ddi_clk_select(struct intel_encoder *encoder,
                  * register writes.
                  */
                 val = I915_READ(DPCLKA_CFGCR0);
-                val &= ~(DPCLKA_CFGCR0_DDI_CLK_OFF(port) |
-                         DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port));
+                val &= ~DPCLKA_CFGCR0_DDI_CLK_OFF(port);
                 I915_WRITE(DPCLKA_CFGCR0, val);
         } else if (IS_GEN9_BC(dev_priv)) {
                 /* DDI -> PLL mapping  */
diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
index a2a3d93d67bd..df808a94c511 100644
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -1996,7 +1996,7 @@ static void cnl_ddi_pll_enable(struct drm_i915_private *dev_priv,
 
         /* 3. Configure DPLL_CFGCR0 */
         /* Avoid touch CFGCR1 if HDMI mode is not enabled */
-        if (pll->state.hw_state.cfgcr0 & DPLL_CTRL1_HDMI_MODE(pll->id)) {
+        if (pll->state.hw_state.cfgcr0 & DPLL_CFGCR0_HDMI_MODE) {
                 val = pll->state.hw_state.cfgcr1;
                 I915_WRITE(CNL_DPLL_CFGCR1(pll->id), val);
                 /* 4. Reab back to ensure writes completed */
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 9ab596941372..3c2d9cf22ed5 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1048,9 +1048,12 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
         }
 
         /* WaProgramL3SqcReg1DefaultForPerf:bxt */
-        if (IS_BXT_REVID(dev_priv, BXT_REVID_B0, REVID_FOREVER))
-                I915_WRITE(GEN8_L3SQCREG1, L3_GENERAL_PRIO_CREDITS(62) |
-                                           L3_HIGH_PRIO_CREDITS(2));
+        if (IS_BXT_REVID(dev_priv, BXT_REVID_B0, REVID_FOREVER)) {
+                u32 val = I915_READ(GEN8_L3SQCREG1);
+                val &= ~L3_PRIO_CREDITS_MASK;
+                val |= L3_GENERAL_PRIO_CREDITS(62) | L3_HIGH_PRIO_CREDITS(2);
+                I915_WRITE(GEN8_L3SQCREG1, val);
+        }
 
         /* WaToEnableHwFixForPushConstHWBug:bxt */
         if (IS_BXT_REVID(dev_priv, BXT_REVID_C0, REVID_FOREVER))
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index ed662937ec3c..0a09f8ff6aff 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -8245,14 +8245,17 @@ static void gen8_set_l3sqc_credits(struct drm_i915_private *dev_priv,
                                    int high_prio_credits)
 {
         u32 misccpctl;
+        u32 val;
 
         /* WaTempDisableDOPClkGating:bdw */
         misccpctl = I915_READ(GEN7_MISCCPCTL);
         I915_WRITE(GEN7_MISCCPCTL, misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE);
 
-        I915_WRITE(GEN8_L3SQCREG1,
-                   L3_GENERAL_PRIO_CREDITS(general_prio_credits) |
-                   L3_HIGH_PRIO_CREDITS(high_prio_credits));
+        val = I915_READ(GEN8_L3SQCREG1);
+        val &= ~L3_PRIO_CREDITS_MASK;
+        val |= L3_GENERAL_PRIO_CREDITS(general_prio_credits);
+        val |= L3_HIGH_PRIO_CREDITS(high_prio_credits);
+        I915_WRITE(GEN8_L3SQCREG1, val);
 
         /*
          * Wait at least 100 clocks before re-enabling clock gating.
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index f7707849bb53..2b12d82aac15 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -223,7 +223,7 @@ void
 nouveau_fbcon_accel_save_disable(struct drm_device *dev)
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
-        if (drm->fbcon) {
+        if (drm->fbcon && drm->fbcon->helper.fbdev) {
                 drm->fbcon->saved_flags = drm->fbcon->helper.fbdev->flags;
                 drm->fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;
         }
@@ -233,7 +233,7 @@ void
 nouveau_fbcon_accel_restore(struct drm_device *dev)
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
-        if (drm->fbcon) {
+        if (drm->fbcon && drm->fbcon->helper.fbdev) {
                 drm->fbcon->helper.fbdev->flags = drm->fbcon->saved_flags;
         }
 }
@@ -245,7 +245,8 @@ nouveau_fbcon_accel_fini(struct drm_device *dev)
         struct nouveau_fbdev *fbcon = drm->fbcon;
         if (fbcon && drm->channel) {
                 console_lock();
-                fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;
+                if (fbcon->helper.fbdev)
+                        fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;
                 console_unlock();
                 nouveau_channel_idle(drm->channel);
                 nvif_object_fini(&fbcon->twod);
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 2dbf62a2ac41..e4751f92b342 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -3265,11 +3265,14 @@ nv50_mstm = {
 void
 nv50_mstm_service(struct nv50_mstm *mstm)
 {
-        struct drm_dp_aux *aux = mstm->mgr.aux;
+        struct drm_dp_aux *aux = mstm ? mstm->mgr.aux : NULL;
         bool handled = true;
         int ret;
         u8 esi[8] = {};
 
+        if (!aux)
+                return;
+
         while (handled) {
                 ret = drm_dp_dpcd_read(aux, DP_SINK_COUNT_ESI, esi, 8);
                 if (ret != 8) {
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/bsp/g84.c b/drivers/gpu/drm/nouveau/nvkm/engine/bsp/g84.c
index 8e2e24a74774..44e116f7880d 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/bsp/g84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/bsp/g84.c
@@ -39,5 +39,5 @@ int
 g84_bsp_new(struct nvkm_device *device, int index, struct nvkm_engine **pengine)
 {
         return nvkm_xtensa_new_(&g84_bsp, device, index,
-                                true, 0x103000, pengine);
+                                device->chipset != 0x92, 0x103000, pengine);
 }
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c
index d06ad2c372bf..455da298227f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c
@@ -241,6 +241,8 @@ nvkm_vm_unmap_pgt(struct nvkm_vm *vm, int big, u32 fpde, u32 lpde)
                         mmu->func->map_pgt(vpgd->obj, pde, vpgt->mem);
                 }
 
+                mmu->func->flush(vm);
+
                 nvkm_memory_del(&pgt);
         }
 }
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 018d2e0f8ec5..379b0df123be 100644
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -937,7 +937,10 @@ void vmbus_hvsock_device_unregister(struct vmbus_channel *channel)
 {
         BUG_ON(!is_hvsock_channel(channel));
 
-        channel->rescind = true;
+        /* We always get a rescind msg when a connection is closed. */
+        while (!READ_ONCE(channel->probe_done) || !READ_ONCE(channel->rescind))
+                msleep(1);
+
         vmbus_device_unregister(channel->device_obj);
 }
 EXPORT_SYMBOL_GPL(vmbus_hvsock_device_unregister);
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 54a47b40546f..f96830ffd9f1 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -1021,7 +1021,7 @@ static int i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx,
         }
 
         dev_dbg(&pdev->dev, "using scl-gpio %d and sda-gpio %d for recovery\n",
-                        rinfo->sda_gpio, rinfo->scl_gpio);
+                        rinfo->scl_gpio, rinfo->sda_gpio);
 
         rinfo->prepare_recovery = i2c_imx_prepare_recovery;
         rinfo->unprepare_recovery = i2c_imx_unprepare_recovery;
@@ -1100,7 +1100,7 @@ static int i2c_imx_probe(struct platform_device *pdev)
         }
 
         /* Request IRQ */
-        ret = devm_request_irq(&pdev->dev, irq, i2c_imx_isr, 0,
+        ret = devm_request_irq(&pdev->dev, irq, i2c_imx_isr, IRQF_SHARED,
                                 pdev->name, i2c_imx);
         if (ret) {
                 dev_err(&pdev->dev, "can't claim irq %d\n", irq);
diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c
index 22ffcb73c185..b51adffa4841 100644
--- a/drivers/i2c/busses/i2c-ismt.c
+++ b/drivers/i2c/busses/i2c-ismt.c
@@ -340,12 +340,15 @@ static int ismt_process_desc(const struct ismt_desc *desc,
                         data->word = dma_buffer[0] | (dma_buffer[1] << 8);
                         break;
                 case I2C_SMBUS_BLOCK_DATA:
-                case I2C_SMBUS_I2C_BLOCK_DATA:
                         if (desc->rxbytes != dma_buffer[0] + 1)
                                 return -EMSGSIZE;
 
                         memcpy(data->block, dma_buffer, desc->rxbytes);
                         break;
+                case I2C_SMBUS_I2C_BLOCK_DATA:
+                        memcpy(&data->block[1], dma_buffer, desc->rxbytes);
+                        data->block[0] = desc->rxbytes;
+                        break;
                 }
                 return 0;
         }
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 1ebb5e947e0b..23c2ea2baedc 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -360,6 +360,7 @@ static int omap_i2c_init(struct omap_i2c_dev *omap)
         unsigned long fclk_rate = 12000000;
         unsigned long internal_clk = 0;
         struct clk *fclk;
+        int error;
 
         if (omap->rev >= OMAP_I2C_REV_ON_3430_3530) {
                 /*
@@ -378,6 +379,13 @@ static int omap_i2c_init(struct omap_i2c_dev *omap)
                  * do this bit unconditionally.
                  */
                 fclk = clk_get(omap->dev, "fck");
+                if (IS_ERR(fclk)) {
+                        error = PTR_ERR(fclk);
+                        dev_err(omap->dev, "could not get fck: %i\n", error);
+
+                        return error;
+                }
+
                 fclk_rate = clk_get_rate(fclk);
                 clk_put(fclk);
 
@@ -410,6 +418,12 @@ static int omap_i2c_init(struct omap_i2c_dev *omap)
                 else
                         internal_clk = 4000;
                 fclk = clk_get(omap->dev, "fck");
+                if (IS_ERR(fclk)) {
+                        error = PTR_ERR(fclk);
+                        dev_err(omap->dev, "could not get fck: %i\n", error);
+
+                        return error;
+                }
                 fclk_rate = clk_get_rate(fclk) / 1000;
                 clk_put(fclk);
 
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 0ecdb47a23ab..174579d32e5f 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -85,6 +85,9 @@
 /* SB800 constants */
 #define SB800_PIIX4_SMB_IDX             0xcd6
 
+#define KERNCZ_IMC_IDX                  0x3e
+#define KERNCZ_IMC_DATA                 0x3f
+
 /*
  * SB800 port is selected by bits 2:1 of the smb_en register (0x2c)
  * or the smb_sel register (0x2e), depending on bit 0 of register 0x2f.
@@ -94,6 +97,12 @@
 #define SB800_PIIX4_PORT_IDX_ALT        0x2e
 #define SB800_PIIX4_PORT_IDX_SEL        0x2f
 #define SB800_PIIX4_PORT_IDX_MASK       0x06
+#define SB800_PIIX4_PORT_IDX_SHIFT      1
+
+/* On kerncz, SmBus0Sel is at bit 20:19 of PMx00 DecodeEn */
+#define SB800_PIIX4_PORT_IDX_KERNCZ             0x02
+#define SB800_PIIX4_PORT_IDX_MASK_KERNCZ        0x18
+#define SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ       3
 
 /* insmod parameters */
 
@@ -149,6 +158,8 @@ static const struct dmi_system_id piix4_dmi_ibm[] = {
  */
 static DEFINE_MUTEX(piix4_mutex_sb800);
 static u8 piix4_port_sel_sb800;
+static u8 piix4_port_mask_sb800;
+static u8 piix4_port_shift_sb800;
 static const char *piix4_main_port_names_sb800[PIIX4_MAX_ADAPTERS] = {
         " port 0", " port 2", " port 3", " port 4"
 };
@@ -159,6 +170,7 @@ struct i2c_piix4_adapdata {
 
         /* SB800 */
         bool sb800_main;
+        bool notify_imc;
         u8 port;                /* Port number, shifted */
 };
 
@@ -347,7 +359,19 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
 
         /* Find which register is used for port selection */
         if (PIIX4_dev->vendor == PCI_VENDOR_ID_AMD) {
-                piix4_port_sel_sb800 = SB800_PIIX4_PORT_IDX_ALT;
+                switch (PIIX4_dev->device) {
+                case PCI_DEVICE_ID_AMD_KERNCZ_SMBUS:
+                        piix4_port_sel_sb800 = SB800_PIIX4_PORT_IDX_KERNCZ;
+                        piix4_port_mask_sb800 = SB800_PIIX4_PORT_IDX_MASK_KERNCZ;
+                        piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ;
+                        break;
+                case PCI_DEVICE_ID_AMD_HUDSON2_SMBUS:
+                default:
+                        piix4_port_sel_sb800 = SB800_PIIX4_PORT_IDX_ALT;
+                        piix4_port_mask_sb800 = SB800_PIIX4_PORT_IDX_MASK;
+                        piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT;
+                        break;
+                }
         } else {
                 mutex_lock(&piix4_mutex_sb800);
                 outb_p(SB800_PIIX4_PORT_IDX_SEL, SB800_PIIX4_SMB_IDX);
@@ -355,6 +379,8 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
                 piix4_port_sel_sb800 = (port_sel & 0x01) ?
                                        SB800_PIIX4_PORT_IDX_ALT :
                                        SB800_PIIX4_PORT_IDX;
+                piix4_port_mask_sb800 = SB800_PIIX4_PORT_IDX_MASK;
+                piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT;
                 mutex_unlock(&piix4_mutex_sb800);
         }
 
@@ -572,6 +598,67 @@ static s32 piix4_access(struct i2c_adapter * adap, u16 addr,
         return 0;
 }
 
+static uint8_t piix4_imc_read(uint8_t idx)
+{
+        outb_p(idx, KERNCZ_IMC_IDX);
+        return inb_p(KERNCZ_IMC_DATA);
+}
+
+static void piix4_imc_write(uint8_t idx, uint8_t value)
+{
+        outb_p(idx, KERNCZ_IMC_IDX);
+        outb_p(value, KERNCZ_IMC_DATA);
+}
+
+static int piix4_imc_sleep(void)
+{
+        int timeout = MAX_TIMEOUT;
+
+        if (!request_muxed_region(KERNCZ_IMC_IDX, 2, "smbus_kerncz_imc"))
+                return -EBUSY;
+
+        /* clear response register */
+        piix4_imc_write(0x82, 0x00);
+        /* request ownership flag */
+        piix4_imc_write(0x83, 0xB4);
+        /* kick off IMC Mailbox command 96 */
+        piix4_imc_write(0x80, 0x96);
+
+        while (timeout--) {
+                if (piix4_imc_read(0x82) == 0xfa) {
+                        release_region(KERNCZ_IMC_IDX, 2);
+                        return 0;
+                }
+                usleep_range(1000, 2000);
+        }
+
+        release_region(KERNCZ_IMC_IDX, 2);
+        return -ETIMEDOUT;
+}
+
+static void piix4_imc_wakeup(void)
+{
+        int timeout = MAX_TIMEOUT;
+
+        if (!request_muxed_region(KERNCZ_IMC_IDX, 2, "smbus_kerncz_imc"))
+                return;
+
+        /* clear response register */
+        piix4_imc_write(0x82, 0x00);
+        /* release ownership flag */
+        piix4_imc_write(0x83, 0xB5);
+        /* kick off IMC Mailbox command 96 */
+        piix4_imc_write(0x80, 0x96);
+
+        while (timeout--) {
+                if (piix4_imc_read(0x82) == 0xfa)
+                        break;
+                usleep_range(1000, 2000);
+        }
+
+        release_region(KERNCZ_IMC_IDX, 2);
+}
+
 /*
  * Handles access to multiple SMBus ports on the SB800.
  * The port is selected by bits 2:1 of the smb_en register (0x2c).
@@ -612,12 +699,47 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr,
                 return -EBUSY;
         }
 
+        /*
+         * Notify the IMC (Integrated Micro Controller) if required.
+         * Among other responsibilities, the IMC is in charge of monitoring
+         * the System fans and temperature sensors, and act accordingly.
+         * All this is done through SMBus and can/will collide
+         * with our transactions if they are long (BLOCK_DATA).
+         * Therefore we need to request the ownership flag during those
+         * transactions.
+         */
+        if ((size == I2C_SMBUS_BLOCK_DATA) && adapdata->notify_imc) {
+                int ret;
+
+                ret = piix4_imc_sleep();
+                switch (ret) {
+                case -EBUSY:
+                        dev_warn(&adap->dev,
+                                 "IMC base address index region 0x%x already in use.\n",
+                                 KERNCZ_IMC_IDX);
+                        break;
+                case -ETIMEDOUT:
+                        dev_warn(&adap->dev,
+                                 "Failed to communicate with the IMC.\n");
+                        break;
+                default:
+                        break;
+                }
+
+                /* If IMC communication fails do not retry */
+                if (ret) {
+                        dev_warn(&adap->dev,
+                                 "Continuing without IMC notification.\n");
+                        adapdata->notify_imc = false;
+                }
+        }
+
         outb_p(piix4_port_sel_sb800, SB800_PIIX4_SMB_IDX);
         smba_en_lo = inb_p(SB800_PIIX4_SMB_IDX + 1);
 
         port = adapdata->port;
-        if ((smba_en_lo & SB800_PIIX4_PORT_IDX_MASK) != port)
-                outb_p((smba_en_lo & ~SB800_PIIX4_PORT_IDX_MASK) | port,
+        if ((smba_en_lo & piix4_port_mask_sb800) != port)
+                outb_p((smba_en_lo & ~piix4_port_mask_sb800) | port,
                        SB800_PIIX4_SMB_IDX + 1);
 
         retval = piix4_access(adap, addr, flags, read_write,
@@ -628,6 +750,9 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr,
         /* Release the semaphore */
         outb_p(smbslvcnt | 0x20, SMBSLVCNT);
 
+        if ((size == I2C_SMBUS_BLOCK_DATA) && adapdata->notify_imc)
+                piix4_imc_wakeup();
+
         mutex_unlock(&piix4_mutex_sb800);
 
         return retval;
@@ -679,7 +804,7 @@ static struct i2c_adapter *piix4_main_adapters[PIIX4_MAX_ADAPTERS];
 static struct i2c_adapter *piix4_aux_adapter;
 
 static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
-                             bool sb800_main, u8 port,
+                             bool sb800_main, u8 port, bool notify_imc,
                              const char *name, struct i2c_adapter **padap)
 {
         struct i2c_adapter *adap;
@@ -706,7 +831,8 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
 
         adapdata->smba = smba;
         adapdata->sb800_main = sb800_main;
-        adapdata->port = port << 1;
+        adapdata->port = port << piix4_port_shift_sb800;
+        adapdata->notify_imc = notify_imc;
 
         /* set up the sysfs linkage to our parent device */
         adap->dev.parent = &dev->dev;
@@ -728,14 +854,15 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
         return 0;
 }
 
-static int piix4_add_adapters_sb800(struct pci_dev *dev, unsigned short smba)
+static int piix4_add_adapters_sb800(struct pci_dev *dev, unsigned short smba,
+                                    bool notify_imc)
 {
         struct i2c_piix4_adapdata *adapdata;
         int port;
         int retval;
 
         for (port = 0; port < PIIX4_MAX_ADAPTERS; port++) {
-                retval = piix4_add_adapter(dev, smba, true, port,
+                retval = piix4_add_adapter(dev, smba, true, port, notify_imc,
                                            piix4_main_port_names_sb800[port],
                                            &piix4_main_adapters[port]);
                 if (retval < 0)
@@ -769,6 +896,7 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
              dev->device == PCI_DEVICE_ID_ATI_SBX00_SMBUS &&
              dev->revision >= 0x40) ||
             dev->vendor == PCI_VENDOR_ID_AMD) {
+                bool notify_imc = false;
                 is_sb800 = true;
 
                 if (!request_region(SB800_PIIX4_SMB_IDX, 2, "smba_idx")) {
@@ -778,6 +906,20 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
                         return -EBUSY;
                 }
 
+                if (dev->vendor == PCI_VENDOR_ID_AMD &&
+                    dev->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS) {
+                        u8 imc;
+
+                        /*
+                         * Detect if IMC is active or not, this method is
+                         * described on coreboot's AMD IMC notes
+                         */
+                        pci_bus_read_config_byte(dev->bus, PCI_DEVFN(0x14, 3),
+                                                 0x40, &imc);
+                        if (imc & 0x80)
+                                notify_imc = true;
+                }
+
                 /* base address location etc changed in SB800 */
                 retval = piix4_setup_sb800(dev, id, 0);
                 if (retval < 0) {
@@ -789,7 +931,7 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
                  * Try to register multiplexed main SMBus adapter,
                  * give up if we can't
                  */
-                retval = piix4_add_adapters_sb800(dev, retval);
+                retval = piix4_add_adapters_sb800(dev, retval, notify_imc);
                 if (retval < 0) {
                         release_region(SB800_PIIX4_SMB_IDX, 2);
                         return retval;
@@ -800,7 +942,7 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
                         return retval;
 
                 /* Try to register main SMBus adapter, give up if we can't */
-                retval = piix4_add_adapter(dev, retval, false, 0, "",
+                retval = piix4_add_adapter(dev, retval, false, 0, false, "",
                                            &piix4_main_adapters[0]);
                 if (retval < 0)
                         return retval;
@@ -827,7 +969,7 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
         if (retval > 0) {
                 /* Try to add the aux adapter if it exists,
                  * piix4_add_adapter will clean up if this fails */
-                piix4_add_adapter(dev, retval, false, 0,
+                piix4_add_adapter(dev, retval, false, 0, false,
                                   is_sb800 ? piix4_aux_port_name_sb800 : "",
                                   &piix4_aux_adapter);
         }
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 15de262015df..c6d9517d7611 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -148,6 +148,17 @@ config HID_SENSOR_ACCEL_3D
           To compile this driver as a module, choose M here: the
           module will be called hid-sensor-accel-3d.
 
+config IIO_CROS_EC_ACCEL_LEGACY
+        tristate "ChromeOS EC Legacy Accelerometer Sensor"
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        select CROS_EC_LPC_REGISTER_DEVICE
+        help
+          Say yes here to get support for accelerometers on Chromebook using
+          legacy EC firmware.
+          Sensor data is retrieved through IO memory.
+          Newer devices should use IIO_CROS_EC_SENSORS.
+
 config IIO_ST_ACCEL_3AXIS
         tristate "STMicroelectronics accelerometers 3-Axis Driver"
         depends on (I2C || SPI_MASTER) && SYSFS
@@ -219,8 +230,8 @@ config KXCJK1013
         select IIO_TRIGGERED_BUFFER
         help
           Say Y here if you want to build a driver for the Kionix KXCJK-1013
-          triaxial acceleration sensor. This driver also supports KXCJ9-1008
-          and KXTJ2-1009.
+          triaxial acceleration sensor. This driver also supports KXCJ9-1008,
+          KXTJ2-1009 and KXTF9.
 
           To compile this driver as a module, choose M here: the module will
           be called kxcjk-1013.
diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
index 31fba1974e95..fdd054af636c 100644
--- a/drivers/iio/accel/Makefile
+++ b/drivers/iio/accel/Makefile
@@ -43,6 +43,8 @@ obj-$(CONFIG_SCA3000)		+= sca3000.o
 obj-$(CONFIG_STK8312)           += stk8312.o
 obj-$(CONFIG_STK8BA50)          += stk8ba50.o
 
+obj-$(CONFIG_IIO_CROS_EC_ACCEL_LEGACY) += cros_ec_accel_legacy.o
+
 obj-$(CONFIG_IIO_SSP_SENSORS_COMMONS) += ssp_accel_sensor.o
 
 obj-$(CONFIG_IIO_ST_ACCEL_3AXIS) += st_accel.o
diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c
index 9ccb5828db98..7251d0e63d74 100644
--- a/drivers/iio/accel/adxl345_core.c
+++ b/drivers/iio/accel/adxl345_core.c
@@ -95,7 +95,6 @@ static int adxl345_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info adxl345_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = adxl345_read_raw,
 };
 
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 3dec972ca672..cb9765a3de60 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -536,7 +536,6 @@ static const struct iio_info bma180_info = {
         .attrs                  = &bma180_attrs_group,
         .read_raw               = bma180_read_raw,
         .write_raw              = bma180_write_raw,
-        .driver_module          = THIS_MODULE,
 };
 
 static const char * const bma180_power_modes[] = { "low_noise", "low_power" };
@@ -700,7 +699,6 @@ static int bma180_trig_try_reen(struct iio_trigger *trig)
 static const struct iio_trigger_ops bma180_trigger_ops = {
         .set_trigger_state = bma180_data_rdy_trigger_set_state,
         .try_reenable = bma180_trig_try_reen,
-        .owner = THIS_MODULE,
 };
 
 static int bma180_probe(struct i2c_client *client,
diff --git a/drivers/iio/accel/bma220_spi.c b/drivers/iio/accel/bma220_spi.c
index 5099f295dd37..e25d91c017ed 100644
--- a/drivers/iio/accel/bma220_spi.c
+++ b/drivers/iio/accel/bma220_spi.c
@@ -186,7 +186,6 @@ static int bma220_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info bma220_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = bma220_read_raw,
         .write_raw              = bma220_write_raw,
         .attrs                  = &bma220_attribute_group,
diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c
index 807299dd45eb..870f92ef61c2 100644
--- a/drivers/iio/accel/bmc150-accel-core.c
+++ b/drivers/iio/accel/bmc150-accel-core.c
@@ -1094,7 +1094,6 @@ static const struct iio_info bmc150_accel_info = {
         .write_event_value      = bmc150_accel_write_event,
         .write_event_config     = bmc150_accel_write_event_config,
         .read_event_config      = bmc150_accel_read_event_config,
-        .driver_module          = THIS_MODULE,
 };
 
 static const struct iio_info bmc150_accel_info_fifo = {
@@ -1108,7 +1107,6 @@ static const struct iio_info bmc150_accel_info_fifo = {
         .validate_trigger       = bmc150_accel_validate_trigger,
         .hwfifo_set_watermark   = bmc150_accel_set_watermark,
         .hwfifo_flush_to_buffer = bmc150_accel_fifo_flush,
-        .driver_module          = THIS_MODULE,
 };
 
 static const unsigned long bmc150_accel_scan_masks[] = {
@@ -1200,7 +1198,6 @@ static int bmc150_accel_trigger_set_state(struct iio_trigger *trig,
 static const struct iio_trigger_ops bmc150_accel_trigger_ops = {
         .set_trigger_state = bmc150_accel_trigger_set_state,
         .try_reenable = bmc150_accel_trig_try_reen,
-        .owner = THIS_MODULE,
 };
 
 static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
diff --git a/drivers/iio/accel/cros_ec_accel_legacy.c b/drivers/iio/accel/cros_ec_accel_legacy.c
new file mode 100644
index 000000000000..063e89eff791
--- /dev/null
+++ b/drivers/iio/accel/cros_ec_accel_legacy.c
@@ -0,0 +1,423 @@
+/*
+ * Driver for older Chrome OS EC accelerometer
+ *
+ * Copyright 2017 Google, Inc
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * This driver uses the memory mapper cros-ec interface to communicate
+ * with the Chrome OS EC about accelerometer data.
+ * Accelerometer access is presented through iio sysfs.
+ */
+
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/kfifo_buf.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
+#include <linux/kernel.h>
+#include <linux/mfd/cros_ec.h>
+#include <linux/mfd/cros_ec_commands.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/platform_device.h>
+
+#define DRV_NAME        "cros-ec-accel-legacy"
+
+/*
+ * Sensor scale hard coded at 10 bits per g, computed as:
+ * g / (2^10 - 1) = 0.009586168; with g = 9.80665 m.s^-2
+ */
+#define ACCEL_LEGACY_NSCALE 9586168
+
+/* Indices for EC sensor values. */
+enum {
+        X,
+        Y,
+        Z,
+        MAX_AXIS,
+};
+
+/* State data for cros_ec_accel_legacy iio driver. */
+struct cros_ec_accel_legacy_state {
+        struct cros_ec_device *ec;
+
+        /*
+         * Array holding data from a single capture. 2 bytes per channel
+         * for the 3 channels plus the timestamp which is always last and
+         * 8-bytes aligned.
+         */
+        s16 capture_data[8];
+        s8 sign[MAX_AXIS];
+        u8 sensor_num;
+};
+
+static int ec_cmd_read_u8(struct cros_ec_device *ec, unsigned int offset,
+                          u8 *dest)
+{
+        return ec->cmd_readmem(ec, offset, 1, dest);
+}
+
+static int ec_cmd_read_u16(struct cros_ec_device *ec, unsigned int offset,
+                           u16 *dest)
+{
+        __le16 tmp;
+        int ret = ec->cmd_readmem(ec, offset, 2, &tmp);
+
+        *dest = le16_to_cpu(tmp);
+
+        return ret;
+}
+
+/**
+ * read_ec_until_not_busy() - Read from EC status byte until it reads not busy.
+ * @st: Pointer to state information for device.
+ *
+ * This function reads EC status until its busy bit gets cleared. It does not
+ * wait indefinitely and returns -EIO if the EC status is still busy after a
+ * few hundreds milliseconds.
+ *
+ * Return: 8-bit status if ok, -EIO on error
+ */
+static int read_ec_until_not_busy(struct cros_ec_accel_legacy_state *st)
+{
+        struct cros_ec_device *ec = st->ec;
+        u8 status;
+        int attempts = 0;
+
+        ec_cmd_read_u8(ec, EC_MEMMAP_ACC_STATUS, &status);
+        while (status & EC_MEMMAP_ACC_STATUS_BUSY_BIT) {
+                /* Give up after enough attempts, return error. */
+                if (attempts++ >= 50)
+                        return -EIO;
+
+                /* Small delay every so often. */
+                if (attempts % 5 == 0)
+                        msleep(25);
+
+                ec_cmd_read_u8(ec, EC_MEMMAP_ACC_STATUS, &status);
+        }
+
+        return status;
+}
+
+/**
+ * read_ec_accel_data_unsafe() - Read acceleration data from EC shared memory.
+ * @st:        Pointer to state information for device.
+ * @scan_mask: Bitmap of the sensor indices to scan.
+ * @data:      Location to store data.
+ *
+ * This is the unsafe function for reading the EC data. It does not guarantee
+ * that the EC will not modify the data as it is being read in.
+ */
+static void read_ec_accel_data_unsafe(struct cros_ec_accel_legacy_state *st,
+                                      unsigned long scan_mask, s16 *data)
+{
+        int i = 0;
+        int num_enabled = bitmap_weight(&scan_mask, MAX_AXIS);
+
+        /* Read all sensors enabled in scan_mask. Each value is 2 bytes. */
+        while (num_enabled--) {
+                i = find_next_bit(&scan_mask, MAX_AXIS, i);
+                ec_cmd_read_u16(st->ec,
+                                EC_MEMMAP_ACC_DATA +
+                                sizeof(s16) *
+                                (1 + i + st->sensor_num * MAX_AXIS),
+                                data);
+                *data *= st->sign[i];
+                i++;
+                data++;
+        }
+}
+
+/**
+ * read_ec_accel_data() - Read acceleration data from EC shared memory.
+ * @st:        Pointer to state information for device.
+ * @scan_mask: Bitmap of the sensor indices to scan.
+ * @data:      Location to store data.
+ *
+ * This is the safe function for reading the EC data. It guarantees that
+ * the data sampled was not modified by the EC while being read.
+ *
+ * Return: 0 if ok, -ve on error
+ */
+static int read_ec_accel_data(struct cros_ec_accel_legacy_state *st,
+                              unsigned long scan_mask, s16 *data)
+{
+        u8 samp_id = 0xff;
+        u8 status = 0;
+        int ret;
+        int attempts = 0;
+
+        /*
+         * Continually read all data from EC until the status byte after
+         * all reads reflects that the EC is not busy and the sample id
+         * matches the sample id from before all reads. This guarantees
+         * that data read in was not modified by the EC while reading.
+         */
+        while ((status & (EC_MEMMAP_ACC_STATUS_BUSY_BIT |
+                          EC_MEMMAP_ACC_STATUS_SAMPLE_ID_MASK)) != samp_id) {
+                /* If we have tried to read too many times, return error. */
+                if (attempts++ >= 5)
+                        return -EIO;
+
+                /* Read status byte until EC is not busy. */
+                ret = read_ec_until_not_busy(st);
+                if (ret < 0)
+                        return ret;
+                status = ret;
+
+                /*
+                 * Store the current sample id so that we can compare to the
+                 * sample id after reading the data.
+                 */
+                samp_id = status & EC_MEMMAP_ACC_STATUS_SAMPLE_ID_MASK;
+
+                /* Read all EC data, format it, and store it into data. */
+                read_ec_accel_data_unsafe(st, scan_mask, data);
+
+                /* Read status byte. */
+                ec_cmd_read_u8(st->ec, EC_MEMMAP_ACC_STATUS, &status);
+        }
+
+        return 0;
+}
+
+static int cros_ec_accel_legacy_read(struct iio_dev *indio_dev,
+                                     struct iio_chan_spec const *chan,
+                                     int *val, int *val2, long mask)
+{
+        struct cros_ec_accel_legacy_state *st = iio_priv(indio_dev);
+        s16 data = 0;
+        int ret = IIO_VAL_INT;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                ret = read_ec_accel_data(st, (1 << chan->scan_index), &data);
+                if (ret)
+                        return ret;
+                *val = data;
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                *val = 0;
+                *val2 = ACCEL_LEGACY_NSCALE;
+                return IIO_VAL_INT_PLUS_NANO;
+        case IIO_CHAN_INFO_CALIBBIAS:
+                /* Calibration not supported. */
+                *val = 0;
+                return IIO_VAL_INT;
+        default:
+                return -EINVAL;
+        }
+}
+
+static int cros_ec_accel_legacy_write(struct iio_dev *indio_dev,
+                                      struct iio_chan_spec const *chan,
+                                      int val, int val2, long mask)
+{
+        /*
+         * Do nothing but don't return an error code to allow calibration
+         * script to work.
+         */
+        if (mask == IIO_CHAN_INFO_CALIBBIAS)
+                return 0;
+
+        return -EINVAL;
+}
+
+static const struct iio_info cros_ec_accel_legacy_info = {
+        .read_raw = &cros_ec_accel_legacy_read,
+        .write_raw = &cros_ec_accel_legacy_write,
+};
+
+/**
+ * cros_ec_accel_legacy_capture() - The trigger handler function
+ * @irq: The interrupt number.
+ * @p:   Private data - always a pointer to the poll func.
+ *
+ * On a trigger event occurring, if the pollfunc is attached then this
+ * handler is called as a threaded interrupt (and hence may sleep). It
+ * is responsible for grabbing data from the device and pushing it into
+ * the associated buffer.
+ *
+ * Return: IRQ_HANDLED
+ */
+static irqreturn_t cros_ec_accel_legacy_capture(int irq, void *p)
+{
+        struct iio_poll_func *pf = p;
+        struct iio_dev *indio_dev = pf->indio_dev;
+        struct cros_ec_accel_legacy_state *st = iio_priv(indio_dev);
+
+        /* Clear capture data. */
+        memset(st->capture_data, 0, sizeof(st->capture_data));
+
+        /*
+         * Read data based on which channels are enabled in scan mask. Note
+         * that on a capture we are always reading the calibrated data.
+         */
+        read_ec_accel_data(st, *indio_dev->active_scan_mask, st->capture_data);
+
+        iio_push_to_buffers_with_timestamp(indio_dev, (void *)st->capture_data,
+                                           iio_get_time_ns(indio_dev));
+
+        /*
+         * Tell the core we are done with this trigger and ready for the
+         * next one.
+         */
+        iio_trigger_notify_done(indio_dev->trig);
+
+        return IRQ_HANDLED;
+}
+
+static char *cros_ec_accel_legacy_loc_strings[] = {
+        [MOTIONSENSE_LOC_BASE] = "base",
+        [MOTIONSENSE_LOC_LID] = "lid",
+        [MOTIONSENSE_LOC_MAX] = "unknown",
+};
+
+static ssize_t cros_ec_accel_legacy_loc(struct iio_dev *indio_dev,
+                                        uintptr_t private,
+                                        const struct iio_chan_spec *chan,
+                                        char *buf)
+{
+        struct cros_ec_accel_legacy_state *st = iio_priv(indio_dev);
+
+        return sprintf(buf, "%s\n",
+                       cros_ec_accel_legacy_loc_strings[st->sensor_num +
+                                                        MOTIONSENSE_LOC_BASE]);
+}
+
+static ssize_t cros_ec_accel_legacy_id(struct iio_dev *indio_dev,
+                                       uintptr_t private,
+                                       const struct iio_chan_spec *chan,
+                                       char *buf)
+{
+        struct cros_ec_accel_legacy_state *st = iio_priv(indio_dev);
+
+        return sprintf(buf, "%d\n", st->sensor_num);
+}
+
+static const struct iio_chan_spec_ext_info cros_ec_accel_legacy_ext_info[] = {
+        {
+                .name = "id",
+                .shared = IIO_SHARED_BY_ALL,
+                .read = cros_ec_accel_legacy_id,
+        },
+        {
+                .name = "location",
+                .shared = IIO_SHARED_BY_ALL,
+                .read = cros_ec_accel_legacy_loc,
+        },
+        { }
+};
+
+#define CROS_EC_ACCEL_LEGACY_CHAN(_axis)                                \
+        {                                                               \
+                .type = IIO_ACCEL,                                      \
+                .channel2 = IIO_MOD_X + (_axis),                        \
+                .modified = 1,                                          \
+                .info_mask_separate =                                   \
+                        BIT(IIO_CHAN_INFO_RAW) |                        \
+                        BIT(IIO_CHAN_INFO_SCALE) |                      \
+                        BIT(IIO_CHAN_INFO_CALIBBIAS),                   \
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SCALE),    \
+                .ext_info = cros_ec_accel_legacy_ext_info,              \
+                .scan_type = {                                          \
+                        .sign = 's',                                    \
+                        .realbits = 16,                                 \
+                        .storagebits = 16,                              \
+                },                                                      \
+        }                                                               \
+
+static struct iio_chan_spec ec_accel_channels[] = {
+        CROS_EC_ACCEL_LEGACY_CHAN(X),
+        CROS_EC_ACCEL_LEGACY_CHAN(Y),
+        CROS_EC_ACCEL_LEGACY_CHAN(Z),
+        IIO_CHAN_SOFT_TIMESTAMP(MAX_AXIS)
+};
+
+static int cros_ec_accel_legacy_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct cros_ec_dev *ec = dev_get_drvdata(dev->parent);
+        struct cros_ec_sensor_platform *sensor_platform = dev_get_platdata(dev);
+        struct iio_dev *indio_dev;
+        struct cros_ec_accel_legacy_state *state;
+        int ret, i;
+
+        if (!ec || !ec->ec_dev) {
+                dev_warn(&pdev->dev, "No EC device found.\n");
+                return -EINVAL;
+        }
+
+        if (!ec->ec_dev->cmd_readmem) {
+                dev_warn(&pdev->dev, "EC does not support direct reads.\n");
+                return -EINVAL;
+        }
+
+        indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*state));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, indio_dev);
+        state = iio_priv(indio_dev);
+        state->ec = ec->ec_dev;
+        state->sensor_num = sensor_platform->sensor_num;
+
+        indio_dev->dev.parent = dev;
+        indio_dev->name = pdev->name;
+        indio_dev->channels = ec_accel_channels;
+        /*
+         * Present the channel using HTML5 standard:
+         * need to invert X and Y and invert some lid axis.
+         */
+        for (i = X ; i < MAX_AXIS; i++) {
+                switch (i) {
+                case X:
+                        ec_accel_channels[X].scan_index = Y;
+                case Y:
+                        ec_accel_channels[Y].scan_index = X;
+                case Z:
+                        ec_accel_channels[Z].scan_index = Z;
+                }
+                if (state->sensor_num == MOTIONSENSE_LOC_LID && i != Y)
+                        state->sign[i] = -1;
+                else
+                        state->sign[i] = 1;
+        }
+        indio_dev->num_channels = ARRAY_SIZE(ec_accel_channels);
+        indio_dev->dev.parent = &pdev->dev;
+        indio_dev->info = &cros_ec_accel_legacy_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL,
+                                              cros_ec_accel_legacy_capture,
+                                              NULL);
+        if (ret)
+                return ret;
+
+        return devm_iio_device_register(dev, indio_dev);
+}
+
+static struct platform_driver cros_ec_accel_platform_driver = {
+        .driver = {
+                .name   = DRV_NAME,
+        },
+        .probe          = cros_ec_accel_legacy_probe,
+};
+module_platform_driver(cros_ec_accel_platform_driver);
+
+MODULE_DESCRIPTION("ChromeOS EC legacy accelerometer driver");
+MODULE_AUTHOR("Gwendal Grignou <gwendal@chromium.org>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/iio/accel/da280.c b/drivers/iio/accel/da280.c
index ed8343aeac9c..6c214783241c 100644
--- a/drivers/iio/accel/da280.c
+++ b/drivers/iio/accel/da280.c
@@ -88,7 +88,6 @@ static int da280_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info da280_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = da280_read_raw,
 };
 
diff --git a/drivers/iio/accel/da311.c b/drivers/iio/accel/da311.c
index c0c1620d2a2f..aa64bca00955 100644
--- a/drivers/iio/accel/da311.c
+++ b/drivers/iio/accel/da311.c
@@ -212,7 +212,6 @@ static int da311_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info da311_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = da311_read_raw,
 };
 
diff --git a/drivers/iio/accel/dmard06.c b/drivers/iio/accel/dmard06.c
index 656ca8e1927f..d87e2c751475 100644
--- a/drivers/iio/accel/dmard06.c
+++ b/drivers/iio/accel/dmard06.c
@@ -124,7 +124,6 @@ static int dmard06_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info dmard06_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = dmard06_read_raw,
 };
 
diff --git a/drivers/iio/accel/dmard09.c b/drivers/iio/accel/dmard09.c
index d3a28f96565c..16a7e74f5e9a 100644
--- a/drivers/iio/accel/dmard09.c
+++ b/drivers/iio/accel/dmard09.c
@@ -93,7 +93,6 @@ static int dmard09_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info dmard09_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = dmard09_read_raw,
 };
 
diff --git a/drivers/iio/accel/dmard10.c b/drivers/iio/accel/dmard10.c
index b8736cc75656..9518ea00167e 100644
--- a/drivers/iio/accel/dmard10.c
+++ b/drivers/iio/accel/dmard10.c
@@ -170,7 +170,6 @@ static int dmard10_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info dmard10_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = dmard10_read_raw,
 };
 
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index 2238a26aba63..c066a3bdbff7 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -225,7 +225,6 @@ static int accel_3d_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info accel_3d_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &accel_3d_read_raw,
         .write_raw = &accel_3d_write_raw,
 };
diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index 3f968c46e667..af53a1084ee5 100644
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -34,6 +34,13 @@
 #define KXCJK1013_DRV_NAME "kxcjk1013"
 #define KXCJK1013_IRQ_NAME "kxcjk1013_event"
 
+#define KXTF9_REG_HP_XOUT_L             0x00
+#define KXTF9_REG_HP_XOUT_H             0x01
+#define KXTF9_REG_HP_YOUT_L             0x02
+#define KXTF9_REG_HP_YOUT_H             0x03
+#define KXTF9_REG_HP_ZOUT_L             0x04
+#define KXTF9_REG_HP_ZOUT_H             0x05
+
 #define KXCJK1013_REG_XOUT_L            0x06
 /*
  * From low byte X axis register, all the other addresses of Y and Z can be
@@ -48,17 +55,33 @@
 
 #define KXCJK1013_REG_DCST_RESP         0x0C
 #define KXCJK1013_REG_WHO_AM_I          0x0F
-#define KXCJK1013_REG_INT_SRC1          0x16
+#define KXTF9_REG_TILT_POS_CUR          0x10
+#define KXTF9_REG_TILT_POS_PREV         0x11
+#define KXTF9_REG_INT_SRC1              0x15
+#define KXCJK1013_REG_INT_SRC1          0x16    /* compatible, but called INT_SRC2 in KXTF9 ds */
 #define KXCJK1013_REG_INT_SRC2          0x17
 #define KXCJK1013_REG_STATUS_REG        0x18
 #define KXCJK1013_REG_INT_REL           0x1A
 #define KXCJK1013_REG_CTRL1             0x1B
-#define KXCJK1013_REG_CTRL2             0x1D
+#define KXTF9_REG_CTRL2                 0x1C
+#define KXCJK1013_REG_CTRL2             0x1D    /* mostly compatible, CTRL_REG3 in KTXF9 ds */
 #define KXCJK1013_REG_INT_CTRL1         0x1E
 #define KXCJK1013_REG_INT_CTRL2         0x1F
+#define KXTF9_REG_INT_CTRL3             0x20
 #define KXCJK1013_REG_DATA_CTRL         0x21
+#define KXTF9_REG_TILT_TIMER            0x28
 #define KXCJK1013_REG_WAKE_TIMER        0x29
+#define KXTF9_REG_TDT_TIMER             0x2B
+#define KXTF9_REG_TDT_THRESH_H          0x2C
+#define KXTF9_REG_TDT_THRESH_L          0x2D
+#define KXTF9_REG_TDT_TAP_TIMER         0x2E
+#define KXTF9_REG_TDT_TOTAL_TIMER       0x2F
+#define KXTF9_REG_TDT_LATENCY_TIMER     0x30
+#define KXTF9_REG_TDT_WINDOW_TIMER      0x31
 #define KXCJK1013_REG_SELF_TEST         0x3A
+#define KXTF9_REG_WAKE_THRESH           0x5A
+#define KXTF9_REG_TILT_ANGLE            0x5C
+#define KXTF9_REG_HYST_SET              0x5F
 #define KXCJK1013_REG_WAKE_THRES        0x6A
 
 #define KXCJK1013_REG_CTRL1_BIT_PC1     BIT(7)
@@ -67,14 +90,33 @@
 #define KXCJK1013_REG_CTRL1_BIT_GSEL1   BIT(4)
 #define KXCJK1013_REG_CTRL1_BIT_GSEL0   BIT(3)
 #define KXCJK1013_REG_CTRL1_BIT_WUFE    BIT(1)
-#define KXCJK1013_REG_INT_REG1_BIT_IEA  BIT(4)
-#define KXCJK1013_REG_INT_REG1_BIT_IEN  BIT(5)
+
+#define KXCJK1013_REG_INT_CTRL1_BIT_IEU BIT(2)  /* KXTF9 */
+#define KXCJK1013_REG_INT_CTRL1_BIT_IEL BIT(3)
+#define KXCJK1013_REG_INT_CTRL1_BIT_IEA BIT(4)
+#define KXCJK1013_REG_INT_CTRL1_BIT_IEN BIT(5)
+
+#define KXTF9_REG_TILT_BIT_LEFT_EDGE    BIT(5)
+#define KXTF9_REG_TILT_BIT_RIGHT_EDGE   BIT(4)
+#define KXTF9_REG_TILT_BIT_LOWER_EDGE   BIT(3)
+#define KXTF9_REG_TILT_BIT_UPPER_EDGE   BIT(2)
+#define KXTF9_REG_TILT_BIT_FACE_DOWN    BIT(1)
+#define KXTF9_REG_TILT_BIT_FACE_UP      BIT(0)
 
 #define KXCJK1013_DATA_MASK_12_BIT      0x0FFF
 #define KXCJK1013_MAX_STARTUP_TIME_US   100000
 
 #define KXCJK1013_SLEEP_DELAY_MS        2000
 
+#define KXCJK1013_REG_INT_SRC1_BIT_TPS  BIT(0)  /* KXTF9 */
+#define KXCJK1013_REG_INT_SRC1_BIT_WUFS BIT(1)
+#define KXCJK1013_REG_INT_SRC1_MASK_TDTS        (BIT(2) | BIT(3))       /* KXTF9 */
+#define KXCJK1013_REG_INT_SRC1_TAP_NONE         0
+#define KXCJK1013_REG_INT_SRC1_TAP_SINGLE               BIT(2)
+#define KXCJK1013_REG_INT_SRC1_TAP_DOUBLE               BIT(3)
+#define KXCJK1013_REG_INT_SRC1_BIT_DRDY BIT(4)
+
+/* KXCJK: INT_SOURCE2: motion detect, KXTF9: INT_SRC_REG1: tap detect */
 #define KXCJK1013_REG_INT_SRC2_BIT_ZP   BIT(0)
 #define KXCJK1013_REG_INT_SRC2_BIT_ZN   BIT(1)
 #define KXCJK1013_REG_INT_SRC2_BIT_YP   BIT(2)
@@ -88,6 +130,7 @@ enum kx_chipset {
         KXCJK1013,
         KXCJ91008,
         KXTJ21009,
+        KXTF9,
         KX_MAX_CHIPS /* this must be last */
 };
 
@@ -128,15 +171,42 @@ enum kxcjk1013_range {
         KXCJK1013_RANGE_8G,
 };
 
-static const struct {
+struct kx_odr_map {
         int val;
         int val2;
         int odr_bits;
-} samp_freq_table[] = { {0, 781000, 0x08}, {1, 563000, 0x09},
-                        {3, 125000, 0x0A}, {6, 250000, 0x0B}, {12, 500000, 0},
-                        {25, 0, 0x01}, {50, 0, 0x02}, {100, 0, 0x03},
-                        {200, 0, 0x04}, {400, 0, 0x05}, {800, 0, 0x06},
-                        {1600, 0, 0x07} };
+        int wuf_bits;
+};
+
+static const struct kx_odr_map samp_freq_table[] = {
+        { 0, 781000, 0x08, 0x00 },
+        { 1, 563000, 0x09, 0x01 },
+        { 3, 125000, 0x0A, 0x02 },
+        { 6, 250000, 0x0B, 0x03 },
+        { 12, 500000, 0x00, 0x04 },
+        { 25, 0, 0x01, 0x05 },
+        { 50, 0, 0x02, 0x06 },
+        { 100, 0, 0x03, 0x06 },
+        { 200, 0, 0x04, 0x06 },
+        { 400, 0, 0x05, 0x06 },
+        { 800, 0, 0x06, 0x06 },
+        { 1600, 0, 0x07, 0x06 },
+};
+
+static const char *const kxcjk1013_samp_freq_avail =
+        "0.781000 1.563000 3.125000 6.250000 12.500000 25 50 100 200 400 800 1600";
+
+static const struct kx_odr_map kxtf9_samp_freq_table[] = {
+        { 25, 0, 0x01, 0x00 },
+        { 50, 0, 0x02, 0x01 },
+        { 100, 0, 0x03, 0x01 },
+        { 200, 0, 0x04, 0x01 },
+        { 400, 0, 0x05, 0x01 },
+        { 800, 0, 0x06, 0x01 },
+};
+
+static const char *const kxtf9_samp_freq_avail =
+        "25 50 100 200 400 800";
 
 /* Refer to section 4 of the specification */
 static const struct {
@@ -188,6 +258,15 @@ static const struct {
                 {0x06, 3000},
                 {0x07, 2000},
         },
+        /* KXTF9 */
+        {
+                {0x01, 81000},
+                {0x02, 41000},
+                {0x03, 21000},
+                {0x04, 11000},
+                {0x05, 5100},
+                {0x06, 2700},
+        },
 };
 
 static const struct {
@@ -198,23 +277,6 @@ static const struct {
                               {19163, 1, 0},
                               {38326, 0, 1} };
 
-static const struct {
-        int val;
-        int val2;
-        int odr_bits;
-} wake_odr_data_rate_table[] = { {0, 781000, 0x00},
-                                 {1, 563000, 0x01},
-                                 {3, 125000, 0x02},
-                                 {6, 250000, 0x03},
-                                 {12, 500000, 0x04},
-                                 {25, 0, 0x05},
-                                 {50, 0, 0x06},
-                                 {100, 0, 0x06},
-                                 {200, 0, 0x06},
-                                 {400, 0, 0x06},
-                                 {800, 0, 0x06},
-                                 {1600, 0, 0x06} };
-
 static int kxcjk1013_set_mode(struct kxcjk1013_data *data,
                               enum kxcjk1013_mode mode)
 {
@@ -341,9 +403,9 @@ static int kxcjk1013_chip_init(struct kxcjk1013_data *data)
         }
 
         if (data->active_high_intr)
-                ret |= KXCJK1013_REG_INT_REG1_BIT_IEA;
+                ret |= KXCJK1013_REG_INT_CTRL1_BIT_IEA;
         else
-                ret &= ~KXCJK1013_REG_INT_REG1_BIT_IEA;
+                ret &= ~KXCJK1013_REG_INT_CTRL1_BIT_IEA;
 
         ret = i2c_smbus_write_byte_data(data->client, KXCJK1013_REG_INT_CTRL1,
                                         ret);
@@ -401,7 +463,7 @@ static int kxcjk1013_set_power_state(struct kxcjk1013_data *data, bool on)
 
 static int kxcjk1013_chip_update_thresholds(struct kxcjk1013_data *data)
 {
-        int ret;
+        int waketh_reg, ret;
 
         ret = i2c_smbus_write_byte_data(data->client,
                                         KXCJK1013_REG_WAKE_TIMER,
@@ -412,8 +474,9 @@ static int kxcjk1013_chip_update_thresholds(struct kxcjk1013_data *data)
                 return ret;
         }
 
-        ret = i2c_smbus_write_byte_data(data->client,
-                                        KXCJK1013_REG_WAKE_THRES,
+        waketh_reg = data->chipset == KXTF9 ?
+                KXTF9_REG_WAKE_THRESH : KXCJK1013_REG_WAKE_THRES;
+        ret = i2c_smbus_write_byte_data(data->client, waketh_reg,
                                         data->wake_thres);
         if (ret < 0) {
                 dev_err(&data->client->dev, "Error writing reg_wake_thres\n");
@@ -449,9 +512,9 @@ static int kxcjk1013_setup_any_motion_interrupt(struct kxcjk1013_data *data,
         }
 
         if (status)
-                ret |= KXCJK1013_REG_INT_REG1_BIT_IEN;
+                ret |= KXCJK1013_REG_INT_CTRL1_BIT_IEN;
         else
-                ret &= ~KXCJK1013_REG_INT_REG1_BIT_IEN;
+                ret &= ~KXCJK1013_REG_INT_CTRL1_BIT_IEN;
 
         ret = i2c_smbus_write_byte_data(data->client, KXCJK1013_REG_INT_CTRL1,
                                         ret);
@@ -509,9 +572,9 @@ static int kxcjk1013_setup_new_data_interrupt(struct kxcjk1013_data *data,
         }
 
         if (status)
-                ret |= KXCJK1013_REG_INT_REG1_BIT_IEN;
+                ret |= KXCJK1013_REG_INT_CTRL1_BIT_IEN;
         else
-                ret &= ~KXCJK1013_REG_INT_REG1_BIT_IEN;
+                ret &= ~KXCJK1013_REG_INT_CTRL1_BIT_IEN;
 
         ret = i2c_smbus_write_byte_data(data->client, KXCJK1013_REG_INT_CTRL1,
                                         ret);
@@ -547,28 +610,30 @@ static int kxcjk1013_setup_new_data_interrupt(struct kxcjk1013_data *data,
         return 0;
 }
 
-static int kxcjk1013_convert_freq_to_bit(int val, int val2)
+static const struct kx_odr_map *kxcjk1013_find_odr_value(
+        const struct kx_odr_map *map, size_t map_size, int val, int val2)
 {
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(samp_freq_table); ++i) {
-                if (samp_freq_table[i].val == val &&
-                        samp_freq_table[i].val2 == val2) {
-                        return samp_freq_table[i].odr_bits;
-                }
+        for (i = 0; i < map_size; ++i) {
+                if (map[i].val == val && map[i].val2 == val2)
+                        return &map[i];
         }
 
-        return -EINVAL;
+        return ERR_PTR(-EINVAL);
 }
 
-static int kxcjk1013_convert_wake_odr_to_bit(int val, int val2)
+static int kxcjk1013_convert_odr_value(const struct kx_odr_map *map,
+                                       size_t map_size, int odr_bits,
+                                       int *val, int *val2)
 {
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(wake_odr_data_rate_table); ++i) {
-                if (wake_odr_data_rate_table[i].val == val &&
-                        wake_odr_data_rate_table[i].val2 == val2) {
-                        return wake_odr_data_rate_table[i].odr_bits;
+        for (i = 0; i < map_size; ++i) {
+                if (map[i].odr_bits == odr_bits) {
+                        *val = map[i].val;
+                        *val2 = map[i].val2;
+                        return IIO_VAL_INT_PLUS_MICRO;
                 }
         }
 
@@ -578,16 +643,24 @@ static int kxcjk1013_convert_wake_odr_to_bit(int val, int val2)
 static int kxcjk1013_set_odr(struct kxcjk1013_data *data, int val, int val2)
 {
         int ret;
-        int odr_bits;
         enum kxcjk1013_mode store_mode;
+        const struct kx_odr_map *odr_setting;
 
         ret = kxcjk1013_get_mode(data, &store_mode);
         if (ret < 0)
                 return ret;
 
-        odr_bits = kxcjk1013_convert_freq_to_bit(val, val2);
-        if (odr_bits < 0)
-                return odr_bits;
+        if (data->chipset == KXTF9)
+                odr_setting = kxcjk1013_find_odr_value(kxtf9_samp_freq_table,
+                                                       ARRAY_SIZE(kxtf9_samp_freq_table),
+                                                       val, val2);
+        else
+                odr_setting = kxcjk1013_find_odr_value(samp_freq_table,
+                                                       ARRAY_SIZE(samp_freq_table),
+                                                       val, val2);
+
+        if (IS_ERR(odr_setting))
+                return PTR_ERR(odr_setting);
 
         /* To change ODR, the chip must be set to STANDBY as per spec */
         ret = kxcjk1013_set_mode(data, STANDBY);
@@ -595,20 +668,16 @@ static int kxcjk1013_set_odr(struct kxcjk1013_data *data, int val, int val2)
                 return ret;
 
         ret = i2c_smbus_write_byte_data(data->client, KXCJK1013_REG_DATA_CTRL,
-                                        odr_bits);
+                                        odr_setting->odr_bits);
         if (ret < 0) {
                 dev_err(&data->client->dev, "Error writing data_ctrl\n");
                 return ret;
         }
 
-        data->odr_bits = odr_bits;
-
-        odr_bits = kxcjk1013_convert_wake_odr_to_bit(val, val2);
-        if (odr_bits < 0)
-                return odr_bits;
+        data->odr_bits = odr_setting->odr_bits;
 
         ret = i2c_smbus_write_byte_data(data->client, KXCJK1013_REG_CTRL2,
-                                        odr_bits);
+                                        odr_setting->wuf_bits);
         if (ret < 0) {
                 dev_err(&data->client->dev, "Error writing reg_ctrl2\n");
                 return ret;
@@ -625,17 +694,14 @@ static int kxcjk1013_set_odr(struct kxcjk1013_data *data, int val, int val2)
 
 static int kxcjk1013_get_odr(struct kxcjk1013_data *data, int *val, int *val2)
 {
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(samp_freq_table); ++i) {
-                if (samp_freq_table[i].odr_bits == data->odr_bits) {
-                        *val = samp_freq_table[i].val;
-                        *val2 = samp_freq_table[i].val2;
-                        return IIO_VAL_INT_PLUS_MICRO;
-                }
-        }
-
-        return -EINVAL;
+        if (data->chipset == KXTF9)
+                return kxcjk1013_convert_odr_value(kxtf9_samp_freq_table,
+                                                   ARRAY_SIZE(kxtf9_samp_freq_table),
+                                                   data->odr_bits, val, val2);
+        else
+                return kxcjk1013_convert_odr_value(samp_freq_table,
+                                                   ARRAY_SIZE(samp_freq_table),
+                                                   data->odr_bits, val, val2);
 }
 
 static int kxcjk1013_get_acc_reg(struct kxcjk1013_data *data, int axis)
@@ -886,13 +952,29 @@ static int kxcjk1013_buffer_postdisable(struct iio_dev *indio_dev)
         return kxcjk1013_set_power_state(data, false);
 }
 
-static IIO_CONST_ATTR_SAMP_FREQ_AVAIL(
-        "0.781000 1.563000 3.125000 6.250000 12.500000 25 50 100 200 400 800 1600");
+static ssize_t kxcjk1013_get_samp_freq_avail(struct device *dev,
+                                             struct device_attribute *attr,
+                                             char *buf)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct kxcjk1013_data *data = iio_priv(indio_dev);
+        const char *str;
+
+        if (data->chipset == KXTF9)
+                str = kxtf9_samp_freq_avail;
+        else
+                str = kxcjk1013_samp_freq_avail;
+
+        return sprintf(buf, "%s\n", str);
+}
+
+static IIO_DEVICE_ATTR(in_accel_sampling_frequency_available, S_IRUGO,
+                       kxcjk1013_get_samp_freq_avail, NULL, 0);
 
 static IIO_CONST_ATTR(in_accel_scale_available, "0.009582 0.019163 0.038326");
 
 static struct attribute *kxcjk1013_attributes[] = {
-        &iio_const_attr_sampling_frequency_available.dev_attr.attr,
+        &iio_dev_attr_in_accel_sampling_frequency_available.dev_attr.attr,
         &iio_const_attr_in_accel_scale_available.dev_attr.attr,
         NULL,
 };
@@ -950,7 +1032,6 @@ static const struct iio_info kxcjk1013_info = {
         .write_event_value      = kxcjk1013_write_event,
         .write_event_config     = kxcjk1013_write_event_config,
         .read_event_config      = kxcjk1013_read_event_config,
-        .driver_module          = THIS_MODULE,
 };
 
 static const unsigned long kxcjk1013_scan_masks[] = {0x7, 0};
@@ -1036,9 +1117,74 @@ static int kxcjk1013_data_rdy_trigger_set_state(struct iio_trigger *trig,
 static const struct iio_trigger_ops kxcjk1013_trigger_ops = {
         .set_trigger_state = kxcjk1013_data_rdy_trigger_set_state,
         .try_reenable = kxcjk1013_trig_try_reen,
-        .owner = THIS_MODULE,
 };
 
+static void kxcjk1013_report_motion_event(struct iio_dev *indio_dev)
+{
+        struct kxcjk1013_data *data = iio_priv(indio_dev);
+
+        int ret = i2c_smbus_read_byte_data(data->client,
+                                           KXCJK1013_REG_INT_SRC2);
+        if (ret < 0) {
+                dev_err(&data->client->dev, "Error reading reg_int_src2\n");
+                return;
+        }
+
+        if (ret & KXCJK1013_REG_INT_SRC2_BIT_XN)
+                iio_push_event(indio_dev,
+                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
+                                                  0,
+                                                  IIO_MOD_X,
+                                                  IIO_EV_TYPE_THRESH,
+                                                  IIO_EV_DIR_FALLING),
+                               data->timestamp);
+
+        if (ret & KXCJK1013_REG_INT_SRC2_BIT_XP)
+                iio_push_event(indio_dev,
+                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
+                                                  0,
+                                                  IIO_MOD_X,
+                                                  IIO_EV_TYPE_THRESH,
+                                                  IIO_EV_DIR_RISING),
+                               data->timestamp);
+
+        if (ret & KXCJK1013_REG_INT_SRC2_BIT_YN)
+                iio_push_event(indio_dev,
+                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
+                                                  0,
+                                                  IIO_MOD_Y,
+                                                  IIO_EV_TYPE_THRESH,
+                                                  IIO_EV_DIR_FALLING),
+                               data->timestamp);
+
+        if (ret & KXCJK1013_REG_INT_SRC2_BIT_YP)
+                iio_push_event(indio_dev,
+                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
+                                                  0,
+                                                  IIO_MOD_Y,
+                                                  IIO_EV_TYPE_THRESH,
+                                                  IIO_EV_DIR_RISING),
+                               data->timestamp);
+
+        if (ret & KXCJK1013_REG_INT_SRC2_BIT_ZN)
+                iio_push_event(indio_dev,
+                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
+                                                  0,
+                                                  IIO_MOD_Z,
+                                                  IIO_EV_TYPE_THRESH,
+                                                  IIO_EV_DIR_FALLING),
+                               data->timestamp);
+
+        if (ret & KXCJK1013_REG_INT_SRC2_BIT_ZP)
+                iio_push_event(indio_dev,
+                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
+                                                  0,
+                                                  IIO_MOD_Z,
+                                                  IIO_EV_TYPE_THRESH,
+                                                  IIO_EV_DIR_RISING),
+                               data->timestamp);
+}
+
 static irqreturn_t kxcjk1013_event_handler(int irq, void *private)
 {
         struct iio_dev *indio_dev = private;
@@ -1051,66 +1197,17 @@ static irqreturn_t kxcjk1013_event_handler(int irq, void *private)
                 goto ack_intr;
         }
 
-        if (ret & 0x02) {
-                ret = i2c_smbus_read_byte_data(data->client,
-                                               KXCJK1013_REG_INT_SRC2);
-                if (ret < 0) {
-                        dev_err(&data->client->dev,
-                                "Error reading reg_int_src2\n");
-                        goto ack_intr;
-                }
-
-                if (ret & KXCJK1013_REG_INT_SRC2_BIT_XN)
-                        iio_push_event(indio_dev,
-                                       IIO_MOD_EVENT_CODE(IIO_ACCEL,
-                                       0,
-                                       IIO_MOD_X,
-                                       IIO_EV_TYPE_THRESH,
-                                       IIO_EV_DIR_FALLING),
-                                       data->timestamp);
-                if (ret & KXCJK1013_REG_INT_SRC2_BIT_XP)
-                        iio_push_event(indio_dev,
-                                       IIO_MOD_EVENT_CODE(IIO_ACCEL,
-                                       0,
-                                       IIO_MOD_X,
-                                       IIO_EV_TYPE_THRESH,
-                                       IIO_EV_DIR_RISING),
-                                       data->timestamp);
-
-
-                if (ret & KXCJK1013_REG_INT_SRC2_BIT_YN)
-                        iio_push_event(indio_dev,
-                                       IIO_MOD_EVENT_CODE(IIO_ACCEL,
-                                       0,
-                                       IIO_MOD_Y,
-                                       IIO_EV_TYPE_THRESH,
-                                       IIO_EV_DIR_FALLING),
-                                       data->timestamp);
-                if (ret & KXCJK1013_REG_INT_SRC2_BIT_YP)
-                        iio_push_event(indio_dev,
-                                       IIO_MOD_EVENT_CODE(IIO_ACCEL,
-                                       0,
-                                       IIO_MOD_Y,
-                                       IIO_EV_TYPE_THRESH,
-                                       IIO_EV_DIR_RISING),
-                                       data->timestamp);
-
-                if (ret & KXCJK1013_REG_INT_SRC2_BIT_ZN)
-                        iio_push_event(indio_dev,
-                                       IIO_MOD_EVENT_CODE(IIO_ACCEL,
-                                       0,
-                                       IIO_MOD_Z,
-                                       IIO_EV_TYPE_THRESH,
-                                       IIO_EV_DIR_FALLING),
-                                       data->timestamp);
-                if (ret & KXCJK1013_REG_INT_SRC2_BIT_ZP)
+        if (ret & KXCJK1013_REG_INT_SRC1_BIT_WUFS) {
+                if (data->chipset == KXTF9)
                         iio_push_event(indio_dev,
                                        IIO_MOD_EVENT_CODE(IIO_ACCEL,
                                        0,
-                                       IIO_MOD_Z,
+                                       IIO_MOD_X_AND_Y_AND_Z,
                                        IIO_EV_TYPE_THRESH,
                                        IIO_EV_DIR_RISING),
                                        data->timestamp);
+                else
+                        kxcjk1013_report_motion_event(indio_dev);
         }
 
 ack_intr:
@@ -1403,6 +1500,7 @@ static const struct i2c_device_id kxcjk1013_id[] = {
         {"kxcjk1013", KXCJK1013},
         {"kxcj91008", KXCJ91008},
         {"kxtj21009", KXTJ21009},
+        {"kxtf9",     KXTF9},
         {"SMO8500",   KXCJ91008},
         {}
 };
diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index 9af60ac70738..0c0df4fce420 100644
--- a/drivers/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
@@ -390,7 +390,6 @@ static const struct iio_info kxsd9_info = {
         .read_raw = &kxsd9_read_raw,
         .write_raw = &kxsd9_write_raw,
         .attrs = &kxsd9_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 /* Four channels apart from timestamp, scan mask = 0x0f */
diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
index 4ea2ff623a6d..8b11604eed63 100644
--- a/drivers/iio/accel/mc3230.c
+++ b/drivers/iio/accel/mc3230.c
@@ -107,7 +107,6 @@ static int mc3230_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info mc3230_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = mc3230_read_raw,
 };
 
diff --git a/drivers/iio/accel/mma7455_core.c b/drivers/iio/accel/mma7455_core.c
index 6551085bedd7..da0ceaac46b5 100644
--- a/drivers/iio/accel/mma7455_core.c
+++ b/drivers/iio/accel/mma7455_core.c
@@ -199,7 +199,6 @@ static const struct iio_info mma7455_info = {
         .attrs = &mma7455_group,
         .read_raw = mma7455_read_raw,
         .write_raw = mma7455_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define MMA7455_CHANNEL(axis, idx) { \
diff --git a/drivers/iio/accel/mma7660.c b/drivers/iio/accel/mma7660.c
index 42fa57e41bdd..f1a13724efb3 100644
--- a/drivers/iio/accel/mma7660.c
+++ b/drivers/iio/accel/mma7660.c
@@ -168,7 +168,6 @@ static int mma7660_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info mma7660_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw               = mma7660_read_raw,
         .attrs                  = &mma7660_attribute_group,
 };
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index eb6e3dc789b2..bfd4bc806fc2 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -59,7 +59,9 @@
 #define MMA8452_FF_MT_THS                       0x17
 #define  MMA8452_FF_MT_THS_MASK                 0x7f
 #define MMA8452_FF_MT_COUNT                     0x18
+#define MMA8452_FF_MT_CHAN_SHIFT        3
 #define MMA8452_TRANSIENT_CFG                   0x1d
+#define  MMA8452_TRANSIENT_CFG_CHAN(chan)       BIT(chan + 1)
 #define  MMA8452_TRANSIENT_CFG_HPF_BYP          BIT(0)
 #define  MMA8452_TRANSIENT_CFG_ELE              BIT(4)
 #define MMA8452_TRANSIENT_SRC                   0x1e
@@ -69,6 +71,7 @@
 #define MMA8452_TRANSIENT_THS                   0x1f
 #define  MMA8452_TRANSIENT_THS_MASK             GENMASK(6, 0)
 #define MMA8452_TRANSIENT_COUNT                 0x20
+#define MMA8452_TRANSIENT_CHAN_SHIFT 1
 #define MMA8452_CTRL_REG1                       0x2a
 #define  MMA8452_CTRL_ACTIVE                    BIT(0)
 #define  MMA8452_CTRL_DR_MASK                   GENMASK(5, 3)
@@ -107,6 +110,51 @@ struct mma8452_data {
         const struct mma_chip_info *chip_info;
 };
 
+ /**
+  * struct mma8452_event_regs - chip specific data related to events
+  * @ev_cfg:                    event config register address
+  * @ev_cfg_ele:                        latch bit in event config register
+  * @ev_cfg_chan_shift:         number of the bit to enable events in X
+  *                             direction; in event config register
+  * @ev_src:                    event source register address
+  * @ev_ths:                    event threshold register address
+  * @ev_ths_mask:               mask for the threshold value
+  * @ev_count:                  event count (period) register address
+  *
+  * Since not all chips supported by the driver support comparing high pass
+  * filtered data for events (interrupts), different interrupt sources are
+  * used for different chips and the relevant registers are included here.
+  */
+struct mma8452_event_regs {
+                u8 ev_cfg;
+                u8 ev_cfg_ele;
+                u8 ev_cfg_chan_shift;
+                u8 ev_src;
+                u8 ev_ths;
+                u8 ev_ths_mask;
+                u8 ev_count;
+};
+
+static const struct mma8452_event_regs ev_regs_accel_falling = {
+                .ev_cfg = MMA8452_FF_MT_CFG,
+                .ev_cfg_ele = MMA8452_FF_MT_CFG_ELE,
+                .ev_cfg_chan_shift = MMA8452_FF_MT_CHAN_SHIFT,
+                .ev_src = MMA8452_FF_MT_SRC,
+                .ev_ths = MMA8452_FF_MT_THS,
+                .ev_ths_mask = MMA8452_FF_MT_THS_MASK,
+                .ev_count = MMA8452_FF_MT_COUNT
+};
+
+static const struct mma8452_event_regs ev_regs_accel_rising = {
+                .ev_cfg = MMA8452_TRANSIENT_CFG,
+                .ev_cfg_ele = MMA8452_TRANSIENT_CFG_ELE,
+                .ev_cfg_chan_shift = MMA8452_TRANSIENT_CHAN_SHIFT,
+                .ev_src = MMA8452_TRANSIENT_SRC,
+                .ev_ths = MMA8452_TRANSIENT_THS,
+                .ev_ths_mask = MMA8452_TRANSIENT_THS_MASK,
+                .ev_count = MMA8452_TRANSIENT_COUNT,
+};
+
 /**
  * struct mma_chip_info - chip specific data
  * @chip_id:                    WHO_AM_I register's value
@@ -116,40 +164,16 @@ struct mma8452_data {
  * @mma_scales:                 scale factors for converting register values
  *                              to m/s^2; 3 modes: 2g, 4g, 8g; 2 integers
  *                              per mode: m/s^2 and micro m/s^2
- * @ev_cfg:                     event config register address
- * @ev_cfg_ele:                 latch bit in event config register
- * @ev_cfg_chan_shift:          number of the bit to enable events in X
- *                              direction; in event config register
- * @ev_src:                     event source register address
- * @ev_src_xe:                  bit in event source register that indicates
- *                              an event in X direction
- * @ev_src_ye:                  bit in event source register that indicates
- *                              an event in Y direction
- * @ev_src_ze:                  bit in event source register that indicates
- *                              an event in Z direction
- * @ev_ths:                     event threshold register address
- * @ev_ths_mask:                mask for the threshold value
- * @ev_count:                   event count (period) register address
- *
- * Since not all chips supported by the driver support comparing high pass
- * filtered data for events (interrupts), different interrupt sources are
- * used for different chips and the relevant registers are included here.
+ * @all_events:                 all events supported by this chip
+ * @enabled_events:             event flags enabled and handled by this driver
  */
 struct mma_chip_info {
         u8 chip_id;
         const struct iio_chan_spec *channels;
         int num_channels;
         const int mma_scales[3][2];
-        u8 ev_cfg;
-        u8 ev_cfg_ele;
-        u8 ev_cfg_chan_shift;
-        u8 ev_src;
-        u8 ev_src_xe;
-        u8 ev_src_ye;
-        u8 ev_src_ze;
-        u8 ev_ths;
-        u8 ev_ths_mask;
-        u8 ev_count;
+        int all_events;
+        int enabled_events;
 };
 
 enum {
@@ -394,11 +418,11 @@ static ssize_t mma8452_show_os_ratio_avail(struct device *dev,
 }
 
 static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(mma8452_show_samp_freq_avail);
-static IIO_DEVICE_ATTR(in_accel_scale_available, S_IRUGO,
+static IIO_DEVICE_ATTR(in_accel_scale_available, 0444,
                        mma8452_show_scale_avail, NULL, 0);
 static IIO_DEVICE_ATTR(in_accel_filter_high_pass_3db_frequency_available,
-                       S_IRUGO, mma8452_show_hp_cutoff_avail, NULL, 0);
-static IIO_DEVICE_ATTR(in_accel_oversampling_ratio_available, S_IRUGO,
+                       0444, mma8452_show_hp_cutoff_avail, NULL, 0);
+static IIO_DEVICE_ATTR(in_accel_oversampling_ratio_available, 0444,
                        mma8452_show_os_ratio_avail, NULL, 0);
 
 static int mma8452_get_samp_freq_index(struct mma8452_data *data,
@@ -602,9 +626,8 @@ static int mma8452_set_power_mode(struct mma8452_data *data, u8 mode)
 static int mma8452_freefall_mode_enabled(struct mma8452_data *data)
 {
         int val;
-        const struct mma_chip_info *chip = data->chip_info;
 
-        val = i2c_smbus_read_byte_data(data->client, chip->ev_cfg);
+        val = i2c_smbus_read_byte_data(data->client, MMA8452_FF_MT_CFG);
         if (val < 0)
                 return val;
 
@@ -614,29 +637,28 @@ static int mma8452_freefall_mode_enabled(struct mma8452_data *data)
 static int mma8452_set_freefall_mode(struct mma8452_data *data, bool state)
 {
         int val;
-        const struct mma_chip_info *chip = data->chip_info;
 
         if ((state && mma8452_freefall_mode_enabled(data)) ||
             (!state && !(mma8452_freefall_mode_enabled(data))))
                 return 0;
 
-        val = i2c_smbus_read_byte_data(data->client, chip->ev_cfg);
+        val = i2c_smbus_read_byte_data(data->client, MMA8452_FF_MT_CFG);
         if (val < 0)
                 return val;
 
         if (state) {
-                val |= BIT(idx_x + chip->ev_cfg_chan_shift);
-                val |= BIT(idx_y + chip->ev_cfg_chan_shift);
-                val |= BIT(idx_z + chip->ev_cfg_chan_shift);
+                val |= BIT(idx_x + MMA8452_FF_MT_CHAN_SHIFT);
+                val |= BIT(idx_y + MMA8452_FF_MT_CHAN_SHIFT);
+                val |= BIT(idx_z + MMA8452_FF_MT_CHAN_SHIFT);
                 val &= ~MMA8452_FF_MT_CFG_OAE;
         } else {
-                val &= ~BIT(idx_x + chip->ev_cfg_chan_shift);
-                val &= ~BIT(idx_y + chip->ev_cfg_chan_shift);
-                val &= ~BIT(idx_z + chip->ev_cfg_chan_shift);
+                val &= ~BIT(idx_x + MMA8452_FF_MT_CHAN_SHIFT);
+                val &= ~BIT(idx_y + MMA8452_FF_MT_CHAN_SHIFT);
+                val &= ~BIT(idx_z + MMA8452_FF_MT_CHAN_SHIFT);
                 val |= MMA8452_FF_MT_CFG_OAE;
         }
 
-        return mma8452_change_config(data, chip->ev_cfg, val);
+        return mma8452_change_config(data, MMA8452_FF_MT_CFG, val);
 }
 
 static int mma8452_set_hp_filter_frequency(struct mma8452_data *data,
@@ -740,7 +762,37 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
         return ret;
 }
 
-static int mma8452_read_thresh(struct iio_dev *indio_dev,
+static int mma8452_get_event_regs(struct mma8452_data *data,
+                const struct iio_chan_spec *chan, enum iio_event_direction dir,
+                const struct mma8452_event_regs **ev_reg)
+{
+        if (!chan)
+                return -EINVAL;
+
+        switch (chan->type) {
+        case IIO_ACCEL:
+                switch (dir) {
+                case IIO_EV_DIR_RISING:
+                        if ((data->chip_info->all_events
+                                        & MMA8452_INT_TRANS) &&
+                                (data->chip_info->enabled_events
+                                        & MMA8452_INT_TRANS))
+                                *ev_reg = &ev_regs_accel_rising;
+                        else
+                                *ev_reg = &ev_regs_accel_falling;
+                        return 0;
+                case IIO_EV_DIR_FALLING:
+                        *ev_reg = &ev_regs_accel_falling;
+                        return 0;
+                default:
+                        return -EINVAL;
+                }
+        default:
+                return -EINVAL;
+        }
+}
+
+static int mma8452_read_event_value(struct iio_dev *indio_dev,
                                const struct iio_chan_spec *chan,
                                enum iio_event_type type,
                                enum iio_event_direction dir,
@@ -749,21 +801,24 @@ static int mma8452_read_thresh(struct iio_dev *indio_dev,
 {
         struct mma8452_data *data = iio_priv(indio_dev);
         int ret, us, power_mode;
+        const struct mma8452_event_regs *ev_regs;
+
+        ret = mma8452_get_event_regs(data, chan, dir, &ev_regs);
+        if (ret)
+                return ret;
 
         switch (info) {
         case IIO_EV_INFO_VALUE:
-                ret = i2c_smbus_read_byte_data(data->client,
-                                               data->chip_info->ev_ths);
+                ret = i2c_smbus_read_byte_data(data->client, ev_regs->ev_ths);
                 if (ret < 0)
                         return ret;
 
-                *val = ret & data->chip_info->ev_ths_mask;
+                *val = ret & ev_regs->ev_ths_mask;
 
                 return IIO_VAL_INT;
 
         case IIO_EV_INFO_PERIOD:
-                ret = i2c_smbus_read_byte_data(data->client,
-                                               data->chip_info->ev_count);
+                ret = i2c_smbus_read_byte_data(data->client, ev_regs->ev_count);
                 if (ret < 0)
                         return ret;
 
@@ -800,7 +855,7 @@ static int mma8452_read_thresh(struct iio_dev *indio_dev,
         }
 }
 
-static int mma8452_write_thresh(struct iio_dev *indio_dev,
+static int mma8452_write_event_value(struct iio_dev *indio_dev,
                                 const struct iio_chan_spec *chan,
                                 enum iio_event_type type,
                                 enum iio_event_direction dir,
@@ -809,14 +864,18 @@ static int mma8452_write_thresh(struct iio_dev *indio_dev,
 {
         struct mma8452_data *data = iio_priv(indio_dev);
         int ret, reg, steps;
+        const struct mma8452_event_regs *ev_regs;
+
+        ret = mma8452_get_event_regs(data, chan, dir, &ev_regs);
+        if (ret)
+                return ret;
 
         switch (info) {
         case IIO_EV_INFO_VALUE:
-                if (val < 0 || val > MMA8452_TRANSIENT_THS_MASK)
+                if (val < 0 || val > ev_regs->ev_ths_mask)
                         return -EINVAL;
 
-                return mma8452_change_config(data, data->chip_info->ev_ths,
-                                             val);
+                return mma8452_change_config(data, ev_regs->ev_ths, val);
 
         case IIO_EV_INFO_PERIOD:
                 ret = mma8452_get_power_mode(data);
@@ -830,8 +889,7 @@ static int mma8452_write_thresh(struct iio_dev *indio_dev,
                 if (steps < 0 || steps > 0xff)
                         return -EINVAL;
 
-                return mma8452_change_config(data, data->chip_info->ev_count,
-                                             steps);
+                return mma8452_change_config(data, ev_regs->ev_count, steps);
 
         case IIO_EV_INFO_HIGH_PASS_FILTER_3DB:
                 reg = i2c_smbus_read_byte_data(data->client,
@@ -861,23 +919,24 @@ static int mma8452_read_event_config(struct iio_dev *indio_dev,
                                      enum iio_event_direction dir)
 {
         struct mma8452_data *data = iio_priv(indio_dev);
-        const struct mma_chip_info *chip = data->chip_info;
         int ret;
+        const struct mma8452_event_regs *ev_regs;
+
+        ret = mma8452_get_event_regs(data, chan, dir, &ev_regs);
+        if (ret)
+                return ret;
 
         switch (dir) {
         case IIO_EV_DIR_FALLING:
                 return mma8452_freefall_mode_enabled(data);
         case IIO_EV_DIR_RISING:
-                if (mma8452_freefall_mode_enabled(data))
-                        return 0;
-
                 ret = i2c_smbus_read_byte_data(data->client,
-                                               data->chip_info->ev_cfg);
+                                ev_regs->ev_cfg);
                 if (ret < 0)
                         return ret;
 
                 return !!(ret & BIT(chan->scan_index +
-                                    chip->ev_cfg_chan_shift));
+                                ev_regs->ev_cfg_chan_shift));
         default:
                 return -EINVAL;
         }
@@ -890,8 +949,12 @@ static int mma8452_write_event_config(struct iio_dev *indio_dev,
                                       int state)
 {
         struct mma8452_data *data = iio_priv(indio_dev);
-        const struct mma_chip_info *chip = data->chip_info;
         int val, ret;
+        const struct mma8452_event_regs *ev_regs;
+
+        ret = mma8452_get_event_regs(data, chan, dir, &ev_regs);
+        if (ret)
+                return ret;
 
         ret = mma8452_set_runtime_pm_state(data->client, state);
         if (ret)
@@ -901,28 +964,30 @@ static int mma8452_write_event_config(struct iio_dev *indio_dev,
         case IIO_EV_DIR_FALLING:
                 return mma8452_set_freefall_mode(data, state);
         case IIO_EV_DIR_RISING:
-                val = i2c_smbus_read_byte_data(data->client, chip->ev_cfg);
+                val = i2c_smbus_read_byte_data(data->client, ev_regs->ev_cfg);
                 if (val < 0)
                         return val;
 
                 if (state) {
                         if (mma8452_freefall_mode_enabled(data)) {
-                                val &= ~BIT(idx_x + chip->ev_cfg_chan_shift);
-                                val &= ~BIT(idx_y + chip->ev_cfg_chan_shift);
-                                val &= ~BIT(idx_z + chip->ev_cfg_chan_shift);
+                                val &= ~BIT(idx_x + ev_regs->ev_cfg_chan_shift);
+                                val &= ~BIT(idx_y + ev_regs->ev_cfg_chan_shift);
+                                val &= ~BIT(idx_z + ev_regs->ev_cfg_chan_shift);
                                 val |= MMA8452_FF_MT_CFG_OAE;
                         }
-                        val |= BIT(chan->scan_index + chip->ev_cfg_chan_shift);
+                        val |= BIT(chan->scan_index +
+                                        ev_regs->ev_cfg_chan_shift);
                 } else {
                         if (mma8452_freefall_mode_enabled(data))
                                 return 0;
 
-                        val &= ~BIT(chan->scan_index + chip->ev_cfg_chan_shift);
+                        val &= ~BIT(chan->scan_index +
+                                        ev_regs->ev_cfg_chan_shift);
                 }
 
-                val |= chip->ev_cfg_ele;
+                val |= ev_regs->ev_cfg_ele;
 
-                return mma8452_change_config(data, chip->ev_cfg, val);
+                return mma8452_change_config(data, ev_regs->ev_cfg, val);
         default:
                 return -EINVAL;
         }
@@ -934,35 +999,25 @@ static void mma8452_transient_interrupt(struct iio_dev *indio_dev)
         s64 ts = iio_get_time_ns(indio_dev);
         int src;
 
-        src = i2c_smbus_read_byte_data(data->client, data->chip_info->ev_src);
+        src = i2c_smbus_read_byte_data(data->client, MMA8452_TRANSIENT_SRC);
         if (src < 0)
                 return;
 
-        if (mma8452_freefall_mode_enabled(data)) {
-                iio_push_event(indio_dev,
-                               IIO_MOD_EVENT_CODE(IIO_ACCEL, 0,
-                                                  IIO_MOD_X_AND_Y_AND_Z,
-                                                  IIO_EV_TYPE_MAG,
-                                                  IIO_EV_DIR_FALLING),
-                               ts);
-                return;
-        }
-
-        if (src & data->chip_info->ev_src_xe)
+        if (src & MMA8452_TRANSIENT_SRC_XTRANSE)
                 iio_push_event(indio_dev,
                                IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, IIO_MOD_X,
                                                   IIO_EV_TYPE_MAG,
                                                   IIO_EV_DIR_RISING),
                                ts);
 
-        if (src & data->chip_info->ev_src_ye)
+        if (src & MMA8452_TRANSIENT_SRC_YTRANSE)
                 iio_push_event(indio_dev,
                                IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, IIO_MOD_Y,
                                                   IIO_EV_TYPE_MAG,
                                                   IIO_EV_DIR_RISING),
                                ts);
 
-        if (src & data->chip_info->ev_src_ze)
+        if (src & MMA8452_TRANSIENT_SRC_ZTRANSE)
                 iio_push_event(indio_dev,
                                IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, IIO_MOD_Z,
                                                   IIO_EV_TYPE_MAG,
@@ -974,7 +1029,6 @@ static irqreturn_t mma8452_interrupt(int irq, void *p)
 {
         struct iio_dev *indio_dev = p;
         struct mma8452_data *data = iio_priv(indio_dev);
-        const struct mma_chip_info *chip = data->chip_info;
         int ret = IRQ_NONE;
         int src;
 
@@ -982,15 +1036,29 @@ static irqreturn_t mma8452_interrupt(int irq, void *p)
         if (src < 0)
                 return IRQ_NONE;
 
+        if (!(src & data->chip_info->enabled_events))
+                return IRQ_NONE;
+
         if (src & MMA8452_INT_DRDY) {
                 iio_trigger_poll_chained(indio_dev->trig);
                 ret = IRQ_HANDLED;
         }
 
-        if ((src & MMA8452_INT_TRANS &&
-             chip->ev_src == MMA8452_TRANSIENT_SRC) ||
-            (src & MMA8452_INT_FF_MT &&
-             chip->ev_src == MMA8452_FF_MT_SRC)) {
+        if (src & MMA8452_INT_FF_MT) {
+                if (mma8452_freefall_mode_enabled(data)) {
+                        s64 ts = iio_get_time_ns(indio_dev);
+
+                        iio_push_event(indio_dev,
+                                       IIO_MOD_EVENT_CODE(IIO_ACCEL, 0,
+                                                          IIO_MOD_X_AND_Y_AND_Z,
+                                                          IIO_EV_TYPE_MAG,
+                                                          IIO_EV_DIR_FALLING),
+                                        ts);
+                }
+                ret = IRQ_HANDLED;
+        }
+
+        if (src & MMA8452_INT_TRANS) {
                 mma8452_transient_interrupt(indio_dev);
                 ret = IRQ_HANDLED;
         }
@@ -1020,8 +1088,8 @@ done:
 }
 
 static int mma8452_reg_access_dbg(struct iio_dev *indio_dev,
-                                  unsigned reg, unsigned writeval,
-                                  unsigned *readval)
+                                  unsigned int reg, unsigned int writeval,
+                                  unsigned int *readval)
 {
         int ret;
         struct mma8452_data *data = iio_priv(indio_dev);
@@ -1222,96 +1290,87 @@ static const struct mma_chip_info mma_chip_info_table[] = {
                  *      g * N * 1000000 / 2048 for N = 2, 4, 8 and g=9.80665
                  */
                 .mma_scales = { {0, 2394}, {0, 4788}, {0, 9577} },
-                .ev_cfg = MMA8452_TRANSIENT_CFG,
-                .ev_cfg_ele = MMA8452_TRANSIENT_CFG_ELE,
-                .ev_cfg_chan_shift = 1,
-                .ev_src = MMA8452_TRANSIENT_SRC,
-                .ev_src_xe = MMA8452_TRANSIENT_SRC_XTRANSE,
-                .ev_src_ye = MMA8452_TRANSIENT_SRC_YTRANSE,
-                .ev_src_ze = MMA8452_TRANSIENT_SRC_ZTRANSE,
-                .ev_ths = MMA8452_TRANSIENT_THS,
-                .ev_ths_mask = MMA8452_TRANSIENT_THS_MASK,
-                .ev_count = MMA8452_TRANSIENT_COUNT,
+                /*
+                 * Although we enable the interrupt sources once and for
+                 * all here the event detection itself is not enabled until
+                 * userspace asks for it by mma8452_write_event_config()
+                 */
+                .all_events = MMA8452_INT_DRDY |
+                                        MMA8452_INT_TRANS |
+                                        MMA8452_INT_FF_MT,
+                .enabled_events = MMA8452_INT_TRANS |
+                                        MMA8452_INT_FF_MT,
         },
         [mma8452] = {
                 .chip_id = MMA8452_DEVICE_ID,
                 .channels = mma8452_channels,
                 .num_channels = ARRAY_SIZE(mma8452_channels),
                 .mma_scales = { {0, 9577}, {0, 19154}, {0, 38307} },
-                .ev_cfg = MMA8452_TRANSIENT_CFG,
-                .ev_cfg_ele = MMA8452_TRANSIENT_CFG_ELE,
-                .ev_cfg_chan_shift = 1,
-                .ev_src = MMA8452_TRANSIENT_SRC,
-                .ev_src_xe = MMA8452_TRANSIENT_SRC_XTRANSE,
-                .ev_src_ye = MMA8452_TRANSIENT_SRC_YTRANSE,
-                .ev_src_ze = MMA8452_TRANSIENT_SRC_ZTRANSE,
-                .ev_ths = MMA8452_TRANSIENT_THS,
-                .ev_ths_mask = MMA8452_TRANSIENT_THS_MASK,
-                .ev_count = MMA8452_TRANSIENT_COUNT,
+                /*
+                 * Although we enable the interrupt sources once and for
+                 * all here the event detection itself is not enabled until
+                 * userspace asks for it by mma8452_write_event_config()
+                 */
+                .all_events = MMA8452_INT_DRDY |
+                                        MMA8452_INT_TRANS |
+                                        MMA8452_INT_FF_MT,
+                .enabled_events = MMA8452_INT_TRANS |
+                                        MMA8452_INT_FF_MT,
         },
         [mma8453] = {
                 .chip_id = MMA8453_DEVICE_ID,
                 .channels = mma8453_channels,
                 .num_channels = ARRAY_SIZE(mma8453_channels),
                 .mma_scales = { {0, 38307}, {0, 76614}, {0, 153228} },
-                .ev_cfg = MMA8452_TRANSIENT_CFG,
-                .ev_cfg_ele = MMA8452_TRANSIENT_CFG_ELE,
-                .ev_cfg_chan_shift = 1,
-                .ev_src = MMA8452_TRANSIENT_SRC,
-                .ev_src_xe = MMA8452_TRANSIENT_SRC_XTRANSE,
-                .ev_src_ye = MMA8452_TRANSIENT_SRC_YTRANSE,
-                .ev_src_ze = MMA8452_TRANSIENT_SRC_ZTRANSE,
-                .ev_ths = MMA8452_TRANSIENT_THS,
-                .ev_ths_mask = MMA8452_TRANSIENT_THS_MASK,
-                .ev_count = MMA8452_TRANSIENT_COUNT,
+                /*
+                 * Although we enable the interrupt sources once and for
+                 * all here the event detection itself is not enabled until
+                 * userspace asks for it by mma8452_write_event_config()
+                 */
+                .all_events = MMA8452_INT_DRDY |
+                                        MMA8452_INT_TRANS |
+                                        MMA8452_INT_FF_MT,
+                .enabled_events = MMA8452_INT_TRANS |
+                                        MMA8452_INT_FF_MT,
         },
         [mma8652] = {
                 .chip_id = MMA8652_DEVICE_ID,
                 .channels = mma8652_channels,
                 .num_channels = ARRAY_SIZE(mma8652_channels),
                 .mma_scales = { {0, 9577}, {0, 19154}, {0, 38307} },
-                .ev_cfg = MMA8452_FF_MT_CFG,
-                .ev_cfg_ele = MMA8452_FF_MT_CFG_ELE,
-                .ev_cfg_chan_shift = 3,
-                .ev_src = MMA8452_FF_MT_SRC,
-                .ev_src_xe = MMA8452_FF_MT_SRC_XHE,
-                .ev_src_ye = MMA8452_FF_MT_SRC_YHE,
-                .ev_src_ze = MMA8452_FF_MT_SRC_ZHE,
-                .ev_ths = MMA8452_FF_MT_THS,
-                .ev_ths_mask = MMA8452_FF_MT_THS_MASK,
-                .ev_count = MMA8452_FF_MT_COUNT,
+                .all_events = MMA8452_INT_DRDY |
+                                        MMA8452_INT_FF_MT,
+                .enabled_events = MMA8452_INT_FF_MT,
         },
         [mma8653] = {
                 .chip_id = MMA8653_DEVICE_ID,
                 .channels = mma8653_channels,
                 .num_channels = ARRAY_SIZE(mma8653_channels),
                 .mma_scales = { {0, 38307}, {0, 76614}, {0, 153228} },
-                .ev_cfg = MMA8452_FF_MT_CFG,
-                .ev_cfg_ele = MMA8452_FF_MT_CFG_ELE,
-                .ev_cfg_chan_shift = 3,
-                .ev_src = MMA8452_FF_MT_SRC,
-                .ev_src_xe = MMA8452_FF_MT_SRC_XHE,
-                .ev_src_ye = MMA8452_FF_MT_SRC_YHE,
-                .ev_src_ze = MMA8452_FF_MT_SRC_ZHE,
-                .ev_ths = MMA8452_FF_MT_THS,
-                .ev_ths_mask = MMA8452_FF_MT_THS_MASK,
-                .ev_count = MMA8452_FF_MT_COUNT,
+                /*
+                 * Although we enable the interrupt sources once and for
+                 * all here the event detection itself is not enabled until
+                 * userspace asks for it by mma8452_write_event_config()
+                 */
+                .all_events = MMA8452_INT_DRDY |
+                                        MMA8452_INT_FF_MT,
+                .enabled_events = MMA8452_INT_FF_MT,
         },
         [fxls8471] = {
                 .chip_id = FXLS8471_DEVICE_ID,
                 .channels = mma8451_channels,
                 .num_channels = ARRAY_SIZE(mma8451_channels),
                 .mma_scales = { {0, 2394}, {0, 4788}, {0, 9577} },
-                .ev_cfg = MMA8452_TRANSIENT_CFG,
-                .ev_cfg_ele = MMA8452_TRANSIENT_CFG_ELE,
-                .ev_cfg_chan_shift = 1,
-                .ev_src = MMA8452_TRANSIENT_SRC,
-                .ev_src_xe = MMA8452_TRANSIENT_SRC_XTRANSE,
-                .ev_src_ye = MMA8452_TRANSIENT_SRC_YTRANSE,
-                .ev_src_ze = MMA8452_TRANSIENT_SRC_ZTRANSE,
-                .ev_ths = MMA8452_TRANSIENT_THS,
-                .ev_ths_mask = MMA8452_TRANSIENT_THS_MASK,
-                .ev_count = MMA8452_TRANSIENT_COUNT,
+                /*
+                 * Although we enable the interrupt sources once and for
+                 * all here the event detection itself is not enabled until
+                 * userspace asks for it by mma8452_write_event_config()
+                 */
+                .all_events = MMA8452_INT_DRDY |
+                                        MMA8452_INT_TRANS |
+                                        MMA8452_INT_FF_MT,
+                .enabled_events = MMA8452_INT_TRANS |
+                                        MMA8452_INT_FF_MT,
         },
 };
 
@@ -1332,12 +1391,11 @@ static const struct iio_info mma8452_info = {
         .read_raw = &mma8452_read_raw,
         .write_raw = &mma8452_write_raw,
         .event_attrs = &mma8452_event_attribute_group,
-        .read_event_value = &mma8452_read_thresh,
-        .write_event_value = &mma8452_write_thresh,
+        .read_event_value = &mma8452_read_event_value,
+        .write_event_value = &mma8452_write_event_value,
         .read_event_config = &mma8452_read_event_config,
         .write_event_config = &mma8452_write_event_config,
         .debugfs_reg_access = &mma8452_reg_access_dbg,
-        .driver_module = THIS_MODULE,
 };
 
 static const unsigned long mma8452_scan_masks[] = {0x7, 0};
@@ -1368,7 +1426,6 @@ static int mma8452_data_rdy_trigger_set_state(struct iio_trigger *trig,
 static const struct iio_trigger_ops mma8452_trigger_ops = {
         .set_trigger_state = mma8452_data_rdy_trigger_set_state,
         .validate_device = iio_trigger_validate_own_device,
-        .owner = THIS_MODULE,
 };
 
 static int mma8452_trigger_setup(struct iio_dev *indio_dev)
@@ -1509,16 +1566,6 @@ static int mma8452_probe(struct i2c_client *client,
                 return ret;
 
         if (client->irq) {
-                /*
-                 * Although we enable the interrupt sources once and for
-                 * all here the event detection itself is not enabled until
-                 * userspace asks for it by mma8452_write_event_config()
-                 */
-                int supported_interrupts = MMA8452_INT_DRDY |
-                                           MMA8452_INT_TRANS |
-                                           MMA8452_INT_FF_MT;
-                int enabled_interrupts = MMA8452_INT_TRANS |
-                                         MMA8452_INT_FF_MT;
                 int irq2;
 
                 irq2 = of_irq_get_byname(client->dev.of_node, "INT2");
@@ -1527,8 +1574,8 @@ static int mma8452_probe(struct i2c_client *client,
                         dev_dbg(&client->dev, "using interrupt line INT2\n");
                 } else {
                         ret = i2c_smbus_write_byte_data(client,
-                                                        MMA8452_CTRL_REG5,
-                                                        supported_interrupts);
+                                                MMA8452_CTRL_REG5,
+                                                data->chip_info->all_events);
                         if (ret < 0)
                                 return ret;
 
@@ -1536,8 +1583,8 @@ static int mma8452_probe(struct i2c_client *client,
                 }
 
                 ret = i2c_smbus_write_byte_data(client,
-                                                MMA8452_CTRL_REG4,
-                                                enabled_interrupts);
+                                        MMA8452_CTRL_REG4,
+                                        data->chip_info->enabled_events);
                 if (ret < 0)
                         return ret;
 
diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c
index 1f53f08476f5..da7c21504f38 100644
--- a/drivers/iio/accel/mma9551.c
+++ b/drivers/iio/accel/mma9551.c
@@ -332,7 +332,6 @@ static const struct iio_chan_spec mma9551_channels[] = {
 };
 
 static const struct iio_info mma9551_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = mma9551_read_raw,
         .read_event_config = mma9551_read_event_config,
         .write_event_config = mma9551_write_event_config,
diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c
index 36bf19733be0..b52a3f182190 100644
--- a/drivers/iio/accel/mma9553.c
+++ b/drivers/iio/accel/mma9553.c
@@ -987,7 +987,6 @@ static const struct iio_chan_spec mma9553_channels[] = {
 };
 
 static const struct iio_info mma9553_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = mma9553_read_raw,
         .write_raw = mma9553_write_raw,
         .read_event_config = mma9553_read_event_config,
diff --git a/drivers/iio/accel/mxc4005.c b/drivers/iio/accel/mxc4005.c
index c23f47af7256..58099e40d717 100644
--- a/drivers/iio/accel/mxc4005.c
+++ b/drivers/iio/accel/mxc4005.c
@@ -264,7 +264,6 @@ static int mxc4005_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info mxc4005_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = mxc4005_read_raw,
         .write_raw      = mxc4005_write_raw,
         .attrs          = &mxc4005_attrs_group,
@@ -376,7 +375,6 @@ static int mxc4005_trigger_try_reen(struct iio_trigger *trig)
 static const struct iio_trigger_ops mxc4005_trigger_ops = {
         .set_trigger_state = mxc4005_set_trigger_state,
         .try_reenable = mxc4005_trigger_try_reen,
-        .owner = THIS_MODULE,
 };
 
 static int mxc4005_chip_init(struct mxc4005_data *data)
diff --git a/drivers/iio/accel/mxc6255.c b/drivers/iio/accel/mxc6255.c
index 0abad6948201..ddd50d1781c5 100644
--- a/drivers/iio/accel/mxc6255.c
+++ b/drivers/iio/accel/mxc6255.c
@@ -78,7 +78,6 @@ static int mxc6255_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info mxc6255_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = mxc6255_read_raw,
 };
 
diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c
index 39ab210c44f6..f33dadf7b262 100644
--- a/drivers/iio/accel/sca3000.c
+++ b/drivers/iio/accel/sca3000.c
@@ -1454,7 +1454,6 @@ static const struct iio_info sca3000_info = {
         .write_event_value = &sca3000_write_event_value,
         .read_event_config = &sca3000_read_event_config,
         .write_event_config = &sca3000_write_event_config,
-        .driver_module = THIS_MODULE,
 };
 
 static int sca3000_probe(struct spi_device *spi)
diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
index 0fe521609a3a..2f931e4837e5 100644
--- a/drivers/iio/accel/st_accel.h
+++ b/drivers/iio/accel/st_accel.h
@@ -32,6 +32,8 @@ enum st_accel_type {
         H3LIS331DL,
         LIS331DL,
         LIS3LV02DL,
+        LIS2DW12,
+        LIS3DHH,
         ST_ACCEL_MAX,
 };
 
@@ -52,6 +54,8 @@ enum st_accel_type {
 #define LIS2DH12_ACCEL_DEV_NAME         "lis2dh12_accel"
 #define LIS3L02DQ_ACCEL_DEV_NAME        "lis3l02dq"
 #define LNG2DM_ACCEL_DEV_NAME           "lng2dm"
+#define LIS2DW12_ACCEL_DEV_NAME         "lis2dw12"
+#define LIS3DHH_ACCEL_DEV_NAME          "lis3dhh"
 
 /**
 * struct st_sensors_platform_data - default accel platform data
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 752856b3a849..460aa58e0159 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -159,12 +159,16 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = 0x22,
-                        .mask_int1 = 0x10,
-                        .mask_int2 = 0x00,
+                        .int1 = {
+                                .addr = 0x22,
+                                .mask = 0x10,
+                        },
                         .addr_ihl = 0x25,
                         .mask_ihl = 0x02,
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
                 },
                 .sim = {
                         .addr = 0x23,
@@ -229,14 +233,24 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = 0x22,
-                        .mask_int1 = 0x02,
-                        .mask_int2 = 0x10,
+                        .int1 = {
+                                .addr = 0x22,
+                                .mask = 0x02,
+                                .addr_od = 0x22,
+                                .mask_od = 0x40,
+                        },
+                        .int2 = {
+                                .addr = 0x22,
+                                .mask = 0x10,
+                                .addr_od = 0x22,
+                                .mask_od = 0x40,
+                        },
                         .addr_ihl = 0x22,
                         .mask_ihl = 0x80,
-                        .addr_od = 0x22,
-                        .mask_od = 0x40,
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
                 },
                 .sim = {
                         .addr = 0x23,
@@ -313,12 +327,16 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .mask = 0x08,
                 },
                 .drdy_irq = {
-                        .addr = 0x23,
-                        .mask_int1 = 0x80,
-                        .mask_int2 = 0x00,
+                        .int1 = {
+                                .addr = 0x23,
+                                .mask = 0x80,
+                        },
                         .addr_ihl = 0x23,
                         .mask_ihl = 0x40,
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
                         .ig1 = {
                                 .en_addr = 0x23,
                                 .en_mask = 0x08,
@@ -387,9 +405,14 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .mask = 0x01,
                 },
                 .drdy_irq = {
-                        .addr = 0x21,
-                        .mask_int1 = 0x04,
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .int1 = {
+                                .addr = 0x21,
+                                .mask = 0x04,
+                        },
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
                 },
                 .sim = {
                         .addr = 0x21,
@@ -444,14 +467,24 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         },
                 },
                 .drdy_irq = {
-                        .addr = 0x22,
-                        .mask_int1 = 0x04,
-                        .mask_int2 = 0x20,
+                        .int1 = {
+                                .addr = 0x22,
+                                .mask = 0x04,
+                                .addr_od = 0x22,
+                                .mask_od = 0x40,
+                        },
+                        .int2 = {
+                                .addr = 0x22,
+                                .mask = 0x20,
+                                .addr_od = 0x22,
+                                .mask_od = 0x40,
+                        },
                         .addr_ihl = 0x22,
                         .mask_ihl = 0x80,
-                        .addr_od = 0x22,
-                        .mask_od = 0x40,
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
                 },
                 .sim = {
                         .addr = 0x21,
@@ -513,9 +546,14 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = 0x22,
-                        .mask_int1 = 0x02,
-                        .mask_int2 = 0x10,
+                        .int1 = {
+                                .addr = 0x22,
+                                .mask = 0x02,
+                        },
+                        .int2 = {
+                                .addr = 0x22,
+                                .mask = 0x10,
+                        },
                         .addr_ihl = 0x22,
                         .mask_ihl = 0x80,
                 },
@@ -567,9 +605,14 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                 .bdu = {
                 },
                 .drdy_irq = {
-                        .addr = 0x21,
-                        .mask_int1 = 0x04,
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .int1 = {
+                                .addr = 0x21,
+                                .mask = 0x04,
+                        },
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
                 },
                 .sim = {
                         .addr = 0x21,
@@ -635,12 +678,16 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         },
                 },
                 .drdy_irq = {
-                        .addr = 0x22,
-                        .mask_int1 = 0x10,
-                        .mask_int2 = 0x00,
+                        .int1 = {
+                                .addr = 0x22,
+                                .mask = 0x10,
+                        },
                         .addr_ihl = 0x25,
                         .mask_ihl = 0x02,
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
                 },
                 .sim = {
                         .addr = 0x23,
@@ -649,6 +696,139 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                 .multi_read_bit = true,
                 .bootime = 2,
         },
+        {
+                .wai = 0x44,
+                .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
+                .sensors_supported = {
+                        [0] = LIS2DW12_ACCEL_DEV_NAME,
+                },
+                .ch = (struct iio_chan_spec *)st_accel_12bit_channels,
+                .odr = {
+                        .addr = 0x20,
+                        .mask = 0xf0,
+                        .odr_avl = {
+                                { .hz = 1, .value = 0x01, },
+                                { .hz = 12, .value = 0x02, },
+                                { .hz = 25, .value = 0x03, },
+                                { .hz = 50, .value = 0x04, },
+                                { .hz = 100, .value = 0x05, },
+                                { .hz = 200, .value = 0x06, },
+                        },
+                },
+                .pw = {
+                        .addr = 0x20,
+                        .mask = 0xf0,
+                        .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
+                },
+                .fs = {
+                        .addr = 0x25,
+                        .mask = 0x30,
+                        .fs_avl = {
+                                [0] = {
+                                        .num = ST_ACCEL_FS_AVL_2G,
+                                        .value = 0x00,
+                                        .gain = IIO_G_TO_M_S_2(976),
+                                },
+                                [1] = {
+                                        .num = ST_ACCEL_FS_AVL_4G,
+                                        .value = 0x01,
+                                        .gain = IIO_G_TO_M_S_2(1952),
+                                },
+                                [2] = {
+                                        .num = ST_ACCEL_FS_AVL_8G,
+                                        .value = 0x02,
+                                        .gain = IIO_G_TO_M_S_2(3904),
+                                },
+                                [3] = {
+                                        .num = ST_ACCEL_FS_AVL_16G,
+                                        .value = 0x03,
+                                        .gain = IIO_G_TO_M_S_2(7808),
+                                },
+                        },
+                },
+                .bdu = {
+                        .addr = 0x21,
+                        .mask = 0x08,
+                },
+                .drdy_irq = {
+                        .int1 = {
+                                .addr = 0x23,
+                                .mask = 0x01,
+                                .addr_od = 0x22,
+                                .mask_od = 0x20,
+                        },
+                        .int2 = {
+                                .addr = 0x24,
+                                .mask = 0x01,
+                                .addr_od = 0x22,
+                                .mask_od = 0x20,
+                        },
+                        .addr_ihl = 0x22,
+                        .mask_ihl = 0x08,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x01,
+                        },
+                },
+                .sim = {
+                        .addr = 0x21,
+                        .value = BIT(0),
+                },
+                .multi_read_bit = false,
+                .bootime = 2,
+        },
+        {
+                .wai = 0x11,
+                .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
+                .sensors_supported = {
+                        [0] = LIS3DHH_ACCEL_DEV_NAME,
+                },
+                .ch = (struct iio_chan_spec *)st_accel_16bit_channels,
+                .odr = {
+                        /* just ODR = 1100Hz available */
+                        .odr_avl = {
+                                { .hz = 1100, .value = 0x00, },
+                        },
+                },
+                .pw = {
+                        .addr = 0x20,
+                        .mask = 0x80,
+                        .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
+                        .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
+                },
+                .fs = {
+                        .fs_avl = {
+                                [0] = {
+                                        .num = ST_ACCEL_FS_AVL_2G,
+                                        .gain = IIO_G_TO_M_S_2(76),
+                                },
+                        },
+                },
+                .bdu = {
+                        .addr = 0x20,
+                        .mask = 0x01,
+                },
+                .drdy_irq = {
+                        .int1 = {
+                                .addr = 0x21,
+                                .mask = 0x80,
+                                .addr_od = 0x23,
+                                .mask_od = 0x04,
+                        },
+                        .int2 = {
+                                .addr = 0x22,
+                                .mask = 0x80,
+                                .addr_od = 0x23,
+                                .mask_od = 0x08,
+                        },
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
+                },
+                .multi_read_bit = false,
+                .bootime = 2,
+        },
 };
 
 static int st_accel_read_raw(struct iio_dev *indio_dev,
@@ -721,7 +901,6 @@ static const struct attribute_group st_accel_attribute_group = {
 };
 
 static const struct iio_info accel_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &st_accel_attribute_group,
         .read_raw = &st_accel_read_raw,
         .write_raw = &st_accel_write_raw,
@@ -730,7 +909,6 @@ static const struct iio_info accel_info = {
 
 #ifdef CONFIG_IIO_TRIGGER
 static const struct iio_trigger_ops st_accel_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = ST_ACCEL_TRIGGER_SET_STATE,
         .validate_device = st_sensors_validate_device,
 };
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index 18cafb9f2468..363429b5686c 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -94,6 +94,10 @@ static const struct of_device_id st_accel_of_match[] = {
                 .compatible = "st,lng2dm-accel",
                 .data = LNG2DM_ACCEL_DEV_NAME,
         },
+        {
+                .compatible = "st,lis2dw12",
+                .data = LIS2DW12_ACCEL_DEV_NAME,
+        },
         {},
 };
 MODULE_DEVICE_TABLE(of, st_accel_of_match);
@@ -129,6 +133,7 @@ static const struct i2c_device_id st_accel_id_table[] = {
         { H3LIS331DL_ACCEL_DEV_NAME, H3LIS331DL },
         { LIS331DL_ACCEL_DEV_NAME, LIS331DL },
         { LIS3LV02DL_ACCEL_DEV_NAME, LIS3LV02DL },
+        { LIS2DW12_ACCEL_DEV_NAME, LIS2DW12 },
         {},
 };
 MODULE_DEVICE_TABLE(i2c, st_accel_id_table);
diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
index 915fa49085f7..dcc9bd243a52 100644
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -82,6 +82,14 @@ static const struct of_device_id st_accel_of_match[] = {
                 .compatible = "st,lis331dl-accel",
                 .data = LIS331DL_ACCEL_DEV_NAME,
         },
+        {
+                .compatible = "st,lis2dw12",
+                .data = LIS2DW12_ACCEL_DEV_NAME,
+        },
+        {
+                .compatible = "st,lis3dhh",
+                .data = LIS3DHH_ACCEL_DEV_NAME,
+        },
         {}
 };
 MODULE_DEVICE_TABLE(of, st_accel_of_match);
@@ -133,6 +141,8 @@ static const struct spi_device_id st_accel_id_table[] = {
         { H3LIS331DL_ACCEL_DEV_NAME },
         { LIS331DL_ACCEL_DEV_NAME },
         { LIS3LV02DL_ACCEL_DEV_NAME },
+        { LIS2DW12_ACCEL_DEV_NAME },
+        { LIS3DHH_ACCEL_DEV_NAME },
         {},
 };
 MODULE_DEVICE_TABLE(spi, st_accel_id_table);
diff --git a/drivers/iio/accel/stk8312.c b/drivers/iio/accel/stk8312.c
index e31023dc5f1b..cacc0da2f874 100644
--- a/drivers/iio/accel/stk8312.c
+++ b/drivers/iio/accel/stk8312.c
@@ -237,7 +237,6 @@ static int stk8312_data_rdy_trigger_set_state(struct iio_trigger *trig,
 
 static const struct iio_trigger_ops stk8312_trigger_ops = {
         .set_trigger_state = stk8312_data_rdy_trigger_set_state,
-        .owner = THIS_MODULE,
 };
 
 static int stk8312_set_sample_rate(struct stk8312_data *data, u8 rate)
@@ -421,7 +420,6 @@ static int stk8312_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info stk8312_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = stk8312_read_raw,
         .write_raw              = stk8312_write_raw,
         .attrs                  = &stk8312_attribute_group,
diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c
index 300d955bad00..576b6b140f08 100644
--- a/drivers/iio/accel/stk8ba50.c
+++ b/drivers/iio/accel/stk8ba50.c
@@ -179,7 +179,6 @@ static int stk8ba50_data_rdy_trigger_set_state(struct iio_trigger *trig,
 
 static const struct iio_trigger_ops stk8ba50_trigger_ops = {
         .set_trigger_state = stk8ba50_data_rdy_trigger_set_state,
-        .owner = THIS_MODULE,
 };
 
 static int stk8ba50_set_power(struct stk8ba50_data *data, bool mode)
@@ -307,7 +306,6 @@ static int stk8ba50_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info stk8ba50_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = stk8ba50_read_raw,
         .write_raw              = stk8ba50_write_raw,
         .attrs                  = &stk8ba50_attribute_group,
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 57625653fcb6..ef86296b8b0d 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -243,6 +243,8 @@ config DA9150_GPADC
 config DLN2_ADC
         tristate "Diolan DLN-2 ADC driver support"
         depends on MFD_DLN2
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
         help
           Say yes here to build support for Diolan DLN-2 ADC.
 
@@ -475,12 +477,13 @@ config	MAX9611
           called max9611.
 
 config MCP320X
-        tristate "Microchip Technology MCP3x01/02/04/08"
+        tristate "Microchip Technology MCP3x01/02/04/08 and MCP3550/1/3"
         depends on SPI
         help
           Say yes here to build support for Microchip Technology's
           MCP3001, MCP3002, MCP3004, MCP3008, MCP3201, MCP3202, MCP3204,
-          MCP3208 or MCP3301 analog to digital converter.
+          MCP3208, MCP3301, MCP3550, MCP3551 and MCP3553 analog to digital
+          converters.
 
           This driver can also be built as a module. If so, the module will be
           called mcp320x.
@@ -593,7 +596,7 @@ config QCOM_SPMI_VADC
 
 config RCAR_GYRO_ADC
         tristate "Renesas R-Car GyroADC driver"
-        depends on ARCH_RCAR_GEN2 || (ARM && COMPILE_TEST)
+        depends on ARCH_RCAR_GEN2 || COMPILE_TEST
         help
           Say yes here to build support for the GyroADC found in Renesas
           R-Car Gen2 SoCs. This block is a simple SPI offload engine for
diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index b8d5cfd57ec4..605eb5e7e829 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -280,7 +280,6 @@ static AD7266_DECLARE_DIFF_CHANNELS_FIXED(u, 'u');
 static const struct iio_info ad7266_info = {
         .read_raw = &ad7266_read_raw,
         .update_scan_mode = &ad7266_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static const unsigned long ad7266_available_scan_masks[] = {
diff --git a/drivers/iio/adc/ad7291.c b/drivers/iio/adc/ad7291.c
index 1d90b02732bb..a862b5d8fb4b 100644
--- a/drivers/iio/adc/ad7291.c
+++ b/drivers/iio/adc/ad7291.c
@@ -461,7 +461,6 @@ static const struct iio_info ad7291_info = {
         .write_event_config = &ad7291_write_event_config,
         .read_event_value = &ad7291_read_event_value,
         .write_event_value = &ad7291_write_event_value,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad7291_probe(struct i2c_client *client,
diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c
index e399bf04c73a..2b20c6c8ec7f 100644
--- a/drivers/iio/adc/ad7298.c
+++ b/drivers/iio/adc/ad7298.c
@@ -280,7 +280,6 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad7298_info = {
         .read_raw = &ad7298_read_raw,
         .update_scan_mode = ad7298_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad7298_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ad7476.c b/drivers/iio/adc/ad7476.c
index b7ecf9aab90f..b7706bf10ffe 100644
--- a/drivers/iio/adc/ad7476.c
+++ b/drivers/iio/adc/ad7476.c
@@ -195,7 +195,6 @@ static const struct ad7476_chip_info ad7476_chip_info_tbl[] = {
 };
 
 static const struct iio_info ad7476_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &ad7476_read_raw,
 };
 
diff --git a/drivers/iio/adc/ad7766.c b/drivers/iio/adc/ad7766.c
index ce45037295d8..3ae14fc8c649 100644
--- a/drivers/iio/adc/ad7766.c
+++ b/drivers/iio/adc/ad7766.c
@@ -185,7 +185,6 @@ static const struct iio_buffer_setup_ops ad7766_buffer_setup_ops = {
 };
 
 static const struct iio_info ad7766_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &ad7766_read_raw,
 };
 
@@ -208,7 +207,6 @@ static int ad7766_set_trigger_state(struct iio_trigger *trig, bool enable)
 }
 
 static const struct iio_trigger_ops ad7766_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = ad7766_set_trigger_state,
         .validate_device = iio_trigger_validate_own_device,
 };
diff --git a/drivers/iio/adc/ad7791.c b/drivers/iio/adc/ad7791.c
index 34e353c43ac8..70fbf92f9827 100644
--- a/drivers/iio/adc/ad7791.c
+++ b/drivers/iio/adc/ad7791.c
@@ -308,13 +308,11 @@ static const struct iio_info ad7791_info = {
         .read_raw = &ad7791_read_raw,
         .attrs = &ad7791_attribute_group,
         .validate_trigger = ad_sd_validate_trigger,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_info ad7791_no_filter_info = {
         .read_raw = &ad7791_read_raw,
         .validate_trigger = ad_sd_validate_trigger,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad7791_setup(struct ad7791_state *st,
diff --git a/drivers/iio/adc/ad7793.c b/drivers/iio/adc/ad7793.c
index 47c3d7f32900..801afb61310b 100644
--- a/drivers/iio/adc/ad7793.c
+++ b/drivers/iio/adc/ad7793.c
@@ -563,7 +563,6 @@ static const struct iio_info ad7793_info = {
         .write_raw_get_fmt = &ad7793_write_raw_get_fmt,
         .attrs = &ad7793_attribute_group,
         .validate_trigger = ad_sd_validate_trigger,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_info ad7797_info = {
@@ -572,7 +571,6 @@ static const struct iio_info ad7797_info = {
         .write_raw_get_fmt = &ad7793_write_raw_get_fmt,
         .attrs = &ad7793_attribute_group,
         .validate_trigger = ad_sd_validate_trigger,
-        .driver_module = THIS_MODULE,
 };
 
 #define DECLARE_AD7793_CHANNELS(_name, _b, _sb, _s) \
diff --git a/drivers/iio/adc/ad7887.c b/drivers/iio/adc/ad7887.c
index 7a483bfbd70c..205c0f1761aa 100644
--- a/drivers/iio/adc/ad7887.c
+++ b/drivers/iio/adc/ad7887.c
@@ -229,7 +229,6 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = {
 
 static const struct iio_info ad7887_info = {
         .read_raw = &ad7887_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad7887_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ad7923.c b/drivers/iio/adc/ad7923.c
index 77a675e11ebb..ffb7e089969c 100644
--- a/drivers/iio/adc/ad7923.c
+++ b/drivers/iio/adc/ad7923.c
@@ -262,7 +262,6 @@ static int ad7923_read_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad7923_info = {
         .read_raw = &ad7923_read_raw,
         .update_scan_mode = ad7923_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad7923_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c
index 22426ae4af97..e1da67d5ee22 100644
--- a/drivers/iio/adc/ad799x.c
+++ b/drivers/iio/adc/ad799x.c
@@ -526,13 +526,11 @@ static const struct attribute_group ad799x_event_attrs_group = {
 
 static const struct iio_info ad7991_info = {
         .read_raw = &ad799x_read_raw,
-        .driver_module = THIS_MODULE,
         .update_scan_mode = ad799x_update_scan_mode,
 };
 
 static const struct iio_info ad7993_4_7_8_noirq_info = {
         .read_raw = &ad799x_read_raw,
-        .driver_module = THIS_MODULE,
         .update_scan_mode = ad799x_update_scan_mode,
 };
 
@@ -543,7 +541,6 @@ static const struct iio_info ad7993_4_7_8_irq_info = {
         .write_event_config = &ad799x_write_event_config,
         .read_event_value = &ad799x_read_event_value,
         .write_event_value = &ad799x_write_event_value,
-        .driver_module = THIS_MODULE,
         .update_scan_mode = ad799x_update_scan_mode,
 };
 
diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
index 22c4c17cd996..cf1b048b0665 100644
--- a/drivers/iio/adc/ad_sigma_delta.c
+++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -463,7 +463,6 @@ int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig)
 EXPORT_SYMBOL_GPL(ad_sd_validate_trigger);
 
 static const struct iio_trigger_ops ad_sd_trigger_ops = {
-        .owner = THIS_MODULE,
 };
 
 static int ad_sd_probe_trigger(struct iio_dev *indio_dev)
diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c
index c02b23d675cb..8a958d5f1905 100644
--- a/drivers/iio/adc/aspeed_adc.c
+++ b/drivers/iio/adc/aspeed_adc.c
@@ -165,7 +165,6 @@ static int aspeed_adc_reg_access(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info aspeed_adc_iio_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = aspeed_adc_read_raw,
         .write_raw = aspeed_adc_write_raw,
         .debugfs_reg_access = aspeed_adc_reg_access,
diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index bc5b38e3a147..755a493c2a2c 100644
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -225,6 +225,7 @@ struct at91_adc_trigger {
         char                            *name;
         unsigned int                    trgmod_value;
         unsigned int                    edge_type;
+        bool                            hw_trig;
 };
 
 struct at91_adc_state {
@@ -254,16 +255,25 @@ static const struct at91_adc_trigger at91_adc_trigger_list[] = {
                 .name = "external_rising",
                 .trgmod_value = AT91_SAMA5D2_TRGR_TRGMOD_EXT_TRIG_RISE,
                 .edge_type = IRQ_TYPE_EDGE_RISING,
+                .hw_trig = true,
         },
         {
                 .name = "external_falling",
                 .trgmod_value = AT91_SAMA5D2_TRGR_TRGMOD_EXT_TRIG_FALL,
                 .edge_type = IRQ_TYPE_EDGE_FALLING,
+                .hw_trig = true,
         },
         {
                 .name = "external_any",
                 .trgmod_value = AT91_SAMA5D2_TRGR_TRGMOD_EXT_TRIG_ANY,
                 .edge_type = IRQ_TYPE_EDGE_BOTH,
+                .hw_trig = true,
+        },
+        {
+                .name = "software",
+                .trgmod_value = AT91_SAMA5D2_TRGR_TRGMOD_NO_TRIGGER,
+                .edge_type = IRQ_TYPE_NONE,
+                .hw_trig = false,
         },
 };
 
@@ -338,7 +348,6 @@ static int at91_adc_reenable_trigger(struct iio_trigger *trig)
 }
 
 static const struct iio_trigger_ops at91_adc_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = &at91_adc_configure_trigger,
         .try_reenable = &at91_adc_reenable_trigger,
 };
@@ -574,7 +583,6 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info at91_adc_info = {
         .read_raw = &at91_adc_read_raw,
         .write_raw = &at91_adc_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static void at91_adc_hw_init(struct at91_adc_state *st)
@@ -597,7 +605,7 @@ static int at91_adc_probe(struct platform_device *pdev)
         struct at91_adc_state *st;
         struct resource *res;
         int ret, i;
-        u32 edge_type;
+        u32 edge_type = IRQ_TYPE_NONE;
 
         indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*st));
         if (!indio_dev)
@@ -641,14 +649,14 @@ static int at91_adc_probe(struct platform_device *pdev)
         ret = of_property_read_u32(pdev->dev.of_node,
                                    "atmel,trigger-edge-type", &edge_type);
         if (ret) {
-                dev_err(&pdev->dev,
-                        "invalid or missing value for atmel,trigger-edge-type\n");
-                return ret;
+                dev_dbg(&pdev->dev,
+                        "atmel,trigger-edge-type not specified, only software trigger available\n");
         }
 
         st->selected_trig = NULL;
 
-        for (i = 0; i < AT91_SAMA5D2_HW_TRIG_CNT; i++)
+        /* find the right trigger, or no trigger at all */
+        for (i = 0; i < AT91_SAMA5D2_HW_TRIG_CNT + 1; i++)
                 if (at91_adc_trigger_list[i].edge_type == edge_type) {
                         st->selected_trig = &at91_adc_trigger_list[i];
                         break;
@@ -717,24 +725,27 @@ static int at91_adc_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, indio_dev);
 
-        ret = at91_adc_buffer_init(indio_dev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "couldn't initialize the buffer.\n");
-                goto per_clk_disable_unprepare;
-        }
+        if (st->selected_trig->hw_trig) {
+                ret = at91_adc_buffer_init(indio_dev);
+                if (ret < 0) {
+                        dev_err(&pdev->dev, "couldn't initialize the buffer.\n");
+                        goto per_clk_disable_unprepare;
+                }
 
-        ret = at91_adc_trigger_init(indio_dev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "couldn't setup the triggers.\n");
-                goto per_clk_disable_unprepare;
+                ret = at91_adc_trigger_init(indio_dev);
+                if (ret < 0) {
+                        dev_err(&pdev->dev, "couldn't setup the triggers.\n");
+                        goto per_clk_disable_unprepare;
+                }
         }
 
         ret = iio_device_register(indio_dev);
         if (ret < 0)
                 goto per_clk_disable_unprepare;
 
-        dev_info(&pdev->dev, "setting up trigger as %s\n",
-                 st->selected_trig->name);
+        if (st->selected_trig->hw_trig)
+                dev_info(&pdev->dev, "setting up trigger as %s\n",
+                         st->selected_trig->name);
 
         dev_info(&pdev->dev, "version: %x\n",
                  readl_relaxed(st->base + AT91_SAMA5D2_VERSION));
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 15109728cae7..3836d4222a3e 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -594,7 +594,6 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
 }
 
 static const struct iio_trigger_ops at91_adc_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = &at91_adc_configure_trigger,
 };
 
@@ -976,7 +975,6 @@ static int at91_adc_probe_pdata(struct at91_adc_state *st,
 }
 
 static const struct iio_info at91_adc_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &at91_adc_read_raw,
 };
 
diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c
index 11e177180ea0..a30a97245e91 100644
--- a/drivers/iio/adc/axp20x_adc.c
+++ b/drivers/iio/adc/axp20x_adc.c
@@ -464,12 +464,10 @@ static int axp20x_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info axp20x_adc_iio_info = {
         .read_raw = axp20x_read_raw,
         .write_raw = axp20x_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_info axp22x_adc_iio_info = {
         .read_raw = axp22x_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int axp20x_adc_rate(int rate)
diff --git a/drivers/iio/adc/axp288_adc.c b/drivers/iio/adc/axp288_adc.c
index 462a99c13e7a..60c9e853dd81 100644
--- a/drivers/iio/adc/axp288_adc.c
+++ b/drivers/iio/adc/axp288_adc.c
@@ -183,7 +183,6 @@ static int axp288_adc_set_state(struct regmap *regmap)
 
 static const struct iio_info axp288_adc_iio_info = {
         .read_raw = &axp288_adc_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int axp288_adc_probe(struct platform_device *pdev)
diff --git a/drivers/iio/adc/bcm_iproc_adc.c b/drivers/iio/adc/bcm_iproc_adc.c
index 7f4f9c4150e3..7af59a4bbd8d 100644
--- a/drivers/iio/adc/bcm_iproc_adc.c
+++ b/drivers/iio/adc/bcm_iproc_adc.c
@@ -492,7 +492,6 @@ static int iproc_adc_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info iproc_adc_iio_info = {
         .read_raw = &iproc_adc_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define IPROC_ADC_CHANNEL(_index, _id) {                \
diff --git a/drivers/iio/adc/berlin2-adc.c b/drivers/iio/adc/berlin2-adc.c
index 71c806ecc722..72d8fa94ab31 100644
--- a/drivers/iio/adc/berlin2-adc.c
+++ b/drivers/iio/adc/berlin2-adc.c
@@ -277,7 +277,6 @@ static irqreturn_t berlin2_adc_tsen_irq(int irq, void *private)
 }
 
 static const struct iio_info berlin2_adc_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = berlin2_adc_read_raw,
 };
 
diff --git a/drivers/iio/adc/cc10001_adc.c b/drivers/iio/adc/cc10001_adc.c
index 91636c0ba5b5..707d8b24b072 100644
--- a/drivers/iio/adc/cc10001_adc.c
+++ b/drivers/iio/adc/cc10001_adc.c
@@ -262,7 +262,6 @@ static int cc10001_update_scan_mode(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info cc10001_adc_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &cc10001_adc_read_raw,
         .update_scan_mode = &cc10001_update_scan_mode,
 };
diff --git a/drivers/iio/adc/cpcap-adc.c b/drivers/iio/adc/cpcap-adc.c
index 6e419d5a7c14..3576ec73ec23 100644
--- a/drivers/iio/adc/cpcap-adc.c
+++ b/drivers/iio/adc/cpcap-adc.c
@@ -932,7 +932,6 @@ err_unlock:
 
 static const struct iio_info cpcap_adc_info = {
         .read_raw = &cpcap_adc_read,
-        .driver_module = THIS_MODULE,
 };
 
 /*
diff --git a/drivers/iio/adc/da9150-gpadc.c b/drivers/iio/adc/da9150-gpadc.c
index 3445107e10b7..0a5d9ce79164 100644
--- a/drivers/iio/adc/da9150-gpadc.c
+++ b/drivers/iio/adc/da9150-gpadc.c
@@ -249,7 +249,6 @@ static int da9150_gpadc_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info da9150_gpadc_info = {
         .read_raw = &da9150_gpadc_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define DA9150_GPADC_CHANNEL(_id, _hw_id, _type, chan_info,     \
diff --git a/drivers/iio/adc/dln2-adc.c b/drivers/iio/adc/dln2-adc.c
index ab8d6aed5085..c64c6675cae6 100644
--- a/drivers/iio/adc/dln2-adc.c
+++ b/drivers/iio/adc/dln2-adc.c
@@ -479,7 +479,6 @@ static const struct iio_info dln2_adc_info = {
         .read_raw = dln2_adc_read_raw,
         .write_raw = dln2_adc_write_raw,
         .update_scan_mode = dln2_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static irqreturn_t dln2_adc_trigger_h(int irq, void *p)
@@ -604,10 +603,6 @@ static void dln2_adc_event(struct platform_device *pdev, u16 echo,
         iio_trigger_poll(dln2->trig);
 }
 
-static const struct iio_trigger_ops dln2_adc_trigger_ops = {
-        .owner = THIS_MODULE,
-};
-
 static int dln2_adc_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
@@ -665,7 +660,6 @@ static int dln2_adc_probe(struct platform_device *pdev)
                 dev_err(dev, "failed to allocate trigger\n");
                 return -ENOMEM;
         }
-        dln2->trig->ops = &dln2_adc_trigger_ops;
         iio_trigger_set_drvdata(dln2->trig, dln2);
         devm_iio_trigger_register(dev, dln2->trig);
         iio_trigger_set_immutable(indio_dev, dln2->trig);
diff --git a/drivers/iio/adc/envelope-detector.c b/drivers/iio/adc/envelope-detector.c
index fef15c0d7c9c..4ebda8ab54fe 100644
--- a/drivers/iio/adc/envelope-detector.c
+++ b/drivers/iio/adc/envelope-detector.c
@@ -322,7 +322,6 @@ static const struct iio_chan_spec envelope_detector_iio_channel = {
 
 static const struct iio_info envelope_detector_info = {
         .read_raw = &envelope_detector_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int envelope_detector_probe(struct platform_device *pdev)
diff --git a/drivers/iio/adc/ep93xx_adc.c b/drivers/iio/adc/ep93xx_adc.c
index a179ac476c6d..81c901507ad2 100644
--- a/drivers/iio/adc/ep93xx_adc.c
+++ b/drivers/iio/adc/ep93xx_adc.c
@@ -150,7 +150,6 @@ static int ep93xx_read_raw(struct iio_dev *iiodev,
 }
 
 static const struct iio_info ep93xx_adc_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = ep93xx_read_raw,
 };
 
diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
index 6c5a7be9f8c1..f10443f92e4c 100644
--- a/drivers/iio/adc/exynos_adc.c
+++ b/drivers/iio/adc/exynos_adc.c
@@ -657,7 +657,6 @@ static int exynos_adc_reg_access(struct iio_dev *indio_dev,
 static const struct iio_info exynos_adc_iio_info = {
         .read_raw = &exynos_read_raw,
         .debugfs_reg_access = &exynos_adc_reg_access,
-        .driver_module = THIS_MODULE,
 };
 
 #define ADC_CHANNEL(_index, _id) {                      \
diff --git a/drivers/iio/adc/hi8435.c b/drivers/iio/adc/hi8435.c
index adf7dc712937..6f6c9a348158 100644
--- a/drivers/iio/adc/hi8435.c
+++ b/drivers/iio/adc/hi8435.c
@@ -408,7 +408,6 @@ static const struct iio_chan_spec hi8435_channels[] = {
 };
 
 static const struct iio_info hi8435_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = hi8435_read_raw,
         .read_event_config = hi8435_read_event_config,
         .write_event_config = hi8435_write_event_config,
diff --git a/drivers/iio/adc/hx711.c b/drivers/iio/adc/hx711.c
index 27005d84ed73..d10b9f13d557 100644
--- a/drivers/iio/adc/hx711.c
+++ b/drivers/iio/adc/hx711.c
@@ -374,7 +374,6 @@ static const struct attribute_group hx711_attribute_group = {
 };
 
 static const struct iio_info hx711_iio_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = hx711_read_raw,
         .write_raw              = hx711_write_raw,
         .write_raw_get_fmt      = hx711_write_raw_get_fmt,
diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c
index 254b29a68b9d..cfab31162845 100644
--- a/drivers/iio/adc/imx7d_adc.c
+++ b/drivers/iio/adc/imx7d_adc.c
@@ -412,7 +412,6 @@ static int imx7d_adc_reg_access(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info imx7d_adc_iio_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &imx7d_adc_read_raw,
         .debugfs_reg_access = &imx7d_adc_reg_access,
 };
diff --git a/drivers/iio/adc/ina2xx-adc.c b/drivers/iio/adc/ina2xx-adc.c
index f387b972e4f4..84a43871f7dc 100644
--- a/drivers/iio/adc/ina2xx-adc.c
+++ b/drivers/iio/adc/ina2xx-adc.c
@@ -123,7 +123,7 @@ struct ina2xx_chip_info {
         struct task_struct *task;
         const struct ina2xx_config *config;
         struct mutex state_lock;
-        unsigned int shunt_resistor;
+        unsigned int shunt_resistor_uohm;
         int avg;
         int int_time_vbus; /* Bus voltage integration time uS */
         int int_time_vshunt; /* Shunt voltage integration time uS */
@@ -436,7 +436,7 @@ static ssize_t ina2xx_allow_async_readout_store(struct device *dev,
 /*
  * Set current LSB to 1mA, shunt is in uOhms
  * (equation 13 in datasheet). We hardcode a Current_LSB
- * of 1.0 x10-6. The only remaining parameter is RShunt.
+ * of 1.0 x10-3. The only remaining parameter is RShunt.
  * There is no need to expose the CALIBRATION register
  * to the user for now. But we need to reset this register
  * if the user updates RShunt after driver init, e.g upon
@@ -445,7 +445,7 @@ static ssize_t ina2xx_allow_async_readout_store(struct device *dev,
 static int ina2xx_set_calibration(struct ina2xx_chip_info *chip)
 {
         u16 regval = DIV_ROUND_CLOSEST(chip->config->calibration_factor,
-                                   chip->shunt_resistor);
+                                   chip->shunt_resistor_uohm);
 
         return regmap_write(chip->regmap, INA2XX_CALIBRATION, regval);
 }
@@ -455,7 +455,7 @@ static int set_shunt_resistor(struct ina2xx_chip_info *chip, unsigned int val)
         if (val <= 0 || val > chip->config->calibration_factor)
                 return -EINVAL;
 
-        chip->shunt_resistor = val;
+        chip->shunt_resistor_uohm = val;
 
         return 0;
 }
@@ -465,8 +465,9 @@ static ssize_t ina2xx_shunt_resistor_show(struct device *dev,
                                           char *buf)
 {
         struct ina2xx_chip_info *chip = iio_priv(dev_to_iio_dev(dev));
+        int vals[2] = { chip->shunt_resistor_uohm, 1000000 };
 
-        return sprintf(buf, "%d\n", chip->shunt_resistor);
+        return iio_format_value(buf, IIO_VAL_FRACTIONAL, 1, vals);
 }
 
 static ssize_t ina2xx_shunt_resistor_store(struct device *dev,
@@ -474,14 +475,13 @@ static ssize_t ina2xx_shunt_resistor_store(struct device *dev,
                                            const char *buf, size_t len)
 {
         struct ina2xx_chip_info *chip = iio_priv(dev_to_iio_dev(dev));
-        unsigned long val;
-        int ret;
+        int val, val_fract, ret;
 
-        ret = kstrtoul((const char *) buf, 10, &val);
+        ret = iio_str_to_fixpoint(buf, 100000, &val, &val_fract);
         if (ret)
                 return ret;
 
-        ret = set_shunt_resistor(chip, val);
+        ret = set_shunt_resistor(chip, val * 1000000 + val_fract);
         if (ret)
                 return ret;
 
@@ -778,7 +778,6 @@ static const struct attribute_group ina226_attribute_group = {
 };
 
 static const struct iio_info ina219_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &ina219_attribute_group,
         .read_raw = ina2xx_read_raw,
         .write_raw = ina2xx_write_raw,
@@ -786,7 +785,6 @@ static const struct iio_info ina219_info = {
 };
 
 static const struct iio_info ina226_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &ina226_attribute_group,
         .read_raw = ina2xx_read_raw,
         .write_raw = ina2xx_write_raw,
diff --git a/drivers/iio/adc/lp8788_adc.c b/drivers/iio/adc/lp8788_adc.c
index 152cfc8e1c7b..3bc4df916420 100644
--- a/drivers/iio/adc/lp8788_adc.c
+++ b/drivers/iio/adc/lp8788_adc.c
@@ -125,7 +125,6 @@ static int lp8788_adc_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info lp8788_adc_info = {
         .read_raw = &lp8788_adc_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define LP8788_CHAN(_id, _type) {                               \
diff --git a/drivers/iio/adc/lpc18xx_adc.c b/drivers/iio/adc/lpc18xx_adc.c
index 3ef18f4b27f0..041dc4a3f66c 100644
--- a/drivers/iio/adc/lpc18xx_adc.c
+++ b/drivers/iio/adc/lpc18xx_adc.c
@@ -116,7 +116,6 @@ static int lpc18xx_adc_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info lpc18xx_adc_info = {
         .read_raw = lpc18xx_adc_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int lpc18xx_adc_probe(struct platform_device *pdev)
diff --git a/drivers/iio/adc/lpc32xx_adc.c b/drivers/iio/adc/lpc32xx_adc.c
index 6a5b9a9bc662..20b36690fa4f 100644
--- a/drivers/iio/adc/lpc32xx_adc.c
+++ b/drivers/iio/adc/lpc32xx_adc.c
@@ -104,7 +104,6 @@ static int lpc32xx_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info lpc32xx_adc_iio_info = {
         .read_raw = &lpc32xx_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define LPC32XX_ADC_CHANNEL(_index) {                   \
diff --git a/drivers/iio/adc/ltc2471.c b/drivers/iio/adc/ltc2471.c
index 29b7ed60cdb0..b88102b751cf 100644
--- a/drivers/iio/adc/ltc2471.c
+++ b/drivers/iio/adc/ltc2471.c
@@ -98,7 +98,6 @@ static const struct iio_chan_spec ltc2473_channel[] = {
 
 static const struct iio_info ltc2471_info = {
         .read_raw = ltc2471_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int ltc2471_i2c_probe(struct i2c_client *client,
diff --git a/drivers/iio/adc/ltc2485.c b/drivers/iio/adc/ltc2485.c
index eab91f12454a..b24c14037fd4 100644
--- a/drivers/iio/adc/ltc2485.c
+++ b/drivers/iio/adc/ltc2485.c
@@ -90,7 +90,6 @@ static const struct iio_chan_spec ltc2485_channel[] = {
 
 static const struct iio_info ltc2485_info = {
         .read_raw = ltc2485_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int ltc2485_probe(struct i2c_client *client,
diff --git a/drivers/iio/adc/ltc2497.c b/drivers/iio/adc/ltc2497.c
index 5bf8011dcde9..f1f7cdf66fbd 100644
--- a/drivers/iio/adc/ltc2497.c
+++ b/drivers/iio/adc/ltc2497.c
@@ -186,7 +186,6 @@ static const struct iio_chan_spec ltc2497_channel[] = {
 
 static const struct iio_info ltc2497_info = {
         .read_raw = ltc2497_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int ltc2497_probe(struct i2c_client *client,
diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c
index ebc715927e63..375da6491499 100644
--- a/drivers/iio/adc/max1027.c
+++ b/drivers/iio/adc/max1027.c
@@ -381,13 +381,11 @@ static irqreturn_t max1027_trigger_handler(int irq, void *private)
 }
 
 static const struct iio_trigger_ops max1027_trigger_ops = {
-        .owner = THIS_MODULE,
         .validate_device = &iio_trigger_validate_own_device,
         .set_trigger_state = &max1027_set_trigger_state,
 };
 
 static const struct iio_info max1027_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &max1027_read_raw,
         .validate_trigger = &max1027_validate_trigger,
         .debugfs_reg_access = &max1027_debugfs_reg_access,
diff --git a/drivers/iio/adc/max11100.c b/drivers/iio/adc/max11100.c
index 1180bcc22ff1..af59ab2e650c 100644
--- a/drivers/iio/adc/max11100.c
+++ b/drivers/iio/adc/max11100.c
@@ -100,7 +100,6 @@ static int max11100_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info max11100_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = max11100_read_raw,
 };
 
diff --git a/drivers/iio/adc/max1118.c b/drivers/iio/adc/max1118.c
index 2e9648a078c4..49db9e9ae625 100644
--- a/drivers/iio/adc/max1118.c
+++ b/drivers/iio/adc/max1118.c
@@ -155,7 +155,6 @@ static int max1118_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info max1118_info = {
         .read_raw = max1118_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static irqreturn_t max1118_trigger_handler(int irq, void *p)
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index 80eada4886b3..7f1848dac9bf 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -1029,7 +1029,6 @@ static int max1363_update_scan_mode(struct iio_dev *indio_dev,
 
 static const struct iio_info max1238_info = {
         .read_raw = &max1363_read_raw,
-        .driver_module = THIS_MODULE,
         .update_scan_mode = &max1363_update_scan_mode,
 };
 
@@ -1040,7 +1039,6 @@ static const struct iio_info max1363_info = {
         .write_event_config = &max1363_write_event_config,
         .read_raw = &max1363_read_raw,
         .update_scan_mode = &max1363_update_scan_mode,
-        .driver_module = THIS_MODULE,
         .event_attrs = &max1363_event_attribute_group,
 };
 
diff --git a/drivers/iio/adc/max9611.c b/drivers/iio/adc/max9611.c
index b1dd17cbce58..0538ff8c4ac1 100644
--- a/drivers/iio/adc/max9611.c
+++ b/drivers/iio/adc/max9611.c
@@ -460,7 +460,6 @@ static const struct attribute_group max9611_attribute_group = {
 };
 
 static const struct iio_info indio_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = max9611_read_raw,
         .attrs          = &max9611_attribute_group,
 };
@@ -573,7 +572,6 @@ static int max9611_probe(struct i2c_client *client,
 static struct i2c_driver max9611_driver = {
         .driver = {
                    .name = DRIVER_NAME,
-                   .owner = THIS_MODULE,
                    .of_match_table = max9611_of_table,
         },
         .probe = max9611_probe,
diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
index 071dd23a33d9..a04856d8afdb 100644
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@ -19,6 +19,11 @@
  * ------------
  * 13 bit converter
  * MCP3301
+ * ------------
+ * 22 bit converter
+ * MCP3550
+ * MCP3551
+ * MCP3553
  *
  * Datasheet can be found here:
  * http://ww1.microchip.com/downloads/en/DeviceDoc/21293C.pdf  mcp3001
@@ -28,6 +33,7 @@
  * http://ww1.microchip.com/downloads/en/DeviceDoc/21034D.pdf  mcp3202
  * http://ww1.microchip.com/downloads/en/DeviceDoc/21298c.pdf  mcp3204/08
  * http://ww1.microchip.com/downloads/en/DeviceDoc/21700E.pdf  mcp3301
+ * http://ww1.microchip.com/downloads/en/DeviceDoc/21950D.pdf  mcp3550/1/3
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -51,25 +57,45 @@ enum {
         mcp3204,
         mcp3208,
         mcp3301,
+        mcp3550_50,
+        mcp3550_60,
+        mcp3551,
+        mcp3553,
 };
 
 struct mcp320x_chip_info {
         const struct iio_chan_spec *channels;
         unsigned int num_channels;
         unsigned int resolution;
+        unsigned int conv_time; /* usec */
 };
 
+/**
+ * struct mcp320x - Microchip SPI ADC instance
+ * @spi: SPI slave (parent of the IIO device)
+ * @msg: SPI message to select a channel and receive a value from the ADC
+ * @transfer: SPI transfers used by @msg
+ * @start_conv_msg: SPI message to start a conversion by briefly asserting CS
+ * @start_conv_transfer: SPI transfer used by @start_conv_msg
+ * @reg: regulator generating Vref
+ * @lock: protects read sequences
+ * @chip_info: ADC properties
+ * @tx_buf: buffer for @transfer[0] (not used on single-channel converters)
+ * @rx_buf: buffer for @transfer[1]
+ */
 struct mcp320x {
         struct spi_device *spi;
         struct spi_message msg;
         struct spi_transfer transfer[2];
+        struct spi_message start_conv_msg;
+        struct spi_transfer start_conv_transfer;
 
         struct regulator *reg;
         struct mutex lock;
         const struct mcp320x_chip_info *chip_info;
 
         u8 tx_buf ____cacheline_aligned;
-        u8 rx_buf[2];
+        u8 rx_buf[4];
 };
 
 static int mcp320x_channel_to_tx_data(int device_index,
@@ -78,10 +104,6 @@ static int mcp320x_channel_to_tx_data(int device_index,
         int start_bit = 1;
 
         switch (device_index) {
-        case mcp3001:
-        case mcp3201:
-        case mcp3301:
-                return 0;
         case mcp3002:
         case mcp3202:
                 return ((start_bit << 4) | (!differential << 3) |
@@ -102,21 +124,24 @@ static int mcp320x_adc_conversion(struct mcp320x *adc, u8 channel,
 {
         int ret;
 
-        adc->rx_buf[0] = 0;
-        adc->rx_buf[1] = 0;
-        adc->tx_buf = mcp320x_channel_to_tx_data(device_index,
-                                                channel, differential);
-
-        if (device_index != mcp3001 && device_index != mcp3201 && device_index != mcp3301) {
-                ret = spi_sync(adc->spi, &adc->msg);
-                if (ret < 0)
-                        return ret;
-        } else {
-                ret = spi_read(adc->spi, &adc->rx_buf, sizeof(adc->rx_buf));
+        if (adc->chip_info->conv_time) {
+                ret = spi_sync(adc->spi, &adc->start_conv_msg);
                 if (ret < 0)
                         return ret;
+
+                usleep_range(adc->chip_info->conv_time,
+                             adc->chip_info->conv_time + 100);
         }
 
+        memset(&adc->rx_buf, 0, sizeof(adc->rx_buf));
+        if (adc->chip_info->num_channels > 1)
+                adc->tx_buf = mcp320x_channel_to_tx_data(device_index, channel,
+                                                         differential);
+
+        ret = spi_sync(adc->spi, &adc->msg);
+        if (ret < 0)
+                return ret;
+
         switch (device_index) {
         case mcp3001:
                 *val = (adc->rx_buf[0] << 5 | adc->rx_buf[1] >> 3);
@@ -138,6 +163,31 @@ static int mcp320x_adc_conversion(struct mcp320x *adc, u8 channel,
                 *val = sign_extend32((adc->rx_buf[0] & 0x1f) << 8
                                     | adc->rx_buf[1], 12);
                 return 0;
+        case mcp3550_50:
+        case mcp3550_60:
+        case mcp3551:
+        case mcp3553: {
+                u32 raw = be32_to_cpup((u32 *)adc->rx_buf);
+
+                if (!(adc->spi->mode & SPI_CPOL))
+                        raw <<= 1; /* strip Data Ready bit in SPI mode 0,0 */
+
+                /*
+                 * If the input is within -vref and vref, bit 21 is the sign.
+                 * Up to 12% overrange or underrange are allowed, in which case
+                 * bit 23 is the sign and bit 0 to 21 is the value.
+                 */
+                raw >>= 8;
+                if (raw & BIT(22) && raw & BIT(23))
+                        return -EIO; /* cannot have overrange AND underrange */
+                else if (raw & BIT(22))
+                        raw &= ~BIT(22); /* overrange */
+                else if (raw & BIT(23) || raw & BIT(21))
+                        raw |= GENMASK(31, 22); /* underrange or negative */
+
+                *val = (s32)raw;
+                return 0;
+                }
         default:
                 return -EINVAL;
         }
@@ -248,7 +298,6 @@ static const struct iio_chan_spec mcp3208_channels[] = {
 
 static const struct iio_info mcp320x_info = {
         .read_raw = mcp320x_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct mcp320x_chip_info mcp320x_chip_infos[] = {
@@ -297,6 +346,31 @@ static const struct mcp320x_chip_info mcp320x_chip_infos[] = {
                 .num_channels = ARRAY_SIZE(mcp3201_channels),
                 .resolution = 13
         },
+        [mcp3550_50] = {
+                .channels = mcp3201_channels,
+                .num_channels = ARRAY_SIZE(mcp3201_channels),
+                .resolution = 21,
+                /* 2% max deviation + 144 clock periods to exit shutdown */
+                .conv_time = 80000 * 1.02 + 144000 / 102.4,
+        },
+        [mcp3550_60] = {
+                .channels = mcp3201_channels,
+                .num_channels = ARRAY_SIZE(mcp3201_channels),
+                .resolution = 21,
+                .conv_time = 66670 * 1.02 + 144000 / 122.88,
+        },
+        [mcp3551] = {
+                .channels = mcp3201_channels,
+                .num_channels = ARRAY_SIZE(mcp3201_channels),
+                .resolution = 21,
+                .conv_time = 73100 * 1.02 + 144000 / 112.64,
+        },
+        [mcp3553] = {
+                .channels = mcp3201_channels,
+                .num_channels = ARRAY_SIZE(mcp3201_channels),
+                .resolution = 21,
+                .conv_time = 16670 * 1.02 + 144000 / 122.88,
+        },
 };
 
 static int mcp320x_probe(struct spi_device *spi)
@@ -304,7 +378,7 @@ static int mcp320x_probe(struct spi_device *spi)
         struct iio_dev *indio_dev;
         struct mcp320x *adc;
         const struct mcp320x_chip_info *chip_info;
-        int ret;
+        int ret, device_index;
 
         indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*adc));
         if (!indio_dev)
@@ -320,7 +394,8 @@ static int mcp320x_probe(struct spi_device *spi)
         indio_dev->info = &mcp320x_info;
         spi_set_drvdata(spi, indio_dev);
 
-        chip_info = &mcp320x_chip_infos[spi_get_device_id(spi)->driver_data];
+        device_index = spi_get_device_id(spi)->driver_data;
+        chip_info = &mcp320x_chip_infos[device_index];
         indio_dev->channels = chip_info->channels;
         indio_dev->num_channels = chip_info->num_channels;
 
@@ -329,10 +404,41 @@ static int mcp320x_probe(struct spi_device *spi)
         adc->transfer[0].tx_buf = &adc->tx_buf;
         adc->transfer[0].len = sizeof(adc->tx_buf);
         adc->transfer[1].rx_buf = adc->rx_buf;
-        adc->transfer[1].len = sizeof(adc->rx_buf);
+        adc->transfer[1].len = DIV_ROUND_UP(chip_info->resolution, 8);
+
+        if (chip_info->num_channels == 1)
+                /* single-channel converters are rx only (no MOSI pin) */
+                spi_message_init_with_transfers(&adc->msg,
+                                                &adc->transfer[1], 1);
+        else
+                spi_message_init_with_transfers(&adc->msg, adc->transfer,
+                                                ARRAY_SIZE(adc->transfer));
 
-        spi_message_init_with_transfers(&adc->msg, adc->transfer,
-                                        ARRAY_SIZE(adc->transfer));
+        switch (device_index) {
+        case mcp3550_50:
+        case mcp3550_60:
+        case mcp3551:
+        case mcp3553:
+                /* rx len increases from 24 to 25 bit in SPI mode 0,0 */
+                if (!(spi->mode & SPI_CPOL))
+                        adc->transfer[1].len++;
+
+                /* conversions are started by asserting CS pin for 8 usec */
+                adc->start_conv_transfer.delay_usecs = 8;
+                spi_message_init_with_transfers(&adc->start_conv_msg,
+                                                &adc->start_conv_transfer, 1);
+
+                /*
+                 * If CS was previously kept low (continuous conversion mode)
+                 * and then changed to high, the chip is in shutdown.
+                 * Sometimes it fails to wake from shutdown and clocks out
+                 * only 0xffffff.  The magic sequence of performing two
+                 * conversions without delay between them resets the chip
+                 * and ensures all subsequent conversions succeed.
+                 */
+                mcp320x_adc_conversion(adc, 0, 1, device_index, &ret);
+                mcp320x_adc_conversion(adc, 0, 1, device_index, &ret);
+        }
 
         adc->reg = devm_regulator_get(&spi->dev, "vref");
         if (IS_ERR(adc->reg))
@@ -370,62 +476,29 @@ static int mcp320x_remove(struct spi_device *spi)
 #if defined(CONFIG_OF)
 static const struct of_device_id mcp320x_dt_ids[] = {
         /* NOTE: The use of compatibles with no vendor prefix is deprecated. */
-        {
-                .compatible = "mcp3001",
-                .data = &mcp320x_chip_infos[mcp3001],
-        }, {
-                .compatible = "mcp3002",
-                .data = &mcp320x_chip_infos[mcp3002],
-        }, {
-                .compatible = "mcp3004",
-                .data = &mcp320x_chip_infos[mcp3004],
-        }, {
-                .compatible = "mcp3008",
-                .data = &mcp320x_chip_infos[mcp3008],
-        }, {
-                .compatible = "mcp3201",
-                .data = &mcp320x_chip_infos[mcp3201],
-        }, {
-                .compatible = "mcp3202",
-                .data = &mcp320x_chip_infos[mcp3202],
-        }, {
-                .compatible = "mcp3204",
-                .data = &mcp320x_chip_infos[mcp3204],
-        }, {
-                .compatible = "mcp3208",
-                .data = &mcp320x_chip_infos[mcp3208],
-        }, {
-                .compatible = "mcp3301",
-                .data = &mcp320x_chip_infos[mcp3301],
-        }, {
-                .compatible = "microchip,mcp3001",
-                .data = &mcp320x_chip_infos[mcp3001],
-        }, {
-                .compatible = "microchip,mcp3002",
-                .data = &mcp320x_chip_infos[mcp3002],
-        }, {
-                .compatible = "microchip,mcp3004",
-                .data = &mcp320x_chip_infos[mcp3004],
-        }, {
-                .compatible = "microchip,mcp3008",
-                .data = &mcp320x_chip_infos[mcp3008],
-        }, {
-                .compatible = "microchip,mcp3201",
-                .data = &mcp320x_chip_infos[mcp3201],
-        }, {
-                .compatible = "microchip,mcp3202",
-                .data = &mcp320x_chip_infos[mcp3202],
-        }, {
-                .compatible = "microchip,mcp3204",
-                .data = &mcp320x_chip_infos[mcp3204],
-        }, {
-                .compatible = "microchip,mcp3208",
-                .data = &mcp320x_chip_infos[mcp3208],
-        }, {
-                .compatible = "microchip,mcp3301",
-                .data = &mcp320x_chip_infos[mcp3301],
-        }, {
-        }
+        { .compatible = "mcp3001" },
+        { .compatible = "mcp3002" },
+        { .compatible = "mcp3004" },
+        { .compatible = "mcp3008" },
+        { .compatible = "mcp3201" },
+        { .compatible = "mcp3202" },
+        { .compatible = "mcp3204" },
+        { .compatible = "mcp3208" },
+        { .compatible = "mcp3301" },
+        { .compatible = "microchip,mcp3001" },
+        { .compatible = "microchip,mcp3002" },
+        { .compatible = "microchip,mcp3004" },
+        { .compatible = "microchip,mcp3008" },
+        { .compatible = "microchip,mcp3201" },
+        { .compatible = "microchip,mcp3202" },
+        { .compatible = "microchip,mcp3204" },
+        { .compatible = "microchip,mcp3208" },
+        { .compatible = "microchip,mcp3301" },
+        { .compatible = "microchip,mcp3550-50" },
+        { .compatible = "microchip,mcp3550-60" },
+        { .compatible = "microchip,mcp3551" },
+        { .compatible = "microchip,mcp3553" },
+        { }
 };
 MODULE_DEVICE_TABLE(of, mcp320x_dt_ids);
 #endif
@@ -440,6 +513,10 @@ static const struct spi_device_id mcp320x_id[] = {
         { "mcp3204", mcp3204 },
         { "mcp3208", mcp3208 },
         { "mcp3301", mcp3301 },
+        { "mcp3550-50", mcp3550_50 },
+        { "mcp3550-60", mcp3550_60 },
+        { "mcp3551", mcp3551 },
+        { "mcp3553", mcp3553 },
         { }
 };
 MODULE_DEVICE_TABLE(spi, mcp320x_id);
@@ -456,5 +533,5 @@ static struct spi_driver mcp320x_driver = {
 module_spi_driver(mcp320x_driver);
 
 MODULE_AUTHOR("Oskar Andero <oskar.andero@gmail.com>");
-MODULE_DESCRIPTION("Microchip Technology MCP3x01/02/04/08");
+MODULE_DESCRIPTION("Microchip Technology MCP3x01/02/04/08 and MCP3550/1/3");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
index 63de705086ed..819f26011500 100644
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
@@ -327,7 +327,6 @@ static const struct iio_info mcp3422_info = {
         .write_raw = mcp3422_write_raw,
         .write_raw_get_fmt = mcp3422_write_raw_get_fmt,
         .attrs = &mcp3422_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int mcp3422_probe(struct i2c_client *client,
diff --git a/drivers/iio/adc/men_z188_adc.c b/drivers/iio/adc/men_z188_adc.c
index 8f3606de4eaf..c80261748d8f 100644
--- a/drivers/iio/adc/men_z188_adc.c
+++ b/drivers/iio/adc/men_z188_adc.c
@@ -80,7 +80,6 @@ static int z188_iio_read_raw(struct iio_dev *iio_dev,
 
 static const struct iio_info z188_adc_info = {
         .read_raw = &z188_iio_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static void men_z188_config_channels(void __iomem *addr)
diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c
index 2e8dbb89c8c9..9c6932ffc0af 100644
--- a/drivers/iio/adc/meson_saradc.c
+++ b/drivers/iio/adc/meson_saradc.c
@@ -840,7 +840,6 @@ out:
 
 static const struct iio_info meson_sar_adc_iio_info = {
         .read_raw = meson_sar_adc_iio_info_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct meson_sar_adc_data meson_sar_adc_meson8_data = {
diff --git a/drivers/iio/adc/mt6577_auxadc.c b/drivers/iio/adc/mt6577_auxadc.c
index 414cf44bf19d..95d76abb64ec 100644
--- a/drivers/iio/adc/mt6577_auxadc.c
+++ b/drivers/iio/adc/mt6577_auxadc.c
@@ -180,7 +180,6 @@ static int mt6577_auxadc_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info mt6577_auxadc_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &mt6577_auxadc_read_raw,
 };
 
@@ -306,6 +305,7 @@ static SIMPLE_DEV_PM_OPS(mt6577_auxadc_pm_ops,
 
 static const struct of_device_id mt6577_auxadc_of_match[] = {
         { .compatible = "mediatek,mt2701-auxadc", },
+        { .compatible = "mediatek,mt2712-auxadc", },
         { .compatible = "mediatek,mt7622-auxadc", },
         { .compatible = "mediatek,mt8173-auxadc", },
         { }
diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
index d32b34638c2f..c627513d9f0f 100644
--- a/drivers/iio/adc/mxs-lradc-adc.c
+++ b/drivers/iio/adc/mxs-lradc-adc.c
@@ -382,7 +382,6 @@ static const struct attribute_group mxs_lradc_adc_attribute_group = {
 };
 
 static const struct iio_info mxs_lradc_adc_iio_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = mxs_lradc_adc_read_raw,
         .write_raw              = mxs_lradc_adc_write_raw,
         .write_raw_get_fmt      = mxs_lradc_adc_write_raw_get_fmt,
@@ -455,7 +454,6 @@ static int mxs_lradc_adc_configure_trigger(struct iio_trigger *trig, bool state)
 }
 
 static const struct iio_trigger_ops mxs_lradc_adc_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = &mxs_lradc_adc_configure_trigger,
 };
 
diff --git a/drivers/iio/adc/nau7802.c b/drivers/iio/adc/nau7802.c
index 08f446695f97..8997e74a8847 100644
--- a/drivers/iio/adc/nau7802.c
+++ b/drivers/iio/adc/nau7802.c
@@ -402,7 +402,6 @@ static int nau7802_write_raw_get_fmt(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info nau7802_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &nau7802_read_raw,
         .write_raw = &nau7802_write_raw,
         .write_raw_get_fmt = nau7802_write_raw_get_fmt,
diff --git a/drivers/iio/adc/palmas_gpadc.c b/drivers/iio/adc/palmas_gpadc.c
index 7d61b566e148..69b9affeef1e 100644
--- a/drivers/iio/adc/palmas_gpadc.c
+++ b/drivers/iio/adc/palmas_gpadc.c
@@ -430,7 +430,6 @@ out:
 
 static const struct iio_info palmas_gpadc_iio_info = {
         .read_raw = palmas_gpadc_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define PALMAS_ADC_CHAN_IIO(chan, _type, chan_info)     \
diff --git a/drivers/iio/adc/qcom-pm8xxx-xoadc.c b/drivers/iio/adc/qcom-pm8xxx-xoadc.c
index cea8f1fb444a..b093ecddf1a8 100644
--- a/drivers/iio/adc/qcom-pm8xxx-xoadc.c
+++ b/drivers/iio/adc/qcom-pm8xxx-xoadc.c
@@ -728,7 +728,6 @@ static int pm8xxx_of_xlate(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info pm8xxx_xoadc_info = {
-        .driver_module = THIS_MODULE,
         .of_xlate = pm8xxx_of_xlate,
         .read_raw = pm8xxx_read_raw,
 };
diff --git a/drivers/iio/adc/qcom-spmi-iadc.c b/drivers/iio/adc/qcom-spmi-iadc.c
index fabd24edc2a1..3f062cd61aba 100644
--- a/drivers/iio/adc/qcom-spmi-iadc.c
+++ b/drivers/iio/adc/qcom-spmi-iadc.c
@@ -356,7 +356,6 @@ static int iadc_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info iadc_info = {
         .read_raw = iadc_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static irqreturn_t iadc_isr(int irq, void *dev_id)
diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c
index 9e600bfd1765..3680e0d47412 100644
--- a/drivers/iio/adc/qcom-spmi-vadc.c
+++ b/drivers/iio/adc/qcom-spmi-vadc.c
@@ -506,7 +506,6 @@ static int vadc_of_xlate(struct iio_dev *indio_dev,
 static const struct iio_info vadc_info = {
         .read_raw = vadc_read_raw,
         .of_xlate = vadc_of_xlate,
-        .driver_module = THIS_MODULE,
 };
 
 struct vadc_channels {
diff --git a/drivers/iio/adc/rcar-gyroadc.c b/drivers/iio/adc/rcar-gyroadc.c
index 27a318164619..dcb50172186f 100644
--- a/drivers/iio/adc/rcar-gyroadc.c
+++ b/drivers/iio/adc/rcar-gyroadc.c
@@ -277,7 +277,6 @@ static int rcar_gyroadc_reg_access(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info rcar_gyroadc_iio_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = rcar_gyroadc_read_raw,
         .debugfs_reg_access     = rcar_gyroadc_reg_access,
 };
@@ -349,7 +348,7 @@ static int rcar_gyroadc_parse_subdevs(struct iio_dev *indio_dev)
                         continue;
                 }
 
-                childmode = (unsigned int)of_id->data;
+                childmode = (uintptr_t)of_id->data;
                 switch (childmode) {
                 case RCAR_GYROADC_MODE_SELECT_1_MB88101A:
                         sample_width = 12;
@@ -488,8 +487,6 @@ err:
 
 static int rcar_gyroadc_probe(struct platform_device *pdev)
 {
-        const struct of_device_id *of_id =
-                of_match_device(rcar_gyroadc_match, &pdev->dev);
         struct device *dev = &pdev->dev;
         struct rcar_gyroadc *priv;
         struct iio_dev *indio_dev;
@@ -526,7 +523,8 @@ static int rcar_gyroadc_probe(struct platform_device *pdev)
         if (ret)
                 return ret;
 
-        priv->model = (enum rcar_gyroadc_model)of_id->data;
+        priv->model = (enum rcar_gyroadc_model)
+                of_device_get_match_data(&pdev->dev);
 
         platform_set_drvdata(pdev, indio_dev);
 
diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
index 5f612d694b33..1f98566d5b3c 100644
--- a/drivers/iio/adc/rockchip_saradc.c
+++ b/drivers/iio/adc/rockchip_saradc.c
@@ -125,7 +125,6 @@ static irqreturn_t rockchip_saradc_isr(int irq, void *dev_id)
 
 static const struct iio_info rockchip_saradc_iio_info = {
         .read_raw = rockchip_saradc_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define ADC_CHANNEL(_index, _id) {                              \
diff --git a/drivers/iio/adc/spear_adc.c b/drivers/iio/adc/spear_adc.c
index 5dd61f6a57b9..b1da2c46107c 100644
--- a/drivers/iio/adc/spear_adc.c
+++ b/drivers/iio/adc/spear_adc.c
@@ -254,7 +254,6 @@ static int spear_adc_configure(struct spear_adc_state *st)
 static const struct iio_info spear_adc_info = {
         .read_raw = &spear_adc_read_raw,
         .write_raw = &spear_adc_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int spear_adc_probe(struct platform_device *pdev)
diff --git a/drivers/iio/adc/stm32-adc-core.c b/drivers/iio/adc/stm32-adc-core.c
index 804198eb0eef..6aefef99f935 100644
--- a/drivers/iio/adc/stm32-adc-core.c
+++ b/drivers/iio/adc/stm32-adc-core.c
@@ -139,6 +139,11 @@ static int stm32f4_adc_clk_sel(struct platform_device *pdev,
         }
 
         rate = clk_get_rate(priv->aclk);
+        if (!rate) {
+                dev_err(&pdev->dev, "Invalid clock rate: 0\n");
+                return -EINVAL;
+        }
+
         for (i = 0; i < ARRAY_SIZE(stm32f4_pclk_div); i++) {
                 if ((rate / stm32f4_pclk_div[i]) <= STM32F4_ADC_MAX_CLK_RATE)
                         break;
@@ -216,6 +221,10 @@ static int stm32h7_adc_clk_sel(struct platform_device *pdev,
                  * From spec: PLL output musn't exceed max rate
                  */
                 rate = clk_get_rate(priv->aclk);
+                if (!rate) {
+                        dev_err(&pdev->dev, "Invalid adc clock rate: 0\n");
+                        return -EINVAL;
+                }
 
                 for (i = 0; i < ARRAY_SIZE(stm32h7_adc_ckmodes_spec); i++) {
                         ckmode = stm32h7_adc_ckmodes_spec[i].ckmode;
@@ -232,6 +241,10 @@ static int stm32h7_adc_clk_sel(struct platform_device *pdev,
 
         /* Synchronous clock modes (e.g. ckmode is 1, 2 or 3) */
         rate = clk_get_rate(priv->bclk);
+        if (!rate) {
+                dev_err(&pdev->dev, "Invalid bus clock rate: 0\n");
+                return -EINVAL;
+        }
 
         for (i = 0; i < ARRAY_SIZE(stm32h7_adc_ckmodes_spec); i++) {
                 ckmode = stm32h7_adc_ckmodes_spec[i].ckmode;
diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
index 4df32cf1650e..c9d96f935dba 100644
--- a/drivers/iio/adc/stm32-adc.c
+++ b/drivers/iio/adc/stm32-adc.c
@@ -531,6 +531,7 @@ static struct stm32_adc_trig_info stm32h7_adc_trigs[] = {
         { TIM2_TRGO, STM32_EXT11 },
         { TIM4_TRGO, STM32_EXT12 },
         { TIM6_TRGO, STM32_EXT13 },
+        { TIM15_TRGO, STM32_EXT14 },
         { TIM3_CH4, STM32_EXT15 },
         { LPTIM1_OUT, STM32_EXT18 },
         { LPTIM2_OUT, STM32_EXT19 },
@@ -1385,7 +1386,6 @@ static const struct iio_info stm32_adc_iio_info = {
         .update_scan_mode = stm32_adc_update_scan_mode,
         .debugfs_reg_access = stm32_adc_debugfs_reg_access,
         .of_xlate = stm32_adc_of_xlate,
-        .driver_module = THIS_MODULE,
 };
 
 static unsigned int stm32_adc_dma_residue(struct stm32_adc *adc)
diff --git a/drivers/iio/adc/stx104.c b/drivers/iio/adc/stx104.c
index 2da741d27540..17b021f33180 100644
--- a/drivers/iio/adc/stx104.c
+++ b/drivers/iio/adc/stx104.c
@@ -172,7 +172,6 @@ static int stx104_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info stx104_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = stx104_read_raw,
         .write_raw = stx104_write_raw
 };
diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c
index 137f577d9432..04d7147e0110 100644
--- a/drivers/iio/adc/sun4i-gpadc-iio.c
+++ b/drivers/iio/adc/sun4i-gpadc-iio.c
@@ -352,7 +352,6 @@ static int sun4i_gpadc_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info sun4i_gpadc_iio_info = {
         .read_raw = sun4i_gpadc_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static irqreturn_t sun4i_gpadc_temp_data_irq_handler(int irq, void *dev_id)
@@ -502,17 +501,15 @@ static int sun4i_gpadc_probe_dt(struct platform_device *pdev,
                                 struct iio_dev *indio_dev)
 {
         struct sun4i_gpadc_iio *info = iio_priv(indio_dev);
-        const struct of_device_id *of_dev;
         struct resource *mem;
         void __iomem *base;
         int ret;
 
-        of_dev = of_match_device(sun4i_gpadc_of_id, &pdev->dev);
-        if (!of_dev)
+        info->data = of_device_get_match_data(&pdev->dev);
+        if (!info->data)
                 return -ENODEV;
 
         info->no_irq = true;
-        info->data = (struct gpadc_data *)of_dev->data;
         indio_dev->num_channels = ARRAY_SIZE(sun8i_a33_gpadc_channels);
         indio_dev->channels = sun8i_a33_gpadc_channels;
 
@@ -529,17 +526,10 @@ static int sun4i_gpadc_probe_dt(struct platform_device *pdev,
                 return ret;
         }
 
-        if (!IS_ENABLED(CONFIG_THERMAL_OF))
-                return 0;
+        if (IS_ENABLED(CONFIG_THERMAL_OF))
+                info->sensor_device = &pdev->dev;
 
-        info->sensor_device = &pdev->dev;
-        info->tzd = thermal_zone_of_sensor_register(info->sensor_device, 0,
-                                                    info, &sun4i_ts_tz_ops);
-        if (IS_ERR(info->tzd))
-                dev_err(&pdev->dev, "could not register thermal sensor: %ld\n",
-                        PTR_ERR(info->tzd));
-
-        return PTR_ERR_OR_ZERO(info->tzd);
+        return 0;
 }
 
 static int sun4i_gpadc_probe_mfd(struct platform_device *pdev,
@@ -586,15 +576,6 @@ static int sun4i_gpadc_probe_mfd(struct platform_device *pdev,
                  * return the temperature.
                  */
                 info->sensor_device = pdev->dev.parent;
-                info->tzd = thermal_zone_of_sensor_register(info->sensor_device,
-                                                            0, info,
-                                                            &sun4i_ts_tz_ops);
-                if (IS_ERR(info->tzd)) {
-                        dev_err(&pdev->dev,
-                                "could not register thermal sensor: %ld\n",
-                                PTR_ERR(info->tzd));
-                        return PTR_ERR(info->tzd);
-                }
         } else {
                 indio_dev->num_channels =
                         ARRAY_SIZE(sun4i_gpadc_channels_no_temp);
@@ -664,6 +645,22 @@ static int sun4i_gpadc_probe(struct platform_device *pdev)
         pm_runtime_set_suspended(&pdev->dev);
         pm_runtime_enable(&pdev->dev);
 
+        if (IS_ENABLED(CONFIG_THERMAL_OF)) {
+                info->tzd = thermal_zone_of_sensor_register(info->sensor_device,
+                                                            0, info,
+                                                            &sun4i_ts_tz_ops);
+                /*
+                 * Do not fail driver probing when failing to register in
+                 * thermal because no thermal DT node is found.
+                 */
+                if (IS_ERR(info->tzd) && PTR_ERR(info->tzd) != -ENODEV) {
+                        dev_err(&pdev->dev,
+                                "could not register thermal sensor: %ld\n",
+                                PTR_ERR(info->tzd));
+                        return PTR_ERR(info->tzd);
+                }
+        }
+
         ret = devm_iio_device_register(&pdev->dev, indio_dev);
         if (ret < 0) {
                 dev_err(&pdev->dev, "could not register the device\n");
diff --git a/drivers/iio/adc/ti-adc081c.c b/drivers/iio/adc/ti-adc081c.c
index 319172cf7da8..405e3779c0c5 100644
--- a/drivers/iio/adc/ti-adc081c.c
+++ b/drivers/iio/adc/ti-adc081c.c
@@ -124,7 +124,6 @@ static struct adcxx1c_model adcxx1c_models[] = {
 
 static const struct iio_info adc081c_info = {
         .read_raw = adc081c_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static irqreturn_t adc081c_trigger_handler(int irq, void *p)
diff --git a/drivers/iio/adc/ti-adc0832.c b/drivers/iio/adc/ti-adc0832.c
index e952e94a14af..188dae705bf7 100644
--- a/drivers/iio/adc/ti-adc0832.c
+++ b/drivers/iio/adc/ti-adc0832.c
@@ -195,7 +195,6 @@ static int adc0832_read_raw(struct iio_dev *iio,
 
 static const struct iio_info adc0832_info = {
         .read_raw = adc0832_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static irqreturn_t adc0832_trigger_handler(int irq, void *p)
diff --git a/drivers/iio/adc/ti-adc084s021.c b/drivers/iio/adc/ti-adc084s021.c
index a355121c11a4..25504640e126 100644
--- a/drivers/iio/adc/ti-adc084s021.c
+++ b/drivers/iio/adc/ti-adc084s021.c
@@ -186,7 +186,6 @@ static int adc084s021_buffer_postdisable(struct iio_dev *indio_dev)
 
 static const struct iio_info adc084s021_info = {
         .read_raw = adc084s021_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_buffer_setup_ops adc084s021_buffer_setup_ops = {
diff --git a/drivers/iio/adc/ti-adc108s102.c b/drivers/iio/adc/ti-adc108s102.c
index de4e5ac98c6e..841203edaac5 100644
--- a/drivers/iio/adc/ti-adc108s102.c
+++ b/drivers/iio/adc/ti-adc108s102.c
@@ -220,7 +220,6 @@ static int adc108s102_read_raw(struct iio_dev *indio_dev,
 static const struct iio_info adc108s102_info = {
         .read_raw               = &adc108s102_read_raw,
         .update_scan_mode       = &adc108s102_update_scan_mode,
-        .driver_module          = THIS_MODULE,
 };
 
 static int adc108s102_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ti-adc12138.c b/drivers/iio/adc/ti-adc12138.c
index 072f03bfe6a0..703d68ae96b7 100644
--- a/drivers/iio/adc/ti-adc12138.c
+++ b/drivers/iio/adc/ti-adc12138.c
@@ -164,7 +164,7 @@ static int __adc12138_start_conv(struct adc12138 *adc,
                                  void *data, int len)
 
 {
-        const u8 ch_to_mux[] = { 0, 4, 1, 5, 2, 6, 3, 7 };
+        static const u8 ch_to_mux[] = { 0, 4, 1, 5, 2, 6, 3, 7 };
         u8 mode = (ch_to_mux[channel->channel] << 4) |
                   (channel->differential ? 0 : 0x80);
 
@@ -277,7 +277,6 @@ static int adc12138_read_raw(struct iio_dev *iio,
 
 static const struct iio_info adc12138_info = {
         .read_raw = adc12138_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int adc12138_init(struct adc12138 *adc)
diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c
index 89dfbd31be5c..7cf39b3e2416 100644
--- a/drivers/iio/adc/ti-adc128s052.c
+++ b/drivers/iio/adc/ti-adc128s052.c
@@ -130,7 +130,6 @@ static const struct adc128_configuration adc128_config[] = {
 
 static const struct iio_info adc128_info = {
         .read_raw = adc128_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int adc128_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ti-adc161s626.c b/drivers/iio/adc/ti-adc161s626.c
index 4836a0d7aef5..10fa7677ac4b 100644
--- a/drivers/iio/adc/ti-adc161s626.c
+++ b/drivers/iio/adc/ti-adc161s626.c
@@ -173,7 +173,6 @@ static int ti_adc_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info ti_adc_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = ti_adc_read_raw,
 };
 
diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
index e0dc20488335..6a114dcb4a3a 100644
--- a/drivers/iio/adc/ti-ads1015.c
+++ b/drivers/iio/adc/ti-ads1015.c
@@ -332,7 +332,7 @@ static int ads1015_set_power_state(struct ads1015_data *data, bool on)
 static
 int ads1015_get_adc_result(struct ads1015_data *data, int chan, int *val)
 {
-        int ret, pga, dr, conv_time;
+        int ret, pga, dr, dr_old, conv_time;
         unsigned int old, mask, cfg;
 
         if (chan < 0 || chan >= ADS1015_CHANNELS)
@@ -358,17 +358,17 @@ int ads1015_get_adc_result(struct ads1015_data *data, int chan, int *val)
         }
 
         cfg = (old & ~mask) | (cfg & mask);
-
-        ret = regmap_write(data->regmap, ADS1015_CFG_REG, cfg);
-        if (ret)
-                return ret;
-
-        if (old != cfg || data->conv_invalid) {
-                int dr_old = (old & ADS1015_CFG_DR_MASK) >>
-                                ADS1015_CFG_DR_SHIFT;
-
+        if (old != cfg) {
+                ret = regmap_write(data->regmap, ADS1015_CFG_REG, cfg);
+                if (ret)
+                        return ret;
+                data->conv_invalid = true;
+        }
+        if (data->conv_invalid) {
+                dr_old = (old & ADS1015_CFG_DR_MASK) >> ADS1015_CFG_DR_SHIFT;
                 conv_time = DIV_ROUND_UP(USEC_PER_SEC, data->data_rate[dr_old]);
                 conv_time += DIV_ROUND_UP(USEC_PER_SEC, data->data_rate[dr]);
+                conv_time += conv_time / 10; /* 10% internal clock inaccuracy */
                 usleep_range(conv_time, conv_time + 1);
                 data->conv_invalid = false;
         }
@@ -821,7 +821,6 @@ static const struct attribute_group ads1115_attribute_group = {
 };
 
 static const struct iio_info ads1015_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = ads1015_read_raw,
         .write_raw      = ads1015_write_raw,
         .read_event_value = ads1015_read_event,
@@ -832,7 +831,6 @@ static const struct iio_info ads1015_info = {
 };
 
 static const struct iio_info ads1115_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = ads1015_read_raw,
         .write_raw      = ads1015_write_raw,
         .read_event_value = ads1015_read_event,
diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c
index a376190914ad..0225c1b333ab 100644
--- a/drivers/iio/adc/ti-ads7950.c
+++ b/drivers/iio/adc/ti-ads7950.c
@@ -372,7 +372,6 @@ static int ti_ads7950_read_raw(struct iio_dev *indio_dev,
 static const struct iio_info ti_ads7950_info = {
         .read_raw               = &ti_ads7950_read_raw,
         .update_scan_mode       = ti_ads7950_update_scan_mode,
-        .driver_module          = THIS_MODULE,
 };
 
 static int ti_ads7950_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c
index 4a163496d9e4..079f133144b0 100644
--- a/drivers/iio/adc/ti-ads8688.c
+++ b/drivers/iio/adc/ti-ads8688.c
@@ -369,7 +369,6 @@ static const struct iio_info ads8688_info = {
         .write_raw = &ads8688_write_raw,
         .write_raw_get_fmt = &ads8688_write_raw_get_fmt,
         .attrs = &ads8688_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct ads8688_chip_info ads8688_chip_info_tbl[] = {
@@ -474,7 +473,6 @@ MODULE_DEVICE_TABLE(of, ads8688_of_match);
 static struct spi_driver ads8688_driver = {
         .driver = {
                 .name   = "ads8688",
-                .owner  = THIS_MODULE,
         },
         .probe          = ads8688_probe,
         .remove         = ads8688_remove,
diff --git a/drivers/iio/adc/ti-tlc4541.c b/drivers/iio/adc/ti-tlc4541.c
index 78d91a069ea4..2290024c89fc 100644
--- a/drivers/iio/adc/ti-tlc4541.c
+++ b/drivers/iio/adc/ti-tlc4541.c
@@ -157,7 +157,6 @@ static int tlc4541_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info tlc4541_info = {
         .read_raw = &tlc4541_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int tlc4541_probe(struct spi_device *spi)
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 6cbed7eb118a..b3e573cc6f5f 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -533,7 +533,6 @@ err_unlock:
 
 static const struct iio_info tiadc_info = {
         .read_raw = &tiadc_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int tiadc_request_dma(struct platform_device *pdev,
diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
index e3cfb91bffc6..8c019bb6625f 100644
--- a/drivers/iio/adc/twl4030-madc.c
+++ b/drivers/iio/adc/twl4030-madc.c
@@ -212,7 +212,6 @@ static int twl4030_madc_read(struct iio_dev *iio_dev,
 
 static const struct iio_info twl4030_madc_iio_info = {
         .read_raw = &twl4030_madc_read,
-        .driver_module = THIS_MODULE,
 };
 
 #define TWL4030_ADC_CHANNEL(_channel, _type, _name) {   \
diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
index bc0e60b9da45..dc83f8f6c3d3 100644
--- a/drivers/iio/adc/twl6030-gpadc.c
+++ b/drivers/iio/adc/twl6030-gpadc.c
@@ -843,7 +843,6 @@ static const struct iio_chan_spec twl6032_gpadc_iio_channels[] = {
 
 static const struct iio_info twl6030_gpadc_iio_info = {
         .read_raw = &twl6030_gpadc_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct twl6030_gpadc_platform_data twl6030_pdata = {
diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c
index c168e0db329a..bbcb7a4d7edf 100644
--- a/drivers/iio/adc/vf610_adc.c
+++ b/drivers/iio/adc/vf610_adc.c
@@ -799,7 +799,6 @@ static int vf610_adc_reg_access(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info vf610_adc_iio_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &vf610_read_raw,
         .write_raw = &vf610_write_raw,
         .debugfs_reg_access = &vf610_adc_reg_access,
diff --git a/drivers/iio/adc/viperboard_adc.c b/drivers/iio/adc/viperboard_adc.c
index 3be2e35721cc..53eb5a4136fe 100644
--- a/drivers/iio/adc/viperboard_adc.c
+++ b/drivers/iio/adc/viperboard_adc.c
@@ -107,7 +107,6 @@ error:
 
 static const struct iio_info vprbrd_adc_iio_info = {
         .read_raw = &vprbrd_iio_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int vprbrd_adc_probe(struct platform_device *pdev)
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
index 4a60497a1f19..d4f21d1be6c8 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -675,7 +675,6 @@ err_out:
 }
 
 static const struct iio_trigger_ops xadc_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = &xadc_trigger_set_state,
 };
 
@@ -1028,7 +1027,6 @@ static const struct iio_info xadc_info = {
         .read_event_value = &xadc_read_event_value,
         .write_event_value = &xadc_write_event_value,
         .update_scan_mode = &xadc_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct of_device_id xadc_of_match_table[] = {
diff --git a/drivers/iio/amplifiers/ad8366.c b/drivers/iio/amplifiers/ad8366.c
index 102c7174da5b..43667866321e 100644
--- a/drivers/iio/amplifiers/ad8366.c
+++ b/drivers/iio/amplifiers/ad8366.c
@@ -117,7 +117,6 @@ static int ad8366_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad8366_info = {
         .read_raw = &ad8366_read_raw,
         .write_raw = &ad8366_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define AD8366_CHAN(_channel) {                         \
diff --git a/drivers/iio/chemical/ams-iaq-core.c b/drivers/iio/chemical/ams-iaq-core.c
index c948ad2ee9ad..d9e5950ad24a 100644
--- a/drivers/iio/chemical/ams-iaq-core.c
+++ b/drivers/iio/chemical/ams-iaq-core.c
@@ -141,7 +141,6 @@ err_out:
 
 static const struct iio_info ams_iaqcore_info = {
         .read_raw       = ams_iaqcore_read_raw,
-        .driver_module  = THIS_MODULE,
 };
 
 static int ams_iaqcore_probe(struct i2c_client *client,
diff --git a/drivers/iio/chemical/atlas-ph-sensor.c b/drivers/iio/chemical/atlas-ph-sensor.c
index ef761a508630..8c4e05580091 100644
--- a/drivers/iio/chemical/atlas-ph-sensor.c
+++ b/drivers/iio/chemical/atlas-ph-sensor.c
@@ -344,7 +344,6 @@ static int atlas_buffer_predisable(struct iio_dev *indio_dev)
 }
 
 static const struct iio_trigger_ops atlas_interrupt_trigger_ops = {
-        .owner = THIS_MODULE,
 };
 
 static const struct iio_buffer_setup_ops atlas_buffer_setup_ops = {
@@ -499,7 +498,6 @@ static int atlas_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info atlas_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = atlas_read_raw,
         .write_raw = atlas_write_raw,
 };
diff --git a/drivers/iio/chemical/ccs811.c b/drivers/iio/chemical/ccs811.c
index 840a6cbd5f0f..97bce8345c6a 100644
--- a/drivers/iio/chemical/ccs811.c
+++ b/drivers/iio/chemical/ccs811.c
@@ -22,6 +22,7 @@
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/trigger.h>
 #include <linux/iio/triggered_buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/module.h>
@@ -59,6 +60,8 @@
 #define CCS811_MODE_IAQ_60SEC   0x30
 #define CCS811_MODE_RAW_DATA    0x40
 
+#define CCS811_MEAS_MODE_INTERRUPT      BIT(3)
+
 #define CCS811_VOLTAGE_MASK     0x3FF
 
 struct ccs811_reading {
@@ -73,6 +76,8 @@ struct ccs811_data {
         struct i2c_client *client;
         struct mutex lock; /* Protect readings */
         struct ccs811_reading buffer;
+        struct iio_trigger *drdy_trig;
+        bool drdy_trig_on;
 };
 
 static const struct iio_chan_spec ccs811_channels[] = {
@@ -193,10 +198,14 @@ static int ccs811_read_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
+                ret = iio_device_claim_direct_mode(indio_dev);
+                if (ret)
+                        return ret;
                 mutex_lock(&data->lock);
                 ret = ccs811_get_measurement(data);
                 if (ret < 0) {
                         mutex_unlock(&data->lock);
+                        iio_device_release_direct_mode(indio_dev);
                         return ret;
                 }
 
@@ -228,6 +237,7 @@ static int ccs811_read_raw(struct iio_dev *indio_dev,
                         ret = -EINVAL;
                 }
                 mutex_unlock(&data->lock);
+                iio_device_release_direct_mode(indio_dev);
 
                 return ret;
 
@@ -270,7 +280,31 @@ static int ccs811_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info ccs811_info = {
         .read_raw = ccs811_read_raw,
-        .driver_module = THIS_MODULE,
+};
+
+static int ccs811_set_trigger_state(struct iio_trigger *trig,
+                                    bool state)
+{
+        struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
+        struct ccs811_data *data = iio_priv(indio_dev);
+        int ret;
+
+        ret = i2c_smbus_read_byte_data(data->client, CCS811_MEAS_MODE);
+        if (ret < 0)
+                return ret;
+
+        if (state)
+                ret |= CCS811_MEAS_MODE_INTERRUPT;
+        else
+                ret &= ~CCS811_MEAS_MODE_INTERRUPT;
+
+        data->drdy_trig_on = state;
+
+        return i2c_smbus_write_byte_data(data->client, CCS811_MEAS_MODE, ret);
+}
+
+static const struct iio_trigger_ops ccs811_trigger_ops = {
+        .set_trigger_state = ccs811_set_trigger_state,
 };
 
 static irqreturn_t ccs811_trigger_handler(int irq, void *p)
@@ -298,6 +332,17 @@ err:
         return IRQ_HANDLED;
 }
 
+static irqreturn_t ccs811_data_rdy_trigger_poll(int irq, void *private)
+{
+        struct iio_dev *indio_dev = private;
+        struct ccs811_data *data = iio_priv(indio_dev);
+
+        if (data->drdy_trig_on)
+                iio_trigger_poll(data->drdy_trig);
+
+        return IRQ_HANDLED;
+}
+
 static int ccs811_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
@@ -346,16 +391,48 @@ static int ccs811_probe(struct i2c_client *client,
         indio_dev->dev.parent = &client->dev;
         indio_dev->name = id->name;
         indio_dev->info = &ccs811_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
 
         indio_dev->channels = ccs811_channels;
         indio_dev->num_channels = ARRAY_SIZE(ccs811_channels);
 
+        if (client->irq > 0) {
+                ret = devm_request_threaded_irq(&client->dev, client->irq,
+                                                ccs811_data_rdy_trigger_poll,
+                                                NULL,
+                                                IRQF_TRIGGER_FALLING |
+                                                IRQF_ONESHOT,
+                                                "ccs811_irq", indio_dev);
+                if (ret) {
+                        dev_err(&client->dev, "irq request error %d\n", -ret);
+                        goto err_poweroff;
+                }
+
+                data->drdy_trig = devm_iio_trigger_alloc(&client->dev,
+                                                         "%s-dev%d",
+                                                         indio_dev->name,
+                                                         indio_dev->id);
+                if (!data->drdy_trig) {
+                        ret = -ENOMEM;
+                        goto err_poweroff;
+                }
+
+                data->drdy_trig->dev.parent = &client->dev;
+                data->drdy_trig->ops = &ccs811_trigger_ops;
+                iio_trigger_set_drvdata(data->drdy_trig, indio_dev);
+                indio_dev->trig = data->drdy_trig;
+                iio_trigger_get(indio_dev->trig);
+                ret = iio_trigger_register(data->drdy_trig);
+                if (ret)
+                        goto err_poweroff;
+        }
+
         ret = iio_triggered_buffer_setup(indio_dev, NULL,
                                          ccs811_trigger_handler, NULL);
 
         if (ret < 0) {
                 dev_err(&client->dev, "triggered buffer setup failed\n");
-                goto err_poweroff;
+                goto err_trigger_unregister;
         }
 
         ret = iio_device_register(indio_dev);
@@ -367,6 +444,9 @@ static int ccs811_probe(struct i2c_client *client,
 
 err_buffer_cleanup:
         iio_triggered_buffer_cleanup(indio_dev);
+err_trigger_unregister:
+        if (data->drdy_trig)
+                iio_trigger_unregister(data->drdy_trig);
 err_poweroff:
         i2c_smbus_write_byte_data(client, CCS811_MEAS_MODE, CCS811_MODE_IDLE);
 
@@ -376,9 +456,12 @@ err_poweroff:
 static int ccs811_remove(struct i2c_client *client)
 {
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct ccs811_data *data = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
         iio_triggered_buffer_cleanup(indio_dev);
+        if (data->drdy_trig)
+                iio_trigger_unregister(data->drdy_trig);
 
         return i2c_smbus_write_byte_data(client, CCS811_MEAS_MODE,
                                          CCS811_MODE_IDLE);
diff --git a/drivers/iio/chemical/vz89x.c b/drivers/iio/chemical/vz89x.c
index f75eea6822f2..9c9095ba4227 100644
--- a/drivers/iio/chemical/vz89x.c
+++ b/drivers/iio/chemical/vz89x.c
@@ -326,7 +326,6 @@ static int vz89x_read_raw(struct iio_dev *indio_dev,
 static const struct iio_info vz89x_info = {
         .attrs          = &vz89x_attrs_group,
         .read_raw       = vz89x_read_raw,
-        .driver_module  = THIS_MODULE,
 };
 
 static const struct vz89x_chip_data vz89x_chips[] = {
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
index 38e8783e4b05..ed8063f2da99 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
@@ -185,7 +185,6 @@ static int cros_ec_sensors_write(struct iio_dev *indio_dev,
 static const struct iio_info ec_sensors_info = {
         .read_raw = &cros_ec_sensors_read,
         .write_raw = &cros_ec_sensors_write,
-        .driver_module = THIS_MODULE,
 };
 
 static int cros_ec_sensors_probe(struct platform_device *pdev)
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
index 0e4b379ada45..cfb6588565ba 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
@@ -179,6 +179,10 @@ int hid_sensor_power_state(struct hid_sensor_common *st, bool state)
         int ret;
 
         atomic_set(&st->user_requested_state, state);
+
+        if (atomic_add_unless(&st->runtime_pm_enable, 1, 1))
+                pm_runtime_enable(&st->pdev->dev);
+
         if (state)
                 ret = pm_runtime_get_sync(&st->pdev->dev);
         else {
@@ -221,7 +225,8 @@ static void hid_sensor_set_power_work(struct work_struct *work)
         if (attrb->latency_ms > 0)
                 hid_sensor_set_report_latency(attrb, attrb->latency_ms);
 
-        _hid_sensor_power_state(attrb, true);
+        if (atomic_read(&attrb->user_requested_state))
+                _hid_sensor_power_state(attrb, true);
 }
 
 static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
@@ -232,7 +237,9 @@ static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
 
 void hid_sensor_remove_trigger(struct hid_sensor_common *attrb)
 {
-        pm_runtime_disable(&attrb->pdev->dev);
+        if (atomic_read(&attrb->runtime_pm_enable))
+                pm_runtime_disable(&attrb->pdev->dev);
+
         pm_runtime_set_suspended(&attrb->pdev->dev);
         pm_runtime_put_noidle(&attrb->pdev->dev);
 
@@ -243,7 +250,6 @@ void hid_sensor_remove_trigger(struct hid_sensor_common *attrb)
 EXPORT_SYMBOL(hid_sensor_remove_trigger);
 
 static const struct iio_trigger_ops hid_sensor_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = &hid_sensor_data_rdy_trigger_set_state,
 };
 
@@ -283,7 +289,6 @@ int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
         INIT_WORK(&attrb->work, hid_sensor_set_power_work);
 
         pm_suspend_ignore_children(&attrb->pdev->dev, true);
-        pm_runtime_enable(&attrb->pdev->dev);
         /* Default to 3 seconds, but can be changed from sysfs */
         pm_runtime_set_autosuspend_delay(&attrb->pdev->dev,
                                          3000);
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 02e833b14db0..57db19182e95 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -93,6 +93,9 @@ int st_sensors_set_odr(struct iio_dev *indio_dev, unsigned int odr)
         struct st_sensor_odr_avl odr_out = {0, 0};
         struct st_sensor_data *sdata = iio_priv(indio_dev);
 
+        if (!sdata->sensor_settings->odr.addr)
+                return 0;
+
         err = st_sensors_match_odr(sdata->sensor_settings, odr, &odr_out);
         if (err < 0)
                 goto st_sensors_match_odr_error;
@@ -221,11 +224,14 @@ EXPORT_SYMBOL(st_sensors_set_enable);
 int st_sensors_set_axis_enable(struct iio_dev *indio_dev, u8 axis_enable)
 {
         struct st_sensor_data *sdata = iio_priv(indio_dev);
+        int err = 0;
 
-        return st_sensors_write_data_with_mask(indio_dev,
+        if (sdata->sensor_settings->enable_axis.addr)
+                err = st_sensors_write_data_with_mask(indio_dev,
                                 sdata->sensor_settings->enable_axis.addr,
                                 sdata->sensor_settings->enable_axis.mask,
                                 axis_enable);
+        return err;
 }
 EXPORT_SYMBOL(st_sensors_set_axis_enable);
 
@@ -283,7 +289,8 @@ static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev,
         struct st_sensor_data *sdata = iio_priv(indio_dev);
 
         /* Sensor does not support interrupts */
-        if (sdata->sensor_settings->drdy_irq.addr == 0) {
+        if (!sdata->sensor_settings->drdy_irq.int1.addr &&
+            !sdata->sensor_settings->drdy_irq.int2.addr) {
                 if (pdata->drdy_int_pin)
                         dev_info(&indio_dev->dev,
                                  "DRDY on pin INT%d specified, but sensor "
@@ -294,7 +301,7 @@ static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev,
 
         switch (pdata->drdy_int_pin) {
         case 1:
-                if (sdata->sensor_settings->drdy_irq.mask_int1 == 0) {
+                if (!sdata->sensor_settings->drdy_irq.int1.mask) {
                         dev_err(&indio_dev->dev,
                                         "DRDY on INT1 not available.\n");
                         return -EINVAL;
@@ -302,7 +309,7 @@ static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev,
                 sdata->drdy_int_pin = 1;
                 break;
         case 2:
-                if (sdata->sensor_settings->drdy_irq.mask_int2 == 0) {
+                if (!sdata->sensor_settings->drdy_irq.int2.mask) {
                         dev_err(&indio_dev->dev,
                                         "DRDY on INT2 not available.\n");
                         return -EINVAL;
@@ -315,7 +322,8 @@ static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev,
         }
 
         if (pdata->open_drain) {
-                if (!sdata->sensor_settings->drdy_irq.addr_od)
+                if (!sdata->sensor_settings->drdy_irq.int1.addr_od &&
+                    !sdata->sensor_settings->drdy_irq.int2.addr_od)
                         dev_err(&indio_dev->dev,
                                 "open drain requested but unsupported.\n");
                 else
@@ -442,11 +450,21 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
         }
 
         if (sdata->int_pin_open_drain) {
+                u8 addr, mask;
+
+                if (sdata->drdy_int_pin == 1) {
+                        addr = sdata->sensor_settings->drdy_irq.int1.addr_od;
+                        mask = sdata->sensor_settings->drdy_irq.int1.mask_od;
+                } else {
+                        addr = sdata->sensor_settings->drdy_irq.int2.addr_od;
+                        mask = sdata->sensor_settings->drdy_irq.int2.mask_od;
+                }
+
                 dev_info(&indio_dev->dev,
-                         "set interrupt line to open drain mode\n");
-                err = st_sensors_write_data_with_mask(indio_dev,
-                                sdata->sensor_settings->drdy_irq.addr_od,
-                                sdata->sensor_settings->drdy_irq.mask_od, 1);
+                         "set interrupt line to open drain mode on pin %d\n",
+                         sdata->drdy_int_pin);
+                err = st_sensors_write_data_with_mask(indio_dev, addr,
+                                                      mask, 1);
                 if (err < 0)
                         return err;
         }
@@ -460,17 +478,18 @@ EXPORT_SYMBOL(st_sensors_init_sensor);
 int st_sensors_set_dataready_irq(struct iio_dev *indio_dev, bool enable)
 {
         int err;
-        u8 drdy_mask;
+        u8 drdy_addr, drdy_mask;
         struct st_sensor_data *sdata = iio_priv(indio_dev);
 
-        if (!sdata->sensor_settings->drdy_irq.addr) {
+        if (!sdata->sensor_settings->drdy_irq.int1.addr &&
+            !sdata->sensor_settings->drdy_irq.int2.addr) {
                 /*
                  * there are some devices (e.g. LIS3MDL) where drdy line is
                  * routed to a given pin and it is not possible to select a
                  * different one. Take into account irq status register
                  * to understand if irq trigger can be properly supported
                  */
-                if (sdata->sensor_settings->drdy_irq.addr_stat_drdy)
+                if (sdata->sensor_settings->drdy_irq.stat_drdy.addr)
                         sdata->hw_irq_trigger = enable;
                 return 0;
         }
@@ -485,18 +504,20 @@ int st_sensors_set_dataready_irq(struct iio_dev *indio_dev, bool enable)
                         goto st_accel_set_dataready_irq_error;
         }
 
-        if (sdata->drdy_int_pin == 1)
-                drdy_mask = sdata->sensor_settings->drdy_irq.mask_int1;
-        else
-                drdy_mask = sdata->sensor_settings->drdy_irq.mask_int2;
+        if (sdata->drdy_int_pin == 1) {
+                drdy_addr = sdata->sensor_settings->drdy_irq.int1.addr;
+                drdy_mask = sdata->sensor_settings->drdy_irq.int1.mask;
+        } else {
+                drdy_addr = sdata->sensor_settings->drdy_irq.int2.addr;
+                drdy_mask = sdata->sensor_settings->drdy_irq.int2.mask;
+        }
 
         /* Flag to the poll function that the hardware trigger is in use */
         sdata->hw_irq_trigger = enable;
 
         /* Enable/Disable the interrupt generator for data ready. */
-        err = st_sensors_write_data_with_mask(indio_dev,
-                                        sdata->sensor_settings->drdy_irq.addr,
-                                        drdy_mask, (int)enable);
+        err = st_sensors_write_data_with_mask(indio_dev, drdy_addr,
+                                              drdy_mask, (int)enable);
 
 st_accel_set_dataready_irq_error:
         return err;
diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
index fa73e6795359..fdcc5a891958 100644
--- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
+++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
@@ -31,7 +31,7 @@ static int st_sensors_new_samples_available(struct iio_dev *indio_dev,
         int ret;
 
         /* How would I know if I can't check it? */
-        if (!sdata->sensor_settings->drdy_irq.addr_stat_drdy)
+        if (!sdata->sensor_settings->drdy_irq.stat_drdy.addr)
                 return -EINVAL;
 
         /* No scan mask, no interrupt */
@@ -39,23 +39,15 @@ static int st_sensors_new_samples_available(struct iio_dev *indio_dev,
                 return 0;
 
         ret = sdata->tf->read_byte(&sdata->tb, sdata->dev,
-                        sdata->sensor_settings->drdy_irq.addr_stat_drdy,
+                        sdata->sensor_settings->drdy_irq.stat_drdy.addr,
                         &status);
         if (ret < 0) {
                 dev_err(sdata->dev,
                         "error checking samples available\n");
                 return ret;
         }
-        /*
-         * the lower bits of .active_scan_mask[0] is directly mapped
-         * to the channels on the sensor: either bit 0 for
-         * one-dimensional sensors, or e.g. x,y,z for accelerometers,
-         * gyroscopes or magnetometers. No sensor use more than 3
-         * channels, so cut the other status bits here.
-         */
-        status &= 0x07;
 
-        if (status & (u8)indio_dev->active_scan_mask[0])
+        if (status & sdata->sensor_settings->drdy_irq.stat_drdy.mask)
                 return 1;
 
         return 0;
@@ -212,7 +204,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
          * it was "our" interrupt.
          */
         if (sdata->int_pin_open_drain &&
-            sdata->sensor_settings->drdy_irq.addr_stat_drdy)
+            sdata->sensor_settings->drdy_irq.stat_drdy.addr)
                 irq_trig |= IRQF_SHARED;
 
         err = request_threaded_irq(sdata->get_irq_data_ready(indio_dev),
diff --git a/drivers/iio/counter/104-quad-8.c b/drivers/iio/counter/104-quad-8.c
index ba3d9030cd51..b56985078d8c 100644
--- a/drivers/iio/counter/104-quad-8.c
+++ b/drivers/iio/counter/104-quad-8.c
@@ -185,7 +185,6 @@ static int quad8_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info quad8_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = quad8_read_raw,
         .write_raw = quad8_write_raw
 };
diff --git a/drivers/iio/counter/stm32-lptimer-cnt.c b/drivers/iio/counter/stm32-lptimer-cnt.c
index 1c5909bb1605..81ae5f74216d 100644
--- a/drivers/iio/counter/stm32-lptimer-cnt.c
+++ b/drivers/iio/counter/stm32-lptimer-cnt.c
@@ -178,7 +178,6 @@ static int stm32_lptim_read_raw(struct iio_dev *indio_dev,
 static const struct iio_info stm32_lptim_cnt_iio_info = {
         .read_raw = stm32_lptim_read_raw,
         .write_raw = stm32_lptim_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const char *const stm32_lptim_quadrature_modes[] = {
diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
index 25bed2d7d2b9..965d5c0d2468 100644
--- a/drivers/iio/dac/Kconfig
+++ b/drivers/iio/dac/Kconfig
@@ -60,7 +60,8 @@ config AD5446
           Say yes here to build support for Analog Devices AD5300, AD5301, AD5310,
           AD5311, AD5320, AD5321, AD5444, AD5446, AD5450, AD5451, AD5452, AD5453,
           AD5512A, AD5541A, AD5542A, AD5543, AD5553, AD5601, AD5602, AD5611, AD5612,
-          AD5620, AD5621, AD5622, AD5640, AD5641, AD5660, AD5662 DACs.
+          AD5620, AD5621, AD5622, AD5640, AD5641, AD5660, AD5662 DACs
+          as well as Texas Instruments DAC081S101, DAC101S101, DAC121S101.
 
           To compile this driver as a module, choose M here: the
           module will be called ad5446.
@@ -221,6 +222,15 @@ config DPOT_DAC
           To compile this driver as a module, choose M here: the module will be
           called dpot-dac.
 
+config DS4424
+        tristate "Maxim Integrated DS4422/DS4424 DAC driver"
+        depends on I2C
+        help
+          If you say yes here you get support for Maxim chips DS4422, DS4424.
+
+          This driver can also be built as a module.  If so, the module
+          will be called ds4424.
+
 config LPC18XX_DAC
         tristate "NXP LPC18xx DAC driver"
         depends on ARCH_LPC18XX || COMPILE_TEST
@@ -300,6 +310,16 @@ config STM32_DAC
 config STM32_DAC_CORE
         tristate
 
+config TI_DAC082S085
+        tristate "Texas Instruments 8/10/12-bit 2/4-channel DAC driver"
+        depends on SPI_MASTER
+        help
+          Driver for the Texas Instruments (formerly National Semiconductor)
+          DAC082S085, DAC102S085, DAC122S085, DAC084S085, DAC104S085 and
+          DAC124S085.
+
+          If compiled as a module, it will be called ti-dac082s085.
+
 config VF610_DAC
         tristate "Vybrid vf610 DAC driver"
         depends on OF
diff --git a/drivers/iio/dac/Makefile b/drivers/iio/dac/Makefile
index 603587cc2f07..4785858e04cc 100644
--- a/drivers/iio/dac/Makefile
+++ b/drivers/iio/dac/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_AD7303) += ad7303.o
 obj-$(CONFIG_AD8801) += ad8801.o
 obj-$(CONFIG_CIO_DAC) += cio-dac.o
 obj-$(CONFIG_DPOT_DAC) += dpot-dac.o
+obj-$(CONFIG_DS4424) += ds4424.o
 obj-$(CONFIG_LPC18XX_DAC) += lpc18xx_dac.o
 obj-$(CONFIG_LTC2632) += ltc2632.o
 obj-$(CONFIG_M62332) += m62332.o
@@ -32,4 +33,5 @@ obj-$(CONFIG_MCP4725) += mcp4725.o
 obj-$(CONFIG_MCP4922) += mcp4922.o
 obj-$(CONFIG_STM32_DAC_CORE) += stm32-dac-core.o
 obj-$(CONFIG_STM32_DAC) += stm32-dac.o
+obj-$(CONFIG_TI_DAC082S085) += ti-dac082s085.o
 obj-$(CONFIG_VF610_DAC) += vf610_dac.o
diff --git a/drivers/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c
index 3f9399c27869..bf4fc40ec84d 100644
--- a/drivers/iio/dac/ad5064.c
+++ b/drivers/iio/dac/ad5064.c
@@ -366,7 +366,6 @@ static int ad5064_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad5064_info = {
         .read_raw = ad5064_read_raw,
         .write_raw = ad5064_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_chan_spec_ext_info ad5064_ext_info[] = {
diff --git a/drivers/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c
index 8ba0e9c50176..0209316d5566 100644
--- a/drivers/iio/dac/ad5360.c
+++ b/drivers/iio/dac/ad5360.c
@@ -425,7 +425,6 @@ static const struct iio_info ad5360_info = {
         .read_raw = ad5360_read_raw,
         .write_raw = ad5360_write_raw,
         .attrs = &ad5360_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static const char * const ad5360_vref_name[] = {
diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c
index 97d2c5111f43..845fd1c0fd9d 100644
--- a/drivers/iio/dac/ad5380.c
+++ b/drivers/iio/dac/ad5380.c
@@ -237,7 +237,6 @@ static int ad5380_read_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad5380_info = {
         .read_raw = ad5380_read_raw,
         .write_raw = ad5380_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static struct iio_chan_spec_ext_info ad5380_ext_info[] = {
diff --git a/drivers/iio/dac/ad5421.c b/drivers/iio/dac/ad5421.c
index 559061ab1982..8e9633d8de67 100644
--- a/drivers/iio/dac/ad5421.c
+++ b/drivers/iio/dac/ad5421.c
@@ -465,7 +465,6 @@ static const struct iio_info ad5421_info = {
         .read_event_config =    ad5421_read_event_config,
         .write_event_config =   ad5421_write_event_config,
         .read_event_value =     ad5421_read_event_value,
-        .driver_module =        THIS_MODULE,
 };
 
 static int ad5421_probe(struct spi_device *spi)
diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c
index b555552a0d80..fd26a4272fc5 100644
--- a/drivers/iio/dac/ad5446.c
+++ b/drivers/iio/dac/ad5446.c
@@ -212,7 +212,6 @@ static int ad5446_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad5446_info = {
         .read_raw = ad5446_read_raw,
         .write_raw = ad5446_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad5446_probe(struct device *dev, const char *name,
@@ -461,10 +460,22 @@ static const struct spi_device_id ad5446_spi_ids[] = {
         {"ad5660-2500", ID_AD5660_2500},
         {"ad5660-1250", ID_AD5660_1250},
         {"ad5662", ID_AD5662},
+        {"dac081s101", ID_AD5300}, /* compatible Texas Instruments chips */
+        {"dac101s101", ID_AD5310},
+        {"dac121s101", ID_AD5320},
+        {"dac7512", ID_AD5320},
         {}
 };
 MODULE_DEVICE_TABLE(spi, ad5446_spi_ids);
 
+#ifdef CONFIG_OF
+static const struct of_device_id ad5446_of_ids[] = {
+        { .compatible = "ti,dac7512" },
+        { }
+};
+MODULE_DEVICE_TABLE(of, ad5446_of_ids);
+#endif
+
 static int ad5446_spi_probe(struct spi_device *spi)
 {
         const struct spi_device_id *id = spi_get_device_id(spi);
@@ -481,6 +492,7 @@ static int ad5446_spi_remove(struct spi_device *spi)
 static struct spi_driver ad5446_spi_driver = {
         .driver = {
                 .name   = "ad5446",
+                .of_match_table = of_match_ptr(ad5446_of_ids),
         },
         .probe          = ad5446_spi_probe,
         .remove         = ad5446_spi_remove,
diff --git a/drivers/iio/dac/ad5449.c b/drivers/iio/dac/ad5449.c
index 5f3202339420..317a74129932 100644
--- a/drivers/iio/dac/ad5449.c
+++ b/drivers/iio/dac/ad5449.c
@@ -193,7 +193,6 @@ static int ad5449_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad5449_info = {
         .read_raw = ad5449_read_raw,
         .write_raw = ad5449_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define AD5449_CHANNEL(chan, bits) {                            \
diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c
index 712d86b4be09..d9037ea59168 100644
--- a/drivers/iio/dac/ad5504.c
+++ b/drivers/iio/dac/ad5504.c
@@ -232,7 +232,6 @@ static const struct iio_info ad5504_info = {
         .write_raw = ad5504_write_raw,
         .read_raw = ad5504_read_raw,
         .event_attrs = &ad5504_ev_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_chan_spec_ext_info ad5504_ext_info[] = {
diff --git a/drivers/iio/dac/ad5592r-base.c b/drivers/iio/dac/ad5592r-base.c
index 69bde5909854..9234c6a09a93 100644
--- a/drivers/iio/dac/ad5592r-base.c
+++ b/drivers/iio/dac/ad5592r-base.c
@@ -474,7 +474,6 @@ static const struct iio_info ad5592r_info = {
         .read_raw = ad5592r_read_raw,
         .write_raw = ad5592r_write_raw,
         .write_raw_get_fmt = ad5592r_write_raw_get_fmt,
-        .driver_module = THIS_MODULE,
 };
 
 static ssize_t ad5592r_show_scale_available(struct iio_dev *iio_dev,
diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c
index 5489ec43b95d..13fdb4dfe356 100644
--- a/drivers/iio/dac/ad5624r_spi.c
+++ b/drivers/iio/dac/ad5624r_spi.c
@@ -149,7 +149,6 @@ static ssize_t ad5624r_write_dac_powerdown(struct iio_dev *indio_dev,
 static const struct iio_info ad5624r_info = {
         .write_raw = ad5624r_write_raw,
         .read_raw = ad5624r_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_chan_spec_ext_info ad5624r_ext_info[] = {
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c
index d1d8450c19f6..20254df7f9c7 100644
--- a/drivers/iio/dac/ad5686.c
+++ b/drivers/iio/dac/ad5686.c
@@ -252,7 +252,6 @@ static int ad5686_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad5686_info = {
         .read_raw = ad5686_read_raw,
         .write_raw = ad5686_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_chan_spec_ext_info ad5686_ext_info[] = {
diff --git a/drivers/iio/dac/ad5755.c b/drivers/iio/dac/ad5755.c
index 5f7968232564..2d03cc89ba50 100644
--- a/drivers/iio/dac/ad5755.c
+++ b/drivers/iio/dac/ad5755.c
@@ -417,7 +417,6 @@ static ssize_t ad5755_write_powerdown(struct iio_dev *indio_dev, uintptr_t priv,
 static const struct iio_info ad5755_info = {
         .read_raw = ad5755_read_raw,
         .write_raw = ad5755_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_chan_spec_ext_info ad5755_ext_info[] = {
diff --git a/drivers/iio/dac/ad5761.c b/drivers/iio/dac/ad5761.c
index d6510d6928b3..05017c8bbd00 100644
--- a/drivers/iio/dac/ad5761.c
+++ b/drivers/iio/dac/ad5761.c
@@ -251,7 +251,6 @@ static int ad5761_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad5761_info = {
         .read_raw = &ad5761_read_raw,
         .write_raw = &ad5761_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define AD5761_CHAN(_bits) {                            \
diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c
index 9a547bbf7d2b..033f20eca616 100644
--- a/drivers/iio/dac/ad5764.c
+++ b/drivers/iio/dac/ad5764.c
@@ -268,7 +268,6 @@ static int ad5764_read_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad5764_info = {
         .read_raw = ad5764_read_raw,
         .write_raw = ad5764_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad5764_probe(struct spi_device *spi)
diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c
index 33e4ae5c42f8..7569bf6868c2 100644
--- a/drivers/iio/dac/ad5791.c
+++ b/drivers/iio/dac/ad5791.c
@@ -340,7 +340,6 @@ static int ad5791_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad5791_info = {
         .read_raw = &ad5791_read_raw,
         .write_raw = &ad5791_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad5791_probe(struct spi_device *spi)
diff --git a/drivers/iio/dac/ad7303.c b/drivers/iio/dac/ad7303.c
index 4b0f942b8914..8f3bd19b6dc3 100644
--- a/drivers/iio/dac/ad7303.c
+++ b/drivers/iio/dac/ad7303.c
@@ -161,7 +161,6 @@ static int ad7303_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad7303_info = {
         .read_raw = ad7303_read_raw,
         .write_raw = ad7303_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_chan_spec_ext_info ad7303_ext_info[] = {
diff --git a/drivers/iio/dac/ad8801.c b/drivers/iio/dac/ad8801.c
index f06faa1aec09..aef5808c9865 100644
--- a/drivers/iio/dac/ad8801.c
+++ b/drivers/iio/dac/ad8801.c
@@ -92,7 +92,6 @@ static int ad8801_read_raw(struct iio_dev *indio_dev,
 static const struct iio_info ad8801_info = {
         .read_raw = ad8801_read_raw,
         .write_raw = ad8801_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define AD8801_CHANNEL(chan) {          \
diff --git a/drivers/iio/dac/cio-dac.c b/drivers/iio/dac/cio-dac.c
index a8dffd938615..6898b0c79013 100644
--- a/drivers/iio/dac/cio-dac.c
+++ b/drivers/iio/dac/cio-dac.c
@@ -85,7 +85,6 @@ static int cio_dac_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info cio_dac_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = cio_dac_read_raw,
         .write_raw = cio_dac_write_raw
 };
diff --git a/drivers/iio/dac/dpot-dac.c b/drivers/iio/dac/dpot-dac.c
index 960a2b430480..aaa2103d7c2b 100644
--- a/drivers/iio/dac/dpot-dac.c
+++ b/drivers/iio/dac/dpot-dac.c
@@ -128,7 +128,6 @@ static const struct iio_info dpot_dac_info = {
         .read_raw = dpot_dac_read_raw,
         .read_avail = dpot_dac_read_avail,
         .write_raw = dpot_dac_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int dpot_dac_channel_max_ohms(struct iio_dev *indio_dev)
diff --git a/drivers/iio/dac/ds4424.c b/drivers/iio/dac/ds4424.c
new file mode 100644
index 000000000000..883a47562055
--- /dev/null
+++ b/drivers/iio/dac/ds4424.c
@@ -0,0 +1,341 @@
+/*
+ * Maxim Integrated
+ * 7-bit, Multi-Channel Sink/Source Current DAC Driver
+ * Copyright (C) 2017 Maxim Integrated
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/regulator/consumer.h>
+#include <linux/err.h>
+#include <linux/delay.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/driver.h>
+#include <linux/iio/machine.h>
+#include <linux/iio/consumer.h>
+
+#define DS4422_MAX_DAC_CHANNELS         2
+#define DS4424_MAX_DAC_CHANNELS         4
+
+#define DS4424_DAC_ADDR(chan)   ((chan) + 0xf8)
+#define DS4424_SOURCE_I         1
+#define DS4424_SINK_I           0
+
+#define DS4424_CHANNEL(chan) { \
+        .type = IIO_CURRENT, \
+        .indexed = 1, \
+        .output = 1, \
+        .channel = chan, \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
+}
+
+/*
+ * DS4424 DAC control register 8 bits
+ * [7]          0: to sink; 1: to source
+ * [6:0]        steps to sink/source
+ * bit[7] looks like a sign bit, but the value of the register is
+ * not a two's complement code considering the bit[6:0] is a absolute
+ * distance from the zero point.
+ */
+union ds4424_raw_data {
+        struct {
+                u8 dx:7;
+                u8 source_bit:1;
+        };
+        u8 bits;
+};
+
+enum ds4424_device_ids {
+        ID_DS4422,
+        ID_DS4424,
+};
+
+struct ds4424_data {
+        struct i2c_client *client;
+        struct mutex lock;
+        uint8_t save[DS4424_MAX_DAC_CHANNELS];
+        struct regulator *vcc_reg;
+        uint8_t raw[DS4424_MAX_DAC_CHANNELS];
+};
+
+static const struct iio_chan_spec ds4424_channels[] = {
+        DS4424_CHANNEL(0),
+        DS4424_CHANNEL(1),
+        DS4424_CHANNEL(2),
+        DS4424_CHANNEL(3),
+};
+
+static int ds4424_get_value(struct iio_dev *indio_dev,
+                             int *val, int channel)
+{
+        struct ds4424_data *data = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&data->lock);
+        ret = i2c_smbus_read_byte_data(data->client, DS4424_DAC_ADDR(channel));
+        if (ret < 0)
+                goto fail;
+
+        *val = ret;
+
+fail:
+        mutex_unlock(&data->lock);
+        return ret;
+}
+
+static int ds4424_set_value(struct iio_dev *indio_dev,
+                             int val, struct iio_chan_spec const *chan)
+{
+        struct ds4424_data *data = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&data->lock);
+        ret = i2c_smbus_write_byte_data(data->client,
+                        DS4424_DAC_ADDR(chan->channel), val);
+        if (ret < 0)
+                goto fail;
+
+        data->raw[chan->channel] = val;
+
+fail:
+        mutex_unlock(&data->lock);
+        return ret;
+}
+
+static int ds4424_read_raw(struct iio_dev *indio_dev,
+                           struct iio_chan_spec const *chan,
+                           int *val, int *val2, long mask)
+{
+        union ds4424_raw_data raw;
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                ret = ds4424_get_value(indio_dev, val, chan->channel);
+                if (ret < 0) {
+                        pr_err("%s : ds4424_get_value returned %d\n",
+                                                        __func__, ret);
+                        return ret;
+                }
+                raw.bits = *val;
+                *val = raw.dx;
+                if (raw.source_bit == DS4424_SINK_I)
+                        *val = -*val;
+                return IIO_VAL_INT;
+
+        default:
+                return -EINVAL;
+        }
+}
+
+static int ds4424_write_raw(struct iio_dev *indio_dev,
+                             struct iio_chan_spec const *chan,
+                             int val, int val2, long mask)
+{
+        union ds4424_raw_data raw;
+
+        if (val2 != 0)
+                return -EINVAL;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                if (val < S8_MIN || val > S8_MAX)
+                        return -EINVAL;
+
+                if (val > 0) {
+                        raw.source_bit = DS4424_SOURCE_I;
+                        raw.dx = val;
+                } else {
+                        raw.source_bit = DS4424_SINK_I;
+                        raw.dx = -val;
+                }
+
+                return ds4424_set_value(indio_dev, raw.bits, chan);
+
+        default:
+                return -EINVAL;
+        }
+}
+
+static int ds4424_verify_chip(struct iio_dev *indio_dev)
+{
+        int ret, val;
+
+        ret = ds4424_get_value(indio_dev, &val, DS4424_DAC_ADDR(0));
+        if (ret < 0)
+                dev_err(&indio_dev->dev,
+                                "%s failed. ret: %d\n", __func__, ret);
+
+        return ret;
+}
+
+static int __maybe_unused ds4424_suspend(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct ds4424_data *data = iio_priv(indio_dev);
+        int ret = 0;
+        int i;
+
+        for (i = 0; i < indio_dev->num_channels; i++) {
+                data->save[i] = data->raw[i];
+                ret = ds4424_set_value(indio_dev, 0,
+                                &indio_dev->channels[i]);
+                if (ret < 0)
+                        return ret;
+        }
+        return ret;
+}
+
+static int __maybe_unused ds4424_resume(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct ds4424_data *data = iio_priv(indio_dev);
+        int ret = 0;
+        int i;
+
+        for (i = 0; i < indio_dev->num_channels; i++) {
+                ret = ds4424_set_value(indio_dev, data->save[i],
+                                &indio_dev->channels[i]);
+                if (ret < 0)
+                        return ret;
+        }
+        return ret;
+}
+
+static SIMPLE_DEV_PM_OPS(ds4424_pm_ops, ds4424_suspend, ds4424_resume);
+
+static const struct iio_info ds4424_info = {
+        .read_raw = ds4424_read_raw,
+        .write_raw = ds4424_write_raw,
+};
+
+static int ds4424_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        struct ds4424_data *data;
+        struct iio_dev *indio_dev;
+        int ret;
+
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+        if (!indio_dev) {
+                dev_err(&client->dev, "iio dev alloc failed.\n");
+                return -ENOMEM;
+        }
+
+        data = iio_priv(indio_dev);
+        i2c_set_clientdata(client, indio_dev);
+        data->client = client;
+        indio_dev->name = id->name;
+        indio_dev->dev.of_node = client->dev.of_node;
+        indio_dev->dev.parent = &client->dev;
+
+        if (!client->dev.of_node) {
+                dev_err(&client->dev,
+                                "Not found DT.\n");
+                return -ENODEV;
+        }
+
+        data->vcc_reg = devm_regulator_get(&client->dev, "vcc");
+        if (IS_ERR(data->vcc_reg)) {
+                dev_err(&client->dev,
+                        "Failed to get vcc-supply regulator. err: %ld\n",
+                                PTR_ERR(data->vcc_reg));
+                return PTR_ERR(data->vcc_reg);
+        }
+
+        mutex_init(&data->lock);
+        ret = regulator_enable(data->vcc_reg);
+        if (ret < 0) {
+                dev_err(&client->dev,
+                                "Unable to enable the regulator.\n");
+                return ret;
+        }
+
+        usleep_range(1000, 1200);
+        ret = ds4424_verify_chip(indio_dev);
+        if (ret < 0)
+                goto fail;
+
+        switch (id->driver_data) {
+        case ID_DS4422:
+                indio_dev->num_channels = DS4422_MAX_DAC_CHANNELS;
+                break;
+        case ID_DS4424:
+                indio_dev->num_channels = DS4424_MAX_DAC_CHANNELS;
+                break;
+        default:
+                dev_err(&client->dev,
+                                "ds4424: Invalid chip id.\n");
+                ret = -ENXIO;
+                goto fail;
+        }
+
+        indio_dev->channels = ds4424_channels;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->info = &ds4424_info;
+
+        ret = iio_device_register(indio_dev);
+        if (ret < 0) {
+                dev_err(&client->dev,
+                                "iio_device_register failed. ret: %d\n", ret);
+                goto fail;
+        }
+
+        return ret;
+
+fail:
+        regulator_disable(data->vcc_reg);
+        return ret;
+}
+
+static int ds4424_remove(struct i2c_client *client)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct ds4424_data *data = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+        regulator_disable(data->vcc_reg);
+
+        return 0;
+}
+
+static const struct i2c_device_id ds4424_id[] = {
+        { "ds4422", ID_DS4422 },
+        { "ds4424", ID_DS4424 },
+        { }
+};
+
+MODULE_DEVICE_TABLE(i2c, ds4424_id);
+
+static const struct of_device_id ds4424_of_match[] = {
+        { .compatible = "maxim,ds4422" },
+        { .compatible = "maxim,ds4424" },
+        { },
+};
+
+MODULE_DEVICE_TABLE(of, ds4424_of_match);
+
+static struct i2c_driver ds4424_driver = {
+        .driver = {
+                .name   = "ds4424",
+                .of_match_table = ds4424_of_match,
+                .pm     = &ds4424_pm_ops,
+        },
+        .probe          = ds4424_probe,
+        .remove         = ds4424_remove,
+        .id_table       = ds4424_id,
+};
+module_i2c_driver(ds4424_driver);
+
+MODULE_DESCRIPTION("Maxim DS4424 DAC Driver");
+MODULE_AUTHOR("Ismail H. Kose <ismail.kose@maximintegrated.com>");
+MODULE_AUTHOR("Vishal Sood <vishal.sood@maximintegrated.com>");
+MODULE_AUTHOR("David Jung <david.jung@maximintegrated.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/dac/lpc18xx_dac.c b/drivers/iio/dac/lpc18xx_dac.c
index 55d1456a059d..7036f77fdf23 100644
--- a/drivers/iio/dac/lpc18xx_dac.c
+++ b/drivers/iio/dac/lpc18xx_dac.c
@@ -103,7 +103,6 @@ static int lpc18xx_dac_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info lpc18xx_dac_info = {
         .read_raw = lpc18xx_dac_read_raw,
         .write_raw = lpc18xx_dac_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int lpc18xx_dac_probe(struct platform_device *pdev)
diff --git a/drivers/iio/dac/ltc2632.c b/drivers/iio/dac/ltc2632.c
index ac5e05f6eb8b..af2ddd0dd341 100644
--- a/drivers/iio/dac/ltc2632.c
+++ b/drivers/iio/dac/ltc2632.c
@@ -159,7 +159,6 @@ static ssize_t ltc2632_write_dac_powerdown(struct iio_dev *indio_dev,
 static const struct iio_info ltc2632_info = {
         .write_raw      = ltc2632_write_raw,
         .read_raw       = ltc2632_read_raw,
-        .driver_module  = THIS_MODULE,
 };
 
 static const struct iio_chan_spec_ext_info ltc2632_ext_info[] = {
diff --git a/drivers/iio/dac/m62332.c b/drivers/iio/dac/m62332.c
index 76e8b044b979..19031943dabe 100644
--- a/drivers/iio/dac/m62332.c
+++ b/drivers/iio/dac/m62332.c
@@ -174,7 +174,6 @@ static SIMPLE_DEV_PM_OPS(m62332_pm_ops, m62332_suspend, m62332_resume);
 static const struct iio_info m62332_info = {
         .read_raw = m62332_read_raw,
         .write_raw = m62332_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define M62332_CHANNEL(chan) {                                  \
diff --git a/drivers/iio/dac/max517.c b/drivers/iio/dac/max517.c
index 5507b3970b4b..1d853247a205 100644
--- a/drivers/iio/dac/max517.c
+++ b/drivers/iio/dac/max517.c
@@ -137,7 +137,6 @@ static SIMPLE_DEV_PM_OPS(max517_pm_ops, max517_suspend, max517_resume);
 static const struct iio_info max517_info = {
         .read_raw = max517_read_raw,
         .write_raw = max517_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #define MAX517_CHANNEL(chan) {                          \
diff --git a/drivers/iio/dac/max5821.c b/drivers/iio/dac/max5821.c
index 193fac3059a3..d0ecc1fdd8fc 100644
--- a/drivers/iio/dac/max5821.c
+++ b/drivers/iio/dac/max5821.c
@@ -300,7 +300,6 @@ static SIMPLE_DEV_PM_OPS(max5821_pm_ops, max5821_suspend, max5821_resume);
 static const struct iio_info max5821_info = {
         .read_raw = max5821_read_raw,
         .write_raw = max5821_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int max5821_probe(struct i2c_client *client,
diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c
index 6ab1f23e5a79..afa856d10c26 100644
--- a/drivers/iio/dac/mcp4725.c
+++ b/drivers/iio/dac/mcp4725.c
@@ -363,7 +363,6 @@ static const struct iio_info mcp4725_info = {
         .read_raw = mcp4725_read_raw,
         .write_raw = mcp4725_write_raw,
         .attrs = &mcp4725_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 #ifdef CONFIG_OF
diff --git a/drivers/iio/dac/mcp4922.c b/drivers/iio/dac/mcp4922.c
index 3854d201a5d6..bf9aa3fc0534 100644
--- a/drivers/iio/dac/mcp4922.c
+++ b/drivers/iio/dac/mcp4922.c
@@ -119,7 +119,6 @@ static const struct iio_chan_spec mcp4922_channels[3][MCP4922_NUM_CHANNELS] = {
 static const struct iio_info mcp4922_info = {
         .read_raw = &mcp4922_read_raw,
         .write_raw = &mcp4922_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int mcp4922_probe(struct spi_device *spi)
diff --git a/drivers/iio/dac/stm32-dac.c b/drivers/iio/dac/stm32-dac.c
index c1864e8aa851..9ffab02bf9f9 100644
--- a/drivers/iio/dac/stm32-dac.c
+++ b/drivers/iio/dac/stm32-dac.c
@@ -156,7 +156,6 @@ static const struct iio_info stm32_dac_iio_info = {
         .read_raw = stm32_dac_read_raw,
         .write_raw = stm32_dac_write_raw,
         .debugfs_reg_access = stm32_dac_debugfs_reg_access,
-        .driver_module = THIS_MODULE,
 };
 
 static const char * const stm32_dac_powerdown_modes[] = {
diff --git a/drivers/iio/dac/ti-dac082s085.c b/drivers/iio/dac/ti-dac082s085.c
new file mode 100644
index 000000000000..4e1e28339c84
--- /dev/null
+++ b/drivers/iio/dac/ti-dac082s085.c
@@ -0,0 +1,368 @@
+/*
+ * ti-dac082s085.c - Texas Instruments 8/10/12-bit 2/4-channel DAC driver
+ *
+ * Copyright (C) 2017 KUNBUS GmbH
+ *
+ * http://www.ti.com/lit/ds/symlink/dac082s085.pdf
+ * http://www.ti.com/lit/ds/symlink/dac102s085.pdf
+ * http://www.ti.com/lit/ds/symlink/dac122s085.pdf
+ * http://www.ti.com/lit/ds/symlink/dac084s085.pdf
+ * http://www.ti.com/lit/ds/symlink/dac104s085.pdf
+ * http://www.ti.com/lit/ds/symlink/dac124s085.pdf
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License (version 2) as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/iio/iio.h>
+#include <linux/module.h>
+#include <linux/regulator/consumer.h>
+#include <linux/spi/spi.h>
+
+enum { dual_8bit, dual_10bit, dual_12bit, quad_8bit, quad_10bit, quad_12bit };
+
+struct ti_dac_spec {
+        u8 num_channels;
+        u8 resolution;
+};
+
+static const struct ti_dac_spec ti_dac_spec[] = {
+        [dual_8bit]  = { .num_channels = 2, .resolution = 8  },
+        [dual_10bit] = { .num_channels = 2, .resolution = 10 },
+        [dual_12bit] = { .num_channels = 2, .resolution = 12 },
+        [quad_8bit]  = { .num_channels = 4, .resolution = 8  },
+        [quad_10bit] = { .num_channels = 4, .resolution = 10 },
+        [quad_12bit] = { .num_channels = 4, .resolution = 12 },
+};
+
+/**
+ * struct ti_dac_chip - TI DAC chip
+ * @lock: protects write sequences
+ * @vref: regulator generating Vref
+ * @mesg: SPI message to perform a write
+ * @xfer: SPI transfer used by @mesg
+ * @val: cached value of each output
+ * @powerdown: whether the chip is powered down
+ * @powerdown_mode: selected by the user
+ * @resolution: resolution of the chip
+ * @buf: buffer for @xfer
+ */
+struct ti_dac_chip {
+        struct mutex lock;
+        struct regulator *vref;
+        struct spi_message mesg;
+        struct spi_transfer xfer;
+        u16 val[4];
+        bool powerdown;
+        u8 powerdown_mode;
+        u8 resolution;
+        u8 buf[2] ____cacheline_aligned;
+};
+
+#define WRITE_NOT_UPDATE(chan)  (0x00 | (chan) << 6)
+#define WRITE_AND_UPDATE(chan)  (0x10 | (chan) << 6)
+#define WRITE_ALL_UPDATE         0x20
+#define POWERDOWN(mode)         (0x30 | ((mode) + 1) << 6)
+
+static int ti_dac_cmd(struct ti_dac_chip *ti_dac, u8 cmd, u16 val)
+{
+        u8 shift = 12 - ti_dac->resolution;
+
+        ti_dac->buf[0] = cmd | (val >> (8 - shift));
+        ti_dac->buf[1] = (val << shift) & 0xff;
+        return spi_sync(ti_dac->mesg.spi, &ti_dac->mesg);
+}
+
+static const char * const ti_dac_powerdown_modes[] = {
+        "2.5kohm_to_gnd", "100kohm_to_gnd", "three_state",
+};
+
+static int ti_dac_get_powerdown_mode(struct iio_dev *indio_dev,
+                                     const struct iio_chan_spec *chan)
+{
+        struct ti_dac_chip *ti_dac = iio_priv(indio_dev);
+
+        return ti_dac->powerdown_mode;
+}
+
+static int ti_dac_set_powerdown_mode(struct iio_dev *indio_dev,
+                                     const struct iio_chan_spec *chan,
+                                     unsigned int mode)
+{
+        struct ti_dac_chip *ti_dac = iio_priv(indio_dev);
+        int ret = 0;
+
+        if (ti_dac->powerdown_mode == mode)
+                return 0;
+
+        mutex_lock(&ti_dac->lock);
+        if (ti_dac->powerdown) {
+                ret = ti_dac_cmd(ti_dac, POWERDOWN(mode), 0);
+                if (ret)
+                        goto out;
+        }
+        ti_dac->powerdown_mode = mode;
+
+out:
+        mutex_unlock(&ti_dac->lock);
+        return ret;
+}
+
+static const struct iio_enum ti_dac_powerdown_mode = {
+        .items = ti_dac_powerdown_modes,
+        .num_items = ARRAY_SIZE(ti_dac_powerdown_modes),
+        .get = ti_dac_get_powerdown_mode,
+        .set = ti_dac_set_powerdown_mode,
+};
+
+static ssize_t ti_dac_read_powerdown(struct iio_dev *indio_dev,
+                                     uintptr_t private,
+                                     const struct iio_chan_spec *chan,
+                                     char *buf)
+{
+        struct ti_dac_chip *ti_dac = iio_priv(indio_dev);
+
+        return sprintf(buf, "%d\n", ti_dac->powerdown);
+}
+
+static ssize_t ti_dac_write_powerdown(struct iio_dev *indio_dev,
+                                      uintptr_t private,
+                                      const struct iio_chan_spec *chan,
+                                      const char *buf, size_t len)
+{
+        struct ti_dac_chip *ti_dac = iio_priv(indio_dev);
+        bool powerdown;
+        int ret;
+
+        ret = strtobool(buf, &powerdown);
+        if (ret)
+                return ret;
+
+        if (ti_dac->powerdown == powerdown)
+                return len;
+
+        mutex_lock(&ti_dac->lock);
+        if (powerdown)
+                ret = ti_dac_cmd(ti_dac, POWERDOWN(ti_dac->powerdown_mode), 0);
+        else
+                ret = ti_dac_cmd(ti_dac, WRITE_AND_UPDATE(0), ti_dac->val[0]);
+        if (!ret)
+                ti_dac->powerdown = powerdown;
+        mutex_unlock(&ti_dac->lock);
+
+        return ret ? ret : len;
+}
+
+static const struct iio_chan_spec_ext_info ti_dac_ext_info[] = {
+        {
+                .name      = "powerdown",
+                .read      = ti_dac_read_powerdown,
+                .write     = ti_dac_write_powerdown,
+                .shared    = IIO_SHARED_BY_TYPE,
+        },
+        IIO_ENUM("powerdown_mode", IIO_SHARED_BY_TYPE, &ti_dac_powerdown_mode),
+        IIO_ENUM_AVAILABLE("powerdown_mode", &ti_dac_powerdown_mode),
+        { },
+};
+
+#define TI_DAC_CHANNEL(chan) {                                  \
+        .type = IIO_VOLTAGE,                                    \
+        .channel = (chan),                                      \
+        .address = (chan),                                      \
+        .indexed = true,                                        \
+        .output = true,                                         \
+        .datasheet_name = (const char[]){ 'A' + (chan), 0 },    \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),           \
+        .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),   \
+        .ext_info = ti_dac_ext_info,                            \
+}
+
+static const struct iio_chan_spec ti_dac_channels[] = {
+        TI_DAC_CHANNEL(0),
+        TI_DAC_CHANNEL(1),
+        TI_DAC_CHANNEL(2),
+        TI_DAC_CHANNEL(3),
+};
+
+static int ti_dac_read_raw(struct iio_dev *indio_dev,
+                           struct iio_chan_spec const *chan,
+                           int *val, int *val2, long mask)
+{
+        struct ti_dac_chip *ti_dac = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                *val = ti_dac->val[chan->channel];
+                ret = IIO_VAL_INT;
+                break;
+
+        case IIO_CHAN_INFO_SCALE:
+                ret = regulator_get_voltage(ti_dac->vref);
+                if (ret < 0)
+                        return ret;
+
+                *val = ret / 1000;
+                *val2 = ti_dac->resolution;
+                ret = IIO_VAL_FRACTIONAL_LOG2;
+                break;
+
+        default:
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
+static int ti_dac_write_raw(struct iio_dev *indio_dev,
+                            struct iio_chan_spec const *chan,
+                            int val, int val2, long mask)
+{
+        struct ti_dac_chip *ti_dac = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                if (ti_dac->val[chan->channel] == val)
+                        return 0;
+
+                if (val >= (1 << ti_dac->resolution) || val < 0)
+                        return -EINVAL;
+
+                if (ti_dac->powerdown)
+                        return -EBUSY;
+
+                mutex_lock(&ti_dac->lock);
+                ret = ti_dac_cmd(ti_dac, WRITE_AND_UPDATE(chan->channel), val);
+                if (!ret)
+                        ti_dac->val[chan->channel] = val;
+                mutex_unlock(&ti_dac->lock);
+                break;
+
+        default:
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
+static int ti_dac_write_raw_get_fmt(struct iio_dev *indio_dev,
+                                    struct iio_chan_spec const *chan, long mask)
+{
+        return IIO_VAL_INT;
+}
+
+static const struct iio_info ti_dac_info = {
+        .read_raw          = ti_dac_read_raw,
+        .write_raw         = ti_dac_write_raw,
+        .write_raw_get_fmt = ti_dac_write_raw_get_fmt,
+};
+
+static int ti_dac_probe(struct spi_device *spi)
+{
+        struct device *dev = &spi->dev;
+        const struct ti_dac_spec *spec;
+        struct ti_dac_chip *ti_dac;
+        struct iio_dev *indio_dev;
+        int ret;
+
+        indio_dev = devm_iio_device_alloc(dev, sizeof(*ti_dac));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        indio_dev->dev.parent = dev;
+        indio_dev->info = &ti_dac_info;
+        indio_dev->name = spi->modalias;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->channels = ti_dac_channels;
+        spi_set_drvdata(spi, indio_dev);
+
+        ti_dac = iio_priv(indio_dev);
+        ti_dac->xfer.tx_buf = &ti_dac->buf;
+        ti_dac->xfer.len = sizeof(ti_dac->buf);
+        spi_message_init_with_transfers(&ti_dac->mesg, &ti_dac->xfer, 1);
+        ti_dac->mesg.spi = spi;
+
+        spec = &ti_dac_spec[spi_get_device_id(spi)->driver_data];
+        indio_dev->num_channels = spec->num_channels;
+        ti_dac->resolution = spec->resolution;
+
+        ti_dac->vref = devm_regulator_get(dev, "vref");
+        if (IS_ERR(ti_dac->vref))
+                return PTR_ERR(ti_dac->vref);
+
+        ret = regulator_enable(ti_dac->vref);
+        if (ret < 0)
+                return ret;
+
+        mutex_init(&ti_dac->lock);
+
+        ret = ti_dac_cmd(ti_dac, WRITE_ALL_UPDATE, 0);
+        if (ret) {
+                dev_err(dev, "failed to initialize outputs to 0\n");
+                goto err;
+        }
+
+        ret = iio_device_register(indio_dev);
+        if (ret)
+                goto err;
+
+        return 0;
+
+err:
+        mutex_destroy(&ti_dac->lock);
+        regulator_disable(ti_dac->vref);
+        return ret;
+}
+
+static int ti_dac_remove(struct spi_device *spi)
+{
+        struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct ti_dac_chip *ti_dac = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+        mutex_destroy(&ti_dac->lock);
+        regulator_disable(ti_dac->vref);
+
+        return 0;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id ti_dac_of_id[] = {
+        { .compatible = "ti,dac082s085" },
+        { .compatible = "ti,dac102s085" },
+        { .compatible = "ti,dac122s085" },
+        { .compatible = "ti,dac084s085" },
+        { .compatible = "ti,dac104s085" },
+        { .compatible = "ti,dac124s085" },
+        { }
+};
+MODULE_DEVICE_TABLE(of, ti_dac_of_id);
+#endif
+
+static const struct spi_device_id ti_dac_spi_id[] = {
+        { "dac082s085", dual_8bit  },
+        { "dac102s085", dual_10bit },
+        { "dac122s085", dual_12bit },
+        { "dac084s085", quad_8bit  },
+        { "dac104s085", quad_10bit },
+        { "dac124s085", quad_12bit },
+        { }
+};
+MODULE_DEVICE_TABLE(spi, ti_dac_spi_id);
+
+static struct spi_driver ti_dac_driver = {
+        .driver = {
+                .name           = "ti-dac082s085",
+                .of_match_table = of_match_ptr(ti_dac_of_id),
+        },
+        .probe    = ti_dac_probe,
+        .remove   = ti_dac_remove,
+        .id_table = ti_dac_spi_id,
+};
+module_spi_driver(ti_dac_driver);
+
+MODULE_AUTHOR("Lukas Wunner <lukas@wunner.de>");
+MODULE_DESCRIPTION("Texas Instruments 8/10/12-bit 2/4-channel DAC driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/dac/vf610_dac.c b/drivers/iio/dac/vf610_dac.c
index c4ec7779b394..5dccdd16cab3 100644
--- a/drivers/iio/dac/vf610_dac.c
+++ b/drivers/iio/dac/vf610_dac.c
@@ -167,7 +167,6 @@ static int vf610_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info vf610_dac_iio_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &vf610_read_raw,
         .write_raw = &vf610_write_raw,
 };
diff --git a/drivers/iio/dummy/Kconfig b/drivers/iio/dummy/Kconfig
index aa5824d96a43..5a29fbd3c531 100644
--- a/drivers/iio/dummy/Kconfig
+++ b/drivers/iio/dummy/Kconfig
@@ -5,7 +5,7 @@ menu "IIO dummy driver"
         depends on IIO
 
 config IIO_DUMMY_EVGEN
-        select IRQ_WORK
+        select IRQ_SIM
         tristate
 
 config IIO_SIMPLE_DUMMY
diff --git a/drivers/iio/dummy/iio_dummy_evgen.c b/drivers/iio/dummy/iio_dummy_evgen.c
index 9e83f348df51..fe8884543da0 100644
--- a/drivers/iio/dummy/iio_dummy_evgen.c
+++ b/drivers/iio/dummy/iio_dummy_evgen.c
@@ -24,97 +24,46 @@
 #include "iio_dummy_evgen.h"
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
-#include <linux/irq_work.h>
+#include <linux/irq_sim.h>
 
 /* Fiddly bit of faking and irq without hardware */
 #define IIO_EVENTGEN_NO 10
 
 /**
- * struct iio_dummy_handle_irq - helper struct to simulate interrupt generation
- * @work: irq_work used to run handlers from hardirq context
- * @irq: fake irq line number to trigger an interrupt
- */
-struct iio_dummy_handle_irq {
-        struct irq_work work;
-        int irq;
-};
-
-/**
- * struct iio_dummy_evgen - evgen state
- * @chip: irq chip we are faking
- * @base: base of irq range
- * @enabled: mask of which irqs are enabled
- * @inuse: mask of which irqs are connected
  * @regs: irq regs we are faking
  * @lock: protect the evgen state
- * @handler: helper for a 'hardware-like' interrupt simulation
+ * @inuse: mask of which irqs are connected
+ * @irq_sim: interrupt simulator
+ * @base: base of irq range
  */
 struct iio_dummy_eventgen {
-        struct irq_chip chip;
-        int base;
-        bool enabled[IIO_EVENTGEN_NO];
-        bool inuse[IIO_EVENTGEN_NO];
         struct iio_dummy_regs regs[IIO_EVENTGEN_NO];
         struct mutex lock;
-        struct iio_dummy_handle_irq handler;
+        bool inuse[IIO_EVENTGEN_NO];
+        struct irq_sim irq_sim;
+        int base;
 };
 
 /* We can only ever have one instance of this 'device' */
 static struct iio_dummy_eventgen *iio_evgen;
-static const char *iio_evgen_name = "iio_dummy_evgen";
-
-static void iio_dummy_event_irqmask(struct irq_data *d)
-{
-        struct irq_chip *chip = irq_data_get_irq_chip(d);
-        struct iio_dummy_eventgen *evgen =
-                container_of(chip, struct iio_dummy_eventgen, chip);
-
-        evgen->enabled[d->irq - evgen->base] = false;
-}
-
-static void iio_dummy_event_irqunmask(struct irq_data *d)
-{
-        struct irq_chip *chip = irq_data_get_irq_chip(d);
-        struct iio_dummy_eventgen *evgen =
-                container_of(chip, struct iio_dummy_eventgen, chip);
-
-        evgen->enabled[d->irq - evgen->base] = true;
-}
-
-static void iio_dummy_work_handler(struct irq_work *work)
-{
-        struct iio_dummy_handle_irq *irq_handler;
-
-        irq_handler = container_of(work, struct iio_dummy_handle_irq, work);
-        handle_simple_irq(irq_to_desc(irq_handler->irq));
-}
 
 static int iio_dummy_evgen_create(void)
 {
-        int ret, i;
+        int ret;
 
         iio_evgen = kzalloc(sizeof(*iio_evgen), GFP_KERNEL);
         if (!iio_evgen)
                 return -ENOMEM;
 
-        iio_evgen->base = irq_alloc_descs(-1, 0, IIO_EVENTGEN_NO, 0);
-        if (iio_evgen->base < 0) {
-                ret = iio_evgen->base;
+        ret = irq_sim_init(&iio_evgen->irq_sim, IIO_EVENTGEN_NO);
+        if (ret) {
                 kfree(iio_evgen);
                 return ret;
         }
-        iio_evgen->chip.name = iio_evgen_name;
-        iio_evgen->chip.irq_mask = &iio_dummy_event_irqmask;
-        iio_evgen->chip.irq_unmask = &iio_dummy_event_irqunmask;
-        for (i = 0; i < IIO_EVENTGEN_NO; i++) {
-                irq_set_chip(iio_evgen->base + i, &iio_evgen->chip);
-                irq_set_handler(iio_evgen->base + i, &handle_simple_irq);
-                irq_modify_status(iio_evgen->base + i,
-                                  IRQ_NOREQUEST | IRQ_NOAUTOEN,
-                                  IRQ_NOPROBE);
-        }
-        init_irq_work(&iio_evgen->handler.work, iio_dummy_work_handler);
+
+        iio_evgen->base = irq_sim_irqnum(&iio_evgen->irq_sim, 0);
         mutex_init(&iio_evgen->lock);
+
         return 0;
 }
 
@@ -132,15 +81,17 @@ int iio_dummy_evgen_get_irq(void)
                 return -ENODEV;
 
         mutex_lock(&iio_evgen->lock);
-        for (i = 0; i < IIO_EVENTGEN_NO; i++)
+        for (i = 0; i < IIO_EVENTGEN_NO; i++) {
                 if (!iio_evgen->inuse[i]) {
-                        ret = iio_evgen->base + i;
+                        ret = irq_sim_irqnum(&iio_evgen->irq_sim, i);
                         iio_evgen->inuse[i] = true;
                         break;
                 }
+        }
         mutex_unlock(&iio_evgen->lock);
         if (i == IIO_EVENTGEN_NO)
                 return -ENOMEM;
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(iio_dummy_evgen_get_irq);
@@ -167,7 +118,7 @@ EXPORT_SYMBOL_GPL(iio_dummy_evgen_get_regs);
 
 static void iio_dummy_evgen_free(void)
 {
-        irq_free_descs(iio_evgen->base, IIO_EVENTGEN_NO);
+        irq_sim_fini(&iio_evgen->irq_sim);
         kfree(iio_evgen);
 }
 
@@ -192,9 +143,7 @@ static ssize_t iio_evgen_poke(struct device *dev,
         iio_evgen->regs[this_attr->address].reg_id   = this_attr->address;
         iio_evgen->regs[this_attr->address].reg_data = event;
 
-        iio_evgen->handler.irq = iio_evgen->base + this_attr->address;
-        if (iio_evgen->enabled[this_attr->address])
-                irq_work_queue(&iio_evgen->handler.work);
+        irq_sim_fire(&iio_evgen->irq_sim, this_attr->address);
 
         return len;
 }
diff --git a/drivers/iio/dummy/iio_simple_dummy.c b/drivers/iio/dummy/iio_simple_dummy.c
index ad3410e528b6..a45d01e9b8e8 100644
--- a/drivers/iio/dummy/iio_simple_dummy.c
+++ b/drivers/iio/dummy/iio_simple_dummy.c
@@ -519,7 +519,6 @@ static int iio_dummy_write_raw(struct iio_dev *indio_dev,
  * Device type specific information.
  */
 static const struct iio_info iio_dummy_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &iio_dummy_read_raw,
         .write_raw = &iio_dummy_write_raw,
 #ifdef CONFIG_IIO_SIMPLE_DUMMY_EVENTS
diff --git a/drivers/iio/dummy/iio_simple_dummy_events.c b/drivers/iio/dummy/iio_simple_dummy_events.c
index ed63ffd849f8..7ec2a0bb0807 100644
--- a/drivers/iio/dummy/iio_simple_dummy_events.c
+++ b/drivers/iio/dummy/iio_simple_dummy_events.c
@@ -72,6 +72,7 @@ int iio_simple_dummy_write_event_config(struct iio_dev *indio_dev,
                                 st->event_en = state;
                         else
                                 return -EINVAL;
+                        break;
                 default:
                         return -EINVAL;
                 }
diff --git a/drivers/iio/frequency/ad9523.c b/drivers/iio/frequency/ad9523.c
index 99eba524f6dd..ddb6a334ae68 100644
--- a/drivers/iio/frequency/ad9523.c
+++ b/drivers/iio/frequency/ad9523.c
@@ -738,7 +738,6 @@ static const struct iio_info ad9523_info = {
         .write_raw = &ad9523_write_raw,
         .debugfs_reg_access = &ad9523_reg_access,
         .attrs = &ad9523_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad9523_setup(struct iio_dev *indio_dev)
diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
index d2d824b446f5..6d768431d90e 100644
--- a/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@ -374,7 +374,6 @@ static const struct iio_chan_spec adf4350_chan = {
 
 static const struct iio_info adf4350_info = {
         .debugfs_reg_access = &adf4350_reg_access,
-        .driver_module = THIS_MODULE,
 };
 
 #ifdef CONFIG_OF
diff --git a/drivers/iio/gyro/adis16080.c b/drivers/iio/gyro/adis16080.c
index ad31a1372a04..a551ebde4762 100644
--- a/drivers/iio/gyro/adis16080.c
+++ b/drivers/iio/gyro/adis16080.c
@@ -163,7 +163,6 @@ static const struct iio_chan_spec adis16080_channels[] = {
 
 static const struct iio_info adis16080_info = {
         .read_raw = &adis16080_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 enum {
diff --git a/drivers/iio/gyro/adis16130.c b/drivers/iio/gyro/adis16130.c
index e5241f41e65e..aea80ab04122 100644
--- a/drivers/iio/gyro/adis16130.c
+++ b/drivers/iio/gyro/adis16130.c
@@ -137,7 +137,6 @@ static const struct iio_chan_spec adis16130_channels[] = {
 
 static const struct iio_info adis16130_info = {
         .read_raw = &adis16130_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int adis16130_probe(struct spi_device *spi)
diff --git a/drivers/iio/gyro/adis16136.c b/drivers/iio/gyro/adis16136.c
index b04faf93e1bc..90ec4bed62b7 100644
--- a/drivers/iio/gyro/adis16136.c
+++ b/drivers/iio/gyro/adis16136.c
@@ -398,7 +398,6 @@ static const struct attribute_group adis16136_attribute_group = {
 };
 
 static const struct iio_info adis16136_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &adis16136_attribute_group,
         .read_raw = &adis16136_read_raw,
         .write_raw = &adis16136_write_raw,
diff --git a/drivers/iio/gyro/adis16260.c b/drivers/iio/gyro/adis16260.c
index 7da8825f4791..a8cb1ca349d9 100644
--- a/drivers/iio/gyro/adis16260.c
+++ b/drivers/iio/gyro/adis16260.c
@@ -321,7 +321,6 @@ static const struct iio_info adis16260_info = {
         .read_raw = &adis16260_read_raw,
         .write_raw = &adis16260_write_raw,
         .update_scan_mode = adis_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static const char * const adis1620_status_error_msgs[] = {
diff --git a/drivers/iio/gyro/adxrs450.c b/drivers/iio/gyro/adxrs450.c
index a330d4288bb0..5d39fd008378 100644
--- a/drivers/iio/gyro/adxrs450.c
+++ b/drivers/iio/gyro/adxrs450.c
@@ -405,7 +405,6 @@ static const struct iio_chan_spec adxrs450_channels[2][2] = {
 };
 
 static const struct iio_info adxrs450_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &adxrs450_read_raw,
         .write_raw = &adxrs450_write_raw,
 };
diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c
index 821919dd245b..15046172e437 100644
--- a/drivers/iio/gyro/bmg160_core.c
+++ b/drivers/iio/gyro/bmg160_core.c
@@ -858,7 +858,6 @@ static const struct iio_info bmg160_info = {
         .write_event_value      = bmg160_write_event,
         .write_event_config     = bmg160_write_event_config,
         .read_event_config      = bmg160_read_event_config,
-        .driver_module          = THIS_MODULE,
 };
 
 static const unsigned long bmg160_accel_scan_masks[] = {
@@ -956,7 +955,6 @@ static int bmg160_data_rdy_trigger_set_state(struct iio_trigger *trig,
 static const struct iio_trigger_ops bmg160_trigger_ops = {
         .set_trigger_state = bmg160_data_rdy_trigger_set_state,
         .try_reenable = bmg160_trig_try_reen,
-        .owner = THIS_MODULE,
 };
 
 static irqreturn_t bmg160_event_handler(int irq, void *private)
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
index c67ce2ac4715..f59995a90387 100644
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
@@ -186,7 +186,6 @@ static int gyro_3d_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info gyro_3d_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &gyro_3d_read_raw,
         .write_raw = &gyro_3d_write_raw,
 };
diff --git a/drivers/iio/gyro/itg3200_buffer.c b/drivers/iio/gyro/itg3200_buffer.c
index eef50e91f17c..59770e5b6660 100644
--- a/drivers/iio/gyro/itg3200_buffer.c
+++ b/drivers/iio/gyro/itg3200_buffer.c
@@ -101,7 +101,6 @@ error_ret:
 }
 
 static const struct iio_trigger_ops itg3200_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = &itg3200_data_rdy_trigger_set_state,
 };
 
diff --git a/drivers/iio/gyro/itg3200_core.c b/drivers/iio/gyro/itg3200_core.c
index cfa2db04a8ab..7adecb562c81 100644
--- a/drivers/iio/gyro/itg3200_core.c
+++ b/drivers/iio/gyro/itg3200_core.c
@@ -278,7 +278,6 @@ static const struct iio_chan_spec itg3200_channels[] = {
 static const struct iio_info itg3200_info = {
         .read_raw = &itg3200_read_raw,
         .write_raw = &itg3200_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const unsigned long itg3200_available_scan_masks[] = { 0xffffffff, 0x0 };
diff --git a/drivers/iio/gyro/mpu3050-core.c b/drivers/iio/gyro/mpu3050-core.c
index e0d241a9aa30..77fac81a3adc 100644
--- a/drivers/iio/gyro/mpu3050-core.c
+++ b/drivers/iio/gyro/mpu3050-core.c
@@ -742,7 +742,6 @@ static const struct attribute_group mpu3050_attribute_group = {
 };
 
 static const struct iio_info mpu3050_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = mpu3050_read_raw,
         .write_raw = mpu3050_write_raw,
         .attrs = &mpu3050_attribute_group,
@@ -1032,7 +1031,6 @@ static int mpu3050_drdy_trigger_set_state(struct iio_trigger *trig,
 }
 
 static const struct iio_trigger_ops mpu3050_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = mpu3050_drdy_trigger_set_state,
 };
 
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index e366422e8512..b31064ba37b9 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -111,14 +111,23 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = {
                         .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = 0x22,
-                        .mask_int2 = 0x08,
+                        .int2 = {
+                                .addr = 0x22,
+                                .mask = 0x08,
+                        },
                         /*
                          * The sensor has IHL (active low) and open
                          * drain settings, but only for INT1 and not
                          * for the DRDY line on INT2.
                          */
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
+                },
+                .sim = {
+                        .addr = 0x23,
+                        .value = BIT(0),
                 },
                 .multi_read_bit = true,
                 .bootime = 2,
@@ -181,14 +190,23 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = {
                         .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = 0x22,
-                        .mask_int2 = 0x08,
+                        .int2 = {
+                                .addr = 0x22,
+                                .mask = 0x08,
+                        },
                         /*
                          * The sensor has IHL (active low) and open
                          * drain settings, but only for INT1 and not
                          * for the DRDY line on INT2.
                          */
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
+                },
+                .sim = {
+                        .addr = 0x23,
+                        .value = BIT(0),
                 },
                 .multi_read_bit = true,
                 .bootime = 2,
@@ -246,14 +264,23 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = {
                         .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = 0x22,
-                        .mask_int2 = 0x08,
+                        .int2 = {
+                                .addr = 0x22,
+                                .mask = 0x08,
+                        },
                         /*
                          * The sensor has IHL (active low) and open
                          * drain settings, but only for INT1 and not
                          * for the DRDY line on INT2.
                          */
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
+                },
+                .sim = {
+                        .addr = 0x23,
+                        .value = BIT(0),
                 },
                 .multi_read_bit = true,
                 .bootime = 2,
@@ -326,7 +353,6 @@ static const struct attribute_group st_gyro_attribute_group = {
 };
 
 static const struct iio_info gyro_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &st_gyro_attribute_group,
         .read_raw = &st_gyro_read_raw,
         .write_raw = &st_gyro_write_raw,
@@ -335,7 +361,6 @@ static const struct iio_info gyro_info = {
 
 #ifdef CONFIG_IIO_TRIGGER
 static const struct iio_trigger_ops st_gyro_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = ST_GYRO_TRIGGER_SET_STATE,
         .validate_device = st_sensors_validate_device,
 };
diff --git a/drivers/iio/health/afe4403.c b/drivers/iio/health/afe4403.c
index 6bb23a49e81e..a739fff01c6b 100644
--- a/drivers/iio/health/afe4403.c
+++ b/drivers/iio/health/afe4403.c
@@ -309,7 +309,6 @@ static const struct iio_info afe4403_iio_info = {
         .attrs = &afe440x_attribute_group,
         .read_raw = afe4403_read_raw,
         .write_raw = afe4403_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static irqreturn_t afe4403_trigger_handler(int irq, void *private)
@@ -354,7 +353,6 @@ err:
 }
 
 static const struct iio_trigger_ops afe4403_trigger_ops = {
-        .owner = THIS_MODULE,
 };
 
 #define AFE4403_TIMING_PAIRS                    \
diff --git a/drivers/iio/health/afe4404.c b/drivers/iio/health/afe4404.c
index 964f5231a831..11910922e655 100644
--- a/drivers/iio/health/afe4404.c
+++ b/drivers/iio/health/afe4404.c
@@ -328,7 +328,6 @@ static const struct iio_info afe4404_iio_info = {
         .attrs = &afe440x_attribute_group,
         .read_raw = afe4404_read_raw,
         .write_raw = afe4404_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static irqreturn_t afe4404_trigger_handler(int irq, void *private)
@@ -355,7 +354,6 @@ err:
 }
 
 static const struct iio_trigger_ops afe4404_trigger_ops = {
-        .owner = THIS_MODULE,
 };
 
 /* Default timings from data-sheet */
diff --git a/drivers/iio/health/max30100.c b/drivers/iio/health/max30100.c
index 849d71747f9f..91aef5df24a1 100644
--- a/drivers/iio/health/max30100.c
+++ b/drivers/iio/health/max30100.c
@@ -420,7 +420,6 @@ static int max30100_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info max30100_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = max30100_read_raw,
 };
 
diff --git a/drivers/iio/health/max30102.c b/drivers/iio/health/max30102.c
index 839b875c29b9..203ffb9cad6a 100644
--- a/drivers/iio/health/max30102.c
+++ b/drivers/iio/health/max30102.c
@@ -381,7 +381,6 @@ static int max30102_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info max30102_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = max30102_read_raw,
 };
 
diff --git a/drivers/iio/humidity/am2315.c b/drivers/iio/humidity/am2315.c
index ff96b6d0fdae..7d8669dc6547 100644
--- a/drivers/iio/humidity/am2315.c
+++ b/drivers/iio/humidity/am2315.c
@@ -215,7 +215,6 @@ static int am2315_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info am2315_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = am2315_read_raw,
 };
 
diff --git a/drivers/iio/humidity/dht11.c b/drivers/iio/humidity/dht11.c
index 2a22ad920333..df6bab40d6fa 100644
--- a/drivers/iio/humidity/dht11.c
+++ b/drivers/iio/humidity/dht11.c
@@ -284,7 +284,6 @@ err:
 }
 
 static const struct iio_info dht11_iio_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = dht11_read_raw,
 };
 
diff --git a/drivers/iio/humidity/hdc100x.c b/drivers/iio/humidity/hdc100x.c
index 7851bd90ef64..d8438310b6d4 100644
--- a/drivers/iio/humidity/hdc100x.c
+++ b/drivers/iio/humidity/hdc100x.c
@@ -357,7 +357,6 @@ static const struct iio_info hdc100x_info = {
         .read_raw = hdc100x_read_raw,
         .write_raw = hdc100x_write_raw,
         .attrs = &hdc100x_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int hdc100x_probe(struct i2c_client *client,
diff --git a/drivers/iio/humidity/hid-sensor-humidity.c b/drivers/iio/humidity/hid-sensor-humidity.c
index 6e09c1acfe51..beab6d6fd6e1 100644
--- a/drivers/iio/humidity/hid-sensor-humidity.c
+++ b/drivers/iio/humidity/hid-sensor-humidity.c
@@ -125,7 +125,6 @@ static int humidity_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info humidity_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &humidity_read_raw,
         .write_raw = &humidity_write_raw,
 };
diff --git a/drivers/iio/humidity/hts221_buffer.c b/drivers/iio/humidity/hts221_buffer.c
index 9690dfe9a844..e971ea425268 100644
--- a/drivers/iio/humidity/hts221_buffer.c
+++ b/drivers/iio/humidity/hts221_buffer.c
@@ -47,7 +47,6 @@ static int hts221_trig_set_state(struct iio_trigger *trig, bool state)
 }
 
 static const struct iio_trigger_ops hts221_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = hts221_trig_set_state,
 };
 
diff --git a/drivers/iio/humidity/hts221_core.c b/drivers/iio/humidity/hts221_core.c
index 32524a8dc66f..daef177219b6 100644
--- a/drivers/iio/humidity/hts221_core.c
+++ b/drivers/iio/humidity/hts221_core.c
@@ -573,7 +573,6 @@ static const struct attribute_group hts221_attribute_group = {
 };
 
 static const struct iio_info hts221_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &hts221_attribute_group,
         .read_raw = hts221_read_raw,
         .write_raw = hts221_write_raw,
diff --git a/drivers/iio/humidity/htu21.c b/drivers/iio/humidity/htu21.c
index 2c4b9be85a05..f5a2701ba6dd 100644
--- a/drivers/iio/humidity/htu21.c
+++ b/drivers/iio/humidity/htu21.c
@@ -175,7 +175,6 @@ static const struct iio_info htu21_info = {
         .read_raw = htu21_read_raw,
         .write_raw = htu21_write_raw,
         .attrs = &htu21_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int htu21_probe(struct i2c_client *client,
diff --git a/drivers/iio/humidity/si7005.c b/drivers/iio/humidity/si7005.c
index 6297766e93d0..1fd19f035a5d 100644
--- a/drivers/iio/humidity/si7005.c
+++ b/drivers/iio/humidity/si7005.c
@@ -124,7 +124,6 @@ static const struct iio_chan_spec si7005_channels[] = {
 
 static const struct iio_info si7005_info = {
         .read_raw = si7005_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int si7005_probe(struct i2c_client *client,
diff --git a/drivers/iio/humidity/si7020.c b/drivers/iio/humidity/si7020.c
index 345a7656c5ef..1b2ec8df1a72 100644
--- a/drivers/iio/humidity/si7020.c
+++ b/drivers/iio/humidity/si7020.c
@@ -108,7 +108,6 @@ static const struct iio_chan_spec si7020_channels[] = {
 
 static const struct iio_info si7020_info = {
         .read_raw = si7020_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int si7020_probe(struct i2c_client *client,
diff --git a/drivers/iio/imu/adis16400_core.c b/drivers/iio/imu/adis16400_core.c
index 9b697d35dbef..46a569005a13 100644
--- a/drivers/iio/imu/adis16400_core.c
+++ b/drivers/iio/imu/adis16400_core.c
@@ -833,7 +833,6 @@ static struct adis16400_chip_info adis16400_chips[] = {
 };
 
 static const struct iio_info adis16400_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &adis16400_read_raw,
         .write_raw = &adis16400_write_raw,
         .update_scan_mode = adis16400_update_scan_mode,
diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
index 12898424d838..7a33d6bd60e0 100644
--- a/drivers/iio/imu/adis16480.c
+++ b/drivers/iio/imu/adis16480.c
@@ -720,7 +720,6 @@ static const struct iio_info adis16480_info = {
         .read_raw = &adis16480_read_raw,
         .write_raw = &adis16480_write_raw,
         .update_scan_mode = adis_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static int adis16480_stop_device(struct iio_dev *indio_dev)
diff --git a/drivers/iio/imu/adis_trigger.c b/drivers/iio/imu/adis_trigger.c
index f53e9a803a0e..0dd5a381be64 100644
--- a/drivers/iio/imu/adis_trigger.c
+++ b/drivers/iio/imu/adis_trigger.c
@@ -25,7 +25,6 @@ static int adis_data_rdy_trigger_set_state(struct iio_trigger *trig,
 }
 
 static const struct iio_trigger_ops adis_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = &adis_data_rdy_trigger_set_state,
 };
 
diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
index cfd225ed1c8d..c85659ca9507 100644
--- a/drivers/iio/imu/bmi160/bmi160_core.c
+++ b/drivers/iio/imu/bmi160/bmi160_core.c
@@ -482,7 +482,6 @@ static const struct attribute_group bmi160_attrs_group = {
 };
 
 static const struct iio_info bmi160_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = bmi160_read_raw,
         .write_raw = bmi160_write_raw,
         .attrs = &bmi160_attrs_group,
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index 44830bce13df..7d64be353403 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -542,7 +542,9 @@ static int inv_mpu6050_write_raw(struct iio_dev *indio_dev,
                         break;
                 default:
                         result = -EINVAL;
+                        break;
                 }
+                break;
         default:
                 result = -EINVAL;
                 break;
@@ -570,10 +572,12 @@ error_write_raw_unlock:
  */
 static int inv_mpu6050_set_lpf(struct inv_mpu6050_state *st, int rate)
 {
-        const int hz[] = {188, 98, 42, 20, 10, 5};
-        const int d[] = {INV_MPU6050_FILTER_188HZ, INV_MPU6050_FILTER_98HZ,
-                        INV_MPU6050_FILTER_42HZ, INV_MPU6050_FILTER_20HZ,
-                        INV_MPU6050_FILTER_10HZ, INV_MPU6050_FILTER_5HZ};
+        static const int hz[] = {188, 98, 42, 20, 10, 5};
+        static const int d[] = {
+                INV_MPU6050_FILTER_188HZ, INV_MPU6050_FILTER_98HZ,
+                INV_MPU6050_FILTER_42HZ, INV_MPU6050_FILTER_20HZ,
+                INV_MPU6050_FILTER_10HZ, INV_MPU6050_FILTER_5HZ
+        };
         int i, h, result;
         u8 data;
 
@@ -795,7 +799,6 @@ static const struct attribute_group inv_attribute_group = {
 };
 
 static const struct iio_info mpu_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &inv_mpu6050_read_raw,
         .write_raw = &inv_mpu6050_write_raw,
         .write_raw_get_fmt = &inv_write_raw_get_fmt,
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
index 540070f0a230..f963f9fc98c0 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
@@ -114,7 +114,6 @@ static int inv_mpu_data_rdy_trigger_set_state(struct iio_trigger *trig,
 }
 
 static const struct iio_trigger_ops inv_mpu_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = &inv_mpu_data_rdy_trigger_set_state,
 };
 
diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c
index 2e7dd5754a56..44b3f5397343 100644
--- a/drivers/iio/imu/kmx61.c
+++ b/drivers/iio/imu/kmx61.c
@@ -1003,7 +1003,6 @@ static int kmx61_mag_validate_trigger(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info kmx61_acc_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = kmx61_read_raw,
         .write_raw              = kmx61_write_raw,
         .attrs                  = &kmx61_acc_attribute_group,
@@ -1015,7 +1014,6 @@ static const struct iio_info kmx61_acc_info = {
 };
 
 static const struct iio_info kmx61_mag_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = kmx61_read_raw,
         .write_raw              = kmx61_write_raw,
         .attrs                  = &kmx61_mag_attribute_group,
@@ -1087,7 +1085,6 @@ static int kmx61_trig_try_reenable(struct iio_trigger *trig)
 static const struct iio_trigger_ops kmx61_trigger_ops = {
         .set_trigger_state = kmx61_data_rdy_trigger_set_state,
         .try_reenable = kmx61_trig_try_reenable,
-        .owner = THIS_MODULE,
 };
 
 static irqreturn_t kmx61_event_handler(int irq, void *private)
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
index 46352c7bff43..4fdb7fcc3ea8 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
@@ -29,8 +29,6 @@ enum st_lsm6dsx_hw_id {
 
 #define ST_LSM6DSX_CHAN_SIZE            2
 #define ST_LSM6DSX_SAMPLE_SIZE          6
-#define ST_LSM6DSX_SAMPLE_DEPTH         (ST_LSM6DSX_SAMPLE_SIZE / \
-                                         ST_LSM6DSX_CHAN_SIZE)
 
 #if defined(CONFIG_SPI_MASTER)
 #define ST_LSM6DSX_RX_MAX_LENGTH        256
@@ -52,10 +50,38 @@ struct st_lsm6dsx_reg {
         u8 mask;
 };
 
+/**
+ * struct st_lsm6dsx_fifo_ops - ST IMU FIFO settings
+ * @fifo_th: FIFO threshold register info (addr + mask).
+ * @fifo_diff: FIFO diff status register info (addr + mask).
+ * @th_wl: FIFO threshold word length.
+ */
+struct st_lsm6dsx_fifo_ops {
+        struct {
+                u8 addr;
+                u16 mask;
+        } fifo_th;
+        struct {
+                u8 addr;
+                u16 mask;
+        } fifo_diff;
+        u8 th_wl;
+};
+
+/**
+ * struct st_lsm6dsx_settings - ST IMU sensor settings
+ * @wai: Sensor WhoAmI default value.
+ * @max_fifo_size: Sensor max fifo length in FIFO words.
+ * @id: List of hw id supported by the driver configuration.
+ * @decimator: List of decimator register info (addr + mask).
+ * @fifo_ops: Sensor hw FIFO parameters.
+ */
 struct st_lsm6dsx_settings {
         u8 wai;
         u16 max_fifo_size;
         enum st_lsm6dsx_hw_id id[ST_LSM6DSX_MAX_ID];
+        struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID];
+        struct st_lsm6dsx_fifo_ops fifo_ops;
 };
 
 enum st_lsm6dsx_sensor_id {
@@ -79,7 +105,6 @@ enum st_lsm6dsx_fifo_mode {
  * @watermark: Sensor watermark level.
  * @sip: Number of samples in a given pattern.
  * @decimator: FIFO decimation factor.
- * @decimator_mask: Sensor mask for decimation register.
  * @delta_ts: Delta time between two consecutive interrupts.
  * @ts: Latest timestamp from the interrupt handler.
  */
@@ -94,7 +119,6 @@ struct st_lsm6dsx_sensor {
         u16 watermark;
         u8 sip;
         u8 decimator;
-        u8 decimator_mask;
 
         s64 delta_ts;
         s64 ts;
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
index e2737dc71b67..755c472e8a05 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
@@ -35,10 +35,6 @@
 
 #include "st_lsm6dsx.h"
 
-#define ST_LSM6DSX_REG_FIFO_THL_ADDR            0x06
-#define ST_LSM6DSX_REG_FIFO_THH_ADDR            0x07
-#define ST_LSM6DSX_FIFO_TH_MASK                 GENMASK(11, 0)
-#define ST_LSM6DSX_REG_FIFO_DEC_GXL_ADDR        0x08
 #define ST_LSM6DSX_REG_HLACTIVE_ADDR            0x12
 #define ST_LSM6DSX_REG_HLACTIVE_MASK            BIT(5)
 #define ST_LSM6DSX_REG_PP_OD_ADDR               0x12
@@ -46,8 +42,6 @@
 #define ST_LSM6DSX_REG_FIFO_MODE_ADDR           0x0a
 #define ST_LSM6DSX_FIFO_MODE_MASK               GENMASK(2, 0)
 #define ST_LSM6DSX_FIFO_ODR_MASK                GENMASK(6, 3)
-#define ST_LSM6DSX_REG_FIFO_DIFFL_ADDR          0x3a
-#define ST_LSM6DSX_FIFO_DIFF_MASK               GENMASK(11, 0)
 #define ST_LSM6DSX_FIFO_EMPTY_MASK              BIT(12)
 #define ST_LSM6DSX_REG_FIFO_OUTL_ADDR           0x3e
 
@@ -110,8 +104,9 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw)
         st_lsm6dsx_get_max_min_odr(hw, &max_odr, &min_odr);
 
         for (i = 0; i < ST_LSM6DSX_ID_MAX; i++) {
-                sensor = iio_priv(hw->iio_devs[i]);
+                const struct st_lsm6dsx_reg *dec_reg;
 
+                sensor = iio_priv(hw->iio_devs[i]);
                 /* update fifo decimators and sample in pattern */
                 if (hw->enable_mask & BIT(sensor->id)) {
                         sensor->sip = sensor->odr / min_odr;
@@ -123,12 +118,13 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw)
                         data = 0;
                 }
 
-                err = st_lsm6dsx_write_with_mask(hw,
-                                        ST_LSM6DSX_REG_FIFO_DEC_GXL_ADDR,
-                                        sensor->decimator_mask, data);
-                if (err < 0)
-                        return err;
-
+                dec_reg = &hw->settings->decimator[sensor->id];
+                if (dec_reg->addr) {
+                        err = st_lsm6dsx_write_with_mask(hw, dec_reg->addr,
+                                                         dec_reg->mask, data);
+                        if (err < 0)
+                                return err;
+                }
                 sip += sensor->sip;
         }
         hw->sip = sip;
@@ -139,23 +135,10 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw)
 int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw,
                              enum st_lsm6dsx_fifo_mode fifo_mode)
 {
-        u8 data;
         int err;
 
-        switch (fifo_mode) {
-        case ST_LSM6DSX_FIFO_BYPASS:
-                data = fifo_mode;
-                break;
-        case ST_LSM6DSX_FIFO_CONT:
-                data = (ST_LSM6DSX_MAX_FIFO_ODR_VAL <<
-                        __ffs(ST_LSM6DSX_FIFO_ODR_MASK)) | fifo_mode;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        err = hw->tf->write(hw->dev, ST_LSM6DSX_REG_FIFO_MODE_ADDR,
-                            sizeof(data), &data);
+        err = st_lsm6dsx_write_with_mask(hw, ST_LSM6DSX_REG_FIFO_MODE_ADDR,
+                                         ST_LSM6DSX_FIFO_MODE_MASK, fifo_mode);
         if (err < 0)
                 return err;
 
@@ -164,9 +147,20 @@ int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw,
         return 0;
 }
 
+static int st_lsm6dsx_set_fifo_odr(struct st_lsm6dsx_sensor *sensor,
+                                   bool enable)
+{
+        struct st_lsm6dsx_hw *hw = sensor->hw;
+        u8 data;
+
+        data = hw->enable_mask ? ST_LSM6DSX_MAX_FIFO_ODR_VAL : 0;
+        return st_lsm6dsx_write_with_mask(hw, ST_LSM6DSX_REG_FIFO_MODE_ADDR,
+                                          ST_LSM6DSX_FIFO_ODR_MASK, data);
+}
+
 int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor, u16 watermark)
 {
-        u16 fifo_watermark = ~0, cur_watermark, sip = 0;
+        u16 fifo_watermark = ~0, cur_watermark, sip = 0, fifo_th_mask;
         struct st_lsm6dsx_hw *hw = sensor->hw;
         struct st_lsm6dsx_sensor *cur_sensor;
         __le16 wdata;
@@ -191,20 +185,21 @@ int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor, u16 watermark)
 
         fifo_watermark = max_t(u16, fifo_watermark, sip);
         fifo_watermark = (fifo_watermark / sip) * sip;
-        fifo_watermark = fifo_watermark * ST_LSM6DSX_SAMPLE_DEPTH;
+        fifo_watermark = fifo_watermark * hw->settings->fifo_ops.th_wl;
 
         mutex_lock(&hw->lock);
 
-        err = hw->tf->read(hw->dev, ST_LSM6DSX_REG_FIFO_THH_ADDR,
+        err = hw->tf->read(hw->dev, hw->settings->fifo_ops.fifo_th.addr + 1,
                            sizeof(data), &data);
         if (err < 0)
                 goto out;
 
-        fifo_watermark = ((data << 8) & ~ST_LSM6DSX_FIFO_TH_MASK) |
-                         (fifo_watermark & ST_LSM6DSX_FIFO_TH_MASK);
+        fifo_th_mask = hw->settings->fifo_ops.fifo_th.mask;
+        fifo_watermark = ((data << 8) & ~fifo_th_mask) |
+                         (fifo_watermark & fifo_th_mask);
 
         wdata = cpu_to_le16(fifo_watermark);
-        err = hw->tf->write(hw->dev, ST_LSM6DSX_REG_FIFO_THL_ADDR,
+        err = hw->tf->write(hw->dev, hw->settings->fifo_ops.fifo_th.addr,
                             sizeof(wdata), (u8 *)&wdata);
 out:
         mutex_unlock(&hw->lock);
@@ -223,6 +218,7 @@ out:
 static int st_lsm6dsx_read_fifo(struct st_lsm6dsx_hw *hw)
 {
         u16 fifo_len, pattern_len = hw->sip * ST_LSM6DSX_SAMPLE_SIZE;
+        u16 fifo_diff_mask = hw->settings->fifo_ops.fifo_diff.mask;
         int err, acc_sip, gyro_sip, read_len, samples, offset;
         struct st_lsm6dsx_sensor *acc_sensor, *gyro_sensor;
         s64 acc_ts, acc_delta_ts, gyro_ts, gyro_delta_ts;
@@ -230,7 +226,7 @@ static int st_lsm6dsx_read_fifo(struct st_lsm6dsx_hw *hw)
         u8 buff[pattern_len];
         __le16 fifo_status;
 
-        err = hw->tf->read(hw->dev, ST_LSM6DSX_REG_FIFO_DIFFL_ADDR,
+        err = hw->tf->read(hw->dev, hw->settings->fifo_ops.fifo_diff.addr,
                            sizeof(fifo_status), (u8 *)&fifo_status);
         if (err < 0)
                 return err;
@@ -238,7 +234,7 @@ static int st_lsm6dsx_read_fifo(struct st_lsm6dsx_hw *hw)
         if (fifo_status & cpu_to_le16(ST_LSM6DSX_FIFO_EMPTY_MASK))
                 return 0;
 
-        fifo_len = (le16_to_cpu(fifo_status) & ST_LSM6DSX_FIFO_DIFF_MASK) *
+        fifo_len = (le16_to_cpu(fifo_status) & fifo_diff_mask) *
                    ST_LSM6DSX_CHAN_SIZE;
         samples = fifo_len / ST_LSM6DSX_SAMPLE_SIZE;
         fifo_len = (fifo_len / pattern_len) * pattern_len;
@@ -345,6 +341,10 @@ static int st_lsm6dsx_update_fifo(struct iio_dev *iio_dev, bool enable)
                         return err;
         }
 
+        err = st_lsm6dsx_set_fifo_odr(sensor, enable);
+        if (err < 0)
+                return err;
+
         err = st_lsm6dsx_update_decimators(hw);
         if (err < 0)
                 return err;
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
index b485540da89e..239c735242be 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
@@ -42,8 +42,6 @@
 
 #include "st_lsm6dsx.h"
 
-#define ST_LSM6DSX_REG_ACC_DEC_MASK             GENMASK(2, 0)
-#define ST_LSM6DSX_REG_GYRO_DEC_MASK            GENMASK(5, 3)
 #define ST_LSM6DSX_REG_INT1_ADDR                0x0d
 #define ST_LSM6DSX_REG_INT2_ADDR                0x0e
 #define ST_LSM6DSX_REG_FIFO_FTH_IRQ_MASK        BIT(3)
@@ -54,10 +52,6 @@
 #define ST_LSM6DSX_REG_BDU_MASK                 BIT(6)
 #define ST_LSM6DSX_REG_INT2_ON_INT1_ADDR        0x13
 #define ST_LSM6DSX_REG_INT2_ON_INT1_MASK        BIT(5)
-#define ST_LSM6DSX_REG_ROUNDING_ADDR            0x16
-#define ST_LSM6DSX_REG_ROUNDING_MASK            BIT(2)
-#define ST_LSM6DSX_REG_LIR_ADDR                 0x58
-#define ST_LSM6DSX_REG_LIR_MASK                 BIT(0)
 
 #define ST_LSM6DSX_REG_ACC_ODR_ADDR             0x10
 #define ST_LSM6DSX_REG_ACC_ODR_MASK             GENMASK(7, 4)
@@ -160,25 +154,88 @@ static const struct st_lsm6dsx_fs_table_entry st_lsm6dsx_fs_table[] = {
 static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
         {
                 .wai = 0x69,
-                .max_fifo_size = 8192,
+                .max_fifo_size = 1365,
                 .id = {
                         [0] = ST_LSM6DS3_ID,
                 },
+                .decimator = {
+                        [ST_LSM6DSX_ID_ACC] = {
+                                .addr = 0x08,
+                                .mask = GENMASK(2, 0),
+                        },
+                        [ST_LSM6DSX_ID_GYRO] = {
+                                .addr = 0x08,
+                                .mask = GENMASK(5, 3),
+                        },
+                },
+                .fifo_ops = {
+                        .fifo_th = {
+                                .addr = 0x06,
+                                .mask = GENMASK(11, 0),
+                        },
+                        .fifo_diff = {
+                                .addr = 0x3a,
+                                .mask = GENMASK(11, 0),
+                        },
+                        .th_wl = 3, /* 1LSB = 2B */
+                },
         },
         {
                 .wai = 0x69,
-                .max_fifo_size = 4096,
+                .max_fifo_size = 682,
                 .id = {
                         [0] = ST_LSM6DS3H_ID,
                 },
+                .decimator = {
+                        [ST_LSM6DSX_ID_ACC] = {
+                                .addr = 0x08,
+                                .mask = GENMASK(2, 0),
+                        },
+                        [ST_LSM6DSX_ID_GYRO] = {
+                                .addr = 0x08,
+                                .mask = GENMASK(5, 3),
+                        },
+                },
+                .fifo_ops = {
+                        .fifo_th = {
+                                .addr = 0x06,
+                                .mask = GENMASK(11, 0),
+                        },
+                        .fifo_diff = {
+                                .addr = 0x3a,
+                                .mask = GENMASK(11, 0),
+                        },
+                        .th_wl = 3, /* 1LSB = 2B */
+                },
         },
         {
                 .wai = 0x6a,
-                .max_fifo_size = 4096,
+                .max_fifo_size = 682,
                 .id = {
                         [0] = ST_LSM6DSL_ID,
                         [1] = ST_LSM6DSM_ID,
                 },
+                .decimator = {
+                        [ST_LSM6DSX_ID_ACC] = {
+                                .addr = 0x08,
+                                .mask = GENMASK(2, 0),
+                        },
+                        [ST_LSM6DSX_ID_GYRO] = {
+                                .addr = 0x08,
+                                .mask = GENMASK(5, 3),
+                        },
+                },
+                .fifo_ops = {
+                        .fifo_th = {
+                                .addr = 0x06,
+                                .mask = GENMASK(11, 0),
+                        },
+                        .fifo_diff = {
+                                .addr = 0x3a,
+                                .mask = GENMASK(11, 0),
+                        },
+                        .th_wl = 3, /* 1LSB = 2B */
+                },
         },
 };
 
@@ -322,7 +379,6 @@ static int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr,
                 return -EINVAL;
 
         *val = st_lsm6dsx_odr_table[sensor->id].odr_avl[i].val;
-        sensor->odr = odr;
 
         return 0;
 }
@@ -449,6 +505,8 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_dev,
                 u8 data;
 
                 err = st_lsm6dsx_check_odr(sensor, val, &data);
+                if (!err)
+                        sensor->odr = val;
                 break;
         }
         default:
@@ -465,10 +523,9 @@ static int st_lsm6dsx_set_watermark(struct iio_dev *iio_dev, unsigned int val)
 {
         struct st_lsm6dsx_sensor *sensor = iio_priv(iio_dev);
         struct st_lsm6dsx_hw *hw = sensor->hw;
-        int err, max_fifo_len;
+        int err;
 
-        max_fifo_len = hw->settings->max_fifo_size / ST_LSM6DSX_SAMPLE_SIZE;
-        if (val < 1 || val > max_fifo_len)
+        if (val < 1 || val > hw->settings->max_fifo_size)
                 return -EINVAL;
 
         err = st_lsm6dsx_update_watermark(sensor, val);
@@ -530,7 +587,6 @@ static const struct attribute_group st_lsm6dsx_acc_attribute_group = {
 };
 
 static const struct iio_info st_lsm6dsx_acc_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &st_lsm6dsx_acc_attribute_group,
         .read_raw = st_lsm6dsx_read_raw,
         .write_raw = st_lsm6dsx_write_raw,
@@ -548,7 +604,6 @@ static const struct attribute_group st_lsm6dsx_gyro_attribute_group = {
 };
 
 static const struct iio_info st_lsm6dsx_gyro_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &st_lsm6dsx_gyro_attribute_group,
         .read_raw = st_lsm6dsx_read_raw,
         .write_raw = st_lsm6dsx_write_raw,
@@ -608,23 +663,12 @@ static int st_lsm6dsx_init_device(struct st_lsm6dsx_hw *hw)
 
         msleep(200);
 
-        /* latch interrupts */
-        err = st_lsm6dsx_write_with_mask(hw, ST_LSM6DSX_REG_LIR_ADDR,
-                                         ST_LSM6DSX_REG_LIR_MASK, 1);
-        if (err < 0)
-                return err;
-
         /* enable Block Data Update */
         err = st_lsm6dsx_write_with_mask(hw, ST_LSM6DSX_REG_BDU_ADDR,
                                          ST_LSM6DSX_REG_BDU_MASK, 1);
         if (err < 0)
                 return err;
 
-        err = st_lsm6dsx_write_with_mask(hw, ST_LSM6DSX_REG_ROUNDING_ADDR,
-                                         ST_LSM6DSX_REG_ROUNDING_MASK, 1);
-        if (err < 0)
-                return err;
-
         /* enable FIFO watermak interrupt */
         err = st_lsm6dsx_get_drdy_reg(hw, &drdy_int_reg);
         if (err < 0)
@@ -662,7 +706,6 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,
                 iio_dev->num_channels = ARRAY_SIZE(st_lsm6dsx_acc_channels);
                 iio_dev->info = &st_lsm6dsx_acc_info;
 
-                sensor->decimator_mask = ST_LSM6DSX_REG_ACC_DEC_MASK;
                 scnprintf(sensor->name, sizeof(sensor->name), "%s_accel",
                           name);
                 break;
@@ -671,7 +714,6 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struct st_lsm6dsx_hw *hw,
                 iio_dev->num_channels = ARRAY_SIZE(st_lsm6dsx_gyro_channels);
                 iio_dev->info = &st_lsm6dsx_gyro_info;
 
-                sensor->decimator_mask = ST_LSM6DSX_REG_GYRO_DEC_MASK;
                 scnprintf(sensor->name, sizeof(sensor->name), "%s_gyro",
                           name);
                 break;
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index a47428b4d31b..9c4cfd19b739 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -1662,14 +1662,11 @@ static int iio_check_unique_scan_index(struct iio_dev *indio_dev)
 
 static const struct iio_buffer_setup_ops noop_ring_setup_ops;
 
-/**
- * iio_device_register() - register a device with the IIO subsystem
- * @indio_dev:          Device structure filled by the device driver
- **/
-int iio_device_register(struct iio_dev *indio_dev)
+int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod)
 {
         int ret;
 
+        indio_dev->driver_module = this_mod;
         /* If the calling driver did not initialize of_node, do it here */
         if (!indio_dev->dev.of_node && indio_dev->dev.parent)
                 indio_dev->dev.of_node = indio_dev->dev.parent->of_node;
@@ -1715,7 +1712,8 @@ int iio_device_register(struct iio_dev *indio_dev)
                 indio_dev->setup_ops = &noop_ring_setup_ops;
 
         cdev_init(&indio_dev->chrdev, &iio_buffer_fileops);
-        indio_dev->chrdev.owner = indio_dev->info->driver_module;
+
+        indio_dev->chrdev.owner = this_mod;
 
         ret = cdev_device_add(&indio_dev->chrdev, &indio_dev->dev);
         if (ret < 0)
@@ -1733,7 +1731,7 @@ error_unreg_debugfs:
         iio_device_unregister_debugfs(indio_dev);
         return ret;
 }
-EXPORT_SYMBOL(iio_device_register);
+EXPORT_SYMBOL(__iio_device_register);
 
 /**
  * iio_device_unregister() - unregister a device from the IIO subsystem
@@ -1765,23 +1763,8 @@ static void devm_iio_device_unreg(struct device *dev, void *res)
         iio_device_unregister(*(struct iio_dev **)res);
 }
 
-/**
- * devm_iio_device_register - Resource-managed iio_device_register()
- * @dev:        Device to allocate iio_dev for
- * @indio_dev:  Device structure filled by the device driver
- *
- * Managed iio_device_register.  The IIO device registered with this
- * function is automatically unregistered on driver detach. This function
- * calls iio_device_register() internally. Refer to that function for more
- * information.
- *
- * If an iio_dev registered with this function needs to be unregistered
- * separately, devm_iio_device_unregister() must be used.
- *
- * RETURNS:
- * 0 on success, negative error number on failure.
- */
-int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev)
+int __devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev,
+                               struct module *this_mod)
 {
         struct iio_dev **ptr;
         int ret;
@@ -1791,7 +1774,7 @@ int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev)
                 return -ENOMEM;
 
         *ptr = indio_dev;
-        ret = iio_device_register(indio_dev);
+        ret = __iio_device_register(indio_dev, this_mod);
         if (!ret)
                 devres_add(dev, ptr);
         else
@@ -1799,7 +1782,7 @@ int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev)
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(devm_iio_device_register);
+EXPORT_SYMBOL_GPL(__devm_iio_device_register);
 
 /**
  * devm_iio_device_unregister - Resource-managed iio_device_unregister()
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 4061fed93f1f..ce66699c7fcc 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -66,13 +66,12 @@ ATTRIBUTE_GROUPS(iio_trig_dev);
 
 static struct iio_trigger *__iio_trigger_find_by_name(const char *name);
 
-int iio_trigger_register(struct iio_trigger *trig_info)
+int __iio_trigger_register(struct iio_trigger *trig_info,
+                           struct module *this_mod)
 {
         int ret;
 
-        /* trig_info->ops is required for the module member */
-        if (!trig_info->ops)
-                return -EINVAL;
+        trig_info->owner = this_mod;
 
         trig_info->id = ida_simple_get(&iio_trigger_ida, 0, 0, GFP_KERNEL);
         if (trig_info->id < 0)
@@ -105,7 +104,7 @@ error_unregister_id:
         ida_simple_remove(&iio_trigger_ida, trig_info->id);
         return ret;
 }
-EXPORT_SYMBOL(iio_trigger_register);
+EXPORT_SYMBOL(__iio_trigger_register);
 
 void iio_trigger_unregister(struct iio_trigger *trig_info)
 {
@@ -206,7 +205,8 @@ EXPORT_SYMBOL(iio_trigger_poll_chained);
 
 void iio_trigger_notify_done(struct iio_trigger *trig)
 {
-        if (atomic_dec_and_test(&trig->use_count) && trig->ops->try_reenable)
+        if (atomic_dec_and_test(&trig->use_count) && trig->ops &&
+            trig->ops->try_reenable)
                 if (trig->ops->try_reenable(trig))
                         /* Missed an interrupt so launch new poll now */
                         iio_trigger_poll(trig);
@@ -250,7 +250,7 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
                 = bitmap_empty(trig->pool, CONFIG_IIO_CONSUMERS_PER_TRIGGER);
 
         /* Prevent the module from being removed whilst attached to a trigger */
-        __module_get(pf->indio_dev->info->driver_module);
+        __module_get(pf->indio_dev->driver_module);
 
         /* Get irq number */
         pf->irq = iio_trigger_get_irq(trig);
@@ -265,7 +265,7 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
                 goto out_put_irq;
 
         /* Enable trigger in driver */
-        if (trig->ops->set_trigger_state && notinuse) {
+        if (trig->ops && trig->ops->set_trigger_state && notinuse) {
                 ret = trig->ops->set_trigger_state(trig, true);
                 if (ret < 0)
                         goto out_free_irq;
@@ -286,7 +286,7 @@ out_free_irq:
 out_put_irq:
         iio_trigger_put_irq(trig, pf->irq);
 out_put_module:
-        module_put(pf->indio_dev->info->driver_module);
+        module_put(pf->indio_dev->driver_module);
         return ret;
 }
 
@@ -298,7 +298,7 @@ static int iio_trigger_detach_poll_func(struct iio_trigger *trig,
                 = (bitmap_weight(trig->pool,
                                  CONFIG_IIO_CONSUMERS_PER_TRIGGER)
                    == 1);
-        if (trig->ops->set_trigger_state && no_other_users) {
+        if (trig->ops && trig->ops->set_trigger_state && no_other_users) {
                 ret = trig->ops->set_trigger_state(trig, false);
                 if (ret)
                         return ret;
@@ -307,7 +307,7 @@ static int iio_trigger_detach_poll_func(struct iio_trigger *trig,
                 trig->attached_own_device = false;
         iio_trigger_put_irq(trig, pf->irq);
         free_irq(pf->irq, pf);
-        module_put(pf->indio_dev->info->driver_module);
+        module_put(pf->indio_dev->driver_module);
 
         return ret;
 }
@@ -428,7 +428,7 @@ static ssize_t iio_trigger_write_current(struct device *dev,
                         goto out_trigger_put;
         }
 
-        if (trig && trig->ops->validate_device) {
+        if (trig && trig->ops && trig->ops->validate_device) {
                 ret = trig->ops->validate_device(trig, indio_dev);
                 if (ret)
                         goto out_trigger_put;
@@ -663,9 +663,10 @@ static void devm_iio_trigger_unreg(struct device *dev, void *res)
 }
 
 /**
- * devm_iio_trigger_register - Resource-managed iio_trigger_register()
+ * __devm_iio_trigger_register - Resource-managed iio_trigger_register()
  * @dev:        device this trigger was allocated for
  * @trig_info:  trigger to register
+ * @this_mod:   module registering the trigger
  *
  * Managed iio_trigger_register().  The IIO trigger registered with this
  * function is automatically unregistered on driver detach. This function
@@ -678,7 +679,9 @@ static void devm_iio_trigger_unreg(struct device *dev, void *res)
  * RETURNS:
  * 0 on success, negative error number on failure.
  */
-int devm_iio_trigger_register(struct device *dev, struct iio_trigger *trig_info)
+int __devm_iio_trigger_register(struct device *dev,
+                                struct iio_trigger *trig_info,
+                                struct module *this_mod)
 {
         struct iio_trigger **ptr;
         int ret;
@@ -688,7 +691,7 @@ int devm_iio_trigger_register(struct device *dev, struct iio_trigger *trig_info)
                 return -ENOMEM;
 
         *ptr = trig_info;
-        ret = iio_trigger_register(trig_info);
+        ret = __iio_trigger_register(trig_info, this_mod);
         if (!ret)
                 devres_add(dev, ptr);
         else
@@ -696,7 +699,7 @@ int devm_iio_trigger_register(struct device *dev, struct iio_trigger *trig_info)
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(devm_iio_trigger_register);
+EXPORT_SYMBOL_GPL(__devm_iio_trigger_register);
 
 /**
  * devm_iio_trigger_unregister - Resource-managed iio_trigger_unregister()
diff --git a/drivers/iio/light/acpi-als.c b/drivers/iio/light/acpi-als.c
index f0b47c501f4e..c35e2f8df339 100644
--- a/drivers/iio/light/acpi-als.c
+++ b/drivers/iio/light/acpi-als.c
@@ -171,7 +171,6 @@ static int acpi_als_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info acpi_als_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = acpi_als_read_raw,
 };
 
diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c
index 0113fc843a81..e45bb6a277c2 100644
--- a/drivers/iio/light/adjd_s311.c
+++ b/drivers/iio/light/adjd_s311.c
@@ -245,7 +245,6 @@ static const struct iio_info adjd_s311_info = {
         .read_raw = adjd_s311_read_raw,
         .write_raw = adjd_s311_write_raw,
         .update_scan_mode = adjd_s311_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static int adjd_s311_probe(struct i2c_client *client,
diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
index 6aac6513fd41..66623facea9a 100644
--- a/drivers/iio/light/al3320a.c
+++ b/drivers/iio/light/al3320a.c
@@ -168,7 +168,6 @@ static int al3320a_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info al3320a_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = al3320a_read_raw,
         .write_raw      = al3320a_write_raw,
         .attrs          = &al3320a_attribute_group,
diff --git a/drivers/iio/light/apds9300.c b/drivers/iio/light/apds9300.c
index 05eacd1ee40f..5c15736fb93e 100644
--- a/drivers/iio/light/apds9300.c
+++ b/drivers/iio/light/apds9300.c
@@ -337,12 +337,10 @@ static int apds9300_write_interrupt_config(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info apds9300_info_no_irq = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = apds9300_read_raw,
 };
 
 static const struct iio_info apds9300_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = apds9300_read_raw,
         .read_event_value       = apds9300_read_thresh,
         .write_event_value      = apds9300_write_thresh,
diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c
index 518a47e9377b..a8fa00e31c39 100644
--- a/drivers/iio/light/apds9960.c
+++ b/drivers/iio/light/apds9960.c
@@ -744,7 +744,6 @@ static int apds9960_write_event_config(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info apds9960_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &apds9960_attribute_group,
         .read_raw = apds9960_read_raw,
         .write_raw = apds9960_write_raw,
diff --git a/drivers/iio/light/bh1750.c b/drivers/iio/light/bh1750.c
index 6c61187e630f..a814828e69f5 100644
--- a/drivers/iio/light/bh1750.c
+++ b/drivers/iio/light/bh1750.c
@@ -217,7 +217,6 @@ static const struct attribute_group bh1750_attribute_group = {
 };
 
 static const struct iio_info bh1750_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &bh1750_attribute_group,
         .read_raw = bh1750_read_raw,
         .write_raw = bh1750_write_raw,
diff --git a/drivers/iio/light/bh1780.c b/drivers/iio/light/bh1780.c
index b54dcba05a82..036f3bbe323c 100644
--- a/drivers/iio/light/bh1780.c
+++ b/drivers/iio/light/bh1780.c
@@ -128,7 +128,6 @@ static int bh1780_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info bh1780_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = bh1780_read_raw,
         .debugfs_reg_access = bh1780_debugfs_reg_access,
 };
diff --git a/drivers/iio/light/cm32181.c b/drivers/iio/light/cm32181.c
index d6fd0dace74f..aebf7dd071af 100644
--- a/drivers/iio/light/cm32181.c
+++ b/drivers/iio/light/cm32181.c
@@ -292,7 +292,6 @@ static const struct attribute_group cm32181_attribute_group = {
 };
 
 static const struct iio_info cm32181_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = &cm32181_read_raw,
         .write_raw              = &cm32181_write_raw,
         .attrs                  = &cm32181_attribute_group,
diff --git a/drivers/iio/light/cm3232.c b/drivers/iio/light/cm3232.c
index 263e97235ea0..c639cf276ee6 100644
--- a/drivers/iio/light/cm3232.c
+++ b/drivers/iio/light/cm3232.c
@@ -322,7 +322,6 @@ static const struct attribute_group cm3232_attribute_group = {
 };
 
 static const struct iio_info cm3232_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = &cm3232_read_raw,
         .write_raw              = &cm3232_write_raw,
         .attrs                  = &cm3232_attribute_group,
diff --git a/drivers/iio/light/cm3323.c b/drivers/iio/light/cm3323.c
index d823c112d54b..83b08b6dc60f 100644
--- a/drivers/iio/light/cm3323.c
+++ b/drivers/iio/light/cm3323.c
@@ -211,7 +211,6 @@ static int cm3323_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info cm3323_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = cm3323_read_raw,
         .write_raw      = cm3323_write_raw,
         .attrs          = &cm3323_attribute_group,
diff --git a/drivers/iio/light/cm3605.c b/drivers/iio/light/cm3605.c
index 980624e9ffb5..e454bc6a33c6 100644
--- a/drivers/iio/light/cm3605.c
+++ b/drivers/iio/light/cm3605.c
@@ -126,7 +126,6 @@ static int cm3605_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info cm3605_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = cm3605_read_raw,
 };
 
diff --git a/drivers/iio/light/cm36651.c b/drivers/iio/light/cm36651.c
index 9d66e89c57ef..1dd8ed0121b3 100644
--- a/drivers/iio/light/cm36651.c
+++ b/drivers/iio/light/cm36651.c
@@ -612,7 +612,6 @@ static const struct attribute_group cm36651_attribute_group = {
 };
 
 static const struct iio_info cm36651_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = &cm36651_read_raw,
         .write_raw              = &cm36651_write_raw,
         .read_event_value       = &cm36651_read_prox_thresh,
diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c
index 721722376fd0..b2a46b390d5c 100644
--- a/drivers/iio/light/cros_ec_light_prox.c
+++ b/drivers/iio/light/cros_ec_light_prox.c
@@ -175,7 +175,6 @@ static int cros_ec_light_prox_write(struct iio_dev *indio_dev,
 static const struct iio_info cros_ec_light_prox_info = {
         .read_raw = &cros_ec_light_prox_read,
         .write_raw = &cros_ec_light_prox_write,
-        .driver_module = THIS_MODULE,
 };
 
 static int cros_ec_light_prox_probe(struct platform_device *pdev)
diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a00f.c
index 6ada9149f142..44b13fbcd093 100644
--- a/drivers/iio/light/gp2ap020a00f.c
+++ b/drivers/iio/light/gp2ap020a00f.c
@@ -1384,7 +1384,6 @@ static const struct iio_info gp2ap020a00f_info = {
         .read_event_config = &gp2ap020a00f_read_event_config,
         .write_event_value = &gp2ap020a00f_write_event_val,
         .write_event_config = &gp2ap020a00f_write_event_config,
-        .driver_module = THIS_MODULE,
 };
 
 static int gp2ap020a00f_buffer_postenable(struct iio_dev *indio_dev)
@@ -1481,7 +1480,6 @@ static const struct iio_buffer_setup_ops gp2ap020a00f_buffer_setup_ops = {
 };
 
 static const struct iio_trigger_ops gp2ap020a00f_trigger_ops = {
-        .owner = THIS_MODULE,
 };
 
 static int gp2ap020a00f_probe(struct i2c_client *client,
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index 059d964772c7..befd693a4a31 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -177,7 +177,6 @@ static int als_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info als_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &als_read_raw,
         .write_raw = &als_write_raw,
 };
diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c
index 73fced8a63b7..45107f7537b5 100644
--- a/drivers/iio/light/hid-sensor-prox.c
+++ b/drivers/iio/light/hid-sensor-prox.c
@@ -156,7 +156,6 @@ static int prox_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info prox_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &prox_read_raw,
         .write_raw = &prox_write_raw,
 };
diff --git a/drivers/iio/light/isl29018.c b/drivers/iio/light/isl29018.c
index 61f5924b472d..b45400f8fef4 100644
--- a/drivers/iio/light/isl29018.c
+++ b/drivers/iio/light/isl29018.c
@@ -624,14 +624,12 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
 
 static const struct iio_info isl29018_info = {
         .attrs = &isl29018_group,
-        .driver_module = THIS_MODULE,
         .read_raw = isl29018_read_raw,
         .write_raw = isl29018_write_raw,
 };
 
 static const struct iio_info isl29023_info = {
         .attrs = &isl29023_group,
-        .driver_module = THIS_MODULE,
         .read_raw = isl29018_read_raw,
         .write_raw = isl29018_write_raw,
 };
diff --git a/drivers/iio/light/isl29028.c b/drivers/iio/light/isl29028.c
index 3d09c1fc4dad..f9912ab4f65c 100644
--- a/drivers/iio/light/isl29028.c
+++ b/drivers/iio/light/isl29028.c
@@ -536,7 +536,6 @@ static const struct iio_chan_spec isl29028_channels[] = {
 
 static const struct iio_info isl29028_info = {
         .attrs = &isl29108_group,
-        .driver_module = THIS_MODULE,
         .read_raw = isl29028_read_raw,
         .write_raw = isl29028_write_raw,
 };
diff --git a/drivers/iio/light/isl29125.c b/drivers/iio/light/isl29125.c
index 1d2c0c8a1d4f..ed38edcd5efe 100644
--- a/drivers/iio/light/isl29125.c
+++ b/drivers/iio/light/isl29125.c
@@ -214,7 +214,6 @@ static const struct iio_info isl29125_info = {
         .read_raw = isl29125_read_raw,
         .write_raw = isl29125_write_raw,
         .attrs = &isl29125_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int isl29125_buffer_preenable(struct iio_dev *indio_dev)
diff --git a/drivers/iio/light/jsa1212.c b/drivers/iio/light/jsa1212.c
index e8a8931b4f50..811505d925b3 100644
--- a/drivers/iio/light/jsa1212.c
+++ b/drivers/iio/light/jsa1212.c
@@ -271,7 +271,6 @@ static const struct iio_chan_spec jsa1212_channels[] = {
 };
 
 static const struct iio_info jsa1212_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = &jsa1212_read_raw,
 };
 
diff --git a/drivers/iio/light/lm3533-als.c b/drivers/iio/light/lm3533-als.c
index 0443fd2e8757..36208a3652e9 100644
--- a/drivers/iio/light/lm3533-als.c
+++ b/drivers/iio/light/lm3533-als.c
@@ -827,7 +827,6 @@ static int lm3533_als_disable(struct lm3533_als *als)
 static const struct iio_info lm3533_als_info = {
         .attrs          = &lm3533_als_attribute_group,
         .event_attrs    = &lm3533_als_event_attribute_group,
-        .driver_module  = THIS_MODULE,
         .read_raw       = &lm3533_als_read_raw,
 };
 
diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c
index 67838edd8b37..830a2d45aa4d 100644
--- a/drivers/iio/light/ltr501.c
+++ b/drivers/iio/light/ltr501.c
@@ -1158,7 +1158,6 @@ static const struct iio_info ltr501_info_no_irq = {
         .read_raw = ltr501_read_raw,
         .write_raw = ltr501_write_raw,
         .attrs = &ltr501_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_info ltr501_info = {
@@ -1169,14 +1168,12 @@ static const struct iio_info ltr501_info = {
         .write_event_value      = &ltr501_write_event,
         .read_event_config      = &ltr501_read_event_config,
         .write_event_config     = &ltr501_write_event_config,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_info ltr301_info_no_irq = {
         .read_raw = ltr501_read_raw,
         .write_raw = ltr501_write_raw,
         .attrs = &ltr301_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_info ltr301_info = {
@@ -1187,7 +1184,6 @@ static const struct iio_info ltr301_info = {
         .write_event_value      = &ltr501_write_event,
         .read_event_config      = &ltr501_read_event_config,
         .write_event_config     = &ltr501_write_event_config,
-        .driver_module = THIS_MODULE,
 };
 
 static struct ltr501_chip_info ltr501_chip_info_tbl[] = {
diff --git a/drivers/iio/light/max44000.c b/drivers/iio/light/max44000.c
index 81bd8e8da4a6..bcdb0eb9e537 100644
--- a/drivers/iio/light/max44000.c
+++ b/drivers/iio/light/max44000.c
@@ -402,7 +402,6 @@ static const struct attribute_group max44000_attribute_group = {
 };
 
 static const struct iio_info max44000_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = max44000_read_raw,
         .write_raw              = max44000_write_raw,
         .write_raw_get_fmt      = max44000_write_raw_get_fmt,
diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c
index b91ebc3483ce..54d88b60e303 100644
--- a/drivers/iio/light/opt3001.c
+++ b/drivers/iio/light/opt3001.c
@@ -585,7 +585,6 @@ err:
 }
 
 static const struct iio_info opt3001_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &opt3001_attribute_group,
         .read_raw = opt3001_read_raw,
         .write_raw = opt3001_write_raw,
diff --git a/drivers/iio/light/pa12203001.c b/drivers/iio/light/pa12203001.c
index 76a9e12b46bc..30ea1a088dd9 100644
--- a/drivers/iio/light/pa12203001.c
+++ b/drivers/iio/light/pa12203001.c
@@ -306,7 +306,6 @@ static int pa12203001_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info pa12203001_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw = pa12203001_read_raw,
         .write_raw = pa12203001_write_raw,
         .attrs = &pa12203001_attr_group,
diff --git a/drivers/iio/light/rpr0521.c b/drivers/iio/light/rpr0521.c
index a6efa12613a2..ffe9ce798ea2 100644
--- a/drivers/iio/light/rpr0521.c
+++ b/drivers/iio/light/rpr0521.c
@@ -538,7 +538,6 @@ static int rpr0521_pxs_drdy_set_state(struct iio_trigger *trigger,
 
 static const struct iio_trigger_ops rpr0521_trigger_ops = {
         .set_trigger_state = rpr0521_pxs_drdy_set_state,
-        .owner = THIS_MODULE,
         };
 
 
@@ -830,7 +829,6 @@ static int rpr0521_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info rpr0521_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = rpr0521_read_raw,
         .write_raw      = rpr0521_write_raw,
         .attrs          = &rpr0521_attribute_group,
diff --git a/drivers/iio/light/si1145.c b/drivers/iio/light/si1145.c
index 096034c126a4..76f16f9c7616 100644
--- a/drivers/iio/light/si1145.c
+++ b/drivers/iio/light/si1145.c
@@ -989,14 +989,12 @@ static const struct attribute_group si114x_attribute_group = {
 static const struct iio_info si1132_info = {
         .read_raw = si1145_read_raw,
         .write_raw = si1145_write_raw,
-        .driver_module = THIS_MODULE,
         .attrs = &si1132_attribute_group,
 };
 
 static const struct iio_info si114x_info = {
         .read_raw = si1145_read_raw,
         .write_raw = si1145_write_raw,
-        .driver_module = THIS_MODULE,
         .attrs = &si114x_attribute_group,
 };
 
@@ -1237,7 +1235,6 @@ disable:
 }
 
 static const struct iio_trigger_ops si1145_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = si1145_trigger_set_state,
 };
 
diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
index 45cf8b0a4363..6e2a169da950 100644
--- a/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@ -409,7 +409,6 @@ static int stk3310_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info stk3310_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = stk3310_read_raw,
         .write_raw              = stk3310_write_raw,
         .attrs                  = &stk3310_attribute_group,
diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c
index a795afb7667b..205e5659ce6b 100644
--- a/drivers/iio/light/tcs3414.c
+++ b/drivers/iio/light/tcs3414.c
@@ -241,7 +241,6 @@ static const struct iio_info tcs3414_info = {
         .read_raw = tcs3414_read_raw,
         .write_raw = tcs3414_write_raw,
         .attrs = &tcs3414_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int tcs3414_buffer_preenable(struct iio_dev *indio_dev)
diff --git a/drivers/iio/light/tcs3472.c b/drivers/iio/light/tcs3472.c
index 09e6ca5e332e..e7923b514d7a 100644
--- a/drivers/iio/light/tcs3472.c
+++ b/drivers/iio/light/tcs3472.c
@@ -13,7 +13,7 @@
  *
  * Datasheet: http://ams.com/eng/content/download/319364/1117183/file/TCS3472_Datasheet_EN_v2.pdf
  *
- * TODO: interrupt support, thresholds, wait time
+ * TODO: wait time
  */
 
 #include <linux/module.h>
@@ -23,6 +23,7 @@
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
+#include <linux/iio/events.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/buffer.h>
 #include <linux/iio/triggered_buffer.h>
@@ -31,12 +32,15 @@
 
 #define TCS3472_COMMAND BIT(7)
 #define TCS3472_AUTO_INCR BIT(5)
+#define TCS3472_SPECIAL_FUNC (BIT(5) | BIT(6))
+
+#define TCS3472_INTR_CLEAR (TCS3472_COMMAND | TCS3472_SPECIAL_FUNC | 0x06)
 
 #define TCS3472_ENABLE (TCS3472_COMMAND | 0x00)
 #define TCS3472_ATIME (TCS3472_COMMAND | 0x01)
 #define TCS3472_WTIME (TCS3472_COMMAND | 0x03)
-#define TCS3472_AILT (TCS3472_COMMAND | 0x04)
-#define TCS3472_AIHT (TCS3472_COMMAND | 0x06)
+#define TCS3472_AILT (TCS3472_COMMAND | TCS3472_AUTO_INCR | 0x04)
+#define TCS3472_AIHT (TCS3472_COMMAND | TCS3472_AUTO_INCR | 0x06)
 #define TCS3472_PERS (TCS3472_COMMAND | 0x0c)
 #define TCS3472_CONFIG (TCS3472_COMMAND | 0x0d)
 #define TCS3472_CONTROL (TCS3472_COMMAND | 0x0f)
@@ -47,19 +51,42 @@
 #define TCS3472_GDATA (TCS3472_COMMAND | TCS3472_AUTO_INCR | 0x18)
 #define TCS3472_BDATA (TCS3472_COMMAND | TCS3472_AUTO_INCR | 0x1a)
 
+#define TCS3472_STATUS_AINT BIT(4)
 #define TCS3472_STATUS_AVALID BIT(0)
+#define TCS3472_ENABLE_AIEN BIT(4)
 #define TCS3472_ENABLE_AEN BIT(1)
 #define TCS3472_ENABLE_PON BIT(0)
 #define TCS3472_CONTROL_AGAIN_MASK (BIT(0) | BIT(1))
 
 struct tcs3472_data {
         struct i2c_client *client;
+        struct mutex lock;
+        u16 low_thresh;
+        u16 high_thresh;
         u8 enable;
         u8 control;
         u8 atime;
+        u8 apers;
         u16 buffer[8]; /* 4 16-bit channels + 64-bit timestamp */
 };
 
+static const struct iio_event_spec tcs3472_events[] = {
+        {
+                .type = IIO_EV_TYPE_THRESH,
+                .dir = IIO_EV_DIR_RISING,
+                .mask_separate = BIT(IIO_EV_INFO_VALUE),
+        }, {
+                .type = IIO_EV_TYPE_THRESH,
+                .dir = IIO_EV_DIR_FALLING,
+                .mask_separate = BIT(IIO_EV_INFO_VALUE),
+        }, {
+                .type = IIO_EV_TYPE_THRESH,
+                .dir = IIO_EV_DIR_EITHER,
+                .mask_separate = BIT(IIO_EV_INFO_ENABLE) |
+                                 BIT(IIO_EV_INFO_PERIOD),
+        },
+};
+
 #define TCS3472_CHANNEL(_color, _si, _addr) { \
         .type = IIO_INTENSITY, \
         .modified = 1, \
@@ -75,6 +102,8 @@ struct tcs3472_data {
                 .storagebits = 16, \
                 .endianness = IIO_CPU, \
         }, \
+        .event_spec = _si ? NULL : tcs3472_events, \
+        .num_event_specs = _si ? 0 : ARRAY_SIZE(tcs3472_events), \
 }
 
 static const int tcs3472_agains[] = { 1, 4, 16, 60 };
@@ -182,6 +211,166 @@ static int tcs3472_write_raw(struct iio_dev *indio_dev,
         return -EINVAL;
 }
 
+/*
+ * Translation from APERS field value to the number of consecutive out-of-range
+ * clear channel values before an interrupt is generated
+ */
+static const int tcs3472_intr_pers[] = {
+        0, 1, 2, 3, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60
+};
+
+static int tcs3472_read_event(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, enum iio_event_type type,
+        enum iio_event_direction dir, enum iio_event_info info, int *val,
+        int *val2)
+{
+        struct tcs3472_data *data = iio_priv(indio_dev);
+        int ret;
+        unsigned int period;
+
+        mutex_lock(&data->lock);
+
+        switch (info) {
+        case IIO_EV_INFO_VALUE:
+                *val = (dir == IIO_EV_DIR_RISING) ?
+                        data->high_thresh : data->low_thresh;
+                ret = IIO_VAL_INT;
+                break;
+        case IIO_EV_INFO_PERIOD:
+                period = (256 - data->atime) * 2400 *
+                        tcs3472_intr_pers[data->apers];
+                *val = period / USEC_PER_SEC;
+                *val2 = period % USEC_PER_SEC;
+                ret = IIO_VAL_INT_PLUS_MICRO;
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+
+        mutex_unlock(&data->lock);
+
+        return ret;
+}
+
+static int tcs3472_write_event(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, enum iio_event_type type,
+        enum iio_event_direction dir, enum iio_event_info info, int val,
+        int val2)
+{
+        struct tcs3472_data *data = iio_priv(indio_dev);
+        int ret;
+        u8 command;
+        int period;
+        int i;
+
+        mutex_lock(&data->lock);
+        switch (info) {
+        case IIO_EV_INFO_VALUE:
+                switch (dir) {
+                case IIO_EV_DIR_RISING:
+                        command = TCS3472_AIHT;
+                        break;
+                case IIO_EV_DIR_FALLING:
+                        command = TCS3472_AILT;
+                        break;
+                default:
+                        ret = -EINVAL;
+                        goto error;
+                }
+                ret = i2c_smbus_write_word_data(data->client, command, val);
+                if (ret)
+                        goto error;
+
+                if (dir == IIO_EV_DIR_RISING)
+                        data->high_thresh = val;
+                else
+                        data->low_thresh = val;
+                break;
+        case IIO_EV_INFO_PERIOD:
+                period = val * USEC_PER_SEC + val2;
+                for (i = 1; i < ARRAY_SIZE(tcs3472_intr_pers) - 1; i++) {
+                        if (period <= (256 - data->atime) * 2400 *
+                                        tcs3472_intr_pers[i])
+                                break;
+                }
+                ret = i2c_smbus_write_byte_data(data->client, TCS3472_PERS, i);
+                if (ret)
+                        goto error;
+
+                data->apers = i;
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+error:
+        mutex_unlock(&data->lock);
+
+        return ret;
+}
+
+static int tcs3472_read_event_config(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, enum iio_event_type type,
+        enum iio_event_direction dir)
+{
+        struct tcs3472_data *data = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&data->lock);
+        ret = !!(data->enable & TCS3472_ENABLE_AIEN);
+        mutex_unlock(&data->lock);
+
+        return ret;
+}
+
+static int tcs3472_write_event_config(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, enum iio_event_type type,
+        enum iio_event_direction dir, int state)
+{
+        struct tcs3472_data *data = iio_priv(indio_dev);
+        int ret = 0;
+        u8 enable_old;
+
+        mutex_lock(&data->lock);
+
+        enable_old = data->enable;
+
+        if (state)
+                data->enable |= TCS3472_ENABLE_AIEN;
+        else
+                data->enable &= ~TCS3472_ENABLE_AIEN;
+
+        if (enable_old != data->enable) {
+                ret = i2c_smbus_write_byte_data(data->client, TCS3472_ENABLE,
+                                                data->enable);
+                if (ret)
+                        data->enable = enable_old;
+        }
+        mutex_unlock(&data->lock);
+
+        return ret;
+}
+
+static irqreturn_t tcs3472_event_handler(int irq, void *priv)
+{
+        struct iio_dev *indio_dev = priv;
+        struct tcs3472_data *data = iio_priv(indio_dev);
+        int ret;
+
+        ret = i2c_smbus_read_byte_data(data->client, TCS3472_STATUS);
+        if (ret >= 0 && (ret & TCS3472_STATUS_AINT)) {
+                iio_push_event(indio_dev, IIO_UNMOD_EVENT_CODE(IIO_INTENSITY, 0,
+                                                IIO_EV_TYPE_THRESH,
+                                                IIO_EV_DIR_EITHER),
+                                iio_get_time_ns(indio_dev));
+
+                i2c_smbus_read_byte_data(data->client, TCS3472_INTR_CLEAR);
+        }
+
+        return IRQ_HANDLED;
+}
+
 static irqreturn_t tcs3472_trigger_handler(int irq, void *p)
 {
         struct iio_poll_func *pf = p;
@@ -245,8 +434,11 @@ static const struct attribute_group tcs3472_attribute_group = {
 static const struct iio_info tcs3472_info = {
         .read_raw = tcs3472_read_raw,
         .write_raw = tcs3472_write_raw,
+        .read_event_value = tcs3472_read_event,
+        .write_event_value = tcs3472_write_event,
+        .read_event_config = tcs3472_read_event_config,
+        .write_event_config = tcs3472_write_event_config,
         .attrs = &tcs3472_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int tcs3472_probe(struct i2c_client *client,
@@ -263,6 +455,7 @@ static int tcs3472_probe(struct i2c_client *client,
         data = iio_priv(indio_dev);
         i2c_set_clientdata(client, indio_dev);
         data->client = client;
+        mutex_init(&data->lock);
 
         indio_dev->dev.parent = &client->dev;
         indio_dev->info = &tcs3472_info;
@@ -292,12 +485,29 @@ static int tcs3472_probe(struct i2c_client *client,
                 return ret;
         data->atime = ret;
 
+        ret = i2c_smbus_read_word_data(data->client, TCS3472_AILT);
+        if (ret < 0)
+                return ret;
+        data->low_thresh = ret;
+
+        ret = i2c_smbus_read_word_data(data->client, TCS3472_AIHT);
+        if (ret < 0)
+                return ret;
+        data->high_thresh = ret;
+
+        data->apers = 1;
+        ret = i2c_smbus_write_byte_data(data->client, TCS3472_PERS,
+                                        data->apers);
+        if (ret < 0)
+                return ret;
+
         ret = i2c_smbus_read_byte_data(data->client, TCS3472_ENABLE);
         if (ret < 0)
                 return ret;
 
         /* enable device */
         data->enable = ret | TCS3472_ENABLE_PON | TCS3472_ENABLE_AEN;
+        data->enable &= ~TCS3472_ENABLE_AIEN;
         ret = i2c_smbus_write_byte_data(data->client, TCS3472_ENABLE,
                 data->enable);
         if (ret < 0)
@@ -308,12 +518,24 @@ static int tcs3472_probe(struct i2c_client *client,
         if (ret < 0)
                 return ret;
 
+        if (client->irq) {
+                ret = request_threaded_irq(client->irq, NULL,
+                                           tcs3472_event_handler,
+                                           IRQF_TRIGGER_FALLING | IRQF_SHARED |
+                                           IRQF_ONESHOT,
+                                           client->name, indio_dev);
+                if (ret)
+                        goto buffer_cleanup;
+        }
+
         ret = iio_device_register(indio_dev);
         if (ret < 0)
-                goto buffer_cleanup;
+                goto free_irq;
 
         return 0;
 
+free_irq:
+        free_irq(client->irq, indio_dev);
 buffer_cleanup:
         iio_triggered_buffer_cleanup(indio_dev);
         return ret;
@@ -321,8 +543,19 @@ buffer_cleanup:
 
 static int tcs3472_powerdown(struct tcs3472_data *data)
 {
-        return i2c_smbus_write_byte_data(data->client, TCS3472_ENABLE,
-                data->enable & ~(TCS3472_ENABLE_AEN | TCS3472_ENABLE_PON));
+        int ret;
+        u8 enable_mask = TCS3472_ENABLE_AEN | TCS3472_ENABLE_PON;
+
+        mutex_lock(&data->lock);
+
+        ret = i2c_smbus_write_byte_data(data->client, TCS3472_ENABLE,
+                data->enable & ~enable_mask);
+        if (!ret)
+                data->enable &= ~enable_mask;
+
+        mutex_unlock(&data->lock);
+
+        return ret;
 }
 
 static int tcs3472_remove(struct i2c_client *client)
@@ -330,6 +563,7 @@ static int tcs3472_remove(struct i2c_client *client)
         struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
         iio_device_unregister(indio_dev);
+        free_irq(client->irq, indio_dev);
         iio_triggered_buffer_cleanup(indio_dev);
         tcs3472_powerdown(iio_priv(indio_dev));
 
@@ -348,8 +582,19 @@ static int tcs3472_resume(struct device *dev)
 {
         struct tcs3472_data *data = iio_priv(i2c_get_clientdata(
                 to_i2c_client(dev)));
-        return i2c_smbus_write_byte_data(data->client, TCS3472_ENABLE,
-                data->enable | (TCS3472_ENABLE_AEN | TCS3472_ENABLE_PON));
+        int ret;
+        u8 enable_mask = TCS3472_ENABLE_AEN | TCS3472_ENABLE_PON;
+
+        mutex_lock(&data->lock);
+
+        ret = i2c_smbus_write_byte_data(data->client, TCS3472_ENABLE,
+                data->enable | enable_mask);
+        if (!ret)
+                data->enable |= enable_mask;
+
+        mutex_unlock(&data->lock);
+
+        return ret;
 }
 #endif
 
diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c
index 7599693f7fe9..6bbb0b1e6032 100644
--- a/drivers/iio/light/tsl2563.c
+++ b/drivers/iio/light/tsl2563.c
@@ -697,13 +697,11 @@ static int tsl2563_read_interrupt_config(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info tsl2563_info_no_irq = {
-        .driver_module = THIS_MODULE,
         .read_raw = &tsl2563_read_raw,
         .write_raw = &tsl2563_write_raw,
 };
 
 static const struct iio_info tsl2563_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &tsl2563_read_raw,
         .write_raw = &tsl2563_write_raw,
         .read_event_value = &tsl2563_read_thresh,
diff --git a/drivers/iio/light/tsl2583.c b/drivers/iio/light/tsl2583.c
index fb711ed4862e..f2e50edaa242 100644
--- a/drivers/iio/light/tsl2583.c
+++ b/drivers/iio/light/tsl2583.c
@@ -804,7 +804,6 @@ static int tsl2583_write_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info tsl2583_info = {
         .attrs = &tsl2583_attribute_group,
-        .driver_module = THIS_MODULE,
         .read_raw = tsl2583_read_raw,
         .write_raw = tsl2583_write_raw,
 };
diff --git a/drivers/iio/light/tsl4531.c b/drivers/iio/light/tsl4531.c
index cf94ec72b181..06171cb76e23 100644
--- a/drivers/iio/light/tsl4531.c
+++ b/drivers/iio/light/tsl4531.c
@@ -144,7 +144,6 @@ static const struct iio_info tsl4531_info = {
         .read_raw = tsl4531_read_raw,
         .write_raw = tsl4531_write_raw,
         .attrs = &tsl4531_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int tsl4531_check_id(struct i2c_client *client)
diff --git a/drivers/iio/light/us5182d.c b/drivers/iio/light/us5182d.c
index d571ad7291ed..68e52943879a 100644
--- a/drivers/iio/light/us5182d.c
+++ b/drivers/iio/light/us5182d.c
@@ -714,7 +714,6 @@ err:
 }
 
 static const struct iio_info us5182d_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw = us5182d_read_raw,
         .write_raw = us5182d_write_raw,
         .attrs = &us5182d_attr_group,
diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index 360b6e98137a..c599a90506ad 100644
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -155,7 +155,6 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info vcnl4000_info = {
         .read_raw = vcnl4000_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int vcnl4000_probe(struct i2c_client *client,
diff --git a/drivers/iio/light/veml6070.c b/drivers/iio/light/veml6070.c
index bc1c4cb782cd..f4bf3c5b5eda 100644
--- a/drivers/iio/light/veml6070.c
+++ b/drivers/iio/light/veml6070.c
@@ -136,7 +136,6 @@ static int veml6070_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info veml6070_info = {
         .read_raw = veml6070_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int veml6070_probe(struct i2c_client *client,
diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c
index 6e25b724d941..192c77ef3608 100644
--- a/drivers/iio/light/vl6180.c
+++ b/drivers/iio/light/vl6180.c
@@ -24,6 +24,7 @@
 #include <linux/err.h>
 #include <linux/of.h>
 #include <linux/delay.h>
+#include <linux/util_macros.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
@@ -86,6 +87,8 @@
 struct vl6180_data {
         struct i2c_client *client;
         struct mutex lock;
+        unsigned int als_gain_milli;
+        unsigned int als_it_ms;
 };
 
 enum { VL6180_ALS, VL6180_RANGE, VL6180_PROX };
@@ -275,19 +278,17 @@ static const struct iio_chan_spec vl6180_channels[] = {
 };
 
 /*
- * Columns 3 & 4 represent the same value in decimal and hex notations.
- * Kept in order to avoid the datatype conversion while reading the
- * hardware_gain.
+ * Available Ambient Light Sensor gain settings, 1/1000th, and
+ * corresponding setting for the VL6180_ALS_GAIN register
  */
-static const int vl6180_als_gain[8][4] = {
-        { 1,    0,      70,     VL6180_ALS_GAIN_1 },
-        { 1,    250000, 69,     VL6180_ALS_GAIN_1_25 },
-        { 1,    670000, 68,     VL6180_ALS_GAIN_1_67 },
-        { 2,    500000, 67,     VL6180_ALS_GAIN_2_5 },
-        { 5,    0,      66,     VL6180_ALS_GAIN_5 },
-        { 10,   0,      65,     VL6180_ALS_GAIN_10 },
-        { 20,   0,      64,     VL6180_ALS_GAIN_20 },
-        { 40,   0,      71,     VL6180_ALS_GAIN_40 }
+static const int vl6180_als_gain_tab[8] = {
+        1000, 1250, 1670, 2500, 5000, 10000, 20000, 40000
+};
+static const u8 vl6180_als_gain_tab_bits[8] = {
+        VL6180_ALS_GAIN_1,    VL6180_ALS_GAIN_1_25,
+        VL6180_ALS_GAIN_1_67, VL6180_ALS_GAIN_2_5,
+        VL6180_ALS_GAIN_5,    VL6180_ALS_GAIN_10,
+        VL6180_ALS_GAIN_20,   VL6180_ALS_GAIN_40
 };
 
 static int vl6180_read_raw(struct iio_dev *indio_dev,
@@ -295,7 +296,7 @@ static int vl6180_read_raw(struct iio_dev *indio_dev,
                                 int *val, int *val2, long mask)
 {
         struct vl6180_data *data = iio_priv(indio_dev);
-        int ret, i;
+        int ret;
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
@@ -306,19 +307,20 @@ static int vl6180_read_raw(struct iio_dev *indio_dev,
 
                 return IIO_VAL_INT;
         case IIO_CHAN_INFO_INT_TIME:
-                ret = vl6180_read_word(data->client, VL6180_ALS_IT);
-                if (ret < 0)
-                        return ret;
-                *val = 0; /* 1 count = 1ms (0 = 1ms) */
-                *val2 = (ret + 1) * 1000; /* convert to seconds */
+                *val = data->als_it_ms;
+                *val2 = 1000;
+
+                return IIO_VAL_FRACTIONAL;
 
-                return IIO_VAL_INT_PLUS_MICRO;
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_LIGHT:
-                        *val = 0; /* one ALS count is 0.32 Lux */
-                        *val2 = 320000;
-                        break;
+                        /* one ALS count is 0.32 Lux @ gain 1, IT 100 ms */
+                        *val = 32000; /* 0.32 * 1000 * 100 */
+                        *val2 = data->als_gain_milli * data->als_it_ms;
+
+                        return IIO_VAL_FRACTIONAL;
+
                 case IIO_DISTANCE:
                         *val = 0; /* sensor reports mm, scale to meter */
                         *val2 = 1000;
@@ -329,17 +331,11 @@ static int vl6180_read_raw(struct iio_dev *indio_dev,
 
                 return IIO_VAL_INT_PLUS_MICRO;
         case IIO_CHAN_INFO_HARDWAREGAIN:
-                ret = vl6180_read_byte(data->client, VL6180_ALS_GAIN);
-                if (ret < 0)
-                        return -EINVAL;
-                for (i = 0; i < ARRAY_SIZE(vl6180_als_gain); i++) {
-                        if (ret == vl6180_als_gain[i][2]) {
-                                *val = vl6180_als_gain[i][0];
-                                *val2 = vl6180_als_gain[i][1];
-                        }
-                }
+                *val = data->als_gain_milli;
+                *val2 = 1000;
+
+                return IIO_VAL_FRACTIONAL;
 
-                return IIO_VAL_INT_PLUS_MICRO;
         default:
                 return -EINVAL;
         }
@@ -365,37 +361,53 @@ static int vl6180_hold(struct vl6180_data *data, bool hold)
 
 static int vl6180_set_als_gain(struct vl6180_data *data, int val, int val2)
 {
-        int i, ret;
-
-        for (i = 0; i < ARRAY_SIZE(vl6180_als_gain); i++) {
-                if (val == vl6180_als_gain[i][0] &&
-                        val2 == vl6180_als_gain[i][1]) {
-                        mutex_lock(&data->lock);
-                        ret = vl6180_hold(data, true);
-                        if (ret < 0)
-                                goto fail;
-                        ret = vl6180_write_byte(data->client, VL6180_ALS_GAIN,
-                                vl6180_als_gain[i][3]);
-fail:
-                        vl6180_hold(data, false);
-                        mutex_unlock(&data->lock);
-                        return ret;
-                }
-        }
+        int i, ret, gain;
 
-        return -EINVAL;
+        if (val < 1 || val > 40)
+                return -EINVAL;
+
+        gain = (val * 1000000 + val2) / 1000;
+        if (gain < 1 || gain > 40000)
+                return -EINVAL;
+
+        i = find_closest(gain, vl6180_als_gain_tab,
+                         ARRAY_SIZE(vl6180_als_gain_tab));
+
+        mutex_lock(&data->lock);
+        ret = vl6180_hold(data, true);
+        if (ret < 0)
+                goto fail;
+
+        ret = vl6180_write_byte(data->client, VL6180_ALS_GAIN,
+                                vl6180_als_gain_tab_bits[i]);
+
+        if (ret >= 0)
+                data->als_gain_milli = vl6180_als_gain_tab[i];
+
+fail:
+        vl6180_hold(data, false);
+        mutex_unlock(&data->lock);
+        return ret;
 }
 
-static int vl6180_set_it(struct vl6180_data *data, int val2)
+static int vl6180_set_it(struct vl6180_data *data, int val, int val2)
 {
-        int ret;
+        int ret, it_ms;
+
+        it_ms = (val2 + 500) / 1000; /* round to ms */
+        if (val != 0 || it_ms < 1 || it_ms > 512)
+                return -EINVAL;
 
         mutex_lock(&data->lock);
         ret = vl6180_hold(data, true);
         if (ret < 0)
                 goto fail;
-        ret = vl6180_write_word(data->client, VL6180_ALS_IT,
-                (val2 - 500) / 1000); /* write value in ms */
+
+        ret = vl6180_write_word(data->client, VL6180_ALS_IT, it_ms - 1);
+
+        if (ret >= 0)
+                data->als_it_ms = it_ms;
+
 fail:
         vl6180_hold(data, false);
         mutex_unlock(&data->lock);
@@ -411,10 +423,8 @@ static int vl6180_write_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_INT_TIME:
-                if (val != 0 || val2 < 500 || val2 >= 512500)
-                        return -EINVAL;
+                return vl6180_set_it(data, val, val2);
 
-                return vl6180_set_it(data, val2);
         case IIO_CHAN_INFO_HARDWAREGAIN:
                 if (chan->type != IIO_LIGHT)
                         return -EINVAL;
@@ -429,7 +439,6 @@ static const struct iio_info vl6180_info = {
         .read_raw = vl6180_read_raw,
         .write_raw = vl6180_write_raw,
         .attrs = &vl6180_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int vl6180_init(struct vl6180_data *data)
@@ -468,11 +477,13 @@ static int vl6180_init(struct vl6180_data *data)
                 return ret;
 
         /* ALS integration time: 100ms */
+        data->als_it_ms = 100;
         ret = vl6180_write_word(client, VL6180_ALS_IT, VL6180_ALS_IT_100);
         if (ret < 0)
                 return ret;
 
         /* ALS gain: 1 */
+        data->als_gain_milli = 1000;
         ret = vl6180_write_byte(client, VL6180_ALS_GAIN, VL6180_ALS_GAIN_1);
         if (ret < 0)
                 return ret;
diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c
index 0bff76e96950..93be1f4c0f27 100644
--- a/drivers/iio/magnetometer/ak8974.c
+++ b/drivers/iio/magnetometer/ak8974.c
@@ -658,7 +658,6 @@ static const unsigned long ak8974_scan_masks[] = { 0x7, 0 };
 
 static const struct iio_info ak8974_info = {
         .read_raw = &ak8974_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static bool ak8974_writeable_reg(struct device *dev, unsigned int reg)
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index 4ff883942f7b..c09329069d0a 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -781,7 +781,6 @@ static const unsigned long ak8975_scan_masks[] = { 0x7, 0 };
 
 static const struct iio_info ak8975_info = {
         .read_raw = &ak8975_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #ifdef CONFIG_ACPI
diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c
index d104fb8d9379..d91cb845e3d6 100644
--- a/drivers/iio/magnetometer/bmc150_magn.c
+++ b/drivers/iio/magnetometer/bmc150_magn.c
@@ -651,7 +651,6 @@ static const struct iio_info bmc150_magn_info = {
         .attrs = &bmc150_magn_attrs_group,
         .read_raw = bmc150_magn_read_raw,
         .write_raw = bmc150_magn_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const unsigned long bmc150_magn_scan_masks[] = {
@@ -811,7 +810,6 @@ err_unlock:
 static const struct iio_trigger_ops bmc150_magn_trigger_ops = {
         .set_trigger_state = bmc150_magn_data_rdy_trigger_set_state,
         .try_reenable = bmc150_magn_trig_try_reen,
-        .owner = THIS_MODULE,
 };
 
 static int bmc150_magn_buffer_preenable(struct iio_dev *indio_dev)
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index 0e791b02ed4a..a1fd9d591818 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -282,7 +282,6 @@ static int magn_3d_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info magn_3d_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &magn_3d_read_raw,
         .write_raw = &magn_3d_write_raw,
 };
diff --git a/drivers/iio/magnetometer/hmc5843_core.c b/drivers/iio/magnetometer/hmc5843_core.c
index ba3e2a374ee5..ada142fb7aa3 100644
--- a/drivers/iio/magnetometer/hmc5843_core.c
+++ b/drivers/iio/magnetometer/hmc5843_core.c
@@ -597,7 +597,6 @@ static const struct iio_info hmc5843_info = {
         .read_raw = &hmc5843_read_raw,
         .write_raw = &hmc5843_write_raw,
         .write_raw_get_fmt = &hmc5843_write_raw_get_fmt,
-        .driver_module = THIS_MODULE,
 };
 
 static const unsigned long hmc5843_scan_masks[] = {0x7, 0};
diff --git a/drivers/iio/magnetometer/mag3110.c b/drivers/iio/magnetometer/mag3110.c
index dad8d57f7402..b34ace76d31b 100644
--- a/drivers/iio/magnetometer/mag3110.c
+++ b/drivers/iio/magnetometer/mag3110.c
@@ -333,7 +333,6 @@ static const struct iio_info mag3110_info = {
         .attrs = &mag3110_group,
         .read_raw = &mag3110_read_raw,
         .write_raw = &mag3110_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const unsigned long mag3110_scan_masks[] = {0x7, 0xf, 0};
diff --git a/drivers/iio/magnetometer/mmc35240.c b/drivers/iio/magnetometer/mmc35240.c
index 176e14a61558..6b640c6338c9 100644
--- a/drivers/iio/magnetometer/mmc35240.c
+++ b/drivers/iio/magnetometer/mmc35240.c
@@ -418,7 +418,6 @@ static int mmc35240_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info mmc35240_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = mmc35240_read_raw,
         .write_raw      = mmc35240_write_raw,
         .attrs          = &mmc35240_attribute_group,
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 08aafba4481c..72f6d1335a04 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -317,7 +317,14 @@ static const struct st_sensor_settings st_magn_sensors_settings[] = {
                 },
                 .drdy_irq = {
                         /* drdy line is routed drdy pin */
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x07,
+                        },
+                },
+                .sim = {
+                        .addr = 0x22,
+                        .value = BIT(2),
                 },
                 .multi_read_bit = true,
                 .bootime = 2,
@@ -359,9 +366,14 @@ static const struct st_sensor_settings st_magn_sensors_settings[] = {
                         .mask = 0x10,
                 },
                 .drdy_irq = {
-                        .addr = 0x62,
-                        .mask_int1 = 0x01,
-                        .addr_stat_drdy = 0x67,
+                        .int1 = {
+                                .addr = 0x62,
+                                .mask = 0x01,
+                        },
+                        .stat_drdy = {
+                                .addr = 0x67,
+                                .mask = 0x07,
+                        },
                 },
                 .multi_read_bit = false,
                 .bootime = 2,
@@ -438,7 +450,6 @@ static const struct attribute_group st_magn_attribute_group = {
 };
 
 static const struct iio_info magn_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &st_magn_attribute_group,
         .read_raw = &st_magn_read_raw,
         .write_raw = &st_magn_write_raw,
@@ -447,7 +458,6 @@ static const struct iio_info magn_info = {
 
 #ifdef CONFIG_IIO_TRIGGER
 static const struct iio_trigger_ops st_magn_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = ST_MAGN_TRIGGER_SET_STATE,
         .validate_device = st_sensors_validate_device,
 };
diff --git a/drivers/iio/multiplexer/iio-mux.c b/drivers/iio/multiplexer/iio-mux.c
index 37ba007f8dca..60621ccd67e4 100644
--- a/drivers/iio/multiplexer/iio-mux.c
+++ b/drivers/iio/multiplexer/iio-mux.c
@@ -173,7 +173,6 @@ static const struct iio_info mux_info = {
         .read_raw = mux_read_raw,
         .read_avail = mux_read_avail,
         .write_raw = mux_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static ssize_t mux_read_ext_info(struct iio_dev *indio_dev, uintptr_t private,
@@ -285,6 +284,9 @@ static int mux_configure_channel(struct device *dev, struct mux *mux,
         child->ext_info_cache = devm_kzalloc(dev,
                                              sizeof(*child->ext_info_cache) *
                                              num_ext_info, GFP_KERNEL);
+        if (!child->ext_info_cache)
+                return -ENOMEM;
+
         for (i = 0; i < num_ext_info; ++i) {
                 child->ext_info_cache[i].size = -1;
 
@@ -309,6 +311,9 @@ static int mux_configure_channel(struct device *dev, struct mux *mux,
 
                 child->ext_info_cache[i].data = devm_kmemdup(dev, page, ret + 1,
                                                              GFP_KERNEL);
+                if (!child->ext_info_cache[i].data)
+                        return -ENOMEM;
+
                 child->ext_info_cache[i].data[ret] = 0;
                 child->ext_info_cache[i].size = ret;
         }
diff --git a/drivers/iio/orientation/hid-sensor-incl-3d.c b/drivers/iio/orientation/hid-sensor-incl-3d.c
index fd1b3696ee42..1e5451d1ff88 100644
--- a/drivers/iio/orientation/hid-sensor-incl-3d.c
+++ b/drivers/iio/orientation/hid-sensor-incl-3d.c
@@ -186,7 +186,6 @@ static int incl_3d_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info incl_3d_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &incl_3d_read_raw,
         .write_raw = &incl_3d_write_raw,
 };
diff --git a/drivers/iio/orientation/hid-sensor-rotation.c b/drivers/iio/orientation/hid-sensor-rotation.c
index 98fe0c5df380..a69db2002414 100644
--- a/drivers/iio/orientation/hid-sensor-rotation.c
+++ b/drivers/iio/orientation/hid-sensor-rotation.c
@@ -138,7 +138,6 @@ static int dev_rot_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info dev_rot_info = {
-        .driver_module = THIS_MODULE,
         .read_raw_multi = &dev_rot_read_raw,
         .write_raw = &dev_rot_write_raw,
 };
diff --git a/drivers/iio/potentiometer/ds1803.c b/drivers/iio/potentiometer/ds1803.c
index fb9e2a337dc2..9b0ff4ab2f9c 100644
--- a/drivers/iio/potentiometer/ds1803.c
+++ b/drivers/iio/potentiometer/ds1803.c
@@ -110,7 +110,6 @@ static int ds1803_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info ds1803_info = {
         .read_raw = ds1803_read_raw,
         .write_raw = ds1803_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int ds1803_probe(struct i2c_client *client,
diff --git a/drivers/iio/potentiometer/max5481.c b/drivers/iio/potentiometer/max5481.c
index 926554991244..ffe2761333a2 100644
--- a/drivers/iio/potentiometer/max5481.c
+++ b/drivers/iio/potentiometer/max5481.c
@@ -119,7 +119,6 @@ static int max5481_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info max5481_info = {
         .read_raw = max5481_read_raw,
         .write_raw = max5481_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #if defined(CONFIG_OF)
@@ -207,7 +206,6 @@ MODULE_DEVICE_TABLE(acpi, max5481_acpi_match);
 static struct spi_driver max5481_driver = {
         .driver = {
                 .name  = "max5481",
-                .owner = THIS_MODULE,
                 .of_match_table = of_match_ptr(max5481_match),
                 .acpi_match_table = ACPI_PTR(max5481_acpi_match),
         },
diff --git a/drivers/iio/potentiometer/max5487.c b/drivers/iio/potentiometer/max5487.c
index 6c50939a2e83..5042d3e09b12 100644
--- a/drivers/iio/potentiometer/max5487.c
+++ b/drivers/iio/potentiometer/max5487.c
@@ -83,7 +83,6 @@ static int max5487_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info max5487_info = {
         .read_raw = max5487_read_raw,
         .write_raw = max5487_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int max5487_spi_probe(struct spi_device *spi)
@@ -147,7 +146,6 @@ MODULE_DEVICE_TABLE(acpi, max5487_acpi_match);
 static struct spi_driver max5487_driver = {
         .driver = {
                 .name = "max5487",
-                .owner = THIS_MODULE,
                 .acpi_match_table = ACPI_PTR(max5487_acpi_match),
         },
         .id_table = max5487_id,
diff --git a/drivers/iio/potentiometer/mcp4131.c b/drivers/iio/potentiometer/mcp4131.c
index 4e7e2c6c522c..b3e30db246cc 100644
--- a/drivers/iio/potentiometer/mcp4131.c
+++ b/drivers/iio/potentiometer/mcp4131.c
@@ -237,7 +237,6 @@ static int mcp4131_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info mcp4131_info = {
         .read_raw = mcp4131_read_raw,
         .write_raw = mcp4131_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int mcp4131_probe(struct spi_device *spi)
diff --git a/drivers/iio/potentiometer/mcp4531.c b/drivers/iio/potentiometer/mcp4531.c
index 314353d7ab59..114ab876fcc6 100644
--- a/drivers/iio/potentiometer/mcp4531.c
+++ b/drivers/iio/potentiometer/mcp4531.c
@@ -207,7 +207,6 @@ static const struct iio_info mcp4531_info = {
         .read_raw = mcp4531_read_raw,
         .read_avail = mcp4531_read_avail,
         .write_raw = mcp4531_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 #ifdef CONFIG_OF
diff --git a/drivers/iio/potentiometer/tpl0102.c b/drivers/iio/potentiometer/tpl0102.c
index 7b6b54531ea2..93f9d4a8c9aa 100644
--- a/drivers/iio/potentiometer/tpl0102.c
+++ b/drivers/iio/potentiometer/tpl0102.c
@@ -106,7 +106,6 @@ static int tpl0102_write_raw(struct iio_dev *indio_dev,
 static const struct iio_info tpl0102_info = {
         .read_raw = tpl0102_read_raw,
         .write_raw = tpl0102_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int tpl0102_probe(struct i2c_client *client,
diff --git a/drivers/iio/potentiostat/lmp91000.c b/drivers/iio/potentiostat/lmp91000.c
index afa8de3418d0..007710991f15 100644
--- a/drivers/iio/potentiostat/lmp91000.c
+++ b/drivers/iio/potentiostat/lmp91000.c
@@ -207,7 +207,6 @@ static int lmp91000_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info lmp91000_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = lmp91000_read_raw,
 };
 
@@ -283,7 +282,6 @@ static int lmp91000_buffer_cb(const void *val, void *private)
 }
 
 static const struct iio_trigger_ops lmp91000_trigger_ops = {
-        .owner = THIS_MODULE,
 };
 
 
diff --git a/drivers/iio/pressure/abp060mg.c b/drivers/iio/pressure/abp060mg.c
index 43bdd0b9155f..46a220c70d6a 100644
--- a/drivers/iio/pressure/abp060mg.c
+++ b/drivers/iio/pressure/abp060mg.c
@@ -168,7 +168,6 @@ static int abp060mg_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info abp060mg_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = abp060mg_read_raw,
 };
 
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 8f26428804a2..fd1da26a62e4 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -561,7 +561,6 @@ static const struct attribute_group bmp280_attrs_group = {
 };
 
 static const struct iio_info bmp280_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &bmp280_read_raw,
         .write_raw = &bmp280_write_raw,
         .attrs = &bmp280_attrs_group,
diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c
index 48b2a30f57ae..4599fde4dd25 100644
--- a/drivers/iio/pressure/cros_ec_baro.c
+++ b/drivers/iio/pressure/cros_ec_baro.c
@@ -120,14 +120,12 @@ static int cros_ec_baro_write(struct iio_dev *indio_dev,
 static const struct iio_info cros_ec_baro_info = {
         .read_raw = &cros_ec_baro_read,
         .write_raw = &cros_ec_baro_write,
-        .driver_module = THIS_MODULE,
 };
 
 static int cros_ec_baro_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct cros_ec_dev *ec_dev = dev_get_drvdata(dev->parent);
-        struct cros_ec_device *ec_device;
         struct iio_dev *indio_dev;
         struct cros_ec_baro_state *state;
         struct iio_chan_spec *channel;
@@ -137,7 +135,6 @@ static int cros_ec_baro_probe(struct platform_device *pdev)
                 dev_warn(dev, "No CROS EC device found.\n");
                 return -EINVAL;
         }
-        ec_device = ec_dev->ec_dev;
 
         indio_dev = devm_iio_device_alloc(dev, sizeof(*state));
         if (!indio_dev)
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c
index 6848d8c80eff..4c437918f1d2 100644
--- a/drivers/iio/pressure/hid-sensor-press.c
+++ b/drivers/iio/pressure/hid-sensor-press.c
@@ -160,7 +160,6 @@ static int press_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info press_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &press_read_raw,
         .write_raw = &press_write_raw,
 };
diff --git a/drivers/iio/pressure/hp03.c b/drivers/iio/pressure/hp03.c
index 8c7b3ec3d84a..406934ea6228 100644
--- a/drivers/iio/pressure/hp03.c
+++ b/drivers/iio/pressure/hp03.c
@@ -208,7 +208,6 @@ static int hp03_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info hp03_info = {
-        .driver_module  = THIS_MODULE,
         .read_raw       = &hp03_read_raw,
 };
 
diff --git a/drivers/iio/pressure/hp206c.c b/drivers/iio/pressure/hp206c.c
index 12f769e86355..c38c19678cf6 100644
--- a/drivers/iio/pressure/hp206c.c
+++ b/drivers/iio/pressure/hp206c.c
@@ -351,7 +351,6 @@ static const struct iio_info hp206c_info = {
         .attrs = &hp206c_attribute_group,
         .read_raw = hp206c_read_raw,
         .write_raw = hp206c_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int hp206c_probe(struct i2c_client *client,
diff --git a/drivers/iio/pressure/mpl115.c b/drivers/iio/pressure/mpl115.c
index 8f2bce213248..ab4786d0102b 100644
--- a/drivers/iio/pressure/mpl115.c
+++ b/drivers/iio/pressure/mpl115.c
@@ -144,7 +144,6 @@ static const struct iio_chan_spec mpl115_channels[] = {
 
 static const struct iio_info mpl115_info = {
         .read_raw = &mpl115_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 int mpl115_probe(struct device *dev, const char *name,
diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c
index 619b963714c7..7537547fb7ee 100644
--- a/drivers/iio/pressure/mpl3115.c
+++ b/drivers/iio/pressure/mpl3115.c
@@ -218,7 +218,6 @@ static const struct iio_chan_spec mpl3115_channels[] = {
 
 static const struct iio_info mpl3115_info = {
         .read_raw = &mpl3115_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int mpl3115_probe(struct i2c_client *client,
diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c
index 2a77a2f15752..f950cfde5db9 100644
--- a/drivers/iio/pressure/ms5611_core.c
+++ b/drivers/iio/pressure/ms5611_core.c
@@ -384,7 +384,6 @@ static const struct iio_info ms5611_info = {
         .read_raw = &ms5611_read_raw,
         .write_raw = &ms5611_write_raw,
         .attrs = &ms5611_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int ms5611_init(struct iio_dev *indio_dev)
diff --git a/drivers/iio/pressure/ms5637.c b/drivers/iio/pressure/ms5637.c
index c413f8a84a63..e2f73e6dc58f 100644
--- a/drivers/iio/pressure/ms5637.c
+++ b/drivers/iio/pressure/ms5637.c
@@ -124,7 +124,6 @@ static const struct iio_info ms5637_info = {
         .read_raw = ms5637_read_raw,
         .write_raw = ms5637_write_raw,
         .attrs = &ms5637_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int ms5637_probe(struct i2c_client *client,
diff --git a/drivers/iio/pressure/st_pressure.h b/drivers/iio/pressure/st_pressure.h
index 7d995937adba..e67eb0d971bf 100644
--- a/drivers/iio/pressure/st_pressure.h
+++ b/drivers/iio/pressure/st_pressure.h
@@ -19,6 +19,8 @@ enum st_press_type {
         LPS25H,
         LPS331AP,
         LPS22HB,
+        LPS33HW,
+        LPS35HW,
         ST_PRESS_MAX,
 };
 
@@ -26,6 +28,8 @@ enum st_press_type {
 #define LPS25H_PRESS_DEV_NAME           "lps25h"
 #define LPS331AP_PRESS_DEV_NAME         "lps331ap"
 #define LPS22HB_PRESS_DEV_NAME          "lps22hb"
+#define LPS33HW_PRESS_DEV_NAME          "lps33hw"
+#define LPS35HW_PRESS_DEV_NAME          "lps35hw"
 
 /**
  * struct st_sensors_platform_data - default press platform data
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 34611a8ea2ce..349e5c713c03 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -280,14 +280,28 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         .mask = 0x04,
                 },
                 .drdy_irq = {
-                        .addr = 0x22,
-                        .mask_int1 = 0x04,
-                        .mask_int2 = 0x20,
+                        .int1 = {
+                                .addr = 0x22,
+                                .mask = 0x04,
+                                .addr_od = 0x22,
+                                .mask_od = 0x40,
+                        },
+                        .int2 = {
+                                .addr = 0x22,
+                                .mask = 0x20,
+                                .addr_od = 0x22,
+                                .mask_od = 0x40,
+                        },
                         .addr_ihl = 0x22,
                         .mask_ihl = 0x80,
-                        .addr_od = 0x22,
-                        .mask_od = 0x40,
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x03,
+                        },
+                },
+                .sim = {
+                        .addr = 0x20,
+                        .value = BIT(0),
                 },
                 .multi_read_bit = true,
                 .bootime = 2,
@@ -335,8 +349,9 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         .addr = 0x20,
                         .mask = 0x04,
                 },
-                .drdy_irq = {
-                        .addr = 0,
+                .sim = {
+                        .addr = 0x20,
+                        .value = BIT(0),
                 },
                 .multi_read_bit = true,
                 .bootime = 2,
@@ -388,14 +403,22 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         .mask = 0x04,
                 },
                 .drdy_irq = {
-                        .addr = 0x23,
-                        .mask_int1 = 0x01,
-                        .mask_int2 = 0x00,
+                        .int1 = {
+                                .addr = 0x23,
+                                .mask = 0x01,
+                                .addr_od = 0x22,
+                                .mask_od = 0x40,
+                        },
                         .addr_ihl = 0x22,
                         .mask_ihl = 0x80,
-                        .addr_od = 0x22,
-                        .mask_od = 0x40,
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x03,
+                        },
+                },
+                .sim = {
+                        .addr = 0x20,
+                        .value = BIT(0),
                 },
                 .multi_read_bit = true,
                 .bootime = 2,
@@ -410,6 +433,8 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LPS22HB_PRESS_DEV_NAME,
+                        [1] = LPS33HW_PRESS_DEV_NAME,
+                        [2] = LPS35HW_PRESS_DEV_NAME,
                 },
                 .ch = (struct iio_chan_spec *)st_press_lps22hb_channels,
                 .num_ch = ARRAY_SIZE(st_press_lps22hb_channels),
@@ -447,14 +472,22 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         .mask = 0x02,
                 },
                 .drdy_irq = {
-                        .addr = 0x12,
-                        .mask_int1 = 0x04,
-                        .mask_int2 = 0x00,
+                        .int1 = {
+                                .addr = 0x12,
+                                .mask = 0x04,
+                                .addr_od = 0x12,
+                                .mask_od = 0x40,
+                        },
                         .addr_ihl = 0x12,
                         .mask_ihl = 0x80,
-                        .addr_od = 0x12,
-                        .mask_od = 0x40,
-                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                        .stat_drdy = {
+                                .addr = ST_SENSORS_DEFAULT_STAT_ADDR,
+                                .mask = 0x03,
+                        },
+                },
+                .sim = {
+                        .addr = 0x10,
+                        .value = BIT(0),
                 },
                 .multi_read_bit = false,
                 .bootime = 2,
@@ -547,7 +580,6 @@ static const struct attribute_group st_press_attribute_group = {
 };
 
 static const struct iio_info press_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &st_press_attribute_group,
         .read_raw = &st_press_read_raw,
         .write_raw = &st_press_write_raw,
@@ -556,7 +588,6 @@ static const struct iio_info press_info = {
 
 #ifdef CONFIG_IIO_TRIGGER
 static const struct iio_trigger_ops st_press_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = ST_PRESS_TRIGGER_SET_STATE,
         .validate_device = st_sensors_validate_device,
 };
@@ -605,7 +636,8 @@ int st_press_common_probe(struct iio_dev *indio_dev)
         press_data->odr = press_data->sensor_settings->odr.odr_avl[0].hz;
 
         /* Some devices don't support a data ready pin. */
-        if (!pdata && press_data->sensor_settings->drdy_irq.addr)
+        if (!pdata && (press_data->sensor_settings->drdy_irq.int1.addr ||
+                       press_data->sensor_settings->drdy_irq.int2.addr))
                 pdata = (struct st_sensors_platform_data *)&default_press_pdata;
 
         err = st_sensors_init_sensor(indio_dev, press_data->dev->platform_data);
diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
index 7f15e927fa2b..fbb59059e942 100644
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -37,6 +37,14 @@ static const struct of_device_id st_press_of_match[] = {
                 .compatible = "st,lps22hb-press",
                 .data = LPS22HB_PRESS_DEV_NAME,
         },
+        {
+                .compatible = "st,lps33hw",
+                .data = LPS33HW_PRESS_DEV_NAME,
+        },
+        {
+                .compatible = "st,lps35hw",
+                .data = LPS35HW_PRESS_DEV_NAME,
+        },
         {},
 };
 MODULE_DEVICE_TABLE(of, st_press_of_match);
@@ -59,6 +67,8 @@ static const struct i2c_device_id st_press_id_table[] = {
         { LPS25H_PRESS_DEV_NAME,  LPS25H },
         { LPS331AP_PRESS_DEV_NAME, LPS331AP },
         { LPS22HB_PRESS_DEV_NAME, LPS22HB },
+        { LPS33HW_PRESS_DEV_NAME, LPS33HW },
+        { LPS35HW_PRESS_DEV_NAME, LPS35HW },
         {},
 };
 MODULE_DEVICE_TABLE(i2c, st_press_id_table);
diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c
index f5ebd36bb4bf..9a3441b128e7 100644
--- a/drivers/iio/pressure/st_pressure_spi.c
+++ b/drivers/iio/pressure/st_pressure_spi.c
@@ -41,6 +41,14 @@ static const struct of_device_id st_press_of_match[] = {
                 .compatible = "st,lps22hb-press",
                 .data = LPS22HB_PRESS_DEV_NAME,
         },
+        {
+                .compatible = "st,lps33hw",
+                .data = LPS33HW_PRESS_DEV_NAME,
+        },
+        {
+                .compatible = "st,lps35hw",
+                .data = LPS35HW_PRESS_DEV_NAME,
+        },
         {},
 };
 MODULE_DEVICE_TABLE(of, st_press_of_match);
@@ -83,6 +91,8 @@ static const struct spi_device_id st_press_id_table[] = {
         { LPS25H_PRESS_DEV_NAME },
         { LPS331AP_PRESS_DEV_NAME },
         { LPS22HB_PRESS_DEV_NAME },
+        { LPS33HW_PRESS_DEV_NAME },
+        { LPS35HW_PRESS_DEV_NAME },
         {},
 };
 MODULE_DEVICE_TABLE(spi, st_press_id_table);
diff --git a/drivers/iio/pressure/t5403.c b/drivers/iio/pressure/t5403.c
index 2667e71721f5..92c00f603b1d 100644
--- a/drivers/iio/pressure/t5403.c
+++ b/drivers/iio/pressure/t5403.c
@@ -209,7 +209,6 @@ static const struct iio_info t5403_info = {
         .read_raw = &t5403_read_raw,
         .write_raw = &t5403_write_raw,
         .attrs = &t5403_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int t5403_probe(struct i2c_client *client,
diff --git a/drivers/iio/pressure/zpa2326.c b/drivers/iio/pressure/zpa2326.c
index ebfb1de7377f..81d8f24eaeb4 100644
--- a/drivers/iio/pressure/zpa2326.c
+++ b/drivers/iio/pressure/zpa2326.c
@@ -865,7 +865,6 @@ complete:
 static int zpa2326_wait_oneshot_completion(const struct iio_dev   *indio_dev,
                                            struct zpa2326_private *private)
 {
-        int          ret;
         unsigned int val;
         long     timeout;
 
@@ -887,14 +886,11 @@ static int zpa2326_wait_oneshot_completion(const struct iio_dev   *indio_dev,
                 /* Timed out. */
                 zpa2326_warn(indio_dev, "no one shot interrupt occurred (%ld)",
                              timeout);
-                ret = -ETIME;
-        } else if (timeout < 0) {
-                zpa2326_warn(indio_dev,
-                             "wait for one shot interrupt cancelled");
-                ret = -ERESTARTSYS;
+                return -ETIME;
         }
 
-        return ret;
+        zpa2326_warn(indio_dev, "wait for one shot interrupt cancelled");
+        return -ERESTARTSYS;
 }
 
 static int zpa2326_init_managed_irq(struct device          *parent,
@@ -1394,7 +1390,6 @@ static int zpa2326_set_trigger_state(struct iio_trigger *trig, bool state)
 }
 
 static const struct iio_trigger_ops zpa2326_trigger_ops = {
-        .owner             = THIS_MODULE,
         .set_trigger_state = zpa2326_set_trigger_state,
 };
 
@@ -1594,7 +1589,6 @@ static const struct iio_chan_spec zpa2326_channels[] = {
 };
 
 static const struct iio_info zpa2326_info = {
-        .driver_module = THIS_MODULE,
         .attrs         = &zpa2326_attribute_group,
         .read_raw      = zpa2326_read_raw,
         .write_raw     = zpa2326_write_raw,
diff --git a/drivers/iio/proximity/Kconfig b/drivers/iio/proximity/Kconfig
index ae070950f920..fcb1c4ba5e41 100644
--- a/drivers/iio/proximity/Kconfig
+++ b/drivers/iio/proximity/Kconfig
@@ -32,6 +32,16 @@ config LIDAR_LITE_V2
           To compile this driver as a module, choose M here: the
           module will be called pulsedlight-lite-v2
 
+config RFD77402
+        tristate "RFD77402 ToF sensor"
+        depends on I2C
+        help
+          Say Y to build a driver for the RFD77420 Time-of-Flight (distance)
+          sensor module with I2C interface.
+
+          To compile this driver as a module, choose M here: the
+          module will be called rfd77402.
+
 config SRF04
         tristate "Devantech SRF04 ultrasonic ranger sensor"
         depends on GPIOLIB
diff --git a/drivers/iio/proximity/Makefile b/drivers/iio/proximity/Makefile
index ed1b6f4cc209..1b195d84c611 100644
--- a/drivers/iio/proximity/Makefile
+++ b/drivers/iio/proximity/Makefile
@@ -5,6 +5,7 @@
 # When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_AS3935)            += as3935.o
 obj-$(CONFIG_LIDAR_LITE_V2)     += pulsedlight-lidar-lite-v2.o
+obj-$(CONFIG_RFD77402)          += rfd77402.o
 obj-$(CONFIG_SRF04)             += srf04.o
 obj-$(CONFIG_SRF08)             += srf08.o
 obj-$(CONFIG_SX9500)            += sx9500.o
diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
index 0eeff29b61be..b6249af48014 100644
--- a/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@ -39,8 +39,12 @@
 #define AS3935_AFE_GAIN_MAX     0x1F
 #define AS3935_AFE_PWR_BIT      BIT(0)
 
+#define AS3935_NFLWDTH          0x01
+#define AS3935_NFLWDTH_MASK     0x7f
+
 #define AS3935_INT              0x03
 #define AS3935_INT_MASK         0x0f
+#define AS3935_DISTURB_INT      BIT(2)
 #define AS3935_EVENT_INT        BIT(3)
 #define AS3935_NOISE_INT        BIT(0)
 
@@ -48,6 +52,7 @@
 #define AS3935_DATA_MASK        0x3F
 
 #define AS3935_TUNE_CAP         0x08
+#define AS3935_DEFAULTS         0x3C
 #define AS3935_CALIBRATE        0x3D
 
 #define AS3935_READ_DATA        BIT(14)
@@ -62,7 +67,9 @@ struct as3935_state {
         struct mutex lock;
         struct delayed_work work;
 
+        unsigned long noise_tripped;
         u32 tune_cap;
+        u32 nflwdth_reg;
         u8 buffer[16]; /* 8-bit data + 56-bit padding + 64-bit timestamp */
         u8 buf[2] ____cacheline_aligned;
 };
@@ -145,12 +152,29 @@ static ssize_t as3935_sensor_sensitivity_store(struct device *dev,
         return len;
 }
 
+static ssize_t as3935_noise_level_tripped_show(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        struct as3935_state *st = iio_priv(dev_to_iio_dev(dev));
+        int ret;
+
+        mutex_lock(&st->lock);
+        ret = sprintf(buf, "%d\n", !time_after(jiffies, st->noise_tripped + HZ));
+        mutex_unlock(&st->lock);
+
+        return ret;
+}
+
 static IIO_DEVICE_ATTR(sensor_sensitivity, S_IRUGO | S_IWUSR,
         as3935_sensor_sensitivity_show, as3935_sensor_sensitivity_store, 0);
 
+static IIO_DEVICE_ATTR(noise_level_tripped, S_IRUGO,
+        as3935_noise_level_tripped_show, NULL, 0);
 
 static struct attribute *as3935_attributes[] = {
         &iio_dev_attr_sensor_sensitivity.dev_attr.attr,
+        &iio_dev_attr_noise_level_tripped.dev_attr.attr,
         NULL,
 };
 
@@ -197,7 +221,6 @@ static int as3935_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info as3935_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &as3935_attribute_group,
         .read_raw = &as3935_read_raw,
 };
@@ -223,7 +246,6 @@ err_read:
 }
 
 static const struct iio_trigger_ops iio_interrupt_trigger_ops = {
-        .owner = THIS_MODULE,
 };
 
 static void as3935_event_work(struct work_struct *work)
@@ -246,7 +268,11 @@ static void as3935_event_work(struct work_struct *work)
         case AS3935_EVENT_INT:
                 iio_trigger_poll_chained(st->trig);
                 break;
+        case AS3935_DISTURB_INT:
         case AS3935_NOISE_INT:
+                mutex_lock(&st->lock);
+                st->noise_tripped = jiffies;
+                mutex_unlock(&st->lock);
                 dev_warn(&st->spi->dev, "noise level is too high\n");
                 break;
         }
@@ -269,15 +295,14 @@ static irqreturn_t as3935_interrupt_handler(int irq, void *private)
 
 static void calibrate_as3935(struct as3935_state *st)
 {
-        /* mask disturber interrupt bit */
-        as3935_write(st, AS3935_INT, BIT(5));
-
+        as3935_write(st, AS3935_DEFAULTS, 0x96);
         as3935_write(st, AS3935_CALIBRATE, 0x96);
         as3935_write(st, AS3935_TUNE_CAP,
                 BIT(5) | (st->tune_cap / TUNE_CAP_DIV));
 
         mdelay(2);
         as3935_write(st, AS3935_TUNE_CAP, (st->tune_cap / TUNE_CAP_DIV));
+        as3935_write(st, AS3935_NFLWDTH, st->nflwdth_reg);
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -370,6 +395,15 @@ static int as3935_probe(struct spi_device *spi)
                 return -EINVAL;
         }
 
+        ret = of_property_read_u32(np,
+                        "ams,nflwdth", &st->nflwdth_reg);
+        if (!ret && st->nflwdth_reg > AS3935_NFLWDTH_MASK) {
+                dev_err(&spi->dev,
+                        "invalid nflwdth setting of %d\n",
+                        st->nflwdth_reg);
+                return -EINVAL;
+        }
+
         indio_dev->dev.parent = &spi->dev;
         indio_dev->name = spi_get_device_id(spi)->name;
         indio_dev->channels = as3935_channels;
@@ -384,6 +418,7 @@ static int as3935_probe(struct spi_device *spi)
                 return -ENOMEM;
 
         st->trig = trig;
+        st->noise_tripped = jiffies - HZ;
         trig->dev.parent = indio_dev->dev.parent;
         iio_trigger_set_drvdata(trig, indio_dev);
         trig->ops = &iio_interrupt_trigger_ops;
diff --git a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
index 36c1ddc251aa..4d56f67b24c6 100644
--- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
+++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
@@ -249,7 +249,6 @@ static irqreturn_t lidar_trigger_handler(int irq, void *private)
 }
 
 static const struct iio_info lidar_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = lidar_read_raw,
 };
 
diff --git a/drivers/iio/proximity/rfd77402.c b/drivers/iio/proximity/rfd77402.c
new file mode 100644
index 000000000000..fe29fb1a19a6
--- /dev/null
+++ b/drivers/iio/proximity/rfd77402.c
@@ -0,0 +1,352 @@
+/*
+ * rfd77402.c - Support for RF Digital RFD77402 Time-of-Flight (distance) sensor
+ *
+ * Copyright 2017 Peter Meerwald-Stadler <pmeerw@pmeerw.net>
+ *
+ * This file is subject to the terms and conditions of version 2 of
+ * the GNU General Public License.  See the file COPYING in the main
+ * directory of this archive for more details.
+ *
+ * 7-bit I2C slave address 0x4c
+ *
+ * TODO: interrupt
+ * https://media.digikey.com/pdf/Data%20Sheets/RF%20Digital%20PDFs/RFD77402.pdf
+ */
+
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+
+#include <linux/iio/iio.h>
+
+#define RFD77402_DRV_NAME "rfd77402"
+
+#define RFD77402_ICSR           0x00 /* Interrupt Control Status Register */
+#define RFD77402_ICSR_INT_MODE  BIT(2)
+#define RFD77402_ICSR_INT_POL   BIT(3)
+#define RFD77402_ICSR_RESULT    BIT(4)
+#define RFD77402_ICSR_M2H_MSG   BIT(5)
+#define RFD77402_ICSR_H2M_MSG   BIT(6)
+#define RFD77402_ICSR_RESET     BIT(7)
+
+#define RFD77402_CMD_R          0x04
+#define RFD77402_CMD_SINGLE     0x01
+#define RFD77402_CMD_STANDBY    0x10
+#define RFD77402_CMD_MCPU_OFF   0x11
+#define RFD77402_CMD_MCPU_ON    0x12
+#define RFD77402_CMD_RESET      BIT(6)
+#define RFD77402_CMD_VALID      BIT(7)
+
+#define RFD77402_STATUS_R       0x06
+#define RFD77402_STATUS_PM_MASK GENMASK(4, 0)
+#define RFD77402_STATUS_STANDBY 0x00
+#define RFD77402_STATUS_MCPU_OFF        0x10
+#define RFD77402_STATUS_MCPU_ON 0x18
+
+#define RFD77402_RESULT_R       0x08
+#define RFD77402_RESULT_DIST_MASK       GENMASK(12, 2)
+#define RFD77402_RESULT_ERR_MASK        GENMASK(14, 13)
+#define RFD77402_RESULT_VALID   BIT(15)
+
+#define RFD77402_PMU_CFG        0x14
+#define RFD77402_PMU_MCPU_INIT  BIT(9)
+
+#define RFD77402_I2C_INIT_CFG   0x1c
+#define RFD77402_I2C_ADDR_INCR  BIT(0)
+#define RFD77402_I2C_DATA_INCR  BIT(2)
+#define RFD77402_I2C_HOST_DEBUG BIT(5)
+#define RFD77402_I2C_MCPU_DEBUG BIT(6)
+
+#define RFD77402_CMD_CFGR_A     0x0c
+#define RFD77402_CMD_CFGR_B     0x0e
+#define RFD77402_HFCFG_0        0x20
+#define RFD77402_HFCFG_1        0x22
+#define RFD77402_HFCFG_2        0x24
+#define RFD77402_HFCFG_3        0x26
+
+#define RFD77402_MOD_CHIP_ID    0x28
+
+/* magic configuration values from datasheet */
+static const struct {
+        u8 reg;
+        u16 val;
+} rf77402_tof_config[] = {
+        {RFD77402_CMD_CFGR_A,   0xe100},
+        {RFD77402_CMD_CFGR_B,   0x10ff},
+        {RFD77402_HFCFG_0,      0x07d0},
+        {RFD77402_HFCFG_1,      0x5008},
+        {RFD77402_HFCFG_2,      0xa041},
+        {RFD77402_HFCFG_3,      0x45d4},
+};
+
+struct rfd77402_data {
+        struct i2c_client *client;
+        /* Serialize reads from the sensor */
+        struct mutex lock;
+};
+
+static const struct iio_chan_spec rfd77402_channels[] = {
+        {
+                .type = IIO_DISTANCE,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                                      BIT(IIO_CHAN_INFO_SCALE),
+        },
+};
+
+static int rfd77402_set_state(struct rfd77402_data *data, u8 state, u16 check)
+{
+        int ret;
+
+        ret = i2c_smbus_write_byte_data(data->client, RFD77402_CMD_R,
+                                        state | RFD77402_CMD_VALID);
+        if (ret < 0)
+                return ret;
+
+        usleep_range(10000, 20000);
+
+        ret = i2c_smbus_read_word_data(data->client, RFD77402_STATUS_R);
+        if (ret < 0)
+                return ret;
+        if ((ret & RFD77402_STATUS_PM_MASK) != check)
+                return -ENODEV;
+
+        return 0;
+}
+
+static int rfd77402_measure(struct rfd77402_data *data)
+{
+        int ret;
+        int tries = 10;
+
+        ret = rfd77402_set_state(data, RFD77402_CMD_MCPU_ON,
+                                 RFD77402_STATUS_MCPU_ON);
+        if (ret < 0)
+                return ret;
+
+        ret = i2c_smbus_write_byte_data(data->client, RFD77402_CMD_R,
+                                        RFD77402_CMD_SINGLE |
+                                        RFD77402_CMD_VALID);
+        if (ret < 0)
+                goto err;
+
+        while (tries-- > 0) {
+                ret = i2c_smbus_read_byte_data(data->client, RFD77402_ICSR);
+                if (ret < 0)
+                        goto err;
+                if (ret & RFD77402_ICSR_RESULT)
+                        break;
+                msleep(20);
+        }
+
+        if (tries < 0) {
+                ret = -ETIMEDOUT;
+                goto err;
+        }
+
+        ret = i2c_smbus_read_word_data(data->client, RFD77402_RESULT_R);
+        if (ret < 0)
+                goto err;
+
+        if ((ret & RFD77402_RESULT_ERR_MASK) ||
+            !(ret & RFD77402_RESULT_VALID)) {
+                ret = -EIO;
+                goto err;
+        }
+
+        return (ret & RFD77402_RESULT_DIST_MASK) >> 2;
+
+err:
+        rfd77402_set_state(data, RFD77402_CMD_MCPU_OFF,
+                           RFD77402_STATUS_MCPU_OFF);
+        return ret;
+}
+
+static int rfd77402_read_raw(struct iio_dev *indio_dev,
+                             struct iio_chan_spec const *chan,
+                             int *val, int *val2, long mask)
+{
+        struct rfd77402_data *data = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                mutex_lock(&data->lock);
+                ret = rfd77402_measure(data);
+                mutex_unlock(&data->lock);
+                if (ret < 0)
+                        return ret;
+                *val = ret;
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                /* 1 LSB is 1 mm */
+                *val = 0;
+                *val2 = 1000;
+                return IIO_VAL_INT_PLUS_MICRO;
+        default:
+                return -EINVAL;
+        }
+}
+
+static const struct iio_info rfd77402_info = {
+        .read_raw = rfd77402_read_raw,
+};
+
+static int rfd77402_init(struct rfd77402_data *data)
+{
+        int ret, i;
+
+        ret = rfd77402_set_state(data, RFD77402_CMD_STANDBY,
+                                 RFD77402_STATUS_STANDBY);
+        if (ret < 0)
+                return ret;
+
+        /* configure INT pad as push-pull, active low */
+        ret = i2c_smbus_write_byte_data(data->client, RFD77402_ICSR,
+                                        RFD77402_ICSR_INT_MODE);
+        if (ret < 0)
+                return ret;
+
+        /* I2C configuration */
+        ret = i2c_smbus_write_word_data(data->client, RFD77402_I2C_INIT_CFG,
+                                        RFD77402_I2C_ADDR_INCR |
+                                        RFD77402_I2C_DATA_INCR |
+                                        RFD77402_I2C_HOST_DEBUG |
+                                        RFD77402_I2C_MCPU_DEBUG);
+        if (ret < 0)
+                return ret;
+
+        /* set initialization */
+        ret = i2c_smbus_write_word_data(data->client, RFD77402_PMU_CFG, 0x0500);
+        if (ret < 0)
+                return ret;
+
+        ret = rfd77402_set_state(data, RFD77402_CMD_MCPU_OFF,
+                                 RFD77402_STATUS_MCPU_OFF);
+        if (ret < 0)
+                return ret;
+
+        /* set initialization */
+        ret = i2c_smbus_write_word_data(data->client, RFD77402_PMU_CFG, 0x0600);
+        if (ret < 0)
+                return ret;
+
+        ret = rfd77402_set_state(data, RFD77402_CMD_MCPU_ON,
+                                 RFD77402_STATUS_MCPU_ON);
+        if (ret < 0)
+                return ret;
+
+        for (i = 0; i < ARRAY_SIZE(rf77402_tof_config); i++) {
+                ret = i2c_smbus_write_word_data(data->client,
+                                                rf77402_tof_config[i].reg,
+                                                rf77402_tof_config[i].val);
+                if (ret < 0)
+                        return ret;
+        }
+
+        ret = rfd77402_set_state(data, RFD77402_CMD_STANDBY,
+                                 RFD77402_STATUS_STANDBY);
+
+        return ret;
+}
+
+static int rfd77402_powerdown(struct rfd77402_data *data)
+{
+        return rfd77402_set_state(data, RFD77402_CMD_STANDBY,
+                                  RFD77402_STATUS_STANDBY);
+}
+
+static int rfd77402_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
+{
+        struct rfd77402_data *data;
+        struct iio_dev *indio_dev;
+        int ret;
+
+        ret = i2c_smbus_read_word_data(client, RFD77402_MOD_CHIP_ID);
+        if (ret < 0)
+                return ret;
+        if (ret != 0xad01 && ret != 0xad02) /* known chip ids */
+                return -ENODEV;
+
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        data = iio_priv(indio_dev);
+        i2c_set_clientdata(client, indio_dev);
+        data->client = client;
+        mutex_init(&data->lock);
+
+        indio_dev->dev.parent = &client->dev;
+        indio_dev->info = &rfd77402_info;
+        indio_dev->channels = rfd77402_channels;
+        indio_dev->num_channels = ARRAY_SIZE(rfd77402_channels);
+        indio_dev->name = RFD77402_DRV_NAME;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+
+        ret = rfd77402_init(data);
+        if (ret < 0)
+                return ret;
+
+        ret = iio_device_register(indio_dev);
+        if (ret)
+                goto err_powerdown;
+
+        return 0;
+
+err_powerdown:
+        rfd77402_powerdown(data);
+        return ret;
+}
+
+static int rfd77402_remove(struct i2c_client *client)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+
+        iio_device_unregister(indio_dev);
+        rfd77402_powerdown(iio_priv(indio_dev));
+
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int rfd77402_suspend(struct device *dev)
+{
+        struct rfd77402_data *data = iio_priv(i2c_get_clientdata(
+                                     to_i2c_client(dev)));
+
+        return rfd77402_powerdown(data);
+}
+
+static int rfd77402_resume(struct device *dev)
+{
+        struct rfd77402_data *data = iio_priv(i2c_get_clientdata(
+                                     to_i2c_client(dev)));
+
+        return rfd77402_init(data);
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(rfd77402_pm_ops, rfd77402_suspend, rfd77402_resume);
+
+static const struct i2c_device_id rfd77402_id[] = {
+        { "rfd77402", 0},
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, rfd77402_id);
+
+static struct i2c_driver rfd77402_driver = {
+        .driver = {
+                .name   = RFD77402_DRV_NAME,
+                .pm     = &rfd77402_pm_ops,
+        },
+        .probe  = rfd77402_probe,
+        .remove = rfd77402_remove,
+        .id_table = rfd77402_id,
+};
+
+module_i2c_driver(rfd77402_driver);
+
+MODULE_AUTHOR("Peter Meerwald-Stadler <pmeerw@pmeerw.net>");
+MODULE_DESCRIPTION("RFD77402 Time-of-Flight sensor driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/iio/proximity/srf04.c b/drivers/iio/proximity/srf04.c
index e37667f933b3..09c7b9c095b0 100644
--- a/drivers/iio/proximity/srf04.c
+++ b/drivers/iio/proximity/srf04.c
@@ -203,7 +203,6 @@ static int srf04_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info srf04_iio_info = {
-        .driver_module          = THIS_MODULE,
         .read_raw               = srf04_read_raw,
 };
 
diff --git a/drivers/iio/proximity/srf08.c b/drivers/iio/proximity/srf08.c
index 9380d545aab1..f2bf783f829a 100644
--- a/drivers/iio/proximity/srf08.c
+++ b/drivers/iio/proximity/srf08.c
@@ -436,7 +436,6 @@ static const struct iio_chan_spec srf08_channels[] = {
 static const struct iio_info srf08_info = {
         .read_raw = srf08_read_raw,
         .attrs = &srf08_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 /*
@@ -445,7 +444,6 @@ static const struct iio_info srf08_info = {
  */
 static const struct iio_info srf02_info = {
         .read_raw = srf08_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int srf08_probe(struct i2c_client *client,
diff --git a/drivers/iio/proximity/sx9500.c b/drivers/iio/proximity/sx9500.c
index f42b3a1c75ff..53c5d653e780 100644
--- a/drivers/iio/proximity/sx9500.c
+++ b/drivers/iio/proximity/sx9500.c
@@ -615,7 +615,6 @@ static const struct attribute_group sx9500_attribute_group = {
 };
 
 static const struct iio_info sx9500_info = {
-        .driver_module = THIS_MODULE,
         .attrs = &sx9500_attribute_group,
         .read_raw = &sx9500_read_raw,
         .write_raw = &sx9500_write_raw,
@@ -650,7 +649,6 @@ out:
 
 static const struct iio_trigger_ops sx9500_trigger_ops = {
         .set_trigger_state = sx9500_set_trigger_state,
-        .owner = THIS_MODULE,
 };
 
 static irqreturn_t sx9500_trigger_handler(int irq, void *private)
diff --git a/drivers/iio/temperature/hid-sensor-temperature.c b/drivers/iio/temperature/hid-sensor-temperature.c
index c01efeca4002..beaf6fd3e337 100644
--- a/drivers/iio/temperature/hid-sensor-temperature.c
+++ b/drivers/iio/temperature/hid-sensor-temperature.c
@@ -123,7 +123,6 @@ static int temperature_write_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info temperature_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &temperature_read_raw,
         .write_raw = &temperature_write_raw,
 };
diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c
index d70e2e53d6a7..e8b7e0b6c8ad 100644
--- a/drivers/iio/temperature/maxim_thermocouple.c
+++ b/drivers/iio/temperature/maxim_thermocouple.c
@@ -208,7 +208,6 @@ static int maxim_thermocouple_read_raw(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info maxim_thermocouple_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = maxim_thermocouple_read_raw,
 };
 
diff --git a/drivers/iio/temperature/mlx90614.c b/drivers/iio/temperature/mlx90614.c
index 2077eef4095c..d619e8634a00 100644
--- a/drivers/iio/temperature/mlx90614.c
+++ b/drivers/iio/temperature/mlx90614.c
@@ -400,7 +400,6 @@ static const struct iio_info mlx90614_info = {
         .write_raw = mlx90614_write_raw,
         .write_raw_get_fmt = mlx90614_write_raw_get_fmt,
         .attrs = &mlx90614_attr_group,
-        .driver_module = THIS_MODULE,
 };
 
 #ifdef CONFIG_PM
diff --git a/drivers/iio/temperature/tmp006.c b/drivers/iio/temperature/tmp006.c
index 18c9b43c02cb..a9b5b7cc7836 100644
--- a/drivers/iio/temperature/tmp006.c
+++ b/drivers/iio/temperature/tmp006.c
@@ -179,7 +179,6 @@ static const struct iio_info tmp006_info = {
         .read_raw = tmp006_read_raw,
         .write_raw = tmp006_write_raw,
         .attrs = &tmp006_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static bool tmp006_check_identification(struct i2c_client *client)
diff --git a/drivers/iio/temperature/tmp007.c b/drivers/iio/temperature/tmp007.c
index 0615324d054c..0e3f2d432e10 100644
--- a/drivers/iio/temperature/tmp007.c
+++ b/drivers/iio/temperature/tmp007.c
@@ -426,7 +426,6 @@ static const struct iio_info tmp007_info = {
         .read_event_value = tmp007_read_thresh,
         .write_event_value = tmp007_write_thresh,
         .attrs = &tmp007_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static bool tmp007_identify(struct i2c_client *client)
diff --git a/drivers/iio/temperature/tsys01.c b/drivers/iio/temperature/tsys01.c
index d8aa211d76e4..3799d007c8e7 100644
--- a/drivers/iio/temperature/tsys01.c
+++ b/drivers/iio/temperature/tsys01.c
@@ -111,7 +111,6 @@ static const struct iio_chan_spec tsys01_channels[] = {
 
 static const struct iio_info tsys01_info = {
         .read_raw = tsys01_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static bool tsys01_crc_valid(u16 *n_prom)
diff --git a/drivers/iio/temperature/tsys02d.c b/drivers/iio/temperature/tsys02d.c
index c0a19a000387..9b2e56fa5fd5 100644
--- a/drivers/iio/temperature/tsys02d.c
+++ b/drivers/iio/temperature/tsys02d.c
@@ -120,7 +120,6 @@ static const struct iio_info tsys02d_info = {
         .read_raw = tsys02d_read_raw,
         .write_raw = tsys02d_write_raw,
         .attrs = &tsys02d_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int tsys02d_probe(struct i2c_client *client,
diff --git a/drivers/iio/trigger/iio-trig-hrtimer.c b/drivers/iio/trigger/iio-trig-hrtimer.c
index a1cad6cc2e0f..3ee92160053f 100644
--- a/drivers/iio/trigger/iio-trig-hrtimer.c
+++ b/drivers/iio/trigger/iio-trig-hrtimer.c
@@ -114,7 +114,6 @@ static int iio_trig_hrtimer_set_state(struct iio_trigger *trig, bool state)
 }
 
 static const struct iio_trigger_ops iio_hrtimer_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = iio_trig_hrtimer_set_state,
 };
 
diff --git a/drivers/iio/trigger/iio-trig-interrupt.c b/drivers/iio/trigger/iio-trig-interrupt.c
index e18f12b74610..171c4ed03543 100644
--- a/drivers/iio/trigger/iio-trig-interrupt.c
+++ b/drivers/iio/trigger/iio-trig-interrupt.c
@@ -29,7 +29,6 @@ static irqreturn_t iio_interrupt_trigger_poll(int irq, void *private)
 }
 
 static const struct iio_trigger_ops iio_interrupt_trigger_ops = {
-        .owner = THIS_MODULE,
 };
 
 static int iio_interrupt_trigger_probe(struct platform_device *pdev)
diff --git a/drivers/iio/trigger/iio-trig-loop.c b/drivers/iio/trigger/iio-trig-loop.c
index dc6be28f96fe..b4b02dbd6e8a 100644
--- a/drivers/iio/trigger/iio-trig-loop.c
+++ b/drivers/iio/trigger/iio-trig-loop.c
@@ -74,7 +74,6 @@ static int iio_loop_trigger_set_state(struct iio_trigger *trig, bool state)
 
 static const struct iio_trigger_ops iio_loop_trigger_ops = {
         .set_trigger_state = iio_loop_trigger_set_state,
-        .owner = THIS_MODULE,
 };
 
 static struct iio_sw_trigger *iio_trig_loop_probe(const char *name)
diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c
index 202e8b89caf2..3f0dc9a1a514 100644
--- a/drivers/iio/trigger/iio-trig-sysfs.c
+++ b/drivers/iio/trigger/iio-trig-sysfs.c
@@ -127,7 +127,6 @@ static const struct attribute_group *iio_sysfs_trigger_attr_groups[] = {
 };
 
 static const struct iio_trigger_ops iio_sysfs_trigger_ops = {
-        .owner = THIS_MODULE,
 };
 
 static int iio_sysfs_trigger_probe(int id)
diff --git a/drivers/iio/trigger/stm32-lptimer-trigger.c b/drivers/iio/trigger/stm32-lptimer-trigger.c
index 241eae6a4306..de361d879929 100644
--- a/drivers/iio/trigger/stm32-lptimer-trigger.c
+++ b/drivers/iio/trigger/stm32-lptimer-trigger.c
@@ -37,7 +37,6 @@ static int stm32_lptim_validate_device(struct iio_trigger *trig,
 }
 
 static const struct iio_trigger_ops stm32_lptim_trigger_ops = {
-        .owner = THIS_MODULE,
         .validate_device = stm32_lptim_validate_device,
 };
 
diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c
index eb212f8c8879..b542dc484969 100644
--- a/drivers/iio/trigger/stm32-timer-trigger.c
+++ b/drivers/iio/trigger/stm32-timer-trigger.c
@@ -355,7 +355,6 @@ static const struct attribute_group *stm32_trigger_attr_groups[] = {
 };
 
 static const struct iio_trigger_ops timer_trigger_ops = {
-        .owner = THIS_MODULE,
 };
 
 static int stm32_setup_iio_triggers(struct stm32_timer_trigger *priv)
@@ -493,7 +492,6 @@ static int stm32_counter_validate_trigger(struct iio_dev *indio_dev,
 }
 
 static const struct iio_info stm32_trigger_info = {
-        .driver_module = THIS_MODULE,
         .validate_trigger = stm32_counter_validate_trigger,
         .read_raw = stm32_counter_read_raw,
         .write_raw = stm32_counter_write_raw
diff --git a/drivers/input/input.c b/drivers/input/input.c
index d268fdc23c64..762bfb9487dc 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -933,58 +933,52 @@ int input_set_keycode(struct input_dev *dev,
 }
 EXPORT_SYMBOL(input_set_keycode);
 
+bool input_match_device_id(const struct input_dev *dev,
+                           const struct input_device_id *id)
+{
+        if (id->flags & INPUT_DEVICE_ID_MATCH_BUS)
+                if (id->bustype != dev->id.bustype)
+                        return false;
+
+        if (id->flags & INPUT_DEVICE_ID_MATCH_VENDOR)
+                if (id->vendor != dev->id.vendor)
+                        return false;
+
+        if (id->flags & INPUT_DEVICE_ID_MATCH_PRODUCT)
+                if (id->product != dev->id.product)
+                        return false;
+
+        if (id->flags & INPUT_DEVICE_ID_MATCH_VERSION)
+                if (id->version != dev->id.version)
+                        return false;
+
+        if (!bitmap_subset(id->evbit, dev->evbit, EV_MAX) ||
+            !bitmap_subset(id->keybit, dev->keybit, KEY_MAX) ||
+            !bitmap_subset(id->relbit, dev->relbit, REL_MAX) ||
+            !bitmap_subset(id->absbit, dev->absbit, ABS_MAX) ||
+            !bitmap_subset(id->mscbit, dev->mscbit, MSC_MAX) ||
+            !bitmap_subset(id->ledbit, dev->ledbit, LED_MAX) ||
+            !bitmap_subset(id->sndbit, dev->sndbit, SND_MAX) ||
+            !bitmap_subset(id->ffbit, dev->ffbit, FF_MAX) ||
+            !bitmap_subset(id->swbit, dev->swbit, SW_MAX) ||
+            !bitmap_subset(id->propbit, dev->propbit, INPUT_PROP_MAX)) {
+                return false;
+        }
+
+        return true;
+}
+EXPORT_SYMBOL(input_match_device_id);
+
 static const struct input_device_id *input_match_device(struct input_handler *handler,
                                                         struct input_dev *dev)
 {
         const struct input_device_id *id;
 
         for (id = handler->id_table; id->flags || id->driver_info; id++) {
-
-                if (id->flags & INPUT_DEVICE_ID_MATCH_BUS)
-                        if (id->bustype != dev->id.bustype)
-                                continue;
-
-                if (id->flags & INPUT_DEVICE_ID_MATCH_VENDOR)
-                        if (id->vendor != dev->id.vendor)
-                                continue;
-
-                if (id->flags & INPUT_DEVICE_ID_MATCH_PRODUCT)
-                        if (id->product != dev->id.product)
-                                continue;
-
-                if (id->flags & INPUT_DEVICE_ID_MATCH_VERSION)
-                        if (id->version != dev->id.version)
-                                continue;
-
-                if (!bitmap_subset(id->evbit, dev->evbit, EV_MAX))
-                        continue;
-
-                if (!bitmap_subset(id->keybit, dev->keybit, KEY_MAX))
-                        continue;
-
-                if (!bitmap_subset(id->relbit, dev->relbit, REL_MAX))
-                        continue;
-
-                if (!bitmap_subset(id->absbit, dev->absbit, ABS_MAX))
-                        continue;
-
-                if (!bitmap_subset(id->mscbit, dev->mscbit, MSC_MAX))
-                        continue;
-
-                if (!bitmap_subset(id->ledbit, dev->ledbit, LED_MAX))
-                        continue;
-
-                if (!bitmap_subset(id->sndbit, dev->sndbit, SND_MAX))
-                        continue;
-
-                if (!bitmap_subset(id->ffbit, dev->ffbit, FF_MAX))
-                        continue;
-
-                if (!bitmap_subset(id->swbit, dev->swbit, SW_MAX))
-                        continue;
-
-                if (!handler->match || handler->match(handler, dev))
+                if (input_match_device_id(dev, id) &&
+                    (!handler->match || handler->match(handler, dev))) {
                         return id;
+                }
         }
 
         return NULL;
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 29d677c714d2..7b29a8944039 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -747,6 +747,68 @@ static void joydev_cleanup(struct joydev *joydev)
                 input_close_device(handle);
 }
 
+/*
+ * These codes are copied from from hid-ids.h, unfortunately there is no common
+ * usb_ids/bt_ids.h header.
+ */
+#define USB_VENDOR_ID_SONY                      0x054c
+#define USB_DEVICE_ID_SONY_PS3_CONTROLLER               0x0268
+#define USB_DEVICE_ID_SONY_PS4_CONTROLLER               0x05c4
+#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2             0x09cc
+#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE        0x0ba0
+
+#define USB_VENDOR_ID_THQ                       0x20d6
+#define USB_DEVICE_ID_THQ_PS3_UDRAW                     0xcb17
+
+#define ACCEL_DEV(vnd, prd)                                             \
+        {                                                               \
+                .flags = INPUT_DEVICE_ID_MATCH_VENDOR |                 \
+                                INPUT_DEVICE_ID_MATCH_PRODUCT |         \
+                                INPUT_DEVICE_ID_MATCH_PROPBIT,          \
+                .vendor = (vnd),                                        \
+                .product = (prd),                                       \
+                .propbit = { BIT_MASK(INPUT_PROP_ACCELEROMETER) },      \
+        }
+
+static const struct input_device_id joydev_blacklist[] = {
+        /* Avoid touchpads and touchscreens */
+        {
+                .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
+                                INPUT_DEVICE_ID_MATCH_KEYBIT,
+                .evbit = { BIT_MASK(EV_KEY) },
+                .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) },
+        },
+        /* Avoid tablets, digitisers and similar devices */
+        {
+                .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
+                                INPUT_DEVICE_ID_MATCH_KEYBIT,
+                .evbit = { BIT_MASK(EV_KEY) },
+                .keybit = { [BIT_WORD(BTN_DIGI)] = BIT_MASK(BTN_DIGI) },
+        },
+        /* Disable accelerometers on composite devices */
+        ACCEL_DEV(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER),
+        ACCEL_DEV(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),
+        ACCEL_DEV(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
+        ACCEL_DEV(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE),
+        ACCEL_DEV(USB_VENDOR_ID_THQ, USB_DEVICE_ID_THQ_PS3_UDRAW),
+        { /* sentinel */ }
+};
+
+static bool joydev_dev_is_blacklisted(struct input_dev *dev)
+{
+        const struct input_device_id *id;
+
+        for (id = joydev_blacklist; id->flags; id++) {
+                if (input_match_device_id(dev, id)) {
+                        dev_dbg(&dev->dev,
+                                "joydev: blacklisting '%s'\n", dev->name);
+                        return true;
+                }
+        }
+
+        return false;
+}
+
 static bool joydev_dev_is_absolute_mouse(struct input_dev *dev)
 {
         DECLARE_BITMAP(jd_scratch, KEY_CNT);
@@ -807,12 +869,8 @@ static bool joydev_dev_is_absolute_mouse(struct input_dev *dev)
 
 static bool joydev_match(struct input_handler *handler, struct input_dev *dev)
 {
-        /* Avoid touchpads and touchscreens */
-        if (test_bit(EV_KEY, dev->evbit) && test_bit(BTN_TOUCH, dev->keybit))
-                return false;
-
-        /* Avoid tablets, digitisers and similar devices */
-        if (test_bit(EV_KEY, dev->evbit) && test_bit(BTN_DIGI, dev->keybit))
+        /* Disable blacklisted devices */
+        if (joydev_dev_is_blacklisted(dev))
                 return false;
 
         /* Avoid absolute mice */
diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c
index e37e335e406f..6da607d3b811 100644
--- a/drivers/input/keyboard/tca8418_keypad.c
+++ b/drivers/input/keyboard/tca8418_keypad.c
@@ -234,14 +234,7 @@ static irqreturn_t tca8418_irq_handler(int irq, void *dev_id)
 static int tca8418_configure(struct tca8418_keypad *keypad_data,
                              u32 rows, u32 cols)
 {
-        int reg, error;
-
-        /* Write config register, if this fails assume device not present */
-        error = tca8418_write_byte(keypad_data, REG_CFG,
-                                CFG_INT_CFG | CFG_OVR_FLOW_IEN | CFG_KE_IEN);
-        if (error < 0)
-                return -ENODEV;
-
+        int reg, error = 0;
 
         /* Assemble a mask for row and column registers */
         reg  =  ~(~0 << rows);
@@ -257,6 +250,12 @@ static int tca8418_configure(struct tca8418_keypad *keypad_data,
         error |= tca8418_write_byte(keypad_data, REG_DEBOUNCE_DIS2, reg >> 8);
         error |= tca8418_write_byte(keypad_data, REG_DEBOUNCE_DIS3, reg >> 16);
 
+        if (error)
+                return error;
+
+        error = tca8418_write_byte(keypad_data, REG_CFG,
+                                CFG_INT_CFG | CFG_OVR_FLOW_IEN | CFG_KE_IEN);
+
         return error;
 }
 
@@ -268,6 +267,7 @@ static int tca8418_keypad_probe(struct i2c_client *client,
         struct input_dev *input;
         u32 rows = 0, cols = 0;
         int error, row_shift, max_keys;
+        u8 reg;
 
         /* Check i2c driver capabilities */
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE)) {
@@ -301,10 +301,10 @@ static int tca8418_keypad_probe(struct i2c_client *client,
         keypad_data->client = client;
         keypad_data->row_shift = row_shift;
 
-        /* Initialize the chip or fail if chip isn't present */
-        error = tca8418_configure(keypad_data, rows, cols);
-        if (error < 0)
-                return error;
+        /* Read key lock register, if this fails assume device not present */
+        error = tca8418_read_byte(keypad_data, REG_KEY_LCK_EC, &reg);
+        if (error)
+                return -ENODEV;
 
         /* Configure input device */
         input = devm_input_allocate_device(dev);
@@ -340,6 +340,11 @@ static int tca8418_keypad_probe(struct i2c_client *client,
                 return error;
         }
 
+        /* Initialize the chip */
+        error = tca8418_configure(keypad_data, rows, cols);
+        if (error < 0)
+                return error;
+
         error = input_register_device(input);
         if (error) {
                 dev_err(dev, "Unable to register input device, error: %d\n",
diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c
index 6cee5adc3b5c..debeeaeb8812 100644
--- a/drivers/input/misc/axp20x-pek.c
+++ b/drivers/input/misc/axp20x-pek.c
@@ -403,6 +403,7 @@ static const struct platform_device_id axp_pek_id_match[] = {
         },
         { /* sentinel */ }
 };
+MODULE_DEVICE_TABLE(platform, axp_pek_id_match);
 
 static struct platform_driver axp20x_pek_driver = {
         .probe          = axp20x_pek_probe,
@@ -417,4 +418,3 @@ module_platform_driver(axp20x_pek_driver);
 MODULE_DESCRIPTION("axp20x Power Button");
 MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:axp20x-pek");
diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
index 6bf82ea8c918..ae473123583b 100644
--- a/drivers/input/misc/ims-pcu.c
+++ b/drivers/input/misc/ims-pcu.c
@@ -1635,13 +1635,25 @@ ims_pcu_get_cdc_union_desc(struct usb_interface *intf)
                 return NULL;
         }
 
-        while (buflen > 0) {
+        while (buflen >= sizeof(*union_desc)) {
                 union_desc = (struct usb_cdc_union_desc *)buf;
 
+                if (union_desc->bLength > buflen) {
+                        dev_err(&intf->dev, "Too large descriptor\n");
+                        return NULL;
+                }
+
                 if (union_desc->bDescriptorType == USB_DT_CS_INTERFACE &&
                     union_desc->bDescriptorSubType == USB_CDC_UNION_TYPE) {
                         dev_dbg(&intf->dev, "Found union header\n");
-                        return union_desc;
+
+                        if (union_desc->bLength >= sizeof(*union_desc))
+                                return union_desc;
+
+                        dev_err(&intf->dev,
+                                "Union descriptor to short (%d vs %zd\n)",
+                                union_desc->bLength, sizeof(*union_desc));
+                        return NULL;
                 }
 
                 buflen -= union_desc->bLength;
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 5af0b7d200bc..ee5466a374bf 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -1709,8 +1709,7 @@ static int synaptics_create_intertouch(struct psmouse *psmouse,
                 .sensor_pdata = {
                         .sensor_type = rmi_sensor_touchpad,
                         .axis_align.flip_y = true,
-                        /* to prevent cursors jumps: */
-                        .kernel_tracking = true,
+                        .kernel_tracking = false,
                         .topbuttonpad = topbuttonpad,
                 },
                 .f30_data = {
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index 32d2762448aa..b3bbad7d2282 100644
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -72,6 +72,9 @@ struct goodix_ts_data {
 #define GOODIX_REG_CONFIG_DATA          0x8047
 #define GOODIX_REG_ID                   0x8140
 
+#define GOODIX_BUFFER_STATUS_READY      BIT(7)
+#define GOODIX_BUFFER_STATUS_TIMEOUT    20
+
 #define RESOLUTION_LOC          1
 #define MAX_CONTACTS_LOC        5
 #define TRIGGER_LOC             6
@@ -195,35 +198,53 @@ static int goodix_get_cfg_len(u16 id)
 
 static int goodix_ts_read_input_report(struct goodix_ts_data *ts, u8 *data)
 {
+        unsigned long max_timeout;
         int touch_num;
         int error;
 
-        error = goodix_i2c_read(ts->client, GOODIX_READ_COOR_ADDR, data,
-                                GOODIX_CONTACT_SIZE + 1);
-        if (error) {
-                dev_err(&ts->client->dev, "I2C transfer error: %d\n", error);
-                return error;
-        }
+        /*
+         * The 'buffer status' bit, which indicates that the data is valid, is
+         * not set as soon as the interrupt is raised, but slightly after.
+         * This takes around 10 ms to happen, so we poll for 20 ms.
+         */
+        max_timeout = jiffies + msecs_to_jiffies(GOODIX_BUFFER_STATUS_TIMEOUT);
+        do {
+                error = goodix_i2c_read(ts->client, GOODIX_READ_COOR_ADDR,
+                                        data, GOODIX_CONTACT_SIZE + 1);
+                if (error) {
+                        dev_err(&ts->client->dev, "I2C transfer error: %d\n",
+                                        error);
+                        return error;
+                }
 
-        if (!(data[0] & 0x80))
-                return -EAGAIN;
+                if (data[0] & GOODIX_BUFFER_STATUS_READY) {
+                        touch_num = data[0] & 0x0f;
+                        if (touch_num > ts->max_touch_num)
+                                return -EPROTO;
+
+                        if (touch_num > 1) {
+                                data += 1 + GOODIX_CONTACT_SIZE;
+                                error = goodix_i2c_read(ts->client,
+                                                GOODIX_READ_COOR_ADDR +
+                                                        1 + GOODIX_CONTACT_SIZE,
+                                                data,
+                                                GOODIX_CONTACT_SIZE *
+                                                        (touch_num - 1));
+                                if (error)
+                                        return error;
+                        }
+
+                        return touch_num;
+                }
 
-        touch_num = data[0] & 0x0f;
-        if (touch_num > ts->max_touch_num)
-                return -EPROTO;
-
-        if (touch_num > 1) {
-                data += 1 + GOODIX_CONTACT_SIZE;
-                error = goodix_i2c_read(ts->client,
-                                        GOODIX_READ_COOR_ADDR +
-                                                1 + GOODIX_CONTACT_SIZE,
-                                        data,
-                                        GOODIX_CONTACT_SIZE * (touch_num - 1));
-                if (error)
-                        return error;
-        }
+                usleep_range(1000, 2000); /* Poll every 1 - 2 ms */
+        } while (time_before(jiffies, max_timeout));
 
-        return touch_num;
+        /*
+         * The Goodix panel will send spurious interrupts after a
+         * 'finger up' event, which will always cause a timeout.
+         */
+        return 0;
 }
 
 static void goodix_ts_report_touch(struct goodix_ts_data *ts, u8 *coor_data)
diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c
index 157fdb4bb2e8..8c6c6178ec12 100644
--- a/drivers/input/touchscreen/stmfts.c
+++ b/drivers/input/touchscreen/stmfts.c
@@ -663,12 +663,10 @@ static int stmfts_probe(struct i2c_client *client,
         sdata->input->open = stmfts_input_open;
         sdata->input->close = stmfts_input_close;
 
+        input_set_capability(sdata->input, EV_ABS, ABS_MT_POSITION_X);
+        input_set_capability(sdata->input, EV_ABS, ABS_MT_POSITION_Y);
         touchscreen_parse_properties(sdata->input, true, &sdata->prop);
 
-        input_set_abs_params(sdata->input, ABS_MT_POSITION_X, 0,
-                                                sdata->prop.max_x, 0, 0);
-        input_set_abs_params(sdata->input, ABS_MT_POSITION_Y, 0,
-                                                sdata->prop.max_y, 0, 0);
         input_set_abs_params(sdata->input, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
         input_set_abs_params(sdata->input, ABS_MT_TOUCH_MINOR, 0, 255, 0, 0);
         input_set_abs_params(sdata->input, ABS_MT_ORIENTATION, 0, 255, 0, 0);
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index 7953381d939a..f1043ae71dcc 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -161,7 +161,7 @@ static void titsc_step_config(struct titsc *ts_dev)
                 break;
         case 5:
                 config |= ts_dev->bit_xp | STEPCONFIG_INP_AN4 |
-                                ts_dev->bit_xn | ts_dev->bit_yp;
+                                STEPCONFIG_XNP | STEPCONFIG_YPN;
                 break;
         case 8:
                 config |= ts_dev->bit_yp | STEPCONFIG_INP(ts_dev->inp_xp);
diff --git a/drivers/input/touchscreen/tsc2007_iio.c b/drivers/input/touchscreen/tsc2007_iio.c
index 27b25a9fce83..e27a956f5f2b 100644
--- a/drivers/input/touchscreen/tsc2007_iio.c
+++ b/drivers/input/touchscreen/tsc2007_iio.c
@@ -104,7 +104,6 @@ static int tsc2007_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info tsc2007_iio_info = {
         .read_raw = tsc2007_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 int tsc2007_iio_configure(struct tsc2007 *ts)
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index e8d89343d613..e88395605e32 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -107,6 +107,10 @@ struct its_node {
 
 #define ITS_ITT_ALIGN           SZ_256
 
+/* The maximum number of VPEID bits supported by VLPI commands */
+#define ITS_MAX_VPEID_BITS      (16)
+#define ITS_MAX_VPEID           (1 << (ITS_MAX_VPEID_BITS))
+
 /* Convert page order to size in bytes */
 #define PAGE_ORDER_TO_SIZE(o)   (PAGE_SIZE << (o))
 
@@ -308,7 +312,7 @@ static void its_encode_size(struct its_cmd_block *cmd, u8 size)
 
 static void its_encode_itt(struct its_cmd_block *cmd, u64 itt_addr)
 {
-        its_mask_encode(&cmd->raw_cmd[2], itt_addr >> 8, 50, 8);
+        its_mask_encode(&cmd->raw_cmd[2], itt_addr >> 8, 51, 8);
 }
 
 static void its_encode_valid(struct its_cmd_block *cmd, int valid)
@@ -318,7 +322,7 @@ static void its_encode_valid(struct its_cmd_block *cmd, int valid)
 
 static void its_encode_target(struct its_cmd_block *cmd, u64 target_addr)
 {
-        its_mask_encode(&cmd->raw_cmd[2], target_addr >> 16, 50, 16);
+        its_mask_encode(&cmd->raw_cmd[2], target_addr >> 16, 51, 16);
 }
 
 static void its_encode_collection(struct its_cmd_block *cmd, u16 col)
@@ -358,7 +362,7 @@ static void its_encode_its_list(struct its_cmd_block *cmd, u16 its_list)
 
 static void its_encode_vpt_addr(struct its_cmd_block *cmd, u64 vpt_pa)
 {
-        its_mask_encode(&cmd->raw_cmd[3], vpt_pa >> 16, 50, 16);
+        its_mask_encode(&cmd->raw_cmd[3], vpt_pa >> 16, 51, 16);
 }
 
 static void its_encode_vpt_size(struct its_cmd_block *cmd, u8 vpt_size)
@@ -1478,9 +1482,9 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser,
         u64 val = its_read_baser(its, baser);
         u64 esz = GITS_BASER_ENTRY_SIZE(val);
         u64 type = GITS_BASER_TYPE(val);
+        u64 baser_phys, tmp;
         u32 alloc_pages;
         void *base;
-        u64 tmp;
 
 retry_alloc_baser:
         alloc_pages = (PAGE_ORDER_TO_SIZE(order) / psz);
@@ -1496,8 +1500,24 @@ retry_alloc_baser:
         if (!base)
                 return -ENOMEM;
 
+        baser_phys = virt_to_phys(base);
+
+        /* Check if the physical address of the memory is above 48bits */
+        if (IS_ENABLED(CONFIG_ARM64_64K_PAGES) && (baser_phys >> 48)) {
+
+                /* 52bit PA is supported only when PageSize=64K */
+                if (psz != SZ_64K) {
+                        pr_err("ITS: no 52bit PA support when psz=%d\n", psz);
+                        free_pages((unsigned long)base, order);
+                        return -ENXIO;
+                }
+
+                /* Convert 52bit PA to 48bit field */
+                baser_phys = GITS_BASER_PHYS_52_to_48(baser_phys);
+        }
+
 retry_baser:
-        val = (virt_to_phys(base)                                |
+        val = (baser_phys                                        |
                 (type << GITS_BASER_TYPE_SHIFT)                  |
                 ((esz - 1) << GITS_BASER_ENTRY_SIZE_SHIFT)       |
                 ((alloc_pages - 1) << GITS_BASER_PAGES_SHIFT)    |
@@ -1582,13 +1602,12 @@ retry_baser:
 
 static bool its_parse_indirect_baser(struct its_node *its,
                                      struct its_baser *baser,
-                                     u32 psz, u32 *order)
+                                     u32 psz, u32 *order, u32 ids)
 {
         u64 tmp = its_read_baser(its, baser);
         u64 type = GITS_BASER_TYPE(tmp);
         u64 esz = GITS_BASER_ENTRY_SIZE(tmp);
         u64 val = GITS_BASER_InnerShareable | GITS_BASER_RaWaWb;
-        u32 ids = its->device_ids;
         u32 new_order = *order;
         bool indirect = false;
 
@@ -1680,9 +1699,13 @@ static int its_alloc_tables(struct its_node *its)
                         continue;
 
                 case GITS_BASER_TYPE_DEVICE:
+                        indirect = its_parse_indirect_baser(its, baser,
+                                                            psz, &order,
+                                                            its->device_ids);
                 case GITS_BASER_TYPE_VCPU:
                         indirect = its_parse_indirect_baser(its, baser,
-                                                            psz, &order);
+                                                            psz, &order,
+                                                            ITS_MAX_VPEID_BITS);
                         break;
                 }
 
@@ -2551,7 +2574,7 @@ static struct irq_chip its_vpe_irq_chip = {
 
 static int its_vpe_id_alloc(void)
 {
-        return ida_simple_get(&its_vpeid_ida, 0, 1 << 16, GFP_KERNEL);
+        return ida_simple_get(&its_vpeid_ida, 0, ITS_MAX_VPEID, GFP_KERNEL);
 }
 
 static void its_vpe_id_free(u16 id)
@@ -2851,7 +2874,7 @@ static int its_init_vpe_domain(void)
                 return -ENOMEM;
         }
 
-        BUG_ON(entries != vpe_proxy.dev->nr_ites);
+        BUG_ON(entries > vpe_proxy.dev->nr_ites);
 
         raw_spin_lock_init(&vpe_proxy.lock);
         vpe_proxy.next_victim = 0;
diff --git a/drivers/irqchip/irq-tango.c b/drivers/irqchip/irq-tango.c
index bdbb5c0ff7fe..0c085303a583 100644
--- a/drivers/irqchip/irq-tango.c
+++ b/drivers/irqchip/irq-tango.c
@@ -141,7 +141,7 @@ static void __init tangox_irq_init_chip(struct irq_chip_generic *gc,
         for (i = 0; i < 2; i++) {
                 ct[i].chip.irq_ack = irq_gc_ack_set_bit;
                 ct[i].chip.irq_mask = irq_gc_mask_disable_reg;
-                ct[i].chip.irq_mask_ack = irq_gc_mask_disable_reg_and_ack;
+                ct[i].chip.irq_mask_ack = irq_gc_mask_disable_and_ack_set;
                 ct[i].chip.irq_unmask = irq_gc_unmask_enable_reg;
                 ct[i].chip.irq_set_type = tangox_irq_set_type;
                 ct[i].chip.name = gc->domain->name;
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 8136dc7e863d..f1a5c2357b14 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -393,16 +393,6 @@ config SPEAR13XX_PCIE_GADGET
          entry will be created for that controller. User can use these
          sysfs node to configure PCIe EP as per his requirements.
 
-config TI_DAC7512
-        tristate "Texas Instruments DAC7512"
-        depends on SPI && SYSFS
-        help
-          If you say yes here you get support for the Texas Instruments
-          DAC7512 16-bit digital-to-analog converter.
-
-          This driver can also be built as a module. If so, the module
-          will be called ti_dac7512.
-
 config VMWARE_BALLOON
         tristate "VMware Balloon Driver"
         depends on VMWARE_VMCI && X86 && HYPERVISOR_GUEST
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index d84819dc2468..9f80b1e9bae1 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -30,7 +30,6 @@ obj-$(CONFIG_ISL29003)		+= isl29003.o
 obj-$(CONFIG_ISL29020)          += isl29020.o
 obj-$(CONFIG_SENSORS_TSL2550)   += tsl2550.o
 obj-$(CONFIG_DS1682)            += ds1682.o
-obj-$(CONFIG_TI_DAC7512)        += ti_dac7512.o
 obj-$(CONFIG_C2PORT)            += c2port/
 obj-$(CONFIG_HMC6352)           += hmc6352.o
 obj-y                           += eeprom/
diff --git a/drivers/misc/ti_dac7512.c b/drivers/misc/ti_dac7512.c
deleted file mode 100644
index f5456fb7d773..000000000000
--- a/drivers/misc/ti_dac7512.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *  dac7512.c - Linux kernel module for
- *      Texas Instruments DAC7512
- *
- *  Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/module.h>
-#include <linux/spi/spi.h>
-#include <linux/of.h>
-
-static ssize_t dac7512_store_val(struct device *dev,
-                                 struct device_attribute *attr,
-                                 const char *buf, size_t count)
-{
-        struct spi_device *spi = to_spi_device(dev);
-        unsigned char tmp[2];
-        unsigned long val;
-        int ret;
-
-        ret = kstrtoul(buf, 10, &val);
-        if (ret)
-                return ret;
-
-        tmp[0] = val >> 8;
-        tmp[1] = val & 0xff;
-        spi_write(spi, tmp, sizeof(tmp));
-        return count;
-}
-
-static DEVICE_ATTR(value, S_IWUSR, NULL, dac7512_store_val);
-
-static struct attribute *dac7512_attributes[] = {
-        &dev_attr_value.attr,
-        NULL
-};
-
-static const struct attribute_group dac7512_attr_group = {
-        .attrs = dac7512_attributes,
-};
-
-static int dac7512_probe(struct spi_device *spi)
-{
-        int ret;
-
-        spi->bits_per_word = 8;
-        spi->mode = SPI_MODE_0;
-        ret = spi_setup(spi);
-        if (ret < 0)
-                return ret;
-
-        return sysfs_create_group(&spi->dev.kobj, &dac7512_attr_group);
-}
-
-static int dac7512_remove(struct spi_device *spi)
-{
-        sysfs_remove_group(&spi->dev.kobj, &dac7512_attr_group);
-        return 0;
-}
-
-static const struct spi_device_id dac7512_id_table[] = {
-        { "dac7512", 0 },
-        { }
-};
-MODULE_DEVICE_TABLE(spi, dac7512_id_table);
-
-#ifdef CONFIG_OF
-static const struct of_device_id dac7512_of_match[] = {
-        { .compatible = "ti,dac7512", },
-        { }
-};
-MODULE_DEVICE_TABLE(of, dac7512_of_match);
-#endif
-
-static struct spi_driver dac7512_driver = {
-        .driver = {
-                .name   = "dac7512",
-                .of_match_table = of_match_ptr(dac7512_of_match),
-        },
-        .probe  = dac7512_probe,
-        .remove = dac7512_remove,
-        .id_table = dac7512_id_table,
-};
-
-module_spi_driver(dac7512_driver);
-
-MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
-MODULE_DESCRIPTION("DAC7512 16-bit DAC");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index d0ccc6729fd2..67d787fa3306 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -448,6 +448,8 @@ static void intel_dsm_init(struct intel_host *intel_host, struct device *dev,
         int err;
         u32 val;
 
+        intel_host->d3_retune = true;
+
         err = __intel_dsm(intel_host, dev, INTEL_DSM_FNS, &intel_host->dsm_fns);
         if (err) {
                 pr_debug("%s: DSM not supported, error %d\n",
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 13f0f219d8aa..a13a4896a8bd 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -182,22 +182,23 @@
 /* FLEXCAN hardware feature flags
  *
  * Below is some version info we got:
- *    SOC   Version   IP-Version  Glitch- [TR]WRN_INT Memory err RTR re-
- *                                Filter? connected?  detection  ception in MB
- *   MX25  FlexCAN2  03.00.00.00     no        no         no        no
- *   MX28  FlexCAN2  03.00.04.00    yes       yes         no        no
- *   MX35  FlexCAN2  03.00.00.00     no        no         no        no
- *   MX53  FlexCAN2  03.00.00.00    yes        no         no        no
- *   MX6s  FlexCAN3  10.00.12.00    yes       yes         no       yes
- *   VF610 FlexCAN3  ?               no       yes        yes       yes?
+ *    SOC   Version   IP-Version  Glitch- [TR]WRN_INT IRQ Err Memory err RTR re-
+ *                                Filter? connected?  Passive detection  ception in MB
+ *   MX25  FlexCAN2  03.00.00.00     no        no         ?       no        no
+ *   MX28  FlexCAN2  03.00.04.00    yes       yes        no       no        no
+ *   MX35  FlexCAN2  03.00.00.00     no        no         ?       no        no
+ *   MX53  FlexCAN2  03.00.00.00    yes        no        no       no        no
+ *   MX6s  FlexCAN3  10.00.12.00    yes       yes        no       no       yes
+ *   VF610 FlexCAN3  ?               no       yes         ?      yes       yes?
  *
  * Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected.
  */
-#define FLEXCAN_QUIRK_BROKEN_ERR_STATE  BIT(1) /* [TR]WRN_INT not connected */
+#define FLEXCAN_QUIRK_BROKEN_WERR_STATE BIT(1) /* [TR]WRN_INT not connected */
 #define FLEXCAN_QUIRK_DISABLE_RXFG      BIT(2) /* Disable RX FIFO Global mask */
 #define FLEXCAN_QUIRK_ENABLE_EACEN_RRS  BIT(3) /* Enable EACEN and RRS bit in ctrl2 */
 #define FLEXCAN_QUIRK_DISABLE_MECR      BIT(4) /* Disable Memory error detection */
 #define FLEXCAN_QUIRK_USE_OFF_TIMESTAMP BIT(5) /* Use timestamp based offloading */
+#define FLEXCAN_QUIRK_BROKEN_PERR_STATE BIT(6) /* No interrupt for error passive */
 
 /* Structure of the message buffer */
 struct flexcan_mb {
@@ -281,14 +282,17 @@ struct flexcan_priv {
 };
 
 static const struct flexcan_devtype_data fsl_p1010_devtype_data = {
-        .quirks = FLEXCAN_QUIRK_BROKEN_ERR_STATE,
+        .quirks = FLEXCAN_QUIRK_BROKEN_WERR_STATE |
+                FLEXCAN_QUIRK_BROKEN_PERR_STATE,
 };
 
-static const struct flexcan_devtype_data fsl_imx28_devtype_data;
+static const struct flexcan_devtype_data fsl_imx28_devtype_data = {
+        .quirks = FLEXCAN_QUIRK_BROKEN_PERR_STATE,
+};
 
 static const struct flexcan_devtype_data fsl_imx6q_devtype_data = {
         .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
-                FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
+                FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | FLEXCAN_QUIRK_BROKEN_PERR_STATE,
 };
 
 static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
@@ -335,6 +339,22 @@ static inline void flexcan_write(u32 val, void __iomem *addr)
 }
 #endif
 
+static inline void flexcan_error_irq_enable(const struct flexcan_priv *priv)
+{
+        struct flexcan_regs __iomem *regs = priv->regs;
+        u32 reg_ctrl = (priv->reg_ctrl_default | FLEXCAN_CTRL_ERR_MSK);
+
+        flexcan_write(reg_ctrl, &regs->ctrl);
+}
+
+static inline void flexcan_error_irq_disable(const struct flexcan_priv *priv)
+{
+        struct flexcan_regs __iomem *regs = priv->regs;
+        u32 reg_ctrl = (priv->reg_ctrl_default & ~FLEXCAN_CTRL_ERR_MSK);
+
+        flexcan_write(reg_ctrl, &regs->ctrl);
+}
+
 static inline int flexcan_transceiver_enable(const struct flexcan_priv *priv)
 {
         if (!priv->reg_xceiver)
@@ -713,6 +733,7 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
         struct flexcan_regs __iomem *regs = priv->regs;
         irqreturn_t handled = IRQ_NONE;
         u32 reg_iflag1, reg_esr;
+        enum can_state last_state = priv->can.state;
 
         reg_iflag1 = flexcan_read(&regs->iflag1);
 
@@ -765,8 +786,10 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
                 flexcan_write(reg_esr & FLEXCAN_ESR_ALL_INT, &regs->esr);
         }
 
-        /* state change interrupt */
-        if (reg_esr & FLEXCAN_ESR_ERR_STATE)
+        /* state change interrupt or broken error state quirk fix is enabled */
+        if ((reg_esr & FLEXCAN_ESR_ERR_STATE) ||
+            (priv->devtype_data->quirks & (FLEXCAN_QUIRK_BROKEN_WERR_STATE |
+                                           FLEXCAN_QUIRK_BROKEN_PERR_STATE)))
                 flexcan_irq_state(dev, reg_esr);
 
         /* bus error IRQ - handle if bus error reporting is activated */
@@ -774,6 +797,44 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
             (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING))
                 flexcan_irq_bus_err(dev, reg_esr);
 
+        /* availability of error interrupt among state transitions in case
+         * bus error reporting is de-activated and
+         * FLEXCAN_QUIRK_BROKEN_PERR_STATE is enabled:
+         *  +--------------------------------------------------------------+
+         *  | +----------------------------------------------+ [stopped /  |
+         *  | |                                              |  sleeping] -+
+         *  +-+-> active <-> warning <-> passive -> bus off -+
+         *        ___________^^^^^^^^^^^^_______________________________
+         *        disabled(1)  enabled             disabled
+         *
+         * (1): enabled if FLEXCAN_QUIRK_BROKEN_WERR_STATE is enabled
+         */
+        if ((last_state != priv->can.state) &&
+            (priv->devtype_data->quirks & FLEXCAN_QUIRK_BROKEN_PERR_STATE) &&
+            !(priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)) {
+                switch (priv->can.state) {
+                case CAN_STATE_ERROR_ACTIVE:
+                        if (priv->devtype_data->quirks &
+                            FLEXCAN_QUIRK_BROKEN_WERR_STATE)
+                                flexcan_error_irq_enable(priv);
+                        else
+                                flexcan_error_irq_disable(priv);
+                        break;
+
+                case CAN_STATE_ERROR_WARNING:
+                        flexcan_error_irq_enable(priv);
+                        break;
+
+                case CAN_STATE_ERROR_PASSIVE:
+                case CAN_STATE_BUS_OFF:
+                        flexcan_error_irq_disable(priv);
+                        break;
+
+                default:
+                        break;
+                }
+        }
+
         return handled;
 }
 
@@ -887,7 +948,7 @@ static int flexcan_chip_start(struct net_device *dev)
          * on most Flexcan cores, too. Otherwise we don't get
          * any error warning or passive interrupts.
          */
-        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_BROKEN_ERR_STATE ||
+        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_BROKEN_WERR_STATE ||
             priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)
                 reg_ctrl |= FLEXCAN_CTRL_ERR_MSK;
         else
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index be928ce62d32..9fdb0f0bfa06 100644
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -333,7 +333,7 @@ static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv,
                 }
 
                 cf->can_id = id & ESD_IDMASK;
-                cf->can_dlc = get_can_dlc(msg->msg.rx.dlc);
+                cf->can_dlc = get_can_dlc(msg->msg.rx.dlc & ~ESD_RTR);
 
                 if (id & ESD_EXTID)
                         cf->can_id |= CAN_EFF_FLAG;
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index afcc1312dbaf..68ac3e88a8ce 100644
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -375,6 +375,8 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)
 
                 gs_free_tx_context(txc);
 
+                atomic_dec(&dev->active_tx_urbs);
+
                 netif_wake_queue(netdev);
         }
 
@@ -463,14 +465,6 @@ static void gs_usb_xmit_callback(struct urb *urb)
                           urb->transfer_buffer_length,
                           urb->transfer_buffer,
                           urb->transfer_dma);
-
-        atomic_dec(&dev->active_tx_urbs);
-
-        if (!netif_device_present(netdev))
-                return;
-
-        if (netif_queue_stopped(netdev))
-                netif_wake_queue(netdev);
 }
 
 static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb,
diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
index dce7fa57eb55..f123ed57630d 100644
--- a/drivers/net/dsa/mv88e6060.c
+++ b/drivers/net/dsa/mv88e6060.c
@@ -214,8 +214,14 @@ static int mv88e6060_setup(struct dsa_switch *ds)
 
 static int mv88e6060_set_addr(struct dsa_switch *ds, u8 *addr)
 {
-        /* Use the same MAC Address as FD Pause frames for all ports */
-        REG_WRITE(REG_GLOBAL, GLOBAL_MAC_01, (addr[0] << 9) | addr[1]);
+        u16 val = addr[0] << 8 | addr[1];
+
+        /* The multicast bit is always transmitted as a zero, so the switch uses
+         * bit 8 for "DiffAddr", where 0 means all ports transmit the same SA.
+         */
+        val &= 0xfeff;
+
+        REG_WRITE(REG_GLOBAL, GLOBAL_MAC_01, val);
         REG_WRITE(REG_GLOBAL, GLOBAL_MAC_23, (addr[2] << 8) | addr[3]);
         REG_WRITE(REG_GLOBAL, GLOBAL_MAC_45, (addr[4] << 8) | addr[5]);
 
diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
index b1212debc2e1..967020fb26ee 100644
--- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
+++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
@@ -742,8 +742,8 @@ static void ena_get_channels(struct net_device *netdev,
 {
         struct ena_adapter *adapter = netdev_priv(netdev);
 
-        channels->max_rx = ENA_MAX_NUM_IO_QUEUES;
-        channels->max_tx = ENA_MAX_NUM_IO_QUEUES;
+        channels->max_rx = adapter->num_queues;
+        channels->max_tx = adapter->num_queues;
         channels->max_other = 0;
         channels->max_combined = 0;
         channels->rx_count = adapter->num_queues;
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index f7dc22f65d9f..c6bd5e24005d 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -966,7 +966,7 @@ static inline void ena_rx_checksum(struct ena_ring *rx_ring,
                 u64_stats_update_begin(&rx_ring->syncp);
                 rx_ring->rx_stats.bad_csum++;
                 u64_stats_update_end(&rx_ring->syncp);
-                netif_err(rx_ring->adapter, rx_err, rx_ring->netdev,
+                netif_dbg(rx_ring->adapter, rx_err, rx_ring->netdev,
                           "RX IPv4 header checksum error\n");
                 return;
         }
@@ -979,7 +979,7 @@ static inline void ena_rx_checksum(struct ena_ring *rx_ring,
                         u64_stats_update_begin(&rx_ring->syncp);
                         rx_ring->rx_stats.bad_csum++;
                         u64_stats_update_end(&rx_ring->syncp);
-                        netif_err(rx_ring->adapter, rx_err, rx_ring->netdev,
+                        netif_dbg(rx_ring->adapter, rx_err, rx_ring->netdev,
                                   "RX L4 checksum error\n");
                         skb->ip_summed = CHECKSUM_NONE;
                         return;
@@ -3064,7 +3064,8 @@ static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev)
         if (ena_dev->mem_bar)
                 devm_iounmap(&pdev->dev, ena_dev->mem_bar);
 
-        devm_iounmap(&pdev->dev, ena_dev->reg_bar);
+        if (ena_dev->reg_bar)
+                devm_iounmap(&pdev->dev, ena_dev->reg_bar);
 
         release_bars = pci_select_bars(pdev, IORESOURCE_MEM) & ENA_BAR_MASK;
         pci_release_selected_regions(pdev, release_bars);
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
index 0fdaaa643073..57e796870595 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
@@ -22,8 +22,12 @@
 
 #define AQ_CFG_FORCE_LEGACY_INT 0U
 
-#define AQ_CFG_IS_INTERRUPT_MODERATION_DEF   1U
-#define AQ_CFG_INTERRUPT_MODERATION_RATE_DEF 0xFFFFU
+#define AQ_CFG_INTERRUPT_MODERATION_OFF         0
+#define AQ_CFG_INTERRUPT_MODERATION_ON          1
+#define AQ_CFG_INTERRUPT_MODERATION_AUTO        0xFFFFU
+
+#define AQ_CFG_INTERRUPT_MODERATION_USEC_MAX (0x1FF * 2)
+
 #define AQ_CFG_IRQ_MASK                      0x1FFU
 
 #define AQ_CFG_VECS_MAX   8U
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
index a761e91471df..d5e99b468870 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
@@ -56,10 +56,6 @@ aq_ethtool_set_link_ksettings(struct net_device *ndev,
         return aq_nic_set_link_ksettings(aq_nic, cmd);
 }
 
-/* there "5U" is number of queue[#] stats lines (InPackets+...+InErrors) */
-static const unsigned int aq_ethtool_stat_queue_lines = 5U;
-static const unsigned int aq_ethtool_stat_queue_chars =
-        5U * ETH_GSTRING_LEN;
 static const char aq_ethtool_stat_names[][ETH_GSTRING_LEN] = {
         "InPackets",
         "InUCast",
@@ -83,56 +79,26 @@ static const char aq_ethtool_stat_names[][ETH_GSTRING_LEN] = {
         "InOctetsDma",
         "OutOctetsDma",
         "InDroppedDma",
-        "Queue[0] InPackets",
-        "Queue[0] OutPackets",
-        "Queue[0] InJumboPackets",
-        "Queue[0] InLroPackets",
-        "Queue[0] InErrors",
-        "Queue[1] InPackets",
-        "Queue[1] OutPackets",
-        "Queue[1] InJumboPackets",
-        "Queue[1] InLroPackets",
-        "Queue[1] InErrors",
-        "Queue[2] InPackets",
-        "Queue[2] OutPackets",
-        "Queue[2] InJumboPackets",
-        "Queue[2] InLroPackets",
-        "Queue[2] InErrors",
-        "Queue[3] InPackets",
-        "Queue[3] OutPackets",
-        "Queue[3] InJumboPackets",
-        "Queue[3] InLroPackets",
-        "Queue[3] InErrors",
-        "Queue[4] InPackets",
-        "Queue[4] OutPackets",
-        "Queue[4] InJumboPackets",
-        "Queue[4] InLroPackets",
-        "Queue[4] InErrors",
-        "Queue[5] InPackets",
-        "Queue[5] OutPackets",
-        "Queue[5] InJumboPackets",
-        "Queue[5] InLroPackets",
-        "Queue[5] InErrors",
-        "Queue[6] InPackets",
-        "Queue[6] OutPackets",
-        "Queue[6] InJumboPackets",
-        "Queue[6] InLroPackets",
-        "Queue[6] InErrors",
-        "Queue[7] InPackets",
-        "Queue[7] OutPackets",
-        "Queue[7] InJumboPackets",
-        "Queue[7] InLroPackets",
-        "Queue[7] InErrors",
+};
+
+static const char aq_ethtool_queue_stat_names[][ETH_GSTRING_LEN] = {
+        "Queue[%d] InPackets",
+        "Queue[%d] OutPackets",
+        "Queue[%d] Restarts",
+        "Queue[%d] InJumboPackets",
+        "Queue[%d] InLroPackets",
+        "Queue[%d] InErrors",
 };
 
 static void aq_ethtool_stats(struct net_device *ndev,
                              struct ethtool_stats *stats, u64 *data)
 {
         struct aq_nic_s *aq_nic = netdev_priv(ndev);
+        struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);
 
-/* ASSERT: Need add lines to aq_ethtool_stat_names if AQ_CFG_VECS_MAX > 8 */
-        BUILD_BUG_ON(AQ_CFG_VECS_MAX > 8);
-        memset(data, 0, ARRAY_SIZE(aq_ethtool_stat_names) * sizeof(u64));
+        memset(data, 0, (ARRAY_SIZE(aq_ethtool_stat_names) +
+                                ARRAY_SIZE(aq_ethtool_queue_stat_names) *
+                                cfg->vecs) * sizeof(u64));
         aq_nic_get_stats(aq_nic, data);
 }
 
@@ -154,8 +120,8 @@ static void aq_ethtool_get_drvinfo(struct net_device *ndev,
 
         strlcpy(drvinfo->bus_info, pdev ? pci_name(pdev) : "",
                 sizeof(drvinfo->bus_info));
-        drvinfo->n_stats = ARRAY_SIZE(aq_ethtool_stat_names) -
-                (AQ_CFG_VECS_MAX - cfg->vecs) * aq_ethtool_stat_queue_lines;
+        drvinfo->n_stats = ARRAY_SIZE(aq_ethtool_stat_names) +
+                cfg->vecs * ARRAY_SIZE(aq_ethtool_queue_stat_names);
         drvinfo->testinfo_len = 0;
         drvinfo->regdump_len = regs_count;
         drvinfo->eedump_len = 0;
@@ -164,14 +130,25 @@ static void aq_ethtool_get_drvinfo(struct net_device *ndev,
 static void aq_ethtool_get_strings(struct net_device *ndev,
                                    u32 stringset, u8 *data)
 {
+        int i, si;
         struct aq_nic_s *aq_nic = netdev_priv(ndev);
         struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);
-
-        if (stringset == ETH_SS_STATS)
-                memcpy(data, *aq_ethtool_stat_names,
-                       sizeof(aq_ethtool_stat_names) -
-                       (AQ_CFG_VECS_MAX - cfg->vecs) *
-                       aq_ethtool_stat_queue_chars);
+        u8 *p = data;
+
+        if (stringset == ETH_SS_STATS) {
+                memcpy(p, *aq_ethtool_stat_names,
+                       sizeof(aq_ethtool_stat_names));
+                p = p + sizeof(aq_ethtool_stat_names);
+                for (i = 0; i < cfg->vecs; i++) {
+                        for (si = 0;
+                                si < ARRAY_SIZE(aq_ethtool_queue_stat_names);
+                                si++) {
+                                snprintf(p, ETH_GSTRING_LEN,
+                                         aq_ethtool_queue_stat_names[si], i);
+                                p += ETH_GSTRING_LEN;
+                        }
+                }
+        }
 }
 
 static int aq_ethtool_get_sset_count(struct net_device *ndev, int stringset)
@@ -182,9 +159,8 @@ static int aq_ethtool_get_sset_count(struct net_device *ndev, int stringset)
 
         switch (stringset) {
         case ETH_SS_STATS:
-                ret = ARRAY_SIZE(aq_ethtool_stat_names) -
-                        (AQ_CFG_VECS_MAX - cfg->vecs) *
-                        aq_ethtool_stat_queue_lines;
+                ret = ARRAY_SIZE(aq_ethtool_stat_names) +
+                        cfg->vecs * ARRAY_SIZE(aq_ethtool_queue_stat_names);
                 break;
         default:
                 ret = -EOPNOTSUPP;
@@ -245,6 +221,69 @@ static int aq_ethtool_get_rxnfc(struct net_device *ndev,
         return err;
 }
 
+int aq_ethtool_get_coalesce(struct net_device *ndev,
+                            struct ethtool_coalesce *coal)
+{
+        struct aq_nic_s *aq_nic = netdev_priv(ndev);
+        struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);
+
+        if (cfg->itr == AQ_CFG_INTERRUPT_MODERATION_ON ||
+            cfg->itr == AQ_CFG_INTERRUPT_MODERATION_AUTO) {
+                coal->rx_coalesce_usecs = cfg->rx_itr;
+                coal->tx_coalesce_usecs = cfg->tx_itr;
+                coal->rx_max_coalesced_frames = 0;
+                coal->tx_max_coalesced_frames = 0;
+        } else {
+                coal->rx_coalesce_usecs = 0;
+                coal->tx_coalesce_usecs = 0;
+                coal->rx_max_coalesced_frames = 1;
+                coal->tx_max_coalesced_frames = 1;
+        }
+        return 0;
+}
+
+int aq_ethtool_set_coalesce(struct net_device *ndev,
+                            struct ethtool_coalesce *coal)
+{
+        struct aq_nic_s *aq_nic = netdev_priv(ndev);
+        struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);
+
+        /* This is not yet supported
+         */
+        if (coal->use_adaptive_rx_coalesce || coal->use_adaptive_tx_coalesce)
+                return -EOPNOTSUPP;
+
+        /* Atlantic only supports timing based coalescing
+         */
+        if (coal->rx_max_coalesced_frames > 1 ||
+            coal->rx_coalesce_usecs_irq ||
+            coal->rx_max_coalesced_frames_irq)
+                return -EOPNOTSUPP;
+
+        if (coal->tx_max_coalesced_frames > 1 ||
+            coal->tx_coalesce_usecs_irq ||
+            coal->tx_max_coalesced_frames_irq)
+                return -EOPNOTSUPP;
+
+        /* We do not support frame counting. Check this
+         */
+        if (!(coal->rx_max_coalesced_frames == !coal->rx_coalesce_usecs))
+                return -EOPNOTSUPP;
+        if (!(coal->tx_max_coalesced_frames == !coal->tx_coalesce_usecs))
+                return -EOPNOTSUPP;
+
+        if (coal->rx_coalesce_usecs > AQ_CFG_INTERRUPT_MODERATION_USEC_MAX ||
+            coal->tx_coalesce_usecs > AQ_CFG_INTERRUPT_MODERATION_USEC_MAX)
+                return -EINVAL;
+
+        cfg->itr = AQ_CFG_INTERRUPT_MODERATION_ON;
+
+        cfg->rx_itr = coal->rx_coalesce_usecs;
+        cfg->tx_itr = coal->tx_coalesce_usecs;
+
+        return aq_nic_update_interrupt_moderation_settings(aq_nic);
+}
+
 const struct ethtool_ops aq_ethtool_ops = {
         .get_link            = aq_ethtool_get_link,
         .get_regs_len        = aq_ethtool_get_regs_len,
@@ -259,4 +298,6 @@ const struct ethtool_ops aq_ethtool_ops = {
         .get_ethtool_stats   = aq_ethtool_stats,
         .get_link_ksettings  = aq_ethtool_get_link_ksettings,
         .set_link_ksettings  = aq_ethtool_set_link_ksettings,
+        .get_coalesce        = aq_ethtool_get_coalesce,
+        .set_coalesce        = aq_ethtool_set_coalesce,
 };
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
index bf9b3f020e10..0207927dc8a6 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
@@ -151,8 +151,7 @@ struct aq_hw_ops {
                                      [ETH_ALEN],
                                      u32 count);
 
-        int (*hw_interrupt_moderation_set)(struct aq_hw_s *self,
-                                           bool itr_enabled);
+        int (*hw_interrupt_moderation_set)(struct aq_hw_s *self);
 
         int (*hw_rss_set)(struct aq_hw_s *self,
                           struct aq_rss_parameters *rss_params);
@@ -163,6 +162,8 @@ struct aq_hw_ops {
         int (*hw_get_regs)(struct aq_hw_s *self,
                            struct aq_hw_caps_s *aq_hw_caps, u32 *regs_buff);
 
+        int (*hw_update_stats)(struct aq_hw_s *self);
+
         int (*hw_get_hw_stats)(struct aq_hw_s *self, u64 *data,
                                unsigned int *p_count);
 
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index 0a5bb4114eb4..483e97691eea 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -16,6 +16,7 @@
 #include "aq_pci_func.h"
 #include "aq_nic_internal.h"
 
+#include <linux/moduleparam.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/timer.h>
@@ -24,6 +25,18 @@
 #include <linux/tcp.h>
 #include <net/ip.h>
 
+static unsigned int aq_itr = AQ_CFG_INTERRUPT_MODERATION_AUTO;
+module_param_named(aq_itr, aq_itr, uint, 0644);
+MODULE_PARM_DESC(aq_itr, "Interrupt throttling mode");
+
+static unsigned int aq_itr_tx;
+module_param_named(aq_itr_tx, aq_itr_tx, uint, 0644);
+MODULE_PARM_DESC(aq_itr_tx, "TX interrupt throttle rate");
+
+static unsigned int aq_itr_rx;
+module_param_named(aq_itr_rx, aq_itr_rx, uint, 0644);
+MODULE_PARM_DESC(aq_itr_rx, "RX interrupt throttle rate");
+
 static void aq_nic_rss_init(struct aq_nic_s *self, unsigned int num_rss_queues)
 {
         struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg;
@@ -61,9 +74,9 @@ static void aq_nic_cfg_init_defaults(struct aq_nic_s *self)
 
         cfg->is_polling = AQ_CFG_IS_POLLING_DEF;
 
-        cfg->is_interrupt_moderation = AQ_CFG_IS_INTERRUPT_MODERATION_DEF;
-        cfg->itr = cfg->is_interrupt_moderation ?
-                AQ_CFG_INTERRUPT_MODERATION_RATE_DEF : 0U;
+        cfg->itr = aq_itr;
+        cfg->tx_itr = aq_itr_tx;
+        cfg->rx_itr = aq_itr_rx;
 
         cfg->is_rss = AQ_CFG_IS_RSS_DEF;
         cfg->num_rss_queues = AQ_CFG_NUM_RSS_QUEUES_DEF;
@@ -126,10 +139,12 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)
         if (err)
                 return err;
 
-        if (self->link_status.mbps != self->aq_hw->aq_link_status.mbps)
+        if (self->link_status.mbps != self->aq_hw->aq_link_status.mbps) {
                 pr_info("%s: link change old %d new %d\n",
                         AQ_CFG_DRV_NAME, self->link_status.mbps,
                         self->aq_hw->aq_link_status.mbps);
+                aq_nic_update_interrupt_moderation_settings(self);
+        }
 
         self->link_status = self->aq_hw->aq_link_status;
         if (!netif_carrier_ok(self->ndev) && self->link_status.mbps) {
@@ -164,8 +179,8 @@ static void aq_nic_service_timer_cb(unsigned long param)
         if (err)
                 goto err_exit;
 
-        self->aq_hw_ops.hw_interrupt_moderation_set(self->aq_hw,
-                    self->aq_nic_cfg.is_interrupt_moderation);
+        if (self->aq_hw_ops.hw_update_stats)
+                self->aq_hw_ops.hw_update_stats(self->aq_hw);
 
         memset(&stats_rx, 0U, sizeof(struct aq_ring_stats_rx_s));
         memset(&stats_tx, 0U, sizeof(struct aq_ring_stats_tx_s));
@@ -334,6 +349,7 @@ struct aq_nic_s *aq_nic_alloc_hot(struct net_device *ndev)
         }
         if (netif_running(ndev))
                 netif_tx_disable(ndev);
+        netif_carrier_off(self->ndev);
 
         for (self->aq_vecs = 0; self->aq_vecs < self->aq_nic_cfg.vecs;
                 self->aq_vecs++) {
@@ -421,9 +437,8 @@ int aq_nic_start(struct aq_nic_s *self)
         if (err < 0)
                 goto err_exit;
 
-        err = self->aq_hw_ops.hw_interrupt_moderation_set(self->aq_hw,
-                            self->aq_nic_cfg.is_interrupt_moderation);
-        if (err < 0)
+        err = aq_nic_update_interrupt_moderation_settings(self);
+        if (err)
                 goto err_exit;
         setup_timer(&self->service_timer, &aq_nic_service_timer_cb,
                     (unsigned long)self);
@@ -645,6 +660,11 @@ err_exit:
         return err;
 }
 
+int aq_nic_update_interrupt_moderation_settings(struct aq_nic_s *self)
+{
+        return self->aq_hw_ops.hw_interrupt_moderation_set(self->aq_hw);
+}
+
 int aq_nic_set_packet_filter(struct aq_nic_s *self, unsigned int flags)
 {
         int err = 0;
@@ -899,6 +919,7 @@ int aq_nic_stop(struct aq_nic_s *self)
         unsigned int i = 0U;
 
         netif_tx_disable(self->ndev);
+        netif_carrier_off(self->ndev);
 
         del_timer_sync(&self->service_timer);
 
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
index 0ddd556ff901..4309983acdd6 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
@@ -40,6 +40,8 @@ struct aq_nic_cfg_s {
         u32 vecs;               /* vecs==allocated irqs */
         u32 irq_type;
         u32 itr;
+        u16 rx_itr;
+        u16 tx_itr;
         u32 num_rss_queues;
         u32 mtu;
         u32 ucp_0x364;
@@ -49,7 +51,6 @@ struct aq_nic_cfg_s {
         u16 is_mc_list_enabled;
         u16 mc_list_count;
         bool is_autoneg;
-        bool is_interrupt_moderation;
         bool is_polling;
         bool is_rss;
         bool is_lro;
@@ -104,5 +105,6 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self,
 struct aq_nic_cfg_s *aq_nic_get_cfg(struct aq_nic_s *self);
 u32 aq_nic_get_fw_version(struct aq_nic_s *self);
 int aq_nic_change_pm_state(struct aq_nic_s *self, pm_message_t *pm_msg);
+int aq_nic_update_interrupt_moderation_settings(struct aq_nic_s *self);
 
 #endif /* AQ_NIC_H */
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
index 4c6c882c6a1c..cadaa646c89f 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
@@ -85,6 +85,7 @@ int aq_pci_func_init(struct aq_pci_func_s *self)
         int err = 0;
         unsigned int bar = 0U;
         unsigned int port = 0U;
+        unsigned int numvecs = 0U;
 
         err = pci_enable_device(self->pdev);
         if (err < 0)
@@ -142,10 +143,12 @@ int aq_pci_func_init(struct aq_pci_func_s *self)
                 }
         }
 
-        /*enable interrupts */
+        numvecs = min((u8)AQ_CFG_VECS_DEF, self->aq_hw_caps.msix_irqs);
+        numvecs = min(numvecs, num_online_cpus());
+
+        /* enable interrupts */
 #if !AQ_CFG_FORCE_LEGACY_INT
-        err = pci_alloc_irq_vectors(self->pdev, self->aq_hw_caps.msix_irqs,
-                              self->aq_hw_caps.msix_irqs, PCI_IRQ_MSIX);
+        err = pci_alloc_irq_vectors(self->pdev, numvecs, numvecs, PCI_IRQ_MSIX);
 
         if (err < 0) {
                 err = pci_alloc_irq_vectors(self->pdev, 1, 1,
@@ -153,7 +156,7 @@ int aq_pci_func_init(struct aq_pci_func_s *self)
                 if (err < 0)
                         goto err_exit;
         }
-#endif
+#endif /* AQ_CFG_FORCE_LEGACY_INT */
 
         /* net device init */
         for (port = 0; port < self->ports; ++port) {
@@ -265,6 +268,9 @@ void aq_pci_func_free(struct aq_pci_func_s *self)
                 aq_nic_ndev_free(self->port[port]);
         }
 
+        if (self->mmio)
+                iounmap(self->mmio);
+
         kfree(self);
 
 err_exit:;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
index 305ff8ffac2c..5fecc9a099ef 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
@@ -373,8 +373,11 @@ int aq_vec_get_sw_stats(struct aq_vec_s *self, u64 *data, unsigned int *p_count)
         memset(&stats_tx, 0U, sizeof(struct aq_ring_stats_tx_s));
         aq_vec_add_stats(self, &stats_rx, &stats_tx);
 
+        /* This data should mimic aq_ethtool_queue_stat_names structure
+         */
         data[count] += stats_rx.packets;
         data[++count] += stats_tx.packets;
+        data[++count] += stats_tx.queue_restarts;
         data[++count] += stats_rx.jumbo_packets;
         data[++count] += stats_rx.lro_packets;
         data[++count] += stats_rx.errors;
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
index c5a02df7a48b..07b3c49a16a4 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
@@ -765,24 +765,23 @@ err_exit:
         return err;
 }
 
-static int hw_atl_a0_hw_interrupt_moderation_set(struct aq_hw_s *self,
-                                                 bool itr_enabled)
+static int hw_atl_a0_hw_interrupt_moderation_set(struct aq_hw_s *self)
 {
         unsigned int i = 0U;
+        u32 itr_rx;
 
-        if (itr_enabled && self->aq_nic_cfg->itr) {
-                if (self->aq_nic_cfg->itr != 0xFFFFU) {
+        if (self->aq_nic_cfg->itr) {
+                if (self->aq_nic_cfg->itr != AQ_CFG_INTERRUPT_MODERATION_AUTO) {
                         u32 itr_ = (self->aq_nic_cfg->itr >> 1);
 
                         itr_ = min(AQ_CFG_IRQ_MASK, itr_);
 
-                        PHAL_ATLANTIC_A0->itr_rx = 0x80000000U |
-                                        (itr_ << 0x10);
+                        itr_rx = 0x80000000U | (itr_ << 0x10);
                 } else  {
                         u32 n = 0xFFFFU & aq_hw_read_reg(self, 0x00002A00U);
 
                         if (n < self->aq_link_status.mbps) {
-                                PHAL_ATLANTIC_A0->itr_rx = 0U;
+                                itr_rx = 0U;
                         } else {
                                 static unsigned int hw_timers_tbl_[] = {
                                         0x01CU, /* 10Gbit */
@@ -797,8 +796,7 @@ static int hw_atl_a0_hw_interrupt_moderation_set(struct aq_hw_s *self,
                                         hw_atl_utils_mbps_2_speed_index(
                                                 self->aq_link_status.mbps);
 
-                                PHAL_ATLANTIC_A0->itr_rx =
-                                        0x80000000U |
+                                itr_rx = 0x80000000U |
                                         (hw_timers_tbl_[speed_index] << 0x10U);
                         }
 
@@ -806,11 +804,11 @@ static int hw_atl_a0_hw_interrupt_moderation_set(struct aq_hw_s *self,
                         aq_hw_write_reg(self, 0x00002A00U, 0x8D000000U);
                 }
         } else {
-                PHAL_ATLANTIC_A0->itr_rx = 0U;
+                itr_rx = 0U;
         }
 
         for (i = HW_ATL_A0_RINGS_MAX; i--;)
-                reg_irq_thr_set(self, PHAL_ATLANTIC_A0->itr_rx, i);
+                reg_irq_thr_set(self, itr_rx, i);
 
         return aq_hw_err_from_flags(self);
 }
@@ -885,6 +883,7 @@ static struct aq_hw_ops hw_atl_ops_ = {
         .hw_rss_set                  = hw_atl_a0_hw_rss_set,
         .hw_rss_hash_set             = hw_atl_a0_hw_rss_hash_set,
         .hw_get_regs                 = hw_atl_utils_hw_get_regs,
+        .hw_update_stats             = hw_atl_utils_update_stats,
         .hw_get_hw_stats             = hw_atl_utils_get_hw_stats,
         .hw_get_fw_version           = hw_atl_utils_get_fw_version,
 };
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
index 21784cc39dab..ec68c20efcbd 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -788,39 +788,45 @@ err_exit:
         return err;
 }
 
-static int hw_atl_b0_hw_interrupt_moderation_set(struct aq_hw_s *self,
-                                                 bool itr_enabled)
+static int hw_atl_b0_hw_interrupt_moderation_set(struct aq_hw_s *self)
 {
         unsigned int i = 0U;
+        u32 itr_tx = 2U;
+        u32 itr_rx = 2U;
 
-        if (itr_enabled && self->aq_nic_cfg->itr) {
+        switch (self->aq_nic_cfg->itr) {
+        case  AQ_CFG_INTERRUPT_MODERATION_ON:
+        case  AQ_CFG_INTERRUPT_MODERATION_AUTO:
                 tdm_tx_desc_wr_wb_irq_en_set(self, 0U);
                 tdm_tdm_intr_moder_en_set(self, 1U);
                 rdm_rx_desc_wr_wb_irq_en_set(self, 0U);
                 rdm_rdm_intr_moder_en_set(self, 1U);
 
-                PHAL_ATLANTIC_B0->itr_tx = 2U;
-                PHAL_ATLANTIC_B0->itr_rx = 2U;
+                if (self->aq_nic_cfg->itr == AQ_CFG_INTERRUPT_MODERATION_ON) {
+                        /* HW timers are in 2us units */
+                        int tx_max_timer = self->aq_nic_cfg->tx_itr / 2;
+                        int tx_min_timer = tx_max_timer / 2;
 
-                if (self->aq_nic_cfg->itr != 0xFFFFU) {
-                        unsigned int max_timer = self->aq_nic_cfg->itr / 2U;
-                        unsigned int min_timer = self->aq_nic_cfg->itr / 32U;
+                        int rx_max_timer = self->aq_nic_cfg->rx_itr / 2;
+                        int rx_min_timer = rx_max_timer / 2;
 
-                        max_timer = min(0x1FFU, max_timer);
-                        min_timer = min(0xFFU, min_timer);
+                        tx_max_timer = min(HW_ATL_INTR_MODER_MAX, tx_max_timer);
+                        tx_min_timer = min(HW_ATL_INTR_MODER_MIN, tx_min_timer);
+                        rx_max_timer = min(HW_ATL_INTR_MODER_MAX, rx_max_timer);
+                        rx_min_timer = min(HW_ATL_INTR_MODER_MIN, rx_min_timer);
 
-                        PHAL_ATLANTIC_B0->itr_tx |= min_timer << 0x8U;
-                        PHAL_ATLANTIC_B0->itr_tx |= max_timer << 0x10U;
-                        PHAL_ATLANTIC_B0->itr_rx |= min_timer << 0x8U;
-                        PHAL_ATLANTIC_B0->itr_rx |= max_timer << 0x10U;
+                        itr_tx |= tx_min_timer << 0x8U;
+                        itr_tx |= tx_max_timer << 0x10U;
+                        itr_rx |= rx_min_timer << 0x8U;
+                        itr_rx |= rx_max_timer << 0x10U;
                 } else {
                         static unsigned int hw_atl_b0_timers_table_tx_[][2] = {
-                                {0xffU, 0xffU}, /* 10Gbit */
-                                {0xffU, 0x1ffU}, /* 5Gbit */
-                                {0xffU, 0x1ffU}, /* 5Gbit 5GS */
-                                {0xffU, 0x1ffU}, /* 2.5Gbit */
-                                {0xffU, 0x1ffU}, /* 1Gbit */
-                                {0xffU, 0x1ffU}, /* 100Mbit */
+                                {0xfU, 0xffU}, /* 10Gbit */
+                                {0xfU, 0x1ffU}, /* 5Gbit */
+                                {0xfU, 0x1ffU}, /* 5Gbit 5GS */
+                                {0xfU, 0x1ffU}, /* 2.5Gbit */
+                                {0xfU, 0x1ffU}, /* 1Gbit */
+                                {0xfU, 0x1ffU}, /* 100Mbit */
                         };
 
                         static unsigned int hw_atl_b0_timers_table_rx_[][2] = {
@@ -836,34 +842,36 @@ static int hw_atl_b0_hw_interrupt_moderation_set(struct aq_hw_s *self,
                                         hw_atl_utils_mbps_2_speed_index(
                                                 self->aq_link_status.mbps);
 
-                        PHAL_ATLANTIC_B0->itr_tx |=
-                                hw_atl_b0_timers_table_tx_[speed_index]
-                                [0] << 0x8U; /* set min timer value */
-                        PHAL_ATLANTIC_B0->itr_tx |=
-                                hw_atl_b0_timers_table_tx_[speed_index]
-                                [1] << 0x10U; /* set max timer value */
-
-                        PHAL_ATLANTIC_B0->itr_rx |=
-                                hw_atl_b0_timers_table_rx_[speed_index]
-                                [0] << 0x8U; /* set min timer value */
-                        PHAL_ATLANTIC_B0->itr_rx |=
-                                hw_atl_b0_timers_table_rx_[speed_index]
-                                [1] << 0x10U; /* set max timer value */
+                        /* Update user visible ITR settings */
+                        self->aq_nic_cfg->tx_itr = hw_atl_b0_timers_table_tx_
+                                                        [speed_index][1] * 2;
+                        self->aq_nic_cfg->rx_itr = hw_atl_b0_timers_table_rx_
+                                                        [speed_index][1] * 2;
+
+                        itr_tx |= hw_atl_b0_timers_table_tx_
+                                                [speed_index][0] << 0x8U;
+                        itr_tx |= hw_atl_b0_timers_table_tx_
+                                                [speed_index][1] << 0x10U;
+
+                        itr_rx |= hw_atl_b0_timers_table_rx_
+                                                [speed_index][0] << 0x8U;
+                        itr_rx |= hw_atl_b0_timers_table_rx_
+                                                [speed_index][1] << 0x10U;
                 }
-        } else {
+                break;
+        case AQ_CFG_INTERRUPT_MODERATION_OFF:
                 tdm_tx_desc_wr_wb_irq_en_set(self, 1U);
                 tdm_tdm_intr_moder_en_set(self, 0U);
                 rdm_rx_desc_wr_wb_irq_en_set(self, 1U);
                 rdm_rdm_intr_moder_en_set(self, 0U);
-                PHAL_ATLANTIC_B0->itr_tx = 0U;
-                PHAL_ATLANTIC_B0->itr_rx = 0U;
+                itr_tx = 0U;
+                itr_rx = 0U;
+                break;
         }
 
         for (i = HW_ATL_B0_RINGS_MAX; i--;) {
-                reg_tx_intr_moder_ctrl_set(self,
-                                           PHAL_ATLANTIC_B0->itr_tx, i);
-                reg_rx_intr_moder_ctrl_set(self,
-                                           PHAL_ATLANTIC_B0->itr_rx, i);
+                reg_tx_intr_moder_ctrl_set(self, itr_tx, i);
+                reg_rx_intr_moder_ctrl_set(self, itr_rx, i);
         }
 
         return aq_hw_err_from_flags(self);
@@ -939,6 +947,7 @@ static struct aq_hw_ops hw_atl_ops_ = {
         .hw_rss_set                  = hw_atl_b0_hw_rss_set,
         .hw_rss_hash_set             = hw_atl_b0_hw_rss_hash_set,
         .hw_get_regs                 = hw_atl_utils_hw_get_regs,
+        .hw_update_stats             = hw_atl_utils_update_stats,
         .hw_get_hw_stats             = hw_atl_utils_get_hw_stats,
         .hw_get_fw_version           = hw_atl_utils_get_fw_version,
 };
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h
index fcf89e25a773..9aa2c6edfca2 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h
@@ -139,6 +139,9 @@
 
 #define HW_ATL_B0_FW_VER_EXPECTED 0x01050006U
 
+#define HW_ATL_INTR_MODER_MAX  0x1FF
+#define HW_ATL_INTR_MODER_MIN  0xFF
+
 /* Hardware tx descriptor */
 struct __packed hw_atl_txd_s {
         u64 buf_addr;
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
index bf734b32e44b..1fe016fc4bc7 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
@@ -255,6 +255,15 @@ err_exit:
         return err;
 }
 
+int hw_atl_utils_mpi_read_mbox(struct aq_hw_s *self,
+                               struct hw_aq_atl_utils_mbox_header *pmbox)
+{
+        return hw_atl_utils_fw_downld_dwords(self,
+                                      PHAL_ATLANTIC->mbox_addr,
+                                      (u32 *)(void *)pmbox,
+                                      sizeof(*pmbox) / sizeof(u32));
+}
+
 void hw_atl_utils_mpi_read_stats(struct aq_hw_s *self,
                                  struct hw_aq_atl_utils_mbox *pmbox)
 {
@@ -267,9 +276,6 @@ void hw_atl_utils_mpi_read_stats(struct aq_hw_s *self,
         if (err < 0)
                 goto err_exit;
 
-        if (pmbox != &PHAL_ATLANTIC->mbox)
-                memcpy(pmbox, &PHAL_ATLANTIC->mbox, sizeof(*pmbox));
-
         if (IS_CHIP_FEATURE(REVISION_A0)) {
                 unsigned int mtu = self->aq_nic_cfg ?
                                         self->aq_nic_cfg->mtu : 1514U;
@@ -299,17 +305,17 @@ void hw_atl_utils_mpi_set(struct aq_hw_s *self,
 {
         int err = 0;
         u32 transaction_id = 0;
+        struct hw_aq_atl_utils_mbox_header mbox;
 
         if (state == MPI_RESET) {
-                hw_atl_utils_mpi_read_stats(self, &PHAL_ATLANTIC->mbox);
+                hw_atl_utils_mpi_read_mbox(self, &mbox);
 
-                transaction_id = PHAL_ATLANTIC->mbox.transaction_id;
+                transaction_id = mbox.transaction_id;
 
                 AQ_HW_WAIT_FOR(transaction_id !=
-                                (hw_atl_utils_mpi_read_stats
-                                        (self, &PHAL_ATLANTIC->mbox),
-                                        PHAL_ATLANTIC->mbox.transaction_id),
-                                        1000U, 100U);
+                                (hw_atl_utils_mpi_read_mbox(self, &mbox),
+                                 mbox.transaction_id),
+                               1000U, 100U);
                 if (err < 0)
                         goto err_exit;
         }
@@ -492,16 +498,51 @@ int hw_atl_utils_hw_set_power(struct aq_hw_s *self,
         return 0;
 }
 
+int hw_atl_utils_update_stats(struct aq_hw_s *self)
+{
+        struct hw_atl_s *hw_self = PHAL_ATLANTIC;
+        struct hw_aq_atl_utils_mbox mbox;
+
+        if (!self->aq_link_status.mbps)
+                return 0;
+
+        hw_atl_utils_mpi_read_stats(self, &mbox);
+
+#define AQ_SDELTA(_N_) (hw_self->curr_stats._N_ += \
+                        mbox.stats._N_ - hw_self->last_stats._N_)
+
+        AQ_SDELTA(uprc);
+        AQ_SDELTA(mprc);
+        AQ_SDELTA(bprc);
+        AQ_SDELTA(erpt);
+
+        AQ_SDELTA(uptc);
+        AQ_SDELTA(mptc);
+        AQ_SDELTA(bptc);
+        AQ_SDELTA(erpr);
+
+        AQ_SDELTA(ubrc);
+        AQ_SDELTA(ubtc);
+        AQ_SDELTA(mbrc);
+        AQ_SDELTA(mbtc);
+        AQ_SDELTA(bbrc);
+        AQ_SDELTA(bbtc);
+        AQ_SDELTA(dpc);
+
+#undef AQ_SDELTA
+
+        memcpy(&hw_self->last_stats, &mbox.stats, sizeof(mbox.stats));
+
+        return 0;
+}
+
 int hw_atl_utils_get_hw_stats(struct aq_hw_s *self,
                               u64 *data, unsigned int *p_count)
 {
-        struct hw_atl_stats_s *stats = NULL;
+        struct hw_atl_s *hw_self = PHAL_ATLANTIC;
+        struct hw_atl_stats_s *stats = &hw_self->curr_stats;
         int i = 0;
 
-        hw_atl_utils_mpi_read_stats(self, &PHAL_ATLANTIC->mbox);
-
-        stats = &PHAL_ATLANTIC->mbox.stats;
-
         data[i] = stats->uprc + stats->mprc + stats->bprc;
         data[++i] = stats->uprc;
         data[++i] = stats->mprc;
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
index e0360a6b2202..c99cc690e425 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h
@@ -115,19 +115,22 @@ struct __packed hw_aq_atl_utils_fw_rpc {
         };
 };
 
-struct __packed hw_aq_atl_utils_mbox {
+struct __packed hw_aq_atl_utils_mbox_header {
         u32 version;
         u32 transaction_id;
-        int error;
+        u32 error;
+};
+
+struct __packed hw_aq_atl_utils_mbox {
+        struct hw_aq_atl_utils_mbox_header header;
         struct hw_atl_stats_s stats;
 };
 
 struct __packed hw_atl_s {
         struct aq_hw_s base;
-        struct hw_aq_atl_utils_mbox mbox;
+        struct hw_atl_stats_s last_stats;
+        struct hw_atl_stats_s curr_stats;
         u64 speed;
-        u32 itr_tx;
-        u32 itr_rx;
         unsigned int chip_features;
         u32 fw_ver_actual;
         atomic_t dpc;
@@ -170,6 +173,9 @@ enum hal_atl_utils_fw_state_e {
 
 void hw_atl_utils_hw_chip_features_init(struct aq_hw_s *self, u32 *p);
 
+int hw_atl_utils_mpi_read_mbox(struct aq_hw_s *self,
+                               struct hw_aq_atl_utils_mbox_header *pmbox);
+
 void hw_atl_utils_mpi_read_stats(struct aq_hw_s *self,
                                  struct hw_aq_atl_utils_mbox *pmbox);
 
@@ -199,6 +205,8 @@ int hw_atl_utils_hw_deinit(struct aq_hw_s *self);
 
 int hw_atl_utils_get_fw_version(struct aq_hw_s *self, u32 *fw_version);
 
+int hw_atl_utils_update_stats(struct aq_hw_s *self);
+
 int hw_atl_utils_get_hw_stats(struct aq_hw_s *self,
                               u64 *data,
                               unsigned int *p_count);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index aacec8bc19d5..dc5de275352a 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -214,6 +214,8 @@ static const u16 bnxt_async_events_arr[] = {
         ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE,
 };
 
+static struct workqueue_struct *bnxt_pf_wq;
+
 static bool bnxt_vf_pciid(enum board_idx idx)
 {
         return (idx == NETXTREME_C_VF || idx == NETXTREME_E_VF);
@@ -1024,12 +1026,28 @@ static int bnxt_discard_rx(struct bnxt *bp, struct bnxt_napi *bnapi,
         return 0;
 }
 
+static void bnxt_queue_sp_work(struct bnxt *bp)
+{
+        if (BNXT_PF(bp))
+                queue_work(bnxt_pf_wq, &bp->sp_task);
+        else
+                schedule_work(&bp->sp_task);
+}
+
+static void bnxt_cancel_sp_work(struct bnxt *bp)
+{
+        if (BNXT_PF(bp))
+                flush_workqueue(bnxt_pf_wq);
+        else
+                cancel_work_sync(&bp->sp_task);
+}
+
 static void bnxt_sched_reset(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)
 {
         if (!rxr->bnapi->in_reset) {
                 rxr->bnapi->in_reset = true;
                 set_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event);
-                schedule_work(&bp->sp_task);
+                bnxt_queue_sp_work(bp);
         }
         rxr->rx_next_cons = 0xffff;
 }
@@ -1717,7 +1735,7 @@ static int bnxt_async_event_process(struct bnxt *bp,
         default:
                 goto async_event_process_exit;
         }
-        schedule_work(&bp->sp_task);
+        bnxt_queue_sp_work(bp);
 async_event_process_exit:
         bnxt_ulp_async_events(bp, cmpl);
         return 0;
@@ -1751,7 +1769,7 @@ static int bnxt_hwrm_handler(struct bnxt *bp, struct tx_cmp *txcmp)
 
                 set_bit(vf_id - bp->pf.first_vf_id, bp->pf.vf_event_bmap);
                 set_bit(BNXT_HWRM_EXEC_FWD_REQ_SP_EVENT, &bp->sp_event);
-                schedule_work(&bp->sp_task);
+                bnxt_queue_sp_work(bp);
                 break;
 
         case CMPL_BASE_TYPE_HWRM_ASYNC_EVENT:
@@ -3448,6 +3466,12 @@ int _hwrm_send_message(struct bnxt *bp, void *msg, u32 msg_len, int timeout)
         return bnxt_hwrm_do_send_msg(bp, msg, msg_len, timeout, false);
 }
 
+int _hwrm_send_message_silent(struct bnxt *bp, void *msg, u32 msg_len,
+                              int timeout)
+{
+        return bnxt_hwrm_do_send_msg(bp, msg, msg_len, timeout, true);
+}
+
 int hwrm_send_message(struct bnxt *bp, void *msg, u32 msg_len, int timeout)
 {
         int rc;
@@ -6327,7 +6351,9 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)
         }
 
         if (link_re_init) {
+                mutex_lock(&bp->link_lock);
                 rc = bnxt_update_phy_setting(bp);
+                mutex_unlock(&bp->link_lock);
                 if (rc)
                         netdev_warn(bp->dev, "failed to update phy settings\n");
         }
@@ -6647,7 +6673,7 @@ static void bnxt_set_rx_mode(struct net_device *dev)
                 vnic->rx_mask = mask;
 
                 set_bit(BNXT_RX_MASK_SP_EVENT, &bp->sp_event);
-                schedule_work(&bp->sp_task);
+                bnxt_queue_sp_work(bp);
         }
 }
 
@@ -6920,7 +6946,7 @@ static void bnxt_tx_timeout(struct net_device *dev)
 
         netdev_err(bp->dev,  "TX timeout detected, starting reset task!\n");
         set_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event);
-        schedule_work(&bp->sp_task);
+        bnxt_queue_sp_work(bp);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -6952,7 +6978,7 @@ static void bnxt_timer(unsigned long data)
         if (bp->link_info.link_up && (bp->flags & BNXT_FLAG_PORT_STATS) &&
             bp->stats_coal_ticks) {
                 set_bit(BNXT_PERIODIC_STATS_SP_EVENT, &bp->sp_event);
-                schedule_work(&bp->sp_task);
+                bnxt_queue_sp_work(bp);
         }
 bnxt_restart_timer:
         mod_timer(&bp->timer, jiffies + bp->current_interval);
@@ -7025,30 +7051,28 @@ static void bnxt_sp_task(struct work_struct *work)
         if (test_and_clear_bit(BNXT_PERIODIC_STATS_SP_EVENT, &bp->sp_event))
                 bnxt_hwrm_port_qstats(bp);
 
-        /* These functions below will clear BNXT_STATE_IN_SP_TASK.  They
-         * must be the last functions to be called before exiting.
-         */
         if (test_and_clear_bit(BNXT_LINK_CHNG_SP_EVENT, &bp->sp_event)) {
-                int rc = 0;
+                int rc;
 
+                mutex_lock(&bp->link_lock);
                 if (test_and_clear_bit(BNXT_LINK_SPEED_CHNG_SP_EVENT,
                                        &bp->sp_event))
                         bnxt_hwrm_phy_qcaps(bp);
 
-                bnxt_rtnl_lock_sp(bp);
-                if (test_bit(BNXT_STATE_OPEN, &bp->state))
-                        rc = bnxt_update_link(bp, true);
-                bnxt_rtnl_unlock_sp(bp);
+                rc = bnxt_update_link(bp, true);
+                mutex_unlock(&bp->link_lock);
                 if (rc)
                         netdev_err(bp->dev, "SP task can't update link (rc: %x)\n",
                                    rc);
         }
         if (test_and_clear_bit(BNXT_HWRM_PORT_MODULE_SP_EVENT, &bp->sp_event)) {
-                bnxt_rtnl_lock_sp(bp);
-                if (test_bit(BNXT_STATE_OPEN, &bp->state))
-                        bnxt_get_port_module_status(bp);
-                bnxt_rtnl_unlock_sp(bp);
+                mutex_lock(&bp->link_lock);
+                bnxt_get_port_module_status(bp);
+                mutex_unlock(&bp->link_lock);
         }
+        /* These functions below will clear BNXT_STATE_IN_SP_TASK.  They
+         * must be the last functions to be called before exiting.
+         */
         if (test_and_clear_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event))
                 bnxt_reset(bp, false);
 
@@ -7433,7 +7457,7 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
         spin_unlock_bh(&bp->ntp_fltr_lock);
 
         set_bit(BNXT_RX_NTP_FLTR_SP_EVENT, &bp->sp_event);
-        schedule_work(&bp->sp_task);
+        bnxt_queue_sp_work(bp);
 
         return new_fltr->sw_id;
 
@@ -7516,7 +7540,7 @@ static void bnxt_udp_tunnel_add(struct net_device *dev,
                 if (bp->vxlan_port_cnt == 1) {
                         bp->vxlan_port = ti->port;
                         set_bit(BNXT_VXLAN_ADD_PORT_SP_EVENT, &bp->sp_event);
-                        schedule_work(&bp->sp_task);
+                        bnxt_queue_sp_work(bp);
                 }
                 break;
         case UDP_TUNNEL_TYPE_GENEVE:
@@ -7533,7 +7557,7 @@ static void bnxt_udp_tunnel_add(struct net_device *dev,
                 return;
         }
 
-        schedule_work(&bp->sp_task);
+        bnxt_queue_sp_work(bp);
 }
 
 static void bnxt_udp_tunnel_del(struct net_device *dev,
@@ -7572,7 +7596,7 @@ static void bnxt_udp_tunnel_del(struct net_device *dev,
                 return;
         }
 
-        schedule_work(&bp->sp_task);
+        bnxt_queue_sp_work(bp);
 }
 
 static int bnxt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
@@ -7720,7 +7744,7 @@ static void bnxt_remove_one(struct pci_dev *pdev)
         pci_disable_pcie_error_reporting(pdev);
         unregister_netdev(dev);
         bnxt_shutdown_tc(bp);
-        cancel_work_sync(&bp->sp_task);
+        bnxt_cancel_sp_work(bp);
         bp->sp_event = 0;
 
         bnxt_clear_int_mode(bp);
@@ -7748,6 +7772,7 @@ static int bnxt_probe_phy(struct bnxt *bp)
                            rc);
                 return rc;
         }
+        mutex_init(&bp->link_lock);
 
         rc = bnxt_update_link(bp, false);
         if (rc) {
@@ -7946,7 +7971,7 @@ static void bnxt_parse_log_pcie_link(struct bnxt *bp)
         enum pcie_link_width width = PCIE_LNK_WIDTH_UNKNOWN;
         enum pci_bus_speed speed = PCI_SPEED_UNKNOWN;
 
-        if (pcie_get_minimum_link(bp->pdev, &speed, &width) ||
+        if (pcie_get_minimum_link(pci_physfn(bp->pdev), &speed, &width) ||
             speed == PCI_SPEED_UNKNOWN || width == PCIE_LNK_WIDTH_UNKNOWN)
                 netdev_info(bp->dev, "Failed to determine PCIe Link Info\n");
         else
@@ -8138,8 +8163,17 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         else
                 device_set_wakeup_capable(&pdev->dev, false);
 
-        if (BNXT_PF(bp))
+        if (BNXT_PF(bp)) {
+                if (!bnxt_pf_wq) {
+                        bnxt_pf_wq =
+                                create_singlethread_workqueue("bnxt_pf_wq");
+                        if (!bnxt_pf_wq) {
+                                dev_err(&pdev->dev, "Unable to create workqueue.\n");
+                                goto init_err_pci_clean;
+                        }
+                }
                 bnxt_init_tc(bp);
+        }
 
         rc = register_netdev(dev);
         if (rc)
@@ -8375,4 +8409,17 @@ static struct pci_driver bnxt_pci_driver = {
 #endif
 };
 
-module_pci_driver(bnxt_pci_driver);
+static int __init bnxt_init(void)
+{
+        return pci_register_driver(&bnxt_pci_driver);
+}
+
+static void __exit bnxt_exit(void)
+{
+        pci_unregister_driver(&bnxt_pci_driver);
+        if (bnxt_pf_wq)
+                destroy_workqueue(bnxt_pf_wq);
+}
+
+module_init(bnxt_init);
+module_exit(bnxt_exit);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 7b888d4b2b55..c911e69ff25f 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1290,6 +1290,10 @@ struct bnxt {
         unsigned long           *ntp_fltr_bmap;
         int                     ntp_fltr_count;
 
+        /* To protect link related settings during link changes and
+         * ethtool settings changes.
+         */
+        struct mutex            link_lock;
         struct bnxt_link_info   link_info;
         struct ethtool_eee      eee;
         u32                     lpi_tmr_lo;
@@ -1358,6 +1362,7 @@ void bnxt_set_ring_params(struct bnxt *);
 int bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode);
 void bnxt_hwrm_cmd_hdr_init(struct bnxt *, void *, u16, u16, u16);
 int _hwrm_send_message(struct bnxt *, void *, u32, int);
+int _hwrm_send_message_silent(struct bnxt *bp, void *msg, u32 len, int timeout);
 int hwrm_send_message(struct bnxt *, void *, u32, int);
 int hwrm_send_message_silent(struct bnxt *, void *, u32, int);
 int bnxt_hwrm_func_rgtr_async_events(struct bnxt *bp, unsigned long *bmap,
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
index aa1f3a2c7a78..fed37cd9ae1d 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
@@ -50,7 +50,9 @@ static int bnxt_hwrm_queue_pri2cos_qcfg(struct bnxt *bp, struct ieee_ets *ets)
 
         bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_QUEUE_PRI2COS_QCFG, -1, -1);
         req.flags = cpu_to_le32(QUEUE_PRI2COS_QCFG_REQ_FLAGS_IVLAN);
-        rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+
+        mutex_lock(&bp->hwrm_cmd_lock);
+        rc = _hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
         if (!rc) {
                 u8 *pri2cos = &resp->pri0_cos_queue_id;
                 int i, j;
@@ -66,6 +68,7 @@ static int bnxt_hwrm_queue_pri2cos_qcfg(struct bnxt *bp, struct ieee_ets *ets)
                         }
                 }
         }
+        mutex_unlock(&bp->hwrm_cmd_lock);
         return rc;
 }
 
@@ -119,9 +122,13 @@ static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets)
         int rc, i;
 
         bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_QUEUE_COS2BW_QCFG, -1, -1);
-        rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
-        if (rc)
+
+        mutex_lock(&bp->hwrm_cmd_lock);
+        rc = _hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+        if (rc) {
+                mutex_unlock(&bp->hwrm_cmd_lock);
                 return rc;
+        }
 
         data = &resp->queue_id0 + offsetof(struct bnxt_cos2bw_cfg, queue_id);
         for (i = 0; i < bp->max_tc; i++, data += sizeof(cos2bw) - 4) {
@@ -143,6 +150,7 @@ static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets)
                         }
                 }
         }
+        mutex_unlock(&bp->hwrm_cmd_lock);
         return 0;
 }
 
@@ -240,12 +248,17 @@ static int bnxt_hwrm_queue_pfc_qcfg(struct bnxt *bp, struct ieee_pfc *pfc)
         int rc;
 
         bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_QUEUE_PFCENABLE_QCFG, -1, -1);
-        rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
-        if (rc)
+
+        mutex_lock(&bp->hwrm_cmd_lock);
+        rc = _hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+        if (rc) {
+                mutex_unlock(&bp->hwrm_cmd_lock);
                 return rc;
+        }
 
         pri_mask = le32_to_cpu(resp->flags);
         pfc->pfc_en = pri_mask;
+        mutex_unlock(&bp->hwrm_cmd_lock);
         return 0;
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 8eff05a3e0e4..3cbe771b3352 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -1052,6 +1052,7 @@ static int bnxt_get_link_ksettings(struct net_device *dev,
         u32 ethtool_speed;
 
         ethtool_link_ksettings_zero_link_mode(lk_ksettings, supported);
+        mutex_lock(&bp->link_lock);
         bnxt_fw_to_ethtool_support_spds(link_info, lk_ksettings);
 
         ethtool_link_ksettings_zero_link_mode(lk_ksettings, advertising);
@@ -1099,6 +1100,7 @@ static int bnxt_get_link_ksettings(struct net_device *dev,
                         base->port = PORT_FIBRE;
         }
         base->phy_address = link_info->phy_addr;
+        mutex_unlock(&bp->link_lock);
 
         return 0;
 }
@@ -1190,6 +1192,7 @@ static int bnxt_set_link_ksettings(struct net_device *dev,
         if (!BNXT_SINGLE_PF(bp))
                 return -EOPNOTSUPP;
 
+        mutex_lock(&bp->link_lock);
         if (base->autoneg == AUTONEG_ENABLE) {
                 BNXT_ETHTOOL_TO_FW_SPDS(fw_advertising, lk_ksettings,
                                         advertising);
@@ -1234,6 +1237,7 @@ static int bnxt_set_link_ksettings(struct net_device *dev,
                 rc = bnxt_hwrm_set_link_setting(bp, set_pause, false);
 
 set_setting_exit:
+        mutex_unlock(&bp->link_lock);
         return rc;
 }
 
@@ -1805,7 +1809,8 @@ static int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,
         req.dir_ordinal = cpu_to_le16(ordinal);
         req.dir_ext = cpu_to_le16(ext);
         req.opt_ordinal = NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_EQ;
-        rc = hwrm_send_message_silent(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+        mutex_lock(&bp->hwrm_cmd_lock);
+        rc = _hwrm_send_message_silent(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
         if (rc == 0) {
                 if (index)
                         *index = le16_to_cpu(output->dir_idx);
@@ -1814,6 +1819,7 @@ static int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,
                 if (data_length)
                         *data_length = le32_to_cpu(output->dir_data_length);
         }
+        mutex_unlock(&bp->hwrm_cmd_lock);
         return rc;
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index d37925a8a65b..5ee18660bc33 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -502,6 +502,7 @@ static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs)
         int rc = 0, vfs_supported;
         int min_rx_rings, min_tx_rings, min_rss_ctxs;
         int tx_ok = 0, rx_ok = 0, rss_ok = 0;
+        int avail_cp, avail_stat;
 
         /* Check if we can enable requested num of vf's. At a mininum
          * we require 1 RX 1 TX rings for each VF. In this minimum conf
@@ -509,6 +510,10 @@ static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs)
          */
         vfs_supported = *num_vfs;
 
+        avail_cp = bp->pf.max_cp_rings - bp->cp_nr_rings;
+        avail_stat = bp->pf.max_stat_ctxs - bp->num_stat_ctxs;
+        avail_cp = min_t(int, avail_cp, avail_stat);
+
         while (vfs_supported) {
                 min_rx_rings = vfs_supported;
                 min_tx_rings = vfs_supported;
@@ -523,10 +528,12 @@ static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs)
                             min_rx_rings)
                                 rx_ok = 1;
                 }
-                if (bp->pf.max_vnics - bp->nr_vnics < min_rx_rings)
+                if (bp->pf.max_vnics - bp->nr_vnics < min_rx_rings ||
+                    avail_cp < min_rx_rings)
                         rx_ok = 0;
 
-                if (bp->pf.max_tx_rings - bp->tx_nr_rings >= min_tx_rings)
+                if (bp->pf.max_tx_rings - bp->tx_nr_rings >= min_tx_rings &&
+                    avail_cp >= min_tx_rings)
                         tx_ok = 1;
 
                 if (bp->pf.max_rsscos_ctxs - bp->rsscos_nr_ctxs >= min_rss_ctxs)
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index e7f54948173f..5b19826a7e16 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -1847,7 +1847,7 @@ static int liquidio_ptp_settime(struct ptp_clock_info *ptp,
         struct lio *lio = container_of(ptp, struct lio, ptp_info);
         struct octeon_device *oct = (struct octeon_device *)lio->oct_dev;
 
-        ns = timespec_to_ns(ts);
+        ns = timespec64_to_ns(ts);
 
         spin_lock_irqsave(&lio->ptp_lock, flags);
         lio_pci_writeq(oct, ns, CN6XXX_MIO_PTP_CLOCK_HI);
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index cb8182f4fdfa..c66abd476023 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1093,11 +1093,12 @@ static int build_hdr_data(u8 hdr_field, struct sk_buff *skb,
  * places them in a descriptor array, scrq_arr
  */
 
-static void create_hdr_descs(u8 hdr_field, u8 *hdr_data, int len, int *hdr_len,
-                             union sub_crq *scrq_arr)
+static int create_hdr_descs(u8 hdr_field, u8 *hdr_data, int len, int *hdr_len,
+                            union sub_crq *scrq_arr)
 {
         union sub_crq hdr_desc;
         int tmp_len = len;
+        int num_descs = 0;
         u8 *data, *cur;
         int tmp;
 
@@ -1126,7 +1127,10 @@ static void create_hdr_descs(u8 hdr_field, u8 *hdr_data, int len, int *hdr_len,
                 tmp_len -= tmp;
                 *scrq_arr = hdr_desc;
                 scrq_arr++;
+                num_descs++;
         }
+
+        return num_descs;
 }
 
 /**
@@ -1144,16 +1148,12 @@ static void build_hdr_descs_arr(struct ibmvnic_tx_buff *txbuff,
                                 int *num_entries, u8 hdr_field)
 {
         int hdr_len[3] = {0, 0, 0};
-        int tot_len, len;
+        int tot_len;
         u8 *hdr_data = txbuff->hdr_data;
 
         tot_len = build_hdr_data(hdr_field, txbuff->skb, hdr_len,
                                  txbuff->hdr_data);
-        len = tot_len;
-        len -= 24;
-        if (len > 0)
-                num_entries += len % 29 ? len / 29 + 1 : len / 29;
-        create_hdr_descs(hdr_field, hdr_data, tot_len, hdr_len,
+        *num_entries += create_hdr_descs(hdr_field, hdr_data, tot_len, hdr_len,
                          txbuff->indir_arr + 1);
 }
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
index 57505b1df98d..d591b3e6bd7c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
@@ -298,7 +298,7 @@ static i40e_status i40e_read_nvm_word_aq(struct i40e_hw *hw, u16 offset,
 }
 
 /**
- * __i40e_read_nvm_word - Reads nvm word, assumes called does the locking
+ * __i40e_read_nvm_word - Reads nvm word, assumes caller does the locking
  * @hw: pointer to the HW structure
  * @offset: offset of the Shadow RAM word to read (0x000000 - 0x001FFF)
  * @data: word read from the Shadow RAM
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 1519dfb851d0..2756131495f0 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1038,6 +1038,32 @@ reset_latency:
 }
 
 /**
+ * i40e_reuse_rx_page - page flip buffer and store it back on the ring
+ * @rx_ring: rx descriptor ring to store buffers on
+ * @old_buff: donor buffer to have page reused
+ *
+ * Synchronizes page for reuse by the adapter
+ **/
+static void i40e_reuse_rx_page(struct i40e_ring *rx_ring,
+                               struct i40e_rx_buffer *old_buff)
+{
+        struct i40e_rx_buffer *new_buff;
+        u16 nta = rx_ring->next_to_alloc;
+
+        new_buff = &rx_ring->rx_bi[nta];
+
+        /* update, and store next to alloc */
+        nta++;
+        rx_ring->next_to_alloc = (nta < rx_ring->count) ? nta : 0;
+
+        /* transfer page from old buffer to new buffer */
+        new_buff->dma           = old_buff->dma;
+        new_buff->page          = old_buff->page;
+        new_buff->page_offset   = old_buff->page_offset;
+        new_buff->pagecnt_bias  = old_buff->pagecnt_bias;
+}
+
+/**
  * i40e_rx_is_programming_status - check for programming status descriptor
  * @qw: qword representing status_error_len in CPU ordering
  *
@@ -1071,15 +1097,24 @@ static void i40e_clean_programming_status(struct i40e_ring *rx_ring,
                                           union i40e_rx_desc *rx_desc,
                                           u64 qw)
 {
-        u32 ntc = rx_ring->next_to_clean + 1;
+        struct i40e_rx_buffer *rx_buffer;
+        u32 ntc = rx_ring->next_to_clean;
         u8 id;
 
         /* fetch, update, and store next to clean */
+        rx_buffer = &rx_ring->rx_bi[ntc++];
         ntc = (ntc < rx_ring->count) ? ntc : 0;
         rx_ring->next_to_clean = ntc;
 
         prefetch(I40E_RX_DESC(rx_ring, ntc));
 
+        /* place unused page back on the ring */
+        i40e_reuse_rx_page(rx_ring, rx_buffer);
+        rx_ring->rx_stats.page_reuse_count++;
+
+        /* clear contents of buffer_info */
+        rx_buffer->page = NULL;
+
         id = (qw & I40E_RX_PROG_STATUS_DESC_QW1_PROGID_MASK) >>
                   I40E_RX_PROG_STATUS_DESC_QW1_PROGID_SHIFT;
 
@@ -1639,32 +1674,6 @@ static bool i40e_cleanup_headers(struct i40e_ring *rx_ring, struct sk_buff *skb,
 }
 
 /**
- * i40e_reuse_rx_page - page flip buffer and store it back on the ring
- * @rx_ring: rx descriptor ring to store buffers on
- * @old_buff: donor buffer to have page reused
- *
- * Synchronizes page for reuse by the adapter
- **/
-static void i40e_reuse_rx_page(struct i40e_ring *rx_ring,
-                               struct i40e_rx_buffer *old_buff)
-{
-        struct i40e_rx_buffer *new_buff;
-        u16 nta = rx_ring->next_to_alloc;
-
-        new_buff = &rx_ring->rx_bi[nta];
-
-        /* update, and store next to alloc */
-        nta++;
-        rx_ring->next_to_alloc = (nta < rx_ring->count) ? nta : 0;
-
-        /* transfer page from old buffer to new buffer */
-        new_buff->dma           = old_buff->dma;
-        new_buff->page          = old_buff->page;
-        new_buff->page_offset   = old_buff->page_offset;
-        new_buff->pagecnt_bias  = old_buff->pagecnt_bias;
-}
-
-/**
  * i40e_page_is_reusable - check if any reuse is possible
  * @page: page struct to check
  *
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index 9d5e7cf288be..f3315bc874ad 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -96,6 +96,7 @@ struct mlxsw_core {
         const struct mlxsw_bus *bus;
         void *bus_priv;
         const struct mlxsw_bus_info *bus_info;
+        struct workqueue_struct *emad_wq;
         struct list_head rx_listener_list;
         struct list_head event_listener_list;
         struct {
@@ -465,7 +466,7 @@ static void mlxsw_emad_trans_timeout_schedule(struct mlxsw_reg_trans *trans)
 {
         unsigned long timeout = msecs_to_jiffies(MLXSW_EMAD_TIMEOUT_MS);
 
-        mlxsw_core_schedule_dw(&trans->timeout_dw, timeout);
+        queue_delayed_work(trans->core->emad_wq, &trans->timeout_dw, timeout);
 }
 
 static int mlxsw_emad_transmit(struct mlxsw_core *mlxsw_core,
@@ -587,12 +588,18 @@ static const struct mlxsw_listener mlxsw_emad_rx_listener =
 
 static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core)
 {
+        struct workqueue_struct *emad_wq;
         u64 tid;
         int err;
 
         if (!(mlxsw_core->bus->features & MLXSW_BUS_F_TXRX))
                 return 0;
 
+        emad_wq = alloc_workqueue("mlxsw_core_emad", WQ_MEM_RECLAIM, 0);
+        if (!emad_wq)
+                return -ENOMEM;
+        mlxsw_core->emad_wq = emad_wq;
+
         /* Set the upper 32 bits of the transaction ID field to a random
          * number. This allows us to discard EMADs addressed to other
          * devices.
@@ -619,6 +626,7 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core)
 err_emad_trap_set:
         mlxsw_core_trap_unregister(mlxsw_core, &mlxsw_emad_rx_listener,
                                    mlxsw_core);
+        destroy_workqueue(mlxsw_core->emad_wq);
         return err;
 }
 
@@ -631,6 +639,7 @@ static void mlxsw_emad_fini(struct mlxsw_core *mlxsw_core)
         mlxsw_core->emad.use_emad = false;
         mlxsw_core_trap_unregister(mlxsw_core, &mlxsw_emad_rx_listener,
                                    mlxsw_core);
+        destroy_workqueue(mlxsw_core->emad_wq);
 }
 
 static struct sk_buff *mlxsw_emad_alloc(const struct mlxsw_core *mlxsw_core,
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index cc27c5de5a1d..4afc8486eb9a 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -6401,6 +6401,36 @@ static inline void mlxsw_reg_mgpc_pack(char *payload, u32 counter_index,
         mlxsw_reg_mgpc_opcode_set(payload, opcode);
 }
 
+/* TIGCR - Tunneling IPinIP General Configuration Register
+ * -------------------------------------------------------
+ * The TIGCR register is used for setting up the IPinIP Tunnel configuration.
+ */
+#define MLXSW_REG_TIGCR_ID 0xA801
+#define MLXSW_REG_TIGCR_LEN 0x10
+
+MLXSW_REG_DEFINE(tigcr, MLXSW_REG_TIGCR_ID, MLXSW_REG_TIGCR_LEN);
+
+/* reg_tigcr_ipip_ttlc
+ * For IPinIP Tunnel encapsulation: whether to copy the ttl from the packet
+ * header.
+ * Access: RW
+ */
+MLXSW_ITEM32(reg, tigcr, ttlc, 0x04, 8, 1);
+
+/* reg_tigcr_ipip_ttl_uc
+ * The TTL for IPinIP Tunnel encapsulation of unicast packets if
+ * reg_tigcr_ipip_ttlc is unset.
+ * Access: RW
+ */
+MLXSW_ITEM32(reg, tigcr, ttl_uc, 0x04, 0, 8);
+
+static inline void mlxsw_reg_tigcr_pack(char *payload, bool ttlc, u8 ttl_uc)
+{
+        MLXSW_REG_ZERO(tigcr, payload);
+        mlxsw_reg_tigcr_ttlc_set(payload, ttlc);
+        mlxsw_reg_tigcr_ttl_uc_set(payload, ttl_uc);
+}
+
 /* SBPR - Shared Buffer Pools Register
  * -----------------------------------
  * The SBPR configures and retrieves the shared buffer pools and configuration.
@@ -6881,6 +6911,7 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {
         MLXSW_REG(mcc),
         MLXSW_REG(mcda),
         MLXSW_REG(mgpc),
+        MLXSW_REG(tigcr),
         MLXSW_REG(sbpr),
         MLXSW_REG(sbcm),
         MLXSW_REG(sbpm),
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index c16718d296d3..5189022a1c8c 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -5896,11 +5896,20 @@ static void mlxsw_sp_rifs_fini(struct mlxsw_sp *mlxsw_sp)
         kfree(mlxsw_sp->router->rifs);
 }
 
+static int
+mlxsw_sp_ipip_config_tigcr(struct mlxsw_sp *mlxsw_sp)
+{
+        char tigcr_pl[MLXSW_REG_TIGCR_LEN];
+
+        mlxsw_reg_tigcr_pack(tigcr_pl, true, 0);
+        return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(tigcr), tigcr_pl);
+}
+
 static int mlxsw_sp_ipips_init(struct mlxsw_sp *mlxsw_sp)
 {
         mlxsw_sp->router->ipip_ops_arr = mlxsw_sp_ipip_ops_arr;
         INIT_LIST_HEAD(&mlxsw_sp->router->ipip_list);
-        return 0;
+        return mlxsw_sp_ipip_config_tigcr(mlxsw_sp);
 }
 
 static void mlxsw_sp_ipips_fini(struct mlxsw_sp *mlxsw_sp)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index 1c0187f0af51..e118b5f23996 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -1180,10 +1180,14 @@ static void *nfp_net_rx_alloc_one(struct nfp_net_dp *dp, dma_addr_t *dma_addr)
 {
         void *frag;
 
-        if (!dp->xdp_prog)
+        if (!dp->xdp_prog) {
                 frag = netdev_alloc_frag(dp->fl_bufsz);
-        else
-                frag = page_address(alloc_page(GFP_KERNEL | __GFP_COLD));
+        } else {
+                struct page *page;
+
+                page = alloc_page(GFP_KERNEL | __GFP_COLD);
+                frag = page ? page_address(page) : NULL;
+        }
         if (!frag) {
                 nn_dp_warn(dp, "Failed to alloc receive page frag\n");
                 return NULL;
@@ -1203,10 +1207,14 @@ static void *nfp_net_napi_alloc_one(struct nfp_net_dp *dp, dma_addr_t *dma_addr)
 {
         void *frag;
 
-        if (!dp->xdp_prog)
+        if (!dp->xdp_prog) {
                 frag = napi_alloc_frag(dp->fl_bufsz);
-        else
-                frag = page_address(alloc_page(GFP_ATOMIC | __GFP_COLD));
+        } else {
+                struct page *page;
+
+                page = alloc_page(GFP_ATOMIC | __GFP_COLD);
+                frag = page ? page_address(page) : NULL;
+        }
         if (!frag) {
                 nn_dp_warn(dp, "Failed to alloc receive page frag\n");
                 return NULL;
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
index 07969f06df10..dc016dfec64d 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
@@ -464,7 +464,7 @@ static u64 *nfp_vnic_get_sw_stats(struct net_device *netdev, u64 *data)
 
                 do {
                         start = u64_stats_fetch_begin(&nn->r_vecs[i].rx_sync);
-                        *data++ = nn->r_vecs[i].rx_pkts;
+                        data[0] = nn->r_vecs[i].rx_pkts;
                         tmp[0] = nn->r_vecs[i].hw_csum_rx_ok;
                         tmp[1] = nn->r_vecs[i].hw_csum_rx_inner_ok;
                         tmp[2] = nn->r_vecs[i].hw_csum_rx_error;
@@ -472,14 +472,16 @@ static u64 *nfp_vnic_get_sw_stats(struct net_device *netdev, u64 *data)
 
                 do {
                         start = u64_stats_fetch_begin(&nn->r_vecs[i].tx_sync);
-                        *data++ = nn->r_vecs[i].tx_pkts;
-                        *data++ = nn->r_vecs[i].tx_busy;
+                        data[1] = nn->r_vecs[i].tx_pkts;
+                        data[2] = nn->r_vecs[i].tx_busy;
                         tmp[3] = nn->r_vecs[i].hw_csum_tx;
                         tmp[4] = nn->r_vecs[i].hw_csum_tx_inner;
                         tmp[5] = nn->r_vecs[i].tx_gather;
                         tmp[6] = nn->r_vecs[i].tx_lso;
                 } while (u64_stats_fetch_retry(&nn->r_vecs[i].tx_sync, start));
 
+                data += 3;
+
                 for (j = 0; j < NN_ET_RVEC_GATHER_STATS; j++)
                         gathered_stats[j] += tmp[j];
         }
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index e03fcf914690..a3c949ea7d1a 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -8491,8 +8491,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 rtl8168_driver_start(tp);
         }
 
-        device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);
-
         if (pci_dev_run_wake(pdev))
                 pm_runtime_put_noidle(&pdev->dev);
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
index e0ef02f9503b..4b286e27c4ca 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@ -275,7 +275,7 @@ static int dwmac4_wrback_get_rx_timestamp_status(void *desc, u32 ats)
                                         goto exit;
                                 i++;
 
-                        } while ((ret == 1) || (i < 10));
+                        } while ((ret == 1) && (i < 10));
 
                         if (i == 10)
                                 ret = -EBUSY;
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
index 67af0bdd7f10..7516ca210855 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
@@ -34,7 +34,7 @@ int dwmac_dma_reset(void __iomem *ioaddr)
 
         err = readl_poll_timeout(ioaddr + DMA_BUS_MODE, value,
                                  !(value & DMA_BUS_MODE_SFT_RESET),
-                                 100000, 10000);
+                                 10000, 100000);
         if (err)
                 return -EBUSY;
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 1763e48c84e2..16bd50929084 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -473,19 +473,18 @@ static void stmmac_get_rx_hwtstamp(struct stmmac_priv *priv, struct dma_desc *p,
                                    struct dma_desc *np, struct sk_buff *skb)
 {
         struct skb_shared_hwtstamps *shhwtstamp = NULL;
+        struct dma_desc *desc = p;
         u64 ns;
 
         if (!priv->hwts_rx_en)
                 return;
+        /* For GMAC4, the valid timestamp is from CTX next desc. */
+        if (priv->plat->has_gmac4)
+                desc = np;
 
         /* Check if timestamp is available */
-        if (priv->hw->desc->get_rx_timestamp_status(p, priv->adv_ts)) {
-                /* For GMAC4, the valid timestamp is from CTX next desc. */
-                if (priv->plat->has_gmac4)
-                        ns = priv->hw->desc->get_timestamp(np, priv->adv_ts);
-                else
-                        ns = priv->hw->desc->get_timestamp(p, priv->adv_ts);
-
+        if (priv->hw->desc->get_rx_timestamp_status(desc, priv->adv_ts)) {
+                ns = priv->hw->desc->get_timestamp(desc, priv->adv_ts);
                 netdev_dbg(priv->dev, "get valid RX hw timestamp %llu\n", ns);
                 shhwtstamp = skb_hwtstamps(skb);
                 memset(shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps));
@@ -1800,12 +1799,13 @@ static void stmmac_tx_clean(struct stmmac_priv *priv, u32 queue)
 {
         struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue];
         unsigned int bytes_compl = 0, pkts_compl = 0;
-        unsigned int entry = tx_q->dirty_tx;
+        unsigned int entry;
 
         netif_tx_lock(priv->dev);
 
         priv->xstats.tx_clean++;
 
+        entry = tx_q->dirty_tx;
         while (entry != tx_q->cur_tx) {
                 struct sk_buff *skb = tx_q->tx_skbuff[entry];
                 struct dma_desc *p;
@@ -3333,6 +3333,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)
                                  * them in stmmac_rx_refill() function so that
                                  * device can reuse it.
                                  */
+                                dev_kfree_skb_any(rx_q->rx_skbuff[entry]);
                                 rx_q->rx_skbuff[entry] = NULL;
                                 dma_unmap_single(priv->device,
                                                  rx_q->rx_skbuff_dma[entry],
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index f6404074b7b0..ed51018a813e 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -113,13 +113,7 @@ static void tunnel_id_to_vni(__be64 tun_id, __u8 *vni)
 
 static bool eq_tun_id_and_vni(u8 *tun_id, u8 *vni)
 {
-#ifdef __BIG_ENDIAN
-        return (vni[0] == tun_id[2]) &&
-               (vni[1] == tun_id[1]) &&
-               (vni[2] == tun_id[0]);
-#else
         return !memcmp(vni, &tun_id[5], 3);
-#endif
 }
 
 static sa_family_t geneve_get_sk_family(struct geneve_sock *gs)
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 98e4deaa3a6a..5ab1b8849c30 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -742,6 +742,7 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb,
         sg_init_table(sg, ret);
         ret = skb_to_sgvec(skb, sg, 0, skb->len);
         if (unlikely(ret < 0)) {
+                aead_request_free(req);
                 macsec_txsa_put(tx_sa);
                 kfree_skb(skb);
                 return ERR_PTR(ret);
@@ -954,6 +955,7 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb,
         sg_init_table(sg, ret);
         ret = skb_to_sgvec(skb, sg, 0, skb->len);
         if (unlikely(ret < 0)) {
+                aead_request_free(req);
                 kfree_skb(skb);
                 return ERR_PTR(ret);
         }
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 5ce580f413b9..e21bf90b819f 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2027,6 +2027,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 
                 if (!dev)
                         return -ENOMEM;
+                err = dev_get_valid_name(net, dev, name);
+                if (err)
+                        goto err_free_dev;
 
                 dev_net_set(dev, net);
                 dev->rtnl_link_ops = &tun_link_ops;
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index c9c711dcd0e6..a89b5685e68b 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -652,7 +652,7 @@ static int i2400m_download_chunk(struct i2400m *i2400m, const void *chunk,
         struct device *dev = i2400m_dev(i2400m);
         struct {
                 struct i2400m_bootrom_header cmd;
-                u8 cmd_payload[chunk_len];
+                u8 cmd_payload[];
         } __packed *buf;
         struct i2400m_bootrom_header ack;
 
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
index 4eb1e1ce9ace..ef72baf6dd96 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
@@ -429,7 +429,8 @@ void brcmf_fweh_process_event(struct brcmf_pub *drvr,
         if (code != BRCMF_E_IF && !fweh->evt_handler[code])
                 return;
 
-        if (datalen > BRCMF_DCMD_MAXLEN)
+        if (datalen > BRCMF_DCMD_MAXLEN ||
+            datalen + sizeof(*event_packet) > packet_len)
                 return;
 
         if (in_interrupt())
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
index b3aab2fe96eb..ef685465f80a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
@@ -14764,8 +14764,8 @@ static void wlc_phy_ipa_restore_tx_digi_filts_nphy(struct brcms_phy *pi)
 }
 
 static void
-wlc_phy_set_rfseq_nphy(struct brcms_phy *pi, u8 cmd, u8 *events, u8 *dlys,
-                       u8 len)
+wlc_phy_set_rfseq_nphy(struct brcms_phy *pi, u8 cmd, const u8 *events,
+                       const u8 *dlys, u8 len)
 {
         u32 t1_offset, t2_offset;
         u8 ctr;
@@ -15240,16 +15240,16 @@ static void wlc_phy_workarounds_nphy_gainctrl_2057_rev5(struct brcms_phy *pi)
 static void wlc_phy_workarounds_nphy_gainctrl_2057_rev6(struct brcms_phy *pi)
 {
         u16 currband;
-        s8 lna1G_gain_db_rev7[] = { 9, 14, 19, 24 };
-        s8 *lna1_gain_db = NULL;
-        s8 *lna1_gain_db_2 = NULL;
-        s8 *lna2_gain_db = NULL;
-        s8 tiaA_gain_db_rev7[] = { -9, -6, -3, 0, 3, 3, 3, 3, 3, 3 };
-        s8 *tia_gain_db;
-        s8 tiaA_gainbits_rev7[] = { 0, 1, 2, 3, 4, 4, 4, 4, 4, 4 };
-        s8 *tia_gainbits;
-        u16 rfseqA_init_gain_rev7[] = { 0x624f, 0x624f };
-        u16 *rfseq_init_gain;
+        static const s8 lna1G_gain_db_rev7[] = { 9, 14, 19, 24 };
+        const s8 *lna1_gain_db = NULL;
+        const s8 *lna1_gain_db_2 = NULL;
+        const s8 *lna2_gain_db = NULL;
+        static const s8 tiaA_gain_db_rev7[] = { -9, -6, -3, 0, 3, 3, 3, 3, 3, 3 };
+        const s8 *tia_gain_db;
+        static const s8 tiaA_gainbits_rev7[] = { 0, 1, 2, 3, 4, 4, 4, 4, 4, 4 };
+        const s8 *tia_gainbits;
+        static const u16 rfseqA_init_gain_rev7[] = { 0x624f, 0x624f };
+        const u16 *rfseq_init_gain;
         u16 init_gaincode;
         u16 clip1hi_gaincode;
         u16 clip1md_gaincode = 0;
@@ -15310,10 +15310,9 @@ static void wlc_phy_workarounds_nphy_gainctrl_2057_rev6(struct brcms_phy *pi)
 
                         if ((freq <= 5080) || (freq == 5825)) {
 
-                                s8 lna1A_gain_db_rev7[] = { 11, 16, 20, 24 };
-                                s8 lna1A_gain_db_2_rev7[] = {
-                                        11, 17, 22, 25};
-                                s8 lna2A_gain_db_rev7[] = { -1, 6, 10, 14 };
+                                static const s8 lna1A_gain_db_rev7[] = { 11, 16, 20, 24 };
+                                static const s8 lna1A_gain_db_2_rev7[] = { 11, 17, 22, 25};
+                                static const s8 lna2A_gain_db_rev7[] = { -1, 6, 10, 14 };
 
                                 crsminu_th = 0x3e;
                                 lna1_gain_db = lna1A_gain_db_rev7;
@@ -15321,10 +15320,9 @@ static void wlc_phy_workarounds_nphy_gainctrl_2057_rev6(struct brcms_phy *pi)
                                 lna2_gain_db = lna2A_gain_db_rev7;
                         } else if ((freq >= 5500) && (freq <= 5700)) {
 
-                                s8 lna1A_gain_db_rev7[] = { 11, 17, 21, 25 };
-                                s8 lna1A_gain_db_2_rev7[] = {
-                                        12, 18, 22, 26};
-                                s8 lna2A_gain_db_rev7[] = { 1, 8, 12, 16 };
+                                static const s8 lna1A_gain_db_rev7[] = { 11, 17, 21, 25 };
+                                static const s8 lna1A_gain_db_2_rev7[] = { 12, 18, 22, 26};
+                                static const s8 lna2A_gain_db_rev7[] = { 1, 8, 12, 16 };
 
                                 crsminu_th = 0x45;
                                 clip1md_gaincode_B = 0x14;
@@ -15335,10 +15333,9 @@ static void wlc_phy_workarounds_nphy_gainctrl_2057_rev6(struct brcms_phy *pi)
                                 lna2_gain_db = lna2A_gain_db_rev7;
                         } else {
 
-                                s8 lna1A_gain_db_rev7[] = { 12, 18, 22, 26 };
-                                s8 lna1A_gain_db_2_rev7[] = {
-                                        12, 18, 22, 26};
-                                s8 lna2A_gain_db_rev7[] = { -1, 6, 10, 14 };
+                                static const s8 lna1A_gain_db_rev7[] = { 12, 18, 22, 26 };
+                                static const s8 lna1A_gain_db_2_rev7[] = { 12, 18, 22, 26};
+                                static const s8 lna2A_gain_db_rev7[] = { -1, 6, 10, 14 };
 
                                 crsminu_th = 0x41;
                                 lna1_gain_db = lna1A_gain_db_rev7;
@@ -15450,65 +15447,65 @@ static void wlc_phy_workarounds_nphy_gainctrl(struct brcms_phy *pi)
                 NPHY_RFSEQ_CMD_CLR_HIQ_DIS,
                 NPHY_RFSEQ_CMD_SET_HPF_BW
         };
-        u8 rfseq_updategainu_dlys[] = { 10, 30, 1 };
-        s8 lna1G_gain_db[] = { 7, 11, 16, 23 };
-        s8 lna1G_gain_db_rev4[] = { 8, 12, 17, 25 };
-        s8 lna1G_gain_db_rev5[] = { 9, 13, 18, 26 };
-        s8 lna1G_gain_db_rev6[] = { 8, 13, 18, 25 };
-        s8 lna1G_gain_db_rev6_224B0[] = { 10, 14, 19, 27 };
-        s8 lna1A_gain_db[] = { 7, 11, 17, 23 };
-        s8 lna1A_gain_db_rev4[] = { 8, 12, 18, 23 };
-        s8 lna1A_gain_db_rev5[] = { 6, 10, 16, 21 };
-        s8 lna1A_gain_db_rev6[] = { 6, 10, 16, 21 };
-        s8 *lna1_gain_db = NULL;
-        s8 lna2G_gain_db[] = { -5, 6, 10, 14 };
-        s8 lna2G_gain_db_rev5[] = { -3, 7, 11, 16 };
-        s8 lna2G_gain_db_rev6[] = { -5, 6, 10, 14 };
-        s8 lna2G_gain_db_rev6_224B0[] = { -5, 6, 10, 15 };
-        s8 lna2A_gain_db[] = { -6, 2, 6, 10 };
-        s8 lna2A_gain_db_rev4[] = { -5, 2, 6, 10 };
-        s8 lna2A_gain_db_rev5[] = { -7, 0, 4, 8 };
-        s8 lna2A_gain_db_rev6[] = { -7, 0, 4, 8 };
-        s8 *lna2_gain_db = NULL;
-        s8 tiaG_gain_db[] = {
+        static const u8 rfseq_updategainu_dlys[] = { 10, 30, 1 };
+        static const s8 lna1G_gain_db[] = { 7, 11, 16, 23 };
+        static const s8 lna1G_gain_db_rev4[] = { 8, 12, 17, 25 };
+        static const s8 lna1G_gain_db_rev5[] = { 9, 13, 18, 26 };
+        static const s8 lna1G_gain_db_rev6[] = { 8, 13, 18, 25 };
+        static const s8 lna1G_gain_db_rev6_224B0[] = { 10, 14, 19, 27 };
+        static const s8 lna1A_gain_db[] = { 7, 11, 17, 23 };
+        static const s8 lna1A_gain_db_rev4[] = { 8, 12, 18, 23 };
+        static const s8 lna1A_gain_db_rev5[] = { 6, 10, 16, 21 };
+        static const s8 lna1A_gain_db_rev6[] = { 6, 10, 16, 21 };
+        const s8 *lna1_gain_db = NULL;
+        static const s8 lna2G_gain_db[] = { -5, 6, 10, 14 };
+        static const s8 lna2G_gain_db_rev5[] = { -3, 7, 11, 16 };
+        static const s8 lna2G_gain_db_rev6[] = { -5, 6, 10, 14 };
+        static const s8 lna2G_gain_db_rev6_224B0[] = { -5, 6, 10, 15 };
+        static const s8 lna2A_gain_db[] = { -6, 2, 6, 10 };
+        static const s8 lna2A_gain_db_rev4[] = { -5, 2, 6, 10 };
+        static const s8 lna2A_gain_db_rev5[] = { -7, 0, 4, 8 };
+        static const s8 lna2A_gain_db_rev6[] = { -7, 0, 4, 8 };
+        const s8 *lna2_gain_db = NULL;
+        static const s8 tiaG_gain_db[] = {
                 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A };
-        s8 tiaA_gain_db[] = {
+        static const s8 tiaA_gain_db[] = {
                 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13 };
-        s8 tiaA_gain_db_rev4[] = {
+        static const s8 tiaA_gain_db_rev4[] = {
                 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
-        s8 tiaA_gain_db_rev5[] = {
+        static const s8 tiaA_gain_db_rev5[] = {
                 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
-        s8 tiaA_gain_db_rev6[] = {
+        static const s8 tiaA_gain_db_rev6[] = {
                 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d };
-        s8 *tia_gain_db;
-        s8 tiaG_gainbits[] = {
+        const s8 *tia_gain_db;
+        static const s8 tiaG_gainbits[] = {
                 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 };
-        s8 tiaA_gainbits[] = {
+        static const s8 tiaA_gainbits[] = {
                 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06 };
-        s8 tiaA_gainbits_rev4[] = {
+        static const s8 tiaA_gainbits_rev4[] = {
                 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
-        s8 tiaA_gainbits_rev5[] = {
+        static const s8 tiaA_gainbits_rev5[] = {
                 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
-        s8 tiaA_gainbits_rev6[] = {
+        static const s8 tiaA_gainbits_rev6[] = {
                 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 };
-        s8 *tia_gainbits;
-        s8 lpf_gain_db[] = { 0x00, 0x06, 0x0c, 0x12, 0x12, 0x12 };
-        s8 lpf_gainbits[] = { 0x00, 0x01, 0x02, 0x03, 0x03, 0x03 };
-        u16 rfseqG_init_gain[] = { 0x613f, 0x613f, 0x613f, 0x613f };
-        u16 rfseqG_init_gain_rev4[] = { 0x513f, 0x513f, 0x513f, 0x513f };
-        u16 rfseqG_init_gain_rev5[] = { 0x413f, 0x413f, 0x413f, 0x413f };
-        u16 rfseqG_init_gain_rev5_elna[] = {
+        const s8 *tia_gainbits;
+        static const s8 lpf_gain_db[] = { 0x00, 0x06, 0x0c, 0x12, 0x12, 0x12 };
+        static const s8 lpf_gainbits[] = { 0x00, 0x01, 0x02, 0x03, 0x03, 0x03 };
+        static const u16 rfseqG_init_gain[] = { 0x613f, 0x613f, 0x613f, 0x613f };
+        static const u16 rfseqG_init_gain_rev4[] = { 0x513f, 0x513f, 0x513f, 0x513f };
+        static const u16 rfseqG_init_gain_rev5[] = { 0x413f, 0x413f, 0x413f, 0x413f };
+        static const u16 rfseqG_init_gain_rev5_elna[] = {
                 0x013f, 0x013f, 0x013f, 0x013f };
-        u16 rfseqG_init_gain_rev6[] = { 0x513f, 0x513f };
-        u16 rfseqG_init_gain_rev6_224B0[] = { 0x413f, 0x413f };
-        u16 rfseqG_init_gain_rev6_elna[] = { 0x113f, 0x113f };
-        u16 rfseqA_init_gain[] = { 0x516f, 0x516f, 0x516f, 0x516f };
-        u16 rfseqA_init_gain_rev4[] = { 0x614f, 0x614f, 0x614f, 0x614f };
-        u16 rfseqA_init_gain_rev4_elna[] = {
+        static const u16 rfseqG_init_gain_rev6[] = { 0x513f, 0x513f };
+        static const u16 rfseqG_init_gain_rev6_224B0[] = { 0x413f, 0x413f };
+        static const u16 rfseqG_init_gain_rev6_elna[] = { 0x113f, 0x113f };
+        static const u16 rfseqA_init_gain[] = { 0x516f, 0x516f, 0x516f, 0x516f };
+        static const u16 rfseqA_init_gain_rev4[] = { 0x614f, 0x614f, 0x614f, 0x614f };
+        static const u16 rfseqA_init_gain_rev4_elna[] = {
                 0x314f, 0x314f, 0x314f, 0x314f };
-        u16 rfseqA_init_gain_rev5[] = { 0x714f, 0x714f, 0x714f, 0x714f };
-        u16 rfseqA_init_gain_rev6[] = { 0x714f, 0x714f };
-        u16 *rfseq_init_gain;
+        static const u16 rfseqA_init_gain_rev5[] = { 0x714f, 0x714f, 0x714f, 0x714f };
+        static const u16 rfseqA_init_gain_rev6[] = { 0x714f, 0x714f };
+        const u16 *rfseq_init_gain;
         u16 initG_gaincode = 0x627e;
         u16 initG_gaincode_rev4 = 0x527e;
         u16 initG_gaincode_rev5 = 0x427e;
@@ -15538,10 +15535,10 @@ static void wlc_phy_workarounds_nphy_gainctrl(struct brcms_phy *pi)
         u16 clip1mdA_gaincode_rev6 = 0x2084;
         u16 clip1md_gaincode = 0;
         u16 clip1loG_gaincode = 0x0074;
-        u16 clip1loG_gaincode_rev5[] = {
+        static const u16 clip1loG_gaincode_rev5[] = {
                 0x0062, 0x0064, 0x006a, 0x106a, 0x106c, 0x1074, 0x107c, 0x207c
         };
-        u16 clip1loG_gaincode_rev6[] = {
+        static const u16 clip1loG_gaincode_rev6[] = {
                 0x106a, 0x106c, 0x1074, 0x107c, 0x007e, 0x107e, 0x207e, 0x307e
         };
         u16 clip1loG_gaincode_rev6_224B0 = 0x1074;
@@ -16066,7 +16063,7 @@ static void wlc_phy_workarounds_nphy_gainctrl(struct brcms_phy *pi)
 
 static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
 {
-        u8 rfseq_rx2tx_events[] = {
+        static const u8 rfseq_rx2tx_events[] = {
                 NPHY_RFSEQ_CMD_NOP,
                 NPHY_RFSEQ_CMD_RXG_FBW,
                 NPHY_RFSEQ_CMD_TR_SWITCH,
@@ -16076,7 +16073,7 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
                 NPHY_RFSEQ_CMD_EXT_PA
         };
         u8 rfseq_rx2tx_dlys[] = { 8, 6, 6, 2, 4, 60, 1 };
-        u8 rfseq_tx2rx_events[] = {
+        static const u8 rfseq_tx2rx_events[] = {
                 NPHY_RFSEQ_CMD_NOP,
                 NPHY_RFSEQ_CMD_EXT_PA,
                 NPHY_RFSEQ_CMD_TX_GAIN,
@@ -16085,8 +16082,8 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
                 NPHY_RFSEQ_CMD_RXG_FBW,
                 NPHY_RFSEQ_CMD_CLR_HIQ_DIS
         };
-        u8 rfseq_tx2rx_dlys[] = { 8, 6, 2, 4, 4, 6, 1 };
-        u8 rfseq_tx2rx_events_rev3[] = {
+        static const u8 rfseq_tx2rx_dlys[] = { 8, 6, 2, 4, 4, 6, 1 };
+        static const u8 rfseq_tx2rx_events_rev3[] = {
                 NPHY_REV3_RFSEQ_CMD_EXT_PA,
                 NPHY_REV3_RFSEQ_CMD_INT_PA_PU,
                 NPHY_REV3_RFSEQ_CMD_TX_GAIN,
@@ -16096,7 +16093,7 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
                 NPHY_REV3_RFSEQ_CMD_CLR_HIQ_DIS,
                 NPHY_REV3_RFSEQ_CMD_END
         };
-        u8 rfseq_tx2rx_dlys_rev3[] = { 8, 4, 2, 2, 4, 4, 6, 1 };
+        static const u8 rfseq_tx2rx_dlys_rev3[] = { 8, 4, 2, 2, 4, 4, 6, 1 };
         u8 rfseq_rx2tx_events_rev3[] = {
                 NPHY_REV3_RFSEQ_CMD_NOP,
                 NPHY_REV3_RFSEQ_CMD_RXG_FBW,
@@ -16110,7 +16107,7 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
         };
         u8 rfseq_rx2tx_dlys_rev3[] = { 8, 6, 6, 4, 4, 18, 42, 1, 1 };
 
-        u8 rfseq_rx2tx_events_rev3_ipa[] = {
+        static const u8 rfseq_rx2tx_events_rev3_ipa[] = {
                 NPHY_REV3_RFSEQ_CMD_NOP,
                 NPHY_REV3_RFSEQ_CMD_RXG_FBW,
                 NPHY_REV3_RFSEQ_CMD_TR_SWITCH,
@@ -16121,15 +16118,15 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
                 NPHY_REV3_RFSEQ_CMD_INT_PA_PU,
                 NPHY_REV3_RFSEQ_CMD_END
         };
-        u8 rfseq_rx2tx_dlys_rev3_ipa[] = { 8, 6, 6, 4, 4, 16, 43, 1, 1 };
-        u16 rfseq_rx2tx_dacbufpu_rev7[] = { 0x10f, 0x10f };
+        static const u8 rfseq_rx2tx_dlys_rev3_ipa[] = { 8, 6, 6, 4, 4, 16, 43, 1, 1 };
+        static const u16 rfseq_rx2tx_dacbufpu_rev7[] = { 0x10f, 0x10f };
 
         s16 alpha0, alpha1, alpha2;
         s16 beta0, beta1, beta2;
         u32 leg_data_weights, ht_data_weights, nss1_data_weights,
             stbc_data_weights;
         u8 chan_freq_range = 0;
-        u16 dac_control = 0x0002;
+        static const u16 dac_control = 0x0002;
         u16 aux_adc_vmid_rev7_core0[] = { 0x8e, 0x96, 0x96, 0x96 };
         u16 aux_adc_vmid_rev7_core1[] = { 0x8f, 0x9f, 0x9f, 0x96 };
         u16 aux_adc_vmid_rev4[] = { 0xa2, 0xb4, 0xb4, 0x89 };
@@ -16139,8 +16136,8 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
         u16 aux_adc_gain_rev4[] = { 0x02, 0x02, 0x02, 0x00 };
         u16 aux_adc_gain_rev3[] = { 0x02, 0x02, 0x02, 0x00 };
         u16 *aux_adc_gain;
-        u16 sk_adc_vmid[] = { 0xb4, 0xb4, 0xb4, 0x24 };
-        u16 sk_adc_gain[] = { 0x02, 0x02, 0x02, 0x02 };
+        static const u16 sk_adc_vmid[] = { 0xb4, 0xb4, 0xb4, 0x24 };
+        static const u16 sk_adc_gain[] = { 0x02, 0x02, 0x02, 0x02 };
         s32 min_nvar_val = 0x18d;
         s32 min_nvar_offset_6mbps = 20;
         u8 pdetrange;
@@ -16151,9 +16148,9 @@ static void wlc_phy_workarounds_nphy(struct brcms_phy *pi)
         u16 rfseq_rx2tx_lpf_h_hpc_rev7 = 0x77;
         u16 rfseq_tx2rx_lpf_h_hpc_rev7 = 0x77;
         u16 rfseq_pktgn_lpf_h_hpc_rev7 = 0x77;
-        u16 rfseq_htpktgn_lpf_hpc_rev7[] = { 0x77, 0x11, 0x11 };
-        u16 rfseq_pktgn_lpf_hpc_rev7[] = { 0x11, 0x11 };
-        u16 rfseq_cckpktgn_lpf_hpc_rev7[] = { 0x11, 0x11 };
+        static const u16 rfseq_htpktgn_lpf_hpc_rev7[] = { 0x77, 0x11, 0x11 };
+        static const u16 rfseq_pktgn_lpf_hpc_rev7[] = { 0x11, 0x11 };
+        static const u16 rfseq_cckpktgn_lpf_hpc_rev7[] = { 0x11, 0x11 };
         u16 ipalvlshift_3p3_war_en = 0;
         u16 rccal_bcap_val, rccal_scap_val;
         u16 rccal_tx20_11b_bcap = 0;
@@ -24291,13 +24288,13 @@ static void wlc_phy_update_txcal_ladder_nphy(struct brcms_phy *pi, u16 core)
         u16 bbmult;
         u16 tblentry;
 
-        struct nphy_txiqcal_ladder ladder_lo[] = {
+        static const struct nphy_txiqcal_ladder ladder_lo[] = {
                 {3, 0}, {4, 0}, {6, 0}, {9, 0}, {13, 0}, {18, 0},
                 {25, 0}, {25, 1}, {25, 2}, {25, 3}, {25, 4}, {25, 5},
                 {25, 6}, {25, 7}, {35, 7}, {50, 7}, {71, 7}, {100, 7}
         };
 
-        struct nphy_txiqcal_ladder ladder_iq[] = {
+        static const struct nphy_txiqcal_ladder ladder_iq[] = {
                 {3, 0}, {4, 0}, {6, 0}, {9, 0}, {13, 0}, {18, 0},
                 {25, 0}, {35, 0}, {50, 0}, {71, 0}, {100, 0}, {100, 1},
                 {100, 2}, {100, 3}, {100, 4}, {100, 5}, {100, 6}, {100, 7}
@@ -25773,67 +25770,67 @@ wlc_phy_cal_txiqlo_nphy(struct brcms_phy *pi, struct nphy_txgains target_gain,
         u16 cal_gain[2];
         struct nphy_iqcal_params cal_params[2];
         u32 tbl_len;
-        void *tbl_ptr;
+        const void *tbl_ptr;
         bool ladder_updated[2];
         u8 mphase_cal_lastphase = 0;
         int bcmerror = 0;
         bool phyhang_avoid_state = false;
 
-        u16 tbl_tx_iqlo_cal_loft_ladder_20[] = {
+        static const u16 tbl_tx_iqlo_cal_loft_ladder_20[] = {
                 0x0300, 0x0500, 0x0700, 0x0900, 0x0d00, 0x1100, 0x1900, 0x1901,
                 0x1902,
                 0x1903, 0x1904, 0x1905, 0x1906, 0x1907, 0x2407, 0x3207, 0x4607,
                 0x6407
         };
 
-        u16 tbl_tx_iqlo_cal_iqimb_ladder_20[] = {
+        static const u16 tbl_tx_iqlo_cal_iqimb_ladder_20[] = {
                 0x0200, 0x0300, 0x0600, 0x0900, 0x0d00, 0x1100, 0x1900, 0x2400,
                 0x3200,
                 0x4600, 0x6400, 0x6401, 0x6402, 0x6403, 0x6404, 0x6405, 0x6406,
                 0x6407
         };
 
-        u16 tbl_tx_iqlo_cal_loft_ladder_40[] = {
+        static const u16 tbl_tx_iqlo_cal_loft_ladder_40[] = {
                 0x0200, 0x0300, 0x0400, 0x0700, 0x0900, 0x0c00, 0x1200, 0x1201,
                 0x1202,
                 0x1203, 0x1204, 0x1205, 0x1206, 0x1207, 0x1907, 0x2307, 0x3207,
                 0x4707
         };
 
-        u16 tbl_tx_iqlo_cal_iqimb_ladder_40[] = {
+        static const u16 tbl_tx_iqlo_cal_iqimb_ladder_40[] = {
                 0x0100, 0x0200, 0x0400, 0x0700, 0x0900, 0x0c00, 0x1200, 0x1900,
                 0x2300,
                 0x3200, 0x4700, 0x4701, 0x4702, 0x4703, 0x4704, 0x4705, 0x4706,
                 0x4707
         };
 
-        u16 tbl_tx_iqlo_cal_startcoefs[] = {
+        static const u16 tbl_tx_iqlo_cal_startcoefs[] = {
                 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
                 0x0000
         };
 
-        u16 tbl_tx_iqlo_cal_cmds_fullcal[] = {
+        static const u16 tbl_tx_iqlo_cal_cmds_fullcal[] = {
                 0x8123, 0x8264, 0x8086, 0x8245, 0x8056,
                 0x9123, 0x9264, 0x9086, 0x9245, 0x9056
         };
 
-        u16 tbl_tx_iqlo_cal_cmds_recal[] = {
+        static const u16 tbl_tx_iqlo_cal_cmds_recal[] = {
                 0x8101, 0x8253, 0x8053, 0x8234, 0x8034,
                 0x9101, 0x9253, 0x9053, 0x9234, 0x9034
         };
 
-        u16 tbl_tx_iqlo_cal_startcoefs_nphyrev3[] = {
+        static const u16 tbl_tx_iqlo_cal_startcoefs_nphyrev3[] = {
                 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
                 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
                 0x0000
         };
 
-        u16 tbl_tx_iqlo_cal_cmds_fullcal_nphyrev3[] = {
+        static const u16 tbl_tx_iqlo_cal_cmds_fullcal_nphyrev3[] = {
                 0x8434, 0x8334, 0x8084, 0x8267, 0x8056, 0x8234,
                 0x9434, 0x9334, 0x9084, 0x9267, 0x9056, 0x9234
         };
 
-        u16 tbl_tx_iqlo_cal_cmds_recal_nphyrev3[] = {
+        static const u16 tbl_tx_iqlo_cal_cmds_recal_nphyrev3[] = {
                 0x8423, 0x8323, 0x8073, 0x8256, 0x8045, 0x8223,
                 0x9423, 0x9323, 0x9073, 0x9256, 0x9045, 0x9223
         };
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/7000.c b/drivers/net/wireless/intel/iwlwifi/cfg/7000.c
index 45e2efc70d19..ce741beec1fc 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/7000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/7000.c
@@ -309,6 +309,7 @@ const struct iwl_cfg iwl3168_2ac_cfg = {
         .nvm_calib_ver = IWL3168_TX_POWER_VERSION,
         .pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,
         .dccm_len = IWL7265_DCCM_LEN,
+        .nvm_type = IWL_NVM_SDP,
 };
 
 const struct iwl_cfg iwl7265_2ac_cfg = {
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
index 2e6c52664cee..c2a5936ccede 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
@@ -164,7 +164,7 @@ static const struct iwl_tt_params iwl8000_tt_params = {
         .default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,       \
         .thermal_params = &iwl8000_tt_params,                           \
         .apmg_not_supported = true,                                     \
-        .ext_nvm = true,                                                \
+        .nvm_type = IWL_NVM_EXT,                                        \
         .dbgc_supported = true
 
 #define IWL_DEVICE_8000                                                 \
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index 2babe0a1f18b..e8b5ff42f5a8 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -148,7 +148,7 @@ static const struct iwl_tt_params iwl9000_tt_params = {
         .vht_mu_mimo_supported = true,                                  \
         .mac_addr_from_csr = true,                                      \
         .rf_id = true,                                                  \
-        .ext_nvm = true,                                                \
+        .nvm_type = IWL_NVM_EXT,                                        \
         .dbgc_supported = true
 
 const struct iwl_cfg iwl9160_2ac_cfg = {
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/a000.c b/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
index 76ba1f8bc72f..a440140ed8dd 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
@@ -133,7 +133,7 @@ static const struct iwl_ht_params iwl_a000_ht_params = {
         .use_tfh = true,                                                \
         .rf_id = true,                                                  \
         .gen2 = true,                                                   \
-        .ext_nvm = true,                                                \
+        .nvm_type = IWL_NVM_EXT,                                        \
         .dbgc_supported = true
 
 const struct iwl_cfg iwla000_2ac_cfg_hr = {
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h b/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
index 00bc7a25dece..3fd07bc80f54 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
@@ -108,6 +108,7 @@ enum iwl_nvm_access_target {
  * @NVM_SECTION_TYPE_REGULATORY: regulatory section
  * @NVM_SECTION_TYPE_CALIBRATION: calibration section
  * @NVM_SECTION_TYPE_PRODUCTION: production section
+ * @NVM_SECTION_TYPE_REGULATORY_SDP: regulatory section used by 3168 series
  * @NVM_SECTION_TYPE_MAC_OVERRIDE: MAC override section
  * @NVM_SECTION_TYPE_PHY_SKU: PHY SKU section
  * @NVM_MAX_NUM_SECTIONS: number of sections
@@ -117,6 +118,7 @@ enum iwl_nvm_section_type {
         NVM_SECTION_TYPE_REGULATORY = 3,
         NVM_SECTION_TYPE_CALIBRATION = 4,
         NVM_SECTION_TYPE_PRODUCTION = 5,
+        NVM_SECTION_TYPE_REGULATORY_SDP = 8,
         NVM_SECTION_TYPE_MAC_OVERRIDE = 11,
         NVM_SECTION_TYPE_PHY_SKU = 12,
         NVM_MAX_NUM_SECTIONS = 13,
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 6afc7a799892..f5dd7d83cd0a 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -1086,7 +1086,7 @@ void iwl_fw_error_dump_wk(struct work_struct *work)
 
         if (fwrt->trans->cfg->device_family == IWL_DEVICE_FAMILY_7000) {
                 /* stop recording */
-                iwl_set_bits_prph(fwrt->trans, MON_BUFF_SAMPLE_CTL, 0x100);
+                iwl_fw_dbg_stop_recording(fwrt);
 
                 iwl_fw_error_dump(fwrt);
 
@@ -1104,10 +1104,7 @@ void iwl_fw_error_dump_wk(struct work_struct *work)
                 u32 in_sample = iwl_read_prph(fwrt->trans, DBGC_IN_SAMPLE);
                 u32 out_ctrl = iwl_read_prph(fwrt->trans, DBGC_OUT_CTRL);
 
-                /* stop recording */
-                iwl_write_prph(fwrt->trans, DBGC_IN_SAMPLE, 0);
-                udelay(100);
-                iwl_write_prph(fwrt->trans, DBGC_OUT_CTRL, 0);
+                iwl_fw_dbg_stop_recording(fwrt);
                 /* wait before we collect the data till the DBGC stop */
                 udelay(500);
 
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
index 0f810ea89d31..9c889a32fe24 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h
@@ -68,6 +68,8 @@
 #include <linux/workqueue.h>
 #include <net/cfg80211.h>
 #include "runtime.h"
+#include "iwl-prph.h"
+#include "iwl-io.h"
 #include "file.h"
 #include "error-dump.h"
 
@@ -194,8 +196,21 @@ _iwl_fw_dbg_trigger_simple_stop(struct iwl_fw_runtime *fwrt,
                                         iwl_fw_dbg_get_trigger((fwrt)->fw,\
                                                                (trig)))
 
+static inline void iwl_fw_dbg_stop_recording(struct iwl_fw_runtime *fwrt)
+{
+        if (fwrt->trans->cfg->device_family == IWL_DEVICE_FAMILY_7000) {
+                iwl_set_bits_prph(fwrt->trans, MON_BUFF_SAMPLE_CTL, 0x100);
+        } else {
+                iwl_write_prph(fwrt->trans, DBGC_IN_SAMPLE, 0);
+                udelay(100);
+                iwl_write_prph(fwrt->trans, DBGC_OUT_CTRL, 0);
+        }
+}
+
 static inline void iwl_fw_dump_conf_clear(struct iwl_fw_runtime *fwrt)
 {
+        iwl_fw_dbg_stop_recording(fwrt);
+
         fwrt->dump.conf = FW_DBG_INVALID;
 }
 
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 3e057b539d5b..71cb1ecde0f7 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -108,6 +108,18 @@ enum iwl_led_mode {
         IWL_LED_DISABLE,
 };
 
+/**
+ * enum iwl_nvm_type - nvm formats
+ * @IWL_NVM: the regular format
+ * @IWL_NVM_EXT: extended NVM format
+ * @IWL_NVM_SDP: NVM format used by 3168 series
+ */
+enum iwl_nvm_type {
+        IWL_NVM,
+        IWL_NVM_EXT,
+        IWL_NVM_SDP,
+};
+
 /*
  * This is the threshold value of plcp error rate per 100mSecs.  It is
  * used to set and check for the validity of plcp_delta.
@@ -320,7 +332,7 @@ struct iwl_pwr_tx_backoff {
  * @integrated: discrete or integrated
  * @gen2: a000 and on transport operation
  * @cdb: CDB support
- * @ext_nvm: extended NVM format
+ * @nvm_type: see &enum iwl_nvm_type
  *
  * We enable the driver to be backward compatible wrt. hardware features.
  * API differences in uCode shouldn't be handled here but through TLVs
@@ -342,6 +354,7 @@ struct iwl_cfg {
         const struct iwl_tt_params *thermal_params;
         enum iwl_device_family device_family;
         enum iwl_led_mode led_mode;
+        enum iwl_nvm_type nvm_type;
         u32 max_data_size;
         u32 max_inst_size;
         netdev_features_t features;
@@ -369,7 +382,6 @@ struct iwl_cfg {
             use_tfh:1,
             gen2:1,
             cdb:1,
-            ext_nvm:1,
             dbgc_supported:1;
         u8 valid_tx_ant;
         u8 valid_rx_ant;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 3014beef4873..c3a5d8ccc95e 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -77,7 +77,7 @@
 #include "iwl-csr.h"
 
 /* NVM offsets (in words) definitions */
-enum wkp_nvm_offsets {
+enum nvm_offsets {
         /* NVM HW-Section offset (in words) definitions */
         SUBSYSTEM_ID = 0x0A,
         HW_ADDR = 0x15,
@@ -92,7 +92,10 @@ enum wkp_nvm_offsets {
 
         /* NVM calibration section offset (in words) definitions */
         NVM_CALIB_SECTION = 0x2B8,
-        XTAL_CALIB = 0x316 - NVM_CALIB_SECTION
+        XTAL_CALIB = 0x316 - NVM_CALIB_SECTION,
+
+        /* NVM REGULATORY -Section offset (in words) definitions */
+        NVM_CHANNELS_SDP = 0,
 };
 
 enum ext_nvm_offsets {
@@ -206,8 +209,36 @@ enum iwl_nvm_channel_flags {
         NVM_CHANNEL_DC_HIGH             = BIT(12),
 };
 
+static inline void iwl_nvm_print_channel_flags(struct device *dev, u32 level,
+                                               int chan, u16 flags)
+{
 #define CHECK_AND_PRINT_I(x)    \
-        ((ch_flags & NVM_CHANNEL_##x) ? # x " " : "")
+        ((flags & NVM_CHANNEL_##x) ? " " #x : "")
+
+        if (!(flags & NVM_CHANNEL_VALID)) {
+                IWL_DEBUG_DEV(dev, level, "Ch. %d: 0x%x: No traffic\n",
+                              chan, flags);
+                return;
+        }
+
+        /* Note: already can print up to 101 characters, 110 is the limit! */
+        IWL_DEBUG_DEV(dev, level,
+                      "Ch. %d: 0x%x:%s%s%s%s%s%s%s%s%s%s%s%s\n",
+                      chan, flags,
+                      CHECK_AND_PRINT_I(VALID),
+                      CHECK_AND_PRINT_I(IBSS),
+                      CHECK_AND_PRINT_I(ACTIVE),
+                      CHECK_AND_PRINT_I(RADAR),
+                      CHECK_AND_PRINT_I(INDOOR_ONLY),
+                      CHECK_AND_PRINT_I(GO_CONCURRENT),
+                      CHECK_AND_PRINT_I(UNIFORM),
+                      CHECK_AND_PRINT_I(20MHZ),
+                      CHECK_AND_PRINT_I(40MHZ),
+                      CHECK_AND_PRINT_I(80MHZ),
+                      CHECK_AND_PRINT_I(160MHZ),
+                      CHECK_AND_PRINT_I(DC_HIGH));
+#undef CHECK_AND_PRINT_I
+}
 
 static u32 iwl_get_channel_flags(u8 ch_num, int ch_idx, bool is_5ghz,
                                  u16 nvm_flags, const struct iwl_cfg *cfg)
@@ -215,7 +246,7 @@ static u32 iwl_get_channel_flags(u8 ch_num, int ch_idx, bool is_5ghz,
         u32 flags = IEEE80211_CHAN_NO_HT40;
         u32 last_5ghz_ht = LAST_5GHZ_HT;
 
-        if (cfg->ext_nvm)
+        if (cfg->nvm_type == IWL_NVM_EXT)
                 last_5ghz_ht = LAST_5GHZ_HT_FAMILY_8000;
 
         if (!is_5ghz && (nvm_flags & NVM_CHANNEL_40MHZ)) {
@@ -268,7 +299,7 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
         int num_of_ch, num_2ghz_channels;
         const u8 *nvm_chan;
 
-        if (!cfg->ext_nvm) {
+        if (cfg->nvm_type != IWL_NVM_EXT) {
                 num_of_ch = IWL_NUM_CHANNELS;
                 nvm_chan = &iwl_nvm_channels[0];
                 num_2ghz_channels = NUM_2GHZ_CHANNELS;
@@ -302,12 +333,8 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
                          * supported, hence we still want to add them to
                          * the list of supported channels to cfg80211.
                          */
-                        IWL_DEBUG_EEPROM(dev,
-                                         "Ch. %d Flags %x [%sGHz] - No traffic\n",
-                                         nvm_chan[ch_idx],
-                                         ch_flags,
-                                         (ch_idx >= num_2ghz_channels) ?
-                                         "5.2" : "2.4");
+                        iwl_nvm_print_channel_flags(dev, IWL_DL_EEPROM,
+                                                    nvm_chan[ch_idx], ch_flags);
                         continue;
                 }
 
@@ -337,27 +364,10 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
                 else
                         channel->flags = 0;
 
-                IWL_DEBUG_EEPROM(dev,
-                                 "Ch. %d [%sGHz] flags 0x%x %s%s%s%s%s%s%s%s%s%s%s%s(%ddBm): Ad-Hoc %ssupported\n",
-                                 channel->hw_value,
-                                 is_5ghz ? "5.2" : "2.4",
-                                 ch_flags,
-                                 CHECK_AND_PRINT_I(VALID),
-                                 CHECK_AND_PRINT_I(IBSS),
-                                 CHECK_AND_PRINT_I(ACTIVE),
-                                 CHECK_AND_PRINT_I(RADAR),
-                                 CHECK_AND_PRINT_I(INDOOR_ONLY),
-                                 CHECK_AND_PRINT_I(GO_CONCURRENT),
-                                 CHECK_AND_PRINT_I(UNIFORM),
-                                 CHECK_AND_PRINT_I(20MHZ),
-                                 CHECK_AND_PRINT_I(40MHZ),
-                                 CHECK_AND_PRINT_I(80MHZ),
-                                 CHECK_AND_PRINT_I(160MHZ),
-                                 CHECK_AND_PRINT_I(DC_HIGH),
-                                 channel->max_power,
-                                 ((ch_flags & NVM_CHANNEL_IBSS) &&
-                                  !(ch_flags & NVM_CHANNEL_RADAR))
-                                        ? "" : "not ");
+                iwl_nvm_print_channel_flags(dev, IWL_DL_EEPROM,
+                                            channel->hw_value, ch_flags);
+                IWL_DEBUG_EEPROM(dev, "Ch. %d: %ddBm\n",
+                                 channel->hw_value, channel->max_power);
         }
 
         return n_channels;
@@ -484,7 +494,7 @@ IWL_EXPORT_SYMBOL(iwl_init_sbands);
 static int iwl_get_sku(const struct iwl_cfg *cfg, const __le16 *nvm_sw,
                        const __le16 *phy_sku)
 {
-        if (!cfg->ext_nvm)
+        if (cfg->nvm_type != IWL_NVM_EXT)
                 return le16_to_cpup(nvm_sw + SKU);
 
         return le32_to_cpup((__le32 *)(phy_sku + SKU_FAMILY_8000));
@@ -492,7 +502,7 @@ static int iwl_get_sku(const struct iwl_cfg *cfg, const __le16 *nvm_sw,
 
 static int iwl_get_nvm_version(const struct iwl_cfg *cfg, const __le16 *nvm_sw)
 {
-        if (!cfg->ext_nvm)
+        if (cfg->nvm_type != IWL_NVM_EXT)
                 return le16_to_cpup(nvm_sw + NVM_VERSION);
         else
                 return le32_to_cpup((__le32 *)(nvm_sw +
@@ -502,7 +512,7 @@ static int iwl_get_nvm_version(const struct iwl_cfg *cfg, const __le16 *nvm_sw)
 static int iwl_get_radio_cfg(const struct iwl_cfg *cfg, const __le16 *nvm_sw,
                              const __le16 *phy_sku)
 {
-        if (!cfg->ext_nvm)
+        if (cfg->nvm_type != IWL_NVM_EXT)
                 return le16_to_cpup(nvm_sw + RADIO_CFG);
 
         return le32_to_cpup((__le32 *)(phy_sku + RADIO_CFG_FAMILY_EXT_NVM));
@@ -513,7 +523,7 @@ static int iwl_get_n_hw_addrs(const struct iwl_cfg *cfg, const __le16 *nvm_sw)
 {
         int n_hw_addr;
 
-        if (!cfg->ext_nvm)
+        if (cfg->nvm_type != IWL_NVM_EXT)
                 return le16_to_cpup(nvm_sw + N_HW_ADDRS);
 
         n_hw_addr = le32_to_cpup((__le32 *)(nvm_sw + N_HW_ADDRS_FAMILY_8000));
@@ -525,7 +535,7 @@ static void iwl_set_radio_cfg(const struct iwl_cfg *cfg,
                               struct iwl_nvm_data *data,
                               u32 radio_cfg)
 {
-        if (!cfg->ext_nvm) {
+        if (cfg->nvm_type != IWL_NVM_EXT) {
                 data->radio_cfg_type = NVM_RF_CFG_TYPE_MSK(radio_cfg);
                 data->radio_cfg_step = NVM_RF_CFG_STEP_MSK(radio_cfg);
                 data->radio_cfg_dash = NVM_RF_CFG_DASH_MSK(radio_cfg);
@@ -634,7 +644,7 @@ static int iwl_set_hw_address(struct iwl_trans *trans,
 {
         if (cfg->mac_addr_from_csr) {
                 iwl_set_hw_address_from_csr(trans, data);
-        } else if (!cfg->ext_nvm) {
+        } else if (cfg->nvm_type != IWL_NVM_EXT) {
                 const u8 *hw_addr = (const u8 *)(nvm_hw + HW_ADDR);
 
                 /* The byte order is little endian 16 bit, meaning 214365 */
@@ -706,7 +716,7 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,
         u16 lar_config;
         const __le16 *ch_section;
 
-        if (!cfg->ext_nvm)
+        if (cfg->nvm_type != IWL_NVM_EXT)
                 data = kzalloc(sizeof(*data) +
                                sizeof(struct ieee80211_channel) *
                                IWL_NUM_CHANNELS,
@@ -740,7 +750,7 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,
 
         data->n_hw_addrs = iwl_get_n_hw_addrs(cfg, nvm_sw);
 
-        if (!cfg->ext_nvm) {
+        if (cfg->nvm_type != IWL_NVM_EXT) {
                 /* Checking for required sections */
                 if (!nvm_calib) {
                         IWL_ERR(trans,
@@ -748,11 +758,15 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg,
                         kfree(data);
                         return NULL;
                 }
+
+                ch_section = cfg->nvm_type == IWL_NVM_SDP ?
+                             &regulatory[NVM_CHANNELS_SDP] :
+                             &nvm_sw[NVM_CHANNELS];
+
                 /* in family 8000 Xtal calibration values moved to OTP */
                 data->xtal_calib[0] = *(nvm_calib + XTAL_CALIB);
                 data->xtal_calib[1] = *(nvm_calib + XTAL_CALIB + 1);
                 lar_enabled = true;
-                ch_section = &nvm_sw[NVM_CHANNELS];
         } else {
                 u16 lar_offset = data->nvm_version < 0xE39 ?
                                  NVM_LAR_OFFSET_OLD :
@@ -786,7 +800,7 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u8 *nvm_chan,
         u32 flags = NL80211_RRF_NO_HT40;
         u32 last_5ghz_ht = LAST_5GHZ_HT;
 
-        if (cfg->ext_nvm)
+        if (cfg->nvm_type == IWL_NVM_EXT)
                 last_5ghz_ht = LAST_5GHZ_HT_FAMILY_8000;
 
         if (ch_idx < NUM_2GHZ_CHANNELS &&
@@ -834,7 +848,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
         int ch_idx;
         u16 ch_flags;
         u32 reg_rule_flags, prev_reg_rule_flags = 0;
-        const u8 *nvm_chan = cfg->ext_nvm ?
+        const u8 *nvm_chan = cfg->nvm_type == IWL_NVM_EXT ?
                              iwl_ext_nvm_channels : iwl_nvm_channels;
         struct ieee80211_regdomain *regd;
         int size_of_regd;
@@ -843,7 +857,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
         int center_freq, prev_center_freq = 0;
         int valid_rules = 0;
         bool new_rule;
-        int max_num_ch = cfg->ext_nvm ?
+        int max_num_ch = cfg->nvm_type == IWL_NVM_EXT ?
                          IWL_NUM_CHANNELS_EXT : IWL_NUM_CHANNELS;
 
         if (WARN_ON_ONCE(num_of_ch > NL80211_MAX_SUPP_REG_RULES))
@@ -873,12 +887,8 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
                 new_rule = false;
 
                 if (!(ch_flags & NVM_CHANNEL_VALID)) {
-                        IWL_DEBUG_DEV(dev, IWL_DL_LAR,
-                                      "Ch. %d Flags %x [%sGHz] - No traffic\n",
-                                      nvm_chan[ch_idx],
-                                      ch_flags,
-                                      (ch_idx >= NUM_2GHZ_CHANNELS) ?
-                                      "5.2" : "2.4");
+                        iwl_nvm_print_channel_flags(dev, IWL_DL_LAR,
+                                                    nvm_chan[ch_idx], ch_flags);
                         continue;
                 }
 
@@ -914,31 +924,8 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
                 prev_center_freq = center_freq;
                 prev_reg_rule_flags = reg_rule_flags;
 
-                IWL_DEBUG_DEV(dev, IWL_DL_LAR,
-                              "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x)\n",
-                              center_freq,
-                              band == NL80211_BAND_5GHZ ? "5.2" : "2.4",
-                              CHECK_AND_PRINT_I(VALID),
-                              CHECK_AND_PRINT_I(IBSS),
-                              CHECK_AND_PRINT_I(ACTIVE),
-                              CHECK_AND_PRINT_I(RADAR),
-                              CHECK_AND_PRINT_I(INDOOR_ONLY),
-                              CHECK_AND_PRINT_I(GO_CONCURRENT),
-                              CHECK_AND_PRINT_I(UNIFORM),
-                              CHECK_AND_PRINT_I(20MHZ),
-                              CHECK_AND_PRINT_I(40MHZ),
-                              CHECK_AND_PRINT_I(80MHZ),
-                              CHECK_AND_PRINT_I(160MHZ),
-                              CHECK_AND_PRINT_I(DC_HIGH),
-                              ch_flags);
-                IWL_DEBUG_DEV(dev, IWL_DL_LAR,
-                              "Ch. %d [%sGHz] reg_flags 0x%x: %s\n",
-                              center_freq,
-                              band == NL80211_BAND_5GHZ ? "5.2" : "2.4",
-                              reg_rule_flags,
-                              ((ch_flags & NVM_CHANNEL_ACTIVE) &&
-                               !(ch_flags & NVM_CHANNEL_RADAR))
-                                         ? "Ad-Hoc" : "");
+                iwl_nvm_print_channel_flags(dev, IWL_DL_LAR,
+                                            nvm_chan[ch_idx], ch_flags);
         }
 
         regd->n_reg_rules = valid_rules;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 3bcaa82f59b2..a9ac872226fd 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -1077,6 +1077,7 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)
         mvm->vif_count = 0;
         mvm->rx_ba_sessions = 0;
         mvm->fwrt.dump.conf = FW_DBG_INVALID;
+        mvm->monitor_on = false;
 
         /* keep statistics ticking */
         iwl_mvm_accu_radio_stats(mvm);
@@ -1437,6 +1438,9 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
                 mvm->p2p_device_vif = vif;
         }
 
+        if (vif->type == NL80211_IFTYPE_MONITOR)
+                mvm->monitor_on = true;
+
         iwl_mvm_vif_dbgfs_register(mvm, vif);
         goto out_unlock;
 
@@ -1526,6 +1530,9 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,
         iwl_mvm_power_update_mac(mvm);
         iwl_mvm_mac_ctxt_remove(mvm, vif);
 
+        if (vif->type == NL80211_IFTYPE_MONITOR)
+                mvm->monitor_on = false;
+
 out_release:
         mutex_unlock(&mvm->mutex);
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 83303bac0e4b..949e63418299 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1015,6 +1015,9 @@ struct iwl_mvm {
         bool drop_bcn_ap_mode;
 
         struct delayed_work cs_tx_unblock_dwork;
+
+        /* does a monitor vif exist (only one can exist hence bool) */
+        bool monitor_on;
 #ifdef CONFIG_ACPI
         struct iwl_mvm_sar_profile sar_profiles[IWL_MVM_SAR_PROFILE_NUM];
         struct iwl_mvm_geo_profile geo_profiles[IWL_NUM_GEO_PROFILES];
@@ -1159,7 +1162,7 @@ static inline bool iwl_mvm_is_lar_supported(struct iwl_mvm *mvm)
          * Enable LAR only if it is supported by the FW (TLV) &&
          * enabled in the NVM
          */
-        if (mvm->cfg->ext_nvm)
+        if (mvm->cfg->nvm_type == IWL_NVM_EXT)
                 return nvm_lar && tlv_lar;
         else
                 return tlv_lar;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
index 422aa6be9932..fb25b6f29323 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
@@ -295,18 +295,24 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
         const __be16 *hw;
         const __le16 *sw, *calib, *regulatory, *mac_override, *phy_sku;
         bool lar_enabled;
+        int regulatory_type;
 
         /* Checking for required sections */
-        if (!mvm->trans->cfg->ext_nvm) {
+        if (mvm->trans->cfg->nvm_type != IWL_NVM_EXT) {
                 if (!mvm->nvm_sections[NVM_SECTION_TYPE_SW].data ||
                     !mvm->nvm_sections[mvm->cfg->nvm_hw_section_num].data) {
                         IWL_ERR(mvm, "Can't parse empty OTP/NVM sections\n");
                         return NULL;
                 }
         } else {
+                if (mvm->trans->cfg->nvm_type == IWL_NVM_SDP)
+                        regulatory_type = NVM_SECTION_TYPE_REGULATORY_SDP;
+                else
+                        regulatory_type = NVM_SECTION_TYPE_REGULATORY;
+
                 /* SW and REGULATORY sections are mandatory */
                 if (!mvm->nvm_sections[NVM_SECTION_TYPE_SW].data ||
-                    !mvm->nvm_sections[NVM_SECTION_TYPE_REGULATORY].data) {
+                    !mvm->nvm_sections[regulatory_type].data) {
                         IWL_ERR(mvm,
                                 "Can't parse empty family 8000 OTP/NVM sections\n");
                         return NULL;
@@ -330,11 +336,14 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
         hw = (const __be16 *)sections[mvm->cfg->nvm_hw_section_num].data;
         sw = (const __le16 *)sections[NVM_SECTION_TYPE_SW].data;
         calib = (const __le16 *)sections[NVM_SECTION_TYPE_CALIBRATION].data;
-        regulatory = (const __le16 *)sections[NVM_SECTION_TYPE_REGULATORY].data;
         mac_override =
                 (const __le16 *)sections[NVM_SECTION_TYPE_MAC_OVERRIDE].data;
         phy_sku = (const __le16 *)sections[NVM_SECTION_TYPE_PHY_SKU].data;
 
+        regulatory = mvm->trans->cfg->nvm_type == IWL_NVM_SDP ?
+                (const __le16 *)sections[NVM_SECTION_TYPE_REGULATORY_SDP].data :
+                (const __le16 *)sections[NVM_SECTION_TYPE_REGULATORY].data;
+
         lar_enabled = !iwlwifi_mod_params.lar_disable &&
                       fw_has_capa(&mvm->fw->ucode_capa,
                                   IWL_UCODE_TLV_CAPA_LAR_SUPPORT);
@@ -394,7 +403,7 @@ int iwl_mvm_read_external_nvm(struct iwl_mvm *mvm)
         IWL_DEBUG_EEPROM(mvm->trans->dev, "Read from external NVM\n");
 
         /* Maximal size depends on NVM version */
-        if (!mvm->trans->cfg->ext_nvm)
+        if (mvm->trans->cfg->nvm_type != IWL_NVM_EXT)
                 max_section_size = IWL_MAX_NVM_SECTION_SIZE;
         else
                 max_section_size = IWL_MAX_EXT_NVM_SECTION_SIZE;
@@ -465,7 +474,7 @@ int iwl_mvm_read_external_nvm(struct iwl_mvm *mvm)
                         break;
                 }
 
-                if (!mvm->trans->cfg->ext_nvm) {
+                if (mvm->trans->cfg->nvm_type != IWL_NVM_EXT) {
                         section_size =
                                 2 * NVM_WORD1_LEN(le16_to_cpu(file_sec->word1));
                         section_id = NVM_WORD2_ID(le16_to_cpu(file_sec->word2));
@@ -740,7 +749,7 @@ int iwl_mvm_init_mcc(struct iwl_mvm *mvm)
         struct ieee80211_regdomain *regd;
         char mcc[3];
 
-        if (mvm->cfg->ext_nvm) {
+        if (mvm->cfg->nvm_type == IWL_NVM_EXT) {
                 tlv_lar = fw_has_capa(&mvm->fw->ucode_capa,
                                       IWL_UCODE_TLV_CAPA_LAR_SUPPORT);
                 nvm_lar = mvm->nvm_data->lar_enabled;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index 184c749766f2..2d14a58cbdd7 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -244,7 +244,9 @@ static u32 iwl_mvm_set_mac80211_rx_flag(struct iwl_mvm *mvm,
                 return 0;
 
         default:
-                IWL_ERR(mvm, "Unhandled alg: 0x%x\n", rx_pkt_status);
+                /* Expected in monitor (not having the keys) */
+                if (!mvm->monitor_on)
+                        IWL_ERR(mvm, "Unhandled alg: 0x%x\n", rx_pkt_status);
         }
 
         return 0;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index 77f77bc5d083..248699c2c4bf 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -277,7 +277,9 @@ static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr,
                 stats->flag |= RX_FLAG_DECRYPTED;
                 return 0;
         default:
-                IWL_ERR(mvm, "Unhandled alg: 0x%x\n", status);
+                /* Expected in monitor (not having the keys) */
+                if (!mvm->monitor_on)
+                        IWL_ERR(mvm, "Unhandled alg: 0x%x\n", status);
         }
 
         return 0;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
index 4d907f60bce9..1232f63278eb 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
@@ -631,7 +631,7 @@ static int iwl_mvm_tzone_get_temp(struct thermal_zone_device *device,
 
         if (!iwl_mvm_firmware_running(mvm) ||
             mvm->fwrt.cur_fw_img != IWL_UCODE_REGULAR) {
-                ret = -EIO;
+                ret = -ENODATA;
                 goto out;
         }
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
index 4f73012978e9..1d431d4bf6d2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
@@ -1122,7 +1122,7 @@ static u8 _rtl8821ae_dbi_read(struct rtl_priv *rtlpriv, u16 addr)
         }
         if (0 == tmp) {
                 read_addr = REG_DBI_RDATA + addr % 4;
-                ret = rtl_read_byte(rtlpriv, read_addr);
+                ret = rtl_read_word(rtlpriv, read_addr);
         }
         return ret;
 }
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index ee8ed9da00ad..4491ca5aee90 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -486,7 +486,7 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
 
         dev->tx_queue_len = XENVIF_QUEUE_LENGTH;
 
-        dev->min_mtu = 0;
+        dev->min_mtu = ETH_MIN_MTU;
         dev->max_mtu = ETH_MAX_MTU - VLAN_ETH_HLEN;
 
         /*
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 523387e71a80..8b8689c6d887 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1316,7 +1316,7 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
         netdev->features |= netdev->hw_features;
 
         netdev->ethtool_ops = &xennet_ethtool_ops;
-        netdev->min_mtu = 0;
+        netdev->min_mtu = ETH_MIN_MTU;
         netdev->max_mtu = XEN_NETIF_MAX_TX_SIZE;
         SET_NETDEV_DEV(netdev, &dev->dev);
 
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index d94dd8b77abd..98258583abb0 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -44,7 +44,7 @@ static int of_get_phy_id(struct device_node *device, u32 *phy_id)
         return -EINVAL;
 }
 
-static void of_mdiobus_register_phy(struct mii_bus *mdio,
+static int of_mdiobus_register_phy(struct mii_bus *mdio,
                                     struct device_node *child, u32 addr)
 {
         struct phy_device *phy;
@@ -60,9 +60,13 @@ static void of_mdiobus_register_phy(struct mii_bus *mdio,
         else
                 phy = get_phy_device(mdio, addr, is_c45);
         if (IS_ERR(phy))
-                return;
+                return PTR_ERR(phy);
 
-        rc = irq_of_parse_and_map(child, 0);
+        rc = of_irq_get(child, 0);
+        if (rc == -EPROBE_DEFER) {
+                phy_device_free(phy);
+                return rc;
+        }
         if (rc > 0) {
                 phy->irq = rc;
                 mdio->irq[addr] = rc;
@@ -84,22 +88,23 @@ static void of_mdiobus_register_phy(struct mii_bus *mdio,
         if (rc) {
                 phy_device_free(phy);
                 of_node_put(child);
-                return;
+                return rc;
         }
 
         dev_dbg(&mdio->dev, "registered phy %s at address %i\n",
                 child->name, addr);
+        return 0;
 }
 
-static void of_mdiobus_register_device(struct mii_bus *mdio,
-                                       struct device_node *child, u32 addr)
+static int of_mdiobus_register_device(struct mii_bus *mdio,
+                                      struct device_node *child, u32 addr)
 {
         struct mdio_device *mdiodev;
         int rc;
 
         mdiodev = mdio_device_create(mdio, addr);
         if (IS_ERR(mdiodev))
-                return;
+                return PTR_ERR(mdiodev);
 
         /* Associate the OF node with the device structure so it
          * can be looked up later.
@@ -112,11 +117,12 @@ static void of_mdiobus_register_device(struct mii_bus *mdio,
         if (rc) {
                 mdio_device_free(mdiodev);
                 of_node_put(child);
-                return;
+                return rc;
         }
 
         dev_dbg(&mdio->dev, "registered mdio device %s at address %i\n",
                 child->name, addr);
+        return 0;
 }
 
 /* The following is a list of PHY compatible strings which appear in
@@ -219,9 +225,11 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                 }
 
                 if (of_mdiobus_child_is_phy(child))
-                        of_mdiobus_register_phy(mdio, child, addr);
+                        rc = of_mdiobus_register_phy(mdio, child, addr);
                 else
-                        of_mdiobus_register_device(mdio, child, addr);
+                        rc = of_mdiobus_register_device(mdio, child, addr);
+                if (rc)
+                        goto unregister;
         }
 
         if (!scanphys)
@@ -242,12 +250,19 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                         dev_info(&mdio->dev, "scan phy %s at address %i\n",
                                  child->name, addr);
 
-                        if (of_mdiobus_child_is_phy(child))
-                                of_mdiobus_register_phy(mdio, child, addr);
+                        if (of_mdiobus_child_is_phy(child)) {
+                                rc = of_mdiobus_register_phy(mdio, child, addr);
+                                if (rc)
+                                        goto unregister;
+                        }
                 }
         }
 
         return 0;
+
+unregister:
+        mdiobus_unregister(mdio);
+        return rc;
 }
 EXPORT_SYMBOL(of_mdiobus_register);
 
diff --git a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
index 73ebad6634a7..89c887ea5557 100644
--- a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
+++ b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c
@@ -111,6 +111,8 @@
 #define     MVEBU_COMPHY_CONF6_40B              BIT(18)
 #define MVEBU_COMPHY_SELECTOR                   0x1140
 #define     MVEBU_COMPHY_SELECTOR_PHY(n)        ((n) * 0x4)
+#define MVEBU_COMPHY_PIPE_SELECTOR              0x1144
+#define     MVEBU_COMPHY_PIPE_SELECTOR_PIPE(n)  ((n) * 0x4)
 
 #define MVEBU_COMPHY_LANES      6
 #define MVEBU_COMPHY_PORTS      3
@@ -468,13 +470,17 @@ static int mvebu_comphy_power_on(struct phy *phy)
 {
         struct mvebu_comphy_lane *lane = phy_get_drvdata(phy);
         struct mvebu_comphy_priv *priv = lane->priv;
-        int ret;
-        u32 mux, val;
+        int ret, mux;
+        u32 val;
 
         mux = mvebu_comphy_get_mux(lane->id, lane->port, lane->mode);
         if (mux < 0)
                 return -ENOTSUPP;
 
+        regmap_read(priv->regmap, MVEBU_COMPHY_PIPE_SELECTOR, &val);
+        val &= ~(0xf << MVEBU_COMPHY_PIPE_SELECTOR_PIPE(lane->id));
+        regmap_write(priv->regmap, MVEBU_COMPHY_PIPE_SELECTOR, val);
+
         regmap_read(priv->regmap, MVEBU_COMPHY_SELECTOR, &val);
         val &= ~(0xf << MVEBU_COMPHY_SELECTOR_PHY(lane->id));
         val |= mux << MVEBU_COMPHY_SELECTOR_PHY(lane->id);
@@ -526,6 +532,10 @@ static int mvebu_comphy_power_off(struct phy *phy)
         val &= ~(0xf << MVEBU_COMPHY_SELECTOR_PHY(lane->id));
         regmap_write(priv->regmap, MVEBU_COMPHY_SELECTOR, val);
 
+        regmap_read(priv->regmap, MVEBU_COMPHY_PIPE_SELECTOR, &val);
+        val &= ~(0xf << MVEBU_COMPHY_PIPE_SELECTOR_PIPE(lane->id));
+        regmap_write(priv->regmap, MVEBU_COMPHY_PIPE_SELECTOR, val);
+
         return 0;
 }
 
@@ -576,8 +586,8 @@ static int mvebu_comphy_probe(struct platform_device *pdev)
                 return PTR_ERR(priv->regmap);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         priv->base = devm_ioremap_resource(&pdev->dev, res);
-        if (!priv->base)
-                return -ENOMEM;
+        if (IS_ERR(priv->base))
+                return PTR_ERR(priv->base);
 
         for_each_available_child_of_node(pdev->dev.of_node, child) {
                 struct mvebu_comphy_lane *lane;
diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c
index e3baad78521f..721a2a1c97ef 100644
--- a/drivers/phy/mediatek/phy-mtk-tphy.c
+++ b/drivers/phy/mediatek/phy-mtk-tphy.c
@@ -27,6 +27,7 @@
 /* banks shared by multiple phys */
 #define SSUSB_SIFSLV_V1_SPLLC           0x000   /* shared by u3 phys */
 #define SSUSB_SIFSLV_V1_U2FREQ          0x100   /* shared by u2 phys */
+#define SSUSB_SIFSLV_V1_CHIP            0x300   /* shared by u3 phys */
 /* u2 phy bank */
 #define SSUSB_SIFSLV_V1_U2PHY_COM       0x000
 /* u3/pcie/sata phy banks */
@@ -762,7 +763,7 @@ static void phy_v1_banks_init(struct mtk_tphy *tphy,
         case PHY_TYPE_USB3:
         case PHY_TYPE_PCIE:
                 u3_banks->spllc = tphy->sif_base + SSUSB_SIFSLV_V1_SPLLC;
-                u3_banks->chip = NULL;
+                u3_banks->chip = tphy->sif_base + SSUSB_SIFSLV_V1_CHIP;
                 u3_banks->phyd = instance->port_base + SSUSB_SIFSLV_V1_U3PHYD;
                 u3_banks->phya = instance->port_base + SSUSB_SIFSLV_V1_U3PHYA;
                 break;
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
index 4d2c57f21d76..a958c9bced01 100644
--- a/drivers/phy/rockchip/phy-rockchip-typec.c
+++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -443,14 +443,34 @@ static inline int property_enable(struct rockchip_typec_phy *tcphy,
         return regmap_write(tcphy->grf_regs, reg->offset, val | mask);
 }
 
+static void tcphy_dp_aux_set_flip(struct rockchip_typec_phy *tcphy)
+{
+        u16 tx_ana_ctrl_reg_1;
+
+        /*
+         * Select the polarity of the xcvr:
+         * 1, Reverses the polarity (If TYPEC, Pulls ups aux_p and pull
+         * down aux_m)
+         * 0, Normal polarity (if TYPEC, pulls up aux_m and pulls down
+         * aux_p)
+         */
+        tx_ana_ctrl_reg_1 = readl(tcphy->base + TX_ANA_CTRL_REG_1);
+        if (!tcphy->flip)
+                tx_ana_ctrl_reg_1 |= BIT(12);
+        else
+                tx_ana_ctrl_reg_1 &= ~BIT(12);
+        writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
+}
+
 static void tcphy_dp_aux_calibration(struct rockchip_typec_phy *tcphy)
 {
+        u16 tx_ana_ctrl_reg_1;
         u16 rdata, rdata2, val;
 
         /* disable txda_cal_latch_en for rewrite the calibration values */
-        rdata = readl(tcphy->base + TX_ANA_CTRL_REG_1);
-        val = rdata & 0xdfff;
-        writel(val, tcphy->base + TX_ANA_CTRL_REG_1);
+        tx_ana_ctrl_reg_1 = readl(tcphy->base + TX_ANA_CTRL_REG_1);
+        tx_ana_ctrl_reg_1 &= ~BIT(13);
+        writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
 
         /*
          * read a resistor calibration code from CMN_TXPUCAL_CTRL[6:0] and
@@ -472,9 +492,8 @@ static void tcphy_dp_aux_calibration(struct rockchip_typec_phy *tcphy)
          * Activate this signal for 1 clock cycle to sample new calibration
          * values.
          */
-        rdata = readl(tcphy->base + TX_ANA_CTRL_REG_1);
-        val = rdata | 0x2000;
-        writel(val, tcphy->base + TX_ANA_CTRL_REG_1);
+        tx_ana_ctrl_reg_1 |= BIT(13);
+        writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
         usleep_range(150, 200);
 
         /* set TX Voltage Level and TX Deemphasis to 0 */
@@ -482,8 +501,10 @@ static void tcphy_dp_aux_calibration(struct rockchip_typec_phy *tcphy)
         /* re-enable decap */
         writel(0x100, tcphy->base + TX_ANA_CTRL_REG_2);
         writel(0x300, tcphy->base + TX_ANA_CTRL_REG_2);
-        writel(0x2008, tcphy->base + TX_ANA_CTRL_REG_1);
-        writel(0x2018, tcphy->base + TX_ANA_CTRL_REG_1);
+        tx_ana_ctrl_reg_1 |= BIT(3);
+        writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
+        tx_ana_ctrl_reg_1 |= BIT(4);
+        writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
 
         writel(0, tcphy->base + TX_ANA_CTRL_REG_5);
 
@@ -494,8 +515,10 @@ static void tcphy_dp_aux_calibration(struct rockchip_typec_phy *tcphy)
         writel(0x1001, tcphy->base + TX_ANA_CTRL_REG_4);
 
         /* re-enables Bandgap reference for LDO */
-        writel(0x2098, tcphy->base + TX_ANA_CTRL_REG_1);
-        writel(0x2198, tcphy->base + TX_ANA_CTRL_REG_1);
+        tx_ana_ctrl_reg_1 |= BIT(7);
+        writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
+        tx_ana_ctrl_reg_1 |= BIT(8);
+        writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
 
         /*
          * re-enables the transmitter pre-driver, driver data selection MUX,
@@ -505,27 +528,26 @@ static void tcphy_dp_aux_calibration(struct rockchip_typec_phy *tcphy)
         writel(0x303, tcphy->base + TX_ANA_CTRL_REG_2);
 
         /*
-         * BIT 12: Controls auxda_polarity, which selects the polarity of the
-         * xcvr:
-         * 1, Reverses the polarity (If TYPEC, Pulls ups aux_p and pull
-         * down aux_m)
-         * 0, Normal polarity (if TYPE_C, pulls up aux_m and pulls down
-         * aux_p)
+         * Do some magic undocumented stuff, some of which appears to
+         * undo the "re-enables Bandgap reference for LDO" above.
          */
-        val = 0xa078;
-        if (!tcphy->flip)
-                val |= BIT(12);
-        writel(val, tcphy->base + TX_ANA_CTRL_REG_1);
+        tx_ana_ctrl_reg_1 |=  BIT(15);
+        tx_ana_ctrl_reg_1 &= ~BIT(8);
+        tx_ana_ctrl_reg_1 &= ~BIT(7);
+        tx_ana_ctrl_reg_1 |=  BIT(6);
+        tx_ana_ctrl_reg_1 |=  BIT(5);
+        writel(tx_ana_ctrl_reg_1, tcphy->base + TX_ANA_CTRL_REG_1);
 
         writel(0, tcphy->base + TX_ANA_CTRL_REG_3);
         writel(0, tcphy->base + TX_ANA_CTRL_REG_4);
         writel(0, tcphy->base + TX_ANA_CTRL_REG_5);
 
         /*
-         * Controls low_power_swing_en, set the voltage swing of the driver
-         * to 400mv. The values below are peak to peak (differential) values.
+         * Controls low_power_swing_en, don't set the voltage swing of the
+         * driver to 400mv. The values below are peak to peak (differential)
+         * values.
          */
-        writel(4, tcphy->base + TXDA_COEFF_CALC_CTRL);
+        writel(0, tcphy->base + TXDA_COEFF_CALC_CTRL);
         writel(0, tcphy->base + TXDA_CYA_AUXDA_CYA);
 
         /* Controls tx_high_z_tm_en */
@@ -555,6 +577,7 @@ static int tcphy_phy_init(struct rockchip_typec_phy *tcphy, u8 mode)
         reset_control_deassert(tcphy->tcphy_rst);
 
         property_enable(tcphy, &cfg->typec_conn_dir, tcphy->flip);
+        tcphy_dp_aux_set_flip(tcphy);
 
         tcphy_cfg_24m(tcphy);
 
@@ -685,8 +708,11 @@ static int rockchip_usb3_phy_power_on(struct phy *phy)
         if (tcphy->mode == new_mode)
                 goto unlock_ret;
 
-        if (tcphy->mode == MODE_DISCONNECT)
-                tcphy_phy_init(tcphy, new_mode);
+        if (tcphy->mode == MODE_DISCONNECT) {
+                ret = tcphy_phy_init(tcphy, new_mode);
+                if (ret)
+                        goto unlock_ret;
+        }
 
         /* wait TCPHY for pipe ready */
         for (timeout = 0; timeout < 100; timeout++) {
@@ -760,10 +786,12 @@ static int rockchip_dp_phy_power_on(struct phy *phy)
          */
         if (new_mode == MODE_DFP_DP && tcphy->mode != MODE_DISCONNECT) {
                 tcphy_phy_deinit(tcphy);
-                tcphy_phy_init(tcphy, new_mode);
+                ret = tcphy_phy_init(tcphy, new_mode);
         } else if (tcphy->mode == MODE_DISCONNECT) {
-                tcphy_phy_init(tcphy, new_mode);
+                ret = tcphy_phy_init(tcphy, new_mode);
         }
+        if (ret)
+                goto unlock_ret;
 
         ret = readx_poll_timeout(readl, tcphy->base + DP_MODE_CTL,
                                  val, val & DP_MODE_A2, 1000,
diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
index 3cbcb2537657..4307bf0013e1 100644
--- a/drivers/phy/tegra/xusb.c
+++ b/drivers/phy/tegra/xusb.c
@@ -454,6 +454,8 @@ tegra_xusb_find_port_node(struct tegra_xusb_padctl *padctl, const char *type,
                 char *name;
 
                 name = kasprintf(GFP_KERNEL, "%s-%u", type, index);
+                if (!name)
+                        return ERR_PTR(-ENOMEM);
                 np = of_find_node_by_name(np, name);
                 kfree(name);
         }
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index bb1dcd7fbdeb..e8d058c5ef21 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -2510,7 +2510,6 @@ static const struct iio_chan_spec toshiba_iio_accel_channels[] = {
 };
 
 static const struct iio_info toshiba_iio_accel_info = {
-        .driver_module = THIS_MODULE,
         .read_raw = &toshiba_iio_accel_read_raw,
 };
 
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index c60904ff40b8..3907bbc9c6cf 100644
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -40,8 +40,9 @@ static int socfpga_reset_assert(struct reset_controller_dev *rcdev,
         struct socfpga_reset_data *data = container_of(rcdev,
                                                      struct socfpga_reset_data,
                                                      rcdev);
-        int bank = id / BITS_PER_LONG;
-        int offset = id % BITS_PER_LONG;
+        int reg_width = sizeof(u32);
+        int bank = id / (reg_width * BITS_PER_BYTE);
+        int offset = id % (reg_width * BITS_PER_BYTE);
         unsigned long flags;
         u32 reg;
 
@@ -61,8 +62,9 @@ static int socfpga_reset_deassert(struct reset_controller_dev *rcdev,
                                                      struct socfpga_reset_data,
                                                      rcdev);
 
-        int bank = id / BITS_PER_LONG;
-        int offset = id % BITS_PER_LONG;
+        int reg_width = sizeof(u32);
+        int bank = id / (reg_width * BITS_PER_BYTE);
+        int offset = id % (reg_width * BITS_PER_BYTE);
         unsigned long flags;
         u32 reg;
 
@@ -81,8 +83,9 @@ static int socfpga_reset_status(struct reset_controller_dev *rcdev,
 {
         struct socfpga_reset_data *data = container_of(rcdev,
                                                 struct socfpga_reset_data, rcdev);
-        int bank = id / BITS_PER_LONG;
-        int offset = id % BITS_PER_LONG;
+        int reg_width = sizeof(u32);
+        int bank = id / (reg_width * BITS_PER_BYTE);
+        int offset = id % (reg_width * BITS_PER_BYTE);
         u32 reg;
 
         reg = readl(data->membase + (bank * BANK_INCREMENT));
@@ -132,7 +135,7 @@ static int socfpga_reset_probe(struct platform_device *pdev)
         spin_lock_init(&data->lock);
 
         data->rcdev.owner = THIS_MODULE;
-        data->rcdev.nr_resets = NR_BANKS * BITS_PER_LONG;
+        data->rcdev.nr_resets = NR_BANKS * (sizeof(u32) * BITS_PER_BYTE);
         data->rcdev.ops = &socfpga_reset_ops;
         data->rcdev.of_node = pdev->dev.of_node;
 
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
index 520325867e2b..31d31aad3de1 100644
--- a/drivers/scsi/libfc/fc_rport.c
+++ b/drivers/scsi/libfc/fc_rport.c
@@ -383,11 +383,11 @@ static void fc_rport_work(struct work_struct *work)
                                 fc_rport_enter_flogi(rdata);
                                 mutex_unlock(&rdata->rp_mutex);
                         } else {
+                                mutex_unlock(&rdata->rp_mutex);
                                 FC_RPORT_DBG(rdata, "work delete\n");
                                 mutex_lock(&lport->disc.disc_mutex);
                                 list_del_rcu(&rdata->peers);
                                 mutex_unlock(&lport->disc.disc_mutex);
-                                mutex_unlock(&rdata->rp_mutex);
                                 kref_put(&rdata->kref, fc_rport_destroy);
                         }
                 } else {
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index c62e8d111fd9..f8dc1601efd5 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1728,7 +1728,7 @@ int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc)
 
         if (test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx)) {
                 reason = FAILURE_SESSION_IN_RECOVERY;
-                sc->result = DID_REQUEUE;
+                sc->result = DID_REQUEUE << 16;
                 goto fault;
         }
 
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 5b2437a5ea44..937209805baf 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3175,6 +3175,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
             host->can_queue, base_vha->req,
             base_vha->mgmt_svr_loop_id, host->sg_tablesize);
 
+        INIT_WORK(&base_vha->iocb_work, qla2x00_iocb_work_fn);
+
         if (ha->mqenable) {
                 bool mq = false;
                 bool startit = false;
@@ -3223,7 +3225,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
          */
         qla2xxx_wake_dpc(base_vha);
 
-        INIT_WORK(&base_vha->iocb_work, qla2x00_iocb_work_fn);
         INIT_WORK(&ha->board_disable, qla2x00_disable_board_on_pci_error);
 
         if (IS_QLA8031(ha) || IS_MCTP_CAPABLE(ha)) {
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index bf53356f41f0..f796bd61f3f0 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -1376,13 +1376,19 @@ static void __scsi_remove_target(struct scsi_target *starget)
         spin_lock_irqsave(shost->host_lock, flags);
  restart:
         list_for_each_entry(sdev, &shost->__devices, siblings) {
+                /*
+                 * We cannot call scsi_device_get() here, as
+                 * we might've been called from rmmod() causing
+                 * scsi_device_get() to fail the module_is_live()
+                 * check.
+                 */
                 if (sdev->channel != starget->channel ||
                     sdev->id != starget->id ||
-                    scsi_device_get(sdev))
+                    !get_device(&sdev->sdev_gendev))
                         continue;
                 spin_unlock_irqrestore(shost->host_lock, flags);
                 scsi_remove_device(sdev);
-                scsi_device_put(sdev);
+                put_device(&sdev->sdev_gendev);
                 spin_lock_irqsave(shost->host_lock, flags);
                 goto restart;
         }
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index cbd4495d0ff9..8c46a6d536af 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3320,6 +3320,9 @@ int fc_block_scsi_eh(struct scsi_cmnd *cmnd)
 {
         struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
 
+        if (WARN_ON_ONCE(!rport))
+                return FAST_IO_FAIL;
+
         return fc_block_rport(rport);
 }
 EXPORT_SYMBOL(fc_block_scsi_eh);
diff --git a/drivers/staging/android/TODO b/drivers/staging/android/TODO
index 5f14247392bf..687e0eac85bf 100644
--- a/drivers/staging/android/TODO
+++ b/drivers/staging/android/TODO
@@ -1,5 +1,4 @@
 TODO:
-        - checkpatch.pl cleanups
         - sparse fixes
         - rename files to be not so "generic"
         - add proper arch dependencies as needed
diff --git a/drivers/staging/android/ion/ion-ioctl.c b/drivers/staging/android/ion/ion-ioctl.c
index d9f8b1424da1..c78989351f9c 100644
--- a/drivers/staging/android/ion/ion-ioctl.c
+++ b/drivers/staging/android/ion/ion-ioctl.c
@@ -27,19 +27,18 @@ union ion_ioctl_arg {
 
 static int validate_ioctl_arg(unsigned int cmd, union ion_ioctl_arg *arg)
 {
-        int ret = 0;
-
         switch (cmd) {
         case ION_IOC_HEAP_QUERY:
-                ret = arg->query.reserved0 != 0;
-                ret |= arg->query.reserved1 != 0;
-                ret |= arg->query.reserved2 != 0;
+                if (arg->query.reserved0 ||
+                    arg->query.reserved1 ||
+                    arg->query.reserved2)
+                        return -EINVAL;
                 break;
         default:
                 break;
         }
 
-        return ret ? -EINVAL : 0;
+        return 0;
 }
 
 /* fix up the cases where the ioctl direction bits are incorrect */
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 93e2c90fa77d..a7d9b0e98572 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -81,7 +81,6 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
                                             unsigned long flags)
 {
         struct ion_buffer *buffer;
-        struct sg_table *table;
         int ret;
 
         buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
@@ -109,7 +108,6 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
                 goto err1;
         }
 
-        table = buffer->sg_table;
         buffer->dev = dev;
         buffer->size = len;
 
diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h
index 621e5f7ceacb..f5f9cd63f8e9 100644
--- a/drivers/staging/android/ion/ion.h
+++ b/drivers/staging/android/ion/ion.h
@@ -86,6 +86,7 @@ struct ion_buffer {
         struct sg_table *sg_table;
         struct list_head attachments;
 };
+
 void ion_buffer_destroy(struct ion_buffer *buffer);
 
 /**
@@ -299,7 +300,6 @@ size_t ion_heap_freelist_shrink(struct ion_heap *heap,
  */
 size_t ion_heap_freelist_size(struct ion_heap *heap);
 
-
 /**
  * functions for creating and destroying a heap pool -- allows you
  * to keep a pool of pre allocated memory to use from your heap.  Keeping
diff --git a/drivers/staging/ccree/cc_hal.h b/drivers/staging/ccree/cc_hal.h
deleted file mode 100644
index eecc866dfc74..000000000000
--- a/drivers/staging/ccree/cc_hal.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2012-2017 ARM Limited or its affiliates.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/* pseudo cc_hal.h for cc7x_perf_test_driver (to be able to include code from
- * CC drivers).
- */
-
-#ifndef __CC_HAL_H__
-#define __CC_HAL_H__
-
-#include <linux/io.h>
-
-#define READ_REGISTER(_addr) ioread32((_addr))
-#define WRITE_REGISTER(_addr, _data)  iowrite32((_data), (_addr))
-
-#define CC_HAL_WRITE_REGISTER(offset, val) \
-        WRITE_REGISTER(cc_base + (offset), val)
-#define CC_HAL_READ_REGISTER(offset) READ_REGISTER(cc_base + (offset))
-
-#endif
diff --git a/drivers/staging/ccree/cc_lli_defs.h b/drivers/staging/ccree/cc_lli_defs.h
index 851d3907167e..a9c417b07b04 100644
--- a/drivers/staging/ccree/cc_lli_defs.h
+++ b/drivers/staging/ccree/cc_lli_defs.h
@@ -59,7 +59,7 @@ static inline void cc_lli_set_addr(u32 *lli_p, dma_addr_t addr)
         lli_p[LLI_WORD0_OFFSET] = (addr & U32_MAX);
 #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
         lli_p[LLI_WORD1_OFFSET] &= ~LLI_HADDR_MASK;
-        lli_p[LLI_WORD1_OFFSET] |= FIELD_PREP(LLI_HADDR_MASK, (addr >> 16));
+        lli_p[LLI_WORD1_OFFSET] |= FIELD_PREP(LLI_HADDR_MASK, (addr >> 32));
 #endif /* CONFIG_ARCH_DMA_ADDR_T_64BIT */
 }
 
diff --git a/drivers/staging/ccree/cc_regs.h b/drivers/staging/ccree/cc_regs.h
deleted file mode 100644
index 4a893a6ba6ef..000000000000
--- a/drivers/staging/ccree/cc_regs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2012-2017 ARM Limited or its affiliates.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/*!
- * @file
- * @brief This file contains macro definitions for accessing ARM TrustZone
- *        CryptoCell register space.
- */
-
-#ifndef _CC_REGS_H_
-#define _CC_REGS_H_
-
-#include <linux/bitfield.h>
-
-#define AXIM_MON_BASE_OFFSET CC_REG_OFFSET(CRY_KERNEL, AXIM_MON_COMP)
-#define AXIM_MON_COMP_VALUE GENMASK(DX_AXIM_MON_COMP_VALUE_BIT_SIZE + \
-                DX_AXIM_MON_COMP_VALUE_BIT_SHIFT, \
-                DX_AXIM_MON_COMP_VALUE_BIT_SHIFT)
-
-#define AXIM_MON_BASE_OFFSET CC_REG_OFFSET(CRY_KERNEL, AXIM_MON_COMP)
-#define AXIM_MON_COMP_VALUE GENMASK(DX_AXIM_MON_COMP_VALUE_BIT_SIZE + \
-                DX_AXIM_MON_COMP_VALUE_BIT_SHIFT, \
-                DX_AXIM_MON_COMP_VALUE_BIT_SHIFT)
-
-/* Register Offset macro */
-#define CC_REG_OFFSET(unit_name, reg_name)               \
-        (DX_BASE_ ## unit_name + DX_ ## reg_name ## _REG_OFFSET)
-
-#endif /*_CC_REGS_H_*/
diff --git a/drivers/staging/ccree/dx_reg_base_host.h b/drivers/staging/ccree/dx_reg_base_host.h
deleted file mode 100644
index 47bbadbcd1df..000000000000
--- a/drivers/staging/ccree/dx_reg_base_host.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2012-2017 ARM Limited or its affiliates.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __DX_REG_BASE_HOST_H__
-#define __DX_REG_BASE_HOST_H__
-
-#define DX_BASE_CC 0x80000000
-#define DX_BASE_HOST_RGF 0x0UL
-#define DX_BASE_CRY_KERNEL     0x0UL
-#define DX_BASE_ROM     0x40000000
-
-#endif /*__DX_REG_BASE_HOST_H__*/
diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c
index 5abe6b24ff8c..ba0954e4d2e5 100644
--- a/drivers/staging/ccree/ssi_aead.c
+++ b/drivers/staging/ccree/ssi_aead.c
@@ -92,18 +92,17 @@ static inline bool valid_assoclen(struct aead_request *req)
 
 static void ssi_aead_exit(struct crypto_aead *tfm)
 {
-        struct device *dev = NULL;
         struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
-        SSI_LOG_DEBUG("Clearing context @%p for %s\n",
-                      crypto_aead_ctx(tfm), crypto_tfm_alg_name(&tfm->base));
+        dev_dbg(dev, "Clearing context @%p for %s\n", crypto_aead_ctx(tfm),
+                crypto_tfm_alg_name(&tfm->base));
 
-        dev = &ctx->drvdata->plat_dev->dev;
         /* Unmap enckey buffer */
         if (ctx->enckey) {
                 dma_free_coherent(dev, AES_MAX_KEY_SIZE, ctx->enckey, ctx->enckey_dma_addr);
-                SSI_LOG_DEBUG("Freed enckey DMA buffer enckey_dma_addr=%pad\n",
-                              ctx->enckey_dma_addr);
+                dev_dbg(dev, "Freed enckey DMA buffer enckey_dma_addr=%pad\n",
+                        &ctx->enckey_dma_addr);
                 ctx->enckey_dma_addr = 0;
                 ctx->enckey = NULL;
         }
@@ -116,8 +115,8 @@ static void ssi_aead_exit(struct crypto_aead *tfm)
                                           xcbc->xcbc_keys,
                                           xcbc->xcbc_keys_dma_addr);
                 }
-                SSI_LOG_DEBUG("Freed xcbc_keys DMA buffer xcbc_keys_dma_addr=%pad\n",
-                              xcbc->xcbc_keys_dma_addr);
+                dev_dbg(dev, "Freed xcbc_keys DMA buffer xcbc_keys_dma_addr=%pad\n",
+                        &xcbc->xcbc_keys_dma_addr);
                 xcbc->xcbc_keys_dma_addr = 0;
                 xcbc->xcbc_keys = NULL;
         } else if (ctx->auth_mode != DRV_HASH_NULL) { /* HMAC auth. */
@@ -127,8 +126,8 @@ static void ssi_aead_exit(struct crypto_aead *tfm)
                         dma_free_coherent(dev, 2 * MAX_HMAC_DIGEST_SIZE,
                                           hmac->ipad_opad,
                                           hmac->ipad_opad_dma_addr);
-                        SSI_LOG_DEBUG("Freed ipad_opad DMA buffer ipad_opad_dma_addr=%pad\n",
-                                      hmac->ipad_opad_dma_addr);
+                        dev_dbg(dev, "Freed ipad_opad DMA buffer ipad_opad_dma_addr=%pad\n",
+                                &hmac->ipad_opad_dma_addr);
                         hmac->ipad_opad_dma_addr = 0;
                         hmac->ipad_opad = NULL;
                 }
@@ -136,8 +135,8 @@ static void ssi_aead_exit(struct crypto_aead *tfm)
                         dma_free_coherent(dev, MAX_HMAC_BLOCK_SIZE,
                                           hmac->padded_authkey,
                                           hmac->padded_authkey_dma_addr);
-                        SSI_LOG_DEBUG("Freed padded_authkey DMA buffer padded_authkey_dma_addr=%pad\n",
-                                      hmac->padded_authkey_dma_addr);
+                        dev_dbg(dev, "Freed padded_authkey DMA buffer padded_authkey_dma_addr=%pad\n",
+                                &hmac->padded_authkey_dma_addr);
                         hmac->padded_authkey_dma_addr = 0;
                         hmac->padded_authkey = NULL;
                 }
@@ -146,29 +145,31 @@ static void ssi_aead_exit(struct crypto_aead *tfm)
 
 static int ssi_aead_init(struct crypto_aead *tfm)
 {
-        struct device *dev;
         struct aead_alg *alg = crypto_aead_alg(tfm);
         struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
         struct ssi_crypto_alg *ssi_alg =
                         container_of(alg, struct ssi_crypto_alg, aead_alg);
-        SSI_LOG_DEBUG("Initializing context @%p for %s\n", ctx, crypto_tfm_alg_name(&tfm->base));
+        struct device *dev = drvdata_to_dev(ssi_alg->drvdata);
+
+        dev_dbg(dev, "Initializing context @%p for %s\n", ctx,
+                crypto_tfm_alg_name(&tfm->base));
 
         /* Initialize modes in instance */
         ctx->cipher_mode = ssi_alg->cipher_mode;
         ctx->flow_mode = ssi_alg->flow_mode;
         ctx->auth_mode = ssi_alg->auth_mode;
         ctx->drvdata = ssi_alg->drvdata;
-        dev = &ctx->drvdata->plat_dev->dev;
         crypto_aead_set_reqsize(tfm, sizeof(struct aead_req_ctx));
 
         /* Allocate key buffer, cache line aligned */
         ctx->enckey = dma_alloc_coherent(dev, AES_MAX_KEY_SIZE,
                                          &ctx->enckey_dma_addr, GFP_KERNEL);
         if (!ctx->enckey) {
-                SSI_LOG_ERR("Failed allocating key buffer\n");
+                dev_err(dev, "Failed allocating key buffer\n");
                 goto init_failed;
         }
-        SSI_LOG_DEBUG("Allocated enckey buffer in context ctx->enckey=@%p\n", ctx->enckey);
+        dev_dbg(dev, "Allocated enckey buffer in context ctx->enckey=@%p\n",
+                ctx->enckey);
 
         /* Set default authlen value */
 
@@ -182,7 +183,7 @@ static int ssi_aead_init(struct crypto_aead *tfm)
                                                      &xcbc->xcbc_keys_dma_addr,
                                                      GFP_KERNEL);
                 if (!xcbc->xcbc_keys) {
-                        SSI_LOG_ERR("Failed allocating buffer for XCBC keys\n");
+                        dev_err(dev, "Failed allocating buffer for XCBC keys\n");
                         goto init_failed;
                 }
         } else if (ctx->auth_mode != DRV_HASH_NULL) { /* HMAC authentication */
@@ -196,12 +197,12 @@ static int ssi_aead_init(struct crypto_aead *tfm)
                                                      GFP_KERNEL);
 
                 if (!hmac->ipad_opad) {
-                        SSI_LOG_ERR("Failed allocating IPAD/OPAD buffer\n");
+                        dev_err(dev, "Failed allocating IPAD/OPAD buffer\n");
                         goto init_failed;
                 }
 
-                SSI_LOG_DEBUG("Allocated authkey buffer in context ctx->authkey=@%p\n",
-                              hmac->ipad_opad);
+                dev_dbg(dev, "Allocated authkey buffer in context ctx->authkey=@%p\n",
+                        hmac->ipad_opad);
 
                 hmac->padded_authkey = dma_alloc_coherent(dev,
                                                           MAX_HMAC_BLOCK_SIZE,
@@ -209,7 +210,7 @@ static int ssi_aead_init(struct crypto_aead *tfm)
                                                           GFP_KERNEL);
 
                 if (!hmac->padded_authkey) {
-                        SSI_LOG_ERR("failed to allocate padded_authkey\n");
+                        dev_err(dev, "failed to allocate padded_authkey\n");
                         goto init_failed;
                 }
         } else {
@@ -240,8 +241,7 @@ static void ssi_aead_complete(struct device *dev, void *ssi_req, void __iomem *c
         if (areq_ctx->gen_ctx.op_type == DRV_CRYPTO_DIRECTION_DECRYPT) {
                 if (memcmp(areq_ctx->mac_buf, areq_ctx->icv_virt_addr,
                            ctx->authsize) != 0) {
-                        SSI_LOG_DEBUG("Payload authentication failure, "
-                                "(auth-size=%d, cipher=%d).\n",
+                        dev_dbg(dev, "Payload authentication failure, (auth-size=%d, cipher=%d)\n",
                                 ctx->authsize, ctx->cipher_mode);
                         /* In case of payload authentication failure, MUST NOT
                          * revealed the decrypted message --> zero its memory.
@@ -252,8 +252,11 @@ static void ssi_aead_complete(struct device *dev, void *ssi_req, void __iomem *c
         } else { /*ENCRYPT*/
                 if (unlikely(areq_ctx->is_icv_fragmented))
                         ssi_buffer_mgr_copy_scatterlist_portion(
-                                areq_ctx->mac_buf, areq_ctx->dst_sgl, areq->cryptlen + areq_ctx->dst_offset,
-                                areq->cryptlen + areq_ctx->dst_offset + ctx->authsize, SSI_SG_FROM_BUF);
+                                dev, areq_ctx->mac_buf, areq_ctx->dst_sgl,
+                                areq->cryptlen + areq_ctx->dst_offset,
+                                (areq->cryptlen + areq_ctx->dst_offset +
+                                 ctx->authsize),
+                                SSI_SG_FROM_BUF);
 
                 /* If an IV was generated, copy it back to the user provided buffer. */
                 if (areq_ctx->backup_giv) {
@@ -377,8 +380,10 @@ static int hmac_setkey(struct cc_hw_desc *desc, struct ssi_aead_ctx *ctx)
 
 static int validate_keys_sizes(struct ssi_aead_ctx *ctx)
 {
-        SSI_LOG_DEBUG("enc_keylen=%u  authkeylen=%u\n",
-                      ctx->enc_keylen, ctx->auth_keylen);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
+
+        dev_dbg(dev, "enc_keylen=%u  authkeylen=%u\n",
+                ctx->enc_keylen, ctx->auth_keylen);
 
         switch (ctx->auth_mode) {
         case DRV_HASH_SHA1:
@@ -395,22 +400,22 @@ static int validate_keys_sizes(struct ssi_aead_ctx *ctx)
                         return -EINVAL;
                 break;
         default:
-                SSI_LOG_ERR("Invalid auth_mode=%d\n", ctx->auth_mode);
+                dev_err(dev, "Invalid auth_mode=%d\n", ctx->auth_mode);
                 return -EINVAL;
         }
         /* Check cipher key size */
         if (unlikely(ctx->flow_mode == S_DIN_to_DES)) {
                 if (ctx->enc_keylen != DES3_EDE_KEY_SIZE) {
-                        SSI_LOG_ERR("Invalid cipher(3DES) key size: %u\n",
-                                    ctx->enc_keylen);
+                        dev_err(dev, "Invalid cipher(3DES) key size: %u\n",
+                                ctx->enc_keylen);
                         return -EINVAL;
                 }
         } else { /* Default assumed to be AES ciphers */
                 if ((ctx->enc_keylen != AES_KEYSIZE_128) &&
                     (ctx->enc_keylen != AES_KEYSIZE_192) &&
                     (ctx->enc_keylen != AES_KEYSIZE_256)) {
-                        SSI_LOG_ERR("Invalid cipher(AES) key size: %u\n",
-                                    ctx->enc_keylen);
+                        dev_err(dev, "Invalid cipher(AES) key size: %u\n",
+                                ctx->enc_keylen);
                         return -EINVAL;
                 }
         }
@@ -426,7 +431,7 @@ ssi_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key, unsigned int keyl
 {
         dma_addr_t key_dma_addr = 0;
         struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         u32 larval_addr = ssi_ahash_get_larval_digest_sram_addr(
                                         ctx->drvdata, ctx->auth_mode);
         struct ssi_crypto_req ssi_req = {};
@@ -455,8 +460,8 @@ ssi_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key, unsigned int keyl
         if (likely(keylen != 0)) {
                 key_dma_addr = dma_map_single(dev, (void *)key, keylen, DMA_TO_DEVICE);
                 if (unlikely(dma_mapping_error(dev, key_dma_addr))) {
-                        SSI_LOG_ERR("Mapping key va=0x%p len=%u for"
-                                   " DMA failed\n", key, keylen);
+                        dev_err(dev, "Mapping key va=0x%p len=%u for DMA failed\n",
+                                key, keylen);
                         return -ENOMEM;
                 }
                 if (keylen > blocksize) {
@@ -534,7 +539,7 @@ ssi_get_plain_hmac_key(struct crypto_aead *tfm, const u8 *key, unsigned int keyl
 
         rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 0);
         if (unlikely(rc != 0))
-                SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                dev_err(dev, "send_request() failed (rc=%d)\n", rc);
 
         if (likely(key_dma_addr != 0))
                 dma_unmap_single(dev, key_dma_addr, keylen, DMA_TO_DEVICE);
@@ -551,10 +556,10 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen)
         struct crypto_authenc_key_param *param;
         struct cc_hw_desc desc[MAX_AEAD_SETKEY_SEQ];
         int seq_len = 0, rc = -EINVAL;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
-        SSI_LOG_DEBUG("Setting key in context @%p for %s. key=%p keylen=%u\n",
-                      ctx, crypto_tfm_alg_name(crypto_aead_tfm(tfm)),
-                      key, keylen);
+        dev_dbg(dev, "Setting key in context @%p for %s. key=%p keylen=%u\n",
+                ctx, crypto_tfm_alg_name(crypto_aead_tfm(tfm)), key, keylen);
 
         /* STAT_PHASE_0: Init and sanity checks */
 
@@ -622,7 +627,7 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen)
         case DRV_HASH_NULL: /* non-authenc modes, e.g., CCM */
                 break; /* No auth. key setup */
         default:
-                SSI_LOG_ERR("Unsupported authenc (%d)\n", ctx->auth_mode);
+                dev_err(dev, "Unsupported authenc (%d)\n", ctx->auth_mode);
                 rc = -ENOTSUPP;
                 goto badkey;
         }
@@ -632,7 +637,7 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen)
         if (seq_len > 0) { /* For CCM there is no sequence to setup the key */
                 rc = send_request(ctx->drvdata, &ssi_req, desc, seq_len, 0);
                 if (unlikely(rc != 0)) {
-                        SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                        dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                         goto setkey_error;
                 }
         }
@@ -651,7 +656,6 @@ setkey_error:
 static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen)
 {
         struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
-        int rc = 0;
 
         if (keylen < 3)
                 return -EINVAL;
@@ -659,9 +663,7 @@ static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, unsign
         keylen -= 3;
         memcpy(ctx->ctr_nonce, key + keylen, 3);
 
-        rc = ssi_aead_setkey(tfm, key, keylen);
-
-        return rc;
+        return ssi_aead_setkey(tfm, key, keylen);
 }
 #endif /*SSI_CC_HAS_AES_CCM*/
 
@@ -670,6 +672,7 @@ static int ssi_aead_setauthsize(
         unsigned int authsize)
 {
         struct ssi_aead_ctx *ctx = crypto_aead_ctx(authenc);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
         /* Unsupported auth. sizes */
         if ((authsize == 0) ||
@@ -678,7 +681,7 @@ static int ssi_aead_setauthsize(
         }
 
         ctx->authsize = authsize;
-        SSI_LOG_DEBUG("authlen=%d\n", ctx->authsize);
+        dev_dbg(dev, "authlen=%d\n", ctx->authsize);
 
         return 0;
 }
@@ -731,10 +734,11 @@ ssi_aead_create_assoc_desc(
         struct aead_req_ctx *areq_ctx = aead_request_ctx(areq);
         enum ssi_req_dma_buf_type assoc_dma_type = areq_ctx->assoc_buff_type;
         unsigned int idx = *seq_size;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
         switch (assoc_dma_type) {
         case SSI_DMA_BUF_DLLI:
-                SSI_LOG_DEBUG("ASSOC buffer type DLLI\n");
+                dev_dbg(dev, "ASSOC buffer type DLLI\n");
                 hw_desc_init(&desc[idx]);
                 set_din_type(&desc[idx], DMA_DLLI, sg_dma_address(areq->src),
                              areq->assoclen, NS_BIT); set_flow_mode(&desc[idx],
@@ -744,7 +748,7 @@ ssi_aead_create_assoc_desc(
                         set_din_not_last_indication(&desc[idx]);
                 break;
         case SSI_DMA_BUF_MLLI:
-                SSI_LOG_DEBUG("ASSOC buffer type MLLI\n");
+                dev_dbg(dev, "ASSOC buffer type MLLI\n");
                 hw_desc_init(&desc[idx]);
                 set_din_type(&desc[idx], DMA_MLLI, areq_ctx->assoc.sram_addr,
                              areq_ctx->assoc.mlli_nents, NS_BIT);
@@ -755,7 +759,7 @@ ssi_aead_create_assoc_desc(
                 break;
         case SSI_DMA_BUF_NULL:
         default:
-                SSI_LOG_ERR("Invalid ASSOC buffer type\n");
+                dev_err(dev, "Invalid ASSOC buffer type\n");
         }
 
         *seq_size = (++idx);
@@ -772,6 +776,9 @@ ssi_aead_process_authenc_data_desc(
         struct aead_req_ctx *areq_ctx = aead_request_ctx(areq);
         enum ssi_req_dma_buf_type data_dma_type = areq_ctx->data_buff_type;
         unsigned int idx = *seq_size;
+        struct crypto_aead *tfm = crypto_aead_reqtfm(areq);
+        struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
         switch (data_dma_type) {
         case SSI_DMA_BUF_DLLI:
@@ -783,7 +790,7 @@ ssi_aead_process_authenc_data_desc(
                 unsigned int offset =
                         (direct == DRV_CRYPTO_DIRECTION_ENCRYPT) ?
                         areq_ctx->dst_offset : areq_ctx->src_offset;
-                SSI_LOG_DEBUG("AUTHENC: SRC/DST buffer type DLLI\n");
+                dev_dbg(dev, "AUTHENC: SRC/DST buffer type DLLI\n");
                 hw_desc_init(&desc[idx]);
                 set_din_type(&desc[idx], DMA_DLLI,
                              (sg_dma_address(cipher) + offset),
@@ -810,7 +817,7 @@ ssi_aead_process_authenc_data_desc(
                         }
                 }
 
-                SSI_LOG_DEBUG("AUTHENC: SRC/DST buffer type MLLI\n");
+                dev_dbg(dev, "AUTHENC: SRC/DST buffer type MLLI\n");
                 hw_desc_init(&desc[idx]);
                 set_din_type(&desc[idx], DMA_MLLI, mlli_addr, mlli_nents,
                              NS_BIT);
@@ -819,7 +826,7 @@ ssi_aead_process_authenc_data_desc(
         }
         case SSI_DMA_BUF_NULL:
         default:
-                SSI_LOG_ERR("AUTHENC: Invalid SRC/DST buffer type\n");
+                dev_err(dev, "AUTHENC: Invalid SRC/DST buffer type\n");
         }
 
         *seq_size = (++idx);
@@ -835,13 +842,16 @@ ssi_aead_process_cipher_data_desc(
         unsigned int idx = *seq_size;
         struct aead_req_ctx *areq_ctx = aead_request_ctx(areq);
         enum ssi_req_dma_buf_type data_dma_type = areq_ctx->data_buff_type;
+        struct crypto_aead *tfm = crypto_aead_reqtfm(areq);
+        struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
         if (areq_ctx->cryptlen == 0)
                 return; /*null processing*/
 
         switch (data_dma_type) {
         case SSI_DMA_BUF_DLLI:
-                SSI_LOG_DEBUG("CIPHER: SRC/DST buffer type DLLI\n");
+                dev_dbg(dev, "CIPHER: SRC/DST buffer type DLLI\n");
                 hw_desc_init(&desc[idx]);
                 set_din_type(&desc[idx], DMA_DLLI,
                              (sg_dma_address(areq_ctx->src_sgl) +
@@ -853,7 +863,7 @@ ssi_aead_process_cipher_data_desc(
                 set_flow_mode(&desc[idx], flow_mode);
                 break;
         case SSI_DMA_BUF_MLLI:
-                SSI_LOG_DEBUG("CIPHER: SRC/DST buffer type MLLI\n");
+                dev_dbg(dev, "CIPHER: SRC/DST buffer type MLLI\n");
                 hw_desc_init(&desc[idx]);
                 set_din_type(&desc[idx], DMA_MLLI, areq_ctx->src.sram_addr,
                              areq_ctx->src.mlli_nents, NS_BIT);
@@ -863,7 +873,7 @@ ssi_aead_process_cipher_data_desc(
                 break;
         case SSI_DMA_BUF_NULL:
         default:
-                SSI_LOG_ERR("CIPHER: Invalid SRC/DST buffer type\n");
+                dev_err(dev, "CIPHER: Invalid SRC/DST buffer type\n");
         }
 
         *seq_size = (++idx);
@@ -1178,14 +1188,15 @@ static inline void ssi_aead_load_mlli_to_sram(
         struct aead_req_ctx *req_ctx = aead_request_ctx(req);
         struct crypto_aead *tfm = crypto_aead_reqtfm(req);
         struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
         if (unlikely(
                 (req_ctx->assoc_buff_type == SSI_DMA_BUF_MLLI) ||
                 (req_ctx->data_buff_type == SSI_DMA_BUF_MLLI) ||
                 !req_ctx->is_single_pass)) {
-                SSI_LOG_DEBUG("Copy-to-sram: mlli_dma=%08x, mlli_size=%u\n",
-                              (unsigned int)ctx->drvdata->mlli_sram_addr,
-                              req_ctx->mlli_params.mlli_len);
+                dev_dbg(dev, "Copy-to-sram: mlli_dma=%08x, mlli_size=%u\n",
+                        (unsigned int)ctx->drvdata->mlli_sram_addr,
+                        req_ctx->mlli_params.mlli_len);
                 /* Copy MLLI table host-to-sram */
                 hw_desc_init(&desc[*seq_size]);
                 set_din_type(&desc[*seq_size], DMA_DLLI,
@@ -1333,6 +1344,7 @@ static int validate_data_size(struct ssi_aead_ctx *ctx,
                               struct aead_request *req)
 {
         struct aead_req_ctx *areq_ctx = aead_request_ctx(req);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         unsigned int assoclen = req->assoclen;
         unsigned int cipherlen = (direct == DRV_CRYPTO_DIRECTION_DECRYPT) ?
                         (req->cryptlen - ctx->authsize) : req->cryptlen;
@@ -1371,7 +1383,7 @@ static int validate_data_size(struct ssi_aead_ctx *ctx,
                         areq_ctx->is_single_pass = false;
                 break;
         default:
-                SSI_LOG_ERR("Unexpected flow mode (%d)\n", ctx->flow_mode);
+                dev_err(dev, "Unexpected flow mode (%d)\n", ctx->flow_mode);
                 goto data_size_err;
         }
 
@@ -1554,6 +1566,7 @@ static int config_ccm_adata(struct aead_request *req)
 {
         struct crypto_aead *tfm = crypto_aead_reqtfm(req);
         struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         struct aead_req_ctx *req_ctx = aead_request_ctx(req);
         //unsigned int size_of_a = 0, rem_a_size = 0;
         unsigned int lp = req->iv[0];
@@ -1575,7 +1588,7 @@ static int config_ccm_adata(struct aead_request *req)
         /* taken from crypto/ccm.c */
         /* 2 <= L <= 8, so 1 <= L' <= 7. */
         if (l < 2 || l > 8) {
-                SSI_LOG_ERR("illegal iv value %X\n", req->iv[0]);
+                dev_err(dev, "illegal iv value %X\n", req->iv[0]);
                 return -EINVAL;
         }
         memcpy(b0, req->iv, AES_BLOCK_SIZE);
@@ -1588,8 +1601,10 @@ static int config_ccm_adata(struct aead_request *req)
                 *b0 |= 64;  /* Enable bit 6 if Adata exists. */
 
         rc = set_msg_len(b0 + 16 - l, cryptlen, l);  /* Write L'. */
-        if (rc != 0)
+        if (rc != 0) {
+                dev_err(dev, "message len overflow detected");
                 return rc;
+        }
          /* END of "taken from crypto/ccm.c" */
 
         /* l(a) - size of associated data. */
@@ -1812,7 +1827,6 @@ static inline int ssi_aead_gcm(
         unsigned int *seq_size)
 {
         struct aead_req_ctx *req_ctx = aead_request_ctx(req);
-        unsigned int idx = *seq_size;
         unsigned int cipher_flow_mode;
 
         if (req_ctx->gen_ctx.op_type == DRV_CRYPTO_DIRECTION_DECRYPT) {
@@ -1829,7 +1843,6 @@ static inline int ssi_aead_gcm(
                 ssi_aead_create_assoc_desc(req, DIN_HASH, desc, seq_size);
                 ssi_aead_gcm_setup_gctr_desc(req, desc, seq_size);
                 ssi_aead_process_gcm_result_desc(req, desc, seq_size);
-                idx = *seq_size;
                 return 0;
         }
 
@@ -1844,7 +1857,6 @@ static inline int ssi_aead_gcm(
                 ssi_aead_process_cipher_data_desc(req, cipher_flow_mode, desc, seq_size);
         ssi_aead_process_gcm_result_desc(req, desc, seq_size);
 
-        idx = *seq_size;
         return 0;
 }
 
@@ -1861,13 +1873,13 @@ static inline void ssi_aead_dump_gcm(
                 return;
 
         if (title) {
-                SSI_LOG_DEBUG("----------------------------------------------------------------------------------");
-                SSI_LOG_DEBUG("%s\n", title);
+                dev_dbg(dev, "----------------------------------------------------------------------------------");
+                dev_dbg(dev, "%s\n", title);
         }
 
-        SSI_LOG_DEBUG("cipher_mode %d, authsize %d, enc_keylen %d, assoclen %d, cryptlen %d\n",
-                      ctx->cipher_mode, ctx->authsize, ctx->enc_keylen,
-                      req->assoclen, req_ctx->cryptlen);
+        dev_dbg(dev, "cipher_mode %d, authsize %d, enc_keylen %d, assoclen %d, cryptlen %d\n",
+                ctx->cipher_mode, ctx->authsize, ctx->enc_keylen,
+                req->assoclen, req_ctx->cryptlen);
 
         if (ctx->enckey)
                 dump_byte_array("mac key", ctx->enckey, 16);
@@ -1897,6 +1909,7 @@ static int config_gcm_context(struct aead_request *req)
         struct crypto_aead *tfm = crypto_aead_reqtfm(req);
         struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
         struct aead_req_ctx *req_ctx = aead_request_ctx(req);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
         unsigned int cryptlen = (req_ctx->gen_ctx.op_type ==
                                  DRV_CRYPTO_DIRECTION_ENCRYPT) ?
@@ -1904,7 +1917,8 @@ static int config_gcm_context(struct aead_request *req)
                                 (req->cryptlen - ctx->authsize);
         __be32 counter = cpu_to_be32(2);
 
-        SSI_LOG_DEBUG("%s() cryptlen = %d, req->assoclen = %d ctx->authsize = %d\n", __func__, cryptlen, req->assoclen, ctx->authsize);
+        dev_dbg(dev, "%s() cryptlen = %d, req->assoclen = %d ctx->authsize = %d\n",
+                __func__, cryptlen, req->assoclen, ctx->authsize);
 
         memset(req_ctx->hkey, 0, AES_BLOCK_SIZE);
 
@@ -1958,20 +1972,20 @@ static int ssi_aead_process(struct aead_request *req, enum drv_crypto_direction
         struct crypto_aead *tfm = crypto_aead_reqtfm(req);
         struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
         struct aead_req_ctx *areq_ctx = aead_request_ctx(req);
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         struct ssi_crypto_req ssi_req = {};
 
-        SSI_LOG_DEBUG("%s context=%p req=%p iv=%p src=%p src_ofs=%d dst=%p dst_ofs=%d cryptolen=%d\n",
-                      ((direct == DRV_CRYPTO_DIRECTION_ENCRYPT) ? "Encrypt" : "Decrypt"),
-                      ctx, req, req->iv, sg_virt(req->src), req->src->offset,
-                      sg_virt(req->dst), req->dst->offset, req->cryptlen);
+        dev_dbg(dev, "%s context=%p req=%p iv=%p src=%p src_ofs=%d dst=%p dst_ofs=%d cryptolen=%d\n",
+                ((direct == DRV_CRYPTO_DIRECTION_ENCRYPT) ? "Enc" : "Dec"),
+                ctx, req, req->iv, sg_virt(req->src), req->src->offset,
+                sg_virt(req->dst), req->dst->offset, req->cryptlen);
 
         /* STAT_PHASE_0: Init and sanity checks */
 
         /* Check data length according to mode */
         if (unlikely(validate_data_size(ctx, direct, req) != 0)) {
-                SSI_LOG_ERR("Unsupported crypt/assoc len %d/%d.\n",
-                            req->cryptlen, req->assoclen);
+                dev_err(dev, "Unsupported crypt/assoc len %d/%d.\n",
+                        req->cryptlen, req->assoclen);
                 crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_BLOCK_LEN);
                 return -EINVAL;
         }
@@ -2017,7 +2031,8 @@ static int ssi_aead_process(struct aead_request *req, enum drv_crypto_direction
         if (ctx->cipher_mode == DRV_CIPHER_CCM) {
                 rc = config_ccm_adata(req);
                 if (unlikely(rc != 0)) {
-                        SSI_LOG_ERR("config_ccm_adata() returned with a failure %d!", rc);
+                        dev_dbg(dev, "config_ccm_adata() returned with a failure %d!",
+                                rc);
                         goto exit;
                 }
         } else {
@@ -2031,7 +2046,8 @@ static int ssi_aead_process(struct aead_request *req, enum drv_crypto_direction
         if (ctx->cipher_mode == DRV_CIPHER_GCTR) {
                 rc = config_gcm_context(req);
                 if (unlikely(rc != 0)) {
-                        SSI_LOG_ERR("config_gcm_context() returned with a failure %d!", rc);
+                        dev_dbg(dev, "config_gcm_context() returned with a failure %d!",
+                                rc);
                         goto exit;
                 }
         }
@@ -2039,7 +2055,7 @@ static int ssi_aead_process(struct aead_request *req, enum drv_crypto_direction
 
         rc = ssi_buffer_mgr_map_aead_request(ctx->drvdata, req);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("map_request() failed\n");
+                dev_err(dev, "map_request() failed\n");
                 goto exit;
         }
 
@@ -2095,7 +2111,7 @@ static int ssi_aead_process(struct aead_request *req, enum drv_crypto_direction
                         break;
 #endif
         default:
-                SSI_LOG_ERR("Unsupported authenc (%d)\n", ctx->auth_mode);
+                dev_err(dev, "Unsupported authenc (%d)\n", ctx->auth_mode);
                 ssi_buffer_mgr_unmap_aead_request(dev, req);
                 rc = -ENOTSUPP;
                 goto exit;
@@ -2106,7 +2122,7 @@ static int ssi_aead_process(struct aead_request *req, enum drv_crypto_direction
         rc = send_request(ctx->drvdata, &ssi_req, desc, seq_len, 1);
 
         if (unlikely(rc != -EINPROGRESS)) {
-                SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                 ssi_buffer_mgr_unmap_aead_request(dev, req);
         }
 
@@ -2139,10 +2155,13 @@ static int ssi_rfc4309_ccm_encrypt(struct aead_request *req)
         /* Very similar to ssi_aead_encrypt() above. */
 
         struct aead_req_ctx *areq_ctx = aead_request_ctx(req);
+        struct crypto_aead *tfm = crypto_aead_reqtfm(req);
+        struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         int rc = -EINVAL;
 
         if (!valid_assoclen(req)) {
-                SSI_LOG_ERR("invalid Assoclen:%u\n", req->assoclen);
+                dev_err(dev, "invalid Assoclen:%u\n", req->assoclen);
                 goto out;
         }
 
@@ -2183,13 +2202,14 @@ static int ssi_aead_decrypt(struct aead_request *req)
 #if SSI_CC_HAS_AES_CCM
 static int ssi_rfc4309_ccm_decrypt(struct aead_request *req)
 {
-        /* Very similar to ssi_aead_decrypt() above. */
-
+        struct crypto_aead *tfm = crypto_aead_reqtfm(req);
+        struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         struct aead_req_ctx *areq_ctx = aead_request_ctx(req);
         int rc = -EINVAL;
 
         if (!valid_assoclen(req)) {
-                SSI_LOG_ERR("invalid Assoclen:%u\n", req->assoclen);
+                dev_err(dev, "invalid Assoclen:%u\n", req->assoclen);
                 goto out;
         }
 
@@ -2214,9 +2234,9 @@ out:
 static int ssi_rfc4106_gcm_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen)
 {
         struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
-        int rc = 0;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
-        SSI_LOG_DEBUG("%s()  keylen %d, key %p\n", __func__, keylen, key);
+        dev_dbg(dev, "%s()  keylen %d, key %p\n", __func__, keylen, key);
 
         if (keylen < 4)
                 return -EINVAL;
@@ -2224,17 +2244,15 @@ static int ssi_rfc4106_gcm_setkey(struct crypto_aead *tfm, const u8 *key, unsign
         keylen -= 4;
         memcpy(ctx->ctr_nonce, key + keylen, 4);
 
-        rc = ssi_aead_setkey(tfm, key, keylen);
-
-        return rc;
+        return ssi_aead_setkey(tfm, key, keylen);
 }
 
 static int ssi_rfc4543_gcm_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen)
 {
         struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
-        int rc = 0;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
-        SSI_LOG_DEBUG("%s()  keylen %d, key %p\n", __func__, keylen, key);
+        dev_dbg(dev, "%s()  keylen %d, key %p\n", __func__, keylen, key);
 
         if (keylen < 4)
                 return -EINVAL;
@@ -2242,9 +2260,7 @@ static int ssi_rfc4543_gcm_setkey(struct crypto_aead *tfm, const u8 *key, unsign
         keylen -= 4;
         memcpy(ctx->ctr_nonce, key + keylen, 4);
 
-        rc = ssi_aead_setkey(tfm, key, keylen);
-
-        return rc;
+        return ssi_aead_setkey(tfm, key, keylen);
 }
 
 static int ssi_gcm_setauthsize(struct crypto_aead *authenc,
@@ -2269,7 +2285,10 @@ static int ssi_gcm_setauthsize(struct crypto_aead *authenc,
 static int ssi_rfc4106_gcm_setauthsize(struct crypto_aead *authenc,
                                        unsigned int authsize)
 {
-        SSI_LOG_DEBUG("authsize %d\n", authsize);
+        struct ssi_aead_ctx *ctx = crypto_aead_ctx(authenc);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
+
+        dev_dbg(dev, "authsize %d\n", authsize);
 
         switch (authsize) {
         case 8:
@@ -2286,7 +2305,10 @@ static int ssi_rfc4106_gcm_setauthsize(struct crypto_aead *authenc,
 static int ssi_rfc4543_gcm_setauthsize(struct crypto_aead *authenc,
                                        unsigned int authsize)
 {
-        SSI_LOG_DEBUG("authsize %d\n", authsize);
+        struct ssi_aead_ctx *ctx = crypto_aead_ctx(authenc);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
+
+        dev_dbg(dev, "authsize %d\n", authsize);
 
         if (authsize != 16)
                 return -EINVAL;
@@ -2298,11 +2320,14 @@ static int ssi_rfc4106_gcm_encrypt(struct aead_request *req)
 {
         /* Very similar to ssi_aead_encrypt() above. */
 
+        struct crypto_aead *tfm = crypto_aead_reqtfm(req);
+        struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         struct aead_req_ctx *areq_ctx = aead_request_ctx(req);
         int rc = -EINVAL;
 
         if (!valid_assoclen(req)) {
-                SSI_LOG_ERR("invalid Assoclen:%u\n", req->assoclen);
+                dev_err(dev, "invalid Assoclen:%u\n", req->assoclen);
                 goto out;
         }
 
@@ -2350,11 +2375,14 @@ static int ssi_rfc4106_gcm_decrypt(struct aead_request *req)
 {
         /* Very similar to ssi_aead_decrypt() above. */
 
+        struct crypto_aead *tfm = crypto_aead_reqtfm(req);
+        struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         struct aead_req_ctx *areq_ctx = aead_request_ctx(req);
         int rc = -EINVAL;
 
         if (!valid_assoclen(req)) {
-                SSI_LOG_ERR("invalid Assoclen:%u\n", req->assoclen);
+                dev_err(dev, "invalid Assoclen:%u\n", req->assoclen);
                 goto out;
         }
 
@@ -2654,16 +2682,17 @@ static struct ssi_alg_template aead_algs[] = {
 #endif /*SSI_CC_HAS_AES_GCM*/
 };
 
-static struct ssi_crypto_alg *ssi_aead_create_alg(struct ssi_alg_template *template)
+static struct ssi_crypto_alg *ssi_aead_create_alg(
+                        struct ssi_alg_template *template,
+                        struct device *dev)
 {
         struct ssi_crypto_alg *t_alg;
         struct aead_alg *alg;
 
         t_alg = kzalloc(sizeof(*t_alg), GFP_KERNEL);
-        if (!t_alg) {
-                SSI_LOG_ERR("failed to allocate t_alg\n");
+        if (!t_alg)
                 return ERR_PTR(-ENOMEM);
-        }
+
         alg = &template->template_aead;
 
         snprintf(alg->base.cra_name, CRYPTO_MAX_ALG_NAME, "%s", template->name);
@@ -2713,6 +2742,7 @@ int ssi_aead_alloc(struct ssi_drvdata *drvdata)
         struct ssi_crypto_alg *t_alg;
         int rc = -ENOMEM;
         int alg;
+        struct device *dev = drvdata_to_dev(drvdata);
 
         aead_handle = kmalloc(sizeof(*aead_handle), GFP_KERNEL);
         if (!aead_handle) {
@@ -2720,36 +2750,36 @@ int ssi_aead_alloc(struct ssi_drvdata *drvdata)
                 goto fail0;
         }
 
+        INIT_LIST_HEAD(&aead_handle->aead_list);
         drvdata->aead_handle = aead_handle;
 
         aead_handle->sram_workspace_addr = ssi_sram_mgr_alloc(
                 drvdata, MAX_HMAC_DIGEST_SIZE);
         if (aead_handle->sram_workspace_addr == NULL_SRAM_ADDR) {
-                SSI_LOG_ERR("SRAM pool exhausted\n");
+                dev_err(dev, "SRAM pool exhausted\n");
                 rc = -ENOMEM;
                 goto fail1;
         }
 
-        INIT_LIST_HEAD(&aead_handle->aead_list);
-
         /* Linux crypto */
         for (alg = 0; alg < ARRAY_SIZE(aead_algs); alg++) {
-                t_alg = ssi_aead_create_alg(&aead_algs[alg]);
+                t_alg = ssi_aead_create_alg(&aead_algs[alg], dev);
                 if (IS_ERR(t_alg)) {
                         rc = PTR_ERR(t_alg);
-                        SSI_LOG_ERR("%s alg allocation failed\n",
-                                    aead_algs[alg].driver_name);
+                        dev_err(dev, "%s alg allocation failed\n",
+                                aead_algs[alg].driver_name);
                         goto fail1;
                 }
                 t_alg->drvdata = drvdata;
                 rc = crypto_register_aead(&t_alg->aead_alg);
                 if (unlikely(rc != 0)) {
-                        SSI_LOG_ERR("%s alg registration failed\n",
-                                    t_alg->aead_alg.base.cra_driver_name);
+                        dev_err(dev, "%s alg registration failed\n",
+                                t_alg->aead_alg.base.cra_driver_name);
                         goto fail2;
                 } else {
                         list_add_tail(&t_alg->entry, &aead_handle->aead_list);
-                        SSI_LOG_DEBUG("Registered %s\n", t_alg->aead_alg.base.cra_driver_name);
+                        dev_dbg(dev, "Registered %s\n",
+                                t_alg->aead_alg.base.cra_driver_name);
                 }
         }
 
diff --git a/drivers/staging/ccree/ssi_buffer_mgr.c b/drivers/staging/ccree/ssi_buffer_mgr.c
index 63936091d524..1f8a225530a8 100644
--- a/drivers/staging/ccree/ssi_buffer_mgr.c
+++ b/drivers/staging/ccree/ssi_buffer_mgr.c
@@ -33,14 +33,10 @@
 #include "ssi_hash.h"
 #include "ssi_aead.h"
 
-#ifdef CC_DEBUG
 #define GET_DMA_BUFFER_TYPE(buff_type) ( \
         ((buff_type) == SSI_DMA_BUF_NULL) ? "BUF_NULL" : \
         ((buff_type) == SSI_DMA_BUF_DLLI) ? "BUF_DLLI" : \
         ((buff_type) == SSI_DMA_BUF_MLLI) ? "BUF_MLLI" : "BUF_INVALID")
-#else
-#define GET_DMA_BUFFER_TYPE(buff_type)
-#endif
 
 enum dma_buffer_type {
         DMA_NULL_TYPE = -1,
@@ -76,16 +72,12 @@ struct buffer_array {
  * @lbytes: [OUT] Returns the amount of bytes at the last entry
  */
 static unsigned int ssi_buffer_mgr_get_sgl_nents(
-        struct scatterlist *sg_list, unsigned int nbytes, u32 *lbytes, bool *is_chained)
+        struct device *dev, struct scatterlist *sg_list,
+        unsigned int nbytes, u32 *lbytes, bool *is_chained)
 {
         unsigned int nents = 0;
 
         while (nbytes != 0) {
-                if (sg_is_chain(sg_list)) {
-                        SSI_LOG_ERR("Unexpected chained entry "
-                                   "in sg (entry =0x%X)\n", nents);
-                        BUG();
-                }
                 if (sg_list->length != 0) {
                         nents++;
                         /* get the number of bytes in the last entry */
@@ -98,7 +90,7 @@ static unsigned int ssi_buffer_mgr_get_sgl_nents(
                                 *is_chained = true;
                 }
         }
-        SSI_LOG_DEBUG("nents %d last bytes %d\n", nents, *lbytes);
+        dev_dbg(dev, "nents %d last bytes %d\n", nents, *lbytes);
         return nents;
 }
 
@@ -134,20 +126,20 @@ void ssi_buffer_mgr_zero_sgl(struct scatterlist *sgl, u32 data_len)
  * @direct:
  */
 void ssi_buffer_mgr_copy_scatterlist_portion(
-        u8 *dest, struct scatterlist *sg,
-        u32 to_skip,  u32 end,
-        enum ssi_sg_cpy_direct direct)
+        struct device *dev, u8 *dest,
+        struct scatterlist *sg, u32 to_skip,
+        u32 end, enum ssi_sg_cpy_direct direct)
 {
         u32 nents, lbytes;
 
-        nents = ssi_buffer_mgr_get_sgl_nents(sg, end, &lbytes, NULL);
+        nents = ssi_buffer_mgr_get_sgl_nents(dev, sg, end, &lbytes, NULL);
         sg_copy_buffer(sg, nents, (void *)dest, (end - to_skip + 1), to_skip,
                        (direct == SSI_SG_TO_BUF));
 }
 
 static inline int ssi_buffer_mgr_render_buff_to_mlli(
-        dma_addr_t buff_dma, u32 buff_size, u32 *curr_nents,
-        u32 **mlli_entry_pp)
+        struct device *dev, dma_addr_t buff_dma, u32 buff_size,
+        u32 *curr_nents, u32 **mlli_entry_pp)
 {
         u32 *mlli_entry_p = *mlli_entry_pp;
         u32 new_nents;
@@ -161,9 +153,9 @@ static inline int ssi_buffer_mgr_render_buff_to_mlli(
         while (buff_size > CC_MAX_MLLI_ENTRY_SIZE) {
                 cc_lli_set_addr(mlli_entry_p, buff_dma);
                 cc_lli_set_size(mlli_entry_p, CC_MAX_MLLI_ENTRY_SIZE);
-                SSI_LOG_DEBUG("entry[%d]: single_buff=0x%08X size=%08X\n", *curr_nents,
-                              mlli_entry_p[LLI_WORD0_OFFSET],
-                              mlli_entry_p[LLI_WORD1_OFFSET]);
+                dev_dbg(dev, "entry[%d]: single_buff=0x%08X size=%08X\n",
+                        *curr_nents, mlli_entry_p[LLI_WORD0_OFFSET],
+                        mlli_entry_p[LLI_WORD1_OFFSET]);
                 buff_dma += CC_MAX_MLLI_ENTRY_SIZE;
                 buff_size -= CC_MAX_MLLI_ENTRY_SIZE;
                 mlli_entry_p = mlli_entry_p + 2;
@@ -172,9 +164,9 @@ static inline int ssi_buffer_mgr_render_buff_to_mlli(
         /*Last entry */
         cc_lli_set_addr(mlli_entry_p, buff_dma);
         cc_lli_set_size(mlli_entry_p, buff_size);
-        SSI_LOG_DEBUG("entry[%d]: single_buff=0x%08X size=%08X\n", *curr_nents,
-                      mlli_entry_p[LLI_WORD0_OFFSET],
-                      mlli_entry_p[LLI_WORD1_OFFSET]);
+        dev_dbg(dev, "entry[%d]: single_buff=0x%08X size=%08X\n",
+                *curr_nents, mlli_entry_p[LLI_WORD0_OFFSET],
+                mlli_entry_p[LLI_WORD1_OFFSET]);
         mlli_entry_p = mlli_entry_p + 2;
         *mlli_entry_pp = mlli_entry_p;
         (*curr_nents)++;
@@ -182,8 +174,9 @@ static inline int ssi_buffer_mgr_render_buff_to_mlli(
 }
 
 static inline int ssi_buffer_mgr_render_scatterlist_to_mlli(
-        struct scatterlist *sgl, u32 sgl_data_len, u32 sgl_offset,
-        u32 *curr_nents, u32 **mlli_entry_pp)
+        struct device *dev, struct scatterlist *sgl,
+        u32 sgl_data_len, u32 sgl_offset, u32 *curr_nents,
+        u32 **mlli_entry_pp)
 {
         struct scatterlist *curr_sgl = sgl;
         u32 *mlli_entry_p = *mlli_entry_pp;
@@ -197,8 +190,8 @@ static inline int ssi_buffer_mgr_render_scatterlist_to_mlli(
                                 sgl_data_len;
                 sgl_data_len -= entry_data_len;
                 rc = ssi_buffer_mgr_render_buff_to_mlli(
-                        sg_dma_address(curr_sgl) + sgl_offset, entry_data_len,
-                        curr_nents, &mlli_entry_p);
+                        dev, sg_dma_address(curr_sgl) + sgl_offset,
+                        entry_data_len, curr_nents, &mlli_entry_p);
                 if (rc != 0)
                         return rc;
 
@@ -217,14 +210,14 @@ static int ssi_buffer_mgr_generate_mlli(
         u32 total_nents = 0, prev_total_nents = 0;
         int rc = 0, i;
 
-        SSI_LOG_DEBUG("NUM of SG's = %d\n", sg_data->num_of_buffers);
+        dev_dbg(dev, "NUM of SG's = %d\n", sg_data->num_of_buffers);
 
         /* Allocate memory from the pointed pool */
         mlli_params->mlli_virt_addr = dma_pool_alloc(
                         mlli_params->curr_pool, GFP_KERNEL,
                         &mlli_params->mlli_dma_addr);
         if (unlikely(!mlli_params->mlli_virt_addr)) {
-                SSI_LOG_ERR("dma_pool_alloc() failed\n");
+                dev_err(dev, "dma_pool_alloc() failed\n");
                 rc = -ENOMEM;
                 goto build_mlli_exit;
         }
@@ -234,12 +227,12 @@ static int ssi_buffer_mgr_generate_mlli(
         for (i = 0; i < sg_data->num_of_buffers; i++) {
                 if (sg_data->type[i] == DMA_SGL_TYPE)
                         rc = ssi_buffer_mgr_render_scatterlist_to_mlli(
-                                sg_data->entry[i].sgl,
-                                sg_data->total_data_len[i], sg_data->offset[i], &total_nents,
-                                &mlli_p);
+                                dev, sg_data->entry[i].sgl,
+                                sg_data->total_data_len[i], sg_data->offset[i],
+                                &total_nents, &mlli_p);
                 else /*DMA_BUFF_TYPE*/
                         rc = ssi_buffer_mgr_render_buff_to_mlli(
-                                sg_data->entry[i].buffer_dma,
+                                dev, sg_data->entry[i].buffer_dma,
                                 sg_data->total_data_len[i], &total_nents,
                                 &mlli_p);
                 if (rc != 0)
@@ -259,26 +252,23 @@ static int ssi_buffer_mgr_generate_mlli(
         /* Set MLLI size for the bypass operation */
         mlli_params->mlli_len = (total_nents * LLI_ENTRY_BYTE_SIZE);
 
-        SSI_LOG_DEBUG("MLLI params: "
-                     "virt_addr=%pK dma_addr=%pad mlli_len=0x%X\n",
-                   mlli_params->mlli_virt_addr,
-                   mlli_params->mlli_dma_addr,
-                   mlli_params->mlli_len);
+        dev_dbg(dev, "MLLI params: virt_addr=%pK dma_addr=%pad mlli_len=0x%X\n",
+                mlli_params->mlli_virt_addr, &mlli_params->mlli_dma_addr,
+                mlli_params->mlli_len);
 
 build_mlli_exit:
         return rc;
 }
 
 static inline void ssi_buffer_mgr_add_buffer_entry(
-        struct buffer_array *sgl_data,
+        struct device *dev, struct buffer_array *sgl_data,
         dma_addr_t buffer_dma, unsigned int buffer_len,
         bool is_last_entry, u32 *mlli_nents)
 {
         unsigned int index = sgl_data->num_of_buffers;
 
-        SSI_LOG_DEBUG("index=%u single_buff=%pad "
-                     "buffer_len=0x%08X is_last=%d\n",
-                     index, buffer_dma, buffer_len, is_last_entry);
+        dev_dbg(dev, "index=%u single_buff=%pad buffer_len=0x%08X is_last=%d\n",
+                index, &buffer_dma, buffer_len, is_last_entry);
         sgl_data->nents[index] = 1;
         sgl_data->entry[index].buffer_dma = buffer_dma;
         sgl_data->offset[index] = 0;
@@ -292,6 +282,7 @@ static inline void ssi_buffer_mgr_add_buffer_entry(
 }
 
 static inline void ssi_buffer_mgr_add_scatterlist_entry(
+        struct device *dev,
         struct buffer_array *sgl_data,
         unsigned int nents,
         struct scatterlist *sgl,
@@ -302,8 +293,8 @@ static inline void ssi_buffer_mgr_add_scatterlist_entry(
 {
         unsigned int index = sgl_data->num_of_buffers;
 
-        SSI_LOG_DEBUG("index=%u nents=%u sgl=%pK data_len=0x%08X is_last=%d\n",
-                      index, nents, sgl, data_len, is_last_table);
+        dev_dbg(dev, "index=%u nents=%u sgl=%pK data_len=0x%08X is_last=%d\n",
+                index, nents, sgl, data_len, is_last_table);
         sgl_data->nents[index] = nents;
         sgl_data->entry[index].sgl = sgl;
         sgl_data->offset[index] = data_offset;
@@ -327,7 +318,7 @@ ssi_buffer_mgr_dma_map_sg(struct device *dev, struct scatterlist *sg, u32 nents,
                 if (!l_sg)
                         break;
                 if (unlikely(dma_map_sg(dev, l_sg, 1, direction) != 1)) {
-                        SSI_LOG_ERR("dma_map_page() sg buffer failed\n");
+                        dev_err(dev, "dma_map_page() sg buffer failed\n");
                         goto err;
                 }
                 l_sg = sg_next(l_sg);
@@ -356,26 +347,22 @@ static int ssi_buffer_mgr_map_scatterlist(
         if (sg_is_last(sg)) {
                 /* One entry only case -set to DLLI */
                 if (unlikely(dma_map_sg(dev, sg, 1, direction) != 1)) {
-                        SSI_LOG_ERR("dma_map_sg() single buffer failed\n");
+                        dev_err(dev, "dma_map_sg() single buffer failed\n");
                         return -ENOMEM;
                 }
-                SSI_LOG_DEBUG("Mapped sg: dma_address=%pad "
-                             "page=%p addr=%pK offset=%u "
-                             "length=%u\n",
-                             sg_dma_address(sg),
-                             sg_page(sg),
-                             sg_virt(sg),
-                             sg->offset, sg->length);
+                dev_dbg(dev, "Mapped sg: dma_address=%pad page=%p addr=%pK offset=%u length=%u\n",
+                        &sg_dma_address(sg), sg_page(sg), sg_virt(sg),
+                        sg->offset, sg->length);
                 *lbytes = nbytes;
                 *nents = 1;
                 *mapped_nents = 1;
         } else {  /*sg_is_last*/
-                *nents = ssi_buffer_mgr_get_sgl_nents(sg, nbytes, lbytes,
+                *nents = ssi_buffer_mgr_get_sgl_nents(dev, sg, nbytes, lbytes,
                                                       &is_chained);
                 if (*nents > max_sg_nents) {
                         *nents = 0;
-                        SSI_LOG_ERR("Too many fragments. current %d max %d\n",
-                                    *nents, max_sg_nents);
+                        dev_err(dev, "Too many fragments. current %d max %d\n",
+                                *nents, max_sg_nents);
                         return -ENOMEM;
                 }
                 if (!is_chained) {
@@ -385,7 +372,7 @@ static int ssi_buffer_mgr_map_scatterlist(
                         *mapped_nents = dma_map_sg(dev, sg, *nents, direction);
                         if (unlikely(*mapped_nents == 0)) {
                                 *nents = 0;
-                                SSI_LOG_ERR("dma_map_sg() sg buffer failed\n");
+                                dev_err(dev, "dma_map_sg() sg buffer failed\n");
                                 return -ENOMEM;
                         }
                 } else {
@@ -398,7 +385,7 @@ static int ssi_buffer_mgr_map_scatterlist(
                                                                   direction);
                         if (unlikely(*mapped_nents != *nents)) {
                                 *nents = *mapped_nents;
-                                SSI_LOG_ERR("dma_map_sg() sg buffer failed\n");
+                                dev_err(dev, "dma_map_sg() sg buffer failed\n");
                                 return -ENOMEM;
                         }
                 }
@@ -414,26 +401,22 @@ ssi_aead_handle_config_buf(struct device *dev,
                            struct buffer_array *sg_data,
                            unsigned int assoclen)
 {
-        SSI_LOG_DEBUG(" handle additional data config set to   DLLI\n");
+        dev_dbg(dev, " handle additional data config set to DLLI\n");
         /* create sg for the current buffer */
         sg_init_one(&areq_ctx->ccm_adata_sg, config_data, AES_BLOCK_SIZE + areq_ctx->ccm_hdr_size);
         if (unlikely(dma_map_sg(dev, &areq_ctx->ccm_adata_sg, 1,
                                 DMA_TO_DEVICE) != 1)) {
-                        SSI_LOG_ERR("dma_map_sg() "
-                           "config buffer failed\n");
-                        return -ENOMEM;
+                dev_err(dev, "dma_map_sg() config buffer failed\n");
+                return -ENOMEM;
         }
-        SSI_LOG_DEBUG("Mapped curr_buff: dma_address=%pad "
-                     "page=%p addr=%pK "
-                     "offset=%u length=%u\n",
-                     sg_dma_address(&areq_ctx->ccm_adata_sg),
-                     sg_page(&areq_ctx->ccm_adata_sg),
-                     sg_virt(&areq_ctx->ccm_adata_sg),
-                     areq_ctx->ccm_adata_sg.offset,
-                     areq_ctx->ccm_adata_sg.length);
+        dev_dbg(dev, "Mapped curr_buff: dma_address=%pad page=%p addr=%pK offset=%u length=%u\n",
+                &sg_dma_address(&areq_ctx->ccm_adata_sg),
+                sg_page(&areq_ctx->ccm_adata_sg),
+                sg_virt(&areq_ctx->ccm_adata_sg),
+                areq_ctx->ccm_adata_sg.offset, areq_ctx->ccm_adata_sg.length);
         /* prepare for case of MLLI */
         if (assoclen > 0) {
-                ssi_buffer_mgr_add_scatterlist_entry(sg_data, 1,
+                ssi_buffer_mgr_add_scatterlist_entry(dev, sg_data, 1,
                                                      &areq_ctx->ccm_adata_sg,
                                                      (AES_BLOCK_SIZE + areq_ctx->ccm_hdr_size),
                                                      0, false, NULL);
@@ -447,28 +430,23 @@ static inline int ssi_ahash_handle_curr_buf(struct device *dev,
                                             u32 curr_buff_cnt,
                                             struct buffer_array *sg_data)
 {
-        SSI_LOG_DEBUG(" handle curr buff %x set to   DLLI\n", curr_buff_cnt);
+        dev_dbg(dev, " handle curr buff %x set to   DLLI\n", curr_buff_cnt);
         /* create sg for the current buffer */
         sg_init_one(areq_ctx->buff_sg, curr_buff, curr_buff_cnt);
         if (unlikely(dma_map_sg(dev, areq_ctx->buff_sg, 1,
                                 DMA_TO_DEVICE) != 1)) {
-                        SSI_LOG_ERR("dma_map_sg() "
-                           "src buffer failed\n");
-                        return -ENOMEM;
+                dev_err(dev, "dma_map_sg() src buffer failed\n");
+                return -ENOMEM;
         }
-        SSI_LOG_DEBUG("Mapped curr_buff: dma_address=%pad "
-                     "page=%p addr=%pK "
-                     "offset=%u length=%u\n",
-                     sg_dma_address(areq_ctx->buff_sg),
-                     sg_page(areq_ctx->buff_sg),
-                     sg_virt(areq_ctx->buff_sg),
-                     areq_ctx->buff_sg->offset,
-                     areq_ctx->buff_sg->length);
+        dev_dbg(dev, "Mapped curr_buff: dma_address=%pad page=%p addr=%pK offset=%u length=%u\n",
+                &sg_dma_address(areq_ctx->buff_sg), sg_page(areq_ctx->buff_sg),
+                sg_virt(areq_ctx->buff_sg), areq_ctx->buff_sg->offset,
+                areq_ctx->buff_sg->length);
         areq_ctx->data_dma_buf_type = SSI_DMA_BUF_DLLI;
         areq_ctx->curr_sg = areq_ctx->buff_sg;
         areq_ctx->in_nents = 0;
         /* prepare for case of MLLI */
-        ssi_buffer_mgr_add_scatterlist_entry(sg_data, 1, areq_ctx->buff_sg,
+        ssi_buffer_mgr_add_scatterlist_entry(dev, sg_data, 1, areq_ctx->buff_sg,
                                              curr_buff_cnt, 0, false, NULL);
         return 0;
 }
@@ -483,9 +461,8 @@ void ssi_buffer_mgr_unmap_blkcipher_request(
         struct blkcipher_req_ctx *req_ctx = (struct blkcipher_req_ctx *)ctx;
 
         if (likely(req_ctx->gen_ctx.iv_dma_addr != 0)) {
-                SSI_LOG_DEBUG("Unmapped iv: iv_dma_addr=%pad iv_size=%u\n",
-                              req_ctx->gen_ctx.iv_dma_addr,
-                              ivsize);
+                dev_dbg(dev, "Unmapped iv: iv_dma_addr=%pad iv_size=%u\n",
+                        &req_ctx->gen_ctx.iv_dma_addr, ivsize);
                 dma_unmap_single(dev, req_ctx->gen_ctx.iv_dma_addr,
                                  ivsize,
                                  req_ctx->is_giv ? DMA_BIDIRECTIONAL :
@@ -499,11 +476,11 @@ void ssi_buffer_mgr_unmap_blkcipher_request(
         }
 
         dma_unmap_sg(dev, src, req_ctx->in_nents, DMA_BIDIRECTIONAL);
-        SSI_LOG_DEBUG("Unmapped req->src=%pK\n", sg_virt(src));
+        dev_dbg(dev, "Unmapped req->src=%pK\n", sg_virt(src));
 
         if (src != dst) {
                 dma_unmap_sg(dev, dst, req_ctx->out_nents, DMA_BIDIRECTIONAL);
-                SSI_LOG_DEBUG("Unmapped req->dst=%pK\n", sg_virt(dst));
+                dev_dbg(dev, "Unmapped req->dst=%pK\n", sg_virt(dst));
         }
 }
 
@@ -519,7 +496,7 @@ int ssi_buffer_mgr_map_blkcipher_request(
         struct blkcipher_req_ctx *req_ctx = (struct blkcipher_req_ctx *)ctx;
         struct mlli_params *mlli_params = &req_ctx->mlli_params;
         struct buff_mgr_handle *buff_mgr = drvdata->buff_mgr_handle;
-        struct device *dev = &drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(drvdata);
         struct buffer_array sg_data;
         u32 dummy = 0;
         int rc = 0;
@@ -539,13 +516,12 @@ int ssi_buffer_mgr_map_blkcipher_request(
                                        DMA_TO_DEVICE);
                 if (unlikely(dma_mapping_error(dev,
                                                req_ctx->gen_ctx.iv_dma_addr))) {
-                        SSI_LOG_ERR("Mapping iv %u B at va=%pK "
-                                   "for DMA failed\n", ivsize, info);
+                        dev_err(dev, "Mapping iv %u B at va=%pK for DMA failed\n",
+                                ivsize, info);
                         return -ENOMEM;
                 }
-                SSI_LOG_DEBUG("Mapped iv %u B at va=%pK to dma=%pad\n",
-                              ivsize, info,
-                              req_ctx->gen_ctx.iv_dma_addr);
+                dev_dbg(dev, "Mapped iv %u B at va=%pK to dma=%pad\n",
+                        ivsize, info, &req_ctx->gen_ctx.iv_dma_addr);
         } else {
                 req_ctx->gen_ctx.iv_dma_addr = 0;
         }
@@ -567,7 +543,7 @@ int ssi_buffer_mgr_map_blkcipher_request(
                 /* Handle inplace operation */
                 if (unlikely(req_ctx->dma_buf_type == SSI_DMA_BUF_MLLI)) {
                         req_ctx->out_nents = 0;
-                        ssi_buffer_mgr_add_scatterlist_entry(&sg_data,
+                        ssi_buffer_mgr_add_scatterlist_entry(dev, &sg_data,
                                                              req_ctx->in_nents,
                                                              src, nbytes, 0,
                                                              true,
@@ -587,12 +563,12 @@ int ssi_buffer_mgr_map_blkcipher_request(
                         req_ctx->dma_buf_type = SSI_DMA_BUF_MLLI;
 
                 if (unlikely((req_ctx->dma_buf_type == SSI_DMA_BUF_MLLI))) {
-                        ssi_buffer_mgr_add_scatterlist_entry(&sg_data,
+                        ssi_buffer_mgr_add_scatterlist_entry(dev, &sg_data,
                                                              req_ctx->in_nents,
                                                              src, nbytes, 0,
                                                              true,
                                                              &req_ctx->in_mlli_nents);
-                        ssi_buffer_mgr_add_scatterlist_entry(&sg_data,
+                        ssi_buffer_mgr_add_scatterlist_entry(dev, &sg_data,
                                                              req_ctx->out_nents,
                                                              dst, nbytes, 0,
                                                              true,
@@ -607,8 +583,8 @@ int ssi_buffer_mgr_map_blkcipher_request(
                         goto ablkcipher_exit;
         }
 
-        SSI_LOG_DEBUG("areq_ctx->dma_buf_type = %s\n",
-                      GET_DMA_BUFFER_TYPE(req_ctx->dma_buf_type));
+        dev_dbg(dev, "areq_ctx->dma_buf_type = %s\n",
+                GET_DMA_BUFFER_TYPE(req_ctx->dma_buf_type));
 
         return 0;
 
@@ -674,30 +650,34 @@ void ssi_buffer_mgr_unmap_aead_request(
          *allocated and should be released
          */
         if (areq_ctx->mlli_params.curr_pool) {
-                SSI_LOG_DEBUG("free MLLI buffer: dma=%pad virt=%pK\n",
-                              areq_ctx->mlli_params.mlli_dma_addr,
-                              areq_ctx->mlli_params.mlli_virt_addr);
+                dev_dbg(dev, "free MLLI buffer: dma=%pad virt=%pK\n",
+                        &areq_ctx->mlli_params.mlli_dma_addr,
+                        areq_ctx->mlli_params.mlli_virt_addr);
                 dma_pool_free(areq_ctx->mlli_params.curr_pool,
                               areq_ctx->mlli_params.mlli_virt_addr,
                               areq_ctx->mlli_params.mlli_dma_addr);
         }
 
-        SSI_LOG_DEBUG("Unmapping src sgl: req->src=%pK areq_ctx->src.nents=%u areq_ctx->assoc.nents=%u assoclen:%u cryptlen=%u\n", sg_virt(req->src), areq_ctx->src.nents, areq_ctx->assoc.nents, req->assoclen, req->cryptlen);
+        dev_dbg(dev, "Unmapping src sgl: req->src=%pK areq_ctx->src.nents=%u areq_ctx->assoc.nents=%u assoclen:%u cryptlen=%u\n",
+                sg_virt(req->src), areq_ctx->src.nents, areq_ctx->assoc.nents,
+                req->assoclen, req->cryptlen);
         size_to_unmap = req->assoclen + req->cryptlen;
         if (areq_ctx->gen_ctx.op_type == DRV_CRYPTO_DIRECTION_ENCRYPT)
                 size_to_unmap += areq_ctx->req_authsize;
         if (areq_ctx->is_gcm4543)
                 size_to_unmap += crypto_aead_ivsize(tfm);
 
-        dma_unmap_sg(dev, req->src, ssi_buffer_mgr_get_sgl_nents(req->src, size_to_unmap, &dummy, &chained), DMA_BIDIRECTIONAL);
+        dma_unmap_sg(dev, req->src,
+                     ssi_buffer_mgr_get_sgl_nents(dev, req->src, size_to_unmap,
+                                                  &dummy, &chained),
+                     DMA_BIDIRECTIONAL);
         if (unlikely(req->src != req->dst)) {
-                SSI_LOG_DEBUG("Unmapping dst sgl: req->dst=%pK\n",
-                              sg_virt(req->dst));
+                dev_dbg(dev, "Unmapping dst sgl: req->dst=%pK\n",
+                        sg_virt(req->dst));
                 dma_unmap_sg(dev, req->dst,
-                             ssi_buffer_mgr_get_sgl_nents(req->dst,
+                             ssi_buffer_mgr_get_sgl_nents(dev, req->dst,
                                                           size_to_unmap,
-                                                          &dummy,
-                                                          &chained),
+                                                          &dummy, &chained),
                              DMA_BIDIRECTIONAL);
         }
         if (drvdata->coherent &&
@@ -712,13 +692,14 @@ void ssi_buffer_mgr_unmap_aead_request(
                  * data memory overriding that caused by cache coherence problem.
                  */
                 ssi_buffer_mgr_copy_scatterlist_portion(
-                        areq_ctx->backup_mac, req->src,
+                        dev, areq_ctx->backup_mac, req->src,
                         size_to_skip + req->cryptlen - areq_ctx->req_authsize,
                         size_to_skip + req->cryptlen, SSI_SG_FROM_BUF);
         }
 }
 
 static inline int ssi_buffer_mgr_get_aead_icv_nents(
+        struct device *dev,
         struct scatterlist *sgl,
         unsigned int sgl_nents,
         unsigned int authsize,
@@ -757,12 +738,12 @@ static inline int ssi_buffer_mgr_get_aead_icv_nents(
                 nents = 2;
                 *is_icv_fragmented = true;
         } else {
-                SSI_LOG_ERR("Unsupported num. of ICV fragments (> %d)\n",
-                            MAX_ICV_NENTS_SUPPORTED);
+                dev_err(dev, "Unsupported num. of ICV fragments (> %d)\n",
+                        MAX_ICV_NENTS_SUPPORTED);
                 nents = -1; /*unsupported*/
         }
-        SSI_LOG_DEBUG("is_frag=%s icv_nents=%u\n",
-                      (*is_icv_fragmented ? "true" : "false"), nents);
+        dev_dbg(dev, "is_frag=%s icv_nents=%u\n",
+                (*is_icv_fragmented ? "true" : "false"), nents);
 
         return nents;
 }
@@ -775,7 +756,7 @@ static inline int ssi_buffer_mgr_aead_chain_iv(
 {
         struct aead_req_ctx *areq_ctx = aead_request_ctx(req);
         unsigned int hw_iv_size = areq_ctx->hw_iv_size;
-        struct device *dev = &drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(drvdata);
         int rc = 0;
 
         if (unlikely(!req->iv)) {
@@ -786,22 +767,22 @@ static inline int ssi_buffer_mgr_aead_chain_iv(
         areq_ctx->gen_ctx.iv_dma_addr = dma_map_single(dev, req->iv, hw_iv_size,
                                                        DMA_BIDIRECTIONAL);
         if (unlikely(dma_mapping_error(dev, areq_ctx->gen_ctx.iv_dma_addr))) {
-                SSI_LOG_ERR("Mapping iv %u B at va=%pK for DMA failed\n",
-                            hw_iv_size, req->iv);
+                dev_err(dev, "Mapping iv %u B at va=%pK for DMA failed\n",
+                        hw_iv_size, req->iv);
                 rc = -ENOMEM;
                 goto chain_iv_exit;
         }
 
-        SSI_LOG_DEBUG("Mapped iv %u B at va=%pK to dma=%pad\n",
-                      hw_iv_size, req->iv,
-                      areq_ctx->gen_ctx.iv_dma_addr);
+        dev_dbg(dev, "Mapped iv %u B at va=%pK to dma=%pad\n",
+                hw_iv_size, req->iv, &areq_ctx->gen_ctx.iv_dma_addr);
         if (do_chain && areq_ctx->plaintext_authenticate_only) {  // TODO: what about CTR?? ask Ron
                 struct crypto_aead *tfm = crypto_aead_reqtfm(req);
                 unsigned int iv_size_to_authenc = crypto_aead_ivsize(tfm);
                 unsigned int iv_ofs = GCM_BLOCK_RFC4_IV_OFFSET;
                 /* Chain to given list */
                 ssi_buffer_mgr_add_buffer_entry(
-                        sg_data, areq_ctx->gen_ctx.iv_dma_addr + iv_ofs,
+                        dev, sg_data,
+                        areq_ctx->gen_ctx.iv_dma_addr + iv_ofs,
                         iv_size_to_authenc, is_last,
                         &areq_ctx->assoc.mlli_nents);
                 areq_ctx->assoc_buff_type = SSI_DMA_BUF_MLLI;
@@ -824,6 +805,7 @@ static inline int ssi_buffer_mgr_aead_chain_assoc(
         struct crypto_aead *tfm = crypto_aead_reqtfm(req);
         unsigned int sg_index = 0;
         u32 size_of_assoc = req->assoclen;
+        struct device *dev = drvdata_to_dev(drvdata);
 
         if (areq_ctx->is_gcm4543)
                 size_of_assoc += crypto_aead_ivsize(tfm);
@@ -837,9 +819,9 @@ static inline int ssi_buffer_mgr_aead_chain_assoc(
                 areq_ctx->assoc_buff_type = SSI_DMA_BUF_NULL;
                 areq_ctx->assoc.nents = 0;
                 areq_ctx->assoc.mlli_nents = 0;
-                SSI_LOG_DEBUG("Chain assoc of length 0: buff_type=%s nents=%u\n",
-                              GET_DMA_BUFFER_TYPE(areq_ctx->assoc_buff_type),
-                              areq_ctx->assoc.nents);
+                dev_dbg(dev, "Chain assoc of length 0: buff_type=%s nents=%u\n",
+                        GET_DMA_BUFFER_TYPE(areq_ctx->assoc_buff_type),
+                        areq_ctx->assoc.nents);
                 goto chain_assoc_exit;
         }
 
@@ -853,16 +835,16 @@ static inline int ssi_buffer_mgr_aead_chain_assoc(
                         current_sg = sg_next(current_sg);
                         //if have reached the end of the sgl, then this is unexpected
                         if (!current_sg) {
-                                SSI_LOG_ERR("reached end of sg list. unexpected\n");
-                                BUG();
+                                dev_err(dev, "reached end of sg list. unexpected\n");
+                                return -EINVAL;
                         }
                         sg_index += current_sg->length;
                         mapped_nents++;
                 }
         }
         if (unlikely(mapped_nents > LLI_MAX_NUM_OF_ASSOC_DATA_ENTRIES)) {
-                SSI_LOG_ERR("Too many fragments. current %d max %d\n",
-                            mapped_nents, LLI_MAX_NUM_OF_ASSOC_DATA_ENTRIES);
+                dev_err(dev, "Too many fragments. current %d max %d\n",
+                        mapped_nents, LLI_MAX_NUM_OF_ASSOC_DATA_ENTRIES);
                 return -ENOMEM;
         }
         areq_ctx->assoc.nents = mapped_nents;
@@ -873,9 +855,9 @@ static inline int ssi_buffer_mgr_aead_chain_assoc(
         if (areq_ctx->ccm_hdr_size != ccm_header_size_null) {
                 if (unlikely((mapped_nents + 1) >
                         LLI_MAX_NUM_OF_ASSOC_DATA_ENTRIES)) {
-                        SSI_LOG_ERR("CCM case.Too many fragments. Current %d max %d\n",
-                                    (areq_ctx->assoc.nents + 1),
-                                    LLI_MAX_NUM_OF_ASSOC_DATA_ENTRIES);
+                        dev_err(dev, "CCM case.Too many fragments. Current %d max %d\n",
+                                (areq_ctx->assoc.nents + 1),
+                                LLI_MAX_NUM_OF_ASSOC_DATA_ENTRIES);
                         rc = -ENOMEM;
                         goto chain_assoc_exit;
                 }
@@ -889,11 +871,11 @@ static inline int ssi_buffer_mgr_aead_chain_assoc(
 
         if (unlikely((do_chain) ||
                      (areq_ctx->assoc_buff_type == SSI_DMA_BUF_MLLI))) {
-                SSI_LOG_DEBUG("Chain assoc: buff_type=%s nents=%u\n",
-                              GET_DMA_BUFFER_TYPE(areq_ctx->assoc_buff_type),
-                              areq_ctx->assoc.nents);
+                dev_dbg(dev, "Chain assoc: buff_type=%s nents=%u\n",
+                        GET_DMA_BUFFER_TYPE(areq_ctx->assoc_buff_type),
+                        areq_ctx->assoc.nents);
                 ssi_buffer_mgr_add_scatterlist_entry(
-                        sg_data, areq_ctx->assoc.nents,
+                        dev, sg_data, areq_ctx->assoc.nents,
                         req->src, req->assoclen, 0, is_last,
                         &areq_ctx->assoc.mlli_nents);
                 areq_ctx->assoc_buff_type = SSI_DMA_BUF_MLLI;
@@ -951,10 +933,11 @@ static inline int ssi_buffer_mgr_prepare_aead_data_mlli(
         unsigned int authsize = areq_ctx->req_authsize;
         int rc = 0, icv_nents;
         struct crypto_aead *tfm = crypto_aead_reqtfm(req);
+        struct device *dev = drvdata_to_dev(drvdata);
 
         if (likely(req->src == req->dst)) {
                 /*INPLACE*/
-                ssi_buffer_mgr_add_scatterlist_entry(sg_data,
+                ssi_buffer_mgr_add_scatterlist_entry(dev, sg_data,
                                                      areq_ctx->src.nents,
                                                      areq_ctx->src_sgl,
                                                      areq_ctx->cryptlen,
@@ -962,7 +945,8 @@ static inline int ssi_buffer_mgr_prepare_aead_data_mlli(
                                                      is_last_table,
                                                      &areq_ctx->src.mlli_nents);
 
-                icv_nents = ssi_buffer_mgr_get_aead_icv_nents(areq_ctx->src_sgl,
+                icv_nents = ssi_buffer_mgr_get_aead_icv_nents(dev,
+                                                              areq_ctx->src_sgl,
                                                               areq_ctx->src.nents,
                                                               authsize,
                                                               *src_last_bytes,
@@ -990,7 +974,8 @@ static inline int ssi_buffer_mgr_prepare_aead_data_mlli(
                                                 skip += crypto_aead_ivsize(tfm);
 
                                         ssi_buffer_mgr_copy_scatterlist_portion(
-                                                areq_ctx->backup_mac, req->src,
+                                                dev, areq_ctx->backup_mac,
+                                                req->src,
                                                 (skip + req->cryptlen -
                                                  areq_ctx->req_authsize),
                                                 skip + req->cryptlen,
@@ -1013,14 +998,14 @@ static inline int ssi_buffer_mgr_prepare_aead_data_mlli(
 
         } else if (direct == DRV_CRYPTO_DIRECTION_DECRYPT) {
                 /*NON-INPLACE and DECRYPT*/
-                ssi_buffer_mgr_add_scatterlist_entry(sg_data,
+                ssi_buffer_mgr_add_scatterlist_entry(dev, sg_data,
                                                      areq_ctx->src.nents,
                                                      areq_ctx->src_sgl,
                                                      areq_ctx->cryptlen,
                                                      areq_ctx->src_offset,
                                                      is_last_table,
                                                      &areq_ctx->src.mlli_nents);
-                ssi_buffer_mgr_add_scatterlist_entry(sg_data,
+                ssi_buffer_mgr_add_scatterlist_entry(dev, sg_data,
                                                      areq_ctx->dst.nents,
                                                      areq_ctx->dst_sgl,
                                                      areq_ctx->cryptlen,
@@ -1028,7 +1013,8 @@ static inline int ssi_buffer_mgr_prepare_aead_data_mlli(
                                                      is_last_table,
                                                      &areq_ctx->dst.mlli_nents);
 
-                icv_nents = ssi_buffer_mgr_get_aead_icv_nents(areq_ctx->src_sgl,
+                icv_nents = ssi_buffer_mgr_get_aead_icv_nents(dev,
+                                                              areq_ctx->src_sgl,
                                                               areq_ctx->src.nents,
                                                               authsize,
                                                               *src_last_bytes,
@@ -1043,15 +1029,15 @@ static inline int ssi_buffer_mgr_prepare_aead_data_mlli(
                          * verification is made by CPU compare in order to simplify
                          * MAC verification upon request completion
                          */
-                          u32 size_to_skip = req->assoclen;
+                        u32 size_to_skip = req->assoclen;
 
-                          if (areq_ctx->is_gcm4543)
-                                  size_to_skip += crypto_aead_ivsize(tfm);
+                        if (areq_ctx->is_gcm4543)
+                                size_to_skip += crypto_aead_ivsize(tfm);
 
-                          ssi_buffer_mgr_copy_scatterlist_portion(
-                                  areq_ctx->backup_mac, req->src,
-                                  size_to_skip + req->cryptlen - areq_ctx->req_authsize,
-                                  size_to_skip + req->cryptlen, SSI_SG_TO_BUF);
+                        ssi_buffer_mgr_copy_scatterlist_portion(
+                                dev, areq_ctx->backup_mac, req->src,
+                                size_to_skip + req->cryptlen - areq_ctx->req_authsize,
+                                size_to_skip + req->cryptlen, SSI_SG_TO_BUF);
                         areq_ctx->icv_virt_addr = areq_ctx->backup_mac;
                 } else { /* Contig. ICV */
                         /*Should hanlde if the sg is not contig.*/
@@ -1065,14 +1051,14 @@ static inline int ssi_buffer_mgr_prepare_aead_data_mlli(
 
         } else {
                 /*NON-INPLACE and ENCRYPT*/
-                ssi_buffer_mgr_add_scatterlist_entry(sg_data,
+                ssi_buffer_mgr_add_scatterlist_entry(dev, sg_data,
                                                      areq_ctx->dst.nents,
                                                      areq_ctx->dst_sgl,
                                                      areq_ctx->cryptlen,
                                                      areq_ctx->dst_offset,
                                                      is_last_table,
                                                      &areq_ctx->dst.mlli_nents);
-                ssi_buffer_mgr_add_scatterlist_entry(sg_data,
+                ssi_buffer_mgr_add_scatterlist_entry(dev, sg_data,
                                                      areq_ctx->src.nents,
                                                      areq_ctx->src_sgl,
                                                      areq_ctx->cryptlen,
@@ -1080,7 +1066,8 @@ static inline int ssi_buffer_mgr_prepare_aead_data_mlli(
                                                      is_last_table,
                                                      &areq_ctx->src.mlli_nents);
 
-                icv_nents = ssi_buffer_mgr_get_aead_icv_nents(areq_ctx->dst_sgl,
+                icv_nents = ssi_buffer_mgr_get_aead_icv_nents(dev,
+                                                              areq_ctx->dst_sgl,
                                                               areq_ctx->dst.nents,
                                                               authsize,
                                                               *dst_last_bytes,
@@ -1115,7 +1102,7 @@ static inline int ssi_buffer_mgr_aead_chain_data(
         bool is_last_table, bool do_chain)
 {
         struct aead_req_ctx *areq_ctx = aead_request_ctx(req);
-        struct device *dev = &drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(drvdata);
         enum drv_crypto_direction direct = areq_ctx->gen_ctx.op_type;
         unsigned int authsize = areq_ctx->req_authsize;
         int src_last_bytes = 0, dst_last_bytes = 0;
@@ -1134,10 +1121,9 @@ static inline int ssi_buffer_mgr_aead_chain_data(
 
         offset = size_to_skip;
 
-        if (!sg_data) {
-                rc = -EINVAL;
-                goto chain_data_exit;
-        }
+        if (!sg_data)
+                return -EINVAL;
+
         areq_ctx->src_sgl = req->src;
         areq_ctx->dst_sgl = req->dst;
 
@@ -1145,7 +1131,10 @@ static inline int ssi_buffer_mgr_aead_chain_data(
                 size_for_map += crypto_aead_ivsize(tfm);
 
         size_for_map += (direct == DRV_CRYPTO_DIRECTION_ENCRYPT) ? authsize : 0;
-        src_mapped_nents = ssi_buffer_mgr_get_sgl_nents(req->src, size_for_map, &src_last_bytes, &chained);
+        src_mapped_nents = ssi_buffer_mgr_get_sgl_nents(dev, req->src,
+                                                        size_for_map,
+                                                        &src_last_bytes,
+                                                        &chained);
         sg_index = areq_ctx->src_sgl->length;
         //check where the data starts
         while (sg_index <= size_to_skip) {
@@ -1153,15 +1142,15 @@ static inline int ssi_buffer_mgr_aead_chain_data(
                 areq_ctx->src_sgl = sg_next(areq_ctx->src_sgl);
                 //if have reached the end of the sgl, then this is unexpected
                 if (!areq_ctx->src_sgl) {
-                        SSI_LOG_ERR("reached end of sg list. unexpected\n");
-                        BUG();
+                        dev_err(dev, "reached end of sg list. unexpected\n");
+                        return -EINVAL;
                 }
                 sg_index += areq_ctx->src_sgl->length;
                 src_mapped_nents--;
         }
         if (unlikely(src_mapped_nents > LLI_MAX_NUM_OF_DATA_ENTRIES)) {
-                SSI_LOG_ERR("Too many fragments. current %d max %d\n",
-                            src_mapped_nents, LLI_MAX_NUM_OF_DATA_ENTRIES);
+                dev_err(dev, "Too many fragments. current %d max %d\n",
+                        src_mapped_nents, LLI_MAX_NUM_OF_DATA_ENTRIES);
                         return -ENOMEM;
         }
 
@@ -1187,7 +1176,10 @@ static inline int ssi_buffer_mgr_aead_chain_data(
                 }
         }
 
-        dst_mapped_nents = ssi_buffer_mgr_get_sgl_nents(req->dst, size_for_map, &dst_last_bytes, &chained);
+        dst_mapped_nents = ssi_buffer_mgr_get_sgl_nents(dev, req->dst,
+                                                        size_for_map,
+                                                        &dst_last_bytes,
+                                                        &chained);
         sg_index = areq_ctx->dst_sgl->length;
         offset = size_to_skip;
 
@@ -1197,15 +1189,15 @@ static inline int ssi_buffer_mgr_aead_chain_data(
                 areq_ctx->dst_sgl = sg_next(areq_ctx->dst_sgl);
                 //if have reached the end of the sgl, then this is unexpected
                 if (!areq_ctx->dst_sgl) {
-                        SSI_LOG_ERR("reached end of sg list. unexpected\n");
-                        BUG();
+                        dev_err(dev, "reached end of sg list. unexpected\n");
+                        return -EINVAL;
                 }
                 sg_index += areq_ctx->dst_sgl->length;
                 dst_mapped_nents--;
         }
         if (unlikely(dst_mapped_nents > LLI_MAX_NUM_OF_DATA_ENTRIES)) {
-                SSI_LOG_ERR("Too many fragments. current %d max %d\n",
-                            dst_mapped_nents, LLI_MAX_NUM_OF_DATA_ENTRIES);
+                dev_err(dev, "Too many fragments. current %d max %d\n",
+                        dst_mapped_nents, LLI_MAX_NUM_OF_DATA_ENTRIES);
                 return -ENOMEM;
         }
         areq_ctx->dst.nents = dst_mapped_nents;
@@ -1285,7 +1277,7 @@ int ssi_buffer_mgr_map_aead_request(
 {
         struct aead_req_ctx *areq_ctx = aead_request_ctx(req);
         struct mlli_params *mlli_params = &areq_ctx->mlli_params;
-        struct device *dev = &drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(drvdata);
         struct buffer_array sg_data;
         unsigned int authsize = areq_ctx->req_authsize;
         struct buff_mgr_handle *buff_mgr = drvdata->buff_mgr_handle;
@@ -1312,7 +1304,7 @@ int ssi_buffer_mgr_map_aead_request(
                  * data memory overriding that caused by cache coherence problem.
                  */
                 ssi_buffer_mgr_copy_scatterlist_portion(
-                        areq_ctx->backup_mac, req->src,
+                        dev, areq_ctx->backup_mac, req->src,
                         size_to_skip + req->cryptlen - areq_ctx->req_authsize,
                         size_to_skip + req->cryptlen, SSI_SG_TO_BUF);
         }
@@ -1327,8 +1319,8 @@ int ssi_buffer_mgr_map_aead_request(
                                                     MAX_MAC_SIZE,
                                                     DMA_BIDIRECTIONAL);
         if (unlikely(dma_mapping_error(dev, areq_ctx->mac_buf_dma_addr))) {
-                SSI_LOG_ERR("Mapping mac_buf %u B at va=%pK for DMA failed\n",
-                            MAX_MAC_SIZE, areq_ctx->mac_buf);
+                dev_err(dev, "Mapping mac_buf %u B at va=%pK for DMA failed\n",
+                        MAX_MAC_SIZE, areq_ctx->mac_buf);
                 rc = -ENOMEM;
                 goto aead_map_failure;
         }
@@ -1340,9 +1332,10 @@ int ssi_buffer_mgr_map_aead_request(
                                                             DMA_TO_DEVICE);
 
                 if (unlikely(dma_mapping_error(dev, areq_ctx->ccm_iv0_dma_addr))) {
-                        SSI_LOG_ERR("Mapping mac_buf %u B at va=%pK "
-                        "for DMA failed\n", AES_BLOCK_SIZE,
-                        (areq_ctx->ccm_config + CCM_CTR_COUNT_0_OFFSET));
+                        dev_err(dev, "Mapping mac_buf %u B at va=%pK for DMA failed\n",
+                                AES_BLOCK_SIZE,
+                                (areq_ctx->ccm_config +
+                                 CCM_CTR_COUNT_0_OFFSET));
                         areq_ctx->ccm_iv0_dma_addr = 0;
                         rc = -ENOMEM;
                         goto aead_map_failure;
@@ -1362,8 +1355,8 @@ int ssi_buffer_mgr_map_aead_request(
                                                          AES_BLOCK_SIZE,
                                                          DMA_BIDIRECTIONAL);
                 if (unlikely(dma_mapping_error(dev, areq_ctx->hkey_dma_addr))) {
-                        SSI_LOG_ERR("Mapping hkey %u B at va=%pK for DMA failed\n",
-                                    AES_BLOCK_SIZE, areq_ctx->hkey);
+                        dev_err(dev, "Mapping hkey %u B at va=%pK for DMA failed\n",
+                                AES_BLOCK_SIZE, areq_ctx->hkey);
                         rc = -ENOMEM;
                         goto aead_map_failure;
                 }
@@ -1373,8 +1366,8 @@ int ssi_buffer_mgr_map_aead_request(
                                                                   AES_BLOCK_SIZE,
                                                                   DMA_TO_DEVICE);
                 if (unlikely(dma_mapping_error(dev, areq_ctx->gcm_block_len_dma_addr))) {
-                        SSI_LOG_ERR("Mapping gcm_len_block %u B at va=%pK for DMA failed\n",
-                                    AES_BLOCK_SIZE, &areq_ctx->gcm_len_block);
+                        dev_err(dev, "Mapping gcm_len_block %u B at va=%pK for DMA failed\n",
+                                AES_BLOCK_SIZE, &areq_ctx->gcm_len_block);
                         rc = -ENOMEM;
                         goto aead_map_failure;
                 }
@@ -1385,9 +1378,8 @@ int ssi_buffer_mgr_map_aead_request(
                                                                 DMA_TO_DEVICE);
 
                 if (unlikely(dma_mapping_error(dev, areq_ctx->gcm_iv_inc1_dma_addr))) {
-                        SSI_LOG_ERR("Mapping gcm_iv_inc1 %u B at va=%pK "
-                        "for DMA failed\n", AES_BLOCK_SIZE,
-                        (areq_ctx->gcm_iv_inc1));
+                        dev_err(dev, "Mapping gcm_iv_inc1 %u B at va=%pK for DMA failed\n",
+                                AES_BLOCK_SIZE, (areq_ctx->gcm_iv_inc1));
                         areq_ctx->gcm_iv_inc1_dma_addr = 0;
                         rc = -ENOMEM;
                         goto aead_map_failure;
@@ -1399,9 +1391,8 @@ int ssi_buffer_mgr_map_aead_request(
                                                                 DMA_TO_DEVICE);
 
                 if (unlikely(dma_mapping_error(dev, areq_ctx->gcm_iv_inc2_dma_addr))) {
-                        SSI_LOG_ERR("Mapping gcm_iv_inc2 %u B at va=%pK "
-                        "for DMA failed\n", AES_BLOCK_SIZE,
-                        (areq_ctx->gcm_iv_inc2));
+                        dev_err(dev, "Mapping gcm_iv_inc2 %u B at va=%pK for DMA failed\n",
+                                AES_BLOCK_SIZE, (areq_ctx->gcm_iv_inc2));
                         areq_ctx->gcm_iv_inc2_dma_addr = 0;
                         rc = -ENOMEM;
                         goto aead_map_failure;
@@ -1481,9 +1472,10 @@ int ssi_buffer_mgr_map_aead_request(
                         goto aead_map_failure;
 
                 ssi_buffer_mgr_update_aead_mlli_nents(drvdata, req);
-                SSI_LOG_DEBUG("assoc params mn %d\n", areq_ctx->assoc.mlli_nents);
-                SSI_LOG_DEBUG("src params mn %d\n", areq_ctx->src.mlli_nents);
-                SSI_LOG_DEBUG("dst params mn %d\n", areq_ctx->dst.mlli_nents);
+                dev_dbg(dev, "assoc params mn %d\n",
+                        areq_ctx->assoc.mlli_nents);
+                dev_dbg(dev, "src params mn %d\n", areq_ctx->src.mlli_nents);
+                dev_dbg(dev, "dst params mn %d\n", areq_ctx->dst.mlli_nents);
         }
         return 0;
 
@@ -1496,7 +1488,7 @@ int ssi_buffer_mgr_map_hash_request_final(
         struct ssi_drvdata *drvdata, void *ctx, struct scatterlist *src, unsigned int nbytes, bool do_update)
 {
         struct ahash_req_ctx *areq_ctx = (struct ahash_req_ctx *)ctx;
-        struct device *dev = &drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(drvdata);
         u8 *curr_buff = areq_ctx->buff_index ? areq_ctx->buff1 :
                         areq_ctx->buff0;
         u32 *curr_buff_cnt = areq_ctx->buff_index ? &areq_ctx->buff1_cnt :
@@ -1507,11 +1499,8 @@ int ssi_buffer_mgr_map_hash_request_final(
         u32 dummy = 0;
         u32 mapped_nents = 0;
 
-        SSI_LOG_DEBUG(" final params : curr_buff=%pK "
-                     "curr_buff_cnt=0x%X nbytes = 0x%X "
-                     "src=%pK curr_index=%u\n",
-                     curr_buff, *curr_buff_cnt, nbytes,
-                     src, areq_ctx->buff_index);
+        dev_dbg(dev, "final params : curr_buff=%pK curr_buff_cnt=0x%X nbytes = 0x%X src=%pK curr_index=%u\n",
+                curr_buff, *curr_buff_cnt, nbytes, src, areq_ctx->buff_index);
         /* Init the type of the dma buffer */
         areq_ctx->data_dma_buf_type = SSI_DMA_BUF_NULL;
         mlli_params->curr_pool = NULL;
@@ -1557,7 +1546,7 @@ int ssi_buffer_mgr_map_hash_request_final(
         if (unlikely(areq_ctx->data_dma_buf_type == SSI_DMA_BUF_MLLI)) {
                 mlli_params->curr_pool = buff_mgr->mlli_buffs_pool;
                 /* add the src data to the sg_data */
-                ssi_buffer_mgr_add_scatterlist_entry(&sg_data,
+                ssi_buffer_mgr_add_scatterlist_entry(dev, &sg_data,
                                                      areq_ctx->in_nents,
                                                      src, nbytes, 0, true,
                                                      &areq_ctx->mlli_nents);
@@ -1568,8 +1557,8 @@ int ssi_buffer_mgr_map_hash_request_final(
         }
         /* change the buffer index for the unmap function */
         areq_ctx->buff_index = (areq_ctx->buff_index ^ 1);
-        SSI_LOG_DEBUG("areq_ctx->data_dma_buf_type = %s\n",
-                      GET_DMA_BUFFER_TYPE(areq_ctx->data_dma_buf_type));
+        dev_dbg(dev, "areq_ctx->data_dma_buf_type = %s\n",
+                GET_DMA_BUFFER_TYPE(areq_ctx->data_dma_buf_type));
         return 0;
 
 fail_unmap_din:
@@ -1586,7 +1575,7 @@ int ssi_buffer_mgr_map_hash_request_update(
         struct ssi_drvdata *drvdata, void *ctx, struct scatterlist *src, unsigned int nbytes, unsigned int block_size)
 {
         struct ahash_req_ctx *areq_ctx = (struct ahash_req_ctx *)ctx;
-        struct device *dev = &drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(drvdata);
         u8 *curr_buff = areq_ctx->buff_index ? areq_ctx->buff1 :
                         areq_ctx->buff0;
         u32 *curr_buff_cnt = areq_ctx->buff_index ? &areq_ctx->buff1_cnt :
@@ -1604,11 +1593,8 @@ int ssi_buffer_mgr_map_hash_request_update(
         u32 dummy = 0;
         u32 mapped_nents = 0;
 
-        SSI_LOG_DEBUG(" update params : curr_buff=%pK "
-                     "curr_buff_cnt=0x%X nbytes=0x%X "
-                     "src=%pK curr_index=%u\n",
-                     curr_buff, *curr_buff_cnt, nbytes,
-                     src, areq_ctx->buff_index);
+        dev_dbg(dev, " update params : curr_buff=%pK curr_buff_cnt=0x%X nbytes=0x%X src=%pK curr_index=%u\n",
+                curr_buff, *curr_buff_cnt, nbytes, src, areq_ctx->buff_index);
         /* Init the type of the dma buffer */
         areq_ctx->data_dma_buf_type = SSI_DMA_BUF_NULL;
         mlli_params->curr_pool = NULL;
@@ -1617,14 +1603,11 @@ int ssi_buffer_mgr_map_hash_request_update(
         areq_ctx->in_nents = 0;
 
         if (unlikely(total_in_len < block_size)) {
-                SSI_LOG_DEBUG(" less than one block: curr_buff=%pK "
-                             "*curr_buff_cnt=0x%X copy_to=%pK\n",
-                        curr_buff, *curr_buff_cnt,
-                        &curr_buff[*curr_buff_cnt]);
+                dev_dbg(dev, " less than one block: curr_buff=%pK *curr_buff_cnt=0x%X copy_to=%pK\n",
+                        curr_buff, *curr_buff_cnt, &curr_buff[*curr_buff_cnt]);
                 areq_ctx->in_nents =
-                        ssi_buffer_mgr_get_sgl_nents(src,
-                                                     nbytes,
-                                                     &dummy, NULL);
+                        ssi_buffer_mgr_get_sgl_nents(dev, src, nbytes, &dummy,
+                                                     NULL);
                 sg_copy_to_buffer(src, areq_ctx->in_nents,
                                   &curr_buff[*curr_buff_cnt], nbytes);
                 *curr_buff_cnt += nbytes;
@@ -1636,17 +1619,15 @@ int ssi_buffer_mgr_map_hash_request_update(
         /* update data len */
         update_data_len = total_in_len - *next_buff_cnt;
 
-        SSI_LOG_DEBUG(" temp length : *next_buff_cnt=0x%X "
-                     "update_data_len=0x%X\n",
+        dev_dbg(dev, " temp length : *next_buff_cnt=0x%X update_data_len=0x%X\n",
                 *next_buff_cnt, update_data_len);
 
         /* Copy the new residue to next buffer */
         if (*next_buff_cnt != 0) {
-                SSI_LOG_DEBUG(" handle residue: next buff %pK skip data %u"
-                             " residue %u\n", next_buff,
-                             (update_data_len - *curr_buff_cnt),
-                             *next_buff_cnt);
-                ssi_buffer_mgr_copy_scatterlist_portion(next_buff, src,
+                dev_dbg(dev, " handle residue: next buff %pK skip data %u residue %u\n",
+                        next_buff, (update_data_len - *curr_buff_cnt),
+                        *next_buff_cnt);
+                ssi_buffer_mgr_copy_scatterlist_portion(dev, next_buff, src,
                                                         (update_data_len - *curr_buff_cnt),
                                                         nbytes, SSI_SG_TO_BUF);
                 /* change the buffer index for next operation */
@@ -1688,7 +1669,7 @@ int ssi_buffer_mgr_map_hash_request_update(
         if (unlikely(areq_ctx->data_dma_buf_type == SSI_DMA_BUF_MLLI)) {
                 mlli_params->curr_pool = buff_mgr->mlli_buffs_pool;
                 /* add the src data to the sg_data */
-                ssi_buffer_mgr_add_scatterlist_entry(&sg_data,
+                ssi_buffer_mgr_add_scatterlist_entry(dev, &sg_data,
                                                      areq_ctx->in_nents,
                                                      src,
                                                      (update_data_len - *curr_buff_cnt),
@@ -1725,29 +1706,26 @@ void ssi_buffer_mgr_unmap_hash_request(
          *allocated and should be released
          */
         if (areq_ctx->mlli_params.curr_pool) {
-                SSI_LOG_DEBUG("free MLLI buffer: dma=%pad virt=%pK\n",
-                              areq_ctx->mlli_params.mlli_dma_addr,
-                              areq_ctx->mlli_params.mlli_virt_addr);
+                dev_dbg(dev, "free MLLI buffer: dma=%pad virt=%pK\n",
+                        &areq_ctx->mlli_params.mlli_dma_addr,
+                        areq_ctx->mlli_params.mlli_virt_addr);
                 dma_pool_free(areq_ctx->mlli_params.curr_pool,
                               areq_ctx->mlli_params.mlli_virt_addr,
                               areq_ctx->mlli_params.mlli_dma_addr);
         }
 
         if ((src) && likely(areq_ctx->in_nents != 0)) {
-                SSI_LOG_DEBUG("Unmapped sg src: virt=%pK dma=%pad len=0x%X\n",
-                              sg_virt(src),
-                              sg_dma_address(src),
-                              sg_dma_len(src));
+                dev_dbg(dev, "Unmapped sg src: virt=%pK dma=%pad len=0x%X\n",
+                        sg_virt(src), &sg_dma_address(src), sg_dma_len(src));
                 dma_unmap_sg(dev, src,
                              areq_ctx->in_nents, DMA_TO_DEVICE);
         }
 
         if (*prev_len != 0) {
-                SSI_LOG_DEBUG("Unmapped buffer: areq_ctx->buff_sg=%pK"
-                             " dma=%pad len 0x%X\n",
-                                sg_virt(areq_ctx->buff_sg),
-                                sg_dma_address(areq_ctx->buff_sg),
-                                sg_dma_len(areq_ctx->buff_sg));
+                dev_dbg(dev, "Unmapped buffer: areq_ctx->buff_sg=%pK dma=%pad len 0x%X\n",
+                        sg_virt(areq_ctx->buff_sg),
+                        &sg_dma_address(areq_ctx->buff_sg),
+                        sg_dma_len(areq_ctx->buff_sg));
                 dma_unmap_sg(dev, areq_ctx->buff_sg, 1, DMA_TO_DEVICE);
                 if (!do_revert) {
                         /* clean the previous data length for update operation */
@@ -1761,7 +1739,7 @@ void ssi_buffer_mgr_unmap_hash_request(
 int ssi_buffer_mgr_init(struct ssi_drvdata *drvdata)
 {
         struct buff_mgr_handle *buff_mgr_handle;
-        struct device *dev = &drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(drvdata);
 
         buff_mgr_handle = kmalloc(sizeof(*buff_mgr_handle), GFP_KERNEL);
         if (!buff_mgr_handle)
diff --git a/drivers/staging/ccree/ssi_buffer_mgr.h b/drivers/staging/ccree/ssi_buffer_mgr.h
index 41f5223730f8..1032f25edcab 100644
--- a/drivers/staging/ccree/ssi_buffer_mgr.h
+++ b/drivers/staging/ccree/ssi_buffer_mgr.h
@@ -80,7 +80,10 @@ int ssi_buffer_mgr_map_hash_request_update(struct ssi_drvdata *drvdata, void *ct
 
 void ssi_buffer_mgr_unmap_hash_request(struct device *dev, void *ctx, struct scatterlist *src, bool do_revert);
 
-void ssi_buffer_mgr_copy_scatterlist_portion(u8 *dest, struct scatterlist *sg, u32 to_skip, u32 end, enum ssi_sg_cpy_direct direct);
+void ssi_buffer_mgr_copy_scatterlist_portion(struct device *dev, u8 *dest,
+                                             struct scatterlist *sg,
+                                             u32 to_skip, u32 end,
+                                             enum ssi_sg_cpy_direct direct);
 
 void ssi_buffer_mgr_zero_sgl(struct scatterlist *sgl, u32 data_len);
 
diff --git a/drivers/staging/ccree/ssi_cipher.c b/drivers/staging/ccree/ssi_cipher.c
index 8d31a93fd8b7..ee85cbf7c9ae 100644
--- a/drivers/staging/ccree/ssi_cipher.c
+++ b/drivers/staging/ccree/ssi_cipher.c
@@ -181,45 +181,42 @@ static int ssi_blkcipher_init(struct crypto_tfm *tfm)
         struct crypto_alg *alg = tfm->__crt_alg;
         struct ssi_crypto_alg *ssi_alg =
                         container_of(alg, struct ssi_crypto_alg, crypto_alg);
-        struct device *dev;
+        struct device *dev = drvdata_to_dev(ssi_alg->drvdata);
         int rc = 0;
         unsigned int max_key_buf_size = get_max_keysize(tfm);
 
-        SSI_LOG_DEBUG("Initializing context @%p for %s\n",
-                      ctx_p, crypto_tfm_alg_name(tfm));
+        dev_dbg(dev, "Initializing context @%p for %s\n", ctx_p,
+                crypto_tfm_alg_name(tfm));
 
         ctx_p->cipher_mode = ssi_alg->cipher_mode;
         ctx_p->flow_mode = ssi_alg->flow_mode;
         ctx_p->drvdata = ssi_alg->drvdata;
-        dev = &ctx_p->drvdata->plat_dev->dev;
 
         /* Allocate key buffer, cache line aligned */
         ctx_p->user.key = kmalloc(max_key_buf_size, GFP_KERNEL | GFP_DMA);
-        if (!ctx_p->user.key) {
-                SSI_LOG_ERR("Allocating key buffer in context failed\n");
-                rc = -ENOMEM;
-        }
-        SSI_LOG_DEBUG("Allocated key buffer in context. key=@%p\n",
-                      ctx_p->user.key);
+        if (!ctx_p->user.key)
+                return -ENOMEM;
+
+        dev_dbg(dev, "Allocated key buffer in context. key=@%p\n",
+                ctx_p->user.key);
 
         /* Map key buffer */
         ctx_p->user.key_dma_addr = dma_map_single(dev, (void *)ctx_p->user.key,
                                                   max_key_buf_size,
                                                   DMA_TO_DEVICE);
         if (dma_mapping_error(dev, ctx_p->user.key_dma_addr)) {
-                SSI_LOG_ERR("Mapping Key %u B at va=%pK for DMA failed\n",
-                            max_key_buf_size, ctx_p->user.key);
+                dev_err(dev, "Mapping Key %u B at va=%pK for DMA failed\n",
+                        max_key_buf_size, ctx_p->user.key);
                 return -ENOMEM;
         }
-        SSI_LOG_DEBUG("Mapped key %u B at va=%pK to dma=%pad\n",
-                      max_key_buf_size, ctx_p->user.key,
-                      ctx_p->user.key_dma_addr);
+        dev_dbg(dev, "Mapped key %u B at va=%pK to dma=%pad\n",
+                max_key_buf_size, ctx_p->user.key, &ctx_p->user.key_dma_addr);
 
         if (ctx_p->cipher_mode == DRV_CIPHER_ESSIV) {
                 /* Alloc hash tfm for essiv */
                 ctx_p->shash_tfm = crypto_alloc_shash("sha256-generic", 0, 0);
                 if (IS_ERR(ctx_p->shash_tfm)) {
-                        SSI_LOG_ERR("Error allocating hash tfm for ESSIV.\n");
+                        dev_err(dev, "Error allocating hash tfm for ESSIV.\n");
                         return PTR_ERR(ctx_p->shash_tfm);
                 }
         }
@@ -230,11 +227,11 @@ static int ssi_blkcipher_init(struct crypto_tfm *tfm)
 static void ssi_blkcipher_exit(struct crypto_tfm *tfm)
 {
         struct ssi_ablkcipher_ctx *ctx_p = crypto_tfm_ctx(tfm);
-        struct device *dev = &ctx_p->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx_p->drvdata);
         unsigned int max_key_buf_size = get_max_keysize(tfm);
 
-        SSI_LOG_DEBUG("Clearing context @%p for %s\n",
-                      crypto_tfm_ctx(tfm), crypto_tfm_alg_name(tfm));
+        dev_dbg(dev, "Clearing context @%p for %s\n",
+                crypto_tfm_ctx(tfm), crypto_tfm_alg_name(tfm));
 
         if (ctx_p->cipher_mode == DRV_CIPHER_ESSIV) {
                 /* Free hash tfm for essiv */
@@ -245,12 +242,12 @@ static void ssi_blkcipher_exit(struct crypto_tfm *tfm)
         /* Unmap key buffer */
         dma_unmap_single(dev, ctx_p->user.key_dma_addr, max_key_buf_size,
                          DMA_TO_DEVICE);
-        SSI_LOG_DEBUG("Unmapped key buffer key_dma_addr=%pad\n",
-                      ctx_p->user.key_dma_addr);
+        dev_dbg(dev, "Unmapped key buffer key_dma_addr=%pad\n",
+                &ctx_p->user.key_dma_addr);
 
         /* Free key buffer in context */
         kfree(ctx_p->user.key);
-        SSI_LOG_DEBUG("Free key buffer in context. key=@%p\n", ctx_p->user.key);
+        dev_dbg(dev, "Free key buffer in context. key=@%p\n", ctx_p->user.key);
 }
 
 struct tdes_keys {
@@ -298,16 +295,14 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                                 unsigned int keylen)
 {
         struct ssi_ablkcipher_ctx *ctx_p = crypto_tfm_ctx(tfm);
-        struct device *dev = &ctx_p->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx_p->drvdata);
         u32 tmp[DES_EXPKEY_WORDS];
         unsigned int max_key_buf_size = get_max_keysize(tfm);
 
-        SSI_LOG_DEBUG("Setting key in context @%p for %s. keylen=%u\n",
-                      ctx_p, crypto_tfm_alg_name(tfm), keylen);
+        dev_dbg(dev, "Setting key in context @%p for %s. keylen=%u\n",
+                ctx_p, crypto_tfm_alg_name(tfm), keylen);
         dump_byte_array("key", (u8 *)key, keylen);
 
-        SSI_LOG_DEBUG("after FIPS check");
-
         /* STAT_PHASE_0: Init and sanity checks */
 
 #if SSI_CC_HAS_MULTI2
@@ -317,7 +312,7 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
 #endif /*SSI_CC_HAS_MULTI2*/
 
         if (unlikely(validate_keys_sizes(ctx_p, keylen) != 0)) {
-                SSI_LOG_ERR("Unsupported key size %d.\n", keylen);
+                dev_err(dev, "Unsupported key size %d.\n", keylen);
                 crypto_tfm_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
                 return -EINVAL;
         }
@@ -327,13 +322,14 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                 struct arm_hw_key_info *hki = (struct arm_hw_key_info *)key;
 
                 if (unlikely(ctx_p->flow_mode != S_DIN_to_AES)) {
-                        SSI_LOG_ERR("HW key not supported for non-AES flows\n");
+                        dev_err(dev, "HW key not supported for non-AES flows\n");
                         return -EINVAL;
                 }
 
                 ctx_p->hw.key1_slot = hw_key_to_cc_hw_key(hki->hw_key1);
                 if (unlikely(ctx_p->hw.key1_slot == END_OF_KEYS)) {
-                        SSI_LOG_ERR("Unsupported hw key1 number (%d)\n", hki->hw_key1);
+                        dev_err(dev, "Unsupported hw key1 number (%d)\n",
+                                hki->hw_key1);
                         return -EINVAL;
                 }
 
@@ -341,18 +337,20 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                     (ctx_p->cipher_mode == DRV_CIPHER_ESSIV) ||
                     (ctx_p->cipher_mode == DRV_CIPHER_BITLOCKER)) {
                         if (unlikely(hki->hw_key1 == hki->hw_key2)) {
-                                SSI_LOG_ERR("Illegal hw key numbers (%d,%d)\n", hki->hw_key1, hki->hw_key2);
+                                dev_err(dev, "Illegal hw key numbers (%d,%d)\n",
+                                        hki->hw_key1, hki->hw_key2);
                                 return -EINVAL;
                         }
                         ctx_p->hw.key2_slot = hw_key_to_cc_hw_key(hki->hw_key2);
                         if (unlikely(ctx_p->hw.key2_slot == END_OF_KEYS)) {
-                                SSI_LOG_ERR("Unsupported hw key2 number (%d)\n", hki->hw_key2);
+                                dev_err(dev, "Unsupported hw key2 number (%d)\n",
+                                        hki->hw_key2);
                                 return -EINVAL;
                         }
                 }
 
                 ctx_p->keylen = keylen;
-                SSI_LOG_DEBUG("ssi_is_hw_key ret 0");
+                dev_dbg(dev, "ssi_is_hw_key ret 0");
 
                 return 0;
         }
@@ -362,19 +360,19 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                 if (unlikely(!des_ekey(tmp, key)) &&
                     (crypto_tfm_get_flags(tfm) & CRYPTO_TFM_REQ_WEAK_KEY)) {
                         tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;
-                        SSI_LOG_DEBUG("weak DES key");
+                        dev_dbg(dev, "weak DES key");
                         return -EINVAL;
                 }
         }
         if ((ctx_p->cipher_mode == DRV_CIPHER_XTS) &&
             xts_check_key(tfm, key, keylen) != 0) {
-                SSI_LOG_DEBUG("weak XTS key");
+                dev_dbg(dev, "weak XTS key");
                 return -EINVAL;
         }
         if ((ctx_p->flow_mode == S_DIN_to_DES) &&
             (keylen == DES3_EDE_KEY_SIZE) &&
             ssi_verify_3des_keys(key, keylen) != 0) {
-                SSI_LOG_DEBUG("weak 3DES key");
+                dev_dbg(dev, "weak 3DES key");
                 return -EINVAL;
         }
 
@@ -389,7 +387,7 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                 if (ctx_p->key_round_number < CC_MULTI2_MIN_NUM_ROUNDS ||
                     ctx_p->key_round_number > CC_MULTI2_MAX_NUM_ROUNDS) {
                         crypto_tfm_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
-                        SSI_LOG_DEBUG("SSI_CC_HAS_MULTI2 einval");
+                        dev_dbg(dev, "SSI_CC_HAS_MULTI2 einval");
                         return -EINVAL;
 #endif /*SSI_CC_HAS_MULTI2*/
         } else {
@@ -407,7 +405,7 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
 
                         err = crypto_shash_digest(desc, ctx_p->user.key, key_len, ctx_p->user.key + key_len);
                         if (err) {
-                                SSI_LOG_ERR("Failed to hash ESSIV key.\n");
+                                dev_err(dev, "Failed to hash ESSIV key.\n");
                                 return err;
                         }
                 }
@@ -416,7 +414,7 @@ static int ssi_blkcipher_setkey(struct crypto_tfm *tfm,
                                    max_key_buf_size, DMA_TO_DEVICE);
         ctx_p->keylen = keylen;
 
-         SSI_LOG_DEBUG("return safely");
+         dev_dbg(dev, "return safely");
         return 0;
 }
 
@@ -430,6 +428,7 @@ ssi_blkcipher_create_setup_desc(
         unsigned int *seq_size)
 {
         struct ssi_ablkcipher_ctx *ctx_p = crypto_tfm_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx_p->drvdata);
         int cipher_mode = ctx_p->cipher_mode;
         int flow_mode = ctx_p->flow_mode;
         int direction = req_ctx->gen_ctx.op_type;
@@ -540,8 +539,7 @@ ssi_blkcipher_create_setup_desc(
                 (*seq_size)++;
                 break;
         default:
-                SSI_LOG_ERR("Unsupported cipher mode (%d)\n", cipher_mode);
-                BUG();
+                dev_err(dev, "Unsupported cipher mode (%d)\n", cipher_mode);
         }
 }
 
@@ -601,6 +599,7 @@ ssi_blkcipher_create_data_desc(
         unsigned int *seq_size)
 {
         struct ssi_ablkcipher_ctx *ctx_p = crypto_tfm_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx_p->drvdata);
         unsigned int flow_mode = ctx_p->flow_mode;
 
         switch (ctx_p->flow_mode) {
@@ -616,15 +615,15 @@ ssi_blkcipher_create_data_desc(
                 break;
 #endif /*SSI_CC_HAS_MULTI2*/
         default:
-                SSI_LOG_ERR("invalid flow mode, flow_mode = %d\n", flow_mode);
+                dev_err(dev, "invalid flow mode, flow_mode = %d\n", flow_mode);
                 return;
         }
         /* Process */
         if (likely(req_ctx->dma_buf_type == SSI_DMA_BUF_DLLI)) {
-                SSI_LOG_DEBUG(" data params addr %pad length 0x%X\n",
-                              sg_dma_address(src), nbytes);
-                SSI_LOG_DEBUG(" data params addr %pad length 0x%X\n",
-                              sg_dma_address(dst), nbytes);
+                dev_dbg(dev, " data params addr %pad length 0x%X\n",
+                        &sg_dma_address(src), nbytes);
+                dev_dbg(dev, " data params addr %pad length 0x%X\n",
+                        &sg_dma_address(dst), nbytes);
                 hw_desc_init(&desc[*seq_size]);
                 set_din_type(&desc[*seq_size], DMA_DLLI, sg_dma_address(src),
                              nbytes, NS_BIT);
@@ -637,9 +636,8 @@ ssi_blkcipher_create_data_desc(
                 (*seq_size)++;
         } else {
                 /* bypass */
-                SSI_LOG_DEBUG(" bypass params addr %pad "
-                             "length 0x%X addr 0x%08X\n",
-                        req_ctx->mlli_params.mlli_dma_addr,
+                dev_dbg(dev, " bypass params addr %pad length 0x%X addr 0x%08X\n",
+                        &req_ctx->mlli_params.mlli_dma_addr,
                         req_ctx->mlli_params.mlli_len,
                         (unsigned int)ctx_p->drvdata->mlli_sram_addr);
                 hw_desc_init(&desc[*seq_size]);
@@ -657,21 +655,18 @@ ssi_blkcipher_create_data_desc(
                              ctx_p->drvdata->mlli_sram_addr,
                              req_ctx->in_mlli_nents, NS_BIT);
                 if (req_ctx->out_nents == 0) {
-                        SSI_LOG_DEBUG(" din/dout params addr 0x%08X "
-                                     "addr 0x%08X\n",
-                        (unsigned int)ctx_p->drvdata->mlli_sram_addr,
-                        (unsigned int)ctx_p->drvdata->mlli_sram_addr);
+                        dev_dbg(dev, " din/dout params addr 0x%08X addr 0x%08X\n",
+                                (unsigned int)ctx_p->drvdata->mlli_sram_addr,
+                                (unsigned int)ctx_p->drvdata->mlli_sram_addr);
                         set_dout_mlli(&desc[*seq_size],
                                       ctx_p->drvdata->mlli_sram_addr,
                                       req_ctx->in_mlli_nents, NS_BIT,
                                       (!areq ? 0 : 1));
                 } else {
-                        SSI_LOG_DEBUG(" din/dout params "
-                                     "addr 0x%08X addr 0x%08X\n",
+                        dev_dbg(dev, " din/dout params addr 0x%08X addr 0x%08X\n",
                                 (unsigned int)ctx_p->drvdata->mlli_sram_addr,
                                 (unsigned int)ctx_p->drvdata->mlli_sram_addr +
-                                (u32)LLI_ENTRY_BYTE_SIZE *
-                                                        req_ctx->in_nents);
+                                (u32)LLI_ENTRY_BYTE_SIZE * req_ctx->in_nents);
                         set_dout_mlli(&desc[*seq_size],
                                       (ctx_p->drvdata->mlli_sram_addr +
                                        (LLI_ENTRY_BYTE_SIZE *
@@ -697,16 +692,10 @@ static int ssi_blkcipher_complete(struct device *dev,
                                   void __iomem *cc_base)
 {
         int completion_error = 0;
-        u32 inflight_counter;
         struct ablkcipher_request *req = (struct ablkcipher_request *)areq;
 
         ssi_buffer_mgr_unmap_blkcipher_request(dev, req_ctx, ivsize, src, dst);
-
-        /*Set the inflight couter value to local variable*/
-        inflight_counter =  ctx_p->drvdata->inflight_counter;
-        /*Decrease the inflight counter*/
-        if (ctx_p->flow_mode == BYPASS && ctx_p->drvdata->inflight_counter > 0)
-                ctx_p->drvdata->inflight_counter--;
+        kfree(req_ctx->iv);
 
         if (areq) {
                 /*
@@ -742,20 +731,20 @@ static int ssi_blkcipher_process(
         enum drv_crypto_direction direction)
 {
         struct ssi_ablkcipher_ctx *ctx_p = crypto_tfm_ctx(tfm);
-        struct device *dev = &ctx_p->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx_p->drvdata);
         struct cc_hw_desc desc[MAX_ABLKCIPHER_SEQ_LEN];
         struct ssi_crypto_req ssi_req = {};
         int rc, seq_len = 0, cts_restore_flag = 0;
 
-        SSI_LOG_DEBUG("%s areq=%p info=%p nbytes=%d\n",
-                      ((direction == DRV_CRYPTO_DIRECTION_ENCRYPT) ? "Encrypt" : "Decrypt"),
-                      areq, info, nbytes);
+        dev_dbg(dev, "%s areq=%p info=%p nbytes=%d\n",
+                ((direction == DRV_CRYPTO_DIRECTION_ENCRYPT) ?
+                "Encrypt" : "Decrypt"), areq, info, nbytes);
 
         /* STAT_PHASE_0: Init and sanity checks */
 
         /* TODO: check data length according to mode */
         if (unlikely(validate_data_size(ctx_p, nbytes))) {
-                SSI_LOG_ERR("Unsupported data size %d.\n", nbytes);
+                dev_err(dev, "Unsupported data size %d.\n", nbytes);
                 crypto_tfm_set_flags(tfm, CRYPTO_TFM_RES_BAD_BLOCK_LEN);
                 rc = -EINVAL;
                 goto exit_process;
@@ -765,6 +754,17 @@ static int ssi_blkcipher_process(
                 rc = 0;
                 goto exit_process;
         }
+
+        /* The IV we are handed may be allocted from the stack so
+         * we must copy it to a DMAable buffer before use.
+         */
+        req_ctx->iv = kmalloc(ivsize, GFP_KERNEL);
+        if (!req_ctx->iv) {
+                rc = -ENOMEM;
+                goto exit_process;
+        }
+        memcpy(req_ctx->iv, info, ivsize);
+
         /*For CTS in case of data size aligned to 16 use CBC mode*/
         if (((nbytes % AES_BLOCK_SIZE) == 0) && (ctx_p->cipher_mode == DRV_CIPHER_CBC_CTS)) {
                 ctx_p->cipher_mode = DRV_CIPHER_CBC;
@@ -786,9 +786,11 @@ static int ssi_blkcipher_process(
 
         /* STAT_PHASE_1: Map buffers */
 
-        rc = ssi_buffer_mgr_map_blkcipher_request(ctx_p->drvdata, req_ctx, ivsize, nbytes, info, src, dst);
+        rc = ssi_buffer_mgr_map_blkcipher_request(ctx_p->drvdata, req_ctx,
+                                                  ivsize, nbytes, req_ctx->iv,
+                                                  src, dst);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("map_request() failed\n");
+                dev_err(dev, "map_request() failed\n");
                 goto exit_process;
         }
 
@@ -838,8 +840,10 @@ exit_process:
         if (cts_restore_flag != 0)
                 ctx_p->cipher_mode = DRV_CIPHER_CBC_CTS;
 
-        if (rc != -EINPROGRESS)
+        if (rc != -EINPROGRESS) {
                 kfree(req_ctx->backup_info);
+                kfree(req_ctx->iv);
+        }
 
         return rc;
 }
@@ -1245,16 +1249,15 @@ static struct ssi_alg_template blkcipher_algs[] = {
 };
 
 static
-struct ssi_crypto_alg *ssi_ablkcipher_create_alg(struct ssi_alg_template *template)
+struct ssi_crypto_alg *ssi_ablkcipher_create_alg(struct ssi_alg_template
+                                                 *template, struct device *dev)
 {
         struct ssi_crypto_alg *t_alg;
         struct crypto_alg *alg;
 
         t_alg = kzalloc(sizeof(*t_alg), GFP_KERNEL);
-        if (!t_alg) {
-                SSI_LOG_ERR("failed to allocate t_alg\n");
+        if (!t_alg)
                 return ERR_PTR(-ENOMEM);
-        }
 
         alg = &t_alg->crypto_alg;
 
@@ -1285,10 +1288,6 @@ int ssi_ablkcipher_free(struct ssi_drvdata *drvdata)
         struct ssi_crypto_alg *t_alg, *n;
         struct ssi_blkcipher_handle *blkcipher_handle =
                                                 drvdata->blkcipher_handle;
-        struct device *dev;
-
-        dev = &drvdata->plat_dev->dev;
-
         if (blkcipher_handle) {
                 /* Remove registered algs */
                 list_for_each_entry_safe(t_alg, n,
@@ -1308,6 +1307,7 @@ int ssi_ablkcipher_alloc(struct ssi_drvdata *drvdata)
 {
         struct ssi_blkcipher_handle *ablkcipher_handle;
         struct ssi_crypto_alg *t_alg;
+        struct device *dev = drvdata_to_dev(drvdata);
         int rc = -ENOMEM;
         int alg;
 
@@ -1315,37 +1315,38 @@ int ssi_ablkcipher_alloc(struct ssi_drvdata *drvdata)
         if (!ablkcipher_handle)
                 return -ENOMEM;
 
-        drvdata->blkcipher_handle = ablkcipher_handle;
-
         INIT_LIST_HEAD(&ablkcipher_handle->blkcipher_alg_list);
+        drvdata->blkcipher_handle = ablkcipher_handle;
 
         /* Linux crypto */
-        SSI_LOG_DEBUG("Number of algorithms = %zu\n", ARRAY_SIZE(blkcipher_algs));
+        dev_dbg(dev, "Number of algorithms = %zu\n",
+                ARRAY_SIZE(blkcipher_algs));
         for (alg = 0; alg < ARRAY_SIZE(blkcipher_algs); alg++) {
-                SSI_LOG_DEBUG("creating %s\n", blkcipher_algs[alg].driver_name);
-                t_alg = ssi_ablkcipher_create_alg(&blkcipher_algs[alg]);
+                dev_dbg(dev, "creating %s\n", blkcipher_algs[alg].driver_name);
+                t_alg = ssi_ablkcipher_create_alg(&blkcipher_algs[alg], dev);
                 if (IS_ERR(t_alg)) {
                         rc = PTR_ERR(t_alg);
-                        SSI_LOG_ERR("%s alg allocation failed\n",
-                                    blkcipher_algs[alg].driver_name);
+                        dev_err(dev, "%s alg allocation failed\n",
+                                blkcipher_algs[alg].driver_name);
                         goto fail0;
                 }
                 t_alg->drvdata = drvdata;
 
-                SSI_LOG_DEBUG("registering %s\n", blkcipher_algs[alg].driver_name);
+                dev_dbg(dev, "registering %s\n",
+                        blkcipher_algs[alg].driver_name);
                 rc = crypto_register_alg(&t_alg->crypto_alg);
-                SSI_LOG_DEBUG("%s alg registration rc = %x\n",
-                              t_alg->crypto_alg.cra_driver_name, rc);
+                dev_dbg(dev, "%s alg registration rc = %x\n",
+                        t_alg->crypto_alg.cra_driver_name, rc);
                 if (unlikely(rc != 0)) {
-                        SSI_LOG_ERR("%s alg registration failed\n",
-                                    t_alg->crypto_alg.cra_driver_name);
+                        dev_err(dev, "%s alg registration failed\n",
+                                t_alg->crypto_alg.cra_driver_name);
                         kfree(t_alg);
                         goto fail0;
                 } else {
                         list_add_tail(&t_alg->entry,
                                       &ablkcipher_handle->blkcipher_alg_list);
-                        SSI_LOG_DEBUG("Registered %s\n",
-                                      t_alg->crypto_alg.cra_driver_name);
+                        dev_dbg(dev, "Registered %s\n",
+                                t_alg->crypto_alg.cra_driver_name);
                 }
         }
         return 0;
diff --git a/drivers/staging/ccree/ssi_cipher.h b/drivers/staging/ccree/ssi_cipher.h
index 296b375d5d89..25e6335c0d94 100644
--- a/drivers/staging/ccree/ssi_cipher.h
+++ b/drivers/staging/ccree/ssi_cipher.h
@@ -27,11 +27,11 @@
 #include "ssi_buffer_mgr.h"
 
 /* Crypto cipher flags */
-#define CC_CRYPTO_CIPHER_KEY_KFDE0    (1 << 0)
-#define CC_CRYPTO_CIPHER_KEY_KFDE1    (1 << 1)
-#define CC_CRYPTO_CIPHER_KEY_KFDE2    (1 << 2)
-#define CC_CRYPTO_CIPHER_KEY_KFDE3    (1 << 3)
-#define CC_CRYPTO_CIPHER_DU_SIZE_512B (1 << 4)
+#define CC_CRYPTO_CIPHER_KEY_KFDE0      BIT(0)
+#define CC_CRYPTO_CIPHER_KEY_KFDE1      BIT(1)
+#define CC_CRYPTO_CIPHER_KEY_KFDE2      BIT(2)
+#define CC_CRYPTO_CIPHER_KEY_KFDE3      BIT(3)
+#define CC_CRYPTO_CIPHER_DU_SIZE_512B   BIT(4)
 
 #define CC_CRYPTO_CIPHER_KEY_KFDE_MASK (CC_CRYPTO_CIPHER_KEY_KFDE0 | CC_CRYPTO_CIPHER_KEY_KFDE1 | CC_CRYPTO_CIPHER_KEY_KFDE2 | CC_CRYPTO_CIPHER_KEY_KFDE3)
 
@@ -43,6 +43,7 @@ struct blkcipher_req_ctx {
         u32 out_nents;
         u32 out_mlli_nents;
         u8 *backup_info; /*store iv for generated IV flow*/
+        u8 *iv;
         bool is_giv;
         struct mlli_params mlli_params;
 };
@@ -75,7 +76,7 @@ struct arm_hw_key_info {
 
 static inline bool ssi_is_hw_key(struct crypto_tfm *tfm)
 {
-        return 0;
+        return false;
 }
 
 #endif /* CRYPTO_TFM_REQ_HW_KEY */
diff --git a/drivers/staging/ccree/ssi_driver.c b/drivers/staging/ccree/ssi_driver.c
index 9c6f1200c130..1a3c481fa92a 100644
--- a/drivers/staging/ccree/ssi_driver.c
+++ b/drivers/staging/ccree/ssi_driver.c
@@ -74,70 +74,46 @@
 #include "ssi_fips.h"
 
 #ifdef DX_DUMP_BYTES
-void dump_byte_array(const char *name, const u8 *the_array, unsigned long size)
+void dump_byte_array(const char *name, const u8 *buf, size_t len)
 {
-        int i, line_offset = 0, ret = 0;
-        const u8 *cur_byte;
-        char line_buf[80];
+        char prefix[NAME_LEN];
 
-        if (!the_array) {
-                SSI_LOG_ERR("cannot dump array - NULL pointer\n");
+        if (!buf)
                 return;
-        }
 
-        ret = snprintf(line_buf, sizeof(line_buf), "%s[%lu]: ", name, size);
-        if (ret < 0) {
-                SSI_LOG_ERR("snprintf returned %d . aborting buffer array dump\n", ret);
-                return;
-        }
-        line_offset = ret;
-        for (i = 0, cur_byte = the_array;
-             (i < size) && (line_offset < sizeof(line_buf)); i++, cur_byte++) {
-                        ret = snprintf(line_buf + line_offset,
-                                       sizeof(line_buf) - line_offset,
-                                       "0x%02X ", *cur_byte);
-                if (ret < 0) {
-                        SSI_LOG_ERR("snprintf returned %d . aborting buffer array dump\n", ret);
-                        return;
-                }
-                line_offset += ret;
-                if (line_offset > 75) { /* Cut before line end */
-                        SSI_LOG_DEBUG("%s\n", line_buf);
-                        line_offset = 0;
-                }
-        }
+        snprintf(prefix, sizeof(prefix), "%s[%lu]: ", name, len);
 
-        if (line_offset > 0) /* Dump remaining line */
-                SSI_LOG_DEBUG("%s\n", line_buf);
+        print_hex_dump(KERN_DEBUG, prefix, DUMP_PREFIX_ADDRESS, 16, 1, len,
+                       false);
 }
 #endif
 
 static irqreturn_t cc_isr(int irq, void *dev_id)
 {
         struct ssi_drvdata *drvdata = (struct ssi_drvdata *)dev_id;
-        void __iomem *cc_base = drvdata->cc_base;
+        struct device *dev = drvdata_to_dev(drvdata);
         u32 irr;
         u32 imr;
 
         /* STAT_OP_TYPE_GENERIC STAT_PHASE_0: Interrupt */
 
         /* read the interrupt status */
-        irr = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRR));
-        SSI_LOG_DEBUG("Got IRR=0x%08X\n", irr);
+        irr = cc_ioread(drvdata, CC_REG(HOST_IRR));
+        dev_dbg(dev, "Got IRR=0x%08X\n", irr);
         if (unlikely(irr == 0)) { /* Probably shared interrupt line */
-                SSI_LOG_ERR("Got interrupt with empty IRR\n");
+                dev_err(dev, "Got interrupt with empty IRR\n");
                 return IRQ_NONE;
         }
-        imr = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IMR));
+        imr = cc_ioread(drvdata, CC_REG(HOST_IMR));
 
         /* clear interrupt - must be before processing events */
-        CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_ICR), irr);
+        cc_iowrite(drvdata, CC_REG(HOST_ICR), irr);
 
         drvdata->irq = irr;
         /* Completion interrupt - most probable */
         if (likely((irr & SSI_COMP_IRQ_MASK) != 0)) {
                 /* Mask AXI completion interrupt - will be unmasked in Deferred service handler */
-                CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IMR), imr | SSI_COMP_IRQ_MASK);
+                cc_iowrite(drvdata, CC_REG(HOST_IMR), imr | SSI_COMP_IRQ_MASK);
                 irr &= ~SSI_COMP_IRQ_MASK;
                 complete_request(drvdata);
         }
@@ -145,7 +121,7 @@ static irqreturn_t cc_isr(int irq, void *dev_id)
         /* TEE FIPS interrupt */
         if (likely((irr & SSI_GPR0_IRQ_MASK) != 0)) {
                 /* Mask interrupt - will be unmasked in Deferred service handler */
-                CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IMR), imr | SSI_GPR0_IRQ_MASK);
+                cc_iowrite(drvdata, CC_REG(HOST_IMR), imr | SSI_GPR0_IRQ_MASK);
                 irr &= ~SSI_GPR0_IRQ_MASK;
                 fips_handler(drvdata);
         }
@@ -155,14 +131,16 @@ static irqreturn_t cc_isr(int irq, void *dev_id)
                 u32 axi_err;
 
                 /* Read the AXI error ID */
-                axi_err = CC_HAL_READ_REGISTER(CC_REG_OFFSET(CRY_KERNEL, AXIM_MON_ERR));
-                SSI_LOG_DEBUG("AXI completion error: axim_mon_err=0x%08X\n", axi_err);
+                axi_err = cc_ioread(drvdata, CC_REG(AXIM_MON_ERR));
+                dev_dbg(dev, "AXI completion error: axim_mon_err=0x%08X\n",
+                        axi_err);
 
                 irr &= ~SSI_AXI_ERR_IRQ_MASK;
         }
 
         if (unlikely(irr != 0)) {
-                SSI_LOG_DEBUG("IRR includes unknown cause bits (0x%08X)\n", irr);
+                dev_dbg(dev, "IRR includes unknown cause bits (0x%08X)\n",
+                        irr);
                 /* Just warning */
         }
 
@@ -172,48 +150,48 @@ static irqreturn_t cc_isr(int irq, void *dev_id)
 int init_cc_regs(struct ssi_drvdata *drvdata, bool is_probe)
 {
         unsigned int val, cache_params;
-        void __iomem *cc_base = drvdata->cc_base;
+        struct device *dev = drvdata_to_dev(drvdata);
 
         /* Unmask all AXI interrupt sources AXI_CFG1 register */
-        val = CC_HAL_READ_REGISTER(CC_REG_OFFSET(CRY_KERNEL, AXIM_CFG));
-        CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(CRY_KERNEL, AXIM_CFG), val & ~SSI_AXI_IRQ_MASK);
-        SSI_LOG_DEBUG("AXIM_CFG=0x%08X\n", CC_HAL_READ_REGISTER(CC_REG_OFFSET(CRY_KERNEL, AXIM_CFG)));
+        val = cc_ioread(drvdata, CC_REG(AXIM_CFG));
+        cc_iowrite(drvdata, CC_REG(AXIM_CFG), val & ~SSI_AXI_IRQ_MASK);
+        dev_dbg(dev, "AXIM_CFG=0x%08X\n",
+                cc_ioread(drvdata, CC_REG(AXIM_CFG)));
 
         /* Clear all pending interrupts */
-        val = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRR));
-        SSI_LOG_DEBUG("IRR=0x%08X\n", val);
-        CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_ICR), val);
+        val = cc_ioread(drvdata, CC_REG(HOST_IRR));
+        dev_dbg(dev, "IRR=0x%08X\n", val);
+        cc_iowrite(drvdata, CC_REG(HOST_ICR), val);
 
         /* Unmask relevant interrupt cause */
-        val = (~(SSI_COMP_IRQ_MASK | SSI_AXI_ERR_IRQ_MASK | SSI_GPR0_IRQ_MASK));
-        CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IMR), val);
+        val = (unsigned int)(~(SSI_COMP_IRQ_MASK | SSI_AXI_ERR_IRQ_MASK |
+                               SSI_GPR0_IRQ_MASK));
+        cc_iowrite(drvdata, CC_REG(HOST_IMR), val);
 
 #ifdef DX_HOST_IRQ_TIMER_INIT_VAL_REG_OFFSET
 #ifdef DX_IRQ_DELAY
         /* Set CC IRQ delay */
-        CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRQ_TIMER_INIT_VAL),
-                              DX_IRQ_DELAY);
+        cc_iowrite(drvdata, CC_REG(HOST_IRQ_TIMER_INIT_VAL), DX_IRQ_DELAY);
 #endif
-        if (CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRQ_TIMER_INIT_VAL)) > 0) {
-                SSI_LOG_DEBUG("irq_delay=%d CC cycles\n",
-                              CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRQ_TIMER_INIT_VAL)));
+        if (cc_ioread(drvdata, CC_REG(HOST_IRQ_TIMER_INIT_VAL)) > 0) {
+                dev_dbg(dev, "irq_delay=%d CC cycles\n",
+                        cc_ioread(drvdata, CC_REG(HOST_IRQ_TIMER_INIT_VAL)));
         }
 #endif
 
         cache_params = (drvdata->coherent ? CC_COHERENT_CACHE_PARAMS : 0x0);
 
-        val = CC_HAL_READ_REGISTER(CC_REG_OFFSET(CRY_KERNEL, AXIM_CACHE_PARAMS));
+        val = cc_ioread(drvdata, CC_REG(AXIM_CACHE_PARAMS));
 
         if (is_probe)
-                SSI_LOG_INFO("Cache params previous: 0x%08X\n", val);
+                dev_info(dev, "Cache params previous: 0x%08X\n", val);
 
-        CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(CRY_KERNEL, AXIM_CACHE_PARAMS),
-                              cache_params);
-        val = CC_HAL_READ_REGISTER(CC_REG_OFFSET(CRY_KERNEL, AXIM_CACHE_PARAMS));
+        cc_iowrite(drvdata, CC_REG(AXIM_CACHE_PARAMS), cache_params);
+        val = cc_ioread(drvdata, CC_REG(AXIM_CACHE_PARAMS));
 
         if (is_probe)
-                SSI_LOG_INFO("Cache params current: 0x%08X (expect: 0x%08X)\n",
-                             val, cache_params);
+                dev_info(dev, "Cache params current: 0x%08X (expect: 0x%08X)\n",
+                         val, cache_params);
 
         return 0;
 }
@@ -222,181 +200,172 @@ static int init_cc_resources(struct platform_device *plat_dev)
 {
         struct resource *req_mem_cc_regs = NULL;
         void __iomem *cc_base = NULL;
-        bool irq_registered = false;
-        struct ssi_drvdata *new_drvdata = kzalloc(sizeof(*new_drvdata),
-                                                  GFP_KERNEL);
+        struct ssi_drvdata *new_drvdata;
         struct device *dev = &plat_dev->dev;
         struct device_node *np = dev->of_node;
         u32 signature_val;
+        dma_addr_t dma_mask;
         int rc = 0;
 
-        if (unlikely(!new_drvdata)) {
-                SSI_LOG_ERR("Failed to allocate drvdata");
-                rc = -ENOMEM;
-                goto init_cc_res_err;
-        }
+        new_drvdata = devm_kzalloc(dev, sizeof(*new_drvdata), GFP_KERNEL);
+        if (!new_drvdata)
+                return -ENOMEM;
+
+        platform_set_drvdata(plat_dev, new_drvdata);
+        new_drvdata->plat_dev = plat_dev;
 
         new_drvdata->clk = of_clk_get(np, 0);
         new_drvdata->coherent = of_dma_is_coherent(np);
 
-        /*Initialize inflight counter used in dx_ablkcipher_secure_complete used for count of BYSPASS blocks operations*/
-        new_drvdata->inflight_counter = 0;
-
-        dev_set_drvdata(&plat_dev->dev, new_drvdata);
         /* Get device resources */
         /* First CC registers space */
-        new_drvdata->res_mem = platform_get_resource(plat_dev, IORESOURCE_MEM, 0);
-        if (unlikely(!new_drvdata->res_mem)) {
-                SSI_LOG_ERR("Failed getting IO memory resource\n");
-                rc = -ENODEV;
-                goto init_cc_res_err;
-        }
-        SSI_LOG_DEBUG("Got MEM resource (%s): start=%pad end=%pad\n",
-                      new_drvdata->res_mem->name,
-                      new_drvdata->res_mem->start,
-                      new_drvdata->res_mem->end);
+        req_mem_cc_regs = platform_get_resource(plat_dev, IORESOURCE_MEM, 0);
         /* Map registers space */
-        req_mem_cc_regs = request_mem_region(new_drvdata->res_mem->start, resource_size(new_drvdata->res_mem), "arm_cc7x_regs");
-        if (unlikely(!req_mem_cc_regs)) {
-                SSI_LOG_ERR("Couldn't allocate registers memory region at "
-                             "0x%08X\n", (unsigned int)new_drvdata->res_mem->start);
-                rc = -EBUSY;
-                goto init_cc_res_err;
+        new_drvdata->cc_base = devm_ioremap_resource(dev, req_mem_cc_regs);
+        if (IS_ERR(new_drvdata->cc_base)) {
+                dev_err(dev, "Failed to ioremap registers");
+                return PTR_ERR(new_drvdata->cc_base);
         }
-        cc_base = ioremap(new_drvdata->res_mem->start, resource_size(new_drvdata->res_mem));
-        if (unlikely(!cc_base)) {
-                SSI_LOG_ERR("ioremap[CC](0x%08X,0x%08X) failed\n",
-                            (unsigned int)new_drvdata->res_mem->start,
-                            (unsigned int)resource_size(new_drvdata->res_mem));
-                rc = -ENOMEM;
-                goto init_cc_res_err;
-        }
-        SSI_LOG_DEBUG("CC registers mapped from %pa to 0x%p\n", &new_drvdata->res_mem->start, cc_base);
-        new_drvdata->cc_base = cc_base;
+
+        dev_dbg(dev, "Got MEM resource (%s): %pR\n", req_mem_cc_regs->name,
+                req_mem_cc_regs);
+        dev_dbg(dev, "CC registers mapped from %pa to 0x%p\n",
+                &req_mem_cc_regs->start, new_drvdata->cc_base);
+
+        cc_base = new_drvdata->cc_base;
 
         /* Then IRQ */
-        new_drvdata->res_irq = platform_get_resource(plat_dev, IORESOURCE_IRQ, 0);
-        if (unlikely(!new_drvdata->res_irq)) {
-                SSI_LOG_ERR("Failed getting IRQ resource\n");
-                rc = -ENODEV;
-                goto init_cc_res_err;
-        }
-        rc = request_irq(new_drvdata->res_irq->start, cc_isr,
-                         IRQF_SHARED, "arm_cc7x", new_drvdata);
-        if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("Could not register to interrupt %llu\n",
-                            (unsigned long long)new_drvdata->res_irq->start);
-                goto init_cc_res_err;
+        new_drvdata->irq = platform_get_irq(plat_dev, 0);
+        if (new_drvdata->irq < 0) {
+                dev_err(dev, "Failed getting IRQ resource\n");
+                return new_drvdata->irq;
         }
-        init_completion(&new_drvdata->icache_setup_completion);
 
-        irq_registered = true;
-        SSI_LOG_DEBUG("Registered to IRQ (%s) %llu\n",
-                      new_drvdata->res_irq->name,
-                      (unsigned long long)new_drvdata->res_irq->start);
+        rc = devm_request_irq(dev, new_drvdata->irq, cc_isr,
+                              IRQF_SHARED, "arm_cc7x", new_drvdata);
+        if (rc) {
+                dev_err(dev, "Could not register to interrupt %d\n",
+                        new_drvdata->irq);
+                return rc;
+        }
+        dev_dbg(dev, "Registered to IRQ: %d\n", new_drvdata->irq);
 
-        new_drvdata->plat_dev = plat_dev;
+        if (!plat_dev->dev.dma_mask)
+                plat_dev->dev.dma_mask = &plat_dev->dev.coherent_dma_mask;
 
-        rc = cc_clk_on(new_drvdata);
-        if (rc)
-                goto init_cc_res_err;
+        dma_mask = (dma_addr_t)(DMA_BIT_MASK(DMA_BIT_MASK_LEN));
+        while (dma_mask > 0x7fffffffUL) {
+                if (dma_supported(&plat_dev->dev, dma_mask)) {
+                        rc = dma_set_coherent_mask(&plat_dev->dev, dma_mask);
+                        if (!rc)
+                                break;
+                }
+                dma_mask >>= 1;
+        }
 
-        if (!new_drvdata->plat_dev->dev.dma_mask)
-                new_drvdata->plat_dev->dev.dma_mask = &new_drvdata->plat_dev->dev.coherent_dma_mask;
+        if (rc) {
+                dev_err(dev, "Failed in dma_set_mask, mask=%par\n",
+                        &dma_mask);
+                return rc;
+        }
 
-        if (!new_drvdata->plat_dev->dev.coherent_dma_mask)
-                new_drvdata->plat_dev->dev.coherent_dma_mask = DMA_BIT_MASK(DMA_BIT_MASK_LEN);
+        rc = cc_clk_on(new_drvdata);
+        if (rc) {
+                dev_err(dev, "Failed to enable clock");
+                return rc;
+        }
 
         /* Verify correct mapping */
-        signature_val = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_SIGNATURE));
+        signature_val = cc_ioread(new_drvdata, CC_REG(HOST_SIGNATURE));
         if (signature_val != DX_DEV_SIGNATURE) {
-                SSI_LOG_ERR("Invalid CC signature: SIGNATURE=0x%08X != expected=0x%08X\n",
-                            signature_val, (u32)DX_DEV_SIGNATURE);
+                dev_err(dev, "Invalid CC signature: SIGNATURE=0x%08X != expected=0x%08X\n",
+                        signature_val, (u32)DX_DEV_SIGNATURE);
                 rc = -EINVAL;
-                goto init_cc_res_err;
+                goto post_clk_err;
         }
-        SSI_LOG_DEBUG("CC SIGNATURE=0x%08X\n", signature_val);
+        dev_dbg(dev, "CC SIGNATURE=0x%08X\n", signature_val);
 
         /* Display HW versions */
-        SSI_LOG(KERN_INFO, "ARM CryptoCell %s Driver: HW version 0x%08X, Driver version %s\n", SSI_DEV_NAME_STR,
-                CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_VERSION)), DRV_MODULE_VERSION);
+        dev_info(dev, "ARM CryptoCell %s Driver: HW version 0x%08X, Driver version %s\n",
+                 SSI_DEV_NAME_STR,
+                 cc_ioread(new_drvdata, CC_REG(HOST_VERSION)),
+                 DRV_MODULE_VERSION);
 
         rc = init_cc_regs(new_drvdata, true);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("init_cc_regs failed\n");
-                goto init_cc_res_err;
+                dev_err(dev, "init_cc_regs failed\n");
+                goto post_clk_err;
         }
 
 #ifdef ENABLE_CC_SYSFS
-        rc = ssi_sysfs_init(&plat_dev->dev.kobj, new_drvdata);
+        rc = ssi_sysfs_init(&dev->kobj, new_drvdata);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("init_stat_db failed\n");
-                goto init_cc_res_err;
+                dev_err(dev, "init_stat_db failed\n");
+                goto post_regs_err;
         }
 #endif
 
+        rc = ssi_fips_init(new_drvdata);
+        if (unlikely(rc != 0)) {
+                dev_err(dev, "SSI_FIPS_INIT failed 0x%x\n", rc);
+                goto post_sysfs_err;
+        }
         rc = ssi_sram_mgr_init(new_drvdata);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("ssi_sram_mgr_init failed\n");
-                goto init_cc_res_err;
+                dev_err(dev, "ssi_sram_mgr_init failed\n");
+                goto post_fips_init_err;
         }
 
         new_drvdata->mlli_sram_addr =
                 ssi_sram_mgr_alloc(new_drvdata, MAX_MLLI_BUFF_SIZE);
         if (unlikely(new_drvdata->mlli_sram_addr == NULL_SRAM_ADDR)) {
-                SSI_LOG_ERR("Failed to alloc MLLI Sram buffer\n");
+                dev_err(dev, "Failed to alloc MLLI Sram buffer\n");
                 rc = -ENOMEM;
-                goto init_cc_res_err;
+                goto post_sram_mgr_err;
         }
 
         rc = request_mgr_init(new_drvdata);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("request_mgr_init failed\n");
-                goto init_cc_res_err;
+                dev_err(dev, "request_mgr_init failed\n");
+                goto post_sram_mgr_err;
         }
 
         rc = ssi_buffer_mgr_init(new_drvdata);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("buffer_mgr_init failed\n");
-                goto init_cc_res_err;
+                dev_err(dev, "buffer_mgr_init failed\n");
+                goto post_req_mgr_err;
         }
 
         rc = ssi_power_mgr_init(new_drvdata);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("ssi_power_mgr_init failed\n");
-                goto init_cc_res_err;
-        }
-
-        rc = ssi_fips_init(new_drvdata);
-        if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("SSI_FIPS_INIT failed 0x%x\n", rc);
-                goto init_cc_res_err;
+                dev_err(dev, "ssi_power_mgr_init failed\n");
+                goto post_buf_mgr_err;
         }
 
         rc = ssi_ivgen_init(new_drvdata);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("ssi_ivgen_init failed\n");
-                goto init_cc_res_err;
+                dev_err(dev, "ssi_ivgen_init failed\n");
+                goto post_power_mgr_err;
         }
 
         /* Allocate crypto algs */
         rc = ssi_ablkcipher_alloc(new_drvdata);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("ssi_ablkcipher_alloc failed\n");
-                goto init_cc_res_err;
+                dev_err(dev, "ssi_ablkcipher_alloc failed\n");
+                goto post_ivgen_err;
         }
 
         /* hash must be allocated before aead since hash exports APIs */
         rc = ssi_hash_alloc(new_drvdata);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("ssi_hash_alloc failed\n");
-                goto init_cc_res_err;
+                dev_err(dev, "ssi_hash_alloc failed\n");
+                goto post_cipher_err;
         }
 
         rc = ssi_aead_alloc(new_drvdata);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("ssi_aead_alloc failed\n");
-                goto init_cc_res_err;
+                dev_err(dev, "ssi_aead_alloc failed\n");
+                goto post_hash_err;
         }
 
         /* If we got here and FIPS mode is enabled
@@ -407,52 +376,43 @@ static int init_cc_resources(struct platform_device *plat_dev)
 
         return 0;
 
-init_cc_res_err:
-        SSI_LOG_ERR("Freeing CC HW resources!\n");
-
-        if (new_drvdata) {
-                ssi_aead_free(new_drvdata);
-                ssi_hash_free(new_drvdata);
-                ssi_ablkcipher_free(new_drvdata);
-                ssi_ivgen_fini(new_drvdata);
-                ssi_power_mgr_fini(new_drvdata);
-                ssi_buffer_mgr_fini(new_drvdata);
-                request_mgr_fini(new_drvdata);
-                ssi_sram_mgr_fini(new_drvdata);
-                ssi_fips_fini(new_drvdata);
+post_hash_err:
+        ssi_hash_free(new_drvdata);
+post_cipher_err:
+        ssi_ablkcipher_free(new_drvdata);
+post_ivgen_err:
+        ssi_ivgen_fini(new_drvdata);
+post_power_mgr_err:
+        ssi_power_mgr_fini(new_drvdata);
+post_buf_mgr_err:
+         ssi_buffer_mgr_fini(new_drvdata);
+post_req_mgr_err:
+        request_mgr_fini(new_drvdata);
+post_sram_mgr_err:
+        ssi_sram_mgr_fini(new_drvdata);
+post_fips_init_err:
+        ssi_fips_fini(new_drvdata);
+post_sysfs_err:
 #ifdef ENABLE_CC_SYSFS
-                ssi_sysfs_fini();
+        ssi_sysfs_fini();
 #endif
-
-                if (req_mem_cc_regs) {
-                        if (irq_registered) {
-                                free_irq(new_drvdata->res_irq->start, new_drvdata);
-                                new_drvdata->res_irq = NULL;
-                                iounmap(cc_base);
-                                new_drvdata->cc_base = NULL;
-                        }
-                        release_mem_region(new_drvdata->res_mem->start,
-                                           resource_size(new_drvdata->res_mem));
-                        new_drvdata->res_mem = NULL;
-                }
-                kfree(new_drvdata);
-                dev_set_drvdata(&plat_dev->dev, NULL);
-        }
-
+post_regs_err:
+        fini_cc_regs(new_drvdata);
+post_clk_err:
+        cc_clk_off(new_drvdata);
         return rc;
 }
 
 void fini_cc_regs(struct ssi_drvdata *drvdata)
 {
         /* Mask all interrupts */
-        WRITE_REGISTER(drvdata->cc_base +
-                       CC_REG_OFFSET(HOST_RGF, HOST_IMR), 0xFFFFFFFF);
+        cc_iowrite(drvdata, CC_REG(HOST_IMR), 0xFFFFFFFF);
 }
 
 static void cleanup_cc_resources(struct platform_device *plat_dev)
 {
         struct ssi_drvdata *drvdata =
-                (struct ssi_drvdata *)dev_get_drvdata(&plat_dev->dev);
+                (struct ssi_drvdata *)platform_get_drvdata(plat_dev);
 
         ssi_aead_free(drvdata);
         ssi_hash_free(drvdata);
@@ -466,22 +426,8 @@ static void cleanup_cc_resources(struct platform_device *plat_dev)
 #ifdef ENABLE_CC_SYSFS
         ssi_sysfs_fini();
 #endif
-
         fini_cc_regs(drvdata);
         cc_clk_off(drvdata);
-        free_irq(drvdata->res_irq->start, drvdata);
-        drvdata->res_irq = NULL;
-
-        if (drvdata->cc_base) {
-                iounmap(drvdata->cc_base);
-                release_mem_region(drvdata->res_mem->start,
-                                   resource_size(drvdata->res_mem));
-                drvdata->cc_base = NULL;
-                drvdata->res_mem = NULL;
-        }
-
-        kfree(drvdata);
-        dev_set_drvdata(&plat_dev->dev, NULL);
 }
 
 int cc_clk_on(struct ssi_drvdata *drvdata)
@@ -514,18 +460,19 @@ void cc_clk_off(struct ssi_drvdata *drvdata)
 static int cc7x_probe(struct platform_device *plat_dev)
 {
         int rc;
+        struct device *dev = &plat_dev->dev;
 #if defined(CONFIG_ARM) && defined(CC_DEBUG)
         u32 ctr, cacheline_size;
 
         asm volatile("mrc p15, 0, %0, c0, c0, 1" : "=r" (ctr));
         cacheline_size =  4 << ((ctr >> 16) & 0xf);
-        SSI_LOG_DEBUG("CP15(L1_CACHE_BYTES) = %u , Kconfig(L1_CACHE_BYTES) = %u\n",
-                      cacheline_size, L1_CACHE_BYTES);
+        dev_dbg(dev, "CP15(L1_CACHE_BYTES) = %u , Kconfig(L1_CACHE_BYTES) = %u\n",
+                cacheline_size, L1_CACHE_BYTES);
 
         asm volatile("mrc p15, 0, %0, c0, c0, 0" : "=r" (ctr));
-        SSI_LOG_DEBUG("Main ID register (MIDR): Implementer 0x%02X, Arch 0x%01X, Part 0x%03X, Rev r%dp%d\n",
-                      (ctr >> 24), (ctr >> 16) & 0xF, (ctr >> 4) & 0xFFF,
-                      (ctr >> 20) & 0xF, ctr & 0xF);
+        dev_dbg(dev, "Main ID register (MIDR): Implementer 0x%02X, Arch 0x%01X, Part 0x%03X, Rev r%dp%d\n",
+                (ctr >> 24), (ctr >> 16) & 0xF, (ctr >> 4) & 0xFFF,
+                (ctr >> 20) & 0xF, ctr & 0xF);
 #endif
 
         /* Map registers space */
@@ -533,18 +480,20 @@ static int cc7x_probe(struct platform_device *plat_dev)
         if (rc != 0)
                 return rc;
 
-        SSI_LOG(KERN_INFO, "ARM cc7x_ree device initialized\n");
+        dev_info(dev, "ARM ccree device initialized\n");
 
         return 0;
 }
 
 static int cc7x_remove(struct platform_device *plat_dev)
 {
-        SSI_LOG_DEBUG("Releasing cc7x resources...\n");
+        struct device *dev = &plat_dev->dev;
+
+        dev_dbg(dev, "Releasing cc7x resources...\n");
 
         cleanup_cc_resources(plat_dev);
 
-        SSI_LOG(KERN_INFO, "ARM cc7x_ree device terminated\n");
+        dev_info(dev, "ARM ccree device terminated\n");
 
         return 0;
 }
diff --git a/drivers/staging/ccree/ssi_driver.h b/drivers/staging/ccree/ssi_driver.h
index b6ad89ae9bee..94c755cafb47 100644
--- a/drivers/staging/ccree/ssi_driver.h
+++ b/drivers/staging/ccree/ssi_driver.h
@@ -37,13 +37,11 @@
 #include <crypto/hash.h>
 #include <linux/version.h>
 #include <linux/clk.h>
+#include <linux/platform_device.h>
 
 /* Registers definitions from shared/hw/ree_include */
-#include "dx_reg_base_host.h"
 #include "dx_host.h"
-#include "cc_regs.h"
 #include "dx_reg_common.h"
-#include "cc_hal.h"
 #define CC_SUPPORT_SHA DX_DEV_SHA_MAX
 #include "cc_crypto_ctx.h"
 #include "ssi_sysfs.h"
@@ -68,12 +66,19 @@
 #define SSI_AXI_IRQ_MASK ((1 << DX_AXIM_CFG_BRESPMASK_BIT_SHIFT) | (1 << DX_AXIM_CFG_RRESPMASK_BIT_SHIFT) |     \
                         (1 << DX_AXIM_CFG_INFLTMASK_BIT_SHIFT) | (1 << DX_AXIM_CFG_COMPMASK_BIT_SHIFT))
 
-#define SSI_AXI_ERR_IRQ_MASK (1 << DX_HOST_IRR_AXI_ERR_INT_BIT_SHIFT)
+#define SSI_AXI_ERR_IRQ_MASK BIT(DX_HOST_IRR_AXI_ERR_INT_BIT_SHIFT)
 
-#define SSI_COMP_IRQ_MASK (1 << DX_HOST_IRR_AXIM_COMP_INT_BIT_SHIFT)
+#define SSI_COMP_IRQ_MASK BIT(DX_HOST_IRR_AXIM_COMP_INT_BIT_SHIFT)
+
+#define AXIM_MON_COMP_VALUE GENMASK(DX_AXIM_MON_COMP_VALUE_BIT_SIZE + \
+                                    DX_AXIM_MON_COMP_VALUE_BIT_SHIFT, \
+                                    DX_AXIM_MON_COMP_VALUE_BIT_SHIFT)
+
+/* Register name mangling macro */
+#define CC_REG(reg_name) DX_ ## reg_name ## _REG_OFFSET
 
 /* TEE FIPS status interrupt */
-#define SSI_GPR0_IRQ_MASK (1 << DX_HOST_IRR_GPR0_BIT_SHIFT)
+#define SSI_GPR0_IRQ_MASK BIT(DX_HOST_IRR_GPR0_BIT_SHIFT)
 
 #define SSI_CRA_PRIO 3000
 
@@ -90,19 +95,6 @@
  * field in the HW descriptor. The DMA engine +8 that value.
  */
 
-/* Logging macros */
-#define SSI_LOG(level, format, ...) \
-        printk(level "cc715ree::%s: " format, __func__, ##__VA_ARGS__)
-#define SSI_LOG_ERR(format, ...) SSI_LOG(KERN_ERR, format, ##__VA_ARGS__)
-#define SSI_LOG_WARNING(format, ...) SSI_LOG(KERN_WARNING, format, ##__VA_ARGS__)
-#define SSI_LOG_NOTICE(format, ...) SSI_LOG(KERN_NOTICE, format, ##__VA_ARGS__)
-#define SSI_LOG_INFO(format, ...) SSI_LOG(KERN_INFO, format, ##__VA_ARGS__)
-#ifdef CC_DEBUG
-#define SSI_LOG_DEBUG(format, ...) SSI_LOG(KERN_DEBUG, format, ##__VA_ARGS__)
-#else /* Debug log messages are removed at compile time for non-DEBUG config. */
-#define SSI_LOG_DEBUG(format, ...) do {} while (0)
-#endif
-
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 
@@ -128,10 +120,8 @@ struct ssi_crypto_req {
  * @fw_ver:     SeP loaded firmware version
  */
 struct ssi_drvdata {
-        struct resource *res_mem;
-        struct resource *res_irq;
         void __iomem *cc_base;
-        unsigned int irq;
+        int irq;
         u32 irq_mask;
         u32 fw_ver;
         /* Calibration time of start/stop
@@ -140,7 +130,6 @@ struct ssi_drvdata {
         u32 monitor_null_cycles;
         struct platform_device *plat_dev;
         ssi_sram_addr_t mlli_sram_addr;
-        struct completion icache_setup_completion;
         void *buff_mgr_handle;
         void *hash_handle;
         void *aead_handle;
@@ -149,7 +138,6 @@ struct ssi_drvdata {
         void *fips_handle;
         void *ivgen_handle;
         void *sram_mgr_handle;
-        u32 inflight_counter;
         struct clk *clk;
         bool coherent;
 };
@@ -187,11 +175,16 @@ struct async_gen_req_ctx {
         enum drv_crypto_direction op_type;
 };
 
+static inline struct device *drvdata_to_dev(struct ssi_drvdata *drvdata)
+{
+        return &drvdata->plat_dev->dev;
+}
+
 #ifdef DX_DUMP_BYTES
 void dump_byte_array(const char *name, const u8 *the_array, unsigned long size);
 #else
-#define dump_byte_array(name, array, size) do { \
-} while (0);
+static inline void dump_byte_array(const char *name, const u8 *the_array,
+                                   unsigned long size) {};
 #endif
 
 int init_cc_regs(struct ssi_drvdata *drvdata, bool is_probe);
@@ -199,5 +192,15 @@ void fini_cc_regs(struct ssi_drvdata *drvdata);
 int cc_clk_on(struct ssi_drvdata *drvdata);
 void cc_clk_off(struct ssi_drvdata *drvdata);
 
+static inline void cc_iowrite(struct ssi_drvdata *drvdata, u32 reg, u32 val)
+{
+        iowrite32(val, (drvdata->cc_base + reg));
+}
+
+static inline u32 cc_ioread(struct ssi_drvdata *drvdata, u32 reg)
+{
+        return ioread32(drvdata->cc_base + reg);
+}
+
 #endif /*__SSI_DRIVER_H__*/
 
diff --git a/drivers/staging/ccree/ssi_fips.c b/drivers/staging/ccree/ssi_fips.c
index 33d53d64603d..4aea99fa129f 100644
--- a/drivers/staging/ccree/ssi_fips.c
+++ b/drivers/staging/ccree/ssi_fips.c
@@ -19,7 +19,6 @@
 
 #include "ssi_config.h"
 #include "ssi_driver.h"
-#include "cc_hal.h"
 #include "ssi_fips.h"
 
 static void fips_dsr(unsigned long devarg);
@@ -34,9 +33,8 @@ struct ssi_fips_handle {
 static bool cc_get_tee_fips_status(struct ssi_drvdata *drvdata)
 {
         u32 reg;
-        void __iomem *cc_base = drvdata->cc_base;
 
-        reg = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, GPR_HOST));
+        reg = cc_ioread(drvdata, CC_REG(GPR_HOST));
         return (reg == (CC_FIPS_SYNC_TEE_STATUS | CC_FIPS_SYNC_MODULE_OK));
 }
 
@@ -46,12 +44,11 @@ static bool cc_get_tee_fips_status(struct ssi_drvdata *drvdata)
  */
 void cc_set_ree_fips_status(struct ssi_drvdata *drvdata, bool status)
 {
-        void __iomem *cc_base = drvdata->cc_base;
         int val = CC_FIPS_SYNC_REE_STATUS;
 
         val |= (status ? CC_FIPS_SYNC_MODULE_OK : CC_FIPS_SYNC_MODULE_ERROR);
 
-        CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_GPR0), val);
+        cc_iowrite(drvdata, CC_REG(HOST_GPR0), val);
 }
 
 void ssi_fips_fini(struct ssi_drvdata *drvdata)
@@ -76,41 +73,42 @@ void fips_handler(struct ssi_drvdata *drvdata)
         tasklet_schedule(&fips_handle_ptr->tasklet);
 }
 
-static inline void tee_fips_error(void)
+static inline void tee_fips_error(struct device *dev)
 {
         if (fips_enabled)
                 panic("ccree: TEE reported cryptographic error in fips mode!\n");
         else
-                SSI_LOG_ERR("TEE reported error!\n");
+                dev_err(dev, "TEE reported error!\n");
 }
 
 /* Deferred service handler, run as interrupt-fired tasklet */
 static void fips_dsr(unsigned long devarg)
 {
         struct ssi_drvdata *drvdata = (struct ssi_drvdata *)devarg;
-        void __iomem *cc_base = drvdata->cc_base;
+        struct device *dev = drvdata_to_dev(drvdata);
         u32 irq, state, val;
 
         irq = (drvdata->irq & (SSI_GPR0_IRQ_MASK));
 
         if (irq) {
-                state = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, GPR_HOST));
+                state = cc_ioread(drvdata, CC_REG(GPR_HOST));
 
                 if (state != (CC_FIPS_SYNC_TEE_STATUS | CC_FIPS_SYNC_MODULE_OK))
-                        tee_fips_error();
+                        tee_fips_error(dev);
         }
 
         /* after verifing that there is nothing to do,
          * unmask AXI completion interrupt.
          */
-        val = (CC_REG_OFFSET(HOST_RGF, HOST_IMR) & ~irq);
-        CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IMR), val);
+        val = (CC_REG(HOST_IMR) & ~irq);
+        cc_iowrite(drvdata, CC_REG(HOST_IMR), val);
 }
 
 /* The function called once at driver entry point .*/
 int ssi_fips_init(struct ssi_drvdata *p_drvdata)
 {
         struct ssi_fips_handle *fips_h;
+        struct device *dev = drvdata_to_dev(p_drvdata);
 
         fips_h = kzalloc(sizeof(*fips_h), GFP_KERNEL);
         if (!fips_h)
@@ -118,11 +116,11 @@ int ssi_fips_init(struct ssi_drvdata *p_drvdata)
 
         p_drvdata->fips_handle = fips_h;
 
-        SSI_LOG_DEBUG("Initializing fips tasklet\n");
+        dev_dbg(dev, "Initializing fips tasklet\n");
         tasklet_init(&fips_h->tasklet, fips_dsr, (unsigned long)p_drvdata);
 
         if (!cc_get_tee_fips_status(p_drvdata))
-                tee_fips_error();
+                tee_fips_error(dev);
 
         return 0;
 }
diff --git a/drivers/staging/ccree/ssi_fips.h b/drivers/staging/ccree/ssi_fips.h
index 369ddf9478e7..63bcca7f3af9 100644
--- a/drivers/staging/ccree/ssi_fips.h
+++ b/drivers/staging/ccree/ssi_fips.h
@@ -40,8 +40,8 @@ static inline int ssi_fips_init(struct ssi_drvdata *p_drvdata)
 }
 
 static inline void ssi_fips_fini(struct ssi_drvdata *drvdata) {}
-void cc_set_ree_fips_status(struct ssi_drvdata *drvdata, bool ok) {}
-void fips_handler(struct ssi_drvdata *drvdata) {}
+static inline void cc_set_ree_fips_status(struct ssi_drvdata *drvdata, bool ok) {}
+static inline void fips_handler(struct ssi_drvdata *drvdata) {}
 
 #endif /* CONFIG_CRYPTO_FIPS */
 
diff --git a/drivers/staging/ccree/ssi_hash.c b/drivers/staging/ccree/ssi_hash.c
index 13291aeaf350..d79090ed7f9c 100644
--- a/drivers/staging/ccree/ssi_hash.c
+++ b/drivers/staging/ccree/ssi_hash.c
@@ -134,14 +134,13 @@ static int ssi_hash_map_result(struct device *dev,
                                digestsize,
                                DMA_BIDIRECTIONAL);
         if (unlikely(dma_mapping_error(dev, state->digest_result_dma_addr))) {
-                SSI_LOG_ERR("Mapping digest result buffer %u B for DMA failed\n",
-                            digestsize);
+                dev_err(dev, "Mapping digest result buffer %u B for DMA failed\n",
+                        digestsize);
                 return -ENOMEM;
         }
-        SSI_LOG_DEBUG("Mapped digest result buffer %u B "
-                     "at va=%pK to dma=%pad\n",
+        dev_dbg(dev, "Mapped digest result buffer %u B at va=%pK to dma=%pad\n",
                 digestsize, state->digest_result_buff,
-                state->digest_result_dma_addr);
+                &state->digest_result_dma_addr);
 
         return 0;
 }
@@ -158,54 +157,50 @@ static int ssi_hash_map_request(struct device *dev,
         int rc = -ENOMEM;
 
         state->buff0 = kzalloc(SSI_MAX_HASH_BLCK_SIZE, GFP_KERNEL | GFP_DMA);
-        if (!state->buff0) {
-                SSI_LOG_ERR("Allocating buff0 in context failed\n");
+        if (!state->buff0)
                 goto fail0;
-        }
+
         state->buff1 = kzalloc(SSI_MAX_HASH_BLCK_SIZE, GFP_KERNEL | GFP_DMA);
-        if (!state->buff1) {
-                SSI_LOG_ERR("Allocating buff1 in context failed\n");
+        if (!state->buff1)
                 goto fail_buff0;
-        }
+
         state->digest_result_buff = kzalloc(SSI_MAX_HASH_DIGEST_SIZE, GFP_KERNEL | GFP_DMA);
-        if (!state->digest_result_buff) {
-                SSI_LOG_ERR("Allocating digest_result_buff in context failed\n");
+        if (!state->digest_result_buff)
                 goto fail_buff1;
-        }
+
         state->digest_buff = kzalloc(ctx->inter_digestsize, GFP_KERNEL | GFP_DMA);
-        if (!state->digest_buff) {
-                SSI_LOG_ERR("Allocating digest-buffer in context failed\n");
+        if (!state->digest_buff)
                 goto fail_digest_result_buff;
-        }
 
-        SSI_LOG_DEBUG("Allocated digest-buffer in context ctx->digest_buff=@%p\n", state->digest_buff);
+        dev_dbg(dev, "Allocated digest-buffer in context ctx->digest_buff=@%p\n",
+                state->digest_buff);
         if (ctx->hw_mode != DRV_CIPHER_XCBC_MAC) {
                 state->digest_bytes_len = kzalloc(HASH_LEN_SIZE, GFP_KERNEL | GFP_DMA);
-                if (!state->digest_bytes_len) {
-                        SSI_LOG_ERR("Allocating digest-bytes-len in context failed\n");
+                if (!state->digest_bytes_len)
                         goto fail1;
-                }
-                SSI_LOG_DEBUG("Allocated digest-bytes-len in context state->>digest_bytes_len=@%p\n", state->digest_bytes_len);
+
+                dev_dbg(dev, "Allocated digest-bytes-len in context state->>digest_bytes_len=@%p\n",
+                        state->digest_bytes_len);
         } else {
                 state->digest_bytes_len = NULL;
         }
 
         state->opad_digest_buff = kzalloc(ctx->inter_digestsize, GFP_KERNEL | GFP_DMA);
-        if (!state->opad_digest_buff) {
-                SSI_LOG_ERR("Allocating opad-digest-buffer in context failed\n");
+        if (!state->opad_digest_buff)
                 goto fail2;
-        }
-        SSI_LOG_DEBUG("Allocated opad-digest-buffer in context state->digest_bytes_len=@%p\n", state->opad_digest_buff);
+
+        dev_dbg(dev, "Allocated opad-digest-buffer in context state->digest_bytes_len=@%p\n",
+                state->opad_digest_buff);
 
         state->digest_buff_dma_addr = dma_map_single(dev, (void *)state->digest_buff, ctx->inter_digestsize, DMA_BIDIRECTIONAL);
         if (dma_mapping_error(dev, state->digest_buff_dma_addr)) {
-                SSI_LOG_ERR("Mapping digest len %d B at va=%pK for DMA failed\n",
-                            ctx->inter_digestsize, state->digest_buff);
+                dev_err(dev, "Mapping digest len %d B at va=%pK for DMA failed\n",
+                        ctx->inter_digestsize, state->digest_buff);
                 goto fail3;
         }
-        SSI_LOG_DEBUG("Mapped digest %d B at va=%pK to dma=%pad\n",
-                      ctx->inter_digestsize, state->digest_buff,
-                      state->digest_buff_dma_addr);
+        dev_dbg(dev, "Mapped digest %d B at va=%pK to dma=%pad\n",
+                ctx->inter_digestsize, state->digest_buff,
+                &state->digest_buff_dma_addr);
 
         if (is_hmac) {
                 dma_sync_single_for_cpu(dev, ctx->digest_buff_dma_addr, ctx->inter_digestsize, DMA_BIDIRECTIONAL);
@@ -240,7 +235,7 @@ static int ssi_hash_map_request(struct device *dev,
 
                 rc = send_request(ctx->drvdata, &ssi_req, &desc, 1, 0);
                 if (unlikely(rc != 0)) {
-                        SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                        dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                         goto fail4;
                 }
         }
@@ -248,13 +243,13 @@ static int ssi_hash_map_request(struct device *dev,
         if (ctx->hw_mode != DRV_CIPHER_XCBC_MAC) {
                 state->digest_bytes_len_dma_addr = dma_map_single(dev, (void *)state->digest_bytes_len, HASH_LEN_SIZE, DMA_BIDIRECTIONAL);
                 if (dma_mapping_error(dev, state->digest_bytes_len_dma_addr)) {
-                        SSI_LOG_ERR("Mapping digest len %u B at va=%pK for DMA failed\n",
-                                    HASH_LEN_SIZE, state->digest_bytes_len);
+                        dev_err(dev, "Mapping digest len %u B at va=%pK for DMA failed\n",
+                                HASH_LEN_SIZE, state->digest_bytes_len);
                         goto fail4;
                 }
-                SSI_LOG_DEBUG("Mapped digest len %u B at va=%pK to dma=%pad\n",
-                              HASH_LEN_SIZE, state->digest_bytes_len,
-                              state->digest_bytes_len_dma_addr);
+                dev_dbg(dev, "Mapped digest len %u B at va=%pK to dma=%pad\n",
+                        HASH_LEN_SIZE, state->digest_bytes_len,
+                        &state->digest_bytes_len_dma_addr);
         } else {
                 state->digest_bytes_len_dma_addr = 0;
         }
@@ -262,14 +257,14 @@ static int ssi_hash_map_request(struct device *dev,
         if (is_hmac && ctx->hash_mode != DRV_HASH_NULL) {
                 state->opad_digest_dma_addr = dma_map_single(dev, (void *)state->opad_digest_buff, ctx->inter_digestsize, DMA_BIDIRECTIONAL);
                 if (dma_mapping_error(dev, state->opad_digest_dma_addr)) {
-                        SSI_LOG_ERR("Mapping opad digest %d B at va=%pK for DMA failed\n",
-                                    ctx->inter_digestsize,
-                                    state->opad_digest_buff);
+                        dev_err(dev, "Mapping opad digest %d B at va=%pK for DMA failed\n",
+                                ctx->inter_digestsize,
+                                state->opad_digest_buff);
                         goto fail5;
                 }
-                SSI_LOG_DEBUG("Mapped opad digest %d B at va=%pK to dma=%pad\n",
-                              ctx->inter_digestsize, state->opad_digest_buff,
-                              state->opad_digest_dma_addr);
+                dev_dbg(dev, "Mapped opad digest %d B at va=%pK to dma=%pad\n",
+                        ctx->inter_digestsize, state->opad_digest_buff,
+                        &state->opad_digest_dma_addr);
         } else {
                 state->opad_digest_dma_addr = 0;
         }
@@ -316,22 +311,22 @@ static void ssi_hash_unmap_request(struct device *dev,
         if (state->digest_buff_dma_addr != 0) {
                 dma_unmap_single(dev, state->digest_buff_dma_addr,
                                  ctx->inter_digestsize, DMA_BIDIRECTIONAL);
-                SSI_LOG_DEBUG("Unmapped digest-buffer: digest_buff_dma_addr=%pad\n",
-                              state->digest_buff_dma_addr);
+                dev_dbg(dev, "Unmapped digest-buffer: digest_buff_dma_addr=%pad\n",
+                        &state->digest_buff_dma_addr);
                 state->digest_buff_dma_addr = 0;
         }
         if (state->digest_bytes_len_dma_addr != 0) {
                 dma_unmap_single(dev, state->digest_bytes_len_dma_addr,
                                  HASH_LEN_SIZE, DMA_BIDIRECTIONAL);
-                SSI_LOG_DEBUG("Unmapped digest-bytes-len buffer: digest_bytes_len_dma_addr=%pad\n",
-                              state->digest_bytes_len_dma_addr);
+                dev_dbg(dev, "Unmapped digest-bytes-len buffer: digest_bytes_len_dma_addr=%pad\n",
+                        &state->digest_bytes_len_dma_addr);
                 state->digest_bytes_len_dma_addr = 0;
         }
         if (state->opad_digest_dma_addr != 0) {
                 dma_unmap_single(dev, state->opad_digest_dma_addr,
                                  ctx->inter_digestsize, DMA_BIDIRECTIONAL);
-                SSI_LOG_DEBUG("Unmapped opad-digest: opad_digest_dma_addr=%pad\n",
-                              state->opad_digest_dma_addr);
+                dev_dbg(dev, "Unmapped opad-digest: opad_digest_dma_addr=%pad\n",
+                        &state->opad_digest_dma_addr);
                 state->opad_digest_dma_addr = 0;
         }
 
@@ -352,11 +347,9 @@ static void ssi_hash_unmap_result(struct device *dev,
                                  state->digest_result_dma_addr,
                                  digestsize,
                                   DMA_BIDIRECTIONAL);
-                SSI_LOG_DEBUG("unmpa digest result buffer "
-                             "va (%pK) pa (%pad) len %u\n",
-                             state->digest_result_buff,
-                             state->digest_result_dma_addr,
-                             digestsize);
+                dev_dbg(dev, "unmpa digest result buffer va (%pK) pa (%pad) len %u\n",
+                        state->digest_result_buff,
+                        &state->digest_result_dma_addr, digestsize);
                 memcpy(result,
                        state->digest_result_buff,
                        digestsize);
@@ -369,7 +362,7 @@ static void ssi_hash_update_complete(struct device *dev, void *ssi_req, void __i
         struct ahash_request *req = (struct ahash_request *)ssi_req;
         struct ahash_req_ctx *state = ahash_request_ctx(req);
 
-        SSI_LOG_DEBUG("req=%pK\n", req);
+        dev_dbg(dev, "req=%pK\n", req);
 
         ssi_buffer_mgr_unmap_hash_request(dev, state, req->src, false);
         req->base.complete(&req->base, 0);
@@ -383,7 +376,7 @@ static void ssi_hash_digest_complete(struct device *dev, void *ssi_req, void __i
         struct ssi_hash_ctx *ctx = crypto_ahash_ctx(tfm);
         u32 digestsize = crypto_ahash_digestsize(tfm);
 
-        SSI_LOG_DEBUG("req=%pK\n", req);
+        dev_dbg(dev, "req=%pK\n", req);
 
         ssi_buffer_mgr_unmap_hash_request(dev, state, req->src, false);
         ssi_hash_unmap_result(dev, state, digestsize, req->result);
@@ -399,7 +392,7 @@ static void ssi_hash_complete(struct device *dev, void *ssi_req, void __iomem *c
         struct ssi_hash_ctx *ctx = crypto_ahash_ctx(tfm);
         u32 digestsize = crypto_ahash_digestsize(tfm);
 
-        SSI_LOG_DEBUG("req=%pK\n", req);
+        dev_dbg(dev, "req=%pK\n", req);
 
         ssi_buffer_mgr_unmap_hash_request(dev, state, req->src, false);
         ssi_hash_unmap_result(dev, state, digestsize, req->result);
@@ -414,7 +407,7 @@ static int ssi_hash_digest(struct ahash_req_ctx *state,
                            unsigned int nbytes, u8 *result,
                            void *async_req)
 {
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         bool is_hmac = ctx->is_hmac;
         struct ssi_crypto_req ssi_req = {};
         struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
@@ -423,20 +416,21 @@ static int ssi_hash_digest(struct ahash_req_ctx *state,
         int idx = 0;
         int rc = 0;
 
-        SSI_LOG_DEBUG("===== %s-digest (%d) ====\n", is_hmac ? "hmac" : "hash", nbytes);
+        dev_dbg(dev, "===== %s-digest (%d) ====\n", is_hmac ? "hmac" : "hash",
+                nbytes);
 
         if (unlikely(ssi_hash_map_request(dev, state, ctx) != 0)) {
-                SSI_LOG_ERR("map_ahash_source() failed\n");
+                dev_err(dev, "map_ahash_source() failed\n");
                 return -ENOMEM;
         }
 
         if (unlikely(ssi_hash_map_result(dev, state, digestsize) != 0)) {
-                SSI_LOG_ERR("map_ahash_digest() failed\n");
+                dev_err(dev, "map_ahash_digest() failed\n");
                 return -ENOMEM;
         }
 
         if (unlikely(ssi_buffer_mgr_map_hash_request_final(ctx->drvdata, state, src, nbytes, 1) != 0)) {
-                SSI_LOG_ERR("map_ahash_request_final() failed\n");
+                dev_err(dev, "map_ahash_request_final() failed\n");
                 return -ENOMEM;
         }
 
@@ -553,7 +547,7 @@ ctx->drvdata, ctx->hash_mode), HASH_LEN_SIZE);
         if (async_req) {
                 rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 1);
                 if (unlikely(rc != -EINPROGRESS)) {
-                        SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                        dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                         ssi_buffer_mgr_unmap_hash_request(dev, state, src, true);
                         ssi_hash_unmap_result(dev, state, digestsize, result);
                         ssi_hash_unmap_request(dev, state, ctx);
@@ -561,7 +555,7 @@ ctx->drvdata, ctx->hash_mode), HASH_LEN_SIZE);
         } else {
                 rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 0);
                 if (rc != 0) {
-                        SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                        dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                         ssi_buffer_mgr_unmap_hash_request(dev, state, src, true);
                 } else {
                         ssi_buffer_mgr_unmap_hash_request(dev, state, src, false);
@@ -579,14 +573,14 @@ static int ssi_hash_update(struct ahash_req_ctx *state,
                            unsigned int nbytes,
                            void *async_req)
 {
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         struct ssi_crypto_req ssi_req = {};
         struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
         u32 idx = 0;
         int rc;
 
-        SSI_LOG_DEBUG("===== %s-update (%d) ====\n", ctx->is_hmac ?
-                                        "hmac" : "hash", nbytes);
+        dev_dbg(dev, "===== %s-update (%d) ====\n", ctx->is_hmac ?
+                "hmac" : "hash", nbytes);
 
         if (nbytes == 0) {
                 /* no real updates required */
@@ -596,12 +590,12 @@ static int ssi_hash_update(struct ahash_req_ctx *state,
         rc = ssi_buffer_mgr_map_hash_request_update(ctx->drvdata, state, src, nbytes, block_size);
         if (unlikely(rc)) {
                 if (rc == 1) {
-                        SSI_LOG_DEBUG(" data size not require HW update %x\n",
-                                      nbytes);
+                        dev_dbg(dev, " data size not require HW update %x\n",
+                                nbytes);
                         /* No hardware updates are required */
                         return 0;
                 }
-                SSI_LOG_ERR("map_ahash_request_update() failed\n");
+                dev_err(dev, "map_ahash_request_update() failed\n");
                 return -ENOMEM;
         }
 
@@ -653,13 +647,13 @@ static int ssi_hash_update(struct ahash_req_ctx *state,
         if (async_req) {
                 rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 1);
                 if (unlikely(rc != -EINPROGRESS)) {
-                        SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                        dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                         ssi_buffer_mgr_unmap_hash_request(dev, state, src, true);
                 }
         } else {
                 rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 0);
                 if (rc != 0) {
-                        SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                        dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                         ssi_buffer_mgr_unmap_hash_request(dev, state, src, true);
                 } else {
                         ssi_buffer_mgr_unmap_hash_request(dev, state, src, false);
@@ -676,21 +670,22 @@ static int ssi_hash_finup(struct ahash_req_ctx *state,
                           u8 *result,
                           void *async_req)
 {
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         bool is_hmac = ctx->is_hmac;
         struct ssi_crypto_req ssi_req = {};
         struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
         int idx = 0;
         int rc;
 
-        SSI_LOG_DEBUG("===== %s-finup (%d) ====\n", is_hmac ? "hmac" : "hash", nbytes);
+        dev_dbg(dev, "===== %s-finup (%d) ====\n", is_hmac ? "hmac" : "hash",
+                nbytes);
 
         if (unlikely(ssi_buffer_mgr_map_hash_request_final(ctx->drvdata, state, src, nbytes, 1) != 0)) {
-                SSI_LOG_ERR("map_ahash_request_final() failed\n");
+                dev_err(dev, "map_ahash_request_final() failed\n");
                 return -ENOMEM;
         }
         if (unlikely(ssi_hash_map_result(dev, state, digestsize) != 0)) {
-                SSI_LOG_ERR("map_ahash_digest() failed\n");
+                dev_err(dev, "map_ahash_digest() failed\n");
                 return -ENOMEM;
         }
 
@@ -783,14 +778,14 @@ ctx->drvdata, ctx->hash_mode), HASH_LEN_SIZE);
         if (async_req) {
                 rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 1);
                 if (unlikely(rc != -EINPROGRESS)) {
-                        SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                        dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                         ssi_buffer_mgr_unmap_hash_request(dev, state, src, true);
                         ssi_hash_unmap_result(dev, state, digestsize, result);
                 }
         } else {
                 rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 0);
                 if (rc != 0) {
-                        SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                        dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                         ssi_buffer_mgr_unmap_hash_request(dev, state, src, true);
                         ssi_hash_unmap_result(dev, state, digestsize, result);
                 } else {
@@ -810,22 +805,23 @@ static int ssi_hash_final(struct ahash_req_ctx *state,
                           u8 *result,
                           void *async_req)
 {
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         bool is_hmac = ctx->is_hmac;
         struct ssi_crypto_req ssi_req = {};
         struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
         int idx = 0;
         int rc;
 
-        SSI_LOG_DEBUG("===== %s-final (%d) ====\n", is_hmac ? "hmac" : "hash", nbytes);
+        dev_dbg(dev, "===== %s-final (%d) ====\n", is_hmac ? "hmac" : "hash",
+                nbytes);
 
         if (unlikely(ssi_buffer_mgr_map_hash_request_final(ctx->drvdata, state, src, nbytes, 0) != 0)) {
-                SSI_LOG_ERR("map_ahash_request_final() failed\n");
+                dev_err(dev, "map_ahash_request_final() failed\n");
                 return -ENOMEM;
         }
 
         if (unlikely(ssi_hash_map_result(dev, state, digestsize) != 0)) {
-                SSI_LOG_ERR("map_ahash_digest() failed\n");
+                dev_err(dev, "map_ahash_digest() failed\n");
                 return -ENOMEM;
         }
 
@@ -927,14 +923,14 @@ ctx->drvdata, ctx->hash_mode), HASH_LEN_SIZE);
         if (async_req) {
                 rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 1);
                 if (unlikely(rc != -EINPROGRESS)) {
-                        SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                        dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                         ssi_buffer_mgr_unmap_hash_request(dev, state, src, true);
                         ssi_hash_unmap_result(dev, state, digestsize, result);
                 }
         } else {
                 rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 0);
                 if (rc != 0) {
-                        SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                        dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                         ssi_buffer_mgr_unmap_hash_request(dev, state, src, true);
                         ssi_hash_unmap_result(dev, state, digestsize, result);
                 } else {
@@ -948,7 +944,7 @@ ctx->drvdata, ctx->hash_mode), HASH_LEN_SIZE);
 
 static int ssi_hash_init(struct ahash_req_ctx *state, struct ssi_hash_ctx *ctx)
 {
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
         state->xcbc_count = 0;
 
@@ -970,10 +966,12 @@ static int ssi_hash_setkey(void *hash,
         int i, idx = 0, rc = 0;
         struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
         ssi_sram_addr_t larval_addr;
-
-         SSI_LOG_DEBUG("start keylen: %d", keylen);
+        struct device *dev;
 
         ctx = crypto_ahash_ctx(((struct crypto_ahash *)hash));
+        dev = drvdata_to_dev(ctx->drvdata);
+        dev_dbg(dev, "start keylen: %d", keylen);
+
         blocksize = crypto_tfm_alg_blocksize(&((struct crypto_ahash *)hash)->base);
         digestsize = crypto_ahash_digestsize(((struct crypto_ahash *)hash));
 
@@ -989,18 +987,16 @@ static int ssi_hash_setkey(void *hash,
 
         if (keylen != 0) {
                 ctx->key_params.key_dma_addr = dma_map_single(
-                                                &ctx->drvdata->plat_dev->dev,
-                                                (void *)key,
+                                                dev, (void *)key,
                                                 keylen, DMA_TO_DEVICE);
-                if (unlikely(dma_mapping_error(&ctx->drvdata->plat_dev->dev,
+                if (unlikely(dma_mapping_error(dev,
                                                ctx->key_params.key_dma_addr))) {
-                        SSI_LOG_ERR("Mapping key va=0x%p len=%u for"
-                                   " DMA failed\n", key, keylen);
+                        dev_err(dev, "Mapping key va=0x%p len=%u for DMA failed\n",
+                                key, keylen);
                         return -ENOMEM;
                 }
-                SSI_LOG_DEBUG("mapping key-buffer: key_dma_addr=%pad "
-                             "keylen=%u\n", ctx->key_params.key_dma_addr,
-                             ctx->key_params.keylen);
+                dev_dbg(dev, "mapping key-buffer: key_dma_addr=%pad keylen=%u\n",
+                        &ctx->key_params.key_dma_addr, ctx->key_params.keylen);
 
                 if (keylen > blocksize) {
                         /* Load hash initial state */
@@ -1079,7 +1075,7 @@ static int ssi_hash_setkey(void *hash,
 
         rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 0);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                 goto out;
         }
 
@@ -1139,12 +1135,10 @@ out:
                 crypto_ahash_set_flags((struct crypto_ahash *)hash, CRYPTO_TFM_RES_BAD_KEY_LEN);
 
         if (ctx->key_params.key_dma_addr) {
-                dma_unmap_single(&ctx->drvdata->plat_dev->dev,
-                                 ctx->key_params.key_dma_addr,
+                dma_unmap_single(dev, ctx->key_params.key_dma_addr,
                                  ctx->key_params.keylen, DMA_TO_DEVICE);
-                SSI_LOG_DEBUG("Unmapped key-buffer: key_dma_addr=%pad keylen=%u\n",
-                              ctx->key_params.key_dma_addr,
-                              ctx->key_params.keylen);
+                dev_dbg(dev, "Unmapped key-buffer: key_dma_addr=%pad keylen=%u\n",
+                        &ctx->key_params.key_dma_addr, ctx->key_params.keylen);
         }
         return rc;
 }
@@ -1154,10 +1148,11 @@ static int ssi_xcbc_setkey(struct crypto_ahash *ahash,
 {
         struct ssi_crypto_req ssi_req = {};
         struct ssi_hash_ctx *ctx = crypto_ahash_ctx(ahash);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         int idx = 0, rc = 0;
         struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
 
-        SSI_LOG_DEBUG("===== setkey (%d) ====\n", keylen);
+        dev_dbg(dev, "===== setkey (%d) ====\n", keylen);
 
         switch (keylen) {
         case AES_KEYSIZE_128:
@@ -1171,19 +1166,15 @@ static int ssi_xcbc_setkey(struct crypto_ahash *ahash,
         ctx->key_params.keylen = keylen;
 
         ctx->key_params.key_dma_addr = dma_map_single(
-                                        &ctx->drvdata->plat_dev->dev,
-                                        (void *)key,
+                                        dev, (void *)key,
                                         keylen, DMA_TO_DEVICE);
-        if (unlikely(dma_mapping_error(&ctx->drvdata->plat_dev->dev,
-                                       ctx->key_params.key_dma_addr))) {
-                SSI_LOG_ERR("Mapping key va=0x%p len=%u for"
-                           " DMA failed\n", key, keylen);
+        if (unlikely(dma_mapping_error(dev, ctx->key_params.key_dma_addr))) {
+                dev_err(dev, "Mapping key va=0x%p len=%u for DMA failed\n",
+                        key, keylen);
                 return -ENOMEM;
         }
-        SSI_LOG_DEBUG("mapping key-buffer: key_dma_addr=%pad "
-                     "keylen=%u\n",
-                     ctx->key_params.key_dma_addr,
-                     ctx->key_params.keylen);
+        dev_dbg(dev, "mapping key-buffer: key_dma_addr=%pad keylen=%u\n",
+                &ctx->key_params.key_dma_addr, ctx->key_params.keylen);
 
         ctx->is_hmac = true;
         /* 1. Load the AES key */
@@ -1226,12 +1217,10 @@ static int ssi_xcbc_setkey(struct crypto_ahash *ahash,
         if (rc != 0)
                 crypto_ahash_set_flags(ahash, CRYPTO_TFM_RES_BAD_KEY_LEN);
 
-        dma_unmap_single(&ctx->drvdata->plat_dev->dev,
-                         ctx->key_params.key_dma_addr,
+        dma_unmap_single(dev, ctx->key_params.key_dma_addr,
                          ctx->key_params.keylen, DMA_TO_DEVICE);
-        SSI_LOG_DEBUG("Unmapped key-buffer: key_dma_addr=%pad keylen=%u\n",
-                      ctx->key_params.key_dma_addr,
-                      ctx->key_params.keylen);
+        dev_dbg(dev, "Unmapped key-buffer: key_dma_addr=%pad keylen=%u\n",
+                &ctx->key_params.key_dma_addr, ctx->key_params.keylen);
 
         return rc;
 }
@@ -1241,8 +1230,9 @@ static int ssi_cmac_setkey(struct crypto_ahash *ahash,
                            const u8 *key, unsigned int keylen)
 {
         struct ssi_hash_ctx *ctx = crypto_ahash_ctx(ahash);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
-        SSI_LOG_DEBUG("===== setkey (%d) ====\n", keylen);
+        dev_dbg(dev, "===== setkey (%d) ====\n", keylen);
 
         ctx->is_hmac = true;
 
@@ -1259,16 +1249,14 @@ static int ssi_cmac_setkey(struct crypto_ahash *ahash,
 
         /* STAT_PHASE_1: Copy key to ctx */
 
-        dma_sync_single_for_cpu(&ctx->drvdata->plat_dev->dev,
-                                ctx->opad_tmp_keys_dma_addr,
+        dma_sync_single_for_cpu(dev, ctx->opad_tmp_keys_dma_addr,
                                 keylen, DMA_TO_DEVICE);
 
         memcpy(ctx->opad_tmp_keys_buff, key, keylen);
         if (keylen == 24)
                 memset(ctx->opad_tmp_keys_buff + 24, 0, CC_AES_KEY_SIZE_MAX - 24);
 
-        dma_sync_single_for_device(&ctx->drvdata->plat_dev->dev,
-                                   ctx->opad_tmp_keys_dma_addr,
+        dma_sync_single_for_device(dev, ctx->opad_tmp_keys_dma_addr,
                                    keylen, DMA_TO_DEVICE);
 
         ctx->key_params.keylen = keylen;
@@ -1279,23 +1267,21 @@ static int ssi_cmac_setkey(struct crypto_ahash *ahash,
 
 static void ssi_hash_free_ctx(struct ssi_hash_ctx *ctx)
 {
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
         if (ctx->digest_buff_dma_addr != 0) {
                 dma_unmap_single(dev, ctx->digest_buff_dma_addr,
                                  sizeof(ctx->digest_buff), DMA_BIDIRECTIONAL);
-                SSI_LOG_DEBUG("Unmapped digest-buffer: "
-                             "digest_buff_dma_addr=%pad\n",
-                              ctx->digest_buff_dma_addr);
+                dev_dbg(dev, "Unmapped digest-buffer: digest_buff_dma_addr=%pad\n",
+                        &ctx->digest_buff_dma_addr);
                 ctx->digest_buff_dma_addr = 0;
         }
         if (ctx->opad_tmp_keys_dma_addr != 0) {
                 dma_unmap_single(dev, ctx->opad_tmp_keys_dma_addr,
                                  sizeof(ctx->opad_tmp_keys_buff),
                                  DMA_BIDIRECTIONAL);
-                SSI_LOG_DEBUG("Unmapped opad-digest: "
-                             "opad_tmp_keys_dma_addr=%pad\n",
-                              ctx->opad_tmp_keys_dma_addr);
+                dev_dbg(dev, "Unmapped opad-digest: opad_tmp_keys_dma_addr=%pad\n",
+                        &ctx->opad_tmp_keys_dma_addr);
                 ctx->opad_tmp_keys_dma_addr = 0;
         }
 
@@ -1304,30 +1290,30 @@ static void ssi_hash_free_ctx(struct ssi_hash_ctx *ctx)
 
 static int ssi_hash_alloc_ctx(struct ssi_hash_ctx *ctx)
 {
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
         ctx->key_params.keylen = 0;
 
         ctx->digest_buff_dma_addr = dma_map_single(dev, (void *)ctx->digest_buff, sizeof(ctx->digest_buff), DMA_BIDIRECTIONAL);
         if (dma_mapping_error(dev, ctx->digest_buff_dma_addr)) {
-                SSI_LOG_ERR("Mapping digest len %zu B at va=%pK for DMA failed\n",
-                            sizeof(ctx->digest_buff), ctx->digest_buff);
+                dev_err(dev, "Mapping digest len %zu B at va=%pK for DMA failed\n",
+                        sizeof(ctx->digest_buff), ctx->digest_buff);
                 goto fail;
         }
-        SSI_LOG_DEBUG("Mapped digest %zu B at va=%pK to dma=%pad\n",
-                      sizeof(ctx->digest_buff), ctx->digest_buff,
-                      ctx->digest_buff_dma_addr);
+        dev_dbg(dev, "Mapped digest %zu B at va=%pK to dma=%pad\n",
+                sizeof(ctx->digest_buff), ctx->digest_buff,
+                &ctx->digest_buff_dma_addr);
 
         ctx->opad_tmp_keys_dma_addr = dma_map_single(dev, (void *)ctx->opad_tmp_keys_buff, sizeof(ctx->opad_tmp_keys_buff), DMA_BIDIRECTIONAL);
         if (dma_mapping_error(dev, ctx->opad_tmp_keys_dma_addr)) {
-                SSI_LOG_ERR("Mapping opad digest %zu B at va=%pK for DMA failed\n",
-                            sizeof(ctx->opad_tmp_keys_buff),
-                            ctx->opad_tmp_keys_buff);
+                dev_err(dev, "Mapping opad digest %zu B at va=%pK for DMA failed\n",
+                        sizeof(ctx->opad_tmp_keys_buff),
+                        ctx->opad_tmp_keys_buff);
                 goto fail;
         }
-        SSI_LOG_DEBUG("Mapped opad_tmp_keys %zu B at va=%pK to dma=%pad\n",
-                      sizeof(ctx->opad_tmp_keys_buff), ctx->opad_tmp_keys_buff,
-                      ctx->opad_tmp_keys_dma_addr);
+        dev_dbg(dev, "Mapped opad_tmp_keys %zu B at va=%pK to dma=%pad\n",
+                sizeof(ctx->opad_tmp_keys_buff), ctx->opad_tmp_keys_buff,
+                &ctx->opad_tmp_keys_dma_addr);
 
         ctx->is_hmac = false;
         return 0;
@@ -1361,8 +1347,9 @@ static int ssi_ahash_cra_init(struct crypto_tfm *tfm)
 static void ssi_hash_cra_exit(struct crypto_tfm *tfm)
 {
         struct ssi_hash_ctx *ctx = crypto_tfm_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
-        SSI_LOG_DEBUG("ssi_hash_cra_exit");
+        dev_dbg(dev, "ssi_hash_cra_exit");
         ssi_hash_free_ctx(ctx);
 }
 
@@ -1371,7 +1358,7 @@ static int ssi_mac_update(struct ahash_request *req)
         struct ahash_req_ctx *state = ahash_request_ctx(req);
         struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
         struct ssi_hash_ctx *ctx = crypto_ahash_ctx(tfm);
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         unsigned int block_size = crypto_tfm_alg_blocksize(&tfm->base);
         struct ssi_crypto_req ssi_req = {};
         struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
@@ -1388,12 +1375,12 @@ static int ssi_mac_update(struct ahash_request *req)
         rc = ssi_buffer_mgr_map_hash_request_update(ctx->drvdata, state, req->src, req->nbytes, block_size);
         if (unlikely(rc)) {
                 if (rc == 1) {
-                        SSI_LOG_DEBUG(" data size not require HW update %x\n",
-                                      req->nbytes);
+                        dev_dbg(dev, " data size not require HW update %x\n",
+                                req->nbytes);
                         /* No hardware updates are required */
                         return 0;
                 }
-                SSI_LOG_ERR("map_ahash_request_update() failed\n");
+                dev_err(dev, "map_ahash_request_update() failed\n");
                 return -ENOMEM;
         }
 
@@ -1420,7 +1407,7 @@ static int ssi_mac_update(struct ahash_request *req)
 
         rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 1);
         if (unlikely(rc != -EINPROGRESS)) {
-                SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                 ssi_buffer_mgr_unmap_hash_request(dev, state, req->src, true);
         }
         return rc;
@@ -1431,7 +1418,7 @@ static int ssi_mac_final(struct ahash_request *req)
         struct ahash_req_ctx *state = ahash_request_ctx(req);
         struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
         struct ssi_hash_ctx *ctx = crypto_ahash_ctx(tfm);
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         struct ssi_crypto_req ssi_req = {};
         struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
         int idx = 0;
@@ -1451,15 +1438,15 @@ static int ssi_mac_final(struct ahash_request *req)
                 key_len =  ctx->key_params.keylen;
         }
 
-        SSI_LOG_DEBUG("===== final  xcbc reminder (%d) ====\n", rem_cnt);
+        dev_dbg(dev, "===== final  xcbc reminder (%d) ====\n", rem_cnt);
 
         if (unlikely(ssi_buffer_mgr_map_hash_request_final(ctx->drvdata, state, req->src, req->nbytes, 0) != 0)) {
-                SSI_LOG_ERR("map_ahash_request_final() failed\n");
+                dev_err(dev, "map_ahash_request_final() failed\n");
                 return -ENOMEM;
         }
 
         if (unlikely(ssi_hash_map_result(dev, state, digestsize) != 0)) {
-                SSI_LOG_ERR("map_ahash_digest() failed\n");
+                dev_err(dev, "map_ahash_digest() failed\n");
                 return -ENOMEM;
         }
 
@@ -1530,7 +1517,7 @@ static int ssi_mac_final(struct ahash_request *req)
 
         rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 1);
         if (unlikely(rc != -EINPROGRESS)) {
-                SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                 ssi_buffer_mgr_unmap_hash_request(dev, state, req->src, true);
                 ssi_hash_unmap_result(dev, state, digestsize, req->result);
         }
@@ -1542,7 +1529,7 @@ static int ssi_mac_finup(struct ahash_request *req)
         struct ahash_req_ctx *state = ahash_request_ctx(req);
         struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
         struct ssi_hash_ctx *ctx = crypto_ahash_ctx(tfm);
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         struct ssi_crypto_req ssi_req = {};
         struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
         int idx = 0;
@@ -1550,18 +1537,18 @@ static int ssi_mac_finup(struct ahash_request *req)
         u32 key_len = 0;
         u32 digestsize = crypto_ahash_digestsize(tfm);
 
-        SSI_LOG_DEBUG("===== finup xcbc(%d) ====\n", req->nbytes);
+        dev_dbg(dev, "===== finup xcbc(%d) ====\n", req->nbytes);
         if (state->xcbc_count > 0 && req->nbytes == 0) {
-                SSI_LOG_DEBUG("No data to update. Call to fdx_mac_final\n");
+                dev_dbg(dev, "No data to update. Call to fdx_mac_final\n");
                 return ssi_mac_final(req);
         }
 
         if (unlikely(ssi_buffer_mgr_map_hash_request_final(ctx->drvdata, state, req->src, req->nbytes, 1) != 0)) {
-                SSI_LOG_ERR("map_ahash_request_final() failed\n");
+                dev_err(dev, "map_ahash_request_final() failed\n");
                 return -ENOMEM;
         }
         if (unlikely(ssi_hash_map_result(dev, state, digestsize) != 0)) {
-                SSI_LOG_ERR("map_ahash_digest() failed\n");
+                dev_err(dev, "map_ahash_digest() failed\n");
                 return -ENOMEM;
         }
 
@@ -1601,7 +1588,7 @@ static int ssi_mac_finup(struct ahash_request *req)
 
         rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 1);
         if (unlikely(rc != -EINPROGRESS)) {
-                SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                 ssi_buffer_mgr_unmap_hash_request(dev, state, req->src, true);
                 ssi_hash_unmap_result(dev, state, digestsize, req->result);
         }
@@ -1613,7 +1600,7 @@ static int ssi_mac_digest(struct ahash_request *req)
         struct ahash_req_ctx *state = ahash_request_ctx(req);
         struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
         struct ssi_hash_ctx *ctx = crypto_ahash_ctx(tfm);
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         u32 digestsize = crypto_ahash_digestsize(tfm);
         struct ssi_crypto_req ssi_req = {};
         struct cc_hw_desc desc[SSI_MAX_AHASH_SEQ_LEN];
@@ -1621,19 +1608,19 @@ static int ssi_mac_digest(struct ahash_request *req)
         int idx = 0;
         int rc;
 
-        SSI_LOG_DEBUG("===== -digest mac (%d) ====\n",  req->nbytes);
+        dev_dbg(dev, "===== -digest mac (%d) ====\n",  req->nbytes);
 
         if (unlikely(ssi_hash_map_request(dev, state, ctx) != 0)) {
-                SSI_LOG_ERR("map_ahash_source() failed\n");
+                dev_err(dev, "map_ahash_source() failed\n");
                 return -ENOMEM;
         }
         if (unlikely(ssi_hash_map_result(dev, state, digestsize) != 0)) {
-                SSI_LOG_ERR("map_ahash_digest() failed\n");
+                dev_err(dev, "map_ahash_digest() failed\n");
                 return -ENOMEM;
         }
 
         if (unlikely(ssi_buffer_mgr_map_hash_request_final(ctx->drvdata, state, req->src, req->nbytes, 1) != 0)) {
-                SSI_LOG_ERR("map_ahash_request_final() failed\n");
+                dev_err(dev, "map_ahash_request_final() failed\n");
                 return -ENOMEM;
         }
 
@@ -1673,7 +1660,7 @@ static int ssi_mac_digest(struct ahash_request *req)
 
         rc = send_request(ctx->drvdata, &ssi_req, desc, idx, 1);
         if (unlikely(rc != -EINPROGRESS)) {
-                SSI_LOG_ERR("send_request() failed (rc=%d)\n", rc);
+                dev_err(dev, "send_request() failed (rc=%d)\n", rc);
                 ssi_buffer_mgr_unmap_hash_request(dev, state, req->src, true);
                 ssi_hash_unmap_result(dev, state, digestsize, req->result);
                 ssi_hash_unmap_request(dev, state, ctx);
@@ -1727,8 +1714,9 @@ static int ssi_ahash_init(struct ahash_request *req)
         struct ahash_req_ctx *state = ahash_request_ctx(req);
         struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
         struct ssi_hash_ctx *ctx = crypto_ahash_ctx(tfm);
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
-        SSI_LOG_DEBUG("===== init (%d) ====\n", req->nbytes);
+        dev_dbg(dev, "===== init (%d) ====\n", req->nbytes);
 
         return ssi_hash_init(state, ctx);
 }
@@ -1737,7 +1725,7 @@ static int ssi_ahash_export(struct ahash_request *req, void *out)
 {
         struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);
         struct ssi_hash_ctx *ctx = crypto_ahash_ctx(ahash);
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         struct ahash_req_ctx *state = ahash_request_ctx(req);
         u8 *curr_buff = state->buff_index ? state->buff1 : state->buff0;
         u32 curr_buff_cnt = state->buff_index ? state->buff1_cnt :
@@ -1778,7 +1766,7 @@ static int ssi_ahash_import(struct ahash_request *req, const void *in)
 {
         struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);
         struct ssi_hash_ctx *ctx = crypto_ahash_ctx(ahash);
-        struct device *dev = &ctx->drvdata->plat_dev->dev;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
         struct ahash_req_ctx *state = ahash_request_ctx(req);
         u32 tmp;
         int rc;
@@ -2054,17 +2042,17 @@ static struct ssi_hash_template driver_hash[] = {
 };
 
 static struct ssi_hash_alg *
-ssi_hash_create_alg(struct ssi_hash_template *template, bool keyed)
+ssi_hash_create_alg(struct ssi_hash_template *template, struct device *dev,
+                    bool keyed)
 {
         struct ssi_hash_alg *t_crypto_alg;
         struct crypto_alg *alg;
         struct ahash_alg *halg;
 
         t_crypto_alg = kzalloc(sizeof(*t_crypto_alg), GFP_KERNEL);
-        if (!t_crypto_alg) {
-                SSI_LOG_ERR("failed to allocate t_crypto_alg\n");
+        if (!t_crypto_alg)
                 return ERR_PTR(-ENOMEM);
-        }
+
 
         t_crypto_alg->ahash_alg = template->template_ahash;
         halg = &t_crypto_alg->ahash_alg;
@@ -2107,6 +2095,7 @@ int ssi_hash_init_sram_digest_consts(struct ssi_drvdata *drvdata)
         ssi_sram_addr_t sram_buff_ofs = hash_handle->digest_len_sram_addr;
         unsigned int larval_seq_len = 0;
         struct cc_hw_desc larval_seq[CC_DIGEST_SIZE_MAX / sizeof(u32)];
+        struct device *dev = drvdata_to_dev(drvdata);
         int rc = 0;
 #if (DX_DEV_SHA_MAX > 256)
         int i;
@@ -2191,7 +2180,7 @@ int ssi_hash_init_sram_digest_consts(struct ssi_drvdata *drvdata)
         }
         rc = send_request_init(drvdata, larval_seq, larval_seq_len);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("send_request() failed (rc = %d)\n", rc);
+                dev_err(dev, "send_request() failed (rc = %d)\n", rc);
                 goto init_digest_const_err;
         }
         larval_seq_len = 0;
@@ -2209,7 +2198,7 @@ int ssi_hash_init_sram_digest_consts(struct ssi_drvdata *drvdata)
         }
         rc = send_request_init(drvdata, larval_seq, larval_seq_len);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("send_request() failed (rc = %d)\n", rc);
+                dev_err(dev, "send_request() failed (rc = %d)\n", rc);
                 goto init_digest_const_err;
         }
 #endif
@@ -2223,17 +2212,15 @@ int ssi_hash_alloc(struct ssi_drvdata *drvdata)
         struct ssi_hash_handle *hash_handle;
         ssi_sram_addr_t sram_buff;
         u32 sram_size_to_alloc;
+        struct device *dev = drvdata_to_dev(drvdata);
         int rc = 0;
         int alg;
 
         hash_handle = kzalloc(sizeof(*hash_handle), GFP_KERNEL);
-        if (!hash_handle) {
-                SSI_LOG_ERR("kzalloc failed to allocate %zu B\n",
-                            sizeof(*hash_handle));
-                rc = -ENOMEM;
-                goto fail;
-        }
+        if (!hash_handle)
+                return -ENOMEM;
 
+        INIT_LIST_HEAD(&hash_handle->hash_list);
         drvdata->hash_handle = hash_handle;
 
         sram_size_to_alloc = sizeof(digest_len_init) +
@@ -2249,7 +2236,7 @@ int ssi_hash_alloc(struct ssi_drvdata *drvdata)
 
         sram_buff = ssi_sram_mgr_alloc(drvdata, sram_size_to_alloc);
         if (sram_buff == NULL_SRAM_ADDR) {
-                SSI_LOG_ERR("SRAM pool exhausted\n");
+                dev_err(dev, "SRAM pool exhausted\n");
                 rc = -ENOMEM;
                 goto fail;
         }
@@ -2260,31 +2247,29 @@ int ssi_hash_alloc(struct ssi_drvdata *drvdata)
         /*must be set before the alg registration as it is being used there*/
         rc = ssi_hash_init_sram_digest_consts(drvdata);
         if (unlikely(rc != 0)) {
-                SSI_LOG_ERR("Init digest CONST failed (rc=%d)\n", rc);
+                dev_err(dev, "Init digest CONST failed (rc=%d)\n", rc);
                 goto fail;
         }
 
-        INIT_LIST_HEAD(&hash_handle->hash_list);
-
         /* ahash registration */
         for (alg = 0; alg < ARRAY_SIZE(driver_hash); alg++) {
                 struct ssi_hash_alg *t_alg;
                 int hw_mode = driver_hash[alg].hw_mode;
 
                 /* register hmac version */
-                t_alg = ssi_hash_create_alg(&driver_hash[alg], true);
+                t_alg = ssi_hash_create_alg(&driver_hash[alg], dev, true);
                 if (IS_ERR(t_alg)) {
                         rc = PTR_ERR(t_alg);
-                        SSI_LOG_ERR("%s alg allocation failed\n",
-                                    driver_hash[alg].driver_name);
+                        dev_err(dev, "%s alg allocation failed\n",
+                                driver_hash[alg].driver_name);
                         goto fail;
                 }
                 t_alg->drvdata = drvdata;
 
                 rc = crypto_register_ahash(&t_alg->ahash_alg);
                 if (unlikely(rc)) {
-                        SSI_LOG_ERR("%s alg registration failed\n",
-                                    driver_hash[alg].driver_name);
+                        dev_err(dev, "%s alg registration failed\n",
+                                driver_hash[alg].driver_name);
                         kfree(t_alg);
                         goto fail;
                 } else {
@@ -2297,19 +2282,19 @@ int ssi_hash_alloc(struct ssi_drvdata *drvdata)
                         continue;
 
                 /* register hash version */
-                t_alg = ssi_hash_create_alg(&driver_hash[alg], false);
+                t_alg = ssi_hash_create_alg(&driver_hash[alg], dev, false);
                 if (IS_ERR(t_alg)) {
                         rc = PTR_ERR(t_alg);
-                        SSI_LOG_ERR("%s alg allocation failed\n",
-                                    driver_hash[alg].driver_name);
+                        dev_err(dev, "%s alg allocation failed\n",
+                                driver_hash[alg].driver_name);
                         goto fail;
                 }
                 t_alg->drvdata = drvdata;
 
                 rc = crypto_register_ahash(&t_alg->ahash_alg);
                 if (unlikely(rc)) {
-                        SSI_LOG_ERR("%s alg registration failed\n",
-                                    driver_hash[alg].driver_name);
+                        dev_err(dev, "%s alg registration failed\n",
+                                driver_hash[alg].driver_name);
                         kfree(t_alg);
                         goto fail;
                 } else {
@@ -2443,6 +2428,7 @@ static void ssi_hash_create_data_desc(struct ahash_req_ctx *areq_ctx,
                                       unsigned int *seq_size)
 {
         unsigned int idx = *seq_size;
+        struct device *dev = drvdata_to_dev(ctx->drvdata);
 
         if (likely(areq_ctx->data_dma_buf_type == SSI_DMA_BUF_DLLI)) {
                 hw_desc_init(&desc[idx]);
@@ -2453,7 +2439,7 @@ static void ssi_hash_create_data_desc(struct ahash_req_ctx *areq_ctx,
                 idx++;
         } else {
                 if (areq_ctx->data_dma_buf_type == SSI_DMA_BUF_NULL) {
-                        SSI_LOG_DEBUG(" NULL mode\n");
+                        dev_dbg(dev, " NULL mode\n");
                         /* nothing to build */
                         return;
                 }
@@ -2493,6 +2479,7 @@ ssi_sram_addr_t ssi_ahash_get_larval_digest_sram_addr(void *drvdata, u32 mode)
 {
         struct ssi_drvdata *_drvdata = (struct ssi_drvdata *)drvdata;
         struct ssi_hash_handle *hash_handle = _drvdata->hash_handle;
+        struct device *dev = drvdata_to_dev(_drvdata);
 
         switch (mode) {
         case DRV_HASH_NULL:
@@ -2527,7 +2514,7 @@ ssi_sram_addr_t ssi_ahash_get_larval_digest_sram_addr(void *drvdata, u32 mode)
                         sizeof(sha384_init));
 #endif
         default:
-                SSI_LOG_ERR("Invalid hash mode (%d)\n", mode);
+                dev_err(dev, "Invalid hash mode (%d)\n", mode);
         }
 
         /*This is valid wrong value to avoid kernel crash*/
diff --git a/drivers/staging/ccree/ssi_ivgen.c b/drivers/staging/ccree/ssi_ivgen.c
index b01e03231947..3f082f41ae8f 100644
--- a/drivers/staging/ccree/ssi_ivgen.c
+++ b/drivers/staging/ccree/ssi_ivgen.c
@@ -193,12 +193,9 @@ int ssi_ivgen_init(struct ssi_drvdata *drvdata)
         /* Allocate "this" context */
         drvdata->ivgen_handle = kzalloc(sizeof(*drvdata->ivgen_handle),
                                         GFP_KERNEL);
-        if (!drvdata->ivgen_handle) {
-                SSI_LOG_ERR("Not enough memory to allocate IVGEN context "
-                           "(%zu B)\n", sizeof(*drvdata->ivgen_handle));
-                rc = -ENOMEM;
-                goto out;
-        }
+        if (!drvdata->ivgen_handle)
+                return -ENOMEM;
+
         ivgen_ctx = drvdata->ivgen_handle;
 
         /* Allocate pool's header for intial enc. key/IV */
@@ -206,15 +203,15 @@ int ssi_ivgen_init(struct ssi_drvdata *drvdata)
                                                   &ivgen_ctx->pool_meta_dma,
                                                   GFP_KERNEL);
         if (!ivgen_ctx->pool_meta) {
-                SSI_LOG_ERR("Not enough memory to allocate DMA of pool_meta "
-                           "(%u B)\n", SSI_IVPOOL_META_SIZE);
+                dev_err(device, "Not enough memory to allocate DMA of pool_meta (%u B)\n",
+                        SSI_IVPOOL_META_SIZE);
                 rc = -ENOMEM;
                 goto out;
         }
         /* Allocate IV pool in SRAM */
         ivgen_ctx->pool = ssi_sram_mgr_alloc(drvdata, SSI_IVPOOL_SIZE);
         if (ivgen_ctx->pool == NULL_SRAM_ADDR) {
-                SSI_LOG_ERR("SRAM pool exhausted\n");
+                dev_err(device, "SRAM pool exhausted\n");
                 rc = -ENOMEM;
                 goto out;
         }
@@ -248,6 +245,7 @@ int ssi_ivgen_getiv(
 {
         struct ssi_ivgen_ctx *ivgen_ctx = drvdata->ivgen_handle;
         unsigned int idx = *iv_seq_len;
+        struct device *dev = drvdata_to_dev(drvdata);
         unsigned int t;
 
         if ((iv_out_size != CC_AES_IV_SIZE) &&
@@ -291,7 +289,7 @@ int ssi_ivgen_getiv(
         ivgen_ctx->next_iv_ofs += iv_out_size;
 
         if ((SSI_IVPOOL_SIZE - ivgen_ctx->next_iv_ofs) < CC_AES_IV_SIZE) {
-                SSI_LOG_DEBUG("Pool exhausted, regenerating iv-pool\n");
+                dev_dbg(dev, "Pool exhausted, regenerating iv-pool\n");
                 /* pool is drained -regenerate it! */
                 return ssi_ivgen_generate_pool(ivgen_ctx, iv_seq, iv_seq_len);
         }
diff --git a/drivers/staging/ccree/ssi_pm.c b/drivers/staging/ccree/ssi_pm.c
index 31325e6cd4b4..36a498098a70 100644
--- a/drivers/staging/ccree/ssi_pm.c
+++ b/drivers/staging/ccree/ssi_pm.c
@@ -40,11 +40,12 @@ int ssi_power_mgr_runtime_suspend(struct device *dev)
                 (struct ssi_drvdata *)dev_get_drvdata(dev);
         int rc;
 
-        SSI_LOG_DEBUG("set HOST_POWER_DOWN_EN\n");
-        WRITE_REGISTER(drvdata->cc_base + CC_REG_OFFSET(HOST_RGF, HOST_POWER_DOWN_EN), POWER_DOWN_ENABLE);
+        dev_dbg(dev, "set HOST_POWER_DOWN_EN\n");
+        cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_ENABLE);
         rc = ssi_request_mgr_runtime_suspend_queue(drvdata);
         if (rc != 0) {
-                SSI_LOG_ERR("ssi_request_mgr_runtime_suspend_queue (%x)\n", rc);
+                dev_err(dev, "ssi_request_mgr_runtime_suspend_queue (%x)\n",
+                        rc);
                 return rc;
         }
         fini_cc_regs(drvdata);
@@ -58,24 +59,24 @@ int ssi_power_mgr_runtime_resume(struct device *dev)
         struct ssi_drvdata *drvdata =
                 (struct ssi_drvdata *)dev_get_drvdata(dev);
 
-        SSI_LOG_DEBUG("unset HOST_POWER_DOWN_EN\n");
-        WRITE_REGISTER(drvdata->cc_base + CC_REG_OFFSET(HOST_RGF, HOST_POWER_DOWN_EN), POWER_DOWN_DISABLE);
+        dev_dbg(dev, "unset HOST_POWER_DOWN_EN\n");
+        cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_DISABLE);
 
         rc = cc_clk_on(drvdata);
         if (rc) {
-                SSI_LOG_ERR("failed getting clock back on. We're toast.\n");
+                dev_err(dev, "failed getting clock back on. We're toast.\n");
                 return rc;
         }
 
         rc = init_cc_regs(drvdata, false);
         if (rc != 0) {
-                SSI_LOG_ERR("init_cc_regs (%x)\n", rc);
+                dev_err(dev, "init_cc_regs (%x)\n", rc);
                 return rc;
         }
 
         rc = ssi_request_mgr_runtime_resume_queue(drvdata);
         if (rc != 0) {
-                SSI_LOG_ERR("ssi_request_mgr_runtime_resume_queue (%x)\n", rc);
+                dev_err(dev, "ssi_request_mgr_runtime_resume_queue (%x)\n", rc);
                 return rc;
         }
 
@@ -109,7 +110,8 @@ int ssi_power_mgr_runtime_put_suspend(struct device *dev)
                 rc = pm_runtime_put_autosuspend(dev);
         } else {
                 /* Something wrong happens*/
-                BUG();
+                dev_err(dev, "request to suspend already suspended queue");
+                rc = -EBUSY;
         }
         return rc;
 }
@@ -120,16 +122,17 @@ int ssi_power_mgr_init(struct ssi_drvdata *drvdata)
 {
         int rc = 0;
 #if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM_SLEEP)
-        struct platform_device *plat_dev = drvdata->plat_dev;
+        struct device *dev = drvdata_to_dev(drvdata);
+
         /* must be before the enabling to avoid resdundent suspending */
-        pm_runtime_set_autosuspend_delay(&plat_dev->dev, SSI_SUSPEND_TIMEOUT);
-        pm_runtime_use_autosuspend(&plat_dev->dev);
+        pm_runtime_set_autosuspend_delay(dev, SSI_SUSPEND_TIMEOUT);
+        pm_runtime_use_autosuspend(dev);
         /* activate the PM module */
-        rc = pm_runtime_set_active(&plat_dev->dev);
+        rc = pm_runtime_set_active(dev);
         if (rc != 0)
                 return rc;
         /* enable the PM module*/
-        pm_runtime_enable(&plat_dev->dev);
+        pm_runtime_enable(dev);
 #endif
         return rc;
 }
@@ -137,8 +140,6 @@ int ssi_power_mgr_init(struct ssi_drvdata *drvdata)
 void ssi_power_mgr_fini(struct ssi_drvdata *drvdata)
 {
 #if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM_SLEEP)
-        struct platform_device *plat_dev = drvdata->plat_dev;
-
-        pm_runtime_disable(&plat_dev->dev);
+        pm_runtime_disable(drvdata_to_dev(drvdata));
 #endif
 }
diff --git a/drivers/staging/ccree/ssi_request_mgr.c b/drivers/staging/ccree/ssi_request_mgr.c
index e5c2f92857f6..a8a7dc672d4c 100644
--- a/drivers/staging/ccree/ssi_request_mgr.c
+++ b/drivers/staging/ccree/ssi_request_mgr.c
@@ -49,7 +49,6 @@ struct ssi_request_mgr_handle {
         dma_addr_t dummy_comp_buff_dma;
         struct cc_hw_desc monitor_desc;
 
-        volatile unsigned long monitor_lock;
 #ifdef COMP_IN_WQ
         struct workqueue_struct *workq;
         struct delayed_work compwork;
@@ -69,19 +68,19 @@ static void comp_work_handler(struct work_struct *work);
 void request_mgr_fini(struct ssi_drvdata *drvdata)
 {
         struct ssi_request_mgr_handle *req_mgr_h = drvdata->request_mgr_handle;
+        struct device *dev = drvdata_to_dev(drvdata);
 
         if (!req_mgr_h)
                 return; /* Not allocated */
 
         if (req_mgr_h->dummy_comp_buff_dma != 0) {
-                dma_free_coherent(&drvdata->plat_dev->dev,
-                                  sizeof(u32), req_mgr_h->dummy_comp_buff,
+                dma_free_coherent(dev, sizeof(u32), req_mgr_h->dummy_comp_buff,
                                   req_mgr_h->dummy_comp_buff_dma);
         }
 
-        SSI_LOG_DEBUG("max_used_hw_slots=%d\n", (req_mgr_h->hw_queue_size -
+        dev_dbg(dev, "max_used_hw_slots=%d\n", (req_mgr_h->hw_queue_size -
                                                 req_mgr_h->min_free_hw_slots));
-        SSI_LOG_DEBUG("max_used_sw_slots=%d\n", req_mgr_h->max_used_sw_slots);
+        dev_dbg(dev, "max_used_sw_slots=%d\n", req_mgr_h->max_used_sw_slots);
 
 #ifdef COMP_IN_WQ
         flush_workqueue(req_mgr_h->workq);
@@ -98,6 +97,7 @@ void request_mgr_fini(struct ssi_drvdata *drvdata)
 int request_mgr_init(struct ssi_drvdata *drvdata)
 {
         struct ssi_request_mgr_handle *req_mgr_h;
+        struct device *dev = drvdata_to_dev(drvdata);
         int rc = 0;
 
         req_mgr_h = kzalloc(sizeof(*req_mgr_h), GFP_KERNEL);
@@ -110,24 +110,24 @@ int request_mgr_init(struct ssi_drvdata *drvdata)
 
         spin_lock_init(&req_mgr_h->hw_lock);
 #ifdef COMP_IN_WQ
-        SSI_LOG_DEBUG("Initializing completion workqueue\n");
+        dev_dbg(dev, "Initializing completion workqueue\n");
         req_mgr_h->workq = create_singlethread_workqueue("arm_cc7x_wq");
         if (unlikely(!req_mgr_h->workq)) {
-                SSI_LOG_ERR("Failed creating work queue\n");
+                dev_err(dev, "Failed creating work queue\n");
                 rc = -ENOMEM;
                 goto req_mgr_init_err;
         }
         INIT_DELAYED_WORK(&req_mgr_h->compwork, comp_work_handler);
 #else
-        SSI_LOG_DEBUG("Initializing completion tasklet\n");
+        dev_dbg(dev, "Initializing completion tasklet\n");
         tasklet_init(&req_mgr_h->comptask, comp_handler, (unsigned long)drvdata);
 #endif
-        req_mgr_h->hw_queue_size = READ_REGISTER(drvdata->cc_base +
-                CC_REG_OFFSET(CRY_KERNEL, DSCRPTR_QUEUE_SRAM_SIZE));
-        SSI_LOG_DEBUG("hw_queue_size=0x%08X\n", req_mgr_h->hw_queue_size);
+        req_mgr_h->hw_queue_size = cc_ioread(drvdata,
+                                             CC_REG(DSCRPTR_QUEUE_SRAM_SIZE));
+        dev_dbg(dev, "hw_queue_size=0x%08X\n", req_mgr_h->hw_queue_size);
         if (req_mgr_h->hw_queue_size < MIN_HW_QUEUE_SIZE) {
-                SSI_LOG_ERR("Invalid HW queue size = %u (Min. required is %u)\n",
-                            req_mgr_h->hw_queue_size, MIN_HW_QUEUE_SIZE);
+                dev_err(dev, "Invalid HW queue size = %u (Min. required is %u)\n",
+                        req_mgr_h->hw_queue_size, MIN_HW_QUEUE_SIZE);
                 rc = -ENOMEM;
                 goto req_mgr_init_err;
         }
@@ -135,13 +135,12 @@ int request_mgr_init(struct ssi_drvdata *drvdata)
         req_mgr_h->max_used_sw_slots = 0;
 
         /* Allocate DMA word for "dummy" completion descriptor use */
-        req_mgr_h->dummy_comp_buff = dma_alloc_coherent(&drvdata->plat_dev->dev,
-                                                        sizeof(u32),
+        req_mgr_h->dummy_comp_buff = dma_alloc_coherent(dev, sizeof(u32),
                                                         &req_mgr_h->dummy_comp_buff_dma,
                                                         GFP_KERNEL);
         if (!req_mgr_h->dummy_comp_buff) {
-                SSI_LOG_ERR("Not enough memory to allocate DMA (%zu) dropped "
-                           "buffer\n", sizeof(u32));
+                dev_err(dev, "Not enough memory to allocate DMA (%zu) dropped buffer\n",
+                        sizeof(u32));
                 rc = -ENOMEM;
                 goto req_mgr_init_err;
         }
@@ -168,17 +167,17 @@ static inline void enqueue_seq(
         int i;
 
         for (i = 0; i < seq_len; i++) {
-                writel_relaxed(seq[i].word[0], (volatile void __iomem *)(cc_base + CC_REG_OFFSET(CRY_KERNEL, DSCRPTR_QUEUE_WORD0)));
-                writel_relaxed(seq[i].word[1], (volatile void __iomem *)(cc_base + CC_REG_OFFSET(CRY_KERNEL, DSCRPTR_QUEUE_WORD0)));
-                writel_relaxed(seq[i].word[2], (volatile void __iomem *)(cc_base + CC_REG_OFFSET(CRY_KERNEL, DSCRPTR_QUEUE_WORD0)));
-                writel_relaxed(seq[i].word[3], (volatile void __iomem *)(cc_base + CC_REG_OFFSET(CRY_KERNEL, DSCRPTR_QUEUE_WORD0)));
-                writel_relaxed(seq[i].word[4], (volatile void __iomem *)(cc_base + CC_REG_OFFSET(CRY_KERNEL, DSCRPTR_QUEUE_WORD0)));
+                writel_relaxed(seq[i].word[0], (volatile void __iomem *)(cc_base + CC_REG(DSCRPTR_QUEUE_WORD0)));
+                writel_relaxed(seq[i].word[1], (volatile void __iomem *)(cc_base + CC_REG(DSCRPTR_QUEUE_WORD0)));
+                writel_relaxed(seq[i].word[2], (volatile void __iomem *)(cc_base + CC_REG(DSCRPTR_QUEUE_WORD0)));
+                writel_relaxed(seq[i].word[3], (volatile void __iomem *)(cc_base + CC_REG(DSCRPTR_QUEUE_WORD0)));
+                writel_relaxed(seq[i].word[4], (volatile void __iomem *)(cc_base + CC_REG(DSCRPTR_QUEUE_WORD0)));
                 wmb();
-                writel_relaxed(seq[i].word[5], (volatile void __iomem *)(cc_base + CC_REG_OFFSET(CRY_KERNEL, DSCRPTR_QUEUE_WORD0)));
+                writel_relaxed(seq[i].word[5], (volatile void __iomem *)(cc_base + CC_REG(DSCRPTR_QUEUE_WORD0)));
 #ifdef DX_DUMP_DESCS
-                SSI_LOG_DEBUG("desc[%02d]: 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X\n", i,
-                              seq[i].word[0], seq[i].word[1], seq[i].word[2],
-                              seq[i].word[3], seq[i].word[4], seq[i].word[5]);
+                dev_dbg(dev, "desc[%02d]: 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X\n",
+                        i, seq[i].word[0], seq[i].word[1], seq[i].word[2],
+                        seq[i].word[3], seq[i].word[4], seq[i].word[5]);
 #endif
         }
 }
@@ -198,11 +197,12 @@ static void request_mgr_complete(struct device *dev, void *dx_compl_h, void __io
 }
 
 static inline int request_mgr_queues_status_check(
+                struct ssi_drvdata *drvdata,
                 struct ssi_request_mgr_handle *req_mgr_h,
-                void __iomem *cc_base,
                 unsigned int total_seq_len)
 {
         unsigned long poll_queue;
+        struct device *dev = drvdata_to_dev(drvdata);
 
         /* SW queue is checked only once as it will not
          * be chaned during the poll becasue the spinlock_bh
@@ -211,8 +211,8 @@ static inline int request_mgr_queues_status_check(
         if (unlikely(((req_mgr_h->req_queue_head + 1) &
                       (MAX_REQUEST_QUEUE_SIZE - 1)) ==
                      req_mgr_h->req_queue_tail)) {
-                SSI_LOG_ERR("SW FIFO is full. req_queue_head=%d sw_fifo_len=%d\n",
-                            req_mgr_h->req_queue_head, MAX_REQUEST_QUEUE_SIZE);
+                dev_err(dev, "SW FIFO is full. req_queue_head=%d sw_fifo_len=%d\n",
+                        req_mgr_h->req_queue_head, MAX_REQUEST_QUEUE_SIZE);
                 return -EBUSY;
         }
 
@@ -222,8 +222,7 @@ static inline int request_mgr_queues_status_check(
         /* Wait for space in HW queue. Poll constant num of iterations. */
         for (poll_queue = 0; poll_queue < SSI_MAX_POLL_ITER ; poll_queue++) {
                 req_mgr_h->q_free_slots =
-                        CC_HAL_READ_REGISTER(CC_REG_OFFSET(CRY_KERNEL,
-                                                           DSCRPTR_QUEUE_CONTENT));
+                        cc_ioread(drvdata, CC_REG(DSCRPTR_QUEUE_CONTENT));
                 if (unlikely(req_mgr_h->q_free_slots <
                                                 req_mgr_h->min_free_hw_slots)) {
                         req_mgr_h->min_free_hw_slots = req_mgr_h->q_free_slots;
@@ -234,16 +233,13 @@ static inline int request_mgr_queues_status_check(
                         return 0;
                 }
 
-                SSI_LOG_DEBUG("HW FIFO is full. q_free_slots=%d total_seq_len=%d\n",
-                              req_mgr_h->q_free_slots, total_seq_len);
+                dev_dbg(dev, "HW FIFO is full. q_free_slots=%d total_seq_len=%d\n",
+                        req_mgr_h->q_free_slots, total_seq_len);
         }
         /* No room in the HW queue try again later */
-        SSI_LOG_DEBUG("HW FIFO full, timeout. req_queue_head=%d "
-                   "sw_fifo_len=%d q_free_slots=%d total_seq_len=%d\n",
-                     req_mgr_h->req_queue_head,
-                   MAX_REQUEST_QUEUE_SIZE,
-                   req_mgr_h->q_free_slots,
-                   total_seq_len);
+        dev_dbg(dev, "HW FIFO full, timeout. req_queue_head=%d sw_fifo_len=%d q_free_slots=%d total_seq_len=%d\n",
+                req_mgr_h->req_queue_head, MAX_REQUEST_QUEUE_SIZE,
+                req_mgr_h->q_free_slots, total_seq_len);
         return -EAGAIN;
 }
 
@@ -270,16 +266,17 @@ int send_request(
         unsigned int iv_seq_len = 0;
         unsigned int total_seq_len = len; /*initial sequence length*/
         struct cc_hw_desc iv_seq[SSI_IVPOOL_SEQ_LEN];
+        struct device *dev = drvdata_to_dev(drvdata);
         int rc;
         unsigned int max_required_seq_len = (total_seq_len +
                                         ((ssi_req->ivgen_dma_addr_len == 0) ? 0 :
                                         SSI_IVPOOL_SEQ_LEN) +
-                                        ((is_dout == 0) ? 1 : 0));
+                                        (!is_dout ? 1 : 0));
 
 #if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM_SLEEP)
-        rc = ssi_power_mgr_runtime_get(&drvdata->plat_dev->dev);
+        rc = ssi_power_mgr_runtime_get(dev);
         if (rc != 0) {
-                SSI_LOG_ERR("ssi_power_mgr_runtime_get returned %x\n", rc);
+                dev_err(dev, "ssi_power_mgr_runtime_get returned %x\n", rc);
                 return rc;
         }
 #endif
@@ -291,7 +288,7 @@ int send_request(
                  * in case iv gen add the max size and in case of no dout add 1
                  * for the internal completion descriptor
                  */
-                rc = request_mgr_queues_status_check(req_mgr_h, cc_base,
+                rc = request_mgr_queues_status_check(drvdata, req_mgr_h,
                                                      max_required_seq_len);
                 if (likely(rc == 0))
                         /* There is enough place in the queue */
@@ -304,7 +301,7 @@ int send_request(
                          * (SW queue is full)
                          */
 #if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM_SLEEP)
-                        ssi_power_mgr_runtime_put_suspend(&drvdata->plat_dev->dev);
+                        ssi_power_mgr_runtime_put_suspend(dev);
 #endif
                         return rc;
                 }
@@ -324,12 +321,12 @@ int send_request(
         }
 
         if (ssi_req->ivgen_dma_addr_len > 0) {
-                SSI_LOG_DEBUG("Acquire IV from pool into %d DMA addresses %pad, %pad, %pad, IV-size=%u\n",
-                              ssi_req->ivgen_dma_addr_len,
-                              ssi_req->ivgen_dma_addr[0],
-                              ssi_req->ivgen_dma_addr[1],
-                              ssi_req->ivgen_dma_addr[2],
-                              ssi_req->ivgen_size);
+                dev_dbg(dev, "Acquire IV from pool into %d DMA addresses %pad, %pad, %pad, IV-size=%u\n",
+                        ssi_req->ivgen_dma_addr_len,
+                        &ssi_req->ivgen_dma_addr[0],
+                        &ssi_req->ivgen_dma_addr[1],
+                        &ssi_req->ivgen_dma_addr[2],
+                        ssi_req->ivgen_size);
 
                 /* Acquire IV from pool */
                 rc = ssi_ivgen_getiv(drvdata, ssi_req->ivgen_dma_addr,
@@ -337,10 +334,10 @@ int send_request(
                                      ssi_req->ivgen_size, iv_seq, &iv_seq_len);
 
                 if (unlikely(rc != 0)) {
-                        SSI_LOG_ERR("Failed to generate IV (rc=%d)\n", rc);
+                        dev_err(dev, "Failed to generate IV (rc=%d)\n", rc);
                         spin_unlock_bh(&req_mgr_h->hw_lock);
 #if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM_SLEEP)
-                        ssi_power_mgr_runtime_put_suspend(&drvdata->plat_dev->dev);
+                        ssi_power_mgr_runtime_put_suspend(dev);
 #endif
                         return rc;
                 }
@@ -357,7 +354,7 @@ int send_request(
         req_mgr_h->req_queue_head = (req_mgr_h->req_queue_head + 1) & (MAX_REQUEST_QUEUE_SIZE - 1);
         /* TODO: Use circ_buf.h ? */
 
-        SSI_LOG_DEBUG("Enqueue request head=%u\n", req_mgr_h->req_queue_head);
+        dev_dbg(dev, "Enqueue request head=%u\n", req_mgr_h->req_queue_head);
 
 #ifdef FLUSH_CACHE_ALL
         flush_cache_all();
@@ -369,11 +366,16 @@ int send_request(
         enqueue_seq(cc_base, &req_mgr_h->compl_desc, (is_dout ? 0 : 1));
 
         if (unlikely(req_mgr_h->q_free_slots < total_seq_len)) {
-                /*This means that there was a problem with the resume*/
-                BUG();
+                /* This situation should never occur. Maybe indicating problem
+                 * with resuming power. Set the free slot count to 0 and hope
+                 * for the best.
+                 */
+                dev_err(dev, "HW free slot count mismatch.");
+                req_mgr_h->q_free_slots = 0;
+        } else {
+                /* Update the free slots in HW queue */
+                req_mgr_h->q_free_slots -= total_seq_len;
         }
-        /* Update the free slots in HW queue */
-        req_mgr_h->q_free_slots -= total_seq_len;
 
         spin_unlock_bh(&req_mgr_h->hw_lock);
 
@@ -383,10 +385,9 @@ int send_request(
                  */
                 wait_for_completion(&ssi_req->seq_compl);
                 return 0;
-        } else {
-                /* Operation still in process */
-                return -EINPROGRESS;
         }
+        /* Operation still in process */
+        return -EINPROGRESS;
 }
 
 /*!
@@ -409,7 +410,8 @@ int send_request_init(
         int rc = 0;
 
         /* Wait for space in HW and SW FIFO. Poll for as much as FIFO_TIMEOUT. */
-        rc = request_mgr_queues_status_check(req_mgr_h, cc_base, total_seq_len);
+        rc = request_mgr_queues_status_check(drvdata, req_mgr_h,
+                                             total_seq_len);
         if (unlikely(rc != 0))
                 return rc;
 
@@ -418,8 +420,8 @@ int send_request_init(
         enqueue_seq(cc_base, desc, len);
 
         /* Update the free slots in HW queue */
-        req_mgr_h->q_free_slots = CC_HAL_READ_REGISTER(CC_REG_OFFSET(CRY_KERNEL,
-                                                                     DSCRPTR_QUEUE_CONTENT));
+        req_mgr_h->q_free_slots =
+                cc_ioread(drvdata, CC_REG(DSCRPTR_QUEUE_CONTENT));
 
         return 0;
 }
@@ -448,7 +450,7 @@ static void comp_work_handler(struct work_struct *work)
 static void proc_completions(struct ssi_drvdata *drvdata)
 {
         struct ssi_crypto_req *ssi_req;
-        struct platform_device *plat_dev = drvdata->plat_dev;
+        struct device *dev = drvdata_to_dev(drvdata);
         struct ssi_request_mgr_handle *request_mgr_handle =
                                                 drvdata->request_mgr_handle;
 #if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM_SLEEP)
@@ -460,8 +462,13 @@ static void proc_completions(struct ssi_drvdata *drvdata)
 
                 /* Dequeue request */
                 if (unlikely(request_mgr_handle->req_queue_head == request_mgr_handle->req_queue_tail)) {
-                        SSI_LOG_ERR("Request queue is empty req_queue_head==req_queue_tail==%u\n", request_mgr_handle->req_queue_head);
-                        BUG();
+                        /* We are supposed to handle a completion but our
+                         * queue is empty. This is not normal. Return and
+                         * hope for the best.
+                         */
+                        dev_err(dev, "Request queue is empty head == tail %u\n",
+                                request_mgr_handle->req_queue_head);
+                        break;
                 }
 
                 ssi_req = &request_mgr_handle->req_queue[request_mgr_handle->req_queue_tail];
@@ -476,39 +483,40 @@ static void proc_completions(struct ssi_drvdata *drvdata)
                         u32 axi_err;
                         int i;
 
-                        SSI_LOG_INFO("Delay\n");
+                        dev_info(dev, "Delay\n");
                         for (i = 0; i < 1000000; i++)
-                                axi_err = READ_REGISTER(drvdata->cc_base + CC_REG_OFFSET(CRY_KERNEL, AXIM_MON_ERR));
+                                axi_err = cc_ioread(drvdata,
+                                                    CC_REG(AXIM_MON_ERR));
                 }
 #endif /* COMPLETION_DELAY */
 
                 if (likely(ssi_req->user_cb))
-                        ssi_req->user_cb(&plat_dev->dev, ssi_req->user_arg, drvdata->cc_base);
+                        ssi_req->user_cb(dev, ssi_req->user_arg,
+                                         drvdata->cc_base);
                 request_mgr_handle->req_queue_tail = (request_mgr_handle->req_queue_tail + 1) & (MAX_REQUEST_QUEUE_SIZE - 1);
-                SSI_LOG_DEBUG("Dequeue request tail=%u\n", request_mgr_handle->req_queue_tail);
-                SSI_LOG_DEBUG("Request completed. axi_completed=%d\n", request_mgr_handle->axi_completed);
+                dev_dbg(dev, "Dequeue request tail=%u\n",
+                        request_mgr_handle->req_queue_tail);
+                dev_dbg(dev, "Request completed. axi_completed=%d\n",
+                        request_mgr_handle->axi_completed);
 #if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM_SLEEP)
-                rc = ssi_power_mgr_runtime_put_suspend(&plat_dev->dev);
+                rc = ssi_power_mgr_runtime_put_suspend(dev);
                 if (rc != 0)
-                        SSI_LOG_ERR("Failed to set runtime suspension %d\n", rc);
+                        dev_err(dev, "Failed to set runtime suspension %d\n",
+                                rc);
 #endif
         }
 }
 
-static inline u32 cc_axi_comp_count(void __iomem *cc_base)
+static inline u32 cc_axi_comp_count(struct ssi_drvdata *drvdata)
 {
-        /* The CC_HAL_READ_REGISTER macro implictly requires and uses
-         * a base MMIO register address variable named cc_base.
-         */
         return FIELD_GET(AXIM_MON_COMP_VALUE,
-                         CC_HAL_READ_REGISTER(AXIM_MON_BASE_OFFSET));
+                         cc_ioread(drvdata, CC_REG(AXIM_MON_COMP)));
 }
 
 /* Deferred service handler, run as interrupt-fired tasklet */
 static void comp_handler(unsigned long devarg)
 {
         struct ssi_drvdata *drvdata = (struct ssi_drvdata *)devarg;
-        void __iomem *cc_base = drvdata->cc_base;
         struct ssi_request_mgr_handle *request_mgr_handle =
                                                 drvdata->request_mgr_handle;
 
@@ -517,12 +525,16 @@ static void comp_handler(unsigned long devarg)
         irq = (drvdata->irq & SSI_COMP_IRQ_MASK);
 
         if (irq & SSI_COMP_IRQ_MASK) {
-                /* To avoid the interrupt from firing as we unmask it, we clear it now */
-                CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_ICR), SSI_COMP_IRQ_MASK);
+                /* To avoid the interrupt from firing as we unmask it,
+                 * we clear it now
+                 */
+                cc_iowrite(drvdata, CC_REG(HOST_ICR), SSI_COMP_IRQ_MASK);
 
-                /* Avoid race with above clear: Test completion counter once more */
+                /* Avoid race with above clear: Test completion counter
+                 * once more
+                 */
                 request_mgr_handle->axi_completed +=
-                                cc_axi_comp_count(cc_base);
+                                cc_axi_comp_count(drvdata);
 
                 while (request_mgr_handle->axi_completed) {
                         do {
@@ -531,20 +543,21 @@ static void comp_handler(unsigned long devarg)
                                  * request_mgr_handle->axi_completed is 0.
                                  */
                                 request_mgr_handle->axi_completed =
-                                                cc_axi_comp_count(cc_base);
+                                                cc_axi_comp_count(drvdata);
                         } while (request_mgr_handle->axi_completed > 0);
 
-                        /* To avoid the interrupt from firing as we unmask it, we clear it now */
-                        CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_ICR), SSI_COMP_IRQ_MASK);
+                        cc_iowrite(drvdata, CC_REG(HOST_ICR),
+                                   SSI_COMP_IRQ_MASK);
 
-                        /* Avoid race with above clear: Test completion counter once more */
                         request_mgr_handle->axi_completed +=
-                                        cc_axi_comp_count(cc_base);
+                                        cc_axi_comp_count(drvdata);
                 }
         }
-        /* after verifing that there is nothing to do, Unmask AXI completion interrupt */
-        CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IMR),
-                              CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IMR)) & ~irq);
+        /* after verifing that there is nothing to do,
+         * unmask AXI completion interrupt
+         */
+        cc_iowrite(drvdata, CC_REG(HOST_IMR),
+                   cc_ioread(drvdata, CC_REG(HOST_IMR)) & ~irq);
 }
 
 /*
diff --git a/drivers/staging/ccree/ssi_sram_mgr.c b/drivers/staging/ccree/ssi_sram_mgr.c
index f11116afe89a..07260d168c91 100644
--- a/drivers/staging/ccree/ssi_sram_mgr.c
+++ b/drivers/staging/ccree/ssi_sram_mgr.c
@@ -50,28 +50,14 @@ void ssi_sram_mgr_fini(struct ssi_drvdata *drvdata)
  */
 int ssi_sram_mgr_init(struct ssi_drvdata *drvdata)
 {
-        struct ssi_sram_mgr_ctx *smgr_ctx;
-        int rc;
-
         /* Allocate "this" context */
-        drvdata->sram_mgr_handle = kzalloc(
-                        sizeof(struct ssi_sram_mgr_ctx), GFP_KERNEL);
-        if (!drvdata->sram_mgr_handle) {
-                SSI_LOG_ERR("Not enough memory to allocate SRAM_MGR ctx (%zu)\n",
-                            sizeof(struct ssi_sram_mgr_ctx));
-                rc = -ENOMEM;
-                goto out;
-        }
-        smgr_ctx = drvdata->sram_mgr_handle;
+        drvdata->sram_mgr_handle = kzalloc(sizeof(struct ssi_sram_mgr_ctx),
+                                           GFP_KERNEL);
 
-        /* Pool starts at start of SRAM */
-        smgr_ctx->sram_free_offset = 0;
+        if (!drvdata->sram_mgr_handle)
+                return -ENOMEM;
 
         return 0;
-
-out:
-        ssi_sram_mgr_fini(drvdata);
-        return rc;
 }
 
 /*!
@@ -86,22 +72,23 @@ out:
 ssi_sram_addr_t ssi_sram_mgr_alloc(struct ssi_drvdata *drvdata, u32 size)
 {
         struct ssi_sram_mgr_ctx *smgr_ctx = drvdata->sram_mgr_handle;
+        struct device *dev = drvdata_to_dev(drvdata);
         ssi_sram_addr_t p;
 
         if (unlikely((size & 0x3) != 0)) {
-                SSI_LOG_ERR("Requested buffer size (%u) is not multiple of 4",
-                            size);
+                dev_err(dev, "Requested buffer size (%u) is not multiple of 4",
+                        size);
                 return NULL_SRAM_ADDR;
         }
         if (unlikely(size > (SSI_CC_SRAM_SIZE - smgr_ctx->sram_free_offset))) {
-                SSI_LOG_ERR("Not enough space to allocate %u B (at offset %llu)\n",
-                            size, smgr_ctx->sram_free_offset);
+                dev_err(dev, "Not enough space to allocate %u B (at offset %llu)\n",
+                        size, smgr_ctx->sram_free_offset);
                 return NULL_SRAM_ADDR;
         }
 
         p = smgr_ctx->sram_free_offset;
         smgr_ctx->sram_free_offset += size;
-        SSI_LOG_DEBUG("Allocated %u B @ %u\n", size, (unsigned int)p);
+        dev_dbg(dev, "Allocated %u B @ %u\n", size, (unsigned int)p);
         return p;
 }
 
diff --git a/drivers/staging/ccree/ssi_sysfs.c b/drivers/staging/ccree/ssi_sysfs.c
index 0655658bba4d..5d39f15cdb59 100644
--- a/drivers/staging/ccree/ssi_sysfs.c
+++ b/drivers/staging/ccree/ssi_sysfs.c
@@ -24,277 +24,22 @@
 
 static struct ssi_drvdata *sys_get_drvdata(void);
 
-#ifdef CC_CYCLE_COUNT
-
-#include <asm/timex.h>
-
-struct stat_item {
-        unsigned int min;
-        unsigned int max;
-        cycles_t sum;
-        unsigned int count;
-};
-
-struct stat_name {
-        const char *op_type_name;
-        const char *stat_phase_name[MAX_STAT_PHASES];
-};
-
-static struct stat_name stat_name_db[MAX_STAT_OP_TYPES] = {
-        {
-                /* STAT_OP_TYPE_NULL */
-                .op_type_name = "NULL",
-                .stat_phase_name = {NULL},
-        },
-        {
-                .op_type_name = "Encode",
-                .stat_phase_name[STAT_PHASE_0] = "Init and sanity checks",
-                .stat_phase_name[STAT_PHASE_1] = "Map buffers",
-                .stat_phase_name[STAT_PHASE_2] = "Create sequence",
-                .stat_phase_name[STAT_PHASE_3] = "Send Request",
-                .stat_phase_name[STAT_PHASE_4] = "HW-Q push",
-                .stat_phase_name[STAT_PHASE_5] = "Sequence completion",
-                .stat_phase_name[STAT_PHASE_6] = "HW cycles",
-        },
-        {       .op_type_name = "Decode",
-                .stat_phase_name[STAT_PHASE_0] = "Init and sanity checks",
-                .stat_phase_name[STAT_PHASE_1] = "Map buffers",
-                .stat_phase_name[STAT_PHASE_2] = "Create sequence",
-                .stat_phase_name[STAT_PHASE_3] = "Send Request",
-                .stat_phase_name[STAT_PHASE_4] = "HW-Q push",
-                .stat_phase_name[STAT_PHASE_5] = "Sequence completion",
-                .stat_phase_name[STAT_PHASE_6] = "HW cycles",
-        },
-        {       .op_type_name = "Setkey",
-                .stat_phase_name[STAT_PHASE_0] = "Init and sanity checks",
-                .stat_phase_name[STAT_PHASE_1] = "Copy key to ctx",
-                .stat_phase_name[STAT_PHASE_2] = "Create sequence",
-                .stat_phase_name[STAT_PHASE_3] = "Send Request",
-                .stat_phase_name[STAT_PHASE_4] = "HW-Q push",
-                .stat_phase_name[STAT_PHASE_5] = "Sequence completion",
-                .stat_phase_name[STAT_PHASE_6] = "HW cycles",
-        },
-        {
-                .op_type_name = "Generic",
-                .stat_phase_name[STAT_PHASE_0] = "Interrupt",
-                .stat_phase_name[STAT_PHASE_1] = "ISR-to-Tasklet",
-                .stat_phase_name[STAT_PHASE_2] = "Tasklet start-to-end",
-                .stat_phase_name[STAT_PHASE_3] = "Tasklet:user_cb()",
-                .stat_phase_name[STAT_PHASE_4] = "Tasklet:dx_X_complete() - w/o X_complete()",
-                .stat_phase_name[STAT_PHASE_5] = "",
-                .stat_phase_name[STAT_PHASE_6] = "HW cycles",
-        }
-};
-
-/*
- * Structure used to create a directory
- * and its attributes in sysfs.
- */
-struct sys_dir {
-        struct kobject *sys_dir_kobj;
-        struct attribute_group sys_dir_attr_group;
-        struct attribute **sys_dir_attr_list;
-        u32 num_of_attrs;
-        struct ssi_drvdata *drvdata; /* Associated driver context */
-};
-
-/* top level directory structures */
-struct sys_dir sys_top_dir;
-
-static DEFINE_SPINLOCK(stat_lock);
-
-/* List of DBs */
-static struct stat_item stat_host_db[MAX_STAT_OP_TYPES][MAX_STAT_PHASES];
-static struct stat_item stat_cc_db[MAX_STAT_OP_TYPES][MAX_STAT_PHASES];
-
-static void init_db(struct stat_item item[MAX_STAT_OP_TYPES][MAX_STAT_PHASES])
-{
-        unsigned int i, j;
-
-        /* Clear db */
-        for (i = 0; i < MAX_STAT_OP_TYPES; i++) {
-                for (j = 0; j < MAX_STAT_PHASES; j++) {
-                        item[i][j].min = 0xFFFFFFFF;
-                        item[i][j].max = 0;
-                        item[i][j].sum = 0;
-                        item[i][j].count = 0;
-                }
-        }
-}
-
-static void update_db(struct stat_item *item, unsigned int result)
-{
-        item->count++;
-        item->sum += result;
-        if (result < item->min)
-                item->min = result;
-        if (result > item->max)
-                item->max = result;
-}
-
-static void display_db(struct stat_item item[MAX_STAT_OP_TYPES][MAX_STAT_PHASES])
-{
-        unsigned int i, j;
-        u64 avg;
-
-        for (i = STAT_OP_TYPE_ENCODE; i < MAX_STAT_OP_TYPES; i++) {
-                for (j = 0; j < MAX_STAT_PHASES; j++) {
-                        if (item[i][j].count > 0) {
-                                avg = (u64)item[i][j].sum;
-                                do_div(avg, item[i][j].count);
-                                SSI_LOG_ERR("%s, %s: min=%d avg=%d max=%d sum=%lld count=%d\n",
-                                            stat_name_db[i].op_type_name,
-                                            stat_name_db[i].stat_phase_name[j],
-                                            item[i][j].min, (int)avg,
-                                            item[i][j].max,
-                                            (long long)item[i][j].sum,
-                                            item[i][j].count);
-                        }
-                }
-        }
-}
-
-/**************************************
- * Attributes show functions section  *
- **************************************/
-
-static ssize_t ssi_sys_stats_host_db_clear(struct kobject *kobj,
-                                           struct kobj_attribute *attr,
-                                           const char *buf, size_t count)
-{
-        init_db(stat_host_db);
-        return count;
-}
-
-static ssize_t ssi_sys_stats_cc_db_clear(struct kobject *kobj,
-                                         struct kobj_attribute *attr,
-                                         const char *buf, size_t count)
-{
-        init_db(stat_cc_db);
-        return count;
-}
-
-static ssize_t ssi_sys_stat_host_db_show(struct kobject *kobj,
-                                         struct kobj_attribute *attr, char *buf)
-{
-        int i, j;
-        char line[512];
-        u32 min_cyc, max_cyc;
-        u64 avg;
-        ssize_t buf_len, tmp_len = 0;
-
-        buf_len = scnprintf(buf, PAGE_SIZE,
-                            "phase\t\t\t\t\t\t\tmin[cy]\tavg[cy]\tmax[cy]\t#samples\n");
-        if (buf_len < 0)/* scnprintf shouldn't return negative value according to its implementation*/
-                return buf_len;
-        for (i = STAT_OP_TYPE_ENCODE; i < MAX_STAT_OP_TYPES; i++) {
-                for (j = 0; j < MAX_STAT_PHASES - 1; j++) {
-                        if (stat_host_db[i][j].count > 0) {
-                                avg = (u64)stat_host_db[i][j].sum;
-                                do_div(avg, stat_host_db[i][j].count);
-                                min_cyc = stat_host_db[i][j].min;
-                                max_cyc = stat_host_db[i][j].max;
-                        } else {
-                                avg = min_cyc = max_cyc = 0;
-                        }
-                        tmp_len = scnprintf(line, 512,
-                                            "%s::%s\t\t\t\t\t%6u\t%6u\t%6u\t%7u\n",
-                                            stat_name_db[i].op_type_name,
-                                            stat_name_db[i].stat_phase_name[j],
-                                            min_cyc, (unsigned int)avg, max_cyc,
-                                            stat_host_db[i][j].count);
-                        if (tmp_len < 0)/* scnprintf shouldn't return negative value according to its implementation*/
-                                return buf_len;
-                        if (buf_len + tmp_len >= PAGE_SIZE)
-                                return buf_len;
-                        buf_len += tmp_len;
-                        strncat(buf, line, 512);
-                }
-        }
-        return buf_len;
-}
-
-static ssize_t ssi_sys_stat_cc_db_show(struct kobject *kobj,
-                                       struct kobj_attribute *attr, char *buf)
-{
-        int i;
-        char line[256];
-        u32 min_cyc, max_cyc;
-        u64 avg;
-        ssize_t buf_len, tmp_len = 0;
-
-        buf_len = scnprintf(buf, PAGE_SIZE,
-                            "phase\tmin[cy]\tavg[cy]\tmax[cy]\t#samples\n");
-        if (buf_len < 0)/* scnprintf shouldn't return negative value according to its implementation*/
-                return buf_len;
-        for (i = STAT_OP_TYPE_ENCODE; i < MAX_STAT_OP_TYPES; i++) {
-                if (stat_cc_db[i][STAT_PHASE_6].count > 0) {
-                        avg = (u64)stat_cc_db[i][STAT_PHASE_6].sum;
-                        do_div(avg, stat_cc_db[i][STAT_PHASE_6].count);
-                        min_cyc = stat_cc_db[i][STAT_PHASE_6].min;
-                        max_cyc = stat_cc_db[i][STAT_PHASE_6].max;
-                } else {
-                        avg = min_cyc = max_cyc = 0;
-                }
-                tmp_len = scnprintf(line, 256, "%s\t%6u\t%6u\t%6u\t%7u\n",
-                                    stat_name_db[i].op_type_name, min_cyc,
-                                    (unsigned int)avg, max_cyc,
-                                    stat_cc_db[i][STAT_PHASE_6].count);
-
-                if (tmp_len < 0)/* scnprintf shouldn't return negative value according to its implementation*/
-                        return buf_len;
-
-                if (buf_len + tmp_len >= PAGE_SIZE)
-                        return buf_len;
-                buf_len += tmp_len;
-                strncat(buf, line, 256);
-        }
-        return buf_len;
-}
-
-void update_host_stat(unsigned int op_type, unsigned int phase, cycles_t result)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&stat_lock, flags);
-        update_db(&stat_host_db[op_type][phase], (unsigned int)result);
-        spin_unlock_irqrestore(&stat_lock, flags);
-}
-
-void update_cc_stat(
-        unsigned int op_type,
-        unsigned int phase,
-        unsigned int elapsed_cycles)
-{
-        update_db(&stat_cc_db[op_type][phase], elapsed_cycles);
-}
-
-void display_all_stat_db(void)
-{
-        SSI_LOG_ERR("\n=======    CYCLE COUNT STATS    =======\n");
-        display_db(stat_host_db);
-        SSI_LOG_ERR("\n======= CC HW CYCLE COUNT STATS =======\n");
-        display_db(stat_cc_db);
-}
-#endif /*CC_CYCLE_COUNT*/
-
 static ssize_t ssi_sys_regdump_show(struct kobject *kobj,
                                     struct kobj_attribute *attr, char *buf)
 {
         struct ssi_drvdata *drvdata = sys_get_drvdata();
         u32 register_value;
-        void __iomem *cc_base = drvdata->cc_base;
         int offset = 0;
 
-        register_value = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_SIGNATURE));
+        register_value = cc_ioread(drvdata, CC_REG(HOST_SIGNATURE));
         offset += scnprintf(buf + offset, PAGE_SIZE - offset, "%s \t(0x%lX)\t 0x%08X\n", "HOST_SIGNATURE       ", DX_HOST_SIGNATURE_REG_OFFSET, register_value);
-        register_value = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IRR));
+        register_value = cc_ioread(drvdata, CC_REG(HOST_IRR));
         offset += scnprintf(buf + offset, PAGE_SIZE - offset, "%s \t(0x%lX)\t 0x%08X\n", "HOST_IRR             ", DX_HOST_IRR_REG_OFFSET, register_value);
-        register_value = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_POWER_DOWN_EN));
+        register_value = cc_ioread(drvdata, CC_REG(HOST_POWER_DOWN_EN));
         offset += scnprintf(buf + offset, PAGE_SIZE - offset, "%s \t(0x%lX)\t 0x%08X\n", "HOST_POWER_DOWN_EN   ", DX_HOST_POWER_DOWN_EN_REG_OFFSET, register_value);
-        register_value =  CC_HAL_READ_REGISTER(CC_REG_OFFSET(CRY_KERNEL, AXIM_MON_ERR));
+        register_value =  cc_ioread(drvdata, CC_REG(AXIM_MON_ERR));
         offset += scnprintf(buf + offset, PAGE_SIZE - offset, "%s \t(0x%lX)\t 0x%08X\n", "AXIM_MON_ERR         ", DX_AXIM_MON_ERR_REG_OFFSET, register_value);
-        register_value = CC_HAL_READ_REGISTER(CC_REG_OFFSET(CRY_KERNEL, DSCRPTR_QUEUE_CONTENT));
+        register_value = cc_ioread(drvdata, CC_REG(DSCRPTR_QUEUE_CONTENT));
         offset += scnprintf(buf + offset, PAGE_SIZE - offset, "%s \t(0x%lX)\t 0x%08X\n", "DSCRPTR_QUEUE_CONTENT", DX_DSCRPTR_QUEUE_CONTENT_REG_OFFSET, register_value);
         return offset;
 }
@@ -304,12 +49,6 @@ static ssize_t ssi_sys_help_show(struct kobject *kobj,
 {
         char *help_str[] = {
                                 "cat reg_dump              ", "Print several of CC register values",
-                #if defined CC_CYCLE_COUNT
-                                "cat stats_host            ", "Print host statistics",
-                                "echo <number> > stats_host", "Clear host statistics database",
-                                "cat stats_cc              ", "Print CC statistics",
-                                "echo <number> > stats_cc  ", "Clear CC statistics database",
-                #endif
                                 };
         int i = 0, offset = 0;
 
@@ -376,7 +115,7 @@ static int sys_init_dir(struct sys_dir *sys_dir, struct ssi_drvdata *drvdata,
                 return -ENOMEM;
         /* allocate memory for directory's attributes list */
         sys_dir->sys_dir_attr_list =
-                kzalloc(sizeof(struct attribute *) * (num_of_attrs + 1),
+                kcalloc(num_of_attrs + 1, sizeof(struct attribute *),
                         GFP_KERNEL);
 
         if (!(sys_dir->sys_dir_attr_list)) {
@@ -413,14 +152,9 @@ static void sys_free_dir(struct sys_dir *sys_dir)
 int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata)
 {
         int retval;
+        struct device *dev = drvdata_to_dev(drvdata);
 
-#if defined CC_CYCLE_COUNT
-        /* Init. statistics */
-        init_db(stat_host_db);
-        init_db(stat_cc_db);
-#endif
-
-        SSI_LOG_ERR("setup sysfs under %s\n", sys_dev_obj->name);
+        dev_info(dev, "setup sysfs under %s\n", sys_dev_obj->name);
 
         /* Initialize top directory */
         retval = sys_init_dir(&sys_top_dir, drvdata, sys_dev_obj, "cc_info",
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 7a655ed071a3..4218fc0e17f1 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -785,8 +785,8 @@ config COMEDI_ADV_PCI_DIO
         ---help---
           Enable support for Advantech PCI DIO cards
           PCI-1730, PCI-1733, PCI-1734, PCI-1735U, PCI-1736UP, PCI-1739U,
-          PCI-1750, PCI-1751, PCI-1752, PCI-1753/E, PCI-1754, PCI-1756 and
-          PCI-1762
+          PCI-1750, PCI-1751, PCI-1752, PCI-1753/E, PCI-1754, PCI-1756,
+          PCI-1761 and PCI-1762
 
           To compile this driver as a module, choose M here: the module will be
           called adv_pci_dio.
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 620cec13d74c..a8186687ca2c 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -12,9 +12,9 @@
  * Devices: [Advantech] PCI-1730 (adv_pci_dio), PCI-1733,
  *   PCI-1734, PCI-1735U, PCI-1736UP, PCI-1739U, PCI-1750,
  *   PCI-1751, PCI-1752, PCI-1753, PCI-1753+PCI-1753E,
- *   PCI-1754, PCI-1756, PCI-1762
+ *   PCI-1754, PCI-1756, PCI-1761, PCI-1762
  * Author: Michal Dobes <dobes@tesnet.cz>
- * Updated: Mon, 09 Jan 2012 12:40:46 +0000
+ * Updated: Fri, 25 Aug 2017 07:23:06 +0300
  * Status: untested
  *
  * Configuration Options: not applicable, uses PCI auto config
@@ -50,6 +50,11 @@
 /* PCI-1752, PCI-1756 special registers */
 #define PCI1752_CFC_REG         0x12    /* R/W: channel freeze function */
 
+/* PCI-1761 interrupt control registers */
+#define PCI1761_INT_EN_REG      0x03    /* R/W: enable/disable interrupts */
+#define PCI1761_INT_RF_REG      0x04    /* R/W: falling/rising edge */
+#define PCI1761_INT_CLR_REG     0x05    /* R/W: clear interrupts */
+
 /* PCI-1762 interrupt control registers */
 #define PCI1762_INT_REG         0x06    /* R/W: status/control */
 
@@ -72,6 +77,7 @@ enum pci_dio_boardid {
         TYPE_PCI1753E,
         TYPE_PCI1754,
         TYPE_PCI1756,
+        TYPE_PCI1761,
         TYPE_PCI1762
 };
 
@@ -181,6 +187,13 @@ static const struct dio_boardtype boardtypes[] = {
                 .id_reg         = 0x10,
                 .is_16bit       = 1,
         },
+        [TYPE_PCI1761] = {
+                .name           = "pci1761",
+                .nsubdevs       = 3,
+                .sdi[1]         = { 8, 0x01 },          /* ISO DI 0-7 */
+                .sdo[1]         = { 8, 0x00 },          /* RELAY DO 0-7 */
+                .id_reg         = 0x02,
+        },
         [TYPE_PCI1762] = {
                 .name           = "pci1762",
                 .nsubdevs       = 3,
@@ -309,6 +322,14 @@ static int pci_dio_reset(struct comedi_device *dev, unsigned long cardtype)
                         outw(0x08, dev->iobase + PCI1754_INT_REG(3));
                 }
                 break;
+        case TYPE_PCI1761:
+                /* disable interrupts */
+                outb(0, dev->iobase + PCI1761_INT_EN_REG);
+                /* clear interrupts */
+                outb(0xff, dev->iobase + PCI1761_INT_CLR_REG);
+                /* set rising edge trigger */
+                outb(0, dev->iobase + PCI1761_INT_RF_REG);
+                break;
         case TYPE_PCI1762:
                 outw(0x0101, dev->iobase + PCI1762_INT_REG);
                 break;
@@ -496,6 +517,7 @@ static const struct pci_device_id adv_pci_dio_pci_table[] = {
         { PCI_VDEVICE(ADVANTECH, 0x1753), TYPE_PCI1753 },
         { PCI_VDEVICE(ADVANTECH, 0x1754), TYPE_PCI1754 },
         { PCI_VDEVICE(ADVANTECH, 0x1756), TYPE_PCI1756 },
+        { PCI_VDEVICE(ADVANTECH, 0x1761), TYPE_PCI1761 },
         { PCI_VDEVICE(ADVANTECH, 0x1762), TYPE_PCI1762 },
         { 0 }
 };
diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c
index ccfd642998be..c7e8194984e5 100644
--- a/drivers/staging/comedi/drivers/comedi_test.c
+++ b/drivers/staging/comedi/drivers/comedi_test.c
@@ -93,6 +93,7 @@ struct waveform_private {
         unsigned int ai_scan_period;    /* AI scan period in usec */
         unsigned int ai_convert_period; /* AI conversion period in usec */
         struct timer_list ao_timer;     /* timer for AO commands */
+        struct comedi_device *dev;      /* parent comedi device */
         u64 ao_last_scan_time;          /* time of previous AO scan in usec */
         unsigned int ao_scan_period;    /* AO scan period in usec */
         unsigned short ao_loopbacks[N_CHANS];
@@ -201,10 +202,10 @@ static unsigned short fake_waveform(struct comedi_device *dev,
  * It should run in the background; therefore it is scheduled by
  * a timer mechanism.
  */
-static void waveform_ai_timer(unsigned long arg)
+static void waveform_ai_timer(struct timer_list *t)
 {
-        struct comedi_device *dev = (struct comedi_device *)arg;
-        struct waveform_private *devpriv = dev->private;
+        struct waveform_private *devpriv = from_timer(devpriv, t, ai_timer);
+        struct comedi_device *dev = devpriv->dev;
         struct comedi_subdevice *s = dev->read_subdev;
         struct comedi_async *async = s->async;
         struct comedi_cmd *cmd = &async->cmd;
@@ -438,10 +439,10 @@ static int waveform_ai_insn_read(struct comedi_device *dev,
  * This is the background routine to handle AO commands, scheduled by
  * a timer mechanism.
  */
-static void waveform_ao_timer(unsigned long arg)
+static void waveform_ao_timer(struct timer_list *t)
 {
-        struct comedi_device *dev = (struct comedi_device *)arg;
-        struct waveform_private *devpriv = dev->private;
+        struct waveform_private *devpriv = from_timer(devpriv, t, ao_timer);
+        struct comedi_device *dev = devpriv->dev;
         struct comedi_subdevice *s = dev->write_subdev;
         struct comedi_async *async = s->async;
         struct comedi_cmd *cmd = &async->cmd;
@@ -686,8 +687,9 @@ static int waveform_common_attach(struct comedi_device *dev,
         for (i = 0; i < s->n_chan; i++)
                 devpriv->ao_loopbacks[i] = s->maxdata / 2;
 
-        setup_timer(&devpriv->ai_timer, waveform_ai_timer, (unsigned long)dev);
-        setup_timer(&devpriv->ao_timer, waveform_ao_timer, (unsigned long)dev);
+        devpriv->dev = dev;
+        timer_setup(&devpriv->ai_timer, waveform_ai_timer, 0);
+        timer_setup(&devpriv->ao_timer, waveform_ao_timer, 0);
 
         dev_info(dev->class_dev,
                  "%s: %u microvolt, %u microsecond waveform attached\n",
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index 5d157951f63f..ddd4aeab6365 100644
--- a/drivers/staging/comedi/drivers/das16.c
+++ b/drivers/staging/comedi/drivers/das16.c
@@ -440,6 +440,7 @@ static inline int timer_period(void)
 
 struct das16_private_struct {
         struct comedi_isadma    *dma;
+        struct comedi_device    *dev;
         unsigned int            clockbase;
         unsigned int            ctrl_reg;
         unsigned int            divisor1;
@@ -525,10 +526,10 @@ static void das16_interrupt(struct comedi_device *dev)
         comedi_handle_events(dev, s);
 }
 
-static void das16_timer_interrupt(unsigned long arg)
+static void das16_timer_interrupt(struct timer_list *t)
 {
-        struct comedi_device *dev = (struct comedi_device *)arg;
-        struct das16_private_struct *devpriv = dev->private;
+        struct das16_private_struct *devpriv = from_timer(devpriv, t, timer);
+        struct comedi_device *dev = devpriv->dev;
         unsigned long flags;
 
         das16_interrupt(dev);
@@ -934,6 +935,8 @@ static void das16_alloc_dma(struct comedi_device *dev, unsigned int dma_chan)
 {
         struct das16_private_struct *devpriv = dev->private;
 
+        timer_setup(&devpriv->timer, das16_timer_interrupt, 0);
+
         /* only DMA channels 3 and 1 are valid */
         if (!(dma_chan == 1 || dma_chan == 3))
                 return;
@@ -941,10 +944,6 @@ static void das16_alloc_dma(struct comedi_device *dev, unsigned int dma_chan)
         /* DMA uses two buffers */
         devpriv->dma = comedi_isadma_alloc(dev, 2, dma_chan, dma_chan,
                                            DAS16_DMA_SIZE, COMEDI_ISADMA_READ);
-        if (devpriv->dma) {
-                setup_timer(&devpriv->timer, das16_timer_interrupt,
-                            (unsigned long)dev);
-        }
 }
 
 static void das16_free_dma(struct comedi_device *dev)
@@ -952,8 +951,7 @@ static void das16_free_dma(struct comedi_device *dev)
         struct das16_private_struct *devpriv = dev->private;
 
         if (devpriv) {
-                if (devpriv->timer.data)
-                        del_timer_sync(&devpriv->timer);
+                del_timer_sync(&devpriv->timer);
                 comedi_isadma_free(devpriv->dma);
         }
 }
@@ -1046,6 +1044,7 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
         if (!devpriv)
                 return -ENOMEM;
+        devpriv->dev = dev;
 
         if (board->size < 0x400) {
                 ret = comedi_request_region(dev, it->options[0], board->size);
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c
index d5295bbdd28c..217a4b884689 100644
--- a/drivers/staging/comedi/drivers/dt282x.c
+++ b/drivers/staging/comedi/drivers/dt282x.c
@@ -1062,6 +1062,8 @@ static void dt282x_alloc_dma(struct comedi_device *dev,
                                            PAGE_SIZE, 0);
         if (!devpriv->dma)
                 free_irq(irq_num, dev);
+        else
+                dev->irq = irq_num;
 }
 
 static void dt282x_free_dma(struct comedi_device *dev)
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index f1c2a20a7d4d..cbff3b41bb45 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -96,6 +96,7 @@ struct jr3_pci_poll_delay {
 
 struct jr3_pci_dev_private {
         struct timer_list timer;
+        struct comedi_device *dev;
 };
 
 union jr3_pci_single_range {
@@ -585,10 +586,10 @@ jr3_pci_poll_subdevice(struct comedi_subdevice *s)
         return result;
 }
 
-static void jr3_pci_poll_dev(unsigned long data)
+static void jr3_pci_poll_dev(struct timer_list *t)
 {
-        struct comedi_device *dev = (struct comedi_device *)data;
-        struct jr3_pci_dev_private *devpriv = dev->private;
+        struct jr3_pci_dev_private *devpriv = from_timer(devpriv, t, timer);
+        struct comedi_device *dev = devpriv->dev;
         struct jr3_pci_subdev_private *spriv;
         struct comedi_subdevice *s;
         unsigned long flags;
@@ -770,7 +771,8 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
                 spriv->next_time_min = jiffies + msecs_to_jiffies(500);
         }
 
-        setup_timer(&devpriv->timer, jr3_pci_poll_dev, (unsigned long)dev);
+        devpriv->dev = dev;
+        timer_setup(&devpriv->timer, jr3_pci_poll_dev, 0);
         devpriv->timer.expires = jiffies + msecs_to_jiffies(1000);
         add_timer(&devpriv->timer);
 
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c
index c80527db9c19..e226275972c0 100644
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -408,9 +408,8 @@ static int s526_gpct_winsn(struct comedi_device *dev,
                  */
                 if ((data[1] <= data[0]) || !data[0])
                         return -EINVAL;
-
-                /* Fall thru to write the PULSE_WIDTH */
-
+                /* to write the PULSE_WIDTH */
+                /* fall through */
         case INSN_CONFIG_GPCT_QUADRATURE_ENCODER:
         case INSN_CONFIG_GPCT_SINGLE_PULSE_GENERATOR:
                 s526_gpct_write(dev, chan, data[0]);
diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c
index c1b6079384e9..d9bf5da1b8e5 100644
--- a/drivers/staging/dgnc/dgnc_driver.c
+++ b/drivers/staging/dgnc/dgnc_driver.c
@@ -291,7 +291,7 @@ static void dgnc_free_irq(struct dgnc_board *brd)
   * waiter needs to be woken up, and (b) whether the poller needs to
   * be rescheduled.
   */
-static void dgnc_poll_handler(ulong dummy)
+static void dgnc_poll_handler(struct timer_list *unused)
 {
         struct dgnc_board *brd;
         unsigned long flags;
@@ -323,7 +323,7 @@ static void dgnc_poll_handler(ulong dummy)
         if ((ulong)new_time >= 2 * dgnc_poll_tick)
                 dgnc_poll_time = jiffies + dgnc_jiffies_from_ms(dgnc_poll_tick);
 
-        setup_timer(&dgnc_poll_timer, dgnc_poll_handler, 0);
+        timer_setup(&dgnc_poll_timer, dgnc_poll_handler, 0);
         dgnc_poll_timer.expires = dgnc_poll_time;
         spin_unlock_irqrestore(&dgnc_poll_lock, flags);
 
@@ -392,8 +392,6 @@ static int dgnc_start(void)
         unsigned long flags;
         struct device *dev;
 
-        init_timer(&dgnc_poll_timer);
-
         rc = register_chrdev(0, "dgnc", &dgnc_board_fops);
         if (rc < 0) {
                 pr_err(DRVSTR ": Can't register dgnc driver device (%d)\n", rc);
@@ -419,7 +417,7 @@ static int dgnc_start(void)
 
         /* Start the poller */
         spin_lock_irqsave(&dgnc_poll_lock, flags);
-        setup_timer(&dgnc_poll_timer, dgnc_poll_handler, 0);
+        timer_setup(&dgnc_poll_timer, dgnc_poll_handler, 0);
         dgnc_poll_time = jiffies + dgnc_jiffies_from_ms(dgnc_poll_tick);
         dgnc_poll_timer.expires = dgnc_poll_time;
         spin_unlock_irqrestore(&dgnc_poll_lock, flags);
diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h
index 764d6fe0d030..efdb11a5e27f 100644
--- a/drivers/staging/dgnc/dgnc_driver.h
+++ b/drivers/staging/dgnc/dgnc_driver.h
@@ -104,7 +104,6 @@ struct board_ops {
  * struct dgnc_board - Per board information.
  * @boardnum: Board number (0 - 32).
  *
- * @type: Type of board.
  * @name: Product name.
  * @pdev: Pointer to the pci_dev structure.
  * @bd_flags: Board flags.
@@ -140,13 +139,9 @@ struct board_ops {
  * @dpastatus: Board status as defined by DPA.
  * @bd_dividend: Board/UART's specific dividend.
  * @bd_ops: Pointer to board operations structure.
- * @proc_entry_pointer: Proc/<board> entry
- * @dgnc_board_table: Proc/<board> entry
  */
 struct dgnc_board {
         int             boardnum;
-
-        int             type;
         char            *name;
         struct pci_dev  *pdev;
         unsigned long   bd_flags;
@@ -200,10 +195,6 @@ struct dgnc_board {
         uint            bd_dividend;
 
         struct board_ops *bd_ops;
-
-        struct proc_dir_entry *proc_entry_pointer;
-        struct dgnc_proc_entry *dgnc_board_table;
-
 };
 
 /* Unit flag definitions for un_flags. */
@@ -233,7 +224,6 @@ struct device;
  */
 struct un_t {
         struct  channel_t *un_ch;
-        ulong   un_time;
         uint    un_type;
         uint    un_open_count;
         struct tty_struct *un_tty;
@@ -321,8 +311,6 @@ struct un_t {
  * @ch_err_overrun: Count of overruns on channel.
  * @ch_xon_sends: Count of xons transmitted.
  * @ch_xoff_sends: Count of xoffs transmitted.
- * @proc_entry_pointer: Proc/<board>/<channel> entry.
- * @dgnc_channel_table: Proc/<board>/<channel> entry.
  */
 struct channel_t {
         struct dgnc_board *ch_bd;
@@ -391,10 +379,6 @@ struct channel_t {
 
         ulong           ch_xon_sends;
         ulong           ch_xoff_sends;
-
-        struct proc_dir_entry *proc_entry_pointer;
-        struct dgnc_proc_entry *dgnc_channel_table;
-
 };
 
 extern uint             dgnc_major;             /* Our driver/mgmt major */
diff --git a/drivers/staging/dgnc/dgnc_neo.c b/drivers/staging/dgnc/dgnc_neo.c
index 1943e66fec57..0ae229c3aaaa 100644
--- a/drivers/staging/dgnc/dgnc_neo.c
+++ b/drivers/staging/dgnc/dgnc_neo.c
@@ -1182,7 +1182,6 @@ static int neo_drain(struct tty_struct *tty, uint seconds)
         unsigned long flags;
         struct channel_t *ch;
         struct un_t *un;
-        int rc = 0;
 
         if (!tty)
                 return -ENXIO;
@@ -1199,12 +1198,10 @@ static int neo_drain(struct tty_struct *tty, uint seconds)
         un->un_flags |= UN_EMPTY;
         spin_unlock_irqrestore(&ch->ch_lock, flags);
 
-        rc = wait_event_interruptible_timeout(un->un_flags_wait,
-                                              ((un->un_flags & UN_EMPTY) == 0),
-                                              msecs_to_jiffies(seconds * 1000));
-
-        /* If ret is non-zero, user ctrl-c'ed us */
-        return rc;
+        /* If returned value is non-zero, user ctrl-c'ed us */
+        return wait_event_interruptible_timeout(un->un_flags_wait,
+                                        ((un->un_flags & UN_EMPTY) == 0),
+                                        msecs_to_jiffies(seconds * 1000));
 }
 
 /*
diff --git a/drivers/staging/fbtft/fb_ra8875.c b/drivers/staging/fbtft/fb_ra8875.c
index a899614ce829..6d1cad85957b 100644
--- a/drivers/staging/fbtft/fb_ra8875.c
+++ b/drivers/staging/fbtft/fb_ra8875.c
@@ -253,7 +253,7 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
 static int write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len)
 {
         u16 *vmem16;
-        __be16 *txbuf16 = par->txbuf.buf;
+        __be16 *txbuf16;
         size_t remain;
         size_t to_copy;
         size_t tx_array_size;
@@ -267,10 +267,10 @@ static int write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len)
         remain = len / 2;
         vmem16 = (u16 *)(par->info->screen_buffer + offset);
         tx_array_size = par->txbuf.len / 2;
-                txbuf16 = par->txbuf.buf + 1;
-                tx_array_size -= 2;
-                *(u8 *)(par->txbuf.buf) = 0x00;
-                startbyte_size = 1;
+        txbuf16 = par->txbuf.buf + 1;
+        tx_array_size -= 2;
+        *(u8 *)(par->txbuf.buf) = 0x00;
+        startbyte_size = 1;
 
         while (remain) {
                 to_copy = min(tx_array_size, remain);
diff --git a/drivers/staging/fbtft/fb_ssd1331.c b/drivers/staging/fbtft/fb_ssd1331.c
index 9aa9864fcf30..e4a759b54ba0 100644
--- a/drivers/staging/fbtft/fb_ssd1331.c
+++ b/drivers/staging/fbtft/fb_ssd1331.c
@@ -26,7 +26,13 @@ static int init_display(struct fbtft_par *par)
         par->fbtftops.reset(par);
 
         write_reg(par, 0xae); /* Display Off */
-        write_reg(par, 0xa0, 0x70 | (par->bgr << 2)); /* Set Colour Depth */
+
+        /* Set Column Address Mapping, COM Scan Direction and Colour Depth */
+        if (par->info->var.rotate == 180)
+                write_reg(par, 0xa0, 0x60 | (par->bgr << 2));
+        else
+                write_reg(par, 0xa0, 0x72 | (par->bgr << 2));
+
         write_reg(par, 0x72); /* RGB colour */
         write_reg(par, 0xa1, 0x00); /* Set Display Start Line */
         write_reg(par, 0xa2, 0x00); /* Set Display Offset */
diff --git a/drivers/staging/fbtft/fb_uc1611.c b/drivers/staging/fbtft/fb_uc1611.c
index 48e3b3fd9fed..8eb5e7f10fb5 100644
--- a/drivers/staging/fbtft/fb_uc1611.c
+++ b/drivers/staging/fbtft/fb_uc1611.c
@@ -225,7 +225,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
         u8 *buf8 = par->txbuf.buf;
         u16 *buf16 = par->txbuf.buf;
         int line_length = par->info->fix.line_length;
-        int y_start = (offset / line_length);
+        int y_start = offset / line_length;
         int y_end = (offset + len - 1) / line_length;
         int x, y, i;
         int ret = 0;
diff --git a/drivers/staging/fbtft/fb_uc1701.c b/drivers/staging/fbtft/fb_uc1701.c
index b78045fe5393..78899a172c7e 100644
--- a/drivers/staging/fbtft/fb_uc1701.c
+++ b/drivers/staging/fbtft/fb_uc1701.c
@@ -127,7 +127,7 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
 static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
 {
         u16 *vmem16 = (u16 *)par->info->screen_buffer;
-        u8 *buf = par->txbuf.buf;
+        u8 *buf;
         int x, y, i;
         int ret = 0;
 
diff --git a/drivers/staging/fbtft/fbtft-bus.c b/drivers/staging/fbtft/fbtft-bus.c
index a80b5d115ff8..81e8af72f87d 100644
--- a/drivers/staging/fbtft/fbtft-bus.c
+++ b/drivers/staging/fbtft/fbtft-bus.c
@@ -10,33 +10,33 @@
  *
  *****************************************************************************/
 
-#define define_fbtft_write_reg(func, type, modifier)                          \
+#define define_fbtft_write_reg(func, buffer_type, data_type, modifier)        \
 void func(struct fbtft_par *par, int len, ...)                                \
 {                                                                             \
         va_list args;                                                         \
         int i, ret;                                                           \
         int offset = 0;                                                       \
-        type *buf = (type *)par->buf;                                         \
+        buffer_type *buf = (buffer_type *)par->buf;                           \
                                                                               \
         if (unlikely(par->debug & DEBUG_WRITE_REGISTER)) {                    \
                 va_start(args, len);                                          \
                 for (i = 0; i < len; i++) {                                   \
-                        buf[i] = (type)va_arg(args, unsigned int);            \
+                        buf[i] = modifier((data_type)va_arg(args, unsigned int)); \
                 }                                                             \
                 va_end(args);                                                 \
-                fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device, type, buf, len, "%s: ", __func__);   \
+                fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device, buffer_type, buf, len, "%s: ", __func__); \
         }                                                                     \
                                                                               \
         va_start(args, len);                                                  \
                                                                               \
         if (par->startbyte) {                                                 \
                 *(u8 *)par->buf = par->startbyte;                             \
-                buf = (type *)(par->buf + 1);                                 \
+                buf = (buffer_type *)(par->buf + 1);                          \
                 offset = 1;                                                   \
         }                                                                     \
                                                                               \
-        *buf = modifier((type)va_arg(args, unsigned int));                    \
-        ret = fbtft_write_buf_dc(par, par->buf, sizeof(type) + offset, 0);    \
+        *buf = modifier((data_type)va_arg(args, unsigned int));               \
+        ret = fbtft_write_buf_dc(par, par->buf, sizeof(data_type) + offset, 0); \
         if (ret < 0)                                                          \
                 goto out;                                                     \
         len--;                                                                \
@@ -47,18 +47,18 @@ void func(struct fbtft_par *par, int len, ...)                                \
         if (len) {                                                            \
                 i = len;                                                      \
                 while (i--)                                                   \
-                        *buf++ = modifier((type)va_arg(args, unsigned int));  \
+                        *buf++ = modifier((data_type)va_arg(args, unsigned int)); \
                 fbtft_write_buf_dc(par, par->buf,                             \
-                                   len * (sizeof(type) + offset), 1);         \
+                                   len * (sizeof(data_type) + offset), 1);    \
         }                                                                     \
 out:                                                                          \
         va_end(args);                                                         \
 }                                                                             \
 EXPORT_SYMBOL(func);
 
-define_fbtft_write_reg(fbtft_write_reg8_bus8, u8, )
-define_fbtft_write_reg(fbtft_write_reg16_bus8, u16, cpu_to_be16)
-define_fbtft_write_reg(fbtft_write_reg16_bus16, u16, )
+define_fbtft_write_reg(fbtft_write_reg8_bus8, u8, u8, )
+define_fbtft_write_reg(fbtft_write_reg16_bus8, __be16, u16, cpu_to_be16)
+define_fbtft_write_reg(fbtft_write_reg16_bus16, u16, u16, )
 
 void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...)
 {
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
index 26017fe9df93..0d8ed002adcb 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c
@@ -104,9 +104,11 @@ static void free_rx_fd(struct dpaa2_eth_priv *priv,
                 /* We don't support any other format */
                 return;
 
-        /* For S/G frames, we first need to free all SG entries */
+        /* For S/G frames, we first need to free all SG entries
+         * except the first one, which was taken care of already
+         */
         sgt = vaddr + dpaa2_fd_get_offset(fd);
-        for (i = 0; i < DPAA2_ETH_MAX_SG_ENTRIES; i++) {
+        for (i = 1; i < DPAA2_ETH_MAX_SG_ENTRIES; i++) {
                 addr = dpaa2_sg_get_addr(&sgt[i]);
                 sg_vaddr = dpaa2_iova_to_virt(priv->iommu_domain, addr);
                 dma_unmap_single(dev, addr, DPAA2_ETH_RX_BUF_SIZE,
@@ -131,16 +133,15 @@ static struct sk_buff *build_linear_skb(struct dpaa2_eth_priv *priv,
         u16 fd_offset = dpaa2_fd_get_offset(fd);
         u32 fd_length = dpaa2_fd_get_len(fd);
 
-        skb = build_skb(fd_vaddr, DPAA2_ETH_RX_BUF_SIZE +
-                        SKB_DATA_ALIGN(sizeof(struct skb_shared_info)));
+        ch->buf_count--;
+
+        skb = build_skb(fd_vaddr, DPAA2_ETH_SKB_SIZE);
         if (unlikely(!skb))
                 return NULL;
 
         skb_reserve(skb, fd_offset);
         skb_put(skb, fd_length);
 
-        ch->buf_count--;
-
         return skb;
 }
 
@@ -176,10 +177,21 @@ static struct sk_buff *build_frag_skb(struct dpaa2_eth_priv *priv,
 
                 if (i == 0) {
                         /* We build the skb around the first data buffer */
-                        skb = build_skb(sg_vaddr, DPAA2_ETH_RX_BUF_SIZE +
-                                SKB_DATA_ALIGN(sizeof(struct skb_shared_info)));
-                        if (unlikely(!skb))
-                                return NULL;
+                        skb = build_skb(sg_vaddr, DPAA2_ETH_SKB_SIZE);
+                        if (unlikely(!skb)) {
+                                /* Free the first SG entry now, since we already
+                                 * unmapped it and obtained the virtual address
+                                 */
+                                skb_free_frag(sg_vaddr);
+
+                                /* We still need to subtract the buffers used
+                                 * by this FD from our software counter
+                                 */
+                                while (!dpaa2_sg_is_final(&sgt[i]) &&
+                                       i < DPAA2_ETH_MAX_SG_ENTRIES)
+                                        i++;
+                                break;
+                        }
 
                         sg_offset = dpaa2_sg_get_offset(sge);
                         skb_reserve(skb, sg_offset);
@@ -206,6 +218,8 @@ static struct sk_buff *build_frag_skb(struct dpaa2_eth_priv *priv,
                         break;
         }
 
+        WARN_ONCE(i == DPAA2_ETH_MAX_SG_ENTRIES, "Final bit not set in SGT");
+
         /* Count all data buffers + SG table buffer */
         ch->buf_count -= i + 2;
 
@@ -557,10 +571,10 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)
         percpu_stats = this_cpu_ptr(priv->percpu_stats);
         percpu_extras = this_cpu_ptr(priv->percpu_extras);
 
-        if (unlikely(skb_headroom(skb) < DPAA2_ETH_NEEDED_HEADROOM(priv))) {
+        if (unlikely(skb_headroom(skb) < dpaa2_eth_needed_headroom(priv))) {
                 struct sk_buff *ns;
 
-                ns = skb_realloc_headroom(skb, DPAA2_ETH_NEEDED_HEADROOM(priv));
+                ns = skb_realloc_headroom(skb, dpaa2_eth_needed_headroom(priv));
                 if (unlikely(!ns)) {
                         percpu_stats->tx_dropped++;
                         goto err_alloc_headroom;
@@ -718,6 +732,23 @@ static int set_tx_csum(struct dpaa2_eth_priv *priv, bool enable)
         return 0;
 }
 
+/* Free buffers acquired from the buffer pool or which were meant to
+ * be released in the pool
+ */
+static void free_bufs(struct dpaa2_eth_priv *priv, u64 *buf_array, int count)
+{
+        struct device *dev = priv->net_dev->dev.parent;
+        void *vaddr;
+        int i;
+
+        for (i = 0; i < count; i++) {
+                vaddr = dpaa2_iova_to_virt(priv->iommu_domain, buf_array[i]);
+                dma_unmap_single(dev, buf_array[i], DPAA2_ETH_RX_BUF_SIZE,
+                                 DMA_BIDIRECTIONAL);
+                skb_free_frag(vaddr);
+        }
+}
+
 /* Perform a single release command to add buffers
  * to the specified buffer pool
  */
@@ -727,17 +758,17 @@ static int add_bufs(struct dpaa2_eth_priv *priv, u16 bpid)
         u64 buf_array[DPAA2_ETH_BUFS_PER_CMD];
         void *buf;
         dma_addr_t addr;
-        int i;
+        int i, err;
 
         for (i = 0; i < DPAA2_ETH_BUFS_PER_CMD; i++) {
                 /* Allocate buffer visible to WRIOP + skb shared info +
                  * alignment padding
                  */
-                buf = napi_alloc_frag(DPAA2_ETH_BUF_RAW_SIZE);
+                buf = napi_alloc_frag(dpaa2_eth_buf_raw_size(priv));
                 if (unlikely(!buf))
                         goto err_alloc;
 
-                buf = PTR_ALIGN(buf, DPAA2_ETH_RX_BUF_ALIGN);
+                buf = PTR_ALIGN(buf, priv->rx_buf_align);
 
                 addr = dma_map_single(dev, buf, DPAA2_ETH_RX_BUF_SIZE,
                                       DMA_FROM_DEVICE);
@@ -748,28 +779,33 @@ static int add_bufs(struct dpaa2_eth_priv *priv, u16 bpid)
 
                 /* tracing point */
                 trace_dpaa2_eth_buf_seed(priv->net_dev,
-                                         buf, DPAA2_ETH_BUF_RAW_SIZE,
+                                         buf, dpaa2_eth_buf_raw_size(priv),
                                          addr, DPAA2_ETH_RX_BUF_SIZE,
                                          bpid);
         }
 
 release_bufs:
-        /* In case the portal is busy, retry until successful.
-         * The buffer release function would only fail if the QBMan portal
-         * was busy, which implies portal contention (i.e. more CPUs than
-         * portals, i.e. GPPs w/o affine DPIOs). For all practical purposes,
-         * there is little we can realistically do, short of giving up -
-         * in which case we'd risk depleting the buffer pool and never again
-         * receiving the Rx interrupt which would kick-start the refill logic.
-         * So just keep retrying, at the risk of being moved to ksoftirqd.
-         */
-        while (dpaa2_io_service_release(NULL, bpid, buf_array, i))
+        /* In case the portal is busy, retry until successful */
+        while ((err = dpaa2_io_service_release(NULL, bpid,
+                                               buf_array, i)) == -EBUSY)
                 cpu_relax();
+
+        /* If release command failed, clean up and bail out;
+         * not much else we can do about it
+         */
+        if (err) {
+                free_bufs(priv, buf_array, i);
+                return 0;
+        }
+
         return i;
 
 err_map:
         skb_free_frag(buf);
 err_alloc:
+        /* If we managed to allocate at least some buffers,
+         * release them to hardware
+         */
         if (i)
                 goto release_bufs;
 
@@ -811,10 +847,8 @@ static int seed_pool(struct dpaa2_eth_priv *priv, u16 bpid)
  */
 static void drain_bufs(struct dpaa2_eth_priv *priv, int count)
 {
-        struct device *dev = priv->net_dev->dev.parent;
         u64 buf_array[DPAA2_ETH_BUFS_PER_CMD];
-        void *vaddr;
-        int ret, i;
+        int ret;
 
         do {
                 ret = dpaa2_io_service_acquire(NULL, priv->bpid,
@@ -823,15 +857,7 @@ static void drain_bufs(struct dpaa2_eth_priv *priv, int count)
                         netdev_err(priv->net_dev, "dpaa2_io_service_acquire() failed\n");
                         return;
                 }
-                for (i = 0; i < ret; i++) {
-                        /* Same logic as on regular Rx path */
-                        vaddr = dpaa2_iova_to_virt(priv->iommu_domain,
-                                                   buf_array[i]);
-                        dma_unmap_single(dev, buf_array[i],
-                                         DPAA2_ETH_RX_BUF_SIZE,
-                                         DMA_FROM_DEVICE);
-                        skb_free_frag(vaddr);
-                }
+                free_bufs(priv, buf_array, ret);
         } while (ret);
 }
 
@@ -927,13 +953,14 @@ static int dpaa2_eth_poll(struct napi_struct *napi, int budget)
                         break;
         }
 
-        if (cleaned < budget) {
-                napi_complete_done(napi, cleaned);
+        if (cleaned < budget && napi_complete_done(napi, cleaned)) {
                 /* Re-enable data available notifications */
                 do {
                         err = dpaa2_io_service_rearm(NULL, &ch->nctx);
                         cpu_relax();
                 } while (err == -EBUSY);
+                WARN_ONCE(err, "CDAN notifications rearm failed on core %d",
+                          ch->nctx.desired_cpu);
         }
 
         ch->stats.frames += cleaned;
@@ -1415,34 +1442,32 @@ static struct fsl_mc_device *setup_dpcon(struct dpaa2_eth_priv *priv)
         err = dpcon_open(priv->mc_io, 0, dpcon->obj_desc.id, &dpcon->mc_handle);
         if (err) {
                 dev_err(dev, "dpcon_open() failed\n");
-                goto err_open;
+                goto free;
         }
 
         err = dpcon_reset(priv->mc_io, 0, dpcon->mc_handle);
         if (err) {
                 dev_err(dev, "dpcon_reset() failed\n");
-                goto err_reset;
+                goto close;
         }
 
         err = dpcon_get_attributes(priv->mc_io, 0, dpcon->mc_handle, &attrs);
         if (err) {
                 dev_err(dev, "dpcon_get_attributes() failed\n");
-                goto err_get_attr;
+                goto close;
         }
 
         err = dpcon_enable(priv->mc_io, 0, dpcon->mc_handle);
         if (err) {
                 dev_err(dev, "dpcon_enable() failed\n");
-                goto err_enable;
+                goto close;
         }
 
         return dpcon;
 
-err_enable:
-err_get_attr:
-err_reset:
+close:
         dpcon_close(priv->mc_io, 0, dpcon->mc_handle);
-err_open:
+free:
         fsl_mc_object_free(dpcon);
 
         return NULL;
@@ -1749,66 +1774,32 @@ static void free_dpbp(struct dpaa2_eth_priv *priv)
         fsl_mc_object_free(priv->dpbp_dev);
 }
 
-/* Configure the DPNI object this interface is associated with */
-static int setup_dpni(struct fsl_mc_device *ls_dev)
+static int set_buffer_layout(struct dpaa2_eth_priv *priv)
 {
-        struct device *dev = &ls_dev->dev;
-        struct dpaa2_eth_priv *priv;
-        struct net_device *net_dev;
+        struct device *dev = priv->net_dev->dev.parent;
         struct dpni_buffer_layout buf_layout = {0};
         int err;
 
-        net_dev = dev_get_drvdata(dev);
-        priv = netdev_priv(net_dev);
-
-        /* get a handle for the DPNI object */
-        err = dpni_open(priv->mc_io, 0, ls_dev->obj_desc.id, &priv->mc_token);
-        if (err) {
-                dev_err(dev, "dpni_open() failed\n");
-                goto err_open;
-        }
-
-        ls_dev->mc_io = priv->mc_io;
-        ls_dev->mc_handle = priv->mc_token;
-
-        err = dpni_reset(priv->mc_io, 0, priv->mc_token);
-        if (err) {
-                dev_err(dev, "dpni_reset() failed\n");
-                goto err_reset;
-        }
-
-        err = dpni_get_attributes(priv->mc_io, 0, priv->mc_token,
-                                  &priv->dpni_attrs);
-        if (err) {
-                dev_err(dev, "dpni_get_attributes() failed (err=%d)\n", err);
-                goto err_get_attr;
-        }
+        /* We need to check for WRIOP version 1.0.0, but depending on the MC
+         * version, this number is not always provided correctly on rev1.
+         * We need to check for both alternatives in this situation.
+         */
+        if (priv->dpni_attrs.wriop_version == DPAA2_WRIOP_VERSION(0, 0, 0) ||
+            priv->dpni_attrs.wriop_version == DPAA2_WRIOP_VERSION(1, 0, 0))
+                priv->rx_buf_align = DPAA2_ETH_RX_BUF_ALIGN_REV1;
+        else
+                priv->rx_buf_align = DPAA2_ETH_RX_BUF_ALIGN;
 
-        /* Configure buffer layouts */
-        /* rx buffer */
-        buf_layout.pass_parser_result = true;
+        /* tx buffer */
         buf_layout.pass_frame_status = true;
         buf_layout.private_data_size = DPAA2_ETH_SWA_SIZE;
-        buf_layout.data_align = DPAA2_ETH_RX_BUF_ALIGN;
-        buf_layout.options = DPNI_BUF_LAYOUT_OPT_PARSER_RESULT |
-                             DPNI_BUF_LAYOUT_OPT_FRAME_STATUS |
-                             DPNI_BUF_LAYOUT_OPT_PRIVATE_DATA_SIZE |
-                             DPNI_BUF_LAYOUT_OPT_DATA_ALIGN;
-        err = dpni_set_buffer_layout(priv->mc_io, 0, priv->mc_token,
-                                     DPNI_QUEUE_RX, &buf_layout);
-        if (err) {
-                dev_err(dev, "dpni_set_buffer_layout(RX) failed\n");
-                goto err_buf_layout;
-        }
-
-        /* tx buffer */
         buf_layout.options = DPNI_BUF_LAYOUT_OPT_FRAME_STATUS |
                              DPNI_BUF_LAYOUT_OPT_PRIVATE_DATA_SIZE;
         err = dpni_set_buffer_layout(priv->mc_io, 0, priv->mc_token,
                                      DPNI_QUEUE_TX, &buf_layout);
         if (err) {
                 dev_err(dev, "dpni_set_buffer_layout(TX) failed\n");
-                goto err_buf_layout;
+                return err;
         }
 
         /* tx-confirm buffer */
@@ -1817,7 +1808,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev)
                                      DPNI_QUEUE_TX_CONFIRM, &buf_layout);
         if (err) {
                 dev_err(dev, "dpni_set_buffer_layout(TX_CONF) failed\n");
-                goto err_buf_layout;
+                return err;
         }
 
         /* Now that we've set our tx buffer layout, retrieve the minimum
@@ -1827,24 +1818,76 @@ static int setup_dpni(struct fsl_mc_device *ls_dev)
                                       &priv->tx_data_offset);
         if (err) {
                 dev_err(dev, "dpni_get_tx_data_offset() failed\n");
-                goto err_data_offset;
+                return err;
         }
 
         if ((priv->tx_data_offset % 64) != 0)
                 dev_warn(dev, "Tx data offset (%d) not a multiple of 64B\n",
                          priv->tx_data_offset);
 
-        /* Accommodate software annotation space (SWA) */
-        priv->tx_data_offset += DPAA2_ETH_SWA_SIZE;
+        /* rx buffer */
+        buf_layout.pass_parser_result = true;
+        buf_layout.data_align = priv->rx_buf_align;
+        buf_layout.data_head_room = dpaa2_eth_rx_head_room(priv);
+        buf_layout.private_data_size = 0;
+        buf_layout.options = DPNI_BUF_LAYOUT_OPT_PARSER_RESULT |
+                             DPNI_BUF_LAYOUT_OPT_FRAME_STATUS |
+                             DPNI_BUF_LAYOUT_OPT_DATA_ALIGN |
+                             DPNI_BUF_LAYOUT_OPT_DATA_HEAD_ROOM;
+        err = dpni_set_buffer_layout(priv->mc_io, 0, priv->mc_token,
+                                     DPNI_QUEUE_RX, &buf_layout);
+        if (err) {
+                dev_err(dev, "dpni_set_buffer_layout(RX) failed\n");
+                return err;
+        }
 
         return 0;
+}
 
-err_data_offset:
-err_buf_layout:
-err_get_attr:
-err_reset:
+/* Configure the DPNI object this interface is associated with */
+static int setup_dpni(struct fsl_mc_device *ls_dev)
+{
+        struct device *dev = &ls_dev->dev;
+        struct dpaa2_eth_priv *priv;
+        struct net_device *net_dev;
+        int err;
+
+        net_dev = dev_get_drvdata(dev);
+        priv = netdev_priv(net_dev);
+
+        /* get a handle for the DPNI object */
+        err = dpni_open(priv->mc_io, 0, ls_dev->obj_desc.id, &priv->mc_token);
+        if (err) {
+                dev_err(dev, "dpni_open() failed\n");
+                return err;
+        }
+
+        ls_dev->mc_io = priv->mc_io;
+        ls_dev->mc_handle = priv->mc_token;
+
+        err = dpni_reset(priv->mc_io, 0, priv->mc_token);
+        if (err) {
+                dev_err(dev, "dpni_reset() failed\n");
+                goto close;
+        }
+
+        err = dpni_get_attributes(priv->mc_io, 0, priv->mc_token,
+                                  &priv->dpni_attrs);
+        if (err) {
+                dev_err(dev, "dpni_get_attributes() failed (err=%d)\n", err);
+                goto close;
+        }
+
+        err = set_buffer_layout(priv);
+        if (err)
+                goto close;
+
+
+        return 0;
+
+close:
         dpni_close(priv->mc_io, 0, priv->mc_token);
-err_open:
+
         return err;
 }
 
@@ -2085,7 +2128,7 @@ static int bind_dpni(struct dpaa2_eth_priv *priv)
          */
         err = dpaa2_eth_set_hash(net_dev, DPAA2_RXH_SUPPORTED);
         if (err)
-                netdev_err(net_dev, "Failed to configure hashing\n");
+                dev_err(dev, "Failed to configure hashing\n");
 
         /* Configure handling of error frames */
         err_cfg.errors = DPAA2_FAS_RX_ERR_MASK;
@@ -2230,6 +2273,7 @@ static int netdev_init(struct net_device *net_dev)
 {
         struct device *dev = net_dev->dev.parent;
         struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
+        u16 rx_headroom, req_headroom;
         u8 bcast_addr[ETH_ALEN];
         u8 num_queues;
         int err;
@@ -2251,7 +2295,20 @@ static int netdev_init(struct net_device *net_dev)
         /* Reserve enough space to align buffer as per hardware requirement;
          * NOTE: priv->tx_data_offset MUST be initialized at this point.
          */
-        net_dev->needed_headroom = DPAA2_ETH_NEEDED_HEADROOM(priv);
+        net_dev->needed_headroom = dpaa2_eth_needed_headroom(priv);
+
+        /* If headroom guaranteed by hardware in the Rx frame buffer is
+         * smaller than the Tx headroom required by the stack, issue a
+         * one time warning. This will most likely mean skbs forwarded to
+         * another DPAA2 network interface will get reallocated, with a
+         * significant performance impact.
+         */
+        req_headroom = LL_RESERVED_SPACE(net_dev) - ETH_HLEN;
+        rx_headroom = ALIGN(DPAA2_ETH_RX_HWA_SIZE +
+                            dpaa2_eth_rx_head_room(priv), priv->rx_buf_align);
+        if (req_headroom > rx_headroom)
+                dev_info_once(dev, "Required headroom (%d) greater than available (%d)\n",
+                              req_headroom, rx_headroom);
 
         /* Set MTU limits */
         net_dev->min_mtu = 68;
@@ -2303,7 +2360,7 @@ static irqreturn_t dpni_irq0_handler(int irq_num, void *arg)
 
 static irqreturn_t dpni_irq0_handler_thread(int irq_num, void *arg)
 {
-        u32 status = 0, clear = 0;
+        u32 status = ~0;
         struct device *dev = (struct device *)arg;
         struct fsl_mc_device *dpni_dev = to_fsl_mc_device(dev);
         struct net_device *net_dev = dev_get_drvdata(dev);
@@ -2313,18 +2370,12 @@ static irqreturn_t dpni_irq0_handler_thread(int irq_num, void *arg)
                                   DPNI_IRQ_INDEX, &status);
         if (unlikely(err)) {
                 netdev_err(net_dev, "Can't get irq status (err %d)\n", err);
-                clear = 0xffffffff;
-                goto out;
+                return IRQ_HANDLED;
         }
 
-        if (status & DPNI_IRQ_EVENT_LINK_CHANGED) {
-                clear |= DPNI_IRQ_EVENT_LINK_CHANGED;
+        if (status & DPNI_IRQ_EVENT_LINK_CHANGED)
                 link_state_update(netdev_priv(net_dev));
-        }
 
-out:
-        dpni_clear_irq_status(dpni_dev->mc_io, 0, dpni_dev->mc_handle,
-                              DPNI_IRQ_INDEX, clear);
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
index bfbabae1aad8..5b3ab9f62d5e 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h
@@ -45,6 +45,8 @@
 
 #include "dpaa2-eth-trace.h"
 
+#define DPAA2_WRIOP_VERSION(x, y, z) ((x) << 10 | (y) << 5 | (z) << 0)
+
 #define DPAA2_ETH_STORE_SIZE            16
 
 /* Maximum number of scatter-gather entries in an ingress frame,
@@ -80,23 +82,21 @@
  */
 #define DPAA2_ETH_BUFS_PER_CMD          7
 
-/* Hardware requires alignment for ingress/egress buffer addresses
- * and ingress buffer lengths.
- */
-#define DPAA2_ETH_RX_BUF_SIZE           2048
+/* Hardware requires alignment for ingress/egress buffer addresses */
 #define DPAA2_ETH_TX_BUF_ALIGN          64
-#define DPAA2_ETH_RX_BUF_ALIGN          256
-#define DPAA2_ETH_NEEDED_HEADROOM(p_priv) \
-        ((p_priv)->tx_data_offset + DPAA2_ETH_TX_BUF_ALIGN)
 
-/* Hardware only sees DPAA2_ETH_RX_BUF_SIZE, but we need to allocate ingress
- * buffers large enough to allow building an skb around them and also account
- * for alignment restrictions
+#define DPAA2_ETH_RX_BUF_SIZE           2048
+#define DPAA2_ETH_SKB_SIZE \
+        (DPAA2_ETH_RX_BUF_SIZE + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
+
+/* Hardware annotation area in RX  buffers */
+#define DPAA2_ETH_RX_HWA_SIZE           64
+
+/* Due to a limitation in WRIOP 1.0.0, the RX buffer data must be aligned
+ * to 256B. For newer revisions, the requirement is only for 64B alignment
  */
-#define DPAA2_ETH_BUF_RAW_SIZE \
-        (DPAA2_ETH_RX_BUF_SIZE + \
-        SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) + \
-        DPAA2_ETH_RX_BUF_ALIGN)
+#define DPAA2_ETH_RX_BUF_ALIGN_REV1     256
+#define DPAA2_ETH_RX_BUF_ALIGN          64
 
 /* We are accommodating a skb backpointer and some S/G info
  * in the frame's software annotation. The hardware
@@ -134,7 +134,7 @@ struct dpaa2_eth_swa {
                                          DPAA2_FD_CTRL_FAERR)
 
 /* Annotation bits in FD CTRL */
-#define DPAA2_FD_CTRL_ASAL              0x00020000      /* ASAL = 128 */
+#define DPAA2_FD_CTRL_ASAL              0x00010000      /* ASAL = 64 */
 #define DPAA2_FD_CTRL_PTA               0x00800000
 #define DPAA2_FD_CTRL_PTV1              0x00400000
 
@@ -318,6 +318,7 @@ struct dpaa2_eth_priv {
         struct iommu_domain *iommu_domain;
 
         u16 tx_qdid;
+        u16 rx_buf_align;
         struct fsl_mc_io *mc_io;
         /* Cores which have an affine DPIO/DPCON.
          * This is the cpu set on which Rx and Tx conf frames are processed
@@ -353,6 +354,29 @@ struct dpaa2_eth_priv {
 extern const struct ethtool_ops dpaa2_ethtool_ops;
 extern const char dpaa2_eth_drv_version[];
 
+/* Hardware only sees DPAA2_ETH_RX_BUF_SIZE, but the skb built around
+ * the buffer also needs space for its shared info struct, and we need
+ * to allocate enough to accommodate hardware alignment restrictions
+ */
+static inline unsigned int dpaa2_eth_buf_raw_size(struct dpaa2_eth_priv *priv)
+{
+        return DPAA2_ETH_SKB_SIZE + priv->rx_buf_align;
+}
+
+static inline
+unsigned int dpaa2_eth_needed_headroom(struct dpaa2_eth_priv *priv)
+{
+        return priv->tx_data_offset + DPAA2_ETH_TX_BUF_ALIGN - HH_DATA_MOD;
+}
+
+/* Extra headroom space requested to hardware, in order to make sure there's
+ * no realloc'ing in forwarding scenarios
+ */
+static inline unsigned int dpaa2_eth_rx_head_room(struct dpaa2_eth_priv *priv)
+{
+        return dpaa2_eth_needed_headroom(priv) - DPAA2_ETH_RX_HWA_SIZE;
+}
+
 static int dpaa2_eth_queue_count(struct dpaa2_eth_priv *priv)
 {
         return priv->dpni_attrs.num_queues;
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c
index 031179ab3a22..ebe8fd6ccf2c 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c
@@ -76,10 +76,22 @@ static char dpaa2_ethtool_extras[][ETH_GSTRING_LEN] = {
 static void dpaa2_eth_get_drvinfo(struct net_device *net_dev,
                                   struct ethtool_drvinfo *drvinfo)
 {
+        struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
+        u16 fw_major, fw_minor;
+        int err;
+
         strlcpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));
         strlcpy(drvinfo->version, dpaa2_eth_drv_version,
                 sizeof(drvinfo->version));
-        strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
+
+        err =  dpni_get_api_version(priv->mc_io, 0, &fw_major, &fw_minor);
+        if (!err)
+                snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
+                         "%u.%u", fw_major, fw_minor);
+        else
+                strlcpy(drvinfo->fw_version, "N/A",
+                        sizeof(drvinfo->fw_version));
+
         strlcpy(drvinfo->bus_info, dev_name(net_dev->dev.parent->parent),
                 sizeof(drvinfo->bus_info));
 }
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpni-cmd.h b/drivers/staging/fsl-dpaa2/ethernet/dpni-cmd.h
index 57df22292233..3120e22496d0 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpni-cmd.h
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpni-cmd.h
@@ -538,4 +538,9 @@ struct dpni_rsp_get_taildrop {
         __le32 threshold;
 };
 
+struct dpni_rsp_get_api_version {
+        u16 major;
+        u16 minor;
+};
+
 #endif /* _FSL_DPNI_CMD_H */
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpni.c b/drivers/staging/fsl-dpaa2/ethernet/dpni.c
index 04a5b14bc1c5..e8be76181c36 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpni.c
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpni.c
@@ -1594,3 +1594,35 @@ int dpni_get_taildrop(struct fsl_mc_io *mc_io,
 
         return 0;
 }
+
+/**
+ * dpni_get_api_version() - Get Data Path Network Interface API version
+ * @mc_io:      Pointer to MC portal's I/O object
+ * @cmd_flags:  Command flags; one or more of 'MC_CMD_FLAG_'
+ * @major_ver:  Major version of data path network interface API
+ * @minor_ver:  Minor version of data path network interface API
+ *
+ * Return:      '0' on Success; Error code otherwise.
+ */
+int dpni_get_api_version(struct fsl_mc_io *mc_io,
+                         u32 cmd_flags,
+                         u16 *major_ver,
+                         u16 *minor_ver)
+{
+        struct dpni_rsp_get_api_version *rsp_params;
+        struct mc_command cmd = { 0 };
+        int err;
+
+        cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_API_VERSION,
+                                          cmd_flags, 0);
+
+        err = mc_send_command(mc_io, &cmd);
+        if (err)
+                return err;
+
+        rsp_params = (struct dpni_rsp_get_api_version *)cmd.params;
+        *major_ver = le16_to_cpu(rsp_params->major);
+        *minor_ver = le16_to_cpu(rsp_params->minor);
+
+        return 0;
+}
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpni.h b/drivers/staging/fsl-dpaa2/ethernet/dpni.h
index 282e5e85ffa7..ce86a816af45 100644
--- a/drivers/staging/fsl-dpaa2/ethernet/dpni.h
+++ b/drivers/staging/fsl-dpaa2/ethernet/dpni.h
@@ -829,4 +829,9 @@ struct dpni_rule_cfg {
         u8      key_size;
 };
 
+int dpni_get_api_version(struct fsl_mc_io *mc_io,
+                         u32 cmd_flags,
+                         u16 *major_ver,
+                         u16 *minor_ver);
+
 #endif /* __FSL_DPNI_H */
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c b/drivers/staging/fsl-mc/bus/dpio/dpio-service.c
index f8096828f5b7..a609ec82daf3 100644
--- a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c
+++ b/drivers/staging/fsl-mc/bus/dpio/dpio-service.c
@@ -76,7 +76,7 @@ static inline struct dpaa2_io *service_select_by_cpu(struct dpaa2_io *d,
         if (d)
                 return d;
 
-        if (unlikely(cpu >= num_possible_cpus()))
+        if (cpu != DPAA2_IO_ANY_CPU && cpu >= num_possible_cpus())
                 return NULL;
 
         /*
@@ -121,7 +121,7 @@ struct dpaa2_io *dpaa2_io_create(const struct dpaa2_io_desc *desc)
                 return NULL;
 
         /* check if CPU is out of range (-1 means any cpu) */
-        if (desc->cpu >= num_possible_cpus()) {
+        if (desc->cpu != DPAA2_IO_ANY_CPU && desc->cpu >= num_possible_cpus()) {
                 kfree(obj);
                 return NULL;
         }
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c
index 038da4d1ebd0..f74a6f1764bb 100644
--- a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c
+++ b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c
@@ -137,7 +137,7 @@ static void fsl_mc_msi_update_chip_ops(struct msi_domain_info *info)
 {
         struct irq_chip *chip = info->chip;
 
-        if (WARN_ON((!chip)))
+        if (WARN_ON(!chip))
                 return;
 
         /*
diff --git a/drivers/staging/fsl-mc/include/dpaa2-io.h b/drivers/staging/fsl-mc/include/dpaa2-io.h
index c5646096c5d4..afc2d060d077 100644
--- a/drivers/staging/fsl-mc/include/dpaa2-io.h
+++ b/drivers/staging/fsl-mc/include/dpaa2-io.h
@@ -54,6 +54,8 @@ struct device;
  * for dequeue.
  */
 
+#define DPAA2_IO_ANY_CPU        -1
+
 /**
  * struct dpaa2_io_desc - The DPIO descriptor
  * @receives_notifications: Use notificaton mode. Non-zero if the DPIO
@@ -91,8 +93,8 @@ irqreturn_t dpaa2_io_irq(struct dpaa2_io *obj);
  * @cb:           The callback to be invoked when the notification arrives
  * @is_cdan:      Zero for FQDAN, non-zero for CDAN
  * @id:           FQID or channel ID, needed for rearm
- * @desired_cpu:  The cpu on which the notifications will show up. -1 means
- *                any CPU.
+ * @desired_cpu:  The cpu on which the notifications will show up. Use
+ *                DPAA2_IO_ANY_CPU if don't care
  * @dpio_id:      The dpio index
  * @qman64:       The 64-bit context value shows up in the FQDAN/CDAN.
  * @node:         The list node
diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c
index 41a49c8194e5..bba7e9c888b3 100644
--- a/drivers/staging/fwserial/fwserial.c
+++ b/drivers/staging/fwserial/fwserial.c
@@ -217,13 +217,6 @@ static void fwtty_log_tx_error(struct fwtty_port *port, int rcode)
         }
 }
 
-static void fwtty_txn_constructor(void *this)
-{
-        struct fwtty_transaction *txn = this;
-
-        init_timer(&txn->fw_txn.split_timeout_timer);
-}
-
 static void fwtty_common_callback(struct fw_card *card, int rcode,
                                   void *payload, size_t len, void *cb_data)
 {
@@ -1806,9 +1799,9 @@ static void fwserial_release_port(struct fwtty_port *port, bool reset)
                 (*port->fwcon_ops->notify)(FWCON_NOTIFY_DETACH, port->con_data);
 }
 
-static void fwserial_plug_timeout(unsigned long data)
+static void fwserial_plug_timeout(struct timer_list *t)
 {
-        struct fwtty_peer *peer = (struct fwtty_peer *)data;
+        struct fwtty_peer *peer = from_timer(peer, t, timer);
         struct fwtty_port *port;
 
         spin_lock_bh(&peer->lock);
@@ -1860,7 +1853,6 @@ static int fwserial_connect_peer(struct fwtty_peer *peer)
 
         fill_plug_req(pkt, peer->port);
 
-        setup_timer(&peer->timer, fwserial_plug_timeout, (unsigned long)peer);
         mod_timer(&peer->timer, jiffies + VIRT_CABLE_PLUG_TIMEOUT);
         spin_unlock_bh(&peer->lock);
 
@@ -2098,7 +2090,7 @@ static int fwserial_add_peer(struct fw_serial *serial, struct fw_unit *unit)
         spin_lock_init(&peer->lock);
         peer->port = NULL;
 
-        init_timer(&peer->timer);
+        timer_setup(&peer->timer, fwserial_plug_timeout, 0);
         INIT_WORK(&peer->work, fwserial_peer_workfn);
         INIT_DELAYED_WORK(&peer->connect, fwserial_auto_connect);
 
@@ -2863,7 +2855,7 @@ static int __init fwserial_init(void)
 
         fwtty_txn_cache = kmem_cache_create("fwtty_txn_cache",
                                             sizeof(struct fwtty_transaction),
-                                            0, 0, fwtty_txn_constructor);
+                                            0, 0, NULL);
         if (!fwtty_txn_cache) {
                 err = -ENOMEM;
                 goto unregister_loop;
diff --git a/drivers/staging/gdm724x/gdm_lte.c b/drivers/staging/gdm724x/gdm_lte.c
index 9ab6ce231f11..0527b0d1c1d0 100644
--- a/drivers/staging/gdm724x/gdm_lte.c
+++ b/drivers/staging/gdm724x/gdm_lte.c
@@ -26,6 +26,7 @@
 #include <linux/icmp.h>
 #include <linux/icmpv6.h>
 #include <linux/uaccess.h>
+#include <linux/errno.h>
 #include <net/ndisc.h>
 
 #include "gdm_lte.h"
@@ -118,6 +119,10 @@ static int gdm_lte_emulate_arp(struct sk_buff *skb_in, u32 nic_type)
         void *mac_header_data;
         u32 mac_header_len;
 
+        /* Check for skb->len, discard if empty */
+        if (skb_in->len == 0)
+                return -ENODATA;
+
         /* Format the mac header so that it can be put to skb */
         if (ntohs(((struct ethhdr *)skb_in->data)->h_proto) == ETH_P_8021Q) {
                 memcpy(&vlan_eth, skb_in->data, sizeof(struct vlan_ethhdr));
@@ -241,13 +246,13 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in, u32 nic_type)
         if (ntohs(((struct ethhdr *)skb_in->data)->h_proto) == ETH_P_8021Q) {
                 memcpy(&vlan_eth, skb_in->data, sizeof(struct vlan_ethhdr));
                 if (ntohs(vlan_eth.h_vlan_encapsulated_proto) != ETH_P_IPV6)
-                        return -1;
+                        return -EPROTONOSUPPORT;
                 mac_header_data = &vlan_eth;
                 mac_header_len = VLAN_ETH_HLEN;
         } else {
                 memcpy(&eth, skb_in->data, sizeof(struct ethhdr));
                 if (ntohs(eth.h_proto) != ETH_P_IPV6)
-                        return -1;
+                        return -EPROTONOSUPPORT;
                 mac_header_data = &eth;
                 mac_header_len = ETH_HLEN;
         }
@@ -255,13 +260,13 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in, u32 nic_type)
         /* Check if this is IPv6 ICMP packet */
         ipv6_in = (struct ipv6hdr *)(skb_in->data + mac_header_len);
         if (ipv6_in->version != 6 || ipv6_in->nexthdr != IPPROTO_ICMPV6)
-                return -1;
+                return -EPROTONOSUPPORT;
 
         /* Check if this is NDP packet */
         icmp6_in = (struct icmp6hdr *)(skb_in->data + mac_header_len +
                                         sizeof(struct ipv6hdr));
         if (icmp6_in->icmp6_type == NDISC_ROUTER_SOLICITATION) { /* Check RS */
-                return -1;
+                return -EPROTONOSUPPORT;
         } else if (icmp6_in->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION) {
                 /* Check NS */
                 u8 icmp_na[sizeof(struct icmp6hdr) +
@@ -305,7 +310,7 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in, u32 nic_type)
                 icmp6_out.icmp6_cksum = icmp6_checksum(&ipv6_out,
                                         (u16 *)icmp_na, sizeof(icmp_na));
         } else {
-                return -1;
+                return -EINVAL;
         }
 
         /* Fill the destination mac with source mac of the received packet */
@@ -412,7 +417,7 @@ static int gdm_lte_tx(struct sk_buff *skb, struct net_device *dev)
         nic_type = gdm_lte_tx_nic_type(dev, skb);
         if (nic_type == 0) {
                 netdev_err(dev, "tx - invalid nic_type\n");
-                return -1;
+                return -EMEDIUMTYPE;
         }
 
         if (nic_type & NIC_TYPE_ARP) {
@@ -539,7 +544,7 @@ int gdm_lte_event_init(void)
         }
 
         pr_err("event init failed\n");
-        return -1;
+        return -ENODATA;
 }
 
 void gdm_lte_event_exit(void)
diff --git a/drivers/staging/greybus/Documentation/firmware/authenticate.c b/drivers/staging/greybus/Documentation/firmware/authenticate.c
index b836f0a20c36..806e75b7f405 100644
--- a/drivers/staging/greybus/Documentation/firmware/authenticate.c
+++ b/drivers/staging/greybus/Documentation/firmware/authenticate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
 /*
  * Sample code to test CAP protocol
  *
diff --git a/drivers/staging/greybus/Documentation/firmware/firmware.c b/drivers/staging/greybus/Documentation/firmware/firmware.c
index c73dee9d13c1..31d9c23e2eeb 100644
--- a/drivers/staging/greybus/Documentation/firmware/firmware.c
+++ b/drivers/staging/greybus/Documentation/firmware/firmware.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
 /*
  * Sample code to test firmware-management protocol
  *
diff --git a/drivers/staging/greybus/arche-apb-ctrl.c b/drivers/staging/greybus/arche-apb-ctrl.c
index 0412f3d06efb..b0c66112eb18 100644
--- a/drivers/staging/greybus/arche-apb-ctrl.c
+++ b/drivers/staging/greybus/arche-apb-ctrl.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Arche Platform driver to control APB.
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/clk.h>
diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c
index 21ac92d0f533..ace4eb365c0e 100644
--- a/drivers/staging/greybus/arche-platform.c
+++ b/drivers/staging/greybus/arche-platform.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Arche Platform driver to enable Unipro link.
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/clk.h>
diff --git a/drivers/staging/greybus/arche_platform.h b/drivers/staging/greybus/arche_platform.h
index bcffc69d0960..02056351d25a 100644
--- a/drivers/staging/greybus/arche_platform.h
+++ b/drivers/staging/greybus/arche_platform.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Arche Platform driver to enable Unipro link.
  *
  * Copyright 2015-2016 Google Inc.
  * Copyright 2015-2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __ARCHE_PLATFORM_H
diff --git a/drivers/staging/greybus/arpc.h b/drivers/staging/greybus/arpc.h
index c0b63c0130c5..3534ba1a4e6c 100644
--- a/drivers/staging/greybus/arpc.h
+++ b/drivers/staging/greybus/arpc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/drivers/staging/greybus/audio_apbridgea.c b/drivers/staging/greybus/audio_apbridgea.c
index 1b4252d5d255..7ebb1bde5cb7 100644
--- a/drivers/staging/greybus/audio_apbridgea.c
+++ b/drivers/staging/greybus/audio_apbridgea.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Audio Device Class Protocol helpers
  *
  * Copyright 2015-2016 Google Inc.
- *
- * Released under the GPLv2 only.
  */
 
 #include "greybus.h"
diff --git a/drivers/staging/greybus/audio_apbridgea.h b/drivers/staging/greybus/audio_apbridgea.h
index b94cb05c89e4..42ac6059bfc7 100644
--- a/drivers/staging/greybus/audio_apbridgea.h
+++ b/drivers/staging/greybus/audio_apbridgea.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /**
  * Copyright (c) 2015-2016 Google Inc.
  * All rights reserved.
diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c
index a6d01f0761f3..fdb9e83cc34b 100644
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * APBridge ALSA SoC dummy codec driver
  * Copyright 2016 Google Inc.
  * Copyright 2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/staging/greybus/audio_codec.h b/drivers/staging/greybus/audio_codec.h
index 6fb064c69a36..161b37c8ef17 100644
--- a/drivers/staging/greybus/audio_codec.h
+++ b/drivers/staging/greybus/audio_codec.h
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus audio driver
  * Copyright 2015 Google Inc.
  * Copyright 2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __LINUX_GBAUDIO_CODEC_H
diff --git a/drivers/staging/greybus/audio_gb.c b/drivers/staging/greybus/audio_gb.c
index 7884d8482dc0..8894f1c87d48 100644
--- a/drivers/staging/greybus/audio_gb.c
+++ b/drivers/staging/greybus/audio_gb.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Audio Device Class Protocol helpers
  *
  * Copyright 2015-2016 Google Inc.
- *
- * Released under the GPLv2 only.
  */
 
 #include "greybus.h"
diff --git a/drivers/staging/greybus/audio_manager.c b/drivers/staging/greybus/audio_manager.c
index aa6508b44fab..d44b070d8862 100644
--- a/drivers/staging/greybus/audio_manager.c
+++ b/drivers/staging/greybus/audio_manager.c
@@ -1,16 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus operations
  *
  * Copyright 2015-2016 Google Inc.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/string.h>
 #include <linux/sysfs.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/rwlock.h>
+#include <linux/spinlock.h>
 #include <linux/idr.h>
 
 #include "audio_manager.h"
diff --git a/drivers/staging/greybus/audio_manager.h b/drivers/staging/greybus/audio_manager.h
index 5ab8f5e0ed3f..dcb1a20f5ff1 100644
--- a/drivers/staging/greybus/audio_manager.h
+++ b/drivers/staging/greybus/audio_manager.h
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus operations
  *
  * Copyright 2015-2016 Google Inc.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef _GB_AUDIO_MANAGER_H_
diff --git a/drivers/staging/greybus/audio_manager_module.c b/drivers/staging/greybus/audio_manager_module.c
index adc16977452d..52342e832e3b 100644
--- a/drivers/staging/greybus/audio_manager_module.c
+++ b/drivers/staging/greybus/audio_manager_module.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus operations
  *
  * Copyright 2015-2016 Google Inc.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/slab.h>
diff --git a/drivers/staging/greybus/audio_manager_private.h b/drivers/staging/greybus/audio_manager_private.h
index 079ce953c256..9d9b58fc54c4 100644
--- a/drivers/staging/greybus/audio_manager_private.h
+++ b/drivers/staging/greybus/audio_manager_private.h
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus operations
  *
  * Copyright 2015-2016 Google Inc.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef _GB_AUDIO_MANAGER_PRIVATE_H_
diff --git a/drivers/staging/greybus/audio_manager_sysfs.c b/drivers/staging/greybus/audio_manager_sysfs.c
index 34ebd147052f..283fbed0c8ed 100644
--- a/drivers/staging/greybus/audio_manager_sysfs.c
+++ b/drivers/staging/greybus/audio_manager_sysfs.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus operations
  *
  * Copyright 2015-2016 Google Inc.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/string.h>
diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c
index 094c3be79b33..d065334efa23 100644
--- a/drivers/staging/greybus/audio_module.c
+++ b/drivers/staging/greybus/audio_module.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus audio driver
  * Copyright 2015 Google Inc.
  * Copyright 2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c
index 07fac3948f3a..de4b1b2b12f3 100644
--- a/drivers/staging/greybus/audio_topology.c
+++ b/drivers/staging/greybus/audio_topology.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus audio driver
  * Copyright 2015-2016 Google Inc.
  * Copyright 2015-2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include "audio_codec.h"
diff --git a/drivers/staging/greybus/authentication.c b/drivers/staging/greybus/authentication.c
index 6c5dcb1c226b..16cc65e1472b 100644
--- a/drivers/staging/greybus/authentication.c
+++ b/drivers/staging/greybus/authentication.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Component Authentication Protocol (CAP) Driver.
  *
  * Copyright 2016 Google Inc.
  * Copyright 2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include "greybus.h"
diff --git a/drivers/staging/greybus/bootrom.c b/drivers/staging/greybus/bootrom.c
index 06df0ce03150..e85ffae85dff 100644
--- a/drivers/staging/greybus/bootrom.c
+++ b/drivers/staging/greybus/bootrom.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * BOOTROM Greybus driver.
  *
  * Copyright 2016 Google Inc.
  * Copyright 2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/firmware.h>
diff --git a/drivers/staging/greybus/bundle.c b/drivers/staging/greybus/bundle.c
index d2ef57d090be..81c018da1248 100644
--- a/drivers/staging/greybus/bundle.c
+++ b/drivers/staging/greybus/bundle.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus bundles
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include "greybus.h"
diff --git a/drivers/staging/greybus/bundle.h b/drivers/staging/greybus/bundle.h
index 0c3491def96c..ffcfd43802cc 100644
--- a/drivers/staging/greybus/bundle.h
+++ b/drivers/staging/greybus/bundle.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus bundles
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __BUNDLE_H
diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c
index a64517eabff4..f13f16b63d7e 100644
--- a/drivers/staging/greybus/camera.c
+++ b/drivers/staging/greybus/camera.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Camera protocol driver.
  *
  * Copyright 2015 Google Inc.
  * Copyright 2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/debugfs.h>
diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index 2cf64640e8ec..2103168b585e 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus connections
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/workqueue.h>
diff --git a/drivers/staging/greybus/connection.h b/drivers/staging/greybus/connection.h
index 4d9f4c64176c..ec3f1d3ef3b9 100644
--- a/drivers/staging/greybus/connection.h
+++ b/drivers/staging/greybus/connection.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus connections
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __CONNECTION_H
diff --git a/drivers/staging/greybus/control.c b/drivers/staging/greybus/control.c
index 5b30be30a3a4..35f945a12b11 100644
--- a/drivers/staging/greybus/control.c
+++ b/drivers/staging/greybus/control.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus CPort control protocol.
  *
  * Copyright 2015 Google Inc.
  * Copyright 2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/staging/greybus/control.h b/drivers/staging/greybus/control.h
index 4dcaec8b9cfe..643ddb9e0f92 100644
--- a/drivers/staging/greybus/control.h
+++ b/drivers/staging/greybus/control.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus CPort control protocol
  *
  * Copyright 2015 Google Inc.
  * Copyright 2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __CONTROL_H
diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index ba761905b790..dafa430d176e 100644
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus "Core"
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/staging/greybus/debugfs.c b/drivers/staging/greybus/debugfs.c
index a9d4d3da99a0..56e20c30feb5 100644
--- a/drivers/staging/greybus/debugfs.c
+++ b/drivers/staging/greybus/debugfs.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus debugfs code
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/debugfs.h>
diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index f7b24e0eaa6f..b082d81833a0 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus "AP" USB driver for "ES2" controller chips
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 #include <linux/kthread.h>
 #include <linux/sizes.h>
@@ -761,6 +760,7 @@ static int check_urb_status(struct urb *urb)
         case -EOVERFLOW:
                 dev_err(dev, "%s: overflow actual length is %d\n",
                         __func__, urb->actual_length);
+                /* fall through */
         case -ECONNRESET:
         case -ENOENT:
         case -ESHUTDOWN:
diff --git a/drivers/staging/greybus/firmware.h b/drivers/staging/greybus/firmware.h
index f4f0db1cefe8..946221307ef6 100644
--- a/drivers/staging/greybus/firmware.h
+++ b/drivers/staging/greybus/firmware.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Firmware Management Header
  *
  * Copyright 2016 Google Inc.
  * Copyright 2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __FIRMWARE_H
diff --git a/drivers/staging/greybus/fw-core.c b/drivers/staging/greybus/fw-core.c
index 454a98957ba5..388866d92f5b 100644
--- a/drivers/staging/greybus/fw-core.c
+++ b/drivers/staging/greybus/fw-core.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Firmware Core Bundle Driver.
  *
  * Copyright 2016 Google Inc.
  * Copyright 2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
diff --git a/drivers/staging/greybus/fw-download.c b/drivers/staging/greybus/fw-download.c
index 8a1a413c6cb3..d3b7cccbc10d 100644
--- a/drivers/staging/greybus/fw-download.c
+++ b/drivers/staging/greybus/fw-download.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Firmware Download Protocol Driver.
  *
  * Copyright 2016 Google Inc.
  * Copyright 2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/firmware.h>
diff --git a/drivers/staging/greybus/fw-management.c b/drivers/staging/greybus/fw-management.c
index 3cd6cf0a656b..71aec14f8181 100644
--- a/drivers/staging/greybus/fw-management.c
+++ b/drivers/staging/greybus/fw-management.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Firmware Management Protocol Driver.
  *
  * Copyright 2016 Google Inc.
  * Copyright 2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/cdev.h>
diff --git a/drivers/staging/greybus/gb-camera.h b/drivers/staging/greybus/gb-camera.h
index d45dabc5b367..ee293e461fc3 100644
--- a/drivers/staging/greybus/gb-camera.h
+++ b/drivers/staging/greybus/gb-camera.h
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Camera protocol driver.
  *
  * Copyright 2015 Google Inc.
- *
- * Released under the GPLv2 only.
  */
 #ifndef __GB_CAMERA_H
 #define __GB_CAMERA_H
diff --git a/drivers/staging/greybus/gbphy.c b/drivers/staging/greybus/gbphy.c
index 80c1da8224e6..6cb85c3d3572 100644
--- a/drivers/staging/greybus/gbphy.c
+++ b/drivers/staging/greybus/gbphy.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Bridged-Phy Bus driver
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/staging/greybus/gbphy.h b/drivers/staging/greybus/gbphy.h
index 8ee68055ccc4..99463489d7d6 100644
--- a/drivers/staging/greybus/gbphy.h
+++ b/drivers/staging/greybus/gbphy.h
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Bridged-Phy Bus driver
  *
  * Copyright 2016 Google Inc.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __GBPHY_H
diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index ee5f998b174f..b1d4698019a1 100644
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPIO Greybus driver.
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h
index c9bb93f23927..d03ddb7c9df0 100644
--- a/drivers/staging/greybus/greybus.h
+++ b/drivers/staging/greybus/greybus.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus driver and device API
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __LINUX_GREYBUS_H
diff --git a/drivers/staging/greybus/greybus_authentication.h b/drivers/staging/greybus/greybus_authentication.h
index 4784ed98e8a3..03ea9615b217 100644
--- a/drivers/staging/greybus/greybus_authentication.h
+++ b/drivers/staging/greybus/greybus_authentication.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
 /*
  * Greybus Component Authentication User Header
  *
diff --git a/drivers/staging/greybus/greybus_firmware.h b/drivers/staging/greybus/greybus_firmware.h
index 277a2acce6fd..b58281a63ba4 100644
--- a/drivers/staging/greybus/greybus_firmware.h
+++ b/drivers/staging/greybus/greybus_firmware.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
 /*
  * Greybus Firmware Management User Header
  *
diff --git a/drivers/staging/greybus/greybus_manifest.h b/drivers/staging/greybus/greybus_manifest.h
index d135945cefe1..2cec5cf7a846 100644
--- a/drivers/staging/greybus/greybus_manifest.h
+++ b/drivers/staging/greybus/greybus_manifest.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus manifest definition
  *
diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h
index b1be0b0af464..9bd7b6dfb476 100644
--- a/drivers/staging/greybus/greybus_protocols.h
+++ b/drivers/staging/greybus/greybus_protocols.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/drivers/staging/greybus/greybus_trace.h b/drivers/staging/greybus/greybus_trace.h
index f8feae4dc3b5..7b5e2c6b1f6b 100644
--- a/drivers/staging/greybus/greybus_trace.h
+++ b/drivers/staging/greybus/greybus_trace.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus driver and device API
  *
  * Copyright 2015 Google Inc.
  * Copyright 2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM greybus
diff --git a/drivers/staging/greybus/hd.c b/drivers/staging/greybus/hd.c
index 185ae3fa10fd..969f86697673 100644
--- a/drivers/staging/greybus/hd.c
+++ b/drivers/staging/greybus/hd.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Host Device
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/staging/greybus/hd.h b/drivers/staging/greybus/hd.h
index e7927bb1761c..6cf024a20a58 100644
--- a/drivers/staging/greybus/hd.h
+++ b/drivers/staging/greybus/hd.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Host Device
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __HD_H
diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c
index 465101bbab69..04053ff075a6 100644
--- a/drivers/staging/greybus/hid.c
+++ b/drivers/staging/greybus/hid.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * HID class driver for the Greybus.
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/bitops.h>
diff --git a/drivers/staging/greybus/i2c.c b/drivers/staging/greybus/i2c.c
index c2a50087000c..58a37deb6579 100644
--- a/drivers/staging/greybus/i2c.c
+++ b/drivers/staging/greybus/i2c.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * I2C bridge driver for the Greybus "generic" I2C module.
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c
index 71e5cc234e78..d7b5b89a2f40 100644
--- a/drivers/staging/greybus/interface.c
+++ b/drivers/staging/greybus/interface.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus interface code
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/delay.h>
diff --git a/drivers/staging/greybus/interface.h b/drivers/staging/greybus/interface.h
index bd31b8c18d5b..1c00c5bb3ec9 100644
--- a/drivers/staging/greybus/interface.h
+++ b/drivers/staging/greybus/interface.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Interface Block code
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __INTERFACE_H
diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c
index 3f4148c92308..010ae1e9c7fb 100644
--- a/drivers/staging/greybus/light.c
+++ b/drivers/staging/greybus/light.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Lights protocol driver.
  *
  * Copyright 2015 Google Inc.
  * Copyright 2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/kernel.h>
@@ -925,6 +924,8 @@ static void __gb_lights_led_unregister(struct gb_channel *channel)
                 return;
 
         led_classdev_unregister(cdev);
+        kfree(cdev->name);
+        cdev->name = NULL;
         channel->led = NULL;
 }
 
@@ -998,11 +999,7 @@ static int gb_lights_channel_config(struct gb_light *light,
 
         light->has_flash = true;
 
-        ret = gb_lights_channel_flash_config(channel);
-        if (ret < 0)
-                return ret;
-
-        return ret;
+        return gb_lights_channel_flash_config(channel);
 }
 
 static int gb_lights_light_config(struct gb_lights *glights, u8 id)
diff --git a/drivers/staging/greybus/log.c b/drivers/staging/greybus/log.c
index 5c5bedaf69a6..15a88574dbb0 100644
--- a/drivers/staging/greybus/log.c
+++ b/drivers/staging/greybus/log.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus driver for the log protocol
  *
  * Copyright 2016 Google Inc.
- *
- * Released under the GPLv2 only.
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c
index 08e255884206..42f6f3de967c 100644
--- a/drivers/staging/greybus/loopback.c
+++ b/drivers/staging/greybus/loopback.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Loopback bridge driver for the Greybus loopback module.
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -58,12 +57,7 @@ static struct gb_loopback_device gb_dev;
 struct gb_loopback_async_operation {
         struct gb_loopback *gb;
         struct gb_operation *operation;
-        struct timeval ts;
-        struct timer_list timer;
-        struct list_head entry;
-        struct work_struct work;
-        struct kref kref;
-        bool pending;
+        ktime_t ts;
         int (*completion)(struct gb_loopback_async_operation *op_async);
 };
 
@@ -72,7 +66,6 @@ struct gb_loopback {
 
         struct dentry *file;
         struct kfifo kfifo_lat;
-        struct kfifo kfifo_ts;
         struct mutex mutex;
         struct task_struct *task;
         struct list_head entry;
@@ -82,7 +75,7 @@ struct gb_loopback {
         atomic_t outstanding_operations;
 
         /* Per connection stats */
-        struct timeval ts;
+        ktime_t ts;
         struct gb_loopback_stats latency;
         struct gb_loopback_stats throughput;
         struct gb_loopback_stats requests_per_second;
@@ -262,7 +255,6 @@ static void gb_loopback_check_attr(struct gb_loopback *gb)
                          gb->iteration_max, kfifo_depth);
         }
         kfifo_reset_out(&gb->kfifo_lat);
-        kfifo_reset_out(&gb->kfifo_ts);
 
         switch (gb->type) {
         case GB_LOOPBACK_TYPE_PING:
@@ -377,21 +369,9 @@ static u64 __gb_loopback_calc_latency(u64 t1, u64 t2)
                 return NSEC_PER_DAY - t2 + t1;
 }
 
-static u64 gb_loopback_calc_latency(struct timeval *ts, struct timeval *te)
-{
-        u64 t1, t2;
-
-        t1 = timeval_to_ns(ts);
-        t2 = timeval_to_ns(te);
-
-        return __gb_loopback_calc_latency(t1, t2);
-}
-
-static void gb_loopback_push_latency_ts(struct gb_loopback *gb,
-                                        struct timeval *ts, struct timeval *te)
+static u64 gb_loopback_calc_latency(ktime_t ts, ktime_t te)
 {
-        kfifo_in(&gb->kfifo_ts, (unsigned char *)ts, sizeof(*ts));
-        kfifo_in(&gb->kfifo_ts, (unsigned char *)te, sizeof(*te));
+        return __gb_loopback_calc_latency(ktime_to_ns(ts), ktime_to_ns(te));
 }
 
 static int gb_loopback_operation_sync(struct gb_loopback *gb, int type,
@@ -399,10 +379,10 @@ static int gb_loopback_operation_sync(struct gb_loopback *gb, int type,
                                       void *response, int response_size)
 {
         struct gb_operation *operation;
-        struct timeval ts, te;
+        ktime_t ts, te;
         int ret;
 
-        do_gettimeofday(&ts);
+        ts = ktime_get();
         operation = gb_operation_create(gb->connection, type, request_size,
                                         response_size, GFP_KERNEL);
         if (!operation)
@@ -430,11 +410,10 @@ static int gb_loopback_operation_sync(struct gb_loopback *gb, int type,
                 }
         }
 
-        do_gettimeofday(&te);
+        te = ktime_get();
 
         /* Calculate the total time the message took */
-        gb_loopback_push_latency_ts(gb, &ts, &te);
-        gb->elapsed_nsecs = gb_loopback_calc_latency(&ts, &te);
+        gb->elapsed_nsecs = gb_loopback_calc_latency(ts, te);
 
 out_put_operation:
         gb_operation_put(operation);
@@ -442,56 +421,6 @@ out_put_operation:
         return ret;
 }
 
-static void __gb_loopback_async_operation_destroy(struct kref *kref)
-{
-        struct gb_loopback_async_operation *op_async;
-
-        op_async = container_of(kref, struct gb_loopback_async_operation, kref);
-
-        list_del(&op_async->entry);
-        if (op_async->operation)
-                gb_operation_put(op_async->operation);
-        atomic_dec(&op_async->gb->outstanding_operations);
-        wake_up(&op_async->gb->wq_completion);
-        kfree(op_async);
-}
-
-static void gb_loopback_async_operation_get(struct gb_loopback_async_operation
-                                            *op_async)
-{
-        kref_get(&op_async->kref);
-}
-
-static void gb_loopback_async_operation_put(struct gb_loopback_async_operation
-                                            *op_async)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&gb_dev.lock, flags);
-        kref_put(&op_async->kref, __gb_loopback_async_operation_destroy);
-        spin_unlock_irqrestore(&gb_dev.lock, flags);
-}
-
-static struct gb_loopback_async_operation *
-        gb_loopback_operation_find(u16 id)
-{
-        struct gb_loopback_async_operation *op_async;
-        bool found = false;
-        unsigned long flags;
-
-        spin_lock_irqsave(&gb_dev.lock, flags);
-        list_for_each_entry(op_async, &gb_dev.list_op_async, entry) {
-                if (op_async->operation->id == id) {
-                        gb_loopback_async_operation_get(op_async);
-                        found = true;
-                        break;
-                }
-        }
-        spin_unlock_irqrestore(&gb_dev.lock, flags);
-
-        return found ? op_async : NULL;
-}
-
 static void gb_loopback_async_wait_all(struct gb_loopback *gb)
 {
         wait_event(gb->wq_completion,
@@ -502,87 +431,42 @@ static void gb_loopback_async_operation_callback(struct gb_operation *operation)
 {
         struct gb_loopback_async_operation *op_async;
         struct gb_loopback *gb;
-        struct timeval te;
-        bool err = false;
-
-        do_gettimeofday(&te);
-        op_async = gb_loopback_operation_find(operation->id);
-        if (!op_async)
-                return;
+        ktime_t te;
+        int result;
 
+        te = ktime_get();
+        result = gb_operation_result(operation);
+        op_async = gb_operation_get_data(operation);
         gb = op_async->gb;
+
         mutex_lock(&gb->mutex);
 
-        if (!op_async->pending || gb_operation_result(operation)) {
-                err = true;
+        if (!result && op_async->completion)
+                result = op_async->completion(op_async);
+
+        if (!result) {
+                gb->elapsed_nsecs = gb_loopback_calc_latency(op_async->ts, te);
         } else {
-                if (op_async->completion)
-                        if (op_async->completion(op_async))
-                                err = true;
+                gb->error++;
+                if (result == -ETIMEDOUT)
+                        gb->requests_timedout++;
         }
 
-        if (!err) {
-                gb_loopback_push_latency_ts(gb, &op_async->ts, &te);
-                gb->elapsed_nsecs = gb_loopback_calc_latency(&op_async->ts,
-                                                             &te);
-        }
+        gb->iteration_count++;
+        gb_loopback_calculate_stats(gb, result);
 
-        if (op_async->pending) {
-                if (err)
-                        gb->error++;
-                gb->iteration_count++;
-                op_async->pending = false;
-                del_timer_sync(&op_async->timer);
-                gb_loopback_async_operation_put(op_async);
-                gb_loopback_calculate_stats(gb, err);
-        }
         mutex_unlock(&gb->mutex);
 
         dev_dbg(&gb->connection->bundle->dev, "complete operation %d\n",
                 operation->id);
 
-        gb_loopback_async_operation_put(op_async);
-}
-
-static void gb_loopback_async_operation_work(struct work_struct *work)
-{
-        struct gb_loopback *gb;
-        struct gb_operation *operation;
-        struct gb_loopback_async_operation *op_async;
-
-        op_async = container_of(work, struct gb_loopback_async_operation, work);
-        gb = op_async->gb;
-        operation = op_async->operation;
-
-        mutex_lock(&gb->mutex);
-        if (op_async->pending) {
-                gb->requests_timedout++;
-                gb->error++;
-                gb->iteration_count++;
-                op_async->pending = false;
-                gb_loopback_async_operation_put(op_async);
-                gb_loopback_calculate_stats(gb, true);
-        }
-        mutex_unlock(&gb->mutex);
-
-        dev_dbg(&gb->connection->bundle->dev, "timeout operation %d\n",
-                operation->id);
-
-        gb_operation_cancel(operation, -ETIMEDOUT);
-        gb_loopback_async_operation_put(op_async);
-}
-
-static void gb_loopback_async_operation_timeout(unsigned long data)
-{
-        struct gb_loopback_async_operation *op_async;
-        u16 id = data;
+        /* Wake up waiters */
+        atomic_dec(&op_async->gb->outstanding_operations);
+        wake_up(&gb->wq_completion);
 
-        op_async = gb_loopback_operation_find(id);
-        if (!op_async) {
-                pr_err("operation %d not found - time out ?\n", id);
-                return;
-        }
-        schedule_work(&op_async->work);
+        /* Release resources */
+        gb_operation_put(operation);
+        kfree(op_async);
 }
 
 static int gb_loopback_async_operation(struct gb_loopback *gb, int type,
@@ -593,15 +477,11 @@ static int gb_loopback_async_operation(struct gb_loopback *gb, int type,
         struct gb_loopback_async_operation *op_async;
         struct gb_operation *operation;
         int ret;
-        unsigned long flags;
 
         op_async = kzalloc(sizeof(*op_async), GFP_KERNEL);
         if (!op_async)
                 return -ENOMEM;
 
-        INIT_WORK(&op_async->work, gb_loopback_async_operation_work);
-        kref_init(&op_async->kref);
-
         operation = gb_operation_create(gb->connection, type, request_size,
                                         response_size, GFP_KERNEL);
         if (!operation) {
@@ -612,35 +492,24 @@ static int gb_loopback_async_operation(struct gb_loopback *gb, int type,
         if (request_size)
                 memcpy(operation->request->payload, request, request_size);
 
+        gb_operation_set_data(operation, op_async);
+
         op_async->gb = gb;
         op_async->operation = operation;
         op_async->completion = completion;
 
-        spin_lock_irqsave(&gb_dev.lock, flags);
-        list_add_tail(&op_async->entry, &gb_dev.list_op_async);
-        spin_unlock_irqrestore(&gb_dev.lock, flags);
+        op_async->ts = ktime_get();
 
-        do_gettimeofday(&op_async->ts);
-        op_async->pending = true;
         atomic_inc(&gb->outstanding_operations);
-        mutex_lock(&gb->mutex);
         ret = gb_operation_request_send(operation,
                                         gb_loopback_async_operation_callback,
-                                        0,
+                                        jiffies_to_msecs(gb->jiffy_timeout),
                                         GFP_KERNEL);
-        if (ret)
-                goto error;
-
-        setup_timer(&op_async->timer, gb_loopback_async_operation_timeout,
-                        (unsigned long)operation->id);
-        op_async->timer.expires = jiffies + gb->jiffy_timeout;
-        add_timer(&op_async->timer);
-
-        goto done;
-error:
-        gb_loopback_async_operation_put(op_async);
-done:
-        mutex_unlock(&gb->mutex);
+        if (ret) {
+                atomic_dec(&gb->outstanding_operations);
+                gb_operation_put(operation);
+                kfree(op_async);
+        }
         return ret;
 }
 
@@ -854,7 +723,7 @@ static void gb_loopback_reset_stats(struct gb_loopback *gb)
         /* Should be initialized at least once per transaction set */
         gb->apbridge_latency_ts = 0;
         gb->gbphy_latency_ts = 0;
-        memset(&gb->ts, 0, sizeof(struct timeval));
+        gb->ts = ktime_set(0, 0);
 }
 
 static void gb_loopback_update_stats(struct gb_loopback_stats *stats, u32 val)
@@ -937,15 +806,15 @@ static void gb_loopback_calculate_stats(struct gb_loopback *gb, bool error)
 {
         u64 nlat;
         u32 lat;
-        struct timeval te;
+        ktime_t te;
 
         if (!error) {
                 gb->requests_completed++;
                 gb_loopback_calculate_latency_stats(gb);
         }
 
-        do_gettimeofday(&te);
-        nlat = gb_loopback_calc_latency(&gb->ts, &te);
+        te = ktime_get();
+        nlat = gb_loopback_calc_latency(gb->ts, te);
         if (nlat >= NSEC_PER_SEC || gb->iteration_count == gb->iteration_max) {
                 lat = gb_loopback_nsec_to_usec_latency(nlat);
 
@@ -1029,9 +898,8 @@ static int gb_loopback_fn(void *data)
                 size = gb->size;
                 us_wait = gb->us_wait;
                 type = gb->type;
-                if (gb->ts.tv_usec == 0 && gb->ts.tv_sec == 0)
-                        do_gettimeofday(&gb->ts);
-                mutex_unlock(&gb->mutex);
+                if (ktime_to_ns(gb->ts) == 0)
+                        gb->ts = ktime_get();
 
                 /* Else operations to perform */
                 if (gb->async) {
@@ -1042,8 +910,10 @@ static int gb_loopback_fn(void *data)
                         else if (type == GB_LOOPBACK_TYPE_SINK)
                                 error = gb_loopback_async_sink(gb, size);
 
-                        if (error)
+                        if (error) {
                                 gb->error++;
+                                gb->iteration_count++;
+                        }
                 } else {
                         /* We are effectively single threaded here */
                         if (type == GB_LOOPBACK_TYPE_PING)
@@ -1059,6 +929,7 @@ static int gb_loopback_fn(void *data)
                         gb_loopback_calculate_stats(gb, !!error);
                 }
                 gb->send_count++;
+                mutex_unlock(&gb->mutex);
 
                 if (us_wait) {
                         if (us_wait < 20000)
@@ -1241,18 +1112,12 @@ static int gb_loopback_probe(struct gb_bundle *bundle,
                 retval = -ENOMEM;
                 goto out_conn;
         }
-        if (kfifo_alloc(&gb->kfifo_ts, kfifo_depth * sizeof(struct timeval) * 2,
-                          GFP_KERNEL)) {
-                retval = -ENOMEM;
-                goto out_kfifo0;
-        }
-
         /* Fork worker thread */
         mutex_init(&gb->mutex);
         gb->task = kthread_run(gb_loopback_fn, gb, "gb_loopback");
         if (IS_ERR(gb->task)) {
                 retval = PTR_ERR(gb->task);
-                goto out_kfifo1;
+                goto out_kfifo;
         }
 
         spin_lock_irqsave(&gb_dev.lock, flags);
@@ -1266,9 +1131,7 @@ static int gb_loopback_probe(struct gb_bundle *bundle,
 
         return 0;
 
-out_kfifo1:
-        kfifo_free(&gb->kfifo_ts);
-out_kfifo0:
+out_kfifo:
         kfifo_free(&gb->kfifo_lat);
 out_conn:
         device_unregister(dev);
@@ -1302,7 +1165,6 @@ static void gb_loopback_disconnect(struct gb_bundle *bundle)
                 kthread_stop(gb->task);
 
         kfifo_free(&gb->kfifo_lat);
-        kfifo_free(&gb->kfifo_ts);
         gb_connection_latency_tag_disable(gb->connection);
         debugfs_remove(gb->file);
 
diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c
index 7b903770a684..08db49264f2b 100644
--- a/drivers/staging/greybus/manifest.c
+++ b/drivers/staging/greybus/manifest.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus manifest parsing
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include "greybus.h"
diff --git a/drivers/staging/greybus/manifest.h b/drivers/staging/greybus/manifest.h
index d96428407cd7..f3c95a255631 100644
--- a/drivers/staging/greybus/manifest.h
+++ b/drivers/staging/greybus/manifest.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus manifest parsing
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __MANIFEST_H
diff --git a/drivers/staging/greybus/module.c b/drivers/staging/greybus/module.c
index 660b4674a76f..b785382192de 100644
--- a/drivers/staging/greybus/module.c
+++ b/drivers/staging/greybus/module.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Module code
  *
  * Copyright 2016 Google Inc.
  * Copyright 2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include "greybus.h"
diff --git a/drivers/staging/greybus/module.h b/drivers/staging/greybus/module.h
index 88a97ce04243..b1ebcc6636db 100644
--- a/drivers/staging/greybus/module.h
+++ b/drivers/staging/greybus/module.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Module code
  *
  * Copyright 2016 Google Inc.
  * Copyright 2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __MODULE_H
diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c
index 3023012808d9..609332b3e15b 100644
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus operations
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/staging/greybus/operation.h b/drivers/staging/greybus/operation.h
index 7529f01b2529..40b7b02fff88 100644
--- a/drivers/staging/greybus/operation.h
+++ b/drivers/staging/greybus/operation.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus operations
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __OPERATION_H
@@ -105,6 +104,8 @@ struct gb_operation {
 
         int                     active;
         struct list_head        links;          /* connection->operations */
+
+        void                    *private;
 };
 
 static inline bool
@@ -206,6 +207,17 @@ static inline int gb_operation_unidirectional(struct gb_connection *connection,
                         request, request_size, GB_OPERATION_TIMEOUT_DEFAULT);
 }
 
+static inline void *gb_operation_get_data(struct gb_operation *operation)
+{
+        return operation->private;
+}
+
+static inline void gb_operation_set_data(struct gb_operation *operation,
+                                         void *data)
+{
+        operation->private = data;
+}
+
 int gb_operation_init(void);
 void gb_operation_exit(void);
 
diff --git a/drivers/staging/greybus/power_supply.c b/drivers/staging/greybus/power_supply.c
index 20cac20518d7..0529e5628c24 100644
--- a/drivers/staging/greybus/power_supply.c
+++ b/drivers/staging/greybus/power_supply.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Power Supply driver for a Greybus module.
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/staging/greybus/pwm.c b/drivers/staging/greybus/pwm.c
index f0404bc37123..4a6d394b6c44 100644
--- a/drivers/staging/greybus/pwm.c
+++ b/drivers/staging/greybus/pwm.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PWM Greybus driver.
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/staging/greybus/raw.c b/drivers/staging/greybus/raw.c
index 729d25811568..838acbe84ca0 100644
--- a/drivers/staging/greybus/raw.c
+++ b/drivers/staging/greybus/raw.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus driver for the Raw protocol
  *
  * Copyright 2015 Google Inc.
  * Copyright 2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/staging/greybus/sdio.c b/drivers/staging/greybus/sdio.c
index 101ca5097fc9..38e85033fc4b 100644
--- a/drivers/staging/greybus/sdio.c
+++ b/drivers/staging/greybus/sdio.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SD/MMC Greybus driver.
  *
  * Copyright 2014-2015 Google Inc.
  * Copyright 2014-2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/staging/greybus/spi.c b/drivers/staging/greybus/spi.c
index c893552b5c0b..47d896992b35 100644
--- a/drivers/staging/greybus/spi.c
+++ b/drivers/staging/greybus/spi.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SPI bridge PHY driver.
  *
  * Copyright 2014-2016 Google Inc.
  * Copyright 2014-2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/module.h>
diff --git a/drivers/staging/greybus/spilib.c b/drivers/staging/greybus/spilib.c
index e97b19148497..2e07c6b41334 100644
--- a/drivers/staging/greybus/spilib.c
+++ b/drivers/staging/greybus/spilib.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus SPI library
  *
  * Copyright 2014-2016 Google Inc.
  * Copyright 2014-2016 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/bitops.h>
@@ -544,12 +543,15 @@ int gb_spilib_master_init(struct gb_connection *connection, struct device *dev,
 
         return 0;
 
-exit_spi_unregister:
-        spi_unregister_master(master);
 exit_spi_put:
         spi_master_put(master);
 
         return ret;
+
+exit_spi_unregister:
+        spi_unregister_master(master);
+
+        return ret;
 }
 EXPORT_SYMBOL_GPL(gb_spilib_master_init);
 
@@ -558,7 +560,6 @@ void gb_spilib_master_exit(struct gb_connection *connection)
         struct spi_master *master = gb_connection_get_data(connection);
 
         spi_unregister_master(master);
-        spi_master_put(master);
 }
 EXPORT_SYMBOL_GPL(gb_spilib_master_exit);
 
diff --git a/drivers/staging/greybus/spilib.h b/drivers/staging/greybus/spilib.h
index cb6092578a92..043d4d32c3ee 100644
--- a/drivers/staging/greybus/spilib.h
+++ b/drivers/staging/greybus/spilib.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus SPI library header
  *
diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c
index 516f827e5ed9..a874fed761a1 100644
--- a/drivers/staging/greybus/svc.c
+++ b/drivers/staging/greybus/svc.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SVC Greybus driver.
  *
  * Copyright 2015 Google Inc.
  * Copyright 2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/debugfs.h>
diff --git a/drivers/staging/greybus/svc.h b/drivers/staging/greybus/svc.h
index 226c2a396fc8..ad01783bac9c 100644
--- a/drivers/staging/greybus/svc.h
+++ b/drivers/staging/greybus/svc.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus SVC code
  *
  * Copyright 2015 Google Inc.
  * Copyright 2015 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #ifndef __SVC_H
diff --git a/drivers/staging/greybus/svc_watchdog.c b/drivers/staging/greybus/svc_watchdog.c
index 779fbea5d4ba..7868ad8211c5 100644
--- a/drivers/staging/greybus/svc_watchdog.c
+++ b/drivers/staging/greybus/svc_watchdog.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SVC Greybus "watchdog" driver.
  *
  * Copyright 2016 Google Inc.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/delay.h>
diff --git a/drivers/staging/greybus/tools/lbtest b/drivers/staging/greybus/tools/lbtest
index d7353f1a2a6f..47c481239e98 100755
--- a/drivers/staging/greybus/tools/lbtest
+++ b/drivers/staging/greybus/tools/lbtest
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
 
 # Copyright (c) 2015 Google, Inc.
 # Copyright (c) 2015 Linaro, Ltd.
diff --git a/drivers/staging/greybus/tools/loopback_test.c b/drivers/staging/greybus/tools/loopback_test.c
index fbe589fca840..c51610ce24af 100644
--- a/drivers/staging/greybus/tools/loopback_test.c
+++ b/drivers/staging/greybus/tools/loopback_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * Loopback test application
  *
diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index c6d01b800d3c..8a006323c3c1 100644
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * UART driver for the Greybus "generic" UART module.
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
  *
- * Released under the GPLv2 only.
- *
  * Heavily based on drivers/usb/class/cdc-acm.c and
  * drivers/usb/serial/usb-serial.c.
  */
diff --git a/drivers/staging/greybus/usb.c b/drivers/staging/greybus/usb.c
index f93a76d02de6..1c246c73a085 100644
--- a/drivers/staging/greybus/usb.c
+++ b/drivers/staging/greybus/usb.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB host driver for the Greybus "generic" USB module.
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
- *
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/staging/greybus/vibrator.c b/drivers/staging/greybus/vibrator.c
index 5cd8a50d41ad..3e5dedeacd5c 100644
--- a/drivers/staging/greybus/vibrator.c
+++ b/drivers/staging/greybus/vibrator.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Greybus Vibrator protocol driver.
  *
  * Copyright 2014 Google Inc.
  * Copyright 2014 Linaro Ltd.
- *
- * Released under the GPLv2 only.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/staging/gs_fpgaboot/gs_fpgaboot.c b/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
index bcbdc7340b55..fa8b27e091a2 100644
--- a/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
+++ b/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
@@ -106,7 +106,7 @@ static int readmagic_bitstream(u8 *bitdata, int *offset)
         read_bitstream(bitdata, buf, offset, 13);
         r = memcmp(buf, bits_magic, 13);
         if (r) {
-                pr_err("error: corrupted header");
+                pr_err("error: corrupted header\n");
                 return -EINVAL;
         }
         pr_info("bitstream file magic number Ok\n");
diff --git a/drivers/staging/iio/Documentation/device.txt b/drivers/staging/iio/Documentation/device.txt
index 54ef0deed28f..ec42544a46aa 100644
--- a/drivers/staging/iio/Documentation/device.txt
+++ b/drivers/staging/iio/Documentation/device.txt
@@ -26,9 +26,6 @@ Then fill in the following:
         pointer to a structure with elements that tend to be fixed for
         large sets of different parts supported by a given driver.
         This contains:
-        * info->driver_module:
-                Set to THIS_MODULE. Used to ensure correct ownership
-                of various resources allocate by the core.
         * info->event_attrs:
                 Attributes used to enable / disable hardware events.
         * info->attrs:
diff --git a/drivers/staging/iio/Documentation/trigger.txt b/drivers/staging/iio/Documentation/trigger.txt
index 7c0e505e4f04..299a1add98bf 100644
--- a/drivers/staging/iio/Documentation/trigger.txt
+++ b/drivers/staging/iio/Documentation/trigger.txt
@@ -10,10 +10,6 @@ struct iio_trig *trig = iio_trigger_alloc("<trigger format string>", ...);
 allocates a trigger structure.  The key elements to then fill in within
 a driver are:
 
-trig->owner
-        Typically set to THIS_MODULE. Used to ensure correct
-        ownership of core allocated resources.
-
 trig->set_trigger_state:
         Function that enables / disables the underlying source of the trigger.
 
diff --git a/drivers/staging/iio/accel/adis16201.c b/drivers/staging/iio/accel/adis16201.c
index fbc240663621..2ebd27536216 100644
--- a/drivers/staging/iio/accel/adis16201.c
+++ b/drivers/staging/iio/accel/adis16201.c
@@ -284,7 +284,6 @@ static const struct iio_info adis16201_info = {
         .read_raw = adis16201_read_raw,
         .write_raw = adis16201_write_raw,
         .update_scan_mode = adis_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static const char * const adis16201_status_error_msgs[] = {
diff --git a/drivers/staging/iio/accel/adis16203.c b/drivers/staging/iio/accel/adis16203.c
index 4e3fa7592d3f..b3e4571340ab 100644
--- a/drivers/staging/iio/accel/adis16203.c
+++ b/drivers/staging/iio/accel/adis16203.c
@@ -232,7 +232,6 @@ static const struct iio_info adis16203_info = {
         .read_raw = adis16203_read_raw,
         .write_raw = adis16203_write_raw,
         .update_scan_mode = adis_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static const char * const adis16203_status_error_msgs[] = {
diff --git a/drivers/staging/iio/accel/adis16209.c b/drivers/staging/iio/accel/adis16209.c
index 8485c024e3f5..7fcef9a2590a 100644
--- a/drivers/staging/iio/accel/adis16209.c
+++ b/drivers/staging/iio/accel/adis16209.c
@@ -285,7 +285,6 @@ static const struct iio_info adis16209_info = {
         .read_raw = adis16209_read_raw,
         .write_raw = adis16209_write_raw,
         .update_scan_mode = adis_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static const char * const adis16209_status_error_msgs[] = {
diff --git a/drivers/staging/iio/accel/adis16240.c b/drivers/staging/iio/accel/adis16240.c
index 109cd94b5ac3..fff6d99089cc 100644
--- a/drivers/staging/iio/accel/adis16240.c
+++ b/drivers/staging/iio/accel/adis16240.c
@@ -361,7 +361,6 @@ static const struct iio_info adis16240_info = {
         .read_raw = adis16240_read_raw,
         .write_raw = adis16240_write_raw,
         .update_scan_mode = adis_update_scan_mode,
-        .driver_module = THIS_MODULE,
 };
 
 static const char * const adis16240_status_error_msgs[] = {
diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index 6150d2780e22..cadfb96734ed 100644
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -162,6 +162,7 @@ struct ad7192_state {
         u32                             scale_avail[8][2];
         u8                              gpocon;
         u8                              devid;
+        struct mutex                    lock;   /* protect sensor state */
 
         struct ad_sigma_delta           sd;
 };
@@ -461,10 +462,10 @@ static int ad7192_read_raw(struct iio_dev *indio_dev,
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
-                        mutex_lock(&indio_dev->mlock);
+                        mutex_lock(&st->lock);
                         *val = st->scale_avail[AD7192_CONF_GAIN(st->conf)][0];
                         *val2 = st->scale_avail[AD7192_CONF_GAIN(st->conf)][1];
-                        mutex_unlock(&indio_dev->mlock);
+                        mutex_unlock(&st->lock);
                         return IIO_VAL_INT_PLUS_NANO;
                 case IIO_TEMP:
                         *val = 0;
@@ -508,6 +509,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,
         switch (mask) {
         case IIO_CHAN_INFO_SCALE:
                 ret = -EINVAL;
+                mutex_lock(&st->lock);
                 for (i = 0; i < ARRAY_SIZE(st->scale_avail); i++)
                         if (val2 == st->scale_avail[i][1]) {
                                 ret = 0;
@@ -521,6 +523,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,
                                 ad7192_calibrate_all(st);
                                 break;
                         }
+                mutex_unlock(&st->lock);
                 break;
         case IIO_CHAN_INFO_SAMP_FREQ:
                 if (!val) {
@@ -567,7 +570,6 @@ static const struct iio_info ad7192_info = {
         .write_raw_get_fmt = ad7192_write_raw_get_fmt,
         .attrs = &ad7192_attribute_group,
         .validate_trigger = ad_sd_validate_trigger,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_info ad7195_info = {
@@ -576,7 +578,6 @@ static const struct iio_info ad7195_info = {
         .write_raw_get_fmt = ad7192_write_raw_get_fmt,
         .attrs = &ad7195_attribute_group,
         .validate_trigger = ad_sd_validate_trigger,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_chan_spec ad7192_channels[] = {
@@ -632,6 +633,8 @@ static int ad7192_probe(struct spi_device *spi)
 
         st = iio_priv(indio_dev);
 
+        mutex_init(&st->lock);
+
         st->avdd = devm_regulator_get(&spi->dev, "avdd");
         if (IS_ERR(st->avdd))
                 return PTR_ERR(st->avdd);
diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index f85dde9805e0..b736275c10f5 100644
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -828,7 +828,6 @@ static const struct iio_info ad7280_info = {
         .read_raw = ad7280_read_raw,
         .event_attrs = &ad7280_event_attrs_group,
         .attrs = &ad7280_attrs_group,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct ad7280_platform_data ad7793_default_pdata = {
diff --git a/drivers/staging/iio/adc/ad7606.c b/drivers/staging/iio/adc/ad7606.c
index 18f5f139117e..25b9fcd5e3a4 100644
--- a/drivers/staging/iio/adc/ad7606.c
+++ b/drivers/staging/iio/adc/ad7606.c
@@ -373,26 +373,22 @@ static irqreturn_t ad7606_interrupt(int irq, void *dev_id)
 };
 
 static const struct iio_info ad7606_info_no_os_or_range = {
-        .driver_module = THIS_MODULE,
         .read_raw = &ad7606_read_raw,
 };
 
 static const struct iio_info ad7606_info_os_and_range = {
-        .driver_module = THIS_MODULE,
         .read_raw = &ad7606_read_raw,
         .write_raw = &ad7606_write_raw,
         .attrs = &ad7606_attribute_group_os_and_range,
 };
 
 static const struct iio_info ad7606_info_os = {
-        .driver_module = THIS_MODULE,
         .read_raw = &ad7606_read_raw,
         .write_raw = &ad7606_write_raw,
         .attrs = &ad7606_attribute_group_os,
 };
 
 static const struct iio_info ad7606_info_range = {
-        .driver_module = THIS_MODULE,
         .read_raw = &ad7606_read_raw,
         .write_raw = &ad7606_write_raw,
         .attrs = &ad7606_attribute_group_range,
diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c
index dec3ba6eba8a..a7797af579b9 100644
--- a/drivers/staging/iio/adc/ad7780.c
+++ b/drivers/staging/iio/adc/ad7780.c
@@ -155,7 +155,6 @@ static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
 
 static const struct iio_info ad7780_info = {
         .read_raw = ad7780_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad7780_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c
index 17d280581e24..bfe180a475ee 100644
--- a/drivers/staging/iio/adc/ad7816.c
+++ b/drivers/staging/iio/adc/ad7816.c
@@ -335,7 +335,6 @@ static const struct attribute_group ad7816_event_attribute_group = {
 static const struct iio_info ad7816_info = {
         .attrs = &ad7816_attribute_group,
         .event_attrs = &ad7816_event_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 /*
diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c
index b2bce26499f5..2d33632c00e8 100644
--- a/drivers/staging/iio/addac/adt7316.c
+++ b/drivers/staging/iio/addac/adt7316.c
@@ -2087,13 +2087,11 @@ EXPORT_SYMBOL_GPL(adt7316_pm_ops);
 static const struct iio_info adt7316_info = {
         .attrs = &adt7316_attribute_group,
         .event_attrs = &adt7316_event_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_info adt7516_info = {
         .attrs = &adt7516_attribute_group,
         .event_attrs = &adt7516_event_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 /*
diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c
index a6f249e9c1e1..2fe916c48848 100644
--- a/drivers/staging/iio/cdc/ad7150.c
+++ b/drivers/staging/iio/cdc/ad7150.c
@@ -569,7 +569,6 @@ static const struct attribute_group ad7150_event_attribute_group = {
 
 static const struct iio_info ad7150_info = {
         .event_attrs = &ad7150_event_attribute_group,
-        .driver_module = THIS_MODULE,
         .read_raw = &ad7150_read_raw,
         .read_event_config = &ad7150_read_event_config,
         .write_event_config = &ad7150_write_event_config,
diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c
index ff10d1f0a7e4..61377ca444de 100644
--- a/drivers/staging/iio/cdc/ad7152.c
+++ b/drivers/staging/iio/cdc/ad7152.c
@@ -441,7 +441,6 @@ static const struct iio_info ad7152_info = {
         .read_raw = ad7152_read_raw,
         .write_raw = ad7152_write_raw,
         .write_raw_get_fmt = ad7152_write_raw_get_fmt,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_chan_spec ad7152_channels[] = {
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
index cdcb4fccf3fe..a124853a05f0 100644
--- a/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@ -667,7 +667,6 @@ static const struct iio_info ad7746_info = {
         .attrs = &ad7746_attribute_group,
         .read_raw = ad7746_read_raw,
         .write_raw = ad7746_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 /*
diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
index 6da46ede7ee0..c73eff1f8d73 100644
--- a/drivers/staging/iio/frequency/ad9832.c
+++ b/drivers/staging/iio/frequency/ad9832.c
@@ -290,7 +290,6 @@ static const struct attribute_group ad9832_attribute_group = {
 
 static const struct iio_info ad9832_info = {
         .attrs = &ad9832_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad9832_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c
index 995acdd7c942..4c6d4043903e 100644
--- a/drivers/staging/iio/frequency/ad9834.c
+++ b/drivers/staging/iio/frequency/ad9834.c
@@ -381,12 +381,10 @@ static const struct attribute_group ad9833_attribute_group = {
 
 static const struct iio_info ad9834_info = {
         .attrs = &ad9834_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_info ad9833_info = {
         .attrs = &ad9833_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad9834_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c
index 967524583d8a..4e7630caf7d3 100644
--- a/drivers/staging/iio/gyro/adis16060_core.c
+++ b/drivers/staging/iio/gyro/adis16060_core.c
@@ -103,7 +103,6 @@ static int adis16060_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info adis16060_info = {
         .read_raw = adis16060_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_chan_spec adis16060_channels[] = {
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 3d539eeb0e26..2b28fb9c0048 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -575,7 +575,6 @@ out:
 static const struct iio_info ad5933_info = {
         .read_raw = ad5933_read_raw,
         .attrs = &ad5933_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad5933_ring_preenable(struct iio_dev *indio_dev)
diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c
index 786e93f16ce9..42ed9c015aaf 100644
--- a/drivers/staging/iio/light/tsl2x7x.c
+++ b/drivers/staging/iio/light/tsl2x7x.c
@@ -15,112 +15,112 @@
  * more details.
  */
 
-#include <linux/kernel.h>
-#include <linux/i2c.h>
-#include <linux/errno.h>
 #include <linux/delay.h>
-#include <linux/mutex.h>
+#include <linux/errno.h>
+#include <linux/i2c.h>
 #include <linux/interrupt.h>
-#include <linux/slab.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/slab.h>
 #include <linux/iio/events.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include "tsl2x7x.h"
 
 /* Cal defs*/
-#define PROX_STAT_CAL        0
-#define PROX_STAT_SAMP       1
-#define MAX_SAMPLES_CAL      200
+#define PROX_STAT_CAL                   0
+#define PROX_STAT_SAMP                  1
+#define MAX_SAMPLES_CAL                 200
 
 /* TSL2X7X Device ID */
-#define TRITON_ID    0x00
-#define SWORDFISH_ID 0x30
-#define HALIBUT_ID   0x20
+#define TRITON_ID                       0x00
+#define SWORDFISH_ID                    0x30
+#define HALIBUT_ID                      0x20
 
 /* Lux calculation constants */
-#define TSL2X7X_LUX_CALC_OVER_FLOW     65535
+#define TSL2X7X_LUX_CALC_OVER_FLOW      65535
 
 /* TAOS Register definitions - note:
  * depending on device, some of these register are not used and the
  * register address is benign.
  */
 /* 2X7X register offsets */
-#define TSL2X7X_MAX_CONFIG_REG         16
+#define TSL2X7X_MAX_CONFIG_REG          16
 
 /* Device Registers and Masks */
-#define TSL2X7X_CNTRL                  0x00
-#define TSL2X7X_ALS_TIME               0X01
-#define TSL2X7X_PRX_TIME               0x02
-#define TSL2X7X_WAIT_TIME              0x03
-#define TSL2X7X_ALS_MINTHRESHLO        0X04
-#define TSL2X7X_ALS_MINTHRESHHI        0X05
-#define TSL2X7X_ALS_MAXTHRESHLO        0X06
-#define TSL2X7X_ALS_MAXTHRESHHI        0X07
-#define TSL2X7X_PRX_MINTHRESHLO        0X08
-#define TSL2X7X_PRX_MINTHRESHHI        0X09
-#define TSL2X7X_PRX_MAXTHRESHLO        0X0A
-#define TSL2X7X_PRX_MAXTHRESHHI        0X0B
-#define TSL2X7X_PERSISTENCE            0x0C
-#define TSL2X7X_PRX_CONFIG             0x0D
-#define TSL2X7X_PRX_COUNT              0x0E
-#define TSL2X7X_GAIN                   0x0F
-#define TSL2X7X_NOTUSED                0x10
-#define TSL2X7X_REVID                  0x11
-#define TSL2X7X_CHIPID                 0x12
-#define TSL2X7X_STATUS                 0x13
-#define TSL2X7X_ALS_CHAN0LO            0x14
-#define TSL2X7X_ALS_CHAN0HI            0x15
-#define TSL2X7X_ALS_CHAN1LO            0x16
-#define TSL2X7X_ALS_CHAN1HI            0x17
-#define TSL2X7X_PRX_LO                 0x18
-#define TSL2X7X_PRX_HI                 0x19
+#define TSL2X7X_CNTRL                   0x00
+#define TSL2X7X_ALS_TIME                0X01
+#define TSL2X7X_PRX_TIME                0x02
+#define TSL2X7X_WAIT_TIME               0x03
+#define TSL2X7X_ALS_MINTHRESHLO         0X04
+#define TSL2X7X_ALS_MINTHRESHHI         0X05
+#define TSL2X7X_ALS_MAXTHRESHLO         0X06
+#define TSL2X7X_ALS_MAXTHRESHHI         0X07
+#define TSL2X7X_PRX_MINTHRESHLO         0X08
+#define TSL2X7X_PRX_MINTHRESHHI         0X09
+#define TSL2X7X_PRX_MAXTHRESHLO         0X0A
+#define TSL2X7X_PRX_MAXTHRESHHI         0X0B
+#define TSL2X7X_PERSISTENCE             0x0C
+#define TSL2X7X_PRX_CONFIG              0x0D
+#define TSL2X7X_PRX_COUNT               0x0E
+#define TSL2X7X_GAIN                    0x0F
+#define TSL2X7X_NOTUSED                 0x10
+#define TSL2X7X_REVID                   0x11
+#define TSL2X7X_CHIPID                  0x12
+#define TSL2X7X_STATUS                  0x13
+#define TSL2X7X_ALS_CHAN0LO             0x14
+#define TSL2X7X_ALS_CHAN0HI             0x15
+#define TSL2X7X_ALS_CHAN1LO             0x16
+#define TSL2X7X_ALS_CHAN1HI             0x17
+#define TSL2X7X_PRX_LO                  0x18
+#define TSL2X7X_PRX_HI                  0x19
 
 /* tsl2X7X cmd reg masks */
-#define TSL2X7X_CMD_REG                0x80
-#define TSL2X7X_CMD_SPL_FN             0x60
+#define TSL2X7X_CMD_REG                 0x80
+#define TSL2X7X_CMD_SPL_FN              0x60
 
-#define TSL2X7X_CMD_PROX_INT_CLR       0X05
-#define TSL2X7X_CMD_ALS_INT_CLR        0x06
-#define TSL2X7X_CMD_PROXALS_INT_CLR    0X07
+#define TSL2X7X_CMD_PROX_INT_CLR        0X05
+#define TSL2X7X_CMD_ALS_INT_CLR         0x06
+#define TSL2X7X_CMD_PROXALS_INT_CLR     0X07
 
 /* tsl2X7X cntrl reg masks */
-#define TSL2X7X_CNTL_ADC_ENBL          0x02
-#define TSL2X7X_CNTL_PWR_ON            0x01
+#define TSL2X7X_CNTL_ADC_ENBL           0x02
+#define TSL2X7X_CNTL_PWR_ON             0x01
 
 /* tsl2X7X status reg masks */
-#define TSL2X7X_STA_ADC_VALID          0x01
-#define TSL2X7X_STA_PRX_VALID          0x02
-#define TSL2X7X_STA_ADC_PRX_VALID      (TSL2X7X_STA_ADC_VALID |\
-                                        TSL2X7X_STA_PRX_VALID)
-#define TSL2X7X_STA_ALS_INTR           0x10
-#define TSL2X7X_STA_PRX_INTR           0x20
+#define TSL2X7X_STA_ADC_VALID           0x01
+#define TSL2X7X_STA_PRX_VALID           0x02
+#define TSL2X7X_STA_ADC_PRX_VALID       (TSL2X7X_STA_ADC_VALID | \
+                                         TSL2X7X_STA_PRX_VALID)
+#define TSL2X7X_STA_ALS_INTR            0x10
+#define TSL2X7X_STA_PRX_INTR            0x20
 
 /* tsl2X7X cntrl reg masks */
-#define TSL2X7X_CNTL_REG_CLEAR         0x00
-#define TSL2X7X_CNTL_PROX_INT_ENBL     0X20
-#define TSL2X7X_CNTL_ALS_INT_ENBL      0X10
-#define TSL2X7X_CNTL_WAIT_TMR_ENBL     0X08
-#define TSL2X7X_CNTL_PROX_DET_ENBL     0X04
-#define TSL2X7X_CNTL_PWRON             0x01
-#define TSL2X7X_CNTL_ALSPON_ENBL       0x03
-#define TSL2X7X_CNTL_INTALSPON_ENBL    0x13
-#define TSL2X7X_CNTL_PROXPON_ENBL      0x0F
-#define TSL2X7X_CNTL_INTPROXPON_ENBL   0x2F
+#define TSL2X7X_CNTL_REG_CLEAR          0x00
+#define TSL2X7X_CNTL_PROX_INT_ENBL      0X20
+#define TSL2X7X_CNTL_ALS_INT_ENBL       0X10
+#define TSL2X7X_CNTL_WAIT_TMR_ENBL      0X08
+#define TSL2X7X_CNTL_PROX_DET_ENBL      0X04
+#define TSL2X7X_CNTL_PWRON              0x01
+#define TSL2X7X_CNTL_ALSPON_ENBL        0x03
+#define TSL2X7X_CNTL_INTALSPON_ENBL     0x13
+#define TSL2X7X_CNTL_PROXPON_ENBL       0x0F
+#define TSL2X7X_CNTL_INTPROXPON_ENBL    0x2F
 
 /*Prox diode to use */
-#define TSL2X7X_DIODE0                 0x10
-#define TSL2X7X_DIODE1                 0x20
-#define TSL2X7X_DIODE_BOTH             0x30
+#define TSL2X7X_DIODE0                  0x10
+#define TSL2X7X_DIODE1                  0x20
+#define TSL2X7X_DIODE_BOTH              0x30
 
 /* LED Power */
-#define TSL2X7X_mA100                  0x00
-#define TSL2X7X_mA50                   0x40
-#define TSL2X7X_mA25                   0x80
-#define TSL2X7X_mA13                   0xD0
-#define TSL2X7X_MAX_TIMER_CNT          (0xFF)
+#define TSL2X7X_100_mA                  0x00
+#define TSL2X7X_50_mA                   0x40
+#define TSL2X7X_25_mA                   0x80
+#define TSL2X7X_13_mA                   0xD0
+#define TSL2X7X_MAX_TIMER_CNT           0xFF
 
-#define TSL2X7X_MIN_ITIME 3
+#define TSL2X7X_MIN_ITIME               3
 
 /* TAOS txx2x7x Device family members */
 enum {
@@ -142,11 +142,6 @@ enum {
         TSL2X7X_CHIP_SUSPENDED = 2
 };
 
-struct tsl2x7x_parse_result {
-        int integer;
-        int fract;
-};
-
 /* Per-device data */
 struct tsl2x7x_als_info {
         u16 als_ch0;
@@ -174,7 +169,7 @@ struct tsl2X7X_chip {
         struct i2c_client *client;
         u16 prox_data;
         struct tsl2x7x_als_info als_cur_info;
-        struct tsl2x7x_settings tsl2x7x_settings;
+        struct tsl2x7x_settings settings;
         struct tsl2X7X_platform_data *pdata;
         int als_time_scale;
         int als_saturation;
@@ -192,25 +187,25 @@ struct tsl2X7X_chip {
 };
 
 /* Different devices require different coefficents */
-static const struct tsl2x7x_lux tsl2x71_lux_table[] = {
+static const struct tsl2x7x_lux tsl2x71_lux_table[TSL2X7X_DEF_LUX_TABLE_SZ] = {
         { 14461,   611,   1211 },
         { 18540,   352,    623 },
         {     0,     0,      0 },
 };
 
-static const struct tsl2x7x_lux tmd2x71_lux_table[] = {
+static const struct tsl2x7x_lux tmd2x71_lux_table[TSL2X7X_DEF_LUX_TABLE_SZ] = {
         { 11635,   115,    256 },
         { 15536,    87,    179 },
         {     0,     0,      0 },
 };
 
-static const struct tsl2x7x_lux tsl2x72_lux_table[] = {
+static const struct tsl2x7x_lux tsl2x72_lux_table[TSL2X7X_DEF_LUX_TABLE_SZ] = {
         { 14013,   466,   917 },
         { 18222,   310,   552 },
         {     0,     0,     0 },
 };
 
-static const struct tsl2x7x_lux tmd2x72_lux_table[] = {
+static const struct tsl2x7x_lux tmd2x72_lux_table[TSL2X7X_DEF_LUX_TABLE_SZ] = {
         { 13218,   130,   262 },
         { 17592,   92,    169 },
         {     0,     0,     0 },
@@ -248,14 +243,14 @@ static const struct tsl2x7x_settings tsl2x7x_default_settings = {
         .prox_pulse_count = 8
 };
 
-static const s16 tsl2X7X_als_gainadj[] = {
+static const s16 tsl2x7x_als_gain[] = {
         1,
         8,
         16,
         120
 };
 
-static const s16 tsl2X7X_prx_gainadj[] = {
+static const s16 tsl2x7x_prx_gain[] = {
         1,
         2,
         4,
@@ -353,9 +348,9 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
 
         /* clear any existing interrupt status */
         ret = i2c_smbus_write_byte(chip->client,
-                                   (TSL2X7X_CMD_REG |
+                                   TSL2X7X_CMD_REG |
                                    TSL2X7X_CMD_SPL_FN |
-                                   TSL2X7X_CMD_ALS_INT_CLR));
+                                   TSL2X7X_CMD_ALS_INT_CLR);
         if (ret < 0) {
                 dev_err(&chip->client->dev,
                         "i2c_write_command failed - err = %d\n", ret);
@@ -369,7 +364,7 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
         chip->als_cur_info.als_ch0 = ch0;
         chip->als_cur_info.als_ch1 = ch1;
 
-        if ((ch0 >= chip->als_saturation) || (ch1 >= chip->als_saturation)) {
+        if (ch0 >= chip->als_saturation || ch1 >= chip->als_saturation) {
                 lux = TSL2X7X_LUX_CALC_OVER_FLOW;
                 goto return_max;
         }
@@ -389,11 +384,10 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
         if (p->ratio == 0) {
                 lux = 0;
         } else {
-                ch0lux = DIV_ROUND_UP(ch0 * p->ch0,
-                        tsl2X7X_als_gainadj[chip->tsl2x7x_settings.als_gain]);
-                ch1lux = DIV_ROUND_UP(ch1 * p->ch1,
-                        tsl2X7X_als_gainadj[chip->tsl2x7x_settings.als_gain]);
-                lux = ch0lux - ch1lux;
+                lux = DIV_ROUND_UP(ch0 * p->ch0,
+                                   tsl2x7x_als_gain[chip->settings.als_gain]) -
+                      DIV_ROUND_UP(ch1 * p->ch1,
+                                   tsl2x7x_als_gain[chip->settings.als_gain]);
         }
 
         /* note: lux is 31 bit max at this point */
@@ -419,7 +413,7 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
          */
 
         lux64 = lux;
-        lux64 = lux64 * chip->tsl2x7x_settings.als_gain_trim;
+        lux64 = lux64 * chip->settings.als_gain_trim;
         lux64 >>= 8;
         lux = lux64;
         lux = (lux + 500) / 1000;
@@ -472,7 +466,7 @@ static int tsl2x7x_get_prox(struct iio_dev *indio_dev)
         case tmd2771:
                 if (!(ret & TSL2X7X_STA_ADC_VALID))
                         goto prox_poll_err;
-        break;
+                break;
         case tsl2572:
         case tsl2672:
         case tmd2672:
@@ -480,7 +474,7 @@ static int tsl2x7x_get_prox(struct iio_dev *indio_dev)
         case tmd2772:
                 if (!(ret & TSL2X7X_STA_PRX_VALID))
                         goto prox_poll_err;
-        break;
+                break;
         }
 
         for (i = 0; i < 2; i++) {
@@ -514,12 +508,10 @@ static void tsl2x7x_defaults(struct tsl2X7X_chip *chip)
 {
         /* If Operational settings defined elsewhere.. */
         if (chip->pdata && chip->pdata->platform_default_settings)
-                memcpy(&chip->tsl2x7x_settings,
-                       chip->pdata->platform_default_settings,
+                memcpy(&chip->settings, chip->pdata->platform_default_settings,
                        sizeof(tsl2x7x_default_settings));
         else
-                memcpy(&chip->tsl2x7x_settings,
-                       &tsl2x7x_default_settings,
+                memcpy(&chip->settings, &tsl2x7x_default_settings,
                        sizeof(tsl2x7x_default_settings));
 
         /* Load up the proper lux table. */
@@ -529,8 +521,8 @@ static void tsl2x7x_defaults(struct tsl2X7X_chip *chip)
                        sizeof(chip->pdata->platform_lux_table));
         else
                 memcpy(chip->tsl2x7x_device_lux,
-                (struct tsl2x7x_lux *)tsl2x7x_default_lux_table_group[chip->id],
-                                MAX_DEFAULT_TABLE_BYTES);
+                       tsl2x7x_default_lux_table_group[chip->id],
+                       TSL2X7X_DEFAULT_TABLE_BYTES);
 }
 
 /**
@@ -542,9 +534,7 @@ static void tsl2x7x_defaults(struct tsl2X7X_chip *chip)
 static int tsl2x7x_als_calibrate(struct iio_dev *indio_dev)
 {
         struct tsl2X7X_chip *chip = iio_priv(indio_dev);
-        int gain_trim_val;
-        int ret;
-        int lux_val;
+        int ret, lux_val;
 
         ret = i2c_smbus_read_byte_data(chip->client,
                                        TSL2X7X_CMD_REG | TSL2X7X_CNTRL);
@@ -575,16 +565,16 @@ static int tsl2x7x_als_calibrate(struct iio_dev *indio_dev)
                 return lux_val;
         }
 
-        gain_trim_val =  ((chip->tsl2x7x_settings.als_cal_target)
-                        * chip->tsl2x7x_settings.als_gain_trim) / lux_val;
-        if ((gain_trim_val < 250) || (gain_trim_val > 4000))
+        ret = (chip->settings.als_cal_target * chip->settings.als_gain_trim) /
+                        lux_val;
+        if (ret < 250 || ret > 4000)
                 return -ERANGE;
 
-        chip->tsl2x7x_settings.als_gain_trim = gain_trim_val;
+        chip->settings.als_gain_trim = ret;
         dev_info(&chip->client->dev,
                  "%s als_calibrate completed\n", chip->client->name);
 
-        return (int)gain_trim_val;
+        return ret;
 }
 
 static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
@@ -602,34 +592,30 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
                 chip->pdata->power_on(indio_dev);
 
         /* Non calculated parameters */
-        chip->tsl2x7x_config[TSL2X7X_PRX_TIME] =
-                        chip->tsl2x7x_settings.prx_time;
-        chip->tsl2x7x_config[TSL2X7X_WAIT_TIME] =
-                        chip->tsl2x7x_settings.wait_time;
-        chip->tsl2x7x_config[TSL2X7X_PRX_CONFIG] =
-                        chip->tsl2x7x_settings.prox_config;
+        chip->tsl2x7x_config[TSL2X7X_PRX_TIME] = chip->settings.prx_time;
+        chip->tsl2x7x_config[TSL2X7X_WAIT_TIME] = chip->settings.wait_time;
+        chip->tsl2x7x_config[TSL2X7X_PRX_CONFIG] = chip->settings.prox_config;
 
         chip->tsl2x7x_config[TSL2X7X_ALS_MINTHRESHLO] =
-                (chip->tsl2x7x_settings.als_thresh_low) & 0xFF;
+                (chip->settings.als_thresh_low) & 0xFF;
         chip->tsl2x7x_config[TSL2X7X_ALS_MINTHRESHHI] =
-                (chip->tsl2x7x_settings.als_thresh_low >> 8) & 0xFF;
+                (chip->settings.als_thresh_low >> 8) & 0xFF;
         chip->tsl2x7x_config[TSL2X7X_ALS_MAXTHRESHLO] =
-                (chip->tsl2x7x_settings.als_thresh_high) & 0xFF;
+                (chip->settings.als_thresh_high) & 0xFF;
         chip->tsl2x7x_config[TSL2X7X_ALS_MAXTHRESHHI] =
-                (chip->tsl2x7x_settings.als_thresh_high >> 8) & 0xFF;
-        chip->tsl2x7x_config[TSL2X7X_PERSISTENCE] =
-                chip->tsl2x7x_settings.persistence;
+                (chip->settings.als_thresh_high >> 8) & 0xFF;
+        chip->tsl2x7x_config[TSL2X7X_PERSISTENCE] = chip->settings.persistence;
 
         chip->tsl2x7x_config[TSL2X7X_PRX_COUNT] =
-                        chip->tsl2x7x_settings.prox_pulse_count;
+                        chip->settings.prox_pulse_count;
         chip->tsl2x7x_config[TSL2X7X_PRX_MINTHRESHLO] =
-                        (chip->tsl2x7x_settings.prox_thres_low) & 0xFF;
+                        (chip->settings.prox_thres_low) & 0xFF;
         chip->tsl2x7x_config[TSL2X7X_PRX_MINTHRESHHI] =
-                        (chip->tsl2x7x_settings.prox_thres_low >> 8) & 0xFF;
+                        (chip->settings.prox_thres_low >> 8) & 0xFF;
         chip->tsl2x7x_config[TSL2X7X_PRX_MAXTHRESHLO] =
-                        (chip->tsl2x7x_settings.prox_thres_high) & 0xFF;
+                        (chip->settings.prox_thres_high) & 0xFF;
         chip->tsl2x7x_config[TSL2X7X_PRX_MAXTHRESHHI] =
-                        (chip->tsl2x7x_settings.prox_thres_high >> 8) & 0xFF;
+                        (chip->settings.prox_thres_high >> 8) & 0xFF;
 
         /* and make sure we're not already on */
         if (chip->tsl2x7x_chip_status == TSL2X7X_CHIP_WORKING) {
@@ -639,7 +625,7 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
         }
 
         /* determine als integration register */
-        als_count = (chip->tsl2x7x_settings.als_time * 100 + 135) / 270;
+        als_count = (chip->settings.als_time * 100 + 135) / 270;
         if (!als_count)
                 als_count = 1; /* ensure at least one cycle */
 
@@ -649,9 +635,9 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
 
         /* Set the gain based on tsl2x7x_settings struct */
         chip->tsl2x7x_config[TSL2X7X_GAIN] =
-                chip->tsl2x7x_settings.als_gain |
-                        (TSL2X7X_mA100 | TSL2X7X_DIODE1)
-                        | ((chip->tsl2x7x_settings.prox_gain) << 2);
+                chip->settings.als_gain |
+                        (TSL2X7X_100_mA | TSL2X7X_DIODE1) |
+                        (chip->settings.prox_gain << 2);
 
         /* set chip struct re scaling and saturation */
         chip->als_saturation = als_count * 922; /* 90% of full scale */
@@ -706,18 +692,18 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
 
         chip->tsl2x7x_chip_status = TSL2X7X_CHIP_WORKING;
 
-        if (chip->tsl2x7x_settings.interrupts_en != 0) {
+        if (chip->settings.interrupts_en != 0) {
                 dev_info(&chip->client->dev, "Setting Up Interrupt(s)\n");
 
                 reg_val = TSL2X7X_CNTL_PWR_ON | TSL2X7X_CNTL_ADC_ENBL;
-                if ((chip->tsl2x7x_settings.interrupts_en == 0x20) ||
-                    (chip->tsl2x7x_settings.interrupts_en == 0x30))
+                if (chip->settings.interrupts_en == 0x20 ||
+                    chip->settings.interrupts_en == 0x30)
                         reg_val |= TSL2X7X_CNTL_PROX_DET_ENBL;
 
-                reg_val |= chip->tsl2x7x_settings.interrupts_en;
+                reg_val |= chip->settings.interrupts_en;
                 ret = i2c_smbus_write_byte_data(chip->client,
-                                                (TSL2X7X_CMD_REG |
-                                                TSL2X7X_CNTRL), reg_val);
+                                                TSL2X7X_CMD_REG | TSL2X7X_CNTRL,
+                                                reg_val);
                 if (ret < 0)
                         dev_err(&chip->client->dev,
                                 "%s: failed in tsl2x7x_IOCTL_INT_SET.\n",
@@ -766,8 +752,7 @@ static int tsl2x7x_chip_off(struct iio_dev *indio_dev)
  * put device back into proper state, and unlock
  * resource.
  */
-static
-int tsl2x7x_invoke_change(struct iio_dev *indio_dev)
+static int tsl2x7x_invoke_change(struct iio_dev *indio_dev)
 {
         struct tsl2X7X_chip *chip = iio_priv(indio_dev);
         int device_status = chip->tsl2x7x_chip_status;
@@ -791,9 +776,8 @@ unlock:
         return ret;
 }
 
-static
-void tsl2x7x_prox_calculate(int *data, int length,
-                            struct tsl2x7x_prox_stat *statP)
+static void tsl2x7x_prox_calculate(int *data, int length,
+                                   struct tsl2x7x_prox_stat *statP)
 {
         int i;
         int sample_sum;
@@ -837,25 +821,25 @@ static void tsl2x7x_prox_cal(struct iio_dev *indio_dev)
         u8 tmp_irq_settings;
         u8 current_state = chip->tsl2x7x_chip_status;
 
-        if (chip->tsl2x7x_settings.prox_max_samples_cal > MAX_SAMPLES_CAL) {
+        if (chip->settings.prox_max_samples_cal > MAX_SAMPLES_CAL) {
                 dev_err(&chip->client->dev,
                         "max prox samples cal is too big: %d\n",
-                        chip->tsl2x7x_settings.prox_max_samples_cal);
-                chip->tsl2x7x_settings.prox_max_samples_cal = MAX_SAMPLES_CAL;
+                        chip->settings.prox_max_samples_cal);
+                chip->settings.prox_max_samples_cal = MAX_SAMPLES_CAL;
         }
 
         /* have to stop to change settings */
         tsl2x7x_chip_off(indio_dev);
 
         /* Enable proximity detection save just in case prox not wanted yet*/
-        tmp_irq_settings = chip->tsl2x7x_settings.interrupts_en;
-        chip->tsl2x7x_settings.interrupts_en |= TSL2X7X_CNTL_PROX_INT_ENBL;
+        tmp_irq_settings = chip->settings.interrupts_en;
+        chip->settings.interrupts_en |= TSL2X7X_CNTL_PROX_INT_ENBL;
 
         /*turn on device if not already on*/
         tsl2x7x_chip_on(indio_dev);
 
         /*gather the samples*/
-        for (i = 0; i < chip->tsl2x7x_settings.prox_max_samples_cal; i++) {
+        for (i = 0; i < chip->settings.prox_max_samples_cal; i++) {
                 usleep_range(15000, 17500);
                 tsl2x7x_get_prox(indio_dev);
                 prox_history[i] = chip->prox_data;
@@ -866,25 +850,25 @@ static void tsl2x7x_prox_cal(struct iio_dev *indio_dev)
         tsl2x7x_chip_off(indio_dev);
         calP = &prox_stat_data[PROX_STAT_CAL];
         tsl2x7x_prox_calculate(prox_history,
-                               chip->tsl2x7x_settings.prox_max_samples_cal,
-                               calP);
-        chip->tsl2x7x_settings.prox_thres_high = (calP->max << 1) - calP->mean;
+                               chip->settings.prox_max_samples_cal, calP);
+        chip->settings.prox_thres_high = (calP->max << 1) - calP->mean;
 
         dev_info(&chip->client->dev, " cal min=%d mean=%d max=%d\n",
                  calP->min, calP->mean, calP->max);
         dev_info(&chip->client->dev,
                  "%s proximity threshold set to %d\n",
-                 chip->client->name, chip->tsl2x7x_settings.prox_thres_high);
+                 chip->client->name, chip->settings.prox_thres_high);
 
         /* back to the way they were */
-        chip->tsl2x7x_settings.interrupts_en = tmp_irq_settings;
+        chip->settings.interrupts_en = tmp_irq_settings;
         if (current_state == TSL2X7X_CHIP_WORKING)
                 tsl2x7x_chip_on(indio_dev);
 }
 
-static ssize_t in_illuminance0_calibscale_available_show(struct device *dev,
-                                           struct device_attribute *attr,
-                                           char *buf)
+static ssize_t
+in_illuminance0_calibscale_available_show(struct device *dev,
+                                          struct device_attribute *attr,
+                                          char *buf)
 {
         struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
 
@@ -900,69 +884,23 @@ static ssize_t in_illuminance0_calibscale_available_show(struct device *dev,
         return snprintf(buf, PAGE_SIZE, "%s\n", "1 8 16 120");
 }
 
-static ssize_t in_proximity0_calibscale_available_show(struct device *dev,
-                                                struct device_attribute *attr,
-                                                char *buf)
-{
-                return snprintf(buf, PAGE_SIZE, "%s\n", "1 2 4 8");
-}
-
-static ssize_t in_illuminance0_integration_time_show(struct device *dev,
-                                     struct device_attribute *attr,
-                                     char *buf)
-{
-        struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
-        int y, z;
-
-        y = (TSL2X7X_MAX_TIMER_CNT - (u8)chip->tsl2x7x_settings.als_time) + 1;
-        z = y * TSL2X7X_MIN_ITIME;
-        y /= 1000;
-        z %= 1000;
-
-        return snprintf(buf, PAGE_SIZE, "%d.%03d\n", y, z);
-}
-
-static ssize_t in_illuminance0_integration_time_store(struct device *dev,
-                                      struct device_attribute *attr,
-                                      const char *buf, size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct tsl2X7X_chip *chip = iio_priv(indio_dev);
-        struct tsl2x7x_parse_result result;
-        int ret;
-
-        ret = iio_str_to_fixpoint(buf, 100, &result.integer, &result.fract);
-        if (ret)
-                return ret;
-
-        result.fract /= 3;
-        chip->tsl2x7x_settings.als_time =
-                        TSL2X7X_MAX_TIMER_CNT - (u8)result.fract;
-
-        dev_info(&chip->client->dev, "%s: als time = %d",
-                 __func__, chip->tsl2x7x_settings.als_time);
-
-        tsl2x7x_invoke_change(indio_dev);
-
-        return IIO_VAL_INT_PLUS_MICRO;
-}
+static IIO_CONST_ATTR(in_proximity0_calibscale_available, "1 2 4 8");
 
 static IIO_CONST_ATTR(in_illuminance0_integration_time_available,
                 ".00272 - .696");
 
 static ssize_t in_illuminance0_target_input_show(struct device *dev,
-                                           struct device_attribute *attr,
-                                           char *buf)
+                                                 struct device_attribute *attr,
+                                                 char *buf)
 {
         struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
 
-        return snprintf(buf, PAGE_SIZE, "%d\n",
-                        chip->tsl2x7x_settings.als_cal_target);
+        return snprintf(buf, PAGE_SIZE, "%d\n", chip->settings.als_cal_target);
 }
 
 static ssize_t in_illuminance0_target_input_store(struct device *dev,
-                                            struct device_attribute *attr,
-                                            const char *buf, size_t len)
+                                                  struct device_attribute *attr,
+                                                  const char *buf, size_t len)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct tsl2X7X_chip *chip = iio_priv(indio_dev);
@@ -973,7 +911,7 @@ static ssize_t in_illuminance0_target_input_store(struct device *dev,
                 return -EINVAL;
 
         if (value)
-                chip->tsl2x7x_settings.als_cal_target = value;
+                chip->settings.als_cal_target = value;
 
         ret = tsl2x7x_invoke_change(indio_dev);
         if (ret < 0)
@@ -982,111 +920,9 @@ static ssize_t in_illuminance0_target_input_store(struct device *dev,
         return len;
 }
 
-/* persistence settings */
-static ssize_t in_intensity0_thresh_period_show(struct device *dev,
-                                            struct device_attribute *attr,
-                                            char *buf)
-{
-        struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
-        int y, z, filter_delay;
-
-        /* Determine integration time */
-        y = (TSL2X7X_MAX_TIMER_CNT - (u8)chip->tsl2x7x_settings.als_time) + 1;
-        z = y * TSL2X7X_MIN_ITIME;
-        filter_delay = z * (chip->tsl2x7x_settings.persistence & 0x0F);
-        y = filter_delay / 1000;
-        z = filter_delay % 1000;
-
-        return snprintf(buf, PAGE_SIZE, "%d.%03d\n", y, z);
-}
-
-static ssize_t in_intensity0_thresh_period_store(struct device *dev,
-                                             struct device_attribute *attr,
-                                             const char *buf, size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct tsl2X7X_chip *chip = iio_priv(indio_dev);
-        struct tsl2x7x_parse_result result;
-        int y, z, filter_delay;
-        int ret;
-
-        ret = iio_str_to_fixpoint(buf, 100, &result.integer, &result.fract);
-        if (ret)
-                return ret;
-
-        y = (TSL2X7X_MAX_TIMER_CNT - (u8)chip->tsl2x7x_settings.als_time) + 1;
-        z = y * TSL2X7X_MIN_ITIME;
-
-        filter_delay =
-                DIV_ROUND_UP((result.integer * 1000) + result.fract, z);
-
-        chip->tsl2x7x_settings.persistence &= 0xF0;
-        chip->tsl2x7x_settings.persistence |= (filter_delay & 0x0F);
-
-        dev_info(&chip->client->dev, "%s: als persistence = %d",
-                 __func__, filter_delay);
-
-        ret = tsl2x7x_invoke_change(indio_dev);
-        if (ret < 0)
-                return ret;
-
-        return IIO_VAL_INT_PLUS_MICRO;
-}
-
-static ssize_t in_proximity0_thresh_period_show(struct device *dev,
-                                             struct device_attribute *attr,
-                                             char *buf)
-{
-        struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
-        int y, z, filter_delay;
-
-        /* Determine integration time */
-        y = (TSL2X7X_MAX_TIMER_CNT - (u8)chip->tsl2x7x_settings.prx_time) + 1;
-        z = y * TSL2X7X_MIN_ITIME;
-        filter_delay = z * ((chip->tsl2x7x_settings.persistence & 0xF0) >> 4);
-        y = filter_delay / 1000;
-        z = filter_delay % 1000;
-
-        return snprintf(buf, PAGE_SIZE, "%d.%03d\n", y, z);
-}
-
-static ssize_t in_proximity0_thresh_period_store(struct device *dev,
-                                              struct device_attribute *attr,
-                                              const char *buf, size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct tsl2X7X_chip *chip = iio_priv(indio_dev);
-        struct tsl2x7x_parse_result result;
-        int y, z, filter_delay;
-        int ret;
-
-        ret = iio_str_to_fixpoint(buf, 100, &result.integer, &result.fract);
-        if (ret)
-                return ret;
-
-        y = (TSL2X7X_MAX_TIMER_CNT - (u8)chip->tsl2x7x_settings.prx_time) + 1;
-        z = y * TSL2X7X_MIN_ITIME;
-
-        filter_delay =
-                DIV_ROUND_UP((result.integer * 1000) + result.fract, z);
-
-        chip->tsl2x7x_settings.persistence &= 0x0F;
-        chip->tsl2x7x_settings.persistence |= ((filter_delay << 4) & 0xF0);
-
-        dev_info(&chip->client->dev, "%s: prox persistence = %d",
-                 __func__, filter_delay);
-
-        ret = tsl2x7x_invoke_change(indio_dev);
-        if (ret < 0)
-                return ret;
-
-
-        return IIO_VAL_INT_PLUS_MICRO;
-}
-
 static ssize_t in_illuminance0_calibrate_store(struct device *dev,
-                                    struct device_attribute *attr,
-                                    const char *buf, size_t len)
+                                               struct device_attribute *attr,
+                                               const char *buf, size_t len)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         bool value;
@@ -1106,14 +942,14 @@ static ssize_t in_illuminance0_calibrate_store(struct device *dev,
 }
 
 static ssize_t in_illuminance0_lux_table_show(struct device *dev,
-                                     struct device_attribute *attr,
-                                     char *buf)
+                                              struct device_attribute *attr,
+                                              char *buf)
 {
         struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
         int i = 0;
         int offset = 0;
 
-        while (i < (TSL2X7X_MAX_LUX_TABLE_SIZE * 3)) {
+        while (i < TSL2X7X_MAX_LUX_TABLE_SIZE) {
                 offset += snprintf(buf + offset, PAGE_SIZE, "%u,%u,%u,",
                         chip->tsl2x7x_device_lux[i].ratio,
                         chip->tsl2x7x_device_lux[i].ch0,
@@ -1134,8 +970,8 @@ static ssize_t in_illuminance0_lux_table_show(struct device *dev,
 }
 
 static ssize_t in_illuminance0_lux_table_store(struct device *dev,
-                                      struct device_attribute *attr,
-                                      const char *buf, size_t len)
+                                               struct device_attribute *attr,
+                                               const char *buf, size_t len)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct tsl2X7X_chip *chip = iio_priv(indio_dev);
@@ -1176,8 +1012,8 @@ static ssize_t in_illuminance0_lux_table_store(struct device *dev,
 }
 
 static ssize_t in_proximity0_calibrate_store(struct device *dev,
-                                         struct device_attribute *attr,
-                                         const char *buf, size_t len)
+                                             struct device_attribute *attr,
+                                             const char *buf, size_t len)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         bool value;
@@ -1205,9 +1041,9 @@ static int tsl2x7x_read_interrupt_config(struct iio_dev *indio_dev,
         int ret;
 
         if (chan->type == IIO_INTENSITY)
-                ret = !!(chip->tsl2x7x_settings.interrupts_en & 0x10);
+                ret = !!(chip->settings.interrupts_en & 0x10);
         else
-                ret = !!(chip->tsl2x7x_settings.interrupts_en & 0x20);
+                ret = !!(chip->settings.interrupts_en & 0x20);
 
         return ret;
 }
@@ -1223,14 +1059,14 @@ static int tsl2x7x_write_interrupt_config(struct iio_dev *indio_dev,
 
         if (chan->type == IIO_INTENSITY) {
                 if (val)
-                        chip->tsl2x7x_settings.interrupts_en |= 0x10;
+                        chip->settings.interrupts_en |= 0x10;
                 else
-                        chip->tsl2x7x_settings.interrupts_en &= 0x20;
+                        chip->settings.interrupts_en &= 0x20;
         } else {
                 if (val)
-                        chip->tsl2x7x_settings.interrupts_en |= 0x20;
+                        chip->settings.interrupts_en |= 0x20;
                 else
-                        chip->tsl2x7x_settings.interrupts_en &= 0x10;
+                        chip->settings.interrupts_en &= 0x10;
         }
 
         ret = tsl2x7x_invoke_change(indio_dev);
@@ -1248,18 +1084,19 @@ static int tsl2x7x_write_event_value(struct iio_dev *indio_dev,
                                      int val, int val2)
 {
         struct tsl2X7X_chip *chip = iio_priv(indio_dev);
-        int ret = -EINVAL;
+        int ret = -EINVAL, y, z, filter_delay;
+        u8 time;
 
         switch (info) {
         case IIO_EV_INFO_VALUE:
                 if (chan->type == IIO_INTENSITY) {
                         switch (dir) {
                         case IIO_EV_DIR_RISING:
-                                chip->tsl2x7x_settings.als_thresh_high = val;
+                                chip->settings.als_thresh_high = val;
                                 ret = 0;
                                 break;
                         case IIO_EV_DIR_FALLING:
-                                chip->tsl2x7x_settings.als_thresh_low = val;
+                                chip->settings.als_thresh_low = val;
                                 ret = 0;
                                 break;
                         default:
@@ -1268,11 +1105,11 @@ static int tsl2x7x_write_event_value(struct iio_dev *indio_dev,
                 } else {
                         switch (dir) {
                         case IIO_EV_DIR_RISING:
-                                chip->tsl2x7x_settings.prox_thres_high = val;
+                                chip->settings.prox_thres_high = val;
                                 ret = 0;
                                 break;
                         case IIO_EV_DIR_FALLING:
-                                chip->tsl2x7x_settings.prox_thres_low = val;
+                                chip->settings.prox_thres_low = val;
                                 ret = 0;
                                 break;
                         default:
@@ -1280,6 +1117,33 @@ static int tsl2x7x_write_event_value(struct iio_dev *indio_dev,
                         }
                 }
                 break;
+        case IIO_EV_INFO_PERIOD:
+                if (chan->type == IIO_INTENSITY)
+                        time = chip->settings.als_time;
+                else
+                        time = chip->settings.prx_time;
+
+                y = (TSL2X7X_MAX_TIMER_CNT - time) + 1;
+                z = y * TSL2X7X_MIN_ITIME;
+
+                filter_delay = DIV_ROUND_UP((val * 1000) + val2, z);
+
+                if (chan->type == IIO_INTENSITY) {
+                        chip->settings.persistence &= 0xF0;
+                        chip->settings.persistence |=
+                                (filter_delay & 0x0F);
+                        dev_info(&chip->client->dev, "%s: ALS persistence = %d",
+                                 __func__, filter_delay);
+                } else {
+                        chip->settings.persistence &= 0x0F;
+                        chip->settings.persistence |=
+                                ((filter_delay << 4) & 0xF0);
+                        dev_info(&chip->client->dev,
+                                 "%s: Proximity persistence = %d",
+                                 __func__, filter_delay);
+                }
+                ret = 0;
+                break;
         default:
                 break;
         }
@@ -1298,18 +1162,19 @@ static int tsl2x7x_read_event_value(struct iio_dev *indio_dev,
                                     int *val, int *val2)
 {
         struct tsl2X7X_chip *chip = iio_priv(indio_dev);
-        int ret = -EINVAL;
+        int ret = -EINVAL, filter_delay, mult;
+        u8 time;
 
         switch (info) {
         case IIO_EV_INFO_VALUE:
                 if (chan->type == IIO_INTENSITY) {
                         switch (dir) {
                         case IIO_EV_DIR_RISING:
-                                *val = chip->tsl2x7x_settings.als_thresh_high;
+                                *val = chip->settings.als_thresh_high;
                                 ret = IIO_VAL_INT;
                                 break;
                         case IIO_EV_DIR_FALLING:
-                                *val = chip->tsl2x7x_settings.als_thresh_low;
+                                *val = chip->settings.als_thresh_low;
                                 ret = IIO_VAL_INT;
                                 break;
                         default:
@@ -1318,11 +1183,11 @@ static int tsl2x7x_read_event_value(struct iio_dev *indio_dev,
                 } else {
                         switch (dir) {
                         case IIO_EV_DIR_RISING:
-                                *val = chip->tsl2x7x_settings.prox_thres_high;
+                                *val = chip->settings.prox_thres_high;
                                 ret = IIO_VAL_INT;
                                 break;
                         case IIO_EV_DIR_FALLING:
-                                *val = chip->tsl2x7x_settings.prox_thres_low;
+                                *val = chip->settings.prox_thres_low;
                                 ret = IIO_VAL_INT;
                                 break;
                         default:
@@ -1330,6 +1195,23 @@ static int tsl2x7x_read_event_value(struct iio_dev *indio_dev,
                         }
                 }
                 break;
+        case IIO_EV_INFO_PERIOD:
+                if (chan->type == IIO_INTENSITY) {
+                        time = chip->settings.als_time;
+                        mult = chip->settings.persistence & 0x0F;
+                } else {
+                        time = chip->settings.prx_time;
+                        mult = (chip->settings.persistence & 0xF0) >> 4;
+                }
+
+                /* Determine integration time */
+                *val = (TSL2X7X_MAX_TIMER_CNT - time) + 1;
+                *val2 = *val * TSL2X7X_MIN_ITIME;
+                filter_delay = *val2 * mult;
+                *val = filter_delay / 1000;
+                *val2 = filter_delay % 1000;
+                ret = IIO_VAL_INT_PLUS_MICRO;
+                break;
         default:
                 break;
         }
@@ -1379,18 +1261,20 @@ static int tsl2x7x_read_raw(struct iio_dev *indio_dev,
                 break;
         case IIO_CHAN_INFO_CALIBSCALE:
                 if (chan->type == IIO_LIGHT)
-                        *val =
-                        tsl2X7X_als_gainadj[chip->tsl2x7x_settings.als_gain];
+                        *val = tsl2x7x_als_gain[chip->settings.als_gain];
                 else
-                        *val =
-                        tsl2X7X_prx_gainadj[chip->tsl2x7x_settings.prox_gain];
+                        *val = tsl2x7x_prx_gain[chip->settings.prox_gain];
                 ret = IIO_VAL_INT;
                 break;
         case IIO_CHAN_INFO_CALIBBIAS:
-                *val = chip->tsl2x7x_settings.als_gain_trim;
+                *val = chip->settings.als_gain_trim;
                 ret = IIO_VAL_INT;
                 break;
-
+        case IIO_CHAN_INFO_INT_TIME:
+                *val = (TSL2X7X_MAX_TIMER_CNT - chip->settings.als_time) + 1;
+                *val2 = ((*val * TSL2X7X_MIN_ITIME) % 1000) / 1000;
+                ret = IIO_VAL_INT_PLUS_MICRO;
+                break;
         default:
                 ret = -EINVAL;
         }
@@ -1411,13 +1295,13 @@ static int tsl2x7x_write_raw(struct iio_dev *indio_dev,
                 if (chan->type == IIO_INTENSITY) {
                         switch (val) {
                         case 1:
-                                chip->tsl2x7x_settings.als_gain = 0;
+                                chip->settings.als_gain = 0;
                                 break;
                         case 8:
-                                chip->tsl2x7x_settings.als_gain = 1;
+                                chip->settings.als_gain = 1;
                                 break;
                         case 16:
-                                chip->tsl2x7x_settings.als_gain = 2;
+                                chip->settings.als_gain = 2;
                                 break;
                         case 120:
                                 switch (chip->id) {
@@ -1428,7 +1312,7 @@ static int tsl2x7x_write_raw(struct iio_dev *indio_dev,
                                 case tmd2772:
                                         return -EINVAL;
                                 }
-                                chip->tsl2x7x_settings.als_gain = 3;
+                                chip->settings.als_gain = 3;
                                 break;
                         case 128:
                                 switch (chip->id) {
@@ -1439,7 +1323,7 @@ static int tsl2x7x_write_raw(struct iio_dev *indio_dev,
                                 case tmd2771:
                                         return -EINVAL;
                                 }
-                                chip->tsl2x7x_settings.als_gain = 3;
+                                chip->settings.als_gain = 3;
                                 break;
                         default:
                                 return -EINVAL;
@@ -1447,16 +1331,16 @@ static int tsl2x7x_write_raw(struct iio_dev *indio_dev,
                 } else {
                         switch (val) {
                         case 1:
-                                chip->tsl2x7x_settings.prox_gain = 0;
+                                chip->settings.prox_gain = 0;
                                 break;
                         case 2:
-                                chip->tsl2x7x_settings.prox_gain = 1;
+                                chip->settings.prox_gain = 1;
                                 break;
                         case 4:
-                                chip->tsl2x7x_settings.prox_gain = 2;
+                                chip->settings.prox_gain = 2;
                                 break;
                         case 8:
-                                chip->tsl2x7x_settings.prox_gain = 3;
+                                chip->settings.prox_gain = 3;
                                 break;
                         default:
                                 return -EINVAL;
@@ -1464,9 +1348,15 @@ static int tsl2x7x_write_raw(struct iio_dev *indio_dev,
                 }
                 break;
         case IIO_CHAN_INFO_CALIBBIAS:
-                chip->tsl2x7x_settings.als_gain_trim = val;
+                chip->settings.als_gain_trim = val;
                 break;
+        case IIO_CHAN_INFO_INT_TIME:
+                chip->settings.als_time =
+                        TSL2X7X_MAX_TIMER_CNT - (val2 / TSL2X7X_MIN_ITIME);
 
+                dev_info(&chip->client->dev, "%s: als time = %d",
+                         __func__, chip->settings.als_time);
+                break;
         default:
                 return -EINVAL;
         }
@@ -1474,12 +1364,8 @@ static int tsl2x7x_write_raw(struct iio_dev *indio_dev,
         return tsl2x7x_invoke_change(indio_dev);
 }
 
-static DEVICE_ATTR_RO(in_proximity0_calibscale_available);
-
 static DEVICE_ATTR_RO(in_illuminance0_calibscale_available);
 
-static DEVICE_ATTR_RW(in_illuminance0_integration_time);
-
 static DEVICE_ATTR_RW(in_illuminance0_target_input);
 
 static DEVICE_ATTR_WO(in_illuminance0_calibrate);
@@ -1488,10 +1374,6 @@ static DEVICE_ATTR_WO(in_proximity0_calibrate);
 
 static DEVICE_ATTR_RW(in_illuminance0_lux_table);
 
-static DEVICE_ATTR_RW(in_intensity0_thresh_period);
-
-static DEVICE_ATTR_RW(in_proximity0_thresh_period);
-
 /* Use the default register values to identify the Taos device */
 static int tsl2x7x_device_id(int *id, int target)
 {
@@ -1559,7 +1441,6 @@ static irqreturn_t tsl2x7x_event_handler(int irq, void *private)
 
 static struct attribute *tsl2x7x_ALS_device_attrs[] = {
         &dev_attr_in_illuminance0_calibscale_available.attr,
-        &dev_attr_in_illuminance0_integration_time.attr,
         &iio_const_attr_in_illuminance0_integration_time_available.dev_attr.attr,
         &dev_attr_in_illuminance0_target_input.attr,
         &dev_attr_in_illuminance0_calibrate.attr,
@@ -1574,49 +1455,31 @@ static struct attribute *tsl2x7x_PRX_device_attrs[] = {
 
 static struct attribute *tsl2x7x_ALSPRX_device_attrs[] = {
         &dev_attr_in_illuminance0_calibscale_available.attr,
-        &dev_attr_in_illuminance0_integration_time.attr,
         &iio_const_attr_in_illuminance0_integration_time_available.dev_attr.attr,
         &dev_attr_in_illuminance0_target_input.attr,
         &dev_attr_in_illuminance0_calibrate.attr,
         &dev_attr_in_illuminance0_lux_table.attr,
-        &dev_attr_in_proximity0_calibrate.attr,
+        &iio_const_attr_in_proximity0_calibscale_available.dev_attr.attr,
         NULL
 };
 
 static struct attribute *tsl2x7x_PRX2_device_attrs[] = {
         &dev_attr_in_proximity0_calibrate.attr,
-        &dev_attr_in_proximity0_calibscale_available.attr,
+        &iio_const_attr_in_proximity0_calibscale_available.dev_attr.attr,
         NULL
 };
 
 static struct attribute *tsl2x7x_ALSPRX2_device_attrs[] = {
         &dev_attr_in_illuminance0_calibscale_available.attr,
-        &dev_attr_in_illuminance0_integration_time.attr,
         &iio_const_attr_in_illuminance0_integration_time_available.dev_attr.attr,
         &dev_attr_in_illuminance0_target_input.attr,
         &dev_attr_in_illuminance0_calibrate.attr,
         &dev_attr_in_illuminance0_lux_table.attr,
         &dev_attr_in_proximity0_calibrate.attr,
-        &dev_attr_in_proximity0_calibscale_available.attr,
+        &iio_const_attr_in_proximity0_calibscale_available.dev_attr.attr,
         NULL
 };
 
-static struct attribute *tsl2X7X_ALS_event_attrs[] = {
-        &dev_attr_in_intensity0_thresh_period.attr,
-        NULL,
-};
-
-static struct attribute *tsl2X7X_PRX_event_attrs[] = {
-        &dev_attr_in_proximity0_thresh_period.attr,
-        NULL,
-};
-
-static struct attribute *tsl2X7X_ALSPRX_event_attrs[] = {
-        &dev_attr_in_intensity0_thresh_period.attr,
-        &dev_attr_in_proximity0_thresh_period.attr,
-        NULL,
-};
-
 static const struct attribute_group tsl2X7X_device_attr_group_tbl[] = {
         [ALS] = {
                 .attrs = tsl2x7x_ALS_device_attrs,
@@ -1635,26 +1498,9 @@ static const struct attribute_group tsl2X7X_device_attr_group_tbl[] = {
         },
 };
 
-static const struct attribute_group tsl2X7X_event_attr_group_tbl[] = {
-        [ALS] = {
-                .attrs = tsl2X7X_ALS_event_attrs,
-                .name = "events",
-        },
-        [PRX] = {
-                .attrs = tsl2X7X_PRX_event_attrs,
-                .name = "events",
-        },
-        [ALSPRX] = {
-                .attrs = tsl2X7X_ALSPRX_event_attrs,
-                .name = "events",
-        },
-};
-
 static const struct iio_info tsl2X7X_device_info[] = {
         [ALS] = {
                 .attrs = &tsl2X7X_device_attr_group_tbl[ALS],
-                .event_attrs = &tsl2X7X_event_attr_group_tbl[ALS],
-                .driver_module = THIS_MODULE,
                 .read_raw = &tsl2x7x_read_raw,
                 .write_raw = &tsl2x7x_write_raw,
                 .read_event_value = &tsl2x7x_read_event_value,
@@ -1664,8 +1510,6 @@ static const struct iio_info tsl2X7X_device_info[] = {
         },
         [PRX] = {
                 .attrs = &tsl2X7X_device_attr_group_tbl[PRX],
-                .event_attrs = &tsl2X7X_event_attr_group_tbl[PRX],
-                .driver_module = THIS_MODULE,
                 .read_raw = &tsl2x7x_read_raw,
                 .write_raw = &tsl2x7x_write_raw,
                 .read_event_value = &tsl2x7x_read_event_value,
@@ -1675,8 +1519,6 @@ static const struct iio_info tsl2X7X_device_info[] = {
         },
         [ALSPRX] = {
                 .attrs = &tsl2X7X_device_attr_group_tbl[ALSPRX],
-                .event_attrs = &tsl2X7X_event_attr_group_tbl[ALSPRX],
-                .driver_module = THIS_MODULE,
                 .read_raw = &tsl2x7x_read_raw,
                 .write_raw = &tsl2x7x_write_raw,
                 .read_event_value = &tsl2x7x_read_event_value,
@@ -1686,8 +1528,6 @@ static const struct iio_info tsl2X7X_device_info[] = {
         },
         [PRX2] = {
                 .attrs = &tsl2X7X_device_attr_group_tbl[PRX2],
-                .event_attrs = &tsl2X7X_event_attr_group_tbl[PRX],
-                .driver_module = THIS_MODULE,
                 .read_raw = &tsl2x7x_read_raw,
                 .write_raw = &tsl2x7x_write_raw,
                 .read_event_value = &tsl2x7x_read_event_value,
@@ -1697,8 +1537,6 @@ static const struct iio_info tsl2X7X_device_info[] = {
         },
         [ALSPRX2] = {
                 .attrs = &tsl2X7X_device_attr_group_tbl[ALSPRX2],
-                .event_attrs = &tsl2X7X_event_attr_group_tbl[ALSPRX],
-                .driver_module = THIS_MODULE,
                 .read_raw = &tsl2x7x_read_raw,
                 .write_raw = &tsl2x7x_write_raw,
                 .read_event_value = &tsl2x7x_read_event_value,
@@ -1719,6 +1557,10 @@ static const struct iio_event_spec tsl2x7x_events[] = {
                 .dir = IIO_EV_DIR_FALLING,
                 .mask_separate = BIT(IIO_EV_INFO_VALUE) |
                         BIT(IIO_EV_INFO_ENABLE),
+        }, {
+                .type = IIO_EV_TYPE_THRESH,
+                .dir = IIO_EV_DIR_EITHER,
+                .mask_separate = BIT(IIO_EV_INFO_PERIOD),
         },
 };
 
@@ -1729,7 +1571,8 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = {
                         .type = IIO_LIGHT,
                         .indexed = 1,
                         .channel = 0,
-                        .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+                        .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+                                              BIT(IIO_CHAN_INFO_INT_TIME),
                         }, {
                         .type = IIO_INTENSITY,
                         .indexed = 1,
@@ -1768,7 +1611,8 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = {
                         .type = IIO_LIGHT,
                         .indexed = 1,
                         .channel = 0,
-                        .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED)
+                        .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+                                              BIT(IIO_CHAN_INFO_INT_TIME),
                         }, {
                         .type = IIO_INTENSITY,
                         .indexed = 1,
@@ -1816,7 +1660,8 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = {
                         .type = IIO_LIGHT,
                         .indexed = 1,
                         .channel = 0,
-                        .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+                        .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+                                              BIT(IIO_CHAN_INFO_INT_TIME),
                         }, {
                         .type = IIO_INTENSITY,
                         .indexed = 1,
@@ -1874,7 +1719,7 @@ static int tsl2x7x_probe(struct i2c_client *clientp,
                 return -EINVAL;
         }
 
-        ret = i2c_smbus_write_byte(clientp, (TSL2X7X_CMD_REG | TSL2X7X_CNTRL));
+        ret = i2c_smbus_write_byte(clientp, TSL2X7X_CMD_REG | TSL2X7X_CNTRL);
         if (ret < 0) {
                 dev_err(&clientp->dev, "write to cmd reg failed. err = %d\n",
                         ret);
@@ -1982,7 +1827,7 @@ static int tsl2x7x_remove(struct i2c_client *client)
         return 0;
 }
 
-static struct i2c_device_id tsl2x7x_idtable[] = {
+static const struct i2c_device_id tsl2x7x_idtable[] = {
         { "tsl2571", tsl2571 },
         { "tsl2671", tsl2671 },
         { "tmd2671", tmd2671 },
diff --git a/drivers/staging/iio/light/tsl2x7x.h b/drivers/staging/iio/light/tsl2x7x.h
index ecae92211216..df00f2ec1719 100644
--- a/drivers/staging/iio/light/tsl2x7x.h
+++ b/drivers/staging/iio/light/tsl2x7x.h
@@ -23,18 +23,19 @@
 #define __TSL2X7X_H
 #include <linux/pm.h>
 
-/* Max number of segments allowable in LUX table */
-#define TSL2X7X_MAX_LUX_TABLE_SIZE              9
-#define MAX_DEFAULT_TABLE_BYTES (sizeof(int) * TSL2X7X_MAX_LUX_TABLE_SIZE)
-
-struct iio_dev;
-
 struct tsl2x7x_lux {
         unsigned int ratio;
         unsigned int ch0;
         unsigned int ch1;
 };
 
+/* Max number of segments allowable in LUX table */
+#define TSL2X7X_MAX_LUX_TABLE_SIZE              9
+/* The default LUX tables all have 3 elements.  */
+#define TSL2X7X_DEF_LUX_TABLE_SZ                3
+#define TSL2X7X_DEFAULT_TABLE_BYTES (sizeof(struct tsl2x7x_lux) * \
+                                     TSL2X7X_DEF_LUX_TABLE_SZ)
+
 /**
  * struct tsl2x7x_default_settings - power on defaults unless
  *                                   overridden by platform data.
diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index ce26abdeab92..c44eb577dc35 100644
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -80,7 +80,7 @@
  * @us:         actual spi_device
  * @tx:         transmit buffer
  * @rx:         receive buffer
- * @buf_lock:       mutex to protect tx and rx
+ * @buf_lock:       mutex to protect tx, rx and write frequency
  **/
 struct ade7753_state {
         struct spi_device   *us;
@@ -107,6 +107,19 @@ static int ade7753_spi_write_reg_8(struct device *dev,
         return ret;
 }
 
+static int __ade7753_spi_write_reg_16(struct device *dev, u8 reg_address,
+                                      u16 value)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct ade7753_state *st = iio_priv(indio_dev);
+
+        st->tx[0] = ADE7753_WRITE_REG(reg_address);
+        st->tx[1] = (value >> 8) & 0xFF;
+        st->tx[2] = value & 0xFF;
+
+        return spi_write(st->us, st->tx, 3);
+}
+
 static int ade7753_spi_write_reg_16(struct device *dev, u8 reg_address,
                                     u16 value)
 {
@@ -115,10 +128,7 @@ static int ade7753_spi_write_reg_16(struct device *dev, u8 reg_address,
         struct ade7753_state *st = iio_priv(indio_dev);
 
         mutex_lock(&st->buf_lock);
-        st->tx[0] = ADE7753_WRITE_REG(reg_address);
-        st->tx[1] = (value >> 8) & 0xFF;
-        st->tx[2] = value & 0xFF;
-        ret = spi_write(st->us, st->tx, 3);
+        ret = __ade7753_spi_write_reg_16(dev, reg_address, value);
         mutex_unlock(&st->buf_lock);
 
         return ret;
@@ -483,7 +493,7 @@ static ssize_t ade7753_write_frequency(struct device *dev,
         if (!val)
                 return -EINVAL;
 
-        mutex_lock(&indio_dev->mlock);
+        mutex_lock(&st->buf_lock);
 
         t = 27900 / val;
         if (t > 0)
@@ -501,10 +511,10 @@ static ssize_t ade7753_write_frequency(struct device *dev,
         reg &= ~(3 << 11);
         reg |= t << 11;
 
-        ret = ade7753_spi_write_reg_16(dev, ADE7753_MODE, reg);
+        ret = __ade7753_spi_write_reg_16(dev, ADE7753_MODE, reg);
 
 out:
-        mutex_unlock(&indio_dev->mlock);
+        mutex_unlock(&st->buf_lock);
 
         return ret ? ret : len;
 }
@@ -561,7 +571,6 @@ static const struct attribute_group ade7753_attribute_group = {
 
 static const struct iio_info ade7753_info = {
         .attrs = &ade7753_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int ade7753_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index be0df3fe4230..3a1e342d75fb 100644
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -601,7 +601,6 @@ static const struct attribute_group ade7754_attribute_group = {
 
 static const struct iio_info ade7754_info = {
         .attrs = &ade7754_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int ade7754_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index 40498af4dc46..7b7ffe5ed186 100644
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -827,7 +827,6 @@ static const struct iio_info ade7758_info = {
         .attrs = &ade7758_attribute_group,
         .read_raw = &ade7758_read_raw,
         .write_raw = &ade7758_write_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int ade7758_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/meter/ade7758_trigger.c b/drivers/staging/iio/meter/ade7758_trigger.c
index 5b35a7f08f4f..1f0d1a0cf889 100644
--- a/drivers/staging/iio/meter/ade7758_trigger.c
+++ b/drivers/staging/iio/meter/ade7758_trigger.c
@@ -53,7 +53,6 @@ static int ade7758_trig_try_reen(struct iio_trigger *trig)
 }
 
 static const struct iio_trigger_ops ade7758_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = &ade7758_data_rdy_trigger_set_state,
         .try_reenable = &ade7758_trig_try_reen,
 };
diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c
index 1691760339da..d99cf508d8d0 100644
--- a/drivers/staging/iio/meter/ade7759.c
+++ b/drivers/staging/iio/meter/ade7759.c
@@ -60,7 +60,7 @@
 /**
  * struct ade7759_state - device instance specific data
  * @us:                 actual spi_device
- * @buf_lock:           mutex to protect tx and rx
+ * @buf_lock:           mutex to protect tx and rx and write frequency
  * @tx:                 transmit buffer
  * @rx:                 receive buffer
  **/
@@ -89,19 +89,30 @@ static int ade7759_spi_write_reg_8(struct device *dev,
         return ret;
 }
 
-static int ade7759_spi_write_reg_16(struct device *dev,
+/*Unlocked version of ade7759_spi_write_reg_16 function */
+static int __ade7759_spi_write_reg_16(struct device *dev,
                 u8 reg_address,
                 u16 value)
 {
-        int ret;
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct ade7759_state *st = iio_priv(indio_dev);
 
-        mutex_lock(&st->buf_lock);
         st->tx[0] = ADE7759_WRITE_REG(reg_address);
         st->tx[1] = (value >> 8) & 0xFF;
         st->tx[2] = value & 0xFF;
-        ret = spi_write(st->us, st->tx, 3);
+        return spi_write(st->us, st->tx, 3);
+}
+
+static int ade7759_spi_write_reg_16(struct device *dev,
+                u8 reg_address,
+                u16 value)
+{
+        int ret;
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct ade7759_state *st = iio_priv(indio_dev);
+
+        mutex_lock(&st->buf_lock);
+        ret = __ade7759_spi_write_reg_16(dev, reg_address, value);
         mutex_unlock(&st->buf_lock);
 
         return ret;
@@ -172,7 +183,7 @@ static int ade7759_spi_read_reg_40(struct device *dev,
                                 reg_address);
                 goto error_ret;
         }
-        *val = ((u64)st->rx[1] << 32) | (st->rx[2] << 24) |
+        *val = ((u64)st->rx[1] << 32) | ((u64)st->rx[2] << 24) |
                 (st->rx[3] << 16) | (st->rx[4] << 8) | st->rx[5];
 
 error_ret:
@@ -429,7 +440,7 @@ static ssize_t ade7759_write_frequency(struct device *dev,
         if (!val)
                 return -EINVAL;
 
-        mutex_lock(&indio_dev->mlock);
+        mutex_lock(&st->buf_lock);
 
         t = 27900 / val;
         if (t > 0)
@@ -447,10 +458,10 @@ static ssize_t ade7759_write_frequency(struct device *dev,
         reg &= ~(3 << 13);
         reg |= t << 13;
 
-        ret = ade7759_spi_write_reg_16(dev, ADE7759_MODE, reg);
+        ret = __ade7759_spi_write_reg_16(dev, ADE7759_MODE, reg);
 
 out:
-        mutex_unlock(&indio_dev->mlock);
+        mutex_unlock(&st->buf_lock);
 
         return ret ? ret : len;
 }
@@ -493,7 +504,6 @@ static const struct attribute_group ade7759_attribute_group = {
 
 static const struct iio_info ade7759_info = {
         .attrs = &ade7759_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int ade7759_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/meter/ade7854.c b/drivers/staging/iio/meter/ade7854.c
index 70612da64a8b..90d07cdca4b8 100644
--- a/drivers/staging/iio/meter/ade7854.c
+++ b/drivers/staging/iio/meter/ade7854.c
@@ -530,7 +530,6 @@ static const struct attribute_group ade7854_attribute_group = {
 
 static const struct iio_info ade7854_info = {
         .attrs = &ade7854_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 int ade7854_probe(struct iio_dev *indio_dev, struct device *dev)
diff --git a/drivers/staging/iio/resolver/ad2s1200.c b/drivers/staging/iio/resolver/ad2s1200.c
index a37e199225f4..aa62c64e9bc4 100644
--- a/drivers/staging/iio/resolver/ad2s1200.c
+++ b/drivers/staging/iio/resolver/ad2s1200.c
@@ -98,7 +98,6 @@ static const struct iio_chan_spec ad2s1200_channels[] = {
 
 static const struct iio_info ad2s1200_info = {
         .read_raw = ad2s1200_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad2s1200_probe(struct spi_device *spi)
diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
index 3e00df74b18c..f8baab061eba 100644
--- a/drivers/staging/iio/resolver/ad2s1210.c
+++ b/drivers/staging/iio/resolver/ad2s1210.c
@@ -638,7 +638,6 @@ error_ret:
 static const struct iio_info ad2s1210_info = {
         .read_raw = ad2s1210_read_raw,
         .attrs = &ad2s1210_attribute_group,
-        .driver_module = THIS_MODULE,
 };
 
 static int ad2s1210_setup_gpios(struct ad2s1210_state *st)
diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c
index b2270908f26f..59586947a936 100644
--- a/drivers/staging/iio/resolver/ad2s90.c
+++ b/drivers/staging/iio/resolver/ad2s90.c
@@ -48,7 +48,6 @@ error_ret:
 
 static const struct iio_info ad2s90_info = {
         .read_raw = ad2s90_read_raw,
-        .driver_module = THIS_MODULE,
 };
 
 static const struct iio_chan_spec ad2s90_chan = {
diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
index 4e0b4eedb53d..d80dcf82eba9 100644
--- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
+++ b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
@@ -172,7 +172,6 @@ static int iio_bfin_tmr_get_number(int irq)
 }
 
 static const struct iio_trigger_ops iio_bfin_tmr_trigger_ops = {
-        .owner = THIS_MODULE,
         .set_trigger_state = iio_bfin_tmr_set_state,
 };
 
diff --git a/drivers/staging/irda/drivers/ali-ircc.c b/drivers/staging/irda/drivers/ali-ircc.c
index 35f198d83701..589cd01797f4 100644
--- a/drivers/staging/irda/drivers/ali-ircc.c
+++ b/drivers/staging/irda/drivers/ali-ircc.c
@@ -1876,8 +1876,7 @@ static int  ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)
                         self->stamp = ktime_get();
 
                         skb = dev_alloc_skb(len+1);
-                        if (skb == NULL)  
-                        {
+                        if (!skb) {
                                 self->netdev->stats.rx_dropped++;
 
                                 return FALSE;
diff --git a/drivers/staging/irda/drivers/au1k_ir.c b/drivers/staging/irda/drivers/au1k_ir.c
index be4ea6aa57a9..73e3e4b041bf 100644
--- a/drivers/staging/irda/drivers/au1k_ir.c
+++ b/drivers/staging/irda/drivers/au1k_ir.c
@@ -290,8 +290,7 @@ static int au1k_irda_set_speed(struct net_device *dev, int speed)
         while (irda_read(aup, IR_STATUS) & (IR_RX_STATUS | IR_TX_STATUS)) {
                 msleep(20);
                 if (!timeout--) {
-                        printk(KERN_ERR "%s: rx/tx disable timeout\n",
-                                        dev->name);
+                        netdev_err(dev, "rx/tx disable timeout\n");
                         break;
                 }
         }
@@ -349,7 +348,7 @@ static int au1k_irda_set_speed(struct net_device *dev, int speed)
                                 IR_RX_ENABLE);
                 break;
         default:
-                printk(KERN_ERR "%s unsupported speed %x\n", dev->name, speed);
+                netdev_err(dev, "unsupported speed %x\n", speed);
                 ret = -EINVAL;
                 break;
         }
@@ -361,18 +360,18 @@ static int au1k_irda_set_speed(struct net_device *dev, int speed)
         irda_write(aup, IR_RING_PROMPT, 0);
 
         if (control & (1 << 14)) {
-                printk(KERN_ERR "%s: configuration error\n", dev->name);
+                netdev_err(dev, "configuration error\n");
         } else {
                 if (control & (1 << 11))
-                        printk(KERN_DEBUG "%s Valid SIR config\n", dev->name);
+                        netdev_debug(dev, "Valid SIR config\n");
                 if (control & (1 << 12))
-                        printk(KERN_DEBUG "%s Valid MIR config\n", dev->name);
+                        netdev_debug(dev, "Valid MIR config\n");
                 if (control & (1 << 13))
-                        printk(KERN_DEBUG "%s Valid FIR config\n", dev->name);
+                        netdev_debug(dev, "Valid FIR config\n");
                 if (control & (1 << 10))
-                        printk(KERN_DEBUG "%s TX enabled\n", dev->name);
+                        netdev_debug(dev, "TX enabled\n");
                 if (control & (1 << 9))
-                        printk(KERN_DEBUG "%s RX enabled\n", dev->name);
+                        netdev_debug(dev, "RX enabled\n");
         }
 
         return ret;
@@ -584,23 +583,21 @@ static int au1k_irda_start(struct net_device *dev)
 
         retval = au1k_init(dev);
         if (retval) {
-                printk(KERN_ERR "%s: error in au1k_init\n", dev->name);
+                netdev_err(dev, "error in au1k_init\n");
                 return retval;
         }
 
         retval = request_irq(aup->irq_tx, &au1k_irda_interrupt, 0,
                              dev->name, dev);
         if (retval) {
-                printk(KERN_ERR "%s: unable to get IRQ %d\n",
-                                dev->name, dev->irq);
+                netdev_err(dev, "unable to get IRQ %d\n", dev->irq);
                 return retval;
         }
         retval = request_irq(aup->irq_rx, &au1k_irda_interrupt, 0,
                              dev->name, dev);
         if (retval) {
                 free_irq(aup->irq_tx, dev);
-                printk(KERN_ERR "%s: unable to get IRQ %d\n",
-                                dev->name, dev->irq);
+                netdev_err(dev, "unable to get IRQ %d\n", dev->irq);
                 return retval;
         }
 
@@ -673,12 +670,12 @@ static int au1k_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
         flags = ptxd->flags;
 
         if (flags & AU_OWN) {
-                printk(KERN_DEBUG "%s: tx_full\n", dev->name);
+                netdev_debug(dev, "tx_full\n");
                 netif_stop_queue(dev);
                 aup->tx_full = 1;
                 return 1;
         } else if (((aup->tx_head + 1) & (NUM_IR_DESC - 1)) == aup->tx_tail) {
-                printk(KERN_DEBUG "%s: tx_full\n", dev->name);
+                netdev_debug(dev, "tx_full\n");
                 netif_stop_queue(dev);
                 aup->tx_full = 1;
                 return 1;
@@ -688,7 +685,7 @@ static int au1k_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
 
 #if 0
         if (irda_read(aup, IR_RX_BYTE_CNT) != 0) {
-                printk(KERN_DEBUG "tx warning: rx byte cnt %x\n",
+                netdev_debug(dev, "tx warning: rx byte cnt %x\n",
                                 irda_read(aup, IR_RX_BYTE_CNT));
         }
 #endif
@@ -726,7 +723,7 @@ static void au1k_tx_timeout(struct net_device *dev)
         u32 speed;
         struct au1k_private *aup = netdev_priv(dev);
 
-        printk(KERN_ERR "%s: tx timeout\n", dev->name);
+        netdev_err(dev, "tx timeout\n");
         speed = aup->speed;
         aup->speed = 0;
         au1k_irda_set_speed(dev, speed);
@@ -751,8 +748,7 @@ static int au1k_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd)
                                 ret = au1k_irda_set_speed(dev,
                                                 rq->ifr_baudrate);
                         else {
-                                printk(KERN_ERR "%s ioctl: !netif_running\n",
-                                                dev->name);
+                                netdev_err(dev, "ioctl: !netif_running\n");
                                 ret = 0;
                         }
                 }
@@ -868,7 +864,7 @@ out3:
 out2:
         kfree(aup->rx_buff.head);
 out1:
-        printk(KERN_ERR "au1k_irda_net_init() failed.  Returns %d\n", retval);
+        netdev_err(dev, "au1k_irda_net_init() failed.  Returns %d\n");
         return retval;
 }
 
@@ -934,7 +930,7 @@ static int au1k_irda_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, dev);
 
-        printk(KERN_INFO "IrDA: Registered device %s\n", dev->name);
+        netdev_info(dev, "IrDA: Registered device\n");
         return 0;
 
 out4:
diff --git a/drivers/staging/irda/drivers/bfin_sir.c b/drivers/staging/irda/drivers/bfin_sir.c
index 3151b580dbd6..59e409b68349 100644
--- a/drivers/staging/irda/drivers/bfin_sir.c
+++ b/drivers/staging/irda/drivers/bfin_sir.c
@@ -22,6 +22,8 @@ static int max_rate = 57600;
 static int max_rate = 115200;
 #endif
 
+static void bfin_sir_rx_dma_timeout(struct timer_list *t);
+
 static void turnaround_delay(int mtt)
 {
         long ticks;
@@ -57,7 +59,7 @@ static void bfin_sir_init_ports(struct bfin_sir_port *sp, struct platform_device
         sp->clk = get_sclk();
 #ifdef CONFIG_SIR_BFIN_DMA
         sp->tx_done        = 1;
-        init_timer(&(sp->rx_dma_timer));
+        timer_setup(&sp->rx_dma_timer, bfin_sir_rx_dma_timeout, 0);
 #endif
 }
 
@@ -317,10 +319,12 @@ static void bfin_sir_dma_rx_chars(struct net_device *dev)
                 async_unwrap_char(dev, &self->stats, &self->rx_buff, port->rx_dma_buf.buf[i]);
 }
 
-void bfin_sir_rx_dma_timeout(struct net_device *dev)
+static void bfin_sir_rx_dma_timeout(struct timer_list *t)
 {
+        struct bfin_sir_port *port = from_timer(port, t, rx_dma_timer);
+        struct net_device *dev = port->dev;
         struct bfin_sir_self *self = netdev_priv(dev);
-        struct bfin_sir_port *port = self->sir_port;
+
         int x_pos, pos;
         unsigned long flags;
 
@@ -405,8 +409,6 @@ static int bfin_sir_startup(struct bfin_sir_port *port, struct net_device *dev)
         set_dma_start_addr(port->rx_dma_channel, (unsigned long)port->rx_dma_buf.buf);
         enable_dma(port->rx_dma_channel);
 
-        port->rx_dma_timer.data = (unsigned long)(dev);
-        port->rx_dma_timer.function = (void *)bfin_sir_rx_dma_timeout;
 
 #else
 
diff --git a/drivers/staging/irda/drivers/esi-sir.c b/drivers/staging/irda/drivers/esi-sir.c
index 019a3e848bcb..eb7aa6430bea 100644
--- a/drivers/staging/irda/drivers/esi-sir.c
+++ b/drivers/staging/irda/drivers/esi-sir.c
@@ -1,5 +1,5 @@
 /*********************************************************************
- *                
+ *
  * Filename:      esi.c
  * Version:       1.6
  * Description:   Driver for the Extended Systems JetEye PC dongle
@@ -8,25 +8,25 @@
  * Created at:    Sat Feb 21 18:54:38 1998
  * Modified at:   Sun Oct 27 22:01:04 2002
  * Modified by:   Martin Diehl <mad@mdiehl.de>
- * 
+ *
  *     Copyright (c) 1999 Dag Brattli, <dagb@cs.uit.no>,
  *     Copyright (c) 1998 Thomas Davis, <ratbert@radiks.net>,
  *     Copyright (c) 2002 Martin Diehl, <mad@mdiehl.de>,
  *     All Rights Reserved.
- *     
- *     This program is free software; you can redistribute it and/or 
- *     modify it under the terms of the GNU General Public License as 
- *     published by the Free Software Foundation; either version 2 of 
+ *
+ *     This program is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of
  *     the License, or (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License 
+ *
+ *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, see <http://www.gnu.org/licenses/>.
- *     
+ *
  ********************************************************************/
 
 #include <linux/module.h>
@@ -97,7 +97,7 @@ static int esi_change_speed(struct sir_dev *dev, unsigned speed)
 {
         int ret = 0;
         int dtr, rts;
-        
+
         switch (speed) {
         case 19200:
                 dtr = TRUE;
diff --git a/drivers/staging/irda/drivers/irda-usb.c b/drivers/staging/irda/drivers/irda-usb.c
index 723e49bc4baa..bda6bdc6c70b 100644
--- a/drivers/staging/irda/drivers/irda-usb.c
+++ b/drivers/staging/irda/drivers/irda-usb.c
@@ -117,7 +117,7 @@ static void irda_usb_close(struct irda_usb_cb *self);
 static void speed_bulk_callback(struct urb *urb);
 static void write_bulk_callback(struct urb *urb);
 static void irda_usb_receive(struct urb *urb);
-static void irda_usb_rx_defer_expired(unsigned long data);
+static void irda_usb_rx_defer_expired(struct timer_list *t);
 static int irda_usb_net_open(struct net_device *dev);
 static int irda_usb_net_close(struct net_device *dev);
 static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
@@ -334,9 +334,9 @@ static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self)
         urb->transfer_flags = 0;
 
         /* Irq disabled -> GFP_ATOMIC */
-        if ((ret = usb_submit_urb(urb, GFP_ATOMIC))) {
+        ret = usb_submit_urb(urb, GFP_ATOMIC);
+        if (ret)
                 net_warn_ratelimited("%s(), failed Speed URB\n", __func__);
-        }
 }
 
 /*------------------------------------------------------------------*/
@@ -846,8 +846,7 @@ static void irda_usb_receive(struct urb *urb)
                  * hot unplug of the dongle...
                  * Lowest effective timer is 10ms...
                  * Jean II */
-                self->rx_defer_timer.function = irda_usb_rx_defer_expired;
-                self->rx_defer_timer.data = (unsigned long) urb;
+                self->rx_defer_timer_urb = urb;
                 mod_timer(&self->rx_defer_timer,
                           jiffies + msecs_to_jiffies(10));
 
@@ -953,20 +952,13 @@ done:
  * In case of errors, we want the USB layer to have time to recover.
  * Now, it is time to resubmit ouur Rx URB...
  */
-static void irda_usb_rx_defer_expired(unsigned long data)
+static void irda_usb_rx_defer_expired(struct timer_list *t)
 {
-        struct urb *urb = (struct urb *) data;
+        struct irda_usb_cb *self = from_timer(self, t, rx_defer_timer);
+        struct urb *urb = self->rx_defer_timer_urb;
         struct sk_buff *skb = (struct sk_buff *) urb->context;
-        struct irda_usb_cb *self; 
-        struct irda_skb_cb *cb;
         struct urb *next_urb;
 
-        /* Find ourselves */
-        cb = (struct irda_skb_cb *) skb->cb;
-        IRDA_ASSERT(cb != NULL, return;);
-        self = (struct irda_usb_cb *) cb->context;
-        IRDA_ASSERT(self != NULL, return;);
-
         /* Same stuff as when Rx is done, see above... */
         next_urb = self->idle_rx_urb;
         urb->context = NULL;
@@ -1622,7 +1614,7 @@ static int irda_usb_probe(struct usb_interface *intf,
         self = netdev_priv(net);
         self->netdev = net;
         spin_lock_init(&self->lock);
-        init_timer(&self->rx_defer_timer);
+        timer_setup(&self->rx_defer_timer, irda_usb_rx_defer_expired, 0);
 
         self->capability = id->driver_info;
         self->needspatch = ((self->capability & IUC_STIR421X) != 0);
diff --git a/drivers/staging/irda/drivers/irda-usb.h b/drivers/staging/irda/drivers/irda-usb.h
index 8ac389fa9348..56ee8c16c5e2 100644
--- a/drivers/staging/irda/drivers/irda-usb.h
+++ b/drivers/staging/irda/drivers/irda-usb.h
@@ -170,5 +170,6 @@ struct irda_usb_cb {
         int needspatch;                 /* device needs firmware patch */
 
         struct timer_list rx_defer_timer;       /* Wait for Rx error to clear */
+        struct urb *rx_defer_timer_urb; /* URB attached to rx_defer_timer */
 };
 
diff --git a/drivers/staging/irda/drivers/mcs7780.c b/drivers/staging/irda/drivers/mcs7780.c
index c3f0b254b344..d52e9f4b9770 100644
--- a/drivers/staging/irda/drivers/mcs7780.c
+++ b/drivers/staging/irda/drivers/mcs7780.c
@@ -605,19 +605,22 @@ static int mcs_speed_change(struct mcs_cb *mcs)
         if (mcs->new_speed <= 115200) {
                 rval &= ~MCS_FIR;
 
-                if ((rst = (mcs->speed > 115200)))
+                rst = mcs->speed > 115200;
+                if (rst)
                         mcs_set_reg(mcs, MCS_MINRXPW_REG, 0);
 
         } else if (mcs->new_speed <= 1152000) {
                 rval &= ~MCS_FIR;
 
-                if ((rst = !(mcs->speed == 576000 || mcs->speed == 1152000)))
+                rst = !(mcs->speed == 576000 || mcs->speed == 1152000);
+                if (rst)
                         mcs_set_reg(mcs, MCS_MINRXPW_REG, 5);
 
         } else {
                 rval |= MCS_FIR;
 
-                if ((rst = (mcs->speed != 4000000)))
+                rst = mcs->speed != 4000000;
+                if (rst)
                         mcs_set_reg(mcs, MCS_MINRXPW_REG, 5);
 
         }
diff --git a/drivers/staging/irda/drivers/vlsi_ir.c b/drivers/staging/irda/drivers/vlsi_ir.c
index 6638784c082e..3dff3c55ddf5 100644
--- a/drivers/staging/irda/drivers/vlsi_ir.c
+++ b/drivers/staging/irda/drivers/vlsi_ir.c
@@ -170,10 +170,10 @@ static void vlsi_proc_pdev(struct seq_file *seq, struct pci_dev *pdev)
         seq_printf(seq, "pci-power-state: %u\n", (unsigned) pdev->current_state);
         seq_printf(seq, "resources: irq=%u / io=0x%04x / dma_mask=0x%016Lx\n",
                    pdev->irq, (unsigned)pci_resource_start(pdev, 0), (unsigned long long)pdev->dma_mask);
-        seq_printf(seq, "hw registers: ");
+        seq_puts(seq, "hw registers: ");
         for (i = 0; i < 0x20; i++)
                 seq_printf(seq, "%02x", (unsigned)inb((iobase+i)));
-        seq_printf(seq, "\n");
+        seq_putc(seq, '\n');
 }
                 
 static void vlsi_proc_ndev(struct seq_file *seq, struct net_device *ndev)
@@ -193,7 +193,7 @@ static void vlsi_proc_ndev(struct seq_file *seq, struct net_device *ndev)
         if (!netif_running(ndev))
                 return;
 
-        seq_printf(seq, "\nhw-state:\n");
+        seq_puts(seq, "\nhw-state:\n");
         pci_read_config_byte(idev->pdev, VLSI_PCI_IRMISC, &byte);
         seq_printf(seq, "IRMISC:%s%s%s uart%s",
                 (byte&IRMISC_IRRAIL) ? " irrail" : "",
@@ -274,7 +274,7 @@ static void vlsi_proc_ndev(struct seq_file *seq, struct net_device *ndev)
         word = inw(iobase+VLSI_PIO_RCVBCNT) & RCVBCNT_MASK;
         seq_printf(seq, "RCVBCNT: rx-fifo filling level = %u\n", word);
 
-        seq_printf(seq, "\nsw-state:\n");
+        seq_puts(seq, "\nsw-state:\n");
         seq_printf(seq, "IrPHY setup: %d baud - %s encoding\n", idev->baud, 
                 (idev->mode==IFF_SIR)?"SIR":((idev->mode==IFF_MIR)?"MIR":"FIR"));
         sec = div_s64_rem(ktime_us_delta(ktime_get(), idev->last_rx),
@@ -305,10 +305,10 @@ static void vlsi_proc_ring(struct seq_file *seq, struct vlsi_ring *r)
         t = atomic_read(&r->tail) & r->mask;
         seq_printf(seq, "head = %d / tail = %d ", h, t);
         if (h == t)
-                seq_printf(seq, "(empty)\n");
+                seq_puts(seq, "(empty)\n");
         else {
                 if (((t+1)&r->mask) == h)
-                        seq_printf(seq, "(full)\n");
+                        seq_puts(seq, "(full)\n");
                 else
                         seq_printf(seq, "(level = %d)\n", ((unsigned)(t-h) & r->mask)); 
                 rd = &r->rd[h];
@@ -355,13 +355,13 @@ static int vlsi_seq_show(struct seq_file *seq, void *v)
                         seq_printf(seq, "\nPCI controller down - resume_ok = %d\n",
                                 idev->resume_ok);
                 if (netif_running(ndev) && idev->rx_ring && idev->tx_ring) {
-                        seq_printf(seq, "\n--------- RX ring -----------\n\n");
+                        seq_puts(seq, "\n--------- RX ring -----------\n\n");
                         vlsi_proc_ring(seq, idev->rx_ring);
-                        seq_printf(seq, "\n--------- TX ring -----------\n\n");
+                        seq_puts(seq, "\n--------- TX ring -----------\n\n");
                         vlsi_proc_ring(seq, idev->tx_ring);
                 }
         }
-        seq_printf(seq, "\n");
+        seq_putc(seq, '\n');
         spin_unlock_irqrestore(&idev->lock, flags);
 
         return 0;
diff --git a/drivers/staging/irda/include/net/irda/irlmp_event.h b/drivers/staging/irda/include/net/irda/irlmp_event.h
index 9e4ec17a7449..a1a082fe384e 100644
--- a/drivers/staging/irda/include/net/irda/irlmp_event.h
+++ b/drivers/staging/irda/include/net/irda/irlmp_event.h
@@ -82,9 +82,9 @@ typedef enum {
 extern const char *const irlmp_state[];
 extern const char *const irlsap_state[];
 
-void irlmp_watchdog_timer_expired(void *data);
-void irlmp_discovery_timer_expired(void *data);
-void irlmp_idle_timer_expired(void *data);
+void irlmp_watchdog_timer_expired(struct timer_list *t);
+void irlmp_discovery_timer_expired(struct timer_list *t);
+void irlmp_idle_timer_expired(struct timer_list *t);
 
 void irlmp_do_lap_event(struct lap_cb *self, IRLMP_EVENT event, 
                         struct sk_buff *skb);
diff --git a/drivers/staging/irda/include/net/irda/qos.h b/drivers/staging/irda/include/net/irda/qos.h
index 05a5a249956f..a0315b50ac27 100644
--- a/drivers/staging/irda/include/net/irda/qos.h
+++ b/drivers/staging/irda/include/net/irda/qos.h
@@ -58,23 +58,23 @@
 #define IR_16000000 0x02
 
 /* Quality of Service information */
-typedef struct {
+struct qos_value {
         __u32 value;
         __u16 bits; /* LSB is first byte, MSB is second byte */
-} qos_value_t;
+};
 
 struct qos_info {
         magic_t magic;
 
-        qos_value_t baud_rate;       /* IR_11520O | ... */
-        qos_value_t max_turn_time;
-        qos_value_t data_size;
-        qos_value_t window_size;
-        qos_value_t additional_bofs;
-        qos_value_t min_turn_time;
-        qos_value_t link_disc_time;
+        struct qos_value baud_rate;       /* IR_11520O | ... */
+        struct qos_value max_turn_time;
+        struct qos_value data_size;
+        struct qos_value window_size;
+        struct qos_value additional_bofs;
+        struct qos_value min_turn_time;
+        struct qos_value link_disc_time;
         
-        qos_value_t power;
+        struct qos_value power;
 };
 
 extern int sysctl_max_baud_rate;
diff --git a/drivers/staging/irda/include/net/irda/timer.h b/drivers/staging/irda/include/net/irda/timer.h
index d784f242cf7b..a6635f0afae9 100644
--- a/drivers/staging/irda/include/net/irda/timer.h
+++ b/drivers/staging/irda/include/net/irda/timer.h
@@ -72,14 +72,11 @@ struct lap_cb;
 
 #define WATCHDOG_TIMEOUT        (20*HZ)       /* 20 sec */
 
-typedef void (*TIMER_CALLBACK)(void *);
-
-static inline void irda_start_timer(struct timer_list *ptimer, int timeout, 
-                                    void* data, TIMER_CALLBACK callback)
+static inline void irda_start_timer(struct timer_list *ptimer, int timeout,
+                                    void (*callback)(struct timer_list *))
 {
-        ptimer->function = (void (*)(unsigned long)) callback;
-        ptimer->data = (unsigned long) data;
-        
+        ptimer->function = (TIMER_FUNC_TYPE) callback;
+
         /* Set new value for timer (update or add timer).
          * We use mod_timer() because it's more efficient and also
          * safer with respect to race conditions - Jean II */
diff --git a/drivers/staging/irda/net/af_irda.c b/drivers/staging/irda/net/af_irda.c
index 23fa7c8b09a5..b82a47b9ef0b 100644
--- a/drivers/staging/irda/net/af_irda.c
+++ b/drivers/staging/irda/net/af_irda.c
@@ -429,11 +429,11 @@ static void irda_selective_discovery_indication(discinfo_t *discovery,
  * We were waiting for a node to be discovered, but nothing has come up
  * so far. Wake up the user and tell him that we failed...
  */
-static void irda_discovery_timeout(u_long priv)
+static void irda_discovery_timeout(struct timer_list *t)
 {
         struct irda_sock *self;
 
-        self = (struct irda_sock *) priv;
+        self = from_timer(self, t, watchdog);
         BUG_ON(self == NULL);
 
         /* Nothing for the caller */
@@ -2505,8 +2505,7 @@ bed:
 
                         /* Set watchdog timer to expire in <val> ms. */
                         self->errno = 0;
-                        setup_timer(&self->watchdog, irda_discovery_timeout,
-                                        (unsigned long)self);
+                        timer_setup(&self->watchdog, irda_discovery_timeout, 0);
                         mod_timer(&self->watchdog,
                                   jiffies + msecs_to_jiffies(val));
 
diff --git a/drivers/staging/irda/net/discovery.c b/drivers/staging/irda/net/discovery.c
index 364d70aed068..1e54954a4081 100644
--- a/drivers/staging/irda/net/discovery.c
+++ b/drivers/staging/irda/net/discovery.c
@@ -179,7 +179,7 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force)
                                 /* Create the client specific buffer */
                                 n = HASHBIN_GET_SIZE(log);
                                 buffer = kmalloc(n * sizeof(struct irda_device_info), GFP_ATOMIC);
-                                if (buffer == NULL) {
+                                if (!buffer) {
                                         spin_unlock_irqrestore(&log->hb_spinlock, flags);
                                         return;
                                 }
@@ -291,7 +291,7 @@ struct irda_device_info *irlmp_copy_discoveries(hashbin_t *log, int *pn,
                                 /* Create the client specific buffer */
                                 n = HASHBIN_GET_SIZE(log);
                                 buffer = kmalloc(n * sizeof(struct irda_device_info), GFP_ATOMIC);
-                                if (buffer == NULL) {
+                                if (!buffer) {
                                         spin_unlock_irqrestore(&log->hb_spinlock, flags);
                                         return NULL;
                                 }
diff --git a/drivers/staging/irda/net/ircomm/ircomm_tty.c b/drivers/staging/irda/net/ircomm/ircomm_tty.c
index ec157c3419b5..473abfaffe7b 100644
--- a/drivers/staging/irda/net/ircomm/ircomm_tty.c
+++ b/drivers/staging/irda/net/ircomm/ircomm_tty.c
@@ -395,7 +395,7 @@ static int ircomm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
                 self->max_data_size = IRCOMM_TTY_DATA_UNINITIALISED;
 
                 /* Init some important stuff */
-                init_timer(&self->watchdog_timer);
+                timer_setup(&self->watchdog_timer, NULL, 0);
                 spin_lock_init(&self->spinlock);
 
                 /*
diff --git a/drivers/staging/irda/net/ircomm/ircomm_tty_attach.c b/drivers/staging/irda/net/ircomm/ircomm_tty_attach.c
index 0a411019c098..e2d5ce8ba0db 100644
--- a/drivers/staging/irda/net/ircomm/ircomm_tty_attach.c
+++ b/drivers/staging/irda/net/ircomm/ircomm_tty_attach.c
@@ -52,7 +52,7 @@ static void ircomm_tty_getvalue_confirm(int result, __u16 obj_id,
                                         struct ias_value *value, void *priv);
 static void ircomm_tty_start_watchdog_timer(struct ircomm_tty_cb *self,
                                             int timeout);
-static void ircomm_tty_watchdog_timer_expired(void *data);
+static void ircomm_tty_watchdog_timer_expired(struct timer_list *timer);
 
 static int ircomm_tty_state_idle(struct ircomm_tty_cb *self,
                                  IRCOMM_TTY_EVENT event,
@@ -587,7 +587,7 @@ static void ircomm_tty_start_watchdog_timer(struct ircomm_tty_cb *self,
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
-        irda_start_timer(&self->watchdog_timer, timeout, (void *) self,
+        irda_start_timer(&self->watchdog_timer, timeout,
                          ircomm_tty_watchdog_timer_expired);
 }
 
@@ -597,9 +597,9 @@ static void ircomm_tty_start_watchdog_timer(struct ircomm_tty_cb *self,
  *    Called when the connect procedure have taken to much time.
  *
  */
-static void ircomm_tty_watchdog_timer_expired(void *data)
+static void ircomm_tty_watchdog_timer_expired(struct timer_list *t)
 {
-        struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) data;
+        struct ircomm_tty_cb *self = from_timer(self, t, watchdog_timer);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
diff --git a/drivers/staging/irda/net/irda_device.c b/drivers/staging/irda/net/irda_device.c
index 890b90d055d5..682b4eea15e0 100644
--- a/drivers/staging/irda/net/irda_device.c
+++ b/drivers/staging/irda/net/irda_device.c
@@ -54,29 +54,30 @@
 
 static void __irda_task_delete(struct irda_task *task);
 
-static hashbin_t *dongles = NULL;
-static hashbin_t *tasks = NULL;
+static hashbin_t *dongles;
+static hashbin_t *tasks;
 
-static void irda_task_timer_expired(void *data);
+static void irda_task_timer_expired(struct timer_list *timer);
 
-int __init irda_device_init( void)
+int __init irda_device_init(void)
 {
         dongles = hashbin_new(HB_NOLOCK);
-        if (dongles == NULL) {
+        if (!dongles) {
                 net_warn_ratelimited("IrDA: Can't allocate dongles hashbin!\n");
                 return -ENOMEM;
         }
         spin_lock_init(&dongles->hb_spinlock);
 
         tasks = hashbin_new(HB_LOCK);
-        if (tasks == NULL) {
+        if (!tasks) {
                 net_warn_ratelimited("IrDA: Can't allocate tasks hashbin!\n");
                 hashbin_delete(dongles, NULL);
                 return -ENOMEM;
         }
 
         /* We no longer initialise the driver ourselves here, we let
-         * the system do it for us... - Jean II */
+         * the system do it for us... - Jean II
+         */
 
         return 0;
 }
@@ -84,6 +85,7 @@ int __init irda_device_init( void)
 static void leftover_dongle(void *arg)
 {
         struct dongle_reg *reg = arg;
+
         net_warn_ratelimited("IrDA: Dongle type %x not unregistered\n",
                              reg->type);
 }
@@ -107,7 +109,7 @@ void irda_device_set_media_busy(struct net_device *dev, int status)
 
         pr_debug("%s(%s)\n", __func__, status ? "TRUE" : "FALSE");
 
-        self = (struct irlap_cb *) dev->atalk_ptr;
+        self = (struct irlap_cb *)dev->atalk_ptr;
 
         /* Some drivers may enable the receive interrupt before calling
          * irlap_open(), or they may disable the receive interrupt
@@ -115,7 +117,8 @@ void irda_device_set_media_busy(struct net_device *dev, int status)
          * The IrDA stack is protected from this in irlap_driver_rcv().
          * However, the driver calls directly the wrapper, that calls
          * us directly. Make sure we protect ourselves.
-         * Jean II */
+         * Jean II
+         */
         if (!self || self->magic != LAP_MAGIC)
                 return;
 
@@ -133,7 +136,6 @@ void irda_device_set_media_busy(struct net_device *dev, int status)
 }
 EXPORT_SYMBOL(irda_device_set_media_busy);
 
-
 /*
  * Function irda_device_is_receiving (dev)
  *
@@ -169,7 +171,7 @@ static void __irda_task_delete(struct irda_task *task)
 static void irda_task_delete(struct irda_task *task)
 {
         /* Unregister task */
-        hashbin_remove(tasks, (long) task, NULL);
+        hashbin_remove(tasks, (long)task, NULL);
 
         __irda_task_delete(task);
 }
@@ -231,7 +233,7 @@ static int irda_task_kick(struct irda_task *task)
                 }
                 irda_task_delete(task);
         } else if (timeout > 0) {
-                irda_start_timer(&task->timer, timeout, (void *) task,
+                irda_start_timer(&task->timer, timeout,
                                  irda_task_timer_expired);
                 finished = FALSE;
         } else {
@@ -249,11 +251,9 @@ static int irda_task_kick(struct irda_task *task)
  *    Task time has expired. We now try to execute task (again), and restart
  *    the timer if the task has not finished yet
  */
-static void irda_task_timer_expired(void *data)
+static void irda_task_timer_expired(struct timer_list *t)
 {
-        struct irda_task *task;
-
-        task = data;
+        struct irda_task *task = from_timer(task, t, timer);
 
         irda_task_kick(task);
 }
@@ -280,8 +280,8 @@ static void irda_device_setup(struct net_device *dev)
 
 /*
  * Funciton  alloc_irdadev
- *      Allocates and sets up an IRDA device in a manner similar to
- *      alloc_etherdev.
+ *      Allocates and sets up an IRDA device in a manner similar to
+ *      alloc_etherdev.
  */
 struct net_device *alloc_irdadev(int sizeof_priv)
 {
diff --git a/drivers/staging/irda/net/iriap.c b/drivers/staging/irda/net/iriap.c
index 1138eaf5c682..d64192e9db8b 100644
--- a/drivers/staging/irda/net/iriap.c
+++ b/drivers/staging/irda/net/iriap.c
@@ -76,12 +76,12 @@ static void iriap_connect_confirm(void *instance, void *sap,
 static int iriap_data_indication(void *instance, void *sap,
                                  struct sk_buff *skb);
 
-static void iriap_watchdog_timer_expired(void *data);
+static void iriap_watchdog_timer_expired(struct timer_list *t);
 
 static inline void iriap_start_watchdog_timer(struct iriap_cb *self,
                                               int timeout)
 {
-        irda_start_timer(&self->watchdog_timer, timeout, self,
+        irda_start_timer(&self->watchdog_timer, timeout,
                          iriap_watchdog_timer_expired);
 }
 
@@ -199,7 +199,7 @@ struct iriap_cb *iriap_open(__u8 slsap_sel, int mode, void *priv,
          * we connect, so this must have a sane value... Jean II */
         self->max_header_size = LMP_MAX_HEADER;
 
-        init_timer(&self->watchdog_timer);
+        timer_setup(&self->watchdog_timer, NULL, 0);
 
         hashbin_insert(iriap, (irda_queue_t *) self, (long) self, NULL);
 
@@ -946,9 +946,9 @@ void iriap_call_indication(struct iriap_cb *self, struct sk_buff *skb)
  *    Query has taken too long time, so abort
  *
  */
-static void iriap_watchdog_timer_expired(void *data)
+static void iriap_watchdog_timer_expired(struct timer_list *t)
 {
-        struct iriap_cb *self = (struct iriap_cb *) data;
+        struct iriap_cb *self = from_timer(self, t, watchdog_timer);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
diff --git a/drivers/staging/irda/net/irlan/irlan_client.c b/drivers/staging/irda/net/irlan/irlan_client.c
index c5837a40c78e..0b65e80849ae 100644
--- a/drivers/staging/irda/net/irlan/irlan_client.c
+++ b/drivers/staging/irda/net/irlan/irlan_client.c
@@ -68,9 +68,9 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
                                        char *value, int val_len);
 static void irlan_client_open_ctrl_tsap(struct irlan_cb *self);
 
-static void irlan_client_kick_timer_expired(void *data)
+static void irlan_client_kick_timer_expired(struct timer_list *t)
 {
-        struct irlan_cb *self = (struct irlan_cb *) data;
+        struct irlan_cb *self = from_timer(self, t, client.kick_timer);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -89,7 +89,7 @@ static void irlan_client_kick_timer_expired(void *data)
 
 static void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
 {
-        irda_start_timer(&self->client.kick_timer, timeout, (void *) self,
+        irda_start_timer(&self->client.kick_timer, timeout,
                          irlan_client_kick_timer_expired);
 }
 
diff --git a/drivers/staging/irda/net/irlan/irlan_common.c b/drivers/staging/irda/net/irlan/irlan_common.c
index 481bbc2a4349..fdcd7147007d 100644
--- a/drivers/staging/irda/net/irlan/irlan_common.c
+++ b/drivers/staging/irda/net/irlan/irlan_common.c
@@ -228,8 +228,8 @@ static struct irlan_cb __init *irlan_open(__u32 saddr, __u32 daddr)
 
         self->media = MEDIA_802_3;
         self->disconnect_reason = LM_USER_REQUEST;
-        init_timer(&self->watchdog_timer);
-        init_timer(&self->client.kick_timer);
+        timer_setup(&self->watchdog_timer, NULL, 0);
+        timer_setup(&self->client.kick_timer, NULL, 0);
         init_waitqueue_head(&self->open_wait);
 
         skb_queue_head_init(&self->client.txq);
diff --git a/drivers/staging/irda/net/irlap.c b/drivers/staging/irda/net/irlap.c
index 1cde711bcab5..d7d894423b4f 100644
--- a/drivers/staging/irda/net/irlap.c
+++ b/drivers/staging/irda/net/irlap.c
@@ -148,14 +148,14 @@ struct irlap_cb *irlap_open(struct net_device *dev, struct qos_info *qos,
         /* Copy to the driver */
         memcpy(dev->dev_addr, &self->saddr, 4);
 
-        init_timer(&self->slot_timer);
-        init_timer(&self->query_timer);
-        init_timer(&self->discovery_timer);
-        init_timer(&self->final_timer);
-        init_timer(&self->poll_timer);
-        init_timer(&self->wd_timer);
-        init_timer(&self->backoff_timer);
-        init_timer(&self->media_busy_timer);
+        timer_setup(&self->slot_timer, NULL, 0);
+        timer_setup(&self->query_timer, NULL, 0);
+        timer_setup(&self->discovery_timer, NULL, 0);
+        timer_setup(&self->final_timer, NULL, 0);
+        timer_setup(&self->poll_timer, NULL, 0);
+        timer_setup(&self->wd_timer, NULL, 0);
+        timer_setup(&self->backoff_timer, NULL, 0);
+        timer_setup(&self->media_busy_timer, NULL, 0);
 
         irlap_apply_default_connection_parameters(self);
 
diff --git a/drivers/staging/irda/net/irlap_event.c b/drivers/staging/irda/net/irlap_event.c
index 0e1b4d79f745..634188b07e0a 100644
--- a/drivers/staging/irda/net/irlap_event.c
+++ b/drivers/staging/irda/net/irlap_event.c
@@ -163,9 +163,9 @@ static int (*state[])(struct irlap_cb *self, IRLAP_EVENT event,
  *    Poll timer has expired. Normally we must now send a RR frame to the
  *    remote device
  */
-static void irlap_poll_timer_expired(void *data)
+static void irlap_poll_timer_expired(struct timer_list *t)
 {
-        struct irlap_cb *self = (struct irlap_cb *) data;
+        struct irlap_cb *self = from_timer(self, t, poll_timer);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LAP_MAGIC, return;);
@@ -222,7 +222,7 @@ static void irlap_start_poll_timer(struct irlap_cb *self, int timeout)
         if (timeout == 0)
                 irlap_do_event(self, POLL_TIMER_EXPIRED, NULL, NULL);
         else
-                irda_start_timer(&self->poll_timer, timeout, self,
+                irda_start_timer(&self->poll_timer, timeout,
                                  irlap_poll_timer_expired);
 }
 
diff --git a/drivers/staging/irda/net/irlmp.c b/drivers/staging/irda/net/irlmp.c
index 43964594aa12..34355061ab0b 100644
--- a/drivers/staging/irda/net/irlmp.c
+++ b/drivers/staging/irda/net/irlmp.c
@@ -109,7 +109,7 @@ int __init irlmp_init(void)
         irlmp->last_lsap_sel = 0x0f; /* Reserved 0x00-0x0f */
         strcpy(sysctl_devname, "Linux");
 
-        init_timer(&irlmp->discovery_timer);
+        timer_setup(&irlmp->discovery_timer, NULL, 0);
 
         /* Do discovery every 3 seconds, conditionally */
         if (sysctl_discovery)
@@ -185,7 +185,7 @@ struct lsap_cb *irlmp_open_lsap(__u8 slsap_sel, notify_t *notify, __u8 pid)
                 self->dlsap_sel = LSAP_ANY;
         /* self->connected = FALSE; -> already NULL via memset() */
 
-        init_timer(&self->watchdog_timer);
+        timer_setup(&self->watchdog_timer, NULL, 0);
 
         self->notify = *notify;
 
@@ -311,7 +311,7 @@ void irlmp_register_link(struct irlap_cb *irlap, __u32 saddr, notify_t *notify)
 
         lap->lap_state = LAP_STANDBY;
 
-        init_timer(&lap->idle_timer);
+        timer_setup(&lap->idle_timer, NULL, 0);
 
         /*
          *  Insert into queue of LMP links
@@ -655,7 +655,7 @@ struct lsap_cb *irlmp_dup(struct lsap_cb *orig, void *instance)
         /* Not everything is the same */
         new->notify.instance = instance;
 
-        init_timer(&new->watchdog_timer);
+        timer_setup(&new->watchdog_timer, NULL, 0);
 
         hashbin_insert(irlmp->unconnected_lsaps, (irda_queue_t *) new,
                        (long) new, NULL);
diff --git a/drivers/staging/irda/net/irlmp_event.c b/drivers/staging/irda/net/irlmp_event.c
index e306cf2c1e04..ddad0994b6dc 100644
--- a/drivers/staging/irda/net/irlmp_event.c
+++ b/drivers/staging/irda/net/irlmp_event.c
@@ -165,7 +165,7 @@ void irlmp_do_lap_event(struct lap_cb *self, IRLMP_EVENT event,
         (*lap_state[self->lap_state]) (self, event, skb);
 }
 
-void irlmp_discovery_timer_expired(void *data)
+void irlmp_discovery_timer_expired(struct timer_list *t)
 {
         /* We always cleanup the log (active & passive discovery) */
         irlmp_do_expiry();
@@ -176,9 +176,9 @@ void irlmp_discovery_timer_expired(void *data)
         irlmp_start_discovery_timer(irlmp, sysctl_discovery_timeout * HZ);
 }
 
-void irlmp_watchdog_timer_expired(void *data)
+void irlmp_watchdog_timer_expired(struct timer_list *t)
 {
-        struct lsap_cb *self = (struct lsap_cb *) data;
+        struct lsap_cb *self = from_timer(self, t, watchdog_timer);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LMP_LSAP_MAGIC, return;);
@@ -186,9 +186,9 @@ void irlmp_watchdog_timer_expired(void *data)
         irlmp_do_lsap_event(self, LM_WATCHDOG_TIMEOUT, NULL);
 }
 
-void irlmp_idle_timer_expired(void *data)
+void irlmp_idle_timer_expired(struct timer_list *t)
 {
-        struct lap_cb *self = (struct lap_cb *) data;
+        struct lap_cb *self = from_timer(self, t, idle_timer);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LMP_LAP_MAGIC, return;);
diff --git a/drivers/staging/irda/net/irqueue.c b/drivers/staging/irda/net/irqueue.c
index 160dc89335e2..14291cbc4097 100644
--- a/drivers/staging/irda/net/irqueue.c
+++ b/drivers/staging/irda/net/irqueue.c
@@ -217,7 +217,8 @@ static __u32 hash( const char* name)
 
         while(*name) {
                 h = (h<<4) + *name++;
-                if ((g = (h & 0xf0000000)))
+                g = h & 0xf0000000;
+                if (g)
                         h ^=g>>24;
                 h &=~g;
         }
diff --git a/drivers/staging/irda/net/irttp.c b/drivers/staging/irda/net/irttp.c
index b6ab41d5b3a3..741a94f39b4e 100644
--- a/drivers/staging/irda/net/irttp.c
+++ b/drivers/staging/irda/net/irttp.c
@@ -62,7 +62,6 @@ static void irttp_run_rx_queue(struct tsap_cb *self);
 static void irttp_flush_queues(struct tsap_cb *self);
 static void irttp_fragment_skb(struct tsap_cb *self, struct sk_buff *skb);
 static struct sk_buff *irttp_reassemble_skb(struct tsap_cb *self);
-static void irttp_todo_expired(unsigned long data);
 static int irttp_param_max_sdu_size(void *instance, irda_param_t *param,
                                     int get);
 
@@ -160,9 +159,9 @@ static inline void irttp_start_todo_timer(struct tsap_cb *self, int timeout)
  * killed (need user context), and we can't guarantee that here...
  * Jean II
  */
-static void irttp_todo_expired(unsigned long data)
+static void irttp_todo_expired(struct timer_list *t)
 {
-        struct tsap_cb *self = (struct tsap_cb *) data;
+        struct tsap_cb *self = from_timer(self, t, todo_timer);
 
         /* Check that we still exist */
         if (!self || self->magic != TTP_TSAP_MAGIC)
@@ -374,7 +373,7 @@ static int irttp_param_max_sdu_size(void *instance, irda_param_t *param,
 static void irttp_init_tsap(struct tsap_cb *tsap)
 {
         spin_lock_init(&tsap->lock);
-        init_timer(&tsap->todo_timer);
+        timer_setup(&tsap->todo_timer, irttp_todo_expired, 0);
 
         skb_queue_head_init(&tsap->rx_queue);
         skb_queue_head_init(&tsap->tx_queue);
@@ -410,10 +409,6 @@ struct tsap_cb *irttp_open_tsap(__u8 stsap_sel, int credit, notify_t *notify)
         /* Initialize internal objects */
         irttp_init_tsap(self);
 
-        /* Initialise todo timer */
-        self->todo_timer.data     = (unsigned long) self;
-        self->todo_timer.function = &irttp_todo_expired;
-
         /* Initialize callbacks for IrLMP to use */
         irda_notify_init(&ttp_notify);
         ttp_notify.connect_confirm = irttp_connect_confirm;
diff --git a/drivers/staging/irda/net/timer.c b/drivers/staging/irda/net/timer.c
index f2280f73b057..cf00c0d848aa 100644
--- a/drivers/staging/irda/net/timer.c
+++ b/drivers/staging/irda/net/timer.c
@@ -34,16 +34,16 @@
 
 extern int  sysctl_slot_timeout;
 
-static void irlap_slot_timer_expired(void* data);
-static void irlap_query_timer_expired(void* data);
-static void irlap_final_timer_expired(void* data);
-static void irlap_wd_timer_expired(void* data);
-static void irlap_backoff_timer_expired(void* data);
-static void irlap_media_busy_expired(void* data);
+static void irlap_slot_timer_expired(struct timer_list *t);
+static void irlap_query_timer_expired(struct timer_list *t);
+static void irlap_final_timer_expired(struct timer_list *t);
+static void irlap_wd_timer_expired(struct timer_list *t);
+static void irlap_backoff_timer_expired(struct timer_list *t);
+static void irlap_media_busy_expired(struct timer_list *t);
 
 void irlap_start_slot_timer(struct irlap_cb *self, int timeout)
 {
-        irda_start_timer(&self->slot_timer, timeout, (void *) self,
+        irda_start_timer(&self->slot_timer, timeout,
                          irlap_slot_timer_expired);
 }
 
@@ -66,32 +66,32 @@ void irlap_start_query_timer(struct irlap_cb *self, int S, int s)
         /* Set or re-set the timer. We reset the timer for each received
          * discovery query, which allow us to automatically adjust to
          * the speed of the peer discovery (faster or slower). Jean II */
-        irda_start_timer( &self->query_timer, timeout, (void *) self,
+        irda_start_timer(&self->query_timer, timeout,
                           irlap_query_timer_expired);
 }
 
 void irlap_start_final_timer(struct irlap_cb *self, int timeout)
 {
-        irda_start_timer(&self->final_timer, timeout, (void *) self,
+        irda_start_timer(&self->final_timer, timeout,
                          irlap_final_timer_expired);
 }
 
 void irlap_start_wd_timer(struct irlap_cb *self, int timeout)
 {
-        irda_start_timer(&self->wd_timer, timeout, (void *) self,
+        irda_start_timer(&self->wd_timer, timeout,
                          irlap_wd_timer_expired);
 }
 
 void irlap_start_backoff_timer(struct irlap_cb *self, int timeout)
 {
-        irda_start_timer(&self->backoff_timer, timeout, (void *) self,
+        irda_start_timer(&self->backoff_timer, timeout,
                          irlap_backoff_timer_expired);
 }
 
 void irlap_start_mbusy_timer(struct irlap_cb *self, int timeout)
 {
         irda_start_timer(&self->media_busy_timer, timeout,
-                         (void *) self, irlap_media_busy_expired);
+                         irlap_media_busy_expired);
 }
 
 void irlap_stop_mbusy_timer(struct irlap_cb *self)
@@ -110,19 +110,19 @@ void irlap_stop_mbusy_timer(struct irlap_cb *self)
 
 void irlmp_start_watchdog_timer(struct lsap_cb *self, int timeout)
 {
-        irda_start_timer(&self->watchdog_timer, timeout, (void *) self,
+        irda_start_timer(&self->watchdog_timer, timeout,
                          irlmp_watchdog_timer_expired);
 }
 
 void irlmp_start_discovery_timer(struct irlmp_cb *self, int timeout)
 {
-        irda_start_timer(&self->discovery_timer, timeout, (void *) self,
+        irda_start_timer(&self->discovery_timer, timeout,
                          irlmp_discovery_timer_expired);
 }
 
 void irlmp_start_idle_timer(struct lap_cb *self, int timeout)
 {
-        irda_start_timer(&self->idle_timer, timeout, (void *) self,
+        irda_start_timer(&self->idle_timer, timeout,
                          irlmp_idle_timer_expired);
 }
 
@@ -138,9 +138,9 @@ void irlmp_stop_idle_timer(struct lap_cb *self)
  *    IrLAP slot timer has expired
  *
  */
-static void irlap_slot_timer_expired(void *data)
+static void irlap_slot_timer_expired(struct timer_list *t)
 {
-        struct irlap_cb *self = (struct irlap_cb *) data;
+        struct irlap_cb *self = from_timer(self, t, slot_timer);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LAP_MAGIC, return;);
@@ -154,9 +154,9 @@ static void irlap_slot_timer_expired(void *data)
  *    IrLAP query timer has expired
  *
  */
-static void irlap_query_timer_expired(void *data)
+static void irlap_query_timer_expired(struct timer_list *t)
 {
-        struct irlap_cb *self = (struct irlap_cb *) data;
+        struct irlap_cb *self = from_timer(self, t, query_timer);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LAP_MAGIC, return;);
@@ -170,9 +170,9 @@ static void irlap_query_timer_expired(void *data)
  *
  *
  */
-static void irlap_final_timer_expired(void *data)
+static void irlap_final_timer_expired(struct timer_list *t)
 {
-        struct irlap_cb *self = (struct irlap_cb *) data;
+        struct irlap_cb *self = from_timer(self, t, final_timer);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LAP_MAGIC, return;);
@@ -186,9 +186,9 @@ static void irlap_final_timer_expired(void *data)
  *
  *
  */
-static void irlap_wd_timer_expired(void *data)
+static void irlap_wd_timer_expired(struct timer_list *t)
 {
-        struct irlap_cb *self = (struct irlap_cb *) data;
+        struct irlap_cb *self = from_timer(self, t, wd_timer);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LAP_MAGIC, return;);
@@ -202,9 +202,9 @@ static void irlap_wd_timer_expired(void *data)
  *
  *
  */
-static void irlap_backoff_timer_expired(void *data)
+static void irlap_backoff_timer_expired(struct timer_list *t)
 {
-        struct irlap_cb *self = (struct irlap_cb *) data;
+        struct irlap_cb *self = from_timer(self, t, backoff_timer);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LAP_MAGIC, return;);
@@ -218,9 +218,9 @@ static void irlap_backoff_timer_expired(void *data)
  *
  *
  */
-static void irlap_media_busy_expired(void *data)
+static void irlap_media_busy_expired(struct timer_list *t)
 {
-        struct irlap_cb *self = (struct irlap_cb *) data;
+        struct irlap_cb *self = from_timer(self, t, media_busy_timer);
 
         IRDA_ASSERT(self != NULL, return;);
 
diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 0f9348ba5d84..880085e2f24a 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -114,7 +114,7 @@ int ks_wlan_update_phy_information(struct ks_wlan_private *priv)
 }
 
 static
-void ks_wlan_update_phyinfo_timeout(unsigned long ptr)
+void ks_wlan_update_phyinfo_timeout(struct timer_list *unused)
 {
         DPRINTK(4, "in_interrupt = %ld\n", in_interrupt());
         atomic_set(&update_phyinfo, 0);
@@ -473,13 +473,16 @@ static int ks_wlan_set_rate(struct net_device *dev,
                                         priv->reg.rate_set.body[3] =
                                             TX_RATE_11M;
                                         i++;
+                                        /* fall through */
                                 case 5500000:
                                         priv->reg.rate_set.body[2] = TX_RATE_5M;
                                         i++;
+                                        /* fall through */
                                 case 2000000:
                                         priv->reg.rate_set.body[1] =
                                             TX_RATE_2M | BASIC_RATE;
                                         i++;
+                                        /* fall through */
                                 case 1000000:
                                         priv->reg.rate_set.body[0] =
                                             TX_RATE_1M | BASIC_RATE;
@@ -535,14 +538,17 @@ static int ks_wlan_set_rate(struct net_device *dev,
                                         priv->reg.rate_set.body[11] =
                                             TX_RATE_54M;
                                         i++;
+                                        /* fall through */
                                 case 48000000:
                                         priv->reg.rate_set.body[10] =
                                             TX_RATE_48M;
                                         i++;
+                                        /* fall through */
                                 case 36000000:
                                         priv->reg.rate_set.body[9] =
                                             TX_RATE_36M;
                                         i++;
+                                        /* fall through */
                                 case 24000000:
                                 case 18000000:
                                 case 12000000:
@@ -619,14 +625,17 @@ static int ks_wlan_set_rate(struct net_device *dev,
                                                     TX_RATE_6M | BASIC_RATE;
                                                 i++;
                                         }
+                                        /* fall through */
                                 case 5500000:
                                         priv->reg.rate_set.body[2] =
                                             TX_RATE_5M | BASIC_RATE;
                                         i++;
+                                        /* fall through */
                                 case 2000000:
                                         priv->reg.rate_set.body[1] =
                                             TX_RATE_2M | BASIC_RATE;
                                         i++;
+                                        /* fall through */
                                 case 1000000:
                                         priv->reg.rate_set.body[0] =
                                             TX_RATE_1M | BASIC_RATE;
@@ -2010,6 +2019,7 @@ static int ks_wlan_set_mlme(struct net_device *dev,
         case IW_MLME_DEAUTH:
                 if (mlme->reason_code == WLAN_REASON_MIC_FAILURE)
                         return 0;
+                /* fall through */
         case IW_MLME_DISASSOC:
                 mode = 1;
                 return ks_wlan_set_stop_request(dev, NULL, &mode, NULL);
@@ -2941,8 +2951,7 @@ int ks_wlan_net_start(struct net_device *dev)
 
         /* phy information update timer */
         atomic_set(&update_phyinfo, 0);
-        setup_timer(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout,
-                    (unsigned long)priv);
+        timer_setup(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout, 0);
 
         /* dummy address set */
         memcpy(priv->eth_addr, dummy_addr, ETH_ALEN);
diff --git a/drivers/staging/lustre/include/linux/libcfs/curproc.h b/drivers/staging/lustre/include/linux/libcfs/curproc.h
index 1ea27c9e3708..3cb3f086148e 100644
--- a/drivers/staging/lustre/include/linux/libcfs/curproc.h
+++ b/drivers/staging/lustre/include/linux/libcfs/curproc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
index b48e2f093bcc..6ad8867e5451 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h
index 6d8752a368fa..6d132f941281 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h
index 3f773a4a344b..e5c156e9d907 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index e7c37415a0c7..1b98f0953afb 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h
index fedb46dff696..d6fc3164e7e7 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
index 0cc2fc465c1a..5a27220cc608 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
index 8c75d5075590..d4c5965c43b1 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
index 709771d27f89..2f4ff595fac9 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
index 41795d9b3b9b..1191764c431a 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
index 008da4497bda..9699646decb9 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_time.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h
index 2accd9a85472..fc780f608e57 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
index fa0808d2953b..30e333af8d0d 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h
index dd0cd0442b86..854c84358ab4 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
index 709e1ce98d8d..aece13698eb4 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/lnet/api.h b/drivers/staging/lustre/include/linux/lnet/api.h
index 9c37f3e4b134..31fcd33171b4 100644
--- a/drivers/staging/lustre/include/linux/lnet/api.h
+++ b/drivers/staging/lustre/include/linux/lnet/api.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
index e0968ab8d95e..c1626726fa05 100644
--- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h b/drivers/staging/lustre/include/linux/lnet/lib-types.h
index eea3b8e5e406..cfe8ee424e94 100644
--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -160,9 +161,9 @@ struct lnet_libmd {
         } md_iov;
 };
 
-#define LNET_MD_FLAG_ZOMBIE             (1 << 0)
-#define LNET_MD_FLAG_AUTO_UNLINK        (1 << 1)
-#define LNET_MD_FLAG_ABORTED            (1 << 2)
+#define LNET_MD_FLAG_ZOMBIE             BIT(0)
+#define LNET_MD_FLAG_AUTO_UNLINK        BIT(1)
+#define LNET_MD_FLAG_ABORTED            BIT(2)
 
 struct lnet_test_peer {
         /* info about peers we are trying to fail */
@@ -287,9 +288,9 @@ struct lnet_ni {
  * of old LNet, so there shouldn't be any compatibility issue
  */
 #define LNET_PING_FEAT_INVAL            (0)             /* no feature */
-#define LNET_PING_FEAT_BASE             (1 << 0)        /* just a ping */
-#define LNET_PING_FEAT_NI_STATUS        (1 << 1)        /* return NI status */
-#define LNET_PING_FEAT_RTE_DISABLED     (1 << 2)        /* Routing enabled */
+#define LNET_PING_FEAT_BASE             BIT(0)  /* just a ping */
+#define LNET_PING_FEAT_NI_STATUS        BIT(1)  /* return NI status */
+#define LNET_PING_FEAT_RTE_DISABLED     BIT(2)  /* Routing enabled */
 
 #define LNET_PING_FEAT_MASK             (LNET_PING_FEAT_BASE | \
                                          LNET_PING_FEAT_NI_STATUS)
@@ -440,23 +441,21 @@ struct lnet_rtrbuf {
 
 enum lnet_match_flags {
         /* Didn't match anything */
-        LNET_MATCHMD_NONE       = (1 << 0),
+        LNET_MATCHMD_NONE       = BIT(0),
         /* Matched OK */
-        LNET_MATCHMD_OK         = (1 << 1),
+        LNET_MATCHMD_OK         = BIT(1),
         /* Must be discarded */
-        LNET_MATCHMD_DROP       = (1 << 2),
+        LNET_MATCHMD_DROP       = BIT(2),
         /* match and buffer is exhausted */
-        LNET_MATCHMD_EXHAUSTED  = (1 << 3),
+        LNET_MATCHMD_EXHAUSTED  = BIT(3),
         /* match or drop */
         LNET_MATCHMD_FINISH     = (LNET_MATCHMD_OK | LNET_MATCHMD_DROP),
 };
 
 /* Options for lnet_portal::ptl_options */
-#define LNET_PTL_LAZY           (1 << 0)
-#define LNET_PTL_MATCH_UNIQUE   (1 << 1)        /* unique match, for RDMA */
-#define LNET_PTL_MATCH_WILDCARD (1 << 2)        /* wildcard match,
-                                                 * request portal
-                                                 */
+#define LNET_PTL_LAZY           BIT(0)
+#define LNET_PTL_MATCH_UNIQUE   BIT(1)  /* unique match, for RDMA */
+#define LNET_PTL_MATCH_WILDCARD BIT(2)  /* wildcard match, request portal */
 
 /* parameter for matching operations (GET, PUT) */
 struct lnet_match_info {
diff --git a/drivers/staging/lustre/include/linux/lnet/socklnd.h b/drivers/staging/lustre/include/linux/lnet/socklnd.h
index 553fb64b3e80..6bd1bca190a3 100644
--- a/drivers/staging/lustre/include/linux/lnet/socklnd.h
+++ b/drivers/staging/lustre/include/linux/lnet/socklnd.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index 64763aacda57..8024843521ab 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
index a1e994a1cc84..171eced213f8 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 8fc191d99927..40e3af5d8b04 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
index 3fe4d4858eba..a71b765215ad 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index fbbd8a5489e9..f8ea523863ba 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -176,12 +177,9 @@ struct ksock_peer *
 ksocknal_find_peer_locked(struct lnet_ni *ni, struct lnet_process_id id)
 {
         struct list_head *peer_list = ksocknal_nid2peerlist(id.nid);
-        struct list_head *tmp;
         struct ksock_peer *peer;
 
-        list_for_each(tmp, peer_list) {
-                peer = list_entry(tmp, struct ksock_peer, ksnp_list);
-
+        list_for_each_entry(peer, peer_list, ksnp_list) {
                 LASSERT(!peer->ksnp_closing);
 
                 if (peer->ksnp_ni != ni)
@@ -453,7 +451,6 @@ int
 ksocknal_add_peer(struct lnet_ni *ni, struct lnet_process_id id, __u32 ipaddr,
                   int port)
 {
-        struct list_head *tmp;
         struct ksock_peer *peer;
         struct ksock_peer *peer2;
         struct ksock_route *route;
@@ -491,9 +488,7 @@ ksocknal_add_peer(struct lnet_ni *ni, struct lnet_process_id id, __u32 ipaddr,
         }
 
         route2 = NULL;
-        list_for_each(tmp, &peer->ksnp_routes) {
-                route2 = list_entry(tmp, struct ksock_route, ksnr_list);
-
+        list_for_each_entry(route2, &peer->ksnp_routes, ksnr_list) {
                 if (route2->ksnr_ipaddr == ipaddr)
                         break;
 
@@ -1854,12 +1849,10 @@ ksocknal_query(struct lnet_ni *ni, lnet_nid_t nid, unsigned long *when)
 
         peer = ksocknal_find_peer_locked(ni, id);
         if (peer) {
-                struct list_head *tmp;
                 struct ksock_conn *conn;
                 int bufnob;
 
-                list_for_each(tmp, &peer->ksnp_conns) {
-                        conn = list_entry(tmp, struct ksock_conn, ksnc_list);
+                list_for_each_entry(conn, &peer->ksnp_conns, ksnc_list) {
                         bufnob = conn->ksnc_sock->sk->sk_wmem_queued;
 
                         if (bufnob < conn->ksnc_tx_bufnob) {
@@ -2316,7 +2309,7 @@ ksocknal_base_shutdown(void)
         switch (ksocknal_data.ksnd_init) {
         default:
                 LASSERT(0);
-
+                /* fall through */
         case SOCKNAL_INIT_ALL:
         case SOCKNAL_INIT_DATA:
                 LASSERT(ksocknal_data.ksnd_peers);
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
index e6428c4b7aec..35a7b396def4 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  *
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
index 6b38d5a8fe92..a5f2ecb966fa 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  *
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
index 9c328dc6537b..970140f09258 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c
index fc7eec83ac07..5663a4ca94d4 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  *
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
index 84be9a518190..d827f770e831 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/debug.c b/drivers/staging/lustre/lnet/libcfs/debug.c
index 1ab394c1fabc..551c45bf4108 100644
--- a/drivers/staging/lustre/lnet/libcfs/debug.c
+++ b/drivers/staging/lustre/lnet/libcfs/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/fail.c b/drivers/staging/lustre/lnet/libcfs/fail.c
index 24f4701a7a1e..5d501beeb622 100644
--- a/drivers/staging/lustre/lnet/libcfs/fail.c
+++ b/drivers/staging/lustre/lnet/libcfs/fail.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/hash.c b/drivers/staging/lustre/lnet/libcfs/hash.c
index 49a04a2b4ec4..f4f67d2b301e 100644
--- a/drivers/staging/lustre/lnet/libcfs/hash.c
+++ b/drivers/staging/lustre/lnet/libcfs/hash.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
index 2ddd09a83cd0..e3a4c67a66b5 100644
--- a/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
+++ b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_lock.c b/drivers/staging/lustre/lnet/libcfs/libcfs_lock.c
index 77fd3d06cde9..f6a0040f4ab1 100644
--- a/drivers/staging/lustre/lnet/libcfs/libcfs_lock.c
+++ b/drivers/staging/lustre/lnet/libcfs/libcfs_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c b/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c
index 1a0c7cad5983..df93d8f77ea2 100644
--- a/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c
+++ b/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_string.c b/drivers/staging/lustre/lnet/libcfs/libcfs_string.c
index 333e47febf87..bcac5074bf80 100644
--- a/drivers/staging/lustre/lnet/libcfs/libcfs_string.c
+++ b/drivers/staging/lustre/lnet/libcfs/libcfs_string.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
index 2da051c0d251..51823ce71773 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c
index db0572733712..2e5d311d2438 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
index 55663390b608..80072b2a443c 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h
index d0b3aa80cfa6..5616e9ea1450 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
index 528d49794881..1d8949f1a4fa 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c
index 972677bdf6bc..0092166af258 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c
index 3f5dec153571..963df0ef4afb 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 only,
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
index 435722175cce..b5746230ab31 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
index 4e331e71083d..6f92ea272186 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c
index 16a3ae791bb6..7928d7182634 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/module.c b/drivers/staging/lustre/lnet/libcfs/module.c
index 6aed98fc9688..4ead55920e79 100644
--- a/drivers/staging/lustre/lnet/libcfs/module.c
+++ b/drivers/staging/lustre/lnet/libcfs/module.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/prng.c b/drivers/staging/lustre/lnet/libcfs/prng.c
index 963ef4ae93b1..f47cf67a92e3 100644
--- a/drivers/staging/lustre/lnet/libcfs/prng.c
+++ b/drivers/staging/lustre/lnet/libcfs/prng.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/tracefile.c b/drivers/staging/lustre/lnet/libcfs/tracefile.c
index f916b475e767..da2844f37edf 100644
--- a/drivers/staging/lustre/lnet/libcfs/tracefile.c
+++ b/drivers/staging/lustre/lnet/libcfs/tracefile.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/tracefile.h b/drivers/staging/lustre/lnet/libcfs/tracefile.h
index c3547cd4c72c..a29d6eb3a785 100644
--- a/drivers/staging/lustre/lnet/libcfs/tracefile.h
+++ b/drivers/staging/lustre/lnet/libcfs/tracefile.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/libcfs/workitem.c b/drivers/staging/lustre/lnet/libcfs/workitem.c
index 038ed8c52107..6a05d9bab8dc 100644
--- a/drivers/staging/lustre/lnet/libcfs/workitem.c
+++ b/drivers/staging/lustre/lnet/libcfs/workitem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/acceptor.c b/drivers/staging/lustre/lnet/lnet/acceptor.c
index be2823f8eb02..ee85cab6f437 100644
--- a/drivers/staging/lustre/lnet/lnet/acceptor.c
+++ b/drivers/staging/lustre/lnet/lnet/acceptor.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index ad835035fffa..7caff290c146 100644
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/config.c b/drivers/staging/lustre/lnet/lnet/config.c
index 26841a7b6213..0cf0f4f99435 100644
--- a/drivers/staging/lustre/lnet/lnet/config.c
+++ b/drivers/staging/lustre/lnet/lnet/config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/lib-eq.c b/drivers/staging/lustre/lnet/lnet/lib-eq.c
index 6b446a51eeac..daf744277003 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-eq.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-eq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/lib-md.c b/drivers/staging/lustre/lnet/lnet/lib-md.c
index a0aef4b9bce3..ac5b9593d597 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-md.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-md.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/lib-me.c b/drivers/staging/lustre/lnet/lnet/lib-me.c
index f52a5e8ed386..dd5d3cf6d3e2 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-me.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-me.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/lib-move.c b/drivers/staging/lustre/lnet/lnet/lib-move.c
index bc0779c02d97..27848cd69564 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-move.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-move.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/lib-msg.c b/drivers/staging/lustre/lnet/lnet/lib-msg.c
index d04875e3956f..c72ef05b2420 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-msg.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-msg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/lib-ptl.c b/drivers/staging/lustre/lnet/lnet/lib-ptl.c
index 5946848a7846..8ae93bf6fd1b 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-ptl.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-ptl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/lib-socket.c b/drivers/staging/lustre/lnet/lnet/lib-socket.c
index 7d0add0c0de3..539a26444f31 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-socket.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-socket.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/lo.c b/drivers/staging/lustre/lnet/lnet/lo.c
index 80c06f4b0c8d..7456b989e451 100644
--- a/drivers/staging/lustre/lnet/lnet/lo.c
+++ b/drivers/staging/lustre/lnet/lnet/lo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/module.c b/drivers/staging/lustre/lnet/lnet/module.c
index 7d12a7fb36a4..c0c4723f72fd 100644
--- a/drivers/staging/lustre/lnet/lnet/module.c
+++ b/drivers/staging/lustre/lnet/lnet/module.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/net_fault.c b/drivers/staging/lustre/lnet/lnet/net_fault.c
index 03f3d18a1a29..3c83aa31e2c2 100644
--- a/drivers/staging/lustre/lnet/lnet/net_fault.c
+++ b/drivers/staging/lustre/lnet/lnet/net_fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -629,6 +630,7 @@ delayed_msg_process(struct list_head *msg_list, bool drop)
                         case LNET_CREDIT_OK:
                                 lnet_ni_recv(ni, msg->msg_private, msg, 0,
                                              0, msg->msg_len, msg->msg_len);
+                                /* fall through */
                         case LNET_CREDIT_WAIT:
                                 continue;
                         default: /* failures */
diff --git a/drivers/staging/lustre/lnet/lnet/nidstrings.c b/drivers/staging/lustre/lnet/lnet/nidstrings.c
index 7bd1e6f389aa..05b120c2d45a 100644
--- a/drivers/staging/lustre/lnet/lnet/nidstrings.c
+++ b/drivers/staging/lustre/lnet/lnet/nidstrings.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/peer.c b/drivers/staging/lustre/lnet/lnet/peer.c
index 4d55df8ff74e..5e94ad349454 100644
--- a/drivers/staging/lustre/lnet/lnet/peer.c
+++ b/drivers/staging/lustre/lnet/lnet/peer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c
index 3df101bafd9f..88283ca3f860 100644
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  *
@@ -222,15 +223,12 @@ struct lnet_remotenet *
 lnet_find_net_locked(__u32 net)
 {
         struct lnet_remotenet *rnet;
-        struct list_head *tmp;
         struct list_head *rn_list;
 
         LASSERT(!the_lnet.ln_shutdown);
 
         rn_list = lnet_net2rnethash(net);
-        list_for_each(tmp, rn_list) {
-                rnet = list_entry(tmp, struct lnet_remotenet, lrn_list);
-
+        list_for_each_entry(rnet, rn_list, lrn_list) {
                 if (rnet->lrn_net == net)
                         return rnet;
         }
@@ -243,7 +241,6 @@ static void lnet_shuffle_seed(void)
         __u32 lnd_type, seed[2];
         struct timespec64 ts;
         struct lnet_ni *ni;
-        struct list_head *tmp;
 
         if (seeded)
                 return;
@@ -254,8 +251,7 @@ static void lnet_shuffle_seed(void)
          * Nodes with small feet have little entropy
          * the NID for this node gives the most entropy in the low bits
          */
-        list_for_each(tmp, &the_lnet.ln_nis) {
-                ni = list_entry(tmp, struct lnet_ni, ni_list);
+        list_for_each_entry(ni, &the_lnet.ln_nis, ni_list) {
                 lnd_type = LNET_NETTYP(LNET_NIDNET(ni->ni_nid));
 
                 if (lnd_type != LOLND)
diff --git a/drivers/staging/lustre/lnet/lnet/router_proc.c b/drivers/staging/lustre/lnet/lnet/router_proc.c
index 4a994d113c7d..d32d653edcb0 100644
--- a/drivers/staging/lustre/lnet/lnet/router_proc.c
+++ b/drivers/staging/lustre/lnet/lnet/router_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  *
diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
index f8b9175f08d4..f1ee219bc8f3 100644
--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/selftest/conctl.c b/drivers/staging/lustre/lnet/selftest/conctl.c
index 9619ecbf8bdf..082c0afacf23 100644
--- a/drivers/staging/lustre/lnet/selftest/conctl.c
+++ b/drivers/staging/lustre/lnet/selftest/conctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -151,6 +152,7 @@ lst_debug_ioctl(struct lstio_debug_args *args)
 
         case LST_OPC_BATCHSRV:
                 client = 0;
+                /* fall through */
         case LST_OPC_BATCHCLI:
                 if (!name)
                         goto out;
diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.c b/drivers/staging/lustre/lnet/selftest/conrpc.c
index 196d23c10921..6a0f770e0e24 100644
--- a/drivers/staging/lustre/lnet/selftest/conrpc.c
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.h b/drivers/staging/lustre/lnet/selftest/conrpc.h
index 239323679baa..374a5f31ef6f 100644
--- a/drivers/staging/lustre/lnet/selftest/conrpc.h
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c
index 289b202c3b36..a2662638d599 100644
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/selftest/console.h b/drivers/staging/lustre/lnet/selftest/console.h
index 143eae9b8d71..3933ed4cca93 100644
--- a/drivers/staging/lustre/lnet/selftest/console.h
+++ b/drivers/staging/lustre/lnet/selftest/console.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
index ef27bfffc230..fe889607ff3f 100644
--- a/drivers/staging/lustre/lnet/selftest/framework.c
+++ b/drivers/staging/lustre/lnet/selftest/framework.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/selftest/module.c b/drivers/staging/lustre/lnet/selftest/module.c
index b5d556fa48ab..1d44d912f014 100644
--- a/drivers/staging/lustre/lnet/selftest/module.c
+++ b/drivers/staging/lustre/lnet/selftest/module.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -57,10 +58,13 @@ lnet_selftest_exit(void)
         switch (lst_init_step) {
         case LST_INIT_CONSOLE:
                 lstcon_console_fini();
+                /* fall through */
         case LST_INIT_FW:
                 sfw_shutdown();
+                /* fall through */
         case LST_INIT_RPC:
                 srpc_shutdown();
+                /* fall through */
         case LST_INIT_WI_TEST:
                 for (i = 0;
                      i < cfs_cpt_number(lnet_cpt_table()); i++) {
@@ -72,7 +76,7 @@ lnet_selftest_exit(void)
                             sizeof(lst_sched_test[0]) *
                             cfs_cpt_number(lnet_cpt_table()));
                 lst_sched_test = NULL;
-
+                /* fall through */
         case LST_INIT_WI_SERIAL:
                 cfs_wi_sched_destroy(lst_sched_serial);
                 lst_sched_serial = NULL;
diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
index 9653ac6fd619..f54bd630dbf8 100644
--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c
index 77c222cca230..ab7e8a8e58b8 100644
--- a/drivers/staging/lustre/lnet/selftest/rpc.c
+++ b/drivers/staging/lustre/lnet/selftest/rpc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -1037,6 +1038,7 @@ srpc_handle_rpc(struct swi_workitem *wi)
                         ev->ev_status = rc;
                 }
         }
+                /* fall through */
         case SWI_STATE_BULK_STARTED:
                 LASSERT(!rpc->srpc_bulk || ev->ev_fired);
 
@@ -1237,7 +1239,8 @@ srpc_send_rpc(struct swi_workitem *wi)
                         break;
 
                 wi->swi_state = SWI_STATE_REQUEST_SENT;
-                /* perhaps more events, fall thru */
+                /* perhaps more events */
+                /* fall through */
         case SWI_STATE_REQUEST_SENT: {
                 enum srpc_msg_type type = srpc_service2reply(rpc->crpc_service);
 
@@ -1269,6 +1272,7 @@ srpc_send_rpc(struct swi_workitem *wi)
 
                 wi->swi_state = SWI_STATE_REPLY_RECEIVED;
         }
+                /* fall through */
         case SWI_STATE_REPLY_RECEIVED:
                 if (do_bulk && !rpc->crpc_bulkev.ev_fired)
                         break;
@@ -1448,6 +1452,7 @@ srpc_lnet_ev_handler(struct lnet_event *ev)
                         srpc_data.rpc_counters.rpcs_sent++;
                         spin_unlock(&srpc_data.rpc_glock);
                 }
+                /* fall through */
         case SRPC_REPLY_RCVD:
         case SRPC_BULK_REQ_RCVD:
                 crpc = rpcev->ev_data;
@@ -1570,7 +1575,7 @@ srpc_lnet_ev_handler(struct lnet_event *ev)
 
                 if (!ev->unlinked)
                         break; /* wait for final event */
-
+                /* fall through */
         case SRPC_BULK_PUT_SENT:
                 if (!ev->status && ev->type != LNET_EVENT_UNLINK) {
                         spin_lock(&srpc_data.rpc_glock);
@@ -1582,6 +1587,7 @@ srpc_lnet_ev_handler(struct lnet_event *ev)
 
                         spin_unlock(&srpc_data.rpc_glock);
                 }
+                /* fall through */
         case SRPC_REPLY_SENT:
                 srpc = rpcev->ev_data;
                 scd = srpc->srpc_scd;
@@ -1674,14 +1680,14 @@ srpc_shutdown(void)
                 spin_unlock(&srpc_data.rpc_glock);
 
                 stt_shutdown();
-
+                /* fall through */
         case SRPC_STATE_EQ_INIT:
                 rc = LNetClearLazyPortal(SRPC_FRAMEWORK_REQUEST_PORTAL);
                 rc = LNetClearLazyPortal(SRPC_REQUEST_PORTAL);
                 LASSERT(!rc);
                 rc = LNetEQFree(srpc_data.rpc_lnet_eq);
                 LASSERT(!rc); /* the EQ should have no user by now */
-
+                /* fall through */
         case SRPC_STATE_NI_INIT:
                 LNetNIFini();
         }
diff --git a/drivers/staging/lustre/lnet/selftest/rpc.h b/drivers/staging/lustre/lnet/selftest/rpc.h
index 7bb442a8e698..465b5b534423 100644
--- a/drivers/staging/lustre/lnet/selftest/rpc.h
+++ b/drivers/staging/lustre/lnet/selftest/rpc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h b/drivers/staging/lustre/lnet/selftest/selftest.h
index 7adad4302dcf..8c10f0f149d5 100644
--- a/drivers/staging/lustre/lnet/selftest/selftest.h
+++ b/drivers/staging/lustre/lnet/selftest/selftest.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/selftest/timer.c b/drivers/staging/lustre/lnet/selftest/timer.c
index 2fe692df19d0..ab125a8524c5 100644
--- a/drivers/staging/lustre/lnet/selftest/timer.c
+++ b/drivers/staging/lustre/lnet/selftest/timer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lnet/selftest/timer.h b/drivers/staging/lustre/lnet/selftest/timer.h
index 441d6d6b4f8e..7f0ef9bd0cda 100644
--- a/drivers/staging/lustre/lnet/selftest/timer.h
+++ b/drivers/staging/lustre/lnet/selftest/timer.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/fid/fid_internal.h b/drivers/staging/lustre/lustre/fid/fid_internal.h
index f48ab9d21428..b7b8f900df8e 100644
--- a/drivers/staging/lustre/lustre/fid/fid_internal.h
+++ b/drivers/staging/lustre/lustre/fid/fid_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/fid/fid_lib.c b/drivers/staging/lustre/lustre/fid/fid_lib.c
index c21a5f5b7621..9577da33e666 100644
--- a/drivers/staging/lustre/lustre/fid/fid_lib.c
+++ b/drivers/staging/lustre/lustre/fid/fid_lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/fid/fid_request.c b/drivers/staging/lustre/lustre/fid/fid_request.c
index ba736239243c..009c2367f74e 100644
--- a/drivers/staging/lustre/lustre/fid/fid_request.c
+++ b/drivers/staging/lustre/lustre/fid/fid_request.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -279,7 +280,8 @@ int seq_client_alloc_fid(const struct lu_env *env,
         *fid = seq->lcs_fid;
         mutex_unlock(&seq->lcs_mutex);
 
-        CDEBUG(D_INFO, "%s: Allocated FID " DFID "\n", seq->lcs_name,  PFID(fid));
+        CDEBUG(D_INFO,
+               "%s: Allocated FID " DFID "\n", seq->lcs_name,  PFID(fid));
         return rc;
 }
 EXPORT_SYMBOL(seq_client_alloc_fid);
diff --git a/drivers/staging/lustre/lustre/fid/lproc_fid.c b/drivers/staging/lustre/lustre/fid/lproc_fid.c
index 1a269fbc4b47..083419f77697 100644
--- a/drivers/staging/lustre/lustre/fid/lproc_fid.c
+++ b/drivers/staging/lustre/lustre/fid/lproc_fid.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/fld/fld_cache.c b/drivers/staging/lustre/lustre/fld/fld_cache.c
index b723ece02eff..7d6a7106c0a5 100644
--- a/drivers/staging/lustre/lustre/fld/fld_cache.c
+++ b/drivers/staging/lustre/lustre/fld/fld_cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/fld/fld_internal.h b/drivers/staging/lustre/lustre/fld/fld_internal.h
index fe6f278a7d9f..b5e3abaa508a 100644
--- a/drivers/staging/lustre/lustre/fld/fld_internal.h
+++ b/drivers/staging/lustre/lustre/fld/fld_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/fld/fld_request.c b/drivers/staging/lustre/lustre/fld/fld_request.c
index 5b180830eec0..068c364adda8 100644
--- a/drivers/staging/lustre/lustre/fld/fld_request.c
+++ b/drivers/staging/lustre/lustre/fld/fld_request.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -425,7 +426,8 @@ int fld_client_lookup(struct lu_client_fld *fld, u64 seq, u32 *mds,
         target = fld_client_get_target(fld, seq);
         LASSERT(target);
 
-        CDEBUG(D_INFO, "%s: Lookup fld entry (seq: %#llx) on target %s (idx %llu)\n",
+        CDEBUG(D_INFO,
+               "%s: Lookup fld entry (seq: %#llx) on target %s (idx %llu)\n",
                fld->lcf_name, seq, fld_target_name(target), target->ft_idx);
 
         res.lsr_start = seq;
diff --git a/drivers/staging/lustre/lustre/fld/lproc_fld.c b/drivers/staging/lustre/lustre/fld/lproc_fld.c
index 6cae803fc8d2..1a6a76110c3e 100644
--- a/drivers/staging/lustre/lustre/fld/lproc_fld.c
+++ b/drivers/staging/lustre/lustre/fld/lproc_fld.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/cl_object.h b/drivers/staging/lustre/lustre/include/cl_object.h
index 9ba184b6017f..90419dca2e1e 100644
--- a/drivers/staging/lustre/lustre/include/cl_object.h
+++ b/drivers/staging/lustre/lustre/include/cl_object.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/interval_tree.h b/drivers/staging/lustre/lustre/include/interval_tree.h
index a4d7280e1fa4..7d119c1a0469 100644
--- a/drivers/staging/lustre/lustre/include/interval_tree.h
+++ b/drivers/staging/lustre/lustre/include/interval_tree.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/llog_swab.h b/drivers/staging/lustre/lustre/include/llog_swab.h
index 925271db4554..0433b79efdcb 100644
--- a/drivers/staging/lustre/lustre/include/llog_swab.h
+++ b/drivers/staging/lustre/lustre/include/llog_swab.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h b/drivers/staging/lustre/lustre/include/lprocfs_status.h
index 98d6b1364c21..835a729dd8d0 100644
--- a/drivers/staging/lustre/lustre/include/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lu_object.h b/drivers/staging/lustre/lustre/include/lu_object.h
index 4f213c408cfa..34e35fbff978 100644
--- a/drivers/staging/lustre/lustre/include/lu_object.h
+++ b/drivers/staging/lustre/lustre/include/lu_object.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -1130,7 +1131,7 @@ struct lu_context_key {
         {                                                        \
                 type *value;                                  \
                                                                   \
-                BUILD_BUG_ON(PAGE_SIZE < sizeof(*value));        \
+                BUILD_BUG_ON(sizeof(*value) > PAGE_SIZE);        \
                                                                   \
                 value = kzalloc(sizeof(*value), GFP_NOFS);      \
                 if (!value)                             \
@@ -1303,8 +1304,6 @@ struct lu_buf {
         size_t  lb_len;
 };
 
-#define DLUBUF "(%p %zu)"
-#define PLUBUF(buf) (buf)->lb_buf, (buf)->lb_len
 /**
  * One-time initializers, called at obdclass module initialization, not
  * exported.
diff --git a/drivers/staging/lustre/lustre/include/lu_ref.h b/drivers/staging/lustre/lustre/include/lu_ref.h
index f7dfd83951ee..ad0c24d29ffa 100644
--- a/drivers/staging/lustre/lustre/include/lu_ref.h
+++ b/drivers/staging/lustre/lustre/include/lu_ref.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
diff --git a/drivers/staging/lustre/lustre/include/lustre_acl.h b/drivers/staging/lustre/lustre/include/lustre_acl.h
index 9786f6caaade..35ff61ce4e9d 100644
--- a/drivers/staging/lustre/lustre/include/lustre_acl.h
+++ b/drivers/staging/lustre/lustre/include/lustre_acl.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_compat.h b/drivers/staging/lustre/lustre/include/lustre_compat.h
index 69bfd6a6e0f9..9f488e605083 100644
--- a/drivers/staging/lustre/lustre/include/lustre_compat.h
+++ b/drivers/staging/lustre/lustre/include/lustre_compat.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_debug.h b/drivers/staging/lustre/lustre/include/lustre_debug.h
index 0be6a534f712..721a81f923e3 100644
--- a/drivers/staging/lustre/lustre/include/lustre_debug.h
+++ b/drivers/staging/lustre/lustre/include/lustre_debug.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_disk.h b/drivers/staging/lustre/lustre/include/lustre_disk.h
index 2d862b32265b..8f1a22527006 100644
--- a/drivers/staging/lustre/lustre/include/lustre_disk.h
+++ b/drivers/staging/lustre/lustre/include/lustre_disk.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index 13c3d2fd31a8..e0b17052b2ea 100644
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm_flags.h b/drivers/staging/lustre/lustre/include/lustre_dlm_flags.h
index 11331ae81d58..53db031c4c8c 100644
--- a/drivers/staging/lustre/lustre/include/lustre_dlm_flags.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm_flags.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*  -*- buffer-read-only: t -*- vi: set ro:
  *
  * This program is free software; you can redistribute it and/or modify
@@ -136,7 +137,8 @@
 #define ldlm_clear_cancel_on_block(_l)  LDLM_CLEAR_FLAG((_l), 1ULL << 23)
 
 /**
- * measure lock contention and return -EUSERS if locking contention is high */
+ * measure lock contention and return -EUSERS if locking contention is high
+ */
 #define LDLM_FL_DENY_ON_CONTENTION        0x0000000040000000ULL /* bit 30 */
 #define ldlm_is_deny_on_contention(_l)    LDLM_TEST_FLAG((_l), 1ULL << 30)
 #define ldlm_set_deny_on_contention(_l)   LDLM_SET_FLAG((_l), 1ULL << 30)
@@ -144,7 +146,8 @@
 
 /**
  * These are flags that are mapped into the flags and ASTs of blocking
- * locks Add FL_DISCARD to blocking ASTs */
+ * locks Add FL_DISCARD to blocking ASTs
+ */
 #define LDLM_FL_AST_DISCARD_DATA        0x0000000080000000ULL /* bit 31 */
 #define ldlm_is_ast_discard_data(_l)    LDLM_TEST_FLAG((_l), 1ULL << 31)
 #define ldlm_set_ast_discard_data(_l)   LDLM_SET_FLAG((_l), 1ULL << 31)
diff --git a/drivers/staging/lustre/lustre/include/lustre_errno.h b/drivers/staging/lustre/lustre/include/lustre_errno.h
index 35aefa2cdad1..59fbb9f47ff1 100644
--- a/drivers/staging/lustre/lustre/include/lustre_errno.h
+++ b/drivers/staging/lustre/lustre/include/lustre_errno.h
@@ -70,16 +70,14 @@
 #define LUSTRE_EROFS            30      /* Read-only file system */
 #define LUSTRE_EMLINK           31      /* Too many links */
 #define LUSTRE_EPIPE            32      /* Broken pipe */
-#define LUSTRE_EDOM             33      /* Math argument out of domain of
-                                           func */
+#define LUSTRE_EDOM             33      /* Math argument out of func domain */
 #define LUSTRE_ERANGE           34      /* Math result not representable */
 #define LUSTRE_EDEADLK          35      /* Resource deadlock would occur */
 #define LUSTRE_ENAMETOOLONG     36      /* File name too long */
 #define LUSTRE_ENOLCK           37      /* No record locks available */
 #define LUSTRE_ENOSYS           38      /* Function not implemented */
 #define LUSTRE_ENOTEMPTY        39      /* Directory not empty */
-#define LUSTRE_ELOOP            40      /* Too many symbolic links
-                                           encountered */
+#define LUSTRE_ELOOP            40      /* Too many symbolic links found */
 #define LUSTRE_ENOMSG           42      /* No message of desired type */
 #define LUSTRE_EIDRM            43      /* Identifier removed */
 #define LUSTRE_ECHRNG           44      /* Channel number out of range */
@@ -112,23 +110,17 @@
 #define LUSTRE_EMULTIHOP        72      /* Multihop attempted */
 #define LUSTRE_EDOTDOT          73      /* RFS specific error */
 #define LUSTRE_EBADMSG          74      /* Not a data message */
-#define LUSTRE_EOVERFLOW        75      /* Value too large for defined data
-                                           type */
+#define LUSTRE_EOVERFLOW        75      /* Value too large for data type */
 #define LUSTRE_ENOTUNIQ         76      /* Name not unique on network */
 #define LUSTRE_EBADFD           77      /* File descriptor in bad state */
 #define LUSTRE_EREMCHG          78      /* Remote address changed */
-#define LUSTRE_ELIBACC          79      /* Can not access a needed shared
-                                           library */
-#define LUSTRE_ELIBBAD          80      /* Accessing a corrupted shared
-                                           library */
+#define LUSTRE_ELIBACC          79      /* Can't access needed shared library */
+#define LUSTRE_ELIBBAD          80      /* Access corrupted shared library */
 #define LUSTRE_ELIBSCN          81      /* .lib section in a.out corrupted */
-#define LUSTRE_ELIBMAX          82      /* Attempting to link in too many shared
-                                           libraries */
-#define LUSTRE_ELIBEXEC         83      /* Cannot exec a shared library
-                                           directly */
+#define LUSTRE_ELIBMAX          82      /* Trying to link too many libraries */
+#define LUSTRE_ELIBEXEC         83      /* Cannot exec a shared lib directly */
 #define LUSTRE_EILSEQ           84      /* Illegal byte sequence */
-#define LUSTRE_ERESTART         85      /* Interrupted system call should be
-                                           restarted */
+#define LUSTRE_ERESTART         85      /* Restart interrupted system call */
 #define LUSTRE_ESTRPIPE         86      /* Streams pipe error */
 #define LUSTRE_EUSERS           87      /* Too many users */
 #define LUSTRE_ENOTSOCK         88      /* Socket operation on non-socket */
@@ -138,26 +130,20 @@
 #define LUSTRE_ENOPROTOOPT      92      /* Protocol not available */
 #define LUSTRE_EPROTONOSUPPORT  93      /* Protocol not supported */
 #define LUSTRE_ESOCKTNOSUPPORT  94      /* Socket type not supported */
-#define LUSTRE_EOPNOTSUPP       95      /* Operation not supported on transport
-                                           endpoint */
+#define LUSTRE_EOPNOTSUPP       95      /* Operation not supported */
 #define LUSTRE_EPFNOSUPPORT     96      /* Protocol family not supported */
-#define LUSTRE_EAFNOSUPPORT     97      /* Address family not supported by
-                                           protocol */
+#define LUSTRE_EAFNOSUPPORT     97      /* Address family not supported */
 #define LUSTRE_EADDRINUSE       98      /* Address already in use */
 #define LUSTRE_EADDRNOTAVAIL    99      /* Cannot assign requested address */
 #define LUSTRE_ENETDOWN         100     /* Network is down */
 #define LUSTRE_ENETUNREACH      101     /* Network is unreachable */
-#define LUSTRE_ENETRESET        102     /* Network dropped connection because of
-                                           reset */
+#define LUSTRE_ENETRESET        102     /* Network connection drop for reset */
 #define LUSTRE_ECONNABORTED     103     /* Software caused connection abort */
 #define LUSTRE_ECONNRESET       104     /* Connection reset by peer */
 #define LUSTRE_ENOBUFS          105     /* No buffer space available */
-#define LUSTRE_EISCONN          106     /* Transport endpoint is already
-                                           connected */
-#define LUSTRE_ENOTCONN         107     /* Transport endpoint is not
-                                           connected */
-#define LUSTRE_ESHUTDOWN        108     /* Cannot send after transport endpoint
-                                           shutdown */
+#define LUSTRE_EISCONN          106     /* Transport endpoint is connected */
+#define LUSTRE_ENOTCONN         107     /* Transport endpoint not connected */
+#define LUSTRE_ESHUTDOWN        108     /* Cannot send after shutdown */
 #define LUSTRE_ETOOMANYREFS     109     /* Too many references: cannot splice */
 #define LUSTRE_ETIMEDOUT        110     /* Connection timed out */
 #define LUSTRE_ECONNREFUSED     111     /* Connection refused */
@@ -185,8 +171,7 @@
 #define LUSTRE_ERESTARTNOINTR   513
 #define LUSTRE_ERESTARTNOHAND   514     /* restart if no handler.. */
 #define LUSTRE_ENOIOCTLCMD      515     /* No ioctl command */
-#define LUSTRE_ERESTART_RESTARTBLOCK 516 /* restart by calling
-                                            sys_restart_syscall */
+#define LUSTRE_ERESTART_RESTARTBLOCK 516 /* restart via sys_restart_syscall */
 #define LUSTRE_EBADHANDLE       521     /* Illegal NFS file handle */
 #define LUSTRE_ENOTSYNC         522     /* Update synchronization mismatch */
 #define LUSTRE_EBADCOOKIE       523     /* Cookie is stale */
@@ -194,10 +179,8 @@
 #define LUSTRE_ETOOSMALL        525     /* Buffer or request is too small */
 #define LUSTRE_ESERVERFAULT     526     /* An untranslatable error occurred */
 #define LUSTRE_EBADTYPE         527     /* Type not supported by server */
-#define LUSTRE_EJUKEBOX         528     /* Request initiated, but will not
-                                           complete before timeout */
-#define LUSTRE_EIOCBQUEUED      529     /* iocb queued, will get completion
-                                           event */
+#define LUSTRE_EJUKEBOX         528     /* Request won't finish until timeout */
+#define LUSTRE_EIOCBQUEUED      529     /* iocb queued await completion event */
 #define LUSTRE_EIOCBRETRY       530     /* iocb queued, will trigger a retry */
 
 /*
diff --git a/drivers/staging/lustre/lustre/include/lustre_export.h b/drivers/staging/lustre/lustre/include/lustre_export.h
index 3631a69a5c6f..66ac9dc7302a 100644
--- a/drivers/staging/lustre/lustre/include/lustre_export.h
+++ b/drivers/staging/lustre/lustre/include/lustre_export.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_fid.h b/drivers/staging/lustre/lustre/include/lustre_fid.h
index e0f2b8295775..d19c7a27ee48 100644
--- a/drivers/staging/lustre/lustre/include/lustre_fid.h
+++ b/drivers/staging/lustre/lustre/include/lustre_fid.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_fld.h b/drivers/staging/lustre/lustre/include/lustre_fld.h
index 6125eb0d3395..4055bbd24c55 100644
--- a/drivers/staging/lustre/lustre/include/lustre_fld.h
+++ b/drivers/staging/lustre/lustre/include/lustre_fld.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_ha.h b/drivers/staging/lustre/lustre/include/lustre_ha.h
index dec1e99d594d..cbd68985ada9 100644
--- a/drivers/staging/lustre/lustre/include/lustre_ha.h
+++ b/drivers/staging/lustre/lustre/include/lustre_ha.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_handles.h b/drivers/staging/lustre/lustre/include/lustre_handles.h
index d49932628f32..c48c97362cf6 100644
--- a/drivers/staging/lustre/lustre/include/lustre_handles.h
+++ b/drivers/staging/lustre/lustre/include/lustre_handles.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_import.h b/drivers/staging/lustre/lustre/include/lustre_import.h
index d71d0473a4eb..ea158e0630e2 100644
--- a/drivers/staging/lustre/lustre/include/lustre_import.h
+++ b/drivers/staging/lustre/lustre/include/lustre_import.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_intent.h b/drivers/staging/lustre/lustre/include/lustre_intent.h
index ed2b6c674109..519e94fc089d 100644
--- a/drivers/staging/lustre/lustre/include/lustre_intent.h
+++ b/drivers/staging/lustre/lustre/include/lustre_intent.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h b/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h
index f1899a3d7a40..2b3fa8430185 100644
--- a/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_lib.h b/drivers/staging/lustre/lustre/include/lustre_lib.h
index 81b9cbffc050..ca1dce15337e 100644
--- a/drivers/staging/lustre/lustre/include/lustre_lib.h
+++ b/drivers/staging/lustre/lustre/include/lustre_lib.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_linkea.h b/drivers/staging/lustre/lustre/include/lustre_linkea.h
index 3ff008fee13d..03db1511bfd3 100644
--- a/drivers/staging/lustre/lustre/include/lustre_linkea.h
+++ b/drivers/staging/lustre/lustre/include/lustre_linkea.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_lmv.h b/drivers/staging/lustre/lustre/include/lustre_lmv.h
index 98a82be2037f..f4298e5f7543 100644
--- a/drivers/staging/lustre/lustre/include/lustre_lmv.h
+++ b/drivers/staging/lustre/lustre/include/lustre_lmv.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_log.h b/drivers/staging/lustre/lustre/include/lustre_log.h
index 24a7777424f6..07f4e600386b 100644
--- a/drivers/staging/lustre/lustre/include/lustre_log.h
+++ b/drivers/staging/lustre/lustre/include/lustre_log.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_mdc.h b/drivers/staging/lustre/lustre/include/lustre_mdc.h
index c0c44974cb1c..007e1ec3f0f4 100644
--- a/drivers/staging/lustre/lustre/include/lustre_mdc.h
+++ b/drivers/staging/lustre/lustre/include/lustre_mdc.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_mds.h b/drivers/staging/lustre/lustre/include/lustre_mds.h
index c424e1239fd5..6937546f1d46 100644
--- a/drivers/staging/lustre/lustre/include/lustre_mds.h
+++ b/drivers/staging/lustre/lustre/include/lustre_mds.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h
index c6d1646f102a..3ff5de4770e8 100644
--- a/drivers/staging/lustre/lustre/include/lustre_net.h
+++ b/drivers/staging/lustre/lustre/include/lustre_net.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_nrs.h b/drivers/staging/lustre/lustre/include/lustre_nrs.h
index 51f45f7776df..ffa7317da35b 100644
--- a/drivers/staging/lustre/lustre/include/lustre_nrs.h
+++ b/drivers/staging/lustre/lustre/include/lustre_nrs.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h b/drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h
index 3b5418eac6c4..b70d97d4acbb 100644
--- a/drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h
+++ b/drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_obdo.h b/drivers/staging/lustre/lustre/include/lustre_obdo.h
index 53379f861161..d67dcbb84f18 100644
--- a/drivers/staging/lustre/lustre/include/lustre_obdo.h
+++ b/drivers/staging/lustre/lustre/include/lustre_obdo.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_patchless_compat.h b/drivers/staging/lustre/lustre/include/lustre_patchless_compat.h
index 5842cb18b49e..ce28ed5c1ef8 100644
--- a/drivers/staging/lustre/lustre/include/lustre_patchless_compat.h
+++ b/drivers/staging/lustre/lustre/include/lustre_patchless_compat.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_req_layout.h b/drivers/staging/lustre/lustre/include/lustre_req_layout.h
index cd62ccd53e2c..213d0a01adcf 100644
--- a/drivers/staging/lustre/lustre/include/lustre_req_layout.h
+++ b/drivers/staging/lustre/lustre/include/lustre_req_layout.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h b/drivers/staging/lustre/lustre/include/lustre_sec.h
index 03a970bcac55..a40f706a53a1 100644
--- a/drivers/staging/lustre/lustre/include/lustre_sec.h
+++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/lustre_swab.h b/drivers/staging/lustre/lustre/include/lustre_swab.h
index 765e923c2fc9..9d786bbe7f3f 100644
--- a/drivers/staging/lustre/lustre/include/lustre_swab.h
+++ b/drivers/staging/lustre/lustre/include/lustre_swab.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
index a986737ec010..4368f4e9f208 100644
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/obd_cksum.h b/drivers/staging/lustre/lustre/include/obd_cksum.h
index cda3d2808d2f..e5f7bb20415d 100644
--- a/drivers/staging/lustre/lustre/include/obd_cksum.h
+++ b/drivers/staging/lustre/lustre/include/obd_cksum.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/obd_class.h b/drivers/staging/lustre/lustre/include/obd_class.h
index 976005a1e0b2..67c535c5aa98 100644
--- a/drivers/staging/lustre/lustre/include/obd_class.h
+++ b/drivers/staging/lustre/lustre/include/obd_class.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h
index aea193a882a2..3f4fe290f6ea 100644
--- a/drivers/staging/lustre/lustre/include/obd_support.h
+++ b/drivers/staging/lustre/lustre/include/obd_support.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/include/seq_range.h b/drivers/staging/lustre/lustre/include/seq_range.h
index d7175485944d..9450da728160 100644
--- a/drivers/staging/lustre/lustre/include/seq_range.h
+++ b/drivers/staging/lustre/lustre/include/seq_range.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ldlm/interval_tree.c b/drivers/staging/lustre/lustre/ldlm/interval_tree.c
index 19e285dd2ee1..8df7a4463c21 100644
--- a/drivers/staging/lustre/lustre/ldlm/interval_tree.c
+++ b/drivers/staging/lustre/lustre/ldlm/interval_tree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ldlm/l_lock.c b/drivers/staging/lustre/lustre/ldlm/l_lock.c
index 57fd84effdfa..0662cec14b81 100644
--- a/drivers/staging/lustre/lustre/ldlm/l_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/l_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
index 2cc6dc2b281f..fac9d19d50b6 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -207,7 +208,8 @@ void ldlm_extent_add_lock(struct ldlm_resource *res,
                                 continue;
                         if (ldlm_extent_overlap(&lck->l_req_extent,
                                                 &lock->l_req_extent)) {
-                                CDEBUG(D_ERROR, "granting conflicting lock %p %p\n",
+                                CDEBUG(D_ERROR,
+                                       "granting conflicting lock %p %p\n",
                                        lck, lock);
                                 ldlm_resource_dump(D_ERROR, res);
                                 LBUG();
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
index cb826e9e840e..657ab95091a0 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -59,17 +60,6 @@
 #include <linux/list.h>
 #include "ldlm_internal.h"
 
-/**
- * list_for_remaining_safe - iterate over the remaining entries in a list
- *            and safeguard against removal of a list entry.
- * \param pos   the &struct list_head to use as a loop counter. pos MUST
- *            have been initialized prior to using it in this macro.
- * \param n     another &struct list_head to use as temporary storage
- * \param head  the head for your list.
- */
-#define list_for_remaining_safe(pos, n, head) \
-        for (n = pos->next; pos != (head); pos = n, n = pos->next)
-
 static inline int
 ldlm_same_flock_owner(struct ldlm_lock *lock, struct ldlm_lock *new)
 {
@@ -88,24 +78,23 @@ ldlm_flocks_overlap(struct ldlm_lock *lock, struct ldlm_lock *new)
 }
 
 static inline void
-ldlm_flock_destroy(struct ldlm_lock *lock, enum ldlm_mode mode, __u64 flags)
+ldlm_flock_destroy(struct ldlm_lock *lock, enum ldlm_mode mode)
 {
-        LDLM_DEBUG(lock, "%s(mode: %d, flags: 0x%llx)",
-                   __func__, mode, flags);
+        LDLM_DEBUG(lock, "%s(mode: %d)",
+                   __func__, mode);
 
         /* Safe to not lock here, since it should be empty anyway */
         LASSERT(hlist_unhashed(&lock->l_exp_flock_hash));
 
         list_del_init(&lock->l_res_link);
-        if (flags == LDLM_FL_WAIT_NOREPROC) {
-                /* client side - set a flag to prevent sending a CANCEL */
-                lock->l_flags |= LDLM_FL_LOCAL_ONLY | LDLM_FL_CBPENDING;
 
-                /* when reaching here, it is under lock_res_and_lock(). Thus,
-                 * need call the nolock version of ldlm_lock_decref_internal
-                 */
-                ldlm_lock_decref_internal_nolock(lock, mode);
-        }
+        /* client side - set a flag to prevent sending a CANCEL */
+        lock->l_flags |= LDLM_FL_LOCAL_ONLY | LDLM_FL_CBPENDING;
+
+        /* when reaching here, it is under lock_res_and_lock(). Thus,
+         * need call the nolock version of ldlm_lock_decref_internal
+         */
+        ldlm_lock_decref_internal_nolock(lock, mode);
 
         ldlm_lock_destroy_nolock(lock);
 }
@@ -121,129 +110,45 @@ ldlm_flock_destroy(struct ldlm_lock *lock, enum ldlm_mode mode, __u64 flags)
  * It is also responsible for splitting a lock if a portion of the lock
  * is released.
  *
- * If \a first_enq is 0 (ie, called from ldlm_reprocess_queue):
- *   - blocking ASTs have already been sent
- *
- * If \a first_enq is 1 (ie, called from ldlm_lock_enqueue):
- *   - blocking ASTs have not been sent yet, so list of conflicting locks
- *     would be collected and ASTs sent.
  */
-static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags,
-                                   int first_enq, enum ldlm_error *err,
-                                   struct list_head *work_list)
+static int ldlm_process_flock_lock(struct ldlm_lock *req)
 {
         struct ldlm_resource *res = req->l_resource;
         struct ldlm_namespace *ns = ldlm_res_to_ns(res);
-        struct list_head *tmp;
-        struct list_head *ownlocks = NULL;
-        struct ldlm_lock *lock = NULL;
+        struct ldlm_lock *tmp;
+        struct ldlm_lock *lock;
         struct ldlm_lock *new = req;
         struct ldlm_lock *new2 = NULL;
         enum ldlm_mode mode = req->l_req_mode;
         int added = (mode == LCK_NL);
-        int overlaps = 0;
         int splitted = 0;
         const struct ldlm_callback_suite null_cbs = { };
 
         CDEBUG(D_DLMTRACE,
-               "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
-               *flags, new->l_policy_data.l_flock.owner,
+               "owner %llu pid %u mode %u start %llu end %llu\n",
+               new->l_policy_data.l_flock.owner,
                new->l_policy_data.l_flock.pid, mode,
                req->l_policy_data.l_flock.start,
                req->l_policy_data.l_flock.end);
 
-        *err = ELDLM_OK;
-
         /* No blocking ASTs are sent to the clients for
          * Posix file & record locks
          */
         req->l_blocking_ast = NULL;
 
 reprocess:
-        if ((*flags == LDLM_FL_WAIT_NOREPROC) || (mode == LCK_NL)) {
-                /* This loop determines where this processes locks start
-                 * in the resource lr_granted list.
-                 */
-                list_for_each(tmp, &res->lr_granted) {
-                        lock = list_entry(tmp, struct ldlm_lock,
-                                          l_res_link);
-                        if (ldlm_same_flock_owner(lock, req)) {
-                                ownlocks = tmp;
-                                break;
-                        }
-                }
-        } else {
-                int reprocess_failed = 0;
-
-                lockmode_verify(mode);
-
-                /* This loop determines if there are existing locks
-                 * that conflict with the new lock request.
-                 */
-                list_for_each(tmp, &res->lr_granted) {
-                        lock = list_entry(tmp, struct ldlm_lock,
-                                          l_res_link);
-
-                        if (ldlm_same_flock_owner(lock, req)) {
-                                if (!ownlocks)
-                                        ownlocks = tmp;
-                                continue;
-                        }
-
-                        /* locks are compatible, overlap doesn't matter */
-                        if (lockmode_compat(lock->l_granted_mode, mode))
-                                continue;
-
-                        if (!ldlm_flocks_overlap(lock, req))
-                                continue;
-
-                        if (!first_enq) {
-                                reprocess_failed = 1;
-                                continue;
-                        }
-
-                        if (*flags & LDLM_FL_BLOCK_NOWAIT) {
-                                ldlm_flock_destroy(req, mode, *flags);
-                                *err = -EAGAIN;
-                                return LDLM_ITER_STOP;
-                        }
-
-                        if (*flags & LDLM_FL_TEST_LOCK) {
-                                ldlm_flock_destroy(req, mode, *flags);
-                                req->l_req_mode = lock->l_granted_mode;
-                                req->l_policy_data.l_flock.pid =
-                                        lock->l_policy_data.l_flock.pid;
-                                req->l_policy_data.l_flock.start =
-                                        lock->l_policy_data.l_flock.start;
-                                req->l_policy_data.l_flock.end =
-                                        lock->l_policy_data.l_flock.end;
-                                *flags |= LDLM_FL_LOCK_CHANGED;
-                                return LDLM_ITER_STOP;
-                        }
-
-                        ldlm_resource_add_lock(res, &res->lr_waiting, req);
-                        *flags |= LDLM_FL_BLOCK_GRANTED;
-                        return LDLM_ITER_STOP;
-                }
-                if (reprocess_failed)
-                        return LDLM_ITER_CONTINUE;
-        }
-
-        if (*flags & LDLM_FL_TEST_LOCK) {
-                ldlm_flock_destroy(req, mode, *flags);
-                req->l_req_mode = LCK_NL;
-                *flags |= LDLM_FL_LOCK_CHANGED;
-                return LDLM_ITER_STOP;
-        }
+        /* This loop determines where this processes locks start
+         * in the resource lr_granted list.
+         */
+        list_for_each_entry(lock, &res->lr_granted, l_res_link)
+                if (ldlm_same_flock_owner(lock, req))
+                        break;
 
-        /* Scan the locks owned by this process that overlap this request.
+        /* Scan the locks owned by this process to find the insertion point
+         * (as locks are ordered), and to handle overlaps.
          * We may have to merge or split existing locks.
          */
-        if (!ownlocks)
-                ownlocks = &res->lr_granted;
-
-        list_for_remaining_safe(ownlocks, tmp, &res->lr_granted) {
-                lock = list_entry(ownlocks, struct ldlm_lock, l_res_link);
+        list_for_each_entry_safe_from(lock, tmp, &res->lr_granted, l_res_link) {
 
                 if (!ldlm_same_flock_owner(lock, new))
                         break;
@@ -283,7 +188,7 @@ reprocess:
                         }
 
                         if (added) {
-                                ldlm_flock_destroy(lock, mode, *flags);
+                                ldlm_flock_destroy(lock, mode);
                         } else {
                                 new = lock;
                                 added = 1;
@@ -299,8 +204,6 @@ reprocess:
                     lock->l_policy_data.l_flock.start)
                         break;
 
-                ++overlaps;
-
                 if (new->l_policy_data.l_flock.start <=
                     lock->l_policy_data.l_flock.start) {
                         if (new->l_policy_data.l_flock.end <
@@ -309,7 +212,7 @@ reprocess:
                                         new->l_policy_data.l_flock.end + 1;
                                 break;
                         }
-                        ldlm_flock_destroy(lock, lock->l_req_mode, *flags);
+                        ldlm_flock_destroy(lock, lock->l_req_mode);
                         continue;
                 }
                 if (new->l_policy_data.l_flock.end >=
@@ -340,9 +243,7 @@ reprocess:
                                                 NULL, 0, LVB_T_NONE);
                         lock_res_and_lock(req);
                         if (IS_ERR(new2)) {
-                                ldlm_flock_destroy(req, lock->l_granted_mode,
-                                                   *flags);
-                                *err = PTR_ERR(new2);
+                                ldlm_flock_destroy(req, lock->l_granted_mode);
                                 return LDLM_ITER_STOP;
                         }
                         goto reprocess;
@@ -371,12 +272,11 @@ reprocess:
                                              &new2->l_remote_handle,
                                              &new2->l_exp_hash);
                 }
-                if (*flags == LDLM_FL_WAIT_NOREPROC)
-                        ldlm_lock_addref_internal_nolock(new2,
-                                                         lock->l_granted_mode);
+                ldlm_lock_addref_internal_nolock(new2,
+                                                 lock->l_granted_mode);
 
                 /* insert new2 at lock */
-                ldlm_resource_add_lock(res, ownlocks, new2);
+                ldlm_resource_add_lock(res, &lock->l_res_link, new2);
                 LDLM_LOCK_RELEASE(new2);
                 break;
         }
@@ -390,17 +290,12 @@ reprocess:
 
         if (!added) {
                 list_del_init(&req->l_res_link);
-                /* insert new lock before ownlocks in list. */
-                ldlm_resource_add_lock(res, ownlocks, req);
-        }
-
-        if (*flags != LDLM_FL_WAIT_NOREPROC) {
-                /* The only one possible case for client-side calls flock
-                 * policy function is ldlm_flock_completion_ast inside which
-                 * carries LDLM_FL_WAIT_NOREPROC flag.
+                /* insert new lock before "lock", which might be the
+                 * next lock for this owner, or might be the first
+                 * lock for the next owner, or might not be a lock at
+                 * all, but instead points at the head of the list
                  */
-                CERROR("Illegal parameter for client-side-only module.\n");
-                LBUG();
+                ldlm_resource_add_lock(res, &lock->l_res_link, req);
         }
 
         /* In case we're reprocessing the requested lock we can't destroy
@@ -409,7 +304,7 @@ reprocess:
          * could be freed before the completion AST can be sent.
          */
         if (added)
-                ldlm_flock_destroy(req, mode, *flags);
+                ldlm_flock_destroy(req, mode);
 
         ldlm_resource_dump(D_INFO, res);
         return LDLM_ITER_CONTINUE;
@@ -417,7 +312,6 @@ reprocess:
 
 struct ldlm_flock_wait_data {
         struct ldlm_lock *fwd_lock;
-        int            fwd_generation;
 };
 
 static void
@@ -448,12 +342,9 @@ int
 ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
 {
         struct file_lock                *getlk = lock->l_ast_data;
-        struct obd_device             *obd;
-        struct obd_import             *imp = NULL;
-        struct ldlm_flock_wait_data     fwd;
-        struct l_wait_info            lwi;
-        enum ldlm_error             err;
-        int                          rc = 0;
+        struct ldlm_flock_wait_data     fwd;
+        struct l_wait_info              lwi;
+        int                             rc = 0;
 
         OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_CP_CB_WAIT2, 4);
         if (OBD_FAIL_PRECHECK(OBD_FAIL_LDLM_CP_CB_WAIT3)) {
@@ -479,20 +370,9 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
                 return 0;
         }
 
-        LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, sleeping");
+        LDLM_DEBUG(lock,
+                   "client-side enqueue returned a blocked lock, sleeping");
         fwd.fwd_lock = lock;
-        obd = class_exp2obd(lock->l_conn_export);
-
-        /* if this is a local lock, there is no import */
-        if (obd)
-                imp = obd->u.cli.cl_import;
-
-        if (imp) {
-                spin_lock(&imp->imp_lock);
-                fwd.fwd_generation = imp->imp_generation;
-                spin_unlock(&imp->imp_lock);
-        }
-
         lwi = LWI_TIMEOUT_INTR(0, NULL, ldlm_flock_interrupted_wait, &fwd);
 
         /* Go to sleep until the lock is granted. */
@@ -561,10 +441,11 @@ granted:
                         mode = lock->l_granted_mode;
 
                 if (ldlm_is_flock_deadlock(lock)) {
-                        LDLM_DEBUG(lock, "client-side enqueue deadlock received");
+                        LDLM_DEBUG(lock,
+                                   "client-side enqueue deadlock received");
                         rc = -EDEADLK;
                 }
-                ldlm_flock_destroy(lock, mode, LDLM_FL_WAIT_NOREPROC);
+                ldlm_flock_destroy(lock, mode);
                 unlock_res_and_lock(lock);
 
                 /* Need to wake up the waiter if we were evicted */
@@ -585,7 +466,7 @@ granted:
                  * in the lock changes we can decref the appropriate refcount.
                  */
                 LASSERT(ldlm_is_test_lock(lock));
-                ldlm_flock_destroy(lock, getlk->fl_type, LDLM_FL_WAIT_NOREPROC);
+                ldlm_flock_destroy(lock, getlk->fl_type);
                 switch (lock->l_granted_mode) {
                 case LCK_PR:
                         getlk->fl_type = F_RDLCK;
@@ -600,12 +481,10 @@ granted:
                 getlk->fl_start = (loff_t)lock->l_policy_data.l_flock.start;
                 getlk->fl_end = (loff_t)lock->l_policy_data.l_flock.end;
         } else {
-                __u64 noreproc = LDLM_FL_WAIT_NOREPROC;
-
                 /* We need to reprocess the lock to do merges or splits
                  * with existing locks owned by this process.
                  */
-                ldlm_process_flock_lock(lock, &noreproc, 1, &err, NULL);
+                ldlm_process_flock_lock(lock);
         }
         unlock_res_and_lock(lock);
         return rc;
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c b/drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c
index fcb6e44bd319..2926208cdfa1 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
index 36808dbe8790..bc33ca100620 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -88,7 +89,7 @@ struct ldlm_namespace *ldlm_namespace_first_locked(enum ldlm_side client);
 /* ldlm_request.c */
 /* Cancel lru flag, it indicates we cancel aged locks. */
 enum {
-        LDLM_LRU_FLAG_AGED      = BIT(0), /* Cancel aged locks (non lru resize). */
+        LDLM_LRU_FLAG_AGED      = BIT(0), /* Cancel old non-LRU resize locks */
         LDLM_LRU_FLAG_PASSED    = BIT(1), /* Cancel passed number of locks. */
         LDLM_LRU_FLAG_SHRINK    = BIT(2), /* Cancel locks from shrinker. */
         LDLM_LRU_FLAG_LRUR      = BIT(3), /* Cancel locks from lru resize. */
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
index 22600c2a73ea..9efd26ec59dd 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
index b5d84f3f6071..7cb61e2e7d3b 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -1035,7 +1036,8 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list)
                 ldlm_extent_add_lock(res, lock);
         } else if (res->lr_type == LDLM_FLOCK) {
                 /*
-                 * We should not add locks to granted list in the following cases:
+                 * We should not add locks to granted list in
+                 * the following cases:
                  * - this is an UNLOCK but not a real lock;
                  * - this is a TEST lock;
                  * - this is a F_CANCELLK lock (async flock has req_mode == 0)
@@ -2051,13 +2053,16 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
                 libcfs_debug_vmsg2(msgdata, fmt, args,
                                    " ns: \?\? lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: \?\? rrc=\?\? type: \?\?\? flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu lvb_type: %d\n",
                                    lock,
-                                   lock->l_handle.h_cookie, atomic_read(&lock->l_refc),
+                                   lock->l_handle.h_cookie,
+                                   atomic_read(&lock->l_refc),
                                    lock->l_readers, lock->l_writers,
                                    ldlm_lockname[lock->l_granted_mode],
                                    ldlm_lockname[lock->l_req_mode],
-                                   lock->l_flags, nid, lock->l_remote_handle.cookie,
+                                   lock->l_flags, nid,
+                                   lock->l_remote_handle.cookie,
                                    exp ? atomic_read(&exp->exp_refcount) : -99,
-                                   lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type);
+                                   lock->l_pid, lock->l_callback_timeout,
+                                   lock->l_lvb_type);
                 va_end(args);
                 return;
         }
@@ -2067,7 +2072,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
                 libcfs_debug_vmsg2(msgdata, fmt, args,
                                    " ns: %s lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: " DLDLMRES " rrc: %d type: %s [%llu->%llu] (req %llu->%llu) flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu lvb_type: %d\n",
                                    ldlm_lock_to_ns_name(lock), lock,
-                                   lock->l_handle.h_cookie, atomic_read(&lock->l_refc),
+                                   lock->l_handle.h_cookie,
+                                   atomic_read(&lock->l_refc),
                                    lock->l_readers, lock->l_writers,
                                    ldlm_lockname[lock->l_granted_mode],
                                    ldlm_lockname[lock->l_req_mode],
@@ -2076,8 +2082,10 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
                                    ldlm_typename[resource->lr_type],
                                    lock->l_policy_data.l_extent.start,
                                    lock->l_policy_data.l_extent.end,
-                                   lock->l_req_extent.start, lock->l_req_extent.end,
-                                   lock->l_flags, nid, lock->l_remote_handle.cookie,
+                                   lock->l_req_extent.start,
+                                   lock->l_req_extent.end,
+                                   lock->l_flags, nid,
+                                   lock->l_remote_handle.cookie,
                                    exp ? atomic_read(&exp->exp_refcount) : -99,
                                    lock->l_pid, lock->l_callback_timeout,
                                    lock->l_lvb_type);
@@ -2087,7 +2095,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
                 libcfs_debug_vmsg2(msgdata, fmt, args,
                                    " ns: %s lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: " DLDLMRES " rrc: %d type: %s pid: %d [%llu->%llu] flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu\n",
                                    ldlm_lock_to_ns_name(lock), lock,
-                                   lock->l_handle.h_cookie, atomic_read(&lock->l_refc),
+                                   lock->l_handle.h_cookie,
+                                   atomic_read(&lock->l_refc),
                                    lock->l_readers, lock->l_writers,
                                    ldlm_lockname[lock->l_granted_mode],
                                    ldlm_lockname[lock->l_req_mode],
@@ -2097,7 +2106,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
                                    lock->l_policy_data.l_flock.pid,
                                    lock->l_policy_data.l_flock.start,
                                    lock->l_policy_data.l_flock.end,
-                                   lock->l_flags, nid, lock->l_remote_handle.cookie,
+                                   lock->l_flags, nid,
+                                   lock->l_remote_handle.cookie,
                                    exp ? atomic_read(&exp->exp_refcount) : -99,
                                    lock->l_pid, lock->l_callback_timeout);
                 break;
@@ -2115,7 +2125,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
                                    lock->l_policy_data.l_inodebits.bits,
                                    atomic_read(&resource->lr_refcount),
                                    ldlm_typename[resource->lr_type],
-                                   lock->l_flags, nid, lock->l_remote_handle.cookie,
+                                   lock->l_flags, nid,
+                                   lock->l_remote_handle.cookie,
                                    exp ? atomic_read(&exp->exp_refcount) : -99,
                                    lock->l_pid, lock->l_callback_timeout,
                                    lock->l_lvb_type);
@@ -2133,7 +2144,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
                                    PLDLMRES(resource),
                                    atomic_read(&resource->lr_refcount),
                                    ldlm_typename[resource->lr_type],
-                                   lock->l_flags, nid, lock->l_remote_handle.cookie,
+                                   lock->l_flags, nid,
+                                   lock->l_remote_handle.cookie,
                                    exp ? atomic_read(&exp->exp_refcount) : -99,
                                    lock->l_pid, lock->l_callback_timeout,
                                    lock->l_lvb_type);
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
index e2707336586c..2d5a2c932ddc 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -184,7 +185,8 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req,
                         LASSERT(lock->l_lvb_data);
 
                         if (unlikely(lock->l_lvb_len < lvb_len)) {
-                                LDLM_ERROR(lock, "Replied LVB is larger than expectation, expected = %d, replied = %d",
+                                LDLM_ERROR(lock,
+                                           "Replied LVB is larger than expectation, expected = %d, replied = %d",
                                            lock->l_lvb_len, lvb_len);
                                 rc = -EINVAL;
                                 goto out;
@@ -598,7 +600,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)
 
         lock = ldlm_handle2lock_long(&dlm_req->lock_handle[0], 0);
         if (!lock) {
-                CDEBUG(D_DLMTRACE, "callback on lock %#llx - lock disappeared\n",
+                CDEBUG(D_DLMTRACE,
+                       "callback on lock %#llx - lock disappeared\n",
                        dlm_req->lock_handle[0].cookie);
                 rc = ldlm_callback_reply(req, -EINVAL);
                 ldlm_callback_errmsg(req, "Operate with invalid parameter", rc,
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_plain.c b/drivers/staging/lustre/lustre/ldlm/ldlm_plain.c
index 1ca605fe25ff..33b5a3f96fcb 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_plain.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_plain.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
index d77bf0baa84f..da65d00a7811 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -386,7 +387,8 @@ static int ldlm_pool_recalc(struct ldlm_pool *pl)
                               pl->pl_recalc_period;
         if (recalc_interval_sec <= 0) {
                 /* DEBUG: should be re-removed after LU-4536 is fixed */
-                CDEBUG(D_DLMTRACE, "%s: Negative interval(%ld), too short period(%ld)\n",
+                CDEBUG(D_DLMTRACE,
+                       "%s: Negative interval(%ld), too short period(%ld)\n",
                        pl->pl_name, (long)recalc_interval_sec,
                        (long)pl->pl_recalc_period);
 
@@ -415,7 +417,8 @@ static int ldlm_pool_shrink(struct ldlm_pool *pl, int nr, gfp_t gfp_mask)
                         lprocfs_counter_add(pl->pl_stats,
                                             LDLM_POOL_SHRINK_FREED_STAT,
                                             cancel);
-                        CDEBUG(D_DLMTRACE, "%s: request to shrink %d locks, shrunk %d\n",
+                        CDEBUG(D_DLMTRACE,
+                               "%s: request to shrink %d locks, shrunk %d\n",
                                pl->pl_name, nr, cancel);
                 }
         }
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
index f3bf238d0748..02ea14c9b089 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -121,7 +122,8 @@ static int ldlm_expired_completion_wait(void *data)
         if (!lock->l_conn_export) {
                 static unsigned long next_dump, last_dump;
 
-                LDLM_ERROR(lock, "lock timed out (enqueued at %lld, %llds ago); not entering recovery in server code, just going back to sleep",
+                LDLM_ERROR(lock,
+                           "lock timed out (enqueued at %lld, %llds ago); not entering recovery in server code, just going back to sleep",
                            (s64)lock->l_last_activity,
                            (s64)(ktime_get_real_seconds() -
                                  lock->l_last_activity));
@@ -139,7 +141,8 @@ static int ldlm_expired_completion_wait(void *data)
         obd = lock->l_conn_export->exp_obd;
         imp = obd->u.cli.cl_import;
         ptlrpc_fail_import(imp, lwd->lwd_conn_cnt);
-        LDLM_ERROR(lock, "lock timed out (enqueued at %lld, %llds ago), entering recovery for %s@%s",
+        LDLM_ERROR(lock,
+                   "lock timed out (enqueued at %lld, %llds ago), entering recovery for %s@%s",
                    (s64)lock->l_last_activity,
                    (s64)(ktime_get_real_seconds() - lock->l_last_activity),
                    obd2cli_tgt(obd), imp->imp_connection->c_remote_uuid.uuid);
@@ -218,7 +221,8 @@ int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data)
                 return ldlm_completion_tail(lock, data);
         }
 
-        LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, going forward");
+        LDLM_DEBUG(lock,
+                   "client-side enqueue returned a blocked lock, going forward");
         return 0;
 }
 EXPORT_SYMBOL(ldlm_completion_ast_async);
@@ -264,7 +268,8 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
                 return 0;
         }
 
-        LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, sleeping");
+        LDLM_DEBUG(lock,
+                   "client-side enqueue returned a blocked lock, sleeping");
 
 noreproc:
 
@@ -414,7 +419,8 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req,
                         rc = size;
                         goto cleanup;
                 } else if (unlikely(size > lvb_len)) {
-                        LDLM_ERROR(lock, "Replied LVB is larger than expectation, expected = %d, replied = %d",
+                        LDLM_ERROR(lock,
+                                   "Replied LVB is larger than expectation, expected = %d, replied = %d",
                                    lvb_len, size);
                         rc = -EINVAL;
                         goto cleanup;
@@ -473,8 +479,8 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req,
 
                 if (!ldlm_res_eq(&reply->lock_desc.l_resource.lr_name,
                                  &lock->l_resource->lr_name)) {
-                        CDEBUG(D_INFO, "remote intent success, locking " DLDLMRES
-                                       " instead of " DLDLMRES "\n",
+                        CDEBUG(D_INFO,
+                               "remote intent success, locking " DLDLMRES " instead of " DLDLMRES "\n",
                                PLDLMRES(&reply->lock_desc.l_resource),
                                PLDLMRES(lock->l_resource));
 
@@ -850,7 +856,8 @@ static __u64 ldlm_cli_cancel_local(struct ldlm_lock *lock)
                 unlock_res_and_lock(lock);
 
                 if (local_only) {
-                        CDEBUG(D_DLMTRACE, "not sending request (at caller's instruction)\n");
+                        CDEBUG(D_DLMTRACE,
+                               "not sending request (at caller's instruction)\n");
                         rc = LDLM_FL_LOCAL_ONLY;
                 }
                 ldlm_lock_cancel(lock);
@@ -963,7 +970,8 @@ static int ldlm_cli_cancel_req(struct obd_export *exp,
 
                 rc = ptlrpc_queue_wait(req);
                 if (rc == LUSTRE_ESTALE) {
-                        CDEBUG(D_DLMTRACE, "client/server (nid %s) out of sync -- not fatal\n",
+                        CDEBUG(D_DLMTRACE,
+                               "client/server (nid %s) out of sync -- not fatal\n",
                                libcfs_nid2str(req->rq_import->
                                               imp_connection->c_peer.nid));
                         rc = 0;
@@ -1175,6 +1183,7 @@ ldlm_cancel_no_wait_policy(struct ldlm_namespace *ns, struct ldlm_lock *lock,
         case LDLM_IBITS:
                 if (ns->ns_cancel && ns->ns_cancel(lock) != 0)
                         break;
+                /* fall through */
         default:
                 result = LDLM_POLICY_SKIP_LOCK;
                 lock_res_and_lock(lock);
@@ -1363,13 +1372,14 @@ ldlm_cancel_lru_policy(struct ldlm_namespace *ns, int flags)
  * flags & LDLM_LRU_FLAG_LRUR   - use LRU resize policy (SLV from server) to
  *                                cancel not more than \a count locks;
  *
- * flags & LDLM_LRU_FLAG_PASSED - cancel \a count number of old locks (located at
- *                                the beginning of LRU list);
+ * flags & LDLM_LRU_FLAG_PASSED - cancel \a count number of old locks (located
+ *                                at the beginning of LRU list);
  *
- * flags & LDLM_LRU_FLAG_SHRINK - cancel not more than \a count locks according to
- *                                memory pressure policy function;
+ * flags & LDLM_LRU_FLAG_SHRINK - cancel not more than \a count locks according
+ *                                to memory pressure policy function;
  *
- * flags & LDLM_LRU_FLAG_AGED   - cancel \a count locks according to "aged policy".
+ * flags & LDLM_LRU_FLAG_AGED   - cancel \a count locks according to
+ *                                "aged policy".
  *
  * flags & LDLM_LRU_FLAG_NO_WAIT - cancel as many unused locks as possible
  *                                 (typically before replaying locks) w/o
@@ -1383,7 +1393,8 @@ static int ldlm_prepare_lru_list(struct ldlm_namespace *ns,
         ldlm_cancel_lru_policy_t pf;
         struct ldlm_lock *lock, *next;
         int added = 0, unused, remained;
-        int no_wait = flags & (LDLM_LRU_FLAG_NO_WAIT | LDLM_LRU_FLAG_LRUR_NO_WAIT);
+        int no_wait = flags &
+                (LDLM_LRU_FLAG_NO_WAIT | LDLM_LRU_FLAG_LRUR_NO_WAIT);
 
         spin_lock(&ns->ns_lock);
         unused = ns->ns_nr_unused;
@@ -2034,7 +2045,8 @@ static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns)
         int canceled;
         LIST_HEAD(cancels);
 
-        CDEBUG(D_DLMTRACE, "Dropping as many unused locks as possible before replay for namespace %s (%d)\n",
+        CDEBUG(D_DLMTRACE,
+               "Dropping as many unused locks as possible before replay for namespace %s (%d)\n",
                ldlm_ns_name(ns), ns->ns_nr_unused);
 
         /* We don't need to care whether or not LRU resize is enabled
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
index c2ddf7312571..2689ffdf10e3 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -1358,7 +1359,8 @@ void ldlm_resource_dump(int level, struct ldlm_resource *res)
                         LDLM_DEBUG_LIMIT(level, lock, "###");
                         if (!(level & D_CANTMASK) &&
                             ++granted > ldlm_dump_granted_max) {
-                                CDEBUG(level, "only dump %d granted locks to avoid DDOS.\n",
+                                CDEBUG(level,
+                                       "only dump %d granted locks to avoid DDOS.\n",
                                        granted);
                                 break;
                         }
diff --git a/drivers/staging/lustre/lustre/llite/dcache.c b/drivers/staging/lustre/lustre/llite/dcache.c
index 3670fcaf373f..549369739d80 100644
--- a/drivers/staging/lustre/lustre/llite/dcache.c
+++ b/drivers/staging/lustre/lustre/llite/dcache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -141,7 +142,8 @@ void ll_intent_drop_lock(struct lookup_intent *it)
 
                 handle.cookie = it->it_lock_handle;
 
-                CDEBUG(D_DLMTRACE, "releasing lock with cookie %#llx from it %p\n",
+                CDEBUG(D_DLMTRACE,
+                       "releasing lock with cookie %#llx from it %p\n",
                        handle.cookie, it);
                 ldlm_lock_decref(&handle, it->it_lock_mode);
 
@@ -152,7 +154,8 @@ void ll_intent_drop_lock(struct lookup_intent *it)
                 if (it->it_remote_lock_mode != 0) {
                         handle.cookie = it->it_remote_lock_handle;
 
-                        CDEBUG(D_DLMTRACE, "releasing remote lock with cookie%#llx from it %p\n",
+                        CDEBUG(D_DLMTRACE,
+                               "releasing remote lock with cookie%#llx from it %p\n",
                                handle.cookie, it);
                         ldlm_lock_decref(&handle,
                                          it->it_remote_lock_mode);
@@ -185,7 +188,8 @@ void ll_invalidate_aliases(struct inode *inode)
 
         spin_lock(&inode->i_lock);
         hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
-                CDEBUG(D_DENTRY, "dentry in drop %pd (%p) parent %p inode %p flags %d\n",
+                CDEBUG(D_DENTRY,
+                       "dentry in drop %pd (%p) parent %p inode %p flags %d\n",
                        dentry, dentry, dentry->d_parent,
                        d_inode(dentry), dentry->d_flags);
 
diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
index 1db3e7f345c5..5b2e47c246f3 100644
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -303,7 +304,8 @@ static int ll_readdir(struct file *filp, struct dir_context *ctx)
         struct md_op_data *op_data;
         int                     rc;
 
-        CDEBUG(D_VFSTRACE, "VFS Op:inode=" DFID "(%p) pos/size %lu/%llu 32bit_api %d\n",
+        CDEBUG(D_VFSTRACE,
+               "VFS Op:inode=" DFID "(%p) pos/size %lu/%llu 32bit_api %d\n",
                PFID(ll_inode2fid(inode)), inode, (unsigned long)pos,
                i_size_read(inode), api32);
 
@@ -502,7 +504,8 @@ int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump,
                         break;
                 }
                 default: {
-                        CDEBUG(D_IOCTL, "bad userland LOV MAGIC: %#08x != %#08x nor %#08x\n",
+                        CDEBUG(D_IOCTL,
+                               "bad userland LOV MAGIC: %#08x != %#08x nor %#08x\n",
                                lump->lmm_magic, LOV_USER_MAGIC_V1,
                                LOV_USER_MAGIC_V3);
                         return -EINVAL;
@@ -732,10 +735,10 @@ static int ll_ioc_copy_start(struct super_block *sb, struct hsm_copy *copy)
                 rc = ll_data_version(inode, &data_version, LL_DV_RD_FLUSH);
                 iput(inode);
                 if (rc != 0) {
-                        CDEBUG(D_HSM, "Could not read file data version of "
-                                      DFID " (rc = %d). Archive request (%#llx) could not be done.\n",
-                                      PFID(&copy->hc_hai.hai_fid), rc,
-                                      copy->hc_hai.hai_cookie);
+                        CDEBUG(D_HSM,
+                               "Could not read file data version of " DFID " (rc = %d). Archive request (%#llx) could not be done.\n",
+                               PFID(&copy->hc_hai.hai_fid), rc,
+                               copy->hc_hai.hai_cookie);
                         hpk.hpk_flags |= HP_FLAG_RETRY;
                         /* hpk_errval must be >= 0 */
                         hpk.hpk_errval = -rc;
@@ -816,7 +819,8 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy)
                 rc = ll_data_version(inode, &data_version, LL_DV_RD_FLUSH);
                 iput(inode);
                 if (rc) {
-                        CDEBUG(D_HSM, "Could not read file data version. Request could not be confirmed.\n");
+                        CDEBUG(D_HSM,
+                               "Could not read file data version. Request could not be confirmed.\n");
                         if (hpk.hpk_errval == 0)
                                 hpk.hpk_errval = -rc;
                         goto progress;
@@ -832,8 +836,7 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy)
                  */
                 if ((copy->hc_hai.hai_action == HSMA_ARCHIVE) &&
                     (copy->hc_data_version != data_version)) {
-                        CDEBUG(D_HSM, "File data version mismatched. File content was changed during archiving. "
-                               DFID ", start:%#llx current:%#llx\n",
+                        CDEBUG(D_HSM, "File data version mismatched. File content was changed during archiving. " DFID ", start:%#llx current:%#llx\n",
                                PFID(&copy->hc_hai.hai_fid),
                                copy->hc_data_version, data_version);
                         /* File was changed, send error to cdt. Do not ask for
diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index be665454f407..2d6e64dea266 100644
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -386,8 +387,8 @@ static int ll_intent_file_open(struct dentry *de, void *lmm, int lmmsize,
         ll_finish_md_op_data(op_data);
         if (rc == -ESTALE) {
                 /* reason for keep own exit path - don`t flood log
-                * with messages with -ESTALE errors.
-                */
+                 * with messages with -ESTALE errors.
+                 */
                 if (!it_disposition(itp, DISP_OPEN_OPEN) ||
                     it_open_error(DISP_OPEN_OPEN, itp))
                         goto out;
@@ -605,7 +606,8 @@ restart:
                          * to get file with different fid.
                          */
                         it->it_flags |= MDS_OPEN_LOCK | MDS_OPEN_BY_FID;
-                        rc = ll_intent_file_open(file->f_path.dentry, NULL, 0, it);
+                        rc = ll_intent_file_open(file->f_path.dentry,
+                                                 NULL, 0, it);
                         if (rc)
                                 goto out_openerr;
 
@@ -1119,7 +1121,8 @@ out:
         cl_io_fini(env, io);
 
         if ((!rc || rc == -ENODATA) && count > 0 && io->ci_need_restart) {
-                CDEBUG(D_VFSTRACE, "%s: restart %s from %lld, count:%zu, result: %zd\n",
+                CDEBUG(D_VFSTRACE,
+                       "%s: restart %s from %lld, count:%zu, result: %zd\n",
                        file_dentry(file)->d_name.name,
                        iot == CIT_READ ? "read" : "write",
                        *ppos, count, result);
@@ -3455,7 +3458,8 @@ out:
                 if (rc == 0)
                         rc = -EAGAIN;
 
-                CDEBUG(D_INODE, "%s: file=" DFID " waiting layout return: %d.\n",
+                CDEBUG(D_INODE,
+                       "%s: file=" DFID " waiting layout return: %d.\n",
                        ll_get_fsname(inode->i_sb, NULL, 0),
                        PFID(&lli->lli_fid), rc);
         }
diff --git a/drivers/staging/lustre/lustre/llite/glimpse.c b/drivers/staging/lustre/lustre/llite/glimpse.c
index 34c2cfecf4b8..c43ac574274c 100644
--- a/drivers/staging/lustre/lustre/llite/glimpse.c
+++ b/drivers/staging/lustre/lustre/llite/glimpse.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/lcommon_cl.c b/drivers/staging/lustre/lustre/llite/lcommon_cl.c
index d2392e4c6872..df5c0c0ae703 100644
--- a/drivers/staging/lustre/lustre/llite/lcommon_cl.c
+++ b/drivers/staging/lustre/lustre/llite/lcommon_cl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/lcommon_misc.c b/drivers/staging/lustre/lustre/llite/lcommon_misc.c
index 422f410d95c1..a246b955306e 100644
--- a/drivers/staging/lustre/lustre/llite/lcommon_misc.c
+++ b/drivers/staging/lustre/lustre/llite/lcommon_misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h
index 0287c751e1cd..b133fd00c08c 100644
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -84,7 +85,7 @@ struct ll_dentry_data {
 
 struct ll_getname_data {
         struct dir_context ctx;
-        char        *lgd_name;      /* points to a buffer with NAME_MAX+1 size */
+        char        *lgd_name;      /* points to buffer with NAME_MAX+1 size */
         struct lu_fid    lgd_fid;       /* target fid we are looking for */
         int           lgd_found;     /* inode matched? */
 };
@@ -392,7 +393,8 @@ enum stats_track_type {
 #define LL_SBI_XATTR_CACHE    0x80000 /* support for xattr cache */
 #define LL_SBI_NOROOTSQUASH     0x100000 /* do not apply root squash */
 #define LL_SBI_ALWAYS_PING      0x200000 /* always ping even if server
-                                          * suppress_pings */
+                                          * suppress_pings
+                                          */
 
 #define LL_SBI_FLAGS {  \
         "nolck",        \
@@ -637,7 +639,8 @@ static inline int ll_need_32bit_api(struct ll_sb_info *sbi)
 #if BITS_PER_LONG == 32
         return 1;
 #elif defined(CONFIG_COMPAT)
-        return unlikely(in_compat_syscall() || (sbi->ll_flags & LL_SBI_32BIT_API));
+        return unlikely(in_compat_syscall() ||
+                        (sbi->ll_flags & LL_SBI_32BIT_API));
 #else
         return unlikely(sbi->ll_flags & LL_SBI_32BIT_API);
 #endif
@@ -1065,7 +1068,7 @@ struct ll_statahead_info {
                                              * hidden entries
                                              */
                                 sai_agl_valid:1,/* AGL is valid for the dir */
-                                sai_in_readpage:1;/* statahead is in readdir() */
+                                sai_in_readpage:1;/* statahead in readdir() */
         wait_queue_head_t       sai_waitq;      /* stat-ahead wait queue */
         struct ptlrpc_thread    sai_thread;     /* stat-ahead thread */
         struct ptlrpc_thread    sai_agl_thread; /* AGL thread */
@@ -1198,7 +1201,7 @@ typedef enum llioc_iter (*llioc_callback_t)(struct inode *inode,
  * Return value:
  *      A magic pointer will be returned if success;
  *      otherwise, NULL will be returned.
- * */
+ */
 void *ll_iocontrol_register(llioc_callback_t cb, int count, unsigned int *cmd);
 void ll_iocontrol_unregister(void *magic);
 
@@ -1261,7 +1264,8 @@ static inline void ll_set_lock_data(struct obd_export *exp, struct inode *inode,
 
                 handle.cookie = it->it_lock_handle;
 
-                CDEBUG(D_DLMTRACE, "setting l_data to inode " DFID "%p for lock %#llx\n",
+                CDEBUG(D_DLMTRACE,
+                       "setting l_data to inode " DFID "%p for lock %#llx\n",
                        PFID(ll_inode2fid(inode)), inode, handle.cookie);
 
                 md_set_lock_data(exp, &handle, inode, &it->it_lock_bits);
@@ -1284,7 +1288,8 @@ static inline int d_lustre_invalid(const struct dentry *dentry)
  */
 static inline void d_lustre_invalidate(struct dentry *dentry, int nested)
 {
-        CDEBUG(D_DENTRY, "invalidate dentry %pd (%p) parent %p inode %p refc %d\n",
+        CDEBUG(D_DENTRY,
+               "invalidate dentry %pd (%p) parent %p inode %p refc %d\n",
                dentry, dentry,
                dentry->d_parent, d_inode(dentry), d_count(dentry));
 
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index 25393e3a0fe8..65ac5128f005 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -231,7 +232,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
         err = obd_connect(NULL, &sbi->ll_md_exp, obd, &sbi->ll_sb_uuid,
                           data, NULL);
         if (err == -EBUSY) {
-                LCONSOLE_ERROR_MSG(0x14f, "An MDT (md %s) is performing recovery, of which this client is not a part. Please wait for recovery to complete, abort, or time out.\n",
+                LCONSOLE_ERROR_MSG(0x14f,
+                                   "An MDT (md %s) is performing recovery, of which this client is not a part. Please wait for recovery to complete, abort, or time out.\n",
                                    md);
                 goto out;
         } else if (err) {
@@ -279,7 +281,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
                 }
                 obd_connect_flags2str(buf, PAGE_SIZE,
                                       valid ^ CLIENT_CONNECT_MDT_REQD, ",");
-                LCONSOLE_ERROR_MSG(0x170, "Server %s does not support feature(s) needed for correct operation of this client (%s). Please upgrade server or downgrade client.\n",
+                LCONSOLE_ERROR_MSG(0x170,
+                                   "Server %s does not support feature(s) needed for correct operation of this client (%s). Please upgrade server or downgrade client.\n",
                                    sbi->ll_md_exp->exp_obd->obd_name, buf);
                 kfree(buf);
                 err = -EPROTO;
@@ -380,7 +383,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
         if (sbi->ll_flags & LL_SBI_ALWAYS_PING)
                 data->ocd_connect_flags &= ~OBD_CONNECT_PINGLESS;
 
-        CDEBUG(D_RPCTRACE, "ocd_connect_flags: %#llx ocd_version: %d ocd_grant: %d\n",
+        CDEBUG(D_RPCTRACE,
+               "ocd_connect_flags: %#llx ocd_version: %d ocd_grant: %d\n",
                data->ocd_connect_flags,
                data->ocd_version, data->ocd_grant);
 
@@ -392,7 +396,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
         err = obd_connect(NULL, &sbi->ll_dt_exp, obd, &sbi->ll_sb_uuid, data,
                           NULL);
         if (err == -EBUSY) {
-                LCONSOLE_ERROR_MSG(0x150, "An OST (dt %s) is performing recovery, of which this client is not a part.  Please wait for recovery to complete, abort, or time out.\n",
+                LCONSOLE_ERROR_MSG(0x150,
+                                   "An OST (dt %s) is performing recovery, of which this client is not a part.  Please wait for recovery to complete, abort, or time out.\n",
                                    dt);
                 goto out_md;
         } else if (err) {
@@ -915,7 +920,8 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt)
         /* Profile set with LCFG_MOUNTOPT so we can find our mdc and osc obds */
         lprof = class_get_profile(profilenm);
         if (!lprof) {
-                LCONSOLE_ERROR_MSG(0x156, "The client profile '%s' could not be read from the MGS.  Does that filesystem exist?\n",
+                LCONSOLE_ERROR_MSG(0x156,
+                                   "The client profile '%s' could not be read from the MGS.  Does that filesystem exist?\n",
                                    profilenm);
                 err = -EINVAL;
                 goto out_free;
@@ -1042,7 +1048,8 @@ struct inode *ll_inode_from_resource_lock(struct ldlm_lock *lock)
                 } else {
                         inode = lock->l_resource->lr_lvb_inode;
                         LDLM_DEBUG_LIMIT(inode->i_state & I_FREEING ?  D_INFO :
-                                         D_WARNING, lock, "lr_lvb_inode %p is bogus: magic %08x",
+                                         D_WARNING, lock,
+                                         "lr_lvb_inode %p is bogus: magic %08x",
                                          lock->l_resource->lr_lvb_inode,
                                          lli->lli_inode_magic);
                         inode = NULL;
@@ -1744,7 +1751,8 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md)
         }
         if (body->mbo_valid & OBD_MD_FLMTIME) {
                 if (body->mbo_mtime > LTIME_S(inode->i_mtime)) {
-                        CDEBUG(D_INODE, "setting ino %lu mtime from %lu to %llu\n",
+                        CDEBUG(D_INODE,
+                               "setting ino %lu mtime from %lu to %llu\n",
                                inode->i_ino, LTIME_S(inode->i_mtime),
                                body->mbo_mtime);
                         LTIME_S(inode->i_mtime) = body->mbo_mtime;
@@ -2254,7 +2262,8 @@ int ll_process_config(struct lustre_cfg *lcfg)
                 return -EINVAL;
         sb = (void *)x;
         /* This better be a real Lustre superblock! */
-        LASSERT(s2lsi((struct super_block *)sb)->lsi_lmd->lmd_magic == LMD_MAGIC);
+        LASSERT(s2lsi((struct super_block *)sb)->lsi_lmd->lmd_magic ==
+                LMD_MAGIC);
 
         /* Note we have not called client_common_fill_super yet, so
          * proc fns must be able to handle that!
@@ -2571,8 +2580,9 @@ static int ll_linkea_decode(struct linkea_data *ldata, unsigned int linkno,
  *
  * \param[in]     file  - File descriptor against which to perform the operation
  * \param[in,out] arg   - User-filled structure containing the linkno to operate
- *                        on and the available size. It is eventually filled with
- *                        the requested information or left untouched on error
+ *                        on and the available size. It is eventually filled
+ *                        with the requested information or left untouched on
+ *                        error
  *
  * \retval - 0 on success
  * \retval - Appropriate negative error code on failure
diff --git a/drivers/staging/lustre/lustre/llite/llite_mmap.c b/drivers/staging/lustre/lustre/llite/llite_mmap.c
index ccc7ae15a943..c0533bd6f352 100644
--- a/drivers/staging/lustre/lustre/llite/llite_mmap.c
+++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -208,7 +209,8 @@ static int ll_page_mkwrite0(struct vm_area_struct *vma, struct page *vmpage,
                          */
                         unlock_page(vmpage);
 
-                        CDEBUG(D_MMAP, "Race on page_mkwrite %p/%lu, page has been written out, retry.\n",
+                        CDEBUG(D_MMAP,
+                               "Race on page_mkwrite %p/%lu, page has been written out, retry.\n",
                                vmpage, vmpage->index);
 
                         *retry = true;
diff --git a/drivers/staging/lustre/lustre/llite/llite_nfs.c b/drivers/staging/lustre/lustre/llite/llite_nfs.c
index e50c637fab54..a6a1d80c711a 100644
--- a/drivers/staging/lustre/lustre/llite/llite_nfs.c
+++ b/drivers/staging/lustre/lustre/llite/llite_nfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -127,7 +128,8 @@ struct lustre_nfs_fid {
 };
 
 static struct dentry *
-ll_iget_for_nfs(struct super_block *sb, struct lu_fid *fid, struct lu_fid *parent)
+ll_iget_for_nfs(struct super_block *sb,
+                struct lu_fid *fid, struct lu_fid *parent)
 {
         struct inode  *inode;
         struct dentry *result;
diff --git a/drivers/staging/lustre/lustre/llite/lproc_llite.c b/drivers/staging/lustre/lustre/llite/lproc_llite.c
index e3bd2d18eac5..644bea2f9d37 100644
--- a/drivers/staging/lustre/lustre/llite/lproc_llite.c
+++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 5cc2b3255207..a2687f46a16d 100644
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -204,7 +205,8 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 
                 if (!fid_res_name_eq(ll_inode2fid(inode),
                                      &lock->l_resource->lr_name)) {
-                        LDLM_ERROR(lock, "data mismatch with object " DFID "(%p)",
+                        LDLM_ERROR(lock,
+                                   "data mismatch with object " DFID "(%p)",
                                    PFID(ll_inode2fid(inode)), inode);
                         LBUG();
                 }
@@ -289,7 +291,8 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
                                  * we have to invalidate the negative children
                                  * on master inode
                                  */
-                                CDEBUG(D_INODE, "Invalidate s" DFID " m" DFID "\n",
+                                CDEBUG(D_INODE,
+                                       "Invalidate s" DFID " m" DFID "\n",
                                        PFID(ll_inode2fid(inode)),
                                        PFID(&lli->lli_pfid));
 
@@ -736,7 +739,8 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
 
                         *opened |= FILE_CREATED;
                 }
-                if (d_really_is_positive(dentry) && it_disposition(it, DISP_OPEN_OPEN)) {
+                if (d_really_is_positive(dentry) &&
+                    it_disposition(it, DISP_OPEN_OPEN)) {
                         /* Open dentry. */
                         if (S_ISFIFO(d_inode(dentry)->i_mode)) {
                                 /* We cannot call open here as it might
@@ -949,7 +953,9 @@ static int ll_mknod(struct inode *dir, struct dentry *dchild,
 
         switch (mode & S_IFMT) {
         case 0:
-                mode |= S_IFREG; /* for mode = 0 case, fallthrough */
+                mode |= S_IFREG;
+                /* for mode = 0 case */
+                /* fall through */
         case S_IFREG:
         case S_IFCHR:
         case S_IFBLK:
@@ -980,7 +986,8 @@ static int ll_create_nd(struct inode *dir, struct dentry *dentry,
 {
         int rc;
 
-        CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir=" DFID "(%p), flags=%u, excl=%d\n",
+        CDEBUG(D_VFSTRACE,
+               "VFS Op:name=%pd, dir=" DFID "(%p), flags=%u, excl=%d\n",
                dentry, PFID(ll_inode2fid(dir)), dir, mode, want_excl);
 
         rc = ll_mknod(dir, dentry, mode, 0);
@@ -1101,7 +1108,8 @@ static int ll_link(struct dentry *old_dentry, struct inode *dir,
         struct md_op_data *op_data;
         int err;
 
-        CDEBUG(D_VFSTRACE, "VFS Op: inode=" DFID "(%p), dir=" DFID "(%p), target=%pd\n",
+        CDEBUG(D_VFSTRACE,
+               "VFS Op: inode=" DFID "(%p), dir=" DFID "(%p), target=%pd\n",
                PFID(ll_inode2fid(src)), src, PFID(ll_inode2fid(dir)), dir,
                new_dentry);
 
diff --git a/drivers/staging/lustre/lustre/llite/range_lock.c b/drivers/staging/lustre/lustre/llite/range_lock.c
index a32598bacdfb..cc9565f6bfe2 100644
--- a/drivers/staging/lustre/lustre/llite/range_lock.c
+++ b/drivers/staging/lustre/lustre/llite/range_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/range_lock.h b/drivers/staging/lustre/lustre/llite/range_lock.h
index 1e1519b1e006..38b2be4e378f 100644
--- a/drivers/staging/lustre/lustre/llite/range_lock.h
+++ b/drivers/staging/lustre/lustre/llite/range_lock.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/rw.c b/drivers/staging/lustre/lustre/llite/rw.c
index e72090572bcc..3e008ce7275d 100644
--- a/drivers/staging/lustre/lustre/llite/rw.c
+++ b/drivers/staging/lustre/lustre/llite/rw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -297,7 +298,8 @@ stride_pg_count(pgoff_t st_off, unsigned long st_len, unsigned long st_pgs,
         else
                 pg_count = start_left + st_pgs * (end - start - 1) + end_left;
 
-        CDEBUG(D_READA, "st_off %lu, st_len %lu st_pgs %lu off %lu length %lu pgcount %lu\n",
+        CDEBUG(D_READA,
+               "st_off %lu, st_len %lu st_pgs %lu off %lu length %lu pgcount %lu\n",
                st_off, st_len, st_pgs, off, length, pg_count);
 
         return pg_count;
@@ -404,7 +406,8 @@ ll_read_ahead_pages(const struct lu_env *env, struct cl_io *io,
                          * forward read-ahead, it will be fixed when backward
                          * read-ahead is implemented
                          */
-                        LASSERTF(page_idx >= ria->ria_stoff, "Invalid page_idx %lu rs %lu re %lu ro %lu rl %lu rp %lu\n",
+                        LASSERTF(page_idx >= ria->ria_stoff,
+                                 "Invalid page_idx %lu rs %lu re %lu ro %lu rl %lu rp %lu\n",
                                  page_idx,
                                  ria->ria_start, ria->ria_end, ria->ria_stoff,
                                  ria->ria_length, ria->ria_pages);
@@ -669,8 +672,9 @@ static void ras_stride_increase_window(struct ll_readahead_state *ras,
         unsigned long stride_len;
 
         LASSERT(ras->ras_stride_length > 0);
-        LASSERTF(ras->ras_window_start + ras->ras_window_len
-                 >= ras->ras_stride_offset, "window_start %lu, window_len %lu stride_offset %lu\n",
+        LASSERTF(ras->ras_window_start + ras->ras_window_len >=
+                 ras->ras_stride_offset,
+                 "window_start %lu, window_len %lu stride_offset %lu\n",
                  ras->ras_window_start,
                  ras->ras_window_len, ras->ras_stride_offset);
 
@@ -766,7 +770,8 @@ static void ras_update(struct ll_sb_info *sbi, struct inode *inode,
                             PAGE_SHIFT;
 
                 CDEBUG(D_READA, "kmsp %llu mwp %lu mp %lu\n", kms_pages,
-                       ra->ra_max_read_ahead_whole_pages, ra->ra_max_pages_per_file);
+                       ra->ra_max_read_ahead_whole_pages,
+                       ra->ra_max_pages_per_file);
 
                 if (kms_pages &&
                     kms_pages <= ra->ra_max_read_ahead_whole_pages) {
@@ -884,7 +889,8 @@ static void ras_update(struct ll_sb_info *sbi, struct inode *inode,
 
         /* The initial ras_window_len is set to the request size.  To avoid
          * uselessly reading and discarding pages for random IO the window is
-         * only increased once per consecutive request received. */
+         * only increased once per consecutive request received.
+         */
         if ((ras->ras_consecutive_requests > 1 || stride_detect) &&
             !ras->ras_request_index)
                 ras_increase_window(inode, ras, ra);
diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index 3619cd8bb5f3..722e5ea1af5f 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/statahead.c b/drivers/staging/lustre/lustre/llite/statahead.c
index ea9d59f07b78..90c7324575e4 100644
--- a/drivers/staging/lustre/lustre/llite/statahead.c
+++ b/drivers/staging/lustre/lustre/llite/statahead.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -1082,7 +1083,8 @@ static int ll_statahead_thread(void *arg)
                                         struct ll_inode_info *clli;
 
                                         clli = list_entry(sai->sai_agls.next,
-                                                          struct ll_inode_info, lli_agl_list);
+                                                          struct ll_inode_info,
+                                                          lli_agl_list);
                                         list_del_init(&clli->lli_agl_list);
                                         spin_unlock(&lli->lli_agl_lock);
 
diff --git a/drivers/staging/lustre/lustre/llite/super25.c b/drivers/staging/lustre/lustre/llite/super25.c
index 0da4af81b830..0bda111a096e 100644
--- a/drivers/staging/lustre/lustre/llite/super25.c
+++ b/drivers/staging/lustre/lustre/llite/super25.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -88,7 +89,8 @@ static int __init lustre_init(void)
         struct timespec64 ts;
         int i, rc, seed[2];
 
-        BUILD_BUG_ON(sizeof(LUSTRE_VOLATILE_HDR) != LUSTRE_VOLATILE_HDR_LEN + 1);
+        BUILD_BUG_ON(sizeof(LUSTRE_VOLATILE_HDR) !=
+                     LUSTRE_VOLATILE_HDR_LEN + 1);
 
         /* print an address of _any_ initialized kernel symbol from this
          * module, to allow debugging with gdb that doesn't support data
diff --git a/drivers/staging/lustre/lustre/llite/symlink.c b/drivers/staging/lustre/lustre/llite/symlink.c
index 3cd33483afaf..0690fdbf49f5 100644
--- a/drivers/staging/lustre/lustre/llite/symlink.c
+++ b/drivers/staging/lustre/lustre/llite/symlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/vvp_dev.c b/drivers/staging/lustre/lustre/llite/vvp_dev.c
index f9d9a161bd4e..8ccc8b799c02 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_dev.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_dev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/vvp_internal.h b/drivers/staging/lustre/lustre/llite/vvp_internal.h
index adce0ff4ae44..02ea5161d635 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_internal.h
+++ b/drivers/staging/lustre/lustre/llite/vvp_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/vvp_io.c b/drivers/staging/lustre/lustre/llite/vvp_io.c
index c83853fa1bb4..bfae98e82d6f 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_io.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/vvp_lock.c b/drivers/staging/lustre/lustre/llite/vvp_lock.c
index e522f7c00617..4b6c7143bd2c 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_lock.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/vvp_object.c b/drivers/staging/lustre/lustre/llite/vvp_object.c
index 3953750b334e..05ad3b322a29 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_object.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_object.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/vvp_page.c b/drivers/staging/lustre/lustre/llite/vvp_page.c
index 687c0c79d621..6eb0565ddc22 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_page.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_page.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index 0be55623bac4..532384c91447 100644
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/llite/xattr_cache.c b/drivers/staging/lustre/lustre/llite/xattr_cache.c
index 80ee3920481a..dbf9be2eebd4 100644
--- a/drivers/staging/lustre/lustre/llite/xattr_cache.c
+++ b/drivers/staging/lustre/lustre/llite/xattr_cache.c
@@ -364,7 +364,8 @@ static int ll_xattr_cache_refill(struct inode *inode, struct lookup_intent *oit)
         }
 
         if (oit->it_status < 0) {
-                CDEBUG(D_CACHE, "getxattr intent returned %d for fid " DFID "\n",
+                CDEBUG(D_CACHE,
+                       "getxattr intent returned %d for fid " DFID "\n",
                        oit->it_status, PFID(ll_inode2fid(inode)));
                 rc = oit->it_status;
                 /* xattr data is so large that we don't want to cache it */
diff --git a/drivers/staging/lustre/lustre/llite/xattr_security.c b/drivers/staging/lustre/lustre/llite/xattr_security.c
index 391fb25ac31d..93ec07531ac7 100644
--- a/drivers/staging/lustre/lustre/llite/xattr_security.c
+++ b/drivers/staging/lustre/lustre/llite/xattr_security.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_fld.c b/drivers/staging/lustre/lustre/lmv/lmv_fld.c
index 5937468080b8..00dc858c10c9 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_fld.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_fld.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_intent.c b/drivers/staging/lustre/lustre/lmv/lmv_intent.c
index 22c247a7d8ca..1793c9f79b24 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_intent.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_intent.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_internal.h b/drivers/staging/lustre/lustre/lmv/lmv_internal.h
index a0475231dd90..c27c3c32188d 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_internal.h
+++ b/drivers/staging/lustre/lustre/lmv/lmv_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index 6e16c930a021..c2c57f65431e 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lmv/lproc_lmv.c b/drivers/staging/lustre/lustre/lmv/lproc_lmv.c
index f16cfa435f77..30727b7acccc 100644
--- a/drivers/staging/lustre/lustre/lmv/lproc_lmv.c
+++ b/drivers/staging/lustre/lustre/lmv/lproc_lmv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_cl_internal.h b/drivers/staging/lustre/lustre/lov/lov_cl_internal.h
index 89d92b05b48c..1185eceaf497 100644
--- a/drivers/staging/lustre/lustre/lov/lov_cl_internal.h
+++ b/drivers/staging/lustre/lustre/lov/lov_cl_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_dev.c b/drivers/staging/lustre/lustre/lov/lov_dev.c
index cea5f9dcd04e..c7db23472346 100644
--- a/drivers/staging/lustre/lustre/lov/lov_dev.c
+++ b/drivers/staging/lustre/lustre/lov/lov_dev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_ea.c b/drivers/staging/lustre/lustre/lov/lov_ea.c
index 1124fd5ab32f..d563dd73343a 100644
--- a/drivers/staging/lustre/lustre/lov/lov_ea.c
+++ b/drivers/staging/lustre/lustre/lov/lov_ea.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_internal.h b/drivers/staging/lustre/lustre/lov/lov_internal.h
index a21f074008af..ae28ddf80d9b 100644
--- a/drivers/staging/lustre/lustre/lov/lov_internal.h
+++ b/drivers/staging/lustre/lustre/lov/lov_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_io.c b/drivers/staging/lustre/lustre/lov/lov_io.c
index 9e3b150967b4..c5f5d1b106dc 100644
--- a/drivers/staging/lustre/lustre/lov/lov_io.c
+++ b/drivers/staging/lustre/lustre/lov/lov_io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_lock.c b/drivers/staging/lustre/lustre/lov/lov_lock.c
index e12dc5afc14f..2fcdeb707ff9 100644
--- a/drivers/staging/lustre/lustre/lov/lov_lock.c
+++ b/drivers/staging/lustre/lustre/lov/lov_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_merge.c b/drivers/staging/lustre/lustre/lov/lov_merge.c
index 916336115989..3796bbb25305 100644
--- a/drivers/staging/lustre/lustre/lov/lov_merge.c
+++ b/drivers/staging/lustre/lustre/lov/lov_merge.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_obd.c b/drivers/staging/lustre/lustre/lov/lov_obd.c
index fefd3c588681..7ce01026a409 100644
--- a/drivers/staging/lustre/lustre/lov/lov_obd.c
+++ b/drivers/staging/lustre/lustre/lov/lov_obd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_object.c b/drivers/staging/lustre/lustre/lov/lov_object.c
index 334ecb1bc049..105b707eed14 100644
--- a/drivers/staging/lustre/lustre/lov/lov_object.c
+++ b/drivers/staging/lustre/lustre/lov/lov_object.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_offset.c b/drivers/staging/lustre/lustre/lov/lov_offset.c
index 899d12c41aab..3e16e647b334 100644
--- a/drivers/staging/lustre/lustre/lov/lov_offset.c
+++ b/drivers/staging/lustre/lustre/lov/lov_offset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_pack.c b/drivers/staging/lustre/lustre/lov/lov_pack.c
index 24fb2a97532b..e5b11c4085a9 100644
--- a/drivers/staging/lustre/lustre/lov/lov_pack.c
+++ b/drivers/staging/lustre/lustre/lov/lov_pack.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_page.c b/drivers/staging/lustre/lustre/lov/lov_page.c
index de43c609cf3d..cfae1294d77a 100644
--- a/drivers/staging/lustre/lustre/lov/lov_page.c
+++ b/drivers/staging/lustre/lustre/lov/lov_page.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_pool.c b/drivers/staging/lustre/lustre/lov/lov_pool.c
index d774ee2a3675..ecd9329cd073 100644
--- a/drivers/staging/lustre/lustre/lov/lov_pool.c
+++ b/drivers/staging/lustre/lustre/lov/lov_pool.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lov_request.c b/drivers/staging/lustre/lustre/lov/lov_request.c
index 9d3b3f3e9f10..3bdf48e4edb4 100644
--- a/drivers/staging/lustre/lustre/lov/lov_request.c
+++ b/drivers/staging/lustre/lustre/lov/lov_request.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lovsub_dev.c b/drivers/staging/lustre/lustre/lov/lovsub_dev.c
index d4646a0949d2..7e89a2e485fc 100644
--- a/drivers/staging/lustre/lustre/lov/lovsub_dev.c
+++ b/drivers/staging/lustre/lustre/lov/lovsub_dev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lovsub_lock.c b/drivers/staging/lustre/lustre/lov/lovsub_lock.c
index d29f0bb33980..ea492be2eef3 100644
--- a/drivers/staging/lustre/lustre/lov/lovsub_lock.c
+++ b/drivers/staging/lustre/lustre/lov/lovsub_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lovsub_object.c b/drivers/staging/lustre/lustre/lov/lovsub_object.c
index 011296ee16e6..13d452086b61 100644
--- a/drivers/staging/lustre/lustre/lov/lovsub_object.c
+++ b/drivers/staging/lustre/lustre/lov/lovsub_object.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lovsub_page.c b/drivers/staging/lustre/lustre/lov/lovsub_page.c
index b2e68c3e820d..915520bcdd60 100644
--- a/drivers/staging/lustre/lustre/lov/lovsub_page.c
+++ b/drivers/staging/lustre/lustre/lov/lovsub_page.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/lov/lproc_lov.c b/drivers/staging/lustre/lustre/lov/lproc_lov.c
index 9bb7e9ea0a6a..721440feef72 100644
--- a/drivers/staging/lustre/lustre/lov/lproc_lov.c
+++ b/drivers/staging/lustre/lustre/lov/lproc_lov.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/mdc/lproc_mdc.c b/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
index f68513771527..6cce32491eb5 100644
--- a/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
+++ b/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_internal.h b/drivers/staging/lustre/lustre/mdc/mdc_internal.h
index cbf011501005..e0300c34ca3a 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_internal.h
+++ b/drivers/staging/lustre/lustre/mdc/mdc_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_lib.c b/drivers/staging/lustre/lustre/mdc/mdc_lib.c
index ba13f0894e0d..46eefdc09e3a 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_lib.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
index cbfea3dd0319..3114907ac5ff 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_reint.c b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
index f45c91d1b4ae..488b98007558 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_reint.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 6ef8ddec4ab6..9e538a59f09d 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/mgc/lproc_mgc.c b/drivers/staging/lustre/lustre/mgc/lproc_mgc.c
index 2ec2d7f731d3..636770624e8f 100644
--- a/drivers/staging/lustre/lustre/mgc/lproc_mgc.c
+++ b/drivers/staging/lustre/lustre/mgc/lproc_mgc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_internal.h b/drivers/staging/lustre/lustre/mgc/mgc_internal.h
index 7a2f2b7bc6b1..2c571c180578 100644
--- a/drivers/staging/lustre/lustre/mgc/mgc_internal.h
+++ b/drivers/staging/lustre/lustre/mgc/mgc_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index 3d2b969c90a7..77fa8fea0249 100644
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_internal.h b/drivers/staging/lustre/lustre/obdclass/cl_internal.h
index 7b403fbd5f94..a0db830ca841 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_internal.h
+++ b/drivers/staging/lustre/lustre/obdclass/cl_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_io.c b/drivers/staging/lustre/lustre/obdclass/cl_io.c
index 2a70e21ae07f..6ec5218a18c1 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_io.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_lock.c b/drivers/staging/lustre/lustre/obdclass/cl_lock.c
index 20e64051d2d6..d415f8396038 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_lock.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_object.c b/drivers/staging/lustre/lustre/obdclass/cl_object.c
index 95c7fa3b532c..fdd27ce46fda 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_object.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index 3dc084cb93bc..7f65439f9b95 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 2df218b010e1..2985bca4dc4c 100644
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/debug.c b/drivers/staging/lustre/lustre/obdclass/debug.c
index 7964cad7e780..2156a82a613a 100644
--- a/drivers/staging/lustre/lustre/obdclass/debug.c
+++ b/drivers/staging/lustre/lustre/obdclass/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/genops.c b/drivers/staging/lustre/lustre/obdclass/genops.c
index 739bfb9421ca..b1d6ba4a3190 100644
--- a/drivers/staging/lustre/lustre/obdclass/genops.c
+++ b/drivers/staging/lustre/lustre/obdclass/genops.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/kernelcomm.c b/drivers/staging/lustre/lustre/obdclass/kernelcomm.c
index 4f0a42633d5a..b9bf81607bbf 100644
--- a/drivers/staging/lustre/lustre/obdclass/kernelcomm.c
+++ b/drivers/staging/lustre/lustre/obdclass/kernelcomm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/linkea.c b/drivers/staging/lustre/lustre/obdclass/linkea.c
index 9af86d3d56e4..fe1638b0916e 100644
--- a/drivers/staging/lustre/lustre/obdclass/linkea.c
+++ b/drivers/staging/lustre/lustre/obdclass/linkea.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
index 6df911112731..fc59f29a4290 100644
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
index e92cccceefa1..e5e8687784ee 100644
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/llog.c b/drivers/staging/lustre/lustre/obdclass/llog.c
index 98021a2d7238..cd051e31233e 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/llog_cat.c b/drivers/staging/lustre/lustre/obdclass/llog_cat.c
index 8fa969101650..d9c63adff206 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog_cat.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog_cat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/llog_internal.h b/drivers/staging/lustre/lustre/obdclass/llog_internal.h
index 8de90bc638b4..4991d4e589dc 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog_internal.h
+++ b/drivers/staging/lustre/lustre/obdclass/llog_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/llog_obd.c b/drivers/staging/lustre/lustre/obdclass/llog_obd.c
index 3c42de966077..28bbaa2136ac 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog_obd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/llog_swab.c b/drivers/staging/lustre/lustre/obdclass/llog_swab.c
index d2d3114ce008..b431c3408fe4 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog_swab.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog_swab.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_counters.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_counters.c
index e4829880dc10..c83b7d7f8e72 100644
--- a/drivers/staging/lustre/lustre/obdclass/lprocfs_counters.c
+++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_counters.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
index e79485b4bf7f..05d71f568837 100644
--- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
+++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -1507,12 +1508,16 @@ int lprocfs_write_frac_u64_helper(const char __user *buffer,
                 switch (tolower(*end)) {
                 case 'p':
                         units <<= 10;
+                        /* fall through */
                 case 't':
                         units <<= 10;
+                        /* fall through */
                 case 'g':
                         units <<= 10;
+                        /* fall through */
                 case 'm':
                         units <<= 10;
+                        /* fall through */
                 case 'k':
                         units <<= 10;
                 }
diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c
index 09c98184a291..b938a3f9d50a 100644
--- a/drivers/staging/lustre/lustre/obdclass/lu_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/lu_ref.c b/drivers/staging/lustre/lustre/obdclass/lu_ref.c
index fa690b2bd643..54fc88206534 100644
--- a/drivers/staging/lustre/lustre/obdclass/lu_ref.c
+++ b/drivers/staging/lustre/lustre/obdclass/lu_ref.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
index e1273c997b5f..71329adc0318 100644
--- a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
+++ b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/lustre_peer.c b/drivers/staging/lustre/lustre/obdclass/lustre_peer.c
index 2798d35ad318..e286a2665423 100644
--- a/drivers/staging/lustre/lustre/obdclass/lustre_peer.c
+++ b/drivers/staging/lustre/lustre/obdclass/lustre_peer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/obd_config.c b/drivers/staging/lustre/lustre/obdclass/obd_config.c
index 94a940faca5d..c0e192ae22a9 100644
--- a/drivers/staging/lustre/lustre/obdclass/obd_config.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/obd_mount.c b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
index 1256034b60c1..2a79a223b98a 100644
--- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/obdo.c b/drivers/staging/lustre/lustre/obdclass/obdo.c
index 7083f8786e9a..c4503bc36591 100644
--- a/drivers/staging/lustre/lustre/obdclass/obdo.c
+++ b/drivers/staging/lustre/lustre/obdclass/obdo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/statfs_pack.c b/drivers/staging/lustre/lustre/obdclass/statfs_pack.c
index 89abea26a1f8..355e888885f4 100644
--- a/drivers/staging/lustre/lustre/obdclass/statfs_pack.c
+++ b/drivers/staging/lustre/lustre/obdclass/statfs_pack.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdclass/uuid.c b/drivers/staging/lustre/lustre/obdclass/uuid.c
index 9b1872b99f2a..6cf7a03f048f 100644
--- a/drivers/staging/lustre/lustre/obdclass/uuid.c
+++ b/drivers/staging/lustre/lustre/obdclass/uuid.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c
index f9808d1cc352..b9c1dc7e61b0 100644
--- a/drivers/staging/lustre/lustre/obdecho/echo_client.c
+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/obdecho/echo_internal.h b/drivers/staging/lustre/lustre/obdecho/echo_internal.h
index 966414fd5424..42faa164fabb 100644
--- a/drivers/staging/lustre/lustre/obdecho/echo_internal.h
+++ b/drivers/staging/lustre/lustre/obdecho/echo_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/osc/lproc_osc.c b/drivers/staging/lustre/lustre/osc/lproc_osc.c
index ae13eb055229..dc76c35ae801 100644
--- a/drivers/staging/lustre/lustre/osc/lproc_osc.c
+++ b/drivers/staging/lustre/lustre/osc/lproc_osc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c
index e1207c227b79..5767ac2a7d16 100644
--- a/drivers/staging/lustre/lustre/osc/osc_cache.c
+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -227,6 +228,7 @@ static int osc_extent_sanity_check0(struct osc_extent *ext,
                         rc = 65;
                         goto out;
                 }
+                /* fall through */
         default:
                 if (atomic_read(&ext->oe_users) > 0) {
                         rc = 70;
diff --git a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
index 35bdbfb8660d..1449013722f6 100644
--- a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
+++ b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/osc/osc_dev.c b/drivers/staging/lustre/lustre/osc/osc_dev.c
index cf7b8879d7f0..2b5f324743e2 100644
--- a/drivers/staging/lustre/lustre/osc/osc_dev.c
+++ b/drivers/staging/lustre/lustre/osc/osc_dev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/osc/osc_internal.h b/drivers/staging/lustre/lustre/osc/osc_internal.h
index a536908fb26a..feda61bcdb9b 100644
--- a/drivers/staging/lustre/lustre/osc/osc_internal.h
+++ b/drivers/staging/lustre/lustre/osc/osc_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/osc/osc_io.c b/drivers/staging/lustre/lustre/osc/osc_io.c
index f7969e33f28a..76743faf3e6d 100644
--- a/drivers/staging/lustre/lustre/osc/osc_io.c
+++ b/drivers/staging/lustre/lustre/osc/osc_io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/osc/osc_lock.c b/drivers/staging/lustre/lustre/osc/osc_lock.c
index b4f1f74dead8..fe8ed0d0497a 100644
--- a/drivers/staging/lustre/lustre/osc/osc_lock.c
+++ b/drivers/staging/lustre/lustre/osc/osc_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/osc/osc_object.c b/drivers/staging/lustre/lustre/osc/osc_object.c
index 945ae6e5a8b1..f82c87a77550 100644
--- a/drivers/staging/lustre/lustre/osc/osc_object.c
+++ b/drivers/staging/lustre/lustre/osc/osc_object.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/osc/osc_page.c b/drivers/staging/lustre/lustre/osc/osc_page.c
index ed8a0dc18ee5..20094b6309f9 100644
--- a/drivers/staging/lustre/lustre/osc/osc_page.c
+++ b/drivers/staging/lustre/lustre/osc/osc_page.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/osc/osc_quota.c b/drivers/staging/lustre/lustre/osc/osc_quota.c
index a6118f8ba446..ce1731dc604f 100644
--- a/drivers/staging/lustre/lustre/osc/osc_quota.c
+++ b/drivers/staging/lustre/lustre/osc/osc_quota.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c
index 4c68c42b2281..53eda4c99142 100644
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c b/drivers/staging/lustre/lustre/ptlrpc/client.c
index b1d379a6a70f..2a9f2f2ebaa8 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/client.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/client.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/connection.c b/drivers/staging/lustre/lustre/ptlrpc/connection.c
index cfdcbcec2779..dfdb4587d49d 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/connection.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/connection.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/errno.c b/drivers/staging/lustre/lustre/ptlrpc/errno.c
index cb788364a553..54f0c36dc2bd 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/errno.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/errno.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/events.c b/drivers/staging/lustre/lustre/ptlrpc/events.c
index 62951f19b2ce..811b7ab3a582 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/events.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/events.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c
index 21f528957b73..5b0f65536c29 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/import.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/import.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/layout.c b/drivers/staging/lustre/lustre/ptlrpc/layout.c
index 85854d9a376d..18769d335751 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/layout.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/layout.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/llog_client.c b/drivers/staging/lustre/lustre/ptlrpc/llog_client.c
index 480c20a6a792..254488be7093 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/llog_client.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/llog_client.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/llog_net.c b/drivers/staging/lustre/lustre/ptlrpc/llog_net.c
index bc5aa7bcdba8..bc4398b9bd1d 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/llog_net.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/llog_net.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
index 1392ae9747bd..36eea50a77e7 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
index 12149fb64719..047d712e850c 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/nrs.c b/drivers/staging/lustre/lustre/ptlrpc/nrs.c
index 2969d8da270e..4847f9a90cc9 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/nrs.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/nrs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c b/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c
index df330e43bfe5..8251cbf2ad68 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
index aad4ff191d95..a64e125df95f 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -786,7 +787,7 @@ __u32 lustre_msg_get_flags(struct lustre_msg *msg)
 
                 CERROR("invalid msg %p: no ptlrpc body!\n", msg);
         }
-        /* no break */
+        /* fall through */
         default:
                 /* flags might be printed in debug code while message
                  * uninitialized
@@ -854,7 +855,7 @@ __u32 lustre_msg_get_op_flags(struct lustre_msg *msg)
 
                 CERROR("invalid msg %p: no ptlrpc body!\n", msg);
         }
-        /* no break */
+        /* fall through */
         default:
                 return 0;
         }
@@ -1035,7 +1036,7 @@ int lustre_msg_get_status(struct lustre_msg *msg)
 
                 CERROR("invalid msg %p: no ptlrpc body!\n", msg);
         }
-        /* no break */
+        /* fall through */
         default:
                 /* status might be printed in debug code while message
                  * uninitialized
diff --git a/drivers/staging/lustre/lustre/ptlrpc/pers.c b/drivers/staging/lustre/lustre/ptlrpc/pers.c
index 643388b03af7..2466868afb9c 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/pers.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/pers.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/pinger.c b/drivers/staging/lustre/lustre/ptlrpc/pinger.c
index e4de50e18d08..fe6b47bfe8be 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/pinger.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/pinger.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
index c38e166f1502..f9decbd1459d 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
+++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
index 38e488dd5409..131fc6d9646e 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c b/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
index 0e476828cf75..8b865294d933 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/recover.c b/drivers/staging/lustre/lustre/ptlrpc/recover.c
index 72a19a379e2f..e4d3f23e9f3a 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/recover.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/recover.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec.c b/drivers/staging/lustre/lustre/ptlrpc/sec.c
index cd7a5391a574..617e004d00f8 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
@@ -847,7 +848,7 @@ void sptlrpc_request_out_callback(struct ptlrpc_request *req)
         if (req->rq_pool || !req->rq_reqbuf)
                 return;
 
-        kfree(req->rq_reqbuf);
+        kvfree(req->rq_reqbuf);
         req->rq_reqbuf = NULL;
         req->rq_reqbuf_len = 0;
 }
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
index 059294aad172..77a3721beaee 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
index 0f4af66688a3..2389f9a8f534 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c b/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c
index d10a8053d04f..8d1e0edfcede 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c b/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c
index 7792132eb145..fd609b63d2de 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_null.c b/drivers/staging/lustre/lustre/ptlrpc/sec_null.c
index dc39a54c5e1a..80cea0b24693 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_null.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_null.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c b/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c
index 6aa9b65b1926..44e34056515b 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/service.c b/drivers/staging/lustre/lustre/ptlrpc/service.c
index 155f6a45cc8b..23cdb7c4476c 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/service.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/service.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
index 07b86a1b6550..2f64eb417e77 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * GPL HEADER START
  *
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
index c32240262f57..6e87aa5aab4c 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
@@ -151,7 +151,7 @@ static void atomisp_css2_hw_store(hrt_address addr,
                                   const void *from, uint32_t n)
 {
         unsigned long flags;
-        unsigned i;
+        unsigned int i;
         unsigned int _to = (unsigned int)addr;
         const char *_from = (const char *)from;
 
@@ -164,7 +164,7 @@ static void atomisp_css2_hw_store(hrt_address addr,
 static void atomisp_css2_hw_load(hrt_address addr, void *to, uint32_t n)
 {
         unsigned long flags;
-        unsigned i;
+        unsigned int i;
         char *_to = (char *)to;
         unsigned int _from = (unsigned int)addr;
 
@@ -228,9 +228,11 @@ static void __dump_pipe_config(struct atomisp_sub_device *asd,
                                unsigned int pipe_id)
 {
         struct atomisp_device *isp = asd->isp;
+
         if (stream_env->pipes[pipe_id]) {
                 struct ia_css_pipe_config *p_config;
                 struct ia_css_pipe_extra_config *pe_config;
+
                 p_config = &stream_env->pipe_configs[pipe_id];
                 pe_config = &stream_env->pipe_extra_configs[pipe_id];
                 dev_dbg(isp->dev, "dumping pipe[%d] config:\n", pipe_id);
@@ -503,6 +505,7 @@ static int __destroy_stream(struct atomisp_sub_device *asd,
 static int __destroy_streams(struct atomisp_sub_device *asd, bool force)
 {
         int ret, i;
+
         for (i = 0; i < ATOMISP_INPUT_STREAM_NUM; i++) {
                 ret = __destroy_stream(asd, &asd->stream_env[i], force);
                 if (ret)
@@ -569,6 +572,7 @@ static int __destroy_stream_pipes(struct atomisp_sub_device *asd,
         struct atomisp_device *isp = asd->isp;
         int ret = 0;
         int i;
+
         for (i = 0; i < IA_CSS_PIPE_ID_NUM; i++) {
                 if (!stream_env->pipes[i] ||
                     !(force || stream_env->update_pipe[i]))
@@ -888,12 +892,12 @@ static inline int __set_css_print_env(struct atomisp_device *isp, int opt)
 {
         int ret = 0;
 
-        if (0 == opt)
+        if (opt == 0)
                 isp->css_env.isp_css_env.print_env.debug_print = NULL;
-        else if (1 == opt)
+        else if (opt == 1)
                 isp->css_env.isp_css_env.print_env.debug_print =
                         atomisp_css2_dbg_ftrace_print;
-        else if (2 == opt)
+        else if (opt == 2)
                 isp->css_env.isp_css_env.print_env.debug_print =
                         atomisp_css2_dbg_print;
         else
@@ -1047,6 +1051,7 @@ int atomisp_css_irq_enable(struct atomisp_device *isp,
 void atomisp_css_init_struct(struct atomisp_sub_device *asd)
 {
         int i, j;
+
         for (i = 0; i < ATOMISP_INPUT_STREAM_NUM; i++) {
                 asd->stream_env[i].stream = NULL;
                 for (j = 0; j < IA_CSS_PIPE_MODE_NUM; j++) {
@@ -1185,6 +1190,7 @@ int atomisp_css_start(struct atomisp_sub_device *asd,
         struct atomisp_device *isp = asd->isp;
         bool sp_is_started = false;
         int ret = 0, i = 0;
+
         if (in_reset) {
                 if (__destroy_streams(asd, true))
                         dev_warn(isp->dev, "destroy stream failed.\n");
@@ -1972,6 +1978,7 @@ void atomisp_css_enable_raw_binning(struct atomisp_sub_device *asd,
 void atomisp_css_enable_dz(struct atomisp_sub_device *asd, bool enable)
 {
         int i;
+
         for (i = 0; i < IA_CSS_PIPE_ID_NUM; i++)
                 asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL]
                         .pipe_configs[i].enable_dz = enable;
@@ -1998,6 +2005,7 @@ void atomisp_css_input_set_mode(struct atomisp_sub_device *asd,
         int i;
         struct atomisp_device *isp = asd->isp;
         unsigned int size_mem_words;
+
         for (i = 0; i < ATOMISP_INPUT_STREAM_NUM; i++)
                 asd->stream_env[i].stream_config.mode = mode;
 
@@ -2271,6 +2279,7 @@ int atomisp_css_stop(struct atomisp_sub_device *asd,
         if (!in_reset) {
                 struct atomisp_stream_env *stream_env;
                 int i, j;
+
                 for (i = 0; i < ATOMISP_INPUT_STREAM_NUM; i++) {
                         stream_env = &asd->stream_env[i];
                         for (j = 0; j < IA_CSS_PIPE_ID_NUM; j++) {
@@ -2797,6 +2806,7 @@ static void __configure_video_vf_output(struct atomisp_sub_device *asd,
         struct atomisp_stream_env *stream_env =
                 &asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL];
         struct ia_css_frame_info *css_output_info;
+
         stream_env->pipe_configs[pipe_id].mode =
                                         __pipe_id_to_pipe_mode(asd, pipe_id);
         stream_env->update_pipe[pipe_id] = true;
@@ -4460,7 +4470,8 @@ int atomisp_css_load_acc_binary(struct atomisp_sub_device *asd,
 static struct atomisp_sub_device *__get_atomisp_subdev(
                                         struct ia_css_pipe *css_pipe,
                                         struct atomisp_device *isp,
-                                        enum atomisp_input_stream_id *stream_id) {
+                                        enum atomisp_input_stream_id *stream_id)
+{
         int i, j, k;
         struct atomisp_sub_device *asd;
         struct atomisp_stream_env *stream_env;
@@ -4655,7 +4666,7 @@ int atomisp_css_dump_sp_raw_copy_linecount(bool reduced)
 int atomisp_css_dump_blob_infor(void)
 {
         struct ia_css_blob_descr *bd = sh_css_blob_info;
-        unsigned i, nm = sh_css_num_binaries;
+        unsigned int i, nm = sh_css_num_binaries;
 
         if (nm == 0)
                 return -EPERM;
@@ -4691,7 +4702,7 @@ int atomisp_set_css_dbgfunc(struct atomisp_device *isp, int opt)
         int ret;
 
         ret = __set_css_print_env(isp, opt);
-        if (0 == ret)
+        if (ret == 0)
                 dbg_func = opt;
 
         return ret;
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
index 383d236c010c..8158ea40d069 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
@@ -146,7 +146,7 @@ sh_css_load_blob_info(const char *fw, const struct ia_css_fw_info *bi, struct ia
                 size_t statestruct_size = sizeof(struct ia_css_state_memory_offsets);
 
                 char *parambuf = kmalloc(paramstruct_size + configstruct_size + statestruct_size,
-                                                        GFP_KERNEL);
+                                         GFP_KERNEL);
                 if (!parambuf)
                         return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
 
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
index 9e957514108e..6e2dce7a5a2d 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
@@ -721,7 +721,7 @@ static int alloc_private_pages(struct hmm_buffer_object *bo,
 
         pgnr = bo->pgnr;
 
-        bo->page_obj = kmalloc(sizeof(struct hmm_page_object) * pgnr,
+        bo->page_obj = kmalloc_array(pgnr, sizeof(struct hmm_page_object),
                                 GFP_KERNEL);
         if (unlikely(!bo->page_obj))
                 return -ENOMEM;
@@ -984,11 +984,11 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,
         struct vm_area_struct *vma;
         struct page **pages;
 
-        pages = kmalloc(sizeof(struct page *) * bo->pgnr, GFP_KERNEL);
+        pages = kmalloc_array(bo->pgnr, sizeof(struct page *), GFP_KERNEL);
         if (unlikely(!pages))
                 return -ENOMEM;
 
-        bo->page_obj = kmalloc(sizeof(struct hmm_page_object) * bo->pgnr,
+        bo->page_obj = kmalloc_array(bo->pgnr, sizeof(struct hmm_page_object),
                 GFP_KERNEL);
         if (unlikely(!bo->page_obj)) {
                 kfree(pages);
@@ -1350,7 +1350,7 @@ void *hmm_bo_vmap(struct hmm_buffer_object *bo, bool cached)
                 bo->status &= ~(HMM_BO_VMAPED | HMM_BO_VMAPED_CACHED);
         }
 
-        pages = kmalloc(sizeof(*pages) * bo->pgnr, GFP_KERNEL);
+        pages = kmalloc_array(bo->pgnr, sizeof(*pages), GFP_KERNEL);
         if (unlikely(!pages)) {
                 mutex_unlock(&bo->mutex);
                 return NULL;
diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 58adaea44eb5..5d3b0e5a1283 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -1964,7 +1964,7 @@ static ssize_t bcm2048_##prop##_write(struct device *dev,		\
         return err < 0 ? err : count;                                   \
 }
 
-#define property_read(prop, size, mask)                                 \
+#define property_read(prop, mask)                                       \
 static ssize_t bcm2048_##prop##_read(struct device *dev,                \
                                         struct device_attribute *attr,  \
                                         char *buf)                      \
@@ -1999,9 +1999,9 @@ static ssize_t bcm2048_##prop##_read(struct device *dev,		\
         return sprintf(buf, mask "\n", value);                          \
 }
 
-#define DEFINE_SYSFS_PROPERTY(prop, signal, size, mask, check)          \
-property_write(prop, signal size, mask, check)                          \
-property_read(prop, size, mask)
+#define DEFINE_SYSFS_PROPERTY(prop, prop_type, mask, check)             \
+property_write(prop, prop_type, mask, check)                            \
+property_read(prop, mask)                                               \
 
 #define property_str_read(prop, size)                                   \
 static ssize_t bcm2048_##prop##_read(struct device *dev,                \
@@ -2027,39 +2027,39 @@ static ssize_t bcm2048_##prop##_read(struct device *dev,		\
         return count;                                                   \
 }
 
-DEFINE_SYSFS_PROPERTY(power_state, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(mute, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(audio_route, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(dac_output, unsigned, int, "%u", 0)
-
-DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned, int, "%u", value > 3)
-
-DEFINE_SYSFS_PROPERTY(rds, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned, int, "%u", 0)
-DEFINE_SYSFS_PROPERTY(rds_wline, unsigned, int, "%u", 0)
-property_read(rds_pi, unsigned int, "%x")
+DEFINE_SYSFS_PROPERTY(power_state, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(mute, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, "%u", 0)
+
+DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned int, "%u", value > 3)
+
+DEFINE_SYSFS_PROPERTY(rds, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(rds_wline, unsigned int, "%u", 0)
+property_read(rds_pi, "%x")
 property_str_read(rds_rt, (BCM2048_MAX_RDS_RT + 1))
 property_str_read(rds_ps, (BCM2048_MAX_RDS_PS + 1))
 
-property_read(fm_rds_flags, unsigned int, "%u")
+property_read(fm_rds_flags, "%u")
 property_str_read(rds_data, BCM2048_MAX_RDS_RADIO_TEXT * 5)
 
-property_read(region_bottom_frequency, unsigned int, "%u")
-property_read(region_top_frequency, unsigned int, "%u")
+property_read(region_bottom_frequency, "%u")
+property_read(region_top_frequency, "%u")
 property_signed_read(fm_carrier_error, int, "%d")
 property_signed_read(fm_rssi, int, "%d")
-DEFINE_SYSFS_PROPERTY(region, unsigned, int, "%u", 0)
+DEFINE_SYSFS_PROPERTY(region, unsigned int, "%u", 0)
 
 static struct device_attribute attrs[] = {
         __ATTR(power_state, 0644, bcm2048_power_state_read,
diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
index e05ae4645d91..30532d8c310b 100644
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -364,39 +364,39 @@ static void xlr_stats(struct net_device *ndev, struct rtnl_link_stats64 *stats)
         stats->tx_bytes = xlr_nae_rdreg(priv->base_addr, TX_BYTE_COUNTER);
         stats->tx_errors = xlr_nae_rdreg(priv->base_addr, TX_FCS_ERROR_COUNTER);
         stats->rx_dropped = xlr_nae_rdreg(priv->base_addr,
-                        RX_DROP_PACKET_COUNTER);
+                                          RX_DROP_PACKET_COUNTER);
         stats->tx_dropped = xlr_nae_rdreg(priv->base_addr,
-                        TX_DROP_FRAME_COUNTER);
+                                          TX_DROP_FRAME_COUNTER);
 
         stats->multicast = xlr_nae_rdreg(priv->base_addr,
-                        RX_MULTICAST_PACKET_COUNTER);
+                                         RX_MULTICAST_PACKET_COUNTER);
         stats->collisions = xlr_nae_rdreg(priv->base_addr,
-                        TX_TOTAL_COLLISION_COUNTER);
+                                          TX_TOTAL_COLLISION_COUNTER);
 
         stats->rx_length_errors = xlr_nae_rdreg(priv->base_addr,
-                        RX_FRAME_LENGTH_ERROR_COUNTER);
+                                                RX_FRAME_LENGTH_ERROR_COUNTER);
         stats->rx_over_errors = xlr_nae_rdreg(priv->base_addr,
-                        RX_DROP_PACKET_COUNTER);
+                                              RX_DROP_PACKET_COUNTER);
         stats->rx_crc_errors = xlr_nae_rdreg(priv->base_addr,
-                        RX_FCS_ERROR_COUNTER);
+                                             RX_FCS_ERROR_COUNTER);
         stats->rx_frame_errors = xlr_nae_rdreg(priv->base_addr,
-                        RX_ALIGNMENT_ERROR_COUNTER);
+                                               RX_ALIGNMENT_ERROR_COUNTER);
 
         stats->rx_fifo_errors = xlr_nae_rdreg(priv->base_addr,
-                        RX_DROP_PACKET_COUNTER);
+                                              RX_DROP_PACKET_COUNTER);
         stats->rx_missed_errors = xlr_nae_rdreg(priv->base_addr,
-                        RX_CARRIER_SENSE_ERROR_COUNTER);
+                                                RX_CARRIER_SENSE_ERROR_COUNTER);
 
         stats->rx_errors = (stats->rx_over_errors + stats->rx_crc_errors +
-                        stats->rx_frame_errors + stats->rx_fifo_errors +
-                        stats->rx_missed_errors);
+                            stats->rx_frame_errors + stats->rx_fifo_errors +
+                            stats->rx_missed_errors);
 
         stats->tx_aborted_errors = xlr_nae_rdreg(priv->base_addr,
                         TX_EXCESSIVE_COLLISION_PACKET_COUNTER);
         stats->tx_carrier_errors = xlr_nae_rdreg(priv->base_addr,
-                        TX_DROP_FRAME_COUNTER);
+                                                 TX_DROP_FRAME_COUNTER);
         stats->tx_fifo_errors = xlr_nae_rdreg(priv->base_addr,
-                        TX_DROP_FRAME_COUNTER);
+                                              TX_DROP_FRAME_COUNTER);
 }
 
 static const struct net_device_ops xlr_netdev_ops = {
@@ -448,41 +448,35 @@ static void *xlr_config_spill(struct xlr_net_priv *priv, int reg_start_0,
 static void xlr_config_fifo_spill_area(struct xlr_net_priv *priv)
 {
         priv->frin_spill = xlr_config_spill(priv,
-                        R_REG_FRIN_SPILL_MEM_START_0,
-                        R_REG_FRIN_SPILL_MEM_START_1,
-                        R_REG_FRIN_SPILL_MEM_SIZE,
-                        MAX_FRIN_SPILL *
-                        sizeof(u64));
+                                            R_REG_FRIN_SPILL_MEM_START_0,
+                                            R_REG_FRIN_SPILL_MEM_START_1,
+                                            R_REG_FRIN_SPILL_MEM_SIZE,
+                                            MAX_FRIN_SPILL * sizeof(u64));
         priv->frout_spill = xlr_config_spill(priv,
-                        R_FROUT_SPILL_MEM_START_0,
-                        R_FROUT_SPILL_MEM_START_1,
-                        R_FROUT_SPILL_MEM_SIZE,
-                        MAX_FROUT_SPILL *
-                        sizeof(u64));
+                                             R_FROUT_SPILL_MEM_START_0,
+                                             R_FROUT_SPILL_MEM_START_1,
+                                             R_FROUT_SPILL_MEM_SIZE,
+                                             MAX_FROUT_SPILL * sizeof(u64));
         priv->class_0_spill = xlr_config_spill(priv,
-                        R_CLASS0_SPILL_MEM_START_0,
-                        R_CLASS0_SPILL_MEM_START_1,
-                        R_CLASS0_SPILL_MEM_SIZE,
-                        MAX_CLASS_0_SPILL *
-                        sizeof(u64));
+                                               R_CLASS0_SPILL_MEM_START_0,
+                                               R_CLASS0_SPILL_MEM_START_1,
+                                               R_CLASS0_SPILL_MEM_SIZE,
+                                               MAX_CLASS_0_SPILL * sizeof(u64));
         priv->class_1_spill = xlr_config_spill(priv,
-                        R_CLASS1_SPILL_MEM_START_0,
-                        R_CLASS1_SPILL_MEM_START_1,
-                        R_CLASS1_SPILL_MEM_SIZE,
-                        MAX_CLASS_1_SPILL *
-                        sizeof(u64));
+                                               R_CLASS1_SPILL_MEM_START_0,
+                                               R_CLASS1_SPILL_MEM_START_1,
+                                               R_CLASS1_SPILL_MEM_SIZE,
+                                               MAX_CLASS_1_SPILL * sizeof(u64));
         priv->class_2_spill = xlr_config_spill(priv,
-                        R_CLASS2_SPILL_MEM_START_0,
-                        R_CLASS2_SPILL_MEM_START_1,
-                        R_CLASS2_SPILL_MEM_SIZE,
-                        MAX_CLASS_2_SPILL *
-                        sizeof(u64));
+                                               R_CLASS2_SPILL_MEM_START_0,
+                                               R_CLASS2_SPILL_MEM_START_1,
+                                               R_CLASS2_SPILL_MEM_SIZE,
+                                               MAX_CLASS_2_SPILL * sizeof(u64));
         priv->class_3_spill = xlr_config_spill(priv,
-                        R_CLASS3_SPILL_MEM_START_0,
-                        R_CLASS3_SPILL_MEM_START_1,
-                        R_CLASS3_SPILL_MEM_SIZE,
-                        MAX_CLASS_3_SPILL *
-                        sizeof(u64));
+                                               R_CLASS3_SPILL_MEM_START_0,
+                                               R_CLASS3_SPILL_MEM_START_1,
+                                               R_CLASS3_SPILL_MEM_SIZE,
+                                               MAX_CLASS_3_SPILL * sizeof(u64));
 }
 
 /*
diff --git a/drivers/staging/pi433/Documentation/pi433.txt b/drivers/staging/pi433/Documentation/pi433.txt
index 38b83b86c334..245fef33d688 100644
--- a/drivers/staging/pi433/Documentation/pi433.txt
+++ b/drivers/staging/pi433/Documentation/pi433.txt
@@ -20,7 +20,7 @@ Discription of driver operation
 a) transmission
 
 Each transmission can take place with a different configuration of the rf
-module. Therfore each application can set its own set of parameters. The driver
+module. Therefore each application can set its own set of parameters. The driver
 takes care, that each transmission takes place with the parameterset of the
 application, that requests the transmission. To allow the transmission to take
 place in the background, a tx thread is introduced.
@@ -33,7 +33,7 @@ there is no receive request or the receiver is still waiting for something in
 the air, the rf module is set to standby, the parameters for transmission gets
 set, the hardware fifo of the rf chip gets preloaded and the transmission gets
 started. Upon hardware fifo threshold interrupt it gets reloaded, thus enabling
-much longer telegrams then hardware fifo size. If the telegram is send and there
+much longer telegrams than the hardware fifo size. If the telegram is sent and there
 is more data available in the kfifo, the procedure is repeated. If not the
 transmission cycle ends.
 
@@ -41,7 +41,7 @@ b) reception
 
 Since there is only one application allowed to receive data at a time, for
 reception there is only one configuration set.
-As soon as an application sets an request for receiving a telegram, the reception
+As soon as an application sets a request for receiving a telegram, the reception
 configuration set is written to the rf module and it gets set into receiving mode.
 Now the driver is waiting, that a predefined RSSI level (signal strength at the
 receiver) is reached. Until this hasn't happened, the reception can be
@@ -123,7 +123,7 @@ packet format:
                 optionOff       - no preamble will be generated
         enable_sync
                 optionOn        - a sync word will be automatically added to
-                                  the telegram after preamble
+                                  the telegram after the preamble
                 optionOff       - no sync word will be added
                 Attention: While possible to generate sync without preamble, the
                 receiver won't be able to detect the sync without preamble.
@@ -136,7 +136,7 @@ packet format:
                 Attention: should be used in combination with sync, only
         enable_address_byte
                 optionOn        - the address byte will be automatically added to the
-                                  telgram. It's part of the payload
+                                  telegram. It's part of the payload
                 optionOff       - the address byte will not be added to the telegram.
                 The address byte can be used for address filtering, so the receiver
                 will only receive telegrams with a given address byte.
@@ -161,7 +161,7 @@ packet format:
                 one byte, used as address byte on address byte option.
 
 
-The rx configuration is transfered via struct pi433_rx_cfg, the parameterset for receiving. It is devided into two sections: rf parameters and packet format.
+The rx configuration is transferred via struct pi433_rx_cfg, the parameterset for receiving. It is divided into two sections: rf parameters and packet format.
 
 rf params:
         frequency
@@ -178,7 +178,7 @@ rf params:
                 OOK - on off key
         rssi_threshold
                 threshold value for the signal strength on the receiver input.
-                If this value is exeeded, a reception cycle starts
+                If this value is exceeded, a reception cycle starts
                 Allowed values: 0...255
         thresholdDecrement
                 in order to adapt to different levels of singnal strength, over
@@ -198,7 +198,7 @@ rf params:
                 twohundretOhm   - for antennas with an impedance of 200Ohm
         lnaGain
                 sets the gain of the low noise amp
-                automatic       - lna gain is determed by an agc
+                automatic       - lna gain is determined by an agc
                 max             - lna gain is set to maximum
                 maxMinus6       - lna gain is set to  6db below max
                 maxMinus12      - lna gain is set to 12db below max
@@ -232,7 +232,7 @@ rf params:
                              amount of bytes that were requested by the read request.
                 Attention: should be used in combination with sync, only
         enable_address_filtering;
-                filteringOff            - no adress filtering will take place
+                filteringOff            - no address filtering will take place
                 nodeAddress             - all telegrams, not matching the node
                                           address will be internally discarded
                 nodeOrBroadcastAddress  - all telegrams, neither matching the
@@ -245,7 +245,7 @@ rf params:
                                   calculated crc doesn't match to two bytes,
                                   that follow the payload, the telegram will be
                                   internally discarded.
-                Attention: This option is only operational, if sync on and fixed length
+                Attention: This option is only operational if sync on and fixed length
                 or length byte is used
         sync_length
                 Gives the length of the payload.
@@ -255,9 +255,9 @@ rf params:
                 Overrides the telegram length either given by the first byte of
                 payload or by the read request.
         bytes_to_drop
-                gives the number of bytes, that will be dropped before transfering
+                gives the number of bytes, that will be dropped before transferring
                 data to the read buffer
-                This option is only usefull, if all packet helper are switched
+                This option is only useful if all packet helper are switched
                 off and the rf chip is used in raw receiving mode. This may be
                 needed, if a telegram of a third party device should be received,
                 using a protocol not compatible with the packet engine of the rf69 chip.
diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
index 93c01680f016..d946838450d4 100644
--- a/drivers/staging/pi433/pi433_if.c
+++ b/drivers/staging/pi433/pi433_if.c
@@ -136,17 +136,17 @@ static irqreturn_t DIO0_irq_handler(int irq, void *dev_id)
         if      (device->irq_state[DIO0] == DIO_PacketSent)
         {
                 device->free_in_fifo = FIFO_SIZE;
-                printk("DIO0 irq: Packet sent\n"); // TODO: printk() should include KERN_ facility level
+                dev_dbg(device->dev, "DIO0 irq: Packet sent\n");
                 wake_up_interruptible(&device->fifo_wait_queue);
         }
         else if (device->irq_state[DIO0] == DIO_Rssi_DIO0)
         {
-                printk("DIO0 irq: RSSI level over threshold\n");
+                dev_dbg(device->dev, "DIO0 irq: RSSI level over threshold\n");
                 wake_up_interruptible(&device->rx_wait_queue);
         }
         else if (device->irq_state[DIO0] == DIO_PayloadReady)
         {
-                printk("DIO0 irq: PayloadReady\n");
+                dev_dbg(device->dev, "DIO0 irq: PayloadReady\n");
                 device->free_in_fifo = 0;
                 wake_up_interruptible(&device->fifo_wait_queue);
         }
@@ -167,7 +167,8 @@ static irqreturn_t DIO1_irq_handler(int irq, void *dev_id)
                 if (device->rx_active)  device->free_in_fifo = FIFO_THRESHOLD - 1;
                 else                    device->free_in_fifo = FIFO_SIZE - FIFO_THRESHOLD - 1;
         }
-        printk("DIO1 irq: %d bytes free in fifo\n", device->free_in_fifo); // TODO: printk() should include KERN_ facility level
+        dev_dbg(device->dev,
+                "DIO1 irq: %d bytes free in fifo\n", device->free_in_fifo);
         wake_up_interruptible(&device->fifo_wait_queue);
 
         return IRQ_HANDLED;
@@ -284,8 +285,7 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)
         SET_CHECKED(rf69_set_crc_enable   (dev->spi, tx_cfg->enable_crc));
 
         /* configure sync, if enabled */
-        if (tx_cfg->enable_sync == optionOn)
-        {
+        if (tx_cfg->enable_sync == optionOn) {
                 SET_CHECKED(rf69_set_sync_size(dev->spi, tx_cfg->sync_length));
                 SET_CHECKED(rf69_set_sync_values(dev->spi, tx_cfg->sync_pattern));
         }
@@ -407,8 +407,7 @@ pi433_receive(void *data)
                 if (retval) goto abort; /* wait was interrupted */
 
                 rf69_read_fifo(spi, (u8 *)&bytes_total, 1);
-                if (bytes_total > dev->rx_buffer_size)
-                {
+                if (bytes_total > dev->rx_buffer_size) {
                         retval = -1;
                         goto abort;
                 }
@@ -466,7 +465,7 @@ pi433_receive(void *data)
         }
 
 
-        /* rx done, wait was interrupted or error occured */
+        /* rx done, wait was interrupted or error occurred */
 abort:
         dev->interrupt_rx_allowed = true;
         SET_CHECKED(rf69_set_mode(dev->spi, standby));
@@ -508,16 +507,14 @@ pi433_tx_thread(void *data)
                 mutex_lock(&device->tx_fifo_lock);
 
                 retval = kfifo_out(&device->tx_fifo, &tx_cfg, sizeof(tx_cfg));
-                if (retval != sizeof(tx_cfg))
-                {
+                if (retval != sizeof(tx_cfg)) {
                         dev_dbg(device->dev, "reading tx_cfg from fifo failed: got %d byte(s), expected %d", retval, (unsigned int)sizeof(tx_cfg) );
                         mutex_unlock(&device->tx_fifo_lock);
                         continue;
                 }
 
                 retval = kfifo_out(&device->tx_fifo, &size, sizeof(size_t));
-                if (retval != sizeof(size_t))
-                {
+                if (retval != sizeof(size_t)) {
                         dev_dbg(device->dev, "reading msg size from fifo failed: got %d, expected %d", retval, (unsigned int)sizeof(size_t) );
                         mutex_unlock(&device->tx_fifo_lock);
                         continue;
@@ -649,8 +646,7 @@ pi433_tx_thread(void *data)
                 SET_CHECKED(rf69_set_mode(spi, standby));
 
                 /* everything sent? */
-                if ( kfifo_is_empty(&device->tx_fifo) )
-                {
+                if (kfifo_is_empty(&device->tx_fifo)) {
 abort:
                         if (rx_interrupted)
                         {
@@ -704,8 +700,7 @@ pi433_read(struct file *filp, char __user *buf, size_t size, loff_t *f_pos)
         mutex_unlock(&device->rx_lock);
 
         /* if read was successful copy to user space*/
-        if (bytes_received > 0)
-        {
+        if (bytes_received > 0) {
                 retval = copy_to_user(buf, device->rx_buffer, bytes_received);
                 if (retval)
                         return -EFAULT;
@@ -805,8 +800,7 @@ pi433_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
         switch (cmd) {
         case PI433_IOC_RD_TX_CFG:
                 tmp = _IOC_SIZE(cmd);
-                if ( (tmp == 0) || ((tmp % sizeof(struct pi433_tx_cfg)) != 0) )
-                {
+                if ((tmp == 0) || ((tmp % sizeof(struct pi433_tx_cfg)) != 0)) {
                         retval = -EINVAL;
                         break;
                 }
@@ -822,8 +816,7 @@ pi433_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 break;
         case PI433_IOC_WR_TX_CFG:
                 tmp = _IOC_SIZE(cmd);
-                if ( (tmp == 0) || ((tmp % sizeof(struct pi433_tx_cfg)) != 0) )
-                {
+                if ((tmp == 0) || ((tmp % sizeof(struct pi433_tx_cfg)) != 0)) {
                         retval = -EINVAL;
                         break;
                 }
@@ -916,8 +909,7 @@ static int pi433_open(struct inode *inode, struct file *filp)
 
         if (!device->rx_buffer) {
                 device->rx_buffer = kmalloc(MAX_MSG_SIZE, GFP_KERNEL);
-                if (!device->rx_buffer)
-                {
+                if (!device->rx_buffer) {
                         dev_dbg(device->dev, "open/ENOMEM\n");
                         return -ENOMEM;
                 }
@@ -925,8 +917,7 @@ static int pi433_open(struct inode *inode, struct file *filp)
 
         device->users++;
         instance = kzalloc(sizeof(*instance), GFP_KERNEL);
-        if (!instance)
-        {
+        if (!instance) {
                 kfree(device->rx_buffer);
                 device->rx_buffer = NULL;
                 return -ENOMEM;
@@ -986,8 +977,7 @@ static int setup_GPIOs(struct pi433_device *device)
                 snprintf(name, sizeof(name), "DIO%d", i);
                 device->gpiod[i] = gpiod_get(&device->spi->dev, name, 0 /*GPIOD_IN*/);
 
-                if (device->gpiod[i] == ERR_PTR(-ENOENT))
-                {
+                if (device->gpiod[i] == ERR_PTR(-ENOENT)) {
                         dev_dbg(&device->spi->dev, "Could not find entry for %s. Ignoring.", name);
                         continue;
                 }
@@ -1016,8 +1006,7 @@ static int setup_GPIOs(struct pi433_device *device)
 
                 /* configure irq */
                 device->irq_num[i] = gpiod_to_irq(device->gpiod[i]);
-                if (device->irq_num[i] < 0)
-                {
+                if (device->irq_num[i] < 0) {
                         device->gpiod[i] = ERR_PTR(-EINVAL);//(struct gpio_desc *)device->irq_num[i];
                         return device->irq_num[i];
                 }
@@ -1030,7 +1019,7 @@ static int setup_GPIOs(struct pi433_device *device)
                 if (retval)
                         return retval;
 
-                dev_dbg(&device->spi->dev, "%s succesfully configured", name);
+                dev_dbg(&device->spi->dev, "%s successfully configured", name);
         }
 
         return 0;
@@ -1156,8 +1145,7 @@ static int pi433_probe(struct spi_device *spi)
 
         /* setup GPIO (including irq_handler) for the different DIOs */
         retval = setup_GPIOs(device);
-        if (retval)
-        {
+        if (retval) {
                 dev_dbg(&spi->dev, "setup of GPIOs failed");
                 goto GPIO_failed;
         }
@@ -1175,16 +1163,14 @@ static int pi433_probe(struct spi_device *spi)
         device->tx_task_struct = kthread_run(pi433_tx_thread,
                                              device,
                                              "pi433_tx_task");
-        if (IS_ERR(device->tx_task_struct))
-        {
+        if (IS_ERR(device->tx_task_struct)) {
                 dev_dbg(device->dev, "start of send thread failed");
                 goto send_thread_failed;
         }
 
         /* determ minor number */
         retval = pi433_get_minor(device);
-        if (retval)
-        {
+        if (retval) {
                 dev_dbg(device->dev, "get of minor number failed");
                 goto minor_failed;
         }
@@ -1213,8 +1199,7 @@ static int pi433_probe(struct spi_device *spi)
         device->cdev->owner = THIS_MODULE;
         cdev_init(device->cdev, &pi433_fops);
         retval = cdev_add(device->cdev, device->devt, 1);
-        if (retval)
-        {
+        if (retval) {
                 dev_dbg(device->dev, "register of cdev failed");
                 goto cdev_failed;
         }
@@ -1306,15 +1291,13 @@ static int __init pi433_init(void)
                 return status;
 
         pi433_class = class_create(THIS_MODULE, "pi433");
-        if (IS_ERR(pi433_class))
-        {
+        if (IS_ERR(pi433_class)) {
                 unregister_chrdev(MAJOR(pi433_dev), pi433_spi_driver.driver.name);
                 return PTR_ERR(pi433_class);
         }
 
         status = spi_register_driver(&pi433_spi_driver);
-        if (status < 0)
-        {
+        if (status < 0) {
                 class_destroy(pi433_class);
                 unregister_chrdev(MAJOR(pi433_dev), pi433_spi_driver.driver.name);
         }
diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c
index 290b419aa9dd..e69a2153c999 100644
--- a/drivers/staging/pi433/rf69.c
+++ b/drivers/staging/pi433/rf69.c
@@ -34,7 +34,7 @@
 /*-------------------------------------------------------------------------*/
 
 #define READ_REG(x)     rf69_read_reg (spi, x)
-#define WRITE_REG(x,y)  rf69_write_reg(spi, x, y)
+#define WRITE_REG(x, y) rf69_write_reg(spi, x, y)
 
 /*-------------------------------------------------------------------------*/
 
@@ -164,9 +164,12 @@ int rf69_set_bit_rate(struct spi_device *spi, u16 bitRate)
 
         // transmit to RF 69
         retval = WRITE_REG(REG_BITRATE_MSB, msb);
-        if (retval)  return retval;
+        if (retval)
+                return retval;
+
         retval = WRITE_REG(REG_BITRATE_LSB, lsb);
-        if (retval)  return retval;
+        if (retval)
+                return retval;
 
         return 0;
 }
@@ -196,7 +199,7 @@ int rf69_set_deviation(struct spi_device *spi, u32 deviation)
 
         // calculate register settings
         f_reg = deviation * factor;
-        do_div(f_reg  , f_step);
+        do_div(f_reg, f_step);
 
         msb = (f_reg&0xff00)   >>  8;
         lsb = (f_reg&0xff);
@@ -209,9 +212,12 @@ int rf69_set_deviation(struct spi_device *spi, u32 deviation)
 
         // write to chip
         retval = WRITE_REG(REG_FDEV_MSB, msb);
-        if (retval)  return retval;
+        if (retval)
+                return retval;
+
         retval = WRITE_REG(REG_FDEV_LSB, lsb);
-        if (retval)  return retval;
+        if (retval)
+                return retval;
 
         return 0;
 }
@@ -244,7 +250,7 @@ int rf69_set_frequency(struct spi_device *spi, u32 frequency)
 
         // calculate reg settings
         f_reg = frequency * factor;
-        do_div(f_reg  , f_step);
+        do_div(f_reg, f_step);
 
         msb = (f_reg&0xff0000) >> 16;
         mid = (f_reg&0xff00)   >>  8;
@@ -252,11 +258,16 @@ int rf69_set_frequency(struct spi_device *spi, u32 frequency)
 
         // write to chip
         retval = WRITE_REG(REG_FRF_MSB, msb);
-        if (retval)  return retval;
+        if (retval)
+                return retval;
+
         retval = WRITE_REG(REG_FRF_MID, mid);
-        if (retval)  return retval;
+        if (retval)
+                return retval;
+
         retval = WRITE_REG(REG_FRF_LSB, lsb);
-        if (retval)  return retval;
+        if (retval)
+                return retval;
 
         return 0;
 }
@@ -267,9 +278,9 @@ int rf69_set_amplifier_0(struct spi_device *spi, enum optionOnOff optionOnOff)
                 dev_dbg(&spi->dev, "set: amp #0");
         #endif
 
-        switch(optionOnOff) {
-        case optionOn:  return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) |  MASK_PALEVEL_PA0) );
-        case optionOff: return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) & ~MASK_PALEVEL_PA0) );
+        switch (optionOnOff) {
+        case optionOn:  return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) |  MASK_PALEVEL_PA0));
+        case optionOff: return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) & ~MASK_PALEVEL_PA0));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -282,9 +293,9 @@ int rf69_set_amplifier_1(struct spi_device *spi, enum optionOnOff optionOnOff)
                 dev_dbg(&spi->dev, "set: amp #1");
         #endif
 
-        switch(optionOnOff) {
-        case optionOn:  return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) |  MASK_PALEVEL_PA1) );
-        case optionOff: return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) & ~MASK_PALEVEL_PA1) );
+        switch (optionOnOff) {
+        case optionOn:  return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) |  MASK_PALEVEL_PA1));
+        case optionOff: return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) & ~MASK_PALEVEL_PA1));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -297,9 +308,9 @@ int rf69_set_amplifier_2(struct spi_device *spi, enum optionOnOff optionOnOff)
                 dev_dbg(&spi->dev, "set: amp #2");
         #endif
 
-        switch(optionOnOff) {
-        case optionOn:  return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) |  MASK_PALEVEL_PA2) );
-        case optionOff: return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) & ~MASK_PALEVEL_PA2) );
+        switch (optionOnOff) {
+        case optionOn:  return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) |  MASK_PALEVEL_PA2));
+        case optionOff: return WRITE_REG(REG_PALEVEL, (READ_REG(REG_PALEVEL) & ~MASK_PALEVEL_PA2));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -312,7 +323,7 @@ int rf69_set_output_power_level(struct spi_device *spi, u8 powerLevel)
                 dev_dbg(&spi->dev, "set: power level");
         #endif
 
-        powerLevel +=18; // TODO Abhängigkeit von PA0,1,2 setting
+        powerLevel += 18; // TODO Abhängigkeit von PA0,1,2 setting
 
         // check input value
         if (powerLevel > 0x1f) {
@@ -330,7 +341,7 @@ int rf69_set_pa_ramp(struct spi_device *spi, enum paRamp paRamp)
                 dev_dbg(&spi->dev, "set: pa ramp");
         #endif
 
-        switch(paRamp) {
+        switch (paRamp) {
         case ramp3400:  return WRITE_REG(REG_PARAMP, PARAMP_3400);
         case ramp2000:  return WRITE_REG(REG_PARAMP, PARAMP_2000);
         case ramp1000:  return WRITE_REG(REG_PARAMP, PARAMP_1000);
@@ -359,9 +370,9 @@ int rf69_set_antenna_impedance(struct spi_device *spi, enum antennaImpedance ant
                 dev_dbg(&spi->dev, "set: antenna impedance");
         #endif
 
-        switch(antennaImpedance) {
-        case fiftyOhm:      return WRITE_REG(REG_LNA, (READ_REG(REG_LNA) & ~MASK_LNA_ZIN) );
-        case twohundretOhm: return WRITE_REG(REG_LNA, (READ_REG(REG_LNA) |  MASK_LNA_ZIN) );
+        switch (antennaImpedance) {
+        case fiftyOhm:      return WRITE_REG(REG_LNA, (READ_REG(REG_LNA) & ~MASK_LNA_ZIN));
+        case twohundretOhm: return WRITE_REG(REG_LNA, (READ_REG(REG_LNA) |  MASK_LNA_ZIN));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -374,14 +385,14 @@ int rf69_set_lna_gain(struct spi_device *spi, enum lnaGain lnaGain)
                 dev_dbg(&spi->dev, "set: lna gain");
         #endif
 
-        switch(lnaGain) {
-        case automatic:  return WRITE_REG(REG_LNA, ( (READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_AUTO) );
-        case max:        return WRITE_REG(REG_LNA, ( (READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX) );
-        case maxMinus6:  return WRITE_REG(REG_LNA, ( (READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX_MINUS_6) );
-        case maxMinus12: return WRITE_REG(REG_LNA, ( (READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX_MINUS_12) );
-        case maxMinus24: return WRITE_REG(REG_LNA, ( (READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX_MINUS_24) );
-        case maxMinus36: return WRITE_REG(REG_LNA, ( (READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX_MINUS_36) );
-        case maxMinus48: return WRITE_REG(REG_LNA, ( (READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX_MINUS_48) );
+        switch (lnaGain) {
+        case automatic:  return WRITE_REG(REG_LNA, ((READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_AUTO));
+        case max:        return WRITE_REG(REG_LNA, ((READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX));
+        case maxMinus6:  return WRITE_REG(REG_LNA, ((READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX_MINUS_6));
+        case maxMinus12: return WRITE_REG(REG_LNA, ((READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX_MINUS_12));
+        case maxMinus24: return WRITE_REG(REG_LNA, ((READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX_MINUS_24));
+        case maxMinus36: return WRITE_REG(REG_LNA, ((READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX_MINUS_36));
+        case maxMinus48: return WRITE_REG(REG_LNA, ((READ_REG(REG_LNA) & ~MASK_LNA_GAIN) & LNA_GAIN_MAX_MINUS_48));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -410,17 +421,17 @@ enum lnaGain rf69_get_lna_gain(struct spi_device *spi)
         }
 }
 
-int rf69_set_dc_cut_off_frequency_intern(struct spi_device *spi ,u8 reg, enum dccPercent dccPercent)
+int rf69_set_dc_cut_off_frequency_intern(struct spi_device *spi, u8 reg, enum dccPercent dccPercent)
 {
         switch (dccPercent) {
-        case dcc16Percent:      return WRITE_REG(reg, ( (READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_16_PERCENT) );
-        case dcc8Percent:       return WRITE_REG(reg, ( (READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_8_PERCENT) );
-        case dcc4Percent:       return WRITE_REG(reg, ( (READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_4_PERCENT) );
-        case dcc2Percent:       return WRITE_REG(reg, ( (READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_2_PERCENT) );
-        case dcc1Percent:       return WRITE_REG(reg, ( (READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_1_PERCENT) );
-        case dcc0_5Percent:     return WRITE_REG(reg, ( (READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_0_5_PERCENT) );
-        case dcc0_25Percent:    return WRITE_REG(reg, ( (READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_0_25_PERCENT) );
-        case dcc0_125Percent:   return WRITE_REG(reg, ( (READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_0_125_PERCENT) );
+        case dcc16Percent:      return WRITE_REG(reg, ((READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_16_PERCENT));
+        case dcc8Percent:       return WRITE_REG(reg, ((READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_8_PERCENT));
+        case dcc4Percent:       return WRITE_REG(reg, ((READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_4_PERCENT));
+        case dcc2Percent:       return WRITE_REG(reg, ((READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_2_PERCENT));
+        case dcc1Percent:       return WRITE_REG(reg, ((READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_1_PERCENT));
+        case dcc0_5Percent:     return WRITE_REG(reg, ((READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_0_5_PERCENT));
+        case dcc0_25Percent:    return WRITE_REG(reg, ((READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_0_25_PERCENT));
+        case dcc0_125Percent:   return WRITE_REG(reg, ((READ_REG(reg) & ~MASK_BW_DCC_FREQ) | BW_DCC_0_125_PERCENT));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -470,10 +481,16 @@ static int rf69_set_bandwidth_intern(struct spi_device *spi, u8 reg,
         newValue = newValue & MASK_BW_DCC_FREQ;
 
         // add new mantisse
-        switch(mantisse) {
-        case mantisse16: newValue = newValue | BW_MANT_16;      break;
-        case mantisse20: newValue = newValue | BW_MANT_20;      break;
-        case mantisse24: newValue = newValue | BW_MANT_24;      break;
+        switch (mantisse) {
+        case mantisse16:
+                newValue = newValue | BW_MANT_16;
+                break;
+        case mantisse20:
+                newValue = newValue | BW_MANT_20;
+                break;
+        case mantisse24:
+                newValue = newValue | BW_MANT_24;
+                break;
         }
 
         // add new exponent
@@ -508,9 +525,9 @@ int rf69_set_ook_threshold_type(struct spi_device *spi, enum thresholdType thres
         #endif
 
         switch (thresholdType) {
-        case fixed:     return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESTYPE) | OOKPEAK_THRESHTYPE_FIXED) );
-        case peak:      return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESTYPE) | OOKPEAK_THRESHTYPE_PEAK) );
-        case average:   return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESTYPE) | OOKPEAK_THRESHTYPE_AVERAGE) );
+        case fixed:     return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESTYPE) | OOKPEAK_THRESHTYPE_FIXED));
+        case peak:      return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESTYPE) | OOKPEAK_THRESHTYPE_PEAK));
+        case average:   return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESTYPE) | OOKPEAK_THRESHTYPE_AVERAGE));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -524,14 +541,14 @@ int rf69_set_ook_threshold_step(struct spi_device *spi, enum thresholdStep thres
         #endif
 
         switch (thresholdStep) {
-        case step_0_5db: return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_0_5_DB) );
-        case step_1_0db: return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_1_0_DB) );
-        case step_1_5db: return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_1_5_DB) );
-        case step_2_0db: return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_2_0_DB) );
-        case step_3_0db: return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_3_0_DB) );
-        case step_4_0db: return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_4_0_DB) );
-        case step_5_0db: return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_5_0_DB) );
-        case step_6_0db: return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_6_0_DB) );
+        case step_0_5db: return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_0_5_DB));
+        case step_1_0db: return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_1_0_DB));
+        case step_1_5db: return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_1_5_DB));
+        case step_2_0db: return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_2_0_DB));
+        case step_3_0db: return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_3_0_DB));
+        case step_4_0db: return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_4_0_DB));
+        case step_5_0db: return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_5_0_DB));
+        case step_6_0db: return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESSTEP) | OOKPEAK_THRESHSTEP_6_0_DB));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -545,14 +562,14 @@ int rf69_set_ook_threshold_dec(struct spi_device *spi, enum thresholdDecrement t
         #endif
 
         switch (thresholdDecrement) {
-        case dec_every8th: return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_EVERY_8TH) );
-        case dec_every4th: return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_EVERY_4TH) );
-        case dec_every2nd: return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_EVERY_2ND) );
-        case dec_once:     return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_ONCE) );
-        case dec_twice:    return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_TWICE) );
-        case dec_4times:   return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_4_TIMES) );
-        case dec_8times:   return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_8_TIMES) );
-        case dec_16times:  return WRITE_REG(REG_OOKPEAK, ( (READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_16_TIMES) );
+        case dec_every8th: return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_EVERY_8TH));
+        case dec_every4th: return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_EVERY_4TH));
+        case dec_every2nd: return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_EVERY_2ND));
+        case dec_once:     return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_ONCE));
+        case dec_twice:    return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_TWICE));
+        case dec_4times:   return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_4_TIMES));
+        case dec_8times:   return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_8_TIMES));
+        case dec_16times:  return WRITE_REG(REG_OOKPEAK, ((READ_REG(REG_OOKPEAK) & ~MASK_OOKPEAK_THRESDEC) | OOKPEAK_THRESHDEC_16_TIMES));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -571,25 +588,37 @@ int rf69_set_dio_mapping(struct spi_device *spi, u8 DIONumber, u8 value)
         #endif
 
         switch (DIONumber) {
-        case 0: mask=MASK_DIO0; shift=SHIFT_DIO0; regaddr=REG_DIOMAPPING1; break;
-        case 1: mask=MASK_DIO1; shift=SHIFT_DIO1; regaddr=REG_DIOMAPPING1; break;
-        case 2: mask=MASK_DIO2; shift=SHIFT_DIO2; regaddr=REG_DIOMAPPING1; break;
-        case 3: mask=MASK_DIO3; shift=SHIFT_DIO3; regaddr=REG_DIOMAPPING1; break;
-        case 4: mask=MASK_DIO4; shift=SHIFT_DIO4; regaddr=REG_DIOMAPPING2; break;
-        case 5: mask=MASK_DIO5; shift=SHIFT_DIO5; regaddr=REG_DIOMAPPING2; break;
+        case 0:
+                mask = MASK_DIO0; shift = SHIFT_DIO0; regaddr = REG_DIOMAPPING1;
+                break;
+        case 1:
+                mask = MASK_DIO1; shift = SHIFT_DIO1; regaddr = REG_DIOMAPPING1;
+                break;
+        case 2:
+                mask = MASK_DIO2; shift = SHIFT_DIO2; regaddr = REG_DIOMAPPING1;
+                break;
+        case 3:
+                mask = MASK_DIO3; shift = SHIFT_DIO3; regaddr = REG_DIOMAPPING1;
+                break;
+        case 4:
+                mask = MASK_DIO4; shift = SHIFT_DIO4; regaddr = REG_DIOMAPPING2;
+                break;
+        case 5:
+                mask = MASK_DIO5; shift = SHIFT_DIO5; regaddr = REG_DIOMAPPING2;
+                break;
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
         }
 
         // read reg
-        regValue=READ_REG(regaddr);
+        regValue = READ_REG(regaddr);
         // delete old value
         regValue = regValue & ~mask;
         // add new value
         regValue = regValue | value << shift;
         // write back
-        return WRITE_REG(regaddr,regValue);
+        return WRITE_REG(regaddr, regValue);
 }
 
 bool rf69_get_flag(struct spi_device *spi, enum flag flag)
@@ -598,7 +627,7 @@ bool rf69_get_flag(struct spi_device *spi, enum flag flag)
                 dev_dbg(&spi->dev, "get: flag");
         #endif
 
-        switch(flag) {
+        switch (flag) {
         case modeSwitchCompleted:     return (READ_REG(REG_IRQFLAGS1) & MASK_IRQFLAGS1_MODE_READY);
         case readyToReceive:          return (READ_REG(REG_IRQFLAGS1) & MASK_IRQFLAGS1_RX_READY);
         case readyToSend:             return (READ_REG(REG_IRQFLAGS1) & MASK_IRQFLAGS1_TX_READY);
@@ -626,7 +655,7 @@ int rf69_reset_flag(struct spi_device *spi, enum flag flag)
                 dev_dbg(&spi->dev, "reset: flag");
         #endif
 
-        switch(flag) {
+        switch (flag) {
         case rssiExceededThreshold: return WRITE_REG(REG_IRQFLAGS1, MASK_IRQFLAGS1_RSSI);
         case syncAddressMatch:      return WRITE_REG(REG_IRQFLAGS1, MASK_IRQFLAGS1_SYNC_ADDRESS_MATCH);
         case fifoOverrun:           return WRITE_REG(REG_IRQFLAGS2, MASK_IRQFLAGS2_FIFO_OVERRUN);
@@ -686,10 +715,9 @@ int rf69_set_preamble_length(struct spi_device *spi, u16 preambleLength)
 
         /* transmit to chip */
         retval = WRITE_REG(REG_PREAMBLE_MSB, msb);
-        if (retval) return retval;
-        retval = WRITE_REG(REG_PREAMBLE_LSB, lsb);
-
-        return retval;
+        if (retval)
+                return retval;
+        return WRITE_REG(REG_PREAMBLE_LSB, lsb);
 }
 
 int rf69_set_sync_enable(struct spi_device *spi, enum optionOnOff optionOnOff)
@@ -698,9 +726,9 @@ int rf69_set_sync_enable(struct spi_device *spi, enum optionOnOff optionOnOff)
                 dev_dbg(&spi->dev, "set: sync enable");
         #endif
 
-        switch(optionOnOff) {
-        case optionOn:  return WRITE_REG(REG_SYNC_CONFIG, (READ_REG(REG_SYNC_CONFIG) |  MASK_SYNC_CONFIG_SYNC_ON) );
-        case optionOff: return WRITE_REG(REG_SYNC_CONFIG, (READ_REG(REG_SYNC_CONFIG) & ~MASK_SYNC_CONFIG_SYNC_ON) );
+        switch (optionOnOff) {
+        case optionOn:  return WRITE_REG(REG_SYNC_CONFIG, (READ_REG(REG_SYNC_CONFIG) |  MASK_SYNC_CONFIG_SYNC_ON));
+        case optionOff: return WRITE_REG(REG_SYNC_CONFIG, (READ_REG(REG_SYNC_CONFIG) & ~MASK_SYNC_CONFIG_SYNC_ON));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -713,9 +741,9 @@ int rf69_set_fifo_fill_condition(struct spi_device *spi, enum fifoFillCondition
                 dev_dbg(&spi->dev, "set: fifo fill condition");
         #endif
 
-        switch(fifoFillCondition) {
-        case always:             return WRITE_REG(REG_SYNC_CONFIG, (READ_REG(REG_SYNC_CONFIG) |  MASK_SYNC_CONFIG_FIFO_FILL_CONDITION) );
-        case afterSyncInterrupt: return WRITE_REG(REG_SYNC_CONFIG, (READ_REG(REG_SYNC_CONFIG) & ~MASK_SYNC_CONFIG_FIFO_FILL_CONDITION) );
+        switch (fifoFillCondition) {
+        case always:             return WRITE_REG(REG_SYNC_CONFIG, (READ_REG(REG_SYNC_CONFIG) |  MASK_SYNC_CONFIG_FIFO_FILL_CONDITION));
+        case afterSyncInterrupt: return WRITE_REG(REG_SYNC_CONFIG, (READ_REG(REG_SYNC_CONFIG) & ~MASK_SYNC_CONFIG_FIFO_FILL_CONDITION));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -735,7 +763,7 @@ int rf69_set_sync_size(struct spi_device *spi, u8 syncSize)
         }
 
         // write value
-        return WRITE_REG(REG_SYNC_CONFIG, (READ_REG(REG_SYNC_CONFIG) & ~MASK_SYNC_CONFIG_SYNC_SIZE) | (syncSize << 3) );
+        return WRITE_REG(REG_SYNC_CONFIG, (READ_REG(REG_SYNC_CONFIG) & ~MASK_SYNC_CONFIG_SYNC_SIZE) | (syncSize << 3));
 }
 
 int rf69_set_sync_tolerance(struct spi_device *spi, u8 syncTolerance)
@@ -780,9 +808,9 @@ int rf69_set_packet_format(struct spi_device *spi, enum packetFormat packetForma
                 dev_dbg(&spi->dev, "set: packet format");
         #endif
 
-        switch(packetFormat) {
-        case packetLengthVar: return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) |  MASK_PACKETCONFIG1_PAKET_FORMAT_VARIABLE) );
-        case packetLengthFix: return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_PAKET_FORMAT_VARIABLE) );
+        switch (packetFormat) {
+        case packetLengthVar: return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) |  MASK_PACKETCONFIG1_PAKET_FORMAT_VARIABLE));
+        case packetLengthFix: return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_PAKET_FORMAT_VARIABLE));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -795,9 +823,9 @@ int rf69_set_crc_enable(struct spi_device *spi, enum optionOnOff optionOnOff)
                 dev_dbg(&spi->dev, "set: crc enable");
         #endif
 
-        switch(optionOnOff) {
-        case optionOn:  return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) |  MASK_PACKETCONFIG1_CRC_ON) );
-        case optionOff: return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_CRC_ON) );
+        switch (optionOnOff) {
+        case optionOn:  return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) |  MASK_PACKETCONFIG1_CRC_ON));
+        case optionOff: return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_CRC_ON));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -811,9 +839,9 @@ int rf69_set_adressFiltering(struct spi_device *spi, enum addressFiltering addre
         #endif
 
         switch (addressFiltering) {
-        case filteringOff:           return WRITE_REG(REG_PACKETCONFIG1, ( (READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_ADDRESSFILTERING) | PACKETCONFIG1_ADDRESSFILTERING_OFF) );
-        case nodeAddress:            return WRITE_REG(REG_PACKETCONFIG1, ( (READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_ADDRESSFILTERING) | PACKETCONFIG1_ADDRESSFILTERING_NODE) );
-        case nodeOrBroadcastAddress: return WRITE_REG(REG_PACKETCONFIG1, ( (READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_ADDRESSFILTERING) | PACKETCONFIG1_ADDRESSFILTERING_NODEBROADCAST) );
+        case filteringOff:           return WRITE_REG(REG_PACKETCONFIG1, ((READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_ADDRESSFILTERING) | PACKETCONFIG1_ADDRESSFILTERING_OFF));
+        case nodeAddress:            return WRITE_REG(REG_PACKETCONFIG1, ((READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_ADDRESSFILTERING) | PACKETCONFIG1_ADDRESSFILTERING_NODE));
+        case nodeOrBroadcastAddress: return WRITE_REG(REG_PACKETCONFIG1, ((READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_ADDRESSFILTERING) | PACKETCONFIG1_ADDRESSFILTERING_NODEBROADCAST));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -862,9 +890,9 @@ int rf69_set_tx_start_condition(struct spi_device *spi, enum txStartCondition tx
                 dev_dbg(&spi->dev, "set: start condition");
         #endif
 
-        switch(txStartCondition) {
-        case fifoLevel:    return WRITE_REG(REG_FIFO_THRESH, (READ_REG(REG_FIFO_THRESH) & ~MASK_FIFO_THRESH_TXSTART) );
-        case fifoNotEmpty: return WRITE_REG(REG_FIFO_THRESH, (READ_REG(REG_FIFO_THRESH) |  MASK_FIFO_THRESH_TXSTART) );
+        switch (txStartCondition) {
+        case fifoLevel:    return WRITE_REG(REG_FIFO_THRESH, (READ_REG(REG_FIFO_THRESH) & ~MASK_FIFO_THRESH_TXSTART));
+        case fifoNotEmpty: return WRITE_REG(REG_FIFO_THRESH, (READ_REG(REG_FIFO_THRESH) |  MASK_FIFO_THRESH_TXSTART));
         default:
                 dev_dbg(&spi->dev, "set: illegal input param");
                 return -EINVAL;
@@ -891,7 +919,7 @@ int rf69_set_fifo_threshold(struct spi_device *spi, u8 threshold)
                 return retval;
 
         // access the fifo to activate new threshold
-        return rf69_read_fifo (spi, (u8*) &retval, 1); // retval used as buffer
+        return rf69_read_fifo(spi, (u8 *)&retval, 1); // retval used as buffer
 }
 
 int rf69_set_dagc(struct spi_device *spi, enum dagc dagc)
@@ -900,7 +928,7 @@ int rf69_set_dagc(struct spi_device *spi, enum dagc dagc)
                 dev_dbg(&spi->dev, "set: dagc");
         #endif
 
-        switch(dagc) {
+        switch (dagc) {
         case normalMode:                 return WRITE_REG(REG_TESTDAGC, DAGC_NORMAL);
         case improve:                    return WRITE_REG(REG_TESTDAGC, DAGC_IMPROVED_LOWBETA0);
         case improve4LowModulationIndex: return WRITE_REG(REG_TESTDAGC, DAGC_IMPROVED_LOWBETA1);
@@ -931,14 +959,14 @@ int rf69_read_fifo (struct spi_device *spi, u8 *buffer, unsigned int size)
         /* prepare a bidirectional transfer */
         local_buffer[0] = REG_FIFO;
         memset(&transfer, 0, sizeof(transfer));
-        transfer.tx_buf = local_buffer;
-        transfer.rx_buf = local_buffer;
+        transfer.tx_buf = local_buffer;
+        transfer.rx_buf = local_buffer;
         transfer.len    = size+1;
 
         retval = spi_sync_transfer(spi, &transfer, 1);
 
         #ifdef DEBUG_FIFO_ACCESS
-                for (i=0; i<size; i++)
+                for (i = 0; i < size; i++)
                         dev_dbg(&spi->dev, "%d - 0x%x\n", i, local_buffer[i+1]);
         #endif
 
@@ -966,8 +994,8 @@ int rf69_write_fifo(struct spi_device *spi, u8 *buffer, unsigned int size)
         memcpy(&local_buffer[1], buffer, size);  // TODO: ohne memcopy wäre schöner
 
         #ifdef DEBUG_FIFO_ACCESS
-                for (i=0; i<size; i++)
-                        dev_dbg(&spi->dev, "0x%x\n",buffer[i]);
+                for (i = 0; i < size; i++)
+                        dev_dbg(&spi->dev, "0x%x\n", buffer[i]);
         #endif
 
         return spi_write (spi, local_buffer, size + 1);
diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 32a483769975..fa611455109a 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -754,7 +754,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
         }
 
         /* setting only at  first time */
-        if (!(pmlmepriv->cur_network.join_res)) {
+        if (pmlmepriv->cur_network.join_res != true) {
                 /* WEP Key will be set before this function, do not
                  * clear CAM.
                  */
diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index 9461bce883ea..be8542676adf 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -333,7 +333,7 @@ u8 rtw_createbss_cmd(struct adapter  *padapter)
         else
                 RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));
 
-        pcmd = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
+        pcmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
         if (!pcmd) {
                 res = _FAIL;
                 goto exit;
@@ -508,7 +508,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
 
         if (enqueue) {
                 /* need enqueue, prepare cmd_obj and enqueue */
-                cmdobj = kzalloc(sizeof(*cmdobj), GFP_KERNEL);
+                cmdobj = kzalloc(sizeof(*cmdobj), GFP_ATOMIC);
                 if (!cmdobj) {
                         res = _FAIL;
                         kfree(param);
diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index b9bdff0490ca..2c4c8c43b1ad 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -48,7 +48,7 @@ void Efuse_PowerSwitch(
         if (PwrState) {
                 usb_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_ON);
 
-                /*  1.2V Power: From VDDON with Power Cut(0x0000h[15]), defualt valid */
+                /*  1.2V Power: From VDDON with Power Cut(0x0000h[15]), default valid */
                 tmpV16 = usb_read16(pAdapter, REG_SYS_ISO_CTRL);
                 if (!(tmpV16 & PWC_EV12V)) {
                         tmpV16 |= PWC_EV12V;
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index 1b9bc9817a57..c4335893d8f6 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -22,9 +22,9 @@
 /*              Callback function of LED BlinkTimer, */
 /*              it just schedules to corresponding BlinkWorkItem/led_blink_hdl */
 /*  */
-void BlinkTimerCallback(unsigned long data)
+static void BlinkTimerCallback(struct timer_list *t)
 {
-        struct LED_871x *pLed = (struct LED_871x *)data;
+        struct LED_871x *pLed = from_timer(pLed, t, BlinkTimer);
         struct adapter *padapter = pLed->padapter;
 
         if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped))
@@ -73,8 +73,7 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed)
 
         ResetLedStatus(pLed);
 
-        setup_timer(&pLed->BlinkTimer, BlinkTimerCallback,
-                    (unsigned long)pLed);
+        timer_setup(&pLed->BlinkTimer, BlinkTimerCallback, 0);
 
         INIT_WORK(&pLed->BlinkWorkItem, BlinkWorkItemCallback);
 }
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index f663e6c41f8a..1cd49e292804 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -106,10 +106,10 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)
 
 void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)
 {
-        rtw_free_mlme_priv_ie_data(pmlmepriv);
-
-        if (pmlmepriv)
+        if (pmlmepriv) {
+                rtw_free_mlme_priv_ie_data(pmlmepriv);
                 vfree(pmlmepriv->free_bss_buf);
+        }
 }
 
 struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)
@@ -1135,7 +1135,7 @@ static u8 search_max_mac_id(struct adapter *padapter)
 
 #if defined(CONFIG_88EU_AP_MODE)
         if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
-                for (aid = (pstapriv->max_num_sta); aid > 0; aid--) {
+                for (aid = pstapriv->max_num_sta; aid > 0; aid--) {
                         if (pstapriv->sta_aid[aid-1])
                                 break;
                 }
@@ -1143,7 +1143,7 @@ static u8 search_max_mac_id(struct adapter *padapter)
         } else
 #endif
         {/* adhoc  id =  31~2 */
-                for (mac_id = (NUM_STA-1); mac_id >= IBSS_START_MAC_ID; mac_id--) {
+                for (mac_id = NUM_STA-1; mac_id >= IBSS_START_MAC_ID; mac_id--) {
                         if (pmlmeinfo->FW_sta_info[mac_id].status == 1)
                                 break;
                 }
@@ -1329,12 +1329,13 @@ void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)
 }
 
 /*
- * _rtw_join_timeout_handler - Timeout/faliure handler for CMD JoinBss
+ * _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss
  * @adapter: pointer to struct adapter structure
  */
-void _rtw_join_timeout_handler (unsigned long data)
+void _rtw_join_timeout_handler (struct timer_list *t)
 {
-        struct adapter *adapter = (struct adapter *)data;
+        struct adapter *adapter =
+                from_timer(adapter, t, mlmepriv.assoc_timer);
         struct  mlme_priv *pmlmepriv = &adapter->mlmepriv;
         int do_join_r;
 
@@ -1373,9 +1374,10 @@ void _rtw_join_timeout_handler (unsigned long data)
  * rtw_scan_timeout_handler - Timeout/Faliure handler for CMD SiteSurvey
  * @adapter: pointer to struct adapter structure
  */
-void rtw_scan_timeout_handler (unsigned long data)
+void rtw_scan_timeout_handler (struct timer_list *t)
 {
-        struct adapter *adapter = (struct adapter *)data;
+        struct adapter *adapter =
+                from_timer(adapter, t, mlmepriv.scan_to_timer);
         struct  mlme_priv *pmlmepriv = &adapter->mlmepriv;
 
         DBG_88E(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv));
@@ -1400,9 +1402,10 @@ static void rtw_auto_scan_handler(struct adapter *padapter)
         }
 }
 
-void rtw_dynamic_check_timer_handlder(unsigned long data)
+void rtw_dynamic_check_timer_handlder(struct timer_list *t)
 {
-        struct adapter *adapter = (struct adapter *)data;
+        struct adapter *adapter =
+                from_timer(adapter, t, mlmepriv.dynamic_chk_timer);
         struct registry_priv *pregistrypriv = &adapter->registrypriv;
 
         if (!adapter)
@@ -1569,7 +1572,7 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv)
         psetauthparm->mode = (unsigned char)psecuritypriv->dot11AuthAlgrthm;
         pcmd->cmdcode = _SetAuth_CMD_;
         pcmd->parmbuf = (unsigned char *)psetauthparm;
-        pcmd->cmdsz =  (sizeof(struct setauth_parm));
+        pcmd->cmdsz =  sizeof(struct setauth_parm);
         pcmd->rsp = NULL;
         pcmd->rspsz = 0;
         INIT_LIST_HEAD(&pcmd->list);
@@ -1648,7 +1651,7 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in
         }
         pcmd->cmdcode = _SetKey_CMD_;
         pcmd->parmbuf = (u8 *)psetkeyparm;
-        pcmd->cmdsz =  (sizeof(struct setkey_parm));
+        pcmd->cmdsz =  sizeof(struct setkey_parm);
         pcmd->rsp = NULL;
         pcmd->rspsz = 0;
         INIT_LIST_HEAD(&pcmd->list);
@@ -1814,45 +1817,45 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
         struct  security_priv *psecuritypriv = &adapter->securitypriv;
         struct  wlan_network    *cur_network = &adapter->mlmepriv.cur_network;
 
-        pdev_network->Privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0); /*  adhoc no 802.1x */
+        pdev_network->Privacy = psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0; /*  adhoc no 802.1x */
 
         pdev_network->Rssi = 0;
 
         switch (pregistrypriv->wireless_mode) {
         case WIRELESS_11B:
-                pdev_network->NetworkTypeInUse = (Ndis802_11DS);
+                pdev_network->NetworkTypeInUse = Ndis802_11DS;
                 break;
         case WIRELESS_11G:
         case WIRELESS_11BG:
         case WIRELESS_11_24N:
         case WIRELESS_11G_24N:
         case WIRELESS_11BG_24N:
-                pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24);
+                pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
                 break;
         case WIRELESS_11A:
         case WIRELESS_11A_5N:
-                pdev_network->NetworkTypeInUse = (Ndis802_11OFDM5);
+                pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
                 break;
         case WIRELESS_11ABGN:
                 if (pregistrypriv->channel > 14)
-                        pdev_network->NetworkTypeInUse = (Ndis802_11OFDM5);
+                        pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
                 else
-                        pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24);
+                        pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
                 break;
         default:
                 /*  TODO */
                 break;
         }
 
-        pdev_network->Configuration.DSConfig = (pregistrypriv->channel);
+        pdev_network->Configuration.DSConfig = pregistrypriv->channel;
         RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
                  ("pregistrypriv->channel=%d, pdev_network->Configuration.DSConfig=0x%x\n",
                  pregistrypriv->channel, pdev_network->Configuration.DSConfig));
 
         if (cur_network->network.InfrastructureMode == Ndis802_11IBSS)
-                pdev_network->Configuration.ATIMWindow = (0);
+                pdev_network->Configuration.ATIMWindow = 0;
 
-        pdev_network->InfrastructureMode = (cur_network->network.InfrastructureMode);
+        pdev_network->InfrastructureMode = cur_network->network.InfrastructureMode;
 
         /*  1. Supported rates */
         /*  2. IE */
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 611c9409bb98..d73e9bdc80cc 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -605,7 +605,9 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da)
         dump_mgntframe(padapter, pmgntframe);
 }
 
-static int issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, bool wait_ack)
+static int issue_probereq(struct adapter *padapter,
+                          struct ndis_802_11_ssid *pssid, u8 *da,
+                          bool wait_ack)
 {
         int ret = _FAIL;
         struct xmit_frame               *pmgntframe;
@@ -707,7 +709,7 @@ static int issue_probereq_ex(struct adapter *padapter,
         unsigned long start = jiffies;
 
         do {
-                ret = issue_probereq(padapter, pssid, da, wait_ms > 0 ? true : false);
+                ret = issue_probereq(padapter, pssid, da, wait_ms > 0);
 
                 i++;
 
@@ -1196,7 +1198,8 @@ exit:
 }
 
 /* when wait_ack is true, this function should be called at process context */
-static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int wait_ack)
+static int _issue_nulldata(struct adapter *padapter, unsigned char *da,
+                           unsigned int power_mode, bool wait_ack)
 {
         int ret = _FAIL;
         struct xmit_frame                       *pmgntframe;
@@ -1269,7 +1272,8 @@ exit:
 
 /* when wait_ms > 0 , this function should be called at process context */
 /* da == NULL for station mode */
-int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms)
+int issue_nulldata(struct adapter *padapter, unsigned char *da,
+                   unsigned int power_mode, int try_cnt, int wait_ms)
 {
         int ret;
         int i = 0;
@@ -1283,7 +1287,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow
                 da = pnetwork->MacAddress;
 
         do {
-                ret = _issue_nulldata(padapter, da, power_mode, wait_ms > 0 ? true : false);
+                ret = _issue_nulldata(padapter, da, power_mode, wait_ms > 0);
 
                 i++;
 
@@ -1316,7 +1320,8 @@ exit:
 }
 
 /* when wait_ack is true, this function should be called at process context */
-static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int wait_ack)
+static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da,
+                               u16 tid, bool wait_ack)
 {
         int ret = _FAIL;
         struct xmit_frame                       *pmgntframe;
@@ -1396,7 +1401,8 @@ exit:
 
 /* when wait_ms > 0 , this function should be called at process context */
 /* da == NULL for station mode */
-int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms)
+int issue_qos_nulldata(struct adapter *padapter, unsigned char *da,
+                       u16 tid, int try_cnt, int wait_ms)
 {
         int ret;
         int i = 0;
@@ -1410,7 +1416,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int
                 da = pnetwork->MacAddress;
 
         do {
-                ret = _issue_qos_nulldata(padapter, da, tid, wait_ms > 0 ? true : false);
+                ret = _issue_qos_nulldata(padapter, da, tid, wait_ms > 0);
 
                 i++;
 
@@ -1442,7 +1448,8 @@ exit:
         return ret;
 }
 
-static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short reason, u8 wait_ack)
+static int _issue_deauth(struct adapter *padapter, unsigned char *da,
+                         unsigned short reason, bool wait_ack)
 {
         struct xmit_frame                       *pmgntframe;
         struct pkt_attrib                       *pattrib;
@@ -1502,7 +1509,8 @@ exit:
         return ret;
 }
 
-int issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short reason)
+int issue_deauth(struct adapter *padapter, unsigned char *da,
+                 unsigned short reason)
 {
         DBG_88E("%s to %pM\n", __func__, da);
         return _issue_deauth(padapter, da, reason, false);
@@ -1517,7 +1525,7 @@ static int issue_deauth_ex(struct adapter *padapter, u8 *da,
         unsigned long start = jiffies;
 
         do {
-                ret = _issue_deauth(padapter, da, reason, wait_ms > 0 ? true : false);
+                ret = _issue_deauth(padapter, da, reason, wait_ms > 0);
 
                 i++;
 
@@ -3413,7 +3421,7 @@ static unsigned int OnAssocRsp(struct adapter *padapter,
         /* following are moved to join event callback function */
         /* to handle HT, WMM, rate adaptive, update MAC reg */
         /* for not to handle the synchronous IO in the tasklet */
-        for (i = (6 + WLAN_HDR_A3_LEN); i < pkt_len;) {
+        for (i = 6 + WLAN_HDR_A3_LEN; i < pkt_len;) {
                 pIE = (struct ndis_802_11_var_ie *)(pframe + i);
 
                 switch (pIE->ElementID) {
@@ -3757,7 +3765,8 @@ static unsigned int on_action_public_vendor(struct recv_frame *precv_frame)
         return ret;
 }
 
-static unsigned int on_action_public_default(struct recv_frame *precv_frame, u8 action)
+static unsigned int on_action_public_default(struct recv_frame *precv_frame,
+                                             u8 action)
 {
         unsigned int ret = _FAIL;
         u8 *pframe = precv_frame->pkt->data;
@@ -3972,9 +3981,10 @@ static int has_channel(struct rt_channel_info *channel_set,
         return 0;
 }
 
-static void init_channel_list(struct adapter *padapter, struct rt_channel_info *channel_set,
-                                                          u8 chanset_size,
-                                                        struct p2p_channels *channel_list)
+static void init_channel_list(struct adapter *padapter,
+                              struct rt_channel_info *channel_set,
+                              u8 chanset_size,
+                              struct p2p_channels *channel_list)
 {
         struct p2p_oper_class_map op_class[] = {
                 { IEEE80211G,  81,   1,  13,  1, BW20 },
@@ -3999,7 +4009,7 @@ static void init_channel_list(struct adapter *padapter, struct rt_channel_info *
                                 continue;
 
                         if ((0 == (padapter->registrypriv.cbw40_enable & BIT(1))) &&
-                            ((BW40MINUS == o->bw) || (BW40PLUS == o->bw)))
+                            ((o->bw == BW40MINUS) || (o->bw == BW40PLUS)))
                                 continue;
 
                         if (reg == NULL) {
@@ -4015,7 +4025,8 @@ static void init_channel_list(struct adapter *padapter, struct rt_channel_info *
         channel_list->reg_classes = cla;
 }
 
-static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_channel_info *channel_set)
+static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan,
+                           struct rt_channel_info *channel_set)
 {
         u8 index, chanset_size = 0;
         u8 b2_4GBand = false;
@@ -4030,7 +4041,7 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
 
         if (padapter->registrypriv.wireless_mode & WIRELESS_11G) {
                 b2_4GBand = true;
-                if (RT_CHANNEL_DOMAIN_REALTEK_DEFINE == ChannelPlan)
+                if (ChannelPlan == RT_CHANNEL_DOMAIN_REALTEK_DEFINE)
                         Index2G = RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE.Index2G;
                 else
                         Index2G = RTW_ChannelPlanMap[ChannelPlan].Index2G;
@@ -4040,14 +4051,14 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
                 for (index = 0; index < RTW_ChannelPlan2G[Index2G].Len; index++) {
                         channel_set[chanset_size].ChannelNum = RTW_ChannelPlan2G[Index2G].Channel[index];
 
-                        if ((RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN == ChannelPlan) ||/* Channel 1~11 is active, and 12~14 is passive */
-                            (RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN_2G == ChannelPlan)) {
+                        if ((ChannelPlan == RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN) ||/* Channel 1~11 is active, and 12~14 is passive */
+                            (ChannelPlan == RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN_2G)) {
                                 if (channel_set[chanset_size].ChannelNum >= 1 && channel_set[chanset_size].ChannelNum <= 11)
                                         channel_set[chanset_size].ScanType = SCAN_ACTIVE;
                                 else if ((channel_set[chanset_size].ChannelNum  >= 12 && channel_set[chanset_size].ChannelNum  <= 14))
                                         channel_set[chanset_size].ScanType  = SCAN_PASSIVE;
-                        } else if (RT_CHANNEL_DOMAIN_WORLD_WIDE_13 == ChannelPlan ||
-                                   RT_CHANNEL_DOMAIN_2G_WORLD == Index2G) {/*  channel 12~13, passive scan */
+                        } else if (ChannelPlan == RT_CHANNEL_DOMAIN_WORLD_WIDE_13 ||
+                                   Index2G == RT_CHANNEL_DOMAIN_2G_WORLD) {/*  channel 12~13, passive scan */
                                 if (channel_set[chanset_size].ChannelNum <= 11)
                                         channel_set[chanset_size].ScanType = SCAN_ACTIVE;
                                 else
@@ -4105,7 +4116,9 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)
         }
 }
 
-static void _mgt_dispatcher(struct adapter *padapter, struct mlme_handler *ptable, struct recv_frame *precv_frame)
+static void _mgt_dispatcher(struct adapter *padapter,
+                            struct mlme_handler *ptable,
+                            struct recv_frame *precv_frame)
 {
         u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
         u8 *pframe = precv_frame->pkt->data;
@@ -4351,7 +4364,8 @@ void report_join_res(struct adapter *padapter, int res)
         rtw_enqueue_cmd(pcmdpriv, pcmd_obj);
 }
 
-void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsigned short reason)
+void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr,
+                          unsigned short reason)
 {
         struct cmd_obj *pcmd_obj;
         u8 *pevtcmd;
@@ -4406,7 +4420,8 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi
         rtw_enqueue_cmd(pcmdpriv, pcmd_obj);
 }
 
-void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int cam_idx)
+void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr,
+                          int cam_idx)
 {
         struct cmd_obj *pcmd_obj;
         u8 *pevtcmd;
@@ -4767,7 +4782,7 @@ void linked_status_chk(struct adapter *padapter)
                         if (pmlmeinfo->FW_sta_info[i].status == 1) {
                                 psta = pmlmeinfo->FW_sta_info[i].psta;
 
-                                if (NULL == psta)
+                                if (psta == NULL)
                                         continue;
                                 if (pmlmeinfo->FW_sta_info[i].rx_pkt == sta_rx_pkts(psta)) {
                                         if (pmlmeinfo->FW_sta_info[i].retry < 3) {
@@ -4788,9 +4803,10 @@ void linked_status_chk(struct adapter *padapter)
         }
 }
 
-void survey_timer_hdl(unsigned long data)
+void survey_timer_hdl(struct timer_list *t)
 {
-        struct adapter *padapter = (struct adapter *)data;
+        struct adapter *padapter = from_timer(padapter, t,
+                                              mlmeextpriv.survey_timer);
         struct cmd_obj  *ph2c;
         struct sitesurvey_parm  *psurveyPara;
         struct cmd_priv                                 *pcmdpriv = &padapter->cmdpriv;
@@ -4828,9 +4844,10 @@ exit_survey_timer_hdl:
         return;
 }
 
-void link_timer_hdl(unsigned long data)
+void link_timer_hdl(struct timer_list *t)
 {
-        struct adapter *padapter = (struct adapter *)data;
+        struct adapter *padapter = from_timer(padapter, t,
+                                            mlmeextpriv.link_timer);
         struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
         struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
 
@@ -4864,9 +4881,9 @@ void link_timer_hdl(unsigned long data)
         }
 }
 
-void addba_timer_hdl(unsigned long data)
+void addba_timer_hdl(struct timer_list *t)
 {
-        struct sta_info *psta = (struct sta_info *)data;
+        struct sta_info *psta = from_timer(psta, t, addba_retry_timer);
         struct ht_priv  *phtpriv;
 
         if (!psta)
@@ -5125,8 +5142,10 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf)
         return  H2C_SUCCESS;
 }
 
-static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_channel *out,
-        u32 out_num, struct rtw_ieee80211_channel *in, u32 in_num)
+static int rtw_scan_ch_decision(struct adapter *padapter,
+                                struct rtw_ieee80211_channel *out,
+                                u32 out_num,
+                                struct rtw_ieee80211_channel *in, u32 in_num)
 {
         int i, j;
         int set_idx;
diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
index f86c9cebf09a..ac27f9a023bc 100644
--- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
@@ -37,7 +37,7 @@ static int rtw_hw_suspend(struct adapter *padapter)
         /* system suspend */
         LeaveAllPowerSaveMode(padapter);
 
-        DBG_88E("==> rtw_hw_suspend\n");
+        DBG_88E("==> %s\n", __func__);
         mutex_lock(&pwrpriv->mutex_lock);
         pwrpriv->bips_processing = true;
         /* s1. */
@@ -89,7 +89,7 @@ static int rtw_hw_resume(struct adapter *padapter)
 
 
         /* system resume */
-        DBG_88E("==> rtw_hw_resume\n");
+        DBG_88E("==> %s\n", __func__);
         mutex_lock(&pwrpriv->mutex_lock);
         pwrpriv->bips_processing = true;
         rtw_reset_drv_sw(padapter);
@@ -146,7 +146,7 @@ void ips_enter(struct adapter *padapter)
         pwrpriv->ips_mode = pwrpriv->ips_mode_req;
 
         pwrpriv->ips_enter_cnts++;
-        DBG_88E("==>ips_enter cnts:%d\n", pwrpriv->ips_enter_cnts);
+        DBG_88E("==>%s:%d\n", __func__, pwrpriv->ips_enter_cnts);
         if (rf_off == pwrpriv->change_rfpwrstate) {
                 pwrpriv->bpower_saving = true;
                 DBG_88E_LEVEL(_drv_info_, "nolinked power save enter\n");
@@ -177,7 +177,7 @@ int ips_leave(struct adapter *padapter)
                 pwrpriv->bips_processing = true;
                 pwrpriv->change_rfpwrstate = rf_on;
                 pwrpriv->ips_leave_cnts++;
-                DBG_88E("==>ips_leave cnts:%d\n", pwrpriv->ips_leave_cnts);
+                DBG_88E("==>%s:%d\n", __func__, pwrpriv->ips_leave_cnts);
 
                 result = rtw_ips_pwr_up(padapter);
                 if (result == _SUCCESS)
@@ -198,7 +198,7 @@ int ips_leave(struct adapter *padapter)
                         }
                 }
 
-                DBG_88E("==> ips_leave.....LED(0x%08x)...\n", usb_read32(padapter, 0x4c));
+                DBG_88E("==> %s.....LED(0x%08x)...\n", __func__, usb_read32(padapter, 0x4c));
                 pwrpriv->bips_processing = false;
 
                 pwrpriv->bkeepfwalive = false;
@@ -276,9 +276,11 @@ exit:
         pwrpriv->ps_processing = false;
 }
 
-static void pwr_state_check_handler(unsigned long data)
+static void pwr_state_check_handler(struct timer_list *t)
 {
-        struct adapter *padapter = (struct adapter *)data;
+        struct adapter *padapter =
+                from_timer(padapter, t,
+                                pwrctrlpriv.pwr_state_check_timer);
 
         rtw_ps_cmd(padapter);
 }
@@ -332,7 +334,7 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
 
         rpwm = pslv | pwrpriv->tog;
         RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,
-                 ("rtw_set_rpwm: rpwm=0x%02x cpwm=0x%02x\n", rpwm, pwrpriv->cpwm));
+                 ("%s: rpwm=0x%02x cpwm=0x%02x\n", __func__, rpwm, pwrpriv->cpwm));
 
         pwrpriv->rpwm = pslv;
 
@@ -525,7 +527,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
                 pwrctrlpriv->power_mgnt = PS_MODE_ACTIVE;
         else
                 pwrctrlpriv->power_mgnt = padapter->registrypriv.power_mgnt;/*  PS_MODE_MIN; */
-        pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt) ? true : false;
+        pwrctrlpriv->bLeisurePs = (pwrctrlpriv->power_mgnt != PS_MODE_ACTIVE) ? true : false;
 
         pwrctrlpriv->bFwCurrentInPSMode = false;
 
@@ -540,9 +542,8 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
 
         pwrctrlpriv->btcoex_rfon = false;
 
-        setup_timer(&pwrctrlpriv->pwr_state_check_timer,
-                    pwr_state_check_handler,
-                    (unsigned long)padapter);
+        timer_setup(&pwrctrlpriv->pwr_state_check_timer,
+                    pwr_state_check_handler, 0);
 }
 
 /*
@@ -569,7 +570,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
                 DBG_88E("%s wait ps_processing...\n", __func__);
                 while (pwrpriv->ps_processing &&
                        jiffies_to_msecs(jiffies - start) <= 3000)
-                        usleep_range(1000, 3000);
+                        udelay(1500);
                 if (pwrpriv->ps_processing)
                         DBG_88E("%s wait ps_processing timeout\n", __func__);
                 else
@@ -595,7 +596,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
         }
         if (rf_off == pwrpriv->rf_pwrstate) {
                 DBG_88E("%s call ips_leave....\n", __func__);
-                if (_FAIL ==  ips_leave(padapter)) {
+                if (ips_leave(padapter) ==  _FAIL) {
                         DBG_88E("======> ips_leave fail.............\n");
                         ret = _FAIL;
                         goto exit;
@@ -628,12 +629,12 @@ int rtw_pm_set_lps(struct adapter *padapter, u8 mode)
 
         if (mode < PS_MODE_NUM) {
                 if (pwrctrlpriv->power_mgnt != mode) {
-                        if (PS_MODE_ACTIVE == mode)
+                        if (mode == PS_MODE_ACTIVE)
                                 LeaveAllPowerSaveMode(padapter);
                         else
                                 pwrctrlpriv->LpsIdleCount = 2;
                         pwrctrlpriv->power_mgnt = mode;
-                        pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt) ? true : false;
+                        pwrctrlpriv->bLeisurePs = (pwrctrlpriv->power_mgnt != PS_MODE_ACTIVE) ? true : false;
                 }
         } else {
                 ret = -EINVAL;
@@ -653,7 +654,7 @@ int rtw_pm_set_ips(struct adapter *padapter, u8 mode)
         } else if (mode == IPS_NONE) {
                 rtw_ips_mode_req(pwrctrlpriv, mode);
                 DBG_88E("%s %s\n", __func__, "IPS_NONE");
-                if ((padapter->bSurpriseRemoved == 0) && (_FAIL == rtw_pwr_wakeup(padapter)))
+                if ((padapter->bSurpriseRemoved == 0) && (rtw_pwr_wakeup(padapter) == _FAIL))
                         return -EFAULT;
         } else {
                 return -EINVAL;
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index 3fd5f4102b36..6506a1587df0 100644
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -39,7 +39,7 @@ static u8 rtw_rfc1042_header[] = {
        0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00
 };
 
-static void rtw_signal_stat_timer_hdl(unsigned long data);
+static void rtw_signal_stat_timer_hdl(struct timer_list *t);
 
 void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)
 {
@@ -86,9 +86,8 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
         }
         res = rtw_hal_init_recv_priv(padapter);
 
-        setup_timer(&precvpriv->signal_stat_timer,
-                    rtw_signal_stat_timer_hdl,
-                    (unsigned long)padapter);
+        timer_setup(&precvpriv->signal_stat_timer, rtw_signal_stat_timer_hdl,
+                    0);
 
         precvpriv->signal_stat_sampling_interval = 1000; /* ms */
 
@@ -193,7 +192,7 @@ void rtw_free_recvframe_queue(struct __queue *pframequeue,  struct __queue *pfre
         plist = phead->next;
 
         while (phead != plist) {
-                hdr = container_of(plist, struct recv_frame, list);
+                hdr = list_entry(plist, struct recv_frame, list);
 
                 plist = plist->next;
 
@@ -237,32 +236,40 @@ static int recvframe_chkmic(struct adapter *adapter,
         stainfo = rtw_get_stainfo(&adapter->stapriv, &prxattrib->ta[0]);
 
         if (prxattrib->encrypt == _TKIP_) {
-                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n recvframe_chkmic:prxattrib->encrypt==_TKIP_\n"));
-                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n recvframe_chkmic:da=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
-                         prxattrib->ra[0], prxattrib->ra[1], prxattrib->ra[2], prxattrib->ra[3], prxattrib->ra[4], prxattrib->ra[5]));
+                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
+                         ("\n %s: prxattrib->encrypt==_TKIP_\n", __func__));
+                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
+                         ("\n %s: da=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+                          __func__, prxattrib->ra[0], prxattrib->ra[1], prxattrib->ra[2],
+                          prxattrib->ra[3], prxattrib->ra[4], prxattrib->ra[5]));
 
                 /* calculate mic code */
                 if (stainfo != NULL) {
                         if (IS_MCAST(prxattrib->ra)) {
                                 if (!psecuritypriv) {
                                         res = _FAIL;
-                                        RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n"));
-                                        DBG_88E("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n");
+                                        RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
+                                                 ("\n %s: didn't install group key!!!!!!!!!!\n", __func__));
+                                        DBG_88E("\n %s: didn't install group key!!!!!!!!!!\n", __func__);
                                         goto exit;
                                 }
                                 mickey = &psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0];
 
-                                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n recvframe_chkmic: bcmc key\n"));
+                                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
+                                         ("\n %s: bcmc key\n", __func__));
                         } else {
                                 mickey = &stainfo->dot11tkiprxmickey.skey[0];
-                                RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n recvframe_chkmic: unicast key\n"));
+                                RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
+                                         ("\n %s: unicast key\n", __func__));
                         }
 
                         /* icv_len included the mic code */
-                        datalen = precvframe->pkt->len-prxattrib->hdrlen - 8;
+                        datalen = precvframe->pkt->len-prxattrib->hdrlen -
+                                  prxattrib->iv_len-prxattrib->icv_len-8;
                         pframe = precvframe->pkt->data;
-                        payload = pframe+prxattrib->hdrlen;
+                        payload = pframe+prxattrib->hdrlen+prxattrib->iv_len;
 
+                        RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n prxattrib->iv_len=%d prxattrib->icv_len=%d\n", prxattrib->iv_len, prxattrib->icv_len));
                         rtw_seccalctkipmic(mickey, pframe, payload, datalen, &miccode[0],
                                            (unsigned char)prxattrib->priority); /* care the length of the data */
 
@@ -273,8 +280,8 @@ static int recvframe_chkmic(struct adapter *adapter,
                         for (i = 0; i < 8; i++) {
                                 if (miccode[i] != *(pframemic+i)) {
                                         RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
-                                                 ("recvframe_chkmic:miccode[%d](%02x)!=*(pframemic+%d)(%02x) ",
-                                                 i, miccode[i], i, *(pframemic+i)));
+                                                 ("%s: miccode[%d](%02x)!=*(pframemic+%d)(%02x) ",
+                                                  __func__, i, miccode[i], i, *(pframemic + i)));
                                         bmic_err = true;
                                 }
                         }
@@ -346,7 +353,8 @@ static int recvframe_chkmic(struct adapter *adapter,
                                 }
                         }
                 } else {
-                        RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chkmic: rtw_get_stainfo==NULL!!!\n"));
+                        RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
+                                 ("%s: rtw_get_stainfo==NULL!!!\n", __func__));
                 }
 
                 skb_trim(precvframe->pkt, precvframe->pkt->len - 8);
@@ -407,15 +415,9 @@ static struct recv_frame *decryptor(struct adapter *padapter,
                 default:
                         break;
                 }
-                if (res != _FAIL) {
-                        memmove(precv_frame->pkt->data + precv_frame->attrib.iv_len, precv_frame->pkt->data, precv_frame->attrib.hdrlen);
-                        skb_pull(precv_frame->pkt, precv_frame->attrib.iv_len);
-                        skb_trim(precv_frame->pkt, precv_frame->pkt->len - precv_frame->attrib.icv_len);
-                }
         } else if (prxattrib->bdecrypted == 1 && prxattrib->encrypt > 0 &&
-                   (psecuritypriv->busetkipkey == 1 || prxattrib->encrypt != _TKIP_)) {
-                psecuritypriv->hw_decrypted = true;
-        }
+                   (psecuritypriv->busetkipkey == 1 || prxattrib->encrypt != _TKIP_))
+                        psecuritypriv->hw_decrypted = true;
 
         if (res == _FAIL) {
                 rtw_free_recvframe(return_packet, &padapter->recvpriv.free_recv_queue);
@@ -456,7 +458,7 @@ static struct recv_frame *portctrl(struct adapter *adapter,
 
         if (auth_alg == 2) {
                 /* get ether_type */
-                ptr = ptr + pfhdr->attrib.hdrlen + LLC_HEADER_SIZE;
+                ptr = ptr + pfhdr->attrib.hdrlen + LLC_HEADER_SIZE + pfhdr->attrib.iv_len;
                 memcpy(&be_tmp, ptr, 2);
                 ether_type = ntohs(be_tmp);
 
@@ -943,7 +945,7 @@ static int validate_recv_ctrl_frame(struct adapter *padapter,
                         xmitframe_plist = xmitframe_phead->next;
 
                         if (xmitframe_phead != xmitframe_plist) {
-                                pxmitframe = container_of(xmitframe_plist, struct xmit_frame, list);
+                                pxmitframe = list_entry(xmitframe_plist, struct xmit_frame, list);
 
                                 xmitframe_plist = xmitframe_plist->next;
 
@@ -1011,7 +1013,8 @@ static int validate_recv_mgnt_frame(struct adapter *padapter,
 
         precv_frame = recvframe_chk_defrag(padapter, precv_frame);
         if (precv_frame == NULL) {
-                RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("%s: fragment packet\n", __func__));
+                RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_,
+                         ("%s: fragment packet\n", __func__));
                 return _SUCCESS;
         }
 
@@ -1138,8 +1141,6 @@ static int validate_recv_data_frame(struct adapter *adapter,
         }
 
         if (pattrib->privacy) {
-                struct sk_buff *skb = precv_frame->pkt;
-
                 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("validate_recv_data_frame:pattrib->privacy=%x\n", pattrib->privacy));
                 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n ^^^^^^^^^^^IS_MCAST(pattrib->ra(0x%02x))=%d^^^^^^^^^^^^^^^6\n", pattrib->ra[0], IS_MCAST(pattrib->ra)));
 
@@ -1148,13 +1149,6 @@ static int validate_recv_data_frame(struct adapter *adapter,
                 RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n pattrib->encrypt=%d\n", pattrib->encrypt));
 
                 SET_ICE_IV_LEN(pattrib->iv_len, pattrib->icv_len, pattrib->encrypt);
-
-                if (pattrib->bdecrypted == 1 && pattrib->encrypt > 0) {
-                        memmove(skb->data + pattrib->iv_len,
-                                skb->data, pattrib->hdrlen);
-                        skb_pull(skb, pattrib->iv_len);
-                        skb_trim(skb, skb->len - pattrib->icv_len);
-                }
         } else {
                 pattrib->encrypt = 0;
                 pattrib->iv_len = 0;
@@ -1274,7 +1268,6 @@ static int validate_recv_frame(struct adapter *adapter,
          * Hence forward the frame to the monitor anyway to preserve the order
          * in which frames were received.
          */
-
         rtl88eu_mon_recv_hook(adapter->pmondev, precv_frame);
 
 exit:
@@ -1296,8 +1289,11 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe)
         u8 *ptr = precvframe->pkt->data;
         struct rx_pkt_attrib *pattrib = &precvframe->attrib;
 
-        psnap = (struct ieee80211_snap_hdr *)(ptr+pattrib->hdrlen);
-        psnap_type = ptr+pattrib->hdrlen + SNAP_SIZE;
+        if (pattrib->encrypt)
+                skb_trim(precvframe->pkt, precvframe->pkt->len - pattrib->icv_len);
+
+        psnap = (struct ieee80211_snap_hdr *)(ptr+pattrib->hdrlen + pattrib->iv_len);
+        psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE;
         /* convert hdr + possible LLC headers into Ethernet header */
         if ((!memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) &&
              (!memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2) == false) &&
@@ -1310,9 +1306,12 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe)
                 bsnaphdr = false;
         }
 
-        rmv_len = pattrib->hdrlen + (bsnaphdr ? SNAP_SIZE : 0);
+        rmv_len = pattrib->hdrlen + pattrib->iv_len + (bsnaphdr ? SNAP_SIZE : 0);
         len = precvframe->pkt->len - rmv_len;
 
+        RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
+                 ("\n===pattrib->hdrlen: %x,  pattrib->iv_len:%x===\n\n", pattrib->hdrlen,  pattrib->iv_len));
+
         memcpy(&be_tmp, ptr+rmv_len, 2);
         eth_type = ntohs(be_tmp); /* pattrib->ether_type */
         pattrib->eth_type = eth_type;
@@ -1337,6 +1336,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,
                                            struct __queue *defrag_q)
 {
         struct list_head *plist, *phead;
+        u8 wlanhdr_offset;
         u8      curfragnum;
         struct recv_frame *pfhdr, *pnfhdr;
         struct recv_frame *prframe, *pnextrframe;
@@ -1347,7 +1347,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,
 
         phead = get_list_head(defrag_q);
         plist = phead->next;
-        pfhdr = container_of(plist, struct recv_frame, list);
+        pfhdr = list_entry(plist, struct recv_frame, list);
         prframe = pfhdr;
         list_del_init(&(prframe->list));
 
@@ -1367,7 +1367,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,
         plist = plist->next;
 
         while (phead != plist) {
-                pnfhdr = container_of(plist, struct recv_frame, list);
+                pnfhdr = list_entry(plist, struct recv_frame, list);
                 pnextrframe = pnfhdr;
 
                 /* check the fragment sequence  (2nd ~n fragment frame) */
@@ -1385,7 +1385,12 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,
                 /* copy the 2nd~n fragment frame's payload to the first fragment */
                 /* get the 2nd~last fragment frame's payload */
 
-                skb_pull(pnextrframe->pkt, pnfhdr->attrib.hdrlen);
+                wlanhdr_offset = pnfhdr->attrib.hdrlen + pnfhdr->attrib.iv_len;
+
+                skb_pull(pnextrframe->pkt, wlanhdr_offset);
+
+                /* append  to first fragment frame's tail (if privacy frame, pull the ICV) */
+                skb_trim(prframe->pkt, prframe->pkt->len - pfhdr->attrib.icv_len);
 
                 /* memcpy */
                 memcpy(skb_tail_pointer(pfhdr->pkt), pnfhdr->pkt->data,
@@ -1393,7 +1398,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,
 
                 skb_put(prframe->pkt, pnfhdr->pkt->len);
 
-                pfhdr->attrib.icv_len = 0;
+                pfhdr->attrib.icv_len = pnfhdr->attrib.icv_len;
                 plist = plist->next;
         }
 
@@ -1519,6 +1524,11 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe)
         nr_subframes = 0;
         pattrib = &prframe->attrib;
 
+        skb_pull(prframe->pkt, prframe->attrib.hdrlen);
+
+        if (prframe->attrib.iv_len > 0)
+                skb_pull(prframe->pkt, prframe->attrib.iv_len);
+
         a_len = prframe->pkt->len;
 
         pdata = prframe->pkt->data;
@@ -1655,7 +1665,7 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl,
         plist = phead->next;
 
         while (phead != plist) {
-                hdr = container_of(plist, struct recv_frame, list);
+                hdr = list_entry(plist, struct recv_frame, list);
                 pnextattrib = &hdr->attrib;
 
                 if (SN_LESS(pnextattrib->seq_num, pattrib->seq_num))
@@ -1690,7 +1700,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor
                 if (list_empty(phead))
                         return true;
 
-                prhdr = container_of(plist, struct recv_frame, list);
+                prhdr = list_entry(plist, struct recv_frame, list);
                 pattrib = &prhdr->attrib;
                 preorder_ctrl->indicate_seq = pattrib->seq_num;
         }
@@ -1698,7 +1708,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor
         /*  Prepare indication list and indication. */
         /*  Check if there is any packet need indicate. */
         while (!list_empty(phead)) {
-                prhdr = container_of(plist, struct recv_frame, list);
+                prhdr = list_entry(plist, struct recv_frame, list);
                 prframe = prhdr;
                 pattrib = &prframe->attrib;
 
@@ -1829,9 +1839,10 @@ _err_exit:
         return _FAIL;
 }
 
-void rtw_reordering_ctrl_timeout_handler(unsigned long data)
+void rtw_reordering_ctrl_timeout_handler(struct timer_list *t)
 {
-        struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)data;
+        struct recv_reorder_ctrl *preorder_ctrl = from_timer(preorder_ctrl, t,
+                                                           reordering_ctrl_timer);
         struct adapter *padapter = preorder_ctrl->padapter;
         struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
 
@@ -1887,6 +1898,24 @@ static int process_recv_indicatepkts(struct adapter *padapter,
         return retval;
 }
 
+static int recv_func_prehandle(struct adapter *padapter,
+                               struct recv_frame *rframe)
+{
+        int ret = _SUCCESS;
+        struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
+
+        /* check the frame crtl field and decache */
+        ret = validate_recv_frame(padapter, rframe);
+        if (ret != _SUCCESS) {
+                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("recv_func: validate_recv_frame fail! drop pkt\n"));
+                rtw_free_recvframe(rframe, pfree_recv_queue);/* free this recv_frame */
+                goto exit;
+        }
+
+exit:
+        return ret;
+}
+
 static int recv_func_posthandle(struct adapter *padapter,
                                 struct recv_frame *prframe)
 {
@@ -1939,7 +1968,6 @@ static int recv_func(struct adapter *padapter, struct recv_frame *rframe)
         struct rx_pkt_attrib *prxattrib = &rframe->attrib;
         struct security_priv *psecuritypriv = &padapter->securitypriv;
         struct mlme_priv *mlmepriv = &padapter->mlmepriv;
-        struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
 
         /* check if need to handle uc_swdec_pending_queue*/
         if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && psecuritypriv->busetkipkey) {
@@ -1951,12 +1979,9 @@ static int recv_func(struct adapter *padapter, struct recv_frame *rframe)
                 }
         }
 
-        /* check the frame crtl field and decache */
-        ret = validate_recv_frame(padapter, rframe);
-        if (ret != _SUCCESS) {
-                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("recv_func: validate_recv_frame fail! drop pkt\n"));
-                rtw_free_recvframe(rframe, pfree_recv_queue);/* free this recv_frame */
-        } else {
+        ret = recv_func_prehandle(padapter, rframe);
+
+        if (ret == _SUCCESS) {
                 /* check if need to enqueue into uc_swdec_pending_queue*/
                 if (check_fwstate(mlmepriv, WIFI_STATION_STATE) &&
                     !IS_MCAST(prxattrib->ra) && prxattrib->encrypt > 0 &&
@@ -1999,9 +2024,10 @@ _recv_entry_drop:
         return ret;
 }
 
-static void rtw_signal_stat_timer_hdl(unsigned long data)
+static void rtw_signal_stat_timer_hdl(struct timer_list *t)
 {
-        struct adapter *adapter = (struct adapter *)data;
+        struct adapter *adapter =
+                from_timer(adapter, t, recvpriv.signal_stat_timer);
         struct recv_priv *recvpriv = &adapter->recvpriv;
 
         u32 tmp_s, tmp_q;
diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c
index b283a4903369..5b1ef229df2a 100644
--- a/drivers/staging/rtl8188eu/core/rtw_security.c
+++ b/drivers/staging/rtl8188eu/core/rtw_security.c
@@ -1690,4 +1690,4 @@ do {									\
         d##1 = TE0(s##1) ^ TE1(s##2) ^ TE2(s##3) ^ TE3(s##0) ^ rk[4 * i + 1]; \
         d##2 = TE0(s##2) ^ TE1(s##3) ^ TE2(s##0) ^ TE3(s##1) ^ rk[4 * i + 2]; \
         d##3 = TE0(s##3) ^ TE1(s##0) ^ TE2(s##1) ^ TE3(s##2) ^ rk[4 * i + 3]; \
-} while (0);
+} while (0)
diff --git a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
index 22cf362b8528..2fd2a9e2416e 100644
--- a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
@@ -239,8 +239,8 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
                 }
 
                 /* init for DM */
-                psta->rssi_stat.UndecoratedSmoothedPWDB = (-1);
-                psta->rssi_stat.UndecoratedSmoothedCCK = (-1);
+                psta->rssi_stat.UndecoratedSmoothedPWDB = -1;
+                psta->rssi_stat.UndecoratedSmoothedCCK = -1;
 
                 /* init for the sequence number of received management frame */
                 psta->RxMgmtFrameSeqNum = 0xffff;
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index be2f46eb9f78..e8d9858f2942 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -93,7 +93,7 @@ s32	_rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
         pxframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf;
 
         for (i = 0; i < NR_XMITFRAME; i++) {
-                INIT_LIST_HEAD(&(pxframe->list));
+                INIT_LIST_HEAD(&pxframe->list);
 
                 pxframe->padapter = padapter;
                 pxframe->frame_tag = NULL_FRAMETAG;
@@ -103,7 +103,7 @@ s32	_rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
                 pxframe->buf_addr = NULL;
                 pxframe->pxmitbuf = NULL;
 
-                list_add_tail(&(pxframe->list), &(pxmitpriv->free_xmit_queue.queue));
+                list_add_tail(&pxframe->list, &pxmitpriv->free_xmit_queue.queue);
 
                 pxframe++;
         }
@@ -148,7 +148,7 @@ s32	_rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
 
                 pxmitbuf->flags = XMIT_VO_QUEUE;
 
-                list_add_tail(&pxmitbuf->list, &(pxmitpriv->free_xmitbuf_queue.queue));
+                list_add_tail(&pxmitbuf->list, &pxmitpriv->free_xmitbuf_queue.queue);
                 pxmitbuf++;
         }
 
@@ -182,7 +182,7 @@ s32	_rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
                         goto exit;
                 }
 
-                list_add_tail(&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue));
+                list_add_tail(&pxmitbuf->list, &pxmitpriv->free_xmit_extbuf_queue.queue);
                 pxmitbuf++;
         }
 
@@ -258,8 +258,8 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *
         u32     sz;
         struct pkt_attrib       *pattrib = &pxmitframe->attrib;
         struct sta_info *psta = pattrib->psta;
-        struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
-        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
+        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
+        struct mlme_ext_info    *pmlmeinfo = &pmlmeext->mlmext_info;
 
         if (pattrib->nr_frags != 1)
                 sz = padapter->xmitpriv.frag_len;
@@ -697,7 +697,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
                                         RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("curfragnum=%d length=%d pattrib->icv_len=%d", curfragnum, length, pattrib->icv_len));
                                 }
                         }
-                        rtw_secgetmic(&micdata, &(mic[0]));
+                        rtw_secgetmic(&micdata, &mic[0]);
                         RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic: before add mic code!!!\n"));
                         RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic: pattrib->last_txcmdsz=%d!!!\n", pattrib->last_txcmdsz));
                         RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic: mic[0]=0x%.2x , mic[1]=0x%.2x , mic[2]= 0x%.2x, mic[3]=0x%.2x\n\
@@ -705,18 +705,18 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
                                 mic[0], mic[1], mic[2], mic[3], mic[4], mic[5], mic[6], mic[7]));
                         /* add mic code  and add the mic code length in last_txcmdsz */
 
-                        memcpy(payload, &(mic[0]), 8);
+                        memcpy(payload, &mic[0], 8);
                         pattrib->last_txcmdsz += 8;
 
                         RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("\n ======== last pkt ========\n"));
                         payload = payload-pattrib->last_txcmdsz+8;
                         for (curfragnum = 0; curfragnum < pattrib->last_txcmdsz; curfragnum = curfragnum+8)
-                                        RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
-                                                 (" %.2x,  %.2x,  %.2x,  %.2x,  %.2x,  %.2x,  %.2x,  %.2x ",
-                                                 *(payload+curfragnum), *(payload+curfragnum+1),
-                                                 *(payload+curfragnum+2), *(payload+curfragnum+3),
-                                                 *(payload+curfragnum+4), *(payload+curfragnum+5),
-                                                 *(payload+curfragnum+6), *(payload+curfragnum+7)));
+                                RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
+                                         (" %.2x,  %.2x,  %.2x,  %.2x,  %.2x,  %.2x,  %.2x,  %.2x ",
+                                         *(payload + curfragnum), *(payload + curfragnum + 1),
+                                         *(payload + curfragnum + 2), *(payload + curfragnum + 3),
+                                         *(payload + curfragnum + 4), *(payload + curfragnum + 5),
+                                         *(payload + curfragnum + 6), *(payload + curfragnum + 7)));
                         } else {
                                 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic: rtw_get_stainfo==NULL!!!\n"));
                         }
@@ -786,7 +786,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
         SetFrameSubType(fctrl, pattrib->subtype);
 
         if (pattrib->subtype & WIFI_DATA_TYPE) {
-                if ((check_fwstate(pmlmepriv,  WIFI_STATION_STATE) == true)) {
+                if (check_fwstate(pmlmepriv,  WIFI_STATION_STATE) == true) {
                         /* to_ds = 1, fr_ds = 0; */
                         /* Data transfer to AP */
                         SetToDs(fctrl);
@@ -899,20 +899,20 @@ s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pat
         switch (priority) {
         case 1:
         case 2:
-                ptxservq = &(psta->sta_xmitpriv.bk_q);
+                ptxservq = &psta->sta_xmitpriv.bk_q;
                 break;
         case 4:
         case 5:
-                ptxservq = &(psta->sta_xmitpriv.vi_q);
+                ptxservq = &psta->sta_xmitpriv.vi_q;
                 break;
         case 6:
         case 7:
-                ptxservq = &(psta->sta_xmitpriv.vo_q);
+                ptxservq = &psta->sta_xmitpriv.vo_q;
                 break;
         case 0:
         case 3:
         default:
-                ptxservq = &(psta->sta_xmitpriv.be_q);
+                ptxservq = &psta->sta_xmitpriv.be_q;
                 break;
         }
 
@@ -1229,7 +1229,7 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
 
         list_del_init(&pxmitbuf->list);
 
-        list_add_tail(&(pxmitbuf->list), get_list_head(pfree_queue));
+        list_add_tail(&pxmitbuf->list, get_list_head(pfree_queue));
         pxmitpriv->free_xmit_extbuf_cnt++;
 
         spin_unlock_irqrestore(&pfree_queue->lock, irql);
@@ -1283,7 +1283,7 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
 
                 list_del_init(&pxmitbuf->list);
 
-                list_add_tail(&(pxmitbuf->list), get_list_head(pfree_xmitbuf_queue));
+                list_add_tail(&pxmitbuf->list, get_list_head(pfree_xmitbuf_queue));
 
                 pxmitpriv->free_xmitbuf_cnt++;
                 spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, irql);
@@ -1395,7 +1395,7 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pfram
         struct  xmit_frame      *pxmitframe;
 
 
-        spin_lock_bh(&(pframequeue->lock));
+        spin_lock_bh(&pframequeue->lock);
 
         phead = get_list_head(pframequeue);
         plist = phead->next;
@@ -1407,7 +1407,7 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pfram
 
                 rtw_free_xmitframe(pxmitpriv, pxmitframe);
         }
-        spin_unlock_bh(&(pframequeue->lock));
+        spin_unlock_bh(&pframequeue->lock);
 
 }
 
@@ -1503,26 +1503,26 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *
         switch (up) {
         case 1:
         case 2:
-                ptxservq = &(psta->sta_xmitpriv.bk_q);
+                ptxservq = &psta->sta_xmitpriv.bk_q;
                 *(ac) = 3;
                 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending : BK\n"));
                 break;
         case 4:
         case 5:
-                ptxservq = &(psta->sta_xmitpriv.vi_q);
+                ptxservq = &psta->sta_xmitpriv.vi_q;
                 *(ac) = 1;
                 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending : VI\n"));
                 break;
         case 6:
         case 7:
-                ptxservq = &(psta->sta_xmitpriv.vo_q);
+                ptxservq = &psta->sta_xmitpriv.vo_q;
                 *(ac) = 0;
                 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending : VO\n"));
                 break;
         case 0:
         case 3:
         default:
-                ptxservq = &(psta->sta_xmitpriv.be_q);
+                ptxservq = &psta->sta_xmitpriv.be_q;
                 *(ac) = 2;
                 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("rtw_get_sta_pending : BE\n"));
         break;
@@ -1845,21 +1845,21 @@ void stop_sta_xmit(struct adapter *padapter, struct sta_info *psta)
         pstapriv->sta_dz_bitmap |= BIT(psta->aid);
 
         dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vo_q.sta_pending);
-        list_del_init(&(pstaxmitpriv->vo_q.tx_pending));
+        list_del_init(&pstaxmitpriv->vo_q.tx_pending);
 
         dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vi_q.sta_pending);
-        list_del_init(&(pstaxmitpriv->vi_q.tx_pending));
+        list_del_init(&pstaxmitpriv->vi_q.tx_pending);
 
         dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->be_q.sta_pending);
-        list_del_init(&(pstaxmitpriv->be_q.tx_pending));
+        list_del_init(&pstaxmitpriv->be_q.tx_pending);
 
         dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->bk_q.sta_pending);
-        list_del_init(&(pstaxmitpriv->bk_q.tx_pending));
+        list_del_init(&pstaxmitpriv->bk_q.tx_pending);
 
         /* for BC/MC Frames */
         pstaxmitpriv = &psta_bmc->sta_xmitpriv;
         dequeue_xmitframes_to_sleeping_queue(padapter, psta_bmc, &pstaxmitpriv->be_q.sta_pending);
-        list_del_init(&(pstaxmitpriv->be_q.tx_pending));
+        list_del_init(&pstaxmitpriv->be_q.tx_pending);
 
         spin_unlock_bh(&pxmitpriv->lock);
 }
diff --git a/drivers/staging/rtl8188eu/hal/odm.c b/drivers/staging/rtl8188eu/hal/odm.c
index ec8aae76bf40..001d6267b56e 100644
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -382,7 +382,7 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm)
         }
 
         /* add by Neil Chen to avoid PSD is processing */
-        if (pDM_Odm->bDMInitialGainEnable == false) {
+        if (!pDM_Odm->bDMInitialGainEnable) {
                 ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG() Return: PSD is Processing\n"));
                 return;
         }
diff --git a/drivers/staging/rtl8188eu/hal/odm_HWConfig.c b/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
index 0555e42a3787..5fcbe5639e99 100644
--- a/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
@@ -109,7 +109,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm,
 
                 dm_odm->PhyDbgInfo.NumQryPhyStatusCCK++;
                 /*  (1)Hardware does not provide RSSI for CCK */
-                /*  (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive) */
+                /*  (2)PWDB, Average PWDB calculated by hardware (for rate adaptive) */
 
                 cck_highpwr = dm_odm->bCckHighPower;
 
@@ -223,7 +223,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm,
                         pPhyInfo->RxSNR[i] = (s32)(pPhyStaRpt->path_rxsnr[i]/2);
                         dm_odm->PhyDbgInfo.RxSNRdB[i] = (s32)(pPhyStaRpt->path_rxsnr[i]/2);
                 }
-                /*  (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive) */
+                /*  (2)PWDB, Average PWDB calculated by hardware (for rate adaptive) */
                 rx_pwr_all = (((pPhyStaRpt->cck_sig_qual_ofdm_pwdb_all) >> 1) & 0x7f) - 110;
 
                 PWDB_ALL = odm_QueryRxPwrPercentage(rx_pwr_all);
diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index 3039bbe44a25..20253b5b6679 100644
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -820,9 +820,8 @@ static void save_adda_registers(struct adapter *adapt, u32 *addareg,
 {
         u32 i;
 
-        for (i = 0; i < register_num; i++) {
+        for (i = 0; i < register_num; i++)
                 backup[i] = phy_query_bb_reg(adapt, addareg[i], bMaskDWord);
-        }
 }
 
 static void save_mac_registers(struct adapter *adapt, u32 *mac_reg,
@@ -830,9 +829,9 @@ static void save_mac_registers(struct adapter *adapt, u32 *mac_reg,
 {
         u32 i;
 
-        for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++) {
+        for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
                 backup[i] = usb_read8(adapt, mac_reg[i]);
-        }
+
         backup[i] = usb_read32(adapt, mac_reg[i]);
 }
 
@@ -850,9 +849,9 @@ static void reload_mac_registers(struct adapter *adapt,
 {
         u32 i;
 
-        for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++) {
+        for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
                 usb_write8(adapt, mac_reg[i], (u8)backup[i]);
-        }
+
         usb_write32(adapt, mac_reg[i], backup[i]);
 }
 
@@ -880,9 +879,9 @@ static void mac_setting_calibration(struct adapter *adapt, u32 *mac_reg, u32 *ba
 
         usb_write8(adapt, mac_reg[i], 0x3F);
 
-        for (i = 1; i < (IQK_MAC_REG_NUM - 1); i++) {
+        for (i = 1; i < (IQK_MAC_REG_NUM - 1); i++)
                 usb_write8(adapt, mac_reg[i], (u8)(backup[i]&(~BIT(3))));
-        }
+
         usb_write8(adapt, mac_reg[i], (u8)(backup[i]&(~BIT(5))));
 }
 
diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 674ac5396d00..17967c944946 100644
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -1745,6 +1745,7 @@ void rtw_hal_get_hwreg(struct adapter *Adapter, u8 variable, u8 *val)
         switch (variable) {
         case HW_VAR_BASIC_RATE:
                 *((u16 *)(val)) = Adapter->HalData->BasicRateSet;
+                /* fall through */
         case HW_VAR_TXPAUSE:
                 val[0] = usb_read8(Adapter, REG_TXPAUSE);
                 break;
diff --git a/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h b/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h
index 550ad62e7064..4e5d7fc6de07 100644
--- a/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h
+++ b/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h
@@ -75,7 +75,8 @@ enum rf_radio_path {
 #define CHANNEL_MAX_NUMBER              14      /*  14 is the max chnl number */
 #define MAX_CHNL_GROUP_24G              6       /*  ch1~2, ch3~5, ch6~8,
                                                  *ch9~11, ch12~13, CH 14
-                                                 * total three groups */
+                                                 * total three groups
+                                                 */
 #define CHANNEL_GROUP_MAX_88E           6
 
 enum wireless_mode {
@@ -116,35 +117,45 @@ struct bb_reg_def {
                                 /*      0x80c~0x80f [4 bytes] */
         u32 rfHSSIPara1;        /*  wire parameter control1 : */
                                 /*      0x820~0x823,0x828~0x82b,
-                                 *      0x830~0x833, 0x838~0x83b [16 bytes] */
+                                 *      0x830~0x833, 0x838~0x83b [16 bytes]
+                                 */
         u32 rfHSSIPara2;        /*  wire parameter control2 : */
                                 /*      0x824~0x827,0x82c~0x82f, 0x834~0x837,
-                                 *      0x83c~0x83f [16 bytes] */
+                                 *      0x83c~0x83f [16 bytes]
+                                 */
         u32 rfSwitchControl;    /* Tx Rx antenna control : */
                                 /*      0x858~0x85f [16 bytes] */
         u32 rfAGCControl1;      /* AGC parameter control1 : */
                                 /*      0xc50~0xc53,0xc58~0xc5b, 0xc60~0xc63,
-                                 * 0xc68~0xc6b [16 bytes] */
+                                 * 0xc68~0xc6b [16 bytes]
+                                 */
         u32 rfAGCControl2;      /* AGC parameter control2 : */
                                 /*      0xc54~0xc57,0xc5c~0xc5f, 0xc64~0xc67,
-                                 *      0xc6c~0xc6f [16 bytes] */
+                                 *      0xc6c~0xc6f [16 bytes]
+                                 */
         u32 rfRxIQImbalance;    /* OFDM Rx IQ imbalance matrix : */
                                 /*      0xc14~0xc17,0xc1c~0xc1f, 0xc24~0xc27,
-                                 *      0xc2c~0xc2f [16 bytes] */
+                                 *      0xc2c~0xc2f [16 bytes]
+                                 */
         u32 rfRxAFE;            /* Rx IQ DC ofset and Rx digital filter,
-                                 * Rx DC notch filter : */
+                                 * Rx DC notch filter :
+                                 */
                                 /*      0xc10~0xc13,0xc18~0xc1b, 0xc20~0xc23,
-                                 *      0xc28~0xc2b [16 bytes] */
+                                 *      0xc28~0xc2b [16 bytes]
+                                 */
         u32 rfTxIQImbalance;    /* OFDM Tx IQ imbalance matrix */
                                 /*      0xc80~0xc83,0xc88~0xc8b, 0xc90~0xc93,
-                                 *       0xc98~0xc9b [16 bytes] */
+                                 *       0xc98~0xc9b [16 bytes]
+                                 */
         u32 rfTxAFE;            /* Tx IQ DC Offset and Tx DFIR type */
                                 /*      0xc84~0xc87,0xc8c~0xc8f, 0xc94~0xc97,
-                                 *      0xc9c~0xc9f [16 bytes] */
+                                 *      0xc9c~0xc9f [16 bytes]
+                                 */
         u32 rfLSSIReadBack;     /* LSSI RF readback data SI mode */
                                 /*      0x8a0~0x8af [16 bytes] */
         u32 rfLSSIReadBackPi;   /* LSSI RF readback data PI mode 0x8b8-8bc for
-                                 * Path A and B */
+                                 * Path A and B
+                                 */
 };
 
 /*------------------------------Define structure----------------------------*/
diff --git a/drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h b/drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h
index 04159a9f90d3..8cbba85e1587 100644
--- a/drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h
+++ b/drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h
@@ -136,7 +136,8 @@
 #define rCCK0_CCA                       0xa08
 
 /* AGC default value, saturation level Antenna Diversity, RX AGC, LNA Threshold,
- * RX LNA Threshold useless now. Not the same as 90 series */
+ * RX LNA Threshold useless now. Not the same as 90 series
+ */
 #define rCCK0_RxAGC1                    0xa0c
 #define rCCK0_RxAGC2                    0xa10   /* AGC & DAGC */
 
diff --git a/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h b/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h
index 21996a1173ef..c7218c49ed71 100644
--- a/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h
+++ b/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h
@@ -1,19 +1,19 @@
 #ifndef __INC_RA_H
 #define __INC_RA_H
-/*++
-Copyright (c) Realtek Semiconductor Corp. All rights reserved.
-
-Module Name:
-        RateAdaptive.h
-
-Abstract:
-        Prototype of RA and related data structure.
-
-Major Change History:
-        When       Who               What
-        ---------- ---------------   -------------------------------
-        2011-08-12 Page            Create.
---*/
+/*
+ * Copyright (c) Realtek Semiconductor Corp. All rights reserved.
+ *
+ * Module Name:
+ *      RateAdaptive.h
+ *
+ * Abstract:
+ *      Prototype of RA and related data structure.
+ *
+ * Major Change History:
+ *      When       Who               What
+ *      ---------- ---------------   -------------------------------
+ *      2011-08-12 Page            Create.
+ */
 
 /*  Rate adaptive define */
 #define PERENTRY        23
diff --git a/drivers/staging/rtl8188eu/include/basic_types.h b/drivers/staging/rtl8188eu/include/basic_types.h
index 69c4d49f43ab..73cc86705cf3 100644
--- a/drivers/staging/rtl8188eu/include/basic_types.h
+++ b/drivers/staging/rtl8188eu/include/basic_types.h
@@ -1,4 +1,4 @@
-/******************************************************************************
+        /******************************************************************************
  *
  * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
  *
@@ -20,14 +20,15 @@
 
 /* port from fw */
 /*  TODO: Macros Below are Sync from SD7-Driver. It is necessary
- * to check correctness */
+ * to check correctness
+ */
 
 /*
  *      Call endian free function when
  *              1. Read/write packet content.
  *              2. Before write integer to IO.
  *              3. After read integer from IO.
-*/
+ */
 
 /* Convert little data endian to host ordering */
 #define EF1BYTE(_val)           \
@@ -74,9 +75,10 @@
 #define LE_P1BYTE_TO_HOST_1BYTE(__pstart) \
         (EF1BYTE(*((u8 *)(__pstart))))
 
-/*Description:
-Translate subfield (continuous bits in little-endian) of 4-byte
-value to host byte ordering.*/
+/* Description:
+ * Translate subfield (continuous bits in little-endian) of 4-byte
+ * value to host byte ordering.
+ */
 #define LE_BITS_TO_4BYTE(__pstart, __bitoffset, __bitlen) \
         ( \
                 (LE_P4BYTE_TO_HOST_4BYTE(__pstart) >> (__bitoffset))  & \
diff --git a/drivers/staging/rtl8188eu/include/drv_types.h b/drivers/staging/rtl8188eu/include/drv_types.h
index c3517c0903ca..2734565ce802 100644
--- a/drivers/staging/rtl8188eu/include/drv_types.h
+++ b/drivers/staging/rtl8188eu/include/drv_types.h
@@ -128,7 +128,8 @@ struct dvobj_priv {
 static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj)
 {
         /* todo: get interface type from dvobj and the return
-         * the dev accordingly */
+         * the dev accordingly
+         */
         return &dvobj->pusbintf->dev;
 };
 
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index dfdbd0254886..da4ee1561c36 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -96,9 +96,11 @@ enum hw_variables {
         HW_VAR_FIFO_CLEARN_UP,
         HW_VAR_CHECK_TXBUF,
         HW_VAR_APFM_ON_MAC, /* Auto FSM to Turn On, include clock, isolation,
-                             * power control for MAC only */
+                             * power control for MAC only
+                             */
         /*  The valid upper nav range for the HW updating, if the true value is
-         *  larger than the upper range, the HW won't update it. */
+         *  larger than the upper range, the HW won't update it.
+         */
         /*  Unit in microsecond. 0 means disable this function. */
         HW_VAR_NAV_UPPER,
         HW_VAR_RPT_TIMER_SETTING,
diff --git a/drivers/staging/rtl8188eu/include/ieee80211.h b/drivers/staging/rtl8188eu/include/ieee80211.h
index 284db7d00f50..9f480ccec531 100644
--- a/drivers/staging/rtl8188eu/include/ieee80211.h
+++ b/drivers/staging/rtl8188eu/include/ieee80211.h
@@ -202,9 +202,9 @@ enum NETWORK_TYPE {
 #define IsSupportedTxCCK(NetType)                               \
         ((NetType) & (WIRELESS_11B) ? true : false)
 #define IsSupportedTxOFDM(NetType)                              \
-        ((NetType) & (WIRELESS_11G|WIRELESS_11A) ? true : false)
+        ((NetType) & (WIRELESS_11G | WIRELESS_11A) ? true : false)
 #define IsSupportedTxMCS(NetType)                               \
-        ((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N) ? true : false)
+        ((NetType) & (WIRELESS_11_24N | WIRELESS_11_5N) ? true : false)
 
 
 struct ieee_param {
@@ -276,12 +276,13 @@ struct sta_data {
 
 #define IEEE80211_DATA_LEN              2304
 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
-   6.2.1.1.2.
+ * 6.2.1.1.2.
 
-   The figure in section 7.1.2 suggests a body size of up to 2312
-   bytes is allowed, which is a bit confusing, I suspect this
-   represents the 2304 bytes of real data, plus a possible 8 bytes of
-   WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */
+ * The figure in section 7.1.2 suggests a body size of up to 2312
+ * bytes is allowed, which is a bit confusing, I suspect this
+ * represents the 2304 bytes of real data, plus a possible 8 bytes of
+ * WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro)
+ */
 
 
 #define IEEE80211_HLEN                  30
@@ -358,11 +359,11 @@ struct ieee80211_snap_hdr {
 #define IEEE80211_DATA_HDR3_LEN 24
 #define IEEE80211_DATA_HDR4_LEN 30
 
-#define IEEE80211_CCK_MODULATION    (1<<0)
-#define IEEE80211_OFDM_MODULATION   (1<<1)
+#define IEEE80211_CCK_MODULATION        BIT(0)
+#define IEEE80211_OFDM_MODULATION       BIT(1)
 
-#define IEEE80211_24GHZ_BAND     (1<<0)
-#define IEEE80211_52GHZ_BAND     (1<<1)
+#define IEEE80211_24GHZ_BAND    BIT(0)
+#define IEEE80211_52GHZ_BAND    BIT(1)
 
 #define IEEE80211_CCK_RATE_LEN                  4
 #define IEEE80211_NUM_OFDM_RATESLEN     8
@@ -383,18 +384,18 @@ struct ieee80211_snap_hdr {
 #define IEEE80211_OFDM_RATE_54MB                0x6C
 #define IEEE80211_BASIC_RATE_MASK               0x80
 
-#define IEEE80211_CCK_RATE_1MB_MASK             (1<<0)
-#define IEEE80211_CCK_RATE_2MB_MASK             (1<<1)
-#define IEEE80211_CCK_RATE_5MB_MASK             (1<<2)
-#define IEEE80211_CCK_RATE_11MB_MASK            (1<<3)
-#define IEEE80211_OFDM_RATE_6MB_MASK            (1<<4)
-#define IEEE80211_OFDM_RATE_9MB_MASK            (1<<5)
-#define IEEE80211_OFDM_RATE_12MB_MASK           (1<<6)
-#define IEEE80211_OFDM_RATE_18MB_MASK           (1<<7)
-#define IEEE80211_OFDM_RATE_24MB_MASK           (1<<8)
-#define IEEE80211_OFDM_RATE_36MB_MASK           (1<<9)
-#define IEEE80211_OFDM_RATE_48MB_MASK           (1<<10)
-#define IEEE80211_OFDM_RATE_54MB_MASK           (1<<11)
+#define IEEE80211_CCK_RATE_1MB_MASK             BIT(0)
+#define IEEE80211_CCK_RATE_2MB_MASK             BIT(1)
+#define IEEE80211_CCK_RATE_5MB_MASK             BIT(2)
+#define IEEE80211_CCK_RATE_11MB_MASK            BIT(3)
+#define IEEE80211_OFDM_RATE_6MB_MASK            BIT(4)
+#define IEEE80211_OFDM_RATE_9MB_MASK            BIT(5)
+#define IEEE80211_OFDM_RATE_12MB_MASK           BIT(6)
+#define IEEE80211_OFDM_RATE_18MB_MASK           BIT(7)
+#define IEEE80211_OFDM_RATE_24MB_MASK           BIT(8)
+#define IEEE80211_OFDM_RATE_36MB_MASK           BIT(9)
+#define IEEE80211_OFDM_RATE_48MB_MASK           BIT(10)
+#define IEEE80211_OFDM_RATE_54MB_MASK           BIT(11)
 
 #define IEEE80211_CCK_RATES_MASK                0x0000000F
 #define IEEE80211_CCK_BASIC_RATES_MASK  (IEEE80211_CCK_RATE_1MB_MASK | \
@@ -423,18 +424,19 @@ struct ieee80211_snap_hdr {
 /* IEEE 802.11 requires that STA supports concurrent reception of at least
  * three fragmented frames. This define can be increased to support more
  * concurrent frames, but it should be noted that each entry can consume about
- * 2 kB of RAM and increasing cache size will slow down frame reassembly. */
+ * 2 kB of RAM and increasing cache size will slow down frame reassembly.
+ */
 #define IEEE80211_FRAG_CACHE_LEN 4
 
-#define SEC_KEY_1       (1<<0)
-#define SEC_KEY_2       (1<<1)
-#define SEC_KEY_3       (1<<2)
-#define SEC_KEY_4       (1<<3)
-#define SEC_ACTIVE_KEY  (1<<4)
-#define SEC_AUTH_MODE   (1<<5)
-#define SEC_UNICAST_GROUP (1<<6)
-#define SEC_LEVEL       (1<<7)
-#define SEC_ENABLED     (1<<8)
+#define SEC_KEY_1       BIT(0)
+#define SEC_KEY_2       BIT(1)
+#define SEC_KEY_3       BIT(2)
+#define SEC_KEY_4       BIT(3)
+#define SEC_ACTIVE_KEY  BIT(4)
+#define SEC_AUTH_MODE   BIT(5)
+#define SEC_UNICAST_GROUP BIT(6)
+#define SEC_LEVEL       BIT(7)
+#define SEC_ENABLED     BIT(8)
 
 #define SEC_LEVEL_0      0 /* None */
 #define SEC_LEVEL_1      1 /* WEP 40 and 104 bit */
@@ -451,7 +453,8 @@ struct ieee80211_snap_hdr {
 /* MAX_RATES_LENGTH needs to be 12.  The spec says 8, and many APs
  * only use 8, and then use extended rates for the remaining supported
  * rates.  Other APs, however, stick all of their supported rates on the
- * main rates information element... */
+ * main rates information element...
+ */
 #define MAX_RATES_LENGTH                ((u8)12)
 #define MAX_RATES_EX_LENGTH             ((u8)16)
 #define MAX_NETWORK_COUNT               128
@@ -467,17 +470,17 @@ struct ieee80211_snap_hdr {
 #define MAX_P2P_IE_LEN (256)
 #define MAX_WFD_IE_LEN (128)
 
-#define NETWORK_EMPTY_ESSID (1<<0)
-#define NETWORK_HAS_OFDM    (1<<1)
-#define NETWORK_HAS_CCK     (1<<2)
+#define NETWORK_EMPTY_ESSID     BIT(0)
+#define NETWORK_HAS_OFDM        BIT(1)
+#define NETWORK_HAS_CCK         BIT(2)
 
 #define IW_ESSID_MAX_SIZE 32
 /*
-join_res:
--1: authentication fail
--2: association fail
-> 0: TID
-*/
+ * join_res:
+ * -1: authentication fail
+ * -2: association fail
+ * > 0: TID
+ */
 
 enum ieee80211_state {
         /* the card is not linked at all */
@@ -531,15 +534,15 @@ static inline int is_broadcast_mac_addr(const u8 *addr)
                (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff);
 }
 
-#define CFG_IEEE80211_RESERVE_FCS (1<<0)
-#define CFG_IEEE80211_COMPUTE_FCS (1<<1)
+#define CFG_IEEE80211_RESERVE_FCS       BIT(0)
+#define CFG_IEEE80211_COMPUTE_FCS       BIT(1)
 
 #define MAXTID  16
 
-#define IEEE_A      (1<<0)
-#define IEEE_B      (1<<1)
-#define IEEE_G      (1<<2)
-#define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)
+#define IEEE_A      BIT(0)
+#define IEEE_B      BIT(1)
+#define IEEE_G      BIT(2)
+#define IEEE_MODE_MASK    (IEEE_A | IEEE_B | IEEE_G)
 
 /* Action category code */
 enum rtw_ieee80211_category {
@@ -615,7 +618,8 @@ enum rtw_ieee80211_back_parties {
 };
 
 #define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs)
-                                * 00:50:F2 */
+                                * 00:50:F2
+                                */
 #define WME_OUI_TYPE 2
 #define WME_OUI_SUBTYPE_INFORMATION_ELEMENT 0
 #define WME_OUI_SUBTYPE_PARAMETER_ELEMENT 1
@@ -655,12 +659,12 @@ enum rtw_ieee80211_back_parties {
  *      is not permitted.
  */
 enum rtw_ieee80211_channel_flags {
-        RTW_IEEE80211_CHAN_DISABLED      = 1<<0,
-        RTW_IEEE80211_CHAN_PASSIVE_SCAN     = 1<<1,
-        RTW_IEEE80211_CHAN_NO_IBSS        = 1<<2,
-        RTW_IEEE80211_CHAN_RADAR            = 1<<3,
-        RTW_IEEE80211_CHAN_NO_HT40PLUS      = 1<<4,
-        RTW_IEEE80211_CHAN_NO_HT40MINUS     = 1<<5,
+        RTW_IEEE80211_CHAN_DISABLED      = BIT(0),
+        RTW_IEEE80211_CHAN_PASSIVE_SCAN     = BIT(1),
+        RTW_IEEE80211_CHAN_NO_IBSS        = BIT(2),
+        RTW_IEEE80211_CHAN_RADAR            = BIT(3),
+        RTW_IEEE80211_CHAN_NO_HT40PLUS      = BIT(4),
+        RTW_IEEE80211_CHAN_NO_HT40MINUS     = BIT(5),
 };
 
 #define RTW_IEEE80211_CHAN_NO_HT40 \
diff --git a/drivers/staging/rtl8188eu/include/odm.h b/drivers/staging/rtl8188eu/include/odm.h
index 4fb3bb07ceaa..95426b7c6dbf 100644
--- a/drivers/staging/rtl8188eu/include/odm.h
+++ b/drivers/staging/rtl8188eu/include/odm.h
@@ -36,7 +36,8 @@
 /*  Mainly, it just retains last scan result and scan again. */
 /*  After that, it compares the scan result to see which one gets better
  *  RSSI. It selects antenna with better receiving power and returns better
- *  scan result. */
+ *  scan result.
+ */
 
 #define TP_MODE                 0
 #define RSSI_MODE               1
@@ -173,10 +174,12 @@ struct rx_hpc {
 
 /*  This indicates two different steps. */
 /*  In SWAW_STEP_PEAK, driver needs to switch antenna and listen to
- *  the signal on the air. */
+ *  the signal on the air.
+ */
 /*  In SWAW_STEP_DETERMINE, driver just compares the signal captured in
  *  SWAW_STEP_PEAK with original RSSI to determine if it is necessary to
- *  switch antenna. */
+ *  switch antenna.
+ */
 
 #define SWAW_STEP_PEAK          0
 #define SWAW_STEP_DETERMINE     1
@@ -265,7 +268,8 @@ struct odm_phy_status_info {
         s8      RxPower; /*  in dBm Translate from PWdB */
         s8      RecvSignalPower;/*  Real power in dBm for this packet, no
                                  * beautification and aggregation. Keep this raw
-                                 * info to be used for the other procedures. */
+                                 * info to be used for the other procedures.
+                                 */
         u8      BTRxRSSIPercentage;
         u8      SignalStrength; /*  in 0-100 index. */
         u8      RxPwr[MAX_PATH_NUM_92CS];/* per-path's pwdb */
@@ -478,7 +482,7 @@ enum odm_operation_mode {
 
 /*  ODM_CMNINFO_WM_MODE */
 enum odm_wireless_mode {
-        ODM_WM_UNKNOW   = 0x0,
+        ODM_WM_UNKNOWN  = 0x0,
         ODM_WM_B        = BIT(0),
         ODM_WM_G        = BIT(1),
         ODM_WM_A        = BIT(2),
@@ -509,7 +513,7 @@ enum odm_security {
         ODM_SEC_RESERVE         = 3,
         ODM_SEC_AESCCMP         = 4,
         ODM_SEC_WEP104          = 5,
-        ODM_WEP_WPA_MIXED       = 6, /*  WEP + WPA */
+        ODM_WEP_WPA_MIXED       = 6, /*  WEP + WPA */
         ODM_SEC_SMS4            = 7,
 };
 
@@ -567,7 +571,8 @@ struct odm_ra_info {
         u8 PTPreRssi;   /*  if RSSI change 5% do PT */
         u8 PTModeSS;    /*  decide whitch rate should do PT */
         u8 RAstage;     /*  StageRA, decide how many times RA will be done
-                         * between PT */
+                         * between PT
+                         */
         u8 PTSmoothFactor;
 };
 
@@ -587,12 +592,14 @@ struct odm_rf_cal {
         u8      TXPowercount;
         bool    bTXPowerTracking;
         u8      TxPowerTrackControl; /* for mp mode, turn off txpwrtracking
-                                      * as default */
+                                      * as default
+                                      */
         u8      TM_Trigger;
         u8      InternalPA5G[2];        /* pathA / pathB */
 
         u8      ThermalMeter[2];    /* ThermalMeter, index 0 for RFIC0,
-                                     * and 1 for RFIC1 */
+                                     * and 1 for RFIC1
+                                     */
         u8      ThermalValue;
         u8      ThermalValue_LCK;
         u8      ThermalValue_IQK;
@@ -688,7 +695,7 @@ enum ant_div_type {
 
 /* Copy from SD4 defined structure. We use to support PHY DM integration. */
 struct odm_dm_struct {
-        /*      Add for different team use temporarily */
+        /*      Add for different team use temporarily */
         struct adapter *Adapter;        /*  For CE/NIC team */
         struct rtl8192cd_priv *priv;    /*  For AP/ADSL team */
         /*  WHen you use above pointers, they must be initialized. */
@@ -714,7 +721,8 @@ struct odm_dm_struct {
         /*  ODM PCIE/USB/SDIO/GSPI = 0/1/2/3 */
         u8      SupportInterface;
         /*  ODM composite or independent. Bit oriented/ 92C+92D+ .... or any
-         *  other type = 1/2/3/... */
+         *  other type = 1/2/3/...
+         */
         u32     SupportICType;
         /*  Cut Version TestChip/A-cut/B-cut... = 0/1/2/3/... */
         u8      CutVersion;
@@ -788,19 +796,21 @@ struct odm_dm_struct {
         bool    bBtHsOperation; /*  BT HS mode is under progress */
         u8      btHsDigVal;     /*  use BT rssi to decide the DIG value */
         bool    bBtDisableEdcaTurbo;/* Under some condition, don't enable the
-                                     * EDCA Turbo */
+                                     * EDCA Turbo
+                                     */
         bool    bBtBusy;                        /*  BT is busy. */
 /* CALL BY VALUE------------- */
 
         /* 2 Define STA info. */
         /*  _ODM_STA_INFO */
-        /*  For MP, we need to reduce one array pointer for default port.?? */
+        /*  For MP, we need to reduce one array pointer for default port.??*/
         struct sta_info *pODM_StaInfo[ODM_ASSOCIATE_ENTRY_NUM];
 
         u16     CurrminRptTime;
         struct odm_ra_info RAInfo[ODM_ASSOCIATE_ENTRY_NUM]; /* Use MacID as
-                        * array index. STA MacID=0,
-                        * VWiFi Client MacID={1, ODM_ASSOCIATE_ENTRY_NUM-1} */
+                                                             * array index. STA MacID=0,
+                                                             * VWiFi Client MacID={1, ODM_ASSOCIATE_ENTRY_NUM-1}
+                                                             */
         /*  */
         /*  2012/02/14 MH Add to share 88E ra with other SW team. */
         /*  We need to colelct all support abilit to a proper area. */
@@ -1029,9 +1039,11 @@ extern	u8 CCKSwingTable_Ch14[CCK_TABLE_SIZE][8];
 /*  20100514 Joseph: Add definition for antenna switching test after link. */
 /*  This indicates two different the steps. */
 /*  In SWAW_STEP_PEAK, driver needs to switch antenna and listen to the
- *  signal on the air. */
+ *  signal on the air.
+ */
 /*  In SWAW_STEP_DETERMINE, driver just compares the signal captured in
- *  SWAW_STEP_PEAK */
+ *  SWAW_STEP_PEAK
+ */
 /*  with original RSSI to determine if it is necessary to switch antenna. */
 #define SWAW_STEP_PEAK          0
 #define SWAW_STEP_DETERMINE     1
diff --git a/drivers/staging/rtl8188eu/include/osdep_intf.h b/drivers/staging/rtl8188eu/include/osdep_intf.h
index 97d3d8504184..f1fb3d511a45 100644
--- a/drivers/staging/rtl8188eu/include/osdep_intf.h
+++ b/drivers/staging/rtl8188eu/include/osdep_intf.h
@@ -26,7 +26,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter);
 u8 rtw_free_drv_sw(struct adapter *padapter);
 u8 rtw_reset_drv_sw(struct adapter *padapter);
 
-void rtw_stop_drv_threads (struct adapter *padapter);
+void rtw_stop_drv_threads(struct adapter *padapter);
 void rtw_cancel_all_timer(struct adapter *padapter);
 
 int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
diff --git a/drivers/staging/rtl8188eu/include/pwrseq.h b/drivers/staging/rtl8188eu/include/pwrseq.h
index addf90b60ce9..bd77a50c0d41 100644
--- a/drivers/staging/rtl8188eu/include/pwrseq.h
+++ b/drivers/staging/rtl8188eu/include/pwrseq.h
@@ -20,28 +20,28 @@
 #include "pwrseqcmd.h"
 
 /*
-        Check document WM-20110607-Paul-RTL8188E_Power_Architecture-R02.vsd
-        There are 6 HW Power States:
-        0: POFF--Power Off
-        1: PDN--Power Down
-        2: CARDEMU--Card Emulation
-        3: ACT--Active Mode
-        4: LPS--Low Power State
-        5: SUS--Suspend
-
-        The transition from different states are defined below
-        TRANS_CARDEMU_TO_ACT
-        TRANS_ACT_TO_CARDEMU
-        TRANS_CARDEMU_TO_SUS
-        TRANS_SUS_TO_CARDEMU
-        TRANS_CARDEMU_TO_PDN
-        TRANS_ACT_TO_LPS
-        TRANS_LPS_TO_ACT
-
-        TRANS_END
-
-    PWR SEQ Version: rtl8188E_PwrSeq_V09.h
-*/
+ *      Check document WM-20110607-Paul-RTL8188E_Power_Architecture-R02.vsd
+ *      There are 6 HW Power States:
+ *      0: POFF--Power Off
+ *      1: PDN--Power Down
+ *      2: CARDEMU--Card Emulation
+ *      3: ACT--Active Mode
+ *      4: LPS--Low Power State
+ *      5: SUS--Suspend
+ *
+ *      The transition from different states are defined below
+ *      TRANS_CARDEMU_TO_ACT
+ *      TRANS_ACT_TO_CARDEMU
+ *      TRANS_CARDEMU_TO_SUS
+ *      TRANS_SUS_TO_CARDEMU
+ *      TRANS_CARDEMU_TO_PDN
+ *      TRANS_ACT_TO_LPS
+ *      TRANS_LPS_TO_ACT
+ *
+ *      TRANS_END
+ *
+ *   PWR SEQ Version: rtl8188E_PwrSeq_V09.h
+ */
 #define RTL8188E_TRANS_CARDEMU_TO_ACT_STEPS     10
 #define RTL8188E_TRANS_ACT_TO_CARDEMU_STEPS     10
 #define RTL8188E_TRANS_CARDEMU_TO_SUS_STEPS     10
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
index 9330361da4ad..b4b5e217105a 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
@@ -42,7 +42,7 @@
 #define RTL8188E_PHY_REG_PG                     "rtl8188E\\PHY_REG_PG.txt"
 #define RTL8188E_PHY_REG_MP                     "rtl8188E\\PHY_REG_MP.txt"
 
-/*              RTL8188E Power Configuration CMDs for USB/SDIO interfaces */
+/* RTL8188E Power Configuration CMDs for USB/SDIO interfaces */
 #define Rtl8188E_NIC_PWR_ON_FLOW                rtl8188E_power_on_flow
 #define Rtl8188E_NIC_RF_OFF_FLOW                rtl8188E_radio_off_flow
 #define Rtl8188E_NIC_DISABLE_FLOW               rtl8188E_card_disable_flow
@@ -81,7 +81,8 @@ enum usb_rx_agg_mode {
 
 #define MAX_RX_DMA_BUFFER_SIZE_88E                              \
       0x2400 /* 9k for 88E nornal chip , MaxRxBuff=10k-max(TxReportSize(64*8),
-              * WOLPattern(16*24)) */
+              * WOLPattern(16*24))
+              */
 
 #define MAX_TX_REPORT_BUFFER_SIZE               0x0400 /*  1k */
 
@@ -94,11 +95,13 @@ enum usb_rx_agg_mode {
 #define TX_SELE_NQ                      BIT(2)          /*  Normal Queue */
 
 /*  Note: We will divide number of page equally for each queue other
- *  than public queue! */
+ *  than public queue!
+ */
 /*  22k = 22528 bytes = 176 pages (@page =  128 bytes) */
 /*  must reserved about 7 pages for LPS =>  176-7 = 169 (0xA9) */
 /*  2*BCN / 1*ps-poll / 1*null-data /1*prob_rsp /1*QOS null-data /1*BT QOS
- *  null-data */
+ *  null-data
+ */
 
 #define TX_TOTAL_PAGE_NUMBER_88E                0xA9/*   169 (21632=> 21k) */
 
@@ -110,7 +113,7 @@ enum usb_rx_agg_mode {
 #define WMM_NORMAL_TX_PAGE_BOUNDARY_88E                 \
         (WMM_NORMAL_TX_TOTAL_PAGE_NUMBER + 1) /* 0xA9 */
 
-/*      Chip specific */
+/* Chip specific */
 #define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3)
 #define CHIP_BONDING_92C_1T2R   0x1
 #define CHIP_BONDING_88C_USB_MCARD      0x2
@@ -118,7 +121,7 @@ enum usb_rx_agg_mode {
 #include "HalVerDef.h"
 #include "hal_com.h"
 
-/*      Channel Plan */
+/* Channel Plan */
 enum ChannelPlan {
         CHPL_FCC        = 0,
         CHPL_IC         = 1,
@@ -168,7 +171,8 @@ struct txpowerinfo24g {
 #define         AVAILABLE_EFUSE_ADDR_88E(addr)                  \
         (addr < EFUSE_REAL_CONTENT_LEN_88E)
 /*  To prevent out of boundary programming case, leave 1byte and program
- *  full section */
+ *  full section
+ */
 /*  9bytes + 1byt + 5bytes and pre 1byte. */
 /*  For worst case: */
 /*  | 2byte|----8bytes----|1byte|--7bytes--| 92D */
@@ -176,7 +180,7 @@ struct txpowerinfo24g {
 #define         EFUSE_OOB_PROTECT_BYTES_88E     18
 #define         EFUSE_PROTECT_BYTES_BANK_88E    16
 
-/*                      EFUSE for BT definition */
+/* EFUSE for BT definition */
 #define EFUSE_BT_REAL_CONTENT_LEN       1536    /*  512*3 */
 #define EFUSE_BT_MAP_LEN                1024    /*  1k bytes */
 #define EFUSE_BT_MAX_SECTION            128     /*  1024/8 */
@@ -293,7 +297,8 @@ struct hal_data_8188e {
         u8      bDumpRxPkt;/* for debug */
         u8      bDumpTxPkt;/* for debug */
         u8      FwRsvdPageStartOffset; /* Reserve page start offset except
-                                        *  beacon in TxQ. */
+                                        *  beacon in TxQ.
+                                        */
 
         /*  2010/08/09 MH Add CU power down mode. */
         bool            pwrdown;
@@ -307,7 +312,8 @@ struct hal_data_8188e {
         u16     EfuseUsedBytes;
 
         /*  Auto FSM to Turn On, include clock, isolation, power control
-         *  for MAC only */
+         *  for MAC only
+         */
         u8      bMacPwrCtrlOn;
 
         u32     UsbBulkOutSize;
@@ -324,7 +330,8 @@ struct hal_data_8188e {
         enum usb_rx_agg_mode UsbRxAggMode;
         u8      UsbRxAggBlockCount;     /*  USB Block count. Block size is
                                          * 512-byte in high speed and 64-byte
-                                         * in full speed */
+                                         * in full speed
+                                         */
         u8      UsbRxAggBlockTimeout;
         u8      UsbRxAggPageCount;      /*  8192C DMA page count */
         u8      UsbRxAggPageTimeout;
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_spec.h b/drivers/staging/rtl8188eu/include/rtl8188e_spec.h
index c93e19d1c50f..71e2b817e20a 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_spec.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_spec.h
@@ -15,7 +15,7 @@
 #ifndef __RTL8188E_SPEC_H__
 #define __RTL8188E_SPEC_H__
 
-/*        8192C Regsiter offset definition */
+/*        8192C Register offset definition */
 
 #define         HAL_PS_TIMER_INT_DELAY  50      /*   50 microseconds */
 #define         HAL_92C_NAV_UPPER_UNIT  128     /*  micro-second */
@@ -62,12 +62,15 @@
 #define REG_HSIMR                       0x0058
 #define REG_HSISR                       0x005c
 #define REG_GPIO_PIN_CTRL_2             0x0060 /*  RTL8723 WIFI/BT/GPS
-                                 * Multi-Function GPIO Pin Control. */
+                                                * Multi-Function GPIO Pin Control.
+                                                */
 #define REG_GPIO_IO_SEL_2               0x0062 /*  RTL8723 WIFI/BT/GPS
-                                 * Multi-Function GPIO Select. */
+                                                * Multi-Function GPIO Select.
+                                                */
 #define REG_BB_PAD_CTRL                 0x0064
 #define REG_MULTI_FUNC_CTRL             0x0068 /*  RTL8723 WIFI/BT/GPS
-                                 * Multi-Function control source. */
+                                                * Multi-Function control source.
+                                                */
 #define REG_GPIO_OUTPUT                 0x006c
 #define REG_AFE_XTAL_CTRL_EXT           0x0078 /* RTL8188E */
 #define REG_XCK_OUT_CTRL                0x007c /* RTL8188E */
@@ -87,7 +90,8 @@
 #define REG_HIMRE_88E                   0x00B8
 #define REG_HISRE_88E                   0x00BC
 #define REG_EFUSE_ACCESS                0x00CF  /*  Efuse access protection
-                                                 * for RTL8723 */
+                                                 * for RTL8723
+                                                 */
 #define REG_BIST_SCAN                   0x00D0
 #define REG_BIST_RPT                    0x00D4
 #define REG_BIST_ROM_RPT                0x00D8
@@ -119,9 +123,9 @@
 #define REG_FWISR                       0x0134
 #define REG_PKTBUF_DBG_CTRL             0x0140
 #define REG_PKTBUF_DBG_ADDR             (REG_PKTBUF_DBG_CTRL)
-#define REG_RXPKTBUF_DBG                (REG_PKTBUF_DBG_CTRL+2)
-#define REG_TXPKTBUF_DBG                (REG_PKTBUF_DBG_CTRL+3)
-#define REG_RXPKTBUF_CTRL               (REG_PKTBUF_DBG_CTRL+2)
+#define REG_RXPKTBUF_DBG                (REG_PKTBUF_DBG_CTRL + 2)
+#define REG_TXPKTBUF_DBG                (REG_PKTBUF_DBG_CTRL + 3)
+#define REG_RXPKTBUF_CTRL               (REG_PKTBUF_DBG_CTRL + 2)
 #define REG_PKTBUF_DBG_DATA_L           0x0144
 #define REG_PKTBUF_DBG_DATA_H           0x0148
 
@@ -252,21 +256,24 @@
 #define REG_TXPAUSE                     0x0522
 #define REG_DIS_TXREQ_CLR               0x0523
 #define REG_RD_CTRL                     0x0524
-/*  Format for offset 540h-542h: */
-/*      [3:0]:   TBTT prohibit setup in unit of 32us. The time for HW getting
- *               beacon content before TBTT. */
-/*      [7:4]:   Reserved. */
-/*      [19:8]:  TBTT prohibit hold in unit of 32us. The time for HW holding
- *               to send the beacon packet. */
-/*      [23:20]: Reserved */
-/*  Description: */
-/*                    | */
-/*      |<--Setup--|--Hold------------>| */
-/*      --------------|---------------------- */
-/*                 | */
-/*                TBTT */
-/*  Note: We cannot update beacon content to HW or send any AC packets during
- *        the time between Setup and Hold. */
+/*  Format for offset 540h-542h:
+ *      [3:0]:   TBTT prohibit setup in unit of 32us. The time for HW getting
+ *               beacon content before TBTT.
+ *
+ *      [7:4]:   Reserved.
+ *      [19:8]:  TBTT prohibit hold in unit of 32us. The time for HW holding
+ *               to send the beacon packet.
+ *
+ *      [23:20]: Reserved
+ *  Description:
+ *                    |
+ *      |<--Setup--|--Hold------------>|
+ *      --------------|----------------------
+ *                 |
+ *                TBTT
+ *  Note: We cannot update beacon content to HW or send any AC packets during
+ *        the time between Setup and Hold.
+ */
 #define REG_TBTT_PROHIBIT               0x0540
 #define REG_RD_NAV_NXT                  0x0544
 #define REG_NAV_PROT_LEN                0x0546
@@ -340,13 +347,14 @@
 #define RXERR_RPT_RST                   BIT(27)
 #define _RXERR_RPT_SEL(type)            ((type) << 28)
 
-/*  Note: */
-/*      The NAV upper value is very important to WiFi 11n 5.2.3 NAV test.
+/*  Note:
+ *      The NAV upper value is very important to WiFi 11n 5.2.3 NAV test.
  *      The default value is always too small, but the WiFi TestPlan test
  *      by 25,000 microseconds of NAV through sending CTS in the air.
  *      We must update this value greater than 25,000 microseconds to pass
  *      the item. The offset of NAV_UPPER in 8192C Spec is incorrect, and
- *      the offset should be 0x0652. */
+ *      the offset should be 0x0652.
+ */
 #define REG_NAV_UPPER                   0x0652  /*  unit of 128 */
 
 /* WMA, BA, CCX */
@@ -453,11 +461,12 @@
 /*  GPIO pins input value */
 #define GPIO_IN                         REG_GPIO_PIN_CTRL
 /*  GPIO pins output value */
-#define GPIO_OUT                        (REG_GPIO_PIN_CTRL+1)
+#define GPIO_OUT                        (REG_GPIO_PIN_CTRL + 1)
 /*  GPIO pins output enable when a bit is set to "1"; otherwise,
- *  input is configured. */
-#define GPIO_IO_SEL                     (REG_GPIO_PIN_CTRL+2)
-#define GPIO_MOD                        (REG_GPIO_PIN_CTRL+3)
+ *  input is configured.
+ */
+#define GPIO_IO_SEL                     (REG_GPIO_PIN_CTRL + 2)
+#define GPIO_MOD                        (REG_GPIO_PIN_CTRL + 3)
 
 /* 8723/8188E Host System Interrupt Mask Register (offset 0x58, 32 byte) */
 #define HSIMR_GPIO12_0_INT_EN           BIT(0)
@@ -475,13 +484,13 @@
 
 /*   8192C (MSR) Media Status Register  (Offset 0x4C, 8 bits) */
 /*
-Network Type
-00: No link
-01: Link in ad hoc network
-10: Link in infrastructure network
-11: AP mode
-Default: 00b.
-*/
+ * Network Type
+ * 00: No link
+ * 01: Link in ad hoc network
+ * 10: Link in infrastructure network
+ * 11: AP mode
+ * Default: 00b.
+ */
 #define MSR_NOLINK                      0x00
 #define MSR_ADHOC                       0x01
 #define MSR_INFRA                       0x02
@@ -635,26 +644,27 @@ So the following defines for 92C is not entire!!!!!!
 =====================================================================
 =====================================================================*/
 /*
-Based on Datasheet V33---090401
-Register Summary
-Current IOREG MAP
-0x0000h ~ 0x00FFh   System Configuration (256 Bytes)
-0x0100h ~ 0x01FFh   MACTOP General Configuration (256 Bytes)
-0x0200h ~ 0x027Fh   TXDMA Configuration (128 Bytes)
-0x0280h ~ 0x02FFh   RXDMA Configuration (128 Bytes)
-0x0300h ~ 0x03FFh   PCIE EMAC Reserved Region (256 Bytes)
-0x0400h ~ 0x04FFh   Protocol Configuration (256 Bytes)
-0x0500h ~ 0x05FFh   EDCA Configuration (256 Bytes)
-0x0600h ~ 0x07FFh   WMAC Configuration (512 Bytes)
-0x2000h ~ 0x3FFFh   8051 FW Download Region (8196 Bytes)
-*/
+ * Based on Datasheet V33---090401
+ * Register Summary
+ * Current IOREG MAP
+ * 0x0000h ~ 0x00FFh   System Configuration (256 Bytes)
+ * 0x0100h ~ 0x01FFh   MACTOP General Configuration (256 Bytes)
+ * 0x0200h ~ 0x027Fh   TXDMA Configuration (128 Bytes)
+ * 0x0280h ~ 0x02FFh   RXDMA Configuration (128 Bytes)
+ * 0x0300h ~ 0x03FFh   PCIE EMAC Reserved Region (256 Bytes)
+ * 0x0400h ~ 0x04FFh   Protocol Configuration (256 Bytes)
+ * 0x0500h ~ 0x05FFh   EDCA Configuration (256 Bytes)
+ * 0x0600h ~ 0x07FFh   WMAC Configuration (512 Bytes)
+ * 0x2000h ~ 0x3FFFh   8051 FW Download Region (8196 Bytes)
+ */
 /*               8192C (TXPAUSE) transmission pause (Offset 0x522, 8 bits) */
-/*  Note: */
-/*      The bits of stopping AC(VO/VI/BE/BK) queue in datasheet
- *      RTL8192S/RTL8192C are wrong, */
-/*      the correct arragement is VO - Bit0, VI - Bit1, BE - Bit2,
- *      and BK - Bit3. */
-/*      8723 and 88E may be not correct either in the earlier version. */
+/*  Note:
+ *      The bits of stopping AC(VO/VI/BE/BK) queue in datasheet
+ *      RTL8192S/RTL8192C are wrong,
+ *      the correct arragement is VO - Bit0, VI - Bit1, BE - Bit2,
+ *      and BK - Bit3.
+ *      8723 and 88E may be not correct either in the earlier version.
+ */
 #define         StopBecon                       BIT(6)
 #define         StopHigh                        BIT(5)
 #define         StopMgt                         BIT(4)
@@ -680,7 +690,8 @@ Current IOREG MAP
 #define RCR_AICV                BIT(9)  /* Accept ICV error packet */
 #define RCR_ACRC32              BIT(8)  /* Accept CRC32 error packet */
 #define RCR_CBSSID_BCN          BIT(7)  /* Accept BSSID match packet
-                                         * (Rx beacon, probe rsp) */
+                                         * (Rx beacon, probe rsp)
+                                         */
 #define RCR_CBSSID_DATA         BIT(6)  /* Accept BSSID match (Data)*/
 #define RCR_CBSSID              RCR_CBSSID_DATA /* Accept BSSID match */
 #define RCR_APWRMGT             BIT(5)  /* Accept power management pkt*/
@@ -701,7 +712,7 @@ Current IOREG MAP
 
 #define REG_USB_HRPWM                   0xFE58
 #define REG_USB_HCPWM                   0xFE57
-/*        8192C Regsiter Bit and Content definition */
+/*        8192C Register Bit and Content definition */
 /*      0x0000h ~ 0x00FFh       System Configuration */
 
 /* 2 SYS_ISO_CTRL */
@@ -798,7 +809,7 @@ Current IOREG MAP
 /* 2 EFUSE_TEST (For RTL8723 partially) */
 #define EF_TRPT                         BIT(7)
 /*  00: Wifi Efuse, 01: BT Efuse0, 10: BT Efuse1, 11: BT Efuse2 */
-#define EF_CELL_SEL                     (BIT(8)|BIT(9))
+#define EF_CELL_SEL                     (BIT(8) | BIT(9))
 #define LDOE25_EN                       BIT(31)
 #define EFUSE_SEL(x)                    (((x) & 0x3) << 8)
 #define EFUSE_SEL_MASK                  0x300
@@ -835,7 +846,7 @@ Current IOREG MAP
 #define BD_MAC2                         BIT(9)
 #define BD_MAC1                         BIT(10)
 #define IC_MACPHY_MODE                  BIT(11)
-#define CHIP_VER                        (BIT(12)|BIT(13)|BIT(14)|BIT(15))
+#define CHIP_VER                        (BIT(12) | BIT(13) | BIT(14) | BIT(15))
 #define BT_FUNC                         BIT(16)
 #define VENDOR_ID                       BIT(19)
 #define PAD_HWPD_IDN                    BIT(22)
@@ -849,9 +860,9 @@ Current IOREG MAP
 #define CHIP_VER_RTL_SHIFT              12
 
 /* 2REG_GPIO_OUTSTS (For RTL8723 only) */
-#define EFS_HCI_SEL                     (BIT(0)|BIT(1))
-#define PAD_HCI_SEL                     (BIT(2)|BIT(3))
-#define HCI_SEL                         (BIT(4)|BIT(5))
+#define EFS_HCI_SEL                     (BIT(0) | BIT(1))
+#define PAD_HCI_SEL                     (BIT(2) | BIT(3))
+#define HCI_SEL                         (BIT(4) | BIT(5))
 #define PKG_SEL_HCI                     BIT(6)
 #define FEN_GPS                         BIT(7)
 #define FEN_BT                          BIT(8)
@@ -868,7 +879,7 @@ Current IOREG MAP
 #define UPHY_SUSB                       BIT(21)
 #define PCI_SUSEN                       BIT(22)
 #define USB_SUSEN                       BIT(23)
-#define RF_RL_ID                        (BIT(31)|BIT(30)|BIT(29)|BIT(28))
+#define RF_RL_ID                        (BIT(31) | BIT(30) | BIT(29) | BIT(28))
 
 /* 2SYS_CFG */
 #define RTL_ID                          BIT(23) /*  TestChip ID, 1:Test(RLE); 0:MP(RL) */
@@ -931,12 +942,12 @@ Current IOREG MAP
 #define HQSEL_HIQ                       BIT(5)
 
 /*  For normal driver, 0x10C */
-#define _TXDMA_HIQ_MAP(x)               (((x)&0x3) << 14)
-#define _TXDMA_MGQ_MAP(x)               (((x)&0x3) << 12)
-#define _TXDMA_BKQ_MAP(x)               (((x)&0x3) << 10)
-#define _TXDMA_BEQ_MAP(x)               (((x)&0x3) << 8)
-#define _TXDMA_VIQ_MAP(x)               (((x)&0x3) << 6)
-#define _TXDMA_VOQ_MAP(x)               (((x)&0x3) << 4)
+#define _TXDMA_HIQ_MAP(x)               (((x) & 0x3) << 14)
+#define _TXDMA_MGQ_MAP(x)               (((x) & 0x3) << 12)
+#define _TXDMA_BKQ_MAP(x)               (((x) & 0x3) << 10)
+#define _TXDMA_BEQ_MAP(x)               (((x) & 0x3) << 8)
+#define _TXDMA_VIQ_MAP(x)               (((x) & 0x3) << 6)
+#define _TXDMA_VOQ_MAP(x)               (((x) & 0x3) << 4)
 
 #define QUEUE_LOW                       1
 #define QUEUE_NORMAL                    2
@@ -1242,10 +1253,12 @@ Current IOREG MAP
 
 /* 2REG_C2HEVT_CLEAR */
 /*  Set by driver and notify FW that the driver has read
- *  the C2H command message */
+ *  the C2H command message
+ */
 #define C2H_EVT_HOST_CLOSE      0x00
 /*  Set by FW indicating that FW had set the C2H command
- *  message and it's not yet read by driver. */
+ *  message and it's not yet read by driver.
+ */
 #define C2H_EVT_FW_CLOSE        0xFF
 
 /* 2REG_MULTI_FUNC_CTRL(For RTL8723 Only) */
diff --git a/drivers/staging/rtl8188eu/include/rtw_cmd.h b/drivers/staging/rtl8188eu/include/rtw_cmd.h
index f79feeb4e38f..2c026bf6fecb 100644
--- a/drivers/staging/rtl8188eu/include/rtw_cmd.h
+++ b/drivers/staging/rtl8188eu/include/rtw_cmd.h
@@ -97,13 +97,13 @@ enum RFINTFS {
 };
 
 /*
-Caller Mode: Infra, Ad-HoC(C)
-
-Notes: To disconnect the current associated BSS
-
-Command Mode
-
-*/
+ * Caller Mode: Infra, Ad-HoC(C)
+ *
+ * Notes: To disconnect the current associated BSS
+ *
+ * Command Mode
+ *
+ */
 struct disconnect_parm {
         u32 deauth_timeout_ms;
 };
@@ -114,13 +114,13 @@ struct	setopmode_parm {
 };
 
 /*
-Caller Mode: AP, Ad-HoC, Infra
-
-Notes: To ask RTL8711 performing site-survey
-
-Command-Event Mode
-
-*/
+ * Caller Mode: AP, Ad-HoC, Infra
+ *
+ * Notes: To ask RTL8711 performing site-survey
+ *
+ * Command-Event Mode
+ *
+ */
 
 #define RTW_SSID_SCAN_AMOUNT 9 /*  for WEXT_CSCAN_AMOUNT 9 */
 #define RTW_CHANNEL_SCAN_AMOUNT (14+37)
@@ -133,13 +133,13 @@ struct sitesurvey_parm {
 };
 
 /*
-Caller Mode: Any
-
-Notes: To set the auth type of RTL8711. open/shared/802.1x
-
-Command Mode
-
-*/
+ * Caller Mode: Any
+ *
+ * Notes: To set the auth type of RTL8711. open/shared/802.1x
+ *
+ * Command Mode
+ *
+ */
 struct setauth_parm {
         u8 mode;  /* 0: legacy open, 1: legacy shared 2: 802.1x */
         u8 _1x;   /* 0: PSK, 1: TLS */
@@ -147,40 +147,42 @@ struct setauth_parm {
 };
 
 /*
-Caller Mode: Infra
-
-a. algorithm: wep40, wep104, tkip & aes
-b. keytype: grp key/unicast key
-c. key contents
-
-when shared key ==> keyid is the camid
-when 802.1x ==> keyid [0:1] ==> grp key
-when 802.1x ==> keyid > 2 ==> unicast key
-
-*/
+ * Caller Mode: Infra
+ *
+ * a. algorithm: wep40, wep104, tkip & aes
+ * b. keytype: grp key/unicast key
+ * c. key contents
+ *
+ * when shared key ==> keyid is the camid
+ * when 802.1x ==> keyid [0:1] ==> grp key
+ * when 802.1x ==> keyid > 2 ==> unicast key
+ *
+ */
 struct setkey_parm {
         u8      algorithm;      /* could be none, wep40, TKIP, CCMP, wep104 */
         u8      keyid;
         u8      grpkey;         /* 1: this is the grpkey for 802.1x.
-                                 * 0: this is the unicast key for 802.1x */
+                                 * 0: this is the unicast key for 802.1x
+                                 */
         u8      set_tx;         /* 1: main tx key for wep. 0: other key. */
         u8      key[16];        /* this could be 40 or 104 */
 };
 
 /*
-When in AP or Ad-Hoc mode, this is used to
-allocate an sw/hw entry for a newly associated sta.
-
-Command
-
-when shared key ==> algorithm/keyid
-
-*/
+ * When in AP or Ad-Hoc mode, this is used to
+ * allocate an sw/hw entry for a newly associated sta.
+ *
+ * Command
+ *
+ * when shared key ==> algorithm/keyid
+ *
+ */
 struct set_stakey_parm {
         u8      addr[ETH_ALEN];
         u8      algorithm;
         u8      id;/* currently for erasing cam entry if
-                    * algorithm == _NO_PRIVACY_ */
+                    * algorithm == _NO_PRIVACY_
+                    */
         u8      key[16];
 };
 
@@ -191,15 +193,15 @@ struct set_stakey_rsp {
 };
 
 /*
-Caller Ad-Hoc/AP
-
-Command -Rsp(AID == CAMID) mode
-
-This is to force fw to add an sta_data entry per driver's request.
-
-FW will write an cam entry associated with it.
-
-*/
+ * Caller Ad-Hoc/AP
+ *
+ * Command -Rsp(AID == CAMID) mode
+ *
+ * This is to force fw to add an sta_data entry per driver's request.
+ *
+ * FW will write an cam entry associated with it.
+ *
+ */
 struct set_assocsta_parm {
         u8      addr[ETH_ALEN];
 };
@@ -210,55 +212,57 @@ struct set_assocsta_rsp {
 };
 
 /*
-        Notes: This command is used for H2C/C2H loopback testing
-
-        mac[0] == 0
-        ==> CMD mode, return H2C_SUCCESS.
-        The following condition must be true under CMD mode
-                mac[1] == mac[4], mac[2] == mac[3], mac[0]=mac[5]= 0;
-                s0 == 0x1234, s1 == 0xabcd, w0 == 0x78563412, w1 == 0x5aa5def7;
-                s2 == (b1 << 8 | b0);
-
-        mac[0] == 1
-        ==> CMD_RSP mode, return H2C_SUCCESS_RSP
-
-        The rsp layout shall be:
-        rsp:                    parm:
-                mac[0]  =   mac[5];
-                mac[1]  =   mac[4];
-                mac[2]  =   mac[3];
-                mac[3]  =   mac[2];
-                mac[4]  =   mac[1];
-                mac[5]  =   mac[0];
-                s0              =   s1;
-                s1              =   swap16(s0);
-                w0              =       swap32(w1);
-                b0              =       b1
-                s2              =       s0 + s1
-                b1              =       b0
-                w1              =       w0
-
-        mac[0] ==       2
-        ==> CMD_EVENT mode, return      H2C_SUCCESS
-        The event layout shall be:
-        event:                  parm:
-                mac[0]  =   mac[5];
-                mac[1]  =   mac[4];
-                mac[2]  =   event's seq no, starting from 1 to parm's marc[3]
-                mac[3]  =   mac[2];
-                mac[4]  =   mac[1];
-                mac[5]  =   mac[0];
-                s0              =   swap16(s0) - event.mac[2];
-                s1              =   s1 + event.mac[2];
-                w0              =       swap32(w0);
-                b0              =       b1
-                s2              =       s0 + event.mac[2]
-                b1              =       b0
-                w1              =       swap32(w1) - event.mac[2];
-
-                parm->mac[3] is the total event counts that host requested.
-        event will be the same with the cmd's param.
-*/
+ *      Notes: This command is used for H2C/C2H loopback testing
+ *
+ *      mac[0] == 0
+ *      ==> CMD mode, return H2C_SUCCESS.
+ *      The following condition must be true under CMD mode
+ *              mac[1] == mac[4], mac[2] == mac[3], mac[0]=mac[5]= 0;
+ *              s0 == 0x1234, s1 == 0xabcd, w0 == 0x78563412, w1 == 0x5aa5def7;
+ *              s2 == (b1 << 8 | b0);
+ *
+ *      mac[0] == 1
+ *      ==> CMD_RSP mode, return H2C_SUCCESS_RSP
+ *
+ *      The rsp layout shall be:
+ *      rsp:                    parm:
+ *              mac[0]  =   mac[5];
+ *              mac[1]  =   mac[4];
+ *              mac[2]  =   mac[3];
+ *              mac[3]  =   mac[2];
+ *              mac[4]  =   mac[1];
+ *              mac[5]  =   mac[0];
+ *              s0              =   s1;
+ *              s1              =   swap16(s0);
+ *              w0              =       swap32(w1);
+ *              b0              =       b1
+ *              s2              =       s0 + s1
+ *              b1              =       b0
+ *              w1              =       w0
+ *
+ *      mac[0] ==       2
+ *      ==> CMD_EVENT mode, return      H2C_SUCCESS
+ *      The event layout shall be:
+ *      event:                  parm:
+ *              mac[0]  =   mac[5];
+ *              mac[1]  =   mac[4];
+ *              mac[2]  =   event's seq no, starting from 1 to parm's marc[3]
+ *              mac[2]  =   event's seq no, starting from 1 to parm's marc[3]
+ *              mac[2]  =   event's seq no, starting from 1 to parm's marc[3]
+ *              mac[3]  =   mac[2];
+ *              mac[4]  =   mac[1];
+ *              mac[5]  =   mac[0];
+ *              s0              =   swap16(s0) - event.mac[2];
+ *              s1              =   s1 + event.mac[2];
+ *              w0              =       swap32(w0);
+ *              b0              =       b1
+ *              s2              =       s0 + event.mac[2]
+ *              b1              =       b0
+ *              w1              =       swap32(w1) - event.mac[2];
+ *
+ *              parm->mac[3] is the total event counts that host requested.
+ *      event will be the same with the cmd's param.
+ */
 
 /*  CMD param Format for driver extra cmd handler */
 struct drvextra_cmd_parm {
@@ -285,15 +289,15 @@ struct SetChannelPlan_param {
 };
 
 /*
-
-Result:
-0x00: success
-0x01: success, and check Response.
-0x02: cmd ignored due to duplicated sequcne number
-0x03: cmd dropped due to invalid cmd code
-0x04: reserved.
-
-*/
+ *
+ * Result:
+ * 0x00: success
+ * 0x01: success, and check Response.
+ * 0x02: cmd ignored due to duplicated sequcne number
+ * 0x03: cmd dropped due to invalid cmd code
+ * 0x04: reserved.
+ *
+ */
 
 #define H2C_SUCCESS             0x00
 #define H2C_SUCCESS_RSP         0x01
diff --git a/drivers/staging/rtl8188eu/include/rtw_debug.h b/drivers/staging/rtl8188eu/include/rtw_debug.h
index 9cc4b8c7c166..4873ba49900c 100644
--- a/drivers/staging/rtl8188eu/include/rtw_debug.h
+++ b/drivers/staging/rtl8188eu/include/rtw_debug.h
@@ -106,9 +106,9 @@ extern u32 GlobalDebugLevel;
                                          (((__i + 1) % 4) == 0) ?       \
                                          "  " : " ");   \
                                 if (((__i + 1) % 16) == 0)              \
-                                        printk("\n");                   \
+                                        pr_cont("\n");                  \
                         }                                               \
-                        printk("\n");                                   \
+                        pr_cont("\n");                                  \
                 }                                                       \
         } while (0)
 
diff --git a/drivers/staging/rtl8188eu/include/rtw_eeprom.h b/drivers/staging/rtl8188eu/include/rtw_eeprom.h
index 5dd73841dd9e..11d1cb6de506 100644
--- a/drivers/staging/rtl8188eu/include/rtw_eeprom.h
+++ b/drivers/staging/rtl8188eu/include/rtw_eeprom.h
@@ -55,7 +55,8 @@
 /*  This variable is initiailzed through EEPROM or registry, */
 /*  however, its definition may be different with that in EEPROM for */
 /*  EEPROM size consideration. So, we have to perform proper translation
- *  between them. */
+ *  between them.
+ */
 /*  Besides, CustomerID of registry has precedence of that of EEPROM. */
 /*  defined below. 060703, by rcnjko. */
 enum RT_CUSTOMER_ID {
@@ -79,7 +80,8 @@ enum RT_CUSTOMER_ID {
         RT_CID_819x_Sitecom = 17,
         RT_CID_CCX = 18, /*  It's set under CCX logo test and isn't demanded
                           * for CCX functions, but for test behavior like retry
-                          * limit and tx report. By Bruce, 2009-02-17. */
+                          * limit and tx report. By Bruce, 2009-02-17.
+                          */
         RT_CID_819x_Lenovo = 19,
         RT_CID_819x_QMI = 20,
         RT_CID_819x_Edimax_Belkin = 21,
@@ -89,7 +91,8 @@ enum RT_CUSTOMER_ID {
         RT_CID_819x_Acer = 25,
         RT_CID_819x_AzWave_ASUS = 26,
         RT_CID_819x_AzWave = 27, /*  For AzWave in PCIe,i
-                                  * The ID is AzWave use and not only Asus */
+                                  * The ID is AzWave use and not only Asus
+                                  */
         RT_CID_819x_HP = 28,
         RT_CID_819x_WNC_COREGA = 29,
         RT_CID_819x_Arcadyan_Belkin = 30,
diff --git a/drivers/staging/rtl8188eu/include/rtw_event.h b/drivers/staging/rtl8188eu/include/rtw_event.h
index 1c5ebde97091..e798e794d962 100644
--- a/drivers/staging/rtl8188eu/include/rtw_event.h
+++ b/drivers/staging/rtl8188eu/include/rtw_event.h
@@ -22,42 +22,42 @@
 #include <linux/sem.h>
 
 /*
-Used to report a bss has been scanned
-*/
+ * Used to report a bss has been scanned
+ */
 struct survey_event     {
         struct wlan_bssid_ex bss;
 };
 
 /*
-Used to report that the requested site survey has been done.
-
-bss_cnt indicates the number of bss that has been reported.
-
-
-*/
+ * Used to report that the requested site survey has been done.
+ *
+ * bss_cnt indicates the number of bss that has been reported.
+ *
+ *
+ */
 struct surveydone_event {
         unsigned int    bss_cnt;
 
 };
 
 /*
-Used to report the link result of joinning the given bss
-
-
-join_res:
--1: authentication fail
--2: association fail
-> 0: TID
-
-*/
+ * Used to report the link result of joinning the given bss
+ *
+ *
+ * join_res:
+ * -1: authentication fail
+ * -2: association fail
+ * > 0: TID
+ *
+ */
 struct joinbss_event {
         struct  wlan_network    network;
 };
 
 /*
-Used to report a given STA has joinned the created BSS.
-It is used in AP/Ad-HoC(M) mode.
-*/
+ * Used to report a given STA has joinned the created BSS.
+ * It is used in AP/Ad-HoC(M) mode.
+ */
 
 struct stassoc_event {
         unsigned char macaddr[6];
diff --git a/drivers/staging/rtl8188eu/include/rtw_led.h b/drivers/staging/rtl8188eu/include/rtw_led.h
index 607d1ba56a46..884e1397755a 100644
--- a/drivers/staging/rtl8188eu/include/rtw_led.h
+++ b/drivers/staging/rtl8188eu/include/rtw_led.h
@@ -58,7 +58,8 @@ struct LED_871x {
 
         enum LED_STATE_871x     CurrLedState; /*  Current LED state. */
         enum LED_STATE_871x     BlinkingLedState; /*  Next state for blinking,
-                                   * either RTW_LED_ON or RTW_LED_OFF are. */
+                                                   * either RTW_LED_ON or RTW_LED_OFF are.
+                                                   */
 
         u8 bLedOn; /*  true if LED is ON, false if LED is OFF. */
 
@@ -75,7 +76,8 @@ struct LED_871x {
         u8 bLedLinkBlinkInProgress;
         u8 bLedScanBlinkInProgress;
         struct work_struct BlinkWorkItem; /* Workitem used by BlinkTimer to
-                                           * manipulate H/W to blink LED. */
+                                           * manipulate H/W to blink LED.
+                                           */
 };
 
 #define IS_LED_WPS_BLINKING(_LED_871x)                                  \
@@ -91,7 +93,6 @@ struct led_priv {
         /* add for led control */
 };
 
-void BlinkTimerCallback(unsigned long data);
 void BlinkWorkItemCallback(struct work_struct *work);
 
 void ResetLedStatus(struct LED_871x *pLed);
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme.h b/drivers/staging/rtl8188eu/include/rtw_mlme.h
index 5c5d0ae8bdd1..e6d4175af3a2 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme.h
@@ -70,25 +70,28 @@ enum rt_scan_type {
 enum SCAN_RESULT_TYPE {
         SCAN_RESULT_P2P_ONLY = 0,       /* Will return all the P2P devices. */
         SCAN_RESULT_ALL = 1,            /* Will return all the scanned device,
-                                         * include AP. */
+                                         * include AP.
+                                         */
         SCAN_RESULT_WFD_TYPE = 2        /* Will just return the correct WFD
-                                         * device. */
+                                         * device.
+                                         */
                                         /* If this device is Miracast sink
                                          * device, it will just return all the
-                                         * Miracast source devices. */
+                                         * Miracast source devices.
+                                         */
 };
 
 /*
-there are several "locks" in mlme_priv,
-since mlme_priv is a shared resource between many threads,
-like ISR/Call-Back functions, the OID handlers, and even timer functions.
-
-Each _queue has its own locks, already.
-Other items are protected by mlme_priv.lock.
-
-To avoid possible dead lock, any thread trying to modifiying mlme_priv
-SHALL not lock up more than one lock at a time!
-*/
+ * there are several "locks" in mlme_priv,
+ * since mlme_priv is a shared resource between many threads,
+ * like ISR/Call-Back functions, the OID handlers, and even timer functions.
+ *
+ * Each _queue has its own locks, already.
+ * Other items are protected by mlme_priv.lock.
+ *
+ * To avoid possible dead lock, any thread trying to modifiying mlme_priv
+ * SHALL not lock up more than one lock at a time!
+ */
 
 #define traffic_threshold       10
 #define traffic_scan_period     500
@@ -102,9 +105,11 @@ struct rt_link_detect {
         bool    bRxBusyTraffic;
         bool    bHigherBusyTraffic; /*  For interrupt migration purpose. */
         bool    bHigherBusyRxTraffic; /* We may disable Tx interrupt according
-                                       * to Rx traffic. */
+                                       * to Rx traffic.
+                                       */
         bool    bHigherBusyTxTraffic; /* We may disable Tx interrupt according
-                                       * to Tx traffic. */
+                                       * to Tx traffic.
+                                       */
 };
 
 struct mlme_priv {
@@ -164,7 +169,8 @@ struct mlme_priv {
 
 #if defined(CONFIG_88EU_AP_MODE)
         /* Number of associated Non-ERP stations (i.e., stations using 802.11b
-         * in 802.11g BSS) */
+         * in 802.11g BSS)
+         */
         int num_sta_non_erp;
 
         /* Number of associated stations that do not support Short Slot Time */
@@ -325,10 +331,10 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter);
 
 void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter);
 
-void _rtw_join_timeout_handler(unsigned long data);
-void rtw_scan_timeout_handler(unsigned long data);
+void _rtw_join_timeout_handler(struct timer_list *t);
+void rtw_scan_timeout_handler(struct timer_list *t);
 
-void rtw_dynamic_check_timer_handlder(unsigned long data);
+void rtw_dynamic_check_timer_handlder(struct timer_list *t);
 #define rtw_is_scan_deny(adapter) false
 #define rtw_clear_scan_deny(adapter) do {} while (0)
 #define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0)
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
index 1b1caaf583c9..118bf5509d97 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
@@ -101,9 +101,11 @@ extern unsigned char WMM_PARA_OUI[];
 /*  Channel Plan Type. */
 /*  Note: */
 /*      We just add new channel plan when the new channel plan is different
- *      from any of the following channel plan. */
+ *      from any of the following channel plan.
+ */
 /*      If you just want to customize the actions(scan period or join actions)
- *      about one of the channel plan, */
+ *      about one of the channel plan,
+ */
 /*      customize them in struct rt_channel_info in the RT_CHANNEL_LIST. */
 enum RT_CHANNEL_DOMAIN {
         /*  old channel plan mapping =====  */
@@ -319,7 +321,8 @@ struct mlme_ext_info {
         u32     authModeToggle;
         u32     enc_algo;/* encrypt algorithm; */
         u32     key_index;      /*  this is only valid for legacy wep,
-                                 *  0~3 for key id. */
+                                 *  0~3 for key id.
+                                 */
         u32     iv;
         u8      chg_txt[128];
         u16     aid;
@@ -353,16 +356,19 @@ struct mlme_ext_info {
         struct HT_info_element  HT_info;
         struct wlan_bssid_ex    network;/* join network or bss_network,
                                          * if in ap mode, it is the same
-                                         * as cur_network.network */
+                                         * as cur_network.network
+                                         */
         struct FW_Sta_Info      FW_sta_info[NUM_STA];
 };
 
 /*  The channel information about this channel including joining,
- *  scanning, and power constraints. */
+ *  scanning, and power constraints.
+ */
 struct rt_channel_info {
         u8      ChannelNum;     /*  The channel number. */
         enum rt_scan_type ScanType;     /*  Scan type such as passive
-                                         *  or active scan. */
+                                         *  or active scan.
+                                         */
         u32     rx_count;
 };
 
@@ -413,7 +419,8 @@ struct mlme_ext_priv {
         unsigned char   cur_wireless_mode;      /*  NETWORK_TYPE */
 
         unsigned char   oper_channel; /* saved chan info when call
-                                       * set_channel_bw */
+                                       * set_channel_bw
+                                       */
         unsigned char   oper_bwmode;
         unsigned char   oper_ch_offset;/* PRIME_CHNL_OFFSET */
 
@@ -427,7 +434,8 @@ struct mlme_ext_priv {
         struct mlme_ext_info    mlmext_info;/* for sta/adhoc mode, including
                                              * current scan/connecting/connected
                                              * related info. For ap mode,
-                                             * network includes ap's cap_info*/
+                                             * network includes ap's cap_info
+                                             */
         struct timer_list survey_timer;
         struct timer_list link_timer;
         u16     chan_scan_time;
@@ -572,9 +580,9 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter,
 
 void linked_status_chk(struct adapter *padapter);
 
-void survey_timer_hdl(unsigned long data);
-void link_timer_hdl(unsigned long data);
-void addba_timer_hdl(unsigned long data);
+void survey_timer_hdl(struct timer_list *t);
+void link_timer_hdl(struct timer_list *t);
+void addba_timer_hdl(struct timer_list *t);
 
 #define set_survey_timer(mlmeext, ms) \
         mod_timer(&mlmeext->survey_timer, jiffies +     \
@@ -690,7 +698,8 @@ enum rtw_c2h_event {
         _C2HBCN_EVT_,
         _ReportPwrState_EVT_,   /* filen: only for PCIE, USB */
         _CloseRF_EVT_,          /* filen: only for PCIE,
-                                         * work around ASPM */
+                                 * work around ASPM
+                                 */
         MAX_C2HEVT
 };
 
diff --git a/drivers/staging/rtl8188eu/include/rtw_mp_phy_regdef.h b/drivers/staging/rtl8188eu/include/rtw_mp_phy_regdef.h
index 4872a21b3103..aa353aefed3d 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mp_phy_regdef.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mp_phy_regdef.h
@@ -521,14 +521,16 @@
 #define bCCKRxPhase                     0x4
 #if (RTL92SE_FPGA_VERIFY == 1)
 #define bLSSIReadAddress                0x3f000000   /* LSSI "Read" Address
-                                        Reg 0x824 rFPGA0_XA_HSSIParameter2 */
+                                                      * Reg 0x824 rFPGA0_XA_HSSIParameter2
+                                                      */
 #else
 #define bLSSIReadAddress                0x7f800000   /*  T65 RF */
 #endif
 #define bLSSIReadEdge                   0x80000000   /* LSSI "Read" edge signal */
 #if (RTL92SE_FPGA_VERIFY == 1)
 #define bLSSIReadBackData               0xfff   /*  Reg 0x8a0
-                                         rFPGA0_XA_LSSIReadBack */
+                                                 * rFPGA0_XA_LSSIReadBack
+                                                 */
 #else
 #define bLSSIReadBackData               0xfffff /*  T65 RF */
 #endif
@@ -548,13 +550,16 @@
 #define bDA6Swing                       0x380000
 
 #define bADClkPhase                     0x4000000       /*  Reg 0x880
-         rFPGA0_AnalogParameter1 20/40 CCK support switch 40/80 BB MHZ */
+                                                         * rFPGA0_AnalogParameter1 20/40 CCK
+                                                         * support switch 40/80 BB MHZ
+                                                         */
 
 #define b80MClkDelay                    0x18000000      /*  Useless */
 #define bAFEWatchDogEnable              0x20000000
 
 #define bXtalCap01                      0xc0000000      /*  Reg 0x884
-         rFPGA0_AnalogParameter2 Crystal cap */
+                                                         * rFPGA0_AnalogParameter2 Crystal cap
+                                                         */
 #define bXtalCap23                      0x3
 #define bXtalCap92x                     0x0f000000
 #define         bXtalCap                0x0f000000
@@ -598,7 +603,8 @@
 #define bCCKTxOn                        0x1
 #define bOFDMTxOn                       0x2
 #define bDebugPage                      0xfff  /* reset debug page and HWord,
-                                                * LWord */
+                                                * LWord
+                                                */
 #define bDebugItem                      0xff   /* reset debug page and LWord */
 #define bAntL                           0x10
 #define bAntNonHT                       0x100
@@ -1071,7 +1077,8 @@
 #define RCR_EnCS1       BIT(29)         /*  enable carrier sense method 1 */
 #define RCR_EnCS2       BIT(30)         /*  enable carrier sense method 2 */
 #define RCR_OnlyErlPkt  BIT(31)         /*  Rx Early mode is performed for
-                                         *  packet size greater than 1536 */
+                                         *  packet size greater than 1536
+                                         */
 
 /*--------------------------Define Parameters-------------------------------*/
 
diff --git a/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h b/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
index 18a9e744fcbe..f39e90cfc031 100644
--- a/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8188eu/include/rtw_pwrctrl.h
@@ -51,11 +51,11 @@ enum power_mgnt {
 };
 
 /*
-        BIT[2:0] = HW state
-        BIT[3] = Protocol PS state,   0: register active state,
-                                      1: register sleep state
-        BIT[4] = sub-state
-*/
+ *      BIT[2:0] = HW state
+ *      BIT[3] = Protocol PS state,   0: register active state,
+ *                                    1: register sleep state
+ *      BIT[4] = sub-state
+ */
 
 #define PS_DPS                  BIT(0)
 #define PS_LCLK                 (PS_DPS)
@@ -115,9 +115,11 @@ enum rt_rf_power_state {
 #define RT_RF_OFF_LEVL_FREE_FW          BIT(4)  /* FW free, re-download the FW*/
 #define RT_RF_OFF_LEVL_FW_32K           BIT(5)  /* FW in 32k */
 #define RT_RF_PS_LEVEL_ALWAYS_ASPM      BIT(6)  /* Always enable ASPM and Clock
-                                                 * Req in initialization. */
+                                                 * Req in initialization.
+                                                 */
 #define RT_RF_LPS_DISALBE_2R            BIT(30) /* When LPS is on, disable 2R
-                                                 * if no packet is RX or TX. */
+                                                 * if no packet is RX or TX.
+                                                 */
 #define RT_RF_LPS_LEVEL_ASPM            BIT(31) /* LPS with ASPM */
 
 #define RT_IN_PS_LEVEL(ppsc, _PS_FLAG)                          \
@@ -145,7 +147,8 @@ struct pwrctrl_priv {
         struct mutex mutex_lock;
         volatile u8 rpwm; /*  requested power state for fw */
         volatile u8 cpwm; /*  fw current power state. updated when
-                           * 1. read from HCPWM 2. driver lowers power level */
+                           * 1. read from HCPWM 2. driver lowers power level
+                           */
         volatile u8 tog; /*  toggling */
         volatile u8 cpwm_tog; /*  toggling */
 
@@ -170,7 +173,8 @@ struct pwrctrl_priv {
 
         u8      ips_mode;
         u8      ips_mode_req;   /*  used to accept the mode setting request,
-                                 *  will update to ipsmode later */
+                                 *  will update to ipsmode later
+                                 */
         uint bips_processing;
         unsigned long ips_deny_time; /* will deny IPS when system time less than this */
         u8 ps_processing; /* temp used to mark whether in rtw_ps_processor */
diff --git a/drivers/staging/rtl8188eu/include/rtw_qos.h b/drivers/staging/rtl8188eu/include/rtw_qos.h
index 45a77f6f8427..576dff68d0dc 100644
--- a/drivers/staging/rtl8188eu/include/rtw_qos.h
+++ b/drivers/staging/rtl8188eu/include/rtw_qos.h
@@ -19,7 +19,8 @@
 
 struct  qos_priv        {
         unsigned int      qos_option;   /* bit mask option: u-apsd,
-                                         * s-apsd, ts, block ack... */
+                                         * s-apsd, ts, block ack...
+                                         */
 };
 
 #endif  /* _RTL871X_QOS_H_ */
diff --git a/drivers/staging/rtl8188eu/include/rtw_recv.h b/drivers/staging/rtl8188eu/include/rtw_recv.h
index 121150860450..7e85f700acb3 100644
--- a/drivers/staging/rtl8188eu/include/rtw_recv.h
+++ b/drivers/staging/rtl8188eu/include/rtw_recv.h
@@ -46,23 +46,23 @@ struct recv_reorder_ctrl {
 struct  stainfo_rxcache {
         u16     tid_rxseq[16];
 /*
-        unsigned short  tid0_rxseq;
-        unsigned short  tid1_rxseq;
-        unsigned short  tid2_rxseq;
-        unsigned short  tid3_rxseq;
-        unsigned short  tid4_rxseq;
-        unsigned short  tid5_rxseq;
-        unsigned short  tid6_rxseq;
-        unsigned short  tid7_rxseq;
-        unsigned short  tid8_rxseq;
-        unsigned short  tid9_rxseq;
-        unsigned short  tid10_rxseq;
-        unsigned short  tid11_rxseq;
-        unsigned short  tid12_rxseq;
-        unsigned short  tid13_rxseq;
-        unsigned short  tid14_rxseq;
-        unsigned short  tid15_rxseq;
-*/
+ *      unsigned short  tid0_rxseq;
+ *      unsigned short  tid1_rxseq;
+ *      unsigned short  tid2_rxseq;
+ *      unsigned short  tid3_rxseq;
+ *      unsigned short  tid4_rxseq;
+ *      unsigned short  tid5_rxseq;
+ *      unsigned short  tid6_rxseq;
+ *      unsigned short  tid7_rxseq;
+ *      unsigned short  tid8_rxseq;
+ *      unsigned short  tid9_rxseq;
+ *      unsigned short  tid10_rxseq;
+ *      unsigned short  tid11_rxseq;
+ *      unsigned short  tid12_rxseq;
+ *      unsigned short  tid13_rxseq;
+ *      unsigned short  tid14_rxseq;
+ *      unsigned short  tid15_rxseq;
+ */
 };
 
 struct signal_stat {
@@ -79,7 +79,8 @@ struct phy_info {
         u8      RxMIMOSignalStrength[MAX_PATH_NUM_92CS];/*  in 0~100 index */
         s8      RxPower; /*  in dBm Translate from PWdB */
 /*  Real power in dBm for this packet, no beautification and aggregation.
- * Keep this raw info to be used for the other procedures. */
+ * Keep this raw info to be used for the other procedures.
+ */
         s8      recvpower;
         u8      BTRxRSSIPercentage;
         u8      SignalStrength; /*  in 0-100 index. */
@@ -106,7 +107,8 @@ struct rx_pkt_attrib {
         u8      privacy; /* in frame_ctrl field */
         u8      bdecrypted;
         u8      encrypt; /* when 0 indicate no encrypt. when non-zero,
-                          * indicate the encrypt algorithm */
+                          * indicate the encrypt algorithm
+                          */
         u8      iv_len;
         u8      icv_len;
         u8      crc_err;
@@ -152,12 +154,12 @@ struct recv_stat {
 };
 
 /*
-accesser of recv_priv: rtw_recv_entry(dispatch / passive level);
-recv_thread(passive) ; returnpkt(dispatch)
-; halt(passive) ;
-
-using enter_critical section to protect
-*/
+ * accesser of recv_priv: rtw_recv_entry(dispatch / passive level);
+ * recv_thread(passive) ; returnpkt(dispatch)
+ * ; halt(passive) ;
+ *
+ * using enter_critical section to protect
+ */
 struct recv_priv {
         struct __queue free_recv_queue;
         struct __queue recv_pending_queue;
@@ -209,20 +211,20 @@ struct recv_buf {
 };
 
 /*
-        head  ----->
-
-                data  ----->
-
-                        payload
-
-                tail  ----->
-
-
-        end   ----->
-
-        len = (unsigned int )(tail - data);
-
-*/
+ *      head  ----->
+ *
+ *              data  ----->
+ *
+ *                      payload
+ *
+ *              tail  ----->
+ *
+ *
+ *      end   ----->
+ *
+ *      len = (unsigned int )(tail - data);
+ *
+ */
 struct recv_frame {
         struct list_head list;
         struct sk_buff   *pkt;
@@ -247,7 +249,7 @@ void rtw_free_recvframe_queue(struct __queue *pframequeue,
                               struct __queue *pfree_recv_queue);
 u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter);
 
-void rtw_reordering_ctrl_timeout_handler(unsigned long data);
+void rtw_reordering_ctrl_timeout_handler(struct timer_list *t);
 
 static inline s32 translate_percentage_to_dbm(u32 sig_stren_index)
 {
diff --git a/drivers/staging/rtl8188eu/include/rtw_rf.h b/drivers/staging/rtl8188eu/include/rtw_rf.h
index 66896af02042..0718a29e7c9d 100644
--- a/drivers/staging/rtl8188eu/include/rtw_rf.h
+++ b/drivers/staging/rtl8188eu/include/rtw_rf.h
@@ -31,7 +31,8 @@
 #define RTL8711_RF_DEF_SENS             4
 
 /*  We now define the following channels as the max channels in each
- * channel plan. */
+ * channel plan.
+ */
 /*  2G, total 14 chnls */
 /*  {1,2,3,4,5,6,7,8,9,10,11,12,13,14} */
 #define MAX_CHANNEL_NUM_2G              14
@@ -65,7 +66,8 @@ enum capability {
         cChannelAgility = 0x0080,
         cSpectrumMgnt   = 0x0100,
         cQos            = 0x0200,       /* For HCCA, use with CF-Pollable
-                                         * and CF-PollReq */
+                                         * and CF-PollReq
+                                         */
         cShortSlotTime  = 0x0400,
         cAPSD           = 0x0800,
         cRM             = 0x1000,       /*  RRM (Radio Request Measurement) */
diff --git a/drivers/staging/rtl8188eu/include/rtw_security.h b/drivers/staging/rtl8188eu/include/rtw_security.h
index 74fe664787e5..a0c6cf706218 100644
--- a/drivers/staging/rtl8188eu/include/rtw_security.h
+++ b/drivers/staging/rtl8188eu/include/rtw_security.h
@@ -100,20 +100,26 @@ struct rt_pmkid_list {
 
 struct security_priv {
         u32       dot11AuthAlgrthm;     /*  802.11 auth, could be open,
-                                         * shared, 8021x and authswitch */
+                                         * shared, 8021x and authswitch
+                                         */
         u32       dot11PrivacyAlgrthm;  /*  This specify the privacy for
-                                         * shared auth. algorithm. */
+                                         * shared auth. algorithm.
+                                         */
         /* WEP */
         u32       dot11PrivacyKeyIndex; /*  this is only valid for legendary
-                                         * wep, 0~3 for key id.(tx key index) */
+                                         * wep, 0~3 for key id.(tx key index)
+                                         */
         union Keytype dot11DefKey[4];   /*  this is only valid for def. key */
         u32     dot11DefKeylen[4];
         u32 dot118021XGrpPrivacy;       /*  This specify the privacy algthm.
-                                         * used for Grp key */
+                                         * used for Grp key
+                                         */
         u32     dot118021XGrpKeyid;     /*  key id used for Grp Key
-                                         * ( tx key index) */
+                                         * ( tx key index)
+                                         */
         union Keytype   dot118021XGrpKey[4];    /*  802.1x Group Key,
-                                                 * for inx0 and inx1 */
+                                                 * for inx0 and inx1
+                                                 */
         union Keytype   dot118021XGrptxmickey[4];
         union Keytype   dot118021XGrprxmickey[4];
         union pn48      dot11Grptxpn;           /* PN48 used for Grp Key xmit.*/
@@ -134,10 +140,12 @@ struct security_priv {
         u8      bcheck_grpkey;
         u8      bgrpkey_handshake;
         s32     hw_decrypted;/* if the rx packets is hw_decrypted==false,i
-                              * it means the hw has not been ready. */
+                              * it means the hw has not been ready.
+                              */
 
         /* keeps the auth_type & enc_status from upper layer
-         * ioctl(wpa_supplicant or wzc) */
+         * ioctl(wpa_supplicant or wzc)
+         */
         u32 ndisauthtype;       /*  NDIS_802_11_AUTHENTICATION_MODE */
         u32 ndisencryptstatus;  /*  NDIS_802_11_ENCRYPTION_STATUS */
         struct wlan_bssid_ex sec_bss;  /* for joinbss (h2c buffer) usage */
@@ -256,7 +264,8 @@ static inline u32 rotr(u32 val, int bits)
 /* ===== start - public domain SHA256 implementation ===== */
 
 /* This is based on SHA256 implementation in LibTomCrypt that was released into
- * public domain by Tom St Denis. */
+ * public domain by Tom St Denis.
+ */
 
 /* the K array */
 static const unsigned long K[64] = {
diff --git a/drivers/staging/rtl8188eu/include/rtw_xmit.h b/drivers/staging/rtl8188eu/include/rtw_xmit.h
index dd6b7a9a8d4a..b4b3d13ace9e 100644
--- a/drivers/staging/rtl8188eu/include/rtw_xmit.h
+++ b/drivers/staging/rtl8188eu/include/rtw_xmit.h
@@ -115,11 +115,13 @@ struct pkt_attrib {
         u16     seqnum;
         u16     hdrlen;         /* the WLAN Header Len */
         u32     pktlen;         /* the original 802.3 pkt raw_data len (not include
-                                 * ether_hdr data) */
+                                 * ether_hdr data)
+                                 */
         u32     last_txcmdsz;
         u8      nr_frags;
         u8      encrypt;        /* when 0 indicate no encrypt. when non-zero,
-                                 * indicate the encrypt algorith */
+                                 * indicate the encrypt algorith
+                                 */
         u8      iv_len;
         u8      icv_len;
         u8      iv[18];
@@ -234,7 +236,8 @@ struct sta_xmit_priv {
         spinlock_t lock;
         int     option;
         int     apsd_setting;   /* When bit mask is on, the associated edca
-                                 * queue supports APSD. */
+                                 * queue supports APSD.
+                                 */
         struct tx_servq be_q;                   /* priority == 0,3 */
         struct tx_servq bk_q;                   /* priority == 1,2 */
         struct tx_servq vi_q;                   /* priority == 4,5 */
@@ -280,7 +283,8 @@ struct	xmit_priv {
         u8      hwxmit_entry;
         u8      wmm_para_seq[4];/* sequence for wmm ac parameter strength
                                  * from large to small. it's value is 0->vo,
-                                 * 1->vi, 2->be, 3->bk. */
+                                 * 1->vi, 2->be, 3->bk.
+                                 */
         u8              txirp_cnt;/*  */
         struct tasklet_struct xmit_tasklet;
         /* per AC pending irp */
diff --git a/drivers/staging/rtl8188eu/include/sta_info.h b/drivers/staging/rtl8188eu/include/sta_info.h
index 42a035123365..8f01deed6e4a 100644
--- a/drivers/staging/rtl8188eu/include/sta_info.h
+++ b/drivers/staging/rtl8188eu/include/sta_info.h
@@ -126,7 +126,8 @@ struct sta_info {
         /* Notes: */
         /* STA_Mode: */
         /* curr_network(mlme_priv/security_priv/qos/ht) +
-         * sta_info: (STA & AP) CAP/INFO */
+         * sta_info: (STA & AP) CAP/INFO
+         */
         /* scan_q: AP CAP/INFO */
 
         /* AP_Mode: */
@@ -184,7 +185,8 @@ struct sta_info {
 
         /*  ================ODM Relative Info======================= */
         /*  Please be careful, don't declare too much structure here.
-         *  It will cost memory * STA support num. */
+         *  It will cost memory * STA support num.
+         */
         /*  2011/10/20 MH Add for ODM STA info. */
         /*  Driver Write */
         u8      bValid;         /*  record the sta status link or not? */
@@ -318,9 +320,11 @@ struct	sta_priv {
         struct sta_info *sta_aid[NUM_STA];
 
         u16 sta_dz_bitmap;/* only support 15 stations, station aid bitmap
-                           * for sleeping sta. */
+                           * for sleeping sta.
+                           */
         u16 tim_bitmap; /* only support 15 stations, aid=0~15 mapping
-                         * bit0~bit15 */
+                         * bit0~bit15
+                         */
 
         u16 max_num_sta;
 
diff --git a/drivers/staging/rtl8188eu/include/wifi.h b/drivers/staging/rtl8188eu/include/wifi.h
index cb46d353327b..084a246eec19 100644
--- a/drivers/staging/rtl8188eu/include/wifi.h
+++ b/drivers/staging/rtl8188eu/include/wifi.h
@@ -35,7 +35,8 @@
 
 /*  This value is tested by WiFi 11n Test Plan 5.2.3. */
 /*  This test verifies the WLAN NIC can update the NAV through sending
- *  the CTS with large duration. */
+ *  the CTS with large duration.
+ */
 #define WiFiNavUpperUs                          30000   /*  30 ms */
 
 enum WIFI_FRAME_TYPE {
@@ -459,14 +460,14 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)
 #define _IEEE8021X_PSK_                 2       /*  WPA with pre-shared key */
 
 /*
-#define _NO_PRIVACY_                    0
-#define _WEP_40_PRIVACY_                1
-#define _TKIP_PRIVACY_                  2
-#define _WRAP_PRIVACY_                  3
-#define _CCMP_PRIVACY_                  4
-#define _WEP_104_PRIVACY_               5
-#define _WEP_WPA_MIXED_PRIVACY_ 6       WEP + WPA
-*/
+ * #define _NO_PRIVACY_                 0
+ * #define _WEP_40_PRIVACY_             1
+ * #define _TKIP_PRIVACY_               2
+ * #define _WRAP_PRIVACY_               3
+ * #define _CCMP_PRIVACY_               4
+ * #define _WEP_104_PRIVACY_            5
+ * #define _WEP_WPA_MIXED_PRIVACY_ 6    WEP + WPA
+ */
 
 /*-----------------------------------------------------------------------------
                                 Below is the definition for WMM
@@ -771,10 +772,12 @@ enum ht_cap_ampdu_factor {
 #define P2P_PROVISIONING_SCAN_CNT               3
 
 /* default value, used when: (1)p2p disabled or (2)p2p enabled
- * but only do 1 scan phase */
+ * but only do 1 scan phase
+ */
 #define P2P_FINDPHASE_EX_NONE           0
 /*  used when p2p enabled and want to do 1 scan phase and
- *  P2P_FINDPHASE_EX_MAX-1 find phase */
+ *  P2P_FINDPHASE_EX_MAX-1 find phase
+ */
 #define P2P_FINDPHASE_EX_FULL           1
 #define P2P_FINDPHASE_EX_SOCIAL_FIRST   (P2P_FINDPHASE_EX_FULL+1)
 #define P2P_FINDPHASE_EX_MAX            4
diff --git a/drivers/staging/rtl8188eu/include/wlan_bssdef.h b/drivers/staging/rtl8188eu/include/wlan_bssdef.h
index e1931dd04da0..d7b25d2f933a 100644
--- a/drivers/staging/rtl8188eu/include/wlan_bssdef.h
+++ b/drivers/staging/rtl8188eu/include/wlan_bssdef.h
@@ -86,7 +86,8 @@ struct ndis_802_11_var_ie {
  *      + NDIS_802_11_LENGTH_RATES_EX + IELength
  *
  * Except the IELength, all other fields are fixed length.
- * Therefore, we can define a macro to represent the partial sum. */
+ * Therefore, we can define a macro to represent the partial sum.
+ */
 
 enum ndis_802_11_auth_mode {
         Ndis802_11AuthModeOpen,
@@ -130,7 +131,8 @@ enum ndis_802_11_reload_def {
 struct ndis_802_11_wep {
         u32     Length;        /*  Length of this structure */
         u32     KeyIndex;      /*  0 is the per-client key,
-                                  * 1-N are the global keys */
+                                * 1-N are the global keys
+                                */
         u32     KeyLength;     /*  length of key in bytes */
         u8     KeyMaterial[16];/*  variable len depending on above field */
 };
@@ -140,7 +142,8 @@ enum ndis_802_11_status_type {
         Ndis802_11StatusType_MediaStreamMode,
         Ndis802_11StatusType_PMKID_CandidateList,
         Ndis802_11StatusTypeMax    /*  not a real type, defined as
-                                    * an upper bound */
+                                    * an upper bound
+                                    */
 };
 
 /*  mask for authentication/integrity fields */
@@ -166,7 +169,8 @@ struct wlan_phy_info {
 
 struct wlan_bcn_info {
         /* these infor get from rtw_get_encrypt_info when
-         *       * translate scan to UI */
+         *       * translate scan to UI
+         */
         u8 encryp_protocol;/* ENCRYP_PROTOCOL_E: OPEN/WEP/WPA/WPA2/WAPI */
         int group_cipher; /* WPA/WPA2 group cipher */
         int pairwise_cipher;/* WPA/WPA2/WEP pairwise cipher */
@@ -178,8 +182,8 @@ struct wlan_bcn_info {
 };
 
 /* temporally add #pragma pack for structure alignment issue of
-*   struct wlan_bssid_ex and get_struct wlan_bssid_ex_sz()
-*/
+ *   struct wlan_bssid_ex and get_struct wlan_bssid_ex_sz()
+ */
 struct wlan_bssid_ex {
         u32  Length;
         unsigned char MacAddress[ETH_ALEN];
@@ -194,7 +198,8 @@ struct wlan_bssid_ex {
         struct wlan_phy_info    PhyInfo;
         u32  IELength;
         u8  IEs[MAX_IE_SZ];     /* timestamp, beacon interval, and
-                                 * capability information) */
+                                 * capability information)
+                                 */
 } __packed;
 
 static inline uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss)
@@ -206,7 +211,8 @@ struct	wlan_network {
         struct list_head list;
         int     network_type;   /* refer to ieee80211.h for WIRELESS_11A/B/G */
         int     fixed;          /*  set fixed when not to be removed
-                                 *  in site-surveying */
+                                 *  in site-surveying
+                                 */
         unsigned long   last_scanned; /* timestamp for the network */
         int     aid;            /* will only be valid when a BSS is joinned. */
         int     join_res;
diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
index bc756267c7fc..831c1ecc5e28 100644
--- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
@@ -24,12 +24,10 @@ void rtw_init_mlme_timer(struct adapter *padapter)
 {
         struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-        setup_timer(&pmlmepriv->assoc_timer, _rtw_join_timeout_handler,
-                    (unsigned long)padapter);
-        setup_timer(&pmlmepriv->scan_to_timer, rtw_scan_timeout_handler,
-                    (unsigned long)padapter);
-        setup_timer(&pmlmepriv->dynamic_chk_timer,
-                    rtw_dynamic_check_timer_handlder, (unsigned long)padapter);
+        timer_setup(&pmlmepriv->assoc_timer, _rtw_join_timeout_handler, 0);
+        timer_setup(&pmlmepriv->scan_to_timer, rtw_scan_timeout_handler, 0);
+        timer_setup(&pmlmepriv->dynamic_chk_timer,
+                    rtw_dynamic_check_timer_handlder, 0);
 }
 
 void rtw_os_indicate_connect(struct adapter *adapter)
@@ -125,18 +123,15 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
 
 void init_addba_retry_timer(struct adapter *padapter, struct sta_info *psta)
 {
-        setup_timer(&psta->addba_retry_timer, addba_timer_hdl,
-                    (unsigned long)psta);
+        timer_setup(&psta->addba_retry_timer, addba_timer_hdl, 0);
 }
 
 void init_mlme_ext_timer(struct adapter *padapter)
 {
         struct  mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
 
-        setup_timer(&pmlmeext->survey_timer, survey_timer_hdl,
-                    (unsigned long)padapter);
-        setup_timer(&pmlmeext->link_timer, link_timer_hdl,
-                    (unsigned long)padapter);
+        timer_setup(&pmlmeext->survey_timer, survey_timer_hdl, 0);
+        timer_setup(&pmlmeext->link_timer, link_timer_hdl, 0);
 }
 
 #ifdef CONFIG_88EU_AP_MODE
diff --git a/drivers/staging/rtl8188eu/os_dep/mon.c b/drivers/staging/rtl8188eu/os_dep/mon.c
index 37fd52d7364f..225c23fc69dc 100644
--- a/drivers/staging/rtl8188eu/os_dep/mon.c
+++ b/drivers/staging/rtl8188eu/os_dep/mon.c
@@ -66,34 +66,6 @@ static void mon_recv_decrypted(struct net_device *dev, const u8 *data,
         netif_rx(skb);
 }
 
-static void mon_recv_decrypted_recv(struct net_device *dev, const u8 *data,
-                                    int data_len)
-{
-        struct sk_buff *skb;
-        struct ieee80211_hdr *hdr;
-        int hdr_len;
-
-        skb = netdev_alloc_skb(dev, data_len);
-        if (!skb)
-                return;
-        memcpy(skb_put(skb, data_len), data, data_len);
-
-        /*
-         * Frame data is not encrypted. Strip off protection so
-         * userspace doesn't think that it is.
-         */
-
-        hdr = (struct ieee80211_hdr *)skb->data;
-        hdr_len = ieee80211_hdrlen(hdr->frame_control);
-
-        if (ieee80211_has_protected(hdr->frame_control))
-                hdr->frame_control &= ~cpu_to_le16(IEEE80211_FCTL_PROTECTED);
-
-        skb->ip_summed = CHECKSUM_UNNECESSARY;
-        skb->protocol = eth_type_trans(skb, dev);
-        netif_rx(skb);
-}
-
 static void mon_recv_encrypted(struct net_device *dev, const u8 *data,
                                int data_len)
 {
@@ -110,6 +82,7 @@ static void mon_recv_encrypted(struct net_device *dev, const u8 *data,
 void rtl88eu_mon_recv_hook(struct net_device *dev, struct recv_frame *frame)
 {
         struct rx_pkt_attrib *attr;
+        int iv_len, icv_len;
         int data_len;
         u8 *data;
 
@@ -122,8 +95,11 @@ void rtl88eu_mon_recv_hook(struct net_device *dev, struct recv_frame *frame)
         data = frame->pkt->data;
         data_len = frame->pkt->len;
 
+        /* Broadcast and multicast frames don't have attr->{iv,icv}_len set */
+        SET_ICE_IV_LEN(iv_len, icv_len, attr->encrypt);
+
         if (attr->bdecrypted)
-                mon_recv_decrypted_recv(dev, data, data_len);
+                mon_recv_decrypted(dev, data, data_len, iv_len, icv_len);
         else
                 mon_recv_encrypted(dev, data, data_len);
 }
diff --git a/drivers/staging/rtl8188eu/os_dep/recv_linux.c b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
index d14bc2b68d98..bda4ab879f58 100644
--- a/drivers/staging/rtl8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
@@ -155,7 +155,6 @@ _recv_indicatepkt_drop:
 void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl)
 {
 
-        setup_timer(&preorder_ctrl->reordering_ctrl_timer,
-                    rtw_reordering_ctrl_timeout_handler,
-                    (unsigned long)preorder_ctrl);
+        timer_setup(&preorder_ctrl->reordering_ctrl_timer,
+                    rtw_reordering_ctrl_timeout_handler, 0);
 }
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 64397b6f1248..7e75030475f7 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -407,6 +407,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
                 case -ENODEV:
                 case -ESHUTDOWN:
                         adapt->bSurpriseRemoved = true;
+                        /* fall through */
                 case -ENOENT:
                         adapt->bDriverStopped = true;
                         RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete:bDriverStopped=true\n"));
diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/dot11d.c
index 017fe04ebe2d..88f89d77b511 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -128,12 +128,16 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
         pTriple = (struct chnl_txpow_triple *)(pCoutryIe + 3);
         for (i = 0; i < NumTriples; i++) {
                 if (MaxChnlNum >= pTriple->FirstChnl) {
-                        netdev_info(dev->dev, "Dot11d_UpdateCountryIe(): Invalid country IE, skip it........1\n");
+                        netdev_info(dev->dev,
+                                    "%s: Invalid country IE, skip it......1\n",
+                                    __func__);
                         return;
                 }
                 if (MAX_CHANNEL_NUMBER < (pTriple->FirstChnl +
                     pTriple->NumChnls)) {
-                        netdev_info(dev->dev, "Dot11d_UpdateCountryIe(): Invalid country IE, skip it........2\n");
+                        netdev_info(dev->dev,
+                                    "%s: Invalid country IE, skip it......2\n",
+                                    __func__);
                         return;
                 }
 
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index aca52654825b..d2605158546b 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -85,7 +85,7 @@ static struct pci_driver rtl8192_pci_driver = {
 
 static short _rtl92e_is_tx_queue_empty(struct net_device *dev);
 static void _rtl92e_watchdog_wq_cb(void *data);
-static void _rtl92e_watchdog_timer_cb(unsigned long data);
+static void _rtl92e_watchdog_timer_cb(struct timer_list *t);
 static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
                                    int rate);
 static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev);
@@ -766,12 +766,12 @@ static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset)
         priv->bfirst_init = false;
 
         if (priv->polling_timer_on == 0)
-                rtl92e_check_rfctrl_gpio_timer((unsigned long)dev);
+                rtl92e_check_rfctrl_gpio_timer(&priv->gpio_polling_timer);
 
         if (priv->rtllib->state != RTLLIB_LINKED)
                 rtllib_softmac_start_protocol(priv->rtllib, 0);
         rtllib_reset_queue(priv->rtllib);
-        _rtl92e_watchdog_timer_cb((unsigned long)dev);
+        _rtl92e_watchdog_timer_cb(&priv->watch_dog_timer);
 
         if (!netif_queue_stopped(dev))
                 netif_start_queue(dev);
@@ -1075,13 +1075,10 @@ static short _rtl92e_init(struct net_device *dev)
 
         rtl92e_dm_init(dev);
 
-        setup_timer(&priv->watch_dog_timer,
-                    _rtl92e_watchdog_timer_cb,
-                    (unsigned long)dev);
+        timer_setup(&priv->watch_dog_timer, _rtl92e_watchdog_timer_cb, 0);
 
-        setup_timer(&priv->gpio_polling_timer,
-                    rtl92e_check_rfctrl_gpio_timer,
-                    (unsigned long)dev);
+        timer_setup(&priv->gpio_polling_timer, rtl92e_check_rfctrl_gpio_timer,
+                    0);
 
         rtl92e_irq_disable(dev);
         if (request_irq(dev->irq, _rtl92e_irq, IRQF_SHARED, dev->name, dev)) {
@@ -1531,9 +1528,9 @@ static void _rtl92e_watchdog_wq_cb(void *data)
         RT_TRACE(COMP_TRACE, " <==RtUsbCheckForHangWorkItemCallback()\n");
 }
 
-static void _rtl92e_watchdog_timer_cb(unsigned long data)
+static void _rtl92e_watchdog_timer_cb(struct timer_list *t)
 {
-        struct r8192_priv *priv = rtllib_priv((struct net_device *)data);
+        struct r8192_priv *priv = from_timer(priv, t, watch_dog_timer);
 
         schedule_delayed_work(&priv->watch_dog_wq, 0);
         mod_timer(&priv->watch_dog_timer, jiffies +
@@ -2535,7 +2532,7 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev,
         RT_TRACE(COMP_INIT, "dev name: %s\n", dev->name);
 
         if (priv->polling_timer_on == 0)
-                rtl92e_check_rfctrl_gpio_timer((unsigned long)dev);
+                rtl92e_check_rfctrl_gpio_timer(&priv->gpio_polling_timer);
 
         RT_TRACE(COMP_INIT, "Driver probe completed\n");
         return 0;
@@ -2648,9 +2645,9 @@ bool rtl92e_disable_nic(struct net_device *dev)
 
 module_pci_driver(rtl8192_pci_driver);
 
-void rtl92e_check_rfctrl_gpio_timer(unsigned long data)
+void rtl92e_check_rfctrl_gpio_timer(struct timer_list *t)
 {
-        struct r8192_priv *priv = rtllib_priv((struct net_device *)data);
+        struct r8192_priv *priv = from_timer(priv, t, gpio_polling_timer);
 
         priv->polling_timer_on = 1;
 
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 9d3089cb6a5a..866fe4d4cb28 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -587,7 +587,7 @@ void rtl92e_tx_enable(struct net_device *);
 void rtl92e_hw_sleep_wq(void *data);
 void rtl92e_commit(struct net_device *dev);
 
-void rtl92e_check_rfctrl_gpio_timer(unsigned long data);
+void rtl92e_check_rfctrl_gpio_timer(struct timer_list *t);
 
 void rtl92e_hw_wakeup_wq(void *data);
 
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index b8205ebafd72..9bf95bd0ad13 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -196,7 +196,7 @@ static	void _rtl92e_dm_check_txrateandretrycount(struct net_device *dev);
 static  void _rtl92e_dm_check_ac_dc_power(struct net_device *dev);
 static void _rtl92e_dm_check_fsync(struct net_device *dev);
 static void _rtl92e_dm_check_rf_ctrl_gpio(void *data);
-static void _rtl92e_dm_fsync_timer_callback(unsigned long data);
+static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t);
 
 /*---------------------Define local function prototype-----------------------*/
 
@@ -2125,8 +2125,7 @@ static void _rtl92e_dm_init_fsync(struct net_device *dev)
         priv->rtllib->fsync_state = Default_Fsync;
         priv->framesyncMonitor = 1;
 
-        setup_timer(&priv->fsync_timer, _rtl92e_dm_fsync_timer_callback,
-                    (unsigned long)dev);
+        timer_setup(&priv->fsync_timer, _rtl92e_dm_fsync_timer_callback, 0);
 }
 
 
@@ -2137,10 +2136,10 @@ static void _rtl92e_dm_deinit_fsync(struct net_device *dev)
         del_timer_sync(&priv->fsync_timer);
 }
 
-static void _rtl92e_dm_fsync_timer_callback(unsigned long data)
+static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t)
 {
-        struct net_device *dev = (struct net_device *)data;
-        struct r8192_priv *priv = rtllib_priv((struct net_device *)data);
+        struct r8192_priv *priv = from_timer(priv, t, fsync_timer);
+        struct net_device *dev = priv->rtllib->dev;
         u32 rate_index, rate_count = 0, rate_count_diff = 0;
         bool            bSwitchFromCountDiff = false;
         bool            bDoubleTimeInterval = false;
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
index 3e3273d3e043..81a68b0b4a7f 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
@@ -91,7 +91,7 @@ int rtl92e_resume(struct pci_dev *pdev)
         pci_enable_wake(pdev, PCI_D0, 0);
 
         if (priv->polling_timer_on == 0)
-                rtl92e_check_rfctrl_gpio_timer((unsigned long)dev);
+                rtl92e_check_rfctrl_gpio_timer(&priv->gpio_polling_timer);
 
         if (!netif_running(dev)) {
                 netdev_info(dev,
diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c
index 1720e1b6ae04..eb6d841f7c45 100644
--- a/drivers/staging/rtl8192e/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c
@@ -528,18 +528,20 @@ void TsInitDelBA(struct rtllib_device *ieee,
         }
 }
 
-void BaSetupTimeOut(unsigned long data)
+void BaSetupTimeOut(struct timer_list *t)
 {
-        struct tx_ts_record *pTxTs = (struct tx_ts_record *)data;
+        struct tx_ts_record *pTxTs = from_timer(pTxTs, t,
+                                              TxPendingBARecord.Timer);
 
         pTxTs->bAddBaReqInProgress = false;
         pTxTs->bAddBaReqDelayed = true;
         pTxTs->TxPendingBARecord.bValid = false;
 }
 
-void TxBaInactTimeout(unsigned long data)
+void TxBaInactTimeout(struct timer_list *t)
 {
-        struct tx_ts_record *pTxTs = (struct tx_ts_record *)data;
+        struct tx_ts_record *pTxTs = from_timer(pTxTs, t,
+                                              TxAdmittedBARecord.Timer);
         struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device,
                                      TxTsRecord[pTxTs->num]);
         TxTsDeleteBA(ieee, pTxTs);
@@ -548,9 +550,10 @@ void TxBaInactTimeout(unsigned long data)
                           DELBA_REASON_TIMEOUT);
 }
 
-void RxBaInactTimeout(unsigned long data)
+void RxBaInactTimeout(struct timer_list *t)
 {
-        struct rx_ts_record *pRxTs = (struct rx_ts_record *)data;
+        struct rx_ts_record *pRxTs = from_timer(pRxTs, t,
+                                              RxAdmittedBARecord.Timer);
         struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device,
                                      RxTsRecord[pRxTs->num]);
 
diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index dcc4eb691889..f839d2447b85 100644
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -16,17 +16,18 @@
 #include <linux/etherdevice.h>
 #include "rtl819x_TS.h"
 
-static void TsSetupTimeOut(unsigned long data)
+static void TsSetupTimeOut(struct timer_list *unused)
 {
 }
 
-static void TsInactTimeout(unsigned long data)
+static void TsInactTimeout(struct timer_list *unused)
 {
 }
 
-static void RxPktPendingTimeout(unsigned long data)
+static void RxPktPendingTimeout(struct timer_list *t)
 {
-        struct rx_ts_record *pRxTs = (struct rx_ts_record *)data;
+        struct rx_ts_record *pRxTs = from_timer(pRxTs, t,
+                                                     RxPktPendingTimer);
         struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device,
                                                   RxTsRecord[pRxTs->num]);
 
@@ -96,9 +97,9 @@ static void RxPktPendingTimeout(unsigned long data)
         spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
 }
 
-static void TsAddBaProcess(unsigned long data)
+static void TsAddBaProcess(struct timer_list *t)
 {
-        struct tx_ts_record *pTxTs = (struct tx_ts_record *)data;
+        struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TsAddBaTimer);
         u8 num = pTxTs->num;
         struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device,
                                      TxTsRecord[num]);
@@ -150,24 +151,18 @@ void TSInitialize(struct rtllib_device *ieee)
 
         for (count = 0; count < TOTAL_TS_NUM; count++) {
                 pTxTS->num = count;
-                setup_timer(&pTxTS->TsCommonInfo.SetupTimer,
-                            TsSetupTimeOut,
-                            (unsigned long) pTxTS);
+                timer_setup(&pTxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut,
+                            0);
 
-                setup_timer(&pTxTS->TsCommonInfo.InactTimer,
-                            TsInactTimeout,
-                            (unsigned long) pTxTS);
+                timer_setup(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout,
+                            0);
 
-                setup_timer(&pTxTS->TsAddBaTimer,
-                            TsAddBaProcess,
-                            (unsigned long) pTxTS);
+                timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0);
 
-                setup_timer(&pTxTS->TxPendingBARecord.Timer,
-                            BaSetupTimeOut,
-                            (unsigned long) pTxTS);
-                setup_timer(&pTxTS->TxAdmittedBARecord.Timer,
-                            TxBaInactTimeout,
-                            (unsigned long) pTxTS);
+                timer_setup(&pTxTS->TxPendingBARecord.Timer, BaSetupTimeOut,
+                            0);
+                timer_setup(&pTxTS->TxAdmittedBARecord.Timer,
+                            TxBaInactTimeout, 0);
 
                 ResetTxTsEntry(pTxTS);
                 list_add_tail(&pTxTS->TsCommonInfo.List,
@@ -182,21 +177,16 @@ void TSInitialize(struct rtllib_device *ieee)
                 pRxTS->num = count;
                 INIT_LIST_HEAD(&pRxTS->RxPendingPktList);
 
-                setup_timer(&pRxTS->TsCommonInfo.SetupTimer,
-                            TsSetupTimeOut,
-                            (unsigned long) pRxTS);
+                timer_setup(&pRxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut,
+                            0);
 
-                setup_timer(&pRxTS->TsCommonInfo.InactTimer,
-                            TsInactTimeout,
-                            (unsigned long) pRxTS);
+                timer_setup(&pRxTS->TsCommonInfo.InactTimer, TsInactTimeout,
+                            0);
 
-                setup_timer(&pRxTS->RxAdmittedBARecord.Timer,
-                            RxBaInactTimeout,
-                            (unsigned long) pRxTS);
+                timer_setup(&pRxTS->RxAdmittedBARecord.Timer,
+                            RxBaInactTimeout, 0);
 
-                setup_timer(&pRxTS->RxPktPendingTimer,
-                            RxPktPendingTimeout,
-                            (unsigned long) pRxTS);
+                timer_setup(&pRxTS->RxPktPendingTimer, RxPktPendingTimeout, 0);
 
                 ResetRxTsEntry(pRxTS);
                 list_add_tail(&pRxTS->TsCommonInfo.List,
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 0042a0f6cf79..c01474a6db1e 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -2113,9 +2113,9 @@ void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS,
 void TsInitDelBA(struct rtllib_device *ieee,
                  struct ts_common_info *pTsCommonInfo,
                  enum tr_select TxRxSelect);
-void BaSetupTimeOut(unsigned long data);
-void TxBaInactTimeout(unsigned long data);
-void RxBaInactTimeout(unsigned long data);
+void BaSetupTimeOut(struct timer_list *t);
+void TxBaInactTimeout(struct timer_list *t);
+void RxBaInactTimeout(struct timer_list *t);
 void ResetBaEntry(struct ba_record *pBA);
 bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, u8 *Addr,
            u8 TID, enum tr_select TxRxSelect, bool bAddNewTs);
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index e4be85af31e7..c2b9ffba354a 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -393,10 +393,10 @@ static void rtllib_send_beacon(struct rtllib_device *ieee)
 }
 
 
-static void rtllib_send_beacon_cb(unsigned long _ieee)
+static void rtllib_send_beacon_cb(struct timer_list *t)
 {
         struct rtllib_device *ieee =
-                (struct rtllib_device *) _ieee;
+                from_timer(ieee, t, beacon_timer);
         unsigned long flags;
 
         spin_lock_irqsave(&ieee->beacon_lock, flags);
@@ -1427,9 +1427,11 @@ static void rtllib_associate_abort(struct rtllib_device *ieee)
         spin_unlock_irqrestore(&ieee->lock, flags);
 }
 
-static void rtllib_associate_abort_cb(unsigned long dev)
+static void rtllib_associate_abort_cb(struct timer_list *t)
 {
-        rtllib_associate_abort((struct rtllib_device *) dev);
+        struct rtllib_device *dev = from_timer(dev, t, associate_timer);
+
+        rtllib_associate_abort(dev);
 }
 
 static void rtllib_associate_step1(struct rtllib_device *ieee, u8 *daddr)
@@ -2811,8 +2813,9 @@ exit:
 
 static struct sk_buff *rtllib_get_beacon_(struct rtllib_device *ieee)
 {
-        const u8 broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-
+        static const u8 broadcast_addr[] = {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+        };
         struct sk_buff *skb;
         struct rtllib_probe_response *b;
 
@@ -3011,13 +3014,9 @@ void rtllib_softmac_init(struct rtllib_device *ieee)
 
         ieee->tx_pending.txb = NULL;
 
-        setup_timer(&ieee->associate_timer,
-                    rtllib_associate_abort_cb,
-                    (unsigned long) ieee);
+        timer_setup(&ieee->associate_timer, rtllib_associate_abort_cb, 0);
 
-        setup_timer(&ieee->beacon_timer,
-                    rtllib_send_beacon_cb,
-                    (unsigned long) ieee);
+        timer_setup(&ieee->beacon_timer, rtllib_send_beacon_cb, 0);
 
         INIT_DELAYED_WORK_RSL(&ieee->link_change_wq,
                               (void *)rtllib_link_change_wq, ieee);
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index f7eba01b5d15..03fbff067fa4 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -694,8 +694,7 @@ int rtllib_wx_set_mlme(struct rtllib_device *ieee,
         switch (mlme->cmd) {
         case IW_MLME_DEAUTH:
                 deauth = true;
-                /* leave break out intentionly */
-
+                /* fall through */
         case IW_MLME_DISASSOC:
                 if (deauth)
                         netdev_info(ieee->dev, "disauth packet !\n");
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index b062cad052b9..3addaa65085a 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -323,7 +323,7 @@ typedef struct ieee_param {
                         u8 key[0];
                 } crypt;
         } u;
-}ieee_param;
+} ieee_param;
 
 
 // linux under 2.6.9 release may not support it, so modify it for common use
@@ -412,15 +412,15 @@ typedef struct ieee_param {
 #define IEEE80211_QCTL_TID              0x000F
 
 #define FC_QOS_BIT                                      BIT(7)
-#define IsDataFrame(pdu)                        ( ((pdu[0] & 0x0C)==0x08) ? true : false )
-#define IsLegacyDataFrame(pdu)  (IsDataFrame(pdu) && (!(pdu[0]&FC_QOS_BIT)) )
+#define IsDataFrame(pdu)                        (((pdu[0] & 0x0C) == 0x08) ? true : false)
+#define IsLegacyDataFrame(pdu)  (IsDataFrame(pdu) && (!(pdu[0] & FC_QOS_BIT)))
 //added by wb. Is this right?
-#define IsQoSDataFrame(pframe)  ((*(u16 *)pframe&(IEEE80211_STYPE_QOS_DATA|IEEE80211_FTYPE_DATA)) == (IEEE80211_STYPE_QOS_DATA|IEEE80211_FTYPE_DATA))
-#define Frame_Order(pframe)     (*(u16 *)pframe&IEEE80211_FCTL_ORDER)
-#define SN_LESS(a, b)           (((a-b)&0x800)!=0)
+#define IsQoSDataFrame(pframe)  ((*(u16 *)pframe & (IEEE80211_STYPE_QOS_DATA | IEEE80211_FTYPE_DATA)) == (IEEE80211_STYPE_QOS_DATA | IEEE80211_FTYPE_DATA))
+#define Frame_Order(pframe)     (*(u16 *)pframe & IEEE80211_FCTL_ORDER)
+#define SN_LESS(a, b)           (((a - b) & 0x800) != 0)
 #define SN_EQUAL(a, b)  (a == b)
 #define MAX_DEV_ADDR_SIZE 8
-typedef enum _ACT_CATEGORY{
+typedef enum _ACT_CATEGORY {
         ACT_CAT_QOS = 1,
         ACT_CAT_DLS = 2,
         ACT_CAT_BA  = 3,
@@ -428,24 +428,24 @@ typedef enum _ACT_CATEGORY{
         ACT_CAT_WMM = 17,
 } ACT_CATEGORY, *PACT_CATEGORY;
 
-typedef enum _TS_ACTION{
+typedef enum _TS_ACTION {
         ACT_ADDTSREQ = 0,
         ACT_ADDTSRSP = 1,
         ACT_DELTS    = 2,
         ACT_SCHEDULE = 3,
 } TS_ACTION, *PTS_ACTION;
 
-typedef enum _BA_ACTION{
+typedef enum _BA_ACTION {
         ACT_ADDBAREQ = 0,
         ACT_ADDBARSP = 1,
         ACT_DELBA    = 2,
 } BA_ACTION, *PBA_ACTION;
 
-typedef enum _InitialGainOpType{
-        IG_Backup=0,
+typedef enum _InitialGainOpType {
+        IG_Backup = 0,
         IG_Restore,
         IG_Max
-}InitialGainOpType;
+} InitialGainOpType;
 
 /* debug macros */
 #define CONFIG_IEEE80211_DEBUG
@@ -457,22 +457,22 @@ do { if (ieee80211_debug_level & (level)) \
 //wb added to debug out data buf
 //if you want print DATA buffer related BA, please set ieee80211_debug_level to DATA|BA
 #define IEEE80211_DEBUG_DATA(level, data, datalen)      \
-        do{ if ((ieee80211_debug_level & (level)) == (level))   \
+        do { if ((ieee80211_debug_level & (level)) == (level))  \
                 {       \
                         int i;                                  \
                         u8 *pdata = (u8 *) data;                        \
                         printk(KERN_DEBUG "ieee80211: %s()\n", __func__);       \
-                        for(i=0; i<(int)(datalen); i++)                 \
+                        for (i = 0; i < (int)(datalen); i++)                    \
                         {                                               \
                                 printk("%2x ", pdata[i]);               \
-                                if ((i+1)%16 == 0) printk("\n");        \
+                                if ((i + 1) % 16 == 0) printk("\n");    \
                         }                               \
                         printk("\n");                   \
                 }                                       \
         } while (0)
 #else
-#define IEEE80211_DEBUG(level, fmt, args...) do {} while (0)
-#define IEEE80211_DEBUG_DATA(level, data, datalen) do {} while(0)
+#define IEEE80211_DEBUG (level, fmt, args...) do {} while (0)
+#define IEEE80211_DEBUG_DATA (level, data, datalen) do {} while(0)
 #endif  /* CONFIG_IEEE80211_DEBUG */
 
 /* debug macros not dependent on CONFIG_IEEE80211_DEBUG */
@@ -876,9 +876,9 @@ enum ieee80211_mfie {
         MFIE_TYPE_ERP = 42,
         MFIE_TYPE_RSN = 48,
         MFIE_TYPE_RATES_EX = 50,
-        MFIE_TYPE_HT_CAP= 45,
-         MFIE_TYPE_HT_INFO= 61,
-         MFIE_TYPE_AIRONET=133,
+        MFIE_TYPE_HT_CAP = 45,
+         MFIE_TYPE_HT_INFO = 61,
+         MFIE_TYPE_AIRONET = 133,
         MFIE_TYPE_GENERIC = 221,
         MFIE_TYPE_QOS_PARAMETER = 222,
 };
@@ -1051,7 +1051,7 @@ typedef union _frameqos {
                 u16 ack_policy:2;
                 u16 reserved:1;
                 u16 txop:8;
-        }field;
+        } field;
 } frameqos, *pframeqos;
 
 /* SWEEP TABLE ENTRIES NUMBER*/
@@ -1196,7 +1196,7 @@ static inline u8 Frame_QoSTID(u8 *buf)
         u16 fc;
         hdr = (struct rtl_80211_hdr_3addr *)buf;
         fc = le16_to_cpu(hdr->frame_ctl);
-        return (u8)((frameqos *)(buf + (((fc & IEEE80211_FCTL_TODS)&&(fc & IEEE80211_FCTL_FROMDS))? 30 : 24)))->field.tid;
+        return (u8)((frameqos *)(buf + (((fc & IEEE80211_FCTL_TODS) && (fc & IEEE80211_FCTL_FROMDS)) ? 30 : 24)))->field.tid;
 }
 
 //added by amy for reorder
@@ -1209,7 +1209,7 @@ struct eapol {
         u16 length;
 } __packed;
 
-struct ieee80211_softmac_stats{
+struct ieee80211_softmac_stats {
         unsigned int rx_ass_ok;
         unsigned int rx_ass_err;
         unsigned int rx_probe_rq;
@@ -1320,7 +1320,7 @@ struct	ether_header {
 #define ETHERTYPE_IP    0x0800          /* IP protocol */
 #endif
 
-typedef enum _erp_t{
+typedef enum _erp_t {
         ERP_NonERPpresent       = 0x01,
         ERP_UseProtection       = 0x02,
         ERP_BarkerPreambleMode = 0x04,
@@ -1479,37 +1479,35 @@ typedef struct _RX_REORDER_ENTRY {
         struct ieee80211_rxb *prxb;
 } RX_REORDER_ENTRY, *PRX_REORDER_ENTRY;
 //added by amy for order
-typedef enum _Fsync_State{
+typedef enum _Fsync_State {
         Default_Fsync,
         HW_Fsync,
         SW_Fsync
-}Fsync_State;
+} Fsync_State;
 
 // Power save mode configured.
-typedef enum _RT_PS_MODE
-{
+typedef enum _RT_PS_MODE {
         eActive,        // Active/Continuous access.
         eMaxPs,         // Max power save mode.
         eFastPs         // Fast power save mode.
-}RT_PS_MODE;
+} RT_PS_MODE;
 
-typedef enum _IPS_CALLBACK_FUNCION
-{
+typedef enum _IPS_CALLBACK_FUNCION {
         IPS_CALLBACK_NONE = 0,
         IPS_CALLBACK_MGNT_LINK_REQUEST = 1,
         IPS_CALLBACK_JOIN_REQUEST = 2,
-}IPS_CALLBACK_FUNCION;
+} IPS_CALLBACK_FUNCION;
 
-typedef enum _RT_JOIN_ACTION{
+typedef enum _RT_JOIN_ACTION {
         RT_JOIN_INFRA   = 1,
         RT_JOIN_IBSS  = 2,
         RT_START_IBSS = 3,
         RT_NO_ACTION  = 4,
-}RT_JOIN_ACTION;
+} RT_JOIN_ACTION;
 
-typedef struct _IbssParms{
+typedef struct _IbssParms {
         u16   atimWin;
-}IbssParms, *PIbssParms;
+} IbssParms, *PIbssParms;
 #define MAX_NUM_RATES   264 // Max num of support rates element: 8,  Max num of ext. support rate: 255. 061122, by rcnjko.
 
 // RF state.
@@ -1517,7 +1515,7 @@ typedef	enum _RT_RF_POWER_STATE {
         eRfOn,
         eRfSleep,
         eRfOff
-}RT_RF_POWER_STATE;
+} RT_RF_POWER_STATE;
 
 typedef struct _RT_POWER_SAVE_CONTROL {
 
@@ -1572,8 +1570,7 @@ typedef u32 RT_RF_CHANGE_SOURCE;
 #define RF_CHANGE_BY_IPS        BIT(28)
 #define RF_CHANGE_BY_INIT       0       // Do not change the RFOff reason. Defined by Bruce, 2008-01-17.
 
-typedef enum
-{
+typedef enum {
         COUNTRY_CODE_FCC = 0,
         COUNTRY_CODE_IC = 1,
         COUNTRY_CODE_ETSI = 2,
@@ -1585,10 +1582,10 @@ typedef enum
         COUNTRY_CODE_TELEC,
         COUNTRY_CODE_MIC,
         COUNTRY_CODE_GLOBAL_DOMAIN
-}country_code_type_t;
+} country_code_type_t;
 
 #define RT_MAX_LD_SLOT_NUM      10
-typedef struct _RT_LINK_DETECT_T{
+typedef struct _RT_LINK_DETECT_T {
 
         u32                             NumRecvBcnInPeriod;
         u32                             NumRecvDataInPeriod;
@@ -1601,7 +1598,7 @@ typedef struct _RT_LINK_DETECT_T{
         u32                             NumTxOkInPeriod;
         u32                             NumRxOkInPeriod;
         bool                            bBusyTraffic;
-}RT_LINK_DETECT_T, *PRT_LINK_DETECT_T;
+} RT_LINK_DETECT_T, *PRT_LINK_DETECT_T;
 
 
 struct ieee80211_device {
@@ -1917,11 +1914,11 @@ struct ieee80211_device {
                                struct net_device *dev);
 
         int (*reset_port)(struct net_device *dev);
-        int (*is_queue_full) (struct net_device *dev, int pri);
+        int (*is_queue_full)(struct net_device *dev, int pri);
 
-        int (*handle_management) (struct net_device *dev,
+        int (*handle_management)(struct net_device *dev,
                                   struct ieee80211_network *network, u16 type);
-        int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb);
+        int (*is_qos_active)(struct net_device *dev, struct sk_buff *skb);
 
         /* Softmac-generated frames (management) are TXed via this
          * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is
@@ -1989,16 +1986,16 @@ struct ieee80211_device {
          * stop_send_bacons is NOT guaranteed to be called only
          * after start_send_beacons.
          */
-        void (*start_send_beacons) (struct net_device *dev,u16 tx_rate);
-        void (*stop_send_beacons) (struct net_device *dev);
+        void (*start_send_beacons)(struct net_device *dev, u16 tx_rate);
+        void (*stop_send_beacons)(struct net_device *dev);
 
         /* power save mode related */
-        void (*sta_wake_up) (struct net_device *dev);
-        void (*ps_request_tx_ack) (struct net_device *dev);
-        void (*enter_sleep_state) (struct net_device *dev, u32 th, u32 tl);
-        short (*ps_is_queue_empty) (struct net_device *dev);
-        int (*handle_beacon) (struct net_device *dev, struct ieee80211_beacon *beacon, struct ieee80211_network *network);
-        int (*handle_assoc_response) (struct net_device *dev, struct ieee80211_assoc_response_frame *resp, struct ieee80211_network *network);
+        void (*sta_wake_up)(struct net_device *dev);
+        void (*ps_request_tx_ack)(struct net_device *dev);
+        void (*enter_sleep_state)(struct net_device *dev, u32 th, u32 tl);
+        short (*ps_is_queue_empty)(struct net_device *dev);
+        int (*handle_beacon)(struct net_device *dev, struct ieee80211_beacon *beacon, struct ieee80211_network *network);
+        int (*handle_assoc_response)(struct net_device *dev, struct ieee80211_assoc_response_frame *resp, struct ieee80211_network *network);
 
 
         /* check whether Tx hw resource available */
@@ -2023,7 +2020,7 @@ struct ieee80211_device {
 #define IEEE_G            (1<<2)
 #define IEEE_N_24G                (1<<4)
 #define IEEE_N_5G                 (1<<5)
-#define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)
+#define IEEE_MODE_MASK    (IEEE_A | IEEE_B | IEEE_G)
 
 /* Generate a 802.11 header */
 
@@ -2112,7 +2109,7 @@ static inline int ieee80211_get_hdrlen(u16 fc)
         case IEEE80211_FTYPE_DATA:
                 if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS))
                         hdrlen = IEEE80211_4ADDR_LEN; /* Addr4 */
-                if(IEEE80211_QOS_HAS_SEQ(fc))
+                if (IEEE80211_QOS_HAS_SEQ(fc))
                         hdrlen += 2; /* QOS ctrl*/
                 break;
         case IEEE80211_FTYPE_CTL:
@@ -2379,7 +2376,7 @@ void HTUpdateSelfAndPeerSetting(struct ieee80211_device *ieee,
 u8 HTGetHighestMCSRate(struct ieee80211_device *ieee,
                        u8 *pMCSRateSet, u8 *pMCSFilter);
 extern u8 MCS_FILTER_ALL[];
-extern u16 MCS_DATA_RATE[2][2][77] ;
+extern u16 MCS_DATA_RATE[2][2][77];
 u8 HTCCheck(struct ieee80211_device *ieee, u8 *pFrame);
 //extern void HTSetConnectBwModeCallback(unsigned long data);
 void HTResetIOTSetting(PRT_HIGH_THROUGHPUT pHTInfo);
@@ -2395,9 +2392,9 @@ void TsInitAddBA(struct ieee80211_device *ieee, PTX_TS_RECORD pTS,
                  u8 Policy, u8 bOverwritePending);
 void TsInitDelBA(struct ieee80211_device *ieee,
                  PTS_COMMON_INFO pTsCommonInfo, TR_SELECT TxRxSelect);
-void BaSetupTimeOut(unsigned long data);
-void TxBaInactTimeout(unsigned long data);
-void RxBaInactTimeout(unsigned long data);
+void BaSetupTimeOut(struct timer_list *t);
+void TxBaInactTimeout(struct timer_list *t);
+void RxBaInactTimeout(struct timer_list *t);
 void ResetBaEntry(PBA_RECORD pBA);
 //function in TS.c
 bool GetTs(
@@ -2426,7 +2423,8 @@ static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
         return ieee->scans;
 }
 
-static inline const char *escape_essid(const char *essid, u8 essid_len) {
+static inline const char *escape_essid(const char *essid, u8 essid_len)
+{
         static char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
 
         if (ieee80211_is_empty_essid(essid, essid_len)) {
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
index 48e80be90ba5..6f457812e5a3 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c
@@ -57,9 +57,9 @@ void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee,
         }
 }
 
-void ieee80211_crypt_deinit_handler(unsigned long data)
+void ieee80211_crypt_deinit_handler(struct timer_list *t)
 {
-        struct ieee80211_device *ieee = (struct ieee80211_device *)data;
+        struct ieee80211_device *ieee = from_timer(ieee, t, crypt_deinit_timer);
         unsigned long flags;
 
         spin_lock_irqsave(&ieee->lock, flags);
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h
index a0aa0f5be63a..1f2aea7e0e55 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h
@@ -83,7 +83,7 @@ int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops);
 int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops);
 struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name);
 void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, int force);
-void ieee80211_crypt_deinit_handler(unsigned long data);
+void ieee80211_crypt_deinit_handler(struct timer_list *t);
 void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
                                     struct ieee80211_crypt_data **crypt);
 
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
index 8f236b332a47..90a097f2cd4e 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
@@ -133,8 +133,8 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
         ieee->ieee802_1x = 1; /* Default to supporting 802.1x */
 
         INIT_LIST_HEAD(&ieee->crypt_deinit_list);
-        setup_timer(&ieee->crypt_deinit_timer,
-                    ieee80211_crypt_deinit_handler, (unsigned long)ieee);
+        timer_setup(&ieee->crypt_deinit_timer, ieee80211_crypt_deinit_handler,
+                    0);
 
         spin_lock_init(&ieee->lock);
         spin_lock_init(&ieee->wpax_suitlist_lock);
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index fe6f38b7ec35..4e7908322d77 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -2948,8 +2948,9 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,
                                   struct ieee_param *param, int param_len)
 {
         int ret = 0;
+        const char *module = NULL;
 
-        struct ieee80211_crypto_ops *ops;
+        struct ieee80211_crypto_ops *ops = NULL;
         struct ieee80211_crypt_data **crypt;
 
         struct ieee80211_security sec = {
@@ -2995,19 +2996,17 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,
             strcmp(param->u.crypt.alg, "TKIP"))
                 goto skip_host_crypt;
 
-        ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
-        if (ops == NULL && strcmp(param->u.crypt.alg, "WEP") == 0) {
-                request_module("ieee80211_crypt_wep");
-                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
-                //set WEP40 first, it will be modified according to WEP104 or WEP40 at other place
-        } else if (ops == NULL && strcmp(param->u.crypt.alg, "TKIP") == 0) {
-                request_module("ieee80211_crypt_tkip");
-                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
-        } else if (ops == NULL && strcmp(param->u.crypt.alg, "CCMP") == 0) {
-                request_module("ieee80211_crypt_ccmp");
-                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
-        }
-        if (ops == NULL) {
+        //set WEP40 first, it will be modified according to WEP104 or WEP40 at other place
+        if (!strcmp(param->u.crypt.alg, "WEP"))
+                module = "ieee80211_crypt_wep";
+        else if (!strcmp(param->u.crypt.alg, "TKIP"))
+                module = "ieee80211_crypt_tkip";
+        else if (!strcmp(param->u.crypt.alg, "CCMP"))
+                module = "ieee80211_crypt_ccmp";
+        if (module)
+                ops = try_then_request_module(ieee80211_get_crypto_ops(param->u.crypt.alg),
+                                              module);
+        if (!ops) {
                 printk("unknown crypto alg '%s'\n", param->u.crypt.alg);
                 param->u.crypt.err = IEEE_CRYPT_ERR_UNKNOWN_ALG;
                 ret = -EINVAL;
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
index f58971a4a2e3..9a1a84548bc6 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
@@ -302,7 +302,6 @@ ieee80211_classify(struct sk_buff *skb, struct ieee80211_network *network)
         }
 }
 
-#define SN_LESS(a, b)           (((a-b)&0x800)!=0)
 static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,
                                        struct sk_buff *skb, struct cb_desc *tcb_desc)
 {
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
index c925e53bf013..f2fcdec9bd17 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
@@ -364,11 +364,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
                                     GFP_KERNEL);
                 if (!new_crypt)
                         return -ENOMEM;
-                new_crypt->ops = ieee80211_get_crypto_ops("WEP");
-                if (!new_crypt->ops) {
-                        request_module("ieee80211_crypt_wep");
-                        new_crypt->ops = ieee80211_get_crypto_ops("WEP");
-                }
+                new_crypt->ops = try_then_request_module(ieee80211_get_crypto_ops("WEP"),
+                                                         "ieee80211_crypt_wep");
                 if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
                         new_crypt->priv = new_crypt->ops->init(key);
 
@@ -591,12 +588,8 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
         }
         printk("alg name:%s\n",alg);
 
-         ops = ieee80211_get_crypto_ops(alg);
-        if (ops == NULL) {
-                request_module(module);
-                ops = ieee80211_get_crypto_ops(alg);
-        }
-        if (ops == NULL) {
+        ops = try_then_request_module(ieee80211_get_crypto_ops(alg), module);
+        if (!ops) {
                 IEEE80211_DEBUG_WX("%s: unknown crypto alg %d\n",
                                    dev->name, ext->alg);
                 printk("========>unknown crypto alg %d\n", ext->alg);
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
index 8aa38dcf0dfd..4ef7d4e63931 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -143,7 +143,7 @@ static struct sk_buff *ieee80211_ADDBA(struct ieee80211_device *ieee, u8 *Dst, P
 
         if (ACT_ADDBARSP == type) {
                 // Status Code
-                printk(KERN_INFO "=====>to send ADDBARSP\n");
+                netdev_info(ieee->dev, "=====>to send ADDBARSP\n");
 
                 put_unaligned_le16(StatusCode, tag);
                 tag += 2;
@@ -345,7 +345,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
         pBaTimeoutVal = (u16 *)(tag + 5);
         pBaStartSeqCtrl = (PSEQUENCE_CONTROL)(req + 7);
 
-        printk(KERN_INFO "====================>rx ADDBAREQ from :%pM\n", dst);
+        netdev_info(ieee->dev, "====================>rx ADDBAREQ from :%pM\n", dst);
 //some other capability is not ready now.
         if ((ieee->current_network.qos_data.active == 0) ||
                 (!ieee->pHTInfo->bCurrentHTSupport)) //||
@@ -672,18 +672,18 @@ TsInitDelBA( struct ieee80211_device *ieee, PTS_COMMON_INFO pTsCommonInfo, TR_SE
  *  return:  NULL
  *  notice:
  ********************************************************************************************************************/
-void BaSetupTimeOut(unsigned long data)
+void BaSetupTimeOut(struct timer_list *t)
 {
-        PTX_TS_RECORD   pTxTs = (PTX_TS_RECORD)data;
+        PTX_TS_RECORD   pTxTs = from_timer(pTxTs, t, TxPendingBARecord.Timer);
 
         pTxTs->bAddBaReqInProgress = false;
         pTxTs->bAddBaReqDelayed = true;
         pTxTs->TxPendingBARecord.bValid = false;
 }
 
-void TxBaInactTimeout(unsigned long data)
+void TxBaInactTimeout(struct timer_list *t)
 {
-        PTX_TS_RECORD   pTxTs = (PTX_TS_RECORD)data;
+        PTX_TS_RECORD   pTxTs = from_timer(pTxTs, t, TxAdmittedBARecord.Timer);
         struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[pTxTs->num]);
         TxTsDeleteBA(ieee, pTxTs);
         ieee80211_send_DELBA(
@@ -694,9 +694,9 @@ void TxBaInactTimeout(unsigned long data)
                 DELBA_REASON_TIMEOUT);
 }
 
-void RxBaInactTimeout(unsigned long data)
+void RxBaInactTimeout(struct timer_list *t)
 {
-        PRX_TS_RECORD   pRxTs = (PRX_TS_RECORD)data;
+        PRX_TS_RECORD   pRxTs = from_timer(pRxTs, t, RxAdmittedBARecord.Timer);
         struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]);
 
         RxTsDeleteBA(ieee, pRxTs);
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
index f98bb03aa293..602be096fa73 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
@@ -3,13 +3,13 @@
 #include <linux/slab.h>
 #include "rtl819x_TS.h"
 
-static void TsSetupTimeOut(unsigned long data)
+static void TsSetupTimeOut(struct timer_list *unused)
 {
         // Not implement yet
         // This is used for WMMSA and ACM , that would send ADDTSReq frame.
 }
 
-static void TsInactTimeout(unsigned long data)
+static void TsInactTimeout(struct timer_list *unused)
 {
         // Not implement yet
         // This is used for WMMSA and ACM.
@@ -22,9 +22,9 @@ static void TsInactTimeout(unsigned long data)
  *  return:  NULL
  *  notice:
  ********************************************************************************************************************/
-static void RxPktPendingTimeout(unsigned long data)
+static void RxPktPendingTimeout(struct timer_list *t)
 {
-        PRX_TS_RECORD   pRxTs = (PRX_TS_RECORD)data;
+        PRX_TS_RECORD   pRxTs = from_timer(pRxTs, t, RxPktPendingTimer);
         struct ieee80211_device *ieee = container_of(pRxTs, struct ieee80211_device, RxTsRecord[pRxTs->num]);
 
         PRX_REORDER_ENTRY       pReorderEntry = NULL;
@@ -89,9 +89,9 @@ static void RxPktPendingTimeout(unsigned long data)
  *  return:  NULL
  *  notice:
  ********************************************************************************************************************/
-static void TsAddBaProcess(unsigned long data)
+static void TsAddBaProcess(struct timer_list *t)
 {
-        PTX_TS_RECORD   pTxTs = (PTX_TS_RECORD)data;
+        PTX_TS_RECORD   pTxTs = from_timer(pTxTs, t, TsAddBaTimer);
         u8 num = pTxTs->num;
         struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[num]);
 
@@ -145,16 +145,15 @@ void TSInitialize(struct ieee80211_device *ieee)
                 pTxTS->num = count;
                 // The timers for the operation of Traffic Stream and Block Ack.
                 // DLS related timer will be add here in the future!!
-                setup_timer(&pTxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut,
-                            (unsigned long)pTxTS);
-                setup_timer(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout,
-                            (unsigned long)pTxTS);
-                setup_timer(&pTxTS->TsAddBaTimer, TsAddBaProcess,
-                            (unsigned long)pTxTS);
-                setup_timer(&pTxTS->TxPendingBARecord.Timer, BaSetupTimeOut,
-                            (unsigned long)pTxTS);
-                setup_timer(&pTxTS->TxAdmittedBARecord.Timer,
-                            TxBaInactTimeout, (unsigned long)pTxTS);
+                timer_setup(&pTxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut,
+                            0);
+                timer_setup(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout,
+                            0);
+                timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0);
+                timer_setup(&pTxTS->TxPendingBARecord.Timer, BaSetupTimeOut,
+                            0);
+                timer_setup(&pTxTS->TxAdmittedBARecord.Timer,
+                            TxBaInactTimeout, 0);
                 ResetTxTsEntry(pTxTS);
                 list_add_tail(&pTxTS->TsCommonInfo.List, &ieee->Tx_TS_Unused_List);
                 pTxTS++;
@@ -167,14 +166,13 @@ void TSInitialize(struct ieee80211_device *ieee)
         for(count = 0; count < TOTAL_TS_NUM; count++) {
                 pRxTS->num = count;
                 INIT_LIST_HEAD(&pRxTS->RxPendingPktList);
-                setup_timer(&pRxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut,
-                            (unsigned long)pRxTS);
-                setup_timer(&pRxTS->TsCommonInfo.InactTimer, TsInactTimeout,
-                            (unsigned long)pRxTS);
-                setup_timer(&pRxTS->RxAdmittedBARecord.Timer,
-                            RxBaInactTimeout, (unsigned long)pRxTS);
-                setup_timer(&pRxTS->RxPktPendingTimer, RxPktPendingTimeout,
-                            (unsigned long)pRxTS);
+                timer_setup(&pRxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut,
+                            0);
+                timer_setup(&pRxTS->TsCommonInfo.InactTimer, TsInactTimeout,
+                            0);
+                timer_setup(&pRxTS->RxAdmittedBARecord.Timer,
+                            RxBaInactTimeout, 0);
+                timer_setup(&pRxTS->RxPktPendingTimer, RxPktPendingTimeout, 0);
                 ResetRxTsEntry(pRxTS);
                 list_add_tail(&pRxTS->TsCommonInfo.List, &ieee->Rx_TS_Unused_List);
                 pRxTS++;
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 46b3f19e0878..09f66b386e44 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -497,7 +497,7 @@ inline void force_pci_posting(struct net_device *dev)
 
 static struct net_device_stats *rtl8192_stats(struct net_device *dev);
 static void rtl8192_restart(struct work_struct *work);
-static void watch_dog_timer_callback(unsigned long data);
+static void watch_dog_timer_callback(struct timer_list *t);
 
 /****************************************************************************
  *   -----------------------------PROCFS STUFF-------------------------
@@ -1687,9 +1687,13 @@ static short rtl8192_usb_initendpoints(struct net_device *dev)
 #ifndef JACKSON_NEW_RX
         for (i = 0; i < (MAX_RX_URB + 1); i++) {
                 priv->rx_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
+                if (!priv->rx_urb[i])
+                        return -ENOMEM;
 
                 priv->rx_urb[i]->transfer_buffer =
                         kmalloc(RX_URB_SIZE, GFP_KERNEL);
+                if (!priv->rx_urb[i]->transfer_buffer)
+                        return -ENOMEM;
 
                 priv->rx_urb[i]->transfer_buffer_length = RX_URB_SIZE;
         }
@@ -2690,15 +2694,11 @@ static short rtl8192_init(struct net_device *dev)
         err = rtl8192_read_eeprom_info(dev);
         if (err) {
                 DMESG("Reading EEPROM info failed");
-                kfree(priv->pFirmware);
-                priv->pFirmware = NULL;
-                free_ieee80211(dev);
                 return err;
         }
         rtl8192_get_channel_map(dev);
         init_hal_dm(dev);
-        setup_timer(&priv->watch_dog_timer, watch_dog_timer_callback,
-                    (unsigned long)dev);
+        timer_setup(&priv->watch_dog_timer, watch_dog_timer_callback, 0);
         if (rtl8192_usb_initendpoints(dev) != 0) {
                 DMESG("Endopoints initialization failed");
                 return -ENOMEM;
@@ -3499,9 +3499,9 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
         RT_TRACE(COMP_TRACE, " <==RtUsbCheckForHangWorkItemCallback()\n");
 }
 
-static void watch_dog_timer_callback(unsigned long data)
+static void watch_dog_timer_callback(struct timer_list *t)
 {
-        struct r8192_priv *priv = ieee80211_priv((struct net_device *)data);
+        struct r8192_priv *priv = from_timer(priv, t, watch_dog_timer);
 
         schedule_delayed_work(&priv->watch_dog_wq, 0);
         mod_timer(&priv->watch_dog_timer,
@@ -3528,7 +3528,7 @@ static int _rtl8192_up(struct net_device *dev)
         if (priv->ieee80211->state != IEEE80211_LINKED)
                 ieee80211_softmac_start_protocol(priv->ieee80211);
         ieee80211_reset_queue(priv->ieee80211);
-        watch_dog_timer_callback((unsigned long)dev);
+        watch_dog_timer_callback(&priv->watch_dog_timer);
         if (!netif_queue_stopped(dev))
                 netif_start_queue(dev);
         else
@@ -4994,11 +4994,11 @@ static int rtl8192_usb_probe(struct usb_interface *intf,
 
 fail2:
         rtl8192_down(dev);
+fail:
         kfree(priv->pFirmware);
         priv->pFirmware = NULL;
         rtl8192_usb_deleteendpoints(dev);
         mdelay(10);
-fail:
         free_ieee80211(dev);
 
         RT_TRACE(COMP_ERR, "wlan driver load failed\n");
diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c
index e6f8d1da65d9..17e650184ee5 100644
--- a/drivers/staging/rtl8192u/r8192U_dm.c
+++ b/drivers/staging/rtl8192u/r8192U_dm.c
@@ -2729,8 +2729,7 @@ static void dm_init_fsync(struct net_device *dev)
         priv->ieee80211->fsync_seconddiff_ratethreshold = 200;
         priv->ieee80211->fsync_state = Default_Fsync;
         priv->framesyncMonitor = 1;     /* current default 0xc38 monitor on */
-        setup_timer(&priv->fsync_timer, dm_fsync_timer_callback,
-                    (unsigned long)dev);
+        timer_setup(&priv->fsync_timer, dm_fsync_timer_callback, 0);
 }
 
 static void dm_deInit_fsync(struct net_device *dev)
@@ -2740,10 +2739,10 @@ static void dm_deInit_fsync(struct net_device *dev)
         del_timer_sync(&priv->fsync_timer);
 }
 
-void dm_fsync_timer_callback(unsigned long data)
+void dm_fsync_timer_callback(struct timer_list *t)
 {
-        struct net_device *dev = (struct net_device *)data;
-        struct r8192_priv *priv = ieee80211_priv((struct net_device *)data);
+        struct r8192_priv *priv = from_timer(priv, t, fsync_timer);
+        struct net_device *dev = priv->ieee80211->dev;
         u32 rate_index, rate_count = 0, rate_count_diff = 0;
         bool            bSwitchFromCountDiff = false;
         bool            bDoubleTimeInterval = false;
diff --git a/drivers/staging/rtl8192u/r8192U_dm.h b/drivers/staging/rtl8192u/r8192U_dm.h
index 2d0232fb3f9b..b19b4e5b87ff 100644
--- a/drivers/staging/rtl8192u/r8192U_dm.h
+++ b/drivers/staging/rtl8192u/r8192U_dm.h
@@ -226,7 +226,7 @@ void dm_force_tx_fw_info(struct net_device *dev,
 void dm_init_edca_turbo(struct net_device *dev);
 void dm_rf_operation_test_callback(unsigned long data);
 void dm_rf_pathcheck_workitemcallback(struct work_struct *work);
-void dm_fsync_timer_callback(unsigned long data);
+void dm_fsync_timer_callback(struct timer_list *t);
 void dm_cck_txpower_adjust(struct net_device *dev, bool  binch14);
 void dm_shadow_init(struct net_device *dev);
 void dm_initialize_txpower_tracking(struct net_device *dev);
diff --git a/drivers/staging/rtl8192u/r8192U_wx.c b/drivers/staging/rtl8192u/r8192U_wx.c
index a9545386fbc5..e4e6c979bedf 100644
--- a/drivers/staging/rtl8192u/r8192U_wx.c
+++ b/drivers/staging/rtl8192u/r8192U_wx.c
@@ -964,7 +964,7 @@ struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev)
         return wstats;
 }
 
-struct iw_handler_def  r8192_wx_handlers_def = {
+const struct iw_handler_def  r8192_wx_handlers_def = {
         .standard = r8192_wx_handlers,
         .num_standard = ARRAY_SIZE(r8192_wx_handlers),
         .private = r8192_private_handler,
diff --git a/drivers/staging/rtl8192u/r8192U_wx.h b/drivers/staging/rtl8192u/r8192U_wx.h
index fb5f808433d1..a6c2b95e2e69 100644
--- a/drivers/staging/rtl8192u/r8192U_wx.h
+++ b/drivers/staging/rtl8192u/r8192U_wx.h
@@ -17,7 +17,7 @@
 #ifndef R8180_WX_H
 #define R8180_WX_H
 
-extern struct iw_handler_def r8192_wx_handlers_def;
+extern const struct iw_handler_def r8192_wx_handlers_def;
 /* Enable  the rtl819x_core.c to share this function, david 2008.9.22 */
 struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev);
 
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index c83d7ebb164f..de832b0b5eec 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -216,9 +216,9 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
                 emem_sz = fwhdr.img_SRAM_size;
                 do {
                         memset(ptx_desc, 0, TXDESC_SIZE);
-                        if (emem_sz >  MAX_DUMP_FWSZ) /* max=48k */
+                        if (emem_sz >  MAX_DUMP_FWSZ) { /* max=48k */
                                 dump_emem_sz = MAX_DUMP_FWSZ;
-                        else {
+                        } else {
                                 dump_emem_sz = emem_sz;
                                 ptx_desc->txdw0 |= cpu_to_le32(BIT(28));
                         }
diff --git a/drivers/staging/rtl8712/mlme_linux.c b/drivers/staging/rtl8712/mlme_linux.c
index a077069d6227..3c7c4a4faeb2 100644
--- a/drivers/staging/rtl8712/mlme_linux.c
+++ b/drivers/staging/rtl8712/mlme_linux.c
@@ -32,39 +32,45 @@
 #include "drv_types.h"
 #include "mlme_osdep.h"
 
-static void sitesurvey_ctrl_handler(unsigned long data)
+static void sitesurvey_ctrl_handler(struct timer_list *t)
 {
-        struct _adapter *adapter = (struct _adapter *)data;
+        struct _adapter *adapter =
+                from_timer(adapter, t,
+                        mlmepriv.sitesurveyctrl.sitesurvey_ctrl_timer);
 
         _r8712_sitesurvey_ctrl_handler(adapter);
         mod_timer(&adapter->mlmepriv.sitesurveyctrl.sitesurvey_ctrl_timer,
                   jiffies + msecs_to_jiffies(3000));
 }
 
-static void join_timeout_handler (unsigned long data)
+static void join_timeout_handler (struct timer_list *t)
 {
-        struct _adapter *adapter = (struct _adapter *)data;
+        struct _adapter *adapter =
+                from_timer(adapter, t, mlmepriv.assoc_timer);
 
         _r8712_join_timeout_handler(adapter);
 }
 
-static void _scan_timeout_handler (unsigned long data)
+static void _scan_timeout_handler (struct timer_list *t)
 {
-        struct _adapter *adapter = (struct _adapter *)data;
+        struct _adapter *adapter =
+                from_timer(adapter, t, mlmepriv.scan_to_timer);
 
         r8712_scan_timeout_handler(adapter);
 }
 
-static void dhcp_timeout_handler (unsigned long data)
+static void dhcp_timeout_handler (struct timer_list *t)
 {
-        struct _adapter *adapter = (struct _adapter *)data;
+        struct _adapter *adapter =
+                from_timer(adapter, t, mlmepriv.dhcp_timer);
 
         _r8712_dhcp_timeout_handler(adapter);
 }
 
-static void wdg_timeout_handler (unsigned long data)
+static void wdg_timeout_handler (struct timer_list *t)
 {
-        struct _adapter *adapter = (struct _adapter *)data;
+        struct _adapter *adapter =
+                from_timer(adapter, t, mlmepriv.wdg_timer);
 
         _r8712_wdg_timeout_handler(adapter);
 
@@ -76,17 +82,12 @@ void r8712_init_mlme_timer(struct _adapter *padapter)
 {
         struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-        setup_timer(&pmlmepriv->assoc_timer, join_timeout_handler,
-                    (unsigned long)padapter);
-        setup_timer(&pmlmepriv->sitesurveyctrl.sitesurvey_ctrl_timer,
-                    sitesurvey_ctrl_handler,
-                    (unsigned long)padapter);
-        setup_timer(&pmlmepriv->scan_to_timer, _scan_timeout_handler,
-                    (unsigned long)padapter);
-        setup_timer(&pmlmepriv->dhcp_timer, dhcp_timeout_handler,
-                    (unsigned long)padapter);
-        setup_timer(&pmlmepriv->wdg_timer, wdg_timeout_handler,
-                    (unsigned long)padapter);
+        timer_setup(&pmlmepriv->assoc_timer, join_timeout_handler, 0);
+        timer_setup(&pmlmepriv->sitesurveyctrl.sitesurvey_ctrl_timer,
+                    sitesurvey_ctrl_handler, 0);
+        timer_setup(&pmlmepriv->scan_to_timer, _scan_timeout_handler, 0);
+        timer_setup(&pmlmepriv->dhcp_timer, dhcp_timeout_handler, 0);
+        timer_setup(&pmlmepriv->wdg_timer, wdg_timeout_handler, 0);
 }
 
 void r8712_os_indicate_connect(struct _adapter *adapter)
@@ -118,9 +119,8 @@ void r8712_os_indicate_disconnect(struct _adapter *adapter)
                         adapter->securitypriv.btkip_countermeasure;
                 memset((unsigned char *)&adapter->securitypriv, 0,
                        sizeof(struct security_priv));
-                setup_timer(&adapter->securitypriv.tkip_timer,
-                            r8712_use_tkipkey_handler,
-                            (unsigned long)adapter);
+                timer_setup(&adapter->securitypriv.tkip_timer,
+                            r8712_use_tkipkey_handler, 0);
                 /* Restore the PMK information to securitypriv structure
                  * for the following connection.
                  */
diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index e698f6ede449..95caf8df9a13 100644
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -313,8 +313,8 @@ u8 r8712_init_drv_sw(struct _adapter *padapter)
         _r8712_init_recv_priv(&padapter->recvpriv, padapter);
         memset((unsigned char *)&padapter->securitypriv, 0,
                sizeof(struct security_priv));
-        setup_timer(&padapter->securitypriv.tkip_timer,
-                    r8712_use_tkipkey_handler, (unsigned long)padapter);
+        timer_setup(&padapter->securitypriv.tkip_timer,
+                    r8712_use_tkipkey_handler, 0);
         _r8712_init_sta_priv(&padapter->stapriv);
         padapter->stapriv.padapter = padapter;
         r8712_init_bcmc_stainfo(padapter);
@@ -385,11 +385,11 @@ static int netdev_open(struct net_device *pnetdev)
                 padapter->bup = true;
                 if (rtl871x_hal_init(padapter) != _SUCCESS)
                         goto netdev_open_error;
-                if (!r8712_initmac)
+                if (!r8712_initmac) {
                         /* Use the mac address stored in the Efuse */
                         memcpy(pnetdev->dev_addr,
                                padapter->eeprompriv.mac_addr, ETH_ALEN);
-                else {
+                } else {
                         /* We have to inform f/w to use user-supplied MAC
                          * address.
                          */
diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c
index 0104aced113e..3c88994fdfcd 100644
--- a/drivers/staging/rtl8712/rtl8712_cmd.c
+++ b/drivers/staging/rtl8712/rtl8712_cmd.c
@@ -356,11 +356,11 @@ _next:
                                 if ((wr_sz % 64) == 0)
                                         blnPending = 1;
                         }
-                        if (blnPending) /* 32 bytes for TX Desc - 8 offset */
+                        if (blnPending) { /* 32 bytes for TX Desc - 8 offset */
                                 pdesc->txdw0 |= cpu_to_le32(((TXDESC_SIZE +
                                                 OFFSET_SZ + 8) << OFFSET_SHT) &
                                                 0x00ff0000);
-                        else {
+                        } else {
                                 pdesc->txdw0 |= cpu_to_le32(((TXDESC_SIZE +
                                                               OFFSET_SZ) <<
                                                               OFFSET_SHT) &
diff --git a/drivers/staging/rtl8712/rtl8712_event.h b/drivers/staging/rtl8712/rtl8712_event.h
index b38374025c93..cad7085c3f8a 100644
--- a/drivers/staging/rtl8712/rtl8712_event.h
+++ b/drivers/staging/rtl8712/rtl8712_event.h
@@ -60,7 +60,6 @@ enum rtl8712_c2h_event {
         MAX_C2HEVT
 };
 
-
 #ifdef _RTL8712_CMD_C_
 
 static struct fwevent wlanevents[] = {
diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index ea3eb94b28b3..8f555e6e1b3f 100644
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -149,7 +149,7 @@ int r8712_free_recvframe(union recv_frame *precvframe,
         list_add_tail(&(precvframe->u.hdr.list), &pfree_recv_queue->queue);
         if (padapter != NULL) {
                 if (pfree_recv_queue == &precvpriv->free_recv_queue)
-                                precvpriv->free_recvframe_cnt++;
+                        precvpriv->free_recvframe_cnt++;
         }
         spin_unlock_irqrestore(&pfree_recv_queue->lock, irqL);
         return _SUCCESS;
@@ -883,10 +883,10 @@ static void query_rx_phy_status(struct _adapter *padapter,
          * from 0~100. It is assigned to the BSS List in
          * GetValueFromBeaconOrProbeRsp().
          */
-        if (bcck_rate)
+        if (bcck_rate) {
                 prframe->u.hdr.attrib.signal_strength =
                          (u8)r8712_signal_scale_mapping(pwdb_all);
-        else {
+        } else {
                 if (rf_rx_num != 0)
                         prframe->u.hdr.attrib.signal_strength =
                                  (u8)(r8712_signal_scale_mapping(total_rssi /=
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index 04638f1e4e88..a424f447a725 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -899,9 +899,10 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,
                         if (!pwlan)
                                 goto createbss_cmd_fail;
                         pwlan->last_scanned = jiffies;
-                } else
+                } else {
                         list_add_tail(&(pwlan->list),
                                          &pmlmepriv->scanned_queue.queue);
+                }
                 pnetwork->Length = r8712_get_wlan_bssid_ex_sz(pnetwork);
                 memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
                 pwlan->fixed = true;
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.c b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
index 01a150446f5a..8a5ced4fa9d3 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_set.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
@@ -78,10 +78,10 @@ static u8 do_join(struct _adapter *padapter)
                 int ret;
 
                 ret = r8712_select_and_join_from_scan(pmlmepriv);
-                if (ret == _SUCCESS)
+                if (ret == _SUCCESS) {
                         mod_timer(&pmlmepriv->assoc_timer,
                                   jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));
-                else {
+                } else {
                         if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
                                 /* submit r8712_createbss_cmd to change to an
                                  * ADHOC_MASTER pmlmepriv->lock has been
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index bf1ac22bae1c..111c809afc51 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -574,10 +574,10 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
                                 set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
 
                                 if (r8712_select_and_join_from_scan(pmlmepriv)
-                                    == _SUCCESS)
+                                    == _SUCCESS) {
                                         mod_timer(&pmlmepriv->assoc_timer, jiffies +
                                                   msecs_to_jiffies(MAX_JOIN_TIMEOUT));
-                                else {
+                                } else {
                                         struct wlan_bssid_ex *pdev_network =
                                           &(adapter->registrypriv.dev_network);
                                         u8 *pibss =
diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.c b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
index e42fc1404c35..ae4c9567bb55 100644
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.c
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
@@ -164,9 +164,10 @@ static void rpwm_workitem_callback(struct work_struct *work)
         }
 }
 
-static void rpwm_check_handler (unsigned long data)
+static void rpwm_check_handler (struct timer_list *t)
 {
-        struct _adapter *adapter = (struct _adapter *)data;
+        struct _adapter *adapter =
+                from_timer(adapter, t, pwrctrlpriv.rpwm_check_timer);
 
         _rpwm_check_handler(adapter);
 }
@@ -185,8 +186,7 @@ void r8712_init_pwrctrl_priv(struct _adapter *padapter)
         r8712_write8(padapter, 0x1025FE58, 0);
         INIT_WORK(&pwrctrlpriv->SetPSModeWorkItem, SetPSModeWorkItemCallback);
         INIT_WORK(&pwrctrlpriv->rpwm_workitem, rpwm_workitem_callback);
-        setup_timer(&pwrctrlpriv->rpwm_check_timer, rpwm_check_handler,
-                    (unsigned long)padapter);
+        timer_setup(&pwrctrlpriv->rpwm_check_timer, rpwm_check_handler, 0);
 }
 
 /*
diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c
index bd83fb492c45..56d36f6f9c46 100644
--- a/drivers/staging/rtl8712/rtl871x_security.c
+++ b/drivers/staging/rtl8712/rtl871x_security.c
@@ -1402,9 +1402,10 @@ u32 r8712_aes_decrypt(struct _adapter *padapter, u8 *precvframe)
         return _SUCCESS;
 }
 
-void r8712_use_tkipkey_handler(unsigned long data)
+void r8712_use_tkipkey_handler(struct timer_list *t)
 {
-        struct _adapter *padapter = (struct _adapter *)data;
+        struct _adapter *padapter =
+                from_timer(padapter, t, securitypriv.tkip_timer);
 
         padapter->securitypriv.busetkipkey = true;
 }
diff --git a/drivers/staging/rtl8712/rtl871x_security.h b/drivers/staging/rtl8712/rtl871x_security.h
index fa952e17975b..46b88a41d236 100644
--- a/drivers/staging/rtl8712/rtl871x_security.h
+++ b/drivers/staging/rtl8712/rtl871x_security.h
@@ -224,7 +224,7 @@ void r8712_wep_encrypt(struct _adapter *padapter, u8  *pxmitframe);
 u32 r8712_aes_decrypt(struct _adapter *padapter, u8  *precvframe);
 u32 r8712_tkip_decrypt(struct _adapter *padapter, u8  *precvframe);
 void r8712_wep_decrypt(struct _adapter *padapter, u8  *precvframe);
-void r8712_use_tkipkey_handler(unsigned long data);
+void r8712_use_tkipkey_handler(struct timer_list *t);
 
 #endif  /*__RTL871X_SECURITY_H_ */
 
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index b3e266bd57ab..85eadddfaf06 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -590,9 +590,10 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
                         mac[0] &= 0xFE;
                         dev_info(&udev->dev,
                                 "r8712u: MAC Address from user = %pM\n", mac);
-                } else
+                } else {
                         dev_info(&udev->dev,
                                 "r8712u: MAC Address from efuse = %pM\n", mac);
+                }
                 ether_addr_copy(pnetdev->dev_addr, mac);
         }
         /* step 6. Load the firmware asynchronously */
diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index d3007c1c45e3..0b530ea7fd81 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -1581,15 +1581,13 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta)
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
         u8 res = _SUCCESS;
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(
-                sizeof(struct set_stakey_parm)
-        );
+        psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));
         if (psetstakey_para == NULL) {
                 kfree((u8 *) ph2c);
                 res = _FAIL;
@@ -1630,12 +1628,12 @@ static int rtw_ap_set_key(
 
         /* DBG_871X("%s\n", __func__); */
 
-        pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
         if (pcmd == NULL) {
                 res = _FAIL;
                 goto exit;
         }
-        psetkeyparm = (struct setkey_parm *)rtw_zmalloc(sizeof(struct setkey_parm));
+        psetkeyparm = rtw_zmalloc(sizeof(struct setkey_parm));
         if (psetkeyparm == NULL) {
                 kfree((unsigned char *)pcmd);
                 res = _FAIL;
diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
index 01f78d1671de..79aa02afad01 100644
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -207,11 +207,11 @@ void rtw_btcoex_RejectApAggregatedPacket(struct adapter *padapter, u8 enable)
         psta = rtw_get_stainfo(&padapter->stapriv, get_bssid(&padapter->mlmepriv));
 
         if (true == enable) {
-                pmlmeinfo->bAcceptAddbaReq = false;
+                pmlmeinfo->accept_addba_req = false;
                 if (psta)
                         send_delba(padapter, 0, psta->hwaddr);
         } else{
-                pmlmeinfo->bAcceptAddbaReq = true;
+                pmlmeinfo->accept_addba_req = true;
         }
 }
 
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index d381827dba3b..9ac2dea6dff1 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -408,7 +408,7 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd)
         }
 
         /* free cmd_obj */
-        kfree((unsigned char *)pcmd);
+        kfree(pcmd);
 }
 
 
@@ -613,13 +613,13 @@ u8 rtw_sitesurvey_cmd(struct adapter  *padapter, struct ndis_802_11_ssid *ssid,
                 rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);
         }
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL)
                 return _FAIL;
 
-        psurveyPara = (struct sitesurvey_parm *)rtw_zmalloc(sizeof(struct sitesurvey_parm));
+        psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm));
         if (psurveyPara == NULL) {
-                kfree((unsigned char *) ph2c);
+                kfree(ph2c);
                 return _FAIL;
         }
 
@@ -681,15 +681,15 @@ u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset)
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
         u8 res = _SUCCESS;
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        pbsetdataratepara = (struct setdatarate_parm *)rtw_zmalloc(sizeof(struct setdatarate_parm));
+        pbsetdataratepara = rtw_zmalloc(sizeof(struct setdatarate_parm));
         if (pbsetdataratepara == NULL) {
-                kfree((u8 *) ph2c);
+                kfree(ph2c);
                 res = _FAIL;
                 goto exit;
         }
@@ -706,8 +706,8 @@ exit:
 void rtw_getbbrfreg_cmdrsp_callback(struct adapter *padapter,  struct cmd_obj *pcmd)
 {
         /* rtw_free_cmd_obj(pcmd); */
-        kfree((unsigned char *) pcmd->parmbuf);
-        kfree((unsigned char *) pcmd);
+        kfree(pcmd->parmbuf);
+        kfree(pcmd);
 }
 
 u8 rtw_createbss_cmd(struct adapter  *padapter)
@@ -724,7 +724,7 @@ u8 rtw_createbss_cmd(struct adapter  *padapter)
                 RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));
         }
 
-        pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
         if (pcmd == NULL) {
                 res = _FAIL;
                 goto exit;
@@ -757,7 +757,7 @@ u8 rtw_startbss_cmd(struct adapter  *padapter, int flags)
                 start_bss_network(padapter, (u8 *)&(padapter->mlmepriv.cur_network.network));
         } else {
                 /* need enqueue, prepare cmd_obj and enqueue */
-                pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+                pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
                 if (pcmd == NULL) {
                         res = _FAIL;
                         goto exit;
@@ -815,7 +815,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
                 RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+Join cmd: SSid =[%s]\n", pmlmepriv->assoc_ssid.Ssid));
         }
 
-        pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
         if (pcmd == NULL) {
                 res = _FAIL;
                 RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd: memory allocate for cmd_obj fail!!!\n"));
@@ -847,7 +847,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
         psecnetwork = (struct wlan_bssid_ex *)&psecuritypriv->sec_bss;
         if (psecnetwork == NULL) {
                 if (pcmd != NULL)
-                        kfree((unsigned char *)pcmd);
+                        kfree(pcmd);
 
                 res = _FAIL;
 
@@ -943,7 +943,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
         RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n"));
 
         /* prepare cmd parameter */
-        param = (struct disconnect_parm *)rtw_zmalloc(sizeof(*param));
+        param = rtw_zmalloc(sizeof(*param));
         if (param == NULL) {
                 res = _FAIL;
                 goto exit;
@@ -952,10 +952,10 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
 
         if (enqueue) {
                 /* need enqueue, prepare cmd_obj and enqueue */
-                cmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(*cmdobj));
+                cmdobj = rtw_zmalloc(sizeof(*cmdobj));
                 if (cmdobj == NULL) {
                         res = _FAIL;
-                        kfree((u8 *)param);
+                        kfree(param);
                         goto exit;
                 }
                 init_h2fwcmd_w_parm_no_rsp(cmdobj, param, _DisConnect_CMD_);
@@ -964,7 +964,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
                 /* no need to enqueue, do the cmd hdl directly and free cmd parameter */
                 if (H2C_SUCCESS != disconnect_hdl(padapter, (u8 *)param))
                         res = _FAIL;
-                kfree((u8 *)param);
+                kfree(param);
         }
 
 exit:
@@ -979,7 +979,7 @@ u8 rtw_setopmode_cmd(struct adapter  *padapter, enum NDIS_802_11_NETWORK_INFRAST
         struct  cmd_priv   *pcmdpriv = &padapter->cmdpriv;
         u8 res = _SUCCESS;
 
-        psetop = (struct setopmode_parm *)rtw_zmalloc(sizeof(struct setopmode_parm));
+        psetop = rtw_zmalloc(sizeof(struct setopmode_parm));
 
         if (psetop == NULL) {
                 res = _FAIL;
@@ -988,9 +988,9 @@ u8 rtw_setopmode_cmd(struct adapter  *padapter, enum NDIS_802_11_NETWORK_INFRAST
         psetop->mode = (u8)networktype;
 
         if (enqueue) {
-                ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+                ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
                 if (ph2c == NULL) {
-                        kfree((u8 *)psetop);
+                        kfree(psetop);
                         res = _FAIL;
                         goto exit;
                 }
@@ -999,7 +999,7 @@ u8 rtw_setopmode_cmd(struct adapter  *padapter, enum NDIS_802_11_NETWORK_INFRAST
                 res = rtw_enqueue_cmd(pcmdpriv, ph2c);
         } else{
                 setopmode_hdl(padapter, (u8 *)psetop);
-                kfree((u8 *)psetop);
+                kfree(psetop);
         }
 exit:
         return res;
@@ -1016,7 +1016,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
         struct security_priv    *psecuritypriv = &padapter->securitypriv;
         u8 res = _SUCCESS;
 
-        psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(sizeof(struct set_stakey_parm));
+        psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));
         if (psetstakey_para == NULL) {
                 res = _FAIL;
                 goto exit;
@@ -1040,17 +1040,17 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
         padapter->securitypriv.busetkipkey = true;
 
         if (enqueue) {
-                ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+                ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
                 if (ph2c == NULL) {
-                        kfree((u8 *) psetstakey_para);
+                        kfree(psetstakey_para);
                         res = _FAIL;
                         goto exit;
                 }
 
-                psetstakey_rsp = (struct set_stakey_rsp *)rtw_zmalloc(sizeof(struct set_stakey_rsp));
+                psetstakey_rsp = rtw_zmalloc(sizeof(struct set_stakey_rsp));
                 if (psetstakey_rsp == NULL) {
-                        kfree((u8 *) ph2c);
-                        kfree((u8 *) psetstakey_para);
+                        kfree(ph2c);
+                        kfree(psetstakey_para);
                         res = _FAIL;
                         goto exit;
                 }
@@ -1061,7 +1061,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
                 res = rtw_enqueue_cmd(pcmdpriv, ph2c);
         } else{
                 set_stakey_hdl(padapter, (u8 *)psetstakey_para);
-                kfree((u8 *) psetstakey_para);
+                kfree(psetstakey_para);
         }
 exit:
         return res;
@@ -1083,23 +1083,23 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu
                         rtw_camid_free(padapter, cam_id);
                 }
         } else{
-                ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+                ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
                 if (ph2c == NULL) {
                         res = _FAIL;
                         goto exit;
                 }
 
-                psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(sizeof(struct set_stakey_parm));
+                psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));
                 if (psetstakey_para == NULL) {
-                        kfree((u8 *) ph2c);
+                        kfree(ph2c);
                         res = _FAIL;
                         goto exit;
                 }
 
-                psetstakey_rsp = (struct set_stakey_rsp *)rtw_zmalloc(sizeof(struct set_stakey_rsp));
+                psetstakey_rsp = rtw_zmalloc(sizeof(struct set_stakey_rsp));
                 if (psetstakey_rsp == NULL) {
-                        kfree((u8 *) ph2c);
-                        kfree((u8 *) psetstakey_para);
+                        kfree(ph2c);
+                        kfree(psetstakey_para);
                         res = _FAIL;
                         goto exit;
                 }
@@ -1128,15 +1128,15 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr)
 
         u8 res = _SUCCESS;
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        paddbareq_parm = (struct addBaReq_parm *)rtw_zmalloc(sizeof(struct addBaReq_parm));
+        paddbareq_parm = rtw_zmalloc(sizeof(struct addBaReq_parm));
         if (paddbareq_parm == NULL) {
-                kfree((unsigned char *)ph2c);
+                kfree(ph2c);
                 res = _FAIL;
                 goto exit;
         }
@@ -1162,15 +1162,15 @@ u8 rtw_reset_securitypriv_cmd(struct adapter *padapter)
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
         u8 res = _SUCCESS;
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
         if (pdrvextra_cmd_parm == NULL) {
-                kfree((unsigned char *)ph2c);
+                kfree(ph2c);
                 res = _FAIL;
                 goto exit;
         }
@@ -1197,15 +1197,15 @@ u8 rtw_free_assoc_resources_cmd(struct adapter *padapter)
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
         u8 res = _SUCCESS;
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
         if (pdrvextra_cmd_parm == NULL) {
-                kfree((unsigned char *)ph2c);
+                kfree(ph2c);
                 res = _FAIL;
                 goto exit;
         }
@@ -1233,15 +1233,15 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)
         u8 res = _SUCCESS;
 
         /* only  primary padapter does this cmd */
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
         if (pdrvextra_cmd_parm == NULL) {
-                kfree((unsigned char *)ph2c);
+                kfree(ph2c);
                 res = _FAIL;
                 goto exit;
         }
@@ -1283,7 +1283,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconf
         }
 
         /* prepare cmd parameter */
-        setChannelPlan_param = (struct  SetChannelPlan_param *)rtw_zmalloc(sizeof(struct SetChannelPlan_param));
+        setChannelPlan_param = rtw_zmalloc(sizeof(struct SetChannelPlan_param));
         if (setChannelPlan_param == NULL) {
                 res = _FAIL;
                 goto exit;
@@ -1292,9 +1292,9 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconf
 
         if (enqueue) {
                 /* need enqueue, prepare cmd_obj and enqueue */
-                pcmdobj = (struct       cmd_obj *)rtw_zmalloc(sizeof(struct     cmd_obj));
+                pcmdobj = rtw_zmalloc(sizeof(struct cmd_obj));
                 if (pcmdobj == NULL) {
-                        kfree((u8 *)setChannelPlan_param);
+                        kfree(setChannelPlan_param);
                         res = _FAIL;
                         goto exit;
                 }
@@ -1306,7 +1306,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconf
                 if (H2C_SUCCESS != set_chplan_hdl(padapter, (unsigned char *)setChannelPlan_param))
                         res = _FAIL;
 
-                kfree((u8 *)setChannelPlan_param);
+                kfree(setChannelPlan_param);
         }
 
         /* do something based on res... */
@@ -1553,15 +1553,15 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)
         /*      return res; */
 
         if (enqueue) {
-                ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+                ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
                 if (ph2c == NULL) {
                         res = _FAIL;
                         goto exit;
                 }
 
-                pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+                pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
                 if (pdrvextra_cmd_parm == NULL) {
-                        kfree((unsigned char *)ph2c);
+                        kfree(ph2c);
                         res = _FAIL;
                         goto exit;
                 }
@@ -1595,15 +1595,15 @@ u8 rtw_dm_in_lps_wk_cmd(struct adapter *padapter)
         u8 res = _SUCCESS;
 
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
         if (pdrvextra_cmd_parm == NULL) {
-                kfree((unsigned char *)ph2c);
+                kfree(ph2c);
                 res = _FAIL;
                 goto exit;
         }
@@ -1668,15 +1668,15 @@ u8 rtw_dm_ra_mask_wk_cmd(struct adapter *padapter, u8 *psta)
         u8 res = _SUCCESS;
 
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
         if (pdrvextra_cmd_parm == NULL) {
-                kfree((unsigned char *)ph2c);
+                kfree(ph2c);
                 res = _FAIL;
                 goto exit;
         }
@@ -1719,15 +1719,15 @@ u8 rtw_ps_cmd(struct adapter *padapter)
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
         u8 res = _SUCCESS;
 
-        ppscmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ppscmd = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ppscmd == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
         if (pdrvextra_cmd_parm == NULL) {
-                kfree((unsigned char *)ppscmd);
+                kfree(ppscmd);
                 res = _FAIL;
                 goto exit;
         }
@@ -1791,15 +1791,15 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter)
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
         u8 res = _SUCCESS;
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
         if (pdrvextra_cmd_parm == NULL) {
-                kfree((unsigned char *)ph2c);
+                kfree(ph2c);
                 res = _FAIL;
                 goto exit;
         }
@@ -1890,15 +1890,15 @@ u8 rtw_c2h_packet_wk_cmd(struct adapter *padapter, u8 *pbuf, u16 length)
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
         u8 res = _SUCCESS;
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
         if (pdrvextra_cmd_parm == NULL) {
-                kfree((u8 *)ph2c);
+                kfree(ph2c);
                 res = _FAIL;
                 goto exit;
         }
@@ -1925,15 +1925,15 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt)
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
         u8 res = _SUCCESS;
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
         if (pdrvextra_cmd_parm == NULL) {
-                kfree((u8 *)ph2c);
+                kfree(ph2c);
                 res = _FAIL;
                 goto exit;
         }
@@ -1967,7 +1967,7 @@ static void c2h_wk_callback(_workitem *work)
                         /* This C2H event is read, clear it */
                         c2h_evt_clear(adapter);
                 } else{
-                        c2h_evt = (u8 *)rtw_malloc(16);
+                        c2h_evt = rtw_malloc(16);
                         if (c2h_evt != NULL) {
                                 /* This C2H event is not read, read & clear now */
                                 if (rtw_hal_c2h_evt_read(adapter, c2h_evt) != _SUCCESS) {
diff --git a/drivers/staging/rtl8723bs/core/rtw_debug.c b/drivers/staging/rtl8723bs/core/rtw_debug.c
index 3db02e9f27ab..b5dd244fee8f 100644
--- a/drivers/staging/rtl8723bs/core/rtw_debug.c
+++ b/drivers/staging/rtl8723bs/core/rtw_debug.c
@@ -1122,7 +1122,8 @@ int proc_get_rx_ampdu(struct seq_file *m, void *v)
 
         if (pregpriv)
                 DBG_871X_SEL_NL(m,
-                        "bAcceptAddbaReq = %d , 0:Reject AP's Add BA req, 1:Accept AP's Add BA req.\n", pmlmeinfo->bAcceptAddbaReq
+                        "accept_addba_req = %d , 0:Reject AP's Add BA req, 1:Accept AP's Add BA req.\n",
+                        pmlmeinfo->accept_addba_req
                         );
 
         return 0;
@@ -1146,8 +1147,9 @@ ssize_t proc_set_rx_ampdu(struct file *file, const char __user *buffer, size_t c
                 sscanf(tmp, "%d ", &mode);
 
                 if (pregpriv && mode < 2) {
-                        pmlmeinfo->bAcceptAddbaReq = mode;
-                        DBG_871X("pmlmeinfo->bAcceptAddbaReq =%d\n", pmlmeinfo->bAcceptAddbaReq);
+                        pmlmeinfo->accept_addba_req = mode;
+                        DBG_871X("pmlmeinfo->accept_addba_req =%d\n",
+                                 pmlmeinfo->accept_addba_req);
                         if (mode == 0) {
                                 /*tear down Rx AMPDU*/
                                 send_delba(padapter, 0, get_my_bssid(&(pmlmeinfo->network)));/* recipient*/
diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index 7b37e085b793..9167900b5f7d 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -1189,9 +1189,9 @@ void rtw_macaddr_cfg(struct device *dev, u8 *mac_addr)
              (mac[3] == 0xff) && (mac[4] == 0xff) && (mac[5] == 0xff)) ||
             ((mac[0] == 0x00) && (mac[1] == 0x00) && (mac[2] == 0x00) &&
              (mac[3] == 0x00) && (mac[4] == 0x00) && (mac[5] == 0x00))) {
-                if (np &&
-                    (addr = of_get_property(np, "local-mac-address", &len)) &&
-                    len == ETH_ALEN) {
+                if (np &&
+                    (addr = of_get_property(np, "local-mac-address", &len)) &&
+                    len == ETH_ALEN) {
                         memcpy(mac_addr, addr, ETH_ALEN);
                 } else {
                         mac[0] = 0x00;
diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index d815a693fa64..e5354cec8dd5 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -590,14 +590,10 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum NDIS_802_11
 u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep)
 {
 
-        u8 bdefaultkey;
-        u8 btransmitkey;
         sint            keyid, res;
         struct security_priv *psecuritypriv = &(padapter->securitypriv);
         u8 ret = _SUCCESS;
 
-        bdefaultkey = (wep->KeyIndex & 0x40000000) > 0 ? false : true;   /* for ??? */
-        btransmitkey = (wep->KeyIndex & 0x80000000) > 0 ? true  : false;        /* for ??? */
         keyid = wep->KeyIndex & 0x3fffffff;
 
         if (keyid >= 4) {
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index cb8a95aabd6c..fe739eb2cf7d 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -28,9 +28,6 @@ sint	_rtw_init_mlme_priv(struct adapter *padapter)
         struct mlme_priv        *pmlmepriv = &padapter->mlmepriv;
         sint    res = _SUCCESS;
 
-        /*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
-        /* memset((u8 *)pmlmepriv, 0, sizeof(struct mlme_priv)); */
-
         pmlmepriv->nic_hdl = (u8 *)padapter;
 
         pmlmepriv->pscanned = NULL;
@@ -1817,8 +1814,10 @@ void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf)
 * _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss
 * @adapter: pointer to struct adapter structure
 */
-void _rtw_join_timeout_handler (struct adapter *adapter)
+void _rtw_join_timeout_handler(struct timer_list *t)
 {
+        struct adapter *adapter = from_timer(adapter, t,
+                                                  mlmepriv.assoc_timer);
         struct  mlme_priv *pmlmepriv = &adapter->mlmepriv;
 
         DBG_871X("%s, fw_state =%x\n", __func__, get_fwstate(pmlmepriv));
@@ -1870,8 +1869,10 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
 * rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey
 * @adapter: pointer to struct adapter structure
 */
-void rtw_scan_timeout_handler (struct adapter *adapter)
+void rtw_scan_timeout_handler(struct timer_list *t)
 {
+        struct adapter *adapter = from_timer(adapter, t,
+                                                  mlmepriv.scan_to_timer);
         struct  mlme_priv *pmlmepriv = &adapter->mlmepriv;
 
         DBG_871X(FUNC_ADPT_FMT" fw_state =%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv));
@@ -1934,7 +1935,7 @@ exit:
         return;
 }
 
-void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
+void rtw_dynamic_check_timer_handler(struct adapter *adapter)
 {
         if (!adapter)
                 return;
@@ -2271,13 +2272,13 @@ sint rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv)
         struct  cmd_priv *pcmdpriv = &(adapter->cmdpriv);
         sint            res = _SUCCESS;
 
-        pcmd = (struct  cmd_obj *)rtw_zmalloc(sizeof(struct     cmd_obj));
+        pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
         if (pcmd == NULL) {
                 res = _FAIL;  /* try again */
                 goto exit;
         }
 
-        psetauthparm = (struct setauth_parm *)rtw_zmalloc(sizeof(struct setauth_parm));
+        psetauthparm = rtw_zmalloc(sizeof(struct setauth_parm));
         if (psetauthparm == NULL) {
                 kfree((unsigned char *)pcmd);
                 res = _FAIL;
@@ -2312,7 +2313,7 @@ sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, s
         struct cmd_priv         *pcmdpriv = &(adapter->cmdpriv);
         sint    res = _SUCCESS;
 
-        psetkeyparm = (struct setkey_parm *)rtw_zmalloc(sizeof(struct setkey_parm));
+        psetkeyparm = rtw_zmalloc(sizeof(struct setkey_parm));
         if (psetkeyparm == NULL) {
                 res = _FAIL;
                 goto exit;
@@ -2364,7 +2365,7 @@ sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, s
 
 
         if (enqueue) {
-                pcmd = (struct  cmd_obj *)rtw_zmalloc(sizeof(struct     cmd_obj));
+                pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
                 if (pcmd == NULL) {
                         kfree((unsigned char *)psetkeyparm);
                         res = _FAIL;  /* try again */
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index b6d137f505e1..7d7756e40bcb 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -17,6 +17,7 @@
 #include <drv_types.h>
 #include <rtw_debug.h>
 #include <rtw_wifi_regd.h>
+#include <linux/kernel.h>
 
 
 static struct mlme_handler mlme_sta_tbl[] = {
@@ -474,15 +475,12 @@ int	init_mlme_ext_priv(struct adapter *padapter)
         struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
         struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
 
-        /*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
-        /* memset((u8 *)pmlmeext, 0, sizeof(struct mlme_ext_priv)); */
-
         pmlmeext->padapter = padapter;
 
         /* fill_fwpriv(padapter, &(pmlmeext->fwpriv)); */
 
         init_mlme_ext_priv_value(padapter);
-        pmlmeinfo->bAcceptAddbaReq = pregistrypriv->bAcceptAddbaReq;
+        pmlmeinfo->accept_addba_req = pregistrypriv->accept_addba_req;
 
         init_mlme_ext_timer(padapter);
 
@@ -510,7 +508,7 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)
         if (!padapter)
                 return;
 
-        if (padapter->bDriverStopped == true) {
+        if (padapter->bDriverStopped) {
                 del_timer_sync(&pmlmeext->survey_timer);
                 del_timer_sync(&pmlmeext->link_timer);
                 /* del_timer_sync(&pmlmeext->ADDBA_timer); */
@@ -562,7 +560,7 @@ void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame)
 
         index = GetFrameSubType(pframe) >> 4;
 
-        if (index >= (sizeof(mlme_sta_tbl) / sizeof(struct mlme_handler))) {
+        if (index >= ARRAY_SIZE(mlme_sta_tbl)) {
                 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("Currently we do not support reserved sub-fr-type =%d\n", index));
                 return;
         }
@@ -582,11 +580,11 @@ void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame)
 
         switch (GetFrameSubType(pframe)) {
         case WIFI_AUTH:
-                if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
+                if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
                         ptable->func = &OnAuth;
                 else
                         ptable->func = &OnAuthClient;
-                /* pass through */
+                /* fall through */
         case WIFI_ASSOCREQ:
         case WIFI_REASSOCREQ:
                 _mgt_dispatcher(padapter, ptable, precv_frame);
@@ -637,8 +635,8 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)
         /* DBG_871X("+OnProbeReq\n"); */
 
 #ifdef CONFIG_AUTO_AP_MODE
-        if (check_fwstate(pmlmepriv, _FW_LINKED) == true &&
-                        pmlmepriv->cur_network.join_res == true) {
+        if (check_fwstate(pmlmepriv, _FW_LINKED) &&
+                        pmlmepriv->cur_network.join_res) {
                 struct sta_info *psta;
                 u8 *mac_addr, *peer_addr;
                 struct sta_priv *pstapriv = &padapter->stapriv;
@@ -752,7 +750,7 @@ _non_rc_device:
 
         /* check (wildcard) SSID */
         if (p != NULL) {
-                if (is_valid_p2p_probereq == true)
+                if (is_valid_p2p_probereq)
                         goto _issue_probersp;
 
                 if ((ielen != 0 && false == !memcmp((void *)(p+2), (void *)cur->Ssid.Ssid, cur->Ssid.SsidLength))
@@ -761,8 +759,8 @@ _non_rc_device:
                         return _SUCCESS;
 
 _issue_probersp:
-                if (((check_fwstate(pmlmepriv, _FW_LINKED) == true &&
-                        pmlmepriv->cur_network.join_res == true)) || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
+                if ((check_fwstate(pmlmepriv, _FW_LINKED)  &&
+                        pmlmepriv->cur_network.join_res) || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
                         /* DBG_871X("+issue_probersp during ap mode\n"); */
                         issue_probersp(padapter, get_sa(pframe), is_valid_p2p_probereq);
                 }
@@ -818,7 +816,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)
         if (!memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) {
                 if (pmlmeinfo->state & WIFI_FW_AUTH_NULL) {
                         /* we should update current network before auth, or some IE is wrong */
-                        pbss = (struct wlan_bssid_ex *)rtw_malloc(sizeof(struct wlan_bssid_ex));
+                        pbss = rtw_malloc(sizeof(struct wlan_bssid_ex));
                         if (pbss) {
                                 if (collect_bss_info(padapter, precv_frame, pbss) == _SUCCESS) {
                                         update_network(&(pmlmepriv->cur_network.network), pbss, padapter, true);
@@ -1773,7 +1771,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)
 
         DBG_871X("%s Reason code(%d)\n", __func__, reason);
 
-        if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
+        if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
                 struct sta_info *psta;
                 struct sta_priv *pstapriv = &padapter->stapriv;
 
@@ -1848,7 +1846,7 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)
 
         DBG_871X("%s Reason code(%d)\n", __func__, reason);
 
-        if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
+        if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
                 struct sta_info *psta;
                 struct sta_priv *pstapriv = &padapter->stapriv;
 
@@ -1976,7 +1974,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra
                         /* process_addba_req(padapter, (u8 *)&(pmlmeinfo->ADDBA_req), GetAddr3Ptr(pframe)); */
                         process_addba_req(padapter, (u8 *)&(pmlmeinfo->ADDBA_req), addr);
 
-                        if (pmlmeinfo->bAcceptAddbaReq == true) {
+                        if (pmlmeinfo->accept_addba_req) {
                                 issue_action_BA(padapter, addr, RTW_WLAN_ACTION_ADDBA_RESP, 0);
                         } else{
                                 issue_action_BA(padapter, addr, RTW_WLAN_ACTION_ADDBA_RESP, 37);/* reject ADDBA Req */
@@ -2227,7 +2225,7 @@ unsigned int OnAction(struct adapter *padapter, union recv_frame *precv_frame)
 
         category = frame_body[0];
 
-        for (i = 0; i < sizeof(OnAction_tbl)/sizeof(struct action_handler); i++) {
+        for (i = 0; i < ARRAY_SIZE(OnAction_tbl); i++) {
                 ptable = &OnAction_tbl[i];
 
                 if (category == ptable->num)
@@ -2350,8 +2348,8 @@ void update_mgntframe_attrib_addr(struct adapter *padapter, struct xmit_frame *p
 
 void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe)
 {
-        if (padapter->bSurpriseRemoved == true ||
-                padapter->bDriverStopped == true) {
+        if (padapter->bSurpriseRemoved ||
+                padapter->bDriverStopped) {
                 rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
                 rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
                 return;
@@ -2368,8 +2366,8 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr
         struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
         struct submit_ctx sctx;
 
-        if (padapter->bSurpriseRemoved == true ||
-                padapter->bDriverStopped == true) {
+        if (padapter->bSurpriseRemoved ||
+                padapter->bDriverStopped) {
                 rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
                 rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
                 return ret;
@@ -2397,8 +2395,8 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg
         u32 timeout_ms = 500;/*   500ms */
         struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 
-        if (padapter->bSurpriseRemoved == true ||
-                padapter->bDriverStopped == true) {
+        if (padapter->bSurpriseRemoved ||
+                padapter->bDriverStopped) {
                 rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
                 rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
                 return -1;
@@ -2833,7 +2831,9 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
 
 }
 
-static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, u8 ch, bool append_wps, int wait_ack)
+static int _issue_probereq(struct adapter *padapter,
+                           struct ndis_802_11_ssid *pssid,
+                           u8 *da, u8 ch, bool append_wps, bool wait_ack)
 {
         int ret = _FAIL;
         struct xmit_frame               *pmgntframe;
@@ -3394,7 +3394,7 @@ void issue_assocreq(struct adapter *padapter)
                         pframe = rtw_set_ie(pframe, EID_WPA2, pIE->Length, pIE->data, &(pattrib->pktlen));
                         break;
                 case EID_HTCapability:
-                        if (padapter->mlmepriv.htpriv.ht_option == true) {
+                        if (padapter->mlmepriv.htpriv.ht_option) {
                                 if (!(is_ap_in_tkip(padapter))) {
                                         memcpy(&(pmlmeinfo->HT_caps), pIE->data, sizeof(struct HT_caps_element));
                                         pframe = rtw_set_ie(pframe, EID_HTCapability, pIE->Length, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen));
@@ -3403,7 +3403,7 @@ void issue_assocreq(struct adapter *padapter)
                         break;
 
                 case EID_EXTCapability:
-                        if (padapter->mlmepriv.htpriv.ht_option == true)
+                        if (padapter->mlmepriv.htpriv.ht_option)
                                 pframe = rtw_set_ie(pframe, EID_EXTCapability, pIE->Length, pIE->data, &(pattrib->pktlen));
                         break;
                 default:
@@ -3432,7 +3432,8 @@ exit:
 }
 
 /* when wait_ack is ture, this function shoule be called at process context */
-static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int wait_ack)
+static int _issue_nulldata(struct adapter *padapter, unsigned char *da,
+                           unsigned int power_mode, bool wait_ack)
 {
         int ret = _FAIL;
         struct xmit_frame                       *pmgntframe;
@@ -3593,7 +3594,8 @@ s32 issue_nulldata_in_interrupt(struct adapter *padapter, u8 *da)
 }
 
 /* when wait_ack is ture, this function shoule be called at process context */
-static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int wait_ack)
+static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da,
+                               u16 tid, bool wait_ack)
 {
         int ret = _FAIL;
         struct xmit_frame                       *pmgntframe;
@@ -3717,7 +3719,8 @@ exit:
         return ret;
 }
 
-static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short reason, u8 wait_ack)
+static int _issue_deauth(struct adapter *padapter, unsigned char *da,
+                         unsigned short reason, bool wait_ack)
 {
         struct xmit_frame                       *pmgntframe;
         struct pkt_attrib                       *pattrib;
@@ -4219,7 +4222,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
 
         if (initiator == 0) {/*  recipient */
                 for (tid = 0; tid < MAXTID; tid++) {
-                        if (psta->recvreorder_ctrl[tid].enable == true) {
+                        if (psta->recvreorder_ctrl[tid].enable) {
                                 DBG_871X("rx agg disable tid(%d)\n", tid);
                                 issue_action_BA(padapter, addr, RTW_WLAN_ACTION_DELBA, (((tid << 1) | initiator)&0x1F));
                                 psta->recvreorder_ctrl[tid].enable = false;
@@ -4408,7 +4411,7 @@ void site_survey(struct adapter *padapter)
                         Restore_DM_Func_Flag(padapter);
                         /* Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true); */
 
-                        if (is_client_associated_to_ap(padapter) == true)
+                        if (is_client_associated_to_ap(padapter))
                                 issue_nulldata(padapter, NULL, 0, 3, 500);
 
                         val8 = 0; /* survey done */
@@ -5049,12 +5052,12 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame
         pmlmeext = &padapter->mlmeextpriv;
         pcmdpriv = &padapter->cmdpriv;
 
-        pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
         if (pcmd_obj == NULL)
                 return;
 
         cmdsz = (sizeof(struct survey_event) + sizeof(struct C2HEvent_Header));
-        pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+        pevtcmd = rtw_zmalloc(cmdsz);
         if (pevtcmd == NULL) {
                 kfree((u8 *)pcmd_obj);
                 return;
@@ -5102,12 +5105,12 @@ void report_surveydone_event(struct adapter *padapter)
         struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-        pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
         if (pcmd_obj == NULL)
                 return;
 
         cmdsz = (sizeof(struct surveydone_event) + sizeof(struct C2HEvent_Header));
-        pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+        pevtcmd = rtw_zmalloc(cmdsz);
         if (pevtcmd == NULL) {
                 kfree((u8 *)pcmd_obj);
                 return;
@@ -5149,12 +5152,12 @@ void report_join_res(struct adapter *padapter, int res)
         struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-        pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
         if (pcmd_obj == NULL)
                 return;
 
         cmdsz = (sizeof(struct joinbss_event) + sizeof(struct C2HEvent_Header));
-        pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+        pevtcmd = rtw_zmalloc(cmdsz);
         if (pevtcmd == NULL) {
                 kfree((u8 *)pcmd_obj);
                 return;
@@ -5200,12 +5203,12 @@ void report_wmm_edca_update(struct adapter *padapter)
         struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-        pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
         if (pcmd_obj == NULL)
                 return;
 
         cmdsz = (sizeof(struct wmm_event) + sizeof(struct C2HEvent_Header));
-        pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+        pevtcmd = rtw_zmalloc(cmdsz);
         if (pevtcmd == NULL) {
                 kfree((u8 *)pcmd_obj);
                 return;
@@ -5246,13 +5249,13 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi
         struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-        pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
         if (pcmd_obj == NULL) {
                 return;
         }
 
         cmdsz = (sizeof(struct stadel_event) + sizeof(struct C2HEvent_Header));
-        pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+        pevtcmd = rtw_zmalloc(cmdsz);
         if (pevtcmd == NULL) {
                 kfree((u8 *)pcmd_obj);
                 return;
@@ -5302,12 +5305,12 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int
         struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
         struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-        pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
         if (pcmd_obj == NULL)
                 return;
 
         cmdsz = (sizeof(struct stassoc_event) + sizeof(struct C2HEvent_Header));
-        pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+        pevtcmd = rtw_zmalloc(cmdsz);
         if (pevtcmd == NULL) {
                 kfree((u8 *)pcmd_obj);
                 return;
@@ -5445,7 +5448,7 @@ static void rtw_mlmeext_disconnect(struct adapter *padapter)
         pmlmeinfo->state = WIFI_FW_NULL_STATE;
 
         if (state_backup == WIFI_FW_STATION_STATE) {
-                if (rtw_port_switch_chk(padapter) == true) {
+                if (rtw_port_switch_chk(padapter)) {
                         rtw_hal_set_hwreg(padapter, HW_VAR_PORT_SWITCH, NULL);
                         {
                                 struct adapter *port0_iface = dvobj_get_port0_adapter(adapter_to_dvobj(padapter));
@@ -5534,7 +5537,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
                 rtw_hal_macid_wakeup(padapter, psta->mac_id);
         }
 
-        if (rtw_port_switch_chk(padapter) == true)
+        if (rtw_port_switch_chk(padapter))
                 rtw_hal_set_hwreg(padapter, HW_VAR_PORT_SWITCH, NULL);
 
         join_type = 2;
@@ -5659,7 +5662,7 @@ void _linked_info_dump(struct adapter *padapter)
 
                 }
                 for (i = 0; i < NUM_STA; i++) {
-                        if (pdvobj->macid[i] == true) {
+                        if (pdvobj->macid[i]) {
                                 if (i != 1) /* skip bc/mc sta */
                                         /*   tx info ============ */
                                         rtw_hal_get_def_var(padapter, HW_DEF_RA_INFO_DUMP, &i);
@@ -5827,8 +5830,10 @@ void linked_status_chk(struct adapter *padapter)
 
 }
 
-void survey_timer_hdl(struct adapter *padapter)
+void survey_timer_hdl(struct timer_list *t)
 {
+        struct adapter *padapter =
+                from_timer(padapter, t, mlmeextpriv.survey_timer);
         struct cmd_obj  *ph2c;
         struct sitesurvey_parm  *psurveyPara;
         struct cmd_priv                                 *pcmdpriv = &padapter->cmdpriv;
@@ -5842,7 +5847,7 @@ void survey_timer_hdl(struct adapter *padapter)
                         pmlmeext->sitesurvey_res.channel_idx++;
                 }
 
-                if (pmlmeext->scan_abort == true) {
+                if (pmlmeext->scan_abort) {
                         {
                                 pmlmeext->sitesurvey_res.channel_idx = pmlmeext->sitesurvey_res.ch_num;
                                 DBG_871X("%s idx:%d\n", __func__
@@ -5853,12 +5858,12 @@ void survey_timer_hdl(struct adapter *padapter)
                         pmlmeext->scan_abort = false;/* reset */
                 }
 
-                ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+                ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
                 if (ph2c == NULL) {
                         goto exit_survey_timer_hdl;
                 }
 
-                psurveyPara = (struct sitesurvey_parm *)rtw_zmalloc(sizeof(struct sitesurvey_parm));
+                psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm));
                 if (psurveyPara == NULL) {
                         kfree((unsigned char *)ph2c);
                         goto exit_survey_timer_hdl;
@@ -5874,8 +5879,10 @@ exit_survey_timer_hdl:
         return;
 }
 
-void link_timer_hdl(struct adapter *padapter)
+void link_timer_hdl(struct timer_list *t)
 {
+        struct adapter *padapter =
+                from_timer(padapter, t, mlmeextpriv.link_timer);
         /* static unsigned int          rx_pkt = 0; */
         /* static u64                           tx_cnt = 0; */
         /* struct xmit_priv     *pxmitpriv = &(padapter->xmitpriv); */
@@ -5924,8 +5931,9 @@ void link_timer_hdl(struct adapter *padapter)
         return;
 }
 
-void addba_timer_hdl(struct sta_info *psta)
+void addba_timer_hdl(struct timer_list *t)
 {
+        struct sta_info *psta = from_timer(psta, t, addba_retry_timer);
         struct ht_priv *phtpriv;
 
         if (!psta)
@@ -5933,20 +5941,22 @@ void addba_timer_hdl(struct sta_info *psta)
 
         phtpriv = &psta->htpriv;
 
-        if ((phtpriv->ht_option == true) && (phtpriv->ampdu_enable == true)) {
+        if (phtpriv->ht_option && phtpriv->ampdu_enable) {
                 if (phtpriv->candidate_tid_bitmap)
                         phtpriv->candidate_tid_bitmap = 0x0;
 
         }
 }
 
-void sa_query_timer_hdl(struct adapter *padapter)
+void sa_query_timer_hdl(struct timer_list *t)
 {
+        struct adapter *padapter =
+                from_timer(padapter, t, mlmeextpriv.sa_query_timer);
         struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
         /* disconnect */
         spin_lock_bh(&pmlmepriv->lock);
 
-        if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
+        if (check_fwstate(pmlmepriv, _FW_LINKED)) {
                 rtw_disassoc_cmd(padapter, 0, true);
                 rtw_indicate_disconnect(padapter);
                 rtw_free_assoc_resources(padapter, 1);
@@ -6084,7 +6094,7 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf)
                 rtw_auto_ap_start_beacon(padapter);
 #endif
 
-        if (rtw_port_switch_chk(padapter) == true) {
+        if (rtw_port_switch_chk(padapter)) {
                 rtw_hal_set_hwreg(padapter, HW_VAR_PORT_SWITCH, NULL);
 
                 if (psetop->mode == Ndis802_11APMode)
@@ -6358,7 +6368,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c
                 set_idx = rtw_ch_set_search_ch(pmlmeext->channel_set, in[i].hw_value);
                 if (in[i].hw_value && !(in[i].flags & RTW_IEEE80211_CHAN_DISABLED)
                         && set_idx >= 0
-                        && rtw_mlme_band_check(padapter, in[i].hw_value) == true
+                        && rtw_mlme_band_check(padapter, in[i].hw_value)
                 ) {
                         if (j >= out_num) {
                                 DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" out_num:%u not enough\n",
@@ -6383,7 +6393,7 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c
 
                         DBG_871X(FUNC_ADPT_FMT" ch:%u\n", FUNC_ADPT_ARG(padapter), pmlmeext->channel_set[i].ChannelNum);
 
-                        if (rtw_mlme_band_check(padapter, pmlmeext->channel_set[i].ChannelNum) == true) {
+                        if (rtw_mlme_band_check(padapter, pmlmeext->channel_set[i].ChannelNum)) {
 
                                 if (j >= out_num) {
                                         DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" out_num:%u not enough\n",
@@ -6435,7 +6445,7 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf)
                 pmlmeext->sitesurvey_res.scan_mode = pparm->scan_mode;
 
                 /* issue null data if associating to the AP */
-                if (is_client_associated_to_ap(padapter) == true) {
+                if (is_client_associated_to_ap(padapter)) {
                         pmlmeext->sitesurvey_res.state = SCAN_TXNULL;
 
                         issue_nulldata(padapter, NULL, 1, 3, 500);
@@ -6602,7 +6612,7 @@ u8 chk_bmc_sleepq_cmd(struct adapter *padapter)
         struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
         u8 res = _SUCCESS;
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
@@ -6626,13 +6636,13 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
         u8 res = _SUCCESS;
         int len_diff = 0;
 
-        ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
         if (ph2c == NULL) {
                 res = _FAIL;
                 goto exit;
         }
 
-        ptxBeacon_parm = (struct Tx_Beacon_param *)rtw_zmalloc(sizeof(struct Tx_Beacon_param));
+        ptxBeacon_parm = rtw_zmalloc(sizeof(struct Tx_Beacon_param));
         if (ptxBeacon_parm == NULL) {
                 kfree((unsigned char *)ph2c);
                 res = _FAIL;
@@ -6767,7 +6777,7 @@ u8 chk_bmc_sleepq_hdl(struct adapter *padapter, unsigned char *pbuf)
 
                         pxmitframe->attrib.triggered = 1;
 
-                        if (xmitframe_hiq_filter(pxmitframe) == true)
+                        if (xmitframe_hiq_filter(pxmitframe))
                                 pxmitframe->attrib.qsel = 0x11;/* HIQ */
 
                         rtw_hal_xmitframe_enqueue(padapter, pxmitframe);
@@ -6809,7 +6819,7 @@ int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset
                 connect_allow = false;
         }
 
-        if (connect_allow == true) {
+        if (connect_allow) {
                 DBG_871X("start_join_set_ch_bw: ch =%d, bwmode =%d, ch_offset =%d\n", cur_ch, cur_bw, cur_ch_offset);
                 *ch = cur_ch;
                 *bw = cur_bw;
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index aabdaafcbdd3..4a6af72013fa 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -34,7 +34,7 @@ void _ips_enter(struct adapter *padapter)
 
         if (rf_off == pwrpriv->change_rfpwrstate) {
                 pwrpriv->bpower_saving = true;
-                DBG_871X_LEVEL(_drv_always_, "nolinked power save enter\n");
+                DBG_871X("nolinked power save enter\n");
 
                 if (pwrpriv->ips_mode == IPS_LEVEL_2)
                         pwrpriv->bkeepfwalive = true;
@@ -73,7 +73,7 @@ int _ips_leave(struct adapter *padapter)
                 if (result == _SUCCESS) {
                         pwrpriv->rf_pwrstate = rf_on;
                 }
-                DBG_871X_LEVEL(_drv_always_, "nolinked power save leave\n");
+                DBG_871X("nolinked power save leave\n");
 
                 DBG_871X("==> ips_leave.....LED(0x%08x)...\n", rtw_read32(padapter, 0x4c));
                 pwrpriv->bips_processing = false;
@@ -201,10 +201,12 @@ exit:
         return;
 }
 
-void pwr_state_check_handler(RTW_TIMER_HDL_ARGS);
-void pwr_state_check_handler(RTW_TIMER_HDL_ARGS)
+static void pwr_state_check_handler(struct timer_list *t)
 {
-        struct adapter *padapter = (struct adapter *)FunctionContext;
+        struct pwrctrl_priv *pwrctrlpriv =
+                from_timer(pwrctrlpriv, t, pwr_state_check_timer);
+        struct adapter *padapter = pwrctrlpriv->adapter;
+
         rtw_ps_cmd(padapter);
 }
 
@@ -823,14 +825,10 @@ exit:
 /*
  * This function is a timer handler, can't do any IO in it.
  */
-static void pwr_rpwm_timeout_handler(void *FunctionContext)
+static void pwr_rpwm_timeout_handler(struct timer_list *t)
 {
-        struct adapter *padapter;
-        struct pwrctrl_priv *pwrpriv;
-
+        struct pwrctrl_priv *pwrpriv = from_timer(pwrpriv, t, pwr_rpwm_timer);
 
-        padapter = FunctionContext;
-        pwrpriv = adapter_to_pwrctl(padapter);
         DBG_871X("+%s: rpwm = 0x%02X cpwm = 0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
 
         if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2)) {
@@ -1154,7 +1152,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
 
         pwrctrlpriv->LpsIdleCount = 0;
         pwrctrlpriv->power_mgnt = padapter->registrypriv.power_mgnt;/*  PS_MODE_MIN; */
-        pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt)?true:false;
+        pwrctrlpriv->bLeisurePs = pwrctrlpriv->power_mgnt != PS_MODE_ACTIVE;
 
         pwrctrlpriv->bFwCurrentInPSMode = false;
 
@@ -1173,10 +1171,11 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
         _init_workitem(&pwrctrlpriv->cpwm_event, cpwm_event_callback, NULL);
 
         pwrctrlpriv->brpwmtimeout = false;
+        pwrctrlpriv->adapter = padapter;
         _init_workitem(&pwrctrlpriv->rpwmtimeoutwi, rpwmtimeout_workitem_callback, NULL);
-        _init_timer(&pwrctrlpriv->pwr_rpwm_timer, padapter->pnetdev, pwr_rpwm_timeout_handler, padapter);
-
-        rtw_init_timer(&pwrctrlpriv->pwr_state_check_timer, padapter, pwr_state_check_handler);
+        timer_setup(&pwrctrlpriv->pwr_rpwm_timer, pwr_rpwm_timeout_handler, 0);
+        timer_setup(&pwrctrlpriv->pwr_state_check_timer,
+                    pwr_state_check_handler, 0);
 
         pwrctrlpriv->wowlan_mode = false;
         pwrctrlpriv->wowlan_ap_mode = false;
@@ -1193,8 +1192,6 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
 
 void rtw_free_pwrctrl_priv(struct adapter *adapter)
 {
-        /* memset((unsigned char *)pwrctrlpriv, 0, sizeof(struct pwrctrl_priv)); */
-
 #ifdef CONFIG_PNO_SUPPORT
         if (pwrctrlpriv->pnlo_info != NULL)
                 printk("****** pnlo_info memory leak********\n");
@@ -1327,7 +1324,8 @@ int rtw_pm_set_lps(struct adapter *padapter, u8 mode)
                                 pwrctrlpriv->LpsIdleCount = 2;
 
                         pwrctrlpriv->power_mgnt = mode;
-                        pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt)?true:false;
+                        pwrctrlpriv->bLeisurePs =
+                                pwrctrlpriv->power_mgnt != PS_MODE_ACTIVE;
                 }
         } else
                 ret = -EINVAL;
diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 68a6303e2754..9c7c3be0553a 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -26,7 +26,7 @@ u8 rtw_rfc1042_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
 /* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
 u8 rtw_bridge_tunnel_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
 
-void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS);
+static void rtw_signal_stat_timer_hdl(struct timer_list *t);
 
 void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)
 {
@@ -46,9 +46,6 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
         union recv_frame *precvframe;
         sint    res = _SUCCESS;
 
-        /*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
-        /* memset((unsigned char *)precvpriv, 0, sizeof (struct  recv_priv)); */
-
         spin_lock_init(&precvpriv->lock);
 
         _rtw_init_queue(&precvpriv->free_recv_queue);
@@ -65,7 +62,6 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
                 res = _FAIL;
                 goto exit;
         }
-        /* memset(precvpriv->pallocated_frame_buf, 0, NR_RECVFRAME * sizeof(union recv_frame) + RXFRAME_ALIGN_SZ); */
 
         precvpriv->precv_frame_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pallocated_frame_buf), RXFRAME_ALIGN_SZ);
         /* precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf + RXFRAME_ALIGN_SZ - */
@@ -90,7 +86,8 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
 
         res = rtw_hal_init_recv_priv(padapter);
 
-        rtw_init_timer(&precvpriv->signal_stat_timer, padapter, rtw_signal_stat_timer_hdl);
+        timer_setup(&precvpriv->signal_stat_timer, rtw_signal_stat_timer_hdl,
+                    0);
 
         precvpriv->signal_stat_sampling_interval = 2000; /* ms */
 
@@ -129,7 +126,7 @@ union recv_frame *_rtw_alloc_recvframe(struct __queue *pfree_recv_queue)
 
                 plist = get_next(phead);
 
-                precvframe = LIST_CONTAINOR(plist, union recv_frame, u);
+                precvframe = (union recv_frame *)plist;
 
                 list_del_init(&precvframe->u.hdr.list);
                 padapter = precvframe->u.hdr.adapter;
@@ -243,7 +240,7 @@ void rtw_free_recvframe_queue(struct __queue *pframequeue,  struct __queue *pfre
         plist = get_next(phead);
 
         while (phead != plist) {
-                precvframe = LIST_CONTAINOR(plist, union recv_frame, u);
+                precvframe = (union recv_frame *)plist;
 
                 plist = get_next(plist);
 
@@ -1732,7 +1729,7 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter,
 
         phead = get_list_head(defrag_q);
         plist = get_next(phead);
-        prframe = LIST_CONTAINOR(plist, union recv_frame, u);
+        prframe = (union recv_frame *)plist;
         pfhdr = &prframe->u.hdr;
         list_del_init(&(prframe->u.list));
 
@@ -1754,7 +1751,7 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter,
         data = get_recvframe_data(prframe);
 
         while (phead != plist) {
-                pnextrframe = LIST_CONTAINOR(plist, union recv_frame, u);
+                pnextrframe = (union recv_frame *)plist;
                 pnfhdr = &pnextrframe->u.hdr;
 
 
@@ -2071,7 +2068,7 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
         plist = get_next(phead);
 
         while (phead != plist) {
-                pnextrframe = LIST_CONTAINOR(plist, union recv_frame, u);
+                pnextrframe = (union recv_frame *)plist;
                 pnextattrib = &pnextrframe->u.hdr.attrib;
 
                 if (SN_LESS(pnextattrib->seq_num, pattrib->seq_num))
@@ -2146,7 +2143,7 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr
                         return true;
                 }
 
-                prframe = LIST_CONTAINOR(plist, union recv_frame, u);
+                prframe = (union recv_frame *)plist;
                 pattrib = &prframe->u.hdr.attrib;
 
                 #ifdef DBG_RX_SEQ
@@ -2162,7 +2159,7 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr
         /*  Check if there is any packet need indicate. */
         while (!list_empty(phead)) {
 
-                prframe = LIST_CONTAINOR(plist, union recv_frame, u);
+                prframe = (union recv_frame *)plist;
                 pattrib = &prframe->u.hdr.attrib;
 
                 if (!SN_LESS(preorder_ctrl->indicate_seq, pattrib->seq_num)) {
@@ -2358,9 +2355,10 @@ _err_exit:
 }
 
 
-void rtw_reordering_ctrl_timeout_handler(void *pcontext)
+void rtw_reordering_ctrl_timeout_handler(struct timer_list *t)
 {
-        struct recv_reorder_ctrl *preorder_ctrl = pcontext;
+        struct recv_reorder_ctrl *preorder_ctrl =
+                from_timer(preorder_ctrl, t, reordering_ctrl_timer);
         struct adapter *padapter = preorder_ctrl->padapter;
         struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
 
@@ -2601,9 +2599,10 @@ _recv_entry_drop:
         return ret;
 }
 
-void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS)
+static void rtw_signal_stat_timer_hdl(struct timer_list *t)
 {
-        struct adapter *adapter = (struct adapter *)FunctionContext;
+        struct adapter *adapter =
+                from_timer(adapter, t, recvpriv.signal_stat_timer);
         struct recv_priv *recvpriv = &adapter->recvpriv;
 
         u32 tmp_s, tmp_q;
diff --git a/drivers/staging/rtl8723bs/core/rtw_rf.c b/drivers/staging/rtl8723bs/core/rtw_rf.c
index b87ea4e388c0..07f5577cc073 100644
--- a/drivers/staging/rtl8723bs/core/rtw_rf.c
+++ b/drivers/staging/rtl8723bs/core/rtw_rf.c
@@ -15,6 +15,7 @@
 #define _RTW_RF_C_
 
 #include <drv_types.h>
+#include <linux/kernel.h>
 
 
 struct ch_freq {
@@ -44,20 +45,18 @@ static struct ch_freq ch_freq_map[] = {
         {216, 5080},/* Japan, means J16 */
 };
 
-static int ch_freq_map_num = (sizeof(ch_freq_map) / sizeof(struct ch_freq));
-
 u32 rtw_ch2freq(u32 channel)
 {
         u8 i;
         u32 freq = 0;
 
-        for (i = 0; i < ch_freq_map_num; i++) {
+        for (i = 0; i < ARRAY_SIZE(ch_freq_map); i++) {
                 if (channel == ch_freq_map[i].channel) {
                         freq = ch_freq_map[i].frequency;
                                 break;
                 }
         }
-        if (i == ch_freq_map_num)
+        if (i == ARRAY_SIZE(ch_freq_map))
                 freq = 2412;
 
         return freq;
diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index 06a7e4059fbb..aadf67bd0559 100644
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -2272,7 +2272,7 @@ static void *aes_encrypt_init(u8 *key, size_t len)
         u32 *rk;
         if (len != 16)
                 return NULL;
-        rk = (u32 *)rtw_malloc(AES_PRIV_SIZE);
+        rk = rtw_malloc(AES_PRIV_SIZE);
         if (rk == NULL)
                 return NULL;
         rijndaelKeySetupEnc(rk, key);
diff --git a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
index cb43ec90a648..03dd6848daa1 100644
--- a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
+++ b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
@@ -429,7 +429,7 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)
                 plist = get_next(phead);
 
                 while (!list_empty(phead)) {
-                        prframe = LIST_CONTAINOR(plist, union recv_frame, u);
+                        prframe = (union recv_frame *)plist;
 
                         plist = get_next(plist);
 
@@ -604,10 +604,10 @@ struct sta_info *rtw_get_bcmc_stainfo(struct adapter *padapter)
 
 u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)
 {
-        u8 res = true;
+        bool res = true;
         struct list_head        *plist, *phead;
         struct rtw_wlan_acl_node *paclnode;
-        u8 match = false;
+        bool match = false;
         struct sta_priv *pstapriv = &padapter->stapriv;
         struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
         struct __queue  *pacl_node_q = &pacl_list->acl_node_q;
@@ -630,10 +630,10 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)
 
 
         if (pacl_list->mode == 1) /* accept unless in deny list */
-                res = (match == true) ?  false:true;
+                res = !match;
 
         else if (pacl_list->mode == 2)/* deny unless in accept list */
-                res = (match == true) ?  true:false;
+                res = match;
         else
                  res = true;
 
diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index f485f541e36d..f6dc26c8bd3d 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1359,7 +1359,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
                 return true;
         }
 
-        bssid = (struct wlan_bssid_ex *)rtw_zmalloc(sizeof(struct wlan_bssid_ex));
+        bssid = rtw_zmalloc(sizeof(struct wlan_bssid_ex));
         if (bssid == NULL) {
                 DBG_871X("%s rtw_zmalloc fail !!!\n", __func__);
                 return true;
@@ -1946,7 +1946,7 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)
                 preorder_ctrl->indicate_seq = 0xffff;
                 #endif
 
-                preorder_ctrl->enable = (pmlmeinfo->bAcceptAddbaReq == true) ? true : false;
+                preorder_ctrl->enable = pmlmeinfo->accept_addba_req;
         }
 
 }
diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 022f654419e4..be54186fb223 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -51,9 +51,6 @@ s32	_rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
         struct xmit_frame *pxframe;
         sint    res = _SUCCESS;
 
-        /*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
-        /* memset((unsigned char *)pxmitpriv, 0, sizeof(struct xmit_priv)); */
-
         spin_lock_init(&pxmitpriv->lock);
         spin_lock_init(&pxmitpriv->lock_sctx);
         sema_init(&pxmitpriv->xmit_sema, 0);
@@ -2166,7 +2163,7 @@ void rtw_alloc_hwxmits(struct adapter *padapter)
 
         pxmitpriv->hwxmits = NULL;
 
-        pxmitpriv->hwxmits = (struct hw_xmit *)rtw_zmalloc(sizeof(struct hw_xmit) * pxmitpriv->hwxmit_entry);
+        pxmitpriv->hwxmits = rtw_zmalloc(sizeof(struct hw_xmit) * pxmitpriv->hwxmit_entry);
 
         if (pxmitpriv->hwxmits == NULL) {
                 DBG_871X("alloc hwxmits fail!...\n");
diff --git a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c
index 51d4219177d3..951585467ab1 100644
--- a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c
+++ b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c
@@ -13,7 +13,7 @@
 *
 ******************************************************************************/
 
-
+#include <linux/kernel.h>
 #include "odm_precomp.h"
 
 static bool CheckPositive(
@@ -268,7 +268,7 @@ static u32 Array_MP_8723B_AGC_TAB[] = {
 void ODM_ReadAndConfig_MP_8723B_AGC_TAB(PDM_ODM_T pDM_Odm)
 {
         u32 i = 0;
-        u32 ArrayLen = sizeof(Array_MP_8723B_AGC_TAB)/sizeof(u32);
+        u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_AGC_TAB);
         u32 *Array = Array_MP_8723B_AGC_TAB;
 
         ODM_RT_TRACE(
@@ -537,7 +537,7 @@ static u32 Array_MP_8723B_PHY_REG[] = {
 void ODM_ReadAndConfig_MP_8723B_PHY_REG(PDM_ODM_T pDM_Odm)
 {
         u32 i = 0;
-        u32 ArrayLen = sizeof(Array_MP_8723B_PHY_REG)/sizeof(u32);
+        u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_PHY_REG);
         u32 *Array = Array_MP_8723B_PHY_REG;
 
         ODM_RT_TRACE(
@@ -617,7 +617,6 @@ static u32 Array_MP_8723B_PHY_REG_PG[] = {
 void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(PDM_ODM_T pDM_Odm)
 {
         u32 i = 0;
-        u32 ArrayLen = sizeof(Array_MP_8723B_PHY_REG_PG)/sizeof(u32);
         u32 *Array = Array_MP_8723B_PHY_REG_PG;
 
         ODM_RT_TRACE(
@@ -630,7 +629,7 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(PDM_ODM_T pDM_Odm)
         pDM_Odm->PhyRegPgVersion = 1;
         pDM_Odm->PhyRegPgValueType = PHY_REG_PG_EXACT_VALUE;
 
-        for (i = 0; i < ArrayLen; i += 6) {
+        for (i = 0; i < ARRAY_SIZE(Array_MP_8723B_PHY_REG_PG); i += 6) {
                 u32 v1 = Array[i];
                 u32 v2 = Array[i+1];
                 u32 v3 = Array[i+2];
diff --git a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c
index b868e26f20ac..7f8afa1be1ca 100644
--- a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c
+++ b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c
@@ -13,7 +13,7 @@
 *
 ******************************************************************************/
 
-
+#include <linux/kernel.h>
 #include "odm_precomp.h"
 
 static bool CheckPositive(
@@ -239,7 +239,7 @@ static u32 Array_MP_8723B_MAC_REG[] = {
 void ODM_ReadAndConfig_MP_8723B_MAC_REG(PDM_ODM_T pDM_Odm)
 {
         u32 i = 0;
-        u32 ArrayLen = sizeof(Array_MP_8723B_MAC_REG)/sizeof(u32);
+        u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_MAC_REG);
         u32 *Array = Array_MP_8723B_MAC_REG;
 
         ODM_RT_TRACE(
diff --git a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
index 84a0be7ba697..fadfcbd91858 100644
--- a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
+++ b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
@@ -13,7 +13,7 @@
 *
 ******************************************************************************/
 
-
+#include <linux/kernel.h>
 #include "odm_precomp.h"
 
 static bool CheckPositive(
@@ -270,7 +270,7 @@ static u32 Array_MP_8723B_RadioA[] = {
 void ODM_ReadAndConfig_MP_8723B_RadioA(PDM_ODM_T pDM_Odm)
 {
         u32 i = 0;
-        u32 ArrayLen = sizeof(Array_MP_8723B_RadioA)/sizeof(u32);
+        u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_RadioA);
         u32 *Array = Array_MP_8723B_RadioA;
 
         ODM_RT_TRACE(
@@ -766,7 +766,6 @@ static u8 *Array_MP_8723B_TXPWR_LMT[] = {
 void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(PDM_ODM_T pDM_Odm)
 {
         u32 i = 0;
-        u32 ArrayLen = sizeof(Array_MP_8723B_TXPWR_LMT)/sizeof(u8 *);
         u8 **Array = Array_MP_8723B_TXPWR_LMT;
 
         ODM_RT_TRACE(
@@ -776,7 +775,7 @@ void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(PDM_ODM_T pDM_Odm)
                 ("===> ODM_ReadAndConfig_MP_8723B_TXPWR_LMT\n")
         );
 
-        for (i = 0; i < ArrayLen; i += 7) {
+        for (i = 0; i < ARRAY_SIZE(Array_MP_8723B_TXPWR_LMT); i += 7) {
                 u8 *regulation = Array[i];
                 u8 *band = Array[i+1];
                 u8 *bandwidth = Array[i+2];
diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
index 86fee109e42d..7d4df5a8832e 100644
--- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c
+++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
@@ -463,7 +463,7 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getType, void *pOutBuf)
                 break;
 
         case BTC_GET_BL_WIFI_UNDER_5G:
-                *pu8 = (pHalData->CurrentBandType == 1) ? true : false;
+                *pu8 = pHalData->CurrentBandType == 1;
                 break;
 
         case BTC_GET_BL_WIFI_AP_MODE_ENABLE:
@@ -1411,15 +1411,8 @@ void hal_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath)
 
 u8 hal_btcoex_Initialize(struct adapter *padapter)
 {
-        u8 ret1;
-        u8 ret2;
-
-
         memset(&GLBtCoexist, 0, sizeof(GLBtCoexist));
-        ret1 = EXhalbtcoutsrc_InitlizeVariables((void *)padapter);
-        ret2 = (ret1 == true) ? true : false;
-
-        return ret2;
+        return EXhalbtcoutsrc_InitlizeVariables((void *)padapter);
 }
 
 void hal_btcoex_PowerOnSetting(struct adapter *padapter)
diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 3e63b6d9c097..dec887a5b338 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -14,6 +14,7 @@
  ******************************************************************************/
 #define _HAL_COM_C_
 
+#include <linux/kernel.h>
 #include <drv_types.h>
 #include <rtw_debug.h>
 #include "hal_com_h2c.h"
@@ -1622,7 +1623,7 @@ void rtw_get_raw_rssi_info(void *sel, struct adapter *padapter)
                 psample_pkt_rssi->pwdball, psample_pkt_rssi->pwr_all
         );
 
-        isCCKrate = (psample_pkt_rssi->data_rate <= DESC_RATE11M) ? true : false;
+        isCCKrate = psample_pkt_rssi->data_rate <= DESC_RATE11M;
 
         if (isCCKrate)
                 psample_pkt_rssi->mimo_singal_strength[0] = psample_pkt_rssi->pwdball;
@@ -1655,7 +1656,7 @@ void rtw_dump_raw_rssi_info(struct adapter *padapter)
         DBG_871X("RxRate = %s, PWDBALL = %d(%%), rx_pwr_all = %d(dBm)\n",
                         HDATA_RATE(psample_pkt_rssi->data_rate), psample_pkt_rssi->pwdball, psample_pkt_rssi->pwr_all);
 
-        isCCKrate = (psample_pkt_rssi->data_rate <= DESC_RATE11M) ? true : false;
+        isCCKrate = psample_pkt_rssi->data_rate <= DESC_RATE11M;
 
         if (isCCKrate)
                 psample_pkt_rssi->mimo_singal_strength[0] = psample_pkt_rssi->pwdball;
@@ -1683,7 +1684,7 @@ void rtw_store_phy_info(struct adapter *padapter, union recv_frame *prframe)
         struct rx_raw_rssi *psample_pkt_rssi = &padapter->recvpriv.raw_rssi_info;
 
         psample_pkt_rssi->data_rate = pattrib->data_rate;
-        isCCKrate = (pattrib->data_rate <= DESC_RATE11M) ? true : false;
+        isCCKrate = pattrib->data_rate <= DESC_RATE11M;
 
         psample_pkt_rssi->pwdball = pPhyInfo->RxPWDBAll;
         psample_pkt_rssi->pwr_all = pPhyInfo->RecvSignalPower;
@@ -1716,7 +1717,6 @@ void rtw_bb_rf_gain_offset(struct adapter *padapter)
 {
         u8 value = padapter->eeprompriv.EEPROMRFGainOffset;
         u32 res, i = 0;
-        u32 ArrayLen = sizeof(Array_kfreemap)/sizeof(u32);
         u32 *Array = Array_kfreemap;
         u32 v1 = 0, v2 = 0, target = 0;
         /* DBG_871X("+%s value: 0x%02x+\n", __func__, value); */
@@ -1729,7 +1729,7 @@ void rtw_bb_rf_gain_offset(struct adapter *padapter)
                         res &= 0xfff87fff;
                         DBG_871X("Offset RF Gain. before reg 0x7f = 0x%08x\n", res);
                         /* res &= 0xfff87fff; */
-                        for (i = 0; i < ArrayLen; i += 2) {
+                        for (i = 0; i < ARRAY_SIZE(Array_kfreemap); i += 2) {
                                 v1 = Array[i];
                                 v2 = Array[i+1];
                                 if (v1 == padapter->eeprompriv.EEPROMRFGainVal) {
diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index 566b6f0997da..e6787c22e00b 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -17,6 +17,7 @@
 #include <drv_types.h>
 #include <rtw_debug.h>
 #include <hal_data.h>
+#include <linux/kernel.h>
 
 u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 Band, u8 RfPath,
                             u8 TxNum, enum RATE_SECTION RateSection)
@@ -860,7 +861,7 @@ struct adapter *padapter
                         for (txNum = RF_1TX; txNum < RF_MAX_TX_NUM; ++txNum) {
                                 /*  CCK */
                                 base = PHY_GetTxPowerByRate(padapter, band, path, txNum, MGN_11M);
-                                for (i = 0; i < sizeof(cckRates); ++i) {
+                                for (i = 0; i < ARRAY_SIZE(cckRates); ++i) {
                                         value = PHY_GetTxPowerByRate(padapter, band, path, txNum, cckRates[i]);
                                         PHY_SetTxPowerByRate(padapter, band, path, txNum, cckRates[i], value - base);
                                 }
@@ -939,58 +940,78 @@ void PHY_SetTxPowerIndexByRateSection(
         if (RateSection == CCK) {
                 u8 cckRates[]   = {MGN_1M, MGN_2M, MGN_5_5M, MGN_11M};
                 if (pHalData->CurrentBandType == BAND_ON_2_4G)
-                        PHY_SetTxPowerIndexByRateArray(padapter, RFPath, pHalData->CurrentChannelBW, Channel,
-                                                                          cckRates, sizeof(cckRates)/sizeof(u8));
+                        PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
+                                                     pHalData->CurrentChannelBW,
+                                                     Channel, cckRates,
+                                                     ARRAY_SIZE(cckRates));
 
         } else if (RateSection == OFDM) {
                 u8 ofdmRates[]  = {MGN_6M, MGN_9M, MGN_12M, MGN_18M, MGN_24M, MGN_36M, MGN_48M, MGN_54M};
-                PHY_SetTxPowerIndexByRateArray(padapter, RFPath, pHalData->CurrentChannelBW, Channel,
-                                                                         ofdmRates, sizeof(ofdmRates)/sizeof(u8));
+                PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
+                                               pHalData->CurrentChannelBW,
+                                               Channel, ofdmRates,
+                                               ARRAY_SIZE(ofdmRates));
 
         } else if (RateSection == HT_MCS0_MCS7) {
                 u8 htRates1T[]  = {MGN_MCS0, MGN_MCS1, MGN_MCS2, MGN_MCS3, MGN_MCS4, MGN_MCS5, MGN_MCS6, MGN_MCS7};
-                PHY_SetTxPowerIndexByRateArray(padapter, RFPath, pHalData->CurrentChannelBW, Channel,
-                                                                         htRates1T, sizeof(htRates1T)/sizeof(u8));
+                PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
+                                               pHalData->CurrentChannelBW,
+                                               Channel, htRates1T,
+                                               ARRAY_SIZE(htRates1T));
 
         } else if (RateSection == HT_MCS8_MCS15) {
                 u8 htRates2T[]  = {MGN_MCS8, MGN_MCS9, MGN_MCS10, MGN_MCS11, MGN_MCS12, MGN_MCS13, MGN_MCS14, MGN_MCS15};
-                PHY_SetTxPowerIndexByRateArray(padapter, RFPath, pHalData->CurrentChannelBW, Channel,
-                                                                         htRates2T, sizeof(htRates2T)/sizeof(u8));
+                PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
+                                               pHalData->CurrentChannelBW,
+                                               Channel, htRates2T,
+                                               ARRAY_SIZE(htRates2T));
 
         } else if (RateSection == HT_MCS16_MCS23) {
                 u8 htRates3T[]  = {MGN_MCS16, MGN_MCS17, MGN_MCS18, MGN_MCS19, MGN_MCS20, MGN_MCS21, MGN_MCS22, MGN_MCS23};
-                PHY_SetTxPowerIndexByRateArray(padapter, RFPath, pHalData->CurrentChannelBW, Channel,
-                                                                         htRates3T, sizeof(htRates3T)/sizeof(u8));
+                PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
+                                               pHalData->CurrentChannelBW,
+                                               Channel, htRates3T,
+                                               ARRAY_SIZE(htRates3T));
 
         } else if (RateSection == HT_MCS24_MCS31) {
                 u8 htRates4T[]  = {MGN_MCS24, MGN_MCS25, MGN_MCS26, MGN_MCS27, MGN_MCS28, MGN_MCS29, MGN_MCS30, MGN_MCS31};
-                PHY_SetTxPowerIndexByRateArray(padapter, RFPath, pHalData->CurrentChannelBW, Channel,
-                                                                         htRates4T, sizeof(htRates4T)/sizeof(u8));
+                PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
+                                               pHalData->CurrentChannelBW,
+                                               Channel, htRates4T,
+                                               ARRAY_SIZE(htRates4T));
 
         } else if (RateSection == VHT_1SSMCS0_1SSMCS9) {
                 u8 vhtRates1T[] = {MGN_VHT1SS_MCS0, MGN_VHT1SS_MCS1, MGN_VHT1SS_MCS2, MGN_VHT1SS_MCS3, MGN_VHT1SS_MCS4,
                                 MGN_VHT1SS_MCS5, MGN_VHT1SS_MCS6, MGN_VHT1SS_MCS7, MGN_VHT1SS_MCS8, MGN_VHT1SS_MCS9};
-                PHY_SetTxPowerIndexByRateArray(padapter, RFPath, pHalData->CurrentChannelBW, Channel,
-                                                                        vhtRates1T, sizeof(vhtRates1T)/sizeof(u8));
+                PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
+                                               pHalData->CurrentChannelBW,
+                                               Channel, vhtRates1T,
+                                               ARRAY_SIZE(vhtRates1T));
 
         } else if (RateSection == VHT_2SSMCS0_2SSMCS9) {
                 u8 vhtRates2T[] = {MGN_VHT2SS_MCS0, MGN_VHT2SS_MCS1, MGN_VHT2SS_MCS2, MGN_VHT2SS_MCS3, MGN_VHT2SS_MCS4,
                                 MGN_VHT2SS_MCS5, MGN_VHT2SS_MCS6, MGN_VHT2SS_MCS7, MGN_VHT2SS_MCS8, MGN_VHT2SS_MCS9};
 
-                PHY_SetTxPowerIndexByRateArray(padapter, RFPath, pHalData->CurrentChannelBW, Channel,
-                                                                  vhtRates2T, sizeof(vhtRates2T)/sizeof(u8));
+                PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
+                                               pHalData->CurrentChannelBW,
+                                               Channel, vhtRates2T,
+                                               ARRAY_SIZE(vhtRates2T));
         } else if (RateSection == VHT_3SSMCS0_3SSMCS9) {
                 u8 vhtRates3T[] = {MGN_VHT3SS_MCS0, MGN_VHT3SS_MCS1, MGN_VHT3SS_MCS2, MGN_VHT3SS_MCS3, MGN_VHT3SS_MCS4,
                                 MGN_VHT3SS_MCS5, MGN_VHT3SS_MCS6, MGN_VHT3SS_MCS7, MGN_VHT3SS_MCS8, MGN_VHT3SS_MCS9};
 
-                PHY_SetTxPowerIndexByRateArray(padapter, RFPath, pHalData->CurrentChannelBW, Channel,
-                                                                  vhtRates3T, sizeof(vhtRates3T)/sizeof(u8));
+                PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
+                                               pHalData->CurrentChannelBW,
+                                               Channel, vhtRates3T,
+                                               ARRAY_SIZE(vhtRates3T));
         } else if (RateSection == VHT_4SSMCS0_4SSMCS9) {
                 u8 vhtRates4T[] = {MGN_VHT4SS_MCS0, MGN_VHT4SS_MCS1, MGN_VHT4SS_MCS2, MGN_VHT4SS_MCS3, MGN_VHT4SS_MCS4,
                                 MGN_VHT4SS_MCS5, MGN_VHT4SS_MCS6, MGN_VHT4SS_MCS7, MGN_VHT4SS_MCS8, MGN_VHT4SS_MCS9};
 
-                PHY_SetTxPowerIndexByRateArray(padapter, RFPath, pHalData->CurrentChannelBW, Channel,
-                                                                  vhtRates4T, sizeof(vhtRates4T)/sizeof(u8));
+                PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
+                                               pHalData->CurrentChannelBW,
+                                               Channel, vhtRates4T,
+                                               ARRAY_SIZE(vhtRates4T));
         } else
                 DBG_871X("Invalid RateSection %d in %s", RateSection, __func__);
 }
@@ -1012,7 +1033,7 @@ static bool phy_GetChnlIndex(u8 Channel, u8 *ChannelIdx)
         } else {
                 bIn24G = false;
 
-                for (i = 0; i < sizeof(channel5G)/sizeof(u8); ++i) {
+                for (i = 0; i < ARRAY_SIZE(channel5G); ++i) {
                         if (channel5G[i] == Channel) {
                                 *ChannelIdx = i;
                                 return bIn24G;
@@ -1149,7 +1170,7 @@ u8 PHY_GetTxPowerIndexBase(
                 } else if (BandWidth == CHANNEL_WIDTH_80) { /*  BW80-1S, BW80-2S */
                         /*  <20121220, Kordan> Get the index of array "Index5G_BW80_Base". */
                         u8 channel5G_80M[CHANNEL_MAX_NUMBER_5G_80M] = {42, 58, 106, 122, 138, 155, 171};
-                        for (i = 0; i < sizeof(channel5G_80M)/sizeof(u8); ++i)
+                        for (i = 0; i < ARRAY_SIZE(channel5G_80M); ++i)
                                 if (channel5G_80M[i] == Channel)
                                         chnlIdx = i;
 
@@ -1588,7 +1609,7 @@ static s8 phy_GetChannelIndexOfTxPowerLimit(u8 Band, u8 Channel)
         if (Band == BAND_ON_2_4G)
                 channelIndex = Channel - 1;
         else if (Band == BAND_ON_5G) {
-                for (i = 0; i < sizeof(channel5G)/sizeof(u8); ++i) {
+                for (i = 0; i < ARRAY_SIZE(channel5G); ++i) {
                         if (channel5G[i] == Channel)
                                 channelIndex = i;
                 }
diff --git a/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c b/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
index 9cde6c66235b..71853e6f7106 100644
--- a/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
+++ b/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c
@@ -23,7 +23,7 @@ static void odm_SetCrystalCap(void *pDM_VOID, u8 CrystalCap)
         struct adapter *Adapter = pDM_Odm->Adapter;
         struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
 
-        bEEPROMCheck = (pHalData->EEPROMVersion >= 0x01) ? true : false;
+        bEEPROMCheck = pHalData->EEPROMVersion >= 0x01;
 
         if (pCfoTrack->CrystalCap == CrystalCap)
                 return;
diff --git a/drivers/staging/rtl8723bs/hal/odm_DIG.c b/drivers/staging/rtl8723bs/hal/odm_DIG.c
index 0bde9444471d..f02eb63a45ce 100644
--- a/drivers/staging/rtl8723bs/hal/odm_DIG.c
+++ b/drivers/staging/rtl8723bs/hal/odm_DIG.c
@@ -553,7 +553,7 @@ void odm_DIG(void *pDM_VOID)
         dm_dig_min = DM_DIG_MIN_NIC;
         DIG_MaxOfMin = DM_DIG_MAX_AP;
 
-        ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): Absolutly upper bound = 0x%x, lower bound = 0x%x\n", dm_dig_max, dm_dig_min));
+        ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG(): Absolutely upper bound = 0x%x, lower bound = 0x%x\n", dm_dig_max, dm_dig_min));
 
         /* 1 Adjust boundary by RSSI */
         if (pDM_Odm->bLinked && bPerformance) {
diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
index ba2700135b60..8dd6da8a4e26 100644
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
@@ -106,7 +106,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(
         u8 LNA_idx, VGA_idx;
         PPHY_STATUS_RPT_8192CD_T pPhyStaRpt = (PPHY_STATUS_RPT_8192CD_T)pPhyStatus;
 
-        isCCKrate = (pPktinfo->DataRate <= DESC_RATE11M) ? true : false;
+        isCCKrate = pPktinfo->DataRate <= DESC_RATE11M;
         pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_A] = -1;
         pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_B] = -1;
 
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 1565f2d67ea4..d6cef9e8378d 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -891,7 +891,7 @@ static void hal_ReadEFuse_WiFi(
                 return;
         }
 
-        efuseTbl = (u8 *)rtw_malloc(EFUSE_MAX_MAP_LEN);
+        efuseTbl = rtw_malloc(EFUSE_MAX_MAP_LEN);
         if (efuseTbl == NULL) {
                 DBG_8192C("%s: alloc efuseTbl fail!\n", __func__);
                 return;
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index d0b317077511..6281dfa1a3ca 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -113,7 +113,7 @@ query_free_page:
                 RT_TRACE(
                         _module_hal_xmit_c_,
                         _drv_notice_,
-                        ("%s: bSurpriseRemoved(wirte port)\n", __func__)
+                        ("%s: bSurpriseRemoved(write port)\n", __func__)
                 );
                 goto free_xmitbuf;
         }
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 6dfb06a49d41..1af77add6af4 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -1019,8 +1019,8 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 
                         rtw_btcoex_IQKNotify(padapter, true);
 
-                        restore_iqk_rst = (pwrpriv->bips_processing == true) ? true : false;
-                        b2Ant = pHalData->EEPROMBluetoothAntNum == Ant_x2 ? true : false;
+                        restore_iqk_rst = pwrpriv->bips_processing;
+                        b2Ant = pHalData->EEPROMBluetoothAntNum == Ant_x2;
                         PHY_IQCalibrate_8723B(padapter, false, restore_iqk_rst, b2Ant, pHalData->ant_path);
                         pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = true;
 
diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index 1d1b14dedd35..9a4c24861947 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -218,7 +218,7 @@ static u32 sdio_read32(struct intf_hdl *pintfhdl, u32 addr)
         } else {
                 u8 *ptmpbuf;
 
-                ptmpbuf = (u8 *)rtw_malloc(8);
+                ptmpbuf = rtw_malloc(8);
                 if (NULL == ptmpbuf) {
                         DBG_8192C(KERN_ERR "%s: Allocate memory FAIL!(size =8) addr = 0x%x\n", __func__, addr);
                         return SDIO_ERR_VAL32;
@@ -594,7 +594,7 @@ static s32 _sdio_local_read(
         }
 
         n = RND4(cnt);
-        ptmpbuf = (u8 *)rtw_malloc(n);
+        ptmpbuf = rtw_malloc(n);
         if (!ptmpbuf)
                 return (-1);
 
@@ -637,7 +637,7 @@ s32 sdio_local_read(
         }
 
         n = RND4(cnt);
-        ptmpbuf = (u8 *)rtw_malloc(n);
+        ptmpbuf = rtw_malloc(n);
         if (!ptmpbuf)
                 return (-1);
 
@@ -684,7 +684,7 @@ s32 sdio_local_write(
                 return err;
         }
 
-        ptmpbuf = (u8 *)rtw_malloc(cnt);
+        ptmpbuf = rtw_malloc(cnt);
         if (!ptmpbuf)
                 return (-1);
 
@@ -1108,7 +1108,7 @@ void sd_int_dpc(struct adapter *padapter)
                 struct c2h_evt_hdr_88xx *c2h_evt;
 
                 DBG_8192C("%s: C2H Command\n", __func__);
-                c2h_evt = (struct c2h_evt_hdr_88xx *)rtw_zmalloc(16);
+                c2h_evt = rtw_zmalloc(16);
                 if (c2h_evt != NULL) {
                         if (rtw_hal_c2h_evt_read(padapter, (u8 *)c2h_evt) == _SUCCESS) {
                                 if (c2h_id_filter_ccx_8723b((u8 *)c2h_evt)) {
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index 4d14fbc5a1fe..32129ac8e169 100644
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -177,7 +177,8 @@ struct registry_priv
         u8 bt_ampdu;
         s8      ant_num;
 
-        bool    bAcceptAddbaReq;
+        /* false:Reject AP's Add BA req, true:accept AP's Add BA req */
+        bool    accept_addba_req;
 
         u8 antdiv_cfg;
         u8 antdiv_type;
diff --git a/drivers/staging/rtl8723bs/include/osdep_service.h b/drivers/staging/rtl8723bs/include/osdep_service.h
index ac9ffe0e3b84..e62ed71e1d80 100644
--- a/drivers/staging/rtl8723bs/include/osdep_service.h
+++ b/drivers/staging/rtl8723bs/include/osdep_service.h
@@ -96,8 +96,8 @@ typedef enum mstat_status{
 
 #define rtw_mstat_update(flag, status, sz) do {} while (0)
 #define rtw_mstat_dump(sel) do {} while (0)
-u8*_rtw_zmalloc(u32 sz);
-u8*_rtw_malloc(u32 sz);
+void *_rtw_zmalloc(u32 sz);
+void *_rtw_malloc(u32 sz);
 void _kfree(u8 *pbuf, u32 sz);
 
 struct sk_buff *_rtw_skb_alloc(u32 sz);
@@ -118,8 +118,6 @@ int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb);
 
 extern void _rtw_init_queue(struct __queue      *pqueue);
 
-extern void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc);
-
 static __inline void thread_enter(char *name)
 {
         allow_signal(SIGTERM);
diff --git a/drivers/staging/rtl8723bs/include/osdep_service_linux.h b/drivers/staging/rtl8723bs/include/osdep_service_linux.h
index 0c9b4f622fee..711863d74a01 100644
--- a/drivers/staging/rtl8723bs/include/osdep_service_linux.h
+++ b/drivers/staging/rtl8723bs/include/osdep_service_linux.h
@@ -86,17 +86,7 @@ __inline static struct list_head	*get_list_head(struct __queue	*queue)
 
 
 #define LIST_CONTAINOR(ptr, type, member) \
-        ((type *)((char *)(ptr)-(__kernel_size_t)(&((type *)0)->member)))
-
-#define RTW_TIMER_HDL_ARGS void *FunctionContext
-
-__inline static void _init_timer(_timer *ptimer, _nic_hdl nic_hdl, void *pfunc, void* cntx)
-{
-        /* setup_timer(ptimer, pfunc, (u32)cntx); */
-        ptimer->function = pfunc;
-        ptimer->data = (unsigned long)cntx;
-        init_timer(ptimer);
-}
+        container_of(ptr, type, member)
 
 __inline static void _set_timer(_timer *ptimer, u32 delay_time)
 {
@@ -109,7 +99,6 @@ __inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled)
         *bcancelled =  true;/* true == 1; false == 0 */
 }
 
-
 __inline static void _init_workitem(_workitem *pwork, void *pfunc, void *cntx)
 {
         INIT_WORK(pwork, pfunc);
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h
index d88ef67ce8d6..00b3d92c9f51 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h
@@ -518,8 +518,8 @@ extern void rtw_atimdone_event_callback(struct adapter *adapter, u8 *pbuf);
 extern void rtw_cpwm_event_callback(struct adapter *adapter, u8 *pbuf);
 extern void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf);
 
-extern void rtw_join_timeout_handler(RTW_TIMER_HDL_ARGS);
-extern void _rtw_scan_timeout_handler(RTW_TIMER_HDL_ARGS);
+extern void rtw_join_timeout_handler(struct timer_list *t);
+extern void _rtw_scan_timeout_handler(struct timer_list *t);
 
 int event_thread(void *context);
 
@@ -618,10 +618,10 @@ extern void rtw_update_registrypriv_dev_network(struct adapter *adapter);
 
 extern void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter);
 
-extern void _rtw_join_timeout_handler(struct adapter *adapter);
-extern void rtw_scan_timeout_handler(struct adapter *adapter);
+extern void _rtw_join_timeout_handler(struct timer_list *t);
+extern void rtw_scan_timeout_handler(struct timer_list *t);
 
-extern void rtw_dynamic_check_timer_handlder(struct adapter *adapter);
+extern void rtw_dynamic_check_timer_handler(struct adapter *adapter);
 bool rtw_is_scan_deny(struct adapter *adapter);
 void rtw_clear_scan_deny(struct adapter *adapter);
 void rtw_set_scan_deny_timer_hdl(struct adapter *adapter);
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index f3952463697e..6613dea2b283 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -424,7 +424,7 @@ struct mlme_ext_info
         u8 candidate_tid_bitmap;
         u8 dialogToken;
         /*  Accept ADDBA Request */
-        bool bAcceptAddbaReq;
+        bool accept_addba_req;
         u8 bwmode_updated;
         u8 hidden_ssid_mode;
         u8 VHT_enable;
@@ -719,10 +719,10 @@ void linked_status_chk(struct adapter *padapter);
 
 void _linked_info_dump(struct adapter *padapter);
 
-void survey_timer_hdl (struct adapter *padapter);
-void link_timer_hdl (struct adapter *padapter);
-void addba_timer_hdl(struct sta_info *psta);
-void sa_query_timer_hdl(struct adapter *padapter);
+void survey_timer_hdl (struct timer_list *t);
+void link_timer_hdl (struct timer_list *t);
+void addba_timer_hdl(struct timer_list *t);
+void sa_query_timer_hdl(struct timer_list *t);
 /* void reauth_timer_hdl(struct adapter *padapter); */
 /* void reassoc_timer_hdl(struct adapter *padapter); */
 
diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
index cf8e766a27a8..faf91022f54a 100644
--- a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
@@ -250,7 +250,7 @@ struct pwrctrl_priv
         u8 ips_mode;
         u8 ips_org_mode;
         u8 ips_mode_req; /*  used to accept the mode setting request, will update to ipsmode later */
-        uint bips_processing;
+        bool bips_processing;
         unsigned long ips_deny_time; /* will deny IPS when system time is smaller than this */
         u8 pre_ips_type;/*  0: default flow, 1: carddisbale flow */
 
@@ -300,6 +300,7 @@ struct pwrctrl_priv
         u64             wowlan_fw_iv;
 #endif /*  CONFIG_WOWLAN */
         _timer  pwr_state_check_timer;
+        struct adapter *adapter;
         int             pwr_state_check_interval;
         u8 pwr_state_check_cnts;
 
diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h
index 570a3c333aa0..71039ca79e4b 100644
--- a/drivers/staging/rtl8723bs/include/rtw_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtw_recv.h
@@ -411,7 +411,7 @@ sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, struct __queue *queu
 sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue);
 struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue);
 
-void rtw_reordering_ctrl_timeout_handler(void *pcontext);
+void rtw_reordering_ctrl_timeout_handler(struct timer_list *t);
 
 __inline static u8 *get_rxmem(union recv_frame *precvframe)
 {
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index bd4352fe2de3..51d48de24a24 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -136,11 +136,9 @@ static struct ieee80211_supported_band *rtw_spt_band_alloc(
                 goto exit;
         }
 
-        spt_band = (struct ieee80211_supported_band *)rtw_zmalloc(
-                sizeof(struct ieee80211_supported_band)
-                + sizeof(struct ieee80211_channel)*n_channels
-                + sizeof(struct ieee80211_rate)*n_bitrates
-        );
+        spt_band = rtw_zmalloc(sizeof(struct ieee80211_supported_band) +
+                               sizeof(struct ieee80211_channel) * n_channels +
+                               sizeof(struct ieee80211_rate) * n_bitrates);
         if (!spt_band)
                 goto exit;
 
@@ -1094,7 +1092,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
         DBG_871X("pairwise =%d\n", pairwise);
 
         param_len = sizeof(struct ieee_param) + params->key_len;
-        param = (struct ieee_param *)rtw_malloc(param_len);
+        param = rtw_malloc(param_len);
         if (param == NULL)
                 return -1;
 
@@ -2183,7 +2181,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
                 {
                         wep_key_len = wep_key_len <= 5 ? 5 : 13;
                         wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);
-                        pwep =(struct ndis_802_11_wep    *) rtw_malloc(wep_total_len);
+                        pwep = rtw_malloc(wep_total_len);
                         if (pwep == NULL) {
                                 DBG_871X(" wpa_set_encryption: pwep allocate fail !!!\n");
                                 ret = -ENOMEM;
@@ -2677,7 +2675,7 @@ static int rtw_cfg80211_add_monitor_if (struct adapter *padapter, char *name, st
         pnpi->sizeof_priv = sizeof(struct adapter);
 
         /*  wdev */
-        mon_wdev = (struct wireless_dev *)rtw_zmalloc(sizeof(struct wireless_dev));
+        mon_wdev = rtw_zmalloc(sizeof(struct wireless_dev));
         if (!mon_wdev) {
                 DBG_871X(FUNC_ADPT_FMT" allocate mon_wdev fail\n", FUNC_ADPT_ARG(padapter));
                 ret = -ENOMEM;
@@ -3497,7 +3495,7 @@ int rtw_wdev_alloc(struct adapter *padapter, struct device *dev)
         }
 
         /*  wdev */
-        wdev = (struct wireless_dev *)rtw_zmalloc(sizeof(struct wireless_dev));
+        wdev = rtw_zmalloc(sizeof(struct wireless_dev));
         if (!wdev) {
                 DBG_8192C("Couldn't allocate wireless device\n");
                 ret = -ENOMEM;
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index d5e5f830f2a1..3fca0c2d4c8d 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -18,6 +18,7 @@
 #include <rtw_debug.h>
 #include <rtw_mp.h>
 #include <linux/jiffies.h>
+#include <linux/kernel.h>
 
 #define RTL_IOCTL_WPA_SUPPLICANT        (SIOCIWFIRSTPRIV+30)
 
@@ -557,7 +558,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
                 if (wep_key_len > 0) {
                         wep_key_len = wep_key_len <= 5 ? 5 : 13;
                         wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);
-                        pwep =(struct ndis_802_11_wep    *) rtw_malloc(wep_total_len);
+                        pwep = rtw_malloc(wep_total_len);
                         if (pwep == NULL) {
                                 RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, (" wpa_set_encryption: pwep allocate fail !!!\n"));
                                 goto exit;
@@ -2123,12 +2124,9 @@ static int rtw_wx_set_gen_ie(struct net_device *dev,
                              struct iw_request_info *info,
                              union iwreq_data *wrqu, char *extra)
 {
-        int ret;
         struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 
-        ret = rtw_set_wpa_ie(padapter, extra, wrqu->data.length);
-
-        return ret;
+        return rtw_set_wpa_ie(padapter, extra, wrqu->data.length);
 }
 
 static int rtw_wx_set_auth(struct net_device *dev,
@@ -2238,7 +2236,7 @@ static int rtw_wx_set_enc_ext(struct net_device *dev,
         int ret = 0;
 
         param_len = sizeof(struct ieee_param) + pext->key_len;
-        param = (struct ieee_param *)rtw_malloc(param_len);
+        param = rtw_malloc(param_len);
         if (param == NULL)
                 return -1;
 
@@ -2347,7 +2345,7 @@ static int rtw_wx_read32(struct net_device *dev,
         if (0 == len)
                 return -EINVAL;
 
-        ptmp = (u8 *)rtw_malloc(len);
+        ptmp = rtw_malloc(len);
         if (NULL == ptmp)
                 return -ENOMEM;
 
@@ -3500,7 +3498,7 @@ static int wpa_supplicant_ioctl(struct net_device *dev, struct iw_point *p)
                 goto out;
         }
 
-        param = (struct ieee_param *)rtw_malloc(p->length);
+        param = rtw_malloc(p->length);
         if (param == NULL) {
                 ret = -ENOMEM;
                 goto out;
@@ -3621,7 +3619,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
                 if (wep_key_len > 0) {
                         wep_key_len = wep_key_len <= 5 ? 5 : 13;
                         wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);
-                        pwep =(struct ndis_802_11_wep *)rtw_malloc(wep_total_len);
+                        pwep = rtw_malloc(wep_total_len);
                         if (pwep == NULL) {
                                 DBG_871X(" r871x_set_encryption: pwep allocate fail !!!\n");
                                 goto exit;
@@ -3857,7 +3855,6 @@ static int rtw_hostapd_sta_flush(struct net_device *dev)
 {
         /* _irqL irqL; */
         /* struct list_head     *phead, *plist; */
-        int ret = 0;
         /* struct sta_info *psta = NULL; */
         struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
         /* struct sta_priv *pstapriv = &padapter->stapriv; */
@@ -3866,9 +3863,7 @@ static int rtw_hostapd_sta_flush(struct net_device *dev)
 
         flush_all_cam_entry(padapter);  /* clear CAM */
 
-        ret = rtw_sta_flush(padapter);
-
-        return ret;
+        return rtw_sta_flush(padapter);
 
 }
 
@@ -4266,7 +4261,6 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param,
 
 static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *param, int len)
 {
-        int ret = 0;
         struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
         struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
 
@@ -4279,15 +4273,12 @@ static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *p
                 return -EINVAL;
         }
 
-        ret = rtw_acl_remove_sta(padapter, param->sta_addr);
-
-        return ret;
+        return rtw_acl_remove_sta(padapter, param->sta_addr);
 
 }
 
 static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *param, int len)
 {
-        int ret = 0;
         struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
         struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
 
@@ -4300,9 +4291,7 @@ static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *para
                 return -EINVAL;
         }
 
-        ret = rtw_acl_add_sta(padapter, param->sta_addr);
-
-        return ret;
+        return rtw_acl_add_sta(padapter, param->sta_addr);
 
 }
 
@@ -4345,7 +4334,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)
                 goto out;
         }
 
-        param = (struct ieee_param *)rtw_malloc(p->length);
+        param = rtw_malloc(p->length);
         if (param == NULL) {
                 ret = -ENOMEM;
                 goto out;
@@ -4673,7 +4662,7 @@ static int rtw_test(
         DBG_871X("+%s\n", __func__);
         len = wrqu->data.length;
 
-        pbuf = (u8 *)rtw_zmalloc(len);
+        pbuf = rtw_zmalloc(len);
         if (pbuf == NULL) {
                 DBG_871X("%s: no memory!\n", __func__);
                 return -ENOMEM;
@@ -5029,12 +5018,12 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
 
 struct iw_handler_def rtw_handlers_def = {
         .standard = rtw_handlers,
-        .num_standard = sizeof(rtw_handlers) / sizeof(iw_handler),
+        .num_standard = ARRAY_SIZE(rtw_handlers),
 #if defined(CONFIG_WEXT_PRIV)
         .private = rtw_private_handler,
         .private_args = (struct iw_priv_args *)rtw_private_args,
-        .num_private = sizeof(rtw_private_handler) / sizeof(iw_handler),
-        .num_private_args = sizeof(rtw_private_args) / sizeof(struct iw_priv_args),
+        .num_private = ARRAY_SIZE(rtw_private_handler),
+        .num_private_args = ARRAY_SIZE(rtw_private_args),
 #endif
         .get_wireless_stats = rtw_get_wireless_stats,
 };
@@ -5121,8 +5110,8 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_
 
         priv = rtw_private_handler;
         priv_args = rtw_private_args;
-        num_priv = sizeof(rtw_private_handler) / sizeof(iw_handler);
-        num_priv_args = sizeof(rtw_private_args) / sizeof(struct iw_priv_args);
+        num_priv = ARRAY_SIZE(rtw_private_handler);
+        num_priv_args = ARRAY_SIZE(rtw_private_args);
 
         if (num_priv_args == 0) {
                 err = -EOPNOTSUPP;
diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
index 80ca2d781c5d..a4ef5789d794 100644
--- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
@@ -19,18 +19,21 @@
 #include <drv_types.h>
 #include <rtw_debug.h>
 
-static void _dynamic_check_timer_handlder (void *FunctionContext)
+static void _dynamic_check_timer_handler(struct timer_list *t)
 {
-        struct adapter *adapter = FunctionContext;
+        struct adapter *adapter =
+                from_timer(adapter, t, mlmepriv.dynamic_chk_timer);
 
-        rtw_dynamic_check_timer_handlder(adapter);
+        rtw_dynamic_check_timer_handler(adapter);
 
         _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);
 }
 
-static void _rtw_set_scan_deny_timer_hdl(void *FunctionContext)
+static void _rtw_set_scan_deny_timer_hdl(struct timer_list *t)
 {
-        struct adapter *adapter = FunctionContext;
+        struct adapter *adapter =
+                from_timer(adapter, t, mlmepriv.set_scan_deny_timer);
+
         rtw_set_scan_deny_timer_hdl(adapter);
 }
 
@@ -38,21 +41,20 @@ void rtw_init_mlme_timer(struct adapter *padapter)
 {
         struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-        _init_timer(&(pmlmepriv->assoc_timer), padapter->pnetdev, _rtw_join_timeout_handler, padapter);
-        /* _init_timer(&(pmlmepriv->sitesurveyctrl.sitesurvey_ctrl_timer), padapter->pnetdev, sitesurvey_ctrl_handler, padapter); */
-        _init_timer(&(pmlmepriv->scan_to_timer), padapter->pnetdev, rtw_scan_timeout_handler, padapter);
-
-        _init_timer(&(pmlmepriv->dynamic_chk_timer), padapter->pnetdev, _dynamic_check_timer_handlder, padapter);
-
-        _init_timer(&(pmlmepriv->set_scan_deny_timer), padapter->pnetdev, _rtw_set_scan_deny_timer_hdl, padapter);
+        timer_setup(&pmlmepriv->assoc_timer, _rtw_join_timeout_handler, 0);
+        timer_setup(&pmlmepriv->scan_to_timer, rtw_scan_timeout_handler, 0);
+        timer_setup(&pmlmepriv->dynamic_chk_timer,
+                    _dynamic_check_timer_handler, 0);
+        timer_setup(&pmlmepriv->set_scan_deny_timer,
+                    _rtw_set_scan_deny_timer_hdl, 0);
 }
 
 void rtw_os_indicate_connect(struct adapter *adapter)
 {
         struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
 
-        if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) ==true) ||
-                (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ==true))
+        if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) ||
+                (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true))
         {
                 rtw_cfg80211_ibss_indicate_connect(adapter);
         }
@@ -99,7 +101,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)
                 /* reset RX BIP packet number */
                 pmlmeext->mgnt_80211w_IPN_rx = 0;
 
-                memset((unsigned char *)&adapter->securitypriv, 0, sizeof (struct security_priv));
+                memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct security_priv));
 
                 /*  Added by Albert 2009/02/18 */
                 /*  Restore the PMK information to securitypriv structure for the following connection. */
@@ -116,9 +118,9 @@ void rtw_reset_securitypriv(struct adapter *adapter)
         {
                 /* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */
                 /*  */
-                struct security_priv *psec_priv =&adapter->securitypriv;
+                struct security_priv *psec_priv = &adapter->securitypriv;
 
-                psec_priv->dot11AuthAlgrthm =dot11AuthAlgrthm_Open;  /* open system */
+                psec_priv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;  /* open system */
                 psec_priv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
                 psec_priv->dot11PrivacyKeyIndex = 0;
 
@@ -150,7 +152,7 @@ void rtw_os_indicate_disconnect(struct adapter *adapter)
 void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
 {
         uint    len;
-        u8 *buff,*p, i;
+        u8 *buff, *p, i;
         union iwreq_data wrqu;
 
         RT_TRACE(_module_mlme_osdep_c_, _drv_info_, ("+rtw_report_sec_ie, authmode =%d\n", authmode));
@@ -168,22 +170,22 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
                 }
                 p = buff;
 
-                p+=sprintf(p,"ASSOCINFO(ReqIEs =");
+                p += sprintf(p, "ASSOCINFO(ReqIEs =");
 
-                len = sec_ie[1]+2;
-                len = (len < IW_CUSTOM_MAX) ? len:IW_CUSTOM_MAX;
+                len = sec_ie[1] + 2;
+                len = (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX;
 
-                for (i = 0;i<len;i++) {
-                        p+=sprintf(p,"%02x", sec_ie[i]);
+                for (i = 0; i < len; i++) {
+                        p += sprintf(p, "%02x", sec_ie[i]);
                 }
 
-                p+=sprintf(p,")");
+                p += sprintf(p, ")");
 
                 memset(&wrqu, 0, sizeof(wrqu));
 
-                wrqu.data.length =p-buff;
+                wrqu.data.length = p - buff;
 
-                wrqu.data.length = (wrqu.data.length<IW_CUSTOM_MAX) ? wrqu.data.length:IW_CUSTOM_MAX;
+                wrqu.data.length = (wrqu.data.length < IW_CUSTOM_MAX) ? wrqu.data.length : IW_CUSTOM_MAX;
 
                 kfree(buff);
         }
@@ -191,14 +193,14 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)
 
 void init_addba_retry_timer(struct adapter *padapter, struct sta_info *psta)
 {
-        _init_timer(&psta->addba_retry_timer, padapter->pnetdev, addba_timer_hdl, psta);
+        timer_setup(&psta->addba_retry_timer, addba_timer_hdl, 0);
 }
 
 void init_mlme_ext_timer(struct adapter *padapter)
 {
         struct  mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
 
-        _init_timer(&pmlmeext->survey_timer, padapter->pnetdev, survey_timer_hdl, padapter);
-        _init_timer(&pmlmeext->link_timer, padapter->pnetdev, link_timer_hdl, padapter);
-        _init_timer(&pmlmeext->sa_query_timer, padapter->pnetdev, sa_query_timer_hdl, padapter);
+        timer_setup(&pmlmeext->survey_timer, survey_timer_hdl, 0);
+        timer_setup(&pmlmeext->link_timer, link_timer_hdl, 0);
+        timer_setup(&pmlmeext->sa_query_timer, sa_query_timer_hdl, 0);
 }
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 021589913681..fc5e3d4739c0 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -24,9 +24,9 @@ MODULE_AUTHOR("Realtek Semiconductor Corp.");
 MODULE_VERSION(DRIVERVERSION);
 
 /* module param defaults */
-static int rtw_chip_version = 0x00;
+static int rtw_chip_version;
 static int rtw_rfintfs = HWPI;
-static int rtw_lbkmode = 0;/* RTL8712_AIR_TRX; */
+static int rtw_lbkmode;/* RTL8712_AIR_TRX; */
 
 
 static int rtw_network_mode = Ndis802_11IBSS;/* Ndis802_11Infrastructure;infra, ad-hoc, auto */
@@ -40,12 +40,12 @@ static int rtw_frag_thresh = 2346;/*  */
 static int rtw_preamble = PREAMBLE_LONG;/* long, short, auto */
 static int rtw_scan_mode = 1;/* active, passive */
 static int rtw_adhoc_tx_pwr = 1;
-static int rtw_soft_ap = 0;
+static int rtw_soft_ap;
 /* int smart_ps = 1; */
 static int rtw_power_mgnt = 1;
 static int rtw_ips_mode = IPS_NORMAL;
 module_param(rtw_ips_mode, int, 0644);
-MODULE_PARM_DESC(rtw_ips_mode,"The default IPS mode");
+MODULE_PARM_DESC(rtw_ips_mode, "The default IPS mode");
 
 static int rtw_smart_ps = 2;
 
@@ -61,18 +61,18 @@ static int rtw_busy_thresh = 40;
 /* int qos_enable = 0; */
 static int rtw_ack_policy = NORMAL_ACK;
 
-static int rtw_software_encrypt = 0;
-static int rtw_software_decrypt = 0;
+static int rtw_software_encrypt;
+static int rtw_software_decrypt;
 
-static int rtw_acm_method = 0;/*  0:By SW 1:By HW. */
+static int rtw_acm_method;/*  0:By SW 1:By HW. */
 
 static int rtw_wmm_enable = 1;/*  default is set to enable the wmm. */
-static int rtw_uapsd_enable = 0;
+static int rtw_uapsd_enable;
 static int rtw_uapsd_max_sp = NO_LIMIT;
-static int rtw_uapsd_acbk_en = 0;
-static int rtw_uapsd_acbe_en = 0;
-static int rtw_uapsd_acvi_en = 0;
-static int rtw_uapsd_acvo_en = 0;
+static int rtw_uapsd_acbk_en;
+static int rtw_uapsd_acbe_en;
+static int rtw_uapsd_acvi_en;
+static int rtw_uapsd_acvo_en;
 
 int rtw_ht_enable = 1;
 /*  0: 20 MHz, 1: 40 MHz, 2: 80 MHz, 3: 160MHz, 4: 80+80MHz */
@@ -81,7 +81,7 @@ int rtw_ht_enable = 1;
 static int rtw_bw_mode = 0x21;
 static int rtw_ampdu_enable = 1;/* for enable tx_ampdu ,0: disable, 0x1:enable (but wifi_spec should be 0), 0x2: force enable (don't care wifi_spec) */
 static int rtw_rx_stbc = 1;/*  0: disable, 1:enable 2.4g */
-static int rtw_ampdu_amsdu = 0;/*  0: disabled, 1:enabled, 2:auto . There is an IOT issu with DLINK DIR-629 when the flag turn on */
+static int rtw_ampdu_amsdu;/*  0: disabled, 1:enabled, 2:auto . There is an IOT issu with DLINK DIR-629 when the flag turn on */
 /*  Short GI support Bit Map */
 /*  BIT0 - 20MHz, 0: non-support, 1: support */
 /*  BIT1 - 40MHz, 0: non-support, 1: support */
@@ -99,8 +99,8 @@ static int rtw_lowrate_two_xmit = 1;/* Use 2 path Tx to transmit MCS0~7 and lega
 
 /* int rf_config = RF_1T2R;  1T2R */
 static int rtw_rf_config = RF_MAX_TYPE;  /* auto */
-static int rtw_low_power = 0;
-static int rtw_wifi_spec = 0;
+static int rtw_low_power;
+static int rtw_wifi_spec;
 static int rtw_channel_plan = RT_CHANNEL_DOMAIN_MAX;
 
 static int rtw_btcoex_enable = 1;
@@ -113,40 +113,38 @@ static int rtw_ant_num = -1; /*  <0: undefined, >0: Antenna number */
 module_param(rtw_ant_num, int, 0644);
 MODULE_PARM_DESC(rtw_ant_num, "Antenna number setting");
 
-static int rtw_AcceptAddbaReq = true;/*  0:Reject AP's Add BA req, 1:Accept AP's Add BA req. */
-
 static int rtw_antdiv_cfg = 1; /*  0:OFF , 1:ON, 2:decide by Efuse config */
-static int rtw_antdiv_type = 0 ; /* 0:decide by efuse  1: for 88EE, 1Tx and 1RxCG are diversity.(2 Ant with SPDT), 2:  for 88EE, 1Tx and 2Rx are diversity.(2 Ant, Tx and RxCG are both on aux port, RxCS is on main port), 3: for 88EE, 1Tx and 1RxCG are fixed.(1Ant, Tx and RxCG are both on aux port) */
+static int rtw_antdiv_type; /* 0:decide by efuse  1: for 88EE, 1Tx and 1RxCG are diversity.(2 Ant with SPDT), 2:  for 88EE, 1Tx and 2Rx are diversity.(2 Ant, Tx and RxCG are both on aux port, RxCS is on main port), 3: for 88EE, 1Tx and 1RxCG are fixed.(1Ant, Tx and RxCG are both on aux port) */
 
 
-static int rtw_enusbss = 0;/* 0:disable, 1:enable */
+static int rtw_enusbss;/* 0:disable, 1:enable */
 
-static int rtw_hwpdn_mode =2;/* 0:disable, 1:enable, 2: by EFUSE config */
+static int rtw_hwpdn_mode = 2;/* 0:disable, 1:enable, 2: by EFUSE config */
 
 #ifdef CONFIG_HW_PWRP_DETECTION
 static int rtw_hwpwrp_detect = 1;
 #else
-static int rtw_hwpwrp_detect = 0; /* HW power  ping detect 0:disable , 1:enable */
+static int rtw_hwpwrp_detect; /* HW power  ping detect 0:disable , 1:enable */
 #endif
 
-static int rtw_hw_wps_pbc = 0;
+static int rtw_hw_wps_pbc;
 
 int rtw_mc2u_disable = 0;
 
-static int rtw_80211d = 0;
+static int rtw_80211d;
 
 #ifdef CONFIG_QOS_OPTIMIZATION
 static int rtw_qos_opt_enable = 1;/* 0: disable, 1:enable */
 #else
-static int rtw_qos_opt_enable = 0;/* 0: disable, 1:enable */
+static int rtw_qos_opt_enable;/* 0: disable, 1:enable */
 #endif
 module_param(rtw_qos_opt_enable, int, 0644);
 
-static char* ifname = "wlan%d";
+static char *ifname = "wlan%d";
 module_param(ifname, charp, 0644);
 MODULE_PARM_DESC(ifname, "The default name to allocate for first interface");
 
-char* rtw_initmac = NULL;  /*  temp mac address if users want to use instead of the mac address in Efuse */
+char *rtw_initmac = NULL;  /*  temp mac address if users want to use instead of the mac address in Efuse */
 
 module_param(rtw_initmac, charp, 0644);
 module_param(rtw_channel_plan, int, 0644);
@@ -183,16 +181,16 @@ module_param(rtw_hwpwrp_detect, int, 0644);
 
 module_param(rtw_hw_wps_pbc, int, 0644);
 
-static uint rtw_max_roaming_times =2;
+static uint rtw_max_roaming_times = 2;
 module_param(rtw_max_roaming_times, uint, 0644);
-MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try");
+MODULE_PARM_DESC(rtw_max_roaming_times, "The max roaming times to try");
 
 module_param(rtw_mc2u_disable, int, 0644);
 
 module_param(rtw_80211d, int, 0644);
 MODULE_PARM_DESC(rtw_80211d, "Enable 802.11d mechanism");
 
-static uint rtw_notch_filter = 0;
+static uint rtw_notch_filter;
 module_param(rtw_notch_filter, uint, 0644);
 MODULE_PARM_DESC(rtw_notch_filter, "0:Disable, 1:Enable, 2:Enable only for P2P");
 
@@ -202,14 +200,14 @@ static uint rtw_hiq_filter = CONFIG_RTW_HIQ_FILTER;
 module_param(rtw_hiq_filter, uint, 0644);
 MODULE_PARM_DESC(rtw_hiq_filter, "0:allow all, 1:allow special, 2:deny all");
 
-static int rtw_tx_pwr_lmt_enable = 0;
-static int rtw_tx_pwr_by_rate = 0;
+static int rtw_tx_pwr_lmt_enable;
+static int rtw_tx_pwr_by_rate;
 
 module_param(rtw_tx_pwr_lmt_enable, int, 0644);
-MODULE_PARM_DESC(rtw_tx_pwr_lmt_enable,"0:Disable, 1:Enable, 2: Depend on efuse");
+MODULE_PARM_DESC(rtw_tx_pwr_lmt_enable, "0:Disable, 1:Enable, 2: Depend on efuse");
 
 module_param(rtw_tx_pwr_by_rate, int, 0644);
-MODULE_PARM_DESC(rtw_tx_pwr_by_rate,"0:Disable, 1:Enable, 2: Depend on efuse");
+MODULE_PARM_DESC(rtw_tx_pwr_by_rate, "0:Disable, 1:Enable, 2: Depend on efuse");
 
 char *rtw_phy_file_path = "";
 module_param(rtw_phy_file_path, charp, 0644);
@@ -222,12 +220,12 @@ MODULE_PARM_DESC(rtw_phy_file_path, "The path of phy parameter");
 /*  BIT4 - RF,                                  0: non-support, 1: support */
 /*  BIT5 - RF_TXPWR_TRACK,      0: non-support, 1: support */
 /*  BIT6 - RF_TXPWR_LMT,                0: non-support, 1: support */
-static int rtw_load_phy_file = (BIT2|BIT6);
+static int rtw_load_phy_file = (BIT2 | BIT6);
 module_param(rtw_load_phy_file, int, 0644);
-MODULE_PARM_DESC(rtw_load_phy_file,"PHY File Bit Map");
-static int rtw_decrypt_phy_file = 0;
+MODULE_PARM_DESC(rtw_load_phy_file, "PHY File Bit Map");
+static int rtw_decrypt_phy_file;
 module_param(rtw_decrypt_phy_file, int, 0644);
-MODULE_PARM_DESC(rtw_decrypt_phy_file,"Enable Decrypt PHY File");
+MODULE_PARM_DESC(rtw_decrypt_phy_file, "Enable Decrypt PHY File");
 
 int _netdev_open(struct net_device *pnetdev);
 int netdev_open (struct net_device *pnetdev);
@@ -255,8 +253,8 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
 
         registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ;
         registry_par->vcs_type = (u8)rtw_vcs_type;
-        registry_par->rts_thresh =(u16)rtw_rts_thresh;
-        registry_par->frag_thresh =(u16)rtw_frag_thresh;
+        registry_par->rts_thresh = (u16)rtw_rts_thresh;
+        registry_par->frag_thresh = (u16)rtw_frag_thresh;
         registry_par->preamble = (u8)rtw_preamble;
         registry_par->scan_mode = (u8)rtw_scan_mode;
         registry_par->adhoc_tx_pwr = (u8)rtw_adhoc_tx_pwr;
@@ -311,7 +309,7 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
         registry_par->bt_ampdu = (u8)rtw_bt_ampdu;
         registry_par->ant_num = (s8)rtw_ant_num;
 
-        registry_par->bAcceptAddbaReq = (u8)rtw_AcceptAddbaReq;
+        registry_par->accept_addba_req = true;
 
         registry_par->antdiv_cfg = (u8)rtw_antdiv_cfg;
         registry_par->antdiv_type = (u8)rtw_antdiv_type;
@@ -351,8 +349,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
         struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
         struct sockaddr *addr = p;
 
-        if (padapter->bup == false)
-        {
+        if (padapter->bup == false) {
                 /* DBG_871X("r8711_net_set_mac_address(), MAC =%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3], */
                 /* addr->sa_data[4], addr->sa_data[5]); */
                 memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN);
@@ -425,9 +422,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
         skb->priority = rtw_classify8021d(skb);
 
         if (pmlmepriv->acm_mask != 0)
-        {
                 skb->priority = qos_acm(pmlmepriv->acm_mask, skb->priority);
-        }
 
         return rtw_1d_to_queue[skb->priority];
 }
@@ -440,12 +435,12 @@ u16 rtw_recv_select_queue(struct sk_buff *skb)
         u32 priority;
         u8 *pdata = skb->data;
 
-        memcpy(&eth_type, pdata+(ETH_ALEN<<1), 2);
+        memcpy(&eth_type, pdata + (ETH_ALEN << 1), 2);
 
         switch (be16_to_cpu(eth_type)) {
                 case ETH_P_IP:
 
-                        piphdr = (struct iphdr *)(pdata+ETH_HLEN);
+                        piphdr = (struct iphdr *)(pdata + ETH_HLEN);
 
                         dscp = piphdr->tos & 0xfc;
 
@@ -457,17 +452,16 @@ u16 rtw_recv_select_queue(struct sk_buff *skb)
         }
 
         return rtw_1d_to_queue[priority];
-
 }
 
-static int rtw_ndev_notifier_call(struct notifier_block * nb, unsigned long state, void *ptr)
+static int rtw_ndev_notifier_call(struct notifier_block *nb, unsigned long state, void *ptr)
 {
         struct net_device *dev = netdev_notifier_info_to_dev(ptr);
 
         if (dev->netdev_ops->ndo_do_ioctl != rtw_ioctl)
                 return NOTIFY_DONE;
 
-        DBG_871X_LEVEL(_drv_info_, FUNC_NDEV_FMT" state:%lu\n", FUNC_NDEV_ARG(dev), state);
+        DBG_871X_LEVEL(_drv_info_, FUNC_NDEV_FMT " state:%lu\n", FUNC_NDEV_ARG(dev), state);
 
         switch (state) {
         case NETDEV_CHANGENAME:
@@ -497,7 +491,7 @@ static int rtw_ndev_init(struct net_device *dev)
 {
         struct adapter *adapter = rtw_netdev_priv(dev);
 
-        DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter));
+        DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT "\n", FUNC_ADPT_ARG(adapter));
         strncpy(adapter->old_ifname, dev->name, IFNAMSIZ);
         rtw_adapter_proc_init(dev);
 
@@ -508,7 +502,7 @@ static void rtw_ndev_uninit(struct net_device *dev)
 {
         struct adapter *adapter = rtw_netdev_priv(dev);
 
-        DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter));
+        DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT "\n", FUNC_ADPT_ARG(adapter));
         rtw_adapter_proc_deinit(dev);
 }
 
@@ -561,7 +555,7 @@ struct net_device *rtw_init_netdev(struct adapter *old_padapter)
         pnetdev->netdev_ops = &rtw_netdev_ops;
 
         /* pnetdev->tx_timeout = NULL; */
-        pnetdev->watchdog_timeo = HZ*3; /* 3 second timeout */
+        pnetdev->watchdog_timeo = HZ * 3; /* 3 second timeout */
         pnetdev->wireless_handlers = (struct iw_handler_def *)&rtw_handlers_def;
 
         /* step 2. */
@@ -597,7 +591,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
                 _status = _FAIL;
 
         padapter->cmdThread = kthread_run(rtw_cmd_thread, padapter, "RTW_CMD_THREAD");
-        if (IS_ERR(padapter->cmdThread))
+        if (IS_ERR(padapter->cmdThread))
                 _status = _FAIL;
         else
                 down(&padapter->cmdpriv.terminate_cmdthread_sema); /* wait for cmd_thread to run */
@@ -623,7 +617,7 @@ void rtw_stop_drv_threads (struct adapter *padapter)
 static u8 rtw_init_default_value(struct adapter *padapter)
 {
         u8 ret  = _SUCCESS;
-        struct registry_priv* pregistrypriv = &padapter->registrypriv;
+        struct registry_priv *pregistrypriv = &padapter->registrypriv;
         struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
         struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
         struct security_priv *psecuritypriv = &padapter->securitypriv;
@@ -652,8 +646,8 @@ static u8 rtw_init_default_value(struct adapter *padapter)
 #ifdef CONFIG_GTK_OL
         psecuritypriv->binstallKCK_KEK = _FAIL;
 #endif /* CONFIG_GTK_OL */
-        psecuritypriv->sw_encrypt =pregistrypriv->software_encrypt;
-        psecuritypriv->sw_decrypt =pregistrypriv->software_decrypt;
+        psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt;
+        psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt;
 
         psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /* open system */
         psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
@@ -691,7 +685,8 @@ struct dvobj_priv *devobj_init(void)
 {
         struct dvobj_priv *pdvobj = NULL;
 
-        if ((pdvobj = (struct dvobj_priv*)rtw_zmalloc(sizeof(*pdvobj))) == NULL)
+        pdvobj = rtw_zmalloc(sizeof(*pdvobj));
+        if (pdvobj == NULL)
                 return NULL;
 
         mutex_init(&pdvobj->hw_init_mutex);
@@ -722,7 +717,7 @@ void devobj_deinit(struct dvobj_priv *pdvobj)
         mutex_destroy(&pdvobj->setch_mutex);
         mutex_destroy(&pdvobj->setbw_mutex);
 
-        kfree((u8 *)pdvobj);
+        kfree(pdvobj);
 }
 
 u8 rtw_reset_drv_sw(struct adapter *padapter)
@@ -748,7 +743,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
         pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
         pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
 
-        _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |_FW_UNDER_LINKING);
+        _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
 
         pwrctrlpriv->pwr_state_check_cnts = 0;
 
@@ -777,7 +772,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
                 goto exit;
         }
 
-        padapter->cmdpriv.padapter =padapter;
+        padapter->cmdpriv.padapter = padapter;
 
         if ((rtw_init_evt_priv(&padapter->evtpriv)) == _FAIL) {
                 RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init evt_priv\n"));
@@ -935,7 +930,7 @@ static int _rtw_drv_register_netdev(struct adapter *padapter, char *name)
                 goto error_register_netdev;
         }
 
-        DBG_871X("%s, MAC Address (if%d) = " MAC_FMT "\n", __func__, (padapter->iface_id+1), MAC_ARG(pnetdev->dev_addr));
+        DBG_871X("%s, MAC Address (if%d) = " MAC_FMT "\n", __func__, (padapter->iface_id + 1), MAC_ARG(pnetdev->dev_addr));
 
         return ret;
 
@@ -984,9 +979,9 @@ int _netdev_open(struct net_device *pnetdev)
                         goto netdev_open_error;
                 }
 
-                DBG_871X("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr));
+                DBG_871X("MAC Address = " MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr));
 
-                status =rtw_start_drv_threads(padapter);
+                status = rtw_start_drv_threads(padapter);
                 if (status == _FAIL) {
                         DBG_871X("Initialize driver software resource Failed!\n");
                         goto netdev_open_error;
@@ -1027,7 +1022,6 @@ netdev_open_error:
         DBG_871X("-871x_drv - drv_open fail, bup =%d\n", padapter->bup);
 
         return (-1);
-
 }
 
 int netdev_open(struct net_device *pnetdev)
@@ -1036,8 +1030,7 @@ int netdev_open(struct net_device *pnetdev)
         struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
         struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
 
-        if (pwrctrlpriv->bInSuspend == true)
-        {
+        if (pwrctrlpriv->bInSuspend == true) {
                 DBG_871X("+871x_drv - drv_open, bInSuspend =%d\n", pwrctrlpriv->bInSuspend);
                 return 0;
         }
@@ -1066,16 +1059,13 @@ static int  ips_netdrv_open(struct adapter *padapter)
         /* padapter->bup = true; */
 
         status = rtw_hal_init(padapter);
-        if (status == _FAIL)
-        {
+        if (status == _FAIL) {
                 RT_TRACE(_module_os_intfs_c_, _drv_err_, ("ips_netdrv_open(): Can't init h/w!\n"));
                 goto netdev_open_error;
         }
 
         if (padapter->intf_start)
-        {
                 padapter->intf_start(padapter);
-        }
 
         _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000);
 
@@ -1098,7 +1088,6 @@ int rtw_ips_pwr_up(struct adapter *padapter)
 
         DBG_871X("<===  rtw_ips_pwr_up..............\n");
         return result;
-
 }
 
 void rtw_ips_pwr_down(struct adapter *padapter)
@@ -1119,10 +1108,7 @@ void rtw_ips_dev_unload(struct adapter *padapter)
 
 
         if (padapter->bSurpriseRemoved == false)
-        {
                 rtw_hal_deinit(padapter);
-        }
-
 }
 
 
@@ -1132,15 +1118,14 @@ static int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
 
         struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
 
-        if (true == bnormal)
-        {
+        if (true == bnormal) {
                 if (mutex_lock_interruptible(&(adapter_to_dvobj(padapter)->hw_init_mutex)) == 0) {
                         status = _netdev_open(pnetdev);
                         mutex_unlock(&(adapter_to_dvobj(padapter)->hw_init_mutex));
                 }
         }
         else
-                status =  (_SUCCESS == ips_netdrv_open(padapter))?(0):(-1);
+                status =  (_SUCCESS == ips_netdrv_open(padapter)) ? (0) : (-1);
 
         return status;
 }
@@ -1152,8 +1137,7 @@ static int netdev_close(struct net_device *pnetdev)
 
         RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+871x_drv - drv_close\n"));
 
-        if (pwrctl->bInternalAutoSuspend == true)
-        {
+        if (pwrctl->bInternalAutoSuspend == true) {
                 /* rtw_pwr_wakeup(padapter); */
                 if (pwrctl->rf_pwrstate == rf_off)
                         pwrctl->ps_flag = true;
@@ -1174,8 +1158,7 @@ static int netdev_close(struct net_device *pnetdev)
                 DBG_871X("(2)871x_drv - drv_close, bup =%d, hw_init_completed =%d\n", padapter->bup, padapter->hw_init_completed);
 
                 /* s1. */
-                if (pnetdev)
-                {
+                if (pnetdev) {
                         if (!rtw_netif_queue_stopped(pnetdev))
                                 rtw_netif_stop_queue(pnetdev);
                 }
@@ -1198,12 +1181,11 @@ static int netdev_close(struct net_device *pnetdev)
         DBG_871X("-871x_drv - drv_close, bup =%d\n", padapter->bup);
 
         return 0;
-
 }
 
 void rtw_ndev_destructor(struct net_device *ndev)
 {
-        DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
+        DBG_871X(FUNC_NDEV_FMT "\n", FUNC_NDEV_ARG(ndev));
 
         if (ndev->ieee80211_ptr)
                 kfree((u8 *)ndev->ieee80211_ptr);
@@ -1219,8 +1201,7 @@ void rtw_dev_unload(struct adapter *padapter)
 
         RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("+%s\n", __func__));
 
-        if (padapter->bup == true)
-        {
+        if (padapter->bup == true) {
                 DBG_871X("===> %s\n", __func__);
 
                 padapter->bDriverStopped = true;
@@ -1257,12 +1238,11 @@ void rtw_dev_unload(struct adapter *padapter)
                         DBG_871X_LEVEL(_drv_always_, "%s: driver not in IPS\n", __func__);
                 }
 
-                if (padapter->bSurpriseRemoved == false)
-                {
+                if (padapter->bSurpriseRemoved == false) {
                         rtw_btcoex_IpsNotify(padapter, pwrctl->ips_mode_req);
 #ifdef CONFIG_WOWLAN
                         if (pwrctl->bSupportRemoteWakeup == true &&
-                                pwrctl->wowlan_mode ==true) {
+                                pwrctl->wowlan_mode == true) {
                                 DBG_871X_LEVEL(_drv_always_, "%s bSupportRemoteWakeup ==true  do not run rtw_hal_deinit()\n", __func__);
                         }
                         else
@@ -1292,12 +1272,11 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
 {
         struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-        DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
 
         if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME)) {
                 if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
-                        && check_fwstate(pmlmepriv, _FW_LINKED))
-                {
+                        && check_fwstate(pmlmepriv, _FW_LINKED)) {
                         DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __func__,
                                         pmlmepriv->cur_network.network.Ssid.Ssid,
                                         MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
@@ -1307,14 +1286,12 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
                 }
         }
 
-        if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED))
-        {
+        if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)) {
                 rtw_disassoc_cmd(padapter, 0, false);
                 /* s2-2.  indicate disconnect to os */
                 rtw_indicate_disconnect(padapter);
         }
-        else if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
-        {
+        else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
                 rtw_sta_flush(padapter);
         }
 
@@ -1327,13 +1304,12 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
         if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
                 rtw_indicate_scan_done(padapter, 1);
 
-        if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true)
-        {
+        if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) {
                 DBG_871X_LEVEL(_drv_always_, "%s: fw_under_linking\n", __func__);
                 rtw_indicate_disconnect(padapter);
         }
 
-        DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
         return _SUCCESS;
 }
 
@@ -1347,7 +1323,7 @@ int rtw_suspend_wow(struct adapter *padapter)
         struct wowlan_ioctl_param poidparam;
         int ret = _SUCCESS;
 
-        DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
 
 
         DBG_871X("wowlan_mode: %d\n", pwrpriv->wowlan_mode);
@@ -1379,8 +1355,7 @@ int rtw_suspend_wow(struct adapter *padapter)
                 padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_WOWLAN, (u8 *)&poidparam);
                 if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME)) {
                         if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
-                                && check_fwstate(pmlmepriv, _FW_LINKED))
-                        {
+                                && check_fwstate(pmlmepriv, _FW_LINKED)) {
                                 DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __func__,
                                                 pmlmepriv->cur_network.network.Ssid.Ssid,
                                                 MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
@@ -1393,15 +1368,14 @@ int rtw_suspend_wow(struct adapter *padapter)
 
                 DBG_871X_LEVEL(_drv_always_, "%s: wowmode suspending\n", __func__);
 
-                if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true)
-                {
+                if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
                         DBG_871X_LEVEL(_drv_always_, "%s: fw_under_survey\n", __func__);
                         rtw_indicate_scan_done(padapter, 1);
                         clr_fwstate(pmlmepriv, _FW_UNDER_SURVEY);
                 }
 
                 if (rtw_get_ch_setting_union(padapter, &ch, &bw, &offset) != 0) {
-                        DBG_871X(FUNC_ADPT_FMT" back to linked/linking union - ch:%u, bw:%u, offset:%u\n",
+                        DBG_871X(FUNC_ADPT_FMT " back to linked/linking union - ch:%u, bw:%u, offset:%u\n",
                                 FUNC_ADPT_ARG(padapter), ch, bw, offset);
                         set_channel_bwmode(padapter, ch, offset, bw);
                 }
@@ -1410,13 +1384,11 @@ int rtw_suspend_wow(struct adapter *padapter)
                         DBG_871X_LEVEL(_drv_always_, "%s: pno: %d\n", __func__, pwrpriv->wowlan_pno_enable);
                 else
                         rtw_set_ps_mode(padapter, PS_MODE_DTIM, 0, 0, "WOWLAN");
-
         }
-        else
-        {
+        else {
                 DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR ### wowlan_mode =%d\n", __func__, pwrpriv->wowlan_mode);
         }
-        DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
         return ret;
 }
 #endif /* ifdef CONFIG_WOWLAN */
@@ -1430,7 +1402,7 @@ int rtw_suspend_ap_wow(struct adapter *padapter)
         struct wowlan_ioctl_param poidparam;
         int ret = _SUCCESS;
 
-        DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
 
         pwrpriv->wowlan_ap_mode = true;
 
@@ -1462,14 +1434,14 @@ int rtw_suspend_ap_wow(struct adapter *padapter)
         DBG_871X_LEVEL(_drv_always_, "%s: wowmode suspending\n", __func__);
 
         if (rtw_get_ch_setting_union(padapter, &ch, &bw, &offset) != 0) {
-                DBG_871X(FUNC_ADPT_FMT" back to linked/linking union - ch:%u, bw:%u, offset:%u\n",
+                DBG_871X(FUNC_ADPT_FMT " back to linked/linking union - ch:%u, bw:%u, offset:%u\n",
                          FUNC_ADPT_ARG(padapter), ch, bw, offset);
                 set_channel_bwmode(padapter, ch, offset, bw);
         }
 
         rtw_set_ps_mode(padapter, PS_MODE_MIN, 0, 0, "AP-WOWLAN");
 
-        DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
         return ret;
 }
 #endif /* ifdef CONFIG_AP_WOWLAN */
@@ -1480,7 +1452,7 @@ static int rtw_suspend_normal(struct adapter *padapter)
         struct net_device *pnetdev = padapter->pnetdev;
         int ret = _SUCCESS;
 
-        DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
         if (pnetdev) {
                 netif_carrier_off(pnetdev);
                 rtw_netif_stop_queue(pnetdev);
@@ -1489,10 +1461,8 @@ static int rtw_suspend_normal(struct adapter *padapter)
         rtw_suspend_free_assoc_resource(padapter);
 
         if ((rtw_hal_check_ips_status(padapter) == true)
-                || (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off))
-        {
+                || (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off)) {
                 DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR #### driver in IPS ####ERROR###!!!\n", __func__);
-
         }
 
         rtw_dev_unload(padapter);
@@ -1501,7 +1471,7 @@ static int rtw_suspend_normal(struct adapter *padapter)
         if (padapter->intf_deinit)
                 padapter->intf_deinit(adapter_to_dvobj(padapter));
 
-        DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
         return ret;
 }
 
@@ -1524,8 +1494,7 @@ int rtw_suspend_common(struct adapter *padapter)
         while (pwrpriv->bips_processing == true)
                 msleep(1);
 
-        if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
-        {
+        if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved)) {
                 DBG_871X("%s bup =%d bDriverStopped =%d bSurpriseRemoved = %d\n", __func__
                         , padapter->bup, padapter->bDriverStopped, padapter->bSurpriseRemoved);
                 pdbgpriv->dbg_suspend_error_cnt++;
@@ -1599,7 +1568,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
         struct sta_info *psta = NULL;
         int ret = _SUCCESS;
 
-        DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
 
         if (padapter) {
                 pnetdev = padapter->pnetdev;
@@ -1641,7 +1610,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
                 }
 
                 /* Disable WOW, set H2C command */
-                poidparam.subcode =WOWLAN_DISABLE;
+                poidparam.subcode = WOWLAN_DISABLE;
                 padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_WOWLAN, (u8 *)&poidparam);
 
                 psta = rtw_get_stainfo(&padapter->stapriv, get_bssid(&padapter->mlmepriv));
@@ -1667,11 +1636,10 @@ int rtw_resume_process_wow(struct adapter *padapter)
                 }
         }
         else {
-
                 DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR ### wowlan_mode =%d\n", __func__, pwrpriv->wowlan_mode);
         }
 
-        if (padapter->pid[1]!= 0) {
+        if (padapter->pid[1] != 0) {
                 DBG_871X("pid[1]:%d\n", padapter->pid[1]);
                 rtw_signal_process(padapter->pid[1], SIGUSR2);
         }
@@ -1680,7 +1648,6 @@ int rtw_resume_process_wow(struct adapter *padapter)
                 if (pwrpriv->wowlan_wake_reason == FWDecisionDisconnect ||
                         pwrpriv->wowlan_wake_reason == Rx_DisAssoc ||
                         pwrpriv->wowlan_wake_reason == Rx_DeAuth) {
-
                         DBG_871X("%s: disconnect reason: %02x\n", __func__,
                                                 pwrpriv->wowlan_wake_reason);
                         rtw_indicate_disconnect(padapter);
@@ -1705,12 +1672,12 @@ int rtw_resume_process_wow(struct adapter *padapter)
                 DBG_871X_LEVEL(_drv_always_, "do not reset timer\n");
         }
 
-        pwrpriv->wowlan_mode =false;
+        pwrpriv->wowlan_mode = false;
 
         /* clean driver side wake up reason. */
         pwrpriv->wowlan_wake_reason = 0;
 exit:
-        DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
         return ret;
 }
 #endif /* ifdef CONFIG_WOWLAN */
@@ -1725,7 +1692,7 @@ int rtw_resume_process_ap_wow(struct adapter *padapter)
         struct wowlan_ioctl_param poidparam;
         int ret = _SUCCESS;
 
-        DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
 
         if (padapter) {
                 pnetdev = padapter->pnetdev;
@@ -1774,7 +1741,7 @@ int rtw_resume_process_ap_wow(struct adapter *padapter)
                         rtw_netif_wake_queue(pnetdev);
         }
 
-        if (padapter->pid[1]!= 0) {
+        if (padapter->pid[1] != 0) {
                 DBG_871X("pid[1]:%d\n", padapter->pid[1]);
                 rtw_signal_process(padapter->pid[1], SIGUSR2);
         }
@@ -1785,7 +1752,7 @@ int rtw_resume_process_ap_wow(struct adapter *padapter)
         /* clean driver side wake up reason. */
         pwrpriv->wowlan_wake_reason = 0;
 exit:
-        DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
         return ret;
 }
 #endif /* ifdef CONFIG_APWOWLAN */
@@ -1811,19 +1778,17 @@ static int rtw_resume_process_normal(struct adapter *padapter)
         psdpriv = padapter->dvobj;
         pdbgpriv = &psdpriv->drv_dbg;
 
-        DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
         /*  interface init */
         /* if (sdio_init(adapter_to_dvobj(padapter)) != _SUCCESS) */
-        if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS))
-        {
+        if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS)) {
                 ret = -1;
                 RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("%s: initialize SDIO Failed!!\n", __func__));
                 goto exit;
         }
         rtw_hal_disable_interrupt(padapter);
         /* if (sdio_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS) */
-        if ((padapter->intf_alloc_irq) && (padapter->intf_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS))
-        {
+        if ((padapter->intf_alloc_irq) && (padapter->intf_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS)) {
                 ret = -1;
                 RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("%s: sdio_alloc_irq Failed!!\n", __func__));
                 goto exit;
@@ -1842,28 +1807,28 @@ static int rtw_resume_process_normal(struct adapter *padapter)
         netif_device_attach(pnetdev);
         netif_carrier_on(pnetdev);
 
-        if (padapter->pid[1]!= 0) {
+        if (padapter->pid[1] != 0) {
                 DBG_871X("pid[1]:%d\n", padapter->pid[1]);
                 rtw_signal_process(padapter->pid[1], SIGUSR2);
         }
 
 
         if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
-                DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
+                DBG_871X(FUNC_ADPT_FMT " fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
 
                 if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME))
                         rtw_roaming(padapter, NULL);
 
         } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
-                DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
+                DBG_871X(FUNC_ADPT_FMT " fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
                 rtw_ap_restore_network(padapter);
         } else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
-                DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
+                DBG_871X(FUNC_ADPT_FMT " fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
         } else {
-                DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
+                DBG_871X(FUNC_ADPT_FMT " fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
         }
 
-        DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
+        DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
 
 exit:
         return ret;
diff --git a/drivers/staging/rtl8723bs/os_dep/osdep_service.c b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
index a05daf06a870..f4221952dd1b 100644
--- a/drivers/staging/rtl8723bs/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
@@ -30,22 +30,17 @@ inline int RTW_STATUS_CODE(int error_code)
         return _FAIL;
 }
 
-u8 *_rtw_malloc(u32 sz)
+void *_rtw_malloc(u32 sz)
 {
-        u8 *pbuf = NULL;
-
-        pbuf = kmalloc(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
-
-        return pbuf;
+        return kmalloc(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
 }
 
-u8 *_rtw_zmalloc(u32 sz)
+void *_rtw_zmalloc(u32 sz)
 {
-        u8 *pbuf = _rtw_malloc(sz);
+        void *pbuf = _rtw_malloc(sz);
 
-        if (pbuf != NULL) {
+        if (pbuf)
                 memset(pbuf, 0, sz);
-        }
 
         return pbuf;
 }
@@ -71,13 +66,6 @@ inline int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb)
         return netif_rx(skb);
 }
 
-void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc)
-{
-        struct adapter *adapter = padapter;
-
-        _init_timer(ptimer, adapter->pnetdev, pfunc, adapter);
-}
-
 void _rtw_init_queue(struct __queue *pqueue)
 {
         INIT_LIST_HEAD(&(pqueue->queue));
@@ -470,7 +458,7 @@ struct rtw_cbuf *rtw_cbuf_alloc(u32 size)
 {
         struct rtw_cbuf *cbuf;
 
-        cbuf = (struct rtw_cbuf *)rtw_malloc(sizeof(*cbuf) + sizeof(void*)*size);
+        cbuf = rtw_malloc(sizeof(*cbuf) + sizeof(void *) * size);
 
         if (cbuf) {
                 cbuf->write = cbuf->read = 0;
diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
index f42e00081e0e..e804b430931c 100644
--- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
@@ -356,8 +356,7 @@ _recv_indicatepkt_drop:
 
 void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl)
 {
-        struct adapter *padapter = preorder_ctrl->padapter;
-
-        _init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, rtw_reordering_ctrl_timeout_handler, preorder_ctrl);
+        timer_setup(&preorder_ctrl->reordering_ctrl_timer,
+                    rtw_reordering_ctrl_timeout_handler, 0);
 
 }
diff --git a/drivers/staging/rtl8723bs/os_dep/rtw_proc.c b/drivers/staging/rtl8723bs/os_dep/rtw_proc.c
index ce1dd6f9036f..9a885e626d1c 100644
--- a/drivers/staging/rtl8723bs/os_dep/rtw_proc.c
+++ b/drivers/staging/rtl8723bs/os_dep/rtw_proc.c
@@ -87,7 +87,7 @@ static ssize_t proc_set_log_level(struct file *file, const char __user *buffer,
 * rtw_drv_proc:
 * init/deinit when register/unregister driver
 */
-static const struct rtw_proc_hdl drv_proc_hdls [] = {
+static const struct rtw_proc_hdl drv_proc_hdls[] = {
         {"ver_info", proc_get_drv_version, NULL},
         {"log_level", proc_get_log_level, proc_set_log_level},
 };
@@ -365,7 +365,7 @@ static int proc_get_cam_cache(struct seq_file *m, void *v)
 * rtw_adapter_proc:
 * init/deinit when register/unregister net_device
 */
-static const struct rtw_proc_hdl adapter_proc_hdls [] = {
+static const struct rtw_proc_hdl adapter_proc_hdls[] = {
         {"write_reg", proc_get_dummy, proc_set_write_reg},
         {"read_reg", proc_get_read_reg, proc_set_read_reg},
         {"fwstate", proc_get_fwstate, NULL},
@@ -600,7 +600,7 @@ ssize_t proc_set_odm_adaptivity(struct file *file, const char __user *buffer, si
 * rtw_odm_proc:
 * init/deinit when register/unregister net_device, along with rtw_adapter_proc
 */
-static const struct rtw_proc_hdl odm_proc_hdls [] = {
+static const struct rtw_proc_hdl odm_proc_hdls[] = {
         {"dbg_comp", proc_get_odm_dbg_comp, proc_set_odm_dbg_comp},
         {"dbg_level", proc_get_odm_dbg_level, proc_set_odm_dbg_level},
         {"ability", proc_get_odm_ability, proc_set_odm_ability},
diff --git a/drivers/staging/rtlwifi/base.c b/drivers/staging/rtlwifi/base.c
index b88b0e8edd3d..c947def37d31 100644
--- a/drivers/staging/rtlwifi/base.c
+++ b/drivers/staging/rtlwifi/base.c
@@ -465,10 +465,10 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         /* <1> timer */
-        setup_timer(&rtlpriv->works.watchdog_timer,
-                    rtl_watch_dog_timer_callback, (unsigned long)hw);
-        setup_timer(&rtlpriv->works.dualmac_easyconcurrent_retrytimer,
-                    rtl_easy_concurrent_retrytimer_callback, (unsigned long)hw);
+        timer_setup(&rtlpriv->works.watchdog_timer,
+                    rtl_watch_dog_timer_callback, 0);
+        timer_setup(&rtlpriv->works.dualmac_easyconcurrent_retrytimer,
+                    rtl_easy_concurrent_retrytimer_callback, 0);
         /* <2> work queue */
         rtlpriv->works.hw = hw;
         rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name);
@@ -637,7 +637,7 @@ static void _rtl_query_shortgi(struct ieee80211_hw *hw,
         sgi_20 = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20;
         sgi_80 = sta->vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_80;
 
-        if ((!sta->ht_cap.ht_supported) && (!sta->vht_cap.vht_supported))
+        if (!sta->ht_cap.ht_supported && !sta->vht_cap.vht_supported)
                 return;
 
         if (!sgi_40 && !sgi_20)
@@ -734,10 +734,10 @@ u8 rtl_mrate_idx_to_arfr_id(
                 ret = RATEID_IDX_B;
                 break;
         case RATR_INX_WIRELESS_MC:
-                if ((wirelessmode == WIRELESS_MODE_B) ||
-                    (wirelessmode == WIRELESS_MODE_G) ||
-                    (wirelessmode == WIRELESS_MODE_N_24G) ||
-                    (wirelessmode == WIRELESS_MODE_AC_24G))
+                if (wirelessmode == WIRELESS_MODE_B ||
+                    wirelessmode == WIRELESS_MODE_G ||
+                    wirelessmode == WIRELESS_MODE_N_24G ||
+                    wirelessmode == WIRELESS_MODE_AC_24G)
                         ret = RATEID_IDX_BG;
                 else
                         ret = RATEID_IDX_G;
@@ -920,7 +920,7 @@ static u8 _rtl_get_vht_highest_n_rate(struct ieee80211_hw *hw,
                 else if ((tx_mcs_map  & 0x000c) >> 2 ==
                         IEEE80211_VHT_MCS_SUPPORT_0_8)
                         hw_rate =
-                        rtlpriv->cfg->maps[RTL_RC_VHT_RATE_2SS_MCS9];
+                        rtlpriv->cfg->maps[RTL_RC_VHT_RATE_2SS_MCS8];
                 else
                         hw_rate =
                         rtlpriv->cfg->maps[RTL_RC_VHT_RATE_2SS_MCS9];
@@ -932,7 +932,7 @@ static u8 _rtl_get_vht_highest_n_rate(struct ieee80211_hw *hw,
                 else if ((tx_mcs_map  & 0x0003) ==
                         IEEE80211_VHT_MCS_SUPPORT_0_8)
                         hw_rate =
-                        rtlpriv->cfg->maps[RTL_RC_VHT_RATE_1SS_MCS9];
+                        rtlpriv->cfg->maps[RTL_RC_VHT_RATE_1SS_MCS8];
                 else
                         hw_rate =
                         rtlpriv->cfg->maps[RTL_RC_VHT_RATE_1SS_MCS9];
@@ -948,8 +948,8 @@ static u8 _rtl_get_highest_n_rate(struct ieee80211_hw *hw,
         struct rtl_phy *rtlphy = &rtlpriv->phy;
         u8 hw_rate;
 
-        if ((get_rf_type(rtlphy) == RF_2T2R) &&
-            (sta->ht_cap.mcs.rx_mask[1] != 0))
+        if (get_rf_type(rtlphy) == RF_2T2R &&
+            sta->ht_cap.mcs.rx_mask[1] != 0)
                 hw_rate = rtlpriv->cfg->maps[RTL_RC_HT_RATEMCS15];
         else
                 hw_rate = rtlpriv->cfg->maps[RTL_RC_HT_RATEMCS7];
@@ -1277,7 +1277,7 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
                                 tcb_desc->hw_rate =
                                 _rtl_get_vht_highest_n_rate(hw, sta);
                         } else {
-                                if (sta && (sta->ht_cap.ht_supported)) {
+                                if (sta && sta->ht_cap.ht_supported) {
                                         tcb_desc->hw_rate =
                                             _rtl_get_highest_n_rate(hw, sta);
                                 } else {
@@ -2080,9 +2080,9 @@ void rtl_watchdog_wq_callback(void *data)
                     rtlpriv->btcoexist.btc_ops->btc_is_bt_ctrl_lps(rtlpriv))
                         goto label_lps_done;
 
-                if (((rtlpriv->link_info.num_rx_inperiod +
-                      rtlpriv->link_info.num_tx_inperiod) > 8) ||
-                    (rtlpriv->link_info.num_rx_inperiod > 2))
+                if (rtlpriv->link_info.num_rx_inperiod +
+                      rtlpriv->link_info.num_tx_inperiod > 8 ||
+                    rtlpriv->link_info.num_rx_inperiod > 2)
                         rtl_lps_leave(hw);
                 else
                         rtl_lps_enter(hw);
@@ -2161,10 +2161,9 @@ label_lps_done:
         rtl_scan_list_expire(hw);
 }
 
-void rtl_watch_dog_timer_callback(unsigned long data)
+void rtl_watch_dog_timer_callback(struct timer_list *t)
 {
-        struct ieee80211_hw *hw = (struct ieee80211_hw *)data;
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_priv *rtlpriv = from_timer(rtlpriv, t, works.watchdog_timer);
 
         queue_delayed_work(rtlpriv->works.rtl_wq,
                            &rtlpriv->works.watchdog_wq, 0);
@@ -2270,10 +2269,11 @@ void rtl_c2hcmd_wq_callback(void *data)
         rtl_c2hcmd_launcher(hw, 1);
 }
 
-void rtl_easy_concurrent_retrytimer_callback(unsigned long data)
+void rtl_easy_concurrent_retrytimer_callback(struct timer_list *t)
 {
-        struct ieee80211_hw *hw = (struct ieee80211_hw *)data;
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_priv *rtlpriv =
+                from_timer(rtlpriv, t, works.dualmac_easyconcurrent_retrytimer);
+        struct ieee80211_hw *hw = rtlpriv->hw;
         struct rtl_priv *buddy_priv = rtlpriv->buddy_priv;
 
         if (!buddy_priv)
@@ -2334,9 +2334,7 @@ static struct sk_buff *rtl_make_smps_action(struct ieee80211_hw *hw,
         case IEEE80211_SMPS_AUTOMATIC:/* 0 */
         case IEEE80211_SMPS_NUM_MODES:/* 4 */
                 WARN_ON(1);
-        /* Here will get a 'MISSING_BREAK' in Coverity Test, just ignore it.
-         * According to Kernel Code, here is right.
-         */
+        /* fall through */
         case IEEE80211_SMPS_OFF:/* 1 */ /*MIMO_PS_NOLIMIT*/
                 action_frame->u.action.u.ht_smps.smps_control =
                                 WLAN_HT_SMPS_CONTROL_DISABLED;/* 0 */
@@ -2552,8 +2550,8 @@ bool rtl_check_beacon_key(struct ieee80211_hw *hw, void *data, unsigned int len)
         bcn_key.valid = true;
 
         /* update cur_beacon_keys or compare beacon key */
-        if ((rtlpriv->mac80211.link_state != MAC80211_LINKED) &&
-            (rtlpriv->mac80211.link_state != MAC80211_LINKED_SCANNING))
+        if (rtlpriv->mac80211.link_state != MAC80211_LINKED &&
+            rtlpriv->mac80211.link_state != MAC80211_LINKED_SCANNING)
                 return true;
 
         if (!cur_bcn_key->valid) {
@@ -2576,8 +2574,8 @@ bool rtl_check_beacon_key(struct ieee80211_hw *hw, void *data, unsigned int len)
                 goto chk_exit;
         }
 
-        if ((cur_bcn_key->bcn_channel == bcn_key.bcn_channel) &&
-            (cur_bcn_key->ht_cap_info == bcn_key.ht_cap_info)) {
+        if (cur_bcn_key->bcn_channel == bcn_key.bcn_channel &&
+            cur_bcn_key->ht_cap_info == bcn_key.ht_cap_info) {
                 /* Beacon HT info IE, secondary channel offset check */
                 /* 40M -> 20M */
                 if (cur_bcn_key->ht_info_infos_0_sco >
diff --git a/drivers/staging/rtlwifi/base.h b/drivers/staging/rtlwifi/base.h
index 1829712dc4e2..b7f92b32978e 100644
--- a/drivers/staging/rtlwifi/base.h
+++ b/drivers/staging/rtlwifi/base.h
@@ -120,7 +120,7 @@ void rtl_init_rx_config(struct ieee80211_hw *hw);
 void rtl_init_rfkill(struct ieee80211_hw *hw);
 void rtl_deinit_rfkill(struct ieee80211_hw *hw);
 
-void rtl_watch_dog_timer_callback(unsigned long data);
+void rtl_watch_dog_timer_callback(struct timer_list *t);
 void rtl_deinit_deferred_work(struct ieee80211_hw *hw);
 
 bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);
@@ -176,7 +176,7 @@ int rtl_send_smps_action(struct ieee80211_hw *hw,
 u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie);
 void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len);
 u8 rtl_tid_to_ac(u8 tid);
-void rtl_easy_concurrent_retrytimer_callback(unsigned long data);
+void rtl_easy_concurrent_retrytimer_callback(struct timer_list *t);
 extern struct rtl_global_var rtl_global_var;
 void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation);
 bool rtl_check_beacon_key(struct ieee80211_hw *hw, void *data,
diff --git a/drivers/staging/rtlwifi/core.c b/drivers/staging/rtlwifi/core.c
index d33847d0550d..b00e51df984f 100644
--- a/drivers/staging/rtlwifi/core.c
+++ b/drivers/staging/rtlwifi/core.c
@@ -49,43 +49,6 @@ u8 channel5g_80m[CHANNEL_MAX_NUMBER_5G_80M] = {
         42, 58, 106, 122, 138, 155, 171
 };
 
-void rtl_addr_delay(u32 addr)
-{
-        if (addr == 0xfe)
-                mdelay(50);
-        else if (addr == 0xfd)
-                msleep(5);
-        else if (addr == 0xfc)
-                msleep(1);
-        else if (addr == 0xfb)
-                usleep_range(50, 100);
-        else if (addr == 0xfa)
-                usleep_range(5, 10);
-        else if (addr == 0xf9)
-                usleep_range(1, 2);
-}
-
-void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr,
-                     u32 mask, u32 data)
-{
-        if (addr >= 0xf9 && addr <= 0xfe) {
-                rtl_addr_delay(addr);
-        } else {
-                rtl_set_rfreg(hw, rfpath, addr, mask, data);
-                udelay(1);
-        }
-}
-
-void rtl_bb_delay(struct ieee80211_hw *hw, u32 addr, u32 data)
-{
-        if (addr >= 0xf9 && addr <= 0xfe) {
-                rtl_addr_delay(addr);
-        } else {
-                rtl_set_bbreg(hw, addr, MASKDWORD, data);
-                udelay(1);
-        }
-}
-
 static void rtl_fw_do_work(const struct firmware *firmware, void *context,
                            bool is_wow)
 {
@@ -153,7 +116,7 @@ static int rtl_op_start(struct ieee80211_hw *hw)
         mutex_lock(&rtlpriv->locks.conf_mutex);
         err = rtlpriv->intf_ops->adapter_start(hw);
         if (!err)
-                rtl_watch_dog_timer_callback((unsigned long)hw);
+                rtl_watch_dog_timer_callback(&rtlpriv->works.watchdog_timer);
         mutex_unlock(&rtlpriv->locks.conf_mutex);
         return err;
 }
@@ -339,9 +302,9 @@ static void rtl_op_remove_interface(struct ieee80211_hw *hw,
         mutex_lock(&rtlpriv->locks.conf_mutex);
 
         /* Free beacon resources */
-        if ((vif->type == NL80211_IFTYPE_AP) ||
-            (vif->type == NL80211_IFTYPE_ADHOC) ||
-            (vif->type == NL80211_IFTYPE_MESH_POINT)) {
+        if (vif->type == NL80211_IFTYPE_AP ||
+            vif->type == NL80211_IFTYPE_ADHOC ||
+            vif->type == NL80211_IFTYPE_MESH_POINT) {
                 if (mac->beacon_enabled == 1) {
                         mac->beacon_enabled = 0;
                         rtlpriv->cfg->ops->update_interrupt_mask(hw, 0,
@@ -449,7 +412,8 @@ static void _rtl_add_wowlan_patterns(struct ieee80211_hw *hw,
         for (i = 0; i < wow->n_patterns; i++) {
                 memset(&rtl_pattern, 0, sizeof(struct rtl_wow_pattern));
                 memset(mask, 0, MAX_WOL_BIT_MASK_SIZE);
-                if (patterns[i].pattern_len > MAX_WOL_PATTERN_SIZE) {
+                if (patterns[i].pattern_len < 0 ||
+                    patterns[i].pattern_len > MAX_WOL_PATTERN_SIZE) {
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_WARNING,
                                  "Pattern[%d] is too long\n", i);
                         continue;
@@ -856,8 +820,8 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
          * here just used for linked scanning, & linked
          * and nolink check bssid is set in set network_type
          */
-        if ((changed_flags & FIF_BCN_PRBRESP_PROMISC) &&
-            (mac->link_state >= MAC80211_LINKED)) {
+        if (changed_flags & FIF_BCN_PRBRESP_PROMISC &&
+            mac->link_state >= MAC80211_LINKED) {
                 if (mac->opmode != NL80211_IFTYPE_AP &&
                     mac->opmode != NL80211_IFTYPE_MESH_POINT) {
                         if (*new_flags & FIF_BCN_PRBRESP_PROMISC)
@@ -1078,10 +1042,10 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
 
         mutex_lock(&rtlpriv->locks.conf_mutex);
-        if ((vif->type == NL80211_IFTYPE_ADHOC) ||
-            (vif->type == NL80211_IFTYPE_AP) ||
-            (vif->type == NL80211_IFTYPE_MESH_POINT)) {
-                if ((changed & BSS_CHANGED_BEACON) ||
+        if (vif->type == NL80211_IFTYPE_ADHOC ||
+            vif->type == NL80211_IFTYPE_AP ||
+            vif->type == NL80211_IFTYPE_MESH_POINT) {
+                if (changed & BSS_CHANGED_BEACON ||
                     (changed & BSS_CHANGED_BEACON_ENABLED &&
                      bss_conf->enable_beacon)) {
                         if (mac->beacon_enabled == 0) {
@@ -1160,7 +1124,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                         if (rtlpriv->dm.supp_phymode_switch) {
                                 if (sta->ht_cap.ht_supported)
                                         rtl_send_smps_action(hw, sta,
-                                                        IEEE80211_SMPS_STATIC);
+                                                             IEEE80211_SMPS_STATIC);
                         }
 
                         if (rtlhal->current_bandtype == BAND_ON_5G) {
@@ -1224,7 +1188,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                                 cfg80211_unlink_bss(hw->wiphy, bss);
                                 cfg80211_put_bss(hw->wiphy, bss);
                                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                                        "cfg80211_unlink !!\n");
+                                         "cfg80211_unlink !!\n");
                         }
 
                         eth_zero_addr(mac->bssid);
@@ -1621,8 +1585,8 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 return -ENOSPC; /*User disabled HW-crypto */
         }
         /* To support IBSS, use sw-crypto for GTK */
-        if (((vif->type == NL80211_IFTYPE_ADHOC) ||
-             (vif->type == NL80211_IFTYPE_MESH_POINT)) &&
+        if ((vif->type == NL80211_IFTYPE_ADHOC ||
+             vif->type == NL80211_IFTYPE_MESH_POINT) &&
             !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
                 return -ENOSPC;
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
@@ -1697,7 +1661,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                         rtlpriv->cfg->ops->enable_hw_sec(hw);
                 }
         } else {
-                if ((!group_key) || (vif->type == NL80211_IFTYPE_ADHOC) ||
+                if (!group_key || vif->type == NL80211_IFTYPE_ADHOC ||
                     rtlpriv->sec.pairwise_enc_algorithm == NO_ENCRYPTION) {
                         if (rtlpriv->sec.pairwise_enc_algorithm ==
                             NO_ENCRYPTION &&
@@ -1885,7 +1849,7 @@ bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
                                 break;
                         case PWR_CMD_WRITE:
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                        "%s(): PWR_CMD_WRITE\n", __func__);
+                                         "%s(): PWR_CMD_WRITE\n", __func__);
                                 offset = GET_PWR_CFG_OFFSET(cfg_cmd);
 
                                 /*Read the value from system register*/
diff --git a/drivers/staging/rtlwifi/core.h b/drivers/staging/rtlwifi/core.h
index 782ac2fc4b28..4c2b69412621 100644
--- a/drivers/staging/rtlwifi/core.h
+++ b/drivers/staging/rtlwifi/core.h
@@ -75,10 +75,6 @@ enum dm_dig_connect_e {
 extern const struct ieee80211_ops rtl_ops;
 void rtl_fw_cb(const struct firmware *firmware, void *context);
 void rtl_wowlan_fw_cb(const struct firmware *firmware, void *context);
-void rtl_addr_delay(u32 addr);
-void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr,
-                     u32 mask, u32 data);
-void rtl_bb_delay(struct ieee80211_hw *hw, u32 addr, u32 data);
 bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb);
 bool rtl_btc_status_false(void);
 void rtl_dm_diginit(struct ieee80211_hw *hw, u32 cur_igval);
diff --git a/drivers/staging/rtlwifi/debug.c b/drivers/staging/rtlwifi/debug.c
index 7446d71c41d1..be8d72cb63db 100644
--- a/drivers/staging/rtlwifi/debug.c
+++ b/drivers/staging/rtlwifi/debug.c
@@ -33,7 +33,7 @@ void _rtl_dbg_trace(struct rtl_priv *rtlpriv, u64 comp, int level,
                     const char *fmt, ...)
 {
         if (unlikely((comp & rtlpriv->cfg->mod_params->debug_mask) &&
-                     (level <= rtlpriv->cfg->mod_params->debug_level))) {
+                     level <= rtlpriv->cfg->mod_params->debug_level)) {
                 struct va_format vaf;
                 va_list args;
 
@@ -52,7 +52,7 @@ void _rtl_dbg_print(struct rtl_priv *rtlpriv, u64 comp, int level,
                     const char *fmt, ...)
 {
         if (unlikely((comp & rtlpriv->cfg->mod_params->debug_mask) &&
-                     (level <= rtlpriv->cfg->mod_params->debug_level))) {
+                     level <= rtlpriv->cfg->mod_params->debug_level)) {
                 struct va_format vaf;
                 va_list args;
 
@@ -127,10 +127,10 @@ static int rtl_debug_get_mac_page(struct seq_file *m, void *v)
         return 0;
 }
 
-#define RTL_DEBUG_IMPL_MAC_SERIES(page, addr)           \
-struct rtl_debugfs_priv rtl_debug_priv_mac_ ##page = {  \
-        .cb_read = rtl_debug_get_mac_page,              \
-        .cb_data = addr,                                \
+#define RTL_DEBUG_IMPL_MAC_SERIES(page, addr)                   \
+static struct rtl_debugfs_priv rtl_debug_priv_mac_ ##page = {   \
+        .cb_read = rtl_debug_get_mac_page,                      \
+        .cb_data = addr,                                        \
 }
 
 RTL_DEBUG_IMPL_MAC_SERIES(0, 0x0000);
@@ -169,10 +169,10 @@ static int rtl_debug_get_bb_page(struct seq_file *m, void *v)
         return 0;
 }
 
-#define RTL_DEBUG_IMPL_BB_SERIES(page, addr)            \
-struct rtl_debugfs_priv rtl_debug_priv_bb_ ##page = {   \
-        .cb_read = rtl_debug_get_bb_page,               \
-        .cb_data = addr,                                \
+#define RTL_DEBUG_IMPL_BB_SERIES(page, addr)                    \
+static struct rtl_debugfs_priv rtl_debug_priv_bb_ ##page = {    \
+        .cb_read = rtl_debug_get_bb_page,                       \
+        .cb_data = addr,                                        \
 }
 
 RTL_DEBUG_IMPL_BB_SERIES(8, 0x0800);
@@ -216,10 +216,10 @@ static int rtl_debug_get_reg_rf(struct seq_file *m, void *v)
         return 0;
 }
 
-#define RTL_DEBUG_IMPL_RF_SERIES(page, addr)            \
-struct rtl_debugfs_priv rtl_debug_priv_rf_ ##page = {   \
-        .cb_read = rtl_debug_get_reg_rf,                \
-        .cb_data = addr,                                \
+#define RTL_DEBUG_IMPL_RF_SERIES(page, addr)                    \
+static struct rtl_debugfs_priv rtl_debug_priv_rf_ ##page = {    \
+        .cb_read = rtl_debug_get_reg_rf,                        \
+        .cb_data = addr,                                        \
 }
 
 RTL_DEBUG_IMPL_RF_SERIES(a, RF90_PATH_A);
@@ -271,10 +271,10 @@ static int rtl_debug_get_cam_register(struct seq_file *m, void *v)
         return 0;
 }
 
-#define RTL_DEBUG_IMPL_CAM_SERIES(page, addr)           \
-struct rtl_debugfs_priv rtl_debug_priv_cam_ ##page = {  \
-        .cb_read = rtl_debug_get_cam_register,          \
-        .cb_data = addr,                                \
+#define RTL_DEBUG_IMPL_CAM_SERIES(page, addr)                   \
+static struct rtl_debugfs_priv rtl_debug_priv_cam_ ##page = {   \
+        .cb_read = rtl_debug_get_cam_register,                  \
+        .cb_data = addr,                                        \
 }
 
 RTL_DEBUG_IMPL_CAM_SERIES(1, 0);
diff --git a/drivers/staging/rtlwifi/efuse.c b/drivers/staging/rtlwifi/efuse.c
index 6d5e657017c6..d74c80d512c9 100644
--- a/drivers/staging/rtlwifi/efuse.c
+++ b/drivers/staging/rtlwifi/efuse.c
@@ -252,12 +252,11 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
                             sizeof(u8), GFP_ATOMIC);
         if (!efuse_tbl)
                 return;
-        efuse_word = kzalloc(EFUSE_MAX_WORD_UNIT * sizeof(u16 *), GFP_ATOMIC);
+        efuse_word = kcalloc(EFUSE_MAX_WORD_UNIT, sizeof(u16 *), GFP_ATOMIC);
         if (!efuse_word)
                 goto out;
         for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
-                efuse_word[i] = kzalloc(efuse_max_section * sizeof(u16),
-                                        GFP_ATOMIC);
+                efuse_word[i] = kcalloc(efuse_max_section, sizeof(u16), GFP_ATOMIC);
                 if (!efuse_word[i])
                         goto done;
         }
diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c
index edbf6af1c8b7..448b1379d220 100644
--- a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c
+++ b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c
@@ -3391,8 +3391,10 @@ halmac_cfg_txbf_88xx(struct halmac_adapter *halmac_adapter, u8 userid,
                 switch (bw) {
                 case HALMAC_BW_80:
                         temp42C |= BIT_R_TXBF0_80M;
+                        /* fall through */
                 case HALMAC_BW_40:
                         temp42C |= BIT_R_TXBF0_40M;
+                        /* fall through */
                 case HALMAC_BW_20:
                         temp42C |= BIT_R_TXBF0_20M;
                         break;
diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
index 544f638ed3ef..c4cb217d3d1f 100644
--- a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
+++ b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
@@ -276,17 +276,13 @@ halmac_dump_efuse_drv_88xx(struct halmac_adapter *halmac_adapter)
 
         if (!halmac_adapter->hal_efuse_map) {
                 halmac_adapter->hal_efuse_map = kzalloc(efuse_size, GFP_KERNEL);
-                if (!halmac_adapter->hal_efuse_map) {
-                        pr_err("[ERR]halmac allocate efuse map Fail!!\n");
+                if (!halmac_adapter->hal_efuse_map)
                         return HALMAC_RET_MALLOC_FAIL;
-                }
         }
 
         efuse_map = kzalloc(efuse_size, GFP_KERNEL);
-        if (!efuse_map) {
-                /* out of memory */
+        if (!efuse_map)
                 return HALMAC_RET_MALLOC_FAIL;
-        }
 
         if (halmac_read_hw_efuse_88xx(halmac_adapter, 0, efuse_size,
                                       efuse_map) != HALMAC_RET_SUCCESS) {
@@ -325,10 +321,8 @@ halmac_dump_efuse_fw_88xx(struct halmac_adapter *halmac_adapter)
         if (!halmac_adapter->hal_efuse_map) {
                 halmac_adapter->hal_efuse_map = kzalloc(
                         halmac_adapter->hw_config_info.efuse_size, GFP_KERNEL);
-                if (!halmac_adapter->hal_efuse_map) {
-                        /* out of memory */
+                if (!halmac_adapter->hal_efuse_map)
                         return HALMAC_RET_MALLOC_FAIL;
-                }
         }
 
         if (!halmac_adapter->hal_efuse_map_valid) {
@@ -537,10 +531,8 @@ halmac_read_logical_efuse_map_88xx(struct halmac_adapter *halmac_adapter,
 
         if (!halmac_adapter->hal_efuse_map_valid) {
                 efuse_map = kzalloc(efuse_size, GFP_KERNEL);
-                if (!efuse_map) {
-                        pr_err("[ERR]halmac allocate local efuse map Fail!!\n");
+                if (!efuse_map)
                         return HALMAC_RET_MALLOC_FAIL;
-                }
 
                 status = halmac_func_read_efuse_88xx(halmac_adapter, 0,
                                                      efuse_size, efuse_map);
@@ -554,7 +546,6 @@ halmac_read_logical_efuse_map_88xx(struct halmac_adapter *halmac_adapter,
                         halmac_adapter->hal_efuse_map =
                                 kzalloc(efuse_size, GFP_KERNEL);
                         if (!halmac_adapter->hal_efuse_map) {
-                                pr_err("[ERR]halmac allocate efuse map Fail!!\n");
                                 kfree(efuse_map);
                                 return HALMAC_RET_MALLOC_FAIL;
                         }
@@ -592,10 +583,8 @@ halmac_func_write_logical_efuse_88xx(struct halmac_adapter *halmac_adapter,
         driver_adapter = halmac_adapter->driver_adapter;
 
         eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);
-        if (!eeprom_map) {
-                /* out of memory */
+        if (!eeprom_map)
                 return HALMAC_RET_MALLOC_FAIL;
-        }
         memset(eeprom_map, 0xFF, eeprom_size);
 
         status = halmac_read_logical_efuse_map_88xx(halmac_adapter, eeprom_map);
@@ -687,10 +676,8 @@ halmac_func_pg_efuse_by_map_88xx(struct halmac_adapter *halmac_adapter,
         enum halmac_ret_status status = HALMAC_RET_SUCCESS;
 
         eeprom_mask_updated = kzalloc(eeprom_mask_size, GFP_KERNEL);
-        if (!eeprom_mask_updated) {
-                /* out of memory */
+        if (!eeprom_mask_updated)
                 return HALMAC_RET_MALLOC_FAIL;
-        }
 
         status = halmac_update_eeprom_mask_88xx(halmac_adapter, pg_efuse_info,
                                                 eeprom_mask_updated);
@@ -743,12 +730,10 @@ halmac_update_eeprom_mask_88xx(struct halmac_adapter *halmac_adapter,
         driver_adapter = halmac_adapter->driver_adapter;
 
         eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);
-        if (!eeprom_map) {
-                /* out of memory */
+        if (!eeprom_map)
                 return HALMAC_RET_MALLOC_FAIL;
-        }
-        memset(eeprom_map, 0xFF, eeprom_size);
 
+        memset(eeprom_map, 0xFF, eeprom_size);
         memset(eeprom_mask_updated, 0x00, pg_efuse_info->efuse_mask_size);
 
         status = halmac_read_logical_efuse_map_88xx(halmac_adapter, eeprom_map);
@@ -1036,7 +1021,7 @@ halmac_dlfw_to_mem_88xx(struct halmac_adapter *halmac_adapter, u8 *ram_code,
                 if (halmac_send_fwpkt_88xx(
                             halmac_adapter, code_ptr + mem_offset,
                             send_pkt_size) != HALMAC_RET_SUCCESS) {
-                        pr_err("halmac_send_fwpkt_88xx fail!!");
+                        pr_err("halmac_send_fwpkt_88xx fail!!\n");
                         return HALMAC_RET_DLFW_FAIL;
                 }
 
@@ -1046,7 +1031,7 @@ halmac_dlfw_to_mem_88xx(struct halmac_adapter *halmac_adapter, u8 *ram_code,
                                     halmac_adapter->hw_config_info.txdesc_size,
                             dest + mem_offset, send_pkt_size,
                             first_part) != HALMAC_RET_SUCCESS) {
-                        pr_err("halmac_iddma_dlfw_88xx fail!!");
+                        pr_err("halmac_iddma_dlfw_88xx fail!!\n");
                         return HALMAC_RET_DLFW_FAIL;
                 }
 
@@ -1057,7 +1042,7 @@ halmac_dlfw_to_mem_88xx(struct halmac_adapter *halmac_adapter, u8 *ram_code,
 
         if (halmac_check_fw_chksum_88xx(halmac_adapter, dest) !=
             HALMAC_RET_SUCCESS) {
-                pr_err("halmac_check_fw_chksum_88xx fail!!");
+                pr_err("halmac_check_fw_chksum_88xx fail!!\n");
                 return HALMAC_RET_DLFW_FAIL;
         }
 
@@ -2549,10 +2534,8 @@ halmac_parse_efuse_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,
                 halmac_adapter->efuse_segment_size = segment_size;
 
         eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);
-        if (!eeprom_map) {
-                /* out of memory */
+        if (!eeprom_map)
                 return HALMAC_RET_MALLOC_FAIL;
-        }
         memset(eeprom_map, 0xFF, eeprom_size);
 
         spin_lock(&halmac_adapter->efuse_lock);
@@ -3355,10 +3338,8 @@ enum halmac_ret_status halmac_query_dump_logical_efuse_status_88xx(
                 *size = eeprom_size;
 
                 eeprom_map = kzalloc(eeprom_size, GFP_KERNEL);
-                if (!eeprom_map) {
-                        /* out of memory */
+                if (!eeprom_map)
                         return HALMAC_RET_MALLOC_FAIL;
-                }
                 memset(eeprom_map, 0xFF, eeprom_size);
 
                 if (halmac_eeprom_parser_88xx(
@@ -3579,10 +3560,8 @@ halmac_verify_send_rsvd_page_88xx(struct halmac_adapter *halmac_adapter)
 
         rsvd_buf = kzalloc(h2c_pkt_verify_size, GFP_KERNEL);
 
-        if (!rsvd_buf) {
-                /*pr_err("[ERR]rsvd buffer malloc fail!!\n");*/
+        if (!rsvd_buf)
                 return HALMAC_RET_MALLOC_FAIL;
-        }
 
         memset(rsvd_buf, (u8)h2c_pkt_verify_payload, h2c_pkt_verify_size);
 
@@ -3599,7 +3578,6 @@ halmac_verify_send_rsvd_page_88xx(struct halmac_adapter *halmac_adapter)
                             GFP_KERNEL);
 
         if (!rsvd_page) {
-                pr_err("[ERR]rsvd page malloc fail!!\n");
                 kfree(rsvd_buf);
                 return HALMAC_RET_MALLOC_FAIL;
         }
diff --git a/drivers/staging/rtlwifi/halmac/rtl_halmac.c b/drivers/staging/rtlwifi/halmac/rtl_halmac.c
index 6448a8bfc14b..66f0a6dfc52c 100644
--- a/drivers/staging/rtlwifi/halmac/rtl_halmac.c
+++ b/drivers/staging/rtlwifi/halmac/rtl_halmac.c
@@ -617,7 +617,7 @@ static int _send_general_info(struct rtl_priv *rtlpriv)
                 RT_TRACE(rtlpriv, COMP_HALMAC, DBG_WARNING,
                          "%s: halmac_send_general_info() fail because fw not dl!\n",
                          __func__);
-        /* fallthrough here */
+        /* fall through */
         default:
                 return -1;
         }
diff --git a/drivers/staging/rtlwifi/pci.c b/drivers/staging/rtlwifi/pci.c
index 4035b8835bd1..70a64a5f564a 100644
--- a/drivers/staging/rtlwifi/pci.c
+++ b/drivers/staging/rtlwifi/pci.c
@@ -649,7 +649,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
                                  prio, ring->idx,
                                  skb_queue_len(&ring->queue));
 
-                        ieee80211_wake_queue(hw, skb_get_queue_mapping (skb));
+                        ieee80211_wake_queue(hw, skb_get_queue_mapping(skb));
                 }
 tx_status_ok:
                 skb = NULL;
diff --git a/drivers/staging/rtlwifi/phydm/halphyrf_ce.c b/drivers/staging/rtlwifi/phydm/halphyrf_ce.c
index 684e383201d6..5986892e767e 100644
--- a/drivers/staging/rtlwifi/phydm/halphyrf_ce.c
+++ b/drivers/staging/rtlwifi/phydm/halphyrf_ce.c
@@ -798,7 +798,7 @@ void odm_txpowertracking_callback_thermal_meter(void *dm_void)
 
                 if (xtal_offset_eanble != 0 &&
                     cali_info->txpowertrack_control &&
-                    (rtlefu->eeprom_thermalmeter != 0xff)) {
+                    rtlefu->eeprom_thermalmeter != 0xff) {
                         ODM_RT_TRACE(
                                 dm, ODM_COMP_TX_PWR_TRACK,
                                 "**********Enter Xtal Tracking**********\n");
diff --git a/drivers/staging/rtlwifi/phydm/phydm.c b/drivers/staging/rtlwifi/phydm/phydm.c
index 37888c3087a4..8b2a180cc13c 100644
--- a/drivers/staging/rtlwifi/phydm/phydm.c
+++ b/drivers/staging/rtlwifi/phydm/phydm.c
@@ -1338,7 +1338,7 @@ static void odm_update_power_training_state(struct phy_dm_struct *dm)
                 return;
 
         /* First connect */
-        if ((dm->is_linked) && !dig_tab->is_media_connect_0) {
+        if (dm->is_linked && !dig_tab->is_media_connect_0) {
                 dm->PT_score = 0;
                 dm->is_change_state = true;
                 dm->phy_dbg_info.num_qry_phy_status_ofdm = 0;
@@ -1360,7 +1360,7 @@ static void odm_update_power_training_state(struct phy_dm_struct *dm)
                              (u32)(dm->phy_dbg_info.num_qry_phy_status_cck);
 
                 if ((false_alm_cnt->cnt_cca_all > 31 && rx_pkt_cnt > 31) &&
-                    (false_alm_cnt->cnt_cca_all >= rx_pkt_cnt)) {
+                    false_alm_cnt->cnt_cca_all >= rx_pkt_cnt) {
                         if ((rx_pkt_cnt + (rx_pkt_cnt >> 1)) <=
                             false_alm_cnt->cnt_cca_all)
                                 score = 0;
@@ -1697,7 +1697,7 @@ static u8 phydm_calculate_fc(void *dm_void, u32 channel, u32 bw, u32 second_ch,
 
                 fc = 2412 + (channel - 1) * 5;
 
-                if (bw == 40 && (second_ch == PHYDM_ABOVE)) {
+                if (bw == 40 && second_ch == PHYDM_ABOVE) {
                         if (channel >= 10) {
                                 ODM_RT_TRACE(
                                         dm, ODM_COMP_API,
@@ -1774,7 +1774,7 @@ static u8 phydm_calculate_intf_distance(void *dm_void, u32 bw, u32 fc,
                      "[f_l, fc, fh] = [ %d, %d, %d ], f_int = ((%d))\n", bw_low,
                      fc, bw_up, f_interference);
 
-        if ((f_interference >= bw_low) && (f_interference <= bw_up)) {
+        if (f_interference >= bw_low && f_interference <= bw_up) {
                 int_distance = (fc >= f_interference) ? (fc - f_interference) :
                                                         (f_interference - fc);
                 tone_idx_tmp =
diff --git a/drivers/staging/rtlwifi/phydm/phydm_adaptivity.c b/drivers/staging/rtlwifi/phydm/phydm_adaptivity.c
index 4f9e267409f6..103a774f9c8f 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_adaptivity.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_adaptivity.c
@@ -762,7 +762,7 @@ void phydm_adaptivity(void *dm_void)
                 dm->rssi_min, adaptivity->adajust_igi_level,
                 dm->adaptivity_flag, dm->adaptivity_enable);
 
-        if (adaptivity->dynamic_link_adaptivity && (!dm->is_linked) &&
+        if (adaptivity->dynamic_link_adaptivity && !dm->is_linked &&
             !dm->adaptivity_enable) {
                 phydm_set_edcca_threshold(dm, 0x7f, 0x7f);
                 ODM_RT_TRACE(
@@ -773,7 +773,7 @@ void phydm_adaptivity(void *dm_void)
 
         if (dm->support_ic_type &
             (ODM_IC_11AC_GAIN_IDX_EDCCA | ODM_IC_11N_GAIN_IDX_EDCCA)) {
-                if ((adaptivity->adajust_igi_level > IGI) &&
+                if (adaptivity->adajust_igi_level > IGI &&
                     dm->adaptivity_enable)
                         diff = adaptivity->adajust_igi_level - IGI;
 
diff --git a/drivers/staging/rtlwifi/phydm/phydm_debug.c b/drivers/staging/rtlwifi/phydm/phydm_debug.c
index a5f90afdae9b..e18ba2cca2bd 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_debug.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_debug.c
@@ -29,6 +29,7 @@
 
 #include "mp_precomp.h"
 #include "phydm_precomp.h"
+#include <linux/kernel.h>
 
 bool phydm_api_set_txagc(struct phy_dm_struct *, u32, enum odm_rf_radio_path,
                          u8, bool);
@@ -1441,9 +1442,9 @@ static void phydm_get_per_path_txagc(void *dm_void, u8 path, u32 *_used,
         u32 out_len = *_out_len;
 
         if (((dm->support_ic_type & (ODM_RTL8822B | ODM_RTL8197F)) &&
-             (path <= ODM_RF_PATH_B)) ||
+             path <= ODM_RF_PATH_B) ||
             ((dm->support_ic_type & (ODM_RTL8821C)) &&
-             (path <= ODM_RF_PATH_A))) {
+             path <= ODM_RF_PATH_A)) {
                 for (rate_idx = 0; rate_idx <= 0x53; rate_idx++) {
                         if (rate_idx == ODM_RATE1M)
                                 PHYDM_SNPRINTF(output + used, out_len - used,
@@ -2107,8 +2108,7 @@ void phydm_cmd_parser(struct phy_dm_struct *dm, char input[][MAX_ARGV],
 
         /* Parsing Cmd ID */
         if (input_num) {
-                phydm_ary_size =
-                        sizeof(phy_dm_ary) / sizeof(struct phydm_command);
+                phydm_ary_size = ARRAY_SIZE(phy_dm_ary);
                 for (i = 0; i < phydm_ary_size; i++) {
                         if (strcmp(phy_dm_ary[i].name, input[0]) == 0) {
                                 id = phy_dm_ary[i].id;
@@ -2530,7 +2530,7 @@ void phydm_cmd_parser(struct phy_dm_struct *dm, char input[][MAX_ARGV],
                 }
 
                 /* NMH trigger */
-                if ((var1[0] <= 2) && (var1[0] != 0)) {
+                if (var1[0] <= 2 && var1[0] != 0) {
                         ccx_info->echo_NHM_en = true;
                         ccx_info->echo_IGI =
                                 (u8)odm_get_bb_reg(dm, 0xC50, MASKBYTE0);
@@ -2808,7 +2808,7 @@ void phydm_fw_trace_handler(void *dm_void, u8 *cmd_buf, u8 cmd_len)
         freg_num = (buf_0 & 0xf);
         c2h_seq = (buf_0 & 0xf0) >> 4;
 
-        if ((c2h_seq != dm->pre_c2h_seq) && !dm->fw_buff_is_enpty) {
+        if (c2h_seq != dm->pre_c2h_seq && !dm->fw_buff_is_enpty) {
                 dm->fw_debug_trace[dm->c2h_cmd_start] = '\0';
                 ODM_RT_TRACE(dm, ODM_FW_DEBUG_TRACE,
                              "[FW Dbg Queue Overflow] %s\n",
diff --git a/drivers/staging/rtlwifi/phydm/phydm_dig.c b/drivers/staging/rtlwifi/phydm/phydm_dig.c
index 31a4f3fcad19..f851ff12dc35 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_dig.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_dig.c
@@ -198,7 +198,7 @@ static u8 odm_forbidden_igi_check(void *dm_void, u8 dig_dynamic_min,
                 if ((fa_cnt->cnt_all >
                      (fa_cnt->cnt_all_pre + (fa_cnt->cnt_all_pre >> 3) +
                       (fa_cnt->cnt_all_pre >> 4))) &&
-                    (current_igi < dig_tab->pre_ig_value)) {
+                    current_igi < dig_tab->pre_ig_value) {
                         if (dig_tab->large_fa_hit != 3)
                                 dig_tab->large_fa_hit++;
 
@@ -319,7 +319,7 @@ void odm_write_dig(void *dm_void, u8 current_igi)
                      __func__, ODM_REG(IGI_A, dm), ODM_BIT(IGI, dm));
 
         /* 1 Check initial gain by upper bound */
-        if ((!dig_tab->is_psd_in_progress) && dm->is_linked) {
+        if (!dig_tab->is_psd_in_progress && dm->is_linked) {
                 if (current_igi > dig_tab->rx_gain_range_max) {
                         ODM_RT_TRACE(
                                 dm, ODM_COMP_DIG,
@@ -353,7 +353,7 @@ void odm_write_dig(void *dm_void, u8 current_igi)
 
                 /*Add by YuChen for USB IO too slow issue*/
                 if ((dm->support_ability & ODM_BB_ADAPTIVITY) &&
-                    (current_igi > dig_tab->cur_ig_value)) {
+                    current_igi > dig_tab->cur_ig_value) {
                         dig_tab->cur_ig_value = current_igi;
                         phydm_adaptivity(dm);
                 }
@@ -388,7 +388,7 @@ void odm_pause_dig(void *dm_void, enum phydm_pause_type pause_type,
         ODM_RT_TRACE(dm, ODM_COMP_DIG, "%s()=========> level = %d\n", __func__,
                      pause_level);
 
-        if ((dig_tab->pause_dig_level == 0) &&
+        if (dig_tab->pause_dig_level == 0 &&
             (!(dm->support_ability & ODM_BB_DIG) ||
              !(dm->support_ability & ODM_BB_FA_CNT))) {
                 ODM_RT_TRACE(
@@ -490,6 +490,8 @@ void odm_pause_dig(void *dm_void, enum phydm_pause_type pause_type,
                                 break;
                 }
 
+                /* pin max_level to be >= 0 */
+                max_level = max_t(s8, 0, max_level);
                 /* write IGI of lower level */
                 odm_write_dig(dm, dig_tab->pause_dig_value[max_level]);
                 ODM_RT_TRACE(dm, ODM_COMP_DIG,
@@ -718,7 +720,7 @@ void odm_DIG(void *dm_void)
                 /* 4 Modify DIG upper bound for 92E, 8723A\B, 8821 & 8812 BT */
                 if ((dm->support_ic_type & (ODM_RTL8192E | ODM_RTL8723B |
                                             ODM_RTL8812 | ODM_RTL8821)) &&
-                    (dm->is_bt_limited_dig == 1)) {
+                    dm->is_bt_limited_dig == 1) {
                         offset = 10;
                         ODM_RT_TRACE(
                                 dm, ODM_COMP_DIG,
@@ -817,8 +819,8 @@ void odm_DIG(void *dm_void)
         if (dm->is_linked && !first_connect) {
                 ODM_RT_TRACE(dm, ODM_COMP_DIG, "Beacon Num (%d)\n",
                              dm->phy_dbg_info.num_qry_beacon_pkt);
-                if ((dm->phy_dbg_info.num_qry_beacon_pkt < 5) &&
-                    (dm->bsta_state)) {
+                if (dm->phy_dbg_info.num_qry_beacon_pkt < 5 &&
+                    dm->bsta_state) {
                         dig_tab->rx_gain_range_min = 0x1c;
                         ODM_RT_TRACE(
                                 dm, ODM_COMP_DIG,
@@ -880,9 +882,9 @@ void odm_DIG(void *dm_void)
                                 current_igi = current_igi - 2;
 
                         /* 4 Abnormal # beacon case */
-                        if ((dm->phy_dbg_info.num_qry_beacon_pkt < 5) &&
-                            (fa_cnt->cnt_all < DM_DIG_FA_TH1) &&
-                            (dm->bsta_state)) {
+                        if (dm->phy_dbg_info.num_qry_beacon_pkt < 5 &&
+                            fa_cnt->cnt_all < DM_DIG_FA_TH1 &&
+                            dm->bsta_state) {
                                 current_igi = dig_tab->rx_gain_range_min;
                                 ODM_RT_TRACE(
                                         dm, ODM_COMP_DIG,
@@ -1319,7 +1321,7 @@ void odm_pause_cck_packet_detection(void *dm_void,
         ODM_RT_TRACE(dm, ODM_COMP_DIG, "%s()=========> level = %d\n", __func__,
                      pause_level);
 
-        if ((dig_tab->pause_cckpd_level == 0) &&
+        if (dig_tab->pause_cckpd_level == 0 &&
             (!(dm->support_ability & ODM_BB_CCK_PD) ||
              !(dm->support_ability & ODM_BB_FA_CNT))) {
                 ODM_RT_TRACE(
diff --git a/drivers/staging/rtlwifi/phydm/phydm_interface.c b/drivers/staging/rtlwifi/phydm/phydm_interface.c
index 102576a46c04..2f9bf6708c54 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_interface.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_interface.c
@@ -179,29 +179,6 @@ void ODM_sleep_ms(u32 ms) { msleep(ms); }
 
 void ODM_sleep_us(u32 us) { usleep_range(us, us + 1); }
 
-void odm_set_timer(struct phy_dm_struct *dm, struct timer_list *timer,
-                   u32 ms_delay)
-{
-        mod_timer(timer, jiffies + msecs_to_jiffies(ms_delay));
-}
-
-void odm_initialize_timer(struct phy_dm_struct *dm, struct timer_list *timer,
-                          void *call_back_func, void *context,
-                          const char *sz_id)
-{
-        init_timer(timer);
-        timer->function = call_back_func;
-        timer->data = (unsigned long)dm;
-        /*mod_timer(timer, jiffies+RTL_MILISECONDS_TO_JIFFIES(10));     */
-}
-
-void odm_cancel_timer(struct phy_dm_struct *dm, struct timer_list *timer)
-{
-        del_timer(timer);
-}
-
-void odm_release_timer(struct phy_dm_struct *dm, struct timer_list *timer) {}
-
 static u8 phydm_trans_h2c_id(struct phy_dm_struct *dm, u8 phydm_h2c_id)
 {
         u8 platform_h2c_id = phydm_h2c_id;
diff --git a/drivers/staging/rtlwifi/phydm/phydm_interface.h b/drivers/staging/rtlwifi/phydm/phydm_interface.h
index d315c79c962a..53ba5585bf33 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_interface.h
+++ b/drivers/staging/rtlwifi/phydm/phydm_interface.h
@@ -172,17 +172,6 @@ void ODM_sleep_ms(u32 ms);
 
 void ODM_sleep_us(u32 us);
 
-void odm_set_timer(struct phy_dm_struct *dm, struct timer_list *timer,
-                   u32 ms_delay);
-
-void odm_initialize_timer(struct phy_dm_struct *dm, struct timer_list *timer,
-                          void *call_back_func, void *context,
-                          const char *sz_id);
-
-void odm_cancel_timer(struct phy_dm_struct *dm, struct timer_list *timer);
-
-void odm_release_timer(struct phy_dm_struct *dm, struct timer_list *timer);
-
 /*
  * ODM FW relative API.
  */
diff --git a/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c b/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c
index 4e7946019fcb..29d19f2b300e 100644
--- a/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c
+++ b/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c
@@ -26,6 +26,7 @@
 /*Image2HeaderVersion: 3.2*/
 #include "../mp_precomp.h"
 #include "../phydm_precomp.h"
+#include <linux/kernel.h>
 
 static bool check_positive(struct phy_dm_struct *dm, const u32 condition1,
                            const u32 condition2, const u32 condition3,
@@ -1350,7 +1351,6 @@ void odm_read_and_config_mp_8822b_agc_tab(struct phy_dm_struct *dm)
         u32 i = 0;
         u8 c_cond;
         bool is_matched = true, is_skipped = false;
-        u32 array_len = sizeof(array_mp_8822b_agc_tab) / sizeof(u32);
         u32 *array = array_mp_8822b_agc_tab;
 
         u32 v1 = 0, v2 = 0, pre_v1 = 0, pre_v2 = 0;
@@ -1358,7 +1358,7 @@ void odm_read_and_config_mp_8822b_agc_tab(struct phy_dm_struct *dm)
         ODM_RT_TRACE(dm, ODM_COMP_INIT,
                      "===> %s\n", __func__);
 
-        for (; (i + 1) < array_len; i = i + 2) {
+        for (; (i + 1) < ARRAY_SIZE(array_mp_8822b_agc_tab); i = i + 2) {
                 v1 = array[i];
                 v2 = array[i + 1];
 
@@ -1843,7 +1843,6 @@ void odm_read_and_config_mp_8822b_phy_reg(struct phy_dm_struct *dm)
         u32 i = 0;
         u8 c_cond;
         bool is_matched = true, is_skipped = false;
-        u32 array_len = sizeof(array_mp_8822b_phy_reg) / sizeof(u32);
         u32 *array = array_mp_8822b_phy_reg;
 
         u32 v1 = 0, v2 = 0, pre_v1 = 0, pre_v2 = 0;
@@ -1851,7 +1850,7 @@ void odm_read_and_config_mp_8822b_phy_reg(struct phy_dm_struct *dm)
         ODM_RT_TRACE(dm, ODM_COMP_INIT,
                      "===> %s\n", __func__);
 
-        for (; (i + 1) < array_len; i = i + 2) {
+        for (; (i + 1) < ARRAY_SIZE(array_mp_8822b_phy_reg); i = i + 2) {
                 v1 = array[i];
                 v2 = array[i + 1];
 
@@ -1947,7 +1946,6 @@ static u32 array_mp_8822b_phy_reg_pg[] = {
 void odm_read_and_config_mp_8822b_phy_reg_pg(struct phy_dm_struct *dm)
 {
         u32 i = 0;
-        u32 array_len = sizeof(array_mp_8822b_phy_reg_pg) / sizeof(u32);
         u32 *array = array_mp_8822b_phy_reg_pg;
 
         ODM_RT_TRACE(dm, ODM_COMP_INIT,
@@ -1956,7 +1954,7 @@ void odm_read_and_config_mp_8822b_phy_reg_pg(struct phy_dm_struct *dm)
         dm->phy_reg_pg_version = 1;
         dm->phy_reg_pg_value_type = PHY_REG_PG_EXACT_VALUE;
 
-        for (i = 0; i < array_len; i += 6) {
+        for (i = 0; i < ARRAY_SIZE(array_mp_8822b_phy_reg_pg); i += 6) {
                 u32 v1 = array[i];
                 u32 v2 = array[i + 1];
                 u32 v3 = array[i + 2];
diff --git a/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c b/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c
index 1a9daed2e609..70924f002541 100644
--- a/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c
+++ b/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c
@@ -26,6 +26,7 @@
 /*Image2HeaderVersion: 3.2*/
 #include "../mp_precomp.h"
 #include "../phydm_precomp.h"
+#include <linux/kernel.h>
 
 static bool check_positive(struct phy_dm_struct *dm, const u32 condition1,
                            const u32 condition2, const u32 condition3,
@@ -173,7 +174,6 @@ void odm_read_and_config_mp_8822b_mac_reg(struct phy_dm_struct *dm)
         u32 i = 0;
         u8 c_cond;
         bool is_matched = true, is_skipped = false;
-        u32 array_len = sizeof(array_mp_8822b_mac_reg) / sizeof(u32);
         u32 *array = array_mp_8822b_mac_reg;
 
         u32 v1 = 0, v2 = 0, pre_v1 = 0, pre_v2 = 0;
@@ -181,7 +181,7 @@ void odm_read_and_config_mp_8822b_mac_reg(struct phy_dm_struct *dm)
         ODM_RT_TRACE(dm, ODM_COMP_INIT,
                      "===> %s\n", __func__);
 
-        for (; (i + 1) < array_len; i = i + 2) {
+        for (; (i + 1) < ARRAY_SIZE(array_mp_8822b_mac_reg); i = i + 2) {
                 v1 = array[i];
                 v2 = array[i + 1];
 
diff --git a/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c b/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c
index 84cdc0644207..0ff3a9a712d6 100644
--- a/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c
+++ b/drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c
@@ -26,6 +26,7 @@
 /*Image2HeaderVersion: 3.2*/
 #include "../mp_precomp.h"
 #include "../phydm_precomp.h"
+#include <linux/kernel.h>
 
 static bool check_positive(struct phy_dm_struct *dm, const u32 condition1,
                            const u32 condition2, const u32 condition3,
@@ -1346,7 +1347,6 @@ void odm_read_and_config_mp_8822b_radioa(struct phy_dm_struct *dm)
         u32 i = 0;
         u8 c_cond;
         bool is_matched = true, is_skipped = false;
-        u32 array_len = sizeof(array_mp_8822b_radioa) / sizeof(u32);
         u32 *array = array_mp_8822b_radioa;
 
         u32 v1 = 0, v2 = 0, pre_v1 = 0, pre_v2 = 0;
@@ -1354,7 +1354,7 @@ void odm_read_and_config_mp_8822b_radioa(struct phy_dm_struct *dm)
         ODM_RT_TRACE(dm, ODM_COMP_INIT,
                      "===> %s\n", __func__);
 
-        for (; (i + 1) < array_len; i = i + 2) {
+        for (; (i + 1) < ARRAY_SIZE(array_mp_8822b_radioa); i = i + 2) {
                 v1 = array[i];
                 v2 = array[i + 1];
 
@@ -2506,7 +2506,6 @@ void odm_read_and_config_mp_8822b_radiob(struct phy_dm_struct *dm)
         u32 i = 0;
         u8 c_cond;
         bool is_matched = true, is_skipped = false;
-        u32 array_len = sizeof(array_mp_8822b_radiob) / sizeof(u32);
         u32 *array = array_mp_8822b_radiob;
 
         u32 v1 = 0, v2 = 0, pre_v1 = 0, pre_v2 = 0;
@@ -2514,7 +2513,7 @@ void odm_read_and_config_mp_8822b_radiob(struct phy_dm_struct *dm)
         ODM_RT_TRACE(dm, ODM_COMP_INIT,
                      "===> %s\n", __func__);
 
-        for (; (i + 1) < array_len; i = i + 2) {
+        for (; (i + 1) < ARRAY_SIZE(array_mp_8822b_radiob); i = i + 2) {
                 v1 = array[i];
                 v2 = array[i + 1];
 
@@ -4239,13 +4238,12 @@ static const char *const array_mp_8822b_txpwr_lmt[] = {
 void odm_read_and_config_mp_8822b_txpwr_lmt(struct phy_dm_struct *dm)
 {
         u32 i = 0;
-        u32 array_len = sizeof(array_mp_8822b_txpwr_lmt) / sizeof(u8 *);
         u8 **array = (u8 **)array_mp_8822b_txpwr_lmt;
 
         ODM_RT_TRACE(dm, ODM_COMP_INIT,
                      "===> %s\n", __func__);
 
-        for (i = 0; i < array_len; i += 7) {
+        for (i = 0; i < ARRAY_SIZE(array_mp_8822b_txpwr_lmt); i += 7) {
                 u8 *regulation = array[i];
                 u8 *band = array[i + 1];
                 u8 *bandwidth = array[i + 2];
@@ -4723,13 +4721,12 @@ static const char *const array_mp_8822b_txpwr_lmt_type5[] = {
 void odm_read_and_config_mp_8822b_txpwr_lmt_type5(struct phy_dm_struct *dm)
 {
         u32 i = 0;
-        u32 array_len = sizeof(array_mp_8822b_txpwr_lmt_type5) / sizeof(u8 *);
         u8 **array = (u8 **)array_mp_8822b_txpwr_lmt_type5;
 
         ODM_RT_TRACE(dm, ODM_COMP_INIT,
                      "===> odm_read_and_config_mp_8822b_txpwr_lmt_type5\n");
 
-        for (i = 0; i < array_len; i += 7) {
+        for (i = 0; i < ARRAY_SIZE(array_mp_8822b_txpwr_lmt_type5); i += 7) {
                 u8 *regulation = array[i];
                 u8 *band = array[i + 1];
                 u8 *bandwidth = array[i + 2];
diff --git a/drivers/staging/rtlwifi/ps.c b/drivers/staging/rtlwifi/ps.c
index 9172cee45f74..7856fc5d10bd 100644
--- a/drivers/staging/rtlwifi/ps.c
+++ b/drivers/staging/rtlwifi/ps.c
@@ -61,7 +61,7 @@ bool rtl_ps_enable_nic(struct ieee80211_hw *hw)
         rtlpriv->cfg->ops->enable_interrupt(hw);
 
         /*<enable timer> */
-        rtl_watch_dog_timer_callback((unsigned long)hw);
+        rtl_watch_dog_timer_callback(&rtlpriv->works.watchdog_timer);
 
         return true;
 }
diff --git a/drivers/staging/rtlwifi/rc.c b/drivers/staging/rtlwifi/rc.c
index 65de0c7b5a67..c835be91f398 100644
--- a/drivers/staging/rtlwifi/rc.c
+++ b/drivers/staging/rtlwifi/rc.c
@@ -125,8 +125,8 @@ static void _rtl_rc_rate_set_series(struct rtl_priv *rtlpriv,
         }
         rate->count = tries;
         rate->idx = rix >= 0x00 ? rix : 0x00;
-        if (((rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8812AE) ||
-             (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8822BE)) &&
+        if ((rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8812AE ||
+             rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8822BE) &&
             wireless_mode == WIRELESS_MODE_AC_5G)
                 rate->idx |= 0x10;/*2NSS for 8812AE, 8822BE*/
 
@@ -138,7 +138,7 @@ static void _rtl_rc_rate_set_series(struct rtl_priv *rtlpriv,
                         if (sta && (sta->ht_cap.cap &
                                     IEEE80211_HT_CAP_SUP_WIDTH_20_40))
                                 rate->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
-                        if (sta && (sta->vht_cap.vht_supported))
+                        if (sta && sta->vht_cap.vht_supported)
                                 rate->flags |= IEEE80211_TX_RC_80_MHZ_WIDTH;
                 } else {
                         if (mac->bw_80)
@@ -150,8 +150,8 @@ static void _rtl_rc_rate_set_series(struct rtl_priv *rtlpriv,
                 if (sgi_20 || sgi_40 || sgi_80)
                         rate->flags |= IEEE80211_TX_RC_SHORT_GI;
                 if (sta && sta->ht_cap.ht_supported &&
-                    ((wireless_mode == WIRELESS_MODE_N_5G) ||
-                     (wireless_mode == WIRELESS_MODE_N_24G)))
+                    (wireless_mode == WIRELESS_MODE_N_5G ||
+                     wireless_mode == WIRELESS_MODE_N_24G))
                         rate->flags |= IEEE80211_TX_RC_MCS;
                 if (sta && sta->vht_cap.vht_supported &&
                     (wireless_mode == WIRELESS_MODE_AC_5G ||
@@ -232,7 +232,7 @@ static void rtl_tx_status(void *ppriv,
         if (sta) {
                 /* Check if aggregation has to be enabled for this tid */
                 sta_entry = (struct rtl_sta_info *)sta->drv_priv;
-                if ((sta->ht_cap.ht_supported) &&
+                if (sta->ht_cap.ht_supported &&
                     !(skb->protocol == cpu_to_be16(ETH_P_PAE))) {
                         if (ieee80211_is_data_qos(fc)) {
                                 u8 tid = rtl_get_tid(skb);
@@ -281,10 +281,8 @@ static void *rtl_rate_alloc_sta(void *ppriv,
         struct rtl_rate_priv *rate_priv;
 
         rate_priv = kzalloc(sizeof(*rate_priv), gfp);
-        if (!rate_priv) {
-                pr_err("Unable to allocate private rc structure\n");
+        if (!rate_priv)
                 return NULL;
-        }
 
         rtlpriv->rate_priv = rate_priv;
 
diff --git a/drivers/staging/rtlwifi/rtl8822be/fw.c b/drivers/staging/rtlwifi/rtl8822be/fw.c
index 8e24da16752c..f45487122517 100644
--- a/drivers/staging/rtlwifi/rtl8822be/fw.c
+++ b/drivers/staging/rtlwifi/rtl8822be/fw.c
@@ -330,7 +330,7 @@ void rtl8822be_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
                         byte5 = btc_ops->btc_get_lps_val(rtlpriv);
                         power_state = btc_ops->btc_get_rpwm_val(rtlpriv);
 
-                        if ((rlbm == 2) && (byte5 & BIT(4))) {
+                        if (rlbm == 2 && (byte5 & BIT(4))) {
                                 /* Keep awake interval to 1 to prevent from
                                  * decreasing coex performance
                                  */
@@ -419,7 +419,7 @@ static bool _rtl8822be_send_bcn_or_cmd_packet(struct ieee80211_hw *hw,
                 dma_addr = rtlpriv->cfg->ops->get_desc(
                                 hw, (u8 *)pbd_desc, true, HW_DESC_TXBUFF_ADDR);
 
-                pci_unmap_single(rtlpci->pdev, dma_addr, skb->len,
+                pci_unmap_single(rtlpci->pdev, dma_addr, pskb->len,
                                  PCI_DMA_TODEVICE);
                 kfree_skb(pskb);
 
@@ -766,9 +766,10 @@ void rtl8822be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
                 rtl8822be_fill_h2c_cmd(hw, H2C_8822B_RSVDPAGE,
                                        sizeof(u1_rsvd_page_loc),
                                        u1_rsvd_page_loc);
-        } else
+        } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "Set RSVD page location to Fw FAIL!!!!!!.\n");
+        }
 }
 
 /* Should check FW support p2p or not. */
@@ -834,7 +835,7 @@ void rtl8822be_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state)
                         rtl_write_dword(rtlpriv, 0x5EC,
                                         p2pinfo->noa_count_type[i]);
                 }
-                if ((p2pinfo->opp_ps == 1) || (p2pinfo->noa_num > 0)) {
+                if (p2pinfo->opp_ps == 1 || p2pinfo->noa_num > 0) {
                         /* rst p2p circuit */
                         rtl_write_byte(rtlpriv, REG_DUAL_TSF_RST_8822B, BIT(4));
                         p2p_ps_offload->offload_en = 1;
diff --git a/drivers/staging/rtlwifi/rtl8822be/led.c b/drivers/staging/rtlwifi/rtl8822be/led.c
index f4b5af8ab116..0054c892dce6 100644
--- a/drivers/staging/rtlwifi/rtl8822be/led.c
+++ b/drivers/staging/rtlwifi/rtl8822be/led.c
@@ -114,7 +114,7 @@ void rtl8822be_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
 
-        if ((ppsc->rfoff_reason > RF_CHANGE_BY_PS) &&
+        if (ppsc->rfoff_reason > RF_CHANGE_BY_PS &&
             (ledaction == LED_CTL_TX || ledaction == LED_CTL_RX ||
              ledaction == LED_CTL_SITE_SURVEY || ledaction == LED_CTL_LINK ||
              ledaction == LED_CTL_NO_LINK ||
diff --git a/drivers/staging/rtlwifi/rtl8822be/phy.c b/drivers/staging/rtlwifi/rtl8822be/phy.c
index 4cba2adc3165..ef37ae98c803 100644
--- a/drivers/staging/rtlwifi/rtl8822be/phy.c
+++ b/drivers/staging/rtlwifi/rtl8822be/phy.c
@@ -890,7 +890,7 @@ bool rtl8822be_load_txpower_by_rate(struct ieee80211_hw *hw)
         rtstatus = rtlpriv->phydm.ops->phydm_load_txpower_by_rate(rtlpriv);
 
         if (!rtstatus) {
-                pr_err("BB_PG Reg Fail!!");
+                pr_err("BB_PG Reg Fail!!\n");
                 return false;
         }
 
@@ -915,7 +915,7 @@ bool rtl8822be_load_txpower_limit(struct ieee80211_hw *hw)
         rtstatus = rtlpriv->phydm.ops->phydm_load_txpower_limit(rtlpriv);
 
         if (!rtstatus) {
-                pr_err("RF TxPwr Limit Fail!!");
+                pr_err("RF TxPwr Limit Fail!!\n");
                 return false;
         }
 
@@ -1562,9 +1562,10 @@ static char _rtl8822be_phy_get_txpower_limit(struct ieee80211_hw *hw, u8 band,
                                                       [channel_index]
                                                       [rate_section]
                                                       [channel_index][rf_path];
-        } else
+        } else {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                          "No power limit table of the specified band\n");
+        }
 
         return power_limit;
 }
@@ -1609,9 +1610,9 @@ u8 rtl8822be_get_txpower_index(struct ieee80211_hw *hw, u8 path, u8 rate,
         char limit;
         char powerdiff_byrate = 0;
 
-        if (((rtlhal->current_bandtype == BAND_ON_2_4G) &&
+        if ((rtlhal->current_bandtype == BAND_ON_2_4G &&
              (channel > 14 || channel < 1)) ||
-            ((rtlhal->current_bandtype == BAND_ON_5G) && (channel <= 14))) {
+            (rtlhal->current_bandtype == BAND_ON_5G && channel <= 14)) {
                 index = 0;
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                          "Illegal channel!!\n");
@@ -1755,9 +1756,9 @@ static void _rtl8822be_phy_set_txpower_index(struct ieee80211_hw *hw,
         static u32 index;
 
         /*
-        * For 8822B, phydm api use 4 bytes txagc value
-        * driver must combine every four 1 byte to one 4 byte and send to phydm
-        */
+         * For 8822B, phydm api use 4 bytes txagc value driver must
+         * combine every four 1 byte to one 4 byte and send to phydm
+         */
         shift = rate & 0x03;
         index |= ((u32)power_index << (shift * 8));
 
@@ -1912,8 +1913,8 @@ static u8 _rtl8822be_phy_get_pri_ch_id(struct rtl_priv *rtlpriv)
 
         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_80) {
                 /* primary channel is at lower subband of 80MHz & 40MHz */
-                if ((mac->cur_40_prime_sc == HAL_PRIME_CHNL_OFFSET_LOWER) &&
-                    (mac->cur_80_prime_sc == HAL_PRIME_CHNL_OFFSET_LOWER)) {
+                if (mac->cur_40_prime_sc == HAL_PRIME_CHNL_OFFSET_LOWER &&
+                    mac->cur_80_prime_sc == HAL_PRIME_CHNL_OFFSET_LOWER) {
                         pri_ch_idx = VHT_DATA_SC_20_LOWEST_OF_80MHZ;
                 /* primary channel is at
                  * lower subband of 80MHz & upper subband of 40MHz
@@ -2141,7 +2142,7 @@ static bool _rtl8822be_phy_set_rf_power_state(struct ieee80211_hw *hw,
 
         switch (rfpwr_state) {
         case ERFON:
-                if ((ppsc->rfpwr_state == ERFOFF) &&
+                if (ppsc->rfpwr_state == ERFOFF &&
                     RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
                         bool rtstatus = false;
                         u32 initialize_count = 0;
diff --git a/drivers/staging/rtlwifi/rtl8822be/trx.c b/drivers/staging/rtlwifi/rtl8822be/trx.c
index 38f80e48a399..87e15e419252 100644
--- a/drivers/staging/rtlwifi/rtl8822be/trx.c
+++ b/drivers/staging/rtlwifi/rtl8822be/trx.c
@@ -165,7 +165,7 @@ static bool rtl8822be_get_rxdesc_is_ht(struct ieee80211_hw *hw, u8 *pdesc)
 
         RT_TRACE(rtlpriv, COMP_RXDESC, DBG_LOUD, "rx_rate=0x%02x.\n", rx_rate);
 
-        if ((rx_rate >= DESC_RATEMCS0) && (rx_rate <= DESC_RATEMCS15))
+        if (rx_rate >= DESC_RATEMCS0 && rx_rate <= DESC_RATEMCS15)
                 return true;
         else
                 return false;
@@ -193,8 +193,8 @@ static u8 rtl8822be_get_rx_vht_nss(struct ieee80211_hw *hw, u8 *pdesc)
 
         rx_rate = GET_RX_DESC_RX_RATE(pdesc);
 
-        if ((rx_rate >= DESC_RATEVHT1SS_MCS0) &&
-            (rx_rate <= DESC_RATEVHT1SS_MCS9))
+        if (rx_rate >= DESC_RATEVHT1SS_MCS0 &&
+            rx_rate <= DESC_RATEVHT1SS_MCS9)
                 vht_nss = 1;
         else if ((rx_rate >= DESC_RATEVHT2SS_MCS0) &&
                  (rx_rate <= DESC_RATEVHT2SS_MCS9))
@@ -510,8 +510,8 @@ static u8 rtl8822be_bw_mapping(struct ieee80211_hw *hw,
                 else
                         bw_setting_of_desc = 0;
         } else if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
-                if ((ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40) ||
-                    (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_80))
+                if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40 ||
+                    ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_80)
                         bw_setting_of_desc = 1;
                 else
                         bw_setting_of_desc = 0;
@@ -546,10 +546,10 @@ static u8 rtl8822be_sc_mapping(struct ieee80211_hw *hw,
                                          "%s: Not Correct Primary40MHz Setting\n",
                                          __func__);
                 } else {
-                        if ((mac->cur_40_prime_sc ==
-                             HAL_PRIME_CHNL_OFFSET_LOWER) &&
-                            (mac->cur_80_prime_sc ==
-                             HAL_PRIME_CHNL_OFFSET_LOWER))
+                        if (mac->cur_40_prime_sc ==
+                             HAL_PRIME_CHNL_OFFSET_LOWER &&
+                            mac->cur_80_prime_sc ==
+                             HAL_PRIME_CHNL_OFFSET_LOWER)
                                 sc_setting_of_desc =
                                         VHT_DATA_SC_20_LOWEST_OF_80MHZ;
                         else if ((mac->cur_40_prime_sc ==
@@ -571,9 +571,9 @@ static u8 rtl8822be_sc_mapping(struct ieee80211_hw *hw,
                                 sc_setting_of_desc =
                                         VHT_DATA_SC_20_UPPERST_OF_80MHZ;
                         else
-                                RT_TRACE(
-                                        rtlpriv, COMP_SEND, DBG_LOUD,
-                                        "rtl8822be_sc_mapping: Not Correct Primary40MHz Setting\n");
+                                RT_TRACE(rtlpriv, COMP_SEND, DBG_LOUD,
+                                         "%s: Not Correct Primary40MHz Setting\n",
+                                         __func__);
                 }
         } else if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                 if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40) {
diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
index 4033a2cf7ac9..d548bc695f9e 100644
--- a/drivers/staging/rts5208/sd.c
+++ b/drivers/staging/rts5208/sd.c
@@ -4125,12 +4125,6 @@ RTY_SEND_CMD:
                                         rtsx_trace(chip);
                                         return STATUS_FAIL;
                                 }
-
-                        } else if (rsp_type == SD_RSP_TYPE_R0) {
-                                if ((ptr[3] & 0x1E) != 0x03) {
-                                        rtsx_trace(chip);
-                                        return STATUS_FAIL;
-                                }
                         }
                 }
         }
diff --git a/drivers/staging/sm750fb/ddk750_chip.h b/drivers/staging/sm750fb/ddk750_chip.h
index 2c7a9b9a7c8a..d9d4c485e54c 100644
--- a/drivers/staging/sm750fb/ddk750_chip.h
+++ b/drivers/staging/sm750fb/ddk750_chip.h
@@ -17,7 +17,7 @@ static inline u32 peek32(u32 addr)
         return readl(addr + mmio750);
 }
 
-static inline void poke32(u32 data, u32 addr)
+static inline void poke32(u32 addr, u32 data)
 {
         writel(data, addr + mmio750);
 }
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c b/drivers/staging/sm750fb/ddk750_dvi.c
index 87a199d6cdaf..6ecdcf0afd14 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -10,7 +10,7 @@
  * function API. Please set the function pointer to NULL whenever the function
  * is not supported.
  */
-static dvi_ctrl_device_t g_dcftSupportedDviController[] = {
+static struct dvi_ctrl_device g_dcftSupportedDviController[] = {
 #ifdef DVI_CTRL_SII164
         {
                 .pfnInit = sii164InitChip,
@@ -40,7 +40,7 @@ int dviInit(unsigned char edgeSelect,
             unsigned char pllFilterEnable,
             unsigned char pllFilterValue)
 {
-        dvi_ctrl_device_t *pCurrentDviCtrl;
+        struct dvi_ctrl_device *pCurrentDviCtrl;
 
         pCurrentDviCtrl = g_dcftSupportedDviController;
         if (pCurrentDviCtrl->pfnInit) {
diff --git a/drivers/staging/sm750fb/ddk750_dvi.h b/drivers/staging/sm750fb/ddk750_dvi.h
index 4a8394561f76..692888ceee40 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.h
+++ b/drivers/staging/sm750fb/ddk750_dvi.h
@@ -25,7 +25,7 @@ typedef unsigned char (*PFN_DVICTRL_CHECKINTERRUPT)(void);
 typedef void (*PFN_DVICTRL_CLEARINTERRUPT)(void);
 
 /* Structure to hold all the function pointer to the DVI Controller. */
-typedef struct _dvi_ctrl_device_t {
+struct dvi_ctrl_device {
         PFN_DVICTRL_INIT                pfnInit;
         PFN_DVICTRL_RESETCHIP           pfnResetChip;
         PFN_DVICTRL_GETCHIPSTRING       pfnGetChipString;
@@ -36,7 +36,7 @@ typedef struct _dvi_ctrl_device_t {
         PFN_DVICTRL_ISCONNECTED         pfnIsConnected;
         PFN_DVICTRL_CHECKINTERRUPT      pfnCheckInterrupt;
         PFN_DVICTRL_CLEARINTERRUPT      pfnClearInterrupt;
-} dvi_ctrl_device_t;
+};
 
 #define DVI_CTRL_SII164
 
diff --git a/drivers/staging/sm750fb/ddk750_power.c b/drivers/staging/sm750fb/ddk750_power.c
index 222ae1a06feb..6f82ab05fdb6 100644
--- a/drivers/staging/sm750fb/ddk750_power.c
+++ b/drivers/staging/sm750fb/ddk750_power.c
@@ -2,7 +2,7 @@
 #include "ddk750_reg.h"
 #include "ddk750_power.h"
 
-void ddk750_set_dpms(DPMS_t state)
+void ddk750_set_dpms(enum dpms state)
 {
         unsigned int value;
 
diff --git a/drivers/staging/sm750fb/ddk750_power.h b/drivers/staging/sm750fb/ddk750_power.h
index 44c4fc587e96..033889f63920 100644
--- a/drivers/staging/sm750fb/ddk750_power.h
+++ b/drivers/staging/sm750fb/ddk750_power.h
@@ -1,20 +1,19 @@
 #ifndef DDK750_POWER_H__
 #define DDK750_POWER_H__
 
-typedef enum _DPMS_t {
+enum dpms {
         crtDPMS_ON = 0x0,
         crtDPMS_STANDBY = 0x1,
         crtDPMS_SUSPEND = 0x2,
         crtDPMS_OFF = 0x3,
-}
-DPMS_t;
+};
 
 #define setDAC(off) {                                                   \
         poke32(MISC_CTRL,                                               \
                (peek32(MISC_CTRL) & ~MISC_CTRL_DAC_POWER_OFF) | (off)); \
 }
 
-void ddk750_set_dpms(DPMS_t state);
+void ddk750_set_dpms(enum dpms state);
 void sm750_set_power_mode(unsigned int powerMode);
 void sm750_set_current_gate(unsigned int gate);
 
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c b/drivers/staging/sm750fb/ddk750_sii164.c
index 0431833de781..3d68e1d00cb1 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -296,7 +296,8 @@ void sii164SetPower(unsigned char powerUp)
  *  sii164SelectHotPlugDetectionMode
  *      This function selects the mode of the hot plug detection.
  */
-static void sii164SelectHotPlugDetectionMode(sii164_hot_plug_mode_t hotPlugMode)
+static
+void sii164SelectHotPlugDetectionMode(enum sii164_hot_plug_mode hotPlugMode)
 {
         unsigned char detectReg;
 
diff --git a/drivers/staging/sm750fb/ddk750_sii164.h b/drivers/staging/sm750fb/ddk750_sii164.h
index 6968cf532f16..e06ba729b4e2 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.h
+++ b/drivers/staging/sm750fb/ddk750_sii164.h
@@ -4,12 +4,12 @@
 #define USE_DVICHIP
 
 /* Hot Plug detection mode structure */
-typedef enum _sii164_hot_plug_mode_t {
+enum sii164_hot_plug_mode {
         SII164_HOTPLUG_DISABLE = 0,         /* Disable Hot Plug output bit (always high). */
         SII164_HOTPLUG_USE_MDI,             /* Use Monitor Detect Interrupt bit. */
         SII164_HOTPLUG_USE_RSEN,            /* Use Receiver Sense detect bit. */
         SII164_HOTPLUG_USE_HTPLG            /* Use Hot Plug detect bit. */
-} sii164_hot_plug_mode_t;
+};
 
 
 /* Silicon Image SiI164 chip prototype */
diff --git a/drivers/staging/sm750fb/sm750_cursor.c b/drivers/staging/sm750fb/sm750_cursor.c
index aa47a16ac75c..6b27b061d4cf 100644
--- a/drivers/staging/sm750fb/sm750_cursor.c
+++ b/drivers/staging/sm750fb/sm750_cursor.c
@@ -18,8 +18,6 @@
 #include "sm750.h"
 #include "sm750_cursor.h"
 
-
-
 #define poke32(addr, data) \
 writel((data), cursor->mmio + (addr))
 
@@ -45,7 +43,6 @@ writel((data), cursor->mmio + (addr))
 #define HWC_COLOR_3                         0xC
 #define HWC_COLOR_3_RGB565_MASK             0xffff
 
-
 /* hw_cursor_xxx works for voyager,718 and 750 */
 void sm750_hw_cursor_enable(struct lynx_cursor *cursor)
 {
@@ -134,7 +131,6 @@ void sm750_hw_cursor_setData(struct lynx_cursor *cursor, u16 rop,
         }
 }
 
-
 void sm750_hw_cursor_setData2(struct lynx_cursor *cursor, u16 rop,
                               const u8 *pcol, const u8 *pmsk)
 {
diff --git a/drivers/staging/speakup/buffers.c b/drivers/staging/speakup/buffers.c
index f459e4004bfa..6137fa83c609 100644
--- a/drivers/staging/speakup/buffers.c
+++ b/drivers/staging/speakup/buffers.c
@@ -27,7 +27,7 @@ void speakup_start_ttys(void)
         for (i = 0; i < MAX_NR_CONSOLES; i++) {
                 if (speakup_console[i] && speakup_console[i]->tty_stopped)
                         continue;
-                if ((vc_cons[i].d) && (vc_cons[i].d->port.tty))
+                if (vc_cons[i].d && vc_cons[i].d->port.tty)
                         start_tty(vc_cons[i].d->port.tty);
         }
 }
@@ -38,7 +38,7 @@ static void speakup_stop_ttys(void)
         int i;
 
         for (i = 0; i < MAX_NR_CONSOLES; i++)
-                if ((vc_cons[i].d && (vc_cons[i].d->port.tty)))
+                if (vc_cons[i].d && vc_cons[i].d->port.tty)
                         stop_tty(vc_cons[i].d->port.tty);
 }
 
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 56f7be6af1f6..3809cd2ad838 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -447,7 +447,7 @@ static void speak_char(u16 ch)
 
         cp = spk_characters[ch];
         if (!cp) {
-                pr_info("speak_char: cp == NULL!\n");
+                pr_info("%s: cp == NULL!\n", __func__);
                 return;
         }
         if (IS_CHAR(ch, B_CAP)) {
@@ -2101,7 +2101,7 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,
         u_char shift_info, offset;
         int ret = 0;
 
-        if (synth == NULL)
+        if (!synth)
                 return 0;
 
         spin_lock_irqsave(&speakup_info.spinlock, flags);
diff --git a/drivers/staging/speakup/speakup_acntsa.c b/drivers/staging/speakup/speakup_acntsa.c
index 0e10404e2e8c..43315849b7b6 100644
--- a/drivers/staging/speakup/speakup_acntsa.c
+++ b/drivers/staging/speakup/speakup_acntsa.c
@@ -136,7 +136,7 @@ static int synth_probe(struct spk_synth *synth)
 }
 
 module_param_named(ser, synth_acntsa.ser, int, 0444);
-module_param_named(dev, synth_acntsa.dev_name, charp, S_IRUGO);
+module_param_named(dev, synth_acntsa.dev_name, charp, 0444);
 module_param_named(start, synth_acntsa.startup, short, 0444);
 
 MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");
diff --git a/drivers/staging/speakup/speakup_apollo.c b/drivers/staging/speakup/speakup_apollo.c
index 2edb56c8a559..dcf0c3b59fdd 100644
--- a/drivers/staging/speakup/speakup_apollo.c
+++ b/drivers/staging/speakup/speakup_apollo.c
@@ -200,7 +200,7 @@ static void do_catch_up(struct spk_synth *synth)
 }
 
 module_param_named(ser, synth_apollo.ser, int, 0444);
-module_param_named(dev, synth_apollo.dev_name, charp, S_IRUGO);
+module_param_named(dev, synth_apollo.dev_name, charp, 0444);
 module_param_named(start, synth_apollo.startup, short, 0444);
 
 MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");
diff --git a/drivers/staging/speakup/speakup_audptr.c b/drivers/staging/speakup/speakup_audptr.c
index 8ae826eba71c..45b5721441ba 100644
--- a/drivers/staging/speakup/speakup_audptr.c
+++ b/drivers/staging/speakup/speakup_audptr.c
@@ -163,7 +163,7 @@ static int synth_probe(struct spk_synth *synth)
 }
 
 module_param_named(ser, synth_audptr.ser, int, 0444);
-module_param_named(dev, synth_audptr.dev_name, charp, S_IRUGO);
+module_param_named(dev, synth_audptr.dev_name, charp, 0444);
 module_param_named(start, synth_audptr.startup, short, 0444);
 
 MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");
diff --git a/drivers/staging/speakup/speakup_bns.c b/drivers/staging/speakup/speakup_bns.c
index 60bcf0df8123..402b0fbfb94d 100644
--- a/drivers/staging/speakup/speakup_bns.c
+++ b/drivers/staging/speakup/speakup_bns.c
@@ -120,7 +120,7 @@ static struct spk_synth synth_bns = {
 };
 
 module_param_named(ser, synth_bns.ser, int, 0444);
-module_param_named(dev, synth_bns.dev_name, charp, S_IRUGO);
+module_param_named(dev, synth_bns.dev_name, charp, 0444);
 module_param_named(start, synth_bns.startup, short, 0444);
 
 MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");
diff --git a/drivers/staging/speakup/speakup_decext.c b/drivers/staging/speakup/speakup_decext.c
index 95f4b2116d0c..4310c2c276c4 100644
--- a/drivers/staging/speakup/speakup_decext.c
+++ b/drivers/staging/speakup/speakup_decext.c
@@ -227,7 +227,7 @@ static void synth_flush(struct spk_synth *synth)
 }
 
 module_param_named(ser, synth_decext.ser, int, 0444);
-module_param_named(dev, synth_decext.dev_name, charp, S_IRUGO);
+module_param_named(dev, synth_decext.dev_name, charp, 0444);
 module_param_named(start, synth_decext.startup, short, 0444);
 
 MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");
diff --git a/drivers/staging/speakup/speakup_dectlk.c b/drivers/staging/speakup/speakup_dectlk.c
index f06995480022..5d6a861c9b1e 100644
--- a/drivers/staging/speakup/speakup_dectlk.c
+++ b/drivers/staging/speakup/speakup_dectlk.c
@@ -299,7 +299,7 @@ static void synth_flush(struct spk_synth *synth)
 }
 
 module_param_named(ser, synth_dectlk.ser, int, 0444);
-module_param_named(dev, synth_dectlk.dev_name, charp, S_IRUGO);
+module_param_named(dev, synth_dectlk.dev_name, charp, 0444);
 module_param_named(start, synth_dectlk.startup, short, 0444);
 
 MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");
diff --git a/drivers/staging/speakup/speakup_dummy.c b/drivers/staging/speakup/speakup_dummy.c
index 851953d5eefb..ea3b2911cab9 100644
--- a/drivers/staging/speakup/speakup_dummy.c
+++ b/drivers/staging/speakup/speakup_dummy.c
@@ -122,7 +122,7 @@ static struct spk_synth synth_dummy = {
 };
 
 module_param_named(ser, synth_dummy.ser, int, 0444);
-module_param_named(dev, synth_dummy.dev_name, charp, S_IRUGO);
+module_param_named(dev, synth_dummy.dev_name, charp, 0444);
 module_param_named(start, synth_dummy.startup, short, 0444);
 
 MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");
diff --git a/drivers/staging/speakup/speakup_ltlk.c b/drivers/staging/speakup/speakup_ltlk.c
index 423795f88f53..95efaab73813 100644
--- a/drivers/staging/speakup/speakup_ltlk.c
+++ b/drivers/staging/speakup/speakup_ltlk.c
@@ -167,7 +167,7 @@ static int synth_probe(struct spk_synth *synth)
 }
 
 module_param_named(ser, synth_ltlk.ser, int, 0444);
-module_param_named(dev, synth_ltlk.dev_name, charp, S_IRUGO);
+module_param_named(dev, synth_ltlk.dev_name, charp, 0444);
 module_param_named(start, synth_ltlk.startup, short, 0444);
 
 MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");
diff --git a/drivers/staging/speakup/speakup_spkout.c b/drivers/staging/speakup/speakup_spkout.c
index 9ca21edc42ce..1037aa0d085a 100644
--- a/drivers/staging/speakup/speakup_spkout.c
+++ b/drivers/staging/speakup/speakup_spkout.c
@@ -131,7 +131,7 @@ static void synth_flush(struct spk_synth *synth)
 }
 
 module_param_named(ser, synth_spkout.ser, int, 0444);
-module_param_named(dev, synth_spkout.dev_name, charp, S_IRUGO);
+module_param_named(dev, synth_spkout.dev_name, charp, 0444);
 module_param_named(start, synth_spkout.startup, short, 0444);
 
 MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");
diff --git a/drivers/staging/speakup/speakup_txprt.c b/drivers/staging/speakup/speakup_txprt.c
index 831ee404e7a1..e160034e4a68 100644
--- a/drivers/staging/speakup/speakup_txprt.c
+++ b/drivers/staging/speakup/speakup_txprt.c
@@ -119,7 +119,7 @@ static struct spk_synth synth_txprt = {
 };
 
 module_param_named(ser, synth_txprt.ser, int, 0444);
-module_param_named(dev, synth_txprt.dev_name, charp, S_IRUGO);
+module_param_named(dev, synth_txprt.dev_name, charp, 0444);
 module_param_named(start, synth_txprt.startup, short, 0444);
 
 MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based).");
diff --git a/drivers/staging/speakup/spk_ttyio.c b/drivers/staging/speakup/spk_ttyio.c
index 4d7d8f2f66ea..513cebbd161c 100644
--- a/drivers/staging/speakup/spk_ttyio.c
+++ b/drivers/staging/speakup/spk_ttyio.c
@@ -51,10 +51,8 @@ static int spk_ttyio_ldisc_open(struct tty_struct *tty)
         speakup_tty = tty;
 
         ldisc_data = kmalloc(sizeof(struct spk_ldisc_data), GFP_KERNEL);
-        if (!ldisc_data) {
-                pr_err("speakup: Failed to allocate ldisc_data.\n");
+        if (!ldisc_data)
                 return -ENOMEM;
-        }
 
         sema_init(&ldisc_data->sem, 0);
         ldisc_data->buf_free = true;
@@ -90,7 +88,8 @@ static int spk_ttyio_receive_buf2(struct tty_struct *tty,
                 return 0;
 
         /* Make sure the consumer has read buf before we have seen
-         * buf_free == true and overwrite buf */
+         * buf_free == true and overwrite buf
+         */
         mb();
 
         ldisc_data->buf = cp[0];
@@ -276,7 +275,8 @@ static unsigned char ttyio_in(int timeout)
 
         rv = ldisc_data->buf;
         /* Make sure we have read buf before we set buf_free to let
-         * the producer overwrite it */
+         * the producer overwrite it
+         */
         mb();
         ldisc_data->buf_free = true;
         /* Let TTY push more characters */
diff --git a/drivers/staging/typec/Kconfig b/drivers/staging/typec/Kconfig
index 37a0781b0d0c..5359f556d203 100644
--- a/drivers/staging/typec/Kconfig
+++ b/drivers/staging/typec/Kconfig
@@ -1,13 +1,5 @@
 menu "USB Power Delivery and Type-C drivers"
 
-config TYPEC_TCPM
-        tristate "USB Type-C Port Controller Manager"
-        depends on USB
-        select TYPEC
-        help
-          The Type-C Port Controller Manager provides a USB PD and USB Type-C
-          state machine for use with Type-C Port Controllers.
-
 if TYPEC_TCPM
 
 config TYPEC_TCPCI
@@ -17,8 +9,6 @@ config TYPEC_TCPCI
         help
           Type-C Port Controller driver for TCPCI-compliant controller.
 
-source "drivers/staging/typec/fusb302/Kconfig"
-
 endif
 
 endmenu
diff --git a/drivers/staging/typec/Makefile b/drivers/staging/typec/Makefile
index 30a7e29cbc9e..53d649abcb53 100644
--- a/drivers/staging/typec/Makefile
+++ b/drivers/staging/typec/Makefile
@@ -1,3 +1 @@
-obj-$(CONFIG_TYPEC_TCPM)        += tcpm.o
 obj-$(CONFIG_TYPEC_TCPCI)       += tcpci.o
-obj-y                           += fusb302/
diff --git a/drivers/staging/typec/TODO b/drivers/staging/typec/TODO
index bc1f97a2d1bf..53fe2f726c88 100644
--- a/drivers/staging/typec/TODO
+++ b/drivers/staging/typec/TODO
@@ -1,13 +1,3 @@
-tcpm:
-- Add documentation (at the very least for the API to low level drivers)
-- Split PD code into separate file
-- Check if it makes sense to use tracepoints instead of debugfs for debug logs
-- Implement Alternate Mode handling
-- Address "#if 0" code if not addressed with the above
-- Validate all comments marked with "XXX"; either address or remove comments
-- Add support for USB PD 3.0. While not mandatory, at least fast role swap
-  as well as authentication support would be very desirable.
-
 tcpci:
 - Test with real hardware
 
diff --git a/drivers/staging/typec/fusb302/TODO b/drivers/staging/typec/fusb302/TODO
deleted file mode 100644
index 19b466eb585d..000000000000
--- a/drivers/staging/typec/fusb302/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-fusb302:
-- Find a better logging scheme, at least not having the same debugging/logging
-  code replicated here and in tcpm
-- Find a non-hacky way to coordinate between PM and I2C access
-- Documentation? The FUSB302 datasheet provides information on the chip to help
-  understand the code. But it may still be helpful to have a documentation.
-- We may want to replace the  "fcs,max-snk-microvolt", "fcs,max-snk-microamp",
-  "fcs,max-snk-microwatt" and "fcs,operating-snk-microwatt" device(tree)
-  properties with properties which are part of a generic type-c controller
-  devicetree binding.
diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c
index df72d8b01e73..b6abaf79ef0b 100644
--- a/drivers/staging/typec/tcpci.c
+++ b/drivers/staging/typec/tcpci.c
@@ -20,11 +20,11 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/regmap.h>
+#include <linux/usb/pd.h>
+#include <linux/usb/tcpm.h>
 #include <linux/usb/typec.h>
 
-#include "pd.h"
 #include "tcpci.h"
-#include "tcpm.h"
 
 #define PD_RETRY_COUNT 3
 
@@ -139,6 +139,7 @@ static enum typec_cc_status tcpci_to_typec_cc(unsigned int cc, bool sink)
         case 0x3:
                 if (sink)
                         return TYPEC_CC_RP_3_0;
+                /* fall through */
         case 0x0:
         default:
                 return TYPEC_CC_OPEN;
diff --git a/drivers/staging/unisys/MAINTAINERS b/drivers/staging/unisys/MAINTAINERS
index 1f0425bf3583..aaddc619c329 100644
--- a/drivers/staging/unisys/MAINTAINERS
+++ b/drivers/staging/unisys/MAINTAINERS
@@ -1,5 +1,5 @@
 Unisys s-Par drivers
 M:      David Kershner <sparmaintainer@unisys.com>
 S:      Maintained
-F:      Documentation/s-Par/overview.txt
+F:      drivers/staging/unisys/Documentation/overview.txt
 F:      drivers/staging/unisys/
diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h
index a70760f48566..5cd407ca2251 100644
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -44,7 +44,7 @@
 #include <linux/uuid.h>
 #include <linux/skbuff.h>
 
-#include "channel.h"
+#include "visorchannel.h"
 
 /*
  * Must increment these whenever you insert or delete fields within this channel
@@ -348,10 +348,9 @@ struct sense_data {
  *                  the start of the NETWORK LAYER HEADER.
  *
  * NOTE:
- * The full packet is described in frags but the ethernet header is
- * separately kept in ethhdr so that uisnic doesn't have "MAP" the
- * guest memory to get to the header. uisnic needs ethhdr to
- * determine how to route the packet.
+ * The full packet is described in frags but the ethernet header is separately
+ * kept in ethhdr so that uisnic doesn't have "MAP" the guest memory to get to
+ * the header. uisnic needs ethhdr to determine how to route the packet.
  */
 struct net_pkt_xmt {
         int len;
diff --git a/drivers/staging/unisys/include/visorbus.h b/drivers/staging/unisys/include/visorbus.h
index e4ee38c3dbe4..1a0986ba3d24 100644
--- a/drivers/staging/unisys/include/visorbus.h
+++ b/drivers/staging/unisys/include/visorbus.h
@@ -28,87 +28,20 @@
 #define __VISORBUS_H__
 
 #include <linux/device.h>
-#include <linux/module.h>
-#include <linux/slab.h>
 
-#include "channel.h"
-
-struct visor_device;
-extern struct bus_type visorbus_type;
-
-typedef void (*visorbus_state_complete_func) (struct visor_device *dev,
-                                              int status);
+#include "visorchannel.h"
 
 struct visorchipset_state {
         u32 created:1;
         u32 attached:1;
         u32 configured:1;
         u32 running:1;
-        /* Add new fields above. */
-        /* Remaining bits in this 32-bit word are unused. */
-};
-
-/*
- * This struct describes a specific Supervisor channel, by providing its
- * GUID, name, and sizes.
- */
-struct visor_channeltype_descriptor {
-        const guid_t guid;
-        const char *name;
+        /* Remaining bits in this 32-bit word are reserved. */
 };
 
 /**
- * struct visor_driver - Information provided by each visor driver when it
- * registers with the visorbus driver.
- * @name:               Name of the visor driver.
- * @owner:              The module owner.
- * @channel_types:      Types of channels handled by this driver, ending with
- *                      a zero GUID. Our specialized BUS.match() method knows
- *                      about this list, and uses it to determine whether this
- *                      driver will in fact handle a new device that it has
- *                      detected.
- * @probe:              Called when a new device comes online, by our probe()
- *                      function specified by driver.probe() (triggered
- *                      ultimately by some call to driver_register(),
- *                      bus_add_driver(), or driver_attach()).
- * @remove:             Called when a new device is removed, by our remove()
- *                      function specified by driver.remove() (triggered
- *                      ultimately by some call to device_release_driver()).
- * @channel_interrupt:  Called periodically, whenever there is a possiblity
- *                      that "something interesting" may have happened to the
- *                      channel.
- * @pause:              Called to initiate a change of the device's state.  If
- *                      the return valu`e is < 0, there was an error and the
- *                      state transition will NOT occur.  If the return value
- *                      is >= 0, then the state transition was INITIATED
- *                      successfully, and complete_func() will be called (or
- *                      was just called) with the final status when either the
- *                      state transition fails or completes successfully.
- * @resume:             Behaves similar to pause.
- * @driver:             Private reference to the device driver. For use by bus
- *                      driver only.
- */
-struct visor_driver {
-        const char *name;
-        struct module *owner;
-        struct visor_channeltype_descriptor *channel_types;
-        int (*probe)(struct visor_device *dev);
-        void (*remove)(struct visor_device *dev);
-        void (*channel_interrupt)(struct visor_device *dev);
-        int (*pause)(struct visor_device *dev,
-                     visorbus_state_complete_func complete_func);
-        int (*resume)(struct visor_device *dev,
-                      visorbus_state_complete_func complete_func);
-
-        /* These fields are for private use by the bus driver only. */
-        struct device_driver driver;
-};
-
-#define to_visor_driver(x) (container_of(x, struct visor_driver, driver))
-
-/**
  * struct visor_device - A device type for things "plugged" into the visorbus
- * bus
+ *                       bus
  * @visorchannel:               Points to the channel that the device is
  *                              associated with.
  * @channel_type_guid:          Identifies the channel type to the bus driver.
@@ -139,7 +72,6 @@ struct visor_driver {
  *                              same across all visor_devices in the current
  *                              guest. Private use by bus driver only.
  */
-
 struct visor_device {
         struct visorchannel *visorchannel;
         guid_t channel_type_guid;
@@ -161,11 +93,74 @@ struct visor_device {
         void *vbus_hdr_info;
         guid_t partition_guid;
         struct dentry *debugfs_dir;
-        struct dentry *debugfs_client_bus_info;
+        struct dentry *debugfs_bus_info;
 };
 
 #define to_visor_device(x) container_of(x, struct visor_device, device)
 
+typedef void (*visorbus_state_complete_func) (struct visor_device *dev,
+                                              int status);
+
+/*
+ * This struct describes a specific visor channel, by providing its GUID, name,
+ * and sizes.
+ */
+struct visor_channeltype_descriptor {
+        const guid_t guid;
+        const char *name;
+        u64 min_bytes;
+        u32 version;
+};
+
+/**
+ * struct visor_driver - Information provided by each visor driver when it
+ *                       registers with the visorbus driver
+ * @name:               Name of the visor driver.
+ * @owner:              The module owner.
+ * @channel_types:      Types of channels handled by this driver, ending with
+ *                      a zero GUID. Our specialized BUS.match() method knows
+ *                      about this list, and uses it to determine whether this
+ *                      driver will in fact handle a new device that it has
+ *                      detected.
+ * @probe:              Called when a new device comes online, by our probe()
+ *                      function specified by driver.probe() (triggered
+ *                      ultimately by some call to driver_register(),
+ *                      bus_add_driver(), or driver_attach()).
+ * @remove:             Called when a new device is removed, by our remove()
+ *                      function specified by driver.remove() (triggered
+ *                      ultimately by some call to device_release_driver()).
+ * @channel_interrupt:  Called periodically, whenever there is a possiblity
+ *                      that "something interesting" may have happened to the
+ *                      channel.
+ * @pause:              Called to initiate a change of the device's state.  If
+ *                      the return valu`e is < 0, there was an error and the
+ *                      state transition will NOT occur.  If the return value
+ *                      is >= 0, then the state transition was INITIATED
+ *                      successfully, and complete_func() will be called (or
+ *                      was just called) with the final status when either the
+ *                      state transition fails or completes successfully.
+ * @resume:             Behaves similar to pause.
+ * @driver:             Private reference to the device driver. For use by bus
+ *                      driver only.
+ */
+struct visor_driver {
+        const char *name;
+        struct module *owner;
+        struct visor_channeltype_descriptor *channel_types;
+        int (*probe)(struct visor_device *dev);
+        void (*remove)(struct visor_device *dev);
+        void (*channel_interrupt)(struct visor_device *dev);
+        int (*pause)(struct visor_device *dev,
+                     visorbus_state_complete_func complete_func);
+        int (*resume)(struct visor_device *dev,
+                      visorbus_state_complete_func complete_func);
+
+        /* These fields are for private use by the bus driver only. */
+        struct device_driver driver;
+};
+
+#define to_visor_driver(x) (container_of(x, struct visor_driver, driver))
+
 int visor_check_channel(struct channel_header *ch, struct device *dev,
                         const guid_t *expected_uuid, char *chname,
                         u64 expected_min_bytes, u32 expected_version,
@@ -182,26 +177,6 @@ int visorbus_write_channel(struct visor_device *dev,
 int visorbus_enable_channel_interrupts(struct visor_device *dev);
 void visorbus_disable_channel_interrupts(struct visor_device *dev);
 
-/*
- * Levels of severity for diagnostic events, in order from lowest severity to
- * highest (i.e. fatal errors are the most severe, and should always be logged,
- * but info events rarely need to be logged except during debugging). The
- * values DIAG_SEVERITY_ENUM_BEGIN and DIAG_SEVERITY_ENUM_END are not valid
- * severity values.  They exist merely to dilineate the list, so that future
- * additions won't require changes to the driver (i.e. when checking for
- * out-of-range severities in SetSeverity). The values DIAG_SEVERITY_OVERRIDE
- * and DIAG_SEVERITY_SHUTOFF are not valid severity values for logging events
- * but they are valid for controlling the amount of event data. Changes made
- * to the enum, need to be reflected in s-Par.
- */
-enum diag_severity {
-        DIAG_SEVERITY_VERBOSE = 0,
-        DIAG_SEVERITY_INFO = 1,
-        DIAG_SEVERITY_WARNING = 2,
-        DIAG_SEVERITY_ERR = 3,
-        DIAG_SEVERITY_PRINT = 4,
-};
-
 int visorchannel_signalremove(struct visorchannel *channel, u32 queue,
                               void *msg);
 int visorchannel_signalinsert(struct visorchannel *channel, u32 queue,
diff --git a/drivers/staging/unisys/include/channel.h b/drivers/staging/unisys/include/visorchannel.h
index 2babe93631f3..33945749c8b6 100644
--- a/drivers/staging/unisys/include/channel.h
+++ b/drivers/staging/unisys/include/visorchannel.h
@@ -14,17 +14,13 @@
  * details.
  */
 
-#ifndef __CHANNEL_H__
-#define __CHANNEL_H__
+#ifndef __VISORCHANNEL_H__
+#define __VISORCHANNEL_H__
 
 #include <linux/types.h>
-#include <linux/io.h>
 #include <linux/uuid.h>
 
-#define SIGNATURE_16(A, B) ((A) | ((B) << 8))
-#define SIGNATURE_32(A, B, C, D) \
-        (SIGNATURE_16(A, B) | (SIGNATURE_16(C, D) << 16))
-#define VISOR_CHANNEL_SIGNATURE SIGNATURE_32('E', 'C', 'N', 'L')
+#define VISOR_CHANNEL_SIGNATURE ('L' << 24 | 'N' << 16 | 'C' << 8 | 'E')
 
 /*
  * enum channel_serverstate
@@ -183,7 +179,7 @@ struct signal_queue_header {
         u8 filler[12];
 } __packed;
 
-/* CHANNEL Guids */
+/* VISORCHANNEL Guids */
 /* {414815ed-c58c-11da-95a9-00e08161165f} */
 #define VISOR_VHBA_CHANNEL_GUID \
         GUID_INIT(0x414815ed, 0xc58c, 0x11da, \
diff --git a/drivers/staging/unisys/visorbus/controlvmchannel.h b/drivers/staging/unisys/visorbus/controlvmchannel.h
index 32ff5c1bb6ba..9ee9886a9aed 100644
--- a/drivers/staging/unisys/visorbus/controlvmchannel.h
+++ b/drivers/staging/unisys/visorbus/controlvmchannel.h
@@ -17,7 +17,8 @@
 #define __CONTROLVMCHANNEL_H__
 
 #include <linux/uuid.h>
-#include "channel.h"
+
+#include "visorchannel.h"
 
 /* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */
 #define VISOR_CONTROLVM_CHANNEL_GUID \
diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h b/drivers/staging/unisys/visorbus/vbuschannel.h
index 27e04de14818..981b180f3c4b 100644
--- a/drivers/staging/unisys/visorbus/vbuschannel.h
+++ b/drivers/staging/unisys/visorbus/vbuschannel.h
@@ -26,8 +26,7 @@
  */
 
 #include <linux/uuid.h>
-#include <linux/ctype.h>
-#include "channel.h"
+#include "visorchannel.h"
 
 /* {193b331b-c58f-11da-95a9-00e08161165f} */
 #define VISOR_VBUS_CHANNEL_GUID                                         \
@@ -50,9 +49,9 @@
  * @infostrs: Kernel vversion.
  * @reserved: Pad size to 256 bytes.
  *
- * An array of this struct is present in the channel area for each vbus.
- * (See vbuschannel.h.). It is filled in by the client side to provide info
- * about the device and driver from the client's perspective.
+ * An array of this struct is present in the channel area for each vbus. It is
+ * filled in by the client side to provide info about the device and driver from
+ * the client's perspective.
  */
 struct visor_vbus_deviceinfo {
         u8 devtype[16];
@@ -73,7 +72,7 @@ struct visor_vbus_deviceinfo {
  *                            BusInfo struct.
  * @dev_info_offset:          Byte offset from beginning of this struct to the
  *                            DevInfo array.
- * @reserved:                 Natural Alignment
+ * @reserved:                 Natural alignment.
  */
 struct visor_vbus_headerinfo {
         u32 struct_bytes;
@@ -97,7 +96,6 @@ struct visor_vbus_headerinfo {
 struct visor_vbus_channel {
         struct channel_header channel_header;
         struct visor_vbus_headerinfo hdr_info;
-        /* The remainder of this channel is filled in by the client */
         struct visor_vbus_deviceinfo chp_info;
         struct visor_vbus_deviceinfo bus_info;
         struct visor_vbus_deviceinfo dev_info[0];
diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index 2bc7ff7bb96a..b604d0cccef1 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -13,7 +13,10 @@
  * details.
  */
 
+#include <linux/ctype.h>
 #include <linux/debugfs.h>
+#include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/uuid.h>
 
 #include "visorbus.h"
@@ -69,12 +72,9 @@ static LIST_HEAD(list_all_device_instances);
  * Note that <logCtx> is only needed for callers in the EFI environment, and
  * is used to pass the EFI_DIAG_CAPTURE_PROTOCOL needed to log messages.
  */
-int visor_check_channel(struct channel_header *ch,
-                        struct device *dev,
-                        const guid_t *expected_guid,
-                        char *chname,
-                        u64 expected_min_bytes,
-                        u32 expected_version,
+int visor_check_channel(struct channel_header *ch, struct device *dev,
+                        const guid_t *expected_guid, char *chname,
+                        u64 expected_min_bytes, u32 expected_version,
                         u64 expected_signature)
 {
         if (!guid_is_null(expected_guid)) {
@@ -125,7 +125,6 @@ static int visorbus_uevent(struct device *xdev, struct kobj_uevent_env *env)
 
         dev = to_visor_device(xdev);
         guid = visorchannel_get_guid(dev->visorchannel);
-
         return add_uevent_var(env, "MODALIAS=visorbus:%pUl", guid);
 }
 
@@ -144,17 +143,24 @@ static int visorbus_match(struct device *xdev, struct device_driver *xdrv)
         int i;
         struct visor_device *dev;
         struct visor_driver *drv;
+        struct visorchannel *chan;
 
         dev = to_visor_device(xdev);
         channel_type = visorchannel_get_guid(dev->visorchannel);
         drv = to_visor_driver(xdrv);
+        chan = dev->visorchannel;
         if (!drv->channel_types)
                 return 0;
-
         for (i = 0; !guid_is_null(&drv->channel_types[i].guid); i++)
-                if (guid_equal(&drv->channel_types[i].guid, channel_type))
+                if (guid_equal(&drv->channel_types[i].guid, channel_type) &&
+                    visor_check_channel(visorchannel_get_header(chan),
+                                        xdev,
+                                        &drv->channel_types[i].guid,
+                                        (char *)drv->channel_types[i].name,
+                                        drv->channel_types[i].min_bytes,
+                                        drv->channel_types[i].version,
+                                        VISOR_CHANNEL_SIGNATURE))
                         return i + 1;
-
         return 0;
 }
 
@@ -162,13 +168,48 @@ static int visorbus_match(struct device *xdev, struct device_driver *xdrv)
  * This describes the TYPE of bus.
  * (Don't confuse this with an INSTANCE of the bus.)
  */
-struct bus_type visorbus_type = {
+static struct bus_type visorbus_type = {
         .name = "visorbus",
         .match = visorbus_match,
         .uevent = visorbus_uevent,
         .dev_groups = visorbus_dev_groups,
 };
 
+struct visor_busdev {
+        u32 bus_no;
+        u32 dev_no;
+};
+
+static int match_visorbus_dev_by_id(struct device *dev, void *data)
+{
+        struct visor_device *vdev = to_visor_device(dev);
+        struct visor_busdev *id = data;
+
+        if (vdev->chipset_bus_no == id->bus_no &&
+            vdev->chipset_dev_no == id->dev_no)
+                return 1;
+        return 0;
+}
+
+struct visor_device *visorbus_get_device_by_id(u32 bus_no, u32 dev_no,
+                                               struct visor_device *from)
+{
+        struct device *dev;
+        struct device *dev_start = NULL;
+        struct visor_busdev id = {
+                .bus_no = bus_no,
+                .dev_no = dev_no
+        };
+
+        if (from)
+                dev_start = &from->device;
+        dev = bus_find_device(&visorbus_type, dev_start, (void *)&id,
+                              match_visorbus_dev_by_id);
+        if (!dev)
+                return NULL;
+        return to_visor_device(dev);
+}
+
 /*
  * visorbus_release_busdevice() - called when device_unregister() is called for
  *                                the bus device instance, after all other tasks
@@ -179,8 +220,9 @@ static void visorbus_release_busdevice(struct device *xdev)
 {
         struct visor_device *dev = dev_get_drvdata(xdev);
 
-        debugfs_remove(dev->debugfs_client_bus_info);
+        debugfs_remove(dev->debugfs_bus_info);
         debugfs_remove_recursive(dev->debugfs_dir);
+        visorchannel_destroy(dev->visorchannel);
         kfree(dev);
 }
 
@@ -198,7 +240,7 @@ static void visorbus_release_device(struct device *xdev)
 }
 
 /*
- * begin implementation of specific channel attributes to appear under
+ * BUS specific channel attributes to appear under
  * /sys/bus/visorbus<x>/dev<y>/channel
  */
 
@@ -218,7 +260,7 @@ static ssize_t nbytes_show(struct device *dev, struct device_attribute *attr,
         struct visor_device *vdev = to_visor_device(dev);
 
         return sprintf(buf, "0x%lx\n",
-                        visorchannel_get_nbytes(vdev->visorchannel));
+                       visorchannel_get_nbytes(vdev->visorchannel));
 }
 static DEVICE_ATTR_RO(nbytes);
 
@@ -284,18 +326,14 @@ static struct attribute *channel_attrs[] = {
 
 ATTRIBUTE_GROUPS(channel);
 
-/* end implementation of specific channel attributes */
-
 /*
  *  BUS instance attributes
  *
  *  define & implement display of bus attributes under
  *  /sys/bus/visorbus/devices/visorbus<n>.
  */
-
 static ssize_t partition_handle_show(struct device *dev,
-                                     struct device_attribute *attr,
-                                     char *buf)
+                                     struct device_attribute *attr, char *buf)
 {
         struct visor_device *vdev = to_visor_device(dev);
         u64 handle = visorchannel_get_clientpartition(vdev->visorchannel);
@@ -305,8 +343,7 @@ static ssize_t partition_handle_show(struct device *dev,
 static DEVICE_ATTR_RO(partition_handle);
 
 static ssize_t partition_guid_show(struct device *dev,
-                                   struct device_attribute *attr,
-                                   char *buf)
+                                   struct device_attribute *attr, char *buf)
 {
         struct visor_device *vdev = to_visor_device(dev);
 
@@ -315,8 +352,7 @@ static ssize_t partition_guid_show(struct device *dev,
 static DEVICE_ATTR_RO(partition_guid);
 
 static ssize_t partition_name_show(struct device *dev,
-                                   struct device_attribute *attr,
-                                   char *buf)
+                                   struct device_attribute *attr, char *buf)
 {
         struct visor_device *vdev = to_visor_device(dev);
 
@@ -325,8 +361,7 @@ static ssize_t partition_name_show(struct device *dev,
 static DEVICE_ATTR_RO(partition_name);
 
 static ssize_t channel_addr_show(struct device *dev,
-                                 struct device_attribute *attr,
-                                 char *buf)
+                                 struct device_attribute *attr, char *buf)
 {
         struct visor_device *vdev = to_visor_device(dev);
         u64 addr = visorchannel_get_physaddr(vdev->visorchannel);
@@ -336,8 +371,7 @@ static ssize_t channel_addr_show(struct device *dev,
 static DEVICE_ATTR_RO(channel_addr);
 
 static ssize_t channel_bytes_show(struct device *dev,
-                                  struct device_attribute *attr,
-                                  char *buf)
+                                  struct device_attribute *attr, char *buf)
 {
         struct visor_device *vdev = to_visor_device(dev);
         u64 nbytes = visorchannel_get_nbytes(vdev->visorchannel);
@@ -347,8 +381,7 @@ static ssize_t channel_bytes_show(struct device *dev,
 static DEVICE_ATTR_RO(channel_bytes);
 
 static ssize_t channel_id_show(struct device *dev,
-                               struct device_attribute *attr,
-                               char *buf)
+                               struct device_attribute *attr, char *buf)
 {
         struct visor_device *vdev = to_visor_device(dev);
         int len = 0;
@@ -356,7 +389,6 @@ static ssize_t channel_id_show(struct device *dev,
         visorchannel_id(vdev->visorchannel, buf);
         len = strlen(buf);
         buf[len++] = '\n';
-
         return len;
 }
 static DEVICE_ATTR_RO(channel_id);
@@ -396,13 +428,11 @@ static void vbuschannel_print_devinfo(struct visor_vbus_deviceinfo *devinfo,
         /* uninitialized vbus device entry */
         if (!isprint(devinfo->devtype[0]))
                 return;
-
         if (devix >= 0)
                 seq_printf(seq, "[%d]", devix);
         else
                 /* vbus device entry is for bus or chipset */
                 seq_puts(seq, "   ");
-
         /*
          * Note: because the s-Par back-end is free to scribble in this area,
          * we never assume '\0'-termination.
@@ -415,7 +445,7 @@ static void vbuschannel_print_devinfo(struct visor_vbus_deviceinfo *devinfo,
                    devinfo->infostrs);
 }
 
-static int client_bus_info_debugfs_show(struct seq_file *seq, void *v)
+static int bus_info_debugfs_show(struct seq_file *seq, void *v)
 {
         int i = 0;
         unsigned long off;
@@ -427,10 +457,9 @@ static int client_bus_info_debugfs_show(struct seq_file *seq, void *v)
                 return 0;
 
         seq_printf(seq,
-                   "Client device / client driver info for %s partition (vbus #%u):\n",
+                   "Client device/driver info for %s partition (vbus #%u):\n",
                    ((vdev->name) ? (char *)(vdev->name) : ""),
                    vdev->chipset_bus_no);
-
         if (visorchannel_read(channel,
                               offsetof(struct visor_vbus_channel, chp_info),
                               &dev_info, sizeof(dev_info)) >= 0)
@@ -448,19 +477,17 @@ static int client_bus_info_debugfs_show(struct seq_file *seq, void *v)
                 off += sizeof(dev_info);
                 i++;
         }
-
         return 0;
 }
 
-static int client_bus_info_debugfs_open(struct inode *inode, struct file *file)
+static int bus_info_debugfs_open(struct inode *inode, struct file *file)
 {
-        return single_open(file, client_bus_info_debugfs_show,
-                           inode->i_private);
+        return single_open(file, bus_info_debugfs_show, inode->i_private);
 }
 
-static const struct file_operations client_bus_info_debugfs_fops = {
+static const struct file_operations bus_info_debugfs_fops = {
         .owner = THIS_MODULE,
-        .open = client_bus_info_debugfs_open,
+        .open = bus_info_debugfs_open,
         .read = seq_read,
         .llseek = seq_lseek,
         .release = single_release,
@@ -479,6 +506,7 @@ static int dev_start_periodic_work(struct visor_device *dev)
 {
         if (dev->being_removed || dev->timer_active)
                 return -EINVAL;
+
         /* now up by at least 2 */
         get_device(&dev->device);
         dev->timer.expires = jiffies + POLLJIFFIES_NORMALCHANNEL;
@@ -491,6 +519,7 @@ static void dev_stop_periodic_work(struct visor_device *dev)
 {
         if (!dev->timer_active)
                 return;
+
         del_timer_sync(&dev->timer);
         dev->timer_active = false;
         put_device(&dev->device);
@@ -508,20 +537,15 @@ static void dev_stop_periodic_work(struct visor_device *dev)
  */
 static int visordriver_remove_device(struct device *xdev)
 {
-        struct visor_device *dev;
-        struct visor_driver *drv;
-
-        dev = to_visor_device(xdev);
-        drv = to_visor_driver(xdev->driver);
+        struct visor_device *dev = to_visor_device(xdev);
+        struct visor_driver *drv = to_visor_driver(xdev->driver);
 
         mutex_lock(&dev->visordriver_callback_lock);
         dev->being_removed = true;
         drv->remove(dev);
         mutex_unlock(&dev->visordriver_callback_lock);
-
         dev_stop_periodic_work(dev);
         put_device(&dev->device);
-
         return 0;
 }
 
@@ -546,8 +570,7 @@ EXPORT_SYMBOL_GPL(visorbus_unregister_visor_driver);
  * @dest:   the destination buffer that is written into from the channel
  * @nbytes: the number of bytes to read from the channel
  *
- * If receiving a message, use the visorchannel_signalremove()
- * function instead.
+ * If receiving a message, use the visorchannel_signalremove() function instead.
  *
  * Return: integer indicating success (zero) or failure (non-zero)
  */
@@ -566,8 +589,7 @@ EXPORT_SYMBOL_GPL(visorbus_read_channel);
  * @src:    the source buffer that is written into the channel
  * @nbytes: the number of bytes to write into the channel
  *
- * If sending a message, use the visorchannel_signalinsert()
- * function instead.
+ * If sending a message, use the visorchannel_signalinsert() function instead.
  *
  * Return: integer indicating success (zero) or failure (non-zero)
  */
@@ -618,17 +640,16 @@ EXPORT_SYMBOL_GPL(visorbus_disable_channel_interrupts);
  *
  * This is how everything starts from the device end.
  * This function is called when a channel first appears via a ControlVM
- * message.  In response, this function allocates a visor_device to
- * correspond to the new channel, and attempts to connect it the appropriate
- * driver.  If the appropriate driver is found, the visor_driver.probe()
- * function for that driver will be called, and will be passed the new
- * visor_device that we just created.
+ * message.  In response, this function allocates a visor_device to correspond
+ * to the new channel, and attempts to connect it the appropriate * driver. If
+ * the appropriate driver is found, the visor_driver.probe() function for that
+ * driver will be called, and will be passed the new * visor_device that we
+ * just created.
  *
  * It's ok if the appropriate driver is not yet loaded, because in that case
  * the new device struct will just stick around in the bus' list of devices.
  * When the appropriate driver calls visorbus_register_visor_driver(), the
- * visor_driver.probe() for the new driver will be called with the new
- * device.
+ * visor_driver.probe() for the new driver will be called with the new device.
  *
  * Return: 0 if successful, otherwise the negative value returned by
  *         device_add() indicating the reason for failure
@@ -647,17 +668,15 @@ int create_visor_device(struct visor_device *dev)
         /* keep a reference just for us (now 2) */
         get_device(&dev->device);
         setup_timer(&dev->timer, dev_periodic_work, (unsigned long)dev);
-
         /*
-         * bus_id must be a unique name with respect to this bus TYPE
-         * (NOT bus instance).  That's why we need to include the bus
-         * number within the name.
+         * bus_id must be a unique name with respect to this bus TYPE (NOT bus
+         * instance).  That's why we need to include the bus number within the
+         * name.
          */
         err = dev_set_name(&dev->device, "vbus%u:dev%u",
                            chipset_bus_no, chipset_dev_no);
         if (err)
                 goto err_put;
-
         /*
          * device_add does this:
          *    bus_add_device(dev)
@@ -671,14 +690,13 @@ int create_visor_device(struct visor_device *dev)
          *              if (!drv.probe(dev))  [visordriver_probe_device]
          *                dev.drv = NULL
          *
-         *  Note that device_add does NOT fail if no driver failed to
-         *  claim the device.  The device will be linked onto
-         *  bus_type.klist_devices regardless (use bus_for_each_dev).
+         * Note that device_add does NOT fail if no driver failed to claim the
+         * device.  The device will be linked onto bus_type.klist_devices
+         * regardless (use bus_for_each_dev).
          */
         err = device_add(&dev->device);
         if (err < 0)
                 goto err_put;
-
         list_add_tail(&dev->list_all, &list_all_device_instances);
         dev->state.created = 1;
         visorbus_response(dev, err, CONTROLVM_DEVICE_CREATE);
@@ -695,8 +713,9 @@ void remove_visor_device(struct visor_device *dev)
 {
         list_del(&dev->list_all);
         put_device(&dev->device);
+        if (dev->pending_msg_hdr)
+                visorbus_response(dev, 0, CONTROLVM_DEVICE_DESTROY);
         device_unregister(&dev->device);
-        visorbus_response(dev, 0, CONTROLVM_DEVICE_DESTROY);
 }
 
 static int get_vbus_header_info(struct visorchannel *chan,
@@ -718,14 +737,11 @@ static int get_vbus_header_info(struct visorchannel *chan,
                                 sizeof(*hdr_info));
         if (err < 0)
                 return err;
-
         if (hdr_info->struct_bytes < sizeof(struct visor_vbus_headerinfo))
                 return -EINVAL;
-
         if (hdr_info->device_info_struct_bytes <
             sizeof(struct visor_vbus_deviceinfo))
                 return -EINVAL;
-
         return 0;
 }
 
@@ -746,11 +762,12 @@ static void write_vbus_chp_info(struct visorchannel *chan,
                                 struct visor_vbus_headerinfo *hdr_info,
                                 struct visor_vbus_deviceinfo *info)
 {
-        int off = sizeof(struct channel_header) + hdr_info->chp_info_offset;
+        int off;
 
         if (hdr_info->chp_info_offset == 0)
                 return;
 
+        off = sizeof(struct channel_header) + hdr_info->chp_info_offset;
         visorchannel_write(chan, off, info, sizeof(*info));
 }
 
@@ -771,11 +788,12 @@ static void write_vbus_bus_info(struct visorchannel *chan,
                                 struct visor_vbus_headerinfo *hdr_info,
                                 struct visor_vbus_deviceinfo *info)
 {
-        int off = sizeof(struct channel_header) + hdr_info->bus_info_offset;
+        int off;
 
         if (hdr_info->bus_info_offset == 0)
                 return;
 
+        off = sizeof(struct channel_header) + hdr_info->bus_info_offset;
         visorchannel_write(chan, off, info, sizeof(*info));
 }
 
@@ -798,13 +816,12 @@ static void write_vbus_dev_info(struct visorchannel *chan,
                                 struct visor_vbus_deviceinfo *info,
                                 unsigned int devix)
 {
-        int off =
-            (sizeof(struct channel_header) + hdr_info->dev_info_offset) +
-            (hdr_info->device_info_struct_bytes * devix);
+        int off;
 
         if (hdr_info->dev_info_offset == 0)
                 return;
-
+        off = (sizeof(struct channel_header) + hdr_info->dev_info_offset) +
+              (hdr_info->device_info_struct_bytes * devix);
         visorchannel_write(chan, off, info, sizeof(*info));
 }
 
@@ -844,7 +861,6 @@ static void publish_vbus_dev_info(struct visor_device *visordev)
 
         if (!visordev->device.driver)
                 return;
-
         bdev = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL);
         if (!bdev)
                 return;
@@ -860,14 +876,12 @@ static void publish_vbus_dev_info(struct visor_device *visordev)
          * type name
          */
         for (i = 0; visordrv->channel_types[i].name; i++) {
-                if (memcmp(&visordrv->channel_types[i].guid,
-                           &visordev->channel_type_guid,
-                           sizeof(visordrv->channel_types[i].guid)) == 0) {
+                if (guid_equal(&visordrv->channel_types[i].guid,
+                               &visordev->channel_type_guid)) {
                         chan_type_name = visordrv->channel_types[i].name;
                         break;
                 }
         }
-
         bus_device_info_init(&dev_info, chan_type_name, visordrv->name);
         write_vbus_dev_info(bdev->visorchannel, hdr_info, &dev_info, dev_no);
         write_vbus_chp_info(bdev->visorchannel, hdr_info, &chipset_driverinfo);
@@ -892,36 +906,32 @@ static void publish_vbus_dev_info(struct visor_device *visordev)
  */
 static int visordriver_probe_device(struct device *xdev)
 {
-        int res;
-        struct visor_driver *drv;
-        struct visor_device *dev;
-
-        dev = to_visor_device(xdev);
-        drv = to_visor_driver(xdev->driver);
+        int err;
+        struct visor_driver *drv = to_visor_driver(xdev->driver);
+        struct visor_device *dev = to_visor_device(xdev);
 
         mutex_lock(&dev->visordriver_callback_lock);
         dev->being_removed = false;
-
-        res = drv->probe(dev);
-        if (res >= 0) {
-                /* success: reference kept via unmatched get_device() */
-                get_device(&dev->device);
-                publish_vbus_dev_info(dev);
+        err = drv->probe(dev);
+        if (err) {
+                mutex_unlock(&dev->visordriver_callback_lock);
+                return err;
         }
-
+        /* success: reference kept via unmatched get_device() */
+        get_device(&dev->device);
+        publish_vbus_dev_info(dev);
         mutex_unlock(&dev->visordriver_callback_lock);
-        return res;
+        return 0;
 }
 
 /*
- * visorbus_register_visor_driver() - registers the provided visor driver
- *                                    for handling one or more visor device
+ * visorbus_register_visor_driver() - registers the provided visor driver for
+ *                                    handling one or more visor device
  *                                    types (channel_types)
  * @drv: the driver to register
  *
- * A visor function driver calls this function to register
- * the driver.  The caller MUST fill in the following fields within the
- * #drv structure:
+ * A visor function driver calls this function to register the driver. The
+ * caller MUST fill in the following fields within the #drv structure:
  *     name, version, owner, channel_types, probe, remove
  *
  * Here's how the whole Linux bus / driver / device model works.
@@ -967,16 +977,12 @@ int visorbus_register_visor_driver(struct visor_driver *drv)
         /* can't register on a nonexistent bus */
         if (!initialized)
                 return -ENODEV;
-
         if (!drv->probe)
                 return -EINVAL;
-
         if (!drv->remove)
                 return -EINVAL;
-
         if (!drv->pause)
                 return -EINVAL;
-
         if (!drv->resume)
                 return -EINVAL;
 
@@ -985,7 +991,6 @@ int visorbus_register_visor_driver(struct visor_driver *drv)
         drv->driver.probe = visordriver_probe_device;
         drv->driver.remove = visordriver_remove_device;
         drv->driver.owner = drv->owner;
-
         /*
          * driver_register does this:
          *   bus_add_driver(drv)
@@ -998,7 +1003,6 @@ int visorbus_register_visor_driver(struct visor_driver *drv)
          *               if (!drv.probe(dev))   [visordriver_probe_device]
          *                 dev.drv = NULL
          */
-
         return driver_register(&drv->driver);
 }
 EXPORT_SYMBOL_GPL(visorbus_register_visor_driver);
@@ -1019,39 +1023,28 @@ int visorbus_create_instance(struct visor_device *dev)
         hdr_info = kzalloc(sizeof(*hdr_info), GFP_KERNEL);
         if (!hdr_info)
                 return -ENOMEM;
-
         dev_set_name(&dev->device, "visorbus%d", id);
         dev->device.bus = &visorbus_type;
         dev->device.groups = visorbus_groups;
         dev->device.release = visorbus_release_busdevice;
-
         dev->debugfs_dir = debugfs_create_dir(dev_name(&dev->device),
                                               visorbus_debugfs_dir);
-        dev->debugfs_client_bus_info =
-                debugfs_create_file("client_bus_info", 0440,
-                                    dev->debugfs_dir, dev,
-                                    &client_bus_info_debugfs_fops);
-
+        dev->debugfs_bus_info = debugfs_create_file("client_bus_info", 0440,
+                                                    dev->debugfs_dir, dev,
+                                                    &bus_info_debugfs_fops);
         dev_set_drvdata(&dev->device, dev);
         err = get_vbus_header_info(dev->visorchannel, &dev->device, hdr_info);
         if (err < 0)
                 goto err_debugfs_dir;
-
         err = device_register(&dev->device);
         if (err < 0)
                 goto err_debugfs_dir;
-
         list_add_tail(&dev->list_all, &list_all_bus_instances);
-
         dev->state.created = 1;
         dev->vbus_hdr_info = (void *)hdr_info;
-        write_vbus_chp_info(dev->visorchannel, hdr_info,
-                            &chipset_driverinfo);
-        write_vbus_bus_info(dev->visorchannel, hdr_info,
-                            &clientbus_driverinfo);
-
+        write_vbus_chp_info(dev->visorchannel, hdr_info, &chipset_driverinfo);
+        write_vbus_bus_info(dev->visorchannel, hdr_info, &clientbus_driverinfo);
         visorbus_response(dev, err, CONTROLVM_BUS_CREATE);
-
         return 0;
 
 err_debugfs_dir:
@@ -1075,11 +1068,11 @@ void visorbus_remove_instance(struct visor_device *dev)
          * successfully been able to trace thru the code to see where/how
          * release() gets called.  But I know it does.
          */
-        visorchannel_destroy(dev->visorchannel);
         kfree(dev->vbus_hdr_info);
         list_del(&dev->list_all);
+        if (dev->pending_msg_hdr)
+                visorbus_response(dev, 0, CONTROLVM_BUS_DESTROY);
         device_unregister(&dev->device);
-        visorbus_response(dev, 0, CONTROLVM_BUS_DESTROY);
 }
 
 /*
@@ -1090,9 +1083,9 @@ static void remove_all_visor_devices(void)
         struct list_head *listentry, *listtmp;
 
         list_for_each_safe(listentry, listtmp, &list_all_device_instances) {
-                struct visor_device *dev = list_entry(listentry,
-                                                      struct visor_device,
-                                                      list_all);
+                struct visor_device *dev;
+
+                dev = list_entry(listentry, struct visor_device, list_all);
                 remove_visor_device(dev);
         }
 }
@@ -1131,7 +1124,6 @@ static void resume_state_change_complete(struct visor_device *dev, int status)
                 return;
 
         dev->resuming = false;
-
         /*
          * Notify the chipset driver that the resume is complete,
          * which will presumably want to send some sort of response to
@@ -1156,7 +1148,7 @@ static int visorchipset_initiate_device_pause_resume(struct visor_device *dev,
                                                      bool is_pause)
 {
         int err;
-        struct visor_driver *drv = NULL;
+        struct visor_driver *drv;
 
         /* If no driver associated with the device nothing to pause/resume */
         if (!dev->device.driver)
@@ -1177,7 +1169,6 @@ static int visorchipset_initiate_device_pause_resume(struct visor_device *dev,
                 dev->resuming = true;
                 err = drv->resume(dev, resume_state_change_complete);
         }
-
         return err;
 }
 
@@ -1198,7 +1189,6 @@ int visorchipset_device_pause(struct visor_device *dev_info)
                 dev_info->pausing = false;
                 return err;
         }
-
         return 0;
 }
 
@@ -1219,7 +1209,6 @@ int visorchipset_device_resume(struct visor_device *dev_info)
                 dev_info->resuming = false;
                 return err;
         }
-
         return 0;
 }
 
@@ -1228,18 +1217,12 @@ int visorbus_init(void)
         int err;
 
         visorbus_debugfs_dir = debugfs_create_dir("visorbus", NULL);
-        if (!visorbus_debugfs_dir)
-                return -ENOMEM;
-
         bus_device_info_init(&clientbus_driverinfo, "clientbus", "visorbus");
-
         err = bus_register(&visorbus_type);
         if (err < 0)
                 return err;
-
         initialized = true;
         bus_device_info_init(&chipset_driverinfo, "chipset", "visorchipset");
-
         return 0;
 }
 
@@ -1248,14 +1231,12 @@ void visorbus_exit(void)
         struct list_head *listentry, *listtmp;
 
         remove_all_visor_devices();
-
         list_for_each_safe(listentry, listtmp, &list_all_bus_instances) {
-                struct visor_device *dev = list_entry(listentry,
-                                                      struct visor_device,
-                                                      list_all);
+                struct visor_device *dev;
+
+                dev = list_entry(listentry, struct visor_device, list_all);
                 visorbus_remove_instance(dev);
         }
-
         bus_unregister(&visorbus_type);
         initialized = false;
         debugfs_remove_recursive(visorbus_debugfs_dir);
diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h
index e878d65ab668..4a8b12d7cfaa 100644
--- a/drivers/staging/unisys/visorbus/visorbus_private.h
+++ b/drivers/staging/unisys/visorbus/visorbus_private.h
@@ -23,25 +23,23 @@
 #include "vbuschannel.h"
 #include "visorbus.h"
 
+struct visor_device *visorbus_get_device_by_id(u32 bus_no, u32 dev_no,
+                                               struct visor_device *from);
 int visorbus_create_instance(struct visor_device *dev);
 void visorbus_remove_instance(struct visor_device *bus_info);
 int create_visor_device(struct visor_device *dev_info);
 void remove_visor_device(struct visor_device *dev_info);
 int visorchipset_device_pause(struct visor_device *dev_info);
 int visorchipset_device_resume(struct visor_device *dev_info);
-
 void visorbus_response(struct visor_device *p, int response, int controlvm_id);
 void visorbus_device_changestate_response(struct visor_device *p, int response,
                                           struct visor_segment_state state);
-
 int visorbus_init(void);
 void visorbus_exit(void);
 
 /* visorchannel access functions */
 struct visorchannel *visorchannel_create(u64 physaddr, gfp_t gfp,
-                                         const guid_t *guid);
-struct visorchannel *visorchannel_create_with_lock(u64 physaddr, gfp_t gfp,
-                                                   const guid_t *guid);
+                                         const guid_t *guid, bool needs_lock);
 void visorchannel_destroy(struct visorchannel *channel);
 int visorchannel_read(struct visorchannel *channel, ulong offset,
                       void *dest, ulong nbytes);
diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c
index 2a000fee3119..aae16073ba03 100644
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/staging/unisys/visorbus/visorchannel.c
@@ -20,6 +20,7 @@
 
 #include <linux/uuid.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 
 #include "visorbus.h"
 #include "visorbus_private.h"
@@ -41,8 +42,8 @@ struct visorchannel {
         struct channel_header chan_hdr;
         guid_t guid;
         /*
-         * channel creator knows if more than one
-         * thread will be inserting or removing
+         * channel creator knows if more than one thread will be inserting or
+         * removing
          */
         bool needs_lock;
         /* protect head writes in chan_hdr */
@@ -57,6 +58,7 @@ void visorchannel_destroy(struct visorchannel *channel)
 {
         if (!channel)
                 return;
+
         if (channel->mapped) {
                 memunmap(channel->mapped);
                 if (channel->requested)
@@ -122,7 +124,6 @@ int visorchannel_read(struct visorchannel *channel, ulong offset, void *dest,
                 return -EIO;
 
         memcpy(dest, channel->mapped + offset, nbytes);
-
         return 0;
 }
 
@@ -140,9 +141,7 @@ int visorchannel_write(struct visorchannel *channel, ulong offset, void *dest,
                 memcpy(((char *)(&channel->chan_hdr)) + offset,
                        dest, copy_size);
         }
-
         memcpy(channel->mapped + offset, dest, nbytes);
-
         return 0;
 }
 
@@ -173,8 +172,8 @@ static int sig_data_offset(struct channel_header *chan_hdr, int q,
 }
 
 /*
- * Write the contents of a specific field within a SIGNAL_QUEUE_HEADER back
- * into host memory
+ * Write the contents of a specific field within a SIGNAL_QUEUE_HEADER back into
+ * host memory
  */
 #define SIG_WRITE_FIELD(channel, queue, sig_hdr, FIELD) \
         visorchannel_write(channel, \
@@ -226,32 +225,25 @@ static int signalremove_inner(struct visorchannel *channel, u32 queue,
         error = sig_read_header(channel, queue, &sig_hdr);
         if (error)
                 return error;
-
         /* No signals to remove; have caller try again. */
         if (sig_hdr.head == sig_hdr.tail)
                 return -EAGAIN;
-
         sig_hdr.tail = (sig_hdr.tail + 1) % sig_hdr.max_slots;
-
         error = sig_read_data(channel, queue, &sig_hdr, sig_hdr.tail, msg);
         if (error)
                 return error;
-
         sig_hdr.num_received++;
-
         /*
-         * For each data field in SIGNAL_QUEUE_HEADER that was modified,
-         * update host memory. Required for channel sync.
+         * For each data field in SIGNAL_QUEUE_HEADER that was modified, update
+         * host memory. Required for channel sync.
          */
         mb();
-
         error = SIG_WRITE_FIELD(channel, queue, &sig_hdr, tail);
         if (error)
                 return error;
         error = SIG_WRITE_FIELD(channel, queue, &sig_hdr, num_received);
         if (error)
                 return error;
-
         return 0;
 }
 
@@ -288,13 +280,12 @@ static bool queue_empty(struct visorchannel *channel, u32 queue)
 
         if (sig_read_header(channel, queue, &sig_hdr))
                 return true;
-
         return (sig_hdr.head == sig_hdr.tail);
 }
 
 /**
- * visorchannel_signalempty() - checks if the designated channel/queue
- *                              contains any messages
+ * visorchannel_signalempty() - checks if the designated channel/queue contains
+ *                              any messages
  * @channel: the channel to query
  * @queue:   the queue in the channel to query
  *
@@ -308,11 +299,9 @@ bool visorchannel_signalempty(struct visorchannel *channel, u32 queue)
 
         if (!channel->needs_lock)
                 return queue_empty(channel, queue);
-
         spin_lock_irqsave(&channel->remove_lock, flags);
         rc = queue_empty(channel, queue);
         spin_unlock_irqrestore(&channel->remove_lock, flags);
-
         return rc;
 }
 EXPORT_SYMBOL_GPL(visorchannel_signalempty);
@@ -326,7 +315,6 @@ static int signalinsert_inner(struct visorchannel *channel, u32 queue,
         err = sig_read_header(channel, queue, &sig_hdr);
         if (err)
                 return err;
-
         sig_hdr.head = (sig_hdr.head + 1) % sig_hdr.max_slots;
         if (sig_hdr.head == sig_hdr.tail) {
                 sig_hdr.num_overflows++;
@@ -335,33 +323,28 @@ static int signalinsert_inner(struct visorchannel *channel, u32 queue,
                         return err;
                 return -EIO;
         }
-
         err = sig_write_data(channel, queue, &sig_hdr, sig_hdr.head, msg);
         if (err)
                 return err;
-
         sig_hdr.num_sent++;
-
         /*
-         * For each data field in SIGNAL_QUEUE_HEADER that was modified,
-         * update host memory. Required for channel sync.
+         * For each data field in SIGNAL_QUEUE_HEADER that was modified, update
+         * host memory. Required for channel sync.
          */
         mb();
-
         err = SIG_WRITE_FIELD(channel, queue, &sig_hdr, head);
         if (err)
                 return err;
         err = SIG_WRITE_FIELD(channel, queue, &sig_hdr, num_sent);
         if (err)
                 return err;
-
         return 0;
 }
 
 /*
- * visorchannel_create_guts() - creates the struct visorchannel abstraction
- *                              for a data area in memory, but does NOT modify
- *                              this data area
+ * visorchannel_create() - creates the struct visorchannel abstraction for a
+ *                         data area in memory, but does NOT modify this data
+ *                         area
  * @physaddr:      physical address of start of channel
  * @gfp:           gfp_t to use when allocating memory for the data struct
  * @guid:          GUID that identifies channel type;
@@ -372,9 +355,8 @@ static int signalinsert_inner(struct visorchannel *channel, u32 queue,
  * Return: pointer to visorchannel that was created if successful,
  *         otherwise NULL
  */
-static struct visorchannel *visorchannel_create_guts(u64 physaddr, gfp_t gfp,
-                                                     const guid_t *guid,
-                                                     bool needs_lock)
+struct visorchannel *visorchannel_create(u64 physaddr, gfp_t gfp,
+                                         const guid_t *guid, bool needs_lock)
 {
         struct visorchannel *channel;
         int err;
@@ -386,37 +368,30 @@ static struct visorchannel *visorchannel_create_guts(u64 physaddr, gfp_t gfp,
         channel = kzalloc(sizeof(*channel), gfp);
         if (!channel)
                 return NULL;
-
         channel->needs_lock = needs_lock;
         spin_lock_init(&channel->insert_lock);
         spin_lock_init(&channel->remove_lock);
-
         /*
-         * Video driver constains the efi framebuffer so it will get a
-         * conflict resource when requesting its full mem region. Since
-         * we are only using the efi framebuffer for video we can ignore
-         * this. Remember that we haven't requested it so we don't try to
-         * release later on.
+         * Video driver constains the efi framebuffer so it will get a conflict
+         * resource when requesting its full mem region. Since we are only
+         * using the efi framebuffer for video we can ignore this. Remember that
+         * we haven't requested it so we don't try to release later on.
          */
         channel->requested = request_mem_region(physaddr, size, VISOR_DRV_NAME);
         if (!channel->requested && !guid_equal(guid, &visor_video_guid))
                 /* we only care about errors if this is not the video channel */
                 goto err_destroy_channel;
-
         channel->mapped = memremap(physaddr, size, MEMREMAP_WB);
         if (!channel->mapped) {
                 release_mem_region(physaddr, size);
                 goto err_destroy_channel;
         }
-
         channel->physaddr = physaddr;
         channel->nbytes = size;
-
         err = visorchannel_read(channel, 0, &channel->chan_hdr, size);
         if (err)
                 goto err_destroy_channel;
         size = (ulong)channel->chan_hdr.size;
-
         memunmap(channel->mapped);
         if (channel->requested)
                 release_mem_region(channel->physaddr, channel->nbytes);
@@ -426,13 +401,11 @@ static struct visorchannel *visorchannel_create_guts(u64 physaddr, gfp_t gfp,
         if (!channel->requested && !guid_equal(guid, &visor_video_guid))
                 /* we only care about errors if this is not the video channel */
                 goto err_destroy_channel;
-
         channel->mapped = memremap(channel->physaddr, size, MEMREMAP_WB);
         if (!channel->mapped) {
                 release_mem_region(channel->physaddr, size);
                 goto err_destroy_channel;
         }
-
         channel->nbytes = size;
         guid_copy(&channel->guid, guid);
         return channel;
@@ -442,18 +415,6 @@ err_destroy_channel:
         return NULL;
 }
 
-struct visorchannel *visorchannel_create(u64 physaddr, gfp_t gfp,
-                                         const guid_t *guid)
-{
-        return visorchannel_create_guts(physaddr, gfp, guid, false);
-}
-
-struct visorchannel *visorchannel_create_with_lock(u64 physaddr, gfp_t gfp,
-                                                   const guid_t *guid)
-{
-        return visorchannel_create_guts(physaddr, gfp, guid, true);
-}
-
 /**
  * visorchannel_signalinsert() - inserts a message into the designated
  *                               channel/queue
diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c
index 27ecf6fb49fd..fed554a43151 100644
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -27,8 +27,8 @@ static const guid_t visor_vhba_channel_guid = VISOR_VHBA_CHANNEL_GUID;
 static const guid_t visor_siovm_guid = VISOR_SIOVM_GUID;
 static const guid_t visor_controlvm_channel_guid = VISOR_CONTROLVM_CHANNEL_GUID;
 
-#define POLLJIFFIES_CONTROLVMCHANNEL_FAST 1
-#define POLLJIFFIES_CONTROLVMCHANNEL_SLOW 100
+#define POLLJIFFIES_CONTROLVM_FAST 1
+#define POLLJIFFIES_CONTROLVM_SLOW 100
 
 #define MAX_CONTROLVM_PAYLOAD_BYTES (1024 * 128)
 
@@ -128,7 +128,6 @@ static ssize_t toolaction_show(struct device *dev,
                                 &tool_action, sizeof(u8));
         if (err)
                 return err;
-
         return sprintf(buf, "%u\n", tool_action);
 }
 
@@ -141,7 +140,6 @@ static ssize_t toolaction_store(struct device *dev,
 
         if (kstrtou8(buf, 10, &tool_action))
                 return -EINVAL;
-
         err = visorchannel_write(chipset_dev->controlvm_channel,
                                  offsetof(struct visor_controlvm_channel,
                                           tool_action),
@@ -178,7 +176,6 @@ static ssize_t boottotool_store(struct device *dev,
 
         if (kstrtoint(buf, 10, &val))
                 return -EINVAL;
-
         efi_visor_indication.boot_to_tool = val;
         err = visorchannel_write(chipset_dev->controlvm_channel,
                                  offsetof(struct visor_controlvm_channel,
@@ -214,7 +211,6 @@ static ssize_t error_store(struct device *dev, struct device_attribute *attr,
 
         if (kstrtou32(buf, 10, &error))
                 return -EINVAL;
-
         err = visorchannel_write(chipset_dev->controlvm_channel,
                                  offsetof(struct visor_controlvm_channel,
                                           installation_error),
@@ -237,7 +233,6 @@ static ssize_t textid_show(struct device *dev, struct device_attribute *attr,
                                 &text_id, sizeof(u32));
         if (err)
                 return err;
-
         return sprintf(buf, "%u\n", text_id);
 }
 
@@ -249,7 +244,6 @@ static ssize_t textid_store(struct device *dev, struct device_attribute *attr,
 
         if (kstrtou32(buf, 10, &text_id))
                 return -EINVAL;
-
         err = visorchannel_write(chipset_dev->controlvm_channel,
                                  offsetof(struct visor_controlvm_channel,
                                           installation_text_id),
@@ -272,7 +266,6 @@ static ssize_t remaining_steps_show(struct device *dev,
                                 &remaining_steps, sizeof(u16));
         if (err)
                 return err;
-
         return sprintf(buf, "%hu\n", remaining_steps);
 }
 
@@ -285,7 +278,6 @@ static ssize_t remaining_steps_store(struct device *dev,
 
         if (kstrtou16(buf, 10, &remaining_steps))
                 return -EINVAL;
-
         err = visorchannel_write(chipset_dev->controlvm_channel,
                                  offsetof(struct visor_controlvm_channel,
                                           installation_remaining_steps),
@@ -296,43 +288,6 @@ static ssize_t remaining_steps_store(struct device *dev,
 }
 static DEVICE_ATTR_RW(remaining_steps);
 
-struct visor_busdev {
-        u32 bus_no;
-        u32 dev_no;
-};
-
-static int match_visorbus_dev_by_id(struct device *dev, void *data)
-{
-        struct visor_device *vdev = to_visor_device(dev);
-        struct visor_busdev *id = data;
-
-        if ((vdev->chipset_bus_no == id->bus_no) &&
-            (vdev->chipset_dev_no == id->dev_no))
-                return 1;
-
-        return 0;
-}
-
-struct visor_device *visorbus_get_device_by_id(u32 bus_no, u32 dev_no,
-                                               struct visor_device *from)
-{
-        struct device *dev;
-        struct device *dev_start = NULL;
-        struct visor_device *vdev = NULL;
-        struct visor_busdev id = {
-                .bus_no = bus_no,
-                .dev_no = dev_no
-        };
-
-        if (from)
-                dev_start = &from->device;
-        dev = bus_find_device(&visorbus_type, dev_start, (void *)&id,
-                              match_visorbus_dev_by_id);
-        if (dev)
-                vdev = to_visor_device(dev);
-        return vdev;
-}
-
 static void controlvm_init_response(struct controlvm_message *msg,
                                     struct controlvm_message_header *msg_hdr,
                                     int response)
@@ -374,18 +329,13 @@ static int chipset_init(struct controlvm_message *inmsg)
                 goto out_respond;
         }
         chipset_inited = 1;
-
         /*
          * Set features to indicate we support parahotplug (if Command also
-         * supports it).
+         * supports it). Set the "reply" bit so Command knows this is a
+         * features-aware driver.
          */
         features = inmsg->cmd.init_chipset.features &
                    VISOR_CHIPSET_FEATURE_PARA_HOTPLUG;
-
-        /*
-         * Set the "reply" bit so Command knows this is a features-aware
-         * driver.
-         */
         features |= VISOR_CHIPSET_FEATURE_REPLY;
 
 out_respond:
@@ -396,20 +346,17 @@ out_respond:
 }
 
 static int controlvm_respond(struct controlvm_message_header *msg_hdr,
-                             int response,
-                             struct visor_segment_state *state)
+                             int response, struct visor_segment_state *state)
 {
         struct controlvm_message outmsg;
 
         controlvm_init_response(&outmsg, msg_hdr, response);
         if (outmsg.hdr.flags.test_message == 1)
                 return -EINVAL;
-
         if (state) {
                 outmsg.cmd.device_change_state.state = *state;
                 outmsg.cmd.device_change_state.flags.phys_device = 1;
         }
-
         return visorchannel_signalinsert(chipset_dev->controlvm_channel,
                                          CONTROLVM_QUEUE_REQUEST, &outmsg);
 }
@@ -435,13 +382,11 @@ static int save_crash_message(struct controlvm_message *msg,
                         "failed to read message count\n");
                 return err;
         }
-
         if (local_crash_msg_count != CONTROLVM_CRASHMSG_MAX) {
                 dev_err(&chipset_dev->acpi_device->dev,
                         "invalid number of messages\n");
                 return -EIO;
         }
-
         err = visorchannel_read(chipset_dev->controlvm_channel,
                                 offsetof(struct visor_controlvm_channel,
                                          saved_crash_message_offset),
@@ -451,13 +396,11 @@ static int save_crash_message(struct controlvm_message *msg,
                         "failed to read offset\n");
                 return err;
         }
-
         switch (cr_type) {
         case CRASH_DEV:
                 local_crash_msg_offset += sizeof(struct controlvm_message);
                 err = visorchannel_write(chipset_dev->controlvm_channel,
-                                         local_crash_msg_offset,
-                                         msg,
+                                         local_crash_msg_offset, msg,
                                          sizeof(struct controlvm_message));
                 if (err) {
                         dev_err(&chipset_dev->acpi_device->dev,
@@ -467,8 +410,7 @@ static int save_crash_message(struct controlvm_message *msg,
                 break;
         case CRASH_BUS:
                 err = visorchannel_write(chipset_dev->controlvm_channel,
-                                         local_crash_msg_offset,
-                                         msg,
+                                         local_crash_msg_offset, msg,
                                          sizeof(struct controlvm_message));
                 if (err) {
                         dev_err(&chipset_dev->acpi_device->dev,
@@ -488,33 +430,25 @@ static int controlvm_responder(enum controlvm_id cmd_id,
                                struct controlvm_message_header *pending_msg_hdr,
                                int response)
 {
-        if (!pending_msg_hdr)
-                return -EIO;
-
         if (pending_msg_hdr->id != (u32)cmd_id)
                 return -EINVAL;
 
         return controlvm_respond(pending_msg_hdr, response, NULL);
 }
 
-static int device_changestate_responder(
-                                enum controlvm_id cmd_id,
-                                struct visor_device *p, int response,
-                                struct visor_segment_state response_state)
+static int device_changestate_responder(enum controlvm_id cmd_id,
+                                        struct visor_device *p, int response,
+                                        struct visor_segment_state state)
 {
         struct controlvm_message outmsg;
 
-        if (!p->pending_msg_hdr)
-                return -EIO;
         if (p->pending_msg_hdr->id != cmd_id)
                 return -EINVAL;
 
         controlvm_init_response(&outmsg, p->pending_msg_hdr, response);
-
         outmsg.cmd.device_change_state.bus_no = p->chipset_bus_no;
         outmsg.cmd.device_change_state.dev_no = p->chipset_dev_no;
-        outmsg.cmd.device_change_state.state = response_state;
-
+        outmsg.cmd.device_change_state.state = state;
         return visorchannel_signalinsert(chipset_dev->controlvm_channel,
                                          CONTROLVM_QUEUE_REQUEST, &outmsg);
 }
@@ -522,64 +456,55 @@ static int device_changestate_responder(
 static int visorbus_create(struct controlvm_message *inmsg)
 {
         struct controlvm_message_packet *cmd = &inmsg->cmd;
-        struct controlvm_message_header *pmsg_hdr = NULL;
+        struct controlvm_message_header *pmsg_hdr;
         u32 bus_no = cmd->create_bus.bus_no;
         struct visor_device *bus_info;
         struct visorchannel *visorchannel;
         int err;
 
         bus_info = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL);
-        if (bus_info && (bus_info->state.created == 1)) {
+        if (bus_info && bus_info->state.created == 1) {
                 dev_err(&chipset_dev->acpi_device->dev,
                         "failed %s: already exists\n", __func__);
                 err = -EEXIST;
                 goto err_respond;
         }
-
         bus_info = kzalloc(sizeof(*bus_info), GFP_KERNEL);
         if (!bus_info) {
                 err = -ENOMEM;
                 goto err_respond;
         }
-
         INIT_LIST_HEAD(&bus_info->list_all);
         bus_info->chipset_bus_no = bus_no;
         bus_info->chipset_dev_no = BUS_ROOT_DEVICE;
-
         if (guid_equal(&cmd->create_bus.bus_inst_guid, &visor_siovm_guid)) {
                 err = save_crash_message(inmsg, CRASH_BUS);
                 if (err)
                         goto err_free_bus_info;
         }
-
         if (inmsg->hdr.flags.response_expected == 1) {
-                pmsg_hdr = kzalloc(sizeof(*pmsg_hdr),
-                                   GFP_KERNEL);
+                pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
                 if (!pmsg_hdr) {
                         err = -ENOMEM;
                         goto err_free_bus_info;
                 }
-
                 memcpy(pmsg_hdr, &inmsg->hdr,
                        sizeof(struct controlvm_message_header));
                 bus_info->pending_msg_hdr = pmsg_hdr;
         }
-
         visorchannel = visorchannel_create(cmd->create_bus.channel_addr,
                                            GFP_KERNEL,
-                                           &cmd->create_bus.bus_data_type_guid);
+                                           &cmd->create_bus.bus_data_type_guid,
+                                           false);
         if (!visorchannel) {
                 err = -ENOMEM;
                 goto err_free_pending_msg;
         }
-
         bus_info->visorchannel = visorchannel;
-
         /* Response will be handled by visorbus_create_instance on success */
         err = visorbus_create_instance(bus_info);
         if (err)
                 goto err_destroy_channel;
-
         return 0;
 
 err_destroy_channel:
@@ -599,9 +524,8 @@ err_respond:
 
 static int visorbus_destroy(struct controlvm_message *inmsg)
 {
-        struct controlvm_message_packet *cmd = &inmsg->cmd;
-        struct controlvm_message_header *pmsg_hdr = NULL;
-        u32 bus_no = cmd->destroy_bus.bus_no;
+        struct controlvm_message_header *pmsg_hdr;
+        u32 bus_no = inmsg->cmd.destroy_bus.bus_no;
         struct visor_device *bus_info;
         int err;
 
@@ -625,12 +549,10 @@ static int visorbus_destroy(struct controlvm_message *inmsg)
                         err = -ENOMEM;
                         goto err_respond;
                 }
-
                 memcpy(pmsg_hdr, &inmsg->hdr,
                        sizeof(struct controlvm_message_header));
                 bus_info->pending_msg_hdr = pmsg_hdr;
         }
-
         /* Response will be handled by visorbus_remove_instance */
         visorbus_remove_instance(bus_info);
         return 0;
@@ -646,51 +568,33 @@ static const guid_t *parser_id_get(struct parser_context *ctx)
         return &ctx->data.id;
 }
 
-static void *parser_string_get(struct parser_context *ctx)
+static void *parser_string_get(u8 *pscan, int nscan)
 {
-        u8 *pscan;
-        unsigned long nscan;
         int value_length;
         void *value;
-        int i;
 
-        pscan = ctx->curr;
-        if (!pscan)
-                return NULL;
-        nscan = ctx->bytes_remaining;
         if (nscan == 0)
                 return NULL;
 
-        for (i = 0, value_length = -1; i < nscan; i++)
-                if (pscan[i] == '\0') {
-                        value_length = i;
-                        break;
-                }
-        /* '\0' was not included in the length */
-        if (value_length < 0)
-                value_length = nscan;
-
-        value = kmalloc(value_length + 1, GFP_KERNEL);
+        value_length = strnlen(pscan, nscan);
+        value = kzalloc(value_length + 1, GFP_KERNEL);
         if (!value)
                 return NULL;
         if (value_length > 0)
                 memcpy(value, pscan, value_length);
-        ((u8 *)(value))[value_length] = '\0';
         return value;
 }
 
 static void *parser_name_get(struct parser_context *ctx)
 {
-        struct visor_controlvm_parameters_header *phdr = NULL;
+        struct visor_controlvm_parameters_header *phdr;
 
         phdr = &ctx->data;
-
         if (phdr->name_offset + phdr->name_length > ctx->param_bytes)
                 return NULL;
-
         ctx->curr = (char *)&phdr + phdr->name_offset;
         ctx->bytes_remaining = phdr->name_length;
-        return parser_string_get(ctx);
+        return parser_string_get(ctx->curr, phdr->name_length);
 }
 
 static int visorbus_configure(struct controlvm_message *inmsg,
@@ -715,20 +619,16 @@ static int visorbus_configure(struct controlvm_message *inmsg,
                 err = -EIO;
                 goto err_respond;
         }
-
-        err = visorchannel_set_clientpartition
-                (bus_info->visorchannel,
-                 cmd->configure_bus.guest_handle);
+        err = visorchannel_set_clientpartition(bus_info->visorchannel,
+                                               cmd->configure_bus.guest_handle);
         if (err)
                 goto err_respond;
-
         if (parser_ctx) {
                 const guid_t *partition_guid = parser_id_get(parser_ctx);
 
                 guid_copy(&bus_info->partition_guid, partition_guid);
                 bus_info->name = parser_name_get(parser_ctx);
         }
-
         if (inmsg->hdr.flags.response_expected == 1)
                 controlvm_responder(inmsg->hdr.id, &inmsg->hdr, err);
         return 0;
@@ -744,10 +644,10 @@ err_respond:
 static int visorbus_device_create(struct controlvm_message *inmsg)
 {
         struct controlvm_message_packet *cmd = &inmsg->cmd;
-        struct controlvm_message_header *pmsg_hdr = NULL;
+        struct controlvm_message_header *pmsg_hdr;
         u32 bus_no = cmd->create_device.bus_no;
         u32 dev_no = cmd->create_device.dev_no;
-        struct visor_device *dev_info = NULL;
+        struct visor_device *dev_info;
         struct visor_device *bus_info;
         struct visorchannel *visorchannel;
         int err;
@@ -765,9 +665,8 @@ static int visorbus_device_create(struct controlvm_message *inmsg)
                 err = -EINVAL;
                 goto err_respond;
         }
-
         dev_info = visorbus_get_device_by_id(bus_no, dev_no, NULL);
-        if (dev_info && (dev_info->state.created == 1)) {
+        if (dev_info && dev_info->state.created == 1) {
                 dev_err(&chipset_dev->acpi_device->dev,
                         "failed to get bus by id: %d/%d\n", bus_no, dev_no);
                 err = -EEXIST;
@@ -779,16 +678,14 @@ static int visorbus_device_create(struct controlvm_message *inmsg)
                 err = -ENOMEM;
                 goto err_respond;
         }
-
         dev_info->chipset_bus_no = bus_no;
         dev_info->chipset_dev_no = dev_no;
         guid_copy(&dev_info->inst, &cmd->create_device.dev_inst_guid);
         dev_info->device.parent = &bus_info->device;
-
-        visorchannel =
-               visorchannel_create_with_lock(cmd->create_device.channel_addr,
-                                             GFP_KERNEL,
-                                             &cmd->create_device.data_type_guid);
+        visorchannel = visorchannel_create(cmd->create_device.channel_addr,
+                                           GFP_KERNEL,
+                                           &cmd->create_device.data_type_guid,
+                                           true);
         if (!visorchannel) {
                 dev_err(&chipset_dev->acpi_device->dev,
                         "failed to create visorchannel: %d/%d\n",
@@ -797,20 +694,20 @@ static int visorbus_device_create(struct controlvm_message *inmsg)
                 goto err_free_dev_info;
         }
         dev_info->visorchannel = visorchannel;
-        guid_copy(&dev_info->channel_type_guid, &cmd->create_device.data_type_guid);
-        if (guid_equal(&cmd->create_device.data_type_guid, &visor_vhba_channel_guid)) {
+        guid_copy(&dev_info->channel_type_guid,
+                  &cmd->create_device.data_type_guid);
+        if (guid_equal(&cmd->create_device.data_type_guid,
+                       &visor_vhba_channel_guid)) {
                 err = save_crash_message(inmsg, CRASH_DEV);
                 if (err)
                         goto err_destroy_visorchannel;
         }
-
         if (inmsg->hdr.flags.response_expected == 1) {
                 pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
                 if (!pmsg_hdr) {
                         err = -ENOMEM;
                         goto err_destroy_visorchannel;
                 }
-
                 memcpy(pmsg_hdr, &inmsg->hdr,
                        sizeof(struct controlvm_message_header));
                 dev_info->pending_msg_hdr = pmsg_hdr;
@@ -837,7 +734,7 @@ err_respond:
 static int visorbus_device_changestate(struct controlvm_message *inmsg)
 {
         struct controlvm_message_packet *cmd = &inmsg->cmd;
-        struct controlvm_message_header *pmsg_hdr = NULL;
+        struct controlvm_message_header *pmsg_hdr;
         u32 bus_no = cmd->device_change_state.bus_no;
         u32 dev_no = cmd->device_change_state.dev_no;
         struct visor_segment_state state = cmd->device_change_state.state;
@@ -858,18 +755,17 @@ static int visorbus_device_changestate(struct controlvm_message *inmsg)
                 err = -EIO;
                 goto err_respond;
         }
+
         if (inmsg->hdr.flags.response_expected == 1) {
                 pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
                 if (!pmsg_hdr) {
                         err = -ENOMEM;
                         goto err_respond;
                 }
-
                 memcpy(pmsg_hdr, &inmsg->hdr,
                        sizeof(struct controlvm_message_header));
                 dev_info->pending_msg_hdr = pmsg_hdr;
         }
-
         if (state.alive == segment_state_running.alive &&
             state.operating == segment_state_running.operating)
                 /* Response will be sent from visorchipset_device_resume */
@@ -884,7 +780,6 @@ static int visorbus_device_changestate(struct controlvm_message *inmsg)
                 err = visorchipset_device_pause(dev_info);
         if (err)
                 goto err_respond;
-
         return 0;
 
 err_respond:
@@ -897,7 +792,7 @@ err_respond:
 static int visorbus_device_destroy(struct controlvm_message *inmsg)
 {
         struct controlvm_message_packet *cmd = &inmsg->cmd;
-        struct controlvm_message_header *pmsg_hdr = NULL;
+        struct controlvm_message_header *pmsg_hdr;
         u32 bus_no = cmd->destroy_device.bus_no;
         u32 dev_no = cmd->destroy_device.dev_no;
         struct visor_device *dev_info;
@@ -928,7 +823,6 @@ static int visorbus_device_destroy(struct controlvm_message *inmsg)
                        sizeof(struct controlvm_message_header));
                 dev_info->pending_msg_hdr = pmsg_hdr;
         }
-
         kfree(dev_info->name);
         remove_visor_device(dev_info);
         return 0;
@@ -995,11 +889,9 @@ static struct parahotplug_request *parahotplug_request_create(
         req = kmalloc(sizeof(*req), GFP_KERNEL);
         if (!req)
                 return NULL;
-
         req->id = parahotplug_next_id();
         req->expiration = parahotplug_next_expiration();
         req->msg = *msg;
-
         return req;
 }
 
@@ -1031,13 +923,12 @@ static int parahotplug_request_complete(int id, u16 active)
 {
         struct list_head *pos;
         struct list_head *tmp;
+        struct parahotplug_request *req;
 
         spin_lock(&parahotplug_request_list_lock);
-
         /* Look for a request matching "id". */
         list_for_each_safe(pos, tmp, &parahotplug_request_list) {
-                struct parahotplug_request *req =
-                    list_entry(pos, struct parahotplug_request, list);
+                req = list_entry(pos, struct parahotplug_request, list);
                 if (req->id == id) {
                         /*
                          * Found a match. Remove it from the list and
@@ -1054,7 +945,6 @@ static int parahotplug_request_complete(int id, u16 active)
                         return 0;
                 }
         }
-
         spin_unlock(&parahotplug_request_list_lock);
         return -EINVAL;
 }
@@ -1081,7 +971,6 @@ static ssize_t devicedisabled_store(struct device *dev,
 
         if (kstrtouint(buf, 10, &id))
                 return -EINVAL;
-
         err = parahotplug_request_complete(id, 0);
         if (err < 0)
                 return err;
@@ -1110,7 +999,6 @@ static ssize_t deviceenabled_store(struct device *dev,
 
         if (kstrtouint(buf, 10, &id))
                 return -EINVAL;
-
         parahotplug_request_complete(id, 1);
         return count;
 }
@@ -1158,9 +1046,9 @@ static int parahotplug_request_kickoff(struct parahotplug_request *req)
 {
         struct controlvm_message_packet *cmd = &req->msg.cmd;
         char env_cmd[40], env_id[40], env_state[40], env_bus[40], env_dev[40],
-            env_func[40];
-        char *envp[] = {
-                env_cmd, env_id, env_state, env_bus, env_dev, env_func, NULL
+             env_func[40];
+        char *envp[] = { env_cmd, env_id, env_state, env_bus, env_dev,
+                         env_func, NULL
         };
 
         sprintf(env_cmd, "VISOR_PARAHOTPLUG=1");
@@ -1173,7 +1061,6 @@ static int parahotplug_request_kickoff(struct parahotplug_request *req)
                 cmd->device_change_state.dev_no >> 3);
         sprintf(env_func, "VISOR_PARAHOTPLUG_FUNCTION=%d",
                 cmd->device_change_state.dev_no & 0x7);
-
         return kobject_uevent_env(&chipset_dev->acpi_device->dev.kobj,
                                   KOBJ_CHANGE, envp);
 }
@@ -1191,7 +1078,6 @@ static int parahotplug_process_message(struct controlvm_message *inmsg)
         req = parahotplug_request_create(inmsg);
         if (!req)
                 return -ENOMEM;
-
         /*
          * For enable messages, just respond with success right away, we don't
          * need to wait to see if the enable was successful.
@@ -1205,7 +1091,6 @@ static int parahotplug_process_message(struct controlvm_message *inmsg)
                 parahotplug_request_destroy(req);
                 return 0;
         }
-
         /*
          * For disable messages, add the request to the request list before
          * kicking off the udev script. It won't get responded to until the
@@ -1214,7 +1099,6 @@ static int parahotplug_process_message(struct controlvm_message *inmsg)
         spin_lock(&parahotplug_request_list_lock);
         list_add_tail(&req->list, &parahotplug_request_list);
         spin_unlock(&parahotplug_request_list_lock);
-
         err = parahotplug_request_kickoff(req);
         if (err)
                 goto err_respond;
@@ -1237,12 +1121,9 @@ static int chipset_ready_uevent(struct controlvm_message_header *msg_hdr)
 {
         int res;
 
-        res = kobject_uevent(&chipset_dev->acpi_device->dev.kobj,
-                             KOBJ_ONLINE);
-
+        res = kobject_uevent(&chipset_dev->acpi_device->dev.kobj, KOBJ_ONLINE);
         if (msg_hdr->flags.response_expected)
                 controlvm_respond(msg_hdr, res, NULL);
-
         return res;
 }
 
@@ -1262,10 +1143,8 @@ static int chipset_selftest_uevent(struct controlvm_message_header *msg_hdr)
         sprintf(env_selftest, "SPARSP_SELFTEST=%d", 1);
         res = kobject_uevent_env(&chipset_dev->acpi_device->dev.kobj,
                                  KOBJ_CHANGE, envp);
-
         if (msg_hdr->flags.response_expected)
                 controlvm_respond(msg_hdr, res, NULL);
-
         return res;
 }
 
@@ -1279,11 +1158,10 @@ static int chipset_selftest_uevent(struct controlvm_message_header *msg_hdr)
 static int chipset_notready_uevent(struct controlvm_message_header *msg_hdr)
 {
         int res = kobject_uevent(&chipset_dev->acpi_device->dev.kobj,
-                             KOBJ_OFFLINE);
+                                 KOBJ_OFFLINE);
 
         if (msg_hdr->flags.response_expected)
                 controlvm_respond(msg_hdr, res, NULL);
-
         return res;
 }
 
@@ -1296,17 +1174,15 @@ static int unisys_vmcall(unsigned long tuple, unsigned long param)
 
         reg_ebx = param & 0xFFFFFFFF;
         reg_ecx = param >> 32;
-
         cpuid(0x00000001, &cpuid_eax, &cpuid_ebx, &cpuid_ecx, &cpuid_edx);
         if (!(cpuid_ecx & 0x80000000))
                 return -EPERM;
-
         __asm__ __volatile__(".byte 0x00f, 0x001, 0x0c1" : "=a"(result) :
-                "a"(tuple), "b"(reg_ebx), "c"(reg_ecx));
+                             "a"(tuple), "b"(reg_ebx), "c"(reg_ecx));
         if (result)
                 goto error;
-
         return 0;
+
 /* Need to convert from VMCALL error codes to Linux */
 error:
         switch (result) {
@@ -1330,8 +1206,8 @@ static int controlvm_channel_create(struct visorchipset_device *dev)
         if (err)
                 return err;
         addr = dev->controlvm_params.address;
-        chan = visorchannel_create_with_lock(addr, GFP_KERNEL,
-                                             &visor_controlvm_channel_guid);
+        chan = visorchannel_create(addr, GFP_KERNEL,
+                                   &visor_controlvm_channel_guid, true);
         if (!chan)
                 return -ENOMEM;
         dev->controlvm_channel = chan;
@@ -1350,9 +1226,7 @@ static void setup_crash_devices_work_queue(struct work_struct *work)
         msg.hdr.id = CONTROLVM_CHIPSET_INIT;
         msg.cmd.init_chipset.bus_count = 23;
         msg.cmd.init_chipset.switch_count = 0;
-
         chipset_init(&msg);
-
         /* get saved message count */
         if (visorchannel_read(chipset_dev->controlvm_channel,
                               offsetof(struct visor_controlvm_channel,
@@ -1362,13 +1236,10 @@ static void setup_crash_devices_work_queue(struct work_struct *work)
                         "failed to read channel\n");
                 return;
         }
-
         if (local_crash_msg_count != CONTROLVM_CRASHMSG_MAX) {
-                dev_err(&chipset_dev->acpi_device->dev,
-                        "invalid count\n");
+                dev_err(&chipset_dev->acpi_device->dev, "invalid count\n");
                 return;
         }
-
         /* get saved crash message offset */
         if (visorchannel_read(chipset_dev->controlvm_channel,
                               offsetof(struct visor_controlvm_channel,
@@ -1378,7 +1249,6 @@ static void setup_crash_devices_work_queue(struct work_struct *work)
                         "failed to read channel\n");
                 return;
         }
-
         /* read create device message for storage bus offset */
         if (visorchannel_read(chipset_dev->controlvm_channel,
                               local_crash_msg_offset,
@@ -1388,7 +1258,6 @@ static void setup_crash_devices_work_queue(struct work_struct *work)
                         "failed to read channel\n");
                 return;
         }
-
         /* read create device message for storage device */
         if (visorchannel_read(chipset_dev->controlvm_channel,
                               local_crash_msg_offset +
@@ -1399,7 +1268,6 @@ static void setup_crash_devices_work_queue(struct work_struct *work)
                         "failed to read channel\n");
                 return;
         }
-
         /* reuse IOVM create bus message */
         if (!local_crash_bus_msg.cmd.create_bus.channel_addr) {
                 dev_err(&chipset_dev->acpi_device->dev,
@@ -1407,7 +1275,6 @@ static void setup_crash_devices_work_queue(struct work_struct *work)
                 return;
         }
         visorbus_create(&local_crash_bus_msg);
-
         /* reuse create device message for storage device */
         if (!local_crash_dev_msg.cmd.create_device.channel_addr) {
                 dev_err(&chipset_dev->acpi_device->dev,
@@ -1420,8 +1287,10 @@ static void setup_crash_devices_work_queue(struct work_struct *work)
 void visorbus_response(struct visor_device *bus_info, int response,
                        int controlvm_id)
 {
-        controlvm_responder(controlvm_id, bus_info->pending_msg_hdr, response);
+        if (!bus_info->pending_msg_hdr)
+                return;
 
+        controlvm_responder(controlvm_id, bus_info->pending_msg_hdr, response);
         kfree(bus_info->pending_msg_hdr);
         bus_info->pending_msg_hdr = NULL;
 }
@@ -1430,9 +1299,11 @@ void visorbus_device_changestate_response(struct visor_device *dev_info,
                                           int response,
                                           struct visor_segment_state state)
 {
-        device_changestate_responder(CONTROLVM_DEVICE_CHANGESTATE,
-                                     dev_info, response, state);
+        if (!dev_info->pending_msg_hdr)
+                return;
 
+        device_changestate_responder(CONTROLVM_DEVICE_CHANGESTATE, dev_info,
+                                     response, state);
         kfree(dev_info->pending_msg_hdr);
         dev_info->pending_msg_hdr = NULL;
 }
@@ -1451,12 +1322,11 @@ static struct parser_context *parser_init_stream(u64 addr, u32 bytes,
         void *mapping;
 
         *retry = false;
-
         /* alloc an extra byte to ensure payload is \0 terminated */
         allocbytes = bytes + 1 + (sizeof(struct parser_context) -
                      sizeof(struct visor_controlvm_parameters_header));
-        if ((chipset_dev->controlvm_payload_bytes_buffered + bytes)
-            > MAX_CONTROLVM_PAYLOAD_BYTES) {
+        if ((chipset_dev->controlvm_payload_bytes_buffered + bytes) >
+             MAX_CONTROLVM_PAYLOAD_BYTES) {
                 *retry = true;
                 return NULL;
         }
@@ -1465,7 +1335,6 @@ static struct parser_context *parser_init_stream(u64 addr, u32 bytes,
                 *retry = true;
                 return NULL;
         }
-
         ctx->allocbytes = allocbytes;
         ctx->param_bytes = bytes;
         mapping = memremap(addr, bytes, MEMREMAP_WB);
@@ -1475,7 +1344,6 @@ static struct parser_context *parser_init_stream(u64 addr, u32 bytes,
         memunmap(mapping);
         ctx->byte_stream = true;
         chipset_dev->controlvm_payload_bytes_buffered += ctx->param_bytes;
-
         return ctx;
 
 err_finish_ctx:
@@ -1508,14 +1376,13 @@ static int handle_command(struct controlvm_message inmsg, u64 channel_addr)
         /* create parsing context if necessary */
         parm_addr = channel_addr + inmsg.hdr.payload_vm_offset;
         parm_bytes = inmsg.hdr.payload_bytes;
-
         /*
          * Parameter and channel addresses within test messages actually lie
          * within our OS-controlled memory. We need to know that, because it
          * makes a difference in how we compute the virtual address.
          */
         if (parm_bytes) {
-                bool retry = false;
+                bool retry;
 
                 parser_ctx = parser_init_stream(parm_addr, parm_bytes, &retry);
                 if (!parser_ctx && retry)
@@ -1526,7 +1393,6 @@ static int handle_command(struct controlvm_message inmsg, u64 channel_addr)
                                         CONTROLVM_QUEUE_ACK, &ackmsg);
         if (err)
                 return err;
-
         switch (inmsg.hdr.id) {
         case CONTROLVM_CHIPSET_INIT:
                 err = chipset_init(&inmsg);
@@ -1580,7 +1446,6 @@ static int handle_command(struct controlvm_message inmsg, u64 channel_addr)
                                           -CONTROLVM_RESP_ID_UNKNOWN, NULL);
                 break;
         }
-
         if (parser_ctx) {
                 parser_done(parser_ctx);
                 parser_ctx = NULL;
@@ -1599,14 +1464,13 @@ static int handle_command(struct controlvm_message inmsg, u64 channel_addr)
 static int read_controlvm_event(struct controlvm_message *msg)
 {
         int err = visorchannel_signalremove(chipset_dev->controlvm_channel,
-                                        CONTROLVM_QUEUE_EVENT, msg);
+                                            CONTROLVM_QUEUE_EVENT, msg);
+
         if (err)
                 return err;
-
         /* got a message */
         if (msg->hdr.flags.test_message == 1)
                 return -EINVAL;
-
         return 0;
 }
 
@@ -1620,14 +1484,12 @@ static void parahotplug_process_list(void)
         struct list_head *tmp;
 
         spin_lock(&parahotplug_request_list_lock);
-
         list_for_each_safe(pos, tmp, &parahotplug_request_list) {
                 struct parahotplug_request *req =
                     list_entry(pos, struct parahotplug_request, list);
 
                 if (!time_after_eq(jiffies, req->expiration))
                         continue;
-
                 list_del(pos);
                 if (req->msg.hdr.flags.response_expected)
                         controlvm_respond(
@@ -1636,7 +1498,6 @@ static void parahotplug_process_list(void)
                                 &req->msg.cmd.device_change_state.state);
                 parahotplug_request_destroy(req);
         }
-
         spin_unlock(&parahotplug_request_list_lock);
 }
 
@@ -1652,10 +1513,8 @@ static void controlvm_periodic_work(struct work_struct *work)
                                                 CONTROLVM_QUEUE_RESPONSE,
                                                 &inmsg);
         } while ((!err) && (++count < CONTROLVM_MESSAGE_MAX));
-
         if (err != -EAGAIN)
                 goto schedule_out;
-
         if (chipset_dev->controlvm_pending_msg_valid) {
                 /*
                  * we throttled processing of a prior msg, so try to process
@@ -1667,7 +1526,6 @@ static void controlvm_periodic_work(struct work_struct *work)
         } else {
                 err = read_controlvm_event(&inmsg);
         }
-
         while (!err) {
                 chipset_dev->most_recent_message_jiffies = jiffies;
                 err = handle_command(inmsg,
@@ -1681,7 +1539,6 @@ static void controlvm_periodic_work(struct work_struct *work)
 
                 err = read_controlvm_event(&inmsg);
         }
-
         /* parahotplug_worker */
         parahotplug_process_list();
 
@@ -1697,17 +1554,12 @@ schedule_out:
                  * it's been longer than MIN_IDLE_SECONDS since we processed
                  * our last controlvm message; slow down the polling
                  */
-                if (chipset_dev->poll_jiffies !=
-                                              POLLJIFFIES_CONTROLVMCHANNEL_SLOW)
-                        chipset_dev->poll_jiffies =
-                                              POLLJIFFIES_CONTROLVMCHANNEL_SLOW;
+                if (chipset_dev->poll_jiffies != POLLJIFFIES_CONTROLVM_SLOW)
+                        chipset_dev->poll_jiffies = POLLJIFFIES_CONTROLVM_SLOW;
         } else {
-                if (chipset_dev->poll_jiffies !=
-                                              POLLJIFFIES_CONTROLVMCHANNEL_FAST)
-                        chipset_dev->poll_jiffies =
-                                              POLLJIFFIES_CONTROLVMCHANNEL_FAST;
+                if (chipset_dev->poll_jiffies != POLLJIFFIES_CONTROLVM_FAST)
+                        chipset_dev->poll_jiffies = POLLJIFFIES_CONTROLVM_FAST;
         }
-
         schedule_delayed_work(&chipset_dev->periodic_controlvm_work,
                               chipset_dev->poll_jiffies);
 }
@@ -1720,20 +1572,16 @@ static int visorchipset_init(struct acpi_device *acpi_device)
         chipset_dev = kzalloc(sizeof(*chipset_dev), GFP_KERNEL);
         if (!chipset_dev)
                 goto error;
-
         err = controlvm_channel_create(chipset_dev);
         if (err)
                 goto error_free_chipset_dev;
-
         acpi_device->driver_data = chipset_dev;
         chipset_dev->acpi_device = acpi_device;
-        chipset_dev->poll_jiffies = POLLJIFFIES_CONTROLVMCHANNEL_FAST;
-
+        chipset_dev->poll_jiffies = POLLJIFFIES_CONTROLVM_FAST;
         err = sysfs_create_groups(&chipset_dev->acpi_device->dev.kobj,
                                   visorchipset_dev_groups);
         if (err < 0)
                 goto error_destroy_channel;
-
         controlvm_channel = chipset_dev->controlvm_channel;
         if (!visor_check_channel(visorchannel_get_header(controlvm_channel),
                                  &chipset_dev->acpi_device->dev,
@@ -1743,7 +1591,6 @@ static int visorchipset_init(struct acpi_device *acpi_device)
                                  VISOR_CONTROLVM_CHANNEL_VERSIONID,
                                  VISOR_CHANNEL_SIGNATURE))
                 goto error_delete_groups;
-
         /* if booting in a crash kernel */
         if (is_kdump_kernel())
                 INIT_DELAYED_WORK(&chipset_dev->periodic_controlvm_work,
@@ -1751,16 +1598,13 @@ static int visorchipset_init(struct acpi_device *acpi_device)
         else
                 INIT_DELAYED_WORK(&chipset_dev->periodic_controlvm_work,
                                   controlvm_periodic_work);
-
         chipset_dev->most_recent_message_jiffies = jiffies;
-        chipset_dev->poll_jiffies = POLLJIFFIES_CONTROLVMCHANNEL_FAST;
+        chipset_dev->poll_jiffies = POLLJIFFIES_CONTROLVM_FAST;
         schedule_delayed_work(&chipset_dev->periodic_controlvm_work,
                               chipset_dev->poll_jiffies);
-
         err = visorbus_init();
         if (err < 0)
                 goto error_cancel_work;
-
         return 0;
 
 error_cancel_work:
@@ -1787,10 +1631,8 @@ static int visorchipset_exit(struct acpi_device *acpi_device)
         cancel_delayed_work_sync(&chipset_dev->periodic_controlvm_work);
         sysfs_remove_groups(&chipset_dev->acpi_device->dev.kobj,
                             visorchipset_dev_groups);
-
         visorchannel_destroy(chipset_dev->controlvm_channel);
         kfree(chipset_dev);
-
         return 0;
 }
 
@@ -1832,11 +1674,9 @@ static int __init init_unisys(void)
 
         if (!visorutil_spar_detect())
                 return -ENODEV;
-
         result = acpi_bus_register_driver(&unisys_acpi_driver);
         if (result)
                 return -ENODEV;
-
         pr_info("Unisys Visorchipset Driver Loaded.\n");
         return 0;
 };
diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c
index 419dba89af06..0bcd3acb7b0c 100644
--- a/drivers/staging/unisys/visorhba/visorhba_main.c
+++ b/drivers/staging/unisys/visorhba/visorhba_main.c
@@ -17,6 +17,7 @@
 #include <linux/debugfs.h>
 #include <linux/kthread.h>
 #include <linux/idr.h>
+#include <linux/module.h>
 #include <linux/seq_file.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
@@ -39,7 +40,8 @@ static struct visor_channeltype_descriptor visorhba_channel_types[] = {
         /* Note that the only channel type we expect to be reported by the
          * bus driver is the VISOR_VHBA channel.
          */
-        { VISOR_VHBA_CHANNEL_GUID, "sparvhba" },
+        { VISOR_VHBA_CHANNEL_GUID, "sparvhba", sizeof(struct channel_header),
+          VISOR_VHBA_CHANNEL_VERSIONID },
         {}
 };
 
@@ -818,9 +820,9 @@ static void do_scsi_linuxstat(struct uiscmdrsp *cmdrsp,
         memcpy(scsicmd->sense_buffer, cmdrsp->scsi.sensebuf, MAX_SENSE_SIZE);
 
         /* Do not log errors for disk-not-present inquiries */
-        if ((cmdrsp->scsi.cmnd[0] == INQUIRY) &&
+        if (cmdrsp->scsi.cmnd[0] == INQUIRY &&
             (host_byte(cmdrsp->scsi.linuxstat) == DID_NO_CONNECT) &&
-            (cmdrsp->scsi.addlstat == ADDL_SEL_TIMEOUT))
+            cmdrsp->scsi.addlstat == ADDL_SEL_TIMEOUT)
                 return;
         /* Okay see what our error_count is here.... */
         vdisk = scsidev->hostdata;
@@ -868,8 +870,8 @@ static void do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp,
         struct visordisk_info *vdisk;
 
         scsidev = scsicmd->device;
-        if ((cmdrsp->scsi.cmnd[0] == INQUIRY) &&
-            (cmdrsp->scsi.bufflen >= MIN_INQUIRY_RESULT_LEN)) {
+        if (cmdrsp->scsi.cmnd[0] == INQUIRY &&
+            cmdrsp->scsi.bufflen >= MIN_INQUIRY_RESULT_LEN) {
                 if (cmdrsp->scsi.no_disk_result == 0)
                         return;
 
diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c
index 9d8cbc52de8b..450f003743c0 100644
--- a/drivers/staging/unisys/visorinput/visorinput.c
+++ b/drivers/staging/unisys/visorinput/visorinput.c
@@ -23,6 +23,7 @@
 #include <linux/fb.h>
 #include <linux/input.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/uuid.h>
 
 #include "visorbus.h"
@@ -711,8 +712,9 @@ out:
 
 /* GUIDS for all channel types supported by this driver. */
 static struct visor_channeltype_descriptor visorinput_channel_types[] = {
-        { VISOR_KEYBOARD_CHANNEL_GUID, "keyboard"},
-        { VISOR_MOUSE_CHANNEL_GUID, "mouse"},
+        { VISOR_KEYBOARD_CHANNEL_GUID, "keyboard",
+          sizeof(struct channel_header), 0 },
+        { VISOR_MOUSE_CHANNEL_GUID, "mouse", sizeof(struct channel_header), 0 },
         {}
 };
 
diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c
index dc390eae2960..735d7e5fa86b 100644
--- a/drivers/staging/unisys/visornic/visornic_main.c
+++ b/drivers/staging/unisys/visornic/visornic_main.c
@@ -20,6 +20,7 @@
 
 #include <linux/debugfs.h>
 #include <linux/etherdevice.h>
+#include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/kthread.h>
 #include <linux/skbuff.h>
@@ -48,7 +49,8 @@ static struct visor_channeltype_descriptor visornic_channel_types[] = {
         /* Note that the only channel type we expect to be reported by the
          * bus driver is the VISOR_VNIC channel.
          */
-        { VISOR_VNIC_CHANNEL_GUID, "ultravnic" },
+        { VISOR_VNIC_CHANNEL_GUID, "ultravnic", sizeof(struct channel_header),
+          VISOR_VNIC_CHANNEL_VERSIONID },
         {}
 };
 MODULE_DEVICE_TABLE(visorbus, visornic_channel_types);
@@ -899,7 +901,7 @@ static int visornic_xmit(struct sk_buff *skb, struct net_device *netdev)
                 return NETDEV_TX_OK;
         }
 
-        if ((len < ETH_MIN_PACKET_SIZE) &&
+        if (len < ETH_MIN_PACKET_SIZE &&
             ((skb_end_pointer(skb) - skb->data) >= ETH_MIN_PACKET_SIZE)) {
                 /* pad the packet out to minimum size */
                 padlen = ETH_MIN_PACKET_SIZE - len;
@@ -1450,7 +1452,7 @@ static ssize_t info_debugfs_read(struct file *file, char __user *buf,
         rcu_read_lock();
         for_each_netdev_rcu(current->nsproxy->net_ns, dev) {
                 /* Only consider netdevs that are visornic, and are open */
-                if ((dev->netdev_ops != &visornic_dev_ops) ||
+                if (dev->netdev_ops != &visornic_dev_ops ||
                     (!netif_queue_stopped(dev)))
                         continue;
 
@@ -1680,7 +1682,7 @@ static void service_resp_queue(struct uiscmdrsp *cmdrsp,
                         /* only call queue wake if we stopped it */
                         netdev = ((struct sk_buff *)cmdrsp->net.buf)->dev;
                         /* ASSERT netdev == vnicinfo->netdev; */
-                        if ((netdev == devdata->netdev) &&
+                        if (netdev == devdata->netdev &&
                             netif_queue_stopped(netdev)) {
                                 /* check if we have crossed the lower watermark
                                  * for netif_wake_queue()
diff --git a/drivers/staging/vboxvideo/vbox_drv.h b/drivers/staging/vboxvideo/vbox_drv.h
index 4b9302703b36..eeac4f0cb2c6 100644
--- a/drivers/staging/vboxvideo/vbox_drv.h
+++ b/drivers/staging/vboxvideo/vbox_drv.h
@@ -137,8 +137,8 @@ struct vbox_connector {
         char name[32];
         struct vbox_crtc *vbox_crtc;
         struct {
-                u16 width;
-                u16 height;
+                u32 width;
+                u32 height;
                 bool disconnected;
         } mode_hint;
 };
@@ -150,8 +150,8 @@ struct vbox_crtc {
         unsigned int crtc_id;
         u32 fb_offset;
         bool cursor_enabled;
-        u16 x_hint;
-        u16 y_hint;
+        u32 x_hint;
+        u32 y_hint;
 };
 
 struct vbox_encoder {
diff --git a/drivers/staging/vboxvideo/vbox_irq.c b/drivers/staging/vboxvideo/vbox_irq.c
index 3ca8bec62ac4..74abdf02d9fd 100644
--- a/drivers/staging/vboxvideo/vbox_irq.c
+++ b/drivers/staging/vboxvideo/vbox_irq.c
@@ -150,8 +150,8 @@ static void vbox_update_mode_hints(struct vbox_private *vbox)
 
                 disconnected = !(hints->enabled);
                 crtc_id = vbox_conn->vbox_crtc->crtc_id;
-                vbox_conn->mode_hint.width = hints->cx & 0x8fff;
-                vbox_conn->mode_hint.height = hints->cy & 0x8fff;
+                vbox_conn->mode_hint.width = hints->cx;
+                vbox_conn->mode_hint.height = hints->cy;
                 vbox_conn->vbox_crtc->x_hint = hints->dx;
                 vbox_conn->vbox_crtc->y_hint = hints->dy;
                 vbox_conn->mode_hint.disconnected = disconnected;
diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
index 257a77830410..6f08dc966719 100644
--- a/drivers/staging/vboxvideo/vbox_mode.c
+++ b/drivers/staging/vboxvideo/vbox_mode.c
@@ -553,12 +553,22 @@ static int vbox_get_modes(struct drm_connector *connector)
                 ++num_modes;
         }
         vbox_set_edid(connector, preferred_width, preferred_height);
-        drm_object_property_set_value(
-                &connector->base, vbox->dev->mode_config.suggested_x_property,
-                vbox_connector->vbox_crtc->x_hint);
-        drm_object_property_set_value(
-                &connector->base, vbox->dev->mode_config.suggested_y_property,
-                vbox_connector->vbox_crtc->y_hint);
+
+        if (vbox_connector->vbox_crtc->x_hint != -1)
+                drm_object_property_set_value(&connector->base,
+                        vbox->dev->mode_config.suggested_x_property,
+                        vbox_connector->vbox_crtc->x_hint);
+        else
+                drm_object_property_set_value(&connector->base,
+                        vbox->dev->mode_config.suggested_x_property, 0);
+
+        if (vbox_connector->vbox_crtc->y_hint != -1)
+                drm_object_property_set_value(&connector->base,
+                        vbox->dev->mode_config.suggested_y_property,
+                        vbox_connector->vbox_crtc->y_hint);
+        else
+                drm_object_property_set_value(&connector->base,
+                        vbox->dev->mode_config.suggested_y_property, 0);
 
         return num_modes;
 }
@@ -640,9 +650,9 @@ static int vbox_connector_init(struct drm_device *dev,
 
         drm_mode_create_suggested_offset_properties(dev);
         drm_object_attach_property(&connector->base,
-                                   dev->mode_config.suggested_x_property, -1);
+                                   dev->mode_config.suggested_x_property, 0);
         drm_object_attach_property(&connector->base,
-                                   dev->mode_config.suggested_y_property, -1);
+                                   dev->mode_config.suggested_y_property, 0);
         drm_connector_register(connector);
 
         drm_mode_connector_attach_encoder(connector, encoder);
diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
index 9e2763663ab8..f5aaf7d629f0 100644
--- a/drivers/staging/vc04_services/Kconfig
+++ b/drivers/staging/vc04_services/Kconfig
@@ -19,18 +19,6 @@ config BCM2835_VCHIQ
                 Defaults to Y when the Broadcom Videocore services
                 are included in the build, N otherwise.
 
-if BCM2835_VCHIQ
-
-config BCM2835_VCHIQ_SUPPORT_MEMDUMP
-        bool "Support dumping memory contents to debug log"
-        help
-                BCM2835 VCHIQ supports the ability to dump the
-                contents of memory to the debug log.  This
-                is typically only needed by diagnostic tools used
-                to debug issues with VideoCore.
-
-endif
-
 source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"
 
 source "drivers/staging/vc04_services/bcm2835-camera/Kconfig"
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
index 94654c0c7bba..7e68b3e28246 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
@@ -65,7 +65,6 @@ void bcm2835_playback_fifo(struct bcm2835_alsa_stream *alsa_stream)
         unsigned int consumed = 0;
         int new_period = 0;
 
-
         audio_info("alsa_stream=%p substream=%p\n", alsa_stream,
                 alsa_stream ? alsa_stream->substream : 0);
 
@@ -111,7 +110,6 @@ static int snd_bcm2835_playback_open_generic(
         int idx;
         int err;
 
-
         if (mutex_lock_interruptible(&chip->audio_mutex)) {
                 audio_error("Interrupted whilst waiting for lock\n");
                 return -EINTR;
@@ -184,7 +182,6 @@ static int snd_bcm2835_playback_open_generic(
 out:
         mutex_unlock(&chip->audio_mutex);
 
-
         return err;
 }
 
@@ -207,7 +204,6 @@ static int snd_bcm2835_playback_close(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime;
         struct bcm2835_alsa_stream *alsa_stream;
 
-
         chip = snd_pcm_substream_chip(substream);
         if (mutex_lock_interruptible(&chip->audio_mutex)) {
                 audio_error("Interrupted whilst waiting for lock\n");
@@ -259,7 +255,6 @@ static int snd_bcm2835_pcm_hw_params(struct snd_pcm_substream *substream,
         struct bcm2835_alsa_stream *alsa_stream = runtime->private_data;
         int err;
 
-
         err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
         if (err < 0) {
                 audio_error
@@ -289,7 +284,6 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
         int channels;
         int err;
 
-
         if (mutex_lock_interruptible(&chip->audio_mutex))
                 return -EINTR;
 
@@ -307,13 +301,11 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
         if (err < 0)
                 audio_error(" error setting hw params\n");
 
-
         bcm2835_audio_setup(alsa_stream);
 
         /* in preparation of the stream, set the controls (volume level) of the stream */
         bcm2835_audio_set_ctls(alsa_stream->chip);
 
-
         memset(&alsa_stream->pcm_indirect, 0, sizeof(alsa_stream->pcm_indirect));
 
         alsa_stream->pcm_indirect.hw_buffer_size =
@@ -364,7 +356,6 @@ static int snd_bcm2835_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
         struct bcm2835_alsa_stream *alsa_stream = runtime->private_data;
         int err = 0;
 
-
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
                 audio_debug("bcm2835_AUDIO_TRIGGER_START running=%d\n",
@@ -416,7 +407,6 @@ snd_bcm2835_pcm_pointer(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct bcm2835_alsa_stream *alsa_stream = runtime->private_data;
 
-
         audio_debug("pcm_pointer... (%d) hwptr=%d appl=%d pos=%d\n", 0,
                 frames_to_bytes(runtime, runtime->status->hw_ptr),
                 frames_to_bytes(runtime, runtime->control->appl_ptr),
@@ -493,7 +483,6 @@ int snd_bcm2835_new_pcm(struct bcm2835_chip *chip, u32 numchannels)
                                               snd_bcm2835_playback_hw.buffer_bytes_max,
                                               snd_bcm2835_playback_hw.buffer_bytes_max);
 
-
 out:
         mutex_unlock(&chip->audio_mutex);
 
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
index 5f3d8f2339e3..3c6f1d91d22d 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -337,7 +337,6 @@ static int vc_vchi_audio_deinit(struct bcm2835_audio_instance *instance)
 {
         unsigned int i;
 
-
         if (!instance) {
                 LOG_ERR("%s: invalid handle %p\n", __func__, instance);
 
@@ -369,7 +368,6 @@ static int vc_vchi_audio_deinit(struct bcm2835_audio_instance *instance)
 
         kfree(instance);
 
-
         return 0;
 }
 
@@ -382,7 +380,6 @@ static int bcm2835_audio_open_connection(struct bcm2835_alsa_stream *alsa_stream
                 (struct bcm2835_audio_instance *)alsa_stream->instance;
         int ret;
 
-
         LOG_INFO("%s: start\n", __func__);
         BUG_ON(instance);
         if (instance) {
@@ -390,8 +387,7 @@ static int bcm2835_audio_open_connection(struct bcm2835_alsa_stream *alsa_stream
                         __func__, instance);
                 instance->alsa_stream = alsa_stream;
                 alsa_stream->instance = instance;
-                ret = 0; // xxx todo -1;
-                goto err_free_mem;
+                return 0;
         }
 
         /* Initialize and create a VCHI connection */
@@ -401,16 +397,15 @@ static int bcm2835_audio_open_connection(struct bcm2835_alsa_stream *alsa_stream
                         LOG_ERR("%s: failed to initialise VCHI instance (ret=%d)\n",
                                 __func__, ret);
 
-                        ret = -EIO;
-                        goto err_free_mem;
+                        return -EIO;
                 }
                 ret = vchi_connect(NULL, 0, vchi_instance);
                 if (ret) {
                         LOG_ERR("%s: failed to connect VCHI instance (ret=%d)\n",
                                 __func__, ret);
 
-                        ret = -EIO;
-                        goto err_free_mem;
+                        kfree(vchi_instance);
+                        return -EIO;
                 }
                 initted = 1;
         }
@@ -421,19 +416,16 @@ static int bcm2835_audio_open_connection(struct bcm2835_alsa_stream *alsa_stream
         if (IS_ERR(instance)) {
                 LOG_ERR("%s: failed to initialize audio service\n", __func__);
 
-                ret = PTR_ERR(instance);
-                goto err_free_mem;
+                /* vchi_instance is retained for use the next time. */
+                return PTR_ERR(instance);
         }
 
         instance->alsa_stream = alsa_stream;
         alsa_stream->instance = instance;
 
         LOG_DBG(" success !\n");
-        ret = 0;
-err_free_mem:
-        kfree(vchi_instance);
 
-        return ret;
+        return 0;
 }
 
 int bcm2835_audio_open(struct bcm2835_alsa_stream *alsa_stream)
@@ -443,7 +435,6 @@ int bcm2835_audio_open(struct bcm2835_alsa_stream *alsa_stream)
         int status;
         int ret;
 
-
         my_workqueue_init(alsa_stream);
 
         ret = bcm2835_audio_open_connection(alsa_stream);
@@ -491,7 +482,6 @@ static int bcm2835_audio_set_ctls_chan(struct bcm2835_alsa_stream *alsa_stream,
         int status;
         int ret;
 
-
         LOG_INFO(" Setting ALSA dest(%d), volume(%d)\n",
                  chip->dest, chip->volume);
 
@@ -575,7 +565,6 @@ int bcm2835_audio_set_params(struct bcm2835_alsa_stream *alsa_stream,
         int status;
         int ret;
 
-
         LOG_INFO(" Setting ALSA channels(%d), samplerate(%d), bits-per-sample(%d)\n",
                  channels, samplerate, bps);
 
@@ -636,7 +625,6 @@ unlock:
 int bcm2835_audio_setup(struct bcm2835_alsa_stream *alsa_stream)
 {
 
-
         return 0;
 }
 
@@ -647,7 +635,6 @@ static int bcm2835_audio_start_worker(struct bcm2835_alsa_stream *alsa_stream)
         int status;
         int ret;
 
-
         if (mutex_lock_interruptible(&instance->vchi_mutex)) {
                 LOG_DBG("Interrupted whilst waiting for lock on (%d)\n",
                         instance->num_connections);
@@ -684,7 +671,6 @@ static int bcm2835_audio_stop_worker(struct bcm2835_alsa_stream *alsa_stream)
         int status;
         int ret;
 
-
         if (mutex_lock_interruptible(&instance->vchi_mutex)) {
                 LOG_DBG("Interrupted whilst waiting for lock on (%d)\n",
                         instance->num_connections);
@@ -722,7 +708,6 @@ int bcm2835_audio_close(struct bcm2835_alsa_stream *alsa_stream)
         int status;
         int ret;
 
-
         my_workqueue_quit(alsa_stream);
 
         if (mutex_lock_interruptible(&instance->vchi_mutex)) {
@@ -780,7 +765,6 @@ static int bcm2835_audio_write_worker(struct bcm2835_alsa_stream *alsa_stream,
         int status;
         int ret;
 
-
         LOG_INFO(" Writing %d bytes from %p\n", count, src);
 
         if (mutex_lock_interruptible(&instance->vchi_mutex)) {
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
index 379604d3554e..f1e43e45fd67 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
@@ -123,8 +123,6 @@ struct bcm2835_alsa_stream {
         struct snd_pcm_indirect pcm_indirect;
 
         spinlock_t lock;
-        volatile unsigned int control;
-        volatile unsigned int status;
 
         int open;
         int running;
diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
index 52cdf4da1b47..5a1b2a7d8eb0 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
@@ -70,7 +70,7 @@ enum mmal_msg_type {
 
 /* port action request messages differ depending on the action type */
 enum mmal_msg_port_action_type {
-        MMAL_MSG_PORT_ACTION_TYPE_UNKNOWN = 0,      /* Unkown action */
+        MMAL_MSG_PORT_ACTION_TYPE_UNKNOWN = 0,      /* Unknown action */
         MMAL_MSG_PORT_ACTION_TYPE_ENABLE,           /* Enable a port */
         MMAL_MSG_PORT_ACTION_TYPE_DISABLE,          /* Disable a port */
         MMAL_MSG_PORT_ACTION_TYPE_FLUSH,            /* Flush a port */
@@ -217,36 +217,36 @@ struct mmal_msg_port_action_reply {
 #define MMAL_VC_SHORT_DATA 128
 
 /** Signals that the current payload is the end of the stream of data */
-#define MMAL_BUFFER_HEADER_FLAG_EOS                    (1<<0)
+#define MMAL_BUFFER_HEADER_FLAG_EOS                    BIT(0)
 /** Signals that the start of the current payload starts a frame */
-#define MMAL_BUFFER_HEADER_FLAG_FRAME_START            (1<<1)
+#define MMAL_BUFFER_HEADER_FLAG_FRAME_START            BIT(1)
 /** Signals that the end of the current payload ends a frame */
-#define MMAL_BUFFER_HEADER_FLAG_FRAME_END              (1<<2)
+#define MMAL_BUFFER_HEADER_FLAG_FRAME_END              BIT(2)
 /** Signals that the current payload contains only complete frames (>1) */
 #define MMAL_BUFFER_HEADER_FLAG_FRAME                  \
         (MMAL_BUFFER_HEADER_FLAG_FRAME_START|MMAL_BUFFER_HEADER_FLAG_FRAME_END)
 /** Signals that the current payload is a keyframe (i.e. self decodable) */
-#define MMAL_BUFFER_HEADER_FLAG_KEYFRAME               (1<<3)
+#define MMAL_BUFFER_HEADER_FLAG_KEYFRAME               BIT(3)
 /** Signals a discontinuity in the stream of data (e.g. after a seek).
  * Can be used for instance by a decoder to reset its state
  */
-#define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY          (1<<4)
+#define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY          BIT(4)
 /** Signals a buffer containing some kind of config data for the component
  * (e.g. codec config data)
  */
-#define MMAL_BUFFER_HEADER_FLAG_CONFIG                 (1<<5)
+#define MMAL_BUFFER_HEADER_FLAG_CONFIG                 BIT(5)
 /** Signals an encrypted payload */
-#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED              (1<<6)
+#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED              BIT(6)
 /** Signals a buffer containing side information */
-#define MMAL_BUFFER_HEADER_FLAG_CODECSIDEINFO          (1<<7)
+#define MMAL_BUFFER_HEADER_FLAG_CODECSIDEINFO          BIT(7)
 /** Signals a buffer which is the snapshot/postview image from a stills
  * capture
  */
-#define MMAL_BUFFER_HEADER_FLAGS_SNAPSHOT              (1<<8)
+#define MMAL_BUFFER_HEADER_FLAGS_SNAPSHOT              BIT(8)
 /** Signals a buffer which contains data known to be corrupted */
-#define MMAL_BUFFER_HEADER_FLAG_CORRUPTED              (1<<9)
+#define MMAL_BUFFER_HEADER_FLAG_CORRUPTED              BIT(9)
 /** Signals that a buffer failed to be transmitted */
-#define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED    (1<<10)
+#define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED    BIT(10)
 
 struct mmal_driver_buffer {
         u32 magic;
diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
index 4360db6d4392..6ea7fb0ea50e 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
@@ -1963,7 +1963,7 @@ int vchiq_mmal_finalise(struct vchiq_mmal_instance *instance)
 
         status = vchi_service_close(instance->handle);
         if (status != 0)
-                pr_err("mmal-vchiq: VCHIQ close failed");
+                pr_err("mmal-vchiq: VCHIQ close failed\n");
 
         mutex_unlock(&instance->vchiq_mutex);
 
diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
index 63db053532bf..db39900c9d91 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
@@ -130,7 +130,7 @@ int vchiq_mmal_component_disable(
 /* enable a mmal port
  *
  * enables a port and if a buffer callback provided enque buffer
- * headers as apropriate for the port.
+ * headers as appropriate for the port.
  */
 int vchiq_mmal_port_enable(
                 struct vchiq_mmal_instance *instance,
diff --git a/drivers/staging/vc04_services/interface/vchi/connections/connection.h b/drivers/staging/vc04_services/interface/vchi/connections/connection.h
index e793cdf2847c..67c84386c65a 100644
--- a/drivers/staging/vc04_services/interface/vchi/connections/connection.h
+++ b/drivers/staging/vc04_services/interface/vchi/connections/connection.h
@@ -54,7 +54,6 @@ typedef struct opaque_vchi_connection_info_t VCHI_CONNECTION_STATE_T;
 
 typedef struct vchi_connection_t VCHI_CONNECTION_T;
 
-
 /******************************************************************************
  API
  *****************************************************************************/
@@ -212,7 +211,6 @@ typedef void * (*VCHI_BUFFER_ALLOCATE)(VCHI_CONNECTION_SERVICE_HANDLE_T service_
 // free memory allocated by buffer_allocate
 typedef void   (*VCHI_BUFFER_FREE)(VCHI_CONNECTION_SERVICE_HANDLE_T service_handle, void * address);
 
-
 /******************************************************************************
  System driver struct
  *****************************************************************************/
@@ -321,7 +319,6 @@ struct vchi_connection_t {
 #endif
 };
 
-
 #endif /* CONNECTION_H_ */
 
 /****************************** End of file **********************************/
diff --git a/drivers/staging/vc04_services/interface/vchi/message_drivers/message.h b/drivers/staging/vc04_services/interface/vchi/message_drivers/message.h
index a7740a425388..834263f278cf 100644
--- a/drivers/staging/vc04_services/interface/vchi/message_drivers/message.h
+++ b/drivers/staging/vc04_services/interface/vchi/message_drivers/message.h
@@ -41,7 +41,6 @@
 #include "interface/vchi/vchi_cfg_internal.h"
 #include "interface/vchi/vchi_common.h"
 
-
 typedef enum message_event_type {
    MESSAGE_EVENT_NONE,
    MESSAGE_EVENT_NOP,
@@ -111,7 +110,6 @@ typedef struct rx_bulk_slotinfo_t {
    VCHI_FLAGS_T flags;
 } RX_BULK_SLOTINFO_T;
 
-
 /* ----------------------------------------------------------------------
  * each connection driver will have a pool of the following struct.
  *
@@ -155,7 +153,6 @@ typedef struct {
 
 } MESSAGE_EVENT_T;
 
-
 // callbacks
 typedef void VCHI_MESSAGE_DRIVER_EVENT_CALLBACK_T( void *state );
 
@@ -163,7 +160,6 @@ typedef struct {
    VCHI_MESSAGE_DRIVER_EVENT_CALLBACK_T *event_callback;
 } VCHI_MESSAGE_DRIVER_OPEN_T;
 
-
 // handle to this instance of message driver (as returned by ->open)
 typedef struct opaque_mhandle_t *VCHI_MDRIVER_HANDLE_T;
 
@@ -195,7 +191,6 @@ struct opaque_vchi_message_driver_t {
    void    (*debug)( VCHI_MDRIVER_HANDLE_T *handle );
 };
 
-
 #endif // _VCHI_MESSAGE_H_
 
 /****************************** End of file ***********************************/
diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
index addb7b00b688..66a3a060fad2 100644
--- a/drivers/staging/vc04_services/interface/vchi/vchi.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
@@ -39,7 +39,6 @@
 #include "interface/vchi/connections/connection.h"
 #include "vchi_mh.h"
 
-
 /******************************************************************************
  Global defs
  *****************************************************************************/
@@ -92,7 +91,6 @@ typedef struct vchi_msg_vector_ex {
    } u;
 } VCHI_MSG_VECTOR_EX_T;
 
-
 // Construct an entry in a msg vector for a pointer (p) of length (l)
 #define VCHI_VEC_POINTER(p,l)  VCHI_VEC_POINTER, { { (VCHI_MEM_HANDLE_T)(p), (l) } }
 
@@ -103,7 +101,6 @@ typedef struct vchi_msg_vector_ex {
 #define MAKE_FOURCC(x) ((int32_t)( (x[0] << 24) | (x[1] << 16) | (x[2] << 8) | x[3] ))
 #define FOURCC_TO_CHAR(x) (x >> 24) & 0xFF,(x >> 16) & 0xFF,(x >> 8) & 0xFF, x & 0xFF
 
-
 // Opaque service information
 struct opaque_vchi_service_t;
 
@@ -114,8 +111,6 @@ typedef struct {
    void *message;
 } VCHI_HELD_MSG_T;
 
-
-
 // structure used to provide the information needed to open a server or a client
 typedef struct {
         struct vchi_version version;
@@ -162,7 +157,6 @@ extern "C" {
 extern /*@observer@*/ VCHI_CONNECTION_T * vchi_create_connection( const VCHI_CONNECTION_API_T * function_table,
                                                    const VCHI_MESSAGE_DRIVER_T * low_level);
 
-
 // Routine used to initialise the vchi on both local + remote connections
 extern int32_t vchi_initialise( VCHI_INSTANCE_T *instance_handle );
 
@@ -185,7 +179,6 @@ extern void * vchi_allocate_buffer(VCHI_SERVICE_HANDLE_T handle, uint32_t *lengt
 extern void vchi_free_buffer(VCHI_SERVICE_HANDLE_T handle, void *address);
 extern uint32_t vchi_current_time(VCHI_INSTANCE_T instance_handle);
 
-
 /******************************************************************************
  Global service API
  *****************************************************************************/
@@ -194,7 +187,7 @@ extern int32_t vchi_service_create( VCHI_INSTANCE_T instance_handle,
                                     SERVICE_CREATION_T *setup,
                                     VCHI_SERVICE_HANDLE_T *handle );
 
-// Routine to destory a service
+// Routine to destroy a service
 extern int32_t vchi_service_destroy( const VCHI_SERVICE_HANDLE_T handle );
 
 // Routine to open a named service
@@ -307,7 +300,6 @@ extern int32_t vchi_msg_iter_hold_next( VCHI_MSG_ITER_T *iter,
                                         uint32_t *msg_size, // }
                                         VCHI_HELD_MSG_T *message );
 
-
 /******************************************************************************
  Global bulk API
  *****************************************************************************/
@@ -319,7 +311,6 @@ extern int32_t vchi_bulk_queue_receive( VCHI_SERVICE_HANDLE_T handle,
                                         VCHI_FLAGS_T flags,
                                         void *transfer_handle );
 
-
 // Prepare interface for a transfer from the other side into relocatable memory.
 int32_t vchi_bulk_queue_receive_reloc( const VCHI_SERVICE_HANDLE_T handle,
                                        VCHI_MEM_HANDLE_T h_dst,
@@ -335,7 +326,6 @@ extern int32_t vchi_bulk_queue_transmit( VCHI_SERVICE_HANDLE_T handle,
                                          VCHI_FLAGS_T flags,
                                          void *transfer_handle );
 
-
 /******************************************************************************
  Configuration plumbing
  *****************************************************************************/
diff --git a/drivers/staging/vc04_services/interface/vchi/vchi_common.h b/drivers/staging/vc04_services/interface/vchi/vchi_common.h
index 45c2070d46b0..76e10fe65d9b 100644
--- a/drivers/staging/vc04_services/interface/vchi/vchi_common.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi_common.h
@@ -34,7 +34,6 @@
 #ifndef VCHI_COMMON_H_
 #define VCHI_COMMON_H_
 
-
 //flags used when sending messages (must be bitmapped)
 typedef enum {
    VCHI_FLAGS_NONE                      = 0x0,
@@ -118,14 +117,11 @@ typedef enum {
    VCHI_SERVICE_OPTION_MAX
 } VCHI_SERVICE_OPTION_T;
 
-
 //Callback used by all services / bulk transfers
 typedef void (*VCHI_CALLBACK_T)(void *callback_param, //my service local param
                                  VCHI_CALLBACK_REASON_T reason,
                                  void *handle); //for transmitting msg's only
 
-
-
 /*
  * Define vector struct for scatter-gather (vector) operations
  * Vectors can be nested - if a vector element has negative length, then
@@ -154,7 +150,6 @@ typedef struct opaque_vchi_connection_api_t VCHI_CONNECTION_API_T;
 // Opaque type for a message driver
 typedef struct opaque_vchi_message_driver_t VCHI_MESSAGE_DRIVER_T;
 
-
 // Iterator structure for reading ahead through received message queue. Allocated by client,
 // initialised by vchi_msg_look_ahead. Fields are for internal VCHI use only.
 // Iterates over messages in queue at the instant of the call to vchi_msg_lookahead -
@@ -168,5 +163,4 @@ typedef struct {
    void *remove;
 } VCHI_MSG_ITER_T;
 
-
 #endif // VCHI_COMMON_H_
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index be08849175ea..eea2d78b0ec6 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -59,10 +59,10 @@
 #define BELL0   0x00
 #define BELL2   0x08
 
-typedef struct vchiq_2835_state_struct {
+struct vchiq_2835_state {
         int inited;
         VCHIQ_ARM_STATE_T arm_state;
-} VCHIQ_2835_ARM_STATE_T;
+};
 
 struct vchiq_pagelist_info {
         PAGELIST_T *pagelist;
@@ -84,8 +84,6 @@ static char *g_free_fragments;
 static struct semaphore g_free_fragments_sema;
 static struct device *g_dev;
 
-extern int vchiq_arm_log_level;
-
 static DEFINE_SEMAPHORE(g_free_fragments_mutex);
 
 static irqreturn_t
@@ -206,25 +204,31 @@ VCHIQ_STATUS_T
 vchiq_platform_init_state(VCHIQ_STATE_T *state)
 {
         VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
+        struct vchiq_2835_state *platform_state;
+
+        state->platform_state = kzalloc(sizeof(*platform_state), GFP_KERNEL);
+        platform_state = (struct vchiq_2835_state *)state->platform_state;
+
+        platform_state->inited = 1;
+        status = vchiq_arm_init_state(state, &platform_state->arm_state);
 
-        state->platform_state = kzalloc(sizeof(VCHIQ_2835_ARM_STATE_T), GFP_KERNEL);
-        ((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->inited = 1;
-        status = vchiq_arm_init_state(state, &((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->arm_state);
         if (status != VCHIQ_SUCCESS)
-        {
-                ((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->inited = 0;
-        }
+                platform_state->inited = 0;
+
         return status;
 }
 
 VCHIQ_ARM_STATE_T*
 vchiq_platform_get_arm_state(VCHIQ_STATE_T *state)
 {
-        if (!((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->inited)
-        {
+        struct vchiq_2835_state *platform_state;
+
+        platform_state   = (struct vchiq_2835_state *)state->platform_state;
+
+        if (!platform_state->inited)
                 BUG();
-        }
-        return &((VCHIQ_2835_ARM_STATE_T *)state->platform_state)->arm_state;
+
+        return &platform_state->arm_state;
 }
 
 void
@@ -383,12 +387,12 @@ cleanup_pagelistinfo(struct vchiq_pagelist_info *pagelistinfo)
 }
 
 /* There is a potential problem with partial cache lines (pages?)
-** at the ends of the block when reading. If the CPU accessed anything in
-** the same line (page?) then it may have pulled old data into the cache,
-** obscuring the new data underneath. We can solve this by transferring the
-** partial cache lines separately, and allowing the ARM to copy into the
-** cached area.
-*/
+ * at the ends of the block when reading. If the CPU accessed anything in
+ * the same line (page?) then it may have pulled old data into the cache,
+ * obscuring the new data underneath. We can solve this by transferring the
+ * partial cache lines separately, and allowing the ARM to copy into the
+ * cached area.
+ */
 
 static struct vchiq_pagelist_info *
 create_pagelist(char __user *buf, size_t count, unsigned short type,
@@ -415,15 +419,15 @@ create_pagelist(char __user *buf, size_t count, unsigned short type,
                         sizeof(struct vchiq_pagelist_info);
 
         /* Allocate enough storage to hold the page pointers and the page
-        ** list
-        */
+         * list
+         */
         pagelist = dma_zalloc_coherent(g_dev,
                                        pagelist_size,
                                        &dma_addr,
                                        GFP_KERNEL);
 
-        vchiq_log_trace(vchiq_arm_log_level, "create_pagelist - %pK",
-                        pagelist);
+        vchiq_log_trace(vchiq_arm_log_level, "%s - %pK", __func__, pagelist);
+
         if (!pagelist)
                 return NULL;
 
@@ -483,9 +487,8 @@ create_pagelist(char __user *buf, size_t count, unsigned short type,
 
                 if (actual_pages != num_pages) {
                         vchiq_log_info(vchiq_arm_log_level,
-                                       "create_pagelist - only %d/%d pages locked",
-                                       actual_pages,
-                                       num_pages);
+                                       "%s - only %d/%d pages locked",
+                                       __func__, actual_pages, num_pages);
 
                         /* This is probably due to the process being killed */
                         while (actual_pages > 0)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 314ffac50bb8..411539f8ff8c 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -109,9 +109,7 @@ static const char *const resume_state_names[] = {
  * requested */
 #define FORCE_SUSPEND_TIMEOUT_MS 200
 
-
-static void suspend_timer_callback(unsigned long context);
-
+static void suspend_timer_callback(struct timer_list *t);
 
 typedef struct user_service_struct {
         VCHIQ_SERVICE_T *service;
@@ -195,11 +193,6 @@ static const char *const ioctl_names[] = {
 vchiq_static_assert(ARRAY_SIZE(ioctl_names) ==
                     (VCHIQ_IOC_MAX + 1));
 
-#if defined(CONFIG_BCM2835_VCHIQ_SUPPORT_MEMDUMP)
-static void
-dump_phys_mem(void *virt_addr, u32 num_bytes);
-#endif
-
 /****************************************************************************
 *
 *   add_completion
@@ -1161,20 +1154,6 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 args.handle, args.option, args.value);
         } break;
 
-#if defined(CONFIG_BCM2835_VCHIQ_SUPPORT_MEMDUMP)
-        case VCHIQ_IOC_DUMP_PHYS_MEM: {
-                VCHIQ_DUMP_MEM_T  args;
-
-                if (copy_from_user
-                         (&args, (const void __user *)arg,
-                          sizeof(args)) != 0) {
-                        ret = -EFAULT;
-                        break;
-                }
-                dump_phys_mem(args.virt_addr, args.num_bytes);
-        } break;
-#endif
-
         case VCHIQ_IOC_LIB_VERSION: {
                 unsigned int lib_version = (unsigned int)arg;
 
@@ -1654,42 +1633,6 @@ vchiq_compat_ioctl_get_config(struct file *file,
         return vchiq_ioctl(file, VCHIQ_IOC_GET_CONFIG, (unsigned long)args);
 }
 
-#if defined(CONFIG_BCM2835_VCHIQ_SUPPORT_MEMDUMP)
-
-struct vchiq_dump_mem32 {
-        compat_uptr_t virt_addr;
-        u32 num_bytes;
-};
-
-#define VCHIQ_IOC_DUMP_PHYS_MEM32 \
-        _IOW(VCHIQ_IOC_MAGIC, 15, struct vchiq_dump_mem32)
-
-static long
-vchiq_compat_ioctl_dump_phys_mem(struct file *file,
-                                 unsigned int cmd,
-                                 unsigned long arg)
-{
-        VCHIQ_DUMP_MEM_T *args;
-        struct vchiq_dump_mem32 args32;
-
-        args = compat_alloc_user_space(sizeof(*args));
-        if (!args)
-                return -EFAULT;
-
-        if (copy_from_user(&args32,
-                           (struct vchiq_dump_mem32 *)arg,
-                           sizeof(args32)))
-                return -EFAULT;
-
-        if (put_user(compat_ptr(args32.virt_addr), &args->virt_addr) ||
-            put_user(args32.num_bytes, &args->num_bytes))
-                return -EFAULT;
-
-        return vchiq_ioctl(file, VCHIQ_IOC_DUMP_PHYS_MEM, (unsigned long)args);
-}
-
-#endif
-
 static long
 vchiq_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
@@ -1707,10 +1650,6 @@ vchiq_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 return vchiq_compat_ioctl_dequeue_message(file, cmd, arg);
         case VCHIQ_IOC_GET_CONFIG32:
                 return vchiq_compat_ioctl_get_config(file, cmd, arg);
-#if defined(CONFIG_BCM2835_VCHIQ_SUPPORT_MEMDUMP)
-        case VCHIQ_IOC_DUMP_PHYS_MEM32:
-                return vchiq_compat_ioctl_dump_phys_mem(file, cmd, arg);
-#endif
         default:
                 return vchiq_ioctl(file, cmd, arg);
         }
@@ -2050,98 +1989,6 @@ vchiq_dump_platform_service_state(void *dump_context, VCHIQ_SERVICE_T *service)
 
 /****************************************************************************
 *
-*   dump_user_mem
-*
-***************************************************************************/
-
-#if defined(CONFIG_BCM2835_VCHIQ_SUPPORT_MEMDUMP)
-
-static void
-dump_phys_mem(void *virt_addr, u32 num_bytes)
-{
-        int            rc;
-        u8            *end_virt_addr = virt_addr + num_bytes;
-        int            num_pages;
-        int            offset;
-        int            end_offset;
-        int            page_idx;
-        int            prev_idx;
-        struct page   *page;
-        struct page  **pages;
-        u8            *kmapped_virt_ptr;
-
-        /* Align virt_addr and end_virt_addr to 16 byte boundaries. */
-
-        virt_addr = (void *)((unsigned long)virt_addr & ~0x0fuL);
-        end_virt_addr = (void *)(((unsigned long)end_virt_addr + 15uL) &
-                ~0x0fuL);
-
-        offset = (int)(long)virt_addr & (PAGE_SIZE - 1);
-        end_offset = (int)(long)end_virt_addr & (PAGE_SIZE - 1);
-
-        num_pages = DIV_ROUND_UP(offset + num_bytes, PAGE_SIZE);
-
-        pages = kmalloc(sizeof(struct page *) * num_pages, GFP_KERNEL);
-        if (!pages) {
-                vchiq_log_error(vchiq_arm_log_level,
-                        "Unable to allocation memory for %d pages\n",
-                        num_pages);
-                return;
-        }
-
-        down_read(&current->mm->mmap_sem);
-        rc = get_user_pages(
-                (unsigned long)virt_addr, /* start */
-                num_pages,                /* len */
-                0,                        /* gup_flags */
-                pages,                    /* pages (array of page pointers) */
-                NULL);                    /* vmas */
-        up_read(&current->mm->mmap_sem);
-
-        prev_idx = -1;
-        page = NULL;
-
-        if (rc < 0) {
-                vchiq_log_error(vchiq_arm_log_level,
-                                "Failed to get user pages: %d\n", rc);
-                goto out;
-        }
-
-        while (offset < end_offset) {
-                int page_offset = offset % PAGE_SIZE;
-
-                page_idx = offset / PAGE_SIZE;
-                if (page_idx != prev_idx) {
-                        if (page != NULL)
-                                kunmap(page);
-                        page = pages[page_idx];
-                        kmapped_virt_ptr = kmap(page);
-                        prev_idx = page_idx;
-                }
-
-                if (vchiq_arm_log_level >= VCHIQ_LOG_TRACE)
-                        vchiq_log_dump_mem("ph",
-                                (u32)(unsigned long)&kmapped_virt_ptr[
-                                        page_offset],
-                                &kmapped_virt_ptr[page_offset], 16);
-
-                offset += 16;
-        }
-
-out:
-        if (page != NULL)
-                kunmap(page);
-
-        for (page_idx = 0; page_idx < num_pages; page_idx++)
-                put_page(pages[page_idx]);
-
-        kfree(pages);
-}
-
-#endif
-
-/****************************************************************************
-*
 *   vchiq_read
 *
 ***************************************************************************/
@@ -2307,8 +2154,6 @@ exit:
         return 0;
 }
 
-
-
 VCHIQ_STATUS_T
 vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state)
 {
@@ -2339,8 +2184,9 @@ vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state)
 
                 arm_state->suspend_timer_timeout = SUSPEND_TIMER_TIMEOUT_MS;
                 arm_state->suspend_timer_running = 0;
-                setup_timer(&arm_state->suspend_timer, suspend_timer_callback,
-                            (unsigned long)(state));
+                arm_state->state = state;
+                timer_setup(&arm_state->suspend_timer, suspend_timer_callback,
+                            0);
 
                 arm_state->first_connect = 0;
 
@@ -2469,7 +2315,6 @@ set_resume_state(VCHIQ_ARM_STATE_T *arm_state,
         }
 }
 
-
 /* should be called with the write lock held */
 inline void
 start_suspend_timer(VCHIQ_ARM_STATE_T *arm_state)
@@ -2589,7 +2434,6 @@ vchiq_arm_vcsuspend(VCHIQ_STATE_T *state)
         vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
         status = VCHIQ_SUCCESS;
 
-
         switch (arm_state->vc_suspend_state) {
         case VC_SUSPEND_REQUESTED:
                 vchiq_log_info(vchiq_susp_log_level, "%s: suspend already "
@@ -2654,7 +2498,6 @@ out:
         return;
 }
 
-
 static void
 output_timeout_error(VCHIQ_STATE_T *state)
 {
@@ -2834,7 +2677,6 @@ out:
         return;
 }
 
-
 int
 vchiq_arm_allow_resume(VCHIQ_STATE_T *state)
 {
@@ -2996,7 +2838,6 @@ vchiq_use_internal(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
                         "%s %s count %d, state count %d",
                         __func__, entity, *entity_uc, local_uc);
 
-
         write_unlock_bh(&arm_state->susp_res_lock);
 
         /* Completion is in a done state when we're not suspended, so this won't
@@ -3177,18 +3018,14 @@ vchiq_instance_set_trace(VCHIQ_INSTANCE_T instance, int trace)
         instance->trace = (trace != 0);
 }
 
-static void suspend_timer_callback(unsigned long context)
+static void suspend_timer_callback(struct timer_list *t)
 {
-        VCHIQ_STATE_T *state = (VCHIQ_STATE_T *)context;
-        VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
+        VCHIQ_ARM_STATE_T *arm_state = from_timer(arm_state, t, suspend_timer);
+        VCHIQ_STATE_T *state = arm_state->state;
 
-        if (!arm_state)
-                goto out;
         vchiq_log_info(vchiq_susp_log_level,
                 "%s - suspend timer expired - check suspend", __func__);
         vchiq_check_suspend(state);
-out:
-        return;
 }
 
 VCHIQ_STATUS_T
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
index bfbd81d9db33..40bb0c63b1a9 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
@@ -42,7 +42,6 @@
 #include "vchiq_core.h"
 #include "vchiq_debugfs.h"
 
-
 enum vc_suspend_status {
         VC_SUSPEND_FORCE_CANCELED = -3, /* Force suspend canceled, too busy */
         VC_SUSPEND_REJECTED = -2,  /* Videocore rejected suspend request */
@@ -61,15 +60,12 @@ enum vc_resume_status {
         VC_RESUME_RESUMED      /* Videocore resumed successfully (active) */
 };
 
-
 enum USE_TYPE_E {
         USE_TYPE_SERVICE,
         USE_TYPE_SERVICE_NO_RESUME,
         USE_TYPE_VCHIQ
 };
 
-
-
 typedef struct vchiq_arm_state_struct {
         /* Keepalive-related data */
         struct task_struct *ka_thread;
@@ -87,6 +83,7 @@ typedef struct vchiq_arm_state_struct {
 
         unsigned int wake_address;
 
+        VCHIQ_STATE_T *state;
         struct timer_list suspend_timer;
         int suspend_timer_timeout;
         int suspend_timer_running;
@@ -216,5 +213,4 @@ set_resume_state(VCHIQ_ARM_STATE_T *arm_state,
 extern void
 start_suspend_timer(VCHIQ_ARM_STATE_T *arm_state);
 
-
 #endif /* VCHIQ_ARM_H */
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 486be990d7fc..ecff92bae200 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -130,7 +130,6 @@ static const char *const conn_state_names[] = {
         "RESUME_TIMEOUT"
 };
 
-
 static void
 release_message_sync(VCHIQ_STATE_T *state, VCHIQ_HEADER_T *header);
 
@@ -2168,7 +2167,6 @@ slot_handler_func(void *v)
                                 break;
                         }
 
-
                 }
 
                 DEBUG_TRACE(SLOT_HANDLER_LINE);
@@ -2177,7 +2175,6 @@ slot_handler_func(void *v)
         return 0;
 }
 
-
 /* Called by the recycle thread */
 static int
 recycle_func(void *v)
@@ -2193,7 +2190,6 @@ recycle_func(void *v)
         return 0;
 }
 
-
 /* Called by the sync thread */
 static int
 sync_func(void *v)
@@ -2301,7 +2297,6 @@ sync_func(void *v)
         return 0;
 }
 
-
 static void
 init_bulk_queue(VCHIQ_BULK_QUEUE_T *queue)
 {
@@ -2312,14 +2307,12 @@ init_bulk_queue(VCHIQ_BULK_QUEUE_T *queue)
         queue->remove = 0;
 }
 
-
 inline const char *
 get_conn_state_name(VCHIQ_CONNSTATE_T conn_state)
 {
         return conn_state_names[conn_state];
 }
 
-
 VCHIQ_SLOT_ZERO_T *
 vchiq_init_slots(void *mem_base, int mem_size)
 {
@@ -2958,8 +2951,7 @@ vchiq_close_service_internal(VCHIQ_SERVICE_T *service, int close_recvd)
 
         case VCHIQ_SRVSTATE_OPENSYNC:
                 mutex_lock(&state->sync_mutex);
-                /* Drop through */
-
+                /* fall through */
         case VCHIQ_SRVSTATE_OPEN:
                 if (state->is_master || close_recvd) {
                         if (!do_abort_bulks(service))
@@ -3296,7 +3288,6 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
         return status;
 }
 
-
 /* This function may be called by kernel threads or user threads.
  * User threads may receive VCHIQ_RETRY to indicate that a signal has been
  * received and the call should be retried after being returned to user
@@ -3876,7 +3867,6 @@ vchiq_dump_service_state(void *dump_context, VCHIQ_SERVICE_T *service)
                 vchiq_dump_platform_service_state(dump_context, service);
 }
 
-
 void
 vchiq_loud_error_header(void)
 {
@@ -3901,7 +3891,6 @@ vchiq_loud_error_footer(void)
                 "================");
 }
 
-
 VCHIQ_STATUS_T vchiq_send_remote_use(VCHIQ_STATE_T *state)
 {
         VCHIQ_STATUS_T status = VCHIQ_RETRY;
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
index 9e164652548a..afc1d8144a84 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -702,7 +702,6 @@ vchiq_platform_handle_timeout(VCHIQ_STATE_T *state);
 extern void
 vchiq_set_conn_state(VCHIQ_STATE_T *state, VCHIQ_CONNSTATE_T newstate);
 
-
 extern void
 vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,
         size_t numBytes);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
index 9367a9a5aa3c..766b4fe5f32c 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
@@ -32,7 +32,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include <linux/debugfs.h>
 #include "vchiq_core.h"
 #include "vchiq_arm.h"
@@ -52,7 +51,6 @@
 #define VCHIQ_LOG_INFO_STR    "info"
 #define VCHIQ_LOG_TRACE_STR   "trace"
 
-
 /* Top-level debug info */
 struct vchiq_debugfs_info {
         /* Global 'vchiq' debugfs entry used by all instances */
@@ -316,7 +314,6 @@ void vchiq_debugfs_remove_instance(VCHIQ_INSTANCE_T instance)
         debugfs_remove_recursive(node->dentry);
 }
 
-
 int vchiq_debugfs_init(void)
 {
         BUG_ON(debugfs_info.vchiq_cfg_dir != NULL);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
index 8af95fc361ed..d465e1cf5db9 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -41,14 +41,14 @@
 
 #define vchiq_status_to_vchi(status) ((int32_t)status)
 
-typedef struct {
+struct shim_service {
         VCHIQ_SERVICE_HANDLE_T handle;
 
         VCHIU_QUEUE_T queue;
 
         VCHI_CALLBACK_T callback;
         void *callback_param;
-} SHIM_SERVICE_T;
+};
 
 /* ----------------------------------------------------------------------
  * return pointer to the mphi message driver function table
@@ -84,7 +84,6 @@ VCHI_CONNECTION_T *vchi_create_connection(
  *             void **data,
  *             uint32_t *msg_size,
 
-
  *             VCHI_FLAGS_T flags
  *
  * Description: Routine to return a pointer to the current message (to allow in
@@ -99,7 +98,7 @@ int32_t vchi_msg_peek(VCHI_SERVICE_HANDLE_T handle,
         uint32_t *msg_size,
         VCHI_FLAGS_T flags)
 {
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
         VCHIQ_HEADER_T *header;
 
         WARN_ON((flags != VCHI_FLAGS_NONE) &&
@@ -131,7 +130,7 @@ EXPORT_SYMBOL(vchi_msg_peek);
  ***********************************************************/
 int32_t vchi_msg_remove(VCHI_SERVICE_HANDLE_T handle)
 {
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
         VCHIQ_HEADER_T *header;
 
         header = vchiu_queue_pop(&service->queue);
@@ -163,7 +162,7 @@ int32_t vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle,
         void *context,
         uint32_t data_size)
 {
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
         VCHIQ_STATUS_T status;
 
         while (1) {
@@ -262,7 +261,7 @@ int32_t vchi_bulk_queue_receive(VCHI_SERVICE_HANDLE_T handle,
         VCHI_FLAGS_T flags,
         void *bulk_handle)
 {
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
         VCHIQ_BULK_MODE_T mode;
         VCHIQ_STATUS_T status;
 
@@ -322,7 +321,7 @@ int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle,
         VCHI_FLAGS_T flags,
         void *bulk_handle)
 {
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
         VCHIQ_BULK_MODE_T mode;
         VCHIQ_STATUS_T status;
 
@@ -384,7 +383,7 @@ int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle,
         uint32_t *actual_msg_size,
         VCHI_FLAGS_T flags)
 {
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
         VCHIQ_HEADER_T *header;
 
         WARN_ON((flags != VCHI_FLAGS_NONE) &&
@@ -458,7 +457,7 @@ int32_t vchi_msg_hold(VCHI_SERVICE_HANDLE_T handle,
         VCHI_FLAGS_T flags,
         VCHI_HELD_MSG_T *message_handle)
 {
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
         VCHIQ_HEADER_T *header;
 
         WARN_ON((flags != VCHI_FLAGS_NONE) &&
@@ -541,7 +540,6 @@ int32_t vchi_connect(VCHI_CONNECTION_T **connections,
 }
 EXPORT_SYMBOL(vchi_connect);
 
-
 /***********************************************************
  * Name: vchi_disconnect
  *
@@ -561,7 +559,6 @@ int32_t vchi_disconnect(VCHI_INSTANCE_T instance_handle)
 }
 EXPORT_SYMBOL(vchi_disconnect);
 
-
 /***********************************************************
  * Name: vchi_service_open
  * Name: vchi_service_create
@@ -579,8 +576,8 @@ EXPORT_SYMBOL(vchi_disconnect);
 static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason,
         VCHIQ_HEADER_T *header, VCHIQ_SERVICE_HANDLE_T handle, void *bulk_user)
 {
-        SHIM_SERVICE_T *service =
-                (SHIM_SERVICE_T *)VCHIQ_GET_SERVICE_USERDATA(handle);
+        struct shim_service *service =
+                (struct shim_service *)VCHIQ_GET_SERVICE_USERDATA(handle);
 
         if (!service->callback)
                 goto release;
@@ -637,10 +634,10 @@ done:
         return VCHIQ_SUCCESS;
 }
 
-static SHIM_SERVICE_T *service_alloc(VCHIQ_INSTANCE_T instance,
+static struct shim_service *service_alloc(VCHIQ_INSTANCE_T instance,
         SERVICE_CREATION_T *setup)
 {
-        SHIM_SERVICE_T *service = kzalloc(sizeof(SHIM_SERVICE_T), GFP_KERNEL);
+        struct shim_service *service = kzalloc(sizeof(struct shim_service), GFP_KERNEL);
 
         (void)instance;
 
@@ -657,7 +654,7 @@ static SHIM_SERVICE_T *service_alloc(VCHIQ_INSTANCE_T instance,
         return service;
 }
 
-static void service_free(SHIM_SERVICE_T *service)
+static void service_free(struct shim_service *service)
 {
         if (service) {
                 vchiu_queue_delete(&service->queue);
@@ -670,7 +667,7 @@ int32_t vchi_service_open(VCHI_INSTANCE_T instance_handle,
         VCHI_SERVICE_HANDLE_T *handle)
 {
         VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
-        SHIM_SERVICE_T *service = service_alloc(instance, setup);
+        struct shim_service *service = service_alloc(instance, setup);
 
         *handle = (VCHI_SERVICE_HANDLE_T)service;
 
@@ -703,7 +700,7 @@ int32_t vchi_service_create(VCHI_INSTANCE_T instance_handle,
         VCHI_SERVICE_HANDLE_T *handle)
 {
         VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
-        SHIM_SERVICE_T *service = service_alloc(instance, setup);
+        struct shim_service *service = service_alloc(instance, setup);
 
         *handle = (VCHI_SERVICE_HANDLE_T)service;
 
@@ -733,7 +730,7 @@ EXPORT_SYMBOL(vchi_service_create);
 int32_t vchi_service_close(const VCHI_SERVICE_HANDLE_T handle)
 {
         int32_t ret = -1;
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
 
         if (service) {
                 VCHIQ_STATUS_T status = vchiq_close_service(service->handle);
@@ -751,7 +748,7 @@ EXPORT_SYMBOL(vchi_service_close);
 int32_t vchi_service_destroy(const VCHI_SERVICE_HANDLE_T handle)
 {
         int32_t ret = -1;
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
 
         if (service) {
                 VCHIQ_STATUS_T status = vchiq_remove_service(service->handle);
@@ -772,7 +769,7 @@ int32_t vchi_service_set_option(const VCHI_SERVICE_HANDLE_T handle,
                                 int value)
 {
         int32_t ret = -1;
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
         VCHIQ_SERVICE_OPTION_T vchiq_option;
 
         switch (option) {
@@ -801,7 +798,7 @@ EXPORT_SYMBOL(vchi_service_set_option);
 int32_t vchi_get_peer_version(const VCHI_SERVICE_HANDLE_T handle, short *peer_version)
 {
         int32_t ret = -1;
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
 
         if (service)
         {
@@ -828,7 +825,7 @@ int32_t vchi_service_use(const VCHI_SERVICE_HANDLE_T handle)
 {
         int32_t ret = -1;
 
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
         if (service)
                 ret = vchiq_status_to_vchi(vchiq_use_service(service->handle));
         return ret;
@@ -849,7 +846,7 @@ int32_t vchi_service_release(const VCHI_SERVICE_HANDLE_T handle)
 {
         int32_t ret = -1;
 
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
+        struct shim_service *service = (struct shim_service *)handle;
         if (service)
                 ret = vchiq_status_to_vchi(
                         vchiq_release_service(service->handle));
diff --git a/drivers/staging/vme/devices/Kconfig b/drivers/staging/vme/devices/Kconfig
index 1d2ff0cc41f1..c548dd8c91e1 100644
--- a/drivers/staging/vme/devices/Kconfig
+++ b/drivers/staging/vme/devices/Kconfig
@@ -10,16 +10,3 @@ config VME_USER
 
           To compile this driver as a module, choose M here. The module will
           be called vme_user. If unsure, say N.
-
-config VME_PIO2
-        tristate "GE PIO2 VME"
-        depends on STAGING && GPIOLIB
-        help
-          Say Y here to include support for the GE PIO2. The PIO2 is a 6U VME
-          slave card, implementing 32 solid-state relay switched IO lines, in
-          4 groups of 8. Each bank of IO lines is built to function as input,
-          output or both depending on the variant of the card.
-
-          To compile this driver as a module, choose M here. The module will
-          be called vme_pio2. If unsure, say N.
-
diff --git a/drivers/staging/vme/devices/Makefile b/drivers/staging/vme/devices/Makefile
index 172512cb5dbf..459742a75283 100644
--- a/drivers/staging/vme/devices/Makefile
+++ b/drivers/staging/vme/devices/Makefile
@@ -3,6 +3,3 @@
 #
 
 obj-$(CONFIG_VME_USER)          += vme_user.o
-
-vme_pio2-objs   := vme_pio2_cntr.o vme_pio2_gpio.o vme_pio2_core.o
-obj-$(CONFIG_VME_PIO2)         += vme_pio2.o
diff --git a/drivers/staging/vme/devices/vme_pio2.h b/drivers/staging/vme/devices/vme_pio2.h
deleted file mode 100644
index ac4a4bad4091..000000000000
--- a/drivers/staging/vme/devices/vme_pio2.h
+++ /dev/null
@@ -1,244 +0,0 @@
-#ifndef _VME_PIO2_H_
-#define _VME_PIO2_H_
-
-#define PIO2_CARDS_MAX                  32
-
-#define PIO2_VARIANT_LENGTH             5
-
-#define PIO2_NUM_CHANNELS               32
-#define PIO2_NUM_IRQS                   11
-#define PIO2_NUM_CNTRS                  6
-
-#define PIO2_REGS_SIZE                  0x40
-
-#define PIO2_REGS_DATA0                 0x0
-#define PIO2_REGS_DATA1                 0x1
-#define PIO2_REGS_DATA2                 0x2
-#define PIO2_REGS_DATA3                 0x3
-
-static const int PIO2_REGS_DATA[4] = { PIO2_REGS_DATA0, PIO2_REGS_DATA1,
-                                        PIO2_REGS_DATA2, PIO2_REGS_DATA3 };
-
-#define PIO2_REGS_INT_STAT0             0x8
-#define PIO2_REGS_INT_STAT1             0x9
-#define PIO2_REGS_INT_STAT2             0xa
-#define PIO2_REGS_INT_STAT3             0xb
-
-static const int PIO2_REGS_INT_STAT[4] = { PIO2_REGS_INT_STAT0,
-                                        PIO2_REGS_INT_STAT1,
-                                        PIO2_REGS_INT_STAT2,
-                                        PIO2_REGS_INT_STAT3 };
-
-#define PIO2_REGS_INT_STAT_CNTR         0xc
-#define PIO2_REGS_INT_MASK0             0x10
-#define PIO2_REGS_INT_MASK1             0x11
-#define PIO2_REGS_INT_MASK2             0x12
-#define PIO2_REGS_INT_MASK3             0x13
-#define PIO2_REGS_INT_MASK4             0x14
-#define PIO2_REGS_INT_MASK5             0x15
-#define PIO2_REGS_INT_MASK6             0x16
-#define PIO2_REGS_INT_MASK7             0x17
-
-static const int PIO2_REGS_INT_MASK[8] = { PIO2_REGS_INT_MASK0,
-                                        PIO2_REGS_INT_MASK1,
-                                        PIO2_REGS_INT_MASK2,
-                                        PIO2_REGS_INT_MASK3,
-                                        PIO2_REGS_INT_MASK4,
-                                        PIO2_REGS_INT_MASK5,
-                                        PIO2_REGS_INT_MASK6,
-                                        PIO2_REGS_INT_MASK7 };
-
-#define PIO2_REGS_CTRL                  0x18
-#define PIO2_REGS_VME_VECTOR            0x19
-#define PIO2_REGS_CNTR0                 0x20
-#define PIO2_REGS_CNTR1                 0x22
-#define PIO2_REGS_CNTR2                 0x24
-#define PIO2_REGS_CTRL_WRD0             0x26
-#define PIO2_REGS_CNTR3                 0x28
-#define PIO2_REGS_CNTR4                 0x2a
-#define PIO2_REGS_CNTR5                 0x2c
-#define PIO2_REGS_CTRL_WRD1             0x2e
-
-#define PIO2_REGS_ID                    0x30
-
-/* PIO2_REGS_DATAx (0x0 - 0x3) */
-
-static const int PIO2_CHANNEL_BANK[32] = { 0, 0, 0, 0, 0, 0, 0, 0,
-                                        1, 1, 1, 1, 1, 1, 1, 1,
-                                        2, 2, 2, 2, 2, 2, 2, 2,
-                                        3, 3, 3, 3, 3, 3, 3, 3 };
-
-#define PIO2_CHANNEL0_BIT               BIT(0)
-#define PIO2_CHANNEL1_BIT               BIT(1)
-#define PIO2_CHANNEL2_BIT               BIT(2)
-#define PIO2_CHANNEL3_BIT               BIT(3)
-#define PIO2_CHANNEL4_BIT               BIT(4)
-#define PIO2_CHANNEL5_BIT               BIT(5)
-#define PIO2_CHANNEL6_BIT               BIT(6)
-#define PIO2_CHANNEL7_BIT               BIT(7)
-#define PIO2_CHANNEL8_BIT               BIT(0)
-#define PIO2_CHANNEL9_BIT               BIT(1)
-#define PIO2_CHANNEL10_BIT              BIT(2)
-#define PIO2_CHANNEL11_BIT              BIT(3)
-#define PIO2_CHANNEL12_BIT              BIT(4)
-#define PIO2_CHANNEL13_BIT              BIT(5)
-#define PIO2_CHANNEL14_BIT              BIT(6)
-#define PIO2_CHANNEL15_BIT              BIT(7)
-#define PIO2_CHANNEL16_BIT              BIT(0)
-#define PIO2_CHANNEL17_BIT              BIT(1)
-#define PIO2_CHANNEL18_BIT              BIT(2)
-#define PIO2_CHANNEL19_BIT              BIT(3)
-#define PIO2_CHANNEL20_BIT              BIT(4)
-#define PIO2_CHANNEL21_BIT              BIT(5)
-#define PIO2_CHANNEL22_BIT              BIT(6)
-#define PIO2_CHANNEL23_BIT              BIT(7)
-#define PIO2_CHANNEL24_BIT              BIT(0)
-#define PIO2_CHANNEL25_BIT              BIT(1)
-#define PIO2_CHANNEL26_BIT              BIT(2)
-#define PIO2_CHANNEL27_BIT              BIT(3)
-#define PIO2_CHANNEL28_BIT              BIT(4)
-#define PIO2_CHANNEL29_BIT              BIT(5)
-#define PIO2_CHANNEL30_BIT              BIT(6)
-#define PIO2_CHANNEL31_BIT              BIT(7)
-
-static const int PIO2_CHANNEL_BIT[32] = { PIO2_CHANNEL0_BIT, PIO2_CHANNEL1_BIT,
-                                        PIO2_CHANNEL2_BIT, PIO2_CHANNEL3_BIT,
-                                        PIO2_CHANNEL4_BIT, PIO2_CHANNEL5_BIT,
-                                        PIO2_CHANNEL6_BIT, PIO2_CHANNEL7_BIT,
-                                        PIO2_CHANNEL8_BIT, PIO2_CHANNEL9_BIT,
-                                        PIO2_CHANNEL10_BIT, PIO2_CHANNEL11_BIT,
-                                        PIO2_CHANNEL12_BIT, PIO2_CHANNEL13_BIT,
-                                        PIO2_CHANNEL14_BIT, PIO2_CHANNEL15_BIT,
-                                        PIO2_CHANNEL16_BIT, PIO2_CHANNEL17_BIT,
-                                        PIO2_CHANNEL18_BIT, PIO2_CHANNEL19_BIT,
-                                        PIO2_CHANNEL20_BIT, PIO2_CHANNEL21_BIT,
-                                        PIO2_CHANNEL22_BIT, PIO2_CHANNEL23_BIT,
-                                        PIO2_CHANNEL24_BIT, PIO2_CHANNEL25_BIT,
-                                        PIO2_CHANNEL26_BIT, PIO2_CHANNEL27_BIT,
-                                        PIO2_CHANNEL28_BIT, PIO2_CHANNEL29_BIT,
-                                        PIO2_CHANNEL30_BIT, PIO2_CHANNEL31_BIT
-                                        };
-
-/* PIO2_REGS_INT_STAT_CNTR (0xc) */
-#define PIO2_COUNTER0                   BIT(0)
-#define PIO2_COUNTER1                   BIT(1)
-#define PIO2_COUNTER2                   BIT(2)
-#define PIO2_COUNTER3                   BIT(3)
-#define PIO2_COUNTER4                   BIT(4)
-#define PIO2_COUNTER5                   BIT(5)
-
-static const int PIO2_COUNTER[6] = { PIO2_COUNTER0, PIO2_COUNTER1,
-                                        PIO2_COUNTER2, PIO2_COUNTER3,
-                                        PIO2_COUNTER4, PIO2_COUNTER5 };
-
-/* PIO2_REGS_CTRL (0x18) */
-#define PIO2_VME_INT_MASK               0x7
-#define PIO2_LED                        BIT(6)
-#define PIO2_LOOP                       BIT(7)
-
-/* PIO2_REGS_VME_VECTOR (0x19) */
-#define PIO2_VME_VECTOR_SPUR            0x0
-#define PIO2_VME_VECTOR_BANK0           0x1
-#define PIO2_VME_VECTOR_BANK1           0x2
-#define PIO2_VME_VECTOR_BANK2           0x3
-#define PIO2_VME_VECTOR_BANK3           0x4
-#define PIO2_VME_VECTOR_CNTR0           0x5
-#define PIO2_VME_VECTOR_CNTR1           0x6
-#define PIO2_VME_VECTOR_CNTR2           0x7
-#define PIO2_VME_VECTOR_CNTR3           0x8
-#define PIO2_VME_VECTOR_CNTR4           0x9
-#define PIO2_VME_VECTOR_CNTR5           0xa
-
-#define PIO2_VME_VECTOR_MASK            0xf0
-
-static const int PIO2_VECTOR_BANK[4] = { PIO2_VME_VECTOR_BANK0,
-                                        PIO2_VME_VECTOR_BANK1,
-                                        PIO2_VME_VECTOR_BANK2,
-                                        PIO2_VME_VECTOR_BANK3 };
-
-static const int PIO2_VECTOR_CNTR[6] = { PIO2_VME_VECTOR_CNTR0,
-                                        PIO2_VME_VECTOR_CNTR1,
-                                        PIO2_VME_VECTOR_CNTR2,
-                                        PIO2_VME_VECTOR_CNTR3,
-                                        PIO2_VME_VECTOR_CNTR4,
-                                        PIO2_VME_VECTOR_CNTR5 };
-
-/* PIO2_REGS_CNTRx (0x20 - 0x24 & 0x28 - 0x2c) */
-
-static const int PIO2_CNTR_DATA[6] = { PIO2_REGS_CNTR0, PIO2_REGS_CNTR1,
-                                        PIO2_REGS_CNTR2, PIO2_REGS_CNTR3,
-                                        PIO2_REGS_CNTR4, PIO2_REGS_CNTR5 };
-
-/* PIO2_REGS_CTRL_WRDx (0x26 & 0x2e) */
-
-static const int PIO2_CNTR_CTRL[6] = { PIO2_REGS_CTRL_WRD0,
-                                        PIO2_REGS_CTRL_WRD0,
-                                        PIO2_REGS_CTRL_WRD0,
-                                        PIO2_REGS_CTRL_WRD1,
-                                        PIO2_REGS_CTRL_WRD1,
-                                        PIO2_REGS_CTRL_WRD1 };
-
-#define PIO2_CNTR_SC_DEV0               0
-#define PIO2_CNTR_SC_DEV1               (1 << 6)
-#define PIO2_CNTR_SC_DEV2               (2 << 6)
-#define PIO2_CNTR_SC_RDBACK             (3 << 6)
-
-static const int PIO2_CNTR_SC_DEV[6] = { PIO2_CNTR_SC_DEV0, PIO2_CNTR_SC_DEV1,
-                                        PIO2_CNTR_SC_DEV2, PIO2_CNTR_SC_DEV0,
-                                        PIO2_CNTR_SC_DEV1, PIO2_CNTR_SC_DEV2 };
-
-#define PIO2_CNTR_RW_LATCH              0
-#define PIO2_CNTR_RW_LSB                (1 << 4)
-#define PIO2_CNTR_RW_MSB                (2 << 4)
-#define PIO2_CNTR_RW_BOTH               (3 << 4)
-
-#define PIO2_CNTR_MODE0                 0
-#define PIO2_CNTR_MODE1                 (1 << 1)
-#define PIO2_CNTR_MODE2                 (2 << 1)
-#define PIO2_CNTR_MODE3                 (3 << 1)
-#define PIO2_CNTR_MODE4                 (4 << 1)
-#define PIO2_CNTR_MODE5                 (5 << 1)
-
-#define PIO2_CNTR_BCD                   1
-
-enum pio2_bank_config { NOFIT, INPUT, OUTPUT, BOTH };
-enum pio2_int_config { NONE = 0, LOW2HIGH = 1, HIGH2LOW = 2, EITHER = 4 };
-
-/* Bank configuration structure */
-struct pio2_io_bank {
-        enum pio2_bank_config config;
-        u8 value;
-        enum pio2_int_config irq[8];
-};
-
-/* Counter configuration structure */
-struct pio2_cntr {
-        int mode;
-        int count;
-};
-
-struct pio2_card {
-        int id;
-        int bus;
-        long base;
-        int irq_vector;
-        int irq_level;
-        char variant[6];
-        int led;
-
-        struct vme_dev *vdev;
-        struct vme_resource *window;
-
-        struct gpio_chip gc;
-        struct pio2_io_bank bank[4];
-
-        struct pio2_cntr cntr[6];
-};
-
-int pio2_cntr_reset(struct pio2_card *card);
-
-int pio2_gpio_reset(struct pio2_card *card);
-int pio2_gpio_init(struct pio2_card *card);
-void pio2_gpio_exit(struct pio2_card *card);
-
-#endif /* _VME_PIO2_H_ */
diff --git a/drivers/staging/vme/devices/vme_pio2_cntr.c b/drivers/staging/vme/devices/vme_pio2_cntr.c
deleted file mode 100644
index 486c30c4956f..000000000000
--- a/drivers/staging/vme/devices/vme_pio2_cntr.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * GE PIO2 Counter Driver
- *
- * Author: Martyn Welch <martyn.welch@ge.com>
- * Copyright 2009 GE Intelligent Platforms Embedded Systems, Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- * The PIO-2 has 6 counters, currently this code just disables the interrupts
- * and leaves them alone.
- *
- */
-
-#include <linux/device.h>
-#include <linux/types.h>
-#include <linux/gpio.h>
-#include <linux/vme.h>
-
-#include "vme_pio2.h"
-
-static int pio2_cntr_irq_set(struct pio2_card *card, int id)
-{
-        int retval;
-        u8 data;
-
-        data = PIO2_CNTR_SC_DEV[id] | PIO2_CNTR_RW_BOTH | card->cntr[id].mode;
-        retval = vme_master_write(card->window, &data, 1, PIO2_CNTR_CTRL[id]);
-        if (retval < 0)
-                return retval;
-
-        data = card->cntr[id].count & 0xFF;
-        retval = vme_master_write(card->window, &data, 1, PIO2_CNTR_DATA[id]);
-        if (retval < 0)
-                return retval;
-
-        data = (card->cntr[id].count >> 8) & 0xFF;
-        retval = vme_master_write(card->window, &data, 1, PIO2_CNTR_DATA[id]);
-        if (retval < 0)
-                return retval;
-
-        return 0;
-}
-
-int pio2_cntr_reset(struct pio2_card *card)
-{
-        int i, retval = 0;
-        u8 reg;
-
-        /* Clear down all timers */
-        for (i = 0; i < 6; i++) {
-                card->cntr[i].mode = PIO2_CNTR_MODE5;
-                card->cntr[i].count = 0;
-                retval = pio2_cntr_irq_set(card, i);
-                if (retval < 0)
-                        return retval;
-        }
-
-        /* Ensure all counter interrupts are cleared */
-        do {
-                retval = vme_master_read(card->window, &reg, 1,
-                                         PIO2_REGS_INT_STAT_CNTR);
-                if (retval < 0)
-                        return retval;
-        } while (reg != 0);
-
-        return retval;
-}
-
diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
deleted file mode 100644
index 367535b4b77f..000000000000
--- a/drivers/staging/vme/devices/vme_pio2_core.c
+++ /dev/null
@@ -1,493 +0,0 @@
-/*
- * GE PIO2 6U VME I/O Driver
- *
- * Author: Martyn Welch <martyn.welch@ge.com>
- * Copyright 2009 GE Intelligent Platforms Embedded Systems, Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/device.h>
-#include <linux/ctype.h>
-#include <linux/gpio.h>
-#include <linux/slab.h>
-#include <linux/vme.h>
-
-#include "vme_pio2.h"
-
-static const char driver_name[] = "pio2";
-
-static int bus[PIO2_CARDS_MAX];
-static int bus_num;
-static long base[PIO2_CARDS_MAX];
-static int base_num;
-static int vector[PIO2_CARDS_MAX];
-static int vector_num;
-static int level[PIO2_CARDS_MAX];
-static int level_num;
-static char *variant[PIO2_CARDS_MAX];
-static int variant_num;
-
-static bool loopback;
-
-static int pio2_match(struct vme_dev *);
-static int pio2_probe(struct vme_dev *);
-static int pio2_remove(struct vme_dev *);
-
-static int pio2_get_led(struct pio2_card *card)
-{
-        /* Can't read hardware, state saved in structure */
-        return card->led;
-}
-
-static int pio2_set_led(struct pio2_card *card, int state)
-{
-        u8 reg;
-        int retval;
-
-        reg = card->irq_level;
-
-        /* Register state inverse of led state */
-        if (!state)
-                reg |= PIO2_LED;
-
-        if (loopback)
-                reg |= PIO2_LOOP;
-
-        retval = vme_master_write(card->window, &reg, 1, PIO2_REGS_CTRL);
-        if (retval < 0)
-                return retval;
-
-        card->led = state ? 1 : 0;
-
-        return 0;
-}
-
-static void pio2_int(int level, int vector, void *ptr)
-{
-        int vec, i, channel, retval;
-        u8 reg;
-        struct pio2_card *card  = ptr;
-
-        vec = vector & ~PIO2_VME_VECTOR_MASK;
-
-        switch (vec) {
-        case 0:
-                dev_warn(&card->vdev->dev, "Spurious Interrupt\n");
-                break;
-        case 1:
-        case 2:
-        case 3:
-        case 4:
-                /* Channels 0 to 7 */
-                retval = vme_master_read(card->window, &reg, 1,
-                                         PIO2_REGS_INT_STAT[vec - 1]);
-                if (retval < 0) {
-                        dev_err(&card->vdev->dev,
-                                "Unable to read IRQ status register\n");
-                        return;
-                }
-                for (i = 0; i < 8; i++) {
-                        channel = ((vec - 1) * 8) + i;
-                        if (reg & PIO2_CHANNEL_BIT[channel])
-                                dev_info(&card->vdev->dev,
-                                         "Interrupt on I/O channel %d\n",
-                                         channel);
-                }
-                break;
-        case 5:
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-        case 10:
-                /* Counters are dealt with by their own handler */
-                dev_err(&card->vdev->dev,
-                        "Counter interrupt\n");
-                break;
-        }
-}
-
-/*
- * We return whether this has been successful - this is used in the probe to
- * ensure we have a valid card.
- */
-static int pio2_reset_card(struct pio2_card *card)
-{
-        int retval = 0;
-        u8 data = 0;
-
-        /* Clear main register*/
-        retval = vme_master_write(card->window, &data, 1, PIO2_REGS_CTRL);
-        if (retval < 0)
-                return retval;
-
-        /* Clear VME vector */
-        retval = vme_master_write(card->window, &data, 1, PIO2_REGS_VME_VECTOR);
-        if (retval < 0)
-                return retval;
-
-        /* Reset GPIO */
-        retval = pio2_gpio_reset(card);
-        if (retval < 0)
-                return retval;
-
-        /* Reset counters */
-        retval = pio2_cntr_reset(card);
-        if (retval < 0)
-                return retval;
-
-        return 0;
-}
-
-static struct vme_driver pio2_driver = {
-        .name = driver_name,
-        .match = pio2_match,
-        .probe = pio2_probe,
-        .remove = pio2_remove,
-};
-
-static int __init pio2_init(void)
-{
-        if (bus_num == 0) {
-                pr_err("No cards, skipping registration\n");
-                return -ENODEV;
-        }
-
-        if (bus_num > PIO2_CARDS_MAX) {
-                pr_err("Driver only able to handle %d PIO2 Cards\n",
-                       PIO2_CARDS_MAX);
-                bus_num = PIO2_CARDS_MAX;
-        }
-
-        /* Register the PIO2 driver */
-        return  vme_register_driver(&pio2_driver, bus_num);
-}
-
-static int pio2_match(struct vme_dev *vdev)
-{
-        if (vdev->num >= bus_num) {
-                dev_err(&vdev->dev,
-                        "The enumeration of the VMEbus to which the board is connected must be specified\n");
-                return 0;
-        }
-
-        if (vdev->num >= base_num) {
-                dev_err(&vdev->dev,
-                        "The VME address for the cards registers must be specified\n");
-                return 0;
-        }
-
-        if (vdev->num >= vector_num) {
-                dev_err(&vdev->dev,
-                        "The IRQ vector used by the card must be specified\n");
-                return 0;
-        }
-
-        if (vdev->num >= level_num) {
-                dev_err(&vdev->dev,
-                        "The IRQ level used by the card must be specified\n");
-                return 0;
-        }
-
-        if (vdev->num >= variant_num) {
-                dev_err(&vdev->dev, "The variant of the card must be specified\n");
-                return 0;
-        }
-
-        return 1;
-}
-
-static int pio2_probe(struct vme_dev *vdev)
-{
-        struct pio2_card *card;
-        int retval;
-        int i;
-        u8 reg;
-        int vec;
-
-        card = devm_kzalloc(&vdev->dev, sizeof(*card), GFP_KERNEL);
-        if (!card)
-                return -ENOMEM;
-
-        card->id = vdev->num;
-        card->bus = bus[card->id];
-        card->base = base[card->id];
-        card->irq_vector = vector[card->id];
-        card->irq_level = level[card->id] & PIO2_VME_INT_MASK;
-        strncpy(card->variant, variant[card->id], PIO2_VARIANT_LENGTH);
-        card->vdev = vdev;
-
-        for (i = 0; i < PIO2_VARIANT_LENGTH; i++) {
-                if (!isdigit(card->variant[i])) {
-                        dev_err(&card->vdev->dev, "Variant invalid\n");
-                        return -EINVAL;
-                }
-        }
-
-        /*
-         * Bottom 4 bits of VME interrupt vector used to determine source,
-         * provided vector should only use upper 4 bits.
-         */
-        if (card->irq_vector & ~PIO2_VME_VECTOR_MASK) {
-                dev_err(&card->vdev->dev,
-                        "Invalid VME IRQ Vector, vector must not use lower 4 bits\n");
-                return -EINVAL;
-        }
-
-        /*
-         * There is no way to determine the build variant or whether each bank
-         * is input, output or both at run time. The inputs are also inverted
-         * if configured as both.
-         *
-         * We pass in the board variant and use that to determine the
-         * configuration of the banks.
-         */
-        for (i = 1; i < PIO2_VARIANT_LENGTH; i++) {
-                switch (card->variant[i]) {
-                case '0':
-                        card->bank[i - 1].config = NOFIT;
-                        break;
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                        card->bank[i - 1].config = INPUT;
-                        break;
-                case '5':
-                        card->bank[i - 1].config = OUTPUT;
-                        break;
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                        card->bank[i - 1].config = BOTH;
-                        break;
-                }
-        }
-
-        /* Get a master window and position over regs */
-        card->window = vme_master_request(vdev, VME_A24, VME_SCT, VME_D16);
-        if (!card->window) {
-                dev_err(&card->vdev->dev,
-                        "Unable to assign VME master resource\n");
-                return -EIO;
-        }
-
-        retval = vme_master_set(card->window, 1, card->base, 0x10000, VME_A24,
-                                VME_SCT | VME_USER | VME_DATA, VME_D16);
-        if (retval) {
-                dev_err(&card->vdev->dev,
-                        "Unable to configure VME master resource\n");
-                goto err_set;
-        }
-
-        /*
-         * There is also no obvious register which we can probe to determine
-         * whether the provided base is valid. If we can read the "ID Register"
-         * offset and the reset function doesn't error, assume we have a valid
-         * location.
-         */
-        retval = vme_master_read(card->window, &reg, 1, PIO2_REGS_ID);
-        if (retval < 0) {
-                dev_err(&card->vdev->dev, "Unable to read from device\n");
-                goto err_read;
-        }
-
-        dev_dbg(&card->vdev->dev, "ID Register:%x\n", reg);
-
-        /*
-         * Ensure all the I/O is cleared. We can't read back the states, so
-         * this is the only method we have to ensure that the I/O is in a known
-         * state.
-         */
-        retval = pio2_reset_card(card);
-        if (retval) {
-                dev_err(&card->vdev->dev,
-                        "Failed to reset card, is location valid?\n");
-                retval = -ENODEV;
-                goto err_reset;
-        }
-
-        /* Configure VME Interrupts */
-        reg = card->irq_level;
-        if (pio2_get_led(card))
-                reg |= PIO2_LED;
-        if (loopback)
-                reg |= PIO2_LOOP;
-        retval = vme_master_write(card->window, &reg, 1, PIO2_REGS_CTRL);
-        if (retval < 0)
-                return retval;
-
-        /* Set VME vector */
-        retval = vme_master_write(card->window, &card->irq_vector, 1,
-                                  PIO2_REGS_VME_VECTOR);
-        if (retval < 0)
-                return retval;
-
-        /* Attach spurious interrupt handler. */
-        vec = card->irq_vector | PIO2_VME_VECTOR_SPUR;
-
-        retval = vme_irq_request(vdev, card->irq_level, vec,
-                                 &pio2_int, card);
-        if (retval < 0) {
-                dev_err(&card->vdev->dev,
-                        "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
-                         vec, card->irq_level);
-                goto err_irq;
-        }
-
-        /* Attach GPIO interrupt handlers. */
-        for (i = 0; i < 4; i++) {
-                vec = card->irq_vector | PIO2_VECTOR_BANK[i];
-
-                retval = vme_irq_request(vdev, card->irq_level, vec,
-                                         &pio2_int, card);
-                if (retval < 0) {
-                        dev_err(&card->vdev->dev,
-                                "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
-                                 vec, card->irq_level);
-                        goto err_gpio_irq;
-                }
-        }
-
-        /* Attach counter interrupt handlers. */
-        for (i = 0; i < 6; i++) {
-                vec = card->irq_vector | PIO2_VECTOR_CNTR[i];
-
-                retval = vme_irq_request(vdev, card->irq_level, vec,
-                                         &pio2_int, card);
-                if (retval < 0) {
-                        dev_err(&card->vdev->dev,
-                                "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
-                                vec, card->irq_level);
-                        goto err_cntr_irq;
-                }
-        }
-
-        /* Register IO */
-        retval = pio2_gpio_init(card);
-        if (retval < 0) {
-                dev_err(&card->vdev->dev,
-                        "Unable to register with GPIO framework\n");
-                goto err_gpio;
-        }
-
-        /* Set LED - This also sets interrupt level */
-        retval = pio2_set_led(card, 0);
-        if (retval < 0) {
-                dev_err(&card->vdev->dev, "Unable to set LED\n");
-                goto err_led;
-        }
-
-        dev_set_drvdata(&card->vdev->dev, card);
-
-        dev_info(&card->vdev->dev,
-                 "PIO2 (variant %s) configured at 0x%lx\n", card->variant,
-                card->base);
-
-        return 0;
-
-err_led:
-        pio2_gpio_exit(card);
-err_gpio:
-        i = 6;
-err_cntr_irq:
-        while (i > 0) {
-                i--;
-                vec = card->irq_vector | PIO2_VECTOR_CNTR[i];
-                vme_irq_free(vdev, card->irq_level, vec);
-        }
-
-        i = 4;
-err_gpio_irq:
-        while (i > 0) {
-                i--;
-                vec = card->irq_vector | PIO2_VECTOR_BANK[i];
-                vme_irq_free(vdev, card->irq_level, vec);
-        }
-
-        vec = (card->irq_vector & PIO2_VME_VECTOR_MASK) | PIO2_VME_VECTOR_SPUR;
-        vme_irq_free(vdev, card->irq_level, vec);
-err_irq:
-         pio2_reset_card(card);
-err_reset:
-err_read:
-        vme_master_set(card->window, 0, 0, 0, VME_A16, 0, VME_D16);
-err_set:
-        vme_master_free(card->window);
-        return retval;
-}
-
-static int pio2_remove(struct vme_dev *vdev)
-{
-        int vec;
-        int i;
-
-        struct pio2_card *card = dev_get_drvdata(&vdev->dev);
-
-        pio2_gpio_exit(card);
-
-        for (i = 0; i < 6; i++) {
-                vec = card->irq_vector | PIO2_VECTOR_CNTR[i];
-                vme_irq_free(vdev, card->irq_level, vec);
-        }
-
-        for (i = 0; i < 4; i++) {
-                vec = card->irq_vector | PIO2_VECTOR_BANK[i];
-                vme_irq_free(vdev, card->irq_level, vec);
-        }
-
-        vec = (card->irq_vector & PIO2_VME_VECTOR_MASK) | PIO2_VME_VECTOR_SPUR;
-        vme_irq_free(vdev, card->irq_level, vec);
-
-        pio2_reset_card(card);
-
-        vme_master_set(card->window, 0, 0, 0, VME_A16, 0, VME_D16);
-
-        vme_master_free(card->window);
-
-        return 0;
-}
-
-static void __exit pio2_exit(void)
-{
-        vme_unregister_driver(&pio2_driver);
-}
-
-/* These are required for each board */
-MODULE_PARM_DESC(bus, "Enumeration of VMEbus to which the board is connected");
-module_param_hw_array(bus, int, other, &bus_num, 0444);
-
-MODULE_PARM_DESC(base, "Base VME address for PIO2 Registers");
-module_param_hw_array(base, long, other, &base_num, 0444);
-
-MODULE_PARM_DESC(vector, "VME IRQ Vector (Lower 4 bits masked)");
-module_param_hw_array(vector, int, other, &vector_num, 0444);
-
-MODULE_PARM_DESC(level, "VME IRQ Level");
-module_param_hw_array(level, int, other, &level_num, 0444);
-
-MODULE_PARM_DESC(variant, "Last 4 characters of PIO2 board variant");
-module_param_array(variant, charp, &variant_num, 0444);
-
-/* This is for debugging */
-MODULE_PARM_DESC(loopback, "Enable loopback mode on all cards");
-module_param(loopback, bool, 0444);
-
-MODULE_DESCRIPTION("GE PIO2 6U VME I/O Driver");
-MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com");
-MODULE_LICENSE("GPL");
-
-module_init(pio2_init);
-module_exit(pio2_exit);
-
diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
deleted file mode 100644
index ba9fe3bc2642..000000000000
--- a/drivers/staging/vme/devices/vme_pio2_gpio.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * GE PIO2 GPIO Driver
- *
- * Author: Martyn Welch <martyn.welch@ge.com>
- * Copyright 2009 GE Intelligent Platforms Embedded Systems, Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/ctype.h>
-#include <linux/gpio/driver.h>
-#include <linux/slab.h>
-#include <linux/vme.h>
-
-#include "vme_pio2.h"
-
-static const char driver_name[] = "pio2_gpio";
-
-static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
-{
-        u8 reg;
-        int retval;
-        struct pio2_card *card = gpiochip_get_data(chip);
-
-        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
-            (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
-                dev_err(&card->vdev->dev, "Channel not available as input\n");
-                return 0;
-        }
-
-        retval = vme_master_read(card->window, &reg, 1,
-                                 PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
-        if (retval < 0) {
-                dev_err(&card->vdev->dev, "Unable to read from GPIO\n");
-                return 0;
-        }
-
-        /*
-         * Remember, input on channels configured as both input and output
-         * are inverted!
-         */
-        if (reg & PIO2_CHANNEL_BIT[offset]) {
-                if (card->bank[PIO2_CHANNEL_BANK[offset]].config != BOTH)
-                        return 0;
-
-                return 1;
-        }
-
-        if (card->bank[PIO2_CHANNEL_BANK[offset]].config != BOTH)
-                return 1;
-
-        return 0;
-}
-
-static void pio2_gpio_set(struct gpio_chip *chip,
-                          unsigned int offset, int value)
-{
-        u8 reg;
-        int retval;
-        struct pio2_card *card = gpiochip_get_data(chip);
-
-        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
-            (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
-                dev_err(&card->vdev->dev, "Channel not available as output\n");
-                return;
-        }
-
-        if (value)
-                reg = card->bank[PIO2_CHANNEL_BANK[offset]].value |
-                        PIO2_CHANNEL_BIT[offset];
-        else
-                reg = card->bank[PIO2_CHANNEL_BANK[offset]].value &
-                        ~PIO2_CHANNEL_BIT[offset];
-
-        retval = vme_master_write(card->window, &reg, 1,
-                                  PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
-        if (retval < 0) {
-                dev_err(&card->vdev->dev, "Unable to write to GPIO\n");
-                return;
-        }
-
-        card->bank[PIO2_CHANNEL_BANK[offset]].value = reg;
-}
-
-/* Directionality configured at board build - send appropriate response */
-static int pio2_gpio_dir_in(struct gpio_chip *chip, unsigned int offset)
-{
-        int data;
-        struct pio2_card *card = gpiochip_get_data(chip);
-
-        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
-            (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
-                dev_err(&card->vdev->dev,
-                        "Channel directionality not configurable at runtime\n");
-
-                data = -EINVAL;
-        } else {
-                data = 0;
-        }
-
-        return data;
-}
-
-/* Directionality configured at board build - send appropriate response */
-static int pio2_gpio_dir_out(struct gpio_chip *chip,
-                             unsigned int offset, int value)
-{
-        int data;
-        struct pio2_card *card = gpiochip_get_data(chip);
-
-        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
-            (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
-                dev_err(&card->vdev->dev,
-                        "Channel directionality not configurable at runtime\n");
-
-                data = -EINVAL;
-        } else {
-                data = 0;
-        }
-
-        return data;
-}
-
-/*
- * We return whether this has been successful - this is used in the probe to
- * ensure we have a valid card.
- */
-int pio2_gpio_reset(struct pio2_card *card)
-{
-        int retval = 0;
-        int i, j;
-
-        u8 data = 0;
-
-        /* Zero output registers */
-        for (i = 0; i < 4; i++) {
-                retval = vme_master_write(card->window, &data, 1,
-                                          PIO2_REGS_DATA[i]);
-                if (retval < 0)
-                        return retval;
-                card->bank[i].value = 0;
-        }
-
-        /* Set input interrupt masks */
-        for (i = 0; i < 4; i++) {
-                retval = vme_master_write(card->window, &data, 1,
-                                          PIO2_REGS_INT_MASK[i * 2]);
-                if (retval < 0)
-                        return retval;
-
-                retval = vme_master_write(card->window, &data, 1,
-                                          PIO2_REGS_INT_MASK[(i * 2) + 1]);
-                if (retval < 0)
-                        return retval;
-
-                for (j = 0; j < 8; j++)
-                        card->bank[i].irq[j] = NONE;
-        }
-
-        /* Ensure all I/O interrupts are cleared */
-        for (i = 0; i < 4; i++) {
-                do {
-                        retval = vme_master_read(card->window, &data, 1,
-                                                 PIO2_REGS_INT_STAT[i]);
-                        if (retval < 0)
-                                return retval;
-                } while (data != 0);
-        }
-
-        return 0;
-}
-
-int pio2_gpio_init(struct pio2_card *card)
-{
-        int retval = 0;
-        char *label;
-
-        label = kasprintf(GFP_KERNEL,
-                          "%s@%s", driver_name, dev_name(&card->vdev->dev));
-        if (!label)
-                return -ENOMEM;
-
-        card->gc.label = label;
-
-        card->gc.ngpio = PIO2_NUM_CHANNELS;
-        /* Dynamic allocation of base */
-        card->gc.base = -1;
-        /* Setup pointers to chip functions */
-        card->gc.direction_input = pio2_gpio_dir_in;
-        card->gc.direction_output = pio2_gpio_dir_out;
-        card->gc.get = pio2_gpio_get;
-        card->gc.set = pio2_gpio_set;
-
-        /* This function adds a memory mapped GPIO chip */
-        retval = gpiochip_add_data(&card->gc, card);
-        if (retval) {
-                dev_err(&card->vdev->dev, "Unable to register GPIO\n");
-                kfree(card->gc.label);
-        }
-
-        return retval;
-};
-
-void pio2_gpio_exit(struct pio2_card *card)
-{
-        const char *label = card->gc.label;
-
-        gpiochip_remove(&card->gc);
-        kfree(label);
-}
-
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 9fcf2e223f71..1123b4f1e1d6 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1693,10 +1693,11 @@ static int vt6655_suspend(struct pci_dev *pcid, pm_message_t state)
         MACbShutdown(priv);
 
         pci_disable_device(pcid);
-        pci_set_power_state(pcid, pci_choose_state(pcid, state));
 
         spin_unlock_irqrestore(&priv->lock, flags);
 
+        pci_set_power_state(pcid, pci_choose_state(pcid, state));
+
         return 0;
 }
 
diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c
index d7ede73a1a01..d891993b20cf 100644
--- a/drivers/staging/vt6655/key.c
+++ b/drivers/staging/vt6655/key.c
@@ -56,17 +56,19 @@ static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr,
         }
 
         switch (key_type) {
-        /* fallthrough */
         case VNT_KEY_DEFAULTKEY:
                 /* default key last entry */
                 entry = MAX_KEY_TABLE - 1;
                 key->hw_key_idx = entry;
+                /* fall through */
         case VNT_KEY_ALLGROUP:
                 key_mode |= VNT_KEY_ALLGROUP;
                 if (onfly_latch)
                         key_mode |= VNT_KEY_ONFLY_ALL;
+                /* fall through */
         case VNT_KEY_GROUP_ADDRESS:
                 key_mode |= mode;
+                /* fall through */
         case VNT_KEY_GROUP:
                 key_mode |= (mode << 4);
                 key_mode |= VNT_KEY_GROUP;
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index c61422ea8846..4fd9cd64c6e8 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -382,11 +382,13 @@ void vnt_update_ifs(struct vnt_private *priv)
                         priv->difs -= 1;
                         break;
                 }
+                /* fall through */
         case RF_AIROHA7230:
         case RF_AL2230:
         case RF_AL2230S:
                 if (priv->bb_type != BB_TYPE_11B)
                         break;
+                /* fall through */
         case RF_RFMD2959:
         case RF_VT3226:
         case RF_VT3342A0:
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 7b620658ec38..5b4e9dd16b77 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -238,6 +238,7 @@ static struct completion hif_driver_comp;
 static struct completion hif_wait_response;
 static struct mutex hif_deinit_lock;
 static struct timer_list periodic_rssi;
+static struct wilc_vif *periodic_rssi_vif;
 
 u8 wilc_multicast_mac_addr_list[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];
 
@@ -2272,7 +2273,7 @@ static int Handle_RemainOnChan(struct wilc_vif *vif,
 ERRORHANDLER:
         {
                 P2P_LISTEN_STATE = 1;
-                hif_drv->remain_on_ch_timer.data = (unsigned long)vif;
+                hif_drv->remain_on_ch_timer_vif = vif;
                 mod_timer(&hif_drv->remain_on_ch_timer,
                           jiffies +
                           msecs_to_jiffies(pstrHostIfRemainOnChan->duration));
@@ -2360,11 +2361,13 @@ _done_:
         return result;
 }
 
-static void ListenTimerCB(unsigned long arg)
+static void ListenTimerCB(struct timer_list *t)
 {
+        struct host_if_drv *hif_drv = from_timer(hif_drv, t,
+                                                      remain_on_ch_timer);
+        struct wilc_vif *vif = hif_drv->remain_on_ch_timer_vif;
         s32 result = 0;
         struct host_if_msg msg;
-        struct wilc_vif *vif = (struct wilc_vif *)arg;
 
         del_timer(&vif->hif_drv->remain_on_ch_timer);
 
@@ -2417,9 +2420,9 @@ static void Handle_SetMulticastFilter(struct wilc_vif *vif,
 
         pu8CurrByte = wid.val;
         *pu8CurrByte++ = (strHostIfSetMulti->enabled & 0xFF);
-        *pu8CurrByte++ = ((strHostIfSetMulti->enabled >> 8) & 0xFF);
-        *pu8CurrByte++ = ((strHostIfSetMulti->enabled >> 16) & 0xFF);
-        *pu8CurrByte++ = ((strHostIfSetMulti->enabled >> 24) & 0xFF);
+        *pu8CurrByte++ = 0;
+        *pu8CurrByte++ = 0;
+        *pu8CurrByte++ = 0;
 
         *pu8CurrByte++ = (strHostIfSetMulti->cnt & 0xFF);
         *pu8CurrByte++ = ((strHostIfSetMulti->cnt >> 8) & 0xFF);
@@ -2643,9 +2646,10 @@ free_msg:
         complete(&hif_thread_comp);
 }
 
-static void TimerCB_Scan(unsigned long arg)
+static void TimerCB_Scan(struct timer_list *t)
 {
-        struct wilc_vif *vif = (struct wilc_vif *)arg;
+        struct host_if_drv *hif_drv = from_timer(hif_drv, t, scan_timer);
+        struct wilc_vif *vif = hif_drv->scan_timer_vif;
         struct host_if_msg msg;
 
         memset(&msg, 0, sizeof(struct host_if_msg));
@@ -2655,9 +2659,11 @@ static void TimerCB_Scan(unsigned long arg)
         wilc_enqueue_cmd(&msg);
 }
 
-static void TimerCB_Connect(unsigned long arg)
+static void TimerCB_Connect(struct timer_list *t)
 {
-        struct wilc_vif *vif = (struct wilc_vif *)arg;
+        struct host_if_drv *hif_drv = from_timer(hif_drv, t,
+                                                      connect_timer);
+        struct wilc_vif *vif = hif_drv->connect_timer_vif;
         struct host_if_msg msg;
 
         memset(&msg, 0, sizeof(struct host_if_msg));
@@ -3040,7 +3046,7 @@ int wilc_set_join_req(struct wilc_vif *vif, u8 *bssid, const u8 *ssid,
                 return -EFAULT;
         }
 
-        hif_drv->connect_timer.data = (unsigned long)vif;
+        hif_drv->connect_timer_vif = vif;
         mod_timer(&hif_drv->connect_timer,
                   jiffies + msecs_to_jiffies(HOST_IF_CONNECT_TIMEOUT));
 
@@ -3283,7 +3289,7 @@ int wilc_scan(struct wilc_vif *vif, u8 scan_source, u8 scan_type,
                 return -EINVAL;
         }
 
-        hif_drv->scan_timer.data = (unsigned long)vif;
+        hif_drv->scan_timer_vif = vif;
         mod_timer(&hif_drv->scan_timer,
                   jiffies + msecs_to_jiffies(HOST_IF_SCAN_TIMEOUT));
 
@@ -3309,9 +3315,9 @@ int wilc_hif_set_cfg(struct wilc_vif *vif,
         return wilc_enqueue_cmd(&msg);
 }
 
-static void GetPeriodicRSSI(unsigned long arg)
+static void GetPeriodicRSSI(struct timer_list *unused)
 {
-        struct wilc_vif *vif = (struct wilc_vif *)arg;
+        struct wilc_vif *vif = periodic_rssi_vif;
 
         if (!vif->hif_drv) {
                 netdev_err(vif->ndev, "Driver handler is NULL\n");
@@ -3321,7 +3327,6 @@ static void GetPeriodicRSSI(unsigned long arg)
         if (vif->hif_drv->hif_state == HOST_IF_CONNECTED)
                 wilc_get_statistics(vif, &vif->wilc->dummy_statistics);
 
-        periodic_rssi.data = (unsigned long)vif;
         mod_timer(&periodic_rssi, jiffies + msecs_to_jiffies(5000));
 }
 
@@ -3374,14 +3379,14 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
                         goto _fail_;
                 }
 
-                setup_timer(&periodic_rssi, GetPeriodicRSSI,
-                            (unsigned long)vif);
+                periodic_rssi_vif = vif;
+                timer_setup(&periodic_rssi, GetPeriodicRSSI, 0);
                 mod_timer(&periodic_rssi, jiffies + msecs_to_jiffies(5000));
         }
 
-        setup_timer(&hif_drv->scan_timer, TimerCB_Scan, 0);
-        setup_timer(&hif_drv->connect_timer, TimerCB_Connect, 0);
-        setup_timer(&hif_drv->remain_on_ch_timer, ListenTimerCB, 0);
+        timer_setup(&hif_drv->scan_timer, TimerCB_Scan, 0);
+        timer_setup(&hif_drv->connect_timer, TimerCB_Connect, 0);
+        timer_setup(&hif_drv->remain_on_ch_timer, ListenTimerCB, 0);
 
         mutex_init(&hif_drv->cfg_values_lock);
         mutex_lock(&hif_drv->cfg_values_lock);
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 1ce5ead318c7..65734c38bf43 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -279,8 +279,13 @@ struct host_if_drv {
         struct completion comp_inactive_time;
 
         struct timer_list scan_timer;
+        struct wilc_vif *scan_timer_vif;
+
         struct timer_list connect_timer;
+        struct wilc_vif *connect_timer_vif;
+
         struct timer_list remain_on_ch_timer;
+        struct wilc_vif *remain_on_ch_timer_vif;
 
         bool IFC_UP;
         int driver_handler_id;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index ac5aaafa461c..9241a387f528 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -266,7 +266,7 @@ static void update_scan_time(void)
                 last_scanned_shadow[i].time_scan = jiffies;
 }
 
-static void remove_network_from_shadow(unsigned long arg)
+static void remove_network_from_shadow(unsigned long unused)
 {
         unsigned long now = jiffies;
         int i, j;
@@ -287,7 +287,6 @@ static void remove_network_from_shadow(unsigned long arg)
         }
 
         if (last_scanned_cnt != 0) {
-                hAgingTimer.data = arg;
                 mod_timer(&hAgingTimer, jiffies + msecs_to_jiffies(AGING_TIME));
         }
 }
@@ -304,7 +303,6 @@ static int is_network_in_shadow(struct network_info *pstrNetworkInfo,
         int i;
 
         if (last_scanned_cnt == 0) {
-                hAgingTimer.data = (unsigned long)user_void;
                 mod_timer(&hAgingTimer, jiffies + msecs_to_jiffies(AGING_TIME));
                 state = -1;
         } else {
@@ -1111,7 +1109,6 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev,
                 g_key_gtk_params.key = NULL;
                 kfree(g_key_gtk_params.seq);
                 g_key_gtk_params.seq = NULL;
-
         }
 
         if (key_index >= 0 && key_index <= 3) {
@@ -1617,7 +1614,7 @@ static int mgmt_tx(struct wiphy *wiphy,
 
         *cookie = (unsigned long)buf;
         priv->u64tx_cookie = *cookie;
-        mgmt = (const struct ieee80211_mgmt *) buf;
+        mgmt = (const struct ieee80211_mgmt *)buf;
 
         if (ieee80211_is_mgmt(mgmt->frame_control)) {
                 mgmt_tx = kmalloc(sizeof(struct p2p_mgmt_data), GFP_KERNEL);
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 9addef1f1e12..f49dfa82f1b8 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -714,7 +714,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
                                         char *bssid = ((struct tx_complete_data *)(tqe->priv))->bssid;
 
                                         buffer_offset = ETH_ETHERNET_HDR_OFFSET;
-                                        memcpy(&txb[offset + 4], bssid, 6);
+                                        memcpy(&txb[offset + 8], bssid, 6);
                                 } else {
                                         buffer_offset = HOST_HDR_OFFSET;
                                 }
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index d1e8218f96fb..5975d47dfa71 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -184,11 +184,11 @@ static void hfa384x_usbin_ctlx(struct hfa384x *hw, union hfa384x_usbin *usbin,
 
 static void hfa384x_usbctlxq_run(struct hfa384x *hw);
 
-static void hfa384x_usbctlx_reqtimerfn(unsigned long data);
+static void hfa384x_usbctlx_reqtimerfn(struct timer_list *t);
 
-static void hfa384x_usbctlx_resptimerfn(unsigned long data);
+static void hfa384x_usbctlx_resptimerfn(struct timer_list *t);
 
-static void hfa384x_usb_throttlefn(unsigned long data);
+static void hfa384x_usb_throttlefn(struct timer_list *t);
 
 static void hfa384x_usbctlx_completion_task(unsigned long data);
 
@@ -558,13 +558,11 @@ void hfa384x_create(struct hfa384x *hw, struct usb_device *usb)
         INIT_WORK(&hw->link_bh, prism2sta_processing_defer);
         INIT_WORK(&hw->usb_work, hfa384x_usb_defer);
 
-        setup_timer(&hw->throttle, hfa384x_usb_throttlefn, (unsigned long)hw);
+        timer_setup(&hw->throttle, hfa384x_usb_throttlefn, 0);
 
-        setup_timer(&hw->resptimer, hfa384x_usbctlx_resptimerfn,
-                    (unsigned long)hw);
+        timer_setup(&hw->resptimer, hfa384x_usbctlx_resptimerfn, 0);
 
-        setup_timer(&hw->reqtimer, hfa384x_usbctlx_reqtimerfn,
-                    (unsigned long)hw);
+        timer_setup(&hw->reqtimer, hfa384x_usbctlx_reqtimerfn, 0);
 
         usb_init_urb(&hw->rx_urb);
         usb_init_urb(&hw->tx_urb);
@@ -574,8 +572,7 @@ void hfa384x_create(struct hfa384x *hw, struct usb_device *usb)
         hw->state = HFA384x_STATE_INIT;
 
         INIT_WORK(&hw->commsqual_bh, prism2sta_commsqual_defer);
-        setup_timer(&hw->commsqual_timer, prism2sta_commsqual_timer,
-                    (unsigned long)hw);
+        timer_setup(&hw->commsqual_timer, prism2sta_commsqual_timer, 0);
 }
 
 /*----------------------------------------------------------------
@@ -3800,9 +3797,9 @@ delresp:
  *      interrupt
  *----------------------------------------------------------------
  */
-static void hfa384x_usbctlx_reqtimerfn(unsigned long data)
+static void hfa384x_usbctlx_reqtimerfn(struct timer_list *t)
 {
-        struct hfa384x *hw = (struct hfa384x *)data;
+        struct hfa384x *hw = from_timer(hw, t, reqtimer);
         unsigned long flags;
 
         spin_lock_irqsave(&hw->ctlxq.lock, flags);
@@ -3859,9 +3856,9 @@ static void hfa384x_usbctlx_reqtimerfn(unsigned long data)
  *      interrupt
  *----------------------------------------------------------------
  */
-static void hfa384x_usbctlx_resptimerfn(unsigned long data)
+static void hfa384x_usbctlx_resptimerfn(struct timer_list *t)
 {
-        struct hfa384x *hw = (struct hfa384x *)data;
+        struct hfa384x *hw = from_timer(hw, t, resptimer);
         unsigned long flags;
 
         spin_lock_irqsave(&hw->ctlxq.lock, flags);
@@ -3899,9 +3896,9 @@ static void hfa384x_usbctlx_resptimerfn(unsigned long data)
  *      Interrupt
  *----------------------------------------------------------------
  */
-static void hfa384x_usb_throttlefn(unsigned long data)
+static void hfa384x_usb_throttlefn(struct timer_list *t)
 {
-        struct hfa384x *hw = (struct hfa384x *)data;
+        struct hfa384x *hw = from_timer(hw, t, throttle);
         unsigned long flags;
 
         spin_lock_irqsave(&hw->ctlxq.lock, flags);
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index c4aa9e7e7003..72070593394a 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -394,8 +394,9 @@ int prism2mgmt_scan_results(struct wlandevice *wlandev, void *msgp)
                 count = HFA384x_SCANRESULT_MAX;
 
         if (req->bssindex.data >= count) {
-                pr_debug("requested index (%d) out of range (%d)\n",
-                         req->bssindex.data, count);
+                netdev_dbg(wlandev->netdev,
+                           "requested index (%d) out of range (%d)\n",
+                           req->bssindex.data, count);
                 result = 2;
                 req->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
                 goto exit;
@@ -684,7 +685,8 @@ int prism2mgmt_start(struct wlandevice *wlandev, void *msgp)
 
         goto done;
 failed:
-        pr_debug("Failed to set a config option, result=%d\n", result);
+        netdev_dbg(wlandev->netdev,
+                   "Failed to set a config option, result=%d\n", result);
         msg->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
 
 done:
@@ -1120,15 +1122,17 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                 /* Disable monitor mode */
                 result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_DISABLE);
                 if (result) {
-                        pr_debug("failed to disable monitor mode, result=%d\n",
-                                 result);
+                        netdev_dbg(wlandev->netdev,
+                                   "failed to disable monitor mode, result=%d\n",
+                                   result);
                         goto failed;
                 }
                 /* Disable port 0 */
                 result = hfa384x_drvr_disable(hw, 0);
                 if (result) {
-                        pr_debug
-                        ("failed to disable port 0 after sniffing, result=%d\n",
+                        netdev_dbg
+                        (wlandev->netdev,
+                             "failed to disable port 0 after sniffing, result=%d\n",
                              result);
                         goto failed;
                 }
@@ -1140,8 +1144,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                                                   HFA384x_RID_CNFWEPFLAGS,
                                                   hw->presniff_wepflags);
                 if (result) {
-                        pr_debug
-                            ("failed to restore wepflags=0x%04x, result=%d\n",
+                        netdev_dbg
+                            (wlandev->netdev,
+                             "failed to restore wepflags=0x%04x, result=%d\n",
                              hw->presniff_wepflags, result);
                         goto failed;
                 }
@@ -1153,8 +1158,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                                                   HFA384x_RID_CNFPORTTYPE,
                                                   word);
                         if (result) {
-                                pr_debug
-                                    ("failed to restore porttype, result=%d\n",
+                                netdev_dbg
+                                    (wlandev->netdev,
+                                     "failed to restore porttype, result=%d\n",
                                      result);
                                 goto failed;
                         }
@@ -1162,8 +1168,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                         /* Enable the port */
                         result = hfa384x_drvr_enable(hw, 0);
                         if (result) {
-                                pr_debug("failed to enable port to presniff setting, result=%d\n",
-                                         result);
+                                netdev_dbg(wlandev->netdev,
+                                           "failed to enable port to presniff setting, result=%d\n",
+                                           result);
                                 goto failed;
                         }
                 } else {
@@ -1182,8 +1189,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                                                   HFA384x_RID_CNFPORTTYPE,
                                                   &(hw->presniff_port_type));
                                 if (result) {
-                                        pr_debug
-                                        ("failed to read porttype, result=%d\n",
+                                        netdev_dbg
+                                        (wlandev->netdev,
+                                             "failed to read porttype, result=%d\n",
                                              result);
                                         goto failed;
                                 }
@@ -1192,24 +1200,27 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                                                   HFA384x_RID_CNFWEPFLAGS,
                                                   &(hw->presniff_wepflags));
                                 if (result) {
-                                        pr_debug
-                                        ("failed to read wepflags, result=%d\n",
+                                        netdev_dbg
+                                        (wlandev->netdev,
+                                             "failed to read wepflags, result=%d\n",
                                              result);
                                         goto failed;
                                 }
                                 hfa384x_drvr_stop(hw);
                                 result = hfa384x_drvr_start(hw);
                                 if (result) {
-                                        pr_debug("failed to restart the card for sniffing, result=%d\n",
-                                                 result);
+                                        netdev_dbg(wlandev->netdev,
+                                                   "failed to restart the card for sniffing, result=%d\n",
+                                                   result);
                                         goto failed;
                                 }
                         } else {
                                 /* Disable the port */
                                 result = hfa384x_drvr_disable(hw, 0);
                                 if (result) {
-                                        pr_debug("failed to enable port for sniffing, result=%d\n",
-                                                 result);
+                                        netdev_dbg(wlandev->netdev,
+                                                   "failed to enable port for sniffing, result=%d\n",
+                                                   result);
                                         goto failed;
                                 }
                         }
@@ -1225,8 +1236,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                 hw->sniff_channel = word;
 
                 if (result) {
-                        pr_debug("failed to set channel %d, result=%d\n",
-                                 word, result);
+                        netdev_dbg(wlandev->netdev,
+                                   "failed to set channel %d, result=%d\n",
+                                   word, result);
                         goto failed;
                 }
 
@@ -1238,8 +1250,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                                                   HFA384x_RID_CNFPORTTYPE,
                                                   word);
                         if (result) {
-                                pr_debug
-                                    ("failed to set porttype %d, result=%d\n",
+                                netdev_dbg
+                                    (wlandev->netdev,
+                                     "failed to set porttype %d, result=%d\n",
                                      word, result);
                                 goto failed;
                         }
@@ -1257,8 +1270,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                         }
 
                         if (result) {
-                                pr_debug
-                                  ("failed to set wepflags=0x%04x, result=%d\n",
+                                netdev_dbg
+                                  (wlandev->netdev,
+                                   "failed to set wepflags=0x%04x, result=%d\n",
                                    word, result);
                                 goto failed;
                         }
@@ -1283,16 +1297,18 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
                 /* Enable the port */
                 result = hfa384x_drvr_enable(hw, 0);
                 if (result) {
-                        pr_debug
-                            ("failed to enable port for sniffing, result=%d\n",
+                        netdev_dbg
+                            (wlandev->netdev,
+                             "failed to enable port for sniffing, result=%d\n",
                              result);
                         goto failed;
                 }
                 /* Enable monitor mode */
                 result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_ENABLE);
                 if (result) {
-                        pr_debug("failed to enable monitor mode, result=%d\n",
-                                 result);
+                        netdev_dbg(wlandev->netdev,
+                                   "failed to enable monitor mode, result=%d\n",
+                                   result);
                         goto failed;
                 }
 
diff --git a/drivers/staging/wlan-ng/prism2mgmt.h b/drivers/staging/wlan-ng/prism2mgmt.h
index 88b979ff68b3..c062418f1202 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.h
+++ b/drivers/staging/wlan-ng/prism2mgmt.h
@@ -109,7 +109,7 @@ int prism2mgmt_get_grpaddr_index(u32 did);
 void prism2sta_processing_defer(struct work_struct *data);
 
 void prism2sta_commsqual_defer(struct work_struct *data);
-void prism2sta_commsqual_timer(unsigned long data);
+void prism2sta_commsqual_timer(struct timer_list *t);
 
 /* Interface callback functions, passing data back up to the cfg80211 layer */
 void prism2_connect_result(struct wlandevice *wlandev, u8 failed);
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index c9df45063ab3..99316b9a4e49 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -1447,7 +1447,7 @@ static void prism2sta_inf_linkstatus(struct wlandevice *wlandev,
 {
         struct hfa384x *hw = wlandev->priv;
 
-        hw->link_status_new = inf->info.linkstatus.linkstatus;
+        hw->link_status_new = le16_to_cpu(inf->info.linkstatus.linkstatus);
 
         schedule_work(&hw->link_bh);
 }
@@ -2004,9 +2004,9 @@ void prism2sta_commsqual_defer(struct work_struct *data)
         mod_timer(&hw->commsqual_timer, jiffies + HZ);
 }
 
-void prism2sta_commsqual_timer(unsigned long data)
+void prism2sta_commsqual_timer(struct timer_list *t)
 {
-        struct hfa384x *hw = (struct hfa384x *)data;
+        struct hfa384x *hw = from_timer(hw, t, commsqual_timer);
 
         schedule_work(&hw->commsqual_bh);
 }
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index b450c740f626..b813f1d460ce 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1697,7 +1697,7 @@ static int xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         if (XGIfb_get_dram_size(xgifb_info)) {
                 xgifb_info->video_size = min_t(unsigned long, video_size_max,
-                                                SZ_16M);
+                                               SZ_16M);
         } else if (xgifb_info->video_size > video_size_max) {
                 xgifb_info->video_size = video_size_max;
         }
@@ -1736,7 +1736,7 @@ static int xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         hw_info->pjVideoMemoryAddress =
                 ioremap_wc(xgifb_info->video_base, xgifb_info->video_size);
         xgifb_info->mmio_vbase = ioremap(xgifb_info->mmio_base,
-                                            xgifb_info->mmio_size);
+                                         xgifb_info->mmio_size);
 
         dev_info(&pdev->dev,
                  "Framebuffer at 0x%llx, mapped to 0x%p, size %dk\n",
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index cea128bede52..a6cd0a1e8c05 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -5046,7 +5046,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
                                   unsigned short ModeIdIndex,
                                   struct vb_device_info *pVBInfo)
 {
-        const u8 LCDARefreshIndex[] = {
+        static const u8 LCDARefreshIndex[] = {
                 0x00, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x00 };
 
         unsigned short RefreshRateTableIndex, i, index, temp;
@@ -5479,8 +5479,9 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
                                                    ModeIdIndex))
                                 return 0;
 
-                pVBInfo->ModeType = XGI330_EModeIDTable[ModeIdIndex].
-                                                Ext_ModeFlag & ModeTypeMask;
+                pVBInfo->ModeType =
+                        XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag
+                        & ModeTypeMask;
 
                 pVBInfo->SetFlag = 0;
                 pVBInfo->VBInfo = DisableCRT2Display;
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 5e056064259c..18c923a4c16e 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1832,6 +1832,9 @@ static const struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0xfff0, 0x0100), /* DATECS FP-2000 */
         .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
         },
+        { USB_DEVICE(0x09d8, 0x0320), /* Elatec GmbH TWN3 */
+        .driver_info = NO_UNION_NORMAL, /* has misplaced union descriptor */
+        },
 
         { USB_DEVICE(0x2912, 0x0001), /* ATOL FPrint */
         .driver_info = CLEAR_HALT_CONDITIONS,
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 68b54bd88d1e..883549ee946c 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -960,10 +960,12 @@ int usb_get_bos_descriptor(struct usb_device *dev)
         for (i = 0; i < num; i++) {
                 buffer += length;
                 cap = (struct usb_dev_cap_header *)buffer;
-                length = cap->bLength;
 
-                if (total_len < length)
+                if (total_len < sizeof(*cap) || total_len < cap->bLength) {
+                        dev->bos->desc->bNumDeviceCaps = i;
                         break;
+                }
+                length = cap->bLength;
                 total_len -= length;
 
                 if (cap->bDescriptorType != USB_DT_DEVICE_CAPABILITY) {
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 4664e543cf2f..e9326f31db8d 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1576,11 +1576,7 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb
                         totlen += isopkt[u].length;
                 }
                 u *= sizeof(struct usb_iso_packet_descriptor);
-                if (totlen <= uurb->buffer_length)
-                        uurb->buffer_length = totlen;
-                else
-                        WARN_ONCE(1, "uurb->buffer_length is too short %d vs %d",
-                                  totlen, uurb->buffer_length);
+                uurb->buffer_length = totlen;
                 break;
 
         default:
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index b5c733613823..e9ce6bb0b22d 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2710,13 +2710,16 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
         if (!(portstatus & USB_PORT_STAT_CONNECTION))
                 return -ENOTCONN;
 
-        /* bomb out completely if the connection bounced.  A USB 3.0
-         * connection may bounce if multiple warm resets were issued,
+        /* Retry if connect change is set but status is still connected.
+         * A USB 3.0 connection may bounce if multiple warm resets were issued,
          * but the device may have successfully re-connected. Ignore it.
          */
         if (!hub_is_superspeed(hub->hdev) &&
-                        (portchange & USB_PORT_STAT_C_CONNECTION))
-                return -ENOTCONN;
+            (portchange & USB_PORT_STAT_C_CONNECTION)) {
+                usb_clear_port_feature(hub->hdev, port1,
+                                       USB_PORT_FEAT_C_CONNECTION);
+                return -EAGAIN;
+        }
 
         if (!(portstatus & USB_PORT_STAT_ENABLE))
                 return -EBUSY;
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 82806e311202..a6aaf2f193a4 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -221,6 +221,10 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* Corsair Strafe RGB */
         { USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT },
 
+        /* MIDI keyboard WORLDE MINI */
+        { USB_DEVICE(0x1c75, 0x0204), .driver_info =
+                        USB_QUIRK_CONFIG_INTF_STRINGS },
+
         /* Acer C120 LED Projector */
         { USB_DEVICE(0x1de1, 0xc102), .driver_info = USB_QUIRK_NO_LPM },
 
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index da9158f171cb..a2336deb5e36 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -420,14 +420,25 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend)
                                                      GFP_NOWAIT);
                         if (!command) {
                                 spin_unlock_irqrestore(&xhci->lock, flags);
-                                xhci_free_command(xhci, cmd);
-                                return -ENOMEM;
+                                ret = -ENOMEM;
+                                goto cmd_cleanup;
+                        }
+
+                        ret = xhci_queue_stop_endpoint(xhci, command, slot_id,
+                                                       i, suspend);
+                        if (ret) {
+                                spin_unlock_irqrestore(&xhci->lock, flags);
+                                xhci_free_command(xhci, command);
+                                goto cmd_cleanup;
                         }
-                        xhci_queue_stop_endpoint(xhci, command, slot_id, i,
-                                                 suspend);
                 }
         }
-        xhci_queue_stop_endpoint(xhci, cmd, slot_id, 0, suspend);
+        ret = xhci_queue_stop_endpoint(xhci, cmd, slot_id, 0, suspend);
+        if (ret) {
+                spin_unlock_irqrestore(&xhci->lock, flags);
+                goto cmd_cleanup;
+        }
+
         xhci_ring_cmd_db(xhci);
         spin_unlock_irqrestore(&xhci->lock, flags);
 
@@ -439,6 +450,8 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend)
                 xhci_warn(xhci, "Timeout while waiting for stop endpoint command\n");
                 ret = -ETIME;
         }
+
+cmd_cleanup:
         xhci_free_command(xhci, cmd);
         return ret;
 }
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index a9443651ce0f..82c746e2d85c 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1309,6 +1309,7 @@ static void xhci_complete_del_and_free_cmd(struct xhci_command *cmd, u32 status)
 void xhci_cleanup_command_queue(struct xhci_hcd *xhci)
 {
         struct xhci_command *cur_cmd, *tmp_cmd;
+        xhci->current_cmd = NULL;
         list_for_each_entry_safe(cur_cmd, tmp_cmd, &xhci->cmd_list, cmd_list)
                 xhci_complete_del_and_free_cmd(cur_cmd, COMP_COMMAND_ABORTED);
 }
@@ -2579,15 +2580,21 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                                 (struct xhci_generic_trb *) ep_trb);
 
                 /*
-                 * No-op TRB should not trigger interrupts.
-                 * If ep_trb is a no-op TRB, it means the
-                 * corresponding TD has been cancelled. Just ignore
-                 * the TD.
+                 * No-op TRB could trigger interrupts in a case where
+                 * a URB was killed and a STALL_ERROR happens right
+                 * after the endpoint ring stopped. Reset the halted
+                 * endpoint. Otherwise, the endpoint remains stalled
+                 * indefinitely.
                  */
                 if (trb_is_noop(ep_trb)) {
-                        xhci_dbg(xhci,
-                                 "ep_trb is a no-op TRB. Skip it for slot %u ep %u\n",
-                                 slot_id, ep_index);
+                        if (trb_comp_code == COMP_STALL_ERROR ||
+                            xhci_requires_manual_halt_cleanup(xhci, ep_ctx,
+                                                              trb_comp_code))
+                                xhci_cleanup_halted_endpoint(xhci, slot_id,
+                                                             ep_index,
+                                                             ep_ring->stream_id,
+                                                             td, ep_trb,
+                                                             EP_HARD_RESET);
                         goto cleanup;
                 }
 
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index ee198ea47f49..51535ba2bcd4 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -4805,7 +4805,8 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
                  */
                 hcd->has_tt = 1;
         } else {
-                if (xhci->sbrn == 0x31) {
+                /* Some 3.1 hosts return sbrn 0x30, can't rely on sbrn alone */
+                if (xhci->sbrn == 0x31 || xhci->usb3_rhub.min_rev >= 1) {
                         xhci_info(xhci, "Host supports USB 3.1 Enhanced SuperSpeed\n");
                         hcd->speed = HCD_USB31;
                         hcd->self.root_hub->speed = USB_SPEED_SUPER_PLUS;
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 029692053dd3..ff5a1a8989d5 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -906,7 +906,7 @@ b_host:
          */
         if (int_usb & MUSB_INTR_RESET) {
                 handled = IRQ_HANDLED;
-                if (devctl & MUSB_DEVCTL_HM) {
+                if (is_host_active(musb)) {
                         /*
                          * When BABBLE happens what we can depends on which
                          * platform MUSB is running, because some platforms
@@ -916,9 +916,7 @@ b_host:
                          * drop the session.
                          */
                         dev_err(musb->controller, "Babble\n");
-
-                        if (is_host_active(musb))
-                                musb_recover_from_babble(musb);
+                        musb_recover_from_babble(musb);
                 } else {
                         musb_dbg(musb, "BUS RESET as %s",
                                 usb_otg_state_string(musb->xceiv->otg->state));
@@ -1861,22 +1859,22 @@ static void musb_pm_runtime_check_session(struct musb *musb)
                 MUSB_DEVCTL_HR;
         switch (devctl & ~s) {
         case MUSB_QUIRK_B_INVALID_VBUS_91:
-                if (musb->quirk_retries--) {
+                if (musb->quirk_retries && !musb->flush_irq_work) {
                         musb_dbg(musb,
                                  "Poll devctl on invalid vbus, assume no session");
                         schedule_delayed_work(&musb->irq_work,
                                               msecs_to_jiffies(1000));
-
+                        musb->quirk_retries--;
                         return;
                 }
                 /* fall through */
         case MUSB_QUIRK_A_DISCONNECT_19:
-                if (musb->quirk_retries--) {
+                if (musb->quirk_retries && !musb->flush_irq_work) {
                         musb_dbg(musb,
                                  "Poll devctl on possible host mode disconnect");
                         schedule_delayed_work(&musb->irq_work,
                                               msecs_to_jiffies(1000));
-
+                        musb->quirk_retries--;
                         return;
                 }
                 if (!musb->session)
@@ -2681,8 +2679,15 @@ static int musb_suspend(struct device *dev)
 
         musb_platform_disable(musb);
         musb_disable_interrupts(musb);
+
+        musb->flush_irq_work = true;
+        while (flush_delayed_work(&musb->irq_work))
+                ;
+        musb->flush_irq_work = false;
+
         if (!(musb->io.quirks & MUSB_PRESERVE_SESSION))
                 musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
+
         WARN_ON(!list_empty(&musb->pending_list));
 
         spin_lock_irqsave(&musb->lock, flags);
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index c748f4ac1154..20f4614178d9 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -428,6 +428,8 @@ struct musb {
         unsigned                test_mode:1;
         unsigned                softconnect:1;
 
+        unsigned                flush_irq_work:1;
+
         u8                      address;
         u8                      test_mode_nr;
         u16                     ackpend;                /* ep0 */
diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c
index ba255280a624..1ec0a4947b6b 100644
--- a/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@ -26,15 +26,28 @@
 
 #define MUSB_DMA_NUM_CHANNELS 15
 
+#define DA8XX_USB_MODE          0x10
+#define DA8XX_USB_AUTOREQ       0x14
+#define DA8XX_USB_TEARDOWN      0x1c
+
+#define DA8XX_DMA_NUM_CHANNELS 4
+
 struct cppi41_dma_controller {
         struct dma_controller controller;
-        struct cppi41_dma_channel rx_channel[MUSB_DMA_NUM_CHANNELS];
-        struct cppi41_dma_channel tx_channel[MUSB_DMA_NUM_CHANNELS];
+        struct cppi41_dma_channel *rx_channel;
+        struct cppi41_dma_channel *tx_channel;
         struct hrtimer early_tx;
         struct list_head early_tx_list;
         u32 rx_mode;
         u32 tx_mode;
         u32 auto_req;
+
+        u32 tdown_reg;
+        u32 autoreq_reg;
+
+        void (*set_dma_mode)(struct cppi41_dma_channel *cppi41_channel,
+                             unsigned int mode);
+        u8 num_channels;
 };
 
 static void save_rx_toggle(struct cppi41_dma_channel *cppi41_channel)
@@ -349,6 +362,32 @@ static void cppi41_set_dma_mode(struct cppi41_dma_channel *cppi41_channel,
         }
 }
 
+static void da8xx_set_dma_mode(struct cppi41_dma_channel *cppi41_channel,
+                unsigned int mode)
+{
+        struct cppi41_dma_controller *controller = cppi41_channel->controller;
+        struct musb *musb = controller->controller.musb;
+        unsigned int shift;
+        u32 port;
+        u32 new_mode;
+        u32 old_mode;
+
+        old_mode = controller->tx_mode;
+        port = cppi41_channel->port_num;
+
+        shift = (port - 1) * 4;
+        if (!cppi41_channel->is_tx)
+                shift += 16;
+        new_mode = old_mode & ~(3 << shift);
+        new_mode |= mode << shift;
+
+        if (new_mode == old_mode)
+                return;
+        controller->tx_mode = new_mode;
+        musb_writel(musb->ctrl_base, DA8XX_USB_MODE, new_mode);
+}
+
+
 static void cppi41_set_autoreq_mode(struct cppi41_dma_channel *cppi41_channel,
                 unsigned mode)
 {
@@ -364,8 +403,8 @@ static void cppi41_set_autoreq_mode(struct cppi41_dma_channel *cppi41_channel,
         if (new_mode == old_mode)
                 return;
         controller->auto_req = new_mode;
-        musb_writel(controller->controller.musb->ctrl_base, USB_CTRL_AUTOREQ,
-                    new_mode);
+        musb_writel(controller->controller.musb->ctrl_base,
+                    controller->autoreq_reg, new_mode);
 }
 
 static bool cppi41_configure_channel(struct dma_channel *channel,
@@ -373,6 +412,7 @@ static bool cppi41_configure_channel(struct dma_channel *channel,
                                 dma_addr_t dma_addr, u32 len)
 {
         struct cppi41_dma_channel *cppi41_channel = channel->private_data;
+        struct cppi41_dma_controller *controller = cppi41_channel->controller;
         struct dma_chan *dc = cppi41_channel->dc;
         struct dma_async_tx_descriptor *dma_desc;
         enum dma_transfer_direction direction;
@@ -398,7 +438,7 @@ static bool cppi41_configure_channel(struct dma_channel *channel,
                         musb_writel(musb->ctrl_base,
                                 RNDIS_REG(cppi41_channel->port_num), len);
                         /* gen rndis */
-                        cppi41_set_dma_mode(cppi41_channel,
+                        controller->set_dma_mode(cppi41_channel,
                                         EP_MODE_DMA_GEN_RNDIS);
 
                         /* auto req */
@@ -407,14 +447,15 @@ static bool cppi41_configure_channel(struct dma_channel *channel,
                 } else {
                         musb_writel(musb->ctrl_base,
                                         RNDIS_REG(cppi41_channel->port_num), 0);
-                        cppi41_set_dma_mode(cppi41_channel,
+                        controller->set_dma_mode(cppi41_channel,
                                         EP_MODE_DMA_TRANSPARENT);
                         cppi41_set_autoreq_mode(cppi41_channel,
                                         EP_MODE_AUTOREQ_NONE);
                 }
         } else {
                 /* fallback mode */
-                cppi41_set_dma_mode(cppi41_channel, EP_MODE_DMA_TRANSPARENT);
+                controller->set_dma_mode(cppi41_channel,
+                                EP_MODE_DMA_TRANSPARENT);
                 cppi41_set_autoreq_mode(cppi41_channel, EP_MODE_AUTOREQ_NONE);
                 len = min_t(u32, packet_sz, len);
         }
@@ -445,7 +486,7 @@ static struct dma_channel *cppi41_dma_channel_allocate(struct dma_controller *c,
         struct cppi41_dma_channel *cppi41_channel = NULL;
         u8 ch_num = hw_ep->epnum - 1;
 
-        if (ch_num >= MUSB_DMA_NUM_CHANNELS)
+        if (ch_num >= controller->num_channels)
                 return NULL;
 
         if (is_tx)
@@ -581,12 +622,13 @@ static int cppi41_dma_channel_abort(struct dma_channel *channel)
 
         do {
                 if (is_tx)
-                        musb_writel(musb->ctrl_base, USB_TDOWN, tdbit);
+                        musb_writel(musb->ctrl_base, controller->tdown_reg,
+                                    tdbit);
                 ret = dmaengine_terminate_all(cppi41_channel->dc);
         } while (ret == -EAGAIN);
 
         if (is_tx) {
-                musb_writel(musb->ctrl_base, USB_TDOWN, tdbit);
+                musb_writel(musb->ctrl_base, controller->tdown_reg, tdbit);
 
                 csr = musb_readw(epio, MUSB_TXCSR);
                 if (csr & MUSB_TXCSR_TXPKTRDY) {
@@ -604,7 +646,7 @@ static void cppi41_release_all_dma_chans(struct cppi41_dma_controller *ctrl)
         struct dma_chan *dc;
         int i;
 
-        for (i = 0; i < MUSB_DMA_NUM_CHANNELS; i++) {
+        for (i = 0; i < ctrl->num_channels; i++) {
                 dc = ctrl->tx_channel[i].dc;
                 if (dc)
                         dma_release_channel(dc);
@@ -656,7 +698,7 @@ static int cppi41_dma_controller_start(struct cppi41_dma_controller *controller)
                         goto err;
 
                 ret = -EINVAL;
-                if (port > MUSB_DMA_NUM_CHANNELS || !port)
+                if (port > controller->num_channels || !port)
                         goto err;
                 if (is_tx)
                         cppi41_channel = &controller->tx_channel[port - 1];
@@ -697,6 +739,8 @@ void cppi41_dma_controller_destroy(struct dma_controller *c)
 
         hrtimer_cancel(&controller->early_tx);
         cppi41_dma_controller_stop(controller);
+        kfree(controller->rx_channel);
+        kfree(controller->tx_channel);
         kfree(controller);
 }
 EXPORT_SYMBOL_GPL(cppi41_dma_controller_destroy);
@@ -705,6 +749,7 @@ struct dma_controller *
 cppi41_dma_controller_create(struct musb *musb, void __iomem *base)
 {
         struct cppi41_dma_controller *controller;
+        int channel_size;
         int ret = 0;
 
         if (!musb->controller->parent->of_node) {
@@ -727,12 +772,37 @@ cppi41_dma_controller_create(struct musb *musb, void __iomem *base)
         controller->controller.is_compatible = cppi41_is_compatible;
         controller->controller.musb = musb;
 
+        if (musb->io.quirks & MUSB_DA8XX) {
+                controller->tdown_reg = DA8XX_USB_TEARDOWN;
+                controller->autoreq_reg = DA8XX_USB_AUTOREQ;
+                controller->set_dma_mode = da8xx_set_dma_mode;
+                controller->num_channels = DA8XX_DMA_NUM_CHANNELS;
+        } else {
+                controller->tdown_reg = USB_TDOWN;
+                controller->autoreq_reg = USB_CTRL_AUTOREQ;
+                controller->set_dma_mode = cppi41_set_dma_mode;
+                controller->num_channels = MUSB_DMA_NUM_CHANNELS;
+        }
+
+        channel_size = controller->num_channels *
+                        sizeof(struct cppi41_dma_channel);
+        controller->rx_channel = kzalloc(channel_size, GFP_KERNEL);
+        if (!controller->rx_channel)
+                goto rx_channel_alloc_fail;
+        controller->tx_channel = kzalloc(channel_size, GFP_KERNEL);
+        if (!controller->tx_channel)
+                goto tx_channel_alloc_fail;
+
         ret = cppi41_dma_controller_start(controller);
         if (ret)
                 goto plat_get_fail;
         return &controller->controller;
 
 plat_get_fail:
+        kfree(controller->tx_channel);
+tx_channel_alloc_fail:
+        kfree(controller->rx_channel);
+rx_channel_alloc_fail:
         kfree(controller);
 kzalloc_fail:
         if (ret == -EPROBE_DEFER)
diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index c9a09b5bb6e5..dc353e24d53c 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -297,6 +297,8 @@ static int sunxi_musb_exit(struct musb *musb)
         if (test_bit(SUNXI_MUSB_FL_HAS_SRAM, &glue->flags))
                 sunxi_sram_release(musb->controller->parent);
 
+        devm_usb_put_phy(glue->dev, glue->xceiv);
+
         return 0;
 }
 
diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c
index cc84da8dbb84..14511d6a7d44 100644
--- a/drivers/usb/serial/metro-usb.c
+++ b/drivers/usb/serial/metro-usb.c
@@ -45,6 +45,7 @@ struct metrousb_private {
 static const struct usb_device_id id_table[] = {
         { USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID_BI) },
         { USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID_UNI) },
+        { USB_DEVICE_INTERFACE_CLASS(0x0c2e, 0x0730, 0xff) },   /* MS7820 */
         { }, /* Terminating entry. */
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
index bc1b7745f1d4..819c0ed2b200 100644
--- a/drivers/usb/typec/Kconfig
+++ b/drivers/usb/typec/Kconfig
@@ -4,6 +4,20 @@ menu "USB Power Delivery and Type-C drivers"
 config TYPEC
         tristate
 
+config TYPEC_TCPM
+        tristate "USB Type-C Port Controller Manager"
+        depends on USB
+        select TYPEC
+        help
+          The Type-C Port Controller Manager provides a USB PD and USB Type-C
+          state machine for use with Type-C Port Controllers.
+
+if TYPEC_TCPM
+
+source "drivers/usb/typec/fusb302/Kconfig"
+
+endif
+
 config TYPEC_WCOVE
         tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"
         depends on ACPI
diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
index bc214f15f1b5..b77688ce1f16 100644
--- a/drivers/usb/typec/Makefile
+++ b/drivers/usb/typec/Makefile
@@ -1,3 +1,5 @@
 obj-$(CONFIG_TYPEC)             += typec.o
+obj-$(CONFIG_TYPEC_TCPM)        += tcpm.o
+obj-y                           += fusb302/
 obj-$(CONFIG_TYPEC_WCOVE)       += typec_wcove.o
 obj-$(CONFIG_TYPEC_UCSI)        += ucsi/
diff --git a/drivers/staging/typec/fusb302/Kconfig b/drivers/usb/typec/fusb302/Kconfig
index 48a4f2fcee03..48a4f2fcee03 100644
--- a/drivers/staging/typec/fusb302/Kconfig
+++ b/drivers/usb/typec/fusb302/Kconfig
diff --git a/drivers/staging/typec/fusb302/Makefile b/drivers/usb/typec/fusb302/Makefile
index 207efa5fbab8..207efa5fbab8 100644
--- a/drivers/staging/typec/fusb302/Makefile
+++ b/drivers/usb/typec/fusb302/Makefile
diff --git a/drivers/staging/typec/fusb302/fusb302.c b/drivers/usb/typec/fusb302/fusb302.c
index fc6a3cf74eb3..e790b67d4953 100644
--- a/drivers/staging/typec/fusb302/fusb302.c
+++ b/drivers/usb/typec/fusb302/fusb302.c
@@ -37,11 +37,11 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/usb/typec.h>
+#include <linux/usb/tcpm.h>
+#include <linux/usb/pd.h>
 #include <linux/workqueue.h>
 
 #include "fusb302_reg.h"
-#include "../tcpm.h"
-#include "../pd.h"
 
 /*
  * When the device is SNK, BC_LVL interrupt is used to monitor cc pins
diff --git a/drivers/staging/typec/fusb302/fusb302_reg.h b/drivers/usb/typec/fusb302/fusb302_reg.h
index 0682e63de773..0682e63de773 100644
--- a/drivers/staging/typec/fusb302/fusb302_reg.h
+++ b/drivers/usb/typec/fusb302/fusb302_reg.h
diff --git a/drivers/staging/typec/tcpm.c b/drivers/usb/typec/tcpm.c
index 8af62e74d54c..f557c479fdc2 100644
--- a/drivers/staging/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm.c
@@ -26,14 +26,13 @@
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <linux/usb/pd.h>
+#include <linux/usb/pd_bdo.h>
+#include <linux/usb/pd_vdo.h>
+#include <linux/usb/tcpm.h>
 #include <linux/usb/typec.h>
 #include <linux/workqueue.h>
 
-#include "pd.h"
-#include "pd_vdo.h"
-#include "pd_bdo.h"
-#include "tcpm.h"
-
 #define FOREACH_STATE(S)                        \
         S(INVALID_STATE),                       \
         S(DRP_TOGGLING),                        \
@@ -908,27 +907,6 @@ static void svdm_consume_identity(struct tcpm_port *port, const __le32 *payload,
 
         memset(&port->mode_data, 0, sizeof(port->mode_data));
 
-#if 0 /* Not really a match */
-        switch (PD_IDH_PTYPE(vdo)) {
-        case IDH_PTYPE_UNDEF:
-                port->partner.type = TYPEC_PARTNER_NONE; /* no longer exists */
-                break;
-        case IDH_PTYPE_HUB:
-                break;
-        case IDH_PTYPE_PERIPH:
-                break;
-        case IDH_PTYPE_PCABLE:
-                break;
-        case IDH_PTYPE_ACABLE:
-                break;
-        case IDH_PTYPE_AMA:
-                port->partner.type = TYPEC_PARTNER_ALTMODE;
-                break;
-        default:
-                break;
-        }
-#endif
-
         port->partner_ident.id_header = vdo;
         port->partner_ident.cert_stat = le32_to_cpu(payload[VDO_INDEX_CSTAT]);
         port->partner_ident.product = product;
@@ -1103,11 +1081,7 @@ static int tcpm_pd_svdm(struct tcpm_port *port, const __le32 *payload, int cnt,
                                 response[0] = VDO(svid, 1, CMD_DISCOVER_MODES);
                                 rlen = 1;
                         } else {
-#if 0
-                                response[0] = pd_dfp_enter_mode(port, 0, 0);
-                                if (response[0])
-                                        rlen = 1;
-#endif
+                                /* enter alternate mode if/when implemented */
                         }
                         break;
                 case CMD_ENTER_MODE:
@@ -1145,10 +1119,6 @@ static void tcpm_handle_vdm_request(struct tcpm_port *port,
 
         if (PD_VDO_SVDM(p0))
                 rlen = tcpm_pd_svdm(port, payload, cnt, response);
-#if 0
-        else
-                rlen = tcpm_pd_custom_vdm(port, cnt, payload, response);
-#endif
 
         if (rlen > 0) {
                 tcpm_queue_vdm(port, response[0], &response[1], rlen - 1);
@@ -2442,7 +2412,6 @@ static void run_state_machine(struct tcpm_port *port)
                         tcpm_set_state(port, SNK_STARTUP, 0);
                 break;
         case SNK_STARTUP:
-                /* XXX: callback into infrastructure */
                 opmode =  tcpm_get_pwr_opmode(port->polarity ?
                                               port->cc2 : port->cc1);
                 typec_set_pwr_opmode(port->typec_port, opmode);
@@ -3589,11 +3558,6 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
 
         port->partner_desc.identity = &port->partner_ident;
         port->port_type = tcpc->config->type;
-        /*
-         * TODO:
-         *  - alt_modes, set_alt_mode
-         *  - {debug,audio}_accessory
-         */
 
         port->typec_port = typec_register_port(port->dev, &port->typec_caps);
         if (!port->typec_port) {
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 35a128acfbd1..161694b66038 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1135,7 +1135,7 @@ static int btrfs_fill_super(struct super_block *sb,
 #ifdef CONFIG_BTRFS_FS_POSIX_ACL
         sb->s_flags |= MS_POSIXACL;
 #endif
-        sb->s_flags |= MS_I_VERSION;
+        sb->s_flags |= SB_I_VERSION;
         sb->s_iflags |= SB_I_CGROUPWB;
 
         err = super_setup_bdi(sb);
diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c
index 018c588c7ac3..8e704d12a1cf 100644
--- a/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@ -109,6 +109,11 @@ static int validate_user_key(struct fscrypt_info *crypt_info,
                 goto out;
         }
         ukp = user_key_payload_locked(keyring_key);
+        if (!ukp) {
+                /* key was revoked before we acquired its semaphore */
+                res = -EKEYREVOKED;
+                goto out;
+        }
         if (ukp->datalen != sizeof(struct fscrypt_key)) {
                 res = -EINVAL;
                 goto out;
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 96415c65bbdc..b53e66d9abd7 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -45,6 +45,12 @@
 #define DIO_PAGES       64
 
 /*
+ * Flags for dio_complete()
+ */
+#define DIO_COMPLETE_ASYNC              0x01    /* This is async IO */
+#define DIO_COMPLETE_INVALIDATE         0x02    /* Can invalidate pages */
+
+/*
  * This code generally works in units of "dio_blocks".  A dio_block is
  * somewhere between the hard sector size and the filesystem block size.  it
  * is determined on a per-invocation basis.   When talking to the filesystem
@@ -225,7 +231,7 @@ static inline struct page *dio_get_page(struct dio *dio,
  * filesystems can use it to hold additional state between get_block calls and
  * dio_complete.
  */
-static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)
+static ssize_t dio_complete(struct dio *dio, ssize_t ret, unsigned int flags)
 {
         loff_t offset = dio->iocb->ki_pos;
         ssize_t transferred = 0;
@@ -259,14 +265,27 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)
         if (ret == 0)
                 ret = transferred;
 
+        if (dio->end_io) {
+                // XXX: ki_pos??
+                err = dio->end_io(dio->iocb, offset, ret, dio->private);
+                if (err)
+                        ret = err;
+        }
+
         /*
          * Try again to invalidate clean pages which might have been cached by
          * non-direct readahead, or faulted in by get_user_pages() if the source
          * of the write was an mmap'ed region of the file we're writing.  Either
          * one is a pretty crazy thing to do, so we don't support it 100%.  If
          * this invalidation fails, tough, the write still worked...
+         *
+         * And this page cache invalidation has to be after dio->end_io(), as
+         * some filesystems convert unwritten extents to real allocations in
+         * end_io() when necessary, otherwise a racing buffer read would cache
+         * zeros from unwritten extents.
          */
-        if (ret > 0 && dio->op == REQ_OP_WRITE &&
+        if (flags & DIO_COMPLETE_INVALIDATE &&
+            ret > 0 && dio->op == REQ_OP_WRITE &&
             dio->inode->i_mapping->nrpages) {
                 err = invalidate_inode_pages2_range(dio->inode->i_mapping,
                                         offset >> PAGE_SHIFT,
@@ -274,18 +293,10 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)
                 WARN_ON_ONCE(err);
         }
 
-        if (dio->end_io) {
-
-                // XXX: ki_pos??
-                err = dio->end_io(dio->iocb, offset, ret, dio->private);
-                if (err)
-                        ret = err;
-        }
-
         if (!(dio->flags & DIO_SKIP_DIO_COUNT))
                 inode_dio_end(dio->inode);
 
-        if (is_async) {
+        if (flags & DIO_COMPLETE_ASYNC) {
                 /*
                  * generic_write_sync expects ki_pos to have been updated
                  * already, but the submission path only does this for
@@ -306,7 +317,7 @@ static void dio_aio_complete_work(struct work_struct *work)
 {
         struct dio *dio = container_of(work, struct dio, complete_work);
 
-        dio_complete(dio, 0, true);
+        dio_complete(dio, 0, DIO_COMPLETE_ASYNC | DIO_COMPLETE_INVALIDATE);
 }
 
 static blk_status_t dio_bio_complete(struct dio *dio, struct bio *bio);
@@ -348,7 +359,7 @@ static void dio_bio_end_aio(struct bio *bio)
                         queue_work(dio->inode->i_sb->s_dio_done_wq,
                                    &dio->complete_work);
                 } else {
-                        dio_complete(dio, 0, true);
+                        dio_complete(dio, 0, DIO_COMPLETE_ASYNC);
                 }
         }
 }
@@ -1360,7 +1371,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
                 dio_await_completion(dio);
 
         if (drop_refcount(dio) == 0) {
-                retval = dio_complete(dio, retval, false);
+                retval = dio_complete(dio, retval, DIO_COMPLETE_INVALIDATE);
         } else
                 BUG_ON(retval != -EIOCBQUEUED);
 
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index 9c351bf757b2..3fbc0ff79699 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -84,11 +84,16 @@ struct ecryptfs_page_crypt_context {
 static inline struct ecryptfs_auth_tok *
 ecryptfs_get_encrypted_key_payload_data(struct key *key)
 {
-        if (key->type == &key_type_encrypted)
-                return (struct ecryptfs_auth_tok *)
-                        (&((struct encrypted_key_payload *)key->payload.data[0])->payload_data);
-        else
+        struct encrypted_key_payload *payload;
+
+        if (key->type != &key_type_encrypted)
                 return NULL;
+
+        payload = key->payload.data[0];
+        if (!payload)
+                return ERR_PTR(-EKEYREVOKED);
+
+        return (struct ecryptfs_auth_tok *)payload->payload_data;
 }
 
 static inline struct key *ecryptfs_get_encrypted_key(char *sig)
@@ -114,12 +119,17 @@ static inline struct ecryptfs_auth_tok *
 ecryptfs_get_key_payload_data(struct key *key)
 {
         struct ecryptfs_auth_tok *auth_tok;
+        struct user_key_payload *ukp;
 
         auth_tok = ecryptfs_get_encrypted_key_payload_data(key);
-        if (!auth_tok)
-                return (struct ecryptfs_auth_tok *)user_key_payload_locked(key)->data;
-        else
+        if (auth_tok)
                 return auth_tok;
+
+        ukp = user_key_payload_locked(key);
+        if (!ukp)
+                return ERR_PTR(-EKEYREVOKED);
+
+        return (struct ecryptfs_auth_tok *)ukp->data;
 }
 
 #define ECRYPTFS_MAX_KEYSET_SIZE 1024
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 3cf1546dca82..fa218cd64f74 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -459,7 +459,8 @@ out:
  * @auth_tok_key: key containing the authentication token
  * @auth_tok: authentication token
  *
- * Returns zero on valid auth tok; -EINVAL otherwise
+ * Returns zero on valid auth tok; -EINVAL if the payload is invalid; or
+ * -EKEYREVOKED if the key was revoked before we acquired its semaphore.
  */
 static int
 ecryptfs_verify_auth_tok_from_key(struct key *auth_tok_key,
@@ -468,6 +469,12 @@ ecryptfs_verify_auth_tok_from_key(struct key *auth_tok_key,
         int rc = 0;
 
         (*auth_tok) = ecryptfs_get_key_payload_data(auth_tok_key);
+        if (IS_ERR(*auth_tok)) {
+                rc = PTR_ERR(*auth_tok);
+                *auth_tok = NULL;
+                goto out;
+        }
+
         if (ecryptfs_verify_version((*auth_tok)->version)) {
                 printk(KERN_ERR "Data structure version mismatch. Userspace "
                        "tools must match eCryptfs kernel module with major "
diff --git a/fs/exec.c b/fs/exec.c
index 5470d3c1892a..3e14ba25f678 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1802,6 +1802,7 @@ static int do_execveat_common(int fd, struct filename *filename,
         /* execve succeeded */
         current->fs->in_exec = 0;
         current->in_execve = 0;
+        membarrier_execve(current);
         acct_update_integrals(current);
         task_numa_free(current);
         free_bprm(bprm);
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index b104096fce9e..b0915b734a38 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1677,7 +1677,7 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
                 sbi->s_mount_flags |= EXT4_MF_FS_ABORTED;
                 return 1;
         case Opt_i_version:
-                sb->s_flags |= MS_I_VERSION;
+                sb->s_flags |= SB_I_VERSION;
                 return 1;
         case Opt_lazytime:
                 sb->s_flags |= MS_LAZYTIME;
@@ -2060,7 +2060,7 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb,
                 SEQ_OPTS_PRINT("min_batch_time=%u", sbi->s_min_batch_time);
         if (nodefs || sbi->s_max_batch_time != EXT4_DEF_MAX_BATCH_TIME)
                 SEQ_OPTS_PRINT("max_batch_time=%u", sbi->s_max_batch_time);
-        if (sb->s_flags & MS_I_VERSION)
+        if (sb->s_flags & SB_I_VERSION)
                 SEQ_OPTS_PUTS("i_version");
         if (nodefs || sbi->s_stripe)
                 SEQ_OPTS_PRINT("stripe=%lu", sbi->s_stripe);
diff --git a/fs/fscache/object-list.c b/fs/fscache/object-list.c
index b5ab06fabc60..0438d4cd91ef 100644
--- a/fs/fscache/object-list.c
+++ b/fs/fscache/object-list.c
@@ -331,6 +331,13 @@ static void fscache_objlist_config(struct fscache_objlist_data *data)
         rcu_read_lock();
 
         confkey = user_key_payload_rcu(key);
+        if (!confkey) {
+                /* key was revoked */
+                rcu_read_unlock();
+                key_put(key);
+                goto no_config;
+        }
+
         buf = confkey->data;
 
         for (len = confkey->datalen - 1; len >= 0; len--) {
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 65c88379a3a1..94a745acaef8 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1059,7 +1059,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
         if (sb->s_flags & MS_MANDLOCK)
                 goto err;
 
-        sb->s_flags &= ~(MS_NOSEC | MS_I_VERSION);
+        sb->s_flags &= ~(MS_NOSEC | SB_I_VERSION);
 
         if (!parse_fuse_opt(data, &d, is_bdev))
                 goto err;
diff --git a/fs/iomap.c b/fs/iomap.c
index be61cf742b5e..d4801f8dd4fd 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -714,23 +714,9 @@ static ssize_t iomap_dio_complete(struct iomap_dio *dio)
 {
         struct kiocb *iocb = dio->iocb;
         struct inode *inode = file_inode(iocb->ki_filp);
+        loff_t offset = iocb->ki_pos;
         ssize_t ret;
 
-        /*
-         * Try again to invalidate clean pages which might have been cached by
-         * non-direct readahead, or faulted in by get_user_pages() if the source
-         * of the write was an mmap'ed region of the file we're writing.  Either
-         * one is a pretty crazy thing to do, so we don't support it 100%.  If
-         * this invalidation fails, tough, the write still worked...
-         */
-        if (!dio->error &&
-            (dio->flags & IOMAP_DIO_WRITE) && inode->i_mapping->nrpages) {
-                ret = invalidate_inode_pages2_range(inode->i_mapping,
-                                iocb->ki_pos >> PAGE_SHIFT,
-                                (iocb->ki_pos + dio->size - 1) >> PAGE_SHIFT);
-                WARN_ON_ONCE(ret);
-        }
-
         if (dio->end_io) {
                 ret = dio->end_io(iocb,
                                 dio->error ? dio->error : dio->size,
@@ -742,12 +728,33 @@ static ssize_t iomap_dio_complete(struct iomap_dio *dio)
         if (likely(!ret)) {
                 ret = dio->size;
                 /* check for short read */
-                if (iocb->ki_pos + ret > dio->i_size &&
+                if (offset + ret > dio->i_size &&
                     !(dio->flags & IOMAP_DIO_WRITE))
-                        ret = dio->i_size - iocb->ki_pos;
+                        ret = dio->i_size - offset;
                 iocb->ki_pos += ret;
         }
 
+        /*
+         * Try again to invalidate clean pages which might have been cached by
+         * non-direct readahead, or faulted in by get_user_pages() if the source
+         * of the write was an mmap'ed region of the file we're writing.  Either
+         * one is a pretty crazy thing to do, so we don't support it 100%.  If
+         * this invalidation fails, tough, the write still worked...
+         *
+         * And this page cache invalidation has to be after dio->end_io(), as
+         * some filesystems convert unwritten extents to real allocations in
+         * end_io() when necessary, otherwise a racing buffer read would cache
+         * zeros from unwritten extents.
+         */
+        if (!dio->error &&
+            (dio->flags & IOMAP_DIO_WRITE) && inode->i_mapping->nrpages) {
+                int err;
+                err = invalidate_inode_pages2_range(inode->i_mapping,
+                                offset >> PAGE_SHIFT,
+                                (offset + dio->size - 1) >> PAGE_SHIFT);
+                WARN_ON_ONCE(err);
+        }
+
         inode_dio_end(file_inode(iocb->ki_filp));
         kfree(dio);
 
diff --git a/fs/namespace.c b/fs/namespace.c
index 3b601f115b6c..d18deb4c410b 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2825,7 +2825,8 @@ long do_mount(const char *dev_name, const char __user *dir_name,
                             SB_MANDLOCK |
                             SB_DIRSYNC |
                             SB_SILENT |
-                            SB_POSIXACL);
+                            SB_POSIXACL |
+                            SB_I_VERSION);
 
         if (flags & MS_REMOUNT)
                 retval = do_remount(&path, flags, sb_flags, mnt_flags,
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index def32fa1c225..89263797cf32 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -3852,6 +3852,17 @@ xfs_trim_extent(
         }
 }
 
+/* trim extent to within eof */
+void
+xfs_trim_extent_eof(
+        struct xfs_bmbt_irec    *irec,
+        struct xfs_inode        *ip)
+
+{
+        xfs_trim_extent(irec, 0, XFS_B_TO_FSB(ip->i_mount,
+                                              i_size_read(VFS_I(ip))));
+}
+
 /*
  * Trim the returned map to the required bounds
  */
diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
index 851982a5dfbc..502e0d8fb4ff 100644
--- a/fs/xfs/libxfs/xfs_bmap.h
+++ b/fs/xfs/libxfs/xfs_bmap.h
@@ -208,6 +208,7 @@ void	xfs_bmap_trace_exlist(struct xfs_inode *ip, xfs_extnum_t cnt,
 
 void    xfs_trim_extent(struct xfs_bmbt_irec *irec, xfs_fileoff_t bno,
                 xfs_filblks_t len);
+void    xfs_trim_extent_eof(struct xfs_bmbt_irec *, struct xfs_inode *);
 int     xfs_bmap_add_attrfork(struct xfs_inode *ip, int size, int rsvd);
 void    xfs_bmap_local_to_extents_empty(struct xfs_inode *ip, int whichfork);
 void    xfs_bmap_add_free(struct xfs_mount *mp, struct xfs_defer_ops *dfops,
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index f18e5932aec4..a3eeaba156c5 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -446,6 +446,19 @@ xfs_imap_valid(
 {
         offset >>= inode->i_blkbits;
 
+        /*
+         * We have to make sure the cached mapping is within EOF to protect
+         * against eofblocks trimming on file release leaving us with a stale
+         * mapping. Otherwise, a page for a subsequent file extending buffered
+         * write could get picked up by this writeback cycle and written to the
+         * wrong blocks.
+         *
+         * Note that what we really want here is a generic mapping invalidation
+         * mechanism to protect us from arbitrary extent modifying contexts, not
+         * just eofblocks.
+         */
+        xfs_trim_extent_eof(imap, XFS_I(inode));
+
         return offset >= imap->br_startoff &&
                 offset < imap->br_startoff + imap->br_blockcount;
 }
@@ -735,6 +748,14 @@ xfs_vm_invalidatepage(
 {
         trace_xfs_invalidatepage(page->mapping->host, page, offset,
                                  length);
+
+        /*
+         * If we are invalidating the entire page, clear the dirty state from it
+         * so that we can check for attempts to release dirty cached pages in
+         * xfs_vm_releasepage().
+         */
+        if (offset == 0 && length >= PAGE_SIZE)
+                cancel_dirty_page(page);
         block_invalidatepage(page, offset, length);
 }
 
@@ -1190,25 +1211,27 @@ xfs_vm_releasepage(
          * mm accommodates an old ext3 case where clean pages might not have had
          * the dirty bit cleared. Thus, it can send actual dirty pages to
          * ->releasepage() via shrink_active_list(). Conversely,
-         * block_invalidatepage() can send pages that are still marked dirty
-         * but otherwise have invalidated buffers.
+         * block_invalidatepage() can send pages that are still marked dirty but
+         * otherwise have invalidated buffers.
          *
          * We want to release the latter to avoid unnecessary buildup of the
-         * LRU, skip the former and warn if we've left any lingering
-         * delalloc/unwritten buffers on clean pages. Skip pages with delalloc
-         * or unwritten buffers and warn if the page is not dirty. Otherwise
-         * try to release the buffers.
+         * LRU, so xfs_vm_invalidatepage() clears the page dirty flag on pages
+         * that are entirely invalidated and need to be released.  Hence the
+         * only time we should get dirty pages here is through
+         * shrink_active_list() and so we can simply skip those now.
+         *
+         * warn if we've left any lingering delalloc/unwritten buffers on clean
+         * or invalidated pages we are about to release.
          */
+        if (PageDirty(page))
+                return 0;
+
         xfs_count_page_state(page, &delalloc, &unwritten);
 
-        if (delalloc) {
-                WARN_ON_ONCE(!PageDirty(page));
+        if (WARN_ON_ONCE(delalloc))
                 return 0;
-        }
-        if (unwritten) {
-                WARN_ON_ONCE(!PageDirty(page));
+        if (WARN_ON_ONCE(unwritten))
                 return 0;
-        }
 
         return try_to_free_buffers(page);
 }
diff --git a/fs/xfs/xfs_fsmap.c b/fs/xfs/xfs_fsmap.c
index 560e0b40ac1b..43cfc07996a4 100644
--- a/fs/xfs/xfs_fsmap.c
+++ b/fs/xfs/xfs_fsmap.c
@@ -367,29 +367,6 @@ xfs_getfsmap_datadev_helper(
         return xfs_getfsmap_helper(cur->bc_tp, info, rec, rec_daddr);
 }
 
-/* Transform a rtbitmap "record" into a fsmap */
-STATIC int
-xfs_getfsmap_rtdev_rtbitmap_helper(
-        struct xfs_trans                *tp,
-        struct xfs_rtalloc_rec          *rec,
-        void                            *priv)
-{
-        struct xfs_mount                *mp = tp->t_mountp;
-        struct xfs_getfsmap_info        *info = priv;
-        struct xfs_rmap_irec            irec;
-        xfs_daddr_t                     rec_daddr;
-
-        rec_daddr = XFS_FSB_TO_BB(mp, rec->ar_startblock);
-
-        irec.rm_startblock = rec->ar_startblock;
-        irec.rm_blockcount = rec->ar_blockcount;
-        irec.rm_owner = XFS_RMAP_OWN_NULL;      /* "free" */
-        irec.rm_offset = 0;
-        irec.rm_flags = 0;
-
-        return xfs_getfsmap_helper(tp, info, &irec, rec_daddr);
-}
-
 /* Transform a bnobt irec into a fsmap */
 STATIC int
 xfs_getfsmap_datadev_bnobt_helper(
@@ -475,6 +452,30 @@ xfs_getfsmap_logdev(
         return xfs_getfsmap_helper(tp, info, &rmap, 0);
 }
 
+#ifdef CONFIG_XFS_RT
+/* Transform a rtbitmap "record" into a fsmap */
+STATIC int
+xfs_getfsmap_rtdev_rtbitmap_helper(
+        struct xfs_trans                *tp,
+        struct xfs_rtalloc_rec          *rec,
+        void                            *priv)
+{
+        struct xfs_mount                *mp = tp->t_mountp;
+        struct xfs_getfsmap_info        *info = priv;
+        struct xfs_rmap_irec            irec;
+        xfs_daddr_t                     rec_daddr;
+
+        rec_daddr = XFS_FSB_TO_BB(mp, rec->ar_startblock);
+
+        irec.rm_startblock = rec->ar_startblock;
+        irec.rm_blockcount = rec->ar_blockcount;
+        irec.rm_owner = XFS_RMAP_OWN_NULL;      /* "free" */
+        irec.rm_offset = 0;
+        irec.rm_flags = 0;
+
+        return xfs_getfsmap_helper(tp, info, &irec, rec_daddr);
+}
+
 /* Execute a getfsmap query against the realtime device. */
 STATIC int
 __xfs_getfsmap_rtdev(
@@ -521,7 +522,6 @@ __xfs_getfsmap_rtdev(
         return query_fn(tp, info);
 }
 
-#ifdef CONFIG_XFS_RT
 /* Actually query the realtime bitmap. */
 STATIC int
 xfs_getfsmap_rtdev_rtbitmap_query(
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 584cf2d573ba..f663022353c0 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1637,7 +1637,7 @@ xfs_fs_fill_super(
 
         /* version 5 superblocks support inode version counters. */
         if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5)
-                sb->s_flags |= MS_I_VERSION;
+                sb->s_flags |= SB_I_VERSION;
 
         if (mp->m_flags & XFS_MOUNT_DAX) {
                 xfs_warn(mp,
diff --git a/include/linux/filter.h b/include/linux/filter.h
index d29e58fde364..818a0b26249e 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -728,7 +728,7 @@ void xdp_do_flush_map(void);
 void bpf_warn_invalid_xdp_action(u32 act);
 void bpf_warn_invalid_xdp_redirect(u32 ifindex);
 
-struct sock *do_sk_redirect_map(void);
+struct sock *do_sk_redirect_map(struct sk_buff *skb);
 
 #ifdef CONFIG_BPF_JIT
 extern int bpf_jit_enable;
diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h
index fc7aae64dcde..331dc377c275 100644
--- a/include/linux/hid-sensor-hub.h
+++ b/include/linux/hid-sensor-hub.h
@@ -231,6 +231,7 @@ struct hid_sensor_common {
         unsigned usage_id;
         atomic_t data_ready;
         atomic_t user_requested_state;
+        atomic_t runtime_pm_enable;
         int poll_interval;
         int raw_hystersis;
         int latency_ms;
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index 7b0fa8b5c120..f9bd6e8ab138 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -131,28 +131,39 @@ struct st_sensor_das {
 };
 
 /**
+ * struct st_sensor_int_drdy - ST sensor device drdy line parameters
+ * @addr: address of INT drdy register.
+ * @mask: mask to enable drdy line.
+ * @addr_od: address to enable/disable Open Drain on the INT line.
+ * @mask_od: mask to enable/disable Open Drain on the INT line.
+ */
+struct st_sensor_int_drdy {
+        u8 addr;
+        u8 mask;
+        u8 addr_od;
+        u8 mask_od;
+};
+
+/**
  * struct st_sensor_data_ready_irq - ST sensor device data-ready interrupt
- * @addr: address of the register.
- * @mask_int1: mask to enable/disable IRQ on INT1 pin.
- * @mask_int2: mask to enable/disable IRQ on INT2 pin.
+ * struct int1 - data-ready configuration register for INT1 pin.
+ * struct int2 - data-ready configuration register for INT2 pin.
  * @addr_ihl: address to enable/disable active low on the INT lines.
  * @mask_ihl: mask to enable/disable active low on the INT lines.
- * @addr_od: address to enable/disable Open Drain on the INT lines.
- * @mask_od: mask to enable/disable Open Drain on the INT lines.
- * @addr_stat_drdy: address to read status of DRDY (data ready) interrupt
+ * struct stat_drdy - status register of DRDY (data ready) interrupt.
  * struct ig1 - represents the Interrupt Generator 1 of sensors.
  * @en_addr: address of the enable ig1 register.
  * @en_mask: mask to write the on/off value for enable.
  */
 struct st_sensor_data_ready_irq {
-        u8 addr;
-        u8 mask_int1;
-        u8 mask_int2;
+        struct st_sensor_int_drdy int1;
+        struct st_sensor_int_drdy int2;
         u8 addr_ihl;
         u8 mask_ihl;
-        u8 addr_od;
-        u8 mask_od;
-        u8 addr_stat_drdy;
+        struct {
+                u8 addr;
+                u8 mask;
+        } stat_drdy;
         struct {
                 u8 en_addr;
                 u8 en_mask;
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index c380daa40c0e..20b61347ea58 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -365,12 +365,9 @@ unsigned int iio_get_time_res(const struct iio_dev *indio_dev);
 #define INDIO_MAX_RAW_ELEMENTS          4
 
 struct iio_trigger; /* forward declaration */
-struct iio_dev;
 
 /**
  * struct iio_info - constant information about device
- * @driver_module:      module structure used to ensure correct
- *                      ownership of chrdevs etc
  * @event_attrs:        event control attributes
  * @attrs:              general purpose device attributes
  * @read_raw:           function to request a value from the device.
@@ -425,7 +422,6 @@ struct iio_dev;
  *                      were flushed and there was an error.
  **/
 struct iio_info {
-        struct module                   *driver_module;
         const struct attribute_group    *event_attrs;
         const struct attribute_group    *attrs;
 
@@ -518,6 +514,7 @@ struct iio_buffer_setup_ops {
 /**
  * struct iio_dev - industrial I/O device
  * @id:                 [INTERN] used to identify device internally
+ * @driver_module:      [INTERN] used to make it harder to undercut users
  * @modes:              [DRIVER] operating modes supported by device
  * @currentmode:        [DRIVER] current operating mode
  * @dev:                [DRIVER] device structure, should be assigned a parent
@@ -558,6 +555,7 @@ struct iio_buffer_setup_ops {
  */
 struct iio_dev {
         int                             id;
+        struct module                   *driver_module;
 
         int                             modes;
         int                             currentmode;
@@ -604,9 +602,34 @@ struct iio_dev {
 
 const struct iio_chan_spec
 *iio_find_channel_from_si(struct iio_dev *indio_dev, int si);
-int iio_device_register(struct iio_dev *indio_dev);
+/**
+ * iio_device_register() - register a device with the IIO subsystem
+ * @indio_dev:          Device structure filled by the device driver
+ **/
+#define iio_device_register(iio_dev) \
+        __iio_device_register((iio_dev), THIS_MODULE)
+int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod);
 void iio_device_unregister(struct iio_dev *indio_dev);
-int devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev);
+/**
+ * devm_iio_device_register - Resource-managed iio_device_register()
+ * @dev:        Device to allocate iio_dev for
+ * @indio_dev:  Device structure filled by the device driver
+ *
+ * Managed iio_device_register.  The IIO device registered with this
+ * function is automatically unregistered on driver detach. This function
+ * calls iio_device_register() internally. Refer to that function for more
+ * information.
+ *
+ * If an iio_dev registered with this function needs to be unregistered
+ * separately, devm_iio_device_unregister() must be used.
+ *
+ * RETURNS:
+ * 0 on success, negative error number on failure.
+ */
+#define devm_iio_device_register(dev, indio_dev) \
+        __devm_iio_device_register((dev), (indio_dev), THIS_MODULE);
+int __devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev,
+                               struct module *this_mod);
 void devm_iio_device_unregister(struct device *dev, struct iio_dev *indio_dev);
 int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp);
 int iio_device_claim_direct_mode(struct iio_dev *indio_dev);
diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
index 7142d8d6e470..7d5e44518379 100644
--- a/include/linux/iio/trigger.h
+++ b/include/linux/iio/trigger.h
@@ -23,7 +23,6 @@ struct iio_trigger;
 
 /**
  * struct iio_trigger_ops - operations structure for an iio_trigger.
- * @owner:              used to monitor usage count of the trigger.
  * @set_trigger_state:  switch on/off the trigger on demand
  * @try_reenable:       function to reenable the trigger when the
  *                      use count is zero (may be NULL)
@@ -34,7 +33,6 @@ struct iio_trigger;
  * instances of a given device.
  **/
 struct iio_trigger_ops {
-        struct module *owner;
         int (*set_trigger_state)(struct iio_trigger *trig, bool state);
         int (*try_reenable)(struct iio_trigger *trig);
         int (*validate_device)(struct iio_trigger *trig,
@@ -62,6 +60,7 @@ struct iio_trigger_ops {
  **/
 struct iio_trigger {
         const struct iio_trigger_ops    *ops;
+        struct module                   *owner;
         int                             id;
         const char                      *name;
         struct device                   dev;
@@ -87,14 +86,14 @@ static inline struct iio_trigger *to_iio_trigger(struct device *d)
 
 static inline void iio_trigger_put(struct iio_trigger *trig)
 {
-        module_put(trig->ops->owner);
+        module_put(trig->owner);
         put_device(&trig->dev);
 }
 
 static inline struct iio_trigger *iio_trigger_get(struct iio_trigger *trig)
 {
         get_device(&trig->dev);
-        __module_get(trig->ops->owner);
+        __module_get(trig->owner);
 
         return trig;
 }
@@ -127,10 +126,16 @@ static inline void *iio_trigger_get_drvdata(struct iio_trigger *trig)
  * iio_trigger_register() - register a trigger with the IIO core
  * @trig_info:  trigger to be registered
  **/
-int iio_trigger_register(struct iio_trigger *trig_info);
-
-int devm_iio_trigger_register(struct device *dev,
-                              struct iio_trigger *trig_info);
+#define iio_trigger_register(trig_info) \
+        __iio_trigger_register((trig_info), THIS_MODULE)
+int __iio_trigger_register(struct iio_trigger *trig_info,
+                           struct module *this_mod);
+
+#define devm_iio_trigger_register(dev, trig_info) \
+        __devm_iio_trigger_register((dev), (trig_info), THIS_MODULE)
+int __devm_iio_trigger_register(struct device *dev,
+                                struct iio_trigger *trig_info,
+                                struct module *this_mod);
 
 /**
  * iio_trigger_unregister() - unregister a trigger from the core
diff --git a/include/linux/input.h b/include/linux/input.h
index fb5e23c7ed98..7c7516eb7d76 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -234,6 +234,10 @@ struct input_dev {
 #error "SW_MAX and INPUT_DEVICE_ID_SW_MAX do not match"
 #endif
 
+#if INPUT_PROP_MAX != INPUT_DEVICE_ID_PROP_MAX
+#error "INPUT_PROP_MAX and INPUT_DEVICE_ID_PROP_MAX do not match"
+#endif
+
 #define INPUT_DEVICE_ID_MATCH_DEVICE \
         (INPUT_DEVICE_ID_MATCH_BUS | INPUT_DEVICE_ID_MATCH_VENDOR | INPUT_DEVICE_ID_MATCH_PRODUCT)
 #define INPUT_DEVICE_ID_MATCH_DEVICE_AND_VERSION \
@@ -469,6 +473,9 @@ int input_get_keycode(struct input_dev *dev, struct input_keymap_entry *ke);
 int input_set_keycode(struct input_dev *dev,
                       const struct input_keymap_entry *ke);
 
+bool input_match_device_id(const struct input_dev *dev,
+                           const struct input_device_id *id);
+
 void input_enable_softrepeat(struct input_dev *dev, int delay, int period);
 
 extern struct class input_class;
diff --git a/include/linux/irq.h b/include/linux/irq.h
index d4728bf6a537..5ad10948ea95 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -1009,7 +1009,7 @@ void irq_gc_mask_clr_bit(struct irq_data *d);
 void irq_gc_unmask_enable_reg(struct irq_data *d);
 void irq_gc_ack_set_bit(struct irq_data *d);
 void irq_gc_ack_clr_bit(struct irq_data *d);
-void irq_gc_mask_disable_reg_and_ack(struct irq_data *d);
+void irq_gc_mask_disable_and_ack_set(struct irq_data *d);
 void irq_gc_eoi(struct irq_data *d);
 int irq_gc_set_wake(struct irq_data *d, unsigned int on);
 
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
index 1ea576c8126f..14b74f22d43c 100644
--- a/include/linux/irqchip/arm-gic-v3.h
+++ b/include/linux/irqchip/arm-gic-v3.h
@@ -372,6 +372,8 @@
 #define GITS_BASER_ENTRY_SIZE_SHIFT             (48)
 #define GITS_BASER_ENTRY_SIZE(r)        ((((r) >> GITS_BASER_ENTRY_SIZE_SHIFT) & 0x1f) + 1)
 #define GITS_BASER_ENTRY_SIZE_MASK      GENMASK_ULL(52, 48)
+#define GITS_BASER_PHYS_52_to_48(phys)                                  \
+        (((phys) & GENMASK_ULL(47, 16)) | (((phys) >> 48) & 0xf) << 12)
 #define GITS_BASER_SHAREABILITY_SHIFT   (10)
 #define GITS_BASER_InnerShareable                                       \
         GIC_BASER_SHAREABILITY(GITS_BASER, InnerShareable)
diff --git a/include/linux/key.h b/include/linux/key.h
index e315e16b6ff8..8a15cabe928d 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -138,6 +138,11 @@ struct key_restriction {
         struct key_type *keytype;
 };
 
+enum key_state {
+        KEY_IS_UNINSTANTIATED,
+        KEY_IS_POSITIVE,                /* Positively instantiated */
+};
+
 /*****************************************************************************/
 /*
  * authentication token / access credential / keyring
@@ -169,6 +174,7 @@ struct key {
                                                  * - may not match RCU dereferenced payload
                                                  * - payload should contain own length
                                                  */
+        short                   state;          /* Key state (+) or rejection error (-) */
 
 #ifdef KEY_DEBUGGING
         unsigned                magic;
@@ -176,18 +182,16 @@ struct key {
 #endif
 
         unsigned long           flags;          /* status flags (change with bitops) */
-#define KEY_FLAG_INSTANTIATED   0       /* set if key has been instantiated */
-#define KEY_FLAG_DEAD           1       /* set if key type has been deleted */
-#define KEY_FLAG_REVOKED        2       /* set if key had been revoked */
-#define KEY_FLAG_IN_QUOTA       3       /* set if key consumes quota */
-#define KEY_FLAG_USER_CONSTRUCT 4       /* set if key is being constructed in userspace */
-#define KEY_FLAG_NEGATIVE       5       /* set if key is negative */
-#define KEY_FLAG_ROOT_CAN_CLEAR 6       /* set if key can be cleared by root without permission */
-#define KEY_FLAG_INVALIDATED    7       /* set if key has been invalidated */
-#define KEY_FLAG_BUILTIN        8       /* set if key is built in to the kernel */
-#define KEY_FLAG_ROOT_CAN_INVAL 9       /* set if key can be invalidated by root without permission */
-#define KEY_FLAG_KEEP           10      /* set if key should not be removed */
-#define KEY_FLAG_UID_KEYRING    11      /* set if key is a user or user session keyring */
+#define KEY_FLAG_DEAD           0       /* set if key type has been deleted */
+#define KEY_FLAG_REVOKED        1       /* set if key had been revoked */
+#define KEY_FLAG_IN_QUOTA       2       /* set if key consumes quota */
+#define KEY_FLAG_USER_CONSTRUCT 3       /* set if key is being constructed in userspace */
+#define KEY_FLAG_ROOT_CAN_CLEAR 4       /* set if key can be cleared by root without permission */
+#define KEY_FLAG_INVALIDATED    5       /* set if key has been invalidated */
+#define KEY_FLAG_BUILTIN        6       /* set if key is built in to the kernel */
+#define KEY_FLAG_ROOT_CAN_INVAL 7       /* set if key can be invalidated by root without permission */
+#define KEY_FLAG_KEEP           8       /* set if key should not be removed */
+#define KEY_FLAG_UID_KEYRING    9       /* set if key is a user or user session keyring */
 
         /* the key type and key description string
          * - the desc is used to match a key against search criteria
@@ -213,7 +217,6 @@ struct key {
                         struct list_head name_link;
                         struct assoc_array keys;
                 };
-                int reject_error;
         };
 
         /* This is set on a keyring to restrict the addition of a link to a key
@@ -353,17 +356,27 @@ extern void key_set_timeout(struct key *, unsigned);
 #define KEY_NEED_SETATTR 0x20   /* Require permission to change attributes */
 #define KEY_NEED_ALL    0x3f    /* All the above permissions */
 
+static inline short key_read_state(const struct key *key)
+{
+        /* Barrier versus mark_key_instantiated(). */
+        return smp_load_acquire(&key->state);
+}
+
 /**
- * key_is_instantiated - Determine if a key has been positively instantiated
+ * key_is_positive - Determine if a key has been positively instantiated
  * @key: The key to check.
  *
  * Return true if the specified key has been positively instantiated, false
  * otherwise.
  */
-static inline bool key_is_instantiated(const struct key *key)
+static inline bool key_is_positive(const struct key *key)
+{
+        return key_read_state(key) == KEY_IS_POSITIVE;
+}
+
+static inline bool key_is_negative(const struct key *key)
 {
-        return test_bit(KEY_FLAG_INSTANTIATED, &key->flags) &&
-                !test_bit(KEY_FLAG_NEGATIVE, &key->flags);
+        return key_read_state(key) < 0;
 }
 
 #define dereference_key_rcu(KEY)                                        \
diff --git a/include/linux/mbus.h b/include/linux/mbus.h
index 0d3f14fd2621..4773145246ed 100644
--- a/include/linux/mbus.h
+++ b/include/linux/mbus.h
@@ -31,8 +31,8 @@ struct mbus_dram_target_info
         struct mbus_dram_window {
                 u8      cs_index;
                 u8      mbus_attr;
-                u32     base;
-                u32     size;
+                u64     base;
+                u64     size;
         } cs[4];
 };
 
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 46f4ecf5479a..1861ea8dba77 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -445,6 +445,9 @@ struct mm_struct {
         unsigned long flags; /* Must use atomic bitops to access the bits */
 
         struct core_state *core_state; /* coredumping support */
+#ifdef CONFIG_MEMBARRIER
+        atomic_t membarrier_state;
+#endif
 #ifdef CONFIG_AIO
         spinlock_t                      ioctx_lock;
         struct kioctx_table __rcu       *ioctx_table;
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 694cebb50f72..2657f9f51536 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -293,6 +293,7 @@ struct pcmcia_device_id {
 #define INPUT_DEVICE_ID_SND_MAX         0x07
 #define INPUT_DEVICE_ID_FF_MAX          0x7f
 #define INPUT_DEVICE_ID_SW_MAX          0x0f
+#define INPUT_DEVICE_ID_PROP_MAX        0x1f
 
 #define INPUT_DEVICE_ID_MATCH_BUS       1
 #define INPUT_DEVICE_ID_MATCH_VENDOR    2
@@ -308,6 +309,7 @@ struct pcmcia_device_id {
 #define INPUT_DEVICE_ID_MATCH_SNDBIT    0x0400
 #define INPUT_DEVICE_ID_MATCH_FFBIT     0x0800
 #define INPUT_DEVICE_ID_MATCH_SWBIT     0x1000
+#define INPUT_DEVICE_ID_MATCH_PROPBIT   0x2000
 
 struct input_device_id {
 
@@ -327,6 +329,7 @@ struct input_device_id {
         kernel_ulong_t sndbit[INPUT_DEVICE_ID_SND_MAX / BITS_PER_LONG + 1];
         kernel_ulong_t ffbit[INPUT_DEVICE_ID_FF_MAX / BITS_PER_LONG + 1];
         kernel_ulong_t swbit[INPUT_DEVICE_ID_SW_MAX / BITS_PER_LONG + 1];
+        kernel_ulong_t propbit[INPUT_DEVICE_ID_PROP_MAX / BITS_PER_LONG + 1];
 
         kernel_ulong_t driver_info;
 };
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index f535779d9dc1..2eaac7d75af4 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3694,6 +3694,9 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
                                     unsigned char name_assign_type,
                                     void (*setup)(struct net_device *),
                                     unsigned int txqs, unsigned int rxqs);
+int dev_get_valid_name(struct net *net, struct net_device *dev,
+                       const char *name);
+
 #define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
         alloc_netdev_mqs(sizeof_priv, name, name_assign_type, setup, 1, 1)
 
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
index b1fd8bf85fdc..2bea1d5e9930 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
@@ -276,7 +276,7 @@ static inline void list_splice_tail_init_rcu(struct list_head *list,
 #define list_entry_rcu(ptr, type, member) \
         container_of(lockless_dereference(ptr), type, member)
 
-/**
+/*
  * Where are list_empty_rcu() and list_first_entry_rcu()?
  *
  * Implementing those functions following their counterparts list_empty() and
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index de50d8a4cf41..1a9f70d44af9 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -523,7 +523,7 @@ static inline void rcu_preempt_sleep_check(void) { }
  * Return the value of the specified RCU-protected pointer, but omit
  * both the smp_read_barrier_depends() and the READ_ONCE().  This
  * is useful in cases where update-side locks prevent the value of the
- * pointer from changing.  Please note that this primitive does -not-
+ * pointer from changing.  Please note that this primitive does *not*
  * prevent the compiler from repeating this reference or combining it
  * with other references, so it should not be used without protection
  * of appropriate locks.
@@ -568,7 +568,7 @@ static inline void rcu_preempt_sleep_check(void) { }
  * is handed off from RCU to some other synchronization mechanism, for
  * example, reference counting or locking.  In C11, it would map to
  * kill_dependency().  It could be used as follows:
- *
+ * ``
  *      rcu_read_lock();
  *      p = rcu_dereference(gp);
  *      long_lived = is_long_lived(p);
@@ -579,6 +579,7 @@ static inline void rcu_preempt_sleep_check(void) { }
  *                      p = rcu_pointer_handoff(p);
  *      }
  *      rcu_read_unlock();
+ *``
  */
 #define rcu_pointer_handoff(p) (p)
 
@@ -778,18 +779,21 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)
 
 /**
  * RCU_INIT_POINTER() - initialize an RCU protected pointer
+ * @p: The pointer to be initialized.
+ * @v: The value to initialized the pointer to.
  *
  * Initialize an RCU-protected pointer in special cases where readers
  * do not need ordering constraints on the CPU or the compiler.  These
  * special cases are:
  *
- * 1.   This use of RCU_INIT_POINTER() is NULLing out the pointer -or-
+ * 1.   This use of RCU_INIT_POINTER() is NULLing out the pointer *or*
  * 2.   The caller has taken whatever steps are required to prevent
- *      RCU readers from concurrently accessing this pointer -or-
+ *      RCU readers from concurrently accessing this pointer *or*
  * 3.   The referenced data structure has already been exposed to
- *      readers either at compile time or via rcu_assign_pointer() -and-
- *      a.      You have not made -any- reader-visible changes to
- *              this structure since then -or-
+ *      readers either at compile time or via rcu_assign_pointer() *and*
+ *
+ *      a.      You have not made *any* reader-visible changes to
+ *              this structure since then *or*
  *      b.      It is OK for readers accessing this structure from its
  *              new location to see the old state of the structure.  (For
  *              example, the changes were to statistical counters or to
@@ -805,7 +809,7 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)
  * by a single external-to-structure RCU-protected pointer, then you may
  * use RCU_INIT_POINTER() to initialize the internal RCU-protected
  * pointers, but you must use rcu_assign_pointer() to initialize the
- * external-to-structure pointer -after- you have completely initialized
+ * external-to-structure pointer *after* you have completely initialized
  * the reader-accessible portions of the linked structure.
  *
  * Note that unlike rcu_assign_pointer(), RCU_INIT_POINTER() provides no
@@ -819,6 +823,8 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)
 
 /**
  * RCU_POINTER_INITIALIZER() - statically initialize an RCU protected pointer
+ * @p: The pointer to be initialized.
+ * @v: The value to initialized the pointer to.
  *
  * GCC-style initialization for an RCU-protected pointer in a structure field.
  */
diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
index ae53e413fb13..ab9bf7b73954 100644
--- a/include/linux/sched/mm.h
+++ b/include/linux/sched/mm.h
@@ -211,4 +211,20 @@ static inline void memalloc_noreclaim_restore(unsigned int flags)
         current->flags = (current->flags & ~PF_MEMALLOC) | flags;
 }
 
+#ifdef CONFIG_MEMBARRIER
+enum {
+        MEMBARRIER_STATE_PRIVATE_EXPEDITED_READY        = (1U << 0),
+        MEMBARRIER_STATE_SWITCH_MM                      = (1U << 1),
+};
+
+static inline void membarrier_execve(struct task_struct *t)
+{
+        atomic_set(&t->mm->membarrier_state, 0);
+}
+#else
+static inline void membarrier_execve(struct task_struct *t)
+{
+}
+#endif
+
 #endif /* _LINUX_SCHED_MM_H */
diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index 39af9bc0f653..62be8966e837 100644
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -78,6 +78,7 @@ void synchronize_srcu(struct srcu_struct *sp);
 
 /**
  * srcu_read_lock_held - might we be in SRCU read-side critical section?
+ * @sp: The srcu_struct structure to check
  *
  * If CONFIG_DEBUG_LOCK_ALLOC is selected, returns nonzero iff in an SRCU
  * read-side critical section.  In absence of CONFIG_DEBUG_LOCK_ALLOC,
diff --git a/drivers/staging/typec/pd.h b/include/linux/usb/pd.h
index 30b32ad72acd..e00051ced806 100644
--- a/drivers/staging/typec/pd.h
+++ b/include/linux/usb/pd.h
@@ -104,6 +104,11 @@ static inline unsigned int pd_header_msgid_le(__le16 header)
 
 #define PD_MAX_PAYLOAD          7
 
+/**
+ * struct pd_message - PD message as seen on wire
+ * @header:     PD message header
+ * @payload:    PD message payload
+ */
 struct pd_message {
         __le16 header;
         __le32 payload[PD_MAX_PAYLOAD];
diff --git a/drivers/staging/typec/pd_bdo.h b/include/linux/usb/pd_bdo.h
index 90b94d9fea5d..90b94d9fea5d 100644
--- a/drivers/staging/typec/pd_bdo.h
+++ b/include/linux/usb/pd_bdo.h
diff --git a/drivers/staging/typec/pd_vdo.h b/include/linux/usb/pd_vdo.h
index d92259f8de0a..d92259f8de0a 100644
--- a/drivers/staging/typec/pd_vdo.h
+++ b/include/linux/usb/pd_vdo.h
diff --git a/drivers/staging/typec/tcpm.h b/include/linux/usb/tcpm.h
index 7e9a6b7b5cd6..073197f0d2bb 100644
--- a/drivers/staging/typec/tcpm.h
+++ b/include/linux/usb/tcpm.h
@@ -54,6 +54,27 @@ enum tcpm_transmit_type {
         TCPC_TX_BIST_MODE_2 = 7
 };
 
+/**
+ * struct tcpc_config - Port configuration
+ * @src_pdo:    PDO parameters sent to port partner as response to
+ *              PD_CTRL_GET_SOURCE_CAP message
+ * @nr_src_pdo: Number of entries in @src_pdo
+ * @snk_pdo:    PDO parameters sent to partner as response to
+ *              PD_CTRL_GET_SINK_CAP message
+ * @nr_snk_pdo: Number of entries in @snk_pdo
+ * @max_snk_mv: Maximum acceptable sink voltage in mV
+ * @max_snk_ma: Maximum sink current in mA
+ * @max_snk_mw: Maximum required sink power in mW
+ * @operating_snk_mw:
+ *              Required operating sink power in mW
+ * @type:       Port type (TYPEC_PORT_DFP, TYPEC_PORT_UFP, or
+ *              TYPEC_PORT_DRP)
+ * @default_role:
+ *              Default port role (TYPEC_SINK or TYPEC_SOURCE).
+ *              Set to TYPEC_NO_PREFERRED_ROLE if no default role.
+ * @try_role_hw:True if try.{Src,Snk} is implemented in hardware
+ * @alt_modes:  List of supported alternate modes
+ */
 struct tcpc_config {
         const u32 *src_pdo;
         unsigned int nr_src_pdo;
@@ -79,7 +100,6 @@ struct tcpc_config {
 enum tcpc_usb_switch {
         TCPC_USB_SWITCH_CONNECT,
         TCPC_USB_SWITCH_DISCONNECT,
-        TCPC_USB_SWITCH_RESTORE,        /* TODO FIXME */
 };
 
 /* Mux state attributes */
@@ -104,17 +124,40 @@ struct tcpc_mux_dev {
         void *priv_data;
 };
 
+/**
+ * struct tcpc_dev - Port configuration and callback functions
+ * @config:     Pointer to port configuration
+ * @get_vbus:   Called to read current VBUS state
+ * @get_current_limit:
+ *              Optional; called by the tcpm core when configured as a snk
+ *              and cc=Rp-def. This allows the tcpm to provide a fallback
+ *              current-limit detection method for the cc=Rp-def case.
+ *              For example, some tcpcs may include BC1.2 charger detection
+ *              and use that in this case.
+ * @set_cc:     Called to set value of CC pins
+ * @get_cc:     Called to read current CC pin values
+ * @set_polarity:
+ *              Called to set polarity
+ * @set_vconn:  Called to enable or disable VCONN
+ * @set_vbus:   Called to enable or disable VBUS
+ * @set_current_limit:
+ *              Optional; called to set current limit as negotiated
+ *              with partner.
+ * @set_pd_rx:  Called to enable or disable reception of PD messages
+ * @set_roles:  Called to set power and data roles
+ * @start_drp_toggling:
+ *              Optional; if supported by hardware, called to start DRP
+ *              toggling. DRP toggling is stopped automatically if
+ *              a connection is established.
+ * @try_role:   Optional; called to set a preferred role
+ * @pd_transmit:Called to transmit PD message
+ * @mux:        Pointer to multiplexer data
+ */
 struct tcpc_dev {
         const struct tcpc_config *config;
 
         int (*init)(struct tcpc_dev *dev);
         int (*get_vbus)(struct tcpc_dev *dev);
-        /*
-         * This optional callback gets called by the tcpm core when configured
-         * as a snk and cc=Rp-def. This allows the tcpm to provide a fallback
-         * current-limit detection method for the cc=Rp-def case. E.g. some
-         * tcpcs may include BC1.2 charger detection and use that in this case.
-         */
         int (*get_current_limit)(struct tcpc_dev *dev);
         int (*set_cc)(struct tcpc_dev *dev, enum typec_cc_status cc);
         int (*get_cc)(struct tcpc_dev *dev, enum typec_cc_status *cc1,
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index aa95053dfc78..425752f768d2 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -96,7 +96,7 @@ struct inet_request_sock {
         kmemcheck_bitfield_end(flags);
         u32                     ir_mark;
         union {
-                struct ip_options_rcu   *opt;
+                struct ip_options_rcu __rcu     *ireq_opt;
 #if IS_ENABLED(CONFIG_IPV6)
                 struct {
                         struct ipv6_txoptions   *ipv6_opt;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 89974c5286d8..b1ef98ebce53 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -840,6 +840,11 @@ struct tcp_skb_cb {
                         struct inet6_skb_parm   h6;
 #endif
                 } header;       /* For incoming skbs */
+                struct {
+                        __u32 key;
+                        __u32 flags;
+                        struct bpf_map *map;
+                } bpf;
         };
 };
 
diff --git a/include/sound/control.h b/include/sound/control.h
index bd7246de58e7..a1f1152bc687 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -248,6 +248,9 @@ int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kctl,
                              void *private_data);
 void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only);
 #define snd_ctl_sync_vmaster_hook(kctl) snd_ctl_sync_vmaster(kctl, true)
+int snd_ctl_apply_vmaster_slaves(struct snd_kcontrol *kctl,
+                                 int (*func)(struct snd_kcontrol *, void *),
+                                 void *arg);
 
 /*
  * Helper functions for jack-detection controls
diff --git a/include/uapi/linux/membarrier.h b/include/uapi/linux/membarrier.h
index 6d47b3249d8a..4e01ad7ffe98 100644
--- a/include/uapi/linux/membarrier.h
+++ b/include/uapi/linux/membarrier.h
@@ -52,21 +52,30 @@
  *                          (non-running threads are de facto in such a
  *                          state). This only covers threads from the
  *                          same processes as the caller thread. This
- *                          command returns 0. The "expedited" commands
- *                          complete faster than the non-expedited ones,
- *                          they never block, but have the downside of
- *                          causing extra overhead.
+ *                          command returns 0 on success. The
+ *                          "expedited" commands complete faster than
+ *                          the non-expedited ones, they never block,
+ *                          but have the downside of causing extra
+ *                          overhead. A process needs to register its
+ *                          intent to use the private expedited command
+ *                          prior to using it, otherwise this command
+ *                          returns -EPERM.
+ * @MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED:
+ *                          Register the process intent to use
+ *                          MEMBARRIER_CMD_PRIVATE_EXPEDITED. Always
+ *                          returns 0.
  *
  * Command to be passed to the membarrier system call. The commands need to
  * be a single bit each, except for MEMBARRIER_CMD_QUERY which is assigned to
  * the value 0.
  */
 enum membarrier_cmd {
-        MEMBARRIER_CMD_QUERY                    = 0,
-        MEMBARRIER_CMD_SHARED                   = (1 << 0),
+        MEMBARRIER_CMD_QUERY                            = 0,
+        MEMBARRIER_CMD_SHARED                           = (1 << 0),
         /* reserved for MEMBARRIER_CMD_SHARED_EXPEDITED (1 << 1) */
         /* reserved for MEMBARRIER_CMD_PRIVATE (1 << 2) */
-        MEMBARRIER_CMD_PRIVATE_EXPEDITED        = (1 << 3),
+        MEMBARRIER_CMD_PRIVATE_EXPEDITED                = (1 << 3),
+        MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED       = (1 << 4),
 };
 
 #endif /* _UAPI_LINUX_MEMBARRIER_H */
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c
index 98c0f00c3f5e..e2636737b69b 100644
--- a/kernel/bpf/arraymap.c
+++ b/kernel/bpf/arraymap.c
@@ -98,7 +98,7 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr)
         array_size += (u64) attr->max_entries * elem_size * num_possible_cpus();
 
         if (array_size >= U32_MAX - PAGE_SIZE ||
-            elem_size > PCPU_MIN_UNIT_SIZE || bpf_array_alloc_percpu(array)) {
+            bpf_array_alloc_percpu(array)) {
                 bpf_map_area_free(array);
                 return ERR_PTR(-ENOMEM);
         }
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index e093d9a2c4dd..e745d6a88224 100644
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -69,7 +69,7 @@ static LIST_HEAD(dev_map_list);
 
 static u64 dev_map_bitmap_size(const union bpf_attr *attr)
 {
-        return BITS_TO_LONGS(attr->max_entries) * sizeof(unsigned long);
+        return BITS_TO_LONGS((u64) attr->max_entries) * sizeof(unsigned long);
 }
 
 static struct bpf_map *dev_map_alloc(union bpf_attr *attr)
@@ -78,6 +78,9 @@ static struct bpf_map *dev_map_alloc(union bpf_attr *attr)
         int err = -EINVAL;
         u64 cost;
 
+        if (!capable(CAP_NET_ADMIN))
+                return ERR_PTR(-EPERM);
+
         /* check sanity of attributes */
         if (attr->max_entries == 0 || attr->key_size != 4 ||
             attr->value_size != 4 || attr->map_flags & ~BPF_F_NUMA_NODE)
@@ -111,8 +114,9 @@ static struct bpf_map *dev_map_alloc(union bpf_attr *attr)
         err = -ENOMEM;
 
         /* A per cpu bitfield with a bit per possible net device */
-        dtab->flush_needed = __alloc_percpu(dev_map_bitmap_size(attr),
-                                            __alignof__(unsigned long));
+        dtab->flush_needed = __alloc_percpu_gfp(dev_map_bitmap_size(attr),
+                                                __alignof__(unsigned long),
+                                                GFP_KERNEL | __GFP_NOWARN);
         if (!dtab->flush_needed)
                 goto free_dtab;
 
diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c
index 431126f31ea3..6533f08d1238 100644
--- a/kernel/bpf/hashtab.c
+++ b/kernel/bpf/hashtab.c
@@ -317,10 +317,6 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr)
                  */
                 goto free_htab;
 
-        if (percpu && round_up(htab->map.value_size, 8) > PCPU_MIN_UNIT_SIZE)
-                /* make sure the size for pcpu_alloc() is reasonable */
-                goto free_htab;
-
         htab->elem_size = sizeof(struct htab_elem) +
                           round_up(htab->map.key_size, 8);
         if (percpu)
diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c
index 6424ce0e4969..2b6eb35ae5d3 100644
--- a/kernel/bpf/sockmap.c
+++ b/kernel/bpf/sockmap.c
@@ -39,6 +39,7 @@
 #include <linux/workqueue.h>
 #include <linux/list.h>
 #include <net/strparser.h>
+#include <net/tcp.h>
 
 struct bpf_stab {
         struct bpf_map map;
@@ -101,9 +102,16 @@ static int smap_verdict_func(struct smap_psock *psock, struct sk_buff *skb)
                 return SK_DROP;
 
         skb_orphan(skb);
+        /* We need to ensure that BPF metadata for maps is also cleared
+         * when we orphan the skb so that we don't have the possibility
+         * to reference a stale map.
+         */
+        TCP_SKB_CB(skb)->bpf.map = NULL;
         skb->sk = psock->sock;
         bpf_compute_data_end(skb);
+        preempt_disable();
         rc = (*prog->bpf_func)(skb, prog->insnsi);
+        preempt_enable();
         skb->sk = NULL;
 
         return rc;
@@ -114,17 +122,10 @@ static void smap_do_verdict(struct smap_psock *psock, struct sk_buff *skb)
         struct sock *sk;
         int rc;
 
-        /* Because we use per cpu values to feed input from sock redirect
-         * in BPF program to do_sk_redirect_map() call we need to ensure we
-         * are not preempted. RCU read lock is not sufficient in this case
-         * with CONFIG_PREEMPT_RCU enabled so we must be explicit here.
-         */
-        preempt_disable();
         rc = smap_verdict_func(psock, skb);
         switch (rc) {
         case SK_REDIRECT:
-                sk = do_sk_redirect_map();
-                preempt_enable();
+                sk = do_sk_redirect_map(skb);
                 if (likely(sk)) {
                         struct smap_psock *peer = smap_psock_sk(sk);
 
@@ -141,8 +142,6 @@ static void smap_do_verdict(struct smap_psock *psock, struct sk_buff *skb)
         /* Fall through and free skb otherwise */
         case SK_DROP:
         default:
-                if (rc != SK_REDIRECT)
-                        preempt_enable();
                 kfree_skb(skb);
         }
 }
@@ -487,6 +486,9 @@ static struct bpf_map *sock_map_alloc(union bpf_attr *attr)
         int err = -EINVAL;
         u64 cost;
 
+        if (!capable(CAP_NET_ADMIN))
+                return ERR_PTR(-EPERM);
+
         /* check sanity of attributes */
         if (attr->max_entries == 0 || attr->key_size != 4 ||
             attr->value_size != 4 || attr->map_flags & ~BPF_F_NUMA_NODE)
@@ -840,6 +842,12 @@ static int sock_map_update_elem(struct bpf_map *map,
                 return -EINVAL;
         }
 
+        if (skops.sk->sk_type != SOCK_STREAM ||
+            skops.sk->sk_protocol != IPPROTO_TCP) {
+                fput(socket->file);
+                return -EOPNOTSUPP;
+        }
+
         err = sock_map_ctx_update_elem(&skops, map, key, flags);
         fput(socket->file);
         return err;
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 8b8d6ba39e23..c48ca2a34b5e 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -1116,7 +1116,12 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn
                 /* ctx accesses must be at a fixed offset, so that we can
                  * determine what type of data were returned.
                  */
-                if (!tnum_is_const(reg->var_off)) {
+                if (reg->off) {
+                        verbose("dereference of modified ctx ptr R%d off=%d+%d, ctx+const is allowed, ctx+const+const is not\n",
+                                regno, reg->off, off - reg->off);
+                        return -EACCES;
+                }
+                if (!tnum_is_const(reg->var_off) || reg->var_off.value) {
                         char tn_buf[48];
 
                         tnum_strn(tn_buf, sizeof(tn_buf), reg->var_off);
@@ -1124,7 +1129,6 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn
                                 tn_buf, off, size);
                         return -EACCES;
                 }
-                off += reg->var_off.value;
                 err = check_ctx_access(env, insn_idx, off, size, t, &reg_type);
                 if (!err && t == BPF_READ && value_regno >= 0) {
                         /* ctx access returns either a scalar, or a
@@ -2426,12 +2430,15 @@ static int check_alu_op(struct bpf_verifier_env *env, struct bpf_insn *insn)
 }
 
 static void find_good_pkt_pointers(struct bpf_verifier_state *state,
-                                   struct bpf_reg_state *dst_reg)
+                                   struct bpf_reg_state *dst_reg,
+                                   bool range_right_open)
 {
         struct bpf_reg_state *regs = state->regs, *reg;
+        u16 new_range;
         int i;
 
-        if (dst_reg->off < 0)
+        if (dst_reg->off < 0 ||
+            (dst_reg->off == 0 && range_right_open))
                 /* This doesn't give us any range */
                 return;
 
@@ -2442,9 +2449,13 @@ static void find_good_pkt_pointers(struct bpf_verifier_state *state,
                  */
                 return;
 
-        /* LLVM can generate four kind of checks:
+        new_range = dst_reg->off;
+        if (range_right_open)
+                new_range--;
+
+        /* Examples for register markings:
          *
-         * Type 1/2:
+         * pkt_data in dst register:
          *
          *   r2 = r3;
          *   r2 += 8;
@@ -2461,7 +2472,7 @@ static void find_good_pkt_pointers(struct bpf_verifier_state *state,
          *     r2=pkt(id=n,off=8,r=0)
          *     r3=pkt(id=n,off=0,r=0)
          *
-         * Type 3/4:
+         * pkt_data in src register:
          *
          *   r2 = r3;
          *   r2 += 8;
@@ -2479,7 +2490,9 @@ static void find_good_pkt_pointers(struct bpf_verifier_state *state,
          *     r3=pkt(id=n,off=0,r=0)
          *
          * Find register r3 and mark its range as r3=pkt(id=n,off=0,r=8)
-         * so that range of bytes [r3, r3 + 8) is safe to access.
+         * or r3=pkt(id=n,off=0,r=8-1), so that range of bytes [r3, r3 + 8)
+         * and [r3, r3 + 8-1) respectively is safe to access depending on
+         * the check.
          */
 
         /* If our ids match, then we must have the same max_value.  And we
@@ -2490,14 +2503,14 @@ static void find_good_pkt_pointers(struct bpf_verifier_state *state,
         for (i = 0; i < MAX_BPF_REG; i++)
                 if (regs[i].type == PTR_TO_PACKET && regs[i].id == dst_reg->id)
                         /* keep the maximum range already checked */
-                        regs[i].range = max_t(u16, regs[i].range, dst_reg->off);
+                        regs[i].range = max(regs[i].range, new_range);
 
         for (i = 0; i < MAX_BPF_STACK; i += BPF_REG_SIZE) {
                 if (state->stack_slot_type[i] != STACK_SPILL)
                         continue;
                 reg = &state->spilled_regs[i / BPF_REG_SIZE];
                 if (reg->type == PTR_TO_PACKET && reg->id == dst_reg->id)
-                        reg->range = max_t(u16, reg->range, dst_reg->off);
+                        reg->range = max(reg->range, new_range);
         }
 }
 
@@ -2861,19 +2874,43 @@ static int check_cond_jmp_op(struct bpf_verifier_env *env,
         } else if (BPF_SRC(insn->code) == BPF_X && opcode == BPF_JGT &&
                    dst_reg->type == PTR_TO_PACKET &&
                    regs[insn->src_reg].type == PTR_TO_PACKET_END) {
-                find_good_pkt_pointers(this_branch, dst_reg);
+                /* pkt_data' > pkt_end */
+                find_good_pkt_pointers(this_branch, dst_reg, false);
+        } else if (BPF_SRC(insn->code) == BPF_X && opcode == BPF_JGT &&
+                   dst_reg->type == PTR_TO_PACKET_END &&
+                   regs[insn->src_reg].type == PTR_TO_PACKET) {
+                /* pkt_end > pkt_data' */
+                find_good_pkt_pointers(other_branch, &regs[insn->src_reg], true);
         } else if (BPF_SRC(insn->code) == BPF_X && opcode == BPF_JLT &&
                    dst_reg->type == PTR_TO_PACKET &&
                    regs[insn->src_reg].type == PTR_TO_PACKET_END) {
-                find_good_pkt_pointers(other_branch, dst_reg);
+                /* pkt_data' < pkt_end */
+                find_good_pkt_pointers(other_branch, dst_reg, true);
+        } else if (BPF_SRC(insn->code) == BPF_X && opcode == BPF_JLT &&
+                   dst_reg->type == PTR_TO_PACKET_END &&
+                   regs[insn->src_reg].type == PTR_TO_PACKET) {
+                /* pkt_end < pkt_data' */
+                find_good_pkt_pointers(this_branch, &regs[insn->src_reg], false);
+        } else if (BPF_SRC(insn->code) == BPF_X && opcode == BPF_JGE &&
+                   dst_reg->type == PTR_TO_PACKET &&
+                   regs[insn->src_reg].type == PTR_TO_PACKET_END) {
+                /* pkt_data' >= pkt_end */
+                find_good_pkt_pointers(this_branch, dst_reg, true);
         } else if (BPF_SRC(insn->code) == BPF_X && opcode == BPF_JGE &&
                    dst_reg->type == PTR_TO_PACKET_END &&
                    regs[insn->src_reg].type == PTR_TO_PACKET) {
-                find_good_pkt_pointers(other_branch, &regs[insn->src_reg]);
+                /* pkt_end >= pkt_data' */
+                find_good_pkt_pointers(other_branch, &regs[insn->src_reg], false);
+        } else if (BPF_SRC(insn->code) == BPF_X && opcode == BPF_JLE &&
+                   dst_reg->type == PTR_TO_PACKET &&
+                   regs[insn->src_reg].type == PTR_TO_PACKET_END) {
+                /* pkt_data' <= pkt_end */
+                find_good_pkt_pointers(other_branch, dst_reg, false);
         } else if (BPF_SRC(insn->code) == BPF_X && opcode == BPF_JLE &&
                    dst_reg->type == PTR_TO_PACKET_END &&
                    regs[insn->src_reg].type == PTR_TO_PACKET) {
-                find_good_pkt_pointers(this_branch, &regs[insn->src_reg]);
+                /* pkt_end <= pkt_data' */
+                find_good_pkt_pointers(this_branch, &regs[insn->src_reg], true);
         } else if (is_pointer_value(env, insn->dst_reg)) {
                 verbose("R%d pointer comparison prohibited\n", insn->dst_reg);
                 return -EACCES;
diff --git a/kernel/cpu.c b/kernel/cpu.c
index d851df22f5c5..04892a82f6ac 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -632,6 +632,11 @@ cpuhp_invoke_ap_callback(int cpu, enum cpuhp_state state, bool bringup,
                 __cpuhp_kick_ap(st);
         }
 
+        /*
+         * Clean up the leftovers so the next hotplug operation wont use stale
+         * data.
+         */
+        st->node = st->last = NULL;
         return ret;
 }
 
diff --git a/kernel/exit.c b/kernel/exit.c
index cf28528842bc..f6cad39f35df 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1611,7 +1611,7 @@ SYSCALL_DEFINE5(waitid, int, which, pid_t, upid, struct siginfo __user *,
                 return err;
 
         if (!access_ok(VERIFY_WRITE, infop, sizeof(*infop)))
-                goto Efault;
+                return -EFAULT;
 
         user_access_begin();
         unsafe_put_user(signo, &infop->si_signo, Efault);
@@ -1739,7 +1739,7 @@ COMPAT_SYSCALL_DEFINE5(waitid,
                 return err;
 
         if (!access_ok(VERIFY_WRITE, infop, sizeof(*infop)))
-                goto Efault;
+                return -EFAULT;
 
         user_access_begin();
         unsafe_put_user(signo, &infop->si_signo, Efault);
diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c
index 5270a54b9fa4..c26c5bb6b491 100644
--- a/kernel/irq/generic-chip.c
+++ b/kernel/irq/generic-chip.c
@@ -135,17 +135,26 @@ void irq_gc_ack_clr_bit(struct irq_data *d)
 }
 
 /**
- * irq_gc_mask_disable_reg_and_ack - Mask and ack pending interrupt
+ * irq_gc_mask_disable_and_ack_set - Mask and ack pending interrupt
  * @d: irq_data
+ *
+ * This generic implementation of the irq_mask_ack method is for chips
+ * with separate enable/disable registers instead of a single mask
+ * register and where a pending interrupt is acknowledged by setting a
+ * bit.
+ *
+ * Note: This is the only permutation currently used.  Similar generic
+ * functions should be added here if other permutations are required.
  */
-void irq_gc_mask_disable_reg_and_ack(struct irq_data *d)
+void irq_gc_mask_disable_and_ack_set(struct irq_data *d)
 {
         struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
         struct irq_chip_type *ct = irq_data_get_chip_type(d);
         u32 mask = d->mask;
 
         irq_gc_lock(gc);
-        irq_reg_writel(gc, mask, ct->regs.mask);
+        irq_reg_writel(gc, mask, ct->regs.disable);
+        *ct->mask_cache &= ~mask;
         irq_reg_writel(gc, mask, ct->regs.ack);
         irq_gc_unlock(gc);
 }
diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
index 729a8706751d..6d5880089ff6 100644
--- a/kernel/rcu/srcutree.c
+++ b/kernel/rcu/srcutree.c
@@ -854,7 +854,7 @@ void __call_srcu(struct srcu_struct *sp, struct rcu_head *rhp,
 /**
  * call_srcu() - Queue a callback for invocation after an SRCU grace period
  * @sp: srcu_struct in queue the callback
- * @head: structure to be used for queueing the SRCU callback.
+ * @rhp: structure to be used for queueing the SRCU callback.
  * @func: function to be invoked after the SRCU grace period
  *
  * The callback function will be invoked some time after a full SRCU
diff --git a/kernel/rcu/sync.c b/kernel/rcu/sync.c
index 50d1861f7759..3f943efcf61c 100644
--- a/kernel/rcu/sync.c
+++ b/kernel/rcu/sync.c
@@ -85,6 +85,9 @@ void rcu_sync_init(struct rcu_sync *rsp, enum rcu_sync_type type)
 }
 
 /**
+ * rcu_sync_enter_start - Force readers onto slow path for multiple updates
+ * @rsp: Pointer to rcu_sync structure to use for synchronization
+ *
  * Must be called after rcu_sync_init() and before first use.
  *
  * Ensures rcu_sync_is_idle() returns false and rcu_sync_{enter,exit}()
@@ -142,7 +145,7 @@ void rcu_sync_enter(struct rcu_sync *rsp)
 
 /**
  * rcu_sync_func() - Callback function managing reader access to fastpath
- * @rsp: Pointer to rcu_sync structure to use for synchronization
+ * @rhp: Pointer to rcu_head in rcu_sync structure to use for synchronization
  *
  * This function is passed to one of the call_rcu() functions by
  * rcu_sync_exit(), so that it is invoked after a grace period following the
@@ -158,9 +161,9 @@ void rcu_sync_enter(struct rcu_sync *rsp)
  * rcu_sync_exit().  Otherwise, set all state back to idle so that readers
  * can again use their fastpaths.
  */
-static void rcu_sync_func(struct rcu_head *rcu)
+static void rcu_sync_func(struct rcu_head *rhp)
 {
-        struct rcu_sync *rsp = container_of(rcu, struct rcu_sync, cb_head);
+        struct rcu_sync *rsp = container_of(rhp, struct rcu_sync, cb_head);
         unsigned long flags;
 
         BUG_ON(rsp->gp_state != GP_PASSED);
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index b0ad62b0e7b8..3e3650e94ae6 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -3097,9 +3097,10 @@ __call_rcu(struct rcu_head *head, rcu_callback_t func,
  * read-side critical sections have completed. call_rcu_sched() assumes
  * that the read-side critical sections end on enabling of preemption
  * or on voluntary preemption.
- * RCU read-side critical sections are delimited by :
- *  - rcu_read_lock_sched() and rcu_read_unlock_sched(), OR
- *  - anything that disables preemption.
+ * RCU read-side critical sections are delimited by:
+ *
+ * - rcu_read_lock_sched() and rcu_read_unlock_sched(), OR
+ * - anything that disables preemption.
  *
  *  These may be nested.
  *
@@ -3124,11 +3125,12 @@ EXPORT_SYMBOL_GPL(call_rcu_sched);
  * handler. This means that read-side critical sections in process
  * context must not be interrupted by softirqs. This interface is to be
  * used when most of the read-side critical sections are in softirq context.
- * RCU read-side critical sections are delimited by :
- *  - rcu_read_lock() and  rcu_read_unlock(), if in interrupt context.
- *  OR
- *  - rcu_read_lock_bh() and rcu_read_unlock_bh(), if in process context.
- *  These may be nested.
+ * RCU read-side critical sections are delimited by:
+ *
+ * - rcu_read_lock() and  rcu_read_unlock(), if in interrupt context, OR
+ * - rcu_read_lock_bh() and rcu_read_unlock_bh(), if in process context.
+ *
+ * These may be nested.
  *
  * See the description of call_rcu() for more detailed information on
  * memory ordering guarantees.
diff --git a/kernel/sched/membarrier.c b/kernel/sched/membarrier.c
index a92fddc22747..dd7908743dab 100644
--- a/kernel/sched/membarrier.c
+++ b/kernel/sched/membarrier.c
@@ -18,6 +18,7 @@
 #include <linux/membarrier.h>
 #include <linux/tick.h>
 #include <linux/cpumask.h>
+#include <linux/atomic.h>
 
 #include "sched.h"      /* for cpu_rq(). */
 
@@ -26,21 +27,26 @@
  * except MEMBARRIER_CMD_QUERY.
  */
 #define MEMBARRIER_CMD_BITMASK  \
-        (MEMBARRIER_CMD_SHARED | MEMBARRIER_CMD_PRIVATE_EXPEDITED)
+        (MEMBARRIER_CMD_SHARED | MEMBARRIER_CMD_PRIVATE_EXPEDITED       \
+        | MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED)
 
 static void ipi_mb(void *info)
 {
         smp_mb();       /* IPIs should be serializing but paranoid. */
 }
 
-static void membarrier_private_expedited(void)
+static int membarrier_private_expedited(void)
 {
         int cpu;
         bool fallback = false;
         cpumask_var_t tmpmask;
 
+        if (!(atomic_read(&current->mm->membarrier_state)
+                        & MEMBARRIER_STATE_PRIVATE_EXPEDITED_READY))
+                return -EPERM;
+
         if (num_online_cpus() == 1)
-                return;
+                return 0;
 
         /*
          * Matches memory barriers around rq->curr modification in
@@ -94,6 +100,24 @@ static void membarrier_private_expedited(void)
          * rq->curr modification in scheduler.
          */
         smp_mb();       /* exit from system call is not a mb */
+        return 0;
+}
+
+static void membarrier_register_private_expedited(void)
+{
+        struct task_struct *p = current;
+        struct mm_struct *mm = p->mm;
+
+        /*
+         * We need to consider threads belonging to different thread
+         * groups, which use the same mm. (CLONE_VM but not
+         * CLONE_THREAD).
+         */
+        if (atomic_read(&mm->membarrier_state)
+                        & MEMBARRIER_STATE_PRIVATE_EXPEDITED_READY)
+                return;
+        atomic_or(MEMBARRIER_STATE_PRIVATE_EXPEDITED_READY,
+                        &mm->membarrier_state);
 }
 
 /**
@@ -144,7 +168,9 @@ SYSCALL_DEFINE2(membarrier, int, cmd, int, flags)
                         synchronize_sched();
                 return 0;
         case MEMBARRIER_CMD_PRIVATE_EXPEDITED:
-                membarrier_private_expedited();
+                return membarrier_private_expedited();
+        case MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED:
+                membarrier_register_private_expedited();
                 return 0;
         default:
                 return -EINVAL;
diff --git a/lib/digsig.c b/lib/digsig.c
index 03d7c63837ae..6ba6fcd92dd1 100644
--- a/lib/digsig.c
+++ b/lib/digsig.c
@@ -87,6 +87,12 @@ static int digsig_verify_rsa(struct key *key,
         down_read(&key->sem);
         ukp = user_key_payload_locked(key);
 
+        if (!ukp) {
+                /* key was revoked before we acquired its semaphore */
+                err = -EKEYREVOKED;
+                goto err1;
+        }
+
         if (ukp->datalen < sizeof(*pkh))
                 goto err1;
 
diff --git a/lib/ts_fsm.c b/lib/ts_fsm.c
index 5696a35184e4..69557c74ef9f 100644
--- a/lib/ts_fsm.c
+++ b/lib/ts_fsm.c
@@ -11,7 +11,7 @@
  * ==========================================================================
  *
  *   A finite state machine consists of n states (struct ts_fsm_token)
- *   representing the pattern as a finite automation. The data is read
+ *   representing the pattern as a finite automaton. The data is read
  *   sequentially on an octet basis. Every state token specifies the number
  *   of recurrences and the type of value accepted which can be either a
  *   specific character or ctype based set of characters. The available
diff --git a/lib/ts_kmp.c b/lib/ts_kmp.c
index 632f783e65f1..ffbe66cbb0ed 100644
--- a/lib/ts_kmp.c
+++ b/lib/ts_kmp.c
@@ -27,7 +27,7 @@
  *
  *   [1] Cormen, Leiserson, Rivest, Stein
  *       Introdcution to Algorithms, 2nd Edition, MIT Press
- *   [2] See finite automation theory
+ *   [2] See finite automaton theory
  */
 
 #include <linux/module.h>
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d5f3a62887cf..661f046ad318 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5828,21 +5828,6 @@ void mem_cgroup_sk_alloc(struct sock *sk)
         if (!mem_cgroup_sockets_enabled)
                 return;
 
-        /*
-         * Socket cloning can throw us here with sk_memcg already
-         * filled. It won't however, necessarily happen from
-         * process context. So the test for root memcg given
-         * the current task's memcg won't help us in this case.
-         *
-         * Respecting the original socket's memcg is a better
-         * decision in this case.
-         */
-        if (sk->sk_memcg) {
-                BUG_ON(mem_cgroup_is_root(sk->sk_memcg));
-                css_get(&sk->sk_memcg->css);
-                return;
-        }
-
         rcu_read_lock();
         memcg = mem_cgroup_from_task(current);
         if (memcg == root_mem_cgroup)
diff --git a/mm/percpu.c b/mm/percpu.c
index aa121cef76de..a0e0c82c1e4c 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1329,7 +1329,9 @@ static struct pcpu_chunk *pcpu_chunk_addr_search(void *addr)
  * @gfp: allocation flags
  *
  * Allocate percpu area of @size bytes aligned at @align.  If @gfp doesn't
- * contain %GFP_KERNEL, the allocation is atomic.
+ * contain %GFP_KERNEL, the allocation is atomic. If @gfp has __GFP_NOWARN
+ * then no warning will be triggered on invalid or failed allocation
+ * requests.
  *
  * RETURNS:
  * Percpu pointer to the allocated area on success, NULL on failure.
@@ -1337,10 +1339,11 @@ static struct pcpu_chunk *pcpu_chunk_addr_search(void *addr)
 static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved,
                                  gfp_t gfp)
 {
+        bool is_atomic = (gfp & GFP_KERNEL) != GFP_KERNEL;
+        bool do_warn = !(gfp & __GFP_NOWARN);
         static int warn_limit = 10;
         struct pcpu_chunk *chunk;
         const char *err;
-        bool is_atomic = (gfp & GFP_KERNEL) != GFP_KERNEL;
         int slot, off, cpu, ret;
         unsigned long flags;
         void __percpu *ptr;
@@ -1361,7 +1364,7 @@ static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved,
 
         if (unlikely(!size || size > PCPU_MIN_UNIT_SIZE || align > PAGE_SIZE ||
                      !is_power_of_2(align))) {
-                WARN(true, "illegal size (%zu) or align (%zu) for percpu allocation\n",
+                WARN(do_warn, "illegal size (%zu) or align (%zu) for percpu allocation\n",
                      size, align);
                 return NULL;
         }
@@ -1482,7 +1485,7 @@ fail_unlock:
 fail:
         trace_percpu_alloc_percpu_fail(reserved, is_atomic, size, align);
 
-        if (!is_atomic && warn_limit) {
+        if (!is_atomic && do_warn && warn_limit) {
                 pr_warn("allocation failed, size=%zu align=%zu atomic=%d, %s\n",
                         size, align, is_atomic, err);
                 dump_stack();
@@ -1507,7 +1510,9 @@ fail:
  *
  * Allocate zero-filled percpu area of @size bytes aligned at @align.  If
  * @gfp doesn't contain %GFP_KERNEL, the allocation doesn't block and can
- * be called from any context but is a lot more likely to fail.
+ * be called from any context but is a lot more likely to fail. If @gfp
+ * has __GFP_NOWARN then no warning will be triggered on invalid or failed
+ * allocation requests.
  *
  * RETURNS:
  * Percpu pointer to the allocated area on success, NULL on failure.
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 3bc890716c89..de2152730809 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -573,7 +573,7 @@ static int br_process_vlan_info(struct net_bridge *br,
                 }
                 *vinfo_last = NULL;
 
-                return 0;
+                return err;
         }
 
         return br_vlan_info(br, p, cmd, vinfo_curr);
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 88edac0f3e36..ecd5c703d11e 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -78,7 +78,7 @@ MODULE_PARM_DESC(stats_timer, "enable timer for statistics (default:on)");
 static struct kmem_cache *rcv_cache __read_mostly;
 
 /* table of registered CAN protocols */
-static const struct can_proto *proto_tab[CAN_NPROTO] __read_mostly;
+static const struct can_proto __rcu *proto_tab[CAN_NPROTO] __read_mostly;
 static DEFINE_MUTEX(proto_tab_lock);
 
 static atomic_t skbcounter = ATOMIC_INIT(0);
@@ -788,7 +788,7 @@ int can_proto_register(const struct can_proto *cp)
 
         mutex_lock(&proto_tab_lock);
 
-        if (proto_tab[proto]) {
+        if (rcu_access_pointer(proto_tab[proto])) {
                 pr_err("can: protocol %d already registered\n", proto);
                 err = -EBUSY;
         } else
@@ -812,7 +812,7 @@ void can_proto_unregister(const struct can_proto *cp)
         int proto = cp->protocol;
 
         mutex_lock(&proto_tab_lock);
-        BUG_ON(proto_tab[proto] != cp);
+        BUG_ON(rcu_access_pointer(proto_tab[proto]) != cp);
         RCU_INIT_POINTER(proto_tab[proto], NULL);
         mutex_unlock(&proto_tab_lock);
 
@@ -875,9 +875,14 @@ static int can_pernet_init(struct net *net)
         spin_lock_init(&net->can.can_rcvlists_lock);
         net->can.can_rx_alldev_list =
                 kzalloc(sizeof(struct dev_rcv_lists), GFP_KERNEL);
-
+        if (!net->can.can_rx_alldev_list)
+                goto out;
         net->can.can_stats = kzalloc(sizeof(struct s_stats), GFP_KERNEL);
+        if (!net->can.can_stats)
+                goto out_free_alldev_list;
         net->can.can_pstats = kzalloc(sizeof(struct s_pstats), GFP_KERNEL);
+        if (!net->can.can_pstats)
+                goto out_free_can_stats;
 
         if (IS_ENABLED(CONFIG_PROC_FS)) {
                 /* the statistics are updated every second (timer triggered) */
@@ -892,6 +897,13 @@ static int can_pernet_init(struct net *net)
         }
 
         return 0;
+
+ out_free_can_stats:
+        kfree(net->can.can_stats);
+ out_free_alldev_list:
+        kfree(net->can.can_rx_alldev_list);
+ out:
+        return -ENOMEM;
 }
 
 static void can_pernet_exit(struct net *net)
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 47a8748d953a..13690334efa3 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1493,13 +1493,14 @@ static int bcm_init(struct sock *sk)
 static int bcm_release(struct socket *sock)
 {
         struct sock *sk = sock->sk;
-        struct net *net = sock_net(sk);
+        struct net *net;
         struct bcm_sock *bo;
         struct bcm_op *op, *next;
 
-        if (sk == NULL)
+        if (!sk)
                 return 0;
 
+        net = sock_net(sk);
         bo = bcm_sk(sk);
 
         /* remove bcm_ops, timer, rx_unregister(), etc. */
diff --git a/net/core/dev.c b/net/core/dev.c
index 588b473194a8..11596a302a26 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1147,9 +1147,8 @@ static int dev_alloc_name_ns(struct net *net,
         return ret;
 }
 
-static int dev_get_valid_name(struct net *net,
-                              struct net_device *dev,
-                              const char *name)
+int dev_get_valid_name(struct net *net, struct net_device *dev,
+                       const char *name)
 {
         BUG_ON(!net);
 
@@ -1165,6 +1164,7 @@ static int dev_get_valid_name(struct net *net,
 
         return 0;
 }
+EXPORT_SYMBOL(dev_get_valid_name);
 
 /**
  *      dev_change_name - change name of a device
diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index 709a4e6fb447..f9c7a88cd981 100644
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
@@ -303,7 +303,18 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)
         case SIOCSIFTXQLEN:
                 if (ifr->ifr_qlen < 0)
                         return -EINVAL;
-                dev->tx_queue_len = ifr->ifr_qlen;
+                if (dev->tx_queue_len ^ ifr->ifr_qlen) {
+                        unsigned int orig_len = dev->tx_queue_len;
+
+                        dev->tx_queue_len = ifr->ifr_qlen;
+                        err = call_netdevice_notifiers(
+                                        NETDEV_CHANGE_TX_QUEUE_LEN, dev);
+                        err = notifier_to_errno(err);
+                        if (err) {
+                                dev->tx_queue_len = orig_len;
+                                return err;
+                        }
+                }
                 return 0;
 
         case SIOCSIFNAME:
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 3228411ada0f..9a9a3d77e327 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -436,7 +436,7 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,
 EXPORT_SYMBOL(ethtool_convert_link_mode_to_legacy_u32);
 
 /* return false if legacy contained non-0 deprecated fields
- * transceiver/maxtxpkt/maxrxpkt. rest of ksettings always updated
+ * maxtxpkt/maxrxpkt. rest of ksettings always updated
  */
 static bool
 convert_legacy_settings_to_link_ksettings(
@@ -451,8 +451,7 @@ convert_legacy_settings_to_link_ksettings(
          * deprecated legacy fields, and they should not use
          * %ETHTOOL_GLINKSETTINGS/%ETHTOOL_SLINKSETTINGS
          */
-        if (legacy_settings->transceiver ||
-            legacy_settings->maxtxpkt ||
+        if (legacy_settings->maxtxpkt ||
             legacy_settings->maxrxpkt)
                 retval = false;
 
diff --git a/net/core/filter.c b/net/core/filter.c
index 74b8c91fb5f4..aa0265997f93 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1839,31 +1839,31 @@ static const struct bpf_func_proto bpf_redirect_proto = {
         .arg2_type      = ARG_ANYTHING,
 };
 
-BPF_CALL_3(bpf_sk_redirect_map, struct bpf_map *, map, u32, key, u64, flags)
+BPF_CALL_4(bpf_sk_redirect_map, struct sk_buff *, skb,
+           struct bpf_map *, map, u32, key, u64, flags)
 {
-        struct redirect_info *ri = this_cpu_ptr(&redirect_info);
+        struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
 
         if (unlikely(flags))
                 return SK_ABORTED;
 
-        ri->ifindex = key;
-        ri->flags = flags;
-        ri->map = map;
+        tcb->bpf.key = key;
+        tcb->bpf.flags = flags;
+        tcb->bpf.map = map;
 
         return SK_REDIRECT;
 }
 
-struct sock *do_sk_redirect_map(void)
+struct sock *do_sk_redirect_map(struct sk_buff *skb)
 {
-        struct redirect_info *ri = this_cpu_ptr(&redirect_info);
+        struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
         struct sock *sk = NULL;
 
-        if (ri->map) {
-                sk = __sock_map_lookup_elem(ri->map, ri->ifindex);
+        if (tcb->bpf.map) {
+                sk = __sock_map_lookup_elem(tcb->bpf.map, tcb->bpf.key);
 
-                ri->ifindex = 0;
-                ri->map = NULL;
-                /* we do not clear flags for future lookup */
+                tcb->bpf.key = 0;
+                tcb->bpf.map = NULL;
         }
 
         return sk;
@@ -1873,9 +1873,10 @@ static const struct bpf_func_proto bpf_sk_redirect_map_proto = {
         .func           = bpf_sk_redirect_map,
         .gpl_only       = false,
         .ret_type       = RET_INTEGER,
-        .arg1_type      = ARG_CONST_MAP_PTR,
-        .arg2_type      = ARG_ANYTHING,
+        .arg1_type      = ARG_PTR_TO_CTX,
+        .arg2_type      = ARG_CONST_MAP_PTR,
         .arg3_type      = ARG_ANYTHING,
+        .arg4_type      = ARG_ANYTHING,
 };
 
 BPF_CALL_1(bpf_get_cgroup_classid, const struct sk_buff *, skb)
@@ -3683,7 +3684,6 @@ static bool sk_skb_is_valid_access(int off, int size,
 {
         if (type == BPF_WRITE) {
                 switch (off) {
-                case bpf_ctx_range(struct __sk_buff, mark):
                 case bpf_ctx_range(struct __sk_buff, tc_index):
                 case bpf_ctx_range(struct __sk_buff, priority):
                         break;
@@ -3693,6 +3693,7 @@ static bool sk_skb_is_valid_access(int off, int size,
         }
 
         switch (off) {
+        case bpf_ctx_range(struct __sk_buff, mark):
         case bpf_ctx_range(struct __sk_buff, tc_classid):
                 return false;
         case bpf_ctx_range(struct __sk_buff, data):
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index d4bcdcc68e92..5ace48926b19 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1483,7 +1483,10 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = {
         [IFLA_LINKINFO]         = { .type = NLA_NESTED },
         [IFLA_NET_NS_PID]       = { .type = NLA_U32 },
         [IFLA_NET_NS_FD]        = { .type = NLA_U32 },
-        [IFLA_IFALIAS]          = { .type = NLA_STRING, .len = IFALIASZ-1 },
+        /* IFLA_IFALIAS is a string, but policy is set to NLA_BINARY to
+         * allow 0-length string (needed to remove an alias).
+         */
+        [IFLA_IFALIAS]          = { .type = NLA_BINARY, .len = IFALIASZ - 1 },
         [IFLA_VFINFO_LIST]      = {. type = NLA_NESTED },
         [IFLA_VF_PORTS]         = { .type = NLA_NESTED },
         [IFLA_PORT_SELF]        = { .type = NLA_NESTED },
@@ -2093,7 +2096,7 @@ static int do_setlink(const struct sk_buff *skb,
                                 dev->tx_queue_len = orig_len;
                                 goto errout;
                         }
-                        status |= DO_SETLINK_NOTIFY;
+                        status |= DO_SETLINK_MODIFIED;
                 }
         }
 
@@ -2248,7 +2251,7 @@ static int do_setlink(const struct sk_buff *skb,
 
 errout:
         if (status & DO_SETLINK_MODIFIED) {
-                if (status & DO_SETLINK_NOTIFY)
+                if ((status & DO_SETLINK_NOTIFY) == DO_SETLINK_NOTIFY)
                         netdev_state_change(dev);
 
                 if (err < 0)
@@ -4279,13 +4282,17 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi
 
         switch (event) {
         case NETDEV_REBOOT:
+        case NETDEV_CHANGEMTU:
         case NETDEV_CHANGEADDR:
         case NETDEV_CHANGENAME:
         case NETDEV_FEAT_CHANGE:
         case NETDEV_BONDING_FAILOVER:
+        case NETDEV_POST_TYPE_CHANGE:
         case NETDEV_NOTIFY_PEERS:
+        case NETDEV_CHANGEUPPER:
         case NETDEV_RESEND_IGMP:
         case NETDEV_CHANGEINFODATA:
+        case NETDEV_CHANGE_TX_QUEUE_LEN:
                 rtmsg_ifinfo_event(RTM_NEWLINK, dev, 0, rtnl_get_event(event),
                                    GFP_KERNEL);
                 break;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 16982de649b9..24656076906d 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1124,9 +1124,13 @@ int skb_zerocopy_iter_stream(struct sock *sk, struct sk_buff *skb,
 
         err = __zerocopy_sg_from_iter(sk, skb, &msg->msg_iter, len);
         if (err == -EFAULT || (err == -EMSGSIZE && skb->len == orig_len)) {
+                struct sock *save_sk = skb->sk;
+
                 /* Streams do not free skb on error. Reset to prev state. */
                 msg->msg_iter = orig_iter;
+                skb->sk = sk;
                 ___pskb_trim(skb, orig_len);
+                skb->sk = save_sk;
                 return err;
         }
 
@@ -1896,7 +1900,7 @@ void *__pskb_pull_tail(struct sk_buff *skb, int delta)
         }
 
         /* If we need update frag list, we are in troubles.
-         * Certainly, it possible to add an offset to skb data,
+         * Certainly, it is possible to add an offset to skb data,
          * but taking into account that pulling is expected to
          * be very rare operation, it is worth to fight against
          * further bloating skb head and crucify ourselves here instead.
diff --git a/net/core/sock.c b/net/core/sock.c
index 23953b741a41..415f441c63b9 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1677,12 +1677,17 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
                 newsk->sk_dst_pending_confirm = 0;
                 newsk->sk_wmem_queued   = 0;
                 newsk->sk_forward_alloc = 0;
+
+                /* sk->sk_memcg will be populated at accept() time */
+                newsk->sk_memcg = NULL;
+
                 atomic_set(&newsk->sk_drops, 0);
                 newsk->sk_send_head     = NULL;
                 newsk->sk_userlocks     = sk->sk_userlocks & ~SOCK_BINDPORT_LOCK;
                 atomic_set(&newsk->sk_zckey, 0);
 
                 sock_reset_flag(newsk, SOCK_DONE);
+                cgroup_sk_alloc(&newsk->sk_cgrp_data);
 
                 rcu_read_lock();
                 filter = rcu_dereference(sk->sk_filter);
@@ -1714,9 +1719,6 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
                 newsk->sk_incoming_cpu = raw_smp_processor_id();
                 atomic64_set(&newsk->sk_cookie, 0);
 
-                mem_cgroup_sk_alloc(newsk);
-                cgroup_sk_alloc(&newsk->sk_cgrp_data);
-
                 /*
                  * Before updating sk_refcnt, we must commit prior changes to memory
                  * (Documentation/RCU/rculist_nulls.txt for details)
diff --git a/net/core/sock_reuseport.c b/net/core/sock_reuseport.c
index eed1ebf7f29d..b1e0dbea1e8c 100644
--- a/net/core/sock_reuseport.c
+++ b/net/core/sock_reuseport.c
@@ -36,9 +36,14 @@ int reuseport_alloc(struct sock *sk)
          * soft irq of receive path or setsockopt from process context
          */
         spin_lock_bh(&reuseport_lock);
-        WARN_ONCE(rcu_dereference_protected(sk->sk_reuseport_cb,
-                                            lockdep_is_held(&reuseport_lock)),
-                  "multiple allocations for the same socket");
+
+        /* Allocation attempts can occur concurrently via the setsockopt path
+         * and the bind/hash path.  Nothing to do when we lose the race.
+         */
+        if (rcu_dereference_protected(sk->sk_reuseport_cb,
+                                      lockdep_is_held(&reuseport_lock)))
+                goto out;
+
         reuse = __reuseport_alloc(INIT_SOCKS);
         if (!reuse) {
                 spin_unlock_bh(&reuseport_lock);
@@ -49,6 +54,7 @@ int reuseport_alloc(struct sock *sk)
         reuse->num_socks = 1;
         rcu_assign_pointer(sk->sk_reuseport_cb, reuse);
 
+out:
         spin_unlock_bh(&reuseport_lock);
 
         return 0;
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 001c08696334..0490916864f9 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -414,8 +414,7 @@ struct sock *dccp_v4_request_recv_sock(const struct sock *sk,
         sk_daddr_set(newsk, ireq->ir_rmt_addr);
         sk_rcv_saddr_set(newsk, ireq->ir_loc_addr);
         newinet->inet_saddr     = ireq->ir_loc_addr;
-        newinet->inet_opt       = ireq->opt;
-        ireq->opt          = NULL;
+        RCU_INIT_POINTER(newinet->inet_opt, rcu_dereference(ireq->ireq_opt));
         newinet->mc_index  = inet_iif(skb);
         newinet->mc_ttl    = ip_hdr(skb)->ttl;
         newinet->inet_id   = jiffies;
@@ -430,7 +429,10 @@ struct sock *dccp_v4_request_recv_sock(const struct sock *sk,
         if (__inet_inherit_port(sk, newsk) < 0)
                 goto put_and_exit;
         *own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));
-
+        if (*own_req)
+                ireq->ireq_opt = NULL;
+        else
+                newinet->inet_opt = NULL;
         return newsk;
 
 exit_overflow:
@@ -441,6 +443,7 @@ exit:
         __NET_INC_STATS(sock_net(sk), LINUX_MIB_LISTENDROPS);
         return NULL;
 put_and_exit:
+        newinet->inet_opt = NULL;
         inet_csk_prepare_forced_close(newsk);
         dccp_done(newsk);
         goto exit;
@@ -492,7 +495,7 @@ static int dccp_v4_send_response(const struct sock *sk, struct request_sock *req
                                                               ireq->ir_rmt_addr);
                 err = ip_build_and_send_pkt(skb, sk, ireq->ir_loc_addr,
                                             ireq->ir_rmt_addr,
-                                            ireq->opt);
+                                            rcu_dereference(ireq->ireq_opt));
                 err = net_xmit_eval(err);
         }
 
@@ -548,7 +551,7 @@ out:
 static void dccp_v4_reqsk_destructor(struct request_sock *req)
 {
         dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg);
-        kfree(inet_rsk(req)->opt);
+        kfree(rcu_dereference_protected(inet_rsk(req)->ireq_opt, 1));
 }
 
 void dccp_syn_ack_timeout(const struct request_sock *req)
diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
index 8737412c7b27..e1d4d898a007 100644
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
@@ -224,7 +224,7 @@ static int dns_resolver_match_preparse(struct key_match_data *match_data)
 static void dns_resolver_describe(const struct key *key, struct seq_file *m)
 {
         seq_puts(m, key->description);
-        if (key_is_instantiated(key)) {
+        if (key_is_positive(key)) {
                 int err = PTR_ERR(key->payload.data[dns_key_error]);
 
                 if (err)
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 91a2557942fa..f48fe6fc7e8c 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -70,11 +70,9 @@ config IP_MULTIPLE_TABLES
           address into account. Furthermore, the TOS (Type-Of-Service) field
           of the packet can be used for routing decisions as well.
 
-          If you are interested in this, please see the preliminary
-          documentation at <http://www.compendium.com.ar/policy-routing.txt>
-          and <ftp://post.tepkom.ru/pub/vol2/Linux/docs/advanced-routing.tex>.
-          You will need supporting software from
-          <ftp://ftp.tux.org/pub/net/ip-routing/>.
+          If you need more information, see the Linux Advanced
+          Routing and Traffic Control documentation at
+          <http://lartc.org/howto/lartc.rpdb.html>
 
           If unsure, say N.
 
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 2ae8f54cb321..82178cc69c96 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -1951,7 +1951,7 @@ int cipso_v4_req_setattr(struct request_sock *req,
         buf = NULL;
 
         req_inet = inet_rsk(req);
-        opt = xchg(&req_inet->opt, opt);
+        opt = xchg((__force struct ip_options_rcu **)&req_inet->ireq_opt, opt);
         if (opt)
                 kfree_rcu(opt, rcu);
 
@@ -1973,11 +1973,13 @@ req_setattr_failure:
  * values on failure.
  *
  */
-static int cipso_v4_delopt(struct ip_options_rcu **opt_ptr)
+static int cipso_v4_delopt(struct ip_options_rcu __rcu **opt_ptr)
 {
+        struct ip_options_rcu *opt = rcu_dereference_protected(*opt_ptr, 1);
         int hdr_delta = 0;
-        struct ip_options_rcu *opt = *opt_ptr;
 
+        if (!opt || opt->opt.cipso == 0)
+                return 0;
         if (opt->opt.srr || opt->opt.rr || opt->opt.ts || opt->opt.router_alert) {
                 u8 cipso_len;
                 u8 cipso_off;
@@ -2039,14 +2041,10 @@ static int cipso_v4_delopt(struct ip_options_rcu **opt_ptr)
  */
 void cipso_v4_sock_delattr(struct sock *sk)
 {
-        int hdr_delta;
-        struct ip_options_rcu *opt;
         struct inet_sock *sk_inet;
+        int hdr_delta;
 
         sk_inet = inet_sk(sk);
-        opt = rcu_dereference_protected(sk_inet->inet_opt, 1);
-        if (!opt || opt->opt.cipso == 0)
-                return;
 
         hdr_delta = cipso_v4_delopt(&sk_inet->inet_opt);
         if (sk_inet->is_icsk && hdr_delta > 0) {
@@ -2066,15 +2064,7 @@ void cipso_v4_sock_delattr(struct sock *sk)
  */
 void cipso_v4_req_delattr(struct request_sock *req)
 {
-        struct ip_options_rcu *opt;
-        struct inet_request_sock *req_inet;
-
-        req_inet = inet_rsk(req);
-        opt = req_inet->opt;
-        if (!opt || opt->opt.cipso == 0)
-                return;
-
-        cipso_v4_delopt(&req_inet->opt);
+        cipso_v4_delopt(&inet_rsk(req)->ireq_opt);
 }
 
 /**
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index c039c937ba90..5ec9136a7c36 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -475,6 +475,7 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err, bool kern)
                 }
                 spin_unlock_bh(&queue->fastopenq.lock);
         }
+        mem_cgroup_sk_alloc(newsk);
 out:
         release_sock(sk);
         if (req)
@@ -539,9 +540,10 @@ struct dst_entry *inet_csk_route_req(const struct sock *sk,
 {
         const struct inet_request_sock *ireq = inet_rsk(req);
         struct net *net = read_pnet(&ireq->ireq_net);
-        struct ip_options_rcu *opt = ireq->opt;
+        struct ip_options_rcu *opt;
         struct rtable *rt;
 
+        opt = rcu_dereference(ireq->ireq_opt);
         flowi4_init_output(fl4, ireq->ir_iif, ireq->ir_mark,
                            RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
                            sk->sk_protocol, inet_sk_flowi_flags(sk),
@@ -575,10 +577,9 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk,
         struct flowi4 *fl4;
         struct rtable *rt;
 
+        opt = rcu_dereference(ireq->ireq_opt);
         fl4 = &newinet->cork.fl.u.ip4;
 
-        rcu_read_lock();
-        opt = rcu_dereference(newinet->inet_opt);
         flowi4_init_output(fl4, ireq->ir_iif, ireq->ir_mark,
                            RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
                            sk->sk_protocol, inet_sk_flowi_flags(sk),
@@ -591,13 +592,11 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk,
                 goto no_route;
         if (opt && opt->opt.is_strictroute && rt->rt_uses_gateway)
                 goto route_err;
-        rcu_read_unlock();
         return &rt->dst;
 
 route_err:
         ip_rt_put(rt);
 no_route:
-        rcu_read_unlock();
         __IP_INC_STATS(net, IPSTATS_MIB_OUTNOROUTES);
         return NULL;
 }
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 597bb4cfe805..e7d15fb0d94d 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -456,10 +456,7 @@ static int inet_reuseport_add_sock(struct sock *sk,
                         return reuseport_add_sock(sk, sk2);
         }
 
-        /* Initial allocation may have already happened via setsockopt */
-        if (!rcu_access_pointer(sk->sk_reuseport_cb))
-                return reuseport_alloc(sk);
-        return 0;
+        return reuseport_alloc(sk);
 }
 
 int __inet_hash(struct sock *sk, struct sock *osk)
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index b1bb1b3a1082..77cf32a80952 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -355,7 +355,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb)
         /* We throwed the options of the initial SYN away, so we hope
          * the ACK carries the same options again (see RFC1122 4.2.3.8)
          */
-        ireq->opt = tcp_v4_save_options(sock_net(sk), skb);
+        RCU_INIT_POINTER(ireq->ireq_opt, tcp_v4_save_options(sock_net(sk), skb));
 
         if (security_inet_conn_request(sk, skb, req)) {
                 reqsk_free(req);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index c5d7656beeee..7eec3383702b 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -6196,7 +6196,7 @@ struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops,
                 struct inet_request_sock *ireq = inet_rsk(req);
 
                 kmemcheck_annotate_bitfield(ireq, flags);
-                ireq->opt = NULL;
+                ireq->ireq_opt = NULL;
 #if IS_ENABLED(CONFIG_IPV6)
                 ireq->pktopts = NULL;
 #endif
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 85164d4d3e53..4c43365c374c 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -877,7 +877,7 @@ static int tcp_v4_send_synack(const struct sock *sk, struct dst_entry *dst,
 
                 err = ip_build_and_send_pkt(skb, sk, ireq->ir_loc_addr,
                                             ireq->ir_rmt_addr,
-                                            ireq->opt);
+                                            rcu_dereference(ireq->ireq_opt));
                 err = net_xmit_eval(err);
         }
 
@@ -889,7 +889,7 @@ static int tcp_v4_send_synack(const struct sock *sk, struct dst_entry *dst,
  */
 static void tcp_v4_reqsk_destructor(struct request_sock *req)
 {
-        kfree(inet_rsk(req)->opt);
+        kfree(rcu_dereference_protected(inet_rsk(req)->ireq_opt, 1));
 }
 
 #ifdef CONFIG_TCP_MD5SIG
@@ -1265,10 +1265,11 @@ static void tcp_v4_init_req(struct request_sock *req,
                             struct sk_buff *skb)
 {
         struct inet_request_sock *ireq = inet_rsk(req);
+        struct net *net = sock_net(sk_listener);
 
         sk_rcv_saddr_set(req_to_sk(req), ip_hdr(skb)->daddr);
         sk_daddr_set(req_to_sk(req), ip_hdr(skb)->saddr);
-        ireq->opt = tcp_v4_save_options(sock_net(sk_listener), skb);
+        RCU_INIT_POINTER(ireq->ireq_opt, tcp_v4_save_options(net, skb));
 }
 
 static struct dst_entry *tcp_v4_route_req(const struct sock *sk,
@@ -1355,10 +1356,9 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,
         sk_daddr_set(newsk, ireq->ir_rmt_addr);
         sk_rcv_saddr_set(newsk, ireq->ir_loc_addr);
         newsk->sk_bound_dev_if = ireq->ir_iif;
-        newinet->inet_saddr           = ireq->ir_loc_addr;
-        inet_opt              = ireq->opt;
-        rcu_assign_pointer(newinet->inet_opt, inet_opt);
-        ireq->opt             = NULL;
+        newinet->inet_saddr   = ireq->ir_loc_addr;
+        inet_opt              = rcu_dereference(ireq->ireq_opt);
+        RCU_INIT_POINTER(newinet->inet_opt, inet_opt);
         newinet->mc_index     = inet_iif(skb);
         newinet->mc_ttl       = ip_hdr(skb)->ttl;
         newinet->rcv_tos      = ip_hdr(skb)->tos;
@@ -1403,9 +1403,12 @@ struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,
         if (__inet_inherit_port(sk, newsk) < 0)
                 goto put_and_exit;
         *own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash));
-        if (*own_req)
+        if (likely(*own_req)) {
                 tcp_move_syn(newtp, req);
-
+                ireq->ireq_opt = NULL;
+        } else {
+                newinet->inet_opt = NULL;
+        }
         return newsk;
 
 exit_overflow:
@@ -1416,6 +1419,7 @@ exit:
         tcp_listendrop(sk);
         return NULL;
 put_and_exit:
+        newinet->inet_opt = NULL;
         inet_csk_prepare_forced_close(newsk);
         tcp_done(newsk);
         goto exit;
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index e45177ceb0ee..ebfbccae62fd 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -231,10 +231,7 @@ static int udp_reuseport_add_sock(struct sock *sk, struct udp_hslot *hslot)
                 }
         }
 
-        /* Initial allocation may have already happened via setsockopt */
-        if (!rcu_access_pointer(sk->sk_reuseport_cb))
-                return reuseport_alloc(sk);
-        return 0;
+        return reuseport_alloc(sk);
 }
 
 /**
@@ -1061,7 +1058,7 @@ back_from_confirm:
                 /* ... which is an evident application bug. --ANK */
                 release_sock(sk);
 
-                net_dbg_ratelimited("cork app bug 2\n");
+                net_dbg_ratelimited("socket already corked\n");
                 err = -EINVAL;
                 goto out;
         }
@@ -1144,7 +1141,7 @@ int udp_sendpage(struct sock *sk, struct page *page, int offset,
         if (unlikely(!up->pending)) {
                 release_sock(sk);
 
-                net_dbg_ratelimited("udp cork app bug 3\n");
+                net_dbg_ratelimited("cork failed\n");
                 return -EINVAL;
         }
 
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 8081bafe441b..15535ee327c5 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -315,6 +315,7 @@ struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions *opt_space,
         }
         opt_space->dst1opt = fopt->dst1opt;
         opt_space->opt_flen = fopt->opt_flen;
+        opt_space->tot_len = fopt->tot_len;
         return opt_space;
 }
 EXPORT_SYMBOL_GPL(fl6_merge_options);
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 43ca864327c7..5110a418cc4d 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1161,11 +1161,11 @@ static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork,
                 if (WARN_ON(v6_cork->opt))
                         return -EINVAL;
 
-                v6_cork->opt = kzalloc(opt->tot_len, sk->sk_allocation);
+                v6_cork->opt = kzalloc(sizeof(*opt), sk->sk_allocation);
                 if (unlikely(!v6_cork->opt))
                         return -ENOBUFS;
 
-                v6_cork->opt->tot_len = opt->tot_len;
+                v6_cork->opt->tot_len = sizeof(*opt);
                 v6_cork->opt->opt_flen = opt->opt_flen;
                 v6_cork->opt->opt_nflen = opt->opt_nflen;
 
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index bc6e8bfc5be4..f50452b919d5 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -988,6 +988,9 @@ static int pppol2tp_session_ioctl(struct l2tp_session *session,
                  session->name, cmd, arg);
 
         sk = ps->sock;
+        if (!sk)
+                return -EBADR;
+
         sock_hold(sk);
 
         switch (cmd) {
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index a98fc2b5e0dc..ae995c8480db 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -4,7 +4,7 @@
  * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
  * Copyright 2007-2008  Johannes Berg <johannes@sipsolutions.net>
  * Copyright 2013-2014  Intel Mobile Communications GmbH
- * Copyright 2015       Intel Deutschland GmbH
+ * Copyright 2015-2017  Intel Deutschland GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -620,9 +620,6 @@ int ieee80211_key_link(struct ieee80211_key *key,
 
         pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
         idx = key->conf.keyidx;
-        key->local = sdata->local;
-        key->sdata = sdata;
-        key->sta = sta;
 
         mutex_lock(&sdata->local->key_mtx);
 
@@ -633,6 +630,21 @@ int ieee80211_key_link(struct ieee80211_key *key,
         else
                 old_key = key_mtx_dereference(sdata->local, sdata->keys[idx]);
 
+        /*
+         * Silently accept key re-installation without really installing the
+         * new version of the key to avoid nonce reuse or replay issues.
+         */
+        if (old_key && key->conf.keylen == old_key->conf.keylen &&
+            !memcmp(key->conf.key, old_key->conf.key, key->conf.keylen)) {
+                ieee80211_key_free_unused(key);
+                ret = 0;
+                goto out;
+        }
+
+        key->local = sdata->local;
+        key->sdata = sdata;
+        key->sta = sta;
+
         increment_tailroom_need_count(sdata);
 
         ieee80211_key_replace(sdata, sta, pairwise, old_key, key);
@@ -648,6 +660,7 @@ int ieee80211_key_link(struct ieee80211_key *key,
                 ret = 0;
         }
 
+ out:
         mutex_unlock(&sdata->local->key_mtx);
 
         return ret;
diff --git a/net/ncsi/internal.h b/net/ncsi/internal.h
index af3d636534ef..d30f7bd741d0 100644
--- a/net/ncsi/internal.h
+++ b/net/ncsi/internal.h
@@ -286,6 +286,7 @@ struct ncsi_dev_priv {
         struct work_struct  work;            /* For channel management     */
         struct packet_type  ptype;           /* NCSI packet Rx handler     */
         struct list_head    node;            /* Form NCSI device list      */
+#define NCSI_MAX_VLAN_VIDS      15
         struct list_head    vlan_vids;       /* List of active VLAN IDs */
 };
 
diff --git a/net/ncsi/ncsi-aen.c b/net/ncsi/ncsi-aen.c
index 6898e7229285..f135938bf781 100644
--- a/net/ncsi/ncsi-aen.c
+++ b/net/ncsi/ncsi-aen.c
@@ -187,7 +187,7 @@ static struct ncsi_aen_handler {
 } ncsi_aen_handlers[] = {
         { NCSI_PKT_AEN_LSC,    12, ncsi_aen_handler_lsc    },
         { NCSI_PKT_AEN_CR,      4, ncsi_aen_handler_cr     },
-        { NCSI_PKT_AEN_HNCDSC,  4, ncsi_aen_handler_hncdsc }
+        { NCSI_PKT_AEN_HNCDSC,  8, ncsi_aen_handler_hncdsc }
 };
 
 int ncsi_aen_handler(struct ncsi_dev_priv *ndp, struct sk_buff *skb)
diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c
index 3fd3c39e6278..28c42b22b748 100644
--- a/net/ncsi/ncsi-manage.c
+++ b/net/ncsi/ncsi-manage.c
@@ -189,6 +189,7 @@ static void ncsi_channel_monitor(unsigned long data)
         struct ncsi_channel *nc = (struct ncsi_channel *)data;
         struct ncsi_package *np = nc->package;
         struct ncsi_dev_priv *ndp = np->ndp;
+        struct ncsi_channel_mode *ncm;
         struct ncsi_cmd_arg nca;
         bool enabled, chained;
         unsigned int monitor_state;
@@ -202,11 +203,15 @@ static void ncsi_channel_monitor(unsigned long data)
         monitor_state = nc->monitor.state;
         spin_unlock_irqrestore(&nc->lock, flags);
 
-        if (!enabled || chained)
+        if (!enabled || chained) {
+                ncsi_stop_channel_monitor(nc);
                 return;
+        }
         if (state != NCSI_CHANNEL_INACTIVE &&
-            state != NCSI_CHANNEL_ACTIVE)
+            state != NCSI_CHANNEL_ACTIVE) {
+                ncsi_stop_channel_monitor(nc);
                 return;
+        }
 
         switch (monitor_state) {
         case NCSI_CHANNEL_MONITOR_START:
@@ -217,28 +222,28 @@ static void ncsi_channel_monitor(unsigned long data)
                 nca.type = NCSI_PKT_CMD_GLS;
                 nca.req_flags = 0;
                 ret = ncsi_xmit_cmd(&nca);
-                if (ret) {
+                if (ret)
                         netdev_err(ndp->ndev.dev, "Error %d sending GLS\n",
                                    ret);
-                        return;
-                }
-
                 break;
         case NCSI_CHANNEL_MONITOR_WAIT ... NCSI_CHANNEL_MONITOR_WAIT_MAX:
                 break;
         default:
-                if (!(ndp->flags & NCSI_DEV_HWA) &&
-                    state == NCSI_CHANNEL_ACTIVE) {
+                if (!(ndp->flags & NCSI_DEV_HWA)) {
                         ncsi_report_link(ndp, true);
                         ndp->flags |= NCSI_DEV_RESHUFFLE;
                 }
 
+                ncsi_stop_channel_monitor(nc);
+
+                ncm = &nc->modes[NCSI_MODE_LINK];
                 spin_lock_irqsave(&nc->lock, flags);
                 nc->state = NCSI_CHANNEL_INVISIBLE;
+                ncm->data[2] &= ~0x1;
                 spin_unlock_irqrestore(&nc->lock, flags);
 
                 spin_lock_irqsave(&ndp->lock, flags);
-                nc->state = NCSI_CHANNEL_INACTIVE;
+                nc->state = NCSI_CHANNEL_ACTIVE;
                 list_add_tail_rcu(&nc->link, &ndp->channel_queue);
                 spin_unlock_irqrestore(&ndp->lock, flags);
                 ncsi_process_next_channel(ndp);
@@ -732,6 +737,10 @@ static int set_one_vid(struct ncsi_dev_priv *ndp, struct ncsi_channel *nc,
         if (index < 0) {
                 netdev_err(ndp->ndev.dev,
                            "Failed to add new VLAN tag, error %d\n", index);
+                if (index == -ENOSPC)
+                        netdev_err(ndp->ndev.dev,
+                                   "Channel %u already has all VLAN filters set\n",
+                                   nc->id);
                 return -1;
         }
 
@@ -998,12 +1007,15 @@ static bool ncsi_check_hwa(struct ncsi_dev_priv *ndp)
         struct ncsi_package *np;
         struct ncsi_channel *nc;
         unsigned int cap;
+        bool has_channel = false;
 
         /* The hardware arbitration is disabled if any one channel
          * doesn't support explicitly.
          */
         NCSI_FOR_EACH_PACKAGE(ndp, np) {
                 NCSI_FOR_EACH_CHANNEL(np, nc) {
+                        has_channel = true;
+
                         cap = nc->caps[NCSI_CAP_GENERIC].cap;
                         if (!(cap & NCSI_CAP_GENERIC_HWA) ||
                             (cap & NCSI_CAP_GENERIC_HWA_MASK) !=
@@ -1014,8 +1026,13 @@ static bool ncsi_check_hwa(struct ncsi_dev_priv *ndp)
                 }
         }
 
-        ndp->flags |= NCSI_DEV_HWA;
-        return true;
+        if (has_channel) {
+                ndp->flags |= NCSI_DEV_HWA;
+                return true;
+        }
+
+        ndp->flags &= ~NCSI_DEV_HWA;
+        return false;
 }
 
 static int ncsi_enable_hwa(struct ncsi_dev_priv *ndp)
@@ -1403,7 +1420,6 @@ static int ncsi_kick_channels(struct ncsi_dev_priv *ndp)
 
 int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
 {
-        struct ncsi_channel_filter *ncf;
         struct ncsi_dev_priv *ndp;
         unsigned int n_vids = 0;
         struct vlan_vid *vlan;
@@ -1420,7 +1436,6 @@ int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
         }
 
         ndp = TO_NCSI_DEV_PRIV(nd);
-        ncf = ndp->hot_channel->filters[NCSI_FILTER_VLAN];
 
         /* Add the VLAN id to our internal list */
         list_for_each_entry_rcu(vlan, &ndp->vlan_vids, list) {
@@ -1431,12 +1446,11 @@ int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
                         return 0;
                 }
         }
-
-        if (n_vids >= ncf->total) {
-                netdev_info(dev,
-                            "NCSI Channel supports up to %u VLAN tags but %u are already set\n",
-                            ncf->total, n_vids);
-                return -EINVAL;
+        if (n_vids >= NCSI_MAX_VLAN_VIDS) {
+                netdev_warn(dev,
+                            "tried to add vlan id %u but NCSI max already registered (%u)\n",
+                            vid, NCSI_MAX_VLAN_VIDS);
+                return -ENOSPC;
         }
 
         vlan = kzalloc(sizeof(*vlan), GFP_KERNEL);
diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c
index 265b9a892d41..927dad4759d1 100644
--- a/net/ncsi/ncsi-rsp.c
+++ b/net/ncsi/ncsi-rsp.c
@@ -959,7 +959,7 @@ static struct ncsi_rsp_handler {
         { NCSI_PKT_RSP_EGMF,    4, ncsi_rsp_handler_egmf    },
         { NCSI_PKT_RSP_DGMF,    4, ncsi_rsp_handler_dgmf    },
         { NCSI_PKT_RSP_SNFC,    4, ncsi_rsp_handler_snfc    },
-        { NCSI_PKT_RSP_GVI,    36, ncsi_rsp_handler_gvi     },
+        { NCSI_PKT_RSP_GVI,    40, ncsi_rsp_handler_gvi     },
         { NCSI_PKT_RSP_GC,     32, ncsi_rsp_handler_gc      },
         { NCSI_PKT_RSP_GP,     -1, ncsi_rsp_handler_gp      },
         { NCSI_PKT_RSP_GCPS,  172, ncsi_rsp_handler_gcps    },
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index f34750691c5c..b93148e8e9fb 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2307,6 +2307,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,
         size_t tlvlen = 0;
         struct netlink_sock *nlk = nlk_sk(NETLINK_CB(in_skb).sk);
         unsigned int flags = 0;
+        bool nlk_has_extack = nlk->flags & NETLINK_F_EXT_ACK;
 
         /* Error messages get the original request appened, unless the user
          * requests to cap the error message, and get extra error data if
@@ -2317,7 +2318,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,
                         payload += nlmsg_len(nlh);
                 else
                         flags |= NLM_F_CAPPED;
-                if (nlk->flags & NETLINK_F_EXT_ACK && extack) {
+                if (nlk_has_extack && extack) {
                         if (extack->_msg)
                                 tlvlen += nla_total_size(strlen(extack->_msg) + 1);
                         if (extack->bad_attr)
@@ -2326,8 +2327,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,
         } else {
                 flags |= NLM_F_CAPPED;
 
-                if (nlk->flags & NETLINK_F_EXT_ACK &&
-                    extack && extack->cookie_len)
+                if (nlk_has_extack && extack && extack->cookie_len)
                         tlvlen += nla_total_size(extack->cookie_len);
         }
 
@@ -2355,7 +2355,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,
         errmsg->error = err;
         memcpy(&errmsg->msg, nlh, payload > sizeof(*errmsg) ? nlh->nlmsg_len : sizeof(*nlh));
 
-        if (nlk->flags & NETLINK_F_EXT_ACK && extack) {
+        if (nlk_has_extack && extack) {
                 if (err) {
                         if (extack->_msg)
                                 WARN_ON(nla_put_string(skb, NLMSGERR_ATTR_MSG,
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index bec01a3daf5b..2986941164b1 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1769,7 +1769,7 @@ static int fanout_add(struct sock *sk, u16 id, u16 type_flags)
 
 out:
         if (err && rollover) {
-                kfree(rollover);
+                kfree_rcu(rollover, rcu);
                 po->rollover = NULL;
         }
         mutex_unlock(&fanout_mutex);
@@ -1796,8 +1796,10 @@ static struct packet_fanout *fanout_release(struct sock *sk)
                 else
                         f = NULL;
 
-                if (po->rollover)
+                if (po->rollover) {
                         kfree_rcu(po->rollover, rcu);
+                        po->rollover = NULL;
+                }
         }
         mutex_unlock(&fanout_mutex);
 
@@ -3851,6 +3853,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
         void *data = &val;
         union tpacket_stats_u st;
         struct tpacket_rollover_stats rstats;
+        struct packet_rollover *rollover;
 
         if (level != SOL_PACKET)
                 return -ENOPROTOOPT;
@@ -3929,13 +3932,18 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
                        0);
                 break;
         case PACKET_ROLLOVER_STATS:
-                if (!po->rollover)
+                rcu_read_lock();
+                rollover = rcu_dereference(po->rollover);
+                if (rollover) {
+                        rstats.tp_all = atomic_long_read(&rollover->num);
+                        rstats.tp_huge = atomic_long_read(&rollover->num_huge);
+                        rstats.tp_failed = atomic_long_read(&rollover->num_failed);
+                        data = &rstats;
+                        lv = sizeof(rstats);
+                }
+                rcu_read_unlock();
+                if (!rollover)
                         return -EINVAL;
-                rstats.tp_all = atomic_long_read(&po->rollover->num);
-                rstats.tp_huge = atomic_long_read(&po->rollover->num_huge);
-                rstats.tp_failed = atomic_long_read(&po->rollover->num_failed);
-                data = &rstats;
-                lv = sizeof(rstats);
                 break;
         case PACKET_TX_HAS_OFF:
                 val = po->tp_tx_has_off;
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index fb17552fd292..4b0a8288c98a 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -308,10 +308,11 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock,
         call = rxrpc_new_client_call(rx, &cp, srx, user_call_ID, tx_total_len,
                                      gfp);
         /* The socket has been unlocked. */
-        if (!IS_ERR(call))
+        if (!IS_ERR(call)) {
                 call->notify_rx = notify_rx;
+                mutex_unlock(&call->user_mutex);
+        }
 
-        mutex_unlock(&call->user_mutex);
         _leave(" = %p", call);
         return call;
 }
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index d230cb4c8094..b480d7c792ba 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -234,6 +234,7 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f)
         tc_cls_common_offload_init(&cls_flower.common, tp);
         cls_flower.command = TC_CLSFLOWER_DESTROY;
         cls_flower.cookie = (unsigned long) f;
+        cls_flower.egress_dev = f->hw_dev != tp->q->dev_queue->dev;
 
         dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSFLOWER, &cls_flower);
 }
@@ -289,6 +290,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
         cls_flower.command = TC_CLSFLOWER_STATS;
         cls_flower.cookie = (unsigned long) f;
         cls_flower.exts = &f->exts;
+        cls_flower.egress_dev = f->hw_dev != tp->q->dev_queue->dev;
 
         dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSFLOWER,
                                       &cls_flower);
diff --git a/net/sctp/input.c b/net/sctp/input.c
index 92a07141fd07..34f10e75f3b9 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -421,7 +421,7 @@ void sctp_icmp_redirect(struct sock *sk, struct sctp_transport *t,
 {
         struct dst_entry *dst;
 
-        if (!t)
+        if (sock_owned_by_user(sk) || !t)
                 return;
         dst = sctp_transport_dst_check(t);
         if (dst)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index d4730ada7f32..17841ab30798 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4906,6 +4906,10 @@ int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp)
         struct socket *sock;
         int err = 0;
 
+        /* Do not peel off from one netns to another one. */
+        if (!net_eq(current->nsproxy->net_ns, sock_net(sk)))
+                return -EINVAL;
+
         if (!asoc)
                 return -EINVAL;
 
diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
index 14ed5a344cdf..e21991fe883a 100644
--- a/net/vmw_vsock/hyperv_transport.c
+++ b/net/vmw_vsock/hyperv_transport.c
@@ -310,11 +310,15 @@ static void hvs_close_connection(struct vmbus_channel *chan)
         struct sock *sk = get_per_channel_state(chan);
         struct vsock_sock *vsk = vsock_sk(sk);
 
+        lock_sock(sk);
+
         sk->sk_state = SS_UNCONNECTED;
         sock_set_flag(sk, SOCK_DONE);
         vsk->peer_shutdown |= SEND_SHUTDOWN | RCV_SHUTDOWN;
 
         sk->sk_state_change(sk);
+
+        release_sock(sk);
 }
 
 static void hvs_open_connection(struct vmbus_channel *chan)
@@ -344,6 +348,8 @@ static void hvs_open_connection(struct vmbus_channel *chan)
         if (!sk)
                 return;
 
+        lock_sock(sk);
+
         if ((conn_from_host && sk->sk_state != VSOCK_SS_LISTEN) ||
             (!conn_from_host && sk->sk_state != SS_CONNECTING))
                 goto out;
@@ -395,9 +401,7 @@ static void hvs_open_connection(struct vmbus_channel *chan)
 
                 vsock_insert_connected(vnew);
 
-                lock_sock(sk);
                 vsock_enqueue_accept(sk, new);
-                release_sock(sk);
         } else {
                 sk->sk_state = SS_CONNECTED;
                 sk->sk_socket->state = SS_CONNECTED;
@@ -410,6 +414,8 @@ static void hvs_open_connection(struct vmbus_channel *chan)
 out:
         /* Release refcnt obtained when we called vsock_find_bound_socket() */
         sock_put(sk);
+
+        release_sock(sk);
 }
 
 static u32 hvs_get_local_cid(void)
@@ -476,13 +482,21 @@ out:
 
 static void hvs_release(struct vsock_sock *vsk)
 {
+        struct sock *sk = sk_vsock(vsk);
         struct hvsock *hvs = vsk->trans;
-        struct vmbus_channel *chan = hvs->chan;
+        struct vmbus_channel *chan;
 
+        lock_sock(sk);
+
+        sk->sk_state = SS_DISCONNECTING;
+        vsock_remove_sock(vsk);
+
+        release_sock(sk);
+
+        chan = hvs->chan;
         if (chan)
                 hvs_shutdown(vsk, RCV_SHUTDOWN | SEND_SHUTDOWN);
 
-        vsock_remove_sock(vsk);
 }
 
 static void hvs_destruct(struct vsock_sock *vsk)
diff --git a/samples/sockmap/sockmap_kern.c b/samples/sockmap/sockmap_kern.c
index f9b38ef82dc2..52b0053274f4 100644
--- a/samples/sockmap/sockmap_kern.c
+++ b/samples/sockmap/sockmap_kern.c
@@ -62,7 +62,7 @@ int bpf_prog2(struct __sk_buff *skb)
                 ret = 1;
 
         bpf_printk("sockmap: %d -> %d @ %d\n", lport, bpf_ntohl(rport), ret);
-        return bpf_sk_redirect_map(&sock_map, ret, 0);
+        return bpf_sk_redirect_map(skb, &sock_map, ret, 0);
 }
 
 SEC("sockops")
diff --git a/samples/trace_events/trace-events-sample.c b/samples/trace_events/trace-events-sample.c
index bc7fcf010a5b..446beb7ac48d 100644
--- a/samples/trace_events/trace-events-sample.c
+++ b/samples/trace_events/trace-events-sample.c
@@ -78,29 +78,37 @@ static int simple_thread_fn(void *arg)
 }
 
 static DEFINE_MUTEX(thread_mutex);
+static bool simple_thread_cnt;
 
 int foo_bar_reg(void)
 {
+        mutex_lock(&thread_mutex);
+        if (simple_thread_cnt++)
+                goto out;
+
         pr_info("Starting thread for foo_bar_fn\n");
         /*
          * We shouldn't be able to start a trace when the module is
          * unloading (there's other locks to prevent that). But
          * for consistency sake, we still take the thread_mutex.
          */
-        mutex_lock(&thread_mutex);
         simple_tsk_fn = kthread_run(simple_thread_fn, NULL, "event-sample-fn");
+ out:
         mutex_unlock(&thread_mutex);
         return 0;
 }
 
 void foo_bar_unreg(void)
 {
-        pr_info("Killing thread for foo_bar_fn\n");
-        /* protect against module unloading */
         mutex_lock(&thread_mutex);
+        if (--simple_thread_cnt)
+                goto out;
+
+        pr_info("Killing thread for foo_bar_fn\n");
         if (simple_tsk_fn)
                 kthread_stop(simple_tsk_fn);
         simple_tsk_fn = NULL;
+ out:
         mutex_unlock(&thread_mutex);
 }
 
diff --git a/security/commoncap.c b/security/commoncap.c
index c25e0d27537f..fc46f5b85251 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -585,13 +585,14 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
         struct vfs_ns_cap_data data, *nscaps = &data;
         struct vfs_cap_data *caps = (struct vfs_cap_data *) &data;
         kuid_t rootkuid;
-        struct user_namespace *fs_ns = inode->i_sb->s_user_ns;
+        struct user_namespace *fs_ns;
 
         memset(cpu_caps, 0, sizeof(struct cpu_vfs_cap_data));
 
         if (!inode)
                 return -ENODATA;
 
+        fs_ns = inode->i_sb->s_user_ns;
         size = __vfs_getxattr((struct dentry *)dentry, inode,
                               XATTR_NAME_CAPS, &data, XATTR_CAPS_SZ);
         if (size == -ENODATA || size == -EOPNOTSUPP)
diff --git a/security/keys/Kconfig b/security/keys/Kconfig
index 91eafada3164..6462e6654ccf 100644
--- a/security/keys/Kconfig
+++ b/security/keys/Kconfig
@@ -45,6 +45,7 @@ config BIG_KEYS
         bool "Large payload keys"
         depends on KEYS
         depends on TMPFS
+        select CRYPTO
         select CRYPTO_AES
         select CRYPTO_GCM
         help
diff --git a/security/keys/big_key.c b/security/keys/big_key.c
index e607830b6154..929e14978c42 100644
--- a/security/keys/big_key.c
+++ b/security/keys/big_key.c
@@ -247,7 +247,7 @@ void big_key_revoke(struct key *key)
 
         /* clear the quota */
         key_payload_reserve(key, 0);
-        if (key_is_instantiated(key) &&
+        if (key_is_positive(key) &&
             (size_t)key->payload.data[big_key_len] > BIG_KEY_FILE_THRESHOLD)
                 vfs_truncate(path, 0);
 }
@@ -279,7 +279,7 @@ void big_key_describe(const struct key *key, struct seq_file *m)
 
         seq_puts(m, key->description);
 
-        if (key_is_instantiated(key))
+        if (key_is_positive(key))
                 seq_printf(m, ": %zu [%s]",
                            datalen,
                            datalen > BIG_KEY_FILE_THRESHOLD ? "file" : "buff");
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index 69855ba0d3b3..d92cbf9687c3 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -309,6 +309,13 @@ static struct key *request_user_key(const char *master_desc, const u8 **master_k
 
         down_read(&ukey->sem);
         upayload = user_key_payload_locked(ukey);
+        if (!upayload) {
+                /* key was revoked before we acquired its semaphore */
+                up_read(&ukey->sem);
+                key_put(ukey);
+                ukey = ERR_PTR(-EKEYREVOKED);
+                goto error;
+        }
         *master_key = upayload->data;
         *master_keylen = upayload->datalen;
 error:
@@ -847,7 +854,7 @@ static int encrypted_update(struct key *key, struct key_preparsed_payload *prep)
         size_t datalen = prep->datalen;
         int ret = 0;
 
-        if (test_bit(KEY_FLAG_NEGATIVE, &key->flags))
+        if (key_is_negative(key))
                 return -ENOKEY;
         if (datalen <= 0 || datalen > 32767 || !prep->data)
                 return -EINVAL;
diff --git a/security/keys/gc.c b/security/keys/gc.c
index 87cb260e4890..f01d48cb3de1 100644
--- a/security/keys/gc.c
+++ b/security/keys/gc.c
@@ -129,15 +129,15 @@ static noinline void key_gc_unused_keys(struct list_head *keys)
         while (!list_empty(keys)) {
                 struct key *key =
                         list_entry(keys->next, struct key, graveyard_link);
+                short state = key->state;
+
                 list_del(&key->graveyard_link);
 
                 kdebug("- %u", key->serial);
                 key_check(key);
 
                 /* Throw away the key data if the key is instantiated */
-                if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags) &&
-                    !test_bit(KEY_FLAG_NEGATIVE, &key->flags) &&
-                    key->type->destroy)
+                if (state == KEY_IS_POSITIVE && key->type->destroy)
                         key->type->destroy(key);
 
                 security_key_free(key);
@@ -151,7 +151,7 @@ static noinline void key_gc_unused_keys(struct list_head *keys)
                 }
 
                 atomic_dec(&key->user->nkeys);
-                if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags))
+                if (state != KEY_IS_UNINSTANTIATED)
                         atomic_dec(&key->user->nikeys);
 
                 key_user_put(key->user);
diff --git a/security/keys/key.c b/security/keys/key.c
index eb914a838840..83bf4b4afd49 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -402,6 +402,18 @@ int key_payload_reserve(struct key *key, size_t datalen)
 EXPORT_SYMBOL(key_payload_reserve);
 
 /*
+ * Change the key state to being instantiated.
+ */
+static void mark_key_instantiated(struct key *key, int reject_error)
+{
+        /* Commit the payload before setting the state; barrier versus
+         * key_read_state().
+         */
+        smp_store_release(&key->state,
+                          (reject_error < 0) ? reject_error : KEY_IS_POSITIVE);
+}
+
+/*
  * Instantiate a key and link it into the target keyring atomically.  Must be
  * called with the target keyring's semaphore writelocked.  The target key's
  * semaphore need not be locked as instantiation is serialised by
@@ -424,14 +436,14 @@ static int __key_instantiate_and_link(struct key *key,
         mutex_lock(&key_construction_mutex);
 
         /* can't instantiate twice */
-        if (!test_bit(KEY_FLAG_INSTANTIATED, &key->flags)) {
+        if (key->state == KEY_IS_UNINSTANTIATED) {
                 /* instantiate the key */
                 ret = key->type->instantiate(key, prep);
 
                 if (ret == 0) {
                         /* mark the key as being instantiated */
                         atomic_inc(&key->user->nikeys);
-                        set_bit(KEY_FLAG_INSTANTIATED, &key->flags);
+                        mark_key_instantiated(key, 0);
 
                         if (test_and_clear_bit(KEY_FLAG_USER_CONSTRUCT, &key->flags))
                                 awaken = 1;
@@ -577,13 +589,10 @@ int key_reject_and_link(struct key *key,
         mutex_lock(&key_construction_mutex);
 
         /* can't instantiate twice */
-        if (!test_bit(KEY_FLAG_INSTANTIATED, &key->flags)) {
+        if (key->state == KEY_IS_UNINSTANTIATED) {
                 /* mark the key as being negatively instantiated */
                 atomic_inc(&key->user->nikeys);
-                key->reject_error = -error;
-                smp_wmb();
-                set_bit(KEY_FLAG_NEGATIVE, &key->flags);
-                set_bit(KEY_FLAG_INSTANTIATED, &key->flags);
+                mark_key_instantiated(key, -error);
                 now = current_kernel_time();
                 key->expiry = now.tv_sec + timeout;
                 key_schedule_gc(key->expiry + key_gc_delay);
@@ -752,8 +761,8 @@ static inline key_ref_t __key_update(key_ref_t key_ref,
 
         ret = key->type->update(key, prep);
         if (ret == 0)
-                /* updating a negative key instantiates it */
-                clear_bit(KEY_FLAG_NEGATIVE, &key->flags);
+                /* Updating a negative key positively instantiates it */
+                mark_key_instantiated(key, 0);
 
         up_write(&key->sem);
 
@@ -936,6 +945,16 @@ error:
          */
         __key_link_end(keyring, &index_key, edit);
 
+        key = key_ref_to_ptr(key_ref);
+        if (test_bit(KEY_FLAG_USER_CONSTRUCT, &key->flags)) {
+                ret = wait_for_key_construction(key, true);
+                if (ret < 0) {
+                        key_ref_put(key_ref);
+                        key_ref = ERR_PTR(ret);
+                        goto error_free_prep;
+                }
+        }
+
         key_ref = __key_update(key_ref, &prep);
         goto error_free_prep;
 }
@@ -986,8 +1005,8 @@ int key_update(key_ref_t key_ref, const void *payload, size_t plen)
 
         ret = key->type->update(key, &prep);
         if (ret == 0)
-                /* updating a negative key instantiates it */
-                clear_bit(KEY_FLAG_NEGATIVE, &key->flags);
+                /* Updating a negative key positively instantiates it */
+                mark_key_instantiated(key, 0);
 
         up_write(&key->sem);
 
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 365ff85d7e27..76d22f726ae4 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -766,10 +766,9 @@ long keyctl_read_key(key_serial_t keyid, char __user *buffer, size_t buflen)
 
         key = key_ref_to_ptr(key_ref);
 
-        if (test_bit(KEY_FLAG_NEGATIVE, &key->flags)) {
-                ret = -ENOKEY;
-                goto error2;
-        }
+        ret = key_read_state(key);
+        if (ret < 0)
+                goto error2; /* Negatively instantiated */
 
         /* see if we can read it directly */
         ret = key_permission(key_ref, KEY_NEED_READ);
@@ -901,7 +900,7 @@ long keyctl_chown_key(key_serial_t id, uid_t user, gid_t group)
                 atomic_dec(&key->user->nkeys);
                 atomic_inc(&newowner->nkeys);
 
-                if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags)) {
+                if (key->state != KEY_IS_UNINSTANTIATED) {
                         atomic_dec(&key->user->nikeys);
                         atomic_inc(&newowner->nikeys);
                 }
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index 4fa82a8a9c0e..a7e51f793867 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -414,7 +414,7 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m)
         else
                 seq_puts(m, "[anon]");
 
-        if (key_is_instantiated(keyring)) {
+        if (key_is_positive(keyring)) {
                 if (keyring->keys.nr_leaves_on_tree != 0)
                         seq_printf(m, ": %lu", keyring->keys.nr_leaves_on_tree);
                 else
@@ -553,7 +553,8 @@ static int keyring_search_iterator(const void *object, void *iterator_data)
 {
         struct keyring_search_context *ctx = iterator_data;
         const struct key *key = keyring_ptr_to_key(object);
-        unsigned long kflags = key->flags;
+        unsigned long kflags = READ_ONCE(key->flags);
+        short state = READ_ONCE(key->state);
 
         kenter("{%d}", key->serial);
 
@@ -565,6 +566,8 @@ static int keyring_search_iterator(const void *object, void *iterator_data)
 
         /* skip invalidated, revoked and expired keys */
         if (ctx->flags & KEYRING_SEARCH_DO_STATE_CHECK) {
+                time_t expiry = READ_ONCE(key->expiry);
+
                 if (kflags & ((1 << KEY_FLAG_INVALIDATED) |
                               (1 << KEY_FLAG_REVOKED))) {
                         ctx->result = ERR_PTR(-EKEYREVOKED);
@@ -572,7 +575,7 @@ static int keyring_search_iterator(const void *object, void *iterator_data)
                         goto skipped;
                 }
 
-                if (key->expiry && ctx->now.tv_sec >= key->expiry) {
+                if (expiry && ctx->now.tv_sec >= expiry) {
                         if (!(ctx->flags & KEYRING_SEARCH_SKIP_EXPIRED))
                                 ctx->result = ERR_PTR(-EKEYEXPIRED);
                         kleave(" = %d [expire]", ctx->skipped_ret);
@@ -597,9 +600,8 @@ static int keyring_search_iterator(const void *object, void *iterator_data)
 
         if (ctx->flags & KEYRING_SEARCH_DO_STATE_CHECK) {
                 /* we set a different error code if we pass a negative key */
-                if (kflags & (1 << KEY_FLAG_NEGATIVE)) {
-                        smp_rmb();
-                        ctx->result = ERR_PTR(key->reject_error);
+                if (state < 0) {
+                        ctx->result = ERR_PTR(state);
                         kleave(" = %d [neg]", ctx->skipped_ret);
                         goto skipped;
                 }
diff --git a/security/keys/permission.c b/security/keys/permission.c
index 732cc0beffdf..a72b4dd70c8a 100644
--- a/security/keys/permission.c
+++ b/security/keys/permission.c
@@ -88,7 +88,8 @@ EXPORT_SYMBOL(key_task_permission);
  */
 int key_validate(const struct key *key)
 {
-        unsigned long flags = key->flags;
+        unsigned long flags = READ_ONCE(key->flags);
+        time_t expiry = READ_ONCE(key->expiry);
 
         if (flags & (1 << KEY_FLAG_INVALIDATED))
                 return -ENOKEY;
@@ -99,9 +100,9 @@ int key_validate(const struct key *key)
                 return -EKEYREVOKED;
 
         /* check it hasn't expired */
-        if (key->expiry) {
+        if (expiry) {
                 struct timespec now = current_kernel_time();
-                if (now.tv_sec >= key->expiry)
+                if (now.tv_sec >= expiry)
                         return -EKEYEXPIRED;
         }
 
diff --git a/security/keys/proc.c b/security/keys/proc.c
index de834309d100..6d1fcbba1e09 100644
--- a/security/keys/proc.c
+++ b/security/keys/proc.c
@@ -179,9 +179,12 @@ static int proc_keys_show(struct seq_file *m, void *v)
         struct rb_node *_p = v;
         struct key *key = rb_entry(_p, struct key, serial_node);
         struct timespec now;
+        time_t expiry;
         unsigned long timo;
+        unsigned long flags;
         key_ref_t key_ref, skey_ref;
         char xbuf[16];
+        short state;
         int rc;
 
         struct keyring_search_context ctx = {
@@ -217,12 +220,13 @@ static int proc_keys_show(struct seq_file *m, void *v)
         rcu_read_lock();
 
         /* come up with a suitable timeout value */
-        if (key->expiry == 0) {
+        expiry = READ_ONCE(key->expiry);
+        if (expiry == 0) {
                 memcpy(xbuf, "perm", 5);
-        } else if (now.tv_sec >= key->expiry) {
+        } else if (now.tv_sec >= expiry) {
                 memcpy(xbuf, "expd", 5);
         } else {
-                timo = key->expiry - now.tv_sec;
+                timo = expiry - now.tv_sec;
 
                 if (timo < 60)
                         sprintf(xbuf, "%lus", timo);
@@ -236,18 +240,21 @@ static int proc_keys_show(struct seq_file *m, void *v)
                         sprintf(xbuf, "%luw", timo / (60*60*24*7));
         }
 
-#define showflag(KEY, LETTER, FLAG) \
-        (test_bit(FLAG, &(KEY)->flags) ? LETTER : '-')
+        state = key_read_state(key);
 
+#define showflag(FLAGS, LETTER, FLAG) \
+        ((FLAGS & (1 << FLAG)) ? LETTER : '-')
+
+        flags = READ_ONCE(key->flags);
         seq_printf(m, "%08x %c%c%c%c%c%c%c %5d %4s %08x %5d %5d %-9.9s ",
                    key->serial,
-                   showflag(key, 'I', KEY_FLAG_INSTANTIATED),
-                   showflag(key, 'R', KEY_FLAG_REVOKED),
-                   showflag(key, 'D', KEY_FLAG_DEAD),
-                   showflag(key, 'Q', KEY_FLAG_IN_QUOTA),
-                   showflag(key, 'U', KEY_FLAG_USER_CONSTRUCT),
-                   showflag(key, 'N', KEY_FLAG_NEGATIVE),
-                   showflag(key, 'i', KEY_FLAG_INVALIDATED),
+                   state != KEY_IS_UNINSTANTIATED ? 'I' : '-',
+                   showflag(flags, 'R', KEY_FLAG_REVOKED),
+                   showflag(flags, 'D', KEY_FLAG_DEAD),
+                   showflag(flags, 'Q', KEY_FLAG_IN_QUOTA),
+                   showflag(flags, 'U', KEY_FLAG_USER_CONSTRUCT),
+                   state < 0 ? 'N' : '-',
+                   showflag(flags, 'i', KEY_FLAG_INVALIDATED),
                    refcount_read(&key->usage),
                    xbuf,
                    key->perm,
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 293d3598153b..740affd65ee9 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -730,7 +730,7 @@ try_again:
 
         ret = -EIO;
         if (!(lflags & KEY_LOOKUP_PARTIAL) &&
-            !test_bit(KEY_FLAG_INSTANTIATED, &key->flags))
+            key_read_state(key) == KEY_IS_UNINSTANTIATED)
                 goto invalid_key;
 
         /* check the permissions */
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 63e63a42db3c..e8036cd0ad54 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -595,10 +595,9 @@ int wait_for_key_construction(struct key *key, bool intr)
                           intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
         if (ret)
                 return -ERESTARTSYS;
-        if (test_bit(KEY_FLAG_NEGATIVE, &key->flags)) {
-                smp_rmb();
-                return key->reject_error;
-        }
+        ret = key_read_state(key);
+        if (ret < 0)
+                return ret;
         return key_validate(key);
 }
 EXPORT_SYMBOL(wait_for_key_construction);
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c
index 6ebf1af8fce9..424e1d90412e 100644
--- a/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
@@ -73,7 +73,7 @@ static void request_key_auth_describe(const struct key *key,
 
         seq_puts(m, "key:");
         seq_puts(m, key->description);
-        if (key_is_instantiated(key))
+        if (key_is_positive(key))
                 seq_printf(m, " pid:%d ci:%zu", rka->pid, rka->callout_len);
 }
 
diff --git a/security/keys/trusted.c b/security/keys/trusted.c
index ddfaebf60fc8..bd85315cbfeb 100644
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@ -1066,7 +1066,7 @@ static int trusted_update(struct key *key, struct key_preparsed_payload *prep)
         char *datablob;
         int ret = 0;
 
-        if (test_bit(KEY_FLAG_NEGATIVE, &key->flags))
+        if (key_is_negative(key))
                 return -ENOKEY;
         p = key->payload.data[0];
         if (!p->migratable)
diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c
index 3d8c68eba516..9f558bedba23 100644
--- a/security/keys/user_defined.c
+++ b/security/keys/user_defined.c
@@ -114,7 +114,7 @@ int user_update(struct key *key, struct key_preparsed_payload *prep)
 
         /* attach the new data, displacing the old */
         key->expiry = prep->expiry;
-        if (!test_bit(KEY_FLAG_NEGATIVE, &key->flags))
+        if (key_is_positive(key))
                 zap = dereference_key_locked(key);
         rcu_assign_keypointer(key, prep->payload.data[0]);
         prep->payload.data[0] = NULL;
@@ -162,7 +162,7 @@ EXPORT_SYMBOL_GPL(user_destroy);
 void user_describe(const struct key *key, struct seq_file *m)
 {
         seq_puts(m, key->description);
-        if (key_is_instantiated(key))
+        if (key_is_positive(key))
                 seq_printf(m, ": %u", key->datalen);
 }
 
diff --git a/sound/core/seq/seq_lock.c b/sound/core/seq/seq_lock.c
index 0ff7926a5a69..cda64b489e42 100644
--- a/sound/core/seq/seq_lock.c
+++ b/sound/core/seq/seq_lock.c
@@ -23,8 +23,6 @@
 #include <sound/core.h>
 #include "seq_lock.h"
 
-#if defined(CONFIG_SMP) || defined(CONFIG_SND_DEBUG)
-
 /* wait until all locks are released */
 void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)
 {
@@ -41,5 +39,3 @@ void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)
         }
 }
 EXPORT_SYMBOL(snd_use_lock_sync_helper);
-
-#endif
diff --git a/sound/core/seq/seq_lock.h b/sound/core/seq/seq_lock.h
index 54044bc2c9ef..ac38031c370e 100644
--- a/sound/core/seq/seq_lock.h
+++ b/sound/core/seq/seq_lock.h
@@ -3,8 +3,6 @@
 
 #include <linux/sched.h>
 
-#if defined(CONFIG_SMP) || defined(CONFIG_SND_DEBUG)
-
 typedef atomic_t snd_use_lock_t;
 
 /* initialize lock */
@@ -20,14 +18,4 @@ typedef atomic_t snd_use_lock_t;
 void snd_use_lock_sync_helper(snd_use_lock_t *lock, const char *file, int line);
 #define snd_use_lock_sync(lockp) snd_use_lock_sync_helper(lockp, __BASE_FILE__, __LINE__)
 
-#else /* SMP || CONFIG_SND_DEBUG */
-
-typedef spinlock_t snd_use_lock_t;      /* dummy */
-#define snd_use_lock_init(lockp) /**/
-#define snd_use_lock_use(lockp) /**/
-#define snd_use_lock_free(lockp) /**/
-#define snd_use_lock_sync(lockp) /**/
-
-#endif /* SMP || CONFIG_SND_DEBUG */
-
 #endif /* __SND_SEQ_LOCK_H */
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index 6c58e6f73a01..e43af18d4383 100644
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -484,3 +484,34 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kcontrol, bool hook_only)
                 master->hook(master->hook_private_data, master->val);
 }
 EXPORT_SYMBOL_GPL(snd_ctl_sync_vmaster);
+
+/**
+ * snd_ctl_apply_vmaster_slaves - Apply function to each vmaster slave
+ * @kctl: vmaster kctl element
+ * @func: function to apply
+ * @arg: optional function argument
+ *
+ * Apply the function @func to each slave kctl of the given vmaster kctl.
+ * Returns 0 if successful, or a negative error code.
+ */
+int snd_ctl_apply_vmaster_slaves(struct snd_kcontrol *kctl,
+                                 int (*func)(struct snd_kcontrol *, void *),
+                                 void *arg)
+{
+        struct link_master *master;
+        struct link_slave *slave;
+        int err;
+
+        master = snd_kcontrol_chip(kctl);
+        err = master_init(master);
+        if (err < 0)
+                return err;
+        list_for_each_entry(slave, &master->slaves, list) {
+                err = func(&slave->slave, arg);
+                if (err < 0)
+                        return err;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_ctl_apply_vmaster_slaves);
diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c
index 978dc1801b3a..f6d2985b2520 100644
--- a/sound/hda/hdac_controller.c
+++ b/sound/hda/hdac_controller.c
@@ -284,6 +284,11 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus)
                 dev_dbg(bus->dev, "HDA capability ID: 0x%x\n",
                         (cur_cap & AZX_CAP_HDR_ID_MASK) >> AZX_CAP_HDR_ID_OFF);
 
+                if (cur_cap == -1) {
+                        dev_dbg(bus->dev, "Invalid capability reg read\n");
+                        break;
+                }
+
                 switch ((cur_cap & AZX_CAP_HDR_ID_MASK) >> AZX_CAP_HDR_ID_OFF) {
                 case AZX_ML_CAP_ID:
                         dev_dbg(bus->dev, "Found ML capability\n");
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 3db26c451837..a0989d231fd0 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1803,36 +1803,6 @@ static int check_slave_present(struct hda_codec *codec,
         return 1;
 }
 
-/* guess the value corresponding to 0dB */
-static int get_kctl_0dB_offset(struct hda_codec *codec,
-                               struct snd_kcontrol *kctl, int *step_to_check)
-{
-        int _tlv[4];
-        const int *tlv = NULL;
-        int val = -1;
-
-        if ((kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) &&
-            kctl->tlv.c == snd_hda_mixer_amp_tlv) {
-                get_ctl_amp_tlv(kctl, _tlv);
-                tlv = _tlv;
-        } else if (kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_READ)
-                tlv = kctl->tlv.p;
-        if (tlv && tlv[0] == SNDRV_CTL_TLVT_DB_SCALE) {
-                int step = tlv[3];
-                step &= ~TLV_DB_SCALE_MUTE;
-                if (!step)
-                        return -1;
-                if (*step_to_check && *step_to_check != step) {
-                        codec_err(codec, "Mismatching dB step for vmaster slave (%d!=%d)\n",
--                                  *step_to_check, step);
-                        return -1;
-                }
-                *step_to_check = step;
-                val = -tlv[2] / step;
-        }
-        return val;
-}
-
 /* call kctl->put with the given value(s) */
 static int put_kctl_with_value(struct snd_kcontrol *kctl, int val)
 {
@@ -1847,19 +1817,58 @@ static int put_kctl_with_value(struct snd_kcontrol *kctl, int val)
         return 0;
 }
 
-/* initialize the slave volume with 0dB */
-static int init_slave_0dB(struct hda_codec *codec,
-                          void *data, struct snd_kcontrol *slave)
+struct slave_init_arg {
+        struct hda_codec *codec;
+        int step;
+};
+
+/* initialize the slave volume with 0dB via snd_ctl_apply_vmaster_slaves() */
+static int init_slave_0dB(struct snd_kcontrol *kctl, void *_arg)
 {
-        int offset = get_kctl_0dB_offset(codec, slave, data);
-        if (offset > 0)
-                put_kctl_with_value(slave, offset);
+        struct slave_init_arg *arg = _arg;
+        int _tlv[4];
+        const int *tlv = NULL;
+        int step;
+        int val;
+
+        if (kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) {
+                if (kctl->tlv.c != snd_hda_mixer_amp_tlv) {
+                        codec_err(arg->codec,
+                                  "Unexpected TLV callback for slave %s:%d\n",
+                                  kctl->id.name, kctl->id.index);
+                        return 0; /* ignore */
+                }
+                get_ctl_amp_tlv(kctl, _tlv);
+                tlv = _tlv;
+        } else if (kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_READ)
+                tlv = kctl->tlv.p;
+
+        if (!tlv || tlv[0] != SNDRV_CTL_TLVT_DB_SCALE)
+                return 0;
+
+        step = tlv[3];
+        step &= ~TLV_DB_SCALE_MUTE;
+        if (!step)
+                return 0;
+        if (arg->step && arg->step != step) {
+                codec_err(arg->codec,
+                          "Mismatching dB step for vmaster slave (%d!=%d)\n",
+                          arg->step, step);
+                return 0;
+        }
+
+        arg->step = step;
+        val = -tlv[2] / step;
+        if (val > 0) {
+                put_kctl_with_value(kctl, val);
+                return val;
+        }
+
         return 0;
 }
 
-/* unmute the slave */
-static int init_slave_unmute(struct hda_codec *codec,
-                             void *data, struct snd_kcontrol *slave)
+/* unmute the slave via snd_ctl_apply_vmaster_slaves() */
+static int init_slave_unmute(struct snd_kcontrol *slave, void *_arg)
 {
         return put_kctl_with_value(slave, 1);
 }
@@ -1919,9 +1928,13 @@ int __snd_hda_add_vmaster(struct hda_codec *codec, char *name,
         /* init with master mute & zero volume */
         put_kctl_with_value(kctl, 0);
         if (init_slave_vol) {
-                int step = 0;
-                map_slaves(codec, slaves, suffix,
-                           tlv ? init_slave_0dB : init_slave_unmute, &step);
+                struct slave_init_arg arg = {
+                        .codec = codec,
+                        .step = 0,
+                };
+                snd_ctl_apply_vmaster_slaves(kctl,
+                                             tlv ? init_slave_0dB : init_slave_unmute,
+                                             &arg);
         }
 
         if (ctl_ret)
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 9ddaae3784f5..4f5f18f22974 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1354,6 +1354,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,
         case USB_ID(0x20b1, 0x2008): /* Matrix Audio X-Sabre */
         case USB_ID(0x20b1, 0x300a): /* Matrix Audio Mini-i Pro */
         case USB_ID(0x22d9, 0x0416): /* OPPO HA-1 */
+        case USB_ID(0x2772, 0x0230): /* Pro-Ject Pre Box S2 Digital */
                 if (fp->altsetting == 2)
                         return SNDRV_PCM_FMTBIT_DSD_U32_BE;
                 break;
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index f90860d1f897..24b35a1fd4d6 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -569,9 +569,10 @@ union bpf_attr {
  *     @flags: reserved for future use
  *     Return: 0 on success or negative error code
  *
- * int bpf_sk_redirect_map(map, key, flags)
+ * int bpf_sk_redirect_map(skb, map, key, flags)
  *     Redirect skb to a sock in map using key as a lookup key for the
  *     sock in map.
+ *     @skb: pointer to skb
  *     @map: pointer to sockmap
  *     @key: key to lookup sock in map
  *     @flags: reserved for future use
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index a0c518ecf085..c0e26ad1fa7e 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -267,12 +267,13 @@ static int decode_instructions(struct objtool_file *file)
                                                       &insn->immediate,
                                                       &insn->stack_op);
                         if (ret)
-                                return ret;
+                                goto err;
 
                         if (!insn->type || insn->type > INSN_LAST) {
                                 WARN_FUNC("invalid instruction type %d",
                                           insn->sec, insn->offset, insn->type);
-                                return -1;
+                                ret = -1;
+                                goto err;
                         }
 
                         hash_add(file->insn_hash, &insn->hash, insn->offset);
@@ -296,6 +297,10 @@ static int decode_instructions(struct objtool_file *file)
         }
 
         return 0;
+
+err:
+        free(insn);
+        return ret;
 }
 
 /*
diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index e397453e5a46..63526f4416ea 100644
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -8,8 +8,8 @@ perf-record - Run a command and record its profile into perf.data
 SYNOPSIS
 --------
 [verse]
-'perf record' [-e <EVENT> | --event=EVENT] [-l] [-a] <command>
-'perf record' [-e <EVENT> | --event=EVENT] [-l] [-a] -- <command> [<options>]
+'perf record' [-e <EVENT> | --event=EVENT] [-a] <command>
+'perf record' [-e <EVENT> | --event=EVENT] [-a] -- <command> [<options>]
 
 DESCRIPTION
 -----------
diff --git a/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh b/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
index 462fc755092e..7a84d73324e3 100755
--- a/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
+++ b/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
@@ -10,6 +10,9 @@
 
 . $(dirname $0)/lib/probe.sh
 
+ld=$(realpath /lib64/ld*.so.* | uniq)
+libc=$(echo $ld | sed 's/ld/libc/g')
+
 trace_libc_inet_pton_backtrace() {
         idx=0
         expected[0]="PING.*bytes"
@@ -18,8 +21,8 @@ trace_libc_inet_pton_backtrace() {
         expected[3]=".*packets transmitted.*"
         expected[4]="rtt min.*"
         expected[5]="[0-9]+\.[0-9]+[[:space:]]+probe_libc:inet_pton:\([[:xdigit:]]+\)"
-        expected[6]=".*inet_pton[[:space:]]\(/usr/lib.*/libc-[0-9]+\.[0-9]+\.so\)$"
-        expected[7]="getaddrinfo[[:space:]]\(/usr/lib.*/libc-[0-9]+\.[0-9]+\.so\)$"
+        expected[6]=".*inet_pton[[:space:]]\($libc\)$"
+        expected[7]="getaddrinfo[[:space:]]\($libc\)$"
         expected[8]=".*\(.*/bin/ping.*\)$"
 
         perf trace --no-syscalls -e probe_libc:inet_pton/max-stack=3/ ping -6 -c 1 ::1 2>&1 | grep -v ^$ | while read line ; do
@@ -35,7 +38,7 @@ trace_libc_inet_pton_backtrace() {
 }
 
 skip_if_no_perf_probe && \
-perf probe -q /lib64/libc-*.so inet_pton && \
+perf probe -q $libc inet_pton && \
 trace_libc_inet_pton_backtrace
 err=$?
 rm -f ${file}
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index ddb2c6fbdf91..db79017a6e56 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -532,7 +532,7 @@ void perf_hpp_list__prepend_sort_field(struct perf_hpp_list *list,
 
 void perf_hpp__column_unregister(struct perf_hpp_fmt *format)
 {
-        list_del(&format->list);
+        list_del_init(&format->list);
 }
 
 void perf_hpp__cancel_cumulate(void)
@@ -606,6 +606,13 @@ next:
 
 static void fmt_free(struct perf_hpp_fmt *fmt)
 {
+        /*
+         * At this point fmt should be completely
+         * unhooked, if not it's a bug.
+         */
+        BUG_ON(!list_empty(&fmt->list));
+        BUG_ON(!list_empty(&fmt->sort_list));
+
         if (fmt->free)
                 fmt->free(fmt);
 }
diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
index c42edeac451f..dcfdafdc2f1c 100644
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -8,6 +8,9 @@
 
 %{
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include "../perf.h"
 #include "parse-events.h"
 #include "parse-events-bison.h"
@@ -53,9 +56,8 @@ static int str(yyscan_t scanner, int token)
         return token;
 }
 
-static bool isbpf(yyscan_t scanner)
+static bool isbpf_suffix(char *text)
 {
-        char *text = parse_events_get_text(scanner);
         int len = strlen(text);
 
         if (len < 2)
@@ -68,6 +70,17 @@ static bool isbpf(yyscan_t scanner)
         return false;
 }
 
+static bool isbpf(yyscan_t scanner)
+{
+        char *text = parse_events_get_text(scanner);
+        struct stat st;
+
+        if (!isbpf_suffix(text))
+                return false;
+
+        return stat(text, &st) == 0;
+}
+
 /*
  * This function is called when the parser gets two kind of input:
  *
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index a7ebd9fe8e40..76ab0709a20c 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -374,6 +374,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool)
                 tool->mmap2 = process_event_stub;
         if (tool->comm == NULL)
                 tool->comm = process_event_stub;
+        if (tool->namespaces == NULL)
+                tool->namespaces = process_event_stub;
         if (tool->fork == NULL)
                 tool->fork = process_event_stub;
         if (tool->exit == NULL)
diff --git a/tools/perf/util/xyarray.h b/tools/perf/util/xyarray.h
index 4ba726c90870..54af60462130 100644
--- a/tools/perf/util/xyarray.h
+++ b/tools/perf/util/xyarray.h
@@ -23,12 +23,12 @@ static inline void *xyarray__entry(struct xyarray *xy, int x, int y)
 
 static inline int xyarray__max_y(struct xyarray *xy)
 {
-        return xy->max_x;
+        return xy->max_y;
 }
 
 static inline int xyarray__max_x(struct xyarray *xy)
 {
-        return xy->max_y;
+        return xy->max_x;
 }
 
 #endif /* _PERF_XYARRAY_H_ */
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 0dafba2c1e7d..bd9c6b31a504 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -92,7 +92,6 @@ unsigned int do_ring_perf_limit_reasons;
 unsigned int crystal_hz;
 unsigned long long tsc_hz;
 int base_cpu;
-int do_migrate;
 double discover_bclk(unsigned int family, unsigned int model);
 unsigned int has_hwp;   /* IA32_PM_ENABLE, IA32_HWP_CAPABILITIES */
                         /* IA32_HWP_REQUEST, IA32_HWP_STATUS */
@@ -303,9 +302,6 @@ int for_all_cpus(int (func)(struct thread_data *, struct core_data *, struct pkg
 
 int cpu_migrate(int cpu)
 {
-        if (!do_migrate)
-                return 0;
-
         CPU_ZERO_S(cpu_affinity_setsize, cpu_affinity_set);
         CPU_SET_S(cpu, cpu_affinity_setsize, cpu_affinity_set);
         if (sched_setaffinity(0, cpu_affinity_setsize, cpu_affinity_set) == -1)
@@ -5007,7 +5003,6 @@ void cmdline(int argc, char **argv)
                 {"hide",        required_argument,      0, 'H'},        // meh, -h taken by --help
                 {"Joules",      no_argument,            0, 'J'},
                 {"list",        no_argument,            0, 'l'},
-                {"migrate",     no_argument,            0, 'm'},
                 {"out",         required_argument,      0, 'o'},
                 {"quiet",       no_argument,            0, 'q'},
                 {"show",        required_argument,      0, 's'},
@@ -5019,7 +5014,7 @@ void cmdline(int argc, char **argv)
 
         progname = argv[0];
 
-        while ((opt = getopt_long_only(argc, argv, "+C:c:Ddhi:Jmo:qST:v",
+        while ((opt = getopt_long_only(argc, argv, "+C:c:Ddhi:JM:m:o:qST:v",
                                 long_options, &option_index)) != -1) {
                 switch (opt) {
                 case 'a':
@@ -5062,9 +5057,6 @@ void cmdline(int argc, char **argv)
                         list_header_only++;
                         quiet++;
                         break;
-                case 'm':
-                        do_migrate = 1;
-                        break;
                 case 'o':
                         outf = fopen_or_die(optarg, "w");
                         break;
diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h
index 36fb9161b34a..b2e02bdcd098 100644
--- a/tools/testing/selftests/bpf/bpf_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_helpers.h
@@ -65,7 +65,7 @@ static int (*bpf_xdp_adjust_head)(void *ctx, int offset) =
 static int (*bpf_setsockopt)(void *ctx, int level, int optname, void *optval,
                              int optlen) =
         (void *) BPF_FUNC_setsockopt;
-static int (*bpf_sk_redirect_map)(void *map, int key, int flags) =
+static int (*bpf_sk_redirect_map)(void *ctx, void *map, int key, int flags) =
         (void *) BPF_FUNC_sk_redirect_map;
 static int (*bpf_sock_map_update)(void *map, void *key, void *value,
                                   unsigned long long flags) =
diff --git a/tools/testing/selftests/bpf/sockmap_verdict_prog.c b/tools/testing/selftests/bpf/sockmap_verdict_prog.c
index 9b99bd10807d..2cd2d552938b 100644
--- a/tools/testing/selftests/bpf/sockmap_verdict_prog.c
+++ b/tools/testing/selftests/bpf/sockmap_verdict_prog.c
@@ -61,8 +61,8 @@ int bpf_prog2(struct __sk_buff *skb)
         bpf_printk("verdict: data[0] = redir(%u:%u)\n", map, sk);
 
         if (!map)
-                return bpf_sk_redirect_map(&sock_map_rx, sk, 0);
-        return bpf_sk_redirect_map(&sock_map_tx, sk, 0);
+                return bpf_sk_redirect_map(skb, &sock_map_rx, sk, 0);
+        return bpf_sk_redirect_map(skb, &sock_map_tx, sk, 0);
 }
 
 char _license[] SEC("license") = "GPL";
diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c
index fe3a443a1102..50ce52d2013d 100644
--- a/tools/testing/selftests/bpf/test_maps.c
+++ b/tools/testing/selftests/bpf/test_maps.c
@@ -466,7 +466,7 @@ static void test_sockmap(int tasks, void *data)
         int one = 1, map_fd_rx, map_fd_tx, map_fd_break, s, sc, rc;
         struct bpf_map *bpf_map_rx, *bpf_map_tx, *bpf_map_break;
         int ports[] = {50200, 50201, 50202, 50204};
-        int err, i, fd, sfd[6] = {0xdeadbeef};
+        int err, i, fd, udp, sfd[6] = {0xdeadbeef};
         u8 buf[20] = {0x0, 0x5, 0x3, 0x2, 0x1, 0x0};
         int parse_prog, verdict_prog;
         struct sockaddr_in addr;
@@ -548,6 +548,16 @@ static void test_sockmap(int tasks, void *data)
                 goto out_sockmap;
         }
 
+        /* Test update with unsupported UDP socket */
+        udp = socket(AF_INET, SOCK_DGRAM, 0);
+        i = 0;
+        err = bpf_map_update_elem(fd, &i, &udp, BPF_ANY);
+        if (!err) {
+                printf("Failed socket SOCK_DGRAM allowed '%i:%i'\n",
+                       i, udp);
+                goto out_sockmap;
+        }
+
         /* Test update without programs */
         for (i = 0; i < 6; i++) {
                 err = bpf_map_update_elem(fd, &i, &sfd[i], BPF_ANY);
diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c
index 26f3250bdcd2..64ae21f64489 100644
--- a/tools/testing/selftests/bpf/test_verifier.c
+++ b/tools/testing/selftests/bpf/test_verifier.c
@@ -1130,15 +1130,27 @@ static struct bpf_test tests[] = {
                 .errstr = "invalid bpf_context access",
         },
         {
-                "check skb->mark is writeable by SK_SKB",
+                "invalid access of skb->mark for SK_SKB",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,
+                                    offsetof(struct __sk_buff, mark)),
+                        BPF_EXIT_INSN(),
+                },
+                .result =  REJECT,
+                .prog_type = BPF_PROG_TYPE_SK_SKB,
+                .errstr = "invalid bpf_context access",
+        },
+        {
+                "check skb->mark is not writeable by SK_SKB",
                 .insns = {
                         BPF_MOV64_IMM(BPF_REG_0, 0),
                         BPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_0,
                                     offsetof(struct __sk_buff, mark)),
                         BPF_EXIT_INSN(),
                 },
-                .result = ACCEPT,
+                .result =  REJECT,
                 .prog_type = BPF_PROG_TYPE_SK_SKB,
+                .errstr = "invalid bpf_context access",
         },
         {
                 "check skb->tc_index is writeable by SK_SKB",
@@ -6645,6 +6657,500 @@ static struct bpf_test tests[] = {
                 .errstr = "BPF_END uses reserved fields",
                 .result = REJECT,
         },
+        {
+                "arithmetic ops make PTR_TO_CTX unusable",
+                .insns = {
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1,
+                                      offsetof(struct __sk_buff, data) -
+                                      offsetof(struct __sk_buff, mark)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,
+                                    offsetof(struct __sk_buff, mark)),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "dereference of modified ctx ptr R1 off=68+8, ctx+const is allowed, ctx+const+const is not",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_SCHED_CLS,
+        },
+        {
+                "XDP pkt read, pkt_end mangling, bad access 1",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_3, 8),
+                        BPF_JMP_REG(BPF_JGT, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_end mangling, bad access 2",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_ALU64_IMM(BPF_SUB, BPF_REG_3, 8),
+                        BPF_JMP_REG(BPF_JGT, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_data' > pkt_end, good access",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGT, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_data' > pkt_end, bad access 1",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGT, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -4),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+                .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+        },
+        {
+                "XDP pkt read, pkt_data' > pkt_end, bad access 2",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGT, BPF_REG_1, BPF_REG_3, 0),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_end > pkt_data', good access",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGT, BPF_REG_3, BPF_REG_1, 1),
+                        BPF_JMP_IMM(BPF_JA, 0, 0, 1),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, -5),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+                .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+        },
+        {
+                "XDP pkt read, pkt_end > pkt_data', bad access 1",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGT, BPF_REG_3, BPF_REG_1, 1),
+                        BPF_JMP_IMM(BPF_JA, 0, 0, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_end > pkt_data', bad access 2",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGT, BPF_REG_3, BPF_REG_1, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_data' < pkt_end, good access",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLT, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_JMP_IMM(BPF_JA, 0, 0, 1),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, -5),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+                .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+        },
+        {
+                "XDP pkt read, pkt_data' < pkt_end, bad access 1",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLT, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_JMP_IMM(BPF_JA, 0, 0, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_data' < pkt_end, bad access 2",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLT, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_end < pkt_data', good access",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLT, BPF_REG_3, BPF_REG_1, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_end < pkt_data', bad access 1",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLT, BPF_REG_3, BPF_REG_1, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -4),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+                .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+        },
+        {
+                "XDP pkt read, pkt_end < pkt_data', bad access 2",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLT, BPF_REG_3, BPF_REG_1, 0),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_data' >= pkt_end, good access",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGE, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, -5),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+                .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+        },
+        {
+                "XDP pkt read, pkt_data' >= pkt_end, bad access 1",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGE, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_data' >= pkt_end, bad access 2",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGE, BPF_REG_1, BPF_REG_3, 0),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, -5),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+                .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+        },
+        {
+                "XDP pkt read, pkt_end >= pkt_data', good access",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGE, BPF_REG_3, BPF_REG_1, 1),
+                        BPF_JMP_IMM(BPF_JA, 0, 0, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_end >= pkt_data', bad access 1",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGE, BPF_REG_3, BPF_REG_1, 1),
+                        BPF_JMP_IMM(BPF_JA, 0, 0, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -4),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+                .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+        },
+        {
+                "XDP pkt read, pkt_end >= pkt_data', bad access 2",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JGE, BPF_REG_3, BPF_REG_1, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_data' <= pkt_end, good access",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLE, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_JMP_IMM(BPF_JA, 0, 0, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_data' <= pkt_end, bad access 1",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLE, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_JMP_IMM(BPF_JA, 0, 0, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -4),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+                .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+        },
+        {
+                "XDP pkt read, pkt_data' <= pkt_end, bad access 2",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLE, BPF_REG_1, BPF_REG_3, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_end <= pkt_data', good access",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLE, BPF_REG_3, BPF_REG_1, 1),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, -5),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .result = ACCEPT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+                .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+        },
+        {
+                "XDP pkt read, pkt_end <= pkt_data', bad access 1",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLE, BPF_REG_3, BPF_REG_1, 1),
+                        BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+        },
+        {
+                "XDP pkt read, pkt_end <= pkt_data', bad access 2",
+                .insns = {
+                        BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1,
+                                    offsetof(struct xdp_md, data)),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1,
+                                    offsetof(struct xdp_md, data_end)),
+                        BPF_MOV64_REG(BPF_REG_1, BPF_REG_2),
+                        BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, 8),
+                        BPF_JMP_REG(BPF_JLE, BPF_REG_3, BPF_REG_1, 0),
+                        BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, -5),
+                        BPF_MOV64_IMM(BPF_REG_0, 0),
+                        BPF_EXIT_INSN(),
+                },
+                .errstr = "R1 offset is outside of the packet",
+                .result = REJECT,
+                .prog_type = BPF_PROG_TYPE_XDP,
+                .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+        },
 };
 
 static int probe_filter_length(const struct bpf_insn *fp)