Merge tag 'staging-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging/IIO updates from Greg KH:
 "Here's the "big" staging/iio pull request for 4.10-rc1.

  Not as big as 4.9 was, but still just over a thousand changes. We
  almost broke even of lines added vs. removed, as the slicoss driver
  was removed (got a "clean" driver for the same hardware through the
  netdev tree), and some iio drivers were also dropped, but I think we
  ended up adding a few thousand lines to the source tree in the end.
  Other than that it's a lot of minor fixes all over the place, nothing
  major stands out at all.

  All of these have been in linux-next for a while. There will be a
  merge conflict with Al's vfs tree in the lustre code, but the
  resolution for that should be pretty simple, that too has been in
  linux-next"

* tag 'staging-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1002 commits)
  staging: comedi: comedidev.h: Document usage of 'detach' handler
  staging: fsl-mc: remove unnecessary info prints from bus driver
  staging: fsl-mc: add sysfs ABI doc
  staging/lustre/o2iblnd: Fix misspelled attemps->attempts
  staging/lustre/o2iblnd: Fix misspelling intialized->intialized
  staging/lustre: Convert all bare unsigned to unsigned int
  staging/lustre/socklnd: Fix whitespace problem
  staging/lustre/o2iblnd: Add missing space
  staging/lustre/lnetselftest: Fix potential integer overflow
  staging: greybus: audio_module: remove redundant OOM message
  staging: dgnc: Fix lines longer than 80 characters
  staging: dgnc: fix blank line after '{' warnings.
  staging/android: remove Sync Framework tasks from TODO
  staging/lustre/osc: Revert erroneous list_for_each_entry_safe use
  staging: slicoss: remove the staging driver
  staging: lustre: libcfs: remove lnet upcall code
  staging: lustre: remove set but unused variables
  staging: lustre: osc: set lock data for readahead lock
  staging: lustre: import: don't reconnect during connect interpret
  staging: lustre: clio: remove mtime check in vvp_io_fault_start()
  ...

685 files changed, 33601 insertions, 31456 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-fsl-mc b/Documentation/ABI/testing/sysfs-bus-fsl-mc
new file mode 100644
index 000000000000..80256b8b4f26
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-fsl-mc
@@ -0,0 +1,21 @@
+What:           /sys/bus/fsl-mc/drivers/.../bind
+Date:           December 2016
+Contact:        stuart.yoder@nxp.com
+Description:
+                Writing a device location to this file will cause
+                the driver to attempt to bind to the device found at
+                this location. The format for the location is Object.Id
+                and is the same as found in /sys/bus/fsl-mc/devices/.
+                For example:
+                # echo dpni.2 > /sys/bus/fsl-mc/drivers/fsl_dpaa2_eth/bind
+
+What:           /sys/bus/fsl-mc/drivers/.../unbind
+Date:           December 2016
+Contact:        stuart.yoder@nxp.com
+Description:
+                Writing a device location to this file will cause the
+                driver to attempt to unbind from the device found at
+                this location. The format for the location is Object.Id
+                and is the same as found in /sys/bus/fsl-mc/devices/.
+                For example:
+                # echo dpni.2 > /sys/bus/fsl-mc/drivers/fsl_dpaa2_eth/unbind
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index fee35c00cc4e..b8f220f978dd 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -329,6 +329,7 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_humidityrelative_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_illuminance_scale
+What:           /sys/bus/iio/devices/iio:deviceX/in_countY_scale
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
@@ -1579,3 +1580,20 @@ Contact:	linux-iio@vger.kernel.org
 Description:
                 Raw (unscaled no offset etc.) electric conductivity reading that
                 can be processed to siemens per meter.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_countY_raw
+KernelVersion:  4.9
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Raw counter device counts from channel Y. For quadrature
+                counters, multiplication by an available [Y]_scale results in
+                the counts of a single quadrature signal phase from channel Y.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_indexY_raw
+KernelVersion:  4.9
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Raw counter device index value from channel Y. This attribute
+                provides an absolute positional reference (e.g. a pulse once per
+                revolution) which may be used to home positional systems as
+                required.
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector b/Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector
new file mode 100644
index 000000000000..2071f9bcfaa5
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector
@@ -0,0 +1,36 @@
+What:           /sys/bus/iio/devices/iio:deviceX/in_altvoltageY_invert
+Date:           October 2016
+KernelVersion:  4.9
+Contact:        Peter Rosin <peda@axentia.se>
+Description:
+                The DAC is used to find the peak level of an alternating
+                voltage input signal by a binary search using the output
+                of a comparator wired to an interrupt pin. Like so:
+                                           _
+                                          | \
+                     input +------>-------|+ \
+                                          |   \
+                            .-------.     |    }---.
+                            |       |     |   /    |
+                            |    dac|-->--|- /     |
+                            |       |     |_/      |
+                            |       |              |
+                            |       |              |
+                            |    irq|------<-------'
+                            |       |
+                            '-------'
+                The boolean invert attribute (0/1) should be set when the
+                input signal is centered around the maximum value of the
+                dac instead of zero. The envelope detector will search
+                from below in this case and will also invert the result.
+                The edge/level of the interrupt is also switched to its
+                opposite value.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_altvoltageY_compare_interval
+Date:           October 2016
+KernelVersion:  4.9
+Contact:        Peter Rosin <peda@axentia.se>
+Description:
+                Number of milliseconds to wait for the comparator in each
+                step of the binary search for the input peak level. Needs
+                to relate to the frequency of the input signal.
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8 b/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
new file mode 100644
index 000000000000..ba676520b953
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
@@ -0,0 +1,125 @@
+What:           /sys/bus/iio/devices/iio:deviceX/in_count_count_direction_available
+What:           /sys/bus/iio/devices/iio:deviceX/in_count_count_mode_available
+What:           /sys/bus/iio/devices/iio:deviceX/in_count_noise_error_available
+What:           /sys/bus/iio/devices/iio:deviceX/in_count_quadrature_mode_available
+What:           /sys/bus/iio/devices/iio:deviceX/in_index_index_polarity_available
+What:           /sys/bus/iio/devices/iio:deviceX/in_index_synchronous_mode_available
+KernelVersion:  4.9
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Discrete set of available values for the respective counter
+                configuration are listed in this file.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_countY_count_direction
+KernelVersion:  4.9
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Read-only attribute that indicates whether the counter for
+                channel Y is counting up or down.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_countY_count_mode
+KernelVersion:  4.9
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Count mode for channel Y. Four count modes are available:
+                normal, range limit, non-recycle, and modulo-n. The preset value
+                for channel Y is used by the count mode where required.
+
+                Normal:
+                        Counting is continuous in either direction.
+
+                Range Limit:
+                        An upper or lower limit is set, mimicking limit switches
+                        in the mechanical counterpart. The upper limit is set to
+                        the preset value, while the lower limit is set to 0. The
+                        counter freezes at count = preset when counting up, and
+                        at count = 0 when counting down. At either of these
+                        limits, the counting is resumed only when the count
+                        direction is reversed.
+
+                Non-recycle:
+                        Counter is disabled whenever a 24-bit count overflow or
+                        underflow takes place. The counter is re-enabled when a
+                        new count value is loaded to the counter via a preset
+                        operation or write to raw.
+
+                Modulo-N:
+                        A count boundary is set between 0 and the preset value.
+                        The counter is reset to 0 at count = preset when
+                        counting up, while the counter is set to the preset
+                        value at count = 0 when counting down; the counter does
+                        not freeze at the bundary points, but counts
+                        continuously throughout.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_countY_noise_error
+KernelVersion:  4.9
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Read-only attribute that indicates whether excessive noise is
+                present at the channel Y count inputs in quadrature clock mode;
+                irrelevant in non-quadrature clock mode.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_countY_preset
+KernelVersion:  4.9
+Contact:        linux-iio@vger.kernel.org
+Description:
+                If the counter device supports preset registers, the preset
+                count for channel Y is provided by this attribute.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_countY_quadrature_mode
+KernelVersion:  4.9
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Configure channel Y counter for non-quadrature or quadrature
+                clock mode. Selecting non-quadrature clock mode will disable
+                synchronous load mode. In quadrature clock mode, the channel Y
+                scale attribute selects the encoder phase division (scale of 1
+                selects full-cycle, scale of 0.5 selects half-cycle, scale of
+                0.25 selects quarter-cycle) processed by the channel Y counter.
+
+                Non-quadrature:
+                        The filter and decoder circuit are bypassed. Encoder A
+                        input serves as the count input and B as the UP/DOWN
+                        direction control input, with B = 1 selecting UP Count
+                        mode and B = 0 selecting Down Count mode.
+
+                Quadrature:
+                        Encoder A and B inputs are digitally filtered and
+                        decoded for UP/DN clock.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_countY_set_to_preset_on_index
+KernelVersion:  4.9
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Whether to set channel Y counter with channel Y preset value
+                when channel Y index input is active, or continuously count.
+                Valid attribute values are boolean.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_indexY_index_polarity
+KernelVersion:  4.9
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Active level of channel Y index input; irrelevant in
+                non-synchronous load mode.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_indexY_synchronous_mode
+KernelVersion:  4.9
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Configure channel Y counter for non-synchronous or synchronous
+                load mode. Synchronous load mode cannot be selected in
+                non-quadrature clock mode.
+
+                Non-synchronous:
+                        A logic low level is the active level at this index
+                        input. The index function (as enabled via
+                        set_to_preset_on_index) is performed directly on the
+                        active level of the index input.
+
+                Synchronous:
+                        Intended for interfacing with encoder Index output in
+                        quadrature clock mode. The active level is configured
+                        via index_polarity. The index function (as enabled via
+                        set_to_preset_on_index) is performed synchronously with
+                        the quadrature clock on the active level of the index
+                        input.
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-cros-ec b/Documentation/ABI/testing/sysfs-bus-iio-cros-ec
new file mode 100644
index 000000000000..297b9720f024
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-cros-ec
@@ -0,0 +1,18 @@
+What:           /sys/bus/iio/devices/iio:deviceX/calibrate
+Date:           July 2015
+KernelVersion:  4.7
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Writing '1' will perform a FOC (Fast Online Calibration). The
+                corresponding calibration offsets can be read from *_calibbias
+                entries.
+
+What:           /sys/bus/iio/devices/iio:deviceX/location
+Date:           July 2015
+KernelVersion:  4.7
+Contact:        linux-iio@vger.kernel.org
+Description:
+                This attribute returns a string with the physical location where
+                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'.
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac b/Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac
new file mode 100644
index 000000000000..580e93f373f6
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac
@@ -0,0 +1,8 @@
+What:           /sys/bus/iio/devices/iio:deviceX/out_voltageY_raw_available
+Date:           October 2016
+KernelVersion:  4.9
+Contact:        Peter Rosin <peda@axentia.se>
+Description:
+                The range of available values represented as the minimum value,
+                the step and the maximum value, all enclosed in square brackets.
+                Example: [0 1 256]
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-light-isl29018 b/Documentation/ABI/testing/sysfs-bus-iio-light-isl29018
new file mode 100644
index 000000000000..f0ce0a0476ea
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-light-isl29018
@@ -0,0 +1,19 @@
+What:           /sys/bus/iio/devices/iio:deviceX/proximity_on_chip_ambient_infrared_suppression
+Date:           January 2011
+KernelVersion:  2.6.37
+Contact:        linux-iio@vger.kernel.org
+Description:
+                From ISL29018 Data Sheet (FN6619.4, Oct 8, 2012) regarding the
+                infrared suppression:
+
+                Scheme 0, makes full n (4, 8, 12, 16) bits (unsigned) proximity
+                detection. The range of Scheme 0 proximity count is from 0 to
+                2^n. Logic 1 of this bit, Scheme 1, makes n-1 (3, 7, 11, 15)
+                bits (2's complementary) proximity_less_ambient detection. The
+                range of Scheme 1 proximity count is from -2^(n-1) to 2^(n-1).
+                The sign bit is extended for resolutions less than 16. While
+                Scheme 0 has wider dynamic range, Scheme 1 proximity detection
+                is less affected by the ambient IR noise variation.
+
+                0 Sensing IR from LED and ambient
+                1 Sensing IR from LED with ambient IR rejection
diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio-light-tsl2583 b/Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583
index 660781df409f..a2e19964e87e 100644
--- a/drivers/staging/iio/Documentation/sysfs-bus-iio-light-tsl2583
+++ b/Documentation/ABI/testing/sysfs-bus-iio-light-tsl2583
@@ -1,18 +1,18 @@
-What:           /sys/bus/iio/devices/device[n]/lux_table
+What:           /sys/bus/iio/devices/device[n]/in_illuminance_calibrate
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
-                This property gets/sets the table of coefficients
-                used in calculating illuminance in lux.
+                This property causes an internal calibration of the als gain trim
+                value which is later used in calculating illuminance in lux.
 
-What:           /sys/bus/iio/devices/device[n]/illuminance0_calibrate
+What:           /sys/bus/iio/devices/device[n]/in_illuminance_lux_table
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
-                This property causes an internal calibration of the als gain trim
-                value which is later used in calculating illuminance in lux.
+                This property gets/sets the table of coefficients
+                used in calculating illuminance in lux.
 
-What:           /sys/bus/iio/devices/device[n]/illuminance0_input_target
+What:           /sys/bus/iio/devices/device[n]/in_illuminance_input_target
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531 b/Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
new file mode 100644
index 000000000000..2a91fbe394fc
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
@@ -0,0 +1,8 @@
+What:           /sys/bus/iio/devices/iio:deviceX/out_resistance_raw_available
+Date:           October 2016
+KernelVersion:  4.9
+Contact:        Peter Rosin <peda@axentia.se>
+Description:
+                The range of available values represented as the minimum value,
+                the step and the maximum value, all enclosed in square brackets.
+                Example: [0 1 256]
diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index fbbad6446741..03349ad5abfa 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -39,11 +39,13 @@ dallas,ds75		Digital Thermometer and Thermostat
 dlg,da9053              DA9053: flexible system level PMIC with multicore support
 dlg,da9063              DA9063: system PMIC for quad-core application processors
 domintech,dmard09       DMARD09: 3-axis Accelerometer
+domintech,dmard10       DMARD10: 3-axis Accelerometer
 epson,rx8010            I2C-BUS INTERFACE REAL TIME CLOCK MODULE
 epson,rx8025            High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE
 epson,rx8581            I2C-BUS INTERFACE REAL TIME CLOCK MODULE
 fsl,mag3110             MAG3110: Xtrinsic High Accuracy, 3D Magnetometer
 fsl,mc13892             MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51
+fsl,mma7660             MMA7660FC: 3-Axis Orientation/Motion Detection Sensor
 fsl,mma8450             MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer
 fsl,mpl3115             MPL3115: Absolute Digital Pressure Sensor
 fsl,mpr121              MPR121: Proximity Capacitive Touch Sensor Controller
@@ -57,6 +59,7 @@ maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs
 maxim,max6625           9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface
 mc,rv3029c2             Real Time Clock Module with I2C-Bus
 mcube,mc3230            mCube 3-axis 8-bit digital accelerometer
+memsic,mxc6225          MEMSIC 2-axis 8-bit digital accelerometer
 microchip,mcp4531-502   Microchip 7-bit Single I2C Digital Potentiometer (5k)
 microchip,mcp4531-103   Microchip 7-bit Single I2C Digital Potentiometer (10k)
 microchip,mcp4531-503   Microchip 7-bit Single I2C Digital Potentiometer (50k)
@@ -121,6 +124,9 @@ microchip,mcp4662-502	Microchip 8-bit Dual I2C Digital Potentiometer with NV Mem
 microchip,mcp4662-103   Microchip 8-bit Dual I2C Digital Potentiometer with NV Memory (10k)
 microchip,mcp4662-503   Microchip 8-bit Dual I2C Digital Potentiometer with NV Memory (50k)
 microchip,mcp4662-104   Microchip 8-bit Dual I2C Digital Potentiometer with NV Memory (100k)
+miramems,da226          MiraMEMS DA226 2-axis 14-bit digital accelerometer
+miramems,da280          MiraMEMS DA280 3-axis 14-bit digital accelerometer
+miramems,da311          MiraMEMS DA311 3-axis 12-bit digital accelerometer
 national,lm63           Temperature sensor with integrated fan control
 national,lm75           I2C TEMP SENSOR
 national,lm80           Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor
@@ -146,6 +152,7 @@ ricoh,rv5c387a		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
 samsung,24ad0xd1        S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)
 sgx,vz89x               SGX Sensortech VZ89X Sensors
 sii,s35390a             2-wire CMOS real-time clock
+silabs,si7020           Relative Humidity and Temperature Sensors
 skyworks,sky81452       Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply
 st,24c256               i2c serial eeprom  (24cxx)
 st,m41t00               Serial real-time clock (RTC)
diff --git a/Documentation/devicetree/bindings/iio/adc/envelope-detector.txt b/Documentation/devicetree/bindings/iio/adc/envelope-detector.txt
new file mode 100644
index 000000000000..27544bdd4478
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/envelope-detector.txt
@@ -0,0 +1,54 @@
+Bindings for ADC envelope detector using a DAC and a comparator
+
+The DAC is used to find the peak level of an alternating voltage input
+signal by a binary search using the output of a comparator wired to
+an interrupt pin. Like so:
+                          _
+                         | \
+    input +------>-------|+ \
+                         |   \
+           .-------.     |    }---.
+           |       |     |   /    |
+           |    dac|-->--|- /     |
+           |       |     |_/      |
+           |       |              |
+           |       |              |
+           |    irq|------<-------'
+           |       |
+           '-------'
+
+Required properties:
+- compatible: Should be "axentia,tse850-envelope-detector"
+- io-channels: Channel node of the dac to be used for comparator input.
+- io-channel-names: Should be "dac".
+- interrupt specification for one client interrupt,
+  see ../../interrupt-controller/interrupts.txt for details.
+- interrupt-names: Should be "comp".
+
+Example:
+
+        &i2c {
+                dpot: mcp4651-104@28 {
+                        compatible = "microchip,mcp4651-104";
+                        reg = <0x28>;
+                        #io-channel-cells = <1>;
+                };
+        };
+
+        dac: dac {
+                compatible = "dpot-dac";
+                vref-supply = <&reg_3v3>;
+                io-channels = <&dpot 0>;
+                io-channel-names = "dpot";
+                #io-channel-cells = <1>;
+        };
+
+        envelope-detector {
+                compatible = "axentia,tse850-envelope-detector";
+                io-channels = <&dac 0>;
+                io-channel-names = "dac";
+
+                interrupt-parent = <&gpio>;
+                interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
+                interrupt-names = "comp";
+        };
diff --git a/Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt b/Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt
new file mode 100644
index 000000000000..49ed82e89870
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt
@@ -0,0 +1,83 @@
+STMicroelectronics STM32 ADC device driver
+
+STM32 ADC is a successive approximation analog-to-digital converter.
+It has several multiplexed input channels. Conversions can be performed
+in single, continuous, scan or discontinuous mode. Result of the ADC is
+stored in a left-aligned or right-aligned 32-bit data register.
+Conversions can be launched in software or using hardware triggers.
+
+The analog watchdog feature allows the application to detect if the input
+voltage goes beyond the user-defined, higher or lower thresholds.
+
+Each STM32 ADC block can have up to 3 ADC instances.
+
+Each instance supports two contexts to manage conversions, each one has its
+own configurable sequence and trigger:
+- regular conversion can be done in sequence, running in background
+- injected conversions have higher priority, and so have the ability to
+  interrupt regular conversion sequence (either triggered in SW or HW).
+  Regular sequence is resumed, in case it has been interrupted.
+
+Contents of a stm32 adc root node:
+-----------------------------------
+Required properties:
+- compatible: Should be "st,stm32f4-adc-core".
+- reg: Offset and length of the ADC block register set.
+- interrupts: Must contain the interrupt for ADC block.
+- clocks: Clock for the analog circuitry (common to all ADCs).
+- clock-names: Must be "adc".
+- interrupt-controller: Identifies the controller node as interrupt-parent
+- vref-supply: Phandle to the vref input analog reference voltage.
+- #interrupt-cells = <1>;
+- #address-cells = <1>;
+- #size-cells = <0>;
+
+Optional properties:
+- A pinctrl state named "default" for each ADC channel may be defined to set
+  inX ADC pins in mode of operation for analog input on external pin.
+
+Contents of a stm32 adc child node:
+-----------------------------------
+An ADC block node should contain at least one subnode, representing an
+ADC instance available on the machine.
+
+Required properties:
+- compatible: Should be "st,stm32f4-adc".
+- reg: Offset of ADC instance in ADC block (e.g. may be 0x0, 0x100, 0x200).
+- clocks: Input clock private to this ADC instance.
+- interrupt-parent: Phandle to the parent interrupt controller.
+- interrupts: IRQ Line for the ADC (e.g. may be 0 for adc@0, 1 for adc@100 or
+  2 for adc@200).
+- st,adc-channels: List of single-ended channels muxed for this ADC.
+  It can have up to 16 channels, numbered from 0 to 15 (resp. for in0..in15).
+- #io-channel-cells = <1>: See the IIO bindings section "IIO consumers" in
+  Documentation/devicetree/bindings/iio/iio-bindings.txt
+
+Example:
+        adc: adc@40012000 {
+                compatible = "st,stm32f4-adc-core";
+                reg = <0x40012000 0x400>;
+                interrupts = <18>;
+                clocks = <&rcc 0 168>;
+                clock-names = "adc";
+                vref-supply = <&reg_vref>;
+                interrupt-controller;
+                pinctrl-names = "default";
+                pinctrl-0 = <&adc3_in8_pin>;
+
+                #interrupt-cells = <1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                adc@0 {
+                        compatible = "st,stm32f4-adc";
+                        #io-channel-cells = <1>;
+                        reg = <0x0>;
+                        clocks = <&rcc 0 168>;
+                        interrupt-parent = <&adc>;
+                        interrupts = <0>;
+                        st,adc-channels = <8>;
+                };
+                ...
+                other adc child nodes follow...
+        };
diff --git a/Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt b/Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt
index 9ed2315781e4..3d25011f0c99 100644
--- a/Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt
+++ b/Documentation/devicetree/bindings/iio/adc/ti-adc161s626.txt
@@ -3,6 +3,7 @@
 Required properties:
  - compatible: Should be "ti,adc141s626" or "ti,adc161s626"
  - reg: spi chip select number for the device
+ - vdda-supply: supply voltage to VDDA pin
 
 Recommended properties:
  - spi-max-frequency: Definition as per
@@ -11,6 +12,7 @@ Recommended properties:
 Example:
 adc@0 {
         compatible = "ti,adc161s626";
+        vdda-supply = <&vdda_fixed>;
         reg = <0>;
         spi-max-frequency = <4300000>;
 };
diff --git a/Documentation/devicetree/bindings/iio/dac/dpot-dac.txt b/Documentation/devicetree/bindings/iio/dac/dpot-dac.txt
new file mode 100644
index 000000000000..fdf47a01bfef
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/dac/dpot-dac.txt
@@ -0,0 +1,41 @@
+Bindings for DAC emulation using a digital potentiometer
+
+It is assumed that the dpot is used as a voltage divider between the
+current dpot wiper setting and the maximum resistance of the dpot. The
+divided voltage is provided by a vref regulator.
+
+                  .------.
+   .-----------.  |      |
+   | vref      |--'    .---.
+   | regulator |--.    |   |
+   '-----------'  |    | d |
+                  |    | p |
+                  |    | o |  wiper
+                  |    | t |<---------+
+                  |    |   |
+                  |    '---'       dac output voltage
+                  |      |
+                  '------+------------+
+
+Required properties:
+- compatible: Should be "dpot-dac"
+- vref-supply: The regulator supplying the voltage divider.
+- io-channels: Channel node of the dpot to be used for the voltage division.
+- io-channel-names: Should be "dpot".
+
+Example:
+
+        &i2c {
+                dpot: mcp4651-503@28 {
+                        compatible = "microchip,mcp4651-503";
+                        reg = <0x28>;
+                        #io-channel-cells = <1>;
+                };
+        };
+
+        dac {
+                compatible = "dpot-dac";
+                vref-supply = <&reg_3v3>;
+                io-channels = <&dpot 0>;
+                io-channel-names = "dpot";
+        };
diff --git a/Documentation/devicetree/bindings/iio/dac/mcp4725.txt b/Documentation/devicetree/bindings/iio/dac/mcp4725.txt
new file mode 100644
index 000000000000..1bc6c093fbfe
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/dac/mcp4725.txt
@@ -0,0 +1,35 @@
+Microchip mcp4725 and mcp4726 DAC device driver
+
+Required properties:
+        - compatible: Must be "microchip,mcp4725" or "microchip,mcp4726"
+        - reg: Should contain the DAC I2C address
+        - vdd-supply: Phandle to the Vdd power supply. This supply is used as a
+          voltage reference on mcp4725. It is used as a voltage reference on
+          mcp4726 if there is no vref-supply specified.
+
+Optional properties (valid only for mcp4726):
+        - vref-supply: Optional phandle to the Vref power supply. Vref pin is
+          used as a voltage reference when this supply is specified.
+        - microchip,vref-buffered: Boolean to enable buffering of the external
+          Vref pin. This boolean is not valid without the vref-supply. Quoting
+          the datasheet: This is offered in cases where the reference voltage
+          does not have the current capability not to drop its voltage when
+          connected to the internal resistor ladder circuit.
+
+Examples:
+
+        /* simple mcp4725 */
+        mcp4725@60 {
+                compatible = "microchip,mcp4725";
+                reg = <0x60>;
+                vdd-supply = <&vdac_vdd>;
+        };
+
+        /* mcp4726 with the buffered external reference voltage */
+        mcp4726@60 {
+                compatible = "microchip,mcp4726";
+                reg = <0x60>;
+                vdd-supply = <&vdac_vdd>;
+                vref-supply = <&vdac_vref>;
+                microchip,vref-buffered;
+        };
diff --git a/Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt b/Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt
new file mode 100644
index 000000000000..b0d3b59966bc
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt
@@ -0,0 +1,46 @@
+Invensense MPU-3050 Gyroscope device tree bindings
+
+Required properties:
+  - compatible : should be "invensense,mpu3050"
+  - reg : the I2C address of the sensor
+
+Optional properties:
+  - interrupt-parent : should be the phandle for the interrupt controller
+  - interrupts : interrupt mapping for the trigger interrupt from the
+    internal oscillator. The following IRQ modes are supported:
+    IRQ_TYPE_EDGE_RISING, IRQ_TYPE_EDGE_FALLING, IRQ_TYPE_LEVEL_HIGH and
+    IRQ_TYPE_LEVEL_LOW. The driver should detect and configure the hardware
+    for the desired interrupt type.
+  - vdd-supply : supply regulator for the main power voltage.
+  - vlogic-supply : supply regulator for the signal voltage.
+  - mount-matrix : see iio/mount-matrix.txt
+
+Optional subnodes:
+  - The MPU-3050 will pass through and forward the I2C signals from the
+    incoming I2C bus, alternatively drive traffic to a slave device (usually
+    an accelerometer) on its own initiative. Therefore is supports a subnode
+    i2c gate node. For details see: i2c/i2c-gate.txt
+
+Example:
+
+mpu3050@68 {
+        compatible = "invensense,mpu3050";
+        reg = <0x68>;
+        interrupt-parent = <&foo>;
+        interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
+        vdd-supply = <&bar>;
+        vlogic-supply = <&baz>;
+
+        /* External I2C interface */
+        i2c-gate {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                fnord@18 {
+                        compatible = "fnord";
+                        reg = <0x18>;
+                        interrupt-parent = <&foo>;
+                        interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/iio/humidity/hts221.txt b/Documentation/devicetree/bindings/iio/humidity/hts221.txt
new file mode 100644
index 000000000000..b20ab9c12080
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/humidity/hts221.txt
@@ -0,0 +1,22 @@
+* HTS221 STM humidity + temperature sensor
+
+Required properties:
+- compatible: should be "st,hts221"
+- reg: i2c address of the sensor / spi cs line
+
+Optional properties:
+- interrupt-parent: should be the phandle for the interrupt controller
+- interrupts: interrupt mapping for IRQ. It should be configured with
+  flags IRQ_TYPE_LEVEL_HIGH or IRQ_TYPE_EDGE_RISING.
+
+  Refer to interrupt-controller/interrupts.txt for generic interrupt
+  client node bindings.
+
+Example:
+
+hts221@5f {
+        compatible = "st,hts221";
+        reg = <0x5f>;
+        interrupt-parent = <&gpio0>;
+        interrupts = <0 IRQ_TYPE_EDGE_RISING>;
+};
diff --git a/Documentation/devicetree/bindings/iio/light/isl29018.txt b/Documentation/devicetree/bindings/iio/light/isl29018.txt
new file mode 100644
index 000000000000..425ab459e209
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/light/isl29018.txt
@@ -0,0 +1,28 @@
+* ISL 29018/29023/29035 I2C ALS, Proximity, and Infrared sensor
+
+Required properties:
+
+  - compatible: Should be one of
+                "isil,isl29018"
+                "isil,isl29023"
+                "isil,isl29035"
+  - reg: the I2C address of the device
+
+Optional properties:
+
+  - interrupt-parent: should be the phandle for the interrupt controller
+  - interrupts: the sole interrupt generated by the device
+
+  Refer to interrupt-controller/interrupts.txt for generic interrupt client
+  node bindings.
+
+  - vcc-supply: phandle to the regulator that provides power to the sensor.
+
+Example:
+
+isl29018@44 {
+        compatible = "isil,isl29018";
+        reg = <0x44>;
+        interrupt-parent = <&gpio>;
+        interrupts = <TEGRA_GPIO(Z, 2) IRQ_TYPE_LEVEL_HIGH>;
+};
diff --git a/Documentation/devicetree/bindings/iio/light/tsl2583.txt b/Documentation/devicetree/bindings/iio/light/tsl2583.txt
new file mode 100644
index 000000000000..8e2066c83f70
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/light/tsl2583.txt
@@ -0,0 +1,26 @@
+* TAOS TSL 2580/2581/2583 ALS sensor
+
+Required properties:
+
+  - compatible: Should be one of
+                "amstaos,tsl2580"
+                "amstaos,tsl2581"
+                "amstaos,tsl2583"
+  - reg: the I2C address of the device
+
+Optional properties:
+
+  - interrupt-parent: should be the phandle for the interrupt controller
+  - interrupts: the sole interrupt generated by the device
+
+  Refer to interrupt-controller/interrupts.txt for generic interrupt client
+  node bindings.
+
+  - vcc-supply: phandle to the regulator that provides power to the sensor.
+
+Example:
+
+tsl2581@29 {
+        compatible = "amstaos,tsl2581";
+        reg = <0x29>;
+};
diff --git a/Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt b/Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt
new file mode 100644
index 000000000000..b9b621e94cd7
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt
@@ -0,0 +1,30 @@
+* Texas Instruments LMP91000 potentiostat
+
+http://www.ti.com/lit/ds/symlink/lmp91000.pdf
+
+Required properties:
+
+  - compatible: should be "ti,lmp91000"
+  - reg: the I2C address of the device
+  - io-channels: the phandle of the iio provider
+
+  - ti,external-tia-resistor: if the property ti,tia-gain-ohm is not defined this
+    needs to be set to signal that an external resistor value is being used.
+
+Optional properties:
+
+  - ti,tia-gain-ohm: ohm value of the internal resistor for the transimpedance
+    amplifier. Must be 2750, 3500, 7000, 14000, 35000, 120000, or 350000 ohms.
+
+  - ti,rload-ohm: ohm value of the internal resistor load applied to the gas
+    sensor. Must be 10, 33, 50, or 100 (default) ohms.
+
+Example:
+
+lmp91000@48 {
+        compatible = "ti,lmp91000";
+        reg = <0x48>;
+        ti,tia-gain-ohm = <7500>;
+        ti,rload = <100>;
+        io-channels = <&adc>;
+};
diff --git a/Documentation/devicetree/bindings/iio/st-sensors.txt b/Documentation/devicetree/bindings/iio/st-sensors.txt
index e41fe340162b..c040c9ad1889 100644
--- a/Documentation/devicetree/bindings/iio/st-sensors.txt
+++ b/Documentation/devicetree/bindings/iio/st-sensors.txt
@@ -42,6 +42,7 @@ Accelerometers:
 - st,lsm303agr-accel
 - st,lis2dh12-accel
 - st,h3lis331dl-accel
+- st,lng2dm-accel
 
 Gyroscopes:
 - st,l3g4200d-gyro
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index d9c51d7f4aac..56a257b7c4d7 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -39,6 +39,7 @@ auo	AU Optronics Corporation
 auvidea Auvidea GmbH
 avago   Avago Technologies
 avic    Shanghai AVIC Optoelectronics Co., Ltd.
+axentia Axentia Technologies AB
 axis    Axis Communications AB
 boe     BOE Technology Group Co., Ltd.
 bosch   Bosch Sensortec GmbH
@@ -160,16 +161,19 @@ lltc	Linear Technology Corporation
 lsi     LSI Corp. (LSI Logic)
 marvell Marvell Technology Group Ltd.
 maxim   Maxim Integrated Products
+mcube   mCube
 meas    Measurement Specialties
 mediatek        MediaTek Inc.
 melexis Melexis N.V.
 melfas  MELFAS Inc.
+memsic  MEMSIC Inc.
 merrii  Merrii Technology Co., Ltd.
 micrel  Micrel Inc.
 microchip       Microchip Technology Inc.
 microcrystal    Micro Crystal AG
 micron  Micron Technology Inc.
 minix   MINIX Technology Ltd.
+miramems        MiraMEMS Sensing Technology Co., Ltd.
 mitsubishi      Mitsubishi Electric Corporation
 mosaixtech      Mosaix Technologies, Inc.
 moxa    Moxa
diff --git a/MAINTAINERS b/MAINTAINERS
index 34ef63763566..116168194d0e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -260,6 +260,12 @@ L:	linux-gpio@vger.kernel.org
 S:      Maintained
 F:      drivers/gpio/gpio-104-idio-16.c
 
+ACCES 104-QUAD-8 IIO DRIVER
+M:      William Breathitt Gray <vilhelm.gray@gmail.com>
+L:      linux-iio@vger.kernel.org
+S:      Maintained
+F:      drivers/iio/counter/104-quad-8.c
+
 ACENIC DRIVER
 M:      Jes Sorensen <jes@trained-monkey.org>
 L:      linux-acenic@sunsite.dk
@@ -803,7 +809,7 @@ S:	Supported
 F:      drivers/iio/*/ad*
 X:      drivers/iio/*/adjd*
 F:      drivers/staging/iio/*/ad*
-F:      staging/iio/trigger/iio-trig-bfin-timer.c
+F:      drivers/staging/iio/trigger/iio-trig-bfin-timer.c
 
 ANALOG DEVICES INC DMA DRIVERS
 M:      Lars-Peter Clausen <lars@metafoo.de>
@@ -2612,6 +2618,7 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
 S:      Maintained
 N:      bcm2835
+F:      drivers/staging/vc04_services
 
 BROADCOM BCM47XX MIPS ARCHITECTURE
 M:      Hauke Mehrtens <hauke@hauke-m.de>
@@ -5192,13 +5199,6 @@ F:	sound/soc/fsl/fsl*
 F:      sound/soc/fsl/imx*
 F:      sound/soc/fsl/mpc8610_hpcd.c
 
-FREESCALE QORIQ MANAGEMENT COMPLEX DRIVER
-M:      "J. German Rivera" <German.Rivera@freescale.com>
-M:      Stuart Yoder <stuart.yoder@nxp.com>
-L:      linux-kernel@vger.kernel.org
-S:      Maintained
-F:      drivers/staging/fsl-mc/
-
 FREEVXFS FILESYSTEM
 M:      Christoph Hellwig <hch@infradead.org>
 W:      ftp://ftp.openlinux.org/pub/people/hch/vxfs
@@ -6215,6 +6215,22 @@ L:	linux-media@vger.kernel.org
 S:      Maintained
 F:      drivers/media/rc/iguanair.c
 
+IIO DIGITAL POTENTIOMETER DAC
+M:      Peter Rosin <peda@axentia.se>
+L:      linux-iio@vger.kernel.org
+S:      Maintained
+F:      Documentation/ABI/testing/sysfs-bus-iio-dac-dpot-dac
+F:      Documentation/devicetree/bindings/iio/dac/dpot-dac.txt
+F:      drivers/iio/dac/dpot-dac.c
+
+IIO ENVELOPE DETECTOR
+M:      Peter Rosin <peda@axentia.se>
+L:      linux-iio@vger.kernel.org
+S:      Maintained
+F:      Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector
+F:      Documentation/devicetree/bindings/iio/adc/envelope-detector.txt
+F:      drivers/iio/adc/envelope-detector.c
+
 IIO SUBSYSTEM AND DRIVERS
 M:      Jonathan Cameron <jic23@kernel.org>
 R:      Hartmut Knaack <knaack.h@gmx.de>
@@ -6596,6 +6612,13 @@ S:	Maintained
 F:      arch/x86/include/asm/pmc_core.h
 F:      drivers/platform/x86/intel_pmc_core*
 
+INVENSENSE MPU-3050 GYROSCOPE DRIVER
+M:      Linus Walleij <linus.walleij@linaro.org>
+L:      linux-iio@vger.kernel.org
+S:      Maintained
+F:      drivers/iio/gyro/mpu3050*
+F:      Documentation/devicetree/bindings/iio/gyroscope/inv,mpu3050.txt
+
 IOC3 ETHERNET DRIVER
 M:      Ralf Baechle <ralf@linux-mips.org>
 L:      linux-mips@linux-mips.org
@@ -7803,6 +7826,7 @@ MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVER
 M:      Peter Rosin <peda@axentia.se>
 L:      linux-iio@vger.kernel.org
 S:      Maintained
+F:      Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
 F:      drivers/iio/potentiometer/mcp4531.c
 
 MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
@@ -10056,6 +10080,12 @@ F:	fs/qnx4/
 F:      include/uapi/linux/qnx4_fs.h
 F:      include/uapi/linux/qnxtypes.h
 
+QORIQ DPAA2 FSL-MC BUS DRIVER
+M:      Stuart Yoder <stuart.yoder@nxp.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/staging/fsl-mc/
+
 QT1010 MEDIA DRIVER
 M:      Antti Palosaari <crope@iki.fi>
 L:      linux-media@vger.kernel.org
@@ -11647,12 +11677,6 @@ L:	linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/staging/sm750fb/
 
-STAGING - SLICOSS
-M:      Lior Dotan <liodot@gmail.com>
-M:      Christopher Harrer <charrer@alacritech.com>
-S:      Odd Fixes
-F:      drivers/staging/slicoss/
-
 STAGING - SPEAKUP CONSOLE SPEECH DRIVER
 M:      William Hubbs <w.d.hubbs@gmail.com>
 M:      Chris Brannon <chris@the-brannons.com>
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index 6743b18194fb..a918270d6f54 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -73,6 +73,7 @@ source "drivers/iio/adc/Kconfig"
 source "drivers/iio/amplifiers/Kconfig"
 source "drivers/iio/chemical/Kconfig"
 source "drivers/iio/common/Kconfig"
+source "drivers/iio/counter/Kconfig"
 source "drivers/iio/dac/Kconfig"
 source "drivers/iio/dummy/Kconfig"
 source "drivers/iio/frequency/Kconfig"
@@ -87,6 +88,7 @@ if IIO_TRIGGER
    source "drivers/iio/trigger/Kconfig"
 endif #IIO_TRIGGER
 source "drivers/iio/potentiometer/Kconfig"
+source "drivers/iio/potentiostat/Kconfig"
 source "drivers/iio/pressure/Kconfig"
 source "drivers/iio/proximity/Kconfig"
 source "drivers/iio/temperature/Kconfig"
diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
index 87e4c4369e2f..33fa4026f92c 100644
--- a/drivers/iio/Makefile
+++ b/drivers/iio/Makefile
@@ -18,6 +18,7 @@ obj-y += amplifiers/
 obj-y += buffer/
 obj-y += chemical/
 obj-y += common/
+obj-y += counter/
 obj-y += dac/
 obj-y += dummy/
 obj-y += gyro/
@@ -29,6 +30,7 @@ obj-y += light/
 obj-y += magnetometer/
 obj-y += orientation/
 obj-y += potentiometer/
+obj-y += potentiostat/
 obj-y += pressure/
 obj-y += proximity/
 obj-y += temperature/
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 2b791fe1e2bc..c68bdb649005 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -52,6 +52,26 @@ config BMC150_ACCEL_SPI
         tristate
         select REGMAP_SPI
 
+config DA280
+        tristate "MiraMEMS DA280 3-axis 14-bit digital accelerometer driver"
+        depends on I2C
+        help
+          Say yes here to build support for the MiraMEMS DA280 3-axis 14-bit
+          digital accelerometer.
+
+          To compile this driver as a module, choose M here: the
+          module will be called da280.
+
+config DA311
+        tristate "MiraMEMS DA311 3-axis 12-bit digital accelerometer driver"
+        depends on I2C
+        help
+          Say yes here to build support for the MiraMEMS DA311 3-axis 12-bit
+          digital accelerometer.
+
+          To compile this driver as a module, choose M here: the
+          module will be called da311.
+
 config DMARD06
         tristate "Domintech DMARD06 Digital Accelerometer Driver"
         depends on OF || COMPILE_TEST
@@ -73,6 +93,16 @@ config DMARD09
           Choosing M will build the driver as a module. If so, the module
           will be called dmard09.
 
+config DMARD10
+        tristate "Domintech DMARD10 3-axis Accelerometer Driver"
+        depends on I2C
+        help
+          Say yes here to get support for the Domintech DMARD10 3-axis
+          accelerometer.
+
+          Choosing M will build the driver as a module. If so, the module
+          will be called dmard10.
+
 config HID_SENSOR_ACCEL_3D
         depends on HID_SENSOR_HUB
         select IIO_BUFFER
@@ -97,7 +127,8 @@ config IIO_ST_ACCEL_3AXIS
         help
           Say yes here to build support for STMicroelectronics accelerometers:
           LSM303DLH, LSM303DLHC, LIS3DH, LSM330D, LSM330DL, LSM330DLC,
-          LIS331DLH, LSM303DL, LSM303DLM, LSM330, LIS2DH12, H3LIS331DL.
+          LIS331DLH, LSM303DL, LSM303DLM, LSM330, LIS2DH12, H3LIS331DL,
+          LNG2DM
 
           This driver can also be built as a module. If so, these modules
           will be created:
@@ -273,6 +304,18 @@ config MXC6255
           To compile this driver as a module, choose M here: the module will be
           called mxc6255.
 
+config SCA3000
+        select IIO_BUFFER
+        select IIO_KFIFO_BUF
+        depends on SPI
+        tristate "VTI SCA3000 series accelerometers"
+        help
+          Say Y here to build support for the VTI SCA3000 series of SPI
+          accelerometers. These devices use a hardware ring buffer.
+
+          To compile this driver as a module, say M here: the module will be
+          called sca3000.
+
 config STK8312
         tristate "Sensortek STK8312 3-Axis Accelerometer Driver"
         depends on I2C
diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
index f5d3ddee619e..69fe8edc57a2 100644
--- a/drivers/iio/accel/Makefile
+++ b/drivers/iio/accel/Makefile
@@ -8,8 +8,11 @@ obj-$(CONFIG_BMA220) += bma220_spi.o
 obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o
 obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o
 obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o
+obj-$(CONFIG_DA280)     += da280.o
+obj-$(CONFIG_DA311)     += da311.o
 obj-$(CONFIG_DMARD06)   += dmard06.o
 obj-$(CONFIG_DMARD09)   += dmard09.o
+obj-$(CONFIG_DMARD10)   += dmard10.o
 obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
 obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o
 obj-$(CONFIG_KXSD9)     += kxsd9.o
@@ -32,6 +35,8 @@ obj-$(CONFIG_MMA9553)		+= mma9553.o
 obj-$(CONFIG_MXC4005)           += mxc4005.o
 obj-$(CONFIG_MXC6255)           += mxc6255.o
 
+obj-$(CONFIG_SCA3000)           += sca3000.o
+
 obj-$(CONFIG_STK8312)           += stk8312.o
 obj-$(CONFIG_STK8BA50)          += stk8ba50.o
 
diff --git a/drivers/iio/accel/da280.c b/drivers/iio/accel/da280.c
new file mode 100644
index 000000000000..ed8343aeac9c
--- /dev/null
+++ b/drivers/iio/accel/da280.c
@@ -0,0 +1,183 @@
+/**
+ * IIO driver for the MiraMEMS DA280 3-axis accelerometer and
+ * IIO driver for the MiraMEMS DA226 2-axis accelerometer
+ *
+ * Copyright (c) 2016 Hans de Goede <hdegoede@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/byteorder/generic.h>
+
+#define DA280_REG_CHIP_ID               0x01
+#define DA280_REG_ACC_X_LSB             0x02
+#define DA280_REG_ACC_Y_LSB             0x04
+#define DA280_REG_ACC_Z_LSB             0x06
+#define DA280_REG_MODE_BW               0x11
+
+#define DA280_CHIP_ID                   0x13
+#define DA280_MODE_ENABLE               0x1e
+#define DA280_MODE_DISABLE              0x9e
+
+enum { da226, da280 };
+
+/*
+ * a value of + or -4096 corresponds to + or - 1G
+ * scale = 9.81 / 4096 = 0.002395019
+ */
+
+static const int da280_nscale = 2395019;
+
+#define DA280_CHANNEL(reg, axis) {      \
+        .type = IIO_ACCEL,      \
+        .address = reg, \
+        .modified = 1,  \
+        .channel2 = IIO_MOD_##axis,     \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),   \
+        .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),   \
+}
+
+static const struct iio_chan_spec da280_channels[] = {
+        DA280_CHANNEL(DA280_REG_ACC_X_LSB, X),
+        DA280_CHANNEL(DA280_REG_ACC_Y_LSB, Y),
+        DA280_CHANNEL(DA280_REG_ACC_Z_LSB, Z),
+};
+
+struct da280_data {
+        struct i2c_client *client;
+};
+
+static int da280_enable(struct i2c_client *client, bool enable)
+{
+        u8 data = enable ? DA280_MODE_ENABLE : DA280_MODE_DISABLE;
+
+        return i2c_smbus_write_byte_data(client, DA280_REG_MODE_BW, data);
+}
+
+static int da280_read_raw(struct iio_dev *indio_dev,
+                                struct iio_chan_spec const *chan,
+                                int *val, int *val2, long mask)
+{
+        struct da280_data *data = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                ret = i2c_smbus_read_word_data(data->client, chan->address);
+                if (ret < 0)
+                        return ret;
+                /*
+                 * Values are 14 bits, stored as 16 bits with the 2
+                 * least significant bits always 0.
+                 */
+                *val = (short)ret >> 2;
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                *val = 0;
+                *val2 = da280_nscale;
+                return IIO_VAL_INT_PLUS_NANO;
+        default:
+                return -EINVAL;
+        }
+}
+
+static const struct iio_info da280_info = {
+        .driver_module  = THIS_MODULE,
+        .read_raw       = da280_read_raw,
+};
+
+static int da280_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        int ret;
+        struct iio_dev *indio_dev;
+        struct da280_data *data;
+
+        ret = i2c_smbus_read_byte_data(client, DA280_REG_CHIP_ID);
+        if (ret != DA280_CHIP_ID)
+                return (ret < 0) ? ret : -ENODEV;
+
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        data = iio_priv(indio_dev);
+        data->client = client;
+        i2c_set_clientdata(client, indio_dev);
+
+        indio_dev->dev.parent = &client->dev;
+        indio_dev->info = &da280_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->channels = da280_channels;
+        if (id->driver_data == da226) {
+                indio_dev->name = "da226";
+                indio_dev->num_channels = 2;
+        } else {
+                indio_dev->name = "da280";
+                indio_dev->num_channels = 3;
+        }
+
+        ret = da280_enable(client, true);
+        if (ret < 0)
+                return ret;
+
+        ret = iio_device_register(indio_dev);
+        if (ret < 0) {
+                dev_err(&client->dev, "device_register failed\n");
+                da280_enable(client, false);
+        }
+
+        return ret;
+}
+
+static int da280_remove(struct i2c_client *client)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+
+        iio_device_unregister(indio_dev);
+
+        return da280_enable(client, false);
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int da280_suspend(struct device *dev)
+{
+        return da280_enable(to_i2c_client(dev), false);
+}
+
+static int da280_resume(struct device *dev)
+{
+        return da280_enable(to_i2c_client(dev), true);
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(da280_pm_ops, da280_suspend, da280_resume);
+
+static const struct i2c_device_id da280_i2c_id[] = {
+        { "da226", da226 },
+        { "da280", da280 },
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, da280_i2c_id);
+
+static struct i2c_driver da280_driver = {
+        .driver = {
+                .name = "da280",
+                .pm = &da280_pm_ops,
+        },
+        .probe          = da280_probe,
+        .remove         = da280_remove,
+        .id_table       = da280_i2c_id,
+};
+
+module_i2c_driver(da280_driver);
+
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
+MODULE_DESCRIPTION("MiraMEMS DA280 3-Axis Accelerometer driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/accel/da311.c b/drivers/iio/accel/da311.c
new file mode 100644
index 000000000000..537cfa8b6edf
--- /dev/null
+++ b/drivers/iio/accel/da311.c
@@ -0,0 +1,305 @@
+/**
+ * IIO driver for the MiraMEMS DA311 3-axis accelerometer
+ *
+ * Copyright (c) 2016 Hans de Goede <hdegoede@redhat.com>
+ * Copyright (c) 2011-2013 MiraMEMS Sensing Technology Co., Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/byteorder/generic.h>
+
+#define DA311_CHIP_ID                   0x13
+
+/*
+ * Note register addressed go from 0 - 0x3f and then wrap.
+ * For some reason there are 2 banks with 0 - 0x3f addresses,
+ * rather then a single 0-0x7f bank.
+ */
+
+/* Bank 0 regs */
+#define DA311_REG_BANK                  0x0000
+#define DA311_REG_LDO_REG               0x0006
+#define DA311_REG_CHIP_ID               0x000f
+#define DA311_REG_TEMP_CFG_REG          0x001f
+#define DA311_REG_CTRL_REG1             0x0020
+#define DA311_REG_CTRL_REG3             0x0022
+#define DA311_REG_CTRL_REG4             0x0023
+#define DA311_REG_CTRL_REG5             0x0024
+#define DA311_REG_CTRL_REG6             0x0025
+#define DA311_REG_STATUS_REG            0x0027
+#define DA311_REG_OUT_X_L               0x0028
+#define DA311_REG_OUT_X_H               0x0029
+#define DA311_REG_OUT_Y_L               0x002a
+#define DA311_REG_OUT_Y_H               0x002b
+#define DA311_REG_OUT_Z_L               0x002c
+#define DA311_REG_OUT_Z_H               0x002d
+#define DA311_REG_INT1_CFG              0x0030
+#define DA311_REG_INT1_SRC              0x0031
+#define DA311_REG_INT1_THS              0x0032
+#define DA311_REG_INT1_DURATION         0x0033
+#define DA311_REG_INT2_CFG              0x0034
+#define DA311_REG_INT2_SRC              0x0035
+#define DA311_REG_INT2_THS              0x0036
+#define DA311_REG_INT2_DURATION         0x0037
+#define DA311_REG_CLICK_CFG             0x0038
+#define DA311_REG_CLICK_SRC             0x0039
+#define DA311_REG_CLICK_THS             0x003a
+#define DA311_REG_TIME_LIMIT            0x003b
+#define DA311_REG_TIME_LATENCY          0x003c
+#define DA311_REG_TIME_WINDOW           0x003d
+
+/* Bank 1 regs */
+#define DA311_REG_SOFT_RESET            0x0105
+#define DA311_REG_OTP_XOFF_L            0x0110
+#define DA311_REG_OTP_XOFF_H            0x0111
+#define DA311_REG_OTP_YOFF_L            0x0112
+#define DA311_REG_OTP_YOFF_H            0x0113
+#define DA311_REG_OTP_ZOFF_L            0x0114
+#define DA311_REG_OTP_ZOFF_H            0x0115
+#define DA311_REG_OTP_XSO               0x0116
+#define DA311_REG_OTP_YSO               0x0117
+#define DA311_REG_OTP_ZSO               0x0118
+#define DA311_REG_OTP_TRIM_OSC          0x011b
+#define DA311_REG_LPF_ABSOLUTE          0x011c
+#define DA311_REG_TEMP_OFF1             0x0127
+#define DA311_REG_TEMP_OFF2             0x0128
+#define DA311_REG_TEMP_OFF3             0x0129
+#define DA311_REG_OTP_TRIM_THERM_H      0x011a
+
+/*
+ * a value of + or -1024 corresponds to + or - 1G
+ * scale = 9.81 / 1024 = 0.009580078
+ */
+
+static const int da311_nscale = 9580078;
+
+#define DA311_CHANNEL(reg, axis) {      \
+        .type = IIO_ACCEL,      \
+        .address = reg, \
+        .modified = 1,  \
+        .channel2 = IIO_MOD_##axis,     \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),   \
+        .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),   \
+}
+
+static const struct iio_chan_spec da311_channels[] = {
+        /* | 0x80 comes from the android driver */
+        DA311_CHANNEL(DA311_REG_OUT_X_L | 0x80, X),
+        DA311_CHANNEL(DA311_REG_OUT_Y_L | 0x80, Y),
+        DA311_CHANNEL(DA311_REG_OUT_Z_L | 0x80, Z),
+};
+
+struct da311_data {
+        struct i2c_client *client;
+};
+
+static int da311_register_mask_write(struct i2c_client *client, u16 addr,
+                                     u8 mask, u8 data)
+{
+        int ret;
+        u8 tmp_data = 0;
+
+        if (addr & 0xff00) {
+                /* Select bank 1 */
+                ret = i2c_smbus_write_byte_data(client, DA311_REG_BANK, 0x01);
+                if (ret < 0)
+                        return ret;
+        }
+
+        if (mask != 0xff) {
+                ret = i2c_smbus_read_byte_data(client, addr);
+                if (ret < 0)
+                        return ret;
+                tmp_data = ret;
+        }
+
+        tmp_data &= ~mask;
+        tmp_data |= data & mask;
+        ret = i2c_smbus_write_byte_data(client, addr & 0xff, tmp_data);
+        if (ret < 0)
+                return ret;
+
+        if (addr & 0xff00) {
+                /* Back to bank 0 */
+                ret = i2c_smbus_write_byte_data(client, DA311_REG_BANK, 0x00);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return 0;
+}
+
+/* Init sequence taken from the android driver */
+static int da311_reset(struct i2c_client *client)
+{
+        const struct {
+                u16 addr;
+                u8 mask;
+                u8 data;
+        } init_data[] = {
+                { DA311_REG_TEMP_CFG_REG,       0xff,   0x08 },
+                { DA311_REG_CTRL_REG5,          0xff,   0x80 },
+                { DA311_REG_CTRL_REG4,          0x30,   0x00 },
+                { DA311_REG_CTRL_REG1,          0xff,   0x6f },
+                { DA311_REG_TEMP_CFG_REG,       0xff,   0x88 },
+                { DA311_REG_LDO_REG,            0xff,   0x02 },
+                { DA311_REG_OTP_TRIM_OSC,       0xff,   0x27 },
+                { DA311_REG_LPF_ABSOLUTE,       0xff,   0x30 },
+                { DA311_REG_TEMP_OFF1,          0xff,   0x3f },
+                { DA311_REG_TEMP_OFF2,          0xff,   0xff },
+                { DA311_REG_TEMP_OFF3,          0xff,   0x0f },
+        };
+        int i, ret;
+
+        /* Reset */
+        ret = da311_register_mask_write(client, DA311_REG_SOFT_RESET,
+                                        0xff, 0xaa);
+        if (ret < 0)
+                return ret;
+
+        for (i = 0; i < ARRAY_SIZE(init_data); i++) {
+                ret = da311_register_mask_write(client,
+                                                init_data[i].addr,
+                                                init_data[i].mask,
+                                                init_data[i].data);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static int da311_enable(struct i2c_client *client, bool enable)
+{
+        u8 data = enable ? 0x00 : 0x20;
+
+        return da311_register_mask_write(client, DA311_REG_TEMP_CFG_REG,
+                                         0x20, data);
+}
+
+static int da311_read_raw(struct iio_dev *indio_dev,
+                                struct iio_chan_spec const *chan,
+                                int *val, int *val2, long mask)
+{
+        struct da311_data *data = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                ret = i2c_smbus_read_word_data(data->client, chan->address);
+                if (ret < 0)
+                        return ret;
+                /*
+                 * Values are 12 bits, stored as 16 bits with the 4
+                 * least significant bits always 0.
+                 */
+                *val = (short)ret >> 4;
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                *val = 0;
+                *val2 = da311_nscale;
+                return IIO_VAL_INT_PLUS_NANO;
+        default:
+                return -EINVAL;
+        }
+}
+
+static const struct iio_info da311_info = {
+        .driver_module  = THIS_MODULE,
+        .read_raw       = da311_read_raw,
+};
+
+static int da311_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        int ret;
+        struct iio_dev *indio_dev;
+        struct da311_data *data;
+
+        ret = i2c_smbus_read_byte_data(client, DA311_REG_CHIP_ID);
+        if (ret != DA311_CHIP_ID)
+                return (ret < 0) ? ret : -ENODEV;
+
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        data = iio_priv(indio_dev);
+        data->client = client;
+        i2c_set_clientdata(client, indio_dev);
+
+        indio_dev->dev.parent = &client->dev;
+        indio_dev->info = &da311_info;
+        indio_dev->name = "da311";
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->channels = da311_channels;
+        indio_dev->num_channels = ARRAY_SIZE(da311_channels);
+
+        ret = da311_reset(client);
+        if (ret < 0)
+                return ret;
+
+        ret = da311_enable(client, true);
+        if (ret < 0)
+                return ret;
+
+        ret = iio_device_register(indio_dev);
+        if (ret < 0) {
+                dev_err(&client->dev, "device_register failed\n");
+                da311_enable(client, false);
+        }
+
+        return ret;
+}
+
+static int da311_remove(struct i2c_client *client)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+
+        iio_device_unregister(indio_dev);
+
+        return da311_enable(client, false);
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int da311_suspend(struct device *dev)
+{
+        return da311_enable(to_i2c_client(dev), false);
+}
+
+static int da311_resume(struct device *dev)
+{
+        return da311_enable(to_i2c_client(dev), true);
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(da311_pm_ops, da311_suspend, da311_resume);
+
+static const struct i2c_device_id da311_i2c_id[] = {
+        {"da311", 0},
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, da311_i2c_id);
+
+static struct i2c_driver da311_driver = {
+        .driver = {
+                .name = "da311",
+                .pm = &da311_pm_ops,
+        },
+        .probe          = da311_probe,
+        .remove         = da311_remove,
+        .id_table       = da311_i2c_id,
+};
+
+module_i2c_driver(da311_driver);
+
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
+MODULE_DESCRIPTION("MiraMEMS DA311 3-Axis Accelerometer driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/accel/dmard10.c b/drivers/iio/accel/dmard10.c
new file mode 100644
index 000000000000..b8736cc75656
--- /dev/null
+++ b/drivers/iio/accel/dmard10.c
@@ -0,0 +1,266 @@
+/**
+ * IIO driver for the 3-axis accelerometer Domintech ARD10.
+ *
+ * Copyright (c) 2016 Hans de Goede <hdegoede@redhat.com>
+ * Copyright (c) 2012 Domintech Technology Co., Ltd
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/byteorder/generic.h>
+
+#define DMARD10_REG_ACTR                        0x00
+#define DMARD10_REG_AFEM                        0x0c
+#define DMARD10_REG_STADR                       0x12
+#define DMARD10_REG_STAINT                      0x1c
+#define DMARD10_REG_MISC2                       0x1f
+#define DMARD10_REG_PD                          0x21
+
+#define DMARD10_MODE_OFF                        0x00
+#define DMARD10_MODE_STANDBY                    0x02
+#define DMARD10_MODE_ACTIVE                     0x06
+#define DMARD10_MODE_READ_OTP                   0x12
+#define DMARD10_MODE_RESET_DATA_PATH            0x82
+
+/* AFEN set 1, ATM[2:0]=b'000 (normal), EN_Z/Y/X/T=1 */
+#define DMARD10_VALUE_AFEM_AFEN_NORMAL          0x8f
+/* ODR[3:0]=b'0111 (100Hz), CCK[3:0]=b'0100 (204.8kHZ) */
+#define DMARD10_VALUE_CKSEL_ODR_100_204         0x74
+/* INTC[6:5]=b'00 */
+#define DMARD10_VALUE_INTC                      0x00
+/* TAP1/TAP2 Average 2 */
+#define DMARD10_VALUE_TAPNS_AVE_2               0x11
+
+#define DMARD10_VALUE_STADR                     0x55
+#define DMARD10_VALUE_STAINT                    0xaa
+#define DMARD10_VALUE_MISC2_OSCA_EN             0x08
+#define DMARD10_VALUE_PD_RST                    0x52
+
+/* Offsets into the buffer read in dmard10_read_raw() */
+#define DMARD10_X_OFFSET                        1
+#define DMARD10_Y_OFFSET                        2
+#define DMARD10_Z_OFFSET                        3
+
+/*
+ * a value of + or -128 corresponds to + or - 1G
+ * scale = 9.81 / 128 = 0.076640625
+ */
+
+static const int dmard10_nscale = 76640625;
+
+#define DMARD10_CHANNEL(reg, axis) {    \
+        .type = IIO_ACCEL,      \
+        .address = reg, \
+        .modified = 1,  \
+        .channel2 = IIO_MOD_##axis,     \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),   \
+        .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),   \
+}
+
+static const struct iio_chan_spec dmard10_channels[] = {
+        DMARD10_CHANNEL(DMARD10_X_OFFSET, X),
+        DMARD10_CHANNEL(DMARD10_Y_OFFSET, Y),
+        DMARD10_CHANNEL(DMARD10_Z_OFFSET, Z),
+};
+
+struct dmard10_data {
+        struct i2c_client *client;
+};
+
+/* Init sequence taken from the android driver */
+static int dmard10_reset(struct i2c_client *client)
+{
+        unsigned char buffer[7];
+        int ret;
+
+        /* 1. Powerdown reset */
+        ret = i2c_smbus_write_byte_data(client, DMARD10_REG_PD,
+                                                DMARD10_VALUE_PD_RST);
+        if (ret < 0)
+                return ret;
+
+        /*
+         * 2. ACTR => Standby mode => Download OTP to parameter reg =>
+         *    Standby mode => Reset data path => Standby mode
+         */
+        buffer[0] = DMARD10_REG_ACTR;
+        buffer[1] = DMARD10_MODE_STANDBY;
+        buffer[2] = DMARD10_MODE_READ_OTP;
+        buffer[3] = DMARD10_MODE_STANDBY;
+        buffer[4] = DMARD10_MODE_RESET_DATA_PATH;
+        buffer[5] = DMARD10_MODE_STANDBY;
+        ret = i2c_master_send(client, buffer, 6);
+        if (ret < 0)
+                return ret;
+
+        /* 3. OSCA_EN = 1, TSTO = b'000 (INT1 = normal, TEST0 = normal) */
+        ret = i2c_smbus_write_byte_data(client, DMARD10_REG_MISC2,
+                                                DMARD10_VALUE_MISC2_OSCA_EN);
+        if (ret < 0)
+                return ret;
+
+        /* 4. AFEN = 1 (AFE will powerdown after ADC) */
+        buffer[0] = DMARD10_REG_AFEM;
+        buffer[1] = DMARD10_VALUE_AFEM_AFEN_NORMAL;
+        buffer[2] = DMARD10_VALUE_CKSEL_ODR_100_204;
+        buffer[3] = DMARD10_VALUE_INTC;
+        buffer[4] = DMARD10_VALUE_TAPNS_AVE_2;
+        buffer[5] = 0x00; /* DLYC, no delay timing */
+        buffer[6] = 0x07; /* INTD=1 push-pull, INTA=1 active high, AUTOT=1 */
+        ret = i2c_master_send(client, buffer, 7);
+        if (ret < 0)
+                return ret;
+
+        /* 5. Activation mode */
+        ret = i2c_smbus_write_byte_data(client, DMARD10_REG_ACTR,
+                                                DMARD10_MODE_ACTIVE);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+/* Shutdown sequence taken from the android driver */
+static int dmard10_shutdown(struct i2c_client *client)
+{
+        unsigned char buffer[3];
+
+        buffer[0] = DMARD10_REG_ACTR;
+        buffer[1] = DMARD10_MODE_STANDBY;
+        buffer[2] = DMARD10_MODE_OFF;
+
+        return i2c_master_send(client, buffer, 3);
+}
+
+static int dmard10_read_raw(struct iio_dev *indio_dev,
+                                struct iio_chan_spec const *chan,
+                                int *val, int *val2, long mask)
+{
+        struct dmard10_data *data = iio_priv(indio_dev);
+        __le16 buf[4];
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                /*
+                 * Read 8 bytes starting at the REG_STADR register, trying to
+                 * read the individual X, Y, Z registers will always read 0.
+                 */
+                ret = i2c_smbus_read_i2c_block_data(data->client,
+                                                    DMARD10_REG_STADR,
+                                                    sizeof(buf), (u8 *)buf);
+                if (ret < 0)
+                        return ret;
+                ret = le16_to_cpu(buf[chan->address]);
+                *val = sign_extend32(ret, 12);
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                *val = 0;
+                *val2 = dmard10_nscale;
+                return IIO_VAL_INT_PLUS_NANO;
+        default:
+                return -EINVAL;
+        }
+}
+
+static const struct iio_info dmard10_info = {
+        .driver_module  = THIS_MODULE,
+        .read_raw       = dmard10_read_raw,
+};
+
+static int dmard10_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        int ret;
+        struct iio_dev *indio_dev;
+        struct dmard10_data *data;
+
+        /* These 2 registers have special POR reset values used for id */
+        ret = i2c_smbus_read_byte_data(client, DMARD10_REG_STADR);
+        if (ret != DMARD10_VALUE_STADR)
+                return (ret < 0) ? ret : -ENODEV;
+
+        ret = i2c_smbus_read_byte_data(client, DMARD10_REG_STAINT);
+        if (ret != DMARD10_VALUE_STAINT)
+                return (ret < 0) ? ret : -ENODEV;
+
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+        if (!indio_dev) {
+                dev_err(&client->dev, "iio allocation failed!\n");
+                return -ENOMEM;
+        }
+
+        data = iio_priv(indio_dev);
+        data->client = client;
+        i2c_set_clientdata(client, indio_dev);
+
+        indio_dev->dev.parent = &client->dev;
+        indio_dev->info = &dmard10_info;
+        indio_dev->name = "dmard10";
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->channels = dmard10_channels;
+        indio_dev->num_channels = ARRAY_SIZE(dmard10_channels);
+
+        ret = dmard10_reset(client);
+        if (ret < 0)
+                return ret;
+
+        ret = iio_device_register(indio_dev);
+        if (ret < 0) {
+                dev_err(&client->dev, "device_register failed\n");
+                dmard10_shutdown(client);
+        }
+
+        return ret;
+}
+
+static int dmard10_remove(struct i2c_client *client)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+
+        iio_device_unregister(indio_dev);
+
+        return dmard10_shutdown(client);
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int dmard10_suspend(struct device *dev)
+{
+        return dmard10_shutdown(to_i2c_client(dev));
+}
+
+static int dmard10_resume(struct device *dev)
+{
+        return dmard10_reset(to_i2c_client(dev));
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(dmard10_pm_ops, dmard10_suspend, dmard10_resume);
+
+static const struct i2c_device_id dmard10_i2c_id[] = {
+        {"dmard10", 0},
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, dmard10_i2c_id);
+
+static struct i2c_driver dmard10_driver = {
+        .driver = {
+                .name = "dmard10",
+                .pm = &dmard10_pm_ops,
+        },
+        .probe          = dmard10_probe,
+        .remove         = dmard10_remove,
+        .id_table       = dmard10_i2c_id,
+};
+
+module_i2c_driver(dmard10_driver);
+
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
+MODULE_DESCRIPTION("Domintech ARD10 3-Axis Accelerometer driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/accel/mma7660.c b/drivers/iio/accel/mma7660.c
index 03beadf14ad3..3a40774cca74 100644
--- a/drivers/iio/accel/mma7660.c
+++ b/drivers/iio/accel/mma7660.c
@@ -39,7 +39,7 @@
 
 #define MMA7660_SCALE_AVAIL     "0.467142857"
 
-const int mma7660_nscale = 467142857;
+static const int mma7660_nscale = 467142857;
 
 #define MMA7660_CHANNEL(reg, axis) {    \
         .type = IIO_ACCEL,      \
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index d41e1b588e68..f418c588af6a 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -459,12 +459,14 @@ static int mma8452_read_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
-                if (iio_buffer_enabled(indio_dev))
-                        return -EBUSY;
+                ret = iio_device_claim_direct_mode(indio_dev);
+                if (ret)
+                        return ret;
 
                 mutex_lock(&data->lock);
                 ret = mma8452_read(data, buffer);
                 mutex_unlock(&data->lock);
+                iio_device_release_direct_mode(indio_dev);
                 if (ret < 0)
                         return ret;
 
@@ -664,37 +666,46 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
         struct mma8452_data *data = iio_priv(indio_dev);
         int i, ret;
 
-        if (iio_buffer_enabled(indio_dev))
-                return -EBUSY;
+        ret = iio_device_claim_direct_mode(indio_dev);
+        if (ret)
+                return ret;
 
         switch (mask) {
         case IIO_CHAN_INFO_SAMP_FREQ:
                 i = mma8452_get_samp_freq_index(data, val, val2);
-                if (i < 0)
-                        return i;
-
+                if (i < 0) {
+                        ret = i;
+                        break;
+                }
                 data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK;
                 data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT;
 
-                return mma8452_change_config(data, MMA8452_CTRL_REG1,
-                                             data->ctrl_reg1);
+                ret = mma8452_change_config(data, MMA8452_CTRL_REG1,
+                                            data->ctrl_reg1);
+                break;
         case IIO_CHAN_INFO_SCALE:
                 i = mma8452_get_scale_index(data, val, val2);
-                if (i < 0)
-                        return i;
+                if (i < 0) {
+                        ret = i;
+                        break;
+                }
 
                 data->data_cfg &= ~MMA8452_DATA_CFG_FS_MASK;
                 data->data_cfg |= i;
 
-                return mma8452_change_config(data, MMA8452_DATA_CFG,
-                                             data->data_cfg);
+                ret = mma8452_change_config(data, MMA8452_DATA_CFG,
+                                            data->data_cfg);
+                break;
         case IIO_CHAN_INFO_CALIBBIAS:
-                if (val < -128 || val > 127)
-                        return -EINVAL;
+                if (val < -128 || val > 127) {
+                        ret = -EINVAL;
+                        break;
+                }
 
-                return mma8452_change_config(data,
-                                             MMA8452_OFF_X + chan->scan_index,
-                                             val);
+                ret = mma8452_change_config(data,
+                                            MMA8452_OFF_X + chan->scan_index,
+                                            val);
+                break;
 
         case IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY:
                 if (val == 0 && val2 == 0) {
@@ -703,23 +714,30 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
                         data->data_cfg |= MMA8452_DATA_CFG_HPF_MASK;
                         ret = mma8452_set_hp_filter_frequency(data, val, val2);
                         if (ret < 0)
-                                return ret;
+                                break;
                 }
 
-                return mma8452_change_config(data, MMA8452_DATA_CFG,
+                ret = mma8452_change_config(data, MMA8452_DATA_CFG,
                                              data->data_cfg);
+                break;
 
         case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
                 ret = mma8452_get_odr_index(data);
 
                 for (i = 0; i < ARRAY_SIZE(mma8452_os_ratio); i++) {
-                        if (mma8452_os_ratio[i][ret] == val)
-                                return mma8452_set_power_mode(data, i);
+                        if (mma8452_os_ratio[i][ret] == val) {
+                                ret = mma8452_set_power_mode(data, i);
+                                break;
+                        }
                 }
-
+                break;
         default:
-                return -EINVAL;
+                ret = -EINVAL;
+                break;
         }
+
+        iio_device_release_direct_mode(indio_dev);
+        return ret;
 }
 
 static int mma8452_read_thresh(struct iio_dev *indio_dev,
@@ -1347,20 +1365,9 @@ static int mma8452_data_rdy_trigger_set_state(struct iio_trigger *trig,
         return mma8452_change_config(data, MMA8452_CTRL_REG4, reg);
 }
 
-static int mma8452_validate_device(struct iio_trigger *trig,
-                                   struct iio_dev *indio_dev)
-{
-        struct iio_dev *indio = iio_trigger_get_drvdata(trig);
-
-        if (indio != indio_dev)
-                return -EINVAL;
-
-        return 0;
-}
-
 static const struct iio_trigger_ops mma8452_trigger_ops = {
         .set_trigger_state = mma8452_data_rdy_trigger_set_state,
-        .validate_device = mma8452_validate_device,
+        .validate_device = iio_trigger_validate_own_device,
         .owner = THIS_MODULE,
 };
 
diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c
new file mode 100644
index 000000000000..cb1d83fa19a0
--- /dev/null
+++ b/drivers/iio/accel/sca3000.c
@@ -0,0 +1,1576 @@
+/*
+ * sca3000_core.c -- support VTI sca3000 series accelerometers via SPI
+ *
+ * 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.
+ *
+ * Copyright (c) 2009 Jonathan Cameron <jic23@kernel.org>
+ *
+ * See industrialio/accels/sca3000.h for comments.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/fs.h>
+#include <linux/device.h>
+#include <linux/slab.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/sysfs.h>
+#include <linux/module.h>
+#include <linux/uaccess.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/iio/events.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/kfifo_buf.h>
+
+#define SCA3000_WRITE_REG(a) (((a) << 2) | 0x02)
+#define SCA3000_READ_REG(a) ((a) << 2)
+
+#define SCA3000_REG_REVID_ADDR                          0x00
+#define   SCA3000_REG_REVID_MAJOR_MASK                  GENMASK(8, 4)
+#define   SCA3000_REG_REVID_MINOR_MASK                  GENMASK(3, 0)
+
+#define SCA3000_REG_STATUS_ADDR                         0x02
+#define   SCA3000_LOCKED                                BIT(5)
+#define   SCA3000_EEPROM_CS_ERROR                       BIT(1)
+#define   SCA3000_SPI_FRAME_ERROR                       BIT(0)
+ 
+/* All reads done using register decrement so no need to directly access LSBs */
+#define SCA3000_REG_X_MSB_ADDR                          0x05
+#define SCA3000_REG_Y_MSB_ADDR                          0x07
+#define SCA3000_REG_Z_MSB_ADDR                          0x09
+
+#define SCA3000_REG_RING_OUT_ADDR                       0x0f
+
+/* Temp read untested - the e05 doesn't have the sensor */
+#define SCA3000_REG_TEMP_MSB_ADDR                       0x13
+
+#define SCA3000_REG_MODE_ADDR                           0x14
+#define SCA3000_MODE_PROT_MASK                          0x28
+#define   SCA3000_REG_MODE_RING_BUF_ENABLE              BIT(7)
+#define   SCA3000_REG_MODE_RING_BUF_8BIT                BIT(6)
+
+/*
+ * Free fall detection triggers an interrupt if the acceleration
+ * is below a threshold for equivalent of 25cm drop
+ */
+#define   SCA3000_REG_MODE_FREE_FALL_DETECT             BIT(4)
+#define   SCA3000_REG_MODE_MEAS_MODE_NORMAL             0x00
+#define   SCA3000_REG_MODE_MEAS_MODE_OP_1               0x01
+#define   SCA3000_REG_MODE_MEAS_MODE_OP_2               0x02
+
+/*
+ * In motion detection mode the accelerations are band pass filtered
+ * (approx 1 - 25Hz) and then a programmable threshold used to trigger
+ * and interrupt.
+ */
+#define   SCA3000_REG_MODE_MEAS_MODE_MOT_DET            0x03
+#define   SCA3000_REG_MODE_MODE_MASK                    0x03
+
+#define SCA3000_REG_BUF_COUNT_ADDR                      0x15
+
+#define SCA3000_REG_INT_STATUS_ADDR                     0x16
+#define   SCA3000_REG_INT_STATUS_THREE_QUARTERS         BIT(7)
+#define   SCA3000_REG_INT_STATUS_HALF                   BIT(6)
+        
+#define SCA3000_INT_STATUS_FREE_FALL                    BIT(3)
+#define SCA3000_INT_STATUS_Y_TRIGGER                    BIT(2)
+#define SCA3000_INT_STATUS_X_TRIGGER                    BIT(1)
+#define SCA3000_INT_STATUS_Z_TRIGGER                    BIT(0)
+
+/* Used to allow access to multiplexed registers */
+#define SCA3000_REG_CTRL_SEL_ADDR                       0x18
+/* Only available for SCA3000-D03 and SCA3000-D01 */
+#define   SCA3000_REG_CTRL_SEL_I2C_DISABLE              0x01
+#define   SCA3000_REG_CTRL_SEL_MD_CTRL                  0x02
+#define   SCA3000_REG_CTRL_SEL_MD_Y_TH                  0x03
+#define   SCA3000_REG_CTRL_SEL_MD_X_TH                  0x04
+#define   SCA3000_REG_CTRL_SEL_MD_Z_TH                  0x05
+/*
+ * BE VERY CAREFUL WITH THIS, IF 3 BITS ARE NOT SET the device
+ * will not function
+ */
+#define   SCA3000_REG_CTRL_SEL_OUT_CTRL                 0x0B
+
+#define     SCA3000_REG_OUT_CTRL_PROT_MASK              0xE0
+#define     SCA3000_REG_OUT_CTRL_BUF_X_EN               0x10
+#define     SCA3000_REG_OUT_CTRL_BUF_Y_EN               0x08
+#define     SCA3000_REG_OUT_CTRL_BUF_Z_EN               0x04
+#define     SCA3000_REG_OUT_CTRL_BUF_DIV_MASK           0x03
+#define     SCA3000_REG_OUT_CTRL_BUF_DIV_4              0x02
+#define     SCA3000_REG_OUT_CTRL_BUF_DIV_2              0x01
+
+
+/*
+ * Control which motion detector interrupts are on.
+ * For now only OR combinations are supported.
+ */
+#define SCA3000_MD_CTRL_PROT_MASK                       0xC0
+#define SCA3000_MD_CTRL_OR_Y                            BIT(0)
+#define SCA3000_MD_CTRL_OR_X                            BIT(1)
+#define SCA3000_MD_CTRL_OR_Z                            BIT(2)
+/* Currently unsupported */
+#define SCA3000_MD_CTRL_AND_Y                           BIT(3)
+#define SCA3000_MD_CTRL_AND_X                           BIT(4)
+#define SAC3000_MD_CTRL_AND_Z                           BIT(5)
+
+/*
+ * Some control registers of complex access methods requiring this register to
+ * be used to remove a lock.
+ */
+#define SCA3000_REG_UNLOCK_ADDR                         0x1e
+
+#define SCA3000_REG_INT_MASK_ADDR                       0x21
+#define   SCA3000_REG_INT_MASK_PROT_MASK                0x1C
+ 
+#define   SCA3000_REG_INT_MASK_RING_THREE_QUARTER       BIT(7)
+#define   SCA3000_REG_INT_MASK_RING_HALF                BIT(6)
+
+#define SCA3000_REG_INT_MASK_ALL_INTS                   0x02
+#define SCA3000_REG_INT_MASK_ACTIVE_HIGH                0x01
+#define SCA3000_REG_INT_MASK_ACTIVE_LOW                 0x00
+/* Values of multiplexed registers (write to ctrl_data after select) */
+#define SCA3000_REG_CTRL_DATA_ADDR                      0x22
+
+/*
+ * Measurement modes available on some sca3000 series chips. Code assumes others
+ * may become available in the future.
+ *
+ * Bypass - Bypass the low-pass filter in the signal channel so as to increase
+ *          signal bandwidth.
+ *
+ * Narrow - Narrow low-pass filtering of the signal channel and half output
+ *          data rate by decimation.
+ *
+ * Wide - Widen low-pass filtering of signal channel to increase bandwidth
+ */
+#define SCA3000_OP_MODE_BYPASS                          0x01
+#define SCA3000_OP_MODE_NARROW                          0x02
+#define SCA3000_OP_MODE_WIDE                            0x04
+#define SCA3000_MAX_TX 6
+#define SCA3000_MAX_RX 2
+
+/**
+ * struct sca3000_state - device instance state information
+ * @us:                 the associated spi device
+ * @info:                       chip variant information
+ * @last_timestamp:             the timestamp of the last event
+ * @mo_det_use_count:           reference counter for the motion detection unit
+ * @lock:                       lock used to protect elements of sca3000_state
+ *                              and the underlying device state.
+ * @tx:                 dma-able transmit buffer
+ * @rx:                 dma-able receive buffer
+ **/
+struct sca3000_state {
+        struct spi_device               *us;
+        const struct sca3000_chip_info  *info;
+        s64                             last_timestamp;
+        int                             mo_det_use_count;
+        struct mutex                    lock;
+        /* Can these share a cacheline ? */
+        u8                              rx[384] ____cacheline_aligned;
+        u8                              tx[6] ____cacheline_aligned;
+};
+
+/**
+ * struct sca3000_chip_info - model dependent parameters
+ * @scale:                      scale * 10^-6
+ * @temp_output:                some devices have temperature sensors.
+ * @measurement_mode_freq:      normal mode sampling frequency
+ * @measurement_mode_3db_freq:  3db cutoff frequency of the low pass filter for
+ * the normal measurement mode.
+ * @option_mode_1:              first optional mode. Not all models have one
+ * @option_mode_1_freq:         option mode 1 sampling frequency
+ * @option_mode_1_3db_freq:     3db cutoff frequency of the low pass filter for
+ * the first option mode.
+ * @option_mode_2:              second optional mode. Not all chips have one
+ * @option_mode_2_freq:         option mode 2 sampling frequency
+ * @option_mode_2_3db_freq:     3db cutoff frequency of the low pass filter for
+ * the second option mode.
+ * @mod_det_mult_xz:            Bit wise multipliers to calculate the threshold
+ * for motion detection in the x and z axis.
+ * @mod_det_mult_y:             Bit wise multipliers to calculate the threshold
+ * for motion detection in the y axis.
+ *
+ * This structure is used to hold information about the functionality of a given
+ * sca3000 variant.
+ **/
+struct sca3000_chip_info {
+        unsigned int            scale;
+        bool                    temp_output;
+        int                     measurement_mode_freq;
+        int                     measurement_mode_3db_freq;
+        int                     option_mode_1;
+        int                     option_mode_1_freq;
+        int                     option_mode_1_3db_freq;
+        int                     option_mode_2;
+        int                     option_mode_2_freq;
+        int                     option_mode_2_3db_freq;
+        int                     mot_det_mult_xz[6];
+        int                     mot_det_mult_y[7];
+};
+
+enum sca3000_variant {
+        d01,
+        e02,
+        e04,
+        e05,
+};
+
+/*
+ * Note where option modes are not defined, the chip simply does not
+ * support any.
+ * Other chips in the sca3000 series use i2c and are not included here.
+ *
+ * Some of these devices are only listed in the family data sheet and
+ * do not actually appear to be available.
+ */
+static const struct sca3000_chip_info sca3000_spi_chip_info_tbl[] = {
+        [d01] = {
+                .scale = 7357,
+                .temp_output = true,
+                .measurement_mode_freq = 250,
+                .measurement_mode_3db_freq = 45,
+                .option_mode_1 = SCA3000_OP_MODE_BYPASS,
+                .option_mode_1_freq = 250,
+                .option_mode_1_3db_freq = 70,
+                .mot_det_mult_xz = {50, 100, 200, 350, 650, 1300},
+                .mot_det_mult_y = {50, 100, 150, 250, 450, 850, 1750},
+        },
+        [e02] = {
+                .scale = 9810,
+                .measurement_mode_freq = 125,
+                .measurement_mode_3db_freq = 40,
+                .option_mode_1 = SCA3000_OP_MODE_NARROW,
+                .option_mode_1_freq = 63,
+                .option_mode_1_3db_freq = 11,
+                .mot_det_mult_xz = {100, 150, 300, 550, 1050, 2050},
+                .mot_det_mult_y = {50, 100, 200, 350, 700, 1350, 2700},
+        },
+        [e04] = {
+                .scale = 19620,
+                .measurement_mode_freq = 100,
+                .measurement_mode_3db_freq = 38,
+                .option_mode_1 = SCA3000_OP_MODE_NARROW,
+                .option_mode_1_freq = 50,
+                .option_mode_1_3db_freq = 9,
+                .option_mode_2 = SCA3000_OP_MODE_WIDE,
+                .option_mode_2_freq = 400,
+                .option_mode_2_3db_freq = 70,
+                .mot_det_mult_xz = {200, 300, 600, 1100, 2100, 4100},
+                .mot_det_mult_y = {100, 200, 400, 7000, 1400, 2700, 54000},
+        },
+        [e05] = {
+                .scale = 61313,
+                .measurement_mode_freq = 200,
+                .measurement_mode_3db_freq = 60,
+                .option_mode_1 = SCA3000_OP_MODE_NARROW,
+                .option_mode_1_freq = 50,
+                .option_mode_1_3db_freq = 9,
+                .option_mode_2 = SCA3000_OP_MODE_WIDE,
+                .option_mode_2_freq = 400,
+                .option_mode_2_3db_freq = 75,
+                .mot_det_mult_xz = {600, 900, 1700, 3200, 6100, 11900},
+                .mot_det_mult_y = {300, 600, 1200, 2000, 4100, 7800, 15600},
+        },
+};
+
+static int sca3000_write_reg(struct sca3000_state *st, u8 address, u8 val)
+{
+        st->tx[0] = SCA3000_WRITE_REG(address);
+        st->tx[1] = val;
+        return spi_write(st->us, st->tx, 2);
+}
+
+static int sca3000_read_data_short(struct sca3000_state *st,
+                                   u8 reg_address_high,
+                                   int len)
+{
+        struct spi_transfer xfer[2] = {
+                {
+                        .len = 1,
+                        .tx_buf = st->tx,
+                }, {
+                        .len = len,
+                        .rx_buf = st->rx,
+                }
+        };
+        st->tx[0] = SCA3000_READ_REG(reg_address_high);
+
+        return spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));
+}
+
+/**
+ * sca3000_reg_lock_on() - test if the ctrl register lock is on
+ * @st: Driver specific device instance data.
+ *
+ * Lock must be held.
+ **/
+static int sca3000_reg_lock_on(struct sca3000_state *st)
+{
+        int ret;
+
+        ret = sca3000_read_data_short(st, SCA3000_REG_STATUS_ADDR, 1);
+        if (ret < 0)
+                return ret;
+
+        return !(st->rx[0] & SCA3000_LOCKED);
+}
+
+/**
+ * __sca3000_unlock_reg_lock() - unlock the control registers
+ * @st: Driver specific device instance data.
+ *
+ * Note the device does not appear to support doing this in a single transfer.
+ * This should only ever be used as part of ctrl reg read.
+ * Lock must be held before calling this
+ */
+static int __sca3000_unlock_reg_lock(struct sca3000_state *st)
+{
+        struct spi_transfer xfer[3] = {
+                {
+                        .len = 2,
+                        .cs_change = 1,
+                        .tx_buf = st->tx,
+                }, {
+                        .len = 2,
+                        .cs_change = 1,
+                        .tx_buf = st->tx + 2,
+                }, {
+                        .len = 2,
+                        .tx_buf = st->tx + 4,
+                },
+        };
+        st->tx[0] = SCA3000_WRITE_REG(SCA3000_REG_UNLOCK_ADDR);
+        st->tx[1] = 0x00;
+        st->tx[2] = SCA3000_WRITE_REG(SCA3000_REG_UNLOCK_ADDR);
+        st->tx[3] = 0x50;
+        st->tx[4] = SCA3000_WRITE_REG(SCA3000_REG_UNLOCK_ADDR);
+        st->tx[5] = 0xA0;
+
+        return spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));
+}
+
+/**
+ * sca3000_write_ctrl_reg() write to a lock protect ctrl register
+ * @st: Driver specific device instance data.
+ * @sel: selects which registers we wish to write to
+ * @val: the value to be written
+ *
+ * Certain control registers are protected against overwriting by the lock
+ * register and use a shared write address. This function allows writing of
+ * these registers.
+ * Lock must be held.
+ */
+static int sca3000_write_ctrl_reg(struct sca3000_state *st,
+                                  u8 sel,
+                                  uint8_t val)
+{
+        int ret;
+
+        ret = sca3000_reg_lock_on(st);
+        if (ret < 0)
+                goto error_ret;
+        if (ret) {
+                ret = __sca3000_unlock_reg_lock(st);
+                if (ret)
+                        goto error_ret;
+        }
+
+        /* Set the control select register */
+        ret = sca3000_write_reg(st, SCA3000_REG_CTRL_SEL_ADDR, sel);
+        if (ret)
+                goto error_ret;
+
+        /* Write the actual value into the register */
+        ret = sca3000_write_reg(st, SCA3000_REG_CTRL_DATA_ADDR, val);
+
+error_ret:
+        return ret;
+}
+
+/**
+ * sca3000_read_ctrl_reg() read from lock protected control register.
+ * @st: Driver specific device instance data.
+ * @ctrl_reg: Which ctrl register do we want to read.
+ *
+ * Lock must be held.
+ */
+static int sca3000_read_ctrl_reg(struct sca3000_state *st,
+                                 u8 ctrl_reg)
+{
+        int ret;
+
+        ret = sca3000_reg_lock_on(st);
+        if (ret < 0)
+                goto error_ret;
+        if (ret) {
+                ret = __sca3000_unlock_reg_lock(st);
+                if (ret)
+                        goto error_ret;
+        }
+        /* Set the control select register */
+        ret = sca3000_write_reg(st, SCA3000_REG_CTRL_SEL_ADDR, ctrl_reg);
+        if (ret)
+                goto error_ret;
+        ret = sca3000_read_data_short(st, SCA3000_REG_CTRL_DATA_ADDR, 1);
+        if (ret)
+                goto error_ret;
+        return st->rx[0];
+error_ret:
+        return ret;
+}
+
+/**
+ * sca3000_show_rev() - sysfs interface to read the chip revision number
+ * @indio_dev: Device instance specific generic IIO data.
+ * Driver specific device instance data can be obtained via
+ * via iio_priv(indio_dev)
+ */
+static int sca3000_print_rev(struct iio_dev *indio_dev)
+{
+        int ret;
+        struct sca3000_state *st = iio_priv(indio_dev);
+
+        mutex_lock(&st->lock);
+        ret = sca3000_read_data_short(st, SCA3000_REG_REVID_ADDR, 1);
+        if (ret < 0)
+                goto error_ret;
+        dev_info(&indio_dev->dev,
+                 "sca3000 revision major=%lu, minor=%lu\n",
+                 st->rx[0] & SCA3000_REG_REVID_MAJOR_MASK,
+                 st->rx[0] & SCA3000_REG_REVID_MINOR_MASK);
+error_ret:
+        mutex_unlock(&st->lock);
+
+        return ret;
+}
+
+static ssize_t
+sca3000_show_available_3db_freqs(struct device *dev,
+                                 struct device_attribute *attr,
+                                 char *buf)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct sca3000_state *st = iio_priv(indio_dev);
+        int len;
+
+        len = sprintf(buf, "%d", st->info->measurement_mode_3db_freq);
+        if (st->info->option_mode_1)
+                len += sprintf(buf + len, " %d",
+                               st->info->option_mode_1_3db_freq);
+        if (st->info->option_mode_2)
+                len += sprintf(buf + len, " %d",
+                               st->info->option_mode_2_3db_freq);
+        len += sprintf(buf + len, "\n");
+
+        return len;
+}
+
+static IIO_DEVICE_ATTR(in_accel_filter_low_pass_3db_frequency_available,
+                       S_IRUGO, sca3000_show_available_3db_freqs,
+                       NULL, 0);
+
+static const struct iio_event_spec sca3000_event = {
+        .type = IIO_EV_TYPE_MAG,
+        .dir = IIO_EV_DIR_RISING,
+        .mask_separate = BIT(IIO_EV_INFO_VALUE) | BIT(IIO_EV_INFO_ENABLE),
+};
+
+/*
+ * Note the hack in the number of bits to pretend we have 2 more than
+ * we do in the fifo.
+ */
+#define SCA3000_CHAN(index, mod)                                \
+        {                                                       \
+                .type = IIO_ACCEL,                              \
+                .modified = 1,                                  \
+                .channel2 = mod,                                \
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),   \
+                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |\
+                        BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY),\
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),\
+                .address = index,                               \
+                .scan_index = index,                            \
+                .scan_type = {                                  \
+                        .sign = 's',                            \
+                        .realbits = 13,                         \
+                        .storagebits = 16,                      \
+                        .shift = 3,                             \
+                        .endianness = IIO_BE,                   \
+                },                                              \
+                .event_spec = &sca3000_event,                   \
+                .num_event_specs = 1,                           \
+        }
+
+static const struct iio_event_spec sca3000_freefall_event_spec = {
+        .type = IIO_EV_TYPE_MAG,
+        .dir = IIO_EV_DIR_FALLING,
+        .mask_separate = BIT(IIO_EV_INFO_ENABLE) |
+                BIT(IIO_EV_INFO_PERIOD),
+};
+
+static const struct iio_chan_spec sca3000_channels[] = {
+        SCA3000_CHAN(0, IIO_MOD_X),
+        SCA3000_CHAN(1, IIO_MOD_Y),
+        SCA3000_CHAN(2, IIO_MOD_Z),
+        {
+                .type = IIO_ACCEL,
+                .modified = 1,
+                .channel2 = IIO_MOD_X_AND_Y_AND_Z,
+                .scan_index = -1, /* Fake channel */
+                .event_spec = &sca3000_freefall_event_spec,
+                .num_event_specs = 1,
+        },
+};
+
+static const struct iio_chan_spec sca3000_channels_with_temp[] = {
+        SCA3000_CHAN(0, IIO_MOD_X),
+        SCA3000_CHAN(1, IIO_MOD_Y),
+        SCA3000_CHAN(2, IIO_MOD_Z),
+        {
+                .type = IIO_TEMP,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |
+                        BIT(IIO_CHAN_INFO_OFFSET),
+                /* No buffer support */
+                .scan_index = -1,
+        },
+        {
+                .type = IIO_ACCEL,
+                .modified = 1,
+                .channel2 = IIO_MOD_X_AND_Y_AND_Z,
+                .scan_index = -1, /* Fake channel */
+                .event_spec = &sca3000_freefall_event_spec,
+                .num_event_specs = 1,
+        },
+};
+
+static u8 sca3000_addresses[3][3] = {
+        [0] = {SCA3000_REG_X_MSB_ADDR, SCA3000_REG_CTRL_SEL_MD_X_TH,
+               SCA3000_MD_CTRL_OR_X},
+        [1] = {SCA3000_REG_Y_MSB_ADDR, SCA3000_REG_CTRL_SEL_MD_Y_TH,
+               SCA3000_MD_CTRL_OR_Y},
+        [2] = {SCA3000_REG_Z_MSB_ADDR, SCA3000_REG_CTRL_SEL_MD_Z_TH,
+               SCA3000_MD_CTRL_OR_Z},
+};
+
+/**
+ * __sca3000_get_base_freq() - obtain mode specific base frequency
+ * @st: Private driver specific device instance specific state.
+ * @info: chip type specific information.
+ * @base_freq: Base frequency for the current measurement mode.
+ *
+ * lock must be held
+ */
+static inline int __sca3000_get_base_freq(struct sca3000_state *st,
+                                          const struct sca3000_chip_info *info,
+                                          int *base_freq)
+{
+        int ret;
+
+        ret = sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1);
+        if (ret)
+                goto error_ret;
+        switch (SCA3000_REG_MODE_MODE_MASK & st->rx[0]) {
+        case SCA3000_REG_MODE_MEAS_MODE_NORMAL:
+                *base_freq = info->measurement_mode_freq;
+                break;
+        case SCA3000_REG_MODE_MEAS_MODE_OP_1:
+                *base_freq = info->option_mode_1_freq;
+                break;
+        case SCA3000_REG_MODE_MEAS_MODE_OP_2:
+                *base_freq = info->option_mode_2_freq;
+                break;
+        default:
+                ret = -EINVAL;
+        }
+error_ret:
+        return ret;
+}
+
+/**
+ * sca3000_read_raw_samp_freq() - read_raw handler for IIO_CHAN_INFO_SAMP_FREQ
+ * @st: Private driver specific device instance specific state.
+ * @val: The frequency read back.
+ *
+ * lock must be held
+ **/
+static int sca3000_read_raw_samp_freq(struct sca3000_state *st, int *val)
+{
+        int ret;
+
+        ret = __sca3000_get_base_freq(st, st->info, val);
+        if (ret)
+                return ret;
+
+        ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
+        if (ret < 0)
+                return ret;
+
+        if (*val > 0) {
+                ret &= SCA3000_REG_OUT_CTRL_BUF_DIV_MASK;
+                switch (ret) {
+                case SCA3000_REG_OUT_CTRL_BUF_DIV_2:
+                        *val /= 2;
+                        break;
+                case SCA3000_REG_OUT_CTRL_BUF_DIV_4:
+                        *val /= 4;
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+/**
+ * sca3000_write_raw_samp_freq() - write_raw handler for IIO_CHAN_INFO_SAMP_FREQ
+ * @st: Private driver specific device instance specific state.
+ * @val: The frequency desired.
+ *
+ * lock must be held
+ */
+static int sca3000_write_raw_samp_freq(struct sca3000_state *st, int val)
+{
+        int ret, base_freq, ctrlval;
+
+        ret = __sca3000_get_base_freq(st, st->info, &base_freq);
+        if (ret)
+                return ret;
+
+        ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
+        if (ret < 0)
+                return ret;
+
+        ctrlval = ret & ~SCA3000_REG_OUT_CTRL_BUF_DIV_MASK;
+
+        if (val == base_freq / 2)
+                ctrlval |= SCA3000_REG_OUT_CTRL_BUF_DIV_2;
+        if (val == base_freq / 4)
+                ctrlval |= SCA3000_REG_OUT_CTRL_BUF_DIV_4;
+        else if (val != base_freq)
+                return -EINVAL;
+
+        return sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL,
+                                     ctrlval);
+}
+
+static int sca3000_read_3db_freq(struct sca3000_state *st, int *val)
+{
+        int ret;
+
+        ret = sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1);
+        if (ret)
+                return ret;
+
+        /* mask bottom 2 bits - only ones that are relevant */
+        st->rx[0] &= SCA3000_REG_MODE_MODE_MASK;
+        switch (st->rx[0]) {
+        case SCA3000_REG_MODE_MEAS_MODE_NORMAL:
+                *val = st->info->measurement_mode_3db_freq;
+                return IIO_VAL_INT;
+        case SCA3000_REG_MODE_MEAS_MODE_MOT_DET:
+                return -EBUSY;
+        case SCA3000_REG_MODE_MEAS_MODE_OP_1:
+                *val = st->info->option_mode_1_3db_freq;
+                return IIO_VAL_INT;
+        case SCA3000_REG_MODE_MEAS_MODE_OP_2:
+                *val = st->info->option_mode_2_3db_freq;
+                return IIO_VAL_INT;
+        default:
+                return -EINVAL;
+        }
+}
+
+static int sca3000_write_3db_freq(struct sca3000_state *st, int val)
+{
+        int ret;
+        int mode;
+
+        if (val == st->info->measurement_mode_3db_freq)
+                mode = SCA3000_REG_MODE_MEAS_MODE_NORMAL;
+        else if (st->info->option_mode_1 &&
+                 (val == st->info->option_mode_1_3db_freq))
+                mode = SCA3000_REG_MODE_MEAS_MODE_OP_1;
+        else if (st->info->option_mode_2 &&
+                 (val == st->info->option_mode_2_3db_freq))
+                mode = SCA3000_REG_MODE_MEAS_MODE_OP_2;
+        else
+                return -EINVAL;
+        ret = sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1);
+        if (ret)
+                return ret;
+
+        st->rx[0] &= ~SCA3000_REG_MODE_MODE_MASK;
+        st->rx[0] |= (mode & SCA3000_REG_MODE_MODE_MASK);
+
+        return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR, st->rx[0]);
+}
+
+static int sca3000_read_raw(struct iio_dev *indio_dev,
+                            struct iio_chan_spec const *chan,
+                            int *val,
+                            int *val2,
+                            long mask)
+{
+        struct sca3000_state *st = iio_priv(indio_dev);
+        int ret;
+        u8 address;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                mutex_lock(&st->lock);
+                if (chan->type == IIO_ACCEL) {
+                        if (st->mo_det_use_count) {
+                                mutex_unlock(&st->lock);
+                                return -EBUSY;
+                        }
+                        address = sca3000_addresses[chan->address][0];
+                        ret = sca3000_read_data_short(st, address, 2);
+                        if (ret < 0) {
+                                mutex_unlock(&st->lock);
+                                return ret;
+                        }
+                        *val = (be16_to_cpup((__be16 *)st->rx) >> 3) & 0x1FFF;
+                        *val = ((*val) << (sizeof(*val) * 8 - 13)) >>
+                                (sizeof(*val) * 8 - 13);
+                } else {
+                        /* get the temperature when available */
+                        ret = sca3000_read_data_short(st,
+                                                      SCA3000_REG_TEMP_MSB_ADDR,
+                                                      2);
+                        if (ret < 0) {
+                                mutex_unlock(&st->lock);
+                                return ret;
+                        }
+                        *val = ((st->rx[0] & 0x3F) << 3) |
+                               ((st->rx[1] & 0xE0) >> 5);
+                }
+                mutex_unlock(&st->lock);
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                *val = 0;
+                if (chan->type == IIO_ACCEL)
+                        *val2 = st->info->scale;
+                else /* temperature */
+                        *val2 = 555556;
+                return IIO_VAL_INT_PLUS_MICRO;
+        case IIO_CHAN_INFO_OFFSET:
+                *val = -214;
+                *val2 = 600000;
+                return IIO_VAL_INT_PLUS_MICRO;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                mutex_lock(&st->lock);
+                ret = sca3000_read_raw_samp_freq(st, val);
+                mutex_unlock(&st->lock);
+                return ret ? ret : IIO_VAL_INT;
+        case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                mutex_lock(&st->lock);
+                ret = sca3000_read_3db_freq(st, val);
+                mutex_unlock(&st->lock);
+                return ret;
+        default:
+                return -EINVAL;
+        }
+}
+
+static int sca3000_write_raw(struct iio_dev *indio_dev,
+                             struct iio_chan_spec const *chan,
+                             int val, int val2, long mask)
+{
+        struct sca3000_state *st = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                if (val2)
+                        return -EINVAL;
+                mutex_lock(&st->lock);
+                ret = sca3000_write_raw_samp_freq(st, val);
+                mutex_unlock(&st->lock);
+                return ret;
+        case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                if (val2)
+                        return -EINVAL;
+                mutex_lock(&st->lock);
+                ret = sca3000_write_3db_freq(st, val);
+                mutex_unlock(&st->lock);
+        default:
+                return -EINVAL;
+        }
+
+        return ret;
+}
+
+/**
+ * sca3000_read_av_freq() - sysfs function to get available frequencies
+ * @dev: Device structure for this device.
+ * @attr: Description of the attribute.
+ * @buf: Incoming string
+ *
+ * The later modes are only relevant to the ring buffer - and depend on current
+ * mode. Note that data sheet gives rather wide tolerances for these so integer
+ * division will give good enough answer and not all chips have them specified
+ * at all.
+ **/
+static ssize_t sca3000_read_av_freq(struct device *dev,
+                                    struct device_attribute *attr,
+                                    char *buf)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct sca3000_state *st = iio_priv(indio_dev);
+        int len = 0, ret, val;
+
+        mutex_lock(&st->lock);
+        ret = sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1);
+        val = st->rx[0];
+        mutex_unlock(&st->lock);
+        if (ret)
+                goto error_ret;
+
+        switch (val & SCA3000_REG_MODE_MODE_MASK) {
+        case SCA3000_REG_MODE_MEAS_MODE_NORMAL:
+                len += sprintf(buf + len, "%d %d %d\n",
+                               st->info->measurement_mode_freq,
+                               st->info->measurement_mode_freq / 2,
+                               st->info->measurement_mode_freq / 4);
+                break;
+        case SCA3000_REG_MODE_MEAS_MODE_OP_1:
+                len += sprintf(buf + len, "%d %d %d\n",
+                               st->info->option_mode_1_freq,
+                               st->info->option_mode_1_freq / 2,
+                               st->info->option_mode_1_freq / 4);
+                break;
+        case SCA3000_REG_MODE_MEAS_MODE_OP_2:
+                len += sprintf(buf + len, "%d %d %d\n",
+                               st->info->option_mode_2_freq,
+                               st->info->option_mode_2_freq / 2,
+                               st->info->option_mode_2_freq / 4);
+                break;
+        }
+        return len;
+error_ret:
+        return ret;
+}
+
+/*
+ * Should only really be registered if ring buffer support is compiled in.
+ * Does no harm however and doing it right would add a fair bit of complexity
+ */
+static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(sca3000_read_av_freq);
+
+/**
+ * sca3000_read_event_value() - query of a threshold or period
+ **/
+static int sca3000_read_event_value(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)
+{
+        int ret, i;
+        struct sca3000_state *st = iio_priv(indio_dev);
+
+        switch (info) {
+        case IIO_EV_INFO_VALUE:
+                mutex_lock(&st->lock);
+                ret = sca3000_read_ctrl_reg(st,
+                                            sca3000_addresses[chan->address][1]);
+                mutex_unlock(&st->lock);
+                if (ret < 0)
+                        return ret;
+                *val = 0;
+                if (chan->channel2 == IIO_MOD_Y)
+                        for_each_set_bit(i, (unsigned long *)&ret,
+                                         ARRAY_SIZE(st->info->mot_det_mult_y))
+                                *val += st->info->mot_det_mult_y[i];
+                else
+                        for_each_set_bit(i, (unsigned long *)&ret,
+                                         ARRAY_SIZE(st->info->mot_det_mult_xz))
+                                *val += st->info->mot_det_mult_xz[i];
+
+                return IIO_VAL_INT;
+        case IIO_EV_INFO_PERIOD:
+                *val = 0;
+                *val2 = 226000;
+                return IIO_VAL_INT_PLUS_MICRO;
+        default:
+                return -EINVAL;
+        }
+}
+
+/**
+ * sca3000_write_value() - control of threshold and period
+ * @indio_dev: Device instance specific IIO information.
+ * @chan: Description of the channel for which the event is being
+ * configured.
+ * @type: The type of event being configured, here magnitude rising
+ * as everything else is read only.
+ * @dir: Direction of the event (here rising)
+ * @info: What information about the event are we configuring.
+ * Here the threshold only.
+ * @val: Integer part of the value being written..
+ * @val2: Non integer part of the value being written. Here always 0.
+ */
+static int sca3000_write_event_value(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 sca3000_state *st = iio_priv(indio_dev);
+        int ret;
+        int i;
+        u8 nonlinear = 0;
+
+        if (chan->channel2 == IIO_MOD_Y) {
+                i = ARRAY_SIZE(st->info->mot_det_mult_y);
+                while (i > 0)
+                        if (val >= st->info->mot_det_mult_y[--i]) {
+                                nonlinear |= (1 << i);
+                                val -= st->info->mot_det_mult_y[i];
+                        }
+        } else {
+                i = ARRAY_SIZE(st->info->mot_det_mult_xz);
+                while (i > 0)
+                        if (val >= st->info->mot_det_mult_xz[--i]) {
+                                nonlinear |= (1 << i);
+                                val -= st->info->mot_det_mult_xz[i];
+                        }
+        }
+
+        mutex_lock(&st->lock);
+        ret = sca3000_write_ctrl_reg(st,
+                                     sca3000_addresses[chan->address][1],
+                                     nonlinear);
+        mutex_unlock(&st->lock);
+
+        return ret;
+}
+
+static struct attribute *sca3000_attributes[] = {
+        &iio_dev_attr_in_accel_filter_low_pass_3db_frequency_available.dev_attr.attr,
+        &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group sca3000_attribute_group = {
+        .attrs = sca3000_attributes,
+};
+
+static int sca3000_read_data(struct sca3000_state *st,
+                             u8 reg_address_high,
+                             u8 *rx,
+                             int len)
+{
+        int ret;
+        struct spi_transfer xfer[2] = {
+                {
+                        .len = 1,
+                        .tx_buf = st->tx,
+                }, {
+                        .len = len,
+                        .rx_buf = rx,
+                }
+        };
+
+        st->tx[0] = SCA3000_READ_REG(reg_address_high);
+        ret = spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));
+        if (ret) {
+                dev_err(get_device(&st->us->dev), "problem reading register");
+                return ret;
+        }
+
+        return 0;
+}
+
+/**
+ * sca3000_ring_int_process() - ring specific interrupt handling.
+ * @val: Value of the interrupt status register.
+ * @indio_dev: Device instance specific IIO device structure.
+ */
+static void sca3000_ring_int_process(u8 val, struct iio_dev *indio_dev)
+{
+        struct sca3000_state *st = iio_priv(indio_dev);
+        int ret, i, num_available;
+
+        mutex_lock(&st->lock);
+
+        if (val & SCA3000_REG_INT_STATUS_HALF) {
+                ret = sca3000_read_data_short(st, SCA3000_REG_BUF_COUNT_ADDR,
+                                              1);
+                if (ret)
+                        goto error_ret;
+                num_available = st->rx[0];
+                /*
+                 * num_available is the total number of samples available
+                 * i.e. number of time points * number of channels.
+                 */
+                ret = sca3000_read_data(st, SCA3000_REG_RING_OUT_ADDR, st->rx,
+                                        num_available * 2);
+                if (ret)
+                        goto error_ret;
+                for (i = 0; i < num_available / 3; i++) {
+                        /*
+                         * Dirty hack to cover for 11 bit in fifo, 13 bit
+                         * direct reading.
+                         *
+                         * In theory the bottom two bits are undefined.
+                         * In reality they appear to always be 0.
+                         */
+                        iio_push_to_buffers(indio_dev, st->rx + i * 3 * 2);
+                }
+        }
+error_ret:
+        mutex_unlock(&st->lock);
+}
+
+/**
+ * sca3000_event_handler() - handling ring and non ring events
+ * @irq: The irq being handled.
+ * @private: struct iio_device pointer for the device.
+ *
+ * Ring related interrupt handler. Depending on event, push to
+ * the ring buffer event chrdev or the event one.
+ *
+ * This function is complicated by the fact that the devices can signify ring
+ * and non ring events via the same interrupt line and they can only
+ * be distinguished via a read of the relevant status register.
+ */
+static irqreturn_t sca3000_event_handler(int irq, void *private)
+{
+        struct iio_dev *indio_dev = private;
+        struct sca3000_state *st = iio_priv(indio_dev);
+        int ret, val;
+        s64 last_timestamp = iio_get_time_ns(indio_dev);
+
+        /*
+         * Could lead if badly timed to an extra read of status reg,
+         * but ensures no interrupt is missed.
+         */
+        mutex_lock(&st->lock);
+        ret = sca3000_read_data_short(st, SCA3000_REG_INT_STATUS_ADDR, 1);
+        val = st->rx[0];
+        mutex_unlock(&st->lock);
+        if (ret)
+                goto done;
+
+        sca3000_ring_int_process(val, indio_dev);
+
+        if (val & SCA3000_INT_STATUS_FREE_FALL)
+                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),
+                               last_timestamp);
+
+        if (val & SCA3000_INT_STATUS_Y_TRIGGER)
+                iio_push_event(indio_dev,
+                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
+                                                  0,
+                                                  IIO_MOD_Y,
+                                                  IIO_EV_TYPE_MAG,
+                                                  IIO_EV_DIR_RISING),
+                               last_timestamp);
+
+        if (val & SCA3000_INT_STATUS_X_TRIGGER)
+                iio_push_event(indio_dev,
+                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
+                                                  0,
+                                                  IIO_MOD_X,
+                                                  IIO_EV_TYPE_MAG,
+                                                  IIO_EV_DIR_RISING),
+                               last_timestamp);
+
+        if (val & SCA3000_INT_STATUS_Z_TRIGGER)
+                iio_push_event(indio_dev,
+                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
+                                                  0,
+                                                  IIO_MOD_Z,
+                                                  IIO_EV_TYPE_MAG,
+                                                  IIO_EV_DIR_RISING),
+                               last_timestamp);
+
+done:
+        return IRQ_HANDLED;
+}
+
+/**
+ * sca3000_read_event_config() what events are enabled
+ **/
+static int sca3000_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 sca3000_state *st = iio_priv(indio_dev);
+        int ret;
+        /* read current value of mode register */
+        mutex_lock(&st->lock);
+
+        ret = sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1);
+        if (ret)
+                goto error_ret;
+
+        switch (chan->channel2) {
+        case IIO_MOD_X_AND_Y_AND_Z:
+                ret = !!(st->rx[0] & SCA3000_REG_MODE_FREE_FALL_DETECT);
+                break;
+        case IIO_MOD_X:
+        case IIO_MOD_Y:
+        case IIO_MOD_Z:
+                /*
+                 * Motion detection mode cannot run at the same time as
+                 * acceleration data being read.
+                 */
+                if ((st->rx[0] & SCA3000_REG_MODE_MODE_MASK)
+                    != SCA3000_REG_MODE_MEAS_MODE_MOT_DET) {
+                        ret = 0;
+                } else {
+                        ret = sca3000_read_ctrl_reg(st,
+                                                SCA3000_REG_CTRL_SEL_MD_CTRL);
+                        if (ret < 0)
+                                goto error_ret;
+                        /* only supporting logical or's for now */
+                        ret = !!(ret & sca3000_addresses[chan->address][2]);
+                }
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+error_ret:
+        mutex_unlock(&st->lock);
+
+        return ret;
+}
+
+static int sca3000_freefall_set_state(struct iio_dev *indio_dev, int state)
+{
+        struct sca3000_state *st = iio_priv(indio_dev);
+        int ret;
+
+        /* read current value of mode register */
+        ret = sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1);
+        if (ret)
+                return ret;
+
+        /* if off and should be on */
+        if (state && !(st->rx[0] & SCA3000_REG_MODE_FREE_FALL_DETECT))
+                return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR,
+                                         st->rx[0] | SCA3000_REG_MODE_FREE_FALL_DETECT);
+        /* if on and should be off */
+        else if (!state && (st->rx[0] & SCA3000_REG_MODE_FREE_FALL_DETECT))
+                return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR,
+                                         st->rx[0] & ~SCA3000_REG_MODE_FREE_FALL_DETECT);
+        else
+                return 0;
+}
+
+static int sca3000_motion_detect_set_state(struct iio_dev *indio_dev, int axis,
+                                           int state)
+{
+        struct sca3000_state *st = iio_priv(indio_dev);
+        int ret, ctrlval;
+
+        /*
+         * First read the motion detector config to find out if
+         * this axis is on
+         */
+        ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL);
+        if (ret < 0)
+                return ret;
+        ctrlval = ret;
+        /* if off and should be on */
+        if (state && !(ctrlval & sca3000_addresses[axis][2])) {
+                ret = sca3000_write_ctrl_reg(st,
+                                             SCA3000_REG_CTRL_SEL_MD_CTRL,
+                                             ctrlval |
+                                             sca3000_addresses[axis][2]);
+                if (ret)
+                        return ret;
+                st->mo_det_use_count++;
+        } else if (!state && (ctrlval & sca3000_addresses[axis][2])) {
+                ret = sca3000_write_ctrl_reg(st,
+                                             SCA3000_REG_CTRL_SEL_MD_CTRL,
+                                             ctrlval &
+                                             ~(sca3000_addresses[axis][2]));
+                if (ret)
+                        return ret;
+                st->mo_det_use_count--;
+        }
+
+        /* read current value of mode register */
+        ret = sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1);
+        if (ret)
+                return ret;
+        /* if off and should be on */
+        if ((st->mo_det_use_count) &&
+            ((st->rx[0] & SCA3000_REG_MODE_MODE_MASK)
+             != SCA3000_REG_MODE_MEAS_MODE_MOT_DET))
+                return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR,
+                        (st->rx[0] & ~SCA3000_REG_MODE_MODE_MASK)
+                        | SCA3000_REG_MODE_MEAS_MODE_MOT_DET);
+        /* if on and should be off */
+        else if (!(st->mo_det_use_count) &&
+                 ((st->rx[0] & SCA3000_REG_MODE_MODE_MASK)
+                  == SCA3000_REG_MODE_MEAS_MODE_MOT_DET))
+                return sca3000_write_reg(st, SCA3000_REG_MODE_ADDR,
+                        st->rx[0] & SCA3000_REG_MODE_MODE_MASK);
+        else
+                return 0;
+}
+
+/**
+ * sca3000_write_event_config() - simple on off control for motion detector
+ * @indio_dev: IIO device instance specific structure. Data specific to this
+ * particular driver may be accessed via iio_priv(indio_dev).
+ * @chan: Description of the channel whose event we are configuring.
+ * @type: The type of event.
+ * @dir: The direction of the event.
+ * @state: Desired state of event being configured.
+ *
+ * This is a per axis control, but enabling any will result in the
+ * motion detector unit being enabled.
+ * N.B. enabling motion detector stops normal data acquisition.
+ * There is a complexity in knowing which mode to return to when
+ * this mode is disabled.  Currently normal mode is assumed.
+ **/
+static int sca3000_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 sca3000_state *st = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&st->lock);
+        switch (chan->channel2) {
+        case IIO_MOD_X_AND_Y_AND_Z:
+                ret = sca3000_freefall_set_state(indio_dev, state);
+                break;
+
+        case IIO_MOD_X:
+        case IIO_MOD_Y:
+        case IIO_MOD_Z:
+                ret = sca3000_motion_detect_set_state(indio_dev,
+                                                      chan->address,
+                                                      state);
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+        mutex_unlock(&st->lock);
+
+        return ret;
+}
+
+static int sca3000_configure_ring(struct iio_dev *indio_dev)
+{
+        struct iio_buffer *buffer;
+
+        buffer = iio_kfifo_allocate();
+        if (!buffer)
+                return -ENOMEM;
+
+        iio_device_attach_buffer(indio_dev, buffer);
+        indio_dev->modes |= INDIO_BUFFER_SOFTWARE;
+
+        return 0;
+}
+
+static void sca3000_unconfigure_ring(struct iio_dev *indio_dev)
+{
+        iio_kfifo_free(indio_dev->buffer);
+}
+
+static inline
+int __sca3000_hw_ring_state_set(struct iio_dev *indio_dev, bool state)
+{
+        struct sca3000_state *st = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&st->lock);
+        ret = sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1);
+        if (ret)
+                goto error_ret;
+        if (state) {
+                dev_info(&indio_dev->dev, "supposedly enabling ring buffer\n");
+                ret = sca3000_write_reg(st,
+                        SCA3000_REG_MODE_ADDR,
+                        (st->rx[0] | SCA3000_REG_MODE_RING_BUF_ENABLE));
+        } else
+                ret = sca3000_write_reg(st,
+                        SCA3000_REG_MODE_ADDR,
+                        (st->rx[0] & ~SCA3000_REG_MODE_RING_BUF_ENABLE));
+error_ret:
+        mutex_unlock(&st->lock);
+
+        return ret;
+}
+
+/**
+ * sca3000_hw_ring_preenable() - hw ring buffer preenable function
+ * @indio_dev: structure representing the IIO device. Device instance
+ * specific state can be accessed via iio_priv(indio_dev).
+ *
+ * Very simple enable function as the chip will allows normal reads
+ * during ring buffer operation so as long as it is indeed running
+ * before we notify the core, the precise ordering does not matter.
+ */
+static int sca3000_hw_ring_preenable(struct iio_dev *indio_dev)
+{
+        int ret;
+        struct sca3000_state *st = iio_priv(indio_dev);
+
+        mutex_lock(&st->lock);
+
+        /* Enable the 50% full interrupt */
+        ret = sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1);
+        if (ret)
+                goto error_unlock;
+        ret = sca3000_write_reg(st,
+                                SCA3000_REG_INT_MASK_ADDR,
+                                st->rx[0] | SCA3000_REG_INT_MASK_RING_HALF);
+        if (ret)
+                goto error_unlock;
+
+        mutex_unlock(&st->lock);
+
+        return __sca3000_hw_ring_state_set(indio_dev, 1);
+
+error_unlock:
+        mutex_unlock(&st->lock);
+
+        return ret;
+}
+
+static int sca3000_hw_ring_postdisable(struct iio_dev *indio_dev)
+{
+        int ret;
+        struct sca3000_state *st = iio_priv(indio_dev);
+
+        ret = __sca3000_hw_ring_state_set(indio_dev, 0);
+        if (ret)
+                return ret;
+
+        /* Disable the 50% full interrupt */
+        mutex_lock(&st->lock);
+
+        ret = sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1);
+        if (ret)
+                goto unlock;
+        ret = sca3000_write_reg(st,
+                                SCA3000_REG_INT_MASK_ADDR,
+                                st->rx[0] & ~SCA3000_REG_INT_MASK_RING_HALF);
+unlock:
+        mutex_unlock(&st->lock);
+        return ret;
+}
+
+static const struct iio_buffer_setup_ops sca3000_ring_setup_ops = {
+        .preenable = &sca3000_hw_ring_preenable,
+        .postdisable = &sca3000_hw_ring_postdisable,
+};
+
+/**
+ * sca3000_clean_setup() - get the device into a predictable state
+ * @st: Device instance specific private data structure
+ *
+ * Devices use flash memory to store many of the register values
+ * and hence can come up in somewhat unpredictable states.
+ * Hence reset everything on driver load.
+ */
+static int sca3000_clean_setup(struct sca3000_state *st)
+{
+        int ret;
+
+        mutex_lock(&st->lock);
+        /* Ensure all interrupts have been acknowledged */
+        ret = sca3000_read_data_short(st, SCA3000_REG_INT_STATUS_ADDR, 1);
+        if (ret)
+                goto error_ret;
+
+        /* Turn off all motion detection channels */
+        ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL);
+        if (ret < 0)
+                goto error_ret;
+        ret = sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL,
+                                     ret & SCA3000_MD_CTRL_PROT_MASK);
+        if (ret)
+                goto error_ret;
+
+        /* Disable ring buffer */
+        ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
+        if (ret < 0)
+                goto error_ret;
+        ret = sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL,
+                                     (ret & SCA3000_REG_OUT_CTRL_PROT_MASK)
+                                     | SCA3000_REG_OUT_CTRL_BUF_X_EN
+                                     | SCA3000_REG_OUT_CTRL_BUF_Y_EN
+                                     | SCA3000_REG_OUT_CTRL_BUF_Z_EN
+                                     | SCA3000_REG_OUT_CTRL_BUF_DIV_4);
+        if (ret)
+                goto error_ret;
+        /* Enable interrupts, relevant to mode and set up as active low */
+        ret = sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1);
+        if (ret)
+                goto error_ret;
+        ret = sca3000_write_reg(st,
+                                SCA3000_REG_INT_MASK_ADDR,
+                                (ret & SCA3000_REG_INT_MASK_PROT_MASK)
+                                | SCA3000_REG_INT_MASK_ACTIVE_LOW);
+        if (ret)
+                goto error_ret;
+        /*
+         * Select normal measurement mode, free fall off, ring off
+         * Ring in 12 bit mode - it is fine to overwrite reserved bits 3,5
+         * as that occurs in one of the example on the datasheet
+         */
+        ret = sca3000_read_data_short(st, SCA3000_REG_MODE_ADDR, 1);
+        if (ret)
+                goto error_ret;
+        ret = sca3000_write_reg(st, SCA3000_REG_MODE_ADDR,
+                                (st->rx[0] & SCA3000_MODE_PROT_MASK));
+
+error_ret:
+        mutex_unlock(&st->lock);
+        return ret;
+}
+
+static const struct iio_info sca3000_info = {
+        .attrs = &sca3000_attribute_group,
+        .read_raw = &sca3000_read_raw,
+        .write_raw = &sca3000_write_raw,
+        .read_event_value = &sca3000_read_event_value,
+        .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)
+{
+        int ret;
+        struct sca3000_state *st;
+        struct iio_dev *indio_dev;
+
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        st = iio_priv(indio_dev);
+        spi_set_drvdata(spi, indio_dev);
+        st->us = spi;
+        mutex_init(&st->lock);
+        st->info = &sca3000_spi_chip_info_tbl[spi_get_device_id(spi)
+                                              ->driver_data];
+
+        indio_dev->dev.parent = &spi->dev;
+        indio_dev->name = spi_get_device_id(spi)->name;
+        indio_dev->info = &sca3000_info;
+        if (st->info->temp_output) {
+                indio_dev->channels = sca3000_channels_with_temp;
+                indio_dev->num_channels =
+                        ARRAY_SIZE(sca3000_channels_with_temp);
+        } else {
+                indio_dev->channels = sca3000_channels;
+                indio_dev->num_channels = ARRAY_SIZE(sca3000_channels);
+        }
+        indio_dev->modes = INDIO_DIRECT_MODE;
+
+        sca3000_configure_ring(indio_dev);
+
+        if (spi->irq) {
+                ret = request_threaded_irq(spi->irq,
+                                           NULL,
+                                           &sca3000_event_handler,
+                                           IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                           "sca3000",
+                                           indio_dev);
+                if (ret)
+                        return ret;
+        }
+        indio_dev->setup_ops = &sca3000_ring_setup_ops;
+        ret = sca3000_clean_setup(st);
+        if (ret)
+                goto error_free_irq;
+
+        ret = sca3000_print_rev(indio_dev);
+        if (ret)
+                goto error_free_irq;
+
+        return iio_device_register(indio_dev);
+
+error_free_irq:
+        if (spi->irq)
+                free_irq(spi->irq, indio_dev);
+
+        return ret;
+}
+
+static int sca3000_stop_all_interrupts(struct sca3000_state *st)
+{
+        int ret;
+
+        mutex_lock(&st->lock);
+        ret = sca3000_read_data_short(st, SCA3000_REG_INT_MASK_ADDR, 1);
+        if (ret)
+                goto error_ret;
+        ret = sca3000_write_reg(st, SCA3000_REG_INT_MASK_ADDR,
+                                (st->rx[0] &
+                                 ~(SCA3000_REG_INT_MASK_RING_THREE_QUARTER |
+                                   SCA3000_REG_INT_MASK_RING_HALF |
+                                   SCA3000_REG_INT_MASK_ALL_INTS)));
+error_ret:
+        mutex_unlock(&st->lock);
+        return ret;
+}
+
+static int sca3000_remove(struct spi_device *spi)
+{
+        struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct sca3000_state *st = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+
+        /* Must ensure no interrupts can be generated after this! */
+        sca3000_stop_all_interrupts(st);
+        if (spi->irq)
+                free_irq(spi->irq, indio_dev);
+
+        sca3000_unconfigure_ring(indio_dev);
+
+        return 0;
+}
+
+static const struct spi_device_id sca3000_id[] = {
+        {"sca3000_d01", d01},
+        {"sca3000_e02", e02},
+        {"sca3000_e04", e04},
+        {"sca3000_e05", e05},
+        {}
+};
+MODULE_DEVICE_TABLE(spi, sca3000_id);
+
+static struct spi_driver sca3000_driver = {
+        .driver = {
+                .name = "sca3000",
+        },
+        .probe = sca3000_probe,
+        .remove = sca3000_remove,
+        .id_table = sca3000_id,
+};
+module_spi_driver(sca3000_driver);
+
+MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>");
+MODULE_DESCRIPTION("VTI SCA3000 Series Accelerometers SPI driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
index f8dfdb690563..7c231687109a 100644
--- a/drivers/iio/accel/st_accel.h
+++ b/drivers/iio/accel/st_accel.h
@@ -30,6 +30,7 @@
 #define LSM303AGR_ACCEL_DEV_NAME        "lsm303agr_accel"
 #define LIS2DH12_ACCEL_DEV_NAME         "lis2dh12_accel"
 #define LIS3L02DQ_ACCEL_DEV_NAME        "lis3l02dq"
+#define LNG2DM_ACCEL_DEV_NAME           "lng2dm"
 
 /**
 * 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 ce69048c88e9..f6b6d42385e1 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -43,194 +43,6 @@
 #define ST_ACCEL_FS_AVL_200G                    200
 #define ST_ACCEL_FS_AVL_400G                    400
 
-/* CUSTOM VALUES FOR SENSOR 1 */
-#define ST_ACCEL_1_WAI_EXP                      0x33
-#define ST_ACCEL_1_ODR_ADDR                     0x20
-#define ST_ACCEL_1_ODR_MASK                     0xf0
-#define ST_ACCEL_1_ODR_AVL_1HZ_VAL              0x01
-#define ST_ACCEL_1_ODR_AVL_10HZ_VAL             0x02
-#define ST_ACCEL_1_ODR_AVL_25HZ_VAL             0x03
-#define ST_ACCEL_1_ODR_AVL_50HZ_VAL             0x04
-#define ST_ACCEL_1_ODR_AVL_100HZ_VAL            0x05
-#define ST_ACCEL_1_ODR_AVL_200HZ_VAL            0x06
-#define ST_ACCEL_1_ODR_AVL_400HZ_VAL            0x07
-#define ST_ACCEL_1_ODR_AVL_1600HZ_VAL           0x08
-#define ST_ACCEL_1_FS_ADDR                      0x23
-#define ST_ACCEL_1_FS_MASK                      0x30
-#define ST_ACCEL_1_FS_AVL_2_VAL                 0x00
-#define ST_ACCEL_1_FS_AVL_4_VAL                 0x01
-#define ST_ACCEL_1_FS_AVL_8_VAL                 0x02
-#define ST_ACCEL_1_FS_AVL_16_VAL                0x03
-#define ST_ACCEL_1_FS_AVL_2_GAIN                IIO_G_TO_M_S_2(1000)
-#define ST_ACCEL_1_FS_AVL_4_GAIN                IIO_G_TO_M_S_2(2000)
-#define ST_ACCEL_1_FS_AVL_8_GAIN                IIO_G_TO_M_S_2(4000)
-#define ST_ACCEL_1_FS_AVL_16_GAIN               IIO_G_TO_M_S_2(12000)
-#define ST_ACCEL_1_BDU_ADDR                     0x23
-#define ST_ACCEL_1_BDU_MASK                     0x80
-#define ST_ACCEL_1_DRDY_IRQ_ADDR                0x22
-#define ST_ACCEL_1_DRDY_IRQ_INT1_MASK           0x10
-#define ST_ACCEL_1_DRDY_IRQ_INT2_MASK           0x08
-#define ST_ACCEL_1_IHL_IRQ_ADDR                 0x25
-#define ST_ACCEL_1_IHL_IRQ_MASK                 0x02
-#define ST_ACCEL_1_MULTIREAD_BIT                true
-
-/* CUSTOM VALUES FOR SENSOR 2 */
-#define ST_ACCEL_2_WAI_EXP                      0x32
-#define ST_ACCEL_2_ODR_ADDR                     0x20
-#define ST_ACCEL_2_ODR_MASK                     0x18
-#define ST_ACCEL_2_ODR_AVL_50HZ_VAL             0x00
-#define ST_ACCEL_2_ODR_AVL_100HZ_VAL            0x01
-#define ST_ACCEL_2_ODR_AVL_400HZ_VAL            0x02
-#define ST_ACCEL_2_ODR_AVL_1000HZ_VAL           0x03
-#define ST_ACCEL_2_PW_ADDR                      0x20
-#define ST_ACCEL_2_PW_MASK                      0xe0
-#define ST_ACCEL_2_FS_ADDR                      0x23
-#define ST_ACCEL_2_FS_MASK                      0x30
-#define ST_ACCEL_2_FS_AVL_2_VAL                 0X00
-#define ST_ACCEL_2_FS_AVL_4_VAL                 0X01
-#define ST_ACCEL_2_FS_AVL_8_VAL                 0x03
-#define ST_ACCEL_2_FS_AVL_2_GAIN                IIO_G_TO_M_S_2(1000)
-#define ST_ACCEL_2_FS_AVL_4_GAIN                IIO_G_TO_M_S_2(2000)
-#define ST_ACCEL_2_FS_AVL_8_GAIN                IIO_G_TO_M_S_2(3900)
-#define ST_ACCEL_2_BDU_ADDR                     0x23
-#define ST_ACCEL_2_BDU_MASK                     0x80
-#define ST_ACCEL_2_DRDY_IRQ_ADDR                0x22
-#define ST_ACCEL_2_DRDY_IRQ_INT1_MASK           0x02
-#define ST_ACCEL_2_DRDY_IRQ_INT2_MASK           0x10
-#define ST_ACCEL_2_IHL_IRQ_ADDR                 0x22
-#define ST_ACCEL_2_IHL_IRQ_MASK                 0x80
-#define ST_ACCEL_2_OD_IRQ_ADDR                  0x22
-#define ST_ACCEL_2_OD_IRQ_MASK                  0x40
-#define ST_ACCEL_2_MULTIREAD_BIT                true
-
-/* CUSTOM VALUES FOR SENSOR 3 */
-#define ST_ACCEL_3_WAI_EXP                      0x40
-#define ST_ACCEL_3_ODR_ADDR                     0x20
-#define ST_ACCEL_3_ODR_MASK                     0xf0
-#define ST_ACCEL_3_ODR_AVL_3HZ_VAL              0x01
-#define ST_ACCEL_3_ODR_AVL_6HZ_VAL              0x02
-#define ST_ACCEL_3_ODR_AVL_12HZ_VAL             0x03
-#define ST_ACCEL_3_ODR_AVL_25HZ_VAL             0x04
-#define ST_ACCEL_3_ODR_AVL_50HZ_VAL             0x05
-#define ST_ACCEL_3_ODR_AVL_100HZ_VAL            0x06
-#define ST_ACCEL_3_ODR_AVL_200HZ_VAL            0x07
-#define ST_ACCEL_3_ODR_AVL_400HZ_VAL            0x08
-#define ST_ACCEL_3_ODR_AVL_800HZ_VAL            0x09
-#define ST_ACCEL_3_ODR_AVL_1600HZ_VAL           0x0a
-#define ST_ACCEL_3_FS_ADDR                      0x24
-#define ST_ACCEL_3_FS_MASK                      0x38
-#define ST_ACCEL_3_FS_AVL_2_VAL                 0X00
-#define ST_ACCEL_3_FS_AVL_4_VAL                 0X01
-#define ST_ACCEL_3_FS_AVL_6_VAL                 0x02
-#define ST_ACCEL_3_FS_AVL_8_VAL                 0x03
-#define ST_ACCEL_3_FS_AVL_16_VAL                0x04
-#define ST_ACCEL_3_FS_AVL_2_GAIN                IIO_G_TO_M_S_2(61)
-#define ST_ACCEL_3_FS_AVL_4_GAIN                IIO_G_TO_M_S_2(122)
-#define ST_ACCEL_3_FS_AVL_6_GAIN                IIO_G_TO_M_S_2(183)
-#define ST_ACCEL_3_FS_AVL_8_GAIN                IIO_G_TO_M_S_2(244)
-#define ST_ACCEL_3_FS_AVL_16_GAIN               IIO_G_TO_M_S_2(732)
-#define ST_ACCEL_3_BDU_ADDR                     0x20
-#define ST_ACCEL_3_BDU_MASK                     0x08
-#define ST_ACCEL_3_DRDY_IRQ_ADDR                0x23
-#define ST_ACCEL_3_DRDY_IRQ_INT1_MASK           0x80
-#define ST_ACCEL_3_DRDY_IRQ_INT2_MASK           0x00
-#define ST_ACCEL_3_IHL_IRQ_ADDR                 0x23
-#define ST_ACCEL_3_IHL_IRQ_MASK                 0x40
-#define ST_ACCEL_3_IG1_EN_ADDR                  0x23
-#define ST_ACCEL_3_IG1_EN_MASK                  0x08
-#define ST_ACCEL_3_MULTIREAD_BIT                false
-
-/* CUSTOM VALUES FOR SENSOR 4 */
-#define ST_ACCEL_4_WAI_EXP                      0x3a
-#define ST_ACCEL_4_ODR_ADDR                     0x20
-#define ST_ACCEL_4_ODR_MASK                     0x30 /* DF1 and DF0 */
-#define ST_ACCEL_4_ODR_AVL_40HZ_VAL             0x00
-#define ST_ACCEL_4_ODR_AVL_160HZ_VAL            0x01
-#define ST_ACCEL_4_ODR_AVL_640HZ_VAL            0x02
-#define ST_ACCEL_4_ODR_AVL_2560HZ_VAL           0x03
-#define ST_ACCEL_4_PW_ADDR                      0x20
-#define ST_ACCEL_4_PW_MASK                      0xc0
-#define ST_ACCEL_4_FS_ADDR                      0x21
-#define ST_ACCEL_4_FS_MASK                      0x80
-#define ST_ACCEL_4_FS_AVL_2_VAL                 0X00
-#define ST_ACCEL_4_FS_AVL_6_VAL                 0X01
-#define ST_ACCEL_4_FS_AVL_2_GAIN                IIO_G_TO_M_S_2(1024)
-#define ST_ACCEL_4_FS_AVL_6_GAIN                IIO_G_TO_M_S_2(340)
-#define ST_ACCEL_4_BDU_ADDR                     0x21
-#define ST_ACCEL_4_BDU_MASK                     0x40
-#define ST_ACCEL_4_DRDY_IRQ_ADDR                0x21
-#define ST_ACCEL_4_DRDY_IRQ_INT1_MASK           0x04
-#define ST_ACCEL_4_MULTIREAD_BIT                true
-
-/* CUSTOM VALUES FOR SENSOR 5 */
-#define ST_ACCEL_5_WAI_EXP                      0x3b
-#define ST_ACCEL_5_ODR_ADDR                     0x20
-#define ST_ACCEL_5_ODR_MASK                     0x80
-#define ST_ACCEL_5_ODR_AVL_100HZ_VAL            0x00
-#define ST_ACCEL_5_ODR_AVL_400HZ_VAL            0x01
-#define ST_ACCEL_5_PW_ADDR                      0x20
-#define ST_ACCEL_5_PW_MASK                      0x40
-#define ST_ACCEL_5_FS_ADDR                      0x20
-#define ST_ACCEL_5_FS_MASK                      0x20
-#define ST_ACCEL_5_FS_AVL_2_VAL                 0X00
-#define ST_ACCEL_5_FS_AVL_8_VAL                 0X01
-/* TODO: check these resulting gain settings, these are not in the datsheet */
-#define ST_ACCEL_5_FS_AVL_2_GAIN                IIO_G_TO_M_S_2(18000)
-#define ST_ACCEL_5_FS_AVL_8_GAIN                IIO_G_TO_M_S_2(72000)
-#define ST_ACCEL_5_DRDY_IRQ_ADDR                0x22
-#define ST_ACCEL_5_DRDY_IRQ_INT1_MASK           0x04
-#define ST_ACCEL_5_DRDY_IRQ_INT2_MASK           0x20
-#define ST_ACCEL_5_IHL_IRQ_ADDR                 0x22
-#define ST_ACCEL_5_IHL_IRQ_MASK                 0x80
-#define ST_ACCEL_5_OD_IRQ_ADDR                  0x22
-#define ST_ACCEL_5_OD_IRQ_MASK                  0x40
-#define ST_ACCEL_5_IG1_EN_ADDR                  0x21
-#define ST_ACCEL_5_IG1_EN_MASK                  0x08
-#define ST_ACCEL_5_MULTIREAD_BIT                false
-
-/* CUSTOM VALUES FOR SENSOR 6 */
-#define ST_ACCEL_6_WAI_EXP                      0x32
-#define ST_ACCEL_6_ODR_ADDR                     0x20
-#define ST_ACCEL_6_ODR_MASK                     0x18
-#define ST_ACCEL_6_ODR_AVL_50HZ_VAL             0x00
-#define ST_ACCEL_6_ODR_AVL_100HZ_VAL            0x01
-#define ST_ACCEL_6_ODR_AVL_400HZ_VAL            0x02
-#define ST_ACCEL_6_ODR_AVL_1000HZ_VAL           0x03
-#define ST_ACCEL_6_PW_ADDR                      0x20
-#define ST_ACCEL_6_PW_MASK                      0x20
-#define ST_ACCEL_6_FS_ADDR                      0x23
-#define ST_ACCEL_6_FS_MASK                      0x30
-#define ST_ACCEL_6_FS_AVL_100_VAL               0x00
-#define ST_ACCEL_6_FS_AVL_200_VAL               0x01
-#define ST_ACCEL_6_FS_AVL_400_VAL               0x03
-#define ST_ACCEL_6_FS_AVL_100_GAIN              IIO_G_TO_M_S_2(49000)
-#define ST_ACCEL_6_FS_AVL_200_GAIN              IIO_G_TO_M_S_2(98000)
-#define ST_ACCEL_6_FS_AVL_400_GAIN              IIO_G_TO_M_S_2(195000)
-#define ST_ACCEL_6_BDU_ADDR                     0x23
-#define ST_ACCEL_6_BDU_MASK                     0x80
-#define ST_ACCEL_6_DRDY_IRQ_ADDR                0x22
-#define ST_ACCEL_6_DRDY_IRQ_INT1_MASK           0x02
-#define ST_ACCEL_6_DRDY_IRQ_INT2_MASK           0x10
-#define ST_ACCEL_6_IHL_IRQ_ADDR                 0x22
-#define ST_ACCEL_6_IHL_IRQ_MASK                 0x80
-#define ST_ACCEL_6_MULTIREAD_BIT                true
-
-/* CUSTOM VALUES FOR SENSOR 7 */
-#define ST_ACCEL_7_ODR_ADDR                     0x20
-#define ST_ACCEL_7_ODR_MASK                     0x30
-#define ST_ACCEL_7_ODR_AVL_280HZ_VAL            0x00
-#define ST_ACCEL_7_ODR_AVL_560HZ_VAL            0x01
-#define ST_ACCEL_7_ODR_AVL_1120HZ_VAL           0x02
-#define ST_ACCEL_7_ODR_AVL_4480HZ_VAL           0x03
-#define ST_ACCEL_7_PW_ADDR                      0x20
-#define ST_ACCEL_7_PW_MASK                      0xc0
-#define ST_ACCEL_7_FS_AVL_2_GAIN                IIO_G_TO_M_S_2(488)
-#define ST_ACCEL_7_BDU_ADDR                     0x21
-#define ST_ACCEL_7_BDU_MASK                     0x40
-#define ST_ACCEL_7_DRDY_IRQ_ADDR                0x21
-#define ST_ACCEL_7_DRDY_IRQ_INT1_MASK           0x04
-#define ST_ACCEL_7_MULTIREAD_BIT                false
-
 static const struct iio_chan_spec st_accel_8bit_channels[] = {
         ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
                         BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
@@ -281,7 +93,7 @@ static const struct iio_chan_spec st_accel_16bit_channels[] = {
 
 static const struct st_sensor_settings st_accel_sensors_settings[] = {
         {
-                .wai = ST_ACCEL_1_WAI_EXP,
+                .wai = 0x33,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LIS3DH_ACCEL_DEV_NAME,
@@ -294,22 +106,22 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                 },
                 .ch = (struct iio_chan_spec *)st_accel_12bit_channels,
                 .odr = {
-                        .addr = ST_ACCEL_1_ODR_ADDR,
-                        .mask = ST_ACCEL_1_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0xf0,
                         .odr_avl = {
-                                { 1, ST_ACCEL_1_ODR_AVL_1HZ_VAL, },
-                                { 10, ST_ACCEL_1_ODR_AVL_10HZ_VAL, },
-                                { 25, ST_ACCEL_1_ODR_AVL_25HZ_VAL, },
-                                { 50, ST_ACCEL_1_ODR_AVL_50HZ_VAL, },
-                                { 100, ST_ACCEL_1_ODR_AVL_100HZ_VAL, },
-                                { 200, ST_ACCEL_1_ODR_AVL_200HZ_VAL, },
-                                { 400, ST_ACCEL_1_ODR_AVL_400HZ_VAL, },
-                                { 1600, ST_ACCEL_1_ODR_AVL_1600HZ_VAL, },
+                                { .hz = 1, .value = 0x01, },
+                                { .hz = 10, .value = 0x02, },
+                                { .hz = 25, .value = 0x03, },
+                                { .hz = 50, .value = 0x04, },
+                                { .hz = 100, .value = 0x05, },
+                                { .hz = 200, .value = 0x06, },
+                                { .hz = 400, .value = 0x07, },
+                                { .hz = 1600, .value = 0x08, },
                         },
                 },
                 .pw = {
-                        .addr = ST_ACCEL_1_ODR_ADDR,
-                        .mask = ST_ACCEL_1_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0xf0,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
                 .enable_axis = {
@@ -317,48 +129,48 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .mask = ST_SENSORS_DEFAULT_AXIS_MASK,
                 },
                 .fs = {
-                        .addr = ST_ACCEL_1_FS_ADDR,
-                        .mask = ST_ACCEL_1_FS_MASK,
+                        .addr = 0x23,
+                        .mask = 0x30,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_ACCEL_FS_AVL_2G,
-                                        .value = ST_ACCEL_1_FS_AVL_2_VAL,
-                                        .gain = ST_ACCEL_1_FS_AVL_2_GAIN,
+                                        .value = 0x00,
+                                        .gain = IIO_G_TO_M_S_2(1000),
                                 },
                                 [1] = {
                                         .num = ST_ACCEL_FS_AVL_4G,
-                                        .value = ST_ACCEL_1_FS_AVL_4_VAL,
-                                        .gain = ST_ACCEL_1_FS_AVL_4_GAIN,
+                                        .value = 0x01,
+                                        .gain = IIO_G_TO_M_S_2(2000),
                                 },
                                 [2] = {
                                         .num = ST_ACCEL_FS_AVL_8G,
-                                        .value = ST_ACCEL_1_FS_AVL_8_VAL,
-                                        .gain = ST_ACCEL_1_FS_AVL_8_GAIN,
+                                        .value = 0x02,
+                                        .gain = IIO_G_TO_M_S_2(4000),
                                 },
                                 [3] = {
                                         .num = ST_ACCEL_FS_AVL_16G,
-                                        .value = ST_ACCEL_1_FS_AVL_16_VAL,
-                                        .gain = ST_ACCEL_1_FS_AVL_16_GAIN,
+                                        .value = 0x03,
+                                        .gain = IIO_G_TO_M_S_2(12000),
                                 },
                         },
                 },
                 .bdu = {
-                        .addr = ST_ACCEL_1_BDU_ADDR,
-                        .mask = ST_ACCEL_1_BDU_MASK,
+                        .addr = 0x23,
+                        .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = ST_ACCEL_1_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_ACCEL_1_DRDY_IRQ_INT1_MASK,
-                        .mask_int2 = ST_ACCEL_1_DRDY_IRQ_INT2_MASK,
-                        .addr_ihl = ST_ACCEL_1_IHL_IRQ_ADDR,
-                        .mask_ihl = ST_ACCEL_1_IHL_IRQ_MASK,
+                        .addr = 0x22,
+                        .mask_int1 = 0x10,
+                        .mask_int2 = 0x08,
+                        .addr_ihl = 0x25,
+                        .mask_ihl = 0x02,
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_ACCEL_1_MULTIREAD_BIT,
+                .multi_read_bit = true,
                 .bootime = 2,
         },
         {
-                .wai = ST_ACCEL_2_WAI_EXP,
+                .wai = 0x32,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LIS331DLH_ACCEL_DEV_NAME,
@@ -368,18 +180,18 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                 },
                 .ch = (struct iio_chan_spec *)st_accel_12bit_channels,
                 .odr = {
-                        .addr = ST_ACCEL_2_ODR_ADDR,
-                        .mask = ST_ACCEL_2_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0x18,
                         .odr_avl = {
-                                { 50, ST_ACCEL_2_ODR_AVL_50HZ_VAL, },
-                                { 100, ST_ACCEL_2_ODR_AVL_100HZ_VAL, },
-                                { 400, ST_ACCEL_2_ODR_AVL_400HZ_VAL, },
-                                { 1000, ST_ACCEL_2_ODR_AVL_1000HZ_VAL, },
+                                { .hz = 50, .value = 0x00, },
+                                { .hz = 100, .value = 0x01, },
+                                { .hz = 400, .value = 0x02, },
+                                { .hz = 1000, .value = 0x03, },
                         },
                 },
                 .pw = {
-                        .addr = ST_ACCEL_2_PW_ADDR,
-                        .mask = ST_ACCEL_2_PW_MASK,
+                        .addr = 0x20,
+                        .mask = 0xe0,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
@@ -388,69 +200,69 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .mask = ST_SENSORS_DEFAULT_AXIS_MASK,
                 },
                 .fs = {
-                        .addr = ST_ACCEL_2_FS_ADDR,
-                        .mask = ST_ACCEL_2_FS_MASK,
+                        .addr = 0x23,
+                        .mask = 0x30,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_ACCEL_FS_AVL_2G,
-                                        .value = ST_ACCEL_2_FS_AVL_2_VAL,
-                                        .gain = ST_ACCEL_2_FS_AVL_2_GAIN,
+                                        .value = 0x00,
+                                        .gain = IIO_G_TO_M_S_2(1000),
                                 },
                                 [1] = {
                                         .num = ST_ACCEL_FS_AVL_4G,
-                                        .value = ST_ACCEL_2_FS_AVL_4_VAL,
-                                        .gain = ST_ACCEL_2_FS_AVL_4_GAIN,
+                                        .value = 0x01,
+                                        .gain = IIO_G_TO_M_S_2(2000),
                                 },
                                 [2] = {
                                         .num = ST_ACCEL_FS_AVL_8G,
-                                        .value = ST_ACCEL_2_FS_AVL_8_VAL,
-                                        .gain = ST_ACCEL_2_FS_AVL_8_GAIN,
+                                        .value = 0x03,
+                                        .gain = IIO_G_TO_M_S_2(3900),
                                 },
                         },
                 },
                 .bdu = {
-                        .addr = ST_ACCEL_2_BDU_ADDR,
-                        .mask = ST_ACCEL_2_BDU_MASK,
+                        .addr = 0x23,
+                        .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = ST_ACCEL_2_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_ACCEL_2_DRDY_IRQ_INT1_MASK,
-                        .mask_int2 = ST_ACCEL_2_DRDY_IRQ_INT2_MASK,
-                        .addr_ihl = ST_ACCEL_2_IHL_IRQ_ADDR,
-                        .mask_ihl = ST_ACCEL_2_IHL_IRQ_MASK,
-                        .addr_od = ST_ACCEL_2_OD_IRQ_ADDR,
-                        .mask_od = ST_ACCEL_2_OD_IRQ_MASK,
+                        .addr = 0x22,
+                        .mask_int1 = 0x02,
+                        .mask_int2 = 0x10,
+                        .addr_ihl = 0x22,
+                        .mask_ihl = 0x80,
+                        .addr_od = 0x22,
+                        .mask_od = 0x40,
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_ACCEL_2_MULTIREAD_BIT,
+                .multi_read_bit = true,
                 .bootime = 2,
         },
         {
-                .wai = ST_ACCEL_3_WAI_EXP,
+                .wai = 0x40,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LSM330_ACCEL_DEV_NAME,
                 },
                 .ch = (struct iio_chan_spec *)st_accel_16bit_channels,
                 .odr = {
-                        .addr = ST_ACCEL_3_ODR_ADDR,
-                        .mask = ST_ACCEL_3_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0xf0,
                         .odr_avl = {
-                                { 3, ST_ACCEL_3_ODR_AVL_3HZ_VAL },
-                                { 6, ST_ACCEL_3_ODR_AVL_6HZ_VAL, },
-                                { 12, ST_ACCEL_3_ODR_AVL_12HZ_VAL, },
-                                { 25, ST_ACCEL_3_ODR_AVL_25HZ_VAL, },
-                                { 50, ST_ACCEL_3_ODR_AVL_50HZ_VAL, },
-                                { 100, ST_ACCEL_3_ODR_AVL_100HZ_VAL, },
-                                { 200, ST_ACCEL_3_ODR_AVL_200HZ_VAL, },
-                                { 400, ST_ACCEL_3_ODR_AVL_400HZ_VAL, },
-                                { 800, ST_ACCEL_3_ODR_AVL_800HZ_VAL, },
-                                { 1600, ST_ACCEL_3_ODR_AVL_1600HZ_VAL, },
+                                { .hz = 3, .value = 0x01, },
+                                { .hz = 6, .value = 0x02, },
+                                { .hz = 12, .value = 0x03, },
+                                { .hz = 25, .value = 0x04, },
+                                { .hz = 50, .value = 0x05, },
+                                { .hz = 100, .value = 0x06, },
+                                { .hz = 200, .value = 0x07, },
+                                { .hz = 400, .value = 0x08, },
+                                { .hz = 800, .value = 0x09, },
+                                { .hz = 1600, .value = 0x0a, },
                         },
                 },
                 .pw = {
-                        .addr = ST_ACCEL_3_ODR_ADDR,
-                        .mask = ST_ACCEL_3_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0xf0,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
                 .enable_axis = {
@@ -458,75 +270,75 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .mask = ST_SENSORS_DEFAULT_AXIS_MASK,
                 },
                 .fs = {
-                        .addr = ST_ACCEL_3_FS_ADDR,
-                        .mask = ST_ACCEL_3_FS_MASK,
+                        .addr = 0x24,
+                        .mask = 0x38,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_ACCEL_FS_AVL_2G,
-                                        .value = ST_ACCEL_3_FS_AVL_2_VAL,
-                                        .gain = ST_ACCEL_3_FS_AVL_2_GAIN,
+                                        .value = 0x00,
+                                        .gain = IIO_G_TO_M_S_2(61),
                                 },
                                 [1] = {
                                         .num = ST_ACCEL_FS_AVL_4G,
-                                        .value = ST_ACCEL_3_FS_AVL_4_VAL,
-                                        .gain = ST_ACCEL_3_FS_AVL_4_GAIN,
+                                        .value = 0x01,
+                                        .gain = IIO_G_TO_M_S_2(122),
                                 },
                                 [2] = {
                                         .num = ST_ACCEL_FS_AVL_6G,
-                                        .value = ST_ACCEL_3_FS_AVL_6_VAL,
-                                        .gain = ST_ACCEL_3_FS_AVL_6_GAIN,
+                                        .value = 0x02,
+                                        .gain = IIO_G_TO_M_S_2(183),
                                 },
                                 [3] = {
                                         .num = ST_ACCEL_FS_AVL_8G,
-                                        .value = ST_ACCEL_3_FS_AVL_8_VAL,
-                                        .gain = ST_ACCEL_3_FS_AVL_8_GAIN,
+                                        .value = 0x03,
+                                        .gain = IIO_G_TO_M_S_2(244),
                                 },
                                 [4] = {
                                         .num = ST_ACCEL_FS_AVL_16G,
-                                        .value = ST_ACCEL_3_FS_AVL_16_VAL,
-                                        .gain = ST_ACCEL_3_FS_AVL_16_GAIN,
+                                        .value = 0x04,
+                                        .gain = IIO_G_TO_M_S_2(732),
                                 },
                         },
                 },
                 .bdu = {
-                        .addr = ST_ACCEL_3_BDU_ADDR,
-                        .mask = ST_ACCEL_3_BDU_MASK,
+                        .addr = 0x20,
+                        .mask = 0x08,
                 },
                 .drdy_irq = {
-                        .addr = ST_ACCEL_3_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_ACCEL_3_DRDY_IRQ_INT1_MASK,
-                        .mask_int2 = ST_ACCEL_3_DRDY_IRQ_INT2_MASK,
-                        .addr_ihl = ST_ACCEL_3_IHL_IRQ_ADDR,
-                        .mask_ihl = ST_ACCEL_3_IHL_IRQ_MASK,
+                        .addr = 0x23,
+                        .mask_int1 = 0x80,
+                        .mask_int2 = 0x00,
+                        .addr_ihl = 0x23,
+                        .mask_ihl = 0x40,
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                         .ig1 = {
-                                .en_addr = ST_ACCEL_3_IG1_EN_ADDR,
-                                .en_mask = ST_ACCEL_3_IG1_EN_MASK,
+                                .en_addr = 0x23,
+                                .en_mask = 0x08,
                         },
                 },
-                .multi_read_bit = ST_ACCEL_3_MULTIREAD_BIT,
+                .multi_read_bit = false,
                 .bootime = 2,
         },
         {
-                .wai = ST_ACCEL_4_WAI_EXP,
+                .wai = 0x3a,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LIS3LV02DL_ACCEL_DEV_NAME,
                 },
                 .ch = (struct iio_chan_spec *)st_accel_12bit_channels,
                 .odr = {
-                        .addr = ST_ACCEL_4_ODR_ADDR,
-                        .mask = ST_ACCEL_4_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0x30, /* DF1 and DF0 */
                         .odr_avl = {
-                                { 40, ST_ACCEL_4_ODR_AVL_40HZ_VAL },
-                                { 160, ST_ACCEL_4_ODR_AVL_160HZ_VAL, },
-                                { 640, ST_ACCEL_4_ODR_AVL_640HZ_VAL, },
-                                { 2560, ST_ACCEL_4_ODR_AVL_2560HZ_VAL, },
+                                { .hz = 40, .value = 0x00, },
+                                { .hz = 160, .value = 0x01, },
+                                { .hz = 640, .value = 0x02, },
+                                { .hz = 2560, .value = 0x03, },
                         },
                 },
                 .pw = {
-                        .addr = ST_ACCEL_4_PW_ADDR,
-                        .mask = ST_ACCEL_4_PW_MASK,
+                        .addr = 0x20,
+                        .mask = 0xc0,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
@@ -535,51 +347,51 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .mask = ST_SENSORS_DEFAULT_AXIS_MASK,
                 },
                 .fs = {
-                        .addr = ST_ACCEL_4_FS_ADDR,
-                        .mask = ST_ACCEL_4_FS_MASK,
+                        .addr = 0x21,
+                        .mask = 0x80,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_ACCEL_FS_AVL_2G,
-                                        .value = ST_ACCEL_4_FS_AVL_2_VAL,
-                                        .gain = ST_ACCEL_4_FS_AVL_2_GAIN,
+                                        .value = 0x00,
+                                        .gain = IIO_G_TO_M_S_2(1024),
                                 },
                                 [1] = {
                                         .num = ST_ACCEL_FS_AVL_6G,
-                                        .value = ST_ACCEL_4_FS_AVL_6_VAL,
-                                        .gain = ST_ACCEL_4_FS_AVL_6_GAIN,
+                                        .value = 0x01,
+                                        .gain = IIO_G_TO_M_S_2(340),
                                 },
                         },
                 },
                 .bdu = {
-                        .addr = ST_ACCEL_4_BDU_ADDR,
-                        .mask = ST_ACCEL_4_BDU_MASK,
+                        .addr = 0x21,
+                        .mask = 0x40,
                 },
                 .drdy_irq = {
-                        .addr = ST_ACCEL_4_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_ACCEL_4_DRDY_IRQ_INT1_MASK,
+                        .addr = 0x21,
+                        .mask_int1 = 0x04,
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_ACCEL_4_MULTIREAD_BIT,
+                .multi_read_bit = true,
                 .bootime = 2, /* guess */
         },
         {
-                .wai = ST_ACCEL_5_WAI_EXP,
+                .wai = 0x3b,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LIS331DL_ACCEL_DEV_NAME,
                 },
                 .ch = (struct iio_chan_spec *)st_accel_8bit_channels,
                 .odr = {
-                        .addr = ST_ACCEL_5_ODR_ADDR,
-                        .mask = ST_ACCEL_5_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0x80,
                         .odr_avl = {
-                                { 100, ST_ACCEL_5_ODR_AVL_100HZ_VAL },
-                                { 400, ST_ACCEL_5_ODR_AVL_400HZ_VAL, },
+                                { .hz = 100, .value = 0x00, },
+                                { .hz = 400, .value = 0x01, },
                         },
                 },
                 .pw = {
-                        .addr = ST_ACCEL_5_PW_ADDR,
-                        .mask = ST_ACCEL_5_PW_MASK,
+                        .addr = 0x20,
+                        .mask = 0x40,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
@@ -588,54 +400,58 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .mask = ST_SENSORS_DEFAULT_AXIS_MASK,
                 },
                 .fs = {
-                        .addr = ST_ACCEL_5_FS_ADDR,
-                        .mask = ST_ACCEL_5_FS_MASK,
+                        .addr = 0x20,
+                        .mask = 0x20,
+                        /*
+                         * TODO: check these resulting gain settings, these are
+                         * not in the datsheet
+                         */
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_ACCEL_FS_AVL_2G,
-                                        .value = ST_ACCEL_5_FS_AVL_2_VAL,
-                                        .gain = ST_ACCEL_5_FS_AVL_2_GAIN,
+                                        .value = 0x00,
+                                        .gain = IIO_G_TO_M_S_2(18000),
                                 },
                                 [1] = {
                                         .num = ST_ACCEL_FS_AVL_8G,
-                                        .value = ST_ACCEL_5_FS_AVL_8_VAL,
-                                        .gain = ST_ACCEL_5_FS_AVL_8_GAIN,
+                                        .value = 0x01,
+                                        .gain = IIO_G_TO_M_S_2(72000),
                                 },
                         },
                 },
                 .drdy_irq = {
-                        .addr = ST_ACCEL_5_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_ACCEL_5_DRDY_IRQ_INT1_MASK,
-                        .mask_int2 = ST_ACCEL_5_DRDY_IRQ_INT2_MASK,
-                        .addr_ihl = ST_ACCEL_5_IHL_IRQ_ADDR,
-                        .mask_ihl = ST_ACCEL_5_IHL_IRQ_MASK,
-                        .addr_od = ST_ACCEL_5_OD_IRQ_ADDR,
-                        .mask_od = ST_ACCEL_5_OD_IRQ_MASK,
+                        .addr = 0x22,
+                        .mask_int1 = 0x04,
+                        .mask_int2 = 0x20,
+                        .addr_ihl = 0x22,
+                        .mask_ihl = 0x80,
+                        .addr_od = 0x22,
+                        .mask_od = 0x40,
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_ACCEL_5_MULTIREAD_BIT,
+                .multi_read_bit = false,
                 .bootime = 2, /* guess */
         },
         {
-                .wai = ST_ACCEL_6_WAI_EXP,
+                .wai = 0x32,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = H3LIS331DL_DRIVER_NAME,
                 },
                 .ch = (struct iio_chan_spec *)st_accel_12bit_channels,
                 .odr = {
-                        .addr = ST_ACCEL_6_ODR_ADDR,
-                        .mask = ST_ACCEL_6_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0x18,
                         .odr_avl = {
-                                { 50, ST_ACCEL_6_ODR_AVL_50HZ_VAL },
-                                { 100, ST_ACCEL_6_ODR_AVL_100HZ_VAL, },
-                                { 400, ST_ACCEL_6_ODR_AVL_400HZ_VAL, },
-                                { 1000, ST_ACCEL_6_ODR_AVL_1000HZ_VAL, },
+                                { .hz = 50, .value = 0x00, },
+                                { .hz = 100, .value = 0x01, },
+                                { .hz = 400, .value = 0x02, },
+                                { .hz = 1000, .value = 0x03, },
                         },
                 },
                 .pw = {
-                        .addr = ST_ACCEL_6_PW_ADDR,
-                        .mask = ST_ACCEL_6_PW_MASK,
+                        .addr = 0x20,
+                        .mask = 0x20,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
@@ -644,38 +460,38 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .mask = ST_SENSORS_DEFAULT_AXIS_MASK,
                 },
                 .fs = {
-                        .addr = ST_ACCEL_6_FS_ADDR,
-                        .mask = ST_ACCEL_6_FS_MASK,
+                        .addr = 0x23,
+                        .mask = 0x30,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_ACCEL_FS_AVL_100G,
-                                        .value = ST_ACCEL_6_FS_AVL_100_VAL,
-                                        .gain = ST_ACCEL_6_FS_AVL_100_GAIN,
+                                        .value = 0x00,
+                                        .gain = IIO_G_TO_M_S_2(49000),
                                 },
                                 [1] = {
                                         .num = ST_ACCEL_FS_AVL_200G,
-                                        .value = ST_ACCEL_6_FS_AVL_200_VAL,
-                                        .gain = ST_ACCEL_6_FS_AVL_200_GAIN,
+                                        .value = 0x01,
+                                        .gain = IIO_G_TO_M_S_2(98000),
                                 },
                                 [2] = {
                                         .num = ST_ACCEL_FS_AVL_400G,
-                                        .value = ST_ACCEL_6_FS_AVL_400_VAL,
-                                        .gain = ST_ACCEL_6_FS_AVL_400_GAIN,
+                                        .value = 0x03,
+                                        .gain = IIO_G_TO_M_S_2(195000),
                                 },
                         },
                 },
                 .bdu = {
-                        .addr = ST_ACCEL_6_BDU_ADDR,
-                        .mask = ST_ACCEL_6_BDU_MASK,
+                        .addr = 0x23,
+                        .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = ST_ACCEL_6_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_ACCEL_6_DRDY_IRQ_INT1_MASK,
-                        .mask_int2 = ST_ACCEL_6_DRDY_IRQ_INT2_MASK,
-                        .addr_ihl = ST_ACCEL_6_IHL_IRQ_ADDR,
-                        .mask_ihl = ST_ACCEL_6_IHL_IRQ_MASK,
+                        .addr = 0x22,
+                        .mask_int1 = 0x02,
+                        .mask_int2 = 0x10,
+                        .addr_ihl = 0x22,
+                        .mask_ihl = 0x80,
                 },
-                .multi_read_bit = ST_ACCEL_6_MULTIREAD_BIT,
+                .multi_read_bit = true,
                 .bootime = 2,
         },
         {
@@ -685,18 +501,18 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                 },
                 .ch = (struct iio_chan_spec *)st_accel_12bit_channels,
                 .odr = {
-                        .addr = ST_ACCEL_7_ODR_ADDR,
-                        .mask = ST_ACCEL_7_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0x30,
                         .odr_avl = {
-                                { 280, ST_ACCEL_7_ODR_AVL_280HZ_VAL, },
-                                { 560, ST_ACCEL_7_ODR_AVL_560HZ_VAL, },
-                                { 1120, ST_ACCEL_7_ODR_AVL_1120HZ_VAL, },
-                                { 4480, ST_ACCEL_7_ODR_AVL_4480HZ_VAL, },
+                                { .hz = 280, .value = 0x00, },
+                                { .hz = 560, .value = 0x01, },
+                                { .hz = 1120, .value = 0x02, },
+                                { .hz = 4480, .value = 0x03, },
                         },
                 },
                 .pw = {
-                        .addr = ST_ACCEL_7_PW_ADDR,
-                        .mask = ST_ACCEL_7_PW_MASK,
+                        .addr = 0x20,
+                        .mask = 0xc0,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
@@ -708,7 +524,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_ACCEL_FS_AVL_2G,
-                                        .gain = ST_ACCEL_7_FS_AVL_2_GAIN,
+                                        .gain = IIO_G_TO_M_S_2(488),
                                 },
                         },
                 },
@@ -719,11 +535,78 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                 .bdu = {
                 },
                 .drdy_irq = {
-                        .addr = ST_ACCEL_7_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_ACCEL_7_DRDY_IRQ_INT1_MASK,
+                        .addr = 0x21,
+                        .mask_int1 = 0x04,
+                        .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
+                },
+                .multi_read_bit = false,
+                .bootime = 2,
+        },
+        {
+                .wai = 0x33,
+                .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
+                .sensors_supported = {
+                        [0] = LNG2DM_ACCEL_DEV_NAME,
+                },
+                .ch = (struct iio_chan_spec *)st_accel_8bit_channels,
+                .odr = {
+                        .addr = 0x20,
+                        .mask = 0xf0,
+                        .odr_avl = {
+                                { .hz = 1, .value = 0x01, },
+                                { .hz = 10, .value = 0x02, },
+                                { .hz = 25, .value = 0x03, },
+                                { .hz = 50, .value = 0x04, },
+                                { .hz = 100, .value = 0x05, },
+                                { .hz = 200, .value = 0x06, },
+                                { .hz = 400, .value = 0x07, },
+                                { .hz = 1600, .value = 0x08, },
+                        },
+                },
+                .pw = {
+                        .addr = 0x20,
+                        .mask = 0xf0,
+                        .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
+                },
+                .enable_axis = {
+                        .addr = ST_SENSORS_DEFAULT_AXIS_ADDR,
+                        .mask = ST_SENSORS_DEFAULT_AXIS_MASK,
+                },
+                .fs = {
+                        .addr = 0x23,
+                        .mask = 0x30,
+                        .fs_avl = {
+                                [0] = {
+                                        .num = ST_ACCEL_FS_AVL_2G,
+                                        .value = 0x00,
+                                        .gain = IIO_G_TO_M_S_2(15600),
+                                },
+                                [1] = {
+                                        .num = ST_ACCEL_FS_AVL_4G,
+                                        .value = 0x01,
+                                        .gain = IIO_G_TO_M_S_2(31200),
+                                },
+                                [2] = {
+                                        .num = ST_ACCEL_FS_AVL_8G,
+                                        .value = 0x02,
+                                        .gain = IIO_G_TO_M_S_2(62500),
+                                },
+                                [3] = {
+                                        .num = ST_ACCEL_FS_AVL_16G,
+                                        .value = 0x03,
+                                        .gain = IIO_G_TO_M_S_2(187500),
+                                },
+                        },
+                },
+                .drdy_irq = {
+                        .addr = 0x22,
+                        .mask_int1 = 0x10,
+                        .mask_int2 = 0x08,
+                        .addr_ihl = 0x25,
+                        .mask_ihl = 0x02,
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_ACCEL_7_MULTIREAD_BIT,
+                .multi_read_bit = true,
                 .bootime = 2,
         },
 };
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index e9d427a5df7c..c0f8867aa1ea 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -84,6 +84,10 @@ static const struct of_device_id st_accel_of_match[] = {
                 .compatible = "st,lis3l02dq",
                 .data = LIS3L02DQ_ACCEL_DEV_NAME,
         },
+        {
+                .compatible = "st,lng2dm-accel",
+                .data = LNG2DM_ACCEL_DEV_NAME,
+        },
         {},
 };
 MODULE_DEVICE_TABLE(of, st_accel_of_match);
@@ -135,6 +139,7 @@ static const struct i2c_device_id st_accel_id_table[] = {
         { LSM303AGR_ACCEL_DEV_NAME },
         { LIS2DH12_ACCEL_DEV_NAME },
         { LIS3L02DQ_ACCEL_DEV_NAME },
+        { LNG2DM_ACCEL_DEV_NAME },
         {},
 };
 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 efd43941d45d..c25ac50d4600 100644
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -60,6 +60,7 @@ static const struct spi_device_id st_accel_id_table[] = {
         { LSM303AGR_ACCEL_DEV_NAME },
         { LIS2DH12_ACCEL_DEV_NAME },
         { LIS3L02DQ_ACCEL_DEV_NAME },
+        { LNG2DM_ACCEL_DEV_NAME },
         {},
 };
 MODULE_DEVICE_TABLE(spi, st_accel_id_table);
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 99c051490eff..38bc319904c4 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -58,6 +58,18 @@ config AD7476
           To compile this driver as a module, choose M here: the
           module will be called ad7476.
 
+config AD7766
+        tristate "Analog Devices AD7766/AD7767 ADC driver"
+        depends on SPI_MASTER
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        help
+          Say yes here to build support for Analog Devices AD7766, AD7766-1,
+          AD7766-2, AD7767, AD7767-1, AD7767-2 SPI analog to digital converters.
+
+          To compile this driver as a module, choose M here: the module will be
+          called ad7766.
+
 config AD7791
         tristate "Analog Devices AD7791 ADC driver"
         depends on SPI
@@ -195,6 +207,16 @@ config DA9150_GPADC
           To compile this driver as a module, choose M here: the module will be
           called berlin2-adc.
 
+config ENVELOPE_DETECTOR
+        tristate "Envelope detector using a DAC and a comparator"
+        depends on OF
+        help
+          Say yes here to build support for an envelope detector using a DAC
+          and a comparator.
+
+          To compile this driver as a module, choose M here: the module will be
+          called envelope-detector.
+
 config EXYNOS_ADC
         tristate "Exynos ADC driver support"
         depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)
@@ -419,6 +441,28 @@ config ROCKCHIP_SARADC
           To compile this driver as a module, choose M here: the
           module will be called rockchip_saradc.
 
+config STM32_ADC_CORE
+        tristate "STMicroelectronics STM32 adc core"
+        depends on ARCH_STM32 || COMPILE_TEST
+        depends on OF
+        depends on REGULATOR
+        help
+          Select this option to enable the core driver for STMicroelectronics
+          STM32 analog-to-digital converter (ADC).
+
+          This driver can also be built as a module.  If so, the module
+          will be called stm32-adc-core.
+
+config STM32_ADC
+        tristate "STMicroelectronics STM32 adc"
+        depends on STM32_ADC_CORE
+        help
+          Say yes here to build support for STMicroelectronics stm32 Analog
+          to Digital Converter (ADC).
+
+          This driver can also be built as a module.  If so, the module
+          will be called stm32-adc.
+
 config STX104
         tristate "Apex Embedded Systems STX104 driver"
         depends on X86 && ISA_BUS_API
@@ -449,6 +493,8 @@ config TI_ADC081C
 config TI_ADC0832
         tristate "Texas Instruments ADC0831/ADC0832/ADC0834/ADC0838"
         depends on SPI
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
         help
           If you say yes here you get support for Texas Instruments ADC0831,
           ADC0832, ADC0834, ADC0838 ADC chips.
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index 7a40c04c311f..d36c4be8d1fc 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_AD7291) += ad7291.o
 obj-$(CONFIG_AD7298) += ad7298.o
 obj-$(CONFIG_AD7923) += ad7923.o
 obj-$(CONFIG_AD7476) += ad7476.o
+obj-$(CONFIG_AD7766) += ad7766.o
 obj-$(CONFIG_AD7791) += ad7791.o
 obj-$(CONFIG_AD7793) += ad7793.o
 obj-$(CONFIG_AD7887) += ad7887.o
@@ -20,6 +21,7 @@ obj-$(CONFIG_BCM_IPROC_ADC) += bcm_iproc_adc.o
 obj-$(CONFIG_BERLIN2_ADC) += berlin2-adc.o
 obj-$(CONFIG_CC10001_ADC) += cc10001_adc.o
 obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o
+obj-$(CONFIG_ENVELOPE_DETECTOR) += envelope-detector.o
 obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o
 obj-$(CONFIG_FSL_MX25_ADC) += fsl-imx25-gcq.o
 obj-$(CONFIG_HI8435) += hi8435.o
@@ -41,6 +43,8 @@ obj-$(CONFIG_QCOM_SPMI_IADC) += qcom-spmi-iadc.o
 obj-$(CONFIG_QCOM_SPMI_VADC) += qcom-spmi-vadc.o
 obj-$(CONFIG_ROCKCHIP_SARADC) += rockchip_saradc.o
 obj-$(CONFIG_STX104) += stx104.o
+obj-$(CONFIG_STM32_ADC_CORE) += stm32-adc-core.o
+obj-$(CONFIG_STM32_ADC) += stm32-adc.o
 obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o
 obj-$(CONFIG_TI_ADC0832) += ti-adc0832.o
 obj-$(CONFIG_TI_ADC12138) += ti-adc12138.o
diff --git a/drivers/iio/adc/ad7766.c b/drivers/iio/adc/ad7766.c
new file mode 100644
index 000000000000..75cca42b6e70
--- /dev/null
+++ b/drivers/iio/adc/ad7766.c
@@ -0,0 +1,330 @@
+/*
+ * AD7766/AD7767 SPI ADC driver
+ *
+ * Copyright 2016 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/regulator/consumer.h>
+#include <linux/slab.h>
+#include <linux/spi/spi.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/trigger.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
+
+struct ad7766_chip_info {
+        unsigned int decimation_factor;
+};
+
+enum {
+        AD7766_SUPPLY_AVDD = 0,
+        AD7766_SUPPLY_DVDD = 1,
+        AD7766_SUPPLY_VREF = 2,
+        AD7766_NUM_SUPPLIES = 3
+};
+
+struct ad7766 {
+        const struct ad7766_chip_info *chip_info;
+        struct spi_device *spi;
+        struct clk *mclk;
+        struct gpio_desc *pd_gpio;
+        struct regulator_bulk_data reg[AD7766_NUM_SUPPLIES];
+
+        struct iio_trigger *trig;
+
+        struct spi_transfer xfer;
+        struct spi_message msg;
+
+        /*
+         * DMA (thus cache coherency maintenance) requires the
+         * transfer buffers to live in their own cache lines.
+         * Make the buffer large enough for one 24 bit sample and one 64 bit
+         * aligned 64 bit timestamp.
+         */
+        unsigned char data[ALIGN(3, sizeof(s64)) + sizeof(s64)]
+                        ____cacheline_aligned;
+};
+
+/*
+ * AD7766 and AD7767 variations are interface compatible, the main difference is
+ * analog performance. Both parts will use the same ID.
+ */
+enum ad7766_device_ids {
+        ID_AD7766,
+        ID_AD7766_1,
+        ID_AD7766_2,
+};
+
+static irqreturn_t ad7766_trigger_handler(int irq, void *p)
+{
+        struct iio_poll_func *pf = p;
+        struct iio_dev *indio_dev = pf->indio_dev;
+        struct ad7766 *ad7766 = iio_priv(indio_dev);
+        int ret;
+
+        ret = spi_sync(ad7766->spi, &ad7766->msg);
+        if (ret < 0)
+                goto done;
+
+        iio_push_to_buffers_with_timestamp(indio_dev, ad7766->data,
+                pf->timestamp);
+done:
+        iio_trigger_notify_done(indio_dev->trig);
+
+        return IRQ_HANDLED;
+}
+
+static int ad7766_preenable(struct iio_dev *indio_dev)
+{
+        struct ad7766 *ad7766 = iio_priv(indio_dev);
+        int ret;
+
+        ret = regulator_bulk_enable(ARRAY_SIZE(ad7766->reg), ad7766->reg);
+        if (ret < 0) {
+                dev_err(&ad7766->spi->dev, "Failed to enable supplies: %d\n",
+                        ret);
+                return ret;
+        }
+
+        ret = clk_prepare_enable(ad7766->mclk);
+        if (ret < 0) {
+                dev_err(&ad7766->spi->dev, "Failed to enable MCLK: %d\n", ret);
+                regulator_bulk_disable(ARRAY_SIZE(ad7766->reg), ad7766->reg);
+                return ret;
+        }
+
+        if (ad7766->pd_gpio)
+                gpiod_set_value(ad7766->pd_gpio, 0);
+
+        return 0;
+}
+
+static int ad7766_postdisable(struct iio_dev *indio_dev)
+{
+        struct ad7766 *ad7766 = iio_priv(indio_dev);
+
+        if (ad7766->pd_gpio)
+                gpiod_set_value(ad7766->pd_gpio, 1);
+
+        /*
+         * The PD pin is synchronous to the clock, so give it some time to
+         * notice the change before we disable the clock.
+         */
+        msleep(20);
+
+        clk_disable_unprepare(ad7766->mclk);
+        regulator_bulk_disable(ARRAY_SIZE(ad7766->reg), ad7766->reg);
+
+        return 0;
+}
+
+static int ad7766_read_raw(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, int *val, int *val2, long info)
+{
+        struct ad7766 *ad7766 = iio_priv(indio_dev);
+        struct regulator *vref = ad7766->reg[AD7766_SUPPLY_VREF].consumer;
+        int scale_uv;
+
+        switch (info) {
+        case IIO_CHAN_INFO_SCALE:
+                scale_uv = regulator_get_voltage(vref);
+                if (scale_uv < 0)
+                        return scale_uv;
+                *val = scale_uv / 1000;
+                *val2 = chan->scan_type.realbits;
+                return IIO_VAL_FRACTIONAL_LOG2;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                *val = clk_get_rate(ad7766->mclk) /
+                        ad7766->chip_info->decimation_factor;
+                return IIO_VAL_INT;
+        }
+        return -EINVAL;
+}
+
+static const struct iio_chan_spec ad7766_channels[] = {
+        {
+                .type = IIO_VOLTAGE,
+                .indexed = 1,
+                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
+                .scan_type = {
+                        .sign = 's',
+                        .realbits = 24,
+                        .storagebits = 32,
+                        .endianness = IIO_BE,
+                },
+        },
+        IIO_CHAN_SOFT_TIMESTAMP(1),
+};
+
+static const struct ad7766_chip_info ad7766_chip_info[] = {
+        [ID_AD7766] = {
+                .decimation_factor = 8,
+        },
+        [ID_AD7766_1] = {
+                .decimation_factor = 16,
+        },
+        [ID_AD7766_2] = {
+                .decimation_factor = 32,
+        },
+};
+
+static const struct iio_buffer_setup_ops ad7766_buffer_setup_ops = {
+        .preenable = &ad7766_preenable,
+        .postenable = &iio_triggered_buffer_postenable,
+        .predisable = &iio_triggered_buffer_predisable,
+        .postdisable = &ad7766_postdisable,
+};
+
+static const struct iio_info ad7766_info = {
+        .driver_module = THIS_MODULE,
+        .read_raw = &ad7766_read_raw,
+};
+
+static irqreturn_t ad7766_irq(int irq, void *private)
+{
+        iio_trigger_poll(private);
+        return IRQ_HANDLED;
+}
+
+static int ad7766_set_trigger_state(struct iio_trigger *trig, bool enable)
+{
+        struct ad7766 *ad7766 = iio_trigger_get_drvdata(trig);
+
+        if (enable)
+                enable_irq(ad7766->spi->irq);
+        else
+                disable_irq(ad7766->spi->irq);
+
+        return 0;
+}
+
+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,
+};
+
+static int ad7766_probe(struct spi_device *spi)
+{
+        const struct spi_device_id *id = spi_get_device_id(spi);
+        struct iio_dev *indio_dev;
+        struct ad7766 *ad7766;
+        int ret;
+
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*ad7766));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        ad7766 = iio_priv(indio_dev);
+        ad7766->chip_info = &ad7766_chip_info[id->driver_data];
+
+        ad7766->mclk = devm_clk_get(&spi->dev, "mclk");
+        if (IS_ERR(ad7766->mclk))
+                return PTR_ERR(ad7766->mclk);
+
+        ad7766->reg[AD7766_SUPPLY_AVDD].supply = "avdd";
+        ad7766->reg[AD7766_SUPPLY_DVDD].supply = "dvdd";
+        ad7766->reg[AD7766_SUPPLY_VREF].supply = "vref";
+
+        ret = devm_regulator_bulk_get(&spi->dev, ARRAY_SIZE(ad7766->reg),
+                ad7766->reg);
+        if (ret)
+                return ret;
+
+        ad7766->pd_gpio = devm_gpiod_get_optional(&spi->dev, "powerdown",
+                GPIOD_OUT_HIGH);
+        if (IS_ERR(ad7766->pd_gpio))
+                return PTR_ERR(ad7766->pd_gpio);
+
+        indio_dev->dev.parent = &spi->dev;
+        indio_dev->name = spi_get_device_id(spi)->name;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->channels = ad7766_channels;
+        indio_dev->num_channels = ARRAY_SIZE(ad7766_channels);
+        indio_dev->info = &ad7766_info;
+
+        if (spi->irq > 0) {
+                ad7766->trig = devm_iio_trigger_alloc(&spi->dev, "%s-dev%d",
+                        indio_dev->name, indio_dev->id);
+                if (!ad7766->trig)
+                        return -ENOMEM;
+
+                ad7766->trig->ops = &ad7766_trigger_ops;
+                ad7766->trig->dev.parent = &spi->dev;
+                iio_trigger_set_drvdata(ad7766->trig, ad7766);
+
+                ret = devm_request_irq(&spi->dev, spi->irq, ad7766_irq,
+                        IRQF_TRIGGER_FALLING, dev_name(&spi->dev),
+                        ad7766->trig);
+                if (ret < 0)
+                        return ret;
+
+                /*
+                 * The device generates interrupts as long as it is powered up.
+                 * Some platforms might not allow the option to power it down so
+                 * disable the interrupt to avoid extra load on the system
+                 */
+                disable_irq(spi->irq);
+
+                ret = devm_iio_trigger_register(&spi->dev, ad7766->trig);
+                if (ret)
+                        return ret;
+        }
+
+        spi_set_drvdata(spi, indio_dev);
+
+        ad7766->spi = spi;
+
+        /* First byte always 0 */
+        ad7766->xfer.rx_buf = &ad7766->data[1];
+        ad7766->xfer.len = 3;
+
+        spi_message_init(&ad7766->msg);
+        spi_message_add_tail(&ad7766->xfer, &ad7766->msg);
+
+        ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev,
+                &iio_pollfunc_store_time, &ad7766_trigger_handler,
+                &ad7766_buffer_setup_ops);
+        if (ret)
+                return ret;
+
+        ret = devm_iio_device_register(&spi->dev, indio_dev);
+        if (ret)
+                return ret;
+        return 0;
+}
+
+static const struct spi_device_id ad7766_id[] = {
+        {"ad7766", ID_AD7766},
+        {"ad7766-1", ID_AD7766_1},
+        {"ad7766-2", ID_AD7766_2},
+        {"ad7767", ID_AD7766},
+        {"ad7767-1", ID_AD7766_1},
+        {"ad7767-2", ID_AD7766_2},
+        {}
+};
+MODULE_DEVICE_TABLE(spi, ad7766_id);
+
+static struct spi_driver ad7766_driver = {
+        .driver = {
+                .name   = "ad7766",
+        },
+        .probe          = ad7766_probe,
+        .id_table       = ad7766_id,
+};
+module_spi_driver(ad7766_driver);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("Analog Devices AD7766 and AD7767 ADCs driver support");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index bbdac07f4aaa..34b928cefeed 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -30,6 +30,7 @@
 #include <linux/iio/trigger.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
+#include <linux/pinctrl/consumer.h>
 
 /* Registers */
 #define AT91_ADC_CR             0x00            /* Control Register */
@@ -1347,6 +1348,32 @@ static int at91_adc_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int at91_adc_suspend(struct device *dev)
+{
+        struct iio_dev *idev = platform_get_drvdata(to_platform_device(dev));
+        struct at91_adc_state *st = iio_priv(idev);
+
+        pinctrl_pm_select_sleep_state(dev);
+        clk_disable_unprepare(st->clk);
+
+        return 0;
+}
+
+static int at91_adc_resume(struct device *dev)
+{
+        struct iio_dev *idev = platform_get_drvdata(to_platform_device(dev));
+        struct at91_adc_state *st = iio_priv(idev);
+
+        clk_prepare_enable(st->clk);
+        pinctrl_pm_select_default_state(dev);
+
+        return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(at91_adc_pm_ops, at91_adc_suspend, at91_adc_resume);
+
 static struct at91_adc_caps at91sam9260_caps = {
         .calc_startup_ticks = calc_startup_ticks_9260,
         .num_channels = 4,
@@ -1441,6 +1468,7 @@ static struct platform_driver at91_adc_driver = {
         .driver = {
                    .name = DRIVER_NAME,
                    .of_match_table = of_match_ptr(at91_adc_dt_ids),
+                   .pm = &at91_adc_pm_ops,
         },
 };
 
diff --git a/drivers/iio/adc/envelope-detector.c b/drivers/iio/adc/envelope-detector.c
new file mode 100644
index 000000000000..fef15c0d7c9c
--- /dev/null
+++ b/drivers/iio/adc/envelope-detector.c
@@ -0,0 +1,422 @@
+/*
+ * Driver for an envelope detector using a DAC and a comparator
+ *
+ * Copyright (C) 2016 Axentia Technologies AB
+ *
+ * Author: Peter Rosin <peda@axentia.se>
+ *
+ * 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.
+ */
+
+/*
+ * The DAC is used to find the peak level of an alternating voltage input
+ * signal by a binary search using the output of a comparator wired to
+ * an interrupt pin. Like so:
+ *                           _
+ *                          | \
+ *     input +------>-------|+ \
+ *                          |   \
+ *            .-------.     |    }---.
+ *            |       |     |   /    |
+ *            |    dac|-->--|- /     |
+ *            |       |     |_/      |
+ *            |       |              |
+ *            |       |              |
+ *            |    irq|------<-------'
+ *            |       |
+ *            '-------'
+ */
+
+#include <linux/completion.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/iio/consumer.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+
+struct envelope {
+        spinlock_t comp_lock; /* protects comp */
+        int comp;
+
+        struct mutex read_lock; /* protects everything else */
+
+        int comp_irq;
+        u32 comp_irq_trigger;
+        u32 comp_irq_trigger_inv;
+
+        struct iio_channel *dac;
+        struct delayed_work comp_timeout;
+
+        unsigned int comp_interval;
+        bool invert;
+        u32 dac_max;
+
+        int high;
+        int level;
+        int low;
+
+        struct completion done;
+};
+
+/*
+ * The envelope_detector_comp_latch function works together with the compare
+ * interrupt service routine below (envelope_detector_comp_isr) as a latch
+ * (one-bit memory) for if the interrupt has triggered since last calling
+ * this function.
+ * The ..._comp_isr function disables the interrupt so that the cpu does not
+ * need to service a possible interrupt flood from the comparator when no-one
+ * cares anyway, and this ..._comp_latch function reenables them again if
+ * needed.
+ */
+static int envelope_detector_comp_latch(struct envelope *env)
+{
+        int comp;
+
+        spin_lock_irq(&env->comp_lock);
+        comp = env->comp;
+        env->comp = 0;
+        spin_unlock_irq(&env->comp_lock);
+
+        if (!comp)
+                return 0;
+
+        /*
+         * The irq was disabled, and is reenabled just now.
+         * But there might have been a pending irq that
+         * happened while the irq was disabled that fires
+         * just as the irq is reenabled. That is not what
+         * is desired.
+         */
+        enable_irq(env->comp_irq);
+
+        /* So, synchronize this possibly pending irq... */
+        synchronize_irq(env->comp_irq);
+
+        /* ...and redo the whole dance. */
+        spin_lock_irq(&env->comp_lock);
+        comp = env->comp;
+        env->comp = 0;
+        spin_unlock_irq(&env->comp_lock);
+
+        if (comp)
+                enable_irq(env->comp_irq);
+
+        return 1;
+}
+
+static irqreturn_t envelope_detector_comp_isr(int irq, void *ctx)
+{
+        struct envelope *env = ctx;
+
+        spin_lock(&env->comp_lock);
+        env->comp = 1;
+        disable_irq_nosync(env->comp_irq);
+        spin_unlock(&env->comp_lock);
+
+        return IRQ_HANDLED;
+}
+
+static void envelope_detector_setup_compare(struct envelope *env)
+{
+        int ret;
+
+        /*
+         * Do a binary search for the peak input level, and stop
+         * when that level is "trapped" between two adjacent DAC
+         * values.
+         * When invert is active, use the midpoint floor so that
+         * env->level ends up as env->low when the termination
+         * criteria below is fulfilled, and use the midpoint
+         * ceiling when invert is not active so that env->level
+         * ends up as env->high in that case.
+         */
+        env->level = (env->high + env->low + !env->invert) / 2;
+
+        if (env->high == env->low + 1) {
+                complete(&env->done);
+                return;
+        }
+
+        /* Set a "safe" DAC level (if there is such a thing)... */
+        ret = iio_write_channel_raw(env->dac, env->invert ? 0 : env->dac_max);
+        if (ret < 0)
+                goto err;
+
+        /* ...clear the comparison result... */
+        envelope_detector_comp_latch(env);
+
+        /* ...set the real DAC level... */
+        ret = iio_write_channel_raw(env->dac, env->level);
+        if (ret < 0)
+                goto err;
+
+        /* ...and wait for a bit to see if the latch catches anything. */
+        schedule_delayed_work(&env->comp_timeout,
+                              msecs_to_jiffies(env->comp_interval));
+        return;
+
+err:
+        env->level = ret;
+        complete(&env->done);
+}
+
+static void envelope_detector_timeout(struct work_struct *work)
+{
+        struct envelope *env = container_of(work, struct envelope,
+                                            comp_timeout.work);
+
+        /* Adjust low/high depending on the latch content... */
+        if (!envelope_detector_comp_latch(env) ^ !env->invert)
+                env->low = env->level;
+        else
+                env->high = env->level;
+
+        /* ...and continue the search. */
+        envelope_detector_setup_compare(env);
+}
+
+static int envelope_detector_read_raw(struct iio_dev *indio_dev,
+                                      struct iio_chan_spec const *chan,
+                                      int *val, int *val2, long mask)
+{
+        struct envelope *env = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                /*
+                 * When invert is active, start with high=max+1 and low=0
+                 * since we will end up with the low value when the
+                 * termination criteria is fulfilled (rounding down). And
+                 * start with high=max and low=-1 when invert is not active
+                 * since we will end up with the high value in that case.
+                 * This ensures that the returned value in both cases are
+                 * in the same range as the DAC and is a value that has not
+                 * triggered the comparator.
+                 */
+                mutex_lock(&env->read_lock);
+                env->high = env->dac_max + env->invert;
+                env->low = -1 + env->invert;
+                envelope_detector_setup_compare(env);
+                wait_for_completion(&env->done);
+                if (env->level < 0) {
+                        ret = env->level;
+                        goto err_unlock;
+                }
+                *val = env->invert ? env->dac_max - env->level : env->level;
+                mutex_unlock(&env->read_lock);
+
+                return IIO_VAL_INT;
+
+        case IIO_CHAN_INFO_SCALE:
+                return iio_read_channel_scale(env->dac, val, val2);
+        }
+
+        return -EINVAL;
+
+err_unlock:
+        mutex_unlock(&env->read_lock);
+        return ret;
+}
+
+static ssize_t envelope_show_invert(struct iio_dev *indio_dev,
+                                    uintptr_t private,
+                                    struct iio_chan_spec const *ch, char *buf)
+{
+        struct envelope *env = iio_priv(indio_dev);
+
+        return sprintf(buf, "%u\n", env->invert);
+}
+
+static ssize_t envelope_store_invert(struct iio_dev *indio_dev,
+                                     uintptr_t private,
+                                     struct iio_chan_spec const *ch,
+                                     const char *buf, size_t len)
+{
+        struct envelope *env = iio_priv(indio_dev);
+        unsigned long invert;
+        int ret;
+        u32 trigger;
+
+        ret = kstrtoul(buf, 0, &invert);
+        if (ret < 0)
+                return ret;
+        if (invert > 1)
+                return -EINVAL;
+
+        trigger = invert ? env->comp_irq_trigger_inv : env->comp_irq_trigger;
+
+        mutex_lock(&env->read_lock);
+        if (invert != env->invert)
+                ret = irq_set_irq_type(env->comp_irq, trigger);
+        if (!ret) {
+                env->invert = invert;
+                ret = len;
+        }
+        mutex_unlock(&env->read_lock);
+
+        return ret;
+}
+
+static ssize_t envelope_show_comp_interval(struct iio_dev *indio_dev,
+                                           uintptr_t private,
+                                           struct iio_chan_spec const *ch,
+                                           char *buf)
+{
+        struct envelope *env = iio_priv(indio_dev);
+
+        return sprintf(buf, "%u\n", env->comp_interval);
+}
+
+static ssize_t envelope_store_comp_interval(struct iio_dev *indio_dev,
+                                            uintptr_t private,
+                                            struct iio_chan_spec const *ch,
+                                            const char *buf, size_t len)
+{
+        struct envelope *env = iio_priv(indio_dev);
+        unsigned long interval;
+        int ret;
+
+        ret = kstrtoul(buf, 0, &interval);
+        if (ret < 0)
+                return ret;
+        if (interval > 1000)
+                return -EINVAL;
+
+        mutex_lock(&env->read_lock);
+        env->comp_interval = interval;
+        mutex_unlock(&env->read_lock);
+
+        return len;
+}
+
+static const struct iio_chan_spec_ext_info envelope_detector_ext_info[] = {
+        { .name = "invert",
+          .read = envelope_show_invert,
+          .write = envelope_store_invert, },
+        { .name = "compare_interval",
+          .read = envelope_show_comp_interval,
+          .write = envelope_store_comp_interval, },
+        { /* sentinel */ }
+};
+
+static const struct iio_chan_spec envelope_detector_iio_channel = {
+        .type = IIO_ALTVOLTAGE,
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW)
+                            | BIT(IIO_CHAN_INFO_SCALE),
+        .ext_info = envelope_detector_ext_info,
+        .indexed = 1,
+};
+
+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)
+{
+        struct device *dev = &pdev->dev;
+        struct iio_dev *indio_dev;
+        struct envelope *env;
+        enum iio_chan_type type;
+        int ret;
+
+        indio_dev = devm_iio_device_alloc(dev, sizeof(*env));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, indio_dev);
+        env = iio_priv(indio_dev);
+        env->comp_interval = 50; /* some sensible default? */
+
+        spin_lock_init(&env->comp_lock);
+        mutex_init(&env->read_lock);
+        init_completion(&env->done);
+        INIT_DELAYED_WORK(&env->comp_timeout, envelope_detector_timeout);
+
+        indio_dev->name = dev_name(dev);
+        indio_dev->dev.parent = dev;
+        indio_dev->dev.of_node = dev->of_node;
+        indio_dev->info = &envelope_detector_info;
+        indio_dev->channels = &envelope_detector_iio_channel;
+        indio_dev->num_channels = 1;
+
+        env->dac = devm_iio_channel_get(dev, "dac");
+        if (IS_ERR(env->dac)) {
+                if (PTR_ERR(env->dac) != -EPROBE_DEFER)
+                        dev_err(dev, "failed to get dac input channel\n");
+                return PTR_ERR(env->dac);
+        }
+
+        env->comp_irq = platform_get_irq_byname(pdev, "comp");
+        if (env->comp_irq < 0) {
+                if (env->comp_irq != -EPROBE_DEFER)
+                        dev_err(dev, "failed to get compare interrupt\n");
+                return env->comp_irq;
+        }
+
+        ret = devm_request_irq(dev, env->comp_irq, envelope_detector_comp_isr,
+                               0, "envelope-detector", env);
+        if (ret) {
+                if (ret != -EPROBE_DEFER)
+                        dev_err(dev, "failed to request interrupt\n");
+                return ret;
+        }
+        env->comp_irq_trigger = irq_get_trigger_type(env->comp_irq);
+        if (env->comp_irq_trigger & IRQF_TRIGGER_RISING)
+                env->comp_irq_trigger_inv |= IRQF_TRIGGER_FALLING;
+        if (env->comp_irq_trigger & IRQF_TRIGGER_FALLING)
+                env->comp_irq_trigger_inv |= IRQF_TRIGGER_RISING;
+        if (env->comp_irq_trigger & IRQF_TRIGGER_HIGH)
+                env->comp_irq_trigger_inv |= IRQF_TRIGGER_LOW;
+        if (env->comp_irq_trigger & IRQF_TRIGGER_LOW)
+                env->comp_irq_trigger_inv |= IRQF_TRIGGER_HIGH;
+
+        ret = iio_get_channel_type(env->dac, &type);
+        if (ret < 0)
+                return ret;
+
+        if (type != IIO_VOLTAGE) {
+                dev_err(dev, "dac is of the wrong type\n");
+                return -EINVAL;
+        }
+
+        ret = iio_read_max_channel_raw(env->dac, &env->dac_max);
+        if (ret < 0) {
+                dev_err(dev, "dac does not indicate its raw maximum value\n");
+                return ret;
+        }
+
+        return devm_iio_device_register(dev, indio_dev);
+}
+
+static const struct of_device_id envelope_detector_match[] = {
+        { .compatible = "axentia,tse850-envelope-detector", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, envelope_detector_match);
+
+static struct platform_driver envelope_detector_driver = {
+        .probe = envelope_detector_probe,
+        .driver = {
+                .name = "iio-envelope-detector",
+                .of_match_table = envelope_detector_match,
+        },
+};
+module_platform_driver(envelope_detector_driver);
+
+MODULE_DESCRIPTION("Envelope detector using a DAC and a comparator");
+MODULE_AUTHOR("Peter Rosin <peda@axentia.se>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c
index 712fbd2b1f16..3b7c4f78f37a 100644
--- a/drivers/iio/adc/max1027.c
+++ b/drivers/iio/adc/max1027.c
@@ -238,7 +238,9 @@ static int max1027_read_single_value(struct iio_dev *indio_dev,
 
         /* Configure conversion register with the requested chan */
         st->reg = MAX1027_CONV_REG | MAX1027_CHAN(chan->channel) |
-                  MAX1027_NOSCAN | !!(chan->type == IIO_TEMP);
+                  MAX1027_NOSCAN;
+        if (chan->type == IIO_TEMP)
+                st->reg |= MAX1027_TEMP;
         ret = spi_write(st->spi, &st->reg, 1);
         if (ret < 0) {
                 dev_err(&indio_dev->dev,
@@ -360,17 +362,6 @@ static int max1027_set_trigger_state(struct iio_trigger *trig, bool state)
         return 0;
 }
 
-static int max1027_validate_device(struct iio_trigger *trig,
-                                   struct iio_dev *indio_dev)
-{
-        struct iio_dev *indio = iio_trigger_get_drvdata(trig);
-
-        if (indio != indio_dev)
-                return -EINVAL;
-
-        return 0;
-}
-
 static irqreturn_t max1027_trigger_handler(int irq, void *private)
 {
         struct iio_poll_func *pf = (struct iio_poll_func *)private;
@@ -391,7 +382,7 @@ static irqreturn_t max1027_trigger_handler(int irq, void *private)
 
 static const struct iio_trigger_ops max1027_trigger_ops = {
         .owner = THIS_MODULE,
-        .validate_device = &max1027_validate_device,
+        .validate_device = &iio_trigger_validate_own_device,
         .set_trigger_state = &max1027_set_trigger_state,
 };
 
diff --git a/drivers/iio/adc/stm32-adc-core.c b/drivers/iio/adc/stm32-adc-core.c
new file mode 100644
index 000000000000..4214b0cd6b1b
--- /dev/null
+++ b/drivers/iio/adc/stm32-adc-core.c
@@ -0,0 +1,303 @@
+/*
+ * This file is part of STM32 ADC driver
+ *
+ * Copyright (C) 2016, STMicroelectronics - All Rights Reserved
+ * Author: Fabrice Gasnier <fabrice.gasnier@st.com>.
+ *
+ * Inspired from: fsl-imx25-tsadc
+ *
+ * License type: GPLv2
+ *
+ * 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/>.
+ */
+
+#include <linux/clk.h>
+#include <linux/interrupt.h>
+#include <linux/irqchip/chained_irq.h>
+#include <linux/irqdesc.h>
+#include <linux/irqdomain.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/regulator/consumer.h>
+#include <linux/slab.h>
+
+#include "stm32-adc-core.h"
+
+/* STM32F4 - common registers for all ADC instances: 1, 2 & 3 */
+#define STM32F4_ADC_CSR                 (STM32_ADCX_COMN_OFFSET + 0x00)
+#define STM32F4_ADC_CCR                 (STM32_ADCX_COMN_OFFSET + 0x04)
+
+/* STM32F4_ADC_CSR - bit fields */
+#define STM32F4_EOC3                    BIT(17)
+#define STM32F4_EOC2                    BIT(9)
+#define STM32F4_EOC1                    BIT(1)
+
+/* STM32F4_ADC_CCR - bit fields */
+#define STM32F4_ADC_ADCPRE_SHIFT        16
+#define STM32F4_ADC_ADCPRE_MASK         GENMASK(17, 16)
+
+/* STM32 F4 maximum analog clock rate (from datasheet) */
+#define STM32F4_ADC_MAX_CLK_RATE        36000000
+
+/**
+ * struct stm32_adc_priv - stm32 ADC core private data
+ * @irq:                irq for ADC block
+ * @domain:             irq domain reference
+ * @aclk:               clock reference for the analog circuitry
+ * @vref:               regulator reference
+ * @common:             common data for all ADC instances
+ */
+struct stm32_adc_priv {
+        int                             irq;
+        struct irq_domain               *domain;
+        struct clk                      *aclk;
+        struct regulator                *vref;
+        struct stm32_adc_common         common;
+};
+
+static struct stm32_adc_priv *to_stm32_adc_priv(struct stm32_adc_common *com)
+{
+        return container_of(com, struct stm32_adc_priv, common);
+}
+
+/* STM32F4 ADC internal common clock prescaler division ratios */
+static int stm32f4_pclk_div[] = {2, 4, 6, 8};
+
+/**
+ * stm32f4_adc_clk_sel() - Select stm32f4 ADC common clock prescaler
+ * @priv: stm32 ADC core private data
+ * Select clock prescaler used for analog conversions, before using ADC.
+ */
+static int stm32f4_adc_clk_sel(struct platform_device *pdev,
+                               struct stm32_adc_priv *priv)
+{
+        unsigned long rate;
+        u32 val;
+        int i;
+
+        rate = clk_get_rate(priv->aclk);
+        for (i = 0; i < ARRAY_SIZE(stm32f4_pclk_div); i++) {
+                if ((rate / stm32f4_pclk_div[i]) <= STM32F4_ADC_MAX_CLK_RATE)
+                        break;
+        }
+        if (i >= ARRAY_SIZE(stm32f4_pclk_div))
+                return -EINVAL;
+
+        val = readl_relaxed(priv->common.base + STM32F4_ADC_CCR);
+        val &= ~STM32F4_ADC_ADCPRE_MASK;
+        val |= i << STM32F4_ADC_ADCPRE_SHIFT;
+        writel_relaxed(val, priv->common.base + STM32F4_ADC_CCR);
+
+        dev_dbg(&pdev->dev, "Using analog clock source at %ld kHz\n",
+                rate / (stm32f4_pclk_div[i] * 1000));
+
+        return 0;
+}
+
+/* ADC common interrupt for all instances */
+static void stm32_adc_irq_handler(struct irq_desc *desc)
+{
+        struct stm32_adc_priv *priv = irq_desc_get_handler_data(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        u32 status;
+
+        chained_irq_enter(chip, desc);
+        status = readl_relaxed(priv->common.base + STM32F4_ADC_CSR);
+
+        if (status & STM32F4_EOC1)
+                generic_handle_irq(irq_find_mapping(priv->domain, 0));
+
+        if (status & STM32F4_EOC2)
+                generic_handle_irq(irq_find_mapping(priv->domain, 1));
+
+        if (status & STM32F4_EOC3)
+                generic_handle_irq(irq_find_mapping(priv->domain, 2));
+
+        chained_irq_exit(chip, desc);
+};
+
+static int stm32_adc_domain_map(struct irq_domain *d, unsigned int irq,
+                                irq_hw_number_t hwirq)
+{
+        irq_set_chip_data(irq, d->host_data);
+        irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_level_irq);
+
+        return 0;
+}
+
+static void stm32_adc_domain_unmap(struct irq_domain *d, unsigned int irq)
+{
+        irq_set_chip_and_handler(irq, NULL, NULL);
+        irq_set_chip_data(irq, NULL);
+}
+
+static const struct irq_domain_ops stm32_adc_domain_ops = {
+        .map = stm32_adc_domain_map,
+        .unmap  = stm32_adc_domain_unmap,
+        .xlate = irq_domain_xlate_onecell,
+};
+
+static int stm32_adc_irq_probe(struct platform_device *pdev,
+                               struct stm32_adc_priv *priv)
+{
+        struct device_node *np = pdev->dev.of_node;
+
+        priv->irq = platform_get_irq(pdev, 0);
+        if (priv->irq < 0) {
+                dev_err(&pdev->dev, "failed to get irq\n");
+                return priv->irq;
+        }
+
+        priv->domain = irq_domain_add_simple(np, STM32_ADC_MAX_ADCS, 0,
+                                             &stm32_adc_domain_ops,
+                                             priv);
+        if (!priv->domain) {
+                dev_err(&pdev->dev, "Failed to add irq domain\n");
+                return -ENOMEM;
+        }
+
+        irq_set_chained_handler(priv->irq, stm32_adc_irq_handler);
+        irq_set_handler_data(priv->irq, priv);
+
+        return 0;
+}
+
+static void stm32_adc_irq_remove(struct platform_device *pdev,
+                                 struct stm32_adc_priv *priv)
+{
+        int hwirq;
+
+        for (hwirq = 0; hwirq < STM32_ADC_MAX_ADCS; hwirq++)
+                irq_dispose_mapping(irq_find_mapping(priv->domain, hwirq));
+        irq_domain_remove(priv->domain);
+        irq_set_chained_handler(priv->irq, NULL);
+}
+
+static int stm32_adc_probe(struct platform_device *pdev)
+{
+        struct stm32_adc_priv *priv;
+        struct device_node *np = pdev->dev.of_node;
+        struct resource *res;
+        int ret;
+
+        if (!pdev->dev.of_node)
+                return -ENODEV;
+
+        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        priv->common.base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(priv->common.base))
+                return PTR_ERR(priv->common.base);
+
+        priv->vref = devm_regulator_get(&pdev->dev, "vref");
+        if (IS_ERR(priv->vref)) {
+                ret = PTR_ERR(priv->vref);
+                dev_err(&pdev->dev, "vref get failed, %d\n", ret);
+                return ret;
+        }
+
+        ret = regulator_enable(priv->vref);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "vref enable failed\n");
+                return ret;
+        }
+
+        ret = regulator_get_voltage(priv->vref);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "vref get voltage failed, %d\n", ret);
+                goto err_regulator_disable;
+        }
+        priv->common.vref_mv = ret / 1000;
+        dev_dbg(&pdev->dev, "vref+=%dmV\n", priv->common.vref_mv);
+
+        priv->aclk = devm_clk_get(&pdev->dev, "adc");
+        if (IS_ERR(priv->aclk)) {
+                ret = PTR_ERR(priv->aclk);
+                dev_err(&pdev->dev, "Can't get 'adc' clock\n");
+                goto err_regulator_disable;
+        }
+
+        ret = clk_prepare_enable(priv->aclk);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "adc clk enable failed\n");
+                goto err_regulator_disable;
+        }
+
+        ret = stm32f4_adc_clk_sel(pdev, priv);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "adc clk selection failed\n");
+                goto err_clk_disable;
+        }
+
+        ret = stm32_adc_irq_probe(pdev, priv);
+        if (ret < 0)
+                goto err_clk_disable;
+
+        platform_set_drvdata(pdev, &priv->common);
+
+        ret = of_platform_populate(np, NULL, NULL, &pdev->dev);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to populate DT children\n");
+                goto err_irq_remove;
+        }
+
+        return 0;
+
+err_irq_remove:
+        stm32_adc_irq_remove(pdev, priv);
+
+err_clk_disable:
+        clk_disable_unprepare(priv->aclk);
+
+err_regulator_disable:
+        regulator_disable(priv->vref);
+
+        return ret;
+}
+
+static int stm32_adc_remove(struct platform_device *pdev)
+{
+        struct stm32_adc_common *common = platform_get_drvdata(pdev);
+        struct stm32_adc_priv *priv = to_stm32_adc_priv(common);
+
+        of_platform_depopulate(&pdev->dev);
+        stm32_adc_irq_remove(pdev, priv);
+        clk_disable_unprepare(priv->aclk);
+        regulator_disable(priv->vref);
+
+        return 0;
+}
+
+static const struct of_device_id stm32_adc_of_match[] = {
+        { .compatible = "st,stm32f4-adc-core" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, stm32_adc_of_match);
+
+static struct platform_driver stm32_adc_driver = {
+        .probe = stm32_adc_probe,
+        .remove = stm32_adc_remove,
+        .driver = {
+                .name = "stm32-adc-core",
+                .of_match_table = stm32_adc_of_match,
+        },
+};
+module_platform_driver(stm32_adc_driver);
+
+MODULE_AUTHOR("Fabrice Gasnier <fabrice.gasnier@st.com>");
+MODULE_DESCRIPTION("STMicroelectronics STM32 ADC core driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:stm32-adc-core");
diff --git a/drivers/iio/adc/stm32-adc-core.h b/drivers/iio/adc/stm32-adc-core.h
new file mode 100644
index 000000000000..081fa5f55015
--- /dev/null
+++ b/drivers/iio/adc/stm32-adc-core.h
@@ -0,0 +1,52 @@
+/*
+ * This file is part of STM32 ADC driver
+ *
+ * Copyright (C) 2016, STMicroelectronics - All Rights Reserved
+ * Author: Fabrice Gasnier <fabrice.gasnier@st.com>.
+ *
+ * License type: GPLv2
+ *
+ * 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 __STM32_ADC_H
+#define __STM32_ADC_H
+
+/*
+ * STM32 - ADC global register map
+ * ________________________________________________________
+ * | Offset |                 Register                    |
+ * --------------------------------------------------------
+ * | 0x000  |                Master ADC1                  |
+ * --------------------------------------------------------
+ * | 0x100  |                Slave ADC2                   |
+ * --------------------------------------------------------
+ * | 0x200  |                Slave ADC3                   |
+ * --------------------------------------------------------
+ * | 0x300  |         Master & Slave common regs          |
+ * --------------------------------------------------------
+ */
+#define STM32_ADC_MAX_ADCS              3
+#define STM32_ADCX_COMN_OFFSET          0x300
+
+/**
+ * struct stm32_adc_common - stm32 ADC driver common data (for all instances)
+ * @base:               control registers base cpu addr
+ * @vref_mv:            vref voltage (mv)
+ */
+struct stm32_adc_common {
+        void __iomem                    *base;
+        int                             vref_mv;
+};
+
+#endif
diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
new file mode 100644
index 000000000000..5715e79f4935
--- /dev/null
+++ b/drivers/iio/adc/stm32-adc.c
@@ -0,0 +1,518 @@
+/*
+ * This file is part of STM32 ADC driver
+ *
+ * Copyright (C) 2016, STMicroelectronics - All Rights Reserved
+ * Author: Fabrice Gasnier <fabrice.gasnier@st.com>.
+ *
+ * License type: GPLv2
+ *
+ * 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/>.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/iio/iio.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+
+#include "stm32-adc-core.h"
+
+/* STM32F4 - Registers for each ADC instance */
+#define STM32F4_ADC_SR                  0x00
+#define STM32F4_ADC_CR1                 0x04
+#define STM32F4_ADC_CR2                 0x08
+#define STM32F4_ADC_SMPR1               0x0C
+#define STM32F4_ADC_SMPR2               0x10
+#define STM32F4_ADC_HTR                 0x24
+#define STM32F4_ADC_LTR                 0x28
+#define STM32F4_ADC_SQR1                0x2C
+#define STM32F4_ADC_SQR2                0x30
+#define STM32F4_ADC_SQR3                0x34
+#define STM32F4_ADC_JSQR                0x38
+#define STM32F4_ADC_JDR1                0x3C
+#define STM32F4_ADC_JDR2                0x40
+#define STM32F4_ADC_JDR3                0x44
+#define STM32F4_ADC_JDR4                0x48
+#define STM32F4_ADC_DR                  0x4C
+
+/* STM32F4_ADC_SR - bit fields */
+#define STM32F4_STRT                    BIT(4)
+#define STM32F4_EOC                     BIT(1)
+
+/* STM32F4_ADC_CR1 - bit fields */
+#define STM32F4_SCAN                    BIT(8)
+#define STM32F4_EOCIE                   BIT(5)
+
+/* STM32F4_ADC_CR2 - bit fields */
+#define STM32F4_SWSTART                 BIT(30)
+#define STM32F4_EXTEN_MASK              GENMASK(29, 28)
+#define STM32F4_EOCS                    BIT(10)
+#define STM32F4_ADON                    BIT(0)
+
+/* STM32F4_ADC_SQR1 - bit fields */
+#define STM32F4_L_SHIFT                 20
+#define STM32F4_L_MASK                  GENMASK(23, 20)
+
+/* STM32F4_ADC_SQR3 - bit fields */
+#define STM32F4_SQ1_SHIFT               0
+#define STM32F4_SQ1_MASK                GENMASK(4, 0)
+
+#define STM32_ADC_TIMEOUT_US            100000
+#define STM32_ADC_TIMEOUT       (msecs_to_jiffies(STM32_ADC_TIMEOUT_US / 1000))
+
+/**
+ * struct stm32_adc - private data of each ADC IIO instance
+ * @common:             reference to ADC block common data
+ * @offset:             ADC instance register offset in ADC block
+ * @completion:         end of single conversion completion
+ * @buffer:             data buffer
+ * @clk:                clock for this adc instance
+ * @irq:                interrupt for this adc instance
+ * @lock:               spinlock
+ */
+struct stm32_adc {
+        struct stm32_adc_common *common;
+        u32                     offset;
+        struct completion       completion;
+        u16                     *buffer;
+        struct clk              *clk;
+        int                     irq;
+        spinlock_t              lock;           /* interrupt lock */
+};
+
+/**
+ * struct stm32_adc_chan_spec - specification of stm32 adc channel
+ * @type:       IIO channel type
+ * @channel:    channel number (single ended)
+ * @name:       channel name (single ended)
+ */
+struct stm32_adc_chan_spec {
+        enum iio_chan_type      type;
+        int                     channel;
+        const char              *name;
+};
+
+/* Input definitions common for all STM32F4 instances */
+static const struct stm32_adc_chan_spec stm32f4_adc123_channels[] = {
+        { IIO_VOLTAGE, 0, "in0" },
+        { IIO_VOLTAGE, 1, "in1" },
+        { IIO_VOLTAGE, 2, "in2" },
+        { IIO_VOLTAGE, 3, "in3" },
+        { IIO_VOLTAGE, 4, "in4" },
+        { IIO_VOLTAGE, 5, "in5" },
+        { IIO_VOLTAGE, 6, "in6" },
+        { IIO_VOLTAGE, 7, "in7" },
+        { IIO_VOLTAGE, 8, "in8" },
+        { IIO_VOLTAGE, 9, "in9" },
+        { IIO_VOLTAGE, 10, "in10" },
+        { IIO_VOLTAGE, 11, "in11" },
+        { IIO_VOLTAGE, 12, "in12" },
+        { IIO_VOLTAGE, 13, "in13" },
+        { IIO_VOLTAGE, 14, "in14" },
+        { IIO_VOLTAGE, 15, "in15" },
+};
+
+/**
+ * STM32 ADC registers access routines
+ * @adc: stm32 adc instance
+ * @reg: reg offset in adc instance
+ *
+ * Note: All instances share same base, with 0x0, 0x100 or 0x200 offset resp.
+ * for adc1, adc2 and adc3.
+ */
+static u32 stm32_adc_readl(struct stm32_adc *adc, u32 reg)
+{
+        return readl_relaxed(adc->common->base + adc->offset + reg);
+}
+
+static u16 stm32_adc_readw(struct stm32_adc *adc, u32 reg)
+{
+        return readw_relaxed(adc->common->base + adc->offset + reg);
+}
+
+static void stm32_adc_writel(struct stm32_adc *adc, u32 reg, u32 val)
+{
+        writel_relaxed(val, adc->common->base + adc->offset + reg);
+}
+
+static void stm32_adc_set_bits(struct stm32_adc *adc, u32 reg, u32 bits)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&adc->lock, flags);
+        stm32_adc_writel(adc, reg, stm32_adc_readl(adc, reg) | bits);
+        spin_unlock_irqrestore(&adc->lock, flags);
+}
+
+static void stm32_adc_clr_bits(struct stm32_adc *adc, u32 reg, u32 bits)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&adc->lock, flags);
+        stm32_adc_writel(adc, reg, stm32_adc_readl(adc, reg) & ~bits);
+        spin_unlock_irqrestore(&adc->lock, flags);
+}
+
+/**
+ * stm32_adc_conv_irq_enable() - Enable end of conversion interrupt
+ * @adc: stm32 adc instance
+ */
+static void stm32_adc_conv_irq_enable(struct stm32_adc *adc)
+{
+        stm32_adc_set_bits(adc, STM32F4_ADC_CR1, STM32F4_EOCIE);
+};
+
+/**
+ * stm32_adc_conv_irq_disable() - Disable end of conversion interrupt
+ * @adc: stm32 adc instance
+ */
+static void stm32_adc_conv_irq_disable(struct stm32_adc *adc)
+{
+        stm32_adc_clr_bits(adc, STM32F4_ADC_CR1, STM32F4_EOCIE);
+}
+
+/**
+ * stm32_adc_start_conv() - Start conversions for regular channels.
+ * @adc: stm32 adc instance
+ */
+static void stm32_adc_start_conv(struct stm32_adc *adc)
+{
+        stm32_adc_set_bits(adc, STM32F4_ADC_CR1, STM32F4_SCAN);
+        stm32_adc_set_bits(adc, STM32F4_ADC_CR2, STM32F4_EOCS | STM32F4_ADON);
+
+        /* Wait for Power-up time (tSTAB from datasheet) */
+        usleep_range(2, 3);
+
+        /* Software start ? (e.g. trigger detection disabled ?) */
+        if (!(stm32_adc_readl(adc, STM32F4_ADC_CR2) & STM32F4_EXTEN_MASK))
+                stm32_adc_set_bits(adc, STM32F4_ADC_CR2, STM32F4_SWSTART);
+}
+
+static void stm32_adc_stop_conv(struct stm32_adc *adc)
+{
+        stm32_adc_clr_bits(adc, STM32F4_ADC_CR2, STM32F4_EXTEN_MASK);
+        stm32_adc_clr_bits(adc, STM32F4_ADC_SR, STM32F4_STRT);
+
+        stm32_adc_clr_bits(adc, STM32F4_ADC_CR1, STM32F4_SCAN);
+        stm32_adc_clr_bits(adc, STM32F4_ADC_CR2, STM32F4_ADON);
+}
+
+/**
+ * stm32_adc_single_conv() - Performs a single conversion
+ * @indio_dev: IIO device
+ * @chan: IIO channel
+ * @res: conversion result
+ *
+ * The function performs a single conversion on a given channel:
+ * - Program sequencer with one channel (e.g. in SQ1 with len = 1)
+ * - Use SW trigger
+ * - Start conversion, then wait for interrupt completion.
+ */
+static int stm32_adc_single_conv(struct iio_dev *indio_dev,
+                                 const struct iio_chan_spec *chan,
+                                 int *res)
+{
+        struct stm32_adc *adc = iio_priv(indio_dev);
+        long timeout;
+        u32 val;
+        u16 result;
+        int ret;
+
+        reinit_completion(&adc->completion);
+
+        adc->buffer = &result;
+
+        /* Program chan number in regular sequence */
+        val = stm32_adc_readl(adc, STM32F4_ADC_SQR3);
+        val &= ~STM32F4_SQ1_MASK;
+        val |= chan->channel << STM32F4_SQ1_SHIFT;
+        stm32_adc_writel(adc, STM32F4_ADC_SQR3, val);
+
+        /* Set regular sequence len (0 for 1 conversion) */
+        stm32_adc_clr_bits(adc, STM32F4_ADC_SQR1, STM32F4_L_MASK);
+
+        /* Trigger detection disabled (conversion can be launched in SW) */
+        stm32_adc_clr_bits(adc, STM32F4_ADC_CR2, STM32F4_EXTEN_MASK);
+
+        stm32_adc_conv_irq_enable(adc);
+
+        stm32_adc_start_conv(adc);
+
+        timeout = wait_for_completion_interruptible_timeout(
+                                        &adc->completion, STM32_ADC_TIMEOUT);
+        if (timeout == 0) {
+                ret = -ETIMEDOUT;
+        } else if (timeout < 0) {
+                ret = timeout;
+        } else {
+                *res = result;
+                ret = IIO_VAL_INT;
+        }
+
+        stm32_adc_stop_conv(adc);
+
+        stm32_adc_conv_irq_disable(adc);
+
+        return ret;
+}
+
+static int stm32_adc_read_raw(struct iio_dev *indio_dev,
+                              struct iio_chan_spec const *chan,
+                              int *val, int *val2, long mask)
+{
+        struct stm32_adc *adc = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                ret = iio_device_claim_direct_mode(indio_dev);
+                if (ret)
+                        return ret;
+                if (chan->type == IIO_VOLTAGE)
+                        ret = stm32_adc_single_conv(indio_dev, chan, val);
+                else
+                        ret = -EINVAL;
+                iio_device_release_direct_mode(indio_dev);
+                return ret;
+
+        case IIO_CHAN_INFO_SCALE:
+                *val = adc->common->vref_mv;
+                *val2 = chan->scan_type.realbits;
+                return IIO_VAL_FRACTIONAL_LOG2;
+
+        default:
+                return -EINVAL;
+        }
+}
+
+static irqreturn_t stm32_adc_isr(int irq, void *data)
+{
+        struct stm32_adc *adc = data;
+        u32 status = stm32_adc_readl(adc, STM32F4_ADC_SR);
+
+        if (status & STM32F4_EOC) {
+                *adc->buffer = stm32_adc_readw(adc, STM32F4_ADC_DR);
+                complete(&adc->completion);
+                return IRQ_HANDLED;
+        }
+
+        return IRQ_NONE;
+}
+
+static int stm32_adc_of_xlate(struct iio_dev *indio_dev,
+                              const struct of_phandle_args *iiospec)
+{
+        int i;
+
+        for (i = 0; i < indio_dev->num_channels; i++)
+                if (indio_dev->channels[i].channel == iiospec->args[0])
+                        return i;
+
+        return -EINVAL;
+}
+
+/**
+ * stm32_adc_debugfs_reg_access - read or write register value
+ *
+ * To read a value from an ADC register:
+ *   echo [ADC reg offset] > direct_reg_access
+ *   cat direct_reg_access
+ *
+ * To write a value in a ADC register:
+ *   echo [ADC_reg_offset] [value] > direct_reg_access
+ */
+static int stm32_adc_debugfs_reg_access(struct iio_dev *indio_dev,
+                                        unsigned reg, unsigned writeval,
+                                        unsigned *readval)
+{
+        struct stm32_adc *adc = iio_priv(indio_dev);
+
+        if (!readval)
+                stm32_adc_writel(adc, reg, writeval);
+        else
+                *readval = stm32_adc_readl(adc, reg);
+
+        return 0;
+}
+
+static const struct iio_info stm32_adc_iio_info = {
+        .read_raw = stm32_adc_read_raw,
+        .debugfs_reg_access = stm32_adc_debugfs_reg_access,
+        .of_xlate = stm32_adc_of_xlate,
+        .driver_module = THIS_MODULE,
+};
+
+static void stm32_adc_chan_init_one(struct iio_dev *indio_dev,
+                                    struct iio_chan_spec *chan,
+                                    const struct stm32_adc_chan_spec *channel,
+                                    int scan_index)
+{
+        chan->type = channel->type;
+        chan->channel = channel->channel;
+        chan->datasheet_name = channel->name;
+        chan->scan_index = scan_index;
+        chan->indexed = 1;
+        chan->info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
+        chan->info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE);
+        chan->scan_type.sign = 'u';
+        chan->scan_type.realbits = 12;
+        chan->scan_type.storagebits = 16;
+}
+
+static int stm32_adc_chan_of_init(struct iio_dev *indio_dev)
+{
+        struct device_node *node = indio_dev->dev.of_node;
+        struct property *prop;
+        const __be32 *cur;
+        struct iio_chan_spec *channels;
+        int scan_index = 0, num_channels;
+        u32 val;
+
+        num_channels = of_property_count_u32_elems(node, "st,adc-channels");
+        if (num_channels < 0 ||
+            num_channels >= ARRAY_SIZE(stm32f4_adc123_channels)) {
+                dev_err(&indio_dev->dev, "Bad st,adc-channels?\n");
+                return num_channels < 0 ? num_channels : -EINVAL;
+        }
+
+        channels = devm_kcalloc(&indio_dev->dev, num_channels,
+                                sizeof(struct iio_chan_spec), GFP_KERNEL);
+        if (!channels)
+                return -ENOMEM;
+
+        of_property_for_each_u32(node, "st,adc-channels", prop, cur, val) {
+                if (val >= ARRAY_SIZE(stm32f4_adc123_channels)) {
+                        dev_err(&indio_dev->dev, "Invalid channel %d\n", val);
+                        return -EINVAL;
+                }
+                stm32_adc_chan_init_one(indio_dev, &channels[scan_index],
+                                        &stm32f4_adc123_channels[val],
+                                        scan_index);
+                scan_index++;
+        }
+
+        indio_dev->num_channels = scan_index;
+        indio_dev->channels = channels;
+
+        return 0;
+}
+
+static int stm32_adc_probe(struct platform_device *pdev)
+{
+        struct iio_dev *indio_dev;
+        struct stm32_adc *adc;
+        int ret;
+
+        if (!pdev->dev.of_node)
+                return -ENODEV;
+
+        indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*adc));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        adc = iio_priv(indio_dev);
+        adc->common = dev_get_drvdata(pdev->dev.parent);
+        spin_lock_init(&adc->lock);
+        init_completion(&adc->completion);
+
+        indio_dev->name = dev_name(&pdev->dev);
+        indio_dev->dev.parent = &pdev->dev;
+        indio_dev->dev.of_node = pdev->dev.of_node;
+        indio_dev->info = &stm32_adc_iio_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+
+        platform_set_drvdata(pdev, adc);
+
+        ret = of_property_read_u32(pdev->dev.of_node, "reg", &adc->offset);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "missing reg property\n");
+                return -EINVAL;
+        }
+
+        adc->irq = platform_get_irq(pdev, 0);
+        if (adc->irq < 0) {
+                dev_err(&pdev->dev, "failed to get irq\n");
+                return adc->irq;
+        }
+
+        ret = devm_request_irq(&pdev->dev, adc->irq, stm32_adc_isr,
+                               0, pdev->name, adc);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to request IRQ\n");
+                return ret;
+        }
+
+        adc->clk = devm_clk_get(&pdev->dev, NULL);
+        if (IS_ERR(adc->clk)) {
+                dev_err(&pdev->dev, "Can't get clock\n");
+                return PTR_ERR(adc->clk);
+        }
+
+        ret = clk_prepare_enable(adc->clk);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "clk enable failed\n");
+                return ret;
+        }
+
+        ret = stm32_adc_chan_of_init(indio_dev);
+        if (ret < 0)
+                goto err_clk_disable;
+
+        ret = iio_device_register(indio_dev);
+        if (ret) {
+                dev_err(&pdev->dev, "iio dev register failed\n");
+                goto err_clk_disable;
+        }
+
+        return 0;
+
+err_clk_disable:
+        clk_disable_unprepare(adc->clk);
+
+        return ret;
+}
+
+static int stm32_adc_remove(struct platform_device *pdev)
+{
+        struct stm32_adc *adc = platform_get_drvdata(pdev);
+        struct iio_dev *indio_dev = iio_priv_to_dev(adc);
+
+        iio_device_unregister(indio_dev);
+        clk_disable_unprepare(adc->clk);
+
+        return 0;
+}
+
+static const struct of_device_id stm32_adc_of_match[] = {
+        { .compatible = "st,stm32f4-adc" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, stm32_adc_of_match);
+
+static struct platform_driver stm32_adc_driver = {
+        .probe = stm32_adc_probe,
+        .remove = stm32_adc_remove,
+        .driver = {
+                .name = "stm32-adc",
+                .of_match_table = stm32_adc_of_match,
+        },
+};
+module_platform_driver(stm32_adc_driver);
+
+MODULE_AUTHOR("Fabrice Gasnier <fabrice.gasnier@st.com>");
+MODULE_DESCRIPTION("STMicroelectronics STM32 ADC IIO driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:stm32-adc");
diff --git a/drivers/iio/adc/ti-adc0832.c b/drivers/iio/adc/ti-adc0832.c
index f4ba23effe9a..e952e94a14af 100644
--- a/drivers/iio/adc/ti-adc0832.c
+++ b/drivers/iio/adc/ti-adc0832.c
@@ -14,6 +14,10 @@
 #include <linux/spi/spi.h>
 #include <linux/iio/iio.h>
 #include <linux/regulator/consumer.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/trigger.h>
+#include <linux/iio/triggered_buffer.h>
+#include <linux/iio/trigger_consumer.h>
 
 enum {
         adc0831,
@@ -38,10 +42,16 @@ struct adc0832 {
                 .indexed = 1,                                           \
                 .channel = chan,                                        \
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),           \
-                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE)    \
+                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),   \
+                .scan_index = chan,                                     \
+                .scan_type = {                                          \
+                        .sign = 'u',                                    \
+                        .realbits = 8,                                  \
+                        .storagebits = 8,                               \
+                },                                                      \
         }
 
-#define ADC0832_VOLTAGE_CHANNEL_DIFF(chan1, chan2)                      \
+#define ADC0832_VOLTAGE_CHANNEL_DIFF(chan1, chan2, si)                  \
         {                                                               \
                 .type = IIO_VOLTAGE,                                    \
                 .indexed = 1,                                           \
@@ -49,18 +59,26 @@ struct adc0832 {
                 .channel2 = (chan2),                                    \
                 .differential = 1,                                      \
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),           \
-                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE)    \
+                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),   \
+                .scan_index = si,                                       \
+                .scan_type = {                                          \
+                        .sign = 'u',                                    \
+                        .realbits = 8,                                  \
+                        .storagebits = 8,                               \
+                },                                                      \
         }
 
 static const struct iio_chan_spec adc0831_channels[] = {
-        ADC0832_VOLTAGE_CHANNEL_DIFF(0, 1),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(0, 1, 0),
+        IIO_CHAN_SOFT_TIMESTAMP(1),
 };
 
 static const struct iio_chan_spec adc0832_channels[] = {
         ADC0832_VOLTAGE_CHANNEL(0),
         ADC0832_VOLTAGE_CHANNEL(1),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(0, 1),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(1, 0),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(0, 1, 2),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(1, 0, 3),
+        IIO_CHAN_SOFT_TIMESTAMP(4),
 };
 
 static const struct iio_chan_spec adc0834_channels[] = {
@@ -68,10 +86,11 @@ static const struct iio_chan_spec adc0834_channels[] = {
         ADC0832_VOLTAGE_CHANNEL(1),
         ADC0832_VOLTAGE_CHANNEL(2),
         ADC0832_VOLTAGE_CHANNEL(3),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(0, 1),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(1, 0),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(2, 3),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(3, 2),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(0, 1, 4),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(1, 0, 5),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(2, 3, 6),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(3, 2, 7),
+        IIO_CHAN_SOFT_TIMESTAMP(8),
 };
 
 static const struct iio_chan_spec adc0838_channels[] = {
@@ -83,14 +102,15 @@ static const struct iio_chan_spec adc0838_channels[] = {
         ADC0832_VOLTAGE_CHANNEL(5),
         ADC0832_VOLTAGE_CHANNEL(6),
         ADC0832_VOLTAGE_CHANNEL(7),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(0, 1),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(1, 0),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(2, 3),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(3, 2),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(4, 5),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(5, 4),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(6, 7),
-        ADC0832_VOLTAGE_CHANNEL_DIFF(7, 6),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(0, 1, 8),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(1, 0, 9),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(2, 3, 10),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(3, 2, 11),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(4, 5, 12),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(5, 4, 13),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(6, 7, 14),
+        ADC0832_VOLTAGE_CHANNEL_DIFF(7, 6, 15),
+        IIO_CHAN_SOFT_TIMESTAMP(16),
 };
 
 static int adc0831_adc_conversion(struct adc0832 *adc)
@@ -178,6 +198,42 @@ static const struct iio_info adc0832_info = {
         .driver_module = THIS_MODULE,
 };
 
+static irqreturn_t adc0832_trigger_handler(int irq, void *p)
+{
+        struct iio_poll_func *pf = p;
+        struct iio_dev *indio_dev = pf->indio_dev;
+        struct adc0832 *adc = iio_priv(indio_dev);
+        u8 data[24] = { }; /* 16x 1 byte ADC data + 8 bytes timestamp */
+        int scan_index;
+        int i = 0;
+
+        mutex_lock(&adc->lock);
+
+        for_each_set_bit(scan_index, indio_dev->active_scan_mask,
+                         indio_dev->masklength) {
+                const struct iio_chan_spec *scan_chan =
+                                &indio_dev->channels[scan_index];
+                int ret = adc0832_adc_conversion(adc, scan_chan->channel,
+                                                 scan_chan->differential);
+                if (ret < 0) {
+                        dev_warn(&adc->spi->dev,
+                                 "failed to get conversion data\n");
+                        goto out;
+                }
+
+                data[i] = ret;
+                i++;
+        }
+        iio_push_to_buffers_with_timestamp(indio_dev, data,
+                                           iio_get_time_ns(indio_dev));
+out:
+        mutex_unlock(&adc->lock);
+
+        iio_trigger_notify_done(indio_dev->trig);
+
+        return IRQ_HANDLED;
+}
+
 static int adc0832_probe(struct spi_device *spi)
 {
         struct iio_dev *indio_dev;
@@ -233,9 +289,20 @@ static int adc0832_probe(struct spi_device *spi)
 
         spi_set_drvdata(spi, indio_dev);
 
+        ret = iio_triggered_buffer_setup(indio_dev, NULL,
+                                         adc0832_trigger_handler, NULL);
+        if (ret)
+                goto err_reg_disable;
+
         ret = iio_device_register(indio_dev);
         if (ret)
-                regulator_disable(adc->reg);
+                goto err_buffer_cleanup;
+
+        return 0;
+err_buffer_cleanup:
+        iio_triggered_buffer_cleanup(indio_dev);
+err_reg_disable:
+        regulator_disable(adc->reg);
 
         return ret;
 }
@@ -246,6 +313,7 @@ static int adc0832_remove(struct spi_device *spi)
         struct adc0832 *adc = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
+        iio_triggered_buffer_cleanup(indio_dev);
         regulator_disable(adc->reg);
 
         return 0;
diff --git a/drivers/iio/adc/ti-adc161s626.c b/drivers/iio/adc/ti-adc161s626.c
index f94b69f9c288..4836a0d7aef5 100644
--- a/drivers/iio/adc/ti-adc161s626.c
+++ b/drivers/iio/adc/ti-adc161s626.c
@@ -27,6 +27,7 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
+#include <linux/regulator/consumer.h>
 
 #define TI_ADC_DRV_NAME "ti-adc161s626"
 
@@ -39,7 +40,9 @@ static const struct iio_chan_spec ti_adc141s626_channels[] = {
         {
                 .type = IIO_VOLTAGE,
                 .channel = 0,
-                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                                      BIT(IIO_CHAN_INFO_SCALE) |
+                                      BIT(IIO_CHAN_INFO_OFFSET),
                 .scan_index = 0,
                 .scan_type = {
                         .sign = 's',
@@ -54,7 +57,9 @@ static const struct iio_chan_spec ti_adc161s626_channels[] = {
         {
                 .type = IIO_VOLTAGE,
                 .channel = 0,
-                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                                      BIT(IIO_CHAN_INFO_SCALE) |
+                                      BIT(IIO_CHAN_INFO_OFFSET),
                 .scan_index = 0,
                 .scan_type = {
                         .sign = 's',
@@ -68,6 +73,8 @@ static const struct iio_chan_spec ti_adc161s626_channels[] = {
 struct ti_adc_data {
         struct iio_dev *indio_dev;
         struct spi_device *spi;
+        struct regulator *ref;
+
         u8 read_size;
         u8 shift;
 
@@ -135,18 +142,32 @@ static int ti_adc_read_raw(struct iio_dev *indio_dev,
         struct ti_adc_data *data = iio_priv(indio_dev);
         int ret;
 
-        if (mask != IIO_CHAN_INFO_RAW)
-                return -EINVAL;
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                ret = iio_device_claim_direct_mode(indio_dev);
+                if (ret)
+                        return ret;
 
-        ret = iio_device_claim_direct_mode(indio_dev);
-        if (ret)
-                return ret;
+                ret = ti_adc_read_measurement(data, chan, val);
+                iio_device_release_direct_mode(indio_dev);
 
-        ret = ti_adc_read_measurement(data, chan, val);
-        iio_device_release_direct_mode(indio_dev);
+                if (ret)
+                        return ret;
 
-        if (!ret)
                 return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                ret = regulator_get_voltage(data->ref);
+                if (ret < 0)
+                        return ret;
+
+                *val = ret / 1000;
+                *val2 = chan->scan_type.realbits;
+
+                return IIO_VAL_FRACTIONAL_LOG2;
+        case IIO_CHAN_INFO_OFFSET:
+                *val = 1 << (chan->scan_type.realbits - 1);
+                return IIO_VAL_INT;
+        }
 
         return 0;
 }
@@ -191,10 +212,17 @@ static int ti_adc_probe(struct spi_device *spi)
                 break;
         }
 
+        data->ref = devm_regulator_get(&spi->dev, "vdda");
+        if (!IS_ERR(data->ref)) {
+                ret = regulator_enable(data->ref);
+                if (ret < 0)
+                        return ret;
+        }
+
         ret = iio_triggered_buffer_setup(indio_dev, NULL,
                                          ti_adc_trigger_handler, NULL);
         if (ret)
-                return ret;
+                goto error_regulator_disable;
 
         ret = iio_device_register(indio_dev);
         if (ret)
@@ -205,15 +233,20 @@ static int ti_adc_probe(struct spi_device *spi)
 error_unreg_buffer:
         iio_triggered_buffer_cleanup(indio_dev);
 
+error_regulator_disable:
+        regulator_disable(data->ref);
+
         return ret;
 }
 
 static int ti_adc_remove(struct spi_device *spi)
 {
         struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct ti_adc_data *data = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
         iio_triggered_buffer_cleanup(indio_dev);
+        regulator_disable(data->ref);
 
         return 0;
 }
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index c3cfacca2541..ad9dec30bb30 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -30,10 +30,28 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/kfifo_buf.h>
 
+#include <linux/dmaengine.h>
+#include <linux/dma-mapping.h>
+
+#define DMA_BUFFER_SIZE         SZ_2K
+
+struct tiadc_dma {
+        struct dma_slave_config conf;
+        struct dma_chan         *chan;
+        dma_addr_t              addr;
+        dma_cookie_t            cookie;
+        u8                      *buf;
+        int                     current_period;
+        int                     period_size;
+        u8                      fifo_thresh;
+};
+
 struct tiadc_device {
         struct ti_tscadc_dev *mfd_tscadc;
+        struct tiadc_dma dma;
         struct mutex fifo1_lock; /* to protect fifo access */
         int channels;
+        int total_ch_enabled;
         u8 channel_line[8];
         u8 channel_step[8];
         int buffer_en_ch_steps;
@@ -198,6 +216,67 @@ static irqreturn_t tiadc_worker_h(int irq, void *private)
         return IRQ_HANDLED;
 }
 
+static void tiadc_dma_rx_complete(void *param)
+{
+        struct iio_dev *indio_dev = param;
+        struct tiadc_device *adc_dev = iio_priv(indio_dev);
+        struct tiadc_dma *dma = &adc_dev->dma;
+        u8 *data;
+        int i;
+
+        data = dma->buf + dma->current_period * dma->period_size;
+        dma->current_period = 1 - dma->current_period; /* swap the buffer ID */
+
+        for (i = 0; i < dma->period_size; i += indio_dev->scan_bytes) {
+                iio_push_to_buffers(indio_dev, data);
+                data += indio_dev->scan_bytes;
+        }
+}
+
+static int tiadc_start_dma(struct iio_dev *indio_dev)
+{
+        struct tiadc_device *adc_dev = iio_priv(indio_dev);
+        struct tiadc_dma *dma = &adc_dev->dma;
+        struct dma_async_tx_descriptor *desc;
+
+        dma->current_period = 0; /* We start to fill period 0 */
+        /*
+         * Make the fifo thresh as the multiple of total number of
+         * channels enabled, so make sure that cyclic DMA period
+         * length is also a multiple of total number of channels
+         * enabled. This ensures that no invalid data is reported
+         * to the stack via iio_push_to_buffers().
+         */
+        dma->fifo_thresh = rounddown(FIFO1_THRESHOLD + 1,
+                                     adc_dev->total_ch_enabled) - 1;
+        /* Make sure that period length is multiple of fifo thresh level */
+        dma->period_size = rounddown(DMA_BUFFER_SIZE / 2,
+                                    (dma->fifo_thresh + 1) * sizeof(u16));
+
+        dma->conf.src_maxburst = dma->fifo_thresh + 1;
+        dmaengine_slave_config(dma->chan, &dma->conf);
+
+        desc = dmaengine_prep_dma_cyclic(dma->chan, dma->addr,
+                                         dma->period_size * 2,
+                                         dma->period_size, DMA_DEV_TO_MEM,
+                                         DMA_PREP_INTERRUPT);
+        if (!desc)
+                return -EBUSY;
+
+        desc->callback = tiadc_dma_rx_complete;
+        desc->callback_param = indio_dev;
+
+        dma->cookie = dmaengine_submit(desc);
+
+        dma_async_issue_pending(dma->chan);
+
+        tiadc_writel(adc_dev, REG_FIFO1THR, dma->fifo_thresh);
+        tiadc_writel(adc_dev, REG_DMA1REQ, dma->fifo_thresh);
+        tiadc_writel(adc_dev, REG_DMAENABLE_SET, DMA_FIFO1);
+
+        return 0;
+}
+
 static int tiadc_buffer_preenable(struct iio_dev *indio_dev)
 {
         struct tiadc_device *adc_dev = iio_priv(indio_dev);
@@ -218,20 +297,30 @@ static int tiadc_buffer_preenable(struct iio_dev *indio_dev)
 static int tiadc_buffer_postenable(struct iio_dev *indio_dev)
 {
         struct tiadc_device *adc_dev = iio_priv(indio_dev);
+        struct tiadc_dma *dma = &adc_dev->dma;
+        unsigned int irq_enable;
         unsigned int enb = 0;
         u8 bit;
 
         tiadc_step_config(indio_dev);
-        for_each_set_bit(bit, indio_dev->active_scan_mask, adc_dev->channels)
+        for_each_set_bit(bit, indio_dev->active_scan_mask, adc_dev->channels) {
                 enb |= (get_adc_step_bit(adc_dev, bit) << 1);
+                adc_dev->total_ch_enabled++;
+        }
         adc_dev->buffer_en_ch_steps = enb;
 
+        if (dma->chan)
+                tiadc_start_dma(indio_dev);
+
         am335x_tsc_se_set_cache(adc_dev->mfd_tscadc, enb);
 
         tiadc_writel(adc_dev,  REG_IRQSTATUS, IRQENB_FIFO1THRES
                                 | IRQENB_FIFO1OVRRUN | IRQENB_FIFO1UNDRFLW);
-        tiadc_writel(adc_dev,  REG_IRQENABLE, IRQENB_FIFO1THRES
-                                | IRQENB_FIFO1OVRRUN);
+
+        irq_enable = IRQENB_FIFO1OVRRUN;
+        if (!dma->chan)
+                irq_enable |= IRQENB_FIFO1THRES;
+        tiadc_writel(adc_dev,  REG_IRQENABLE, irq_enable);
 
         return 0;
 }
@@ -239,12 +328,18 @@ static int tiadc_buffer_postenable(struct iio_dev *indio_dev)
 static int tiadc_buffer_predisable(struct iio_dev *indio_dev)
 {
         struct tiadc_device *adc_dev = iio_priv(indio_dev);
+        struct tiadc_dma *dma = &adc_dev->dma;
         int fifo1count, i, read;
 
         tiadc_writel(adc_dev, REG_IRQCLR, (IRQENB_FIFO1THRES |
                                 IRQENB_FIFO1OVRRUN | IRQENB_FIFO1UNDRFLW));
         am335x_tsc_se_clr(adc_dev->mfd_tscadc, adc_dev->buffer_en_ch_steps);
         adc_dev->buffer_en_ch_steps = 0;
+        adc_dev->total_ch_enabled = 0;
+        if (dma->chan) {
+                tiadc_writel(adc_dev, REG_DMAENABLE_CLEAR, 0x2);
+                dmaengine_terminate_async(dma->chan);
+        }
 
         /* Flush FIFO of leftover data in the time it takes to disable adc */
         fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT);
@@ -430,6 +525,41 @@ static const struct iio_info tiadc_info = {
         .driver_module = THIS_MODULE,
 };
 
+static int tiadc_request_dma(struct platform_device *pdev,
+                             struct tiadc_device *adc_dev)
+{
+        struct tiadc_dma        *dma = &adc_dev->dma;
+        dma_cap_mask_t          mask;
+
+        /* Default slave configuration parameters */
+        dma->conf.direction = DMA_DEV_TO_MEM;
+        dma->conf.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+        dma->conf.src_addr = adc_dev->mfd_tscadc->tscadc_phys_base + REG_FIFO1;
+
+        dma_cap_zero(mask);
+        dma_cap_set(DMA_CYCLIC, mask);
+
+        /* Get a channel for RX */
+        dma->chan = dma_request_chan(adc_dev->mfd_tscadc->dev, "fifo1");
+        if (IS_ERR(dma->chan)) {
+                int ret = PTR_ERR(dma->chan);
+
+                dma->chan = NULL;
+                return ret;
+        }
+
+        /* RX buffer */
+        dma->buf = dma_alloc_coherent(dma->chan->device->dev, DMA_BUFFER_SIZE,
+                                      &dma->addr, GFP_KERNEL);
+        if (!dma->buf)
+                goto err;
+
+        return 0;
+err:
+        dma_release_channel(dma->chan);
+        return -ENOMEM;
+}
+
 static int tiadc_parse_dt(struct platform_device *pdev,
                           struct tiadc_device *adc_dev)
 {
@@ -512,8 +642,14 @@ static int tiadc_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, indio_dev);
 
+        err = tiadc_request_dma(pdev, adc_dev);
+        if (err && err == -EPROBE_DEFER)
+                goto err_dma;
+
         return 0;
 
+err_dma:
+        iio_device_unregister(indio_dev);
 err_buffer_unregister:
         tiadc_iio_buffered_hardware_remove(indio_dev);
 err_free_channels:
@@ -525,8 +661,14 @@ static int tiadc_remove(struct platform_device *pdev)
 {
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);
         struct tiadc_device *adc_dev = iio_priv(indio_dev);
+        struct tiadc_dma *dma = &adc_dev->dma;
         u32 step_en;
 
+        if (dma->chan) {
+                dma_free_coherent(dma->chan->device->dev, DMA_BUFFER_SIZE,
+                                  dma->buf, dma->addr);
+                dma_release_channel(dma->chan);
+        }
         iio_device_unregister(indio_dev);
         tiadc_iio_buffered_hardware_remove(indio_dev);
         tiadc_channels_remove(indio_dev);
diff --git a/drivers/iio/common/Kconfig b/drivers/iio/common/Kconfig
index 26a6026de614..e108996a9627 100644
--- a/drivers/iio/common/Kconfig
+++ b/drivers/iio/common/Kconfig
@@ -2,6 +2,7 @@
 # IIO common modules
 #
 
+source "drivers/iio/common/cros_ec_sensors/Kconfig"
 source "drivers/iio/common/hid-sensors/Kconfig"
 source "drivers/iio/common/ms_sensors/Kconfig"
 source "drivers/iio/common/ssp_sensors/Kconfig"
diff --git a/drivers/iio/common/Makefile b/drivers/iio/common/Makefile
index 585da6a1b188..6fa760e1bdd5 100644
--- a/drivers/iio/common/Makefile
+++ b/drivers/iio/common/Makefile
@@ -7,6 +7,7 @@
 #
 
 # When adding new entries keep the list in alphabetical order
+obj-y += cros_ec_sensors/
 obj-y += hid-sensors/
 obj-y += ms_sensors/
 obj-y += ssp_sensors/
diff --git a/drivers/iio/common/cros_ec_sensors/Kconfig b/drivers/iio/common/cros_ec_sensors/Kconfig
new file mode 100644
index 000000000000..135f6825903f
--- /dev/null
+++ b/drivers/iio/common/cros_ec_sensors/Kconfig
@@ -0,0 +1,22 @@
+#
+# Chrome OS Embedded Controller managed sensors library
+#
+config IIO_CROS_EC_SENSORS_CORE
+        tristate "ChromeOS EC Sensors Core"
+        depends on SYSFS && MFD_CROS_EC
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        help
+          Base module for the ChromeOS EC Sensors module.
+          Contains core functions used by other IIO CrosEC sensor
+          drivers.
+          Define common attributes and sysfs interrupt handler.
+
+config IIO_CROS_EC_SENSORS
+        tristate "ChromeOS EC Contiguous Sensors"
+        depends on IIO_CROS_EC_SENSORS_CORE
+        help
+          Module to handle 3d contiguous sensors like
+          Accelerometers, Gyroscope and Magnetometer that are
+          presented by the ChromeOS EC Sensor hub.
+          Creates an IIO device for each functions.
diff --git a/drivers/iio/common/cros_ec_sensors/Makefile b/drivers/iio/common/cros_ec_sensors/Makefile
new file mode 100644
index 000000000000..ec716ff2a775
--- /dev/null
+++ b/drivers/iio/common/cros_ec_sensors/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for sensors seen through the ChromeOS EC sensor hub.
+#
+
+obj-$(CONFIG_IIO_CROS_EC_SENSORS_CORE) += cros_ec_sensors_core.o
+obj-$(CONFIG_IIO_CROS_EC_SENSORS) += cros_ec_sensors.o
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
new file mode 100644
index 000000000000..d6c372bb433b
--- /dev/null
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
@@ -0,0 +1,322 @@
+/*
+ * cros_ec_sensors - Driver for Chrome OS Embedded Controller sensors.
+ *
+ * Copyright (C) 2016 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 cros-ec interface to communicate with the Chrome OS
+ * EC about sensors data. Data 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/platform_device.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+
+#include "cros_ec_sensors_core.h"
+
+#define CROS_EC_SENSORS_MAX_CHANNELS 4
+
+/* State data for ec_sensors iio driver. */
+struct cros_ec_sensors_state {
+        /* Shared by all sensors */
+        struct cros_ec_sensors_core_state core;
+
+        struct iio_chan_spec channels[CROS_EC_SENSORS_MAX_CHANNELS];
+};
+
+static int cros_ec_sensors_read(struct iio_dev *indio_dev,
+                          struct iio_chan_spec const *chan,
+                          int *val, int *val2, long mask)
+{
+        struct cros_ec_sensors_state *st = iio_priv(indio_dev);
+        s16 data = 0;
+        s64 val64;
+        int i;
+        int ret;
+        int idx = chan->scan_index;
+
+        mutex_lock(&st->core.cmd_lock);
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                ret = st->core.read_ec_sensors_data(indio_dev, 1 << idx, &data);
+                if (ret < 0)
+                        break;
+
+                *val = data;
+                break;
+        case IIO_CHAN_INFO_CALIBBIAS:
+                st->core.param.cmd = MOTIONSENSE_CMD_SENSOR_OFFSET;
+                st->core.param.sensor_offset.flags = 0;
+
+                ret = cros_ec_motion_send_host_cmd(&st->core, 0);
+                if (ret < 0)
+                        break;
+
+                /* Save values */
+                for (i = CROS_EC_SENSOR_X; i < CROS_EC_SENSOR_MAX_AXIS; i++)
+                        st->core.calib[i] =
+                                st->core.resp->sensor_offset.offset[i];
+
+                *val = st->core.calib[idx];
+                break;
+        case IIO_CHAN_INFO_SCALE:
+                st->core.param.cmd = MOTIONSENSE_CMD_SENSOR_RANGE;
+                st->core.param.sensor_range.data = EC_MOTION_SENSE_NO_VALUE;
+
+                ret = cros_ec_motion_send_host_cmd(&st->core, 0);
+                if (ret < 0)
+                        break;
+
+                val64 = st->core.resp->sensor_range.ret;
+                switch (st->core.type) {
+                case MOTIONSENSE_TYPE_ACCEL:
+                        /*
+                         * EC returns data in g, iio exepects m/s^2.
+                         * Do not use IIO_G_TO_M_S_2 to avoid precision loss.
+                         */
+                        *val = div_s64(val64 * 980665, 10);
+                        *val2 = 10000 << (CROS_EC_SENSOR_BITS - 1);
+                        ret = IIO_VAL_FRACTIONAL;
+                        break;
+                case MOTIONSENSE_TYPE_GYRO:
+                        /*
+                         * EC returns data in dps, iio expects rad/s.
+                         * Do not use IIO_DEGREE_TO_RAD to avoid precision
+                         * loss. Round to the nearest integer.
+                         */
+                        *val = div_s64(val64 * 314159 + 9000000ULL, 1000);
+                        *val2 = 18000 << (CROS_EC_SENSOR_BITS - 1);
+                        ret = IIO_VAL_FRACTIONAL;
+                        break;
+                case MOTIONSENSE_TYPE_MAG:
+                        /*
+                         * EC returns data in 16LSB / uT,
+                         * iio expects Gauss
+                         */
+                        *val = val64;
+                        *val2 = 100 << (CROS_EC_SENSOR_BITS - 1);
+                        ret = IIO_VAL_FRACTIONAL;
+                        break;
+                default:
+                        ret = -EINVAL;
+                }
+                break;
+        default:
+                ret = cros_ec_sensors_core_read(&st->core, chan, val, val2,
+                                                mask);
+                break;
+        }
+        mutex_unlock(&st->core.cmd_lock);
+
+        return ret;
+}
+
+static int cros_ec_sensors_write(struct iio_dev *indio_dev,
+                               struct iio_chan_spec const *chan,
+                               int val, int val2, long mask)
+{
+        struct cros_ec_sensors_state *st = iio_priv(indio_dev);
+        int i;
+        int ret;
+        int idx = chan->scan_index;
+
+        mutex_lock(&st->core.cmd_lock);
+
+        switch (mask) {
+        case IIO_CHAN_INFO_CALIBBIAS:
+                st->core.calib[idx] = val;
+
+                /* Send to EC for each axis, even if not complete */
+                st->core.param.cmd = MOTIONSENSE_CMD_SENSOR_OFFSET;
+                st->core.param.sensor_offset.flags =
+                        MOTION_SENSE_SET_OFFSET;
+                for (i = CROS_EC_SENSOR_X; i < CROS_EC_SENSOR_MAX_AXIS; i++)
+                        st->core.param.sensor_offset.offset[i] =
+                                st->core.calib[i];
+                st->core.param.sensor_offset.temp =
+                        EC_MOTION_SENSE_INVALID_CALIB_TEMP;
+
+                ret = cros_ec_motion_send_host_cmd(&st->core, 0);
+                break;
+        case IIO_CHAN_INFO_SCALE:
+                if (st->core.type == MOTIONSENSE_TYPE_MAG) {
+                        ret = -EINVAL;
+                        break;
+                }
+                st->core.param.cmd = MOTIONSENSE_CMD_SENSOR_RANGE;
+                st->core.param.sensor_range.data = val;
+
+                /* Always roundup, so caller gets at least what it asks for. */
+                st->core.param.sensor_range.roundup = 1;
+
+                ret = cros_ec_motion_send_host_cmd(&st->core, 0);
+                break;
+        default:
+                ret = cros_ec_sensors_core_write(
+                                &st->core, chan, val, val2, mask);
+                break;
+        }
+
+        mutex_unlock(&st->core.cmd_lock);
+
+        return ret;
+}
+
+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)
+{
+        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_sensors_state *state;
+        struct iio_chan_spec *channel;
+        int ret, i;
+
+        if (!ec_dev || !ec_dev->ec_dev) {
+                dev_warn(&pdev->dev, "No CROS EC device found.\n");
+                return -EINVAL;
+        }
+        ec_device = ec_dev->ec_dev;
+
+        indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*state));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        ret = cros_ec_sensors_core_init(pdev, indio_dev, true);
+        if (ret)
+                return ret;
+
+        indio_dev->info = &ec_sensors_info;
+        state = iio_priv(indio_dev);
+        for (channel = state->channels, i = CROS_EC_SENSOR_X;
+             i < CROS_EC_SENSOR_MAX_AXIS; i++, channel++) {
+                /* Common part */
+                channel->info_mask_separate =
+                        BIT(IIO_CHAN_INFO_RAW) |
+                        BIT(IIO_CHAN_INFO_CALIBBIAS);
+                channel->info_mask_shared_by_all =
+                        BIT(IIO_CHAN_INFO_SCALE) |
+                        BIT(IIO_CHAN_INFO_FREQUENCY) |
+                        BIT(IIO_CHAN_INFO_SAMP_FREQ);
+                channel->scan_type.realbits = CROS_EC_SENSOR_BITS;
+                channel->scan_type.storagebits = CROS_EC_SENSOR_BITS;
+                channel->scan_index = i;
+                channel->ext_info = cros_ec_sensors_ext_info;
+                channel->modified = 1;
+                channel->channel2 = IIO_MOD_X + i;
+                channel->scan_type.sign = 's';
+
+                /* Sensor specific */
+                switch (state->core.type) {
+                case MOTIONSENSE_TYPE_ACCEL:
+                        channel->type = IIO_ACCEL;
+                        break;
+                case MOTIONSENSE_TYPE_GYRO:
+                        channel->type = IIO_ANGL_VEL;
+                        break;
+                case MOTIONSENSE_TYPE_MAG:
+                        channel->type = IIO_MAGN;
+                        break;
+                default:
+                        dev_err(&pdev->dev, "Unknown motion sensor\n");
+                        return -EINVAL;
+                }
+        }
+
+        /* Timestamp */
+        channel->type = IIO_TIMESTAMP;
+        channel->channel = -1;
+        channel->scan_index = CROS_EC_SENSOR_MAX_AXIS;
+        channel->scan_type.sign = 's';
+        channel->scan_type.realbits = 64;
+        channel->scan_type.storagebits = 64;
+
+        indio_dev->channels = state->channels;
+        indio_dev->num_channels = CROS_EC_SENSORS_MAX_CHANNELS;
+
+        /* There is only enough room for accel and gyro in the io space */
+        if ((state->core.ec->cmd_readmem != NULL) &&
+            (state->core.type != MOTIONSENSE_TYPE_MAG))
+                state->core.read_ec_sensors_data = cros_ec_sensors_read_lpc;
+        else
+                state->core.read_ec_sensors_data = cros_ec_sensors_read_cmd;
+
+        ret = iio_triggered_buffer_setup(indio_dev, NULL,
+                                         cros_ec_sensors_capture, NULL);
+        if (ret)
+                return ret;
+
+        ret = iio_device_register(indio_dev);
+        if (ret)
+                goto error_uninit_buffer;
+
+        return 0;
+
+error_uninit_buffer:
+        iio_triggered_buffer_cleanup(indio_dev);
+
+        return ret;
+}
+
+static int cros_ec_sensors_remove(struct platform_device *pdev)
+{
+        struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+
+        iio_device_unregister(indio_dev);
+        iio_triggered_buffer_cleanup(indio_dev);
+
+        return 0;
+}
+
+static const struct platform_device_id cros_ec_sensors_ids[] = {
+        {
+                .name = "cros-ec-accel",
+        },
+        {
+                .name = "cros-ec-gyro",
+        },
+        {
+                .name = "cros-ec-mag",
+        },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, cros_ec_sensors_ids);
+
+static struct platform_driver cros_ec_sensors_platform_driver = {
+        .driver = {
+                .name   = "cros-ec-sensors",
+        },
+        .probe          = cros_ec_sensors_probe,
+        .remove         = cros_ec_sensors_remove,
+        .id_table       = cros_ec_sensors_ids,
+};
+module_platform_driver(cros_ec_sensors_platform_driver);
+
+MODULE_DESCRIPTION("ChromeOS EC 3-axis sensors driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
new file mode 100644
index 000000000000..416cae5ebbd0
--- /dev/null
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
@@ -0,0 +1,450 @@
+/*
+ * cros_ec_sensors_core - Common function for Chrome OS EC sensor driver.
+ *
+ * Copyright (C) 2016 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.
+ */
+
+#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/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>
+
+#include "cros_ec_sensors_core.h"
+
+static char *cros_ec_loc[] = {
+        [MOTIONSENSE_LOC_BASE] = "base",
+        [MOTIONSENSE_LOC_LID] = "lid",
+        [MOTIONSENSE_LOC_MAX] = "unknown",
+};
+
+int cros_ec_sensors_core_init(struct platform_device *pdev,
+                              struct iio_dev *indio_dev,
+                              bool physical_device)
+{
+        struct device *dev = &pdev->dev;
+        struct cros_ec_sensors_core_state *state = iio_priv(indio_dev);
+        struct cros_ec_dev *ec = dev_get_drvdata(pdev->dev.parent);
+        struct cros_ec_sensor_platform *sensor_platform = dev_get_platdata(dev);
+
+        platform_set_drvdata(pdev, indio_dev);
+
+        state->ec = ec->ec_dev;
+        state->msg = devm_kzalloc(&pdev->dev,
+                                max((u16)sizeof(struct ec_params_motion_sense),
+                                state->ec->max_response), GFP_KERNEL);
+        if (!state->msg)
+                return -ENOMEM;
+
+        state->resp = (struct ec_response_motion_sense *)state->msg->data;
+
+        mutex_init(&state->cmd_lock);
+
+        /* Set up the host command structure. */
+        state->msg->version = 2;
+        state->msg->command = EC_CMD_MOTION_SENSE_CMD + ec->cmd_offset;
+        state->msg->outsize = sizeof(struct ec_params_motion_sense);
+
+        indio_dev->dev.parent = &pdev->dev;
+        indio_dev->name = pdev->name;
+
+        if (physical_device) {
+                indio_dev->modes = INDIO_DIRECT_MODE;
+
+                state->param.cmd = MOTIONSENSE_CMD_INFO;
+                state->param.info.sensor_num = sensor_platform->sensor_num;
+                if (cros_ec_motion_send_host_cmd(state, 0)) {
+                        dev_warn(dev, "Can not access sensor info\n");
+                        return -EIO;
+                }
+                state->type = state->resp->info.type;
+                state->loc = state->resp->info.location;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cros_ec_sensors_core_init);
+
+int cros_ec_motion_send_host_cmd(struct cros_ec_sensors_core_state *state,
+                                 u16 opt_length)
+{
+        int ret;
+
+        if (opt_length)
+                state->msg->insize = min(opt_length, state->ec->max_response);
+        else
+                state->msg->insize = state->ec->max_response;
+
+        memcpy(state->msg->data, &state->param, sizeof(state->param));
+
+        ret = cros_ec_cmd_xfer_status(state->ec, state->msg);
+        if (ret < 0)
+                return -EIO;
+
+        if (ret &&
+            state->resp != (struct ec_response_motion_sense *)state->msg->data)
+                memcpy(state->resp, state->msg->data, ret);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cros_ec_motion_send_host_cmd);
+
+static ssize_t cros_ec_sensors_calibrate(struct iio_dev *indio_dev,
+                uintptr_t private, const struct iio_chan_spec *chan,
+                const char *buf, size_t len)
+{
+        struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);
+        int ret, i;
+        bool calibrate;
+
+        ret = strtobool(buf, &calibrate);
+        if (ret < 0)
+                return ret;
+        if (!calibrate)
+                return -EINVAL;
+
+        mutex_lock(&st->cmd_lock);
+        st->param.cmd = MOTIONSENSE_CMD_PERFORM_CALIB;
+        ret = cros_ec_motion_send_host_cmd(st, 0);
+        if (ret != 0) {
+                dev_warn(&indio_dev->dev, "Unable to calibrate sensor\n");
+        } else {
+                /* Save values */
+                for (i = CROS_EC_SENSOR_X; i < CROS_EC_SENSOR_MAX_AXIS; i++)
+                        st->calib[i] = st->resp->perform_calib.offset[i];
+        }
+        mutex_unlock(&st->cmd_lock);
+
+        return ret ? ret : len;
+}
+
+static ssize_t cros_ec_sensors_loc(struct iio_dev *indio_dev,
+                uintptr_t private, const struct iio_chan_spec *chan,
+                char *buf)
+{
+        struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);
+
+        return snprintf(buf, PAGE_SIZE, "%s\n", cros_ec_loc[st->loc]);
+}
+
+const struct iio_chan_spec_ext_info cros_ec_sensors_ext_info[] = {
+        {
+                .name = "calibrate",
+                .shared = IIO_SHARED_BY_ALL,
+                .write = cros_ec_sensors_calibrate
+        },
+        {
+                .name = "location",
+                .shared = IIO_SHARED_BY_ALL,
+                .read = cros_ec_sensors_loc
+        },
+        { },
+};
+EXPORT_SYMBOL_GPL(cros_ec_sensors_ext_info);
+
+/**
+ * cros_ec_sensors_idx_to_reg - convert index into offset in shared memory
+ * @st:         pointer to state information for device
+ * @idx:        sensor index (should be element of enum sensor_index)
+ *
+ * Return:      address to read at
+ */
+static unsigned int cros_ec_sensors_idx_to_reg(
+                                        struct cros_ec_sensors_core_state *st,
+                                        unsigned int idx)
+{
+        /*
+         * When using LPC interface, only space for 2 Accel and one Gyro.
+         * First halfword of MOTIONSENSE_TYPE_ACCEL is used by angle.
+         */
+        if (st->type == MOTIONSENSE_TYPE_ACCEL)
+                return EC_MEMMAP_ACC_DATA + sizeof(u16) *
+                        (1 + idx + st->param.info.sensor_num *
+                         CROS_EC_SENSOR_MAX_AXIS);
+
+        return EC_MEMMAP_GYRO_DATA + sizeof(u16) * idx;
+}
+
+static int cros_ec_sensors_cmd_read_u8(struct cros_ec_device *ec,
+                                       unsigned int offset, u8 *dest)
+{
+        return ec->cmd_readmem(ec, offset, 1, dest);
+}
+
+static int cros_ec_sensors_cmd_read_u16(struct cros_ec_device *ec,
+                                         unsigned int offset, u16 *dest)
+{
+        __le16 tmp;
+        int ret = ec->cmd_readmem(ec, offset, 2, &tmp);
+
+        if (ret >= 0)
+                *dest = le16_to_cpu(tmp);
+
+        return ret;
+}
+
+/**
+ * cros_ec_sensors_read_until_not_busy() - read until is not busy
+ *
+ * @st: pointer to state information for device
+ *
+ * Read from EC status byte until it reads not busy.
+ * Return: 8-bit status if ok, -errno on failure.
+ */
+static int cros_ec_sensors_read_until_not_busy(
+                                        struct cros_ec_sensors_core_state *st)
+{
+        struct cros_ec_device *ec = st->ec;
+        u8 status;
+        int ret, attempts = 0;
+
+        ret = cros_ec_sensors_cmd_read_u8(ec, EC_MEMMAP_ACC_STATUS, &status);
+        if (ret < 0)
+                return ret;
+
+        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);
+
+                ret = cros_ec_sensors_cmd_read_u8(ec, EC_MEMMAP_ACC_STATUS,
+                                                  &status);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return status;
+}
+
+/**
+ * read_ec_sensors_data_unsafe() - read acceleration data from EC shared memory
+ * @indio_dev:  pointer to IIO 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.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+static int cros_ec_sensors_read_data_unsafe(struct iio_dev *indio_dev,
+                         unsigned long scan_mask, s16 *data)
+{
+        struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);
+        struct cros_ec_device *ec = st->ec;
+        unsigned int i;
+        int ret;
+
+        /* Read all sensors enabled in scan_mask. Each value is 2 bytes. */
+        for_each_set_bit(i, &scan_mask, indio_dev->masklength) {
+                ret = cros_ec_sensors_cmd_read_u16(ec,
+                                             cros_ec_sensors_idx_to_reg(st, i),
+                                             data);
+                if (ret < 0)
+                        return ret;
+
+                data++;
+        }
+
+        return 0;
+}
+
+int cros_ec_sensors_read_lpc(struct iio_dev *indio_dev,
+                             unsigned long scan_mask, s16 *data)
+{
+        struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);
+        struct cros_ec_device *ec = st->ec;
+        u8 samp_id = 0xff, status = 0;
+        int ret, 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 = cros_ec_sensors_read_until_not_busy(st);
+                if (ret < 0)
+                        return ret;
+
+                /*
+                 * Store the current sample id so that we can compare to the
+                 * sample id after reading the data.
+                 */
+                samp_id = ret & EC_MEMMAP_ACC_STATUS_SAMPLE_ID_MASK;
+
+                /* Read all EC data, format it, and store it into data. */
+                ret = cros_ec_sensors_read_data_unsafe(indio_dev, scan_mask,
+                                                       data);
+                if (ret < 0)
+                        return ret;
+
+                /* Read status byte. */
+                ret = cros_ec_sensors_cmd_read_u8(ec, EC_MEMMAP_ACC_STATUS,
+                                                  &status);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cros_ec_sensors_read_lpc);
+
+int cros_ec_sensors_read_cmd(struct iio_dev *indio_dev,
+                             unsigned long scan_mask, s16 *data)
+{
+        struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);
+        int ret;
+        unsigned int i;
+
+        /* Read all sensor data through a command. */
+        st->param.cmd = MOTIONSENSE_CMD_DATA;
+        ret = cros_ec_motion_send_host_cmd(st, sizeof(st->resp->data));
+        if (ret != 0) {
+                dev_warn(&indio_dev->dev, "Unable to read sensor data\n");
+                return ret;
+        }
+
+        for_each_set_bit(i, &scan_mask, indio_dev->masklength) {
+                *data = st->resp->data.data[i];
+                data++;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cros_ec_sensors_read_cmd);
+
+irqreturn_t cros_ec_sensors_capture(int irq, void *p)
+{
+        struct iio_poll_func *pf = p;
+        struct iio_dev *indio_dev = pf->indio_dev;
+        struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&st->cmd_lock);
+
+        /* Clear capture data. */
+        memset(st->samples, 0, indio_dev->scan_bytes);
+
+        /* Read data based on which channels are enabled in scan mask. */
+        ret = st->read_ec_sensors_data(indio_dev,
+                                       *(indio_dev->active_scan_mask),
+                                       (s16 *)st->samples);
+        if (ret < 0)
+                goto done;
+
+        iio_push_to_buffers_with_timestamp(indio_dev, st->samples,
+                                           iio_get_time_ns(indio_dev));
+
+done:
+        /*
+         * Tell the core we are done with this trigger and ready for the
+         * next one.
+         */
+        iio_trigger_notify_done(indio_dev->trig);
+
+        mutex_unlock(&st->cmd_lock);
+
+        return IRQ_HANDLED;
+}
+EXPORT_SYMBOL_GPL(cros_ec_sensors_capture);
+
+int cros_ec_sensors_core_read(struct cros_ec_sensors_core_state *st,
+                          struct iio_chan_spec const *chan,
+                          int *val, int *val2, long mask)
+{
+        int ret = IIO_VAL_INT;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                st->param.cmd = MOTIONSENSE_CMD_EC_RATE;
+                st->param.ec_rate.data =
+                        EC_MOTION_SENSE_NO_VALUE;
+
+                if (cros_ec_motion_send_host_cmd(st, 0))
+                        ret = -EIO;
+                else
+                        *val = st->resp->ec_rate.ret;
+                break;
+        case IIO_CHAN_INFO_FREQUENCY:
+                st->param.cmd = MOTIONSENSE_CMD_SENSOR_ODR;
+                st->param.sensor_odr.data =
+                        EC_MOTION_SENSE_NO_VALUE;
+
+                if (cros_ec_motion_send_host_cmd(st, 0))
+                        ret = -EIO;
+                else
+                        *val = st->resp->sensor_odr.ret;
+                break;
+        default:
+                break;
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(cros_ec_sensors_core_read);
+
+int cros_ec_sensors_core_write(struct cros_ec_sensors_core_state *st,
+                               struct iio_chan_spec const *chan,
+                               int val, int val2, long mask)
+{
+        int ret = 0;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_FREQUENCY:
+                st->param.cmd = MOTIONSENSE_CMD_SENSOR_ODR;
+                st->param.sensor_odr.data = val;
+
+                /* Always roundup, so caller gets at least what it asks for. */
+                st->param.sensor_odr.roundup = 1;
+
+                if (cros_ec_motion_send_host_cmd(st, 0))
+                        ret = -EIO;
+                break;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                st->param.cmd = MOTIONSENSE_CMD_EC_RATE;
+                st->param.ec_rate.data = val;
+
+                if (cros_ec_motion_send_host_cmd(st, 0))
+                        ret = -EIO;
+                else
+                        st->curr_sampl_freq = val;
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+        return ret;
+}
+EXPORT_SYMBOL_GPL(cros_ec_sensors_core_write);
+
+MODULE_DESCRIPTION("ChromeOS EC sensor hub core functions");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
new file mode 100644
index 000000000000..8bc2ca3c2e2e
--- /dev/null
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.h
@@ -0,0 +1,175 @@
+/*
+ * ChromeOS EC sensor hub
+ *
+ * Copyright (C) 2016 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.
+ */
+
+#ifndef __CROS_EC_SENSORS_CORE_H
+#define __CROS_EC_SENSORS_CORE_H
+
+#include <linux/irqreturn.h>
+
+enum {
+        CROS_EC_SENSOR_X,
+        CROS_EC_SENSOR_Y,
+        CROS_EC_SENSOR_Z,
+        CROS_EC_SENSOR_MAX_AXIS,
+};
+
+/* EC returns sensor values using signed 16 bit registers */
+#define CROS_EC_SENSOR_BITS 16
+
+/*
+ * 4 16 bit channels are allowed.
+ * Good enough for current sensors, they use up to 3 16 bit vectors.
+ */
+#define CROS_EC_SAMPLE_SIZE  (sizeof(s64) * 2)
+
+/* Minimum sampling period to use when device is suspending */
+#define CROS_EC_MIN_SUSPEND_SAMPLING_FREQUENCY 1000  /* 1 second */
+
+/**
+ * struct cros_ec_sensors_core_state - state data for EC sensors IIO driver
+ * @ec:                         cros EC device structure
+ * @cmd_lock:                   lock used to prevent simultaneous access to the
+ *                              commands.
+ * @msg:                        cros EC command structure
+ * @param:                      motion sensor parameters structure
+ * @resp:                       motion sensor response structure
+ * @type:                       type of motion sensor
+ * @loc:                        location where the motion sensor is placed
+ * @calib:                      calibration parameters. Note that trigger
+ *                              captured data will always provide the calibrated
+ *                              data
+ * @samples:                    static array to hold data from a single capture.
+ *                              For each channel we need 2 bytes, except for
+ *                              the timestamp. The timestamp is always last and
+ *                              is always 8-byte aligned.
+ * @read_ec_sensors_data:       function used for accessing sensors values
+ * @cuur_sampl_freq:            current sampling period
+ */
+struct cros_ec_sensors_core_state {
+        struct cros_ec_device *ec;
+        struct mutex cmd_lock;
+
+        struct cros_ec_command *msg;
+        struct ec_params_motion_sense param;
+        struct ec_response_motion_sense *resp;
+
+        enum motionsensor_type type;
+        enum motionsensor_location loc;
+
+        s16 calib[CROS_EC_SENSOR_MAX_AXIS];
+
+        u8 samples[CROS_EC_SAMPLE_SIZE];
+
+        int (*read_ec_sensors_data)(struct iio_dev *indio_dev,
+                                    unsigned long scan_mask, s16 *data);
+
+        int curr_sampl_freq;
+};
+
+/**
+ * cros_ec_sensors_read_lpc() - retrieve data from EC shared memory
+ * @indio_dev:  pointer to IIO 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 on success, -errno on failure.
+ */
+int cros_ec_sensors_read_lpc(struct iio_dev *indio_dev, unsigned long scan_mask,
+                             s16 *data);
+
+/**
+ * cros_ec_sensors_read_cmd() - retrieve data using the EC command protocol
+ * @indio_dev:  pointer to IIO device
+ * @scan_mask:  bitmap of the sensor indices to scan
+ * @data:       location to store data
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+int cros_ec_sensors_read_cmd(struct iio_dev *indio_dev, unsigned long scan_mask,
+                             s16 *data);
+
+/**
+ * cros_ec_sensors_core_init() - basic initialization of the core structure
+ * @pdev:               platform device created for the sensors
+ * @indio_dev:          iio device structure of the device
+ * @physical_device:    true if the device refers to a physical device
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+int cros_ec_sensors_core_init(struct platform_device *pdev,
+                              struct iio_dev *indio_dev, bool physical_device);
+
+/**
+ * cros_ec_sensors_capture() - the trigger handler function
+ * @irq:        the interrupt number.
+ * @p:          a pointer to the poll function.
+ *
+ * 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
+ */
+irqreturn_t cros_ec_sensors_capture(int irq, void *p);
+
+/**
+ * cros_ec_motion_send_host_cmd() - send motion sense host command
+ * @st:         pointer to state information for device
+ * @opt_length: optional length to reduce the response size, useful on the data
+ *              path. Otherwise, the maximal allowed response size is used
+ *
+ * When called, the sub-command is assumed to be set in param->cmd.
+ *
+ * Return: 0 on success, -errno on failure.
+ */
+int cros_ec_motion_send_host_cmd(struct cros_ec_sensors_core_state *st,
+                                 u16 opt_length);
+
+/**
+ * cros_ec_sensors_core_read() - function to request a value from the sensor
+ * @st:         pointer to state information for device
+ * @chan:       channel specification structure table
+ * @val:        will contain one element making up the returned value
+ * @val2:       will contain another element making up the returned value
+ * @mask:       specifies which values to be requested
+ *
+ * Return:      the type of value returned by the device
+ */
+int cros_ec_sensors_core_read(struct cros_ec_sensors_core_state *st,
+                              struct iio_chan_spec const *chan,
+                              int *val, int *val2, long mask);
+
+/**
+ * cros_ec_sensors_core_write() - function to write a value to the sensor
+ * @st:         pointer to state information for device
+ * @chan:       channel specification structure table
+ * @val:        first part of value to write
+ * @val2:       second part of value to write
+ * @mask:       specifies which values to write
+ *
+ * Return:      the type of value returned by the device
+ */
+int cros_ec_sensors_core_write(struct cros_ec_sensors_core_state *st,
+                               struct iio_chan_spec const *chan,
+                               int val, int val2, long mask);
+
+/* List of extended channel specification for all sensors */
+extern const struct iio_chan_spec_ext_info cros_ec_sensors_ext_info[];
+
+#endif  /* __CROS_EC_SENSORS_CORE_H */
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
index b5beea53d6f6..7ef94a90ecf7 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
@@ -201,7 +201,7 @@ int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st,
         int ret;
 
         if (val1 < 0 || val2 < 0)
-                ret = -EINVAL;
+                return -EINVAL;
 
         value = val1 * pow_10(6) + val2;
         if (value) {
@@ -250,6 +250,9 @@ int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st,
         s32 value;
         int ret;
 
+        if (val1 < 0 || val2 < 0)
+                return -EINVAL;
+
         value = convert_to_vtf_format(st->sensitivity.size,
                                 st->sensitivity.unit_expo,
                                 val1, val2);
diff --git a/drivers/iio/counter/104-quad-8.c b/drivers/iio/counter/104-quad-8.c
new file mode 100644
index 000000000000..2d2ee353dde7
--- /dev/null
+++ b/drivers/iio/counter/104-quad-8.c
@@ -0,0 +1,593 @@
+/*
+ * IIO driver for the ACCES 104-QUAD-8
+ * Copyright (C) 2016 William Breathitt Gray
+ *
+ * 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.
+ *
+ * This driver supports the ACCES 104-QUAD-8 and ACCES 104-QUAD-4.
+ */
+#include <linux/bitops.h>
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/types.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/isa.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+
+#define QUAD8_EXTENT 32
+
+static unsigned int base[max_num_isa_dev(QUAD8_EXTENT)];
+static unsigned int num_quad8;
+module_param_array(base, uint, &num_quad8, 0);
+MODULE_PARM_DESC(base, "ACCES 104-QUAD-8 base addresses");
+
+#define QUAD8_NUM_COUNTERS 8
+
+/**
+ * struct quad8_iio - IIO device private data structure
+ * @preset:             array of preset values
+ * @count_mode:         array of count mode configurations
+ * @quadrature_mode:    array of quadrature mode configurations
+ * @quadrature_scale:   array of quadrature mode scale configurations
+ * @ab_enable:          array of A and B inputs enable configurations
+ * @preset_enable:      array of set_to_preset_on_index attribute configurations
+ * @synchronous_mode:   array of index function synchronous mode configurations
+ * @index_polarity:     array of index function polarity configurations
+ * @base:               base port address of the IIO device
+ */
+struct quad8_iio {
+        unsigned int preset[QUAD8_NUM_COUNTERS];
+        unsigned int count_mode[QUAD8_NUM_COUNTERS];
+        unsigned int quadrature_mode[QUAD8_NUM_COUNTERS];
+        unsigned int quadrature_scale[QUAD8_NUM_COUNTERS];
+        unsigned int ab_enable[QUAD8_NUM_COUNTERS];
+        unsigned int preset_enable[QUAD8_NUM_COUNTERS];
+        unsigned int synchronous_mode[QUAD8_NUM_COUNTERS];
+        unsigned int index_polarity[QUAD8_NUM_COUNTERS];
+        unsigned int base;
+};
+
+static int quad8_read_raw(struct iio_dev *indio_dev,
+        struct iio_chan_spec const *chan, int *val, int *val2, long mask)
+{
+        struct quad8_iio *const priv = iio_priv(indio_dev);
+        const int base_offset = priv->base + 2 * chan->channel;
+        unsigned int flags;
+        unsigned int borrow;
+        unsigned int carry;
+        int i;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                if (chan->type == IIO_INDEX) {
+                        *val = !!(inb(priv->base + 0x16) & BIT(chan->channel));
+                        return IIO_VAL_INT;
+                }
+
+                flags = inb(base_offset);
+                borrow = flags & BIT(0);
+                carry = !!(flags & BIT(1));
+
+                /* Borrow XOR Carry effectively doubles count range */
+                *val = (borrow ^ carry) << 24;
+
+                /* Reset Byte Pointer; transfer Counter to Output Latch */
+                outb(0x11, base_offset + 1);
+
+                for (i = 0; i < 3; i++)
+                        *val |= (unsigned int)inb(base_offset) << (8 * i);
+
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_ENABLE:
+                *val = priv->ab_enable[chan->channel];
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                *val = 1;
+                *val2 = priv->quadrature_scale[chan->channel];
+                return IIO_VAL_FRACTIONAL_LOG2;
+        }
+
+        return -EINVAL;
+}
+
+static int quad8_write_raw(struct iio_dev *indio_dev,
+        struct iio_chan_spec const *chan, int val, int val2, long mask)
+{
+        struct quad8_iio *const priv = iio_priv(indio_dev);
+        const int base_offset = priv->base + 2 * chan->channel;
+        int i;
+        unsigned int ior_cfg;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                if (chan->type == IIO_INDEX)
+                        return -EINVAL;
+
+                /* Only 24-bit values are supported */
+                if ((unsigned int)val > 0xFFFFFF)
+                        return -EINVAL;
+
+                /* Reset Byte Pointer */
+                outb(0x01, base_offset + 1);
+
+                /* Counter can only be set via Preset Register */
+                for (i = 0; i < 3; i++)
+                        outb(val >> (8 * i), base_offset);
+
+                /* Transfer Preset Register to Counter */
+                outb(0x08, base_offset + 1);
+
+                /* Reset Byte Pointer */
+                outb(0x01, base_offset + 1);
+
+                /* Set Preset Register back to original value */
+                val = priv->preset[chan->channel];
+                for (i = 0; i < 3; i++)
+                        outb(val >> (8 * i), base_offset);
+
+                /* Reset Borrow, Carry, Compare, and Sign flags */
+                outb(0x02, base_offset + 1);
+                /* Reset Error flag */
+                outb(0x06, base_offset + 1);
+
+                return 0;
+        case IIO_CHAN_INFO_ENABLE:
+                /* only boolean values accepted */
+                if (val < 0 || val > 1)
+                        return -EINVAL;
+
+                priv->ab_enable[chan->channel] = val;
+
+                ior_cfg = val | priv->preset_enable[chan->channel] << 1;
+
+                /* Load I/O control configuration */
+                outb(0x40 | ior_cfg, base_offset);
+
+                return 0;
+        case IIO_CHAN_INFO_SCALE:
+                /* Quadrature scaling only available in quadrature mode */
+                if (!priv->quadrature_mode[chan->channel] && (val2 || val != 1))
+                        return -EINVAL;
+
+                /* Only three gain states (1, 0.5, 0.25) */
+                if (val == 1 && !val2)
+                        priv->quadrature_scale[chan->channel] = 0;
+                else if (!val)
+                        switch (val2) {
+                        case 500000:
+                                priv->quadrature_scale[chan->channel] = 1;
+                                break;
+                        case 250000:
+                                priv->quadrature_scale[chan->channel] = 2;
+                                break;
+                        default:
+                                return -EINVAL;
+                        }
+                else
+                        return -EINVAL;
+
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
+static const struct iio_info quad8_info = {
+        .driver_module = THIS_MODULE,
+        .read_raw = quad8_read_raw,
+        .write_raw = quad8_write_raw
+};
+
+static ssize_t quad8_read_preset(struct iio_dev *indio_dev, uintptr_t private,
+        const struct iio_chan_spec *chan, char *buf)
+{
+        const struct quad8_iio *const priv = iio_priv(indio_dev);
+
+        return snprintf(buf, PAGE_SIZE, "%u\n", priv->preset[chan->channel]);
+}
+
+static ssize_t quad8_write_preset(struct iio_dev *indio_dev, uintptr_t private,
+        const struct iio_chan_spec *chan, const char *buf, size_t len)
+{
+        struct quad8_iio *const priv = iio_priv(indio_dev);
+        const int base_offset = priv->base + 2 * chan->channel;
+        unsigned int preset;
+        int ret;
+        int i;
+
+        ret = kstrtouint(buf, 0, &preset);
+        if (ret)
+                return ret;
+
+        /* Only 24-bit values are supported */
+        if (preset > 0xFFFFFF)
+                return -EINVAL;
+
+        priv->preset[chan->channel] = preset;
+
+        /* Reset Byte Pointer */
+        outb(0x01, base_offset + 1);
+
+        /* Set Preset Register */
+        for (i = 0; i < 3; i++)
+                outb(preset >> (8 * i), base_offset);
+
+        return len;
+}
+
+static ssize_t quad8_read_set_to_preset_on_index(struct iio_dev *indio_dev,
+        uintptr_t private, const struct iio_chan_spec *chan, char *buf)
+{
+        const struct quad8_iio *const priv = iio_priv(indio_dev);
+
+        return snprintf(buf, PAGE_SIZE, "%u\n",
+                priv->preset_enable[chan->channel]);
+}
+
+static ssize_t quad8_write_set_to_preset_on_index(struct iio_dev *indio_dev,
+        uintptr_t private, const struct iio_chan_spec *chan, const char *buf,
+        size_t len)
+{
+        struct quad8_iio *const priv = iio_priv(indio_dev);
+        const int base_offset = priv->base + 2 * chan->channel;
+        bool preset_enable;
+        int ret;
+        unsigned int ior_cfg;
+
+        ret = kstrtobool(buf, &preset_enable);
+        if (ret)
+                return ret;
+
+        priv->preset_enable[chan->channel] = preset_enable;
+
+        ior_cfg = priv->ab_enable[chan->channel] |
+                (unsigned int)preset_enable << 1;
+
+        /* Load I/O control configuration to Input / Output Control Register */
+        outb(0x40 | ior_cfg, base_offset);
+
+        return len;
+}
+
+static const char *const quad8_noise_error_states[] = {
+        "No excessive noise is present at the count inputs",
+        "Excessive noise is present at the count inputs"
+};
+
+static int quad8_get_noise_error(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan)
+{
+        struct quad8_iio *const priv = iio_priv(indio_dev);
+        const int base_offset = priv->base + 2 * chan->channel + 1;
+
+        return !!(inb(base_offset) & BIT(4));
+}
+
+static const struct iio_enum quad8_noise_error_enum = {
+        .items = quad8_noise_error_states,
+        .num_items = ARRAY_SIZE(quad8_noise_error_states),
+        .get = quad8_get_noise_error
+};
+
+static const char *const quad8_count_direction_states[] = {
+        "down",
+        "up"
+};
+
+static int quad8_get_count_direction(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan)
+{
+        struct quad8_iio *const priv = iio_priv(indio_dev);
+        const int base_offset = priv->base + 2 * chan->channel + 1;
+
+        return !!(inb(base_offset) & BIT(5));
+}
+
+static const struct iio_enum quad8_count_direction_enum = {
+        .items = quad8_count_direction_states,
+        .num_items = ARRAY_SIZE(quad8_count_direction_states),
+        .get = quad8_get_count_direction
+};
+
+static const char *const quad8_count_modes[] = {
+        "normal",
+        "range limit",
+        "non-recycle",
+        "modulo-n"
+};
+
+static int quad8_set_count_mode(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, unsigned int count_mode)
+{
+        struct quad8_iio *const priv = iio_priv(indio_dev);
+        unsigned int mode_cfg = count_mode << 1;
+        const int base_offset = priv->base + 2 * chan->channel + 1;
+
+        priv->count_mode[chan->channel] = count_mode;
+
+        /* Add quadrature mode configuration */
+        if (priv->quadrature_mode[chan->channel])
+                mode_cfg |= (priv->quadrature_scale[chan->channel] + 1) << 3;
+
+        /* Load mode configuration to Counter Mode Register */
+        outb(0x20 | mode_cfg, base_offset);
+
+        return 0;
+}
+
+static int quad8_get_count_mode(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan)
+{
+        const struct quad8_iio *const priv = iio_priv(indio_dev);
+
+        return priv->count_mode[chan->channel];
+}
+
+static const struct iio_enum quad8_count_mode_enum = {
+        .items = quad8_count_modes,
+        .num_items = ARRAY_SIZE(quad8_count_modes),
+        .set = quad8_set_count_mode,
+        .get = quad8_get_count_mode
+};
+
+static const char *const quad8_synchronous_modes[] = {
+        "non-synchronous",
+        "synchronous"
+};
+
+static int quad8_set_synchronous_mode(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, unsigned int synchronous_mode)
+{
+        struct quad8_iio *const priv = iio_priv(indio_dev);
+        const unsigned int idr_cfg = synchronous_mode |
+                priv->index_polarity[chan->channel] << 1;
+        const int base_offset = priv->base + 2 * chan->channel + 1;
+
+        /* Index function must be non-synchronous in non-quadrature mode */
+        if (synchronous_mode && !priv->quadrature_mode[chan->channel])
+                return -EINVAL;
+
+        priv->synchronous_mode[chan->channel] = synchronous_mode;
+
+        /* Load Index Control configuration to Index Control Register */
+        outb(0x40 | idr_cfg, base_offset);
+
+        return 0;
+}
+
+static int quad8_get_synchronous_mode(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan)
+{
+        const struct quad8_iio *const priv = iio_priv(indio_dev);
+
+        return priv->synchronous_mode[chan->channel];
+}
+
+static const struct iio_enum quad8_synchronous_mode_enum = {
+        .items = quad8_synchronous_modes,
+        .num_items = ARRAY_SIZE(quad8_synchronous_modes),
+        .set = quad8_set_synchronous_mode,
+        .get = quad8_get_synchronous_mode
+};
+
+static const char *const quad8_quadrature_modes[] = {
+        "non-quadrature",
+        "quadrature"
+};
+
+static int quad8_set_quadrature_mode(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, unsigned int quadrature_mode)
+{
+        struct quad8_iio *const priv = iio_priv(indio_dev);
+        unsigned int mode_cfg = priv->count_mode[chan->channel] << 1;
+        const int base_offset = priv->base + 2 * chan->channel + 1;
+
+        if (quadrature_mode)
+                mode_cfg |= (priv->quadrature_scale[chan->channel] + 1) << 3;
+        else {
+                /* Quadrature scaling only available in quadrature mode */
+                priv->quadrature_scale[chan->channel] = 0;
+
+                /* Synchronous function not supported in non-quadrature mode */
+                if (priv->synchronous_mode[chan->channel])
+                        quad8_set_synchronous_mode(indio_dev, chan, 0);
+        }
+
+        priv->quadrature_mode[chan->channel] = quadrature_mode;
+
+        /* Load mode configuration to Counter Mode Register */
+        outb(0x20 | mode_cfg, base_offset);
+
+        return 0;
+}
+
+static int quad8_get_quadrature_mode(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan)
+{
+        const struct quad8_iio *const priv = iio_priv(indio_dev);
+
+        return priv->quadrature_mode[chan->channel];
+}
+
+static const struct iio_enum quad8_quadrature_mode_enum = {
+        .items = quad8_quadrature_modes,
+        .num_items = ARRAY_SIZE(quad8_quadrature_modes),
+        .set = quad8_set_quadrature_mode,
+        .get = quad8_get_quadrature_mode
+};
+
+static const char *const quad8_index_polarity_modes[] = {
+        "negative",
+        "positive"
+};
+
+static int quad8_set_index_polarity(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan, unsigned int index_polarity)
+{
+        struct quad8_iio *const priv = iio_priv(indio_dev);
+        const unsigned int idr_cfg = priv->synchronous_mode[chan->channel] |
+                index_polarity << 1;
+        const int base_offset = priv->base + 2 * chan->channel + 1;
+
+        priv->index_polarity[chan->channel] = index_polarity;
+
+        /* Load Index Control configuration to Index Control Register */
+        outb(0x40 | idr_cfg, base_offset);
+
+        return 0;
+}
+
+static int quad8_get_index_polarity(struct iio_dev *indio_dev,
+        const struct iio_chan_spec *chan)
+{
+        const struct quad8_iio *const priv = iio_priv(indio_dev);
+
+        return priv->index_polarity[chan->channel];
+}
+
+static const struct iio_enum quad8_index_polarity_enum = {
+        .items = quad8_index_polarity_modes,
+        .num_items = ARRAY_SIZE(quad8_index_polarity_modes),
+        .set = quad8_set_index_polarity,
+        .get = quad8_get_index_polarity
+};
+
+static const struct iio_chan_spec_ext_info quad8_count_ext_info[] = {
+        {
+                .name = "preset",
+                .shared = IIO_SEPARATE,
+                .read = quad8_read_preset,
+                .write = quad8_write_preset
+        },
+        {
+                .name = "set_to_preset_on_index",
+                .shared = IIO_SEPARATE,
+                .read = quad8_read_set_to_preset_on_index,
+                .write = quad8_write_set_to_preset_on_index
+        },
+        IIO_ENUM("noise_error", IIO_SEPARATE, &quad8_noise_error_enum),
+        IIO_ENUM_AVAILABLE("noise_error", &quad8_noise_error_enum),
+        IIO_ENUM("count_direction", IIO_SEPARATE, &quad8_count_direction_enum),
+        IIO_ENUM_AVAILABLE("count_direction", &quad8_count_direction_enum),
+        IIO_ENUM("count_mode", IIO_SEPARATE, &quad8_count_mode_enum),
+        IIO_ENUM_AVAILABLE("count_mode", &quad8_count_mode_enum),
+        IIO_ENUM("quadrature_mode", IIO_SEPARATE, &quad8_quadrature_mode_enum),
+        IIO_ENUM_AVAILABLE("quadrature_mode", &quad8_quadrature_mode_enum),
+        {}
+};
+
+static const struct iio_chan_spec_ext_info quad8_index_ext_info[] = {
+        IIO_ENUM("synchronous_mode", IIO_SEPARATE,
+                &quad8_synchronous_mode_enum),
+        IIO_ENUM_AVAILABLE("synchronous_mode", &quad8_synchronous_mode_enum),
+        IIO_ENUM("index_polarity", IIO_SEPARATE, &quad8_index_polarity_enum),
+        IIO_ENUM_AVAILABLE("index_polarity", &quad8_index_polarity_enum),
+        {}
+};
+
+#define QUAD8_COUNT_CHAN(_chan) {                                       \
+        .type = IIO_COUNT,                                              \
+        .channel = (_chan),                                             \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |                  \
+                BIT(IIO_CHAN_INFO_ENABLE) | BIT(IIO_CHAN_INFO_SCALE),   \
+        .ext_info = quad8_count_ext_info,                               \
+        .indexed = 1                                                    \
+}
+
+#define QUAD8_INDEX_CHAN(_chan) {                       \
+        .type = IIO_INDEX,                              \
+        .channel = (_chan),                             \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),   \
+        .ext_info = quad8_index_ext_info,               \
+        .indexed = 1                                    \
+}
+
+static const struct iio_chan_spec quad8_channels[] = {
+        QUAD8_COUNT_CHAN(0), QUAD8_INDEX_CHAN(0),
+        QUAD8_COUNT_CHAN(1), QUAD8_INDEX_CHAN(1),
+        QUAD8_COUNT_CHAN(2), QUAD8_INDEX_CHAN(2),
+        QUAD8_COUNT_CHAN(3), QUAD8_INDEX_CHAN(3),
+        QUAD8_COUNT_CHAN(4), QUAD8_INDEX_CHAN(4),
+        QUAD8_COUNT_CHAN(5), QUAD8_INDEX_CHAN(5),
+        QUAD8_COUNT_CHAN(6), QUAD8_INDEX_CHAN(6),
+        QUAD8_COUNT_CHAN(7), QUAD8_INDEX_CHAN(7)
+};
+
+static int quad8_probe(struct device *dev, unsigned int id)
+{
+        struct iio_dev *indio_dev;
+        struct quad8_iio *priv;
+        int i, j;
+        unsigned int base_offset;
+
+        indio_dev = devm_iio_device_alloc(dev, sizeof(*priv));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        if (!devm_request_region(dev, base[id], QUAD8_EXTENT,
+                dev_name(dev))) {
+                dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",
+                        base[id], base[id] + QUAD8_EXTENT);
+                return -EBUSY;
+        }
+
+        indio_dev->info = &quad8_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->num_channels = ARRAY_SIZE(quad8_channels);
+        indio_dev->channels = quad8_channels;
+        indio_dev->name = dev_name(dev);
+
+        priv = iio_priv(indio_dev);
+        priv->base = base[id];
+
+        /* Reset all counters and disable interrupt function */
+        outb(0x01, base[id] + 0x11);
+        /* Set initial configuration for all counters */
+        for (i = 0; i < QUAD8_NUM_COUNTERS; i++) {
+                base_offset = base[id] + 2 * i;
+                /* Reset Byte Pointer */
+                outb(0x01, base_offset + 1);
+                /* Reset Preset Register */
+                for (j = 0; j < 3; j++)
+                        outb(0x00, base_offset);
+                /* Reset Borrow, Carry, Compare, and Sign flags */
+                outb(0x04, base_offset + 1);
+                /* Reset Error flag */
+                outb(0x06, base_offset + 1);
+                /* Binary encoding; Normal count; non-quadrature mode */
+                outb(0x20, base_offset + 1);
+                /* Disable A and B inputs; preset on index; FLG1 as Carry */
+                outb(0x40, base_offset + 1);
+                /* Disable index function; negative index polarity */
+                outb(0x60, base_offset + 1);
+        }
+        /* Enable all counters */
+        outb(0x00, base[id] + 0x11);
+
+        return devm_iio_device_register(dev, indio_dev);
+}
+
+static struct isa_driver quad8_driver = {
+        .probe = quad8_probe,
+        .driver = {
+                .name = "104-quad-8"
+        }
+};
+
+module_isa_driver(quad8_driver, num_quad8);
+
+MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
+MODULE_DESCRIPTION("ACCES 104-QUAD-8 IIO driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/counter/Kconfig b/drivers/iio/counter/Kconfig
new file mode 100644
index 000000000000..44627f6e4861
--- /dev/null
+++ b/drivers/iio/counter/Kconfig
@@ -0,0 +1,24 @@
+#
+# Counter devices
+#
+# When adding new entries keep the list in alphabetical order
+
+menu "Counters"
+
+config 104_QUAD_8
+        tristate "ACCES 104-QUAD-8 driver"
+        depends on X86 && ISA_BUS_API
+        help
+          Say yes here to build support for the ACCES 104-QUAD-8 quadrature
+          encoder counter/interface device family (104-QUAD-8, 104-QUAD-4).
+
+          Performing a write to a counter's IIO_CHAN_INFO_RAW sets the counter and
+          also clears the counter's respective error flag. Although the counters
+          have a 25-bit range, only the lower 24 bits may be set, either directly
+          or via a counter's preset attribute. Interrupts are not supported by
+          this driver.
+
+          The base port addresses for the devices may be configured via the base
+          array module parameter.
+
+endmenu
diff --git a/drivers/iio/counter/Makefile b/drivers/iio/counter/Makefile
new file mode 100644
index 000000000000..007e88411648
--- /dev/null
+++ b/drivers/iio/counter/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for IIO counter devices
+#
+
+# When adding new entries keep the list in alphabetical order
+
+obj-$(CONFIG_104_QUAD_8)        += 104-quad-8.o
diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
index 120b24478469..d3084028905b 100644
--- a/drivers/iio/dac/Kconfig
+++ b/drivers/iio/dac/Kconfig
@@ -200,6 +200,16 @@ config AD8801
           To compile this driver as a module choose M here: the module will be called
           ad8801.
 
+config DPOT_DAC
+        tristate "DAC emulation using a DPOT"
+        depends on OF
+        help
+          Say yes here to build support for DAC emulation using a digital
+          potentiometer.
+
+          To compile this driver as a module, choose M here: the module will be
+          called dpot-dac.
+
 config LPC18XX_DAC
         tristate "NXP LPC18xx DAC driver"
         depends on ARCH_LPC18XX || COMPILE_TEST
diff --git a/drivers/iio/dac/Makefile b/drivers/iio/dac/Makefile
index 27642bbf75f2..f01bf4a99867 100644
--- a/drivers/iio/dac/Makefile
+++ b/drivers/iio/dac/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_AD5686) += ad5686.o
 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_LPC18XX_DAC) += lpc18xx_dac.o
 obj-$(CONFIG_M62332) += m62332.o
 obj-$(CONFIG_MAX517) += max517.o
diff --git a/drivers/iio/dac/ad5592r.c b/drivers/iio/dac/ad5592r.c
index 0b235a2c7359..6eed5b7729be 100644
--- a/drivers/iio/dac/ad5592r.c
+++ b/drivers/iio/dac/ad5592r.c
@@ -17,7 +17,7 @@
 #define AD5592R_GPIO_READBACK_EN        BIT(10)
 #define AD5592R_LDAC_READBACK_EN        BIT(6)
 
-static int ad5592r_spi_wnop_r16(struct ad5592r_state *st, u16 *buf)
+static int ad5592r_spi_wnop_r16(struct ad5592r_state *st, __be16 *buf)
 {
         struct spi_device *spi = container_of(st->dev, struct spi_device, dev);
         struct spi_transfer t = {
diff --git a/drivers/iio/dac/dpot-dac.c b/drivers/iio/dac/dpot-dac.c
new file mode 100644
index 000000000000..960a2b430480
--- /dev/null
+++ b/drivers/iio/dac/dpot-dac.c
@@ -0,0 +1,266 @@
+/*
+ * IIO DAC emulation driver using a digital potentiometer
+ *
+ * Copyright (C) 2016 Axentia Technologies AB
+ *
+ * Author: Peter Rosin <peda@axentia.se>
+ *
+ * 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.
+ */
+
+/*
+ * It is assumed that the dpot is used as a voltage divider between the
+ * current dpot wiper setting and the maximum resistance of the dpot. The
+ * divided voltage is provided by a vref regulator.
+ *
+ *                   .------.
+ *    .-----------.  |      |
+ *    | vref      |--'    .---.
+ *    | regulator |--.    |   |
+ *    '-----------'  |    | d |
+ *                   |    | p |
+ *                   |    | o |  wiper
+ *                   |    | t |<---------+
+ *                   |    |   |
+ *                   |    '---'       dac output voltage
+ *                   |      |
+ *                   '------+------------+
+ */
+
+#include <linux/err.h>
+#include <linux/iio/consumer.h>
+#include <linux/iio/iio.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+
+struct dpot_dac {
+        struct regulator *vref;
+        struct iio_channel *dpot;
+        u32 max_ohms;
+};
+
+static const struct iio_chan_spec dpot_dac_iio_channel = {
+        .type = IIO_VOLTAGE,
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW)
+                            | BIT(IIO_CHAN_INFO_SCALE),
+        .info_mask_separate_available = BIT(IIO_CHAN_INFO_RAW),
+        .output = 1,
+        .indexed = 1,
+};
+
+static int dpot_dac_read_raw(struct iio_dev *indio_dev,
+                             struct iio_chan_spec const *chan,
+                             int *val, int *val2, long mask)
+{
+        struct dpot_dac *dac = iio_priv(indio_dev);
+        int ret;
+        unsigned long long tmp;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                return iio_read_channel_raw(dac->dpot, val);
+
+        case IIO_CHAN_INFO_SCALE:
+                ret = iio_read_channel_scale(dac->dpot, val, val2);
+                switch (ret) {
+                case IIO_VAL_FRACTIONAL_LOG2:
+                        tmp = *val * 1000000000LL;
+                        do_div(tmp, dac->max_ohms);
+                        tmp *= regulator_get_voltage(dac->vref) / 1000;
+                        do_div(tmp, 1000000000LL);
+                        *val = tmp;
+                        return ret;
+                case IIO_VAL_INT:
+                        /*
+                         * Convert integer scale to fractional scale by
+                         * setting the denominator (val2) to one...
+                         */
+                        *val2 = 1;
+                        ret = IIO_VAL_FRACTIONAL;
+                        /* ...and fall through. */
+                case IIO_VAL_FRACTIONAL:
+                        *val *= regulator_get_voltage(dac->vref) / 1000;
+                        *val2 *= dac->max_ohms;
+                        break;
+                }
+
+                return ret;
+        }
+
+        return -EINVAL;
+}
+
+static int dpot_dac_read_avail(struct iio_dev *indio_dev,
+                               struct iio_chan_spec const *chan,
+                               const int **vals, int *type, int *length,
+                               long mask)
+{
+        struct dpot_dac *dac = iio_priv(indio_dev);
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                *type = IIO_VAL_INT;
+                return iio_read_avail_channel_raw(dac->dpot, vals, length);
+        }
+
+        return -EINVAL;
+}
+
+static int dpot_dac_write_raw(struct iio_dev *indio_dev,
+                              struct iio_chan_spec const *chan,
+                              int val, int val2, long mask)
+{
+        struct dpot_dac *dac = iio_priv(indio_dev);
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                return iio_write_channel_raw(dac->dpot, val);
+        }
+
+        return -EINVAL;
+}
+
+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)
+{
+        struct device *dev = &indio_dev->dev;
+        struct dpot_dac *dac = iio_priv(indio_dev);
+        unsigned long long tmp;
+        int ret;
+        int val;
+        int val2;
+        int max;
+
+        ret = iio_read_max_channel_raw(dac->dpot, &max);
+        if (ret < 0) {
+                dev_err(dev, "dpot does not indicate its raw maximum value\n");
+                return ret;
+        }
+
+        switch (iio_read_channel_scale(dac->dpot, &val, &val2)) {
+        case IIO_VAL_INT:
+                return max * val;
+        case IIO_VAL_FRACTIONAL:
+                tmp = (unsigned long long)max * val;
+                do_div(tmp, val2);
+                return tmp;
+        case IIO_VAL_FRACTIONAL_LOG2:
+                tmp = val * 1000000000LL * max >> val2;
+                do_div(tmp, 1000000000LL);
+                return tmp;
+        default:
+                dev_err(dev, "dpot has a scale that is too weird\n");
+        }
+
+        return -EINVAL;
+}
+
+static int dpot_dac_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct iio_dev *indio_dev;
+        struct dpot_dac *dac;
+        enum iio_chan_type type;
+        int ret;
+
+        indio_dev = devm_iio_device_alloc(dev, sizeof(*dac));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, indio_dev);
+        dac = iio_priv(indio_dev);
+
+        indio_dev->name = dev_name(dev);
+        indio_dev->dev.parent = dev;
+        indio_dev->info = &dpot_dac_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->channels = &dpot_dac_iio_channel;
+        indio_dev->num_channels = 1;
+
+        dac->vref = devm_regulator_get(dev, "vref");
+        if (IS_ERR(dac->vref)) {
+                if (PTR_ERR(dac->vref) != -EPROBE_DEFER)
+                        dev_err(&pdev->dev, "failed to get vref regulator\n");
+                return PTR_ERR(dac->vref);
+        }
+
+        dac->dpot = devm_iio_channel_get(dev, "dpot");
+        if (IS_ERR(dac->dpot)) {
+                if (PTR_ERR(dac->dpot) != -EPROBE_DEFER)
+                        dev_err(dev, "failed to get dpot input channel\n");
+                return PTR_ERR(dac->dpot);
+        }
+
+        ret = iio_get_channel_type(dac->dpot, &type);
+        if (ret < 0)
+                return ret;
+
+        if (type != IIO_RESISTANCE) {
+                dev_err(dev, "dpot is of the wrong type\n");
+                return -EINVAL;
+        }
+
+        ret = dpot_dac_channel_max_ohms(indio_dev);
+        if (ret < 0)
+                return ret;
+        dac->max_ohms = ret;
+
+        ret = regulator_enable(dac->vref);
+        if (ret) {
+                dev_err(dev, "failed to enable the vref regulator\n");
+                return ret;
+        }
+
+        ret = iio_device_register(indio_dev);
+        if (ret) {
+                dev_err(dev, "failed to register iio device\n");
+                goto disable_reg;
+        }
+
+        return 0;
+
+disable_reg:
+        regulator_disable(dac->vref);
+        return ret;
+}
+
+static int dpot_dac_remove(struct platform_device *pdev)
+{
+        struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+        struct dpot_dac *dac = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+        regulator_disable(dac->vref);
+
+        return 0;
+}
+
+static const struct of_device_id dpot_dac_match[] = {
+        { .compatible = "dpot-dac" },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, dpot_dac_match);
+
+static struct platform_driver dpot_dac_driver = {
+        .probe = dpot_dac_probe,
+        .remove = dpot_dac_remove,
+        .driver = {
+                .name = "iio-dpot-dac",
+                .of_match_table = dpot_dac_match,
+        },
+};
+module_platform_driver(dpot_dac_driver);
+
+MODULE_DESCRIPTION("DAC emulation driver using a digital potentiometer");
+MODULE_AUTHOR("Peter Rosin <peda@axentia.se>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/dac/mcp4725.c b/drivers/iio/dac/mcp4725.c
index cca935c06f2b..db109f0cdd8c 100644
--- a/drivers/iio/dac/mcp4725.c
+++ b/drivers/iio/dac/mcp4725.c
@@ -18,6 +18,8 @@
 #include <linux/i2c.h>
 #include <linux/err.h>
 #include <linux/delay.h>
+#include <linux/regulator/consumer.h>
+#include <linux/of.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
@@ -26,12 +28,20 @@
 
 #define MCP4725_DRV_NAME "mcp4725"
 
+#define MCP472X_REF_VDD                 0x00
+#define MCP472X_REF_VREF_UNBUFFERED     0x02
+#define MCP472X_REF_VREF_BUFFERED       0x03
+
 struct mcp4725_data {
         struct i2c_client *client;
-        u16 vref_mv;
+        int id;
+        unsigned ref_mode;
+        bool vref_buffered;
         u16 dac_value;
         bool powerdown;
         unsigned powerdown_mode;
+        struct regulator *vdd_reg;
+        struct regulator *vref_reg;
 };
 
 static int mcp4725_suspend(struct device *dev)
@@ -86,6 +96,7 @@ static ssize_t mcp4725_store_eeprom(struct device *dev,
                 return 0;
 
         inoutbuf[0] = 0x60; /* write EEPROM */
+        inoutbuf[0] |= data->ref_mode << 3;
         inoutbuf[1] = data->dac_value >> 4;
         inoutbuf[2] = (data->dac_value & 0xf) << 4;
 
@@ -278,18 +289,49 @@ static int mcp4725_set_value(struct iio_dev *indio_dev, int val)
                 return 0;
 }
 
+static int mcp4726_set_cfg(struct iio_dev *indio_dev)
+{
+        struct mcp4725_data *data = iio_priv(indio_dev);
+        u8 outbuf[3];
+        int ret;
+
+        outbuf[0] = 0x40;
+        outbuf[0] |= data->ref_mode << 3;
+        if (data->powerdown)
+                outbuf[0] |= data->powerdown << 1;
+        outbuf[1] = data->dac_value >> 4;
+        outbuf[2] = (data->dac_value & 0xf) << 4;
+
+        ret = i2c_master_send(data->client, outbuf, 3);
+        if (ret < 0)
+                return ret;
+        else if (ret != 3)
+                return -EIO;
+        else
+                return 0;
+}
+
 static int mcp4725_read_raw(struct iio_dev *indio_dev,
                            struct iio_chan_spec const *chan,
                            int *val, int *val2, long mask)
 {
         struct mcp4725_data *data = iio_priv(indio_dev);
+        int ret;
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
                 *val = data->dac_value;
                 return IIO_VAL_INT;
         case IIO_CHAN_INFO_SCALE:
-                *val = data->vref_mv;
+                if (data->ref_mode == MCP472X_REF_VDD)
+                        ret = regulator_get_voltage(data->vdd_reg);
+                else
+                        ret = regulator_get_voltage(data->vref_reg);
+
+                if (ret < 0)
+                        return ret;
+
+                *val = ret / 1000;
                 *val2 = 12;
                 return IIO_VAL_FRACTIONAL_LOG2;
         }
@@ -323,27 +365,98 @@ static const struct iio_info mcp4725_info = {
         .driver_module = THIS_MODULE,
 };
 
+#ifdef CONFIG_OF
+static int mcp4725_probe_dt(struct device *dev,
+                            struct mcp4725_platform_data *pdata)
+{
+        struct device_node *np = dev->of_node;
+
+        if (!np)
+                return -ENODEV;
+
+        /* check if is the vref-supply defined */
+        pdata->use_vref = of_property_read_bool(np, "vref-supply");
+        pdata->vref_buffered =
+                of_property_read_bool(np, "microchip,vref-buffered");
+
+        return 0;
+}
+#else
+static int mcp4725_probe_dt(struct device *dev,
+                            struct mcp4725_platform_data *platform_data)
+{
+        return -ENODEV;
+}
+#endif
+
 static int mcp4725_probe(struct i2c_client *client,
                          const struct i2c_device_id *id)
 {
         struct mcp4725_data *data;
         struct iio_dev *indio_dev;
-        struct mcp4725_platform_data *platform_data = client->dev.platform_data;
-        u8 inbuf[3];
+        struct mcp4725_platform_data *pdata, pdata_dt;
+        u8 inbuf[4];
         u8 pd;
+        u8 ref;
         int err;
 
-        if (!platform_data || !platform_data->vref_mv) {
-                dev_err(&client->dev, "invalid platform data");
-                return -EINVAL;
-        }
-
         indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
         if (indio_dev == NULL)
                 return -ENOMEM;
         data = iio_priv(indio_dev);
         i2c_set_clientdata(client, indio_dev);
         data->client = client;
+        data->id = id->driver_data;
+        pdata = dev_get_platdata(&client->dev);
+
+        if (!pdata) {
+                err = mcp4725_probe_dt(&client->dev, &pdata_dt);
+                if (err) {
+                        dev_err(&client->dev,
+                                "invalid platform or devicetree data");
+                        return err;
+                }
+                pdata = &pdata_dt;
+        }
+
+        if (data->id == MCP4725 && pdata->use_vref) {
+                dev_err(&client->dev,
+                        "external reference is unavailable on MCP4725");
+                return -EINVAL;
+        }
+
+        if (!pdata->use_vref && pdata->vref_buffered) {
+                dev_err(&client->dev,
+                        "buffering is unavailable on the internal reference");
+                return -EINVAL;
+        }
+
+        if (!pdata->use_vref)
+                data->ref_mode = MCP472X_REF_VDD;
+        else
+                data->ref_mode = pdata->vref_buffered ?
+                        MCP472X_REF_VREF_BUFFERED :
+                        MCP472X_REF_VREF_UNBUFFERED;
+
+        data->vdd_reg = devm_regulator_get(&client->dev, "vdd");
+        if (IS_ERR(data->vdd_reg))
+                return PTR_ERR(data->vdd_reg);
+
+        err = regulator_enable(data->vdd_reg);
+        if (err)
+                return err;
+
+        if (pdata->use_vref) {
+                data->vref_reg = devm_regulator_get(&client->dev, "vref");
+                if (IS_ERR(data->vref_reg)) {
+                        err = PTR_ERR(data->vref_reg);
+                        goto err_disable_vdd_reg;
+                }
+
+                err = regulator_enable(data->vref_reg);
+                if (err)
+                        goto err_disable_vdd_reg;
+        }
 
         indio_dev->dev.parent = &client->dev;
         indio_dev->name = id->name;
@@ -352,25 +465,56 @@ static int mcp4725_probe(struct i2c_client *client,
         indio_dev->num_channels = 1;
         indio_dev->modes = INDIO_DIRECT_MODE;
 
-        data->vref_mv = platform_data->vref_mv;
+        /* read current DAC value and settings */
+        err = i2c_master_recv(client, inbuf, data->id == MCP4725 ? 3 : 4);
 
-        /* read current DAC value */
-        err = i2c_master_recv(client, inbuf, 3);
         if (err < 0) {
                 dev_err(&client->dev, "failed to read DAC value");
-                return err;
+                goto err_disable_vref_reg;
         }
         pd = (inbuf[0] >> 1) & 0x3;
         data->powerdown = pd > 0 ? true : false;
-        data->powerdown_mode = pd ? pd - 1 : 2; /* largest register to gnd */
+        data->powerdown_mode = pd ? pd - 1 : 2; /* largest resistor to gnd */
         data->dac_value = (inbuf[1] << 4) | (inbuf[2] >> 4);
+        if (data->id == MCP4726)
+                ref = (inbuf[3] >> 3) & 0x3;
+
+        if (data->id == MCP4726 && ref != data->ref_mode) {
+                dev_info(&client->dev,
+                        "voltage reference mode differs (conf: %u, eeprom: %u), setting %u",
+                        data->ref_mode, ref, data->ref_mode);
+                err = mcp4726_set_cfg(indio_dev);
+                if (err < 0)
+                        goto err_disable_vref_reg;
+        }
+ 
+        err = iio_device_register(indio_dev);
+        if (err)
+                goto err_disable_vref_reg;
+
+        return 0;
+
+err_disable_vref_reg:
+        if (data->vref_reg)
+                regulator_disable(data->vref_reg);
 
-        return iio_device_register(indio_dev);
+err_disable_vdd_reg:
+        regulator_disable(data->vdd_reg);
+
+        return err;
 }
 
 static int mcp4725_remove(struct i2c_client *client)
 {
-        iio_device_unregister(i2c_get_clientdata(client));
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct mcp4725_data *data = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+
+        if (data->vref_reg)
+                regulator_disable(data->vref_reg);
+        regulator_disable(data->vdd_reg);
+
         return 0;
 }
 
diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig
index 205a84420ae9..3126cf05e6b9 100644
--- a/drivers/iio/gyro/Kconfig
+++ b/drivers/iio/gyro/Kconfig
@@ -84,6 +84,24 @@ config HID_SENSOR_GYRO_3D
           Say yes here to build support for the HID SENSOR
           Gyroscope 3D.
 
+config MPU3050
+        tristate
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        select REGMAP
+
+config MPU3050_I2C
+        tristate "Invensense MPU3050 devices on I2C"
+        depends on !(INPUT_MPU3050=y || INPUT_MPU3050=m)
+        depends on I2C
+        select MPU3050
+        select REGMAP_I2C
+        select I2C_MUX
+        help
+          This driver supports the Invensense MPU3050 gyroscope over I2C.
+          This driver can be built as a module. The module will be called
+          inv-mpu3050-i2c.
+
 config IIO_ST_GYRO_3AXIS
         tristate "STMicroelectronics gyroscopes 3-Axis Driver"
         depends on (I2C || SPI_MASTER) && SYSFS
diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile
index f866a4be0667..f0e149a606b0 100644
--- a/drivers/iio/gyro/Makefile
+++ b/drivers/iio/gyro/Makefile
@@ -14,6 +14,11 @@ obj-$(CONFIG_BMG160_SPI) += bmg160_spi.o
 
 obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o
 
+# Currently this is rolled into one module, split it if
+# we ever create a separate SPI interface for MPU-3050
+obj-$(CONFIG_MPU3050) += mpu3050.o
+mpu3050-objs := mpu3050-core.o mpu3050-i2c.o
+
 itg3200-y               := itg3200_core.o
 itg3200-$(CONFIG_IIO_BUFFER) += itg3200_buffer.o
 obj-$(CONFIG_ITG3200)   += itg3200.o
diff --git a/drivers/iio/gyro/mpu3050-core.c b/drivers/iio/gyro/mpu3050-core.c
new file mode 100644
index 000000000000..2be2a5d287e6
--- /dev/null
+++ b/drivers/iio/gyro/mpu3050-core.c
@@ -0,0 +1,1306 @@
+/*
+ * MPU3050 gyroscope driver
+ *
+ * Copyright (C) 2016 Linaro Ltd.
+ * Author: Linus Walleij <linus.walleij@linaro.org>
+ *
+ * Based on the input subsystem driver, Copyright (C) 2011 Wistron Co.Ltd
+ * Joseph Lai <joseph_lai@wistron.com> and trimmed down by
+ * Alan Cox <alan@linux.intel.com> in turn based on bma023.c.
+ * Device behaviour based on a misc driver posted by Nathan Royer in 2011.
+ *
+ * TODO: add support for setting up the low pass 3dB frequency.
+ */
+
+#include <linux/bitops.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/iio/trigger.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/pm_runtime.h>
+#include <linux/random.h>
+#include <linux/slab.h>
+
+#include "mpu3050.h"
+
+#define MPU3050_CHIP_ID         0x69
+
+/*
+ * Register map: anything suffixed *_H is a big-endian high byte and always
+ * followed by the corresponding low byte (*_L) even though these are not
+ * explicitly included in the register definitions.
+ */
+#define MPU3050_CHIP_ID_REG     0x00
+#define MPU3050_PRODUCT_ID_REG  0x01
+#define MPU3050_XG_OFFS_TC      0x05
+#define MPU3050_YG_OFFS_TC      0x08
+#define MPU3050_ZG_OFFS_TC      0x0B
+#define MPU3050_X_OFFS_USR_H    0x0C
+#define MPU3050_Y_OFFS_USR_H    0x0E
+#define MPU3050_Z_OFFS_USR_H    0x10
+#define MPU3050_FIFO_EN         0x12
+#define MPU3050_AUX_VDDIO       0x13
+#define MPU3050_SLV_ADDR        0x14
+#define MPU3050_SMPLRT_DIV      0x15
+#define MPU3050_DLPF_FS_SYNC    0x16
+#define MPU3050_INT_CFG         0x17
+#define MPU3050_AUX_ADDR        0x18
+#define MPU3050_INT_STATUS      0x1A
+#define MPU3050_TEMP_H          0x1B
+#define MPU3050_XOUT_H          0x1D
+#define MPU3050_YOUT_H          0x1F
+#define MPU3050_ZOUT_H          0x21
+#define MPU3050_DMP_CFG1        0x35
+#define MPU3050_DMP_CFG2        0x36
+#define MPU3050_BANK_SEL        0x37
+#define MPU3050_MEM_START_ADDR  0x38
+#define MPU3050_MEM_R_W         0x39
+#define MPU3050_FIFO_COUNT_H    0x3A
+#define MPU3050_FIFO_R          0x3C
+#define MPU3050_USR_CTRL        0x3D
+#define MPU3050_PWR_MGM         0x3E
+
+/* MPU memory bank read options */
+#define MPU3050_MEM_PRFTCH      BIT(5)
+#define MPU3050_MEM_USER_BANK   BIT(4)
+/* Bits 8-11 select memory bank */
+#define MPU3050_MEM_RAM_BANK_0  0
+#define MPU3050_MEM_RAM_BANK_1  1
+#define MPU3050_MEM_RAM_BANK_2  2
+#define MPU3050_MEM_RAM_BANK_3  3
+#define MPU3050_MEM_OTP_BANK_0  4
+
+#define MPU3050_AXIS_REGS(axis) (MPU3050_XOUT_H + (axis * 2))
+
+/* Register bits */
+
+/* FIFO Enable */
+#define MPU3050_FIFO_EN_FOOTER          BIT(0)
+#define MPU3050_FIFO_EN_AUX_ZOUT        BIT(1)
+#define MPU3050_FIFO_EN_AUX_YOUT        BIT(2)
+#define MPU3050_FIFO_EN_AUX_XOUT        BIT(3)
+#define MPU3050_FIFO_EN_GYRO_ZOUT       BIT(4)
+#define MPU3050_FIFO_EN_GYRO_YOUT       BIT(5)
+#define MPU3050_FIFO_EN_GYRO_XOUT       BIT(6)
+#define MPU3050_FIFO_EN_TEMP_OUT        BIT(7)
+
+/*
+ * Digital Low Pass filter (DLPF)
+ * Full Scale (FS)
+ * and Synchronization
+ */
+#define MPU3050_EXT_SYNC_NONE           0x00
+#define MPU3050_EXT_SYNC_TEMP           0x20
+#define MPU3050_EXT_SYNC_GYROX          0x40
+#define MPU3050_EXT_SYNC_GYROY          0x60
+#define MPU3050_EXT_SYNC_GYROZ          0x80
+#define MPU3050_EXT_SYNC_ACCELX 0xA0
+#define MPU3050_EXT_SYNC_ACCELY 0xC0
+#define MPU3050_EXT_SYNC_ACCELZ 0xE0
+#define MPU3050_EXT_SYNC_MASK           0xE0
+#define MPU3050_EXT_SYNC_SHIFT          5
+
+#define MPU3050_FS_250DPS               0x00
+#define MPU3050_FS_500DPS               0x08
+#define MPU3050_FS_1000DPS              0x10
+#define MPU3050_FS_2000DPS              0x18
+#define MPU3050_FS_MASK                 0x18
+#define MPU3050_FS_SHIFT                3
+
+#define MPU3050_DLPF_CFG_256HZ_NOLPF2   0x00
+#define MPU3050_DLPF_CFG_188HZ          0x01
+#define MPU3050_DLPF_CFG_98HZ           0x02
+#define MPU3050_DLPF_CFG_42HZ           0x03
+#define MPU3050_DLPF_CFG_20HZ           0x04
+#define MPU3050_DLPF_CFG_10HZ           0x05
+#define MPU3050_DLPF_CFG_5HZ            0x06
+#define MPU3050_DLPF_CFG_2100HZ_NOLPF   0x07
+#define MPU3050_DLPF_CFG_MASK           0x07
+#define MPU3050_DLPF_CFG_SHIFT          0
+
+/* Interrupt config */
+#define MPU3050_INT_RAW_RDY_EN          BIT(0)
+#define MPU3050_INT_DMP_DONE_EN         BIT(1)
+#define MPU3050_INT_MPU_RDY_EN          BIT(2)
+#define MPU3050_INT_ANYRD_2CLEAR        BIT(4)
+#define MPU3050_INT_LATCH_EN            BIT(5)
+#define MPU3050_INT_OPEN                BIT(6)
+#define MPU3050_INT_ACTL                BIT(7)
+/* Interrupt status */
+#define MPU3050_INT_STATUS_RAW_RDY      BIT(0)
+#define MPU3050_INT_STATUS_DMP_DONE     BIT(1)
+#define MPU3050_INT_STATUS_MPU_RDY      BIT(2)
+#define MPU3050_INT_STATUS_FIFO_OVFLW   BIT(7)
+/* USR_CTRL */
+#define MPU3050_USR_CTRL_FIFO_EN        BIT(6)
+#define MPU3050_USR_CTRL_AUX_IF_EN      BIT(5)
+#define MPU3050_USR_CTRL_AUX_IF_RST     BIT(3)
+#define MPU3050_USR_CTRL_FIFO_RST       BIT(1)
+#define MPU3050_USR_CTRL_GYRO_RST       BIT(0)
+/* PWR_MGM */
+#define MPU3050_PWR_MGM_PLL_X           0x01
+#define MPU3050_PWR_MGM_PLL_Y           0x02
+#define MPU3050_PWR_MGM_PLL_Z           0x03
+#define MPU3050_PWR_MGM_CLKSEL_MASK     0x07
+#define MPU3050_PWR_MGM_STBY_ZG         BIT(3)
+#define MPU3050_PWR_MGM_STBY_YG         BIT(4)
+#define MPU3050_PWR_MGM_STBY_XG         BIT(5)
+#define MPU3050_PWR_MGM_SLEEP           BIT(6)
+#define MPU3050_PWR_MGM_RESET           BIT(7)
+#define MPU3050_PWR_MGM_MASK            0xff
+
+/*
+ * Fullscale precision is (for finest precision) +/- 250 deg/s, so the full
+ * scale is actually 500 deg/s. All 16 bits are then used to cover this scale,
+ * in two's complement.
+ */
+static unsigned int mpu3050_fs_precision[] = {
+        IIO_DEGREE_TO_RAD(250),
+        IIO_DEGREE_TO_RAD(500),
+        IIO_DEGREE_TO_RAD(1000),
+        IIO_DEGREE_TO_RAD(2000)
+};
+
+/*
+ * Regulator names
+ */
+static const char mpu3050_reg_vdd[] = "vdd";
+static const char mpu3050_reg_vlogic[] = "vlogic";
+
+static unsigned int mpu3050_get_freq(struct mpu3050 *mpu3050)
+{
+        unsigned int freq;
+
+        if (mpu3050->lpf == MPU3050_DLPF_CFG_256HZ_NOLPF2)
+                freq = 8000;
+        else
+                freq = 1000;
+        freq /= (mpu3050->divisor + 1);
+
+        return freq;
+}
+
+static int mpu3050_start_sampling(struct mpu3050 *mpu3050)
+{
+        __be16 raw_val[3];
+        int ret;
+        int i;
+
+        /* Reset */
+        ret = regmap_update_bits(mpu3050->map, MPU3050_PWR_MGM,
+                                 MPU3050_PWR_MGM_RESET, MPU3050_PWR_MGM_RESET);
+        if (ret)
+                return ret;
+
+        /* Turn on the Z-axis PLL */
+        ret = regmap_update_bits(mpu3050->map, MPU3050_PWR_MGM,
+                                 MPU3050_PWR_MGM_CLKSEL_MASK,
+                                 MPU3050_PWR_MGM_PLL_Z);
+        if (ret)
+                return ret;
+
+        /* Write calibration offset registers */
+        for (i = 0; i < 3; i++)
+                raw_val[i] = cpu_to_be16(mpu3050->calibration[i]);
+
+        ret = regmap_bulk_write(mpu3050->map, MPU3050_X_OFFS_USR_H, raw_val,
+                                sizeof(raw_val));
+        if (ret)
+                return ret;
+
+        /* Set low pass filter (sample rate), sync and full scale */
+        ret = regmap_write(mpu3050->map, MPU3050_DLPF_FS_SYNC,
+                           MPU3050_EXT_SYNC_NONE << MPU3050_EXT_SYNC_SHIFT |
+                           mpu3050->fullscale << MPU3050_FS_SHIFT |
+                           mpu3050->lpf << MPU3050_DLPF_CFG_SHIFT);
+        if (ret)
+                return ret;
+
+        /* Set up sampling frequency */
+        ret = regmap_write(mpu3050->map, MPU3050_SMPLRT_DIV, mpu3050->divisor);
+        if (ret)
+                return ret;
+
+        /*
+         * Max 50 ms start-up time after setting DLPF_FS_SYNC
+         * according to the data sheet, then wait for the next sample
+         * at this frequency T = 1000/f ms.
+         */
+        msleep(50 + 1000 / mpu3050_get_freq(mpu3050));
+
+        return 0;
+}
+
+static int mpu3050_set_8khz_samplerate(struct mpu3050 *mpu3050)
+{
+        int ret;
+        u8 divisor;
+        enum mpu3050_lpf lpf;
+
+        lpf = mpu3050->lpf;
+        divisor = mpu3050->divisor;
+
+        mpu3050->lpf = LPF_256_HZ_NOLPF; /* 8 kHz base frequency */
+        mpu3050->divisor = 0; /* Divide by 1 */
+        ret = mpu3050_start_sampling(mpu3050);
+
+        mpu3050->lpf = lpf;
+        mpu3050->divisor = divisor;
+
+        return ret;
+}
+
+static int mpu3050_read_raw(struct iio_dev *indio_dev,
+                            struct iio_chan_spec const *chan,
+                            int *val, int *val2,
+                            long mask)
+{
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+        int ret;
+        __be16 raw_val;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_OFFSET:
+                switch (chan->type) {
+                case IIO_TEMP:
+                        /* The temperature scaling is (x+23000)/280 Celsius */
+                        *val = 23000;
+                        return IIO_VAL_INT;
+                default:
+                        return -EINVAL;
+                }
+        case IIO_CHAN_INFO_CALIBBIAS:
+                switch (chan->type) {
+                case IIO_ANGL_VEL:
+                        *val = mpu3050->calibration[chan->scan_index-1];
+                        return IIO_VAL_INT;
+                default:
+                        return -EINVAL;
+                }
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                *val = mpu3050_get_freq(mpu3050);
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                switch (chan->type) {
+                case IIO_TEMP:
+                        /* Millidegrees, see about temperature scaling above */
+                        *val = 1000;
+                        *val2 = 280;
+                        return IIO_VAL_FRACTIONAL;
+                case IIO_ANGL_VEL:
+                        /*
+                         * Convert to the corresponding full scale in
+                         * radians. All 16 bits are used with sign to
+                         * span the available scale: to account for the one
+                         * missing value if we multiply by 1/S16_MAX, instead
+                         * multiply with 2/U16_MAX.
+                         */
+                        *val = mpu3050_fs_precision[mpu3050->fullscale] * 2;
+                        *val2 = U16_MAX;
+                        return IIO_VAL_FRACTIONAL;
+                default:
+                        return -EINVAL;
+                }
+        case IIO_CHAN_INFO_RAW:
+                /* Resume device */
+                pm_runtime_get_sync(mpu3050->dev);
+                mutex_lock(&mpu3050->lock);
+
+                ret = mpu3050_set_8khz_samplerate(mpu3050);
+                if (ret)
+                        goto out_read_raw_unlock;
+
+                switch (chan->type) {
+                case IIO_TEMP:
+                        ret = regmap_bulk_read(mpu3050->map, MPU3050_TEMP_H,
+                                               &raw_val, sizeof(raw_val));
+                        if (ret) {
+                                dev_err(mpu3050->dev,
+                                        "error reading temperature\n");
+                                goto out_read_raw_unlock;
+                        }
+
+                        *val = be16_to_cpu(raw_val);
+                        ret = IIO_VAL_INT;
+
+                        goto out_read_raw_unlock;
+                case IIO_ANGL_VEL:
+                        ret = regmap_bulk_read(mpu3050->map,
+                                       MPU3050_AXIS_REGS(chan->scan_index-1),
+                                       &raw_val,
+                                       sizeof(raw_val));
+                        if (ret) {
+                                dev_err(mpu3050->dev,
+                                        "error reading axis data\n");
+                                goto out_read_raw_unlock;
+                        }
+
+                        *val = be16_to_cpu(raw_val);
+                        ret = IIO_VAL_INT;
+
+                        goto out_read_raw_unlock;
+                default:
+                        ret = -EINVAL;
+                        goto out_read_raw_unlock;
+                }
+        default:
+                break;
+        }
+
+        return -EINVAL;
+
+out_read_raw_unlock:
+        mutex_unlock(&mpu3050->lock);
+        pm_runtime_mark_last_busy(mpu3050->dev);
+        pm_runtime_put_autosuspend(mpu3050->dev);
+
+        return ret;
+}
+
+static int mpu3050_write_raw(struct iio_dev *indio_dev,
+                             const struct iio_chan_spec *chan,
+                             int val, int val2, long mask)
+{
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+        /*
+         * Couldn't figure out a way to precalculate these at compile time.
+         */
+        unsigned int fs250 =
+                DIV_ROUND_CLOSEST(mpu3050_fs_precision[0] * 1000000 * 2,
+                                  U16_MAX);
+        unsigned int fs500 =
+                DIV_ROUND_CLOSEST(mpu3050_fs_precision[1] * 1000000 * 2,
+                                  U16_MAX);
+        unsigned int fs1000 =
+                DIV_ROUND_CLOSEST(mpu3050_fs_precision[2] * 1000000 * 2,
+                                  U16_MAX);
+        unsigned int fs2000 =
+                DIV_ROUND_CLOSEST(mpu3050_fs_precision[3] * 1000000 * 2,
+                                  U16_MAX);
+
+        switch (mask) {
+        case IIO_CHAN_INFO_CALIBBIAS:
+                if (chan->type != IIO_ANGL_VEL)
+                        return -EINVAL;
+                mpu3050->calibration[chan->scan_index-1] = val;
+                return 0;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                /*
+                 * The max samplerate is 8000 Hz, the minimum
+                 * 1000 / 256 ~= 4 Hz
+                 */
+                if (val < 4 || val > 8000)
+                        return -EINVAL;
+
+                /*
+                 * Above 1000 Hz we must turn off the digital low pass filter
+                 * so we get a base frequency of 8kHz to the divider
+                 */
+                if (val > 1000) {
+                        mpu3050->lpf = LPF_256_HZ_NOLPF;
+                        mpu3050->divisor = DIV_ROUND_CLOSEST(8000, val) - 1;
+                        return 0;
+                }
+
+                mpu3050->lpf = LPF_188_HZ;
+                mpu3050->divisor = DIV_ROUND_CLOSEST(1000, val) - 1;
+                return 0;
+        case IIO_CHAN_INFO_SCALE:
+                if (chan->type != IIO_ANGL_VEL)
+                        return -EINVAL;
+                /*
+                 * We support +/-250, +/-500, +/-1000 and +/2000 deg/s
+                 * which means we need to round to the closest radians
+                 * which will be roughly +/-4.3, +/-8.7, +/-17.5, +/-35
+                 * rad/s. The scale is then for the 16 bits used to cover
+                 * it 2/(2^16) of that.
+                 */
+
+                /* Just too large, set the max range */
+                if (val != 0) {
+                        mpu3050->fullscale = FS_2000_DPS;
+                        return 0;
+                }
+
+                /*
+                 * Now we're dealing with fractions below zero in millirad/s
+                 * do some integer interpolation and match with the closest
+                 * fullscale in the table.
+                 */
+                if (val2 <= fs250 ||
+                    val2 < ((fs500 + fs250) / 2))
+                        mpu3050->fullscale = FS_250_DPS;
+                else if (val2 <= fs500 ||
+                         val2 < ((fs1000 + fs500) / 2))
+                        mpu3050->fullscale = FS_500_DPS;
+                else if (val2 <= fs1000 ||
+                         val2 < ((fs2000 + fs1000) / 2))
+                        mpu3050->fullscale = FS_1000_DPS;
+                else
+                        /* Catch-all */
+                        mpu3050->fullscale = FS_2000_DPS;
+                return 0;
+        default:
+                break;
+        }
+
+        return -EINVAL;
+}
+
+static irqreturn_t mpu3050_trigger_handler(int irq, void *p)
+{
+        const struct iio_poll_func *pf = p;
+        struct iio_dev *indio_dev = pf->indio_dev;
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+        int ret;
+        /*
+         * Temperature 1*16 bits
+         * Three axes 3*16 bits
+         * Timestamp 64 bits (4*16 bits)
+         * Sum total 8*16 bits
+         */
+        __be16 hw_values[8];
+        s64 timestamp;
+        unsigned int datums_from_fifo = 0;
+
+        /*
+         * If we're using the hardware trigger, get the precise timestamp from
+         * the top half of the threaded IRQ handler. Otherwise get the
+         * timestamp here so it will be close in time to the actual values
+         * read from the registers.
+         */
+        if (iio_trigger_using_own(indio_dev))
+                timestamp = mpu3050->hw_timestamp;
+        else
+                timestamp = iio_get_time_ns(indio_dev);
+
+        mutex_lock(&mpu3050->lock);
+
+        /* Using the hardware IRQ trigger? Check the buffer then. */
+        if (mpu3050->hw_irq_trigger) {
+                __be16 raw_fifocnt;
+                u16 fifocnt;
+                /* X, Y, Z + temperature */
+                unsigned int bytes_per_datum = 8;
+                bool fifo_overflow = false;
+
+                ret = regmap_bulk_read(mpu3050->map,
+                                       MPU3050_FIFO_COUNT_H,
+                                       &raw_fifocnt,
+                                       sizeof(raw_fifocnt));
+                if (ret)
+                        goto out_trigger_unlock;
+                fifocnt = be16_to_cpu(raw_fifocnt);
+
+                if (fifocnt == 512) {
+                        dev_info(mpu3050->dev,
+                                 "FIFO overflow! Emptying and resetting FIFO\n");
+                        fifo_overflow = true;
+                        /* Reset and enable the FIFO */
+                        ret = regmap_update_bits(mpu3050->map,
+                                                 MPU3050_USR_CTRL,
+                                                 MPU3050_USR_CTRL_FIFO_EN |
+                                                 MPU3050_USR_CTRL_FIFO_RST,
+                                                 MPU3050_USR_CTRL_FIFO_EN |
+                                                 MPU3050_USR_CTRL_FIFO_RST);
+                        if (ret) {
+                                dev_info(mpu3050->dev, "error resetting FIFO\n");
+                                goto out_trigger_unlock;
+                        }
+                        mpu3050->pending_fifo_footer = false;
+                }
+
+                if (fifocnt)
+                        dev_dbg(mpu3050->dev,
+                                "%d bytes in the FIFO\n",
+                                fifocnt);
+
+                while (!fifo_overflow && fifocnt > bytes_per_datum) {
+                        unsigned int toread;
+                        unsigned int offset;
+                        __be16 fifo_values[5];
+
+                        /*
+                         * If there is a FIFO footer in the pipe, first clear
+                         * that out. This follows the complex algorithm in the
+                         * datasheet that states that you may never leave the
+                         * FIFO empty after the first reading: you have to
+                         * always leave two footer bytes in it. The footer is
+                         * in practice just two zero bytes.
+                         */
+                        if (mpu3050->pending_fifo_footer) {
+                                toread = bytes_per_datum + 2;
+                                offset = 0;
+                        } else {
+                                toread = bytes_per_datum;
+                                offset = 1;
+                                /* Put in some dummy value */
+                                fifo_values[0] = 0xAAAA;
+                        }
+
+                        ret = regmap_bulk_read(mpu3050->map,
+                                               MPU3050_FIFO_R,
+                                               &fifo_values[offset],
+                                               toread);
+
+                        dev_dbg(mpu3050->dev,
+                                "%04x %04x %04x %04x %04x\n",
+                                fifo_values[0],
+                                fifo_values[1],
+                                fifo_values[2],
+                                fifo_values[3],
+                                fifo_values[4]);
+
+                        /* Index past the footer (fifo_values[0]) and push */
+                        iio_push_to_buffers_with_timestamp(indio_dev,
+                                                           &fifo_values[1],
+                                                           timestamp);
+
+                        fifocnt -= toread;
+                        datums_from_fifo++;
+                        mpu3050->pending_fifo_footer = true;
+
+                        /*
+                         * If we're emptying the FIFO, just make sure to
+                         * check if something new appeared.
+                         */
+                        if (fifocnt < bytes_per_datum) {
+                                ret = regmap_bulk_read(mpu3050->map,
+                                                       MPU3050_FIFO_COUNT_H,
+                                                       &raw_fifocnt,
+                                                       sizeof(raw_fifocnt));
+                                if (ret)
+                                        goto out_trigger_unlock;
+                                fifocnt = be16_to_cpu(raw_fifocnt);
+                        }
+
+                        if (fifocnt < bytes_per_datum)
+                                dev_dbg(mpu3050->dev,
+                                        "%d bytes left in the FIFO\n",
+                                        fifocnt);
+
+                        /*
+                         * At this point, the timestamp that triggered the
+                         * hardware interrupt is no longer valid for what
+                         * we are reading (the interrupt likely fired for
+                         * the value on the top of the FIFO), so set the
+                         * timestamp to zero and let userspace deal with it.
+                         */
+                        timestamp = 0;
+                }
+        }
+
+        /*
+         * If we picked some datums from the FIFO that's enough, else
+         * fall through and just read from the current value registers.
+         * This happens in two cases:
+         *
+         * - We are using some other trigger (external, like an HRTimer)
+         *   than the sensor's own sample generator. In this case the
+         *   sensor is just set to the max sampling frequency and we give
+         *   the trigger a copy of the latest value every time we get here.
+         *
+         * - The hardware trigger is active but unused and we actually use
+         *   another trigger which calls here with a frequency higher
+         *   than what the device provides data. We will then just read
+         *   duplicate values directly from the hardware registers.
+         */
+        if (datums_from_fifo) {
+                dev_dbg(mpu3050->dev,
+                        "read %d datums from the FIFO\n",
+                        datums_from_fifo);
+                goto out_trigger_unlock;
+        }
+
+        ret = regmap_bulk_read(mpu3050->map, MPU3050_TEMP_H, &hw_values,
+                               sizeof(hw_values));
+        if (ret) {
+                dev_err(mpu3050->dev,
+                        "error reading axis data\n");
+                goto out_trigger_unlock;
+        }
+
+        iio_push_to_buffers_with_timestamp(indio_dev, hw_values, timestamp);
+
+out_trigger_unlock:
+        mutex_unlock(&mpu3050->lock);
+        iio_trigger_notify_done(indio_dev->trig);
+
+        return IRQ_HANDLED;
+}
+
+static int mpu3050_buffer_preenable(struct iio_dev *indio_dev)
+{
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+
+        pm_runtime_get_sync(mpu3050->dev);
+
+        /* Unless we have OUR trigger active, run at full speed */
+        if (!mpu3050->hw_irq_trigger)
+                return mpu3050_set_8khz_samplerate(mpu3050);
+
+        return 0;
+}
+
+static int mpu3050_buffer_postdisable(struct iio_dev *indio_dev)
+{
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+
+        pm_runtime_mark_last_busy(mpu3050->dev);
+        pm_runtime_put_autosuspend(mpu3050->dev);
+
+        return 0;
+}
+
+static const struct iio_buffer_setup_ops mpu3050_buffer_setup_ops = {
+        .preenable = mpu3050_buffer_preenable,
+        .postenable = iio_triggered_buffer_postenable,
+        .predisable = iio_triggered_buffer_predisable,
+        .postdisable = mpu3050_buffer_postdisable,
+};
+
+static const struct iio_mount_matrix *
+mpu3050_get_mount_matrix(const struct iio_dev *indio_dev,
+                         const struct iio_chan_spec *chan)
+{
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+
+        return &mpu3050->orientation;
+}
+
+static const struct iio_chan_spec_ext_info mpu3050_ext_info[] = {
+        IIO_MOUNT_MATRIX(IIO_SHARED_BY_TYPE, mpu3050_get_mount_matrix),
+        { },
+};
+
+#define MPU3050_AXIS_CHANNEL(axis, index)                               \
+        {                                                               \
+                .type = IIO_ANGL_VEL,                                   \
+                .modified = 1,                                          \
+                .channel2 = IIO_MOD_##axis,                             \
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |          \
+                        BIT(IIO_CHAN_INFO_CALIBBIAS),                   \
+                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),   \
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),\
+                .ext_info = mpu3050_ext_info,                           \
+                .scan_index = index,                                    \
+                .scan_type = {                                          \
+                        .sign = 's',                                    \
+                        .realbits = 16,                                 \
+                        .storagebits = 16,                              \
+                        .endianness = IIO_BE,                           \
+                },                                                      \
+        }
+
+static const struct iio_chan_spec mpu3050_channels[] = {
+        {
+                .type = IIO_TEMP,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                                      BIT(IIO_CHAN_INFO_SCALE) |
+                                      BIT(IIO_CHAN_INFO_OFFSET),
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
+                .scan_index = 0,
+                .scan_type = {
+                        .sign = 's',
+                        .realbits = 16,
+                        .storagebits = 16,
+                        .endianness = IIO_BE,
+                },
+        },
+        MPU3050_AXIS_CHANNEL(X, 1),
+        MPU3050_AXIS_CHANNEL(Y, 2),
+        MPU3050_AXIS_CHANNEL(Z, 3),
+        IIO_CHAN_SOFT_TIMESTAMP(4),
+};
+
+/* Four channels apart from timestamp, scan mask = 0x0f */
+static const unsigned long mpu3050_scan_masks[] = { 0xf, 0 };
+
+/*
+ * These are just the hardcoded factors resulting from the more elaborate
+ * calculations done with fractions in the scale raw get/set functions.
+ */
+static IIO_CONST_ATTR(anglevel_scale_available,
+                      "0.000122070 "
+                      "0.000274658 "
+                      "0.000518798 "
+                      "0.001068115");
+
+static struct attribute *mpu3050_attributes[] = {
+        &iio_const_attr_anglevel_scale_available.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group mpu3050_attribute_group = {
+        .attrs = mpu3050_attributes,
+};
+
+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,
+};
+
+/**
+ * mpu3050_read_mem() - read MPU-3050 internal memory
+ * @mpu3050: device to read from
+ * @bank: target bank
+ * @addr: target address
+ * @len: number of bytes
+ * @buf: the buffer to store the read bytes in
+ */
+static int mpu3050_read_mem(struct mpu3050 *mpu3050,
+                            u8 bank,
+                            u8 addr,
+                            u8 len,
+                            u8 *buf)
+{
+        int ret;
+
+        ret = regmap_write(mpu3050->map,
+                           MPU3050_BANK_SEL,
+                           bank);
+        if (ret)
+                return ret;
+
+        ret = regmap_write(mpu3050->map,
+                           MPU3050_MEM_START_ADDR,
+                           addr);
+        if (ret)
+                return ret;
+
+        return regmap_bulk_read(mpu3050->map,
+                                MPU3050_MEM_R_W,
+                                buf,
+                                len);
+}
+
+static int mpu3050_hw_init(struct mpu3050 *mpu3050)
+{
+        int ret;
+        u8 otp[8];
+
+        /* Reset */
+        ret = regmap_update_bits(mpu3050->map,
+                                 MPU3050_PWR_MGM,
+                                 MPU3050_PWR_MGM_RESET,
+                                 MPU3050_PWR_MGM_RESET);
+        if (ret)
+                return ret;
+
+        /* Turn on the PLL */
+        ret = regmap_update_bits(mpu3050->map,
+                                 MPU3050_PWR_MGM,
+                                 MPU3050_PWR_MGM_CLKSEL_MASK,
+                                 MPU3050_PWR_MGM_PLL_Z);
+        if (ret)
+                return ret;
+
+        /* Disable IRQs */
+        ret = regmap_write(mpu3050->map,
+                           MPU3050_INT_CFG,
+                           0);
+        if (ret)
+                return ret;
+
+        /* Read out the 8 bytes of OTP (one-time-programmable) memory */
+        ret = mpu3050_read_mem(mpu3050,
+                               (MPU3050_MEM_PRFTCH |
+                                MPU3050_MEM_USER_BANK |
+                                MPU3050_MEM_OTP_BANK_0),
+                               0,
+                               sizeof(otp),
+                               otp);
+        if (ret)
+                return ret;
+
+        /* This is device-unique data so it goes into the entropy pool */
+        add_device_randomness(otp, sizeof(otp));
+
+        dev_info(mpu3050->dev,
+                 "die ID: %04X, wafer ID: %02X, A lot ID: %04X, "
+                 "W lot ID: %03X, WP ID: %01X, rev ID: %02X\n",
+                 /* Die ID, bits 0-12 */
+                 (otp[1] << 8 | otp[0]) & 0x1fff,
+                 /* Wafer ID, bits 13-17 */
+                 ((otp[2] << 8 | otp[1]) & 0x03e0) >> 5,
+                 /* A lot ID, bits 18-33 */
+                 ((otp[4] << 16 | otp[3] << 8 | otp[2]) & 0x3fffc) >> 2,
+                 /* W lot ID, bits 34-45 */
+                 ((otp[5] << 8 | otp[4]) & 0x3ffc) >> 2,
+                 /* WP ID, bits 47-49 */
+                 ((otp[6] << 8 | otp[5]) & 0x0380) >> 7,
+                 /* rev ID, bits 50-55 */
+                 otp[6] >> 2);
+
+        return 0;
+}
+
+static int mpu3050_power_up(struct mpu3050 *mpu3050)
+{
+        int ret;
+
+        ret = regulator_bulk_enable(ARRAY_SIZE(mpu3050->regs), mpu3050->regs);
+        if (ret) {
+                dev_err(mpu3050->dev, "cannot enable regulators\n");
+                return ret;
+        }
+        /*
+         * 20-100 ms start-up time for register read/write according to
+         * the datasheet, be on the safe side and wait 200 ms.
+         */
+        msleep(200);
+
+        /* Take device out of sleep mode */
+        ret = regmap_update_bits(mpu3050->map, MPU3050_PWR_MGM,
+                                 MPU3050_PWR_MGM_SLEEP, 0);
+        if (ret) {
+                dev_err(mpu3050->dev, "error setting power mode\n");
+                return ret;
+        }
+        msleep(10);
+
+        return 0;
+}
+
+static int mpu3050_power_down(struct mpu3050 *mpu3050)
+{
+        int ret;
+
+        /*
+         * Put MPU-3050 into sleep mode before cutting regulators.
+         * This is important, because we may not be the sole user
+         * of the regulator so the power may stay on after this, and
+         * then we would be wasting power unless we go to sleep mode
+         * first.
+         */
+        ret = regmap_update_bits(mpu3050->map, MPU3050_PWR_MGM,
+                                 MPU3050_PWR_MGM_SLEEP, MPU3050_PWR_MGM_SLEEP);
+        if (ret)
+                dev_err(mpu3050->dev, "error putting to sleep\n");
+
+        ret = regulator_bulk_disable(ARRAY_SIZE(mpu3050->regs), mpu3050->regs);
+        if (ret)
+                dev_err(mpu3050->dev, "error disabling regulators\n");
+
+        return 0;
+}
+
+static irqreturn_t mpu3050_irq_handler(int irq, void *p)
+{
+        struct iio_trigger *trig = p;
+        struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+
+        if (!mpu3050->hw_irq_trigger)
+                return IRQ_NONE;
+
+        /* Get the time stamp as close in time as possible */
+        mpu3050->hw_timestamp = iio_get_time_ns(indio_dev);
+
+        return IRQ_WAKE_THREAD;
+}
+
+static irqreturn_t mpu3050_irq_thread(int irq, void *p)
+{
+        struct iio_trigger *trig = p;
+        struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+        unsigned int val;
+        int ret;
+
+        /* ACK IRQ and check if it was from us */
+        ret = regmap_read(mpu3050->map, MPU3050_INT_STATUS, &val);
+        if (ret) {
+                dev_err(mpu3050->dev, "error reading IRQ status\n");
+                return IRQ_HANDLED;
+        }
+        if (!(val & MPU3050_INT_STATUS_RAW_RDY))
+                return IRQ_NONE;
+
+        iio_trigger_poll_chained(p);
+
+        return IRQ_HANDLED;
+}
+
+/**
+ * mpu3050_drdy_trigger_set_state() - set data ready interrupt state
+ * @trig: trigger instance
+ * @enable: true if trigger should be enabled, false to disable
+ */
+static int mpu3050_drdy_trigger_set_state(struct iio_trigger *trig,
+                                          bool enable)
+{
+        struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+        unsigned int val;
+        int ret;
+
+        /* Disabling trigger: disable interrupt and return */
+        if (!enable) {
+                /* Disable all interrupts */
+                ret = regmap_write(mpu3050->map,
+                                   MPU3050_INT_CFG,
+                                   0);
+                if (ret)
+                        dev_err(mpu3050->dev, "error disabling IRQ\n");
+
+                /* Clear IRQ flag */
+                ret = regmap_read(mpu3050->map, MPU3050_INT_STATUS, &val);
+                if (ret)
+                        dev_err(mpu3050->dev, "error clearing IRQ status\n");
+
+                /* Disable all things in the FIFO and reset it */
+                ret = regmap_write(mpu3050->map, MPU3050_FIFO_EN, 0);
+                if (ret)
+                        dev_err(mpu3050->dev, "error disabling FIFO\n");
+
+                ret = regmap_write(mpu3050->map, MPU3050_USR_CTRL,
+                                   MPU3050_USR_CTRL_FIFO_RST);
+                if (ret)
+                        dev_err(mpu3050->dev, "error resetting FIFO\n");
+
+                pm_runtime_mark_last_busy(mpu3050->dev);
+                pm_runtime_put_autosuspend(mpu3050->dev);
+                mpu3050->hw_irq_trigger = false;
+
+                return 0;
+        } else {
+                /* Else we're enabling the trigger from this point */
+                pm_runtime_get_sync(mpu3050->dev);
+                mpu3050->hw_irq_trigger = true;
+
+                /* Disable all things in the FIFO */
+                ret = regmap_write(mpu3050->map, MPU3050_FIFO_EN, 0);
+                if (ret)
+                        return ret;
+
+                /* Reset and enable the FIFO */
+                ret = regmap_update_bits(mpu3050->map, MPU3050_USR_CTRL,
+                                         MPU3050_USR_CTRL_FIFO_EN |
+                                         MPU3050_USR_CTRL_FIFO_RST,
+                                         MPU3050_USR_CTRL_FIFO_EN |
+                                         MPU3050_USR_CTRL_FIFO_RST);
+                if (ret)
+                        return ret;
+
+                mpu3050->pending_fifo_footer = false;
+
+                /* Turn on the FIFO for temp+X+Y+Z */
+                ret = regmap_write(mpu3050->map, MPU3050_FIFO_EN,
+                                   MPU3050_FIFO_EN_TEMP_OUT |
+                                   MPU3050_FIFO_EN_GYRO_XOUT |
+                                   MPU3050_FIFO_EN_GYRO_YOUT |
+                                   MPU3050_FIFO_EN_GYRO_ZOUT |
+                                   MPU3050_FIFO_EN_FOOTER);
+                if (ret)
+                        return ret;
+
+                /* Configure the sample engine */
+                ret = mpu3050_start_sampling(mpu3050);
+                if (ret)
+                        return ret;
+
+                /* Clear IRQ flag */
+                ret = regmap_read(mpu3050->map, MPU3050_INT_STATUS, &val);
+                if (ret)
+                        dev_err(mpu3050->dev, "error clearing IRQ status\n");
+
+                /* Give us interrupts whenever there is new data ready */
+                val = MPU3050_INT_RAW_RDY_EN;
+
+                if (mpu3050->irq_actl)
+                        val |= MPU3050_INT_ACTL;
+                if (mpu3050->irq_latch)
+                        val |= MPU3050_INT_LATCH_EN;
+                if (mpu3050->irq_opendrain)
+                        val |= MPU3050_INT_OPEN;
+
+                ret = regmap_write(mpu3050->map, MPU3050_INT_CFG, val);
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
+
+static const struct iio_trigger_ops mpu3050_trigger_ops = {
+        .owner = THIS_MODULE,
+        .set_trigger_state = mpu3050_drdy_trigger_set_state,
+};
+
+static int mpu3050_trigger_probe(struct iio_dev *indio_dev, int irq)
+{
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+        unsigned long irq_trig;
+        int ret;
+
+        mpu3050->trig = devm_iio_trigger_alloc(&indio_dev->dev,
+                                               "%s-dev%d",
+                                               indio_dev->name,
+                                               indio_dev->id);
+        if (!mpu3050->trig)
+                return -ENOMEM;
+
+        /* Check if IRQ is open drain */
+        if (of_property_read_bool(mpu3050->dev->of_node, "drive-open-drain"))
+                mpu3050->irq_opendrain = true;
+
+        irq_trig = irqd_get_trigger_type(irq_get_irq_data(irq));
+        /*
+         * Configure the interrupt generator hardware to supply whatever
+         * the interrupt is configured for, edges low/high level low/high,
+         * we can provide it all.
+         */
+        switch (irq_trig) {
+        case IRQF_TRIGGER_RISING:
+                dev_info(&indio_dev->dev,
+                         "pulse interrupts on the rising edge\n");
+                if (mpu3050->irq_opendrain) {
+                        dev_info(&indio_dev->dev,
+                                 "rising edge incompatible with open drain\n");
+                        mpu3050->irq_opendrain = false;
+                }
+                break;
+        case IRQF_TRIGGER_FALLING:
+                mpu3050->irq_actl = true;
+                dev_info(&indio_dev->dev,
+                         "pulse interrupts on the falling edge\n");
+                break;
+        case IRQF_TRIGGER_HIGH:
+                mpu3050->irq_latch = true;
+                dev_info(&indio_dev->dev,
+                         "interrupts active high level\n");
+                if (mpu3050->irq_opendrain) {
+                        dev_info(&indio_dev->dev,
+                                 "active high incompatible with open drain\n");
+                        mpu3050->irq_opendrain = false;
+                }
+                /*
+                 * With level IRQs, we mask the IRQ until it is processed,
+                 * but with edge IRQs (pulses) we can queue several interrupts
+                 * in the top half.
+                 */
+                irq_trig |= IRQF_ONESHOT;
+                break;
+        case IRQF_TRIGGER_LOW:
+                mpu3050->irq_latch = true;
+                mpu3050->irq_actl = true;
+                irq_trig |= IRQF_ONESHOT;
+                dev_info(&indio_dev->dev,
+                         "interrupts active low level\n");
+                break;
+        default:
+                /* This is the most preferred mode, if possible */
+                dev_err(&indio_dev->dev,
+                        "unsupported IRQ trigger specified (%lx), enforce "
+                        "rising edge\n", irq_trig);
+                irq_trig = IRQF_TRIGGER_RISING;
+                break;
+        }
+
+        /* An open drain line can be shared with several devices */
+        if (mpu3050->irq_opendrain)
+                irq_trig |= IRQF_SHARED;
+
+        ret = request_threaded_irq(irq,
+                                   mpu3050_irq_handler,
+                                   mpu3050_irq_thread,
+                                   irq_trig,
+                                   mpu3050->trig->name,
+                                   mpu3050->trig);
+        if (ret) {
+                dev_err(mpu3050->dev,
+                        "can't get IRQ %d, error %d\n", irq, ret);
+                return ret;
+        }
+
+        mpu3050->irq = irq;
+        mpu3050->trig->dev.parent = mpu3050->dev;
+        mpu3050->trig->ops = &mpu3050_trigger_ops;
+        iio_trigger_set_drvdata(mpu3050->trig, indio_dev);
+
+        ret = iio_trigger_register(mpu3050->trig);
+        if (ret)
+                return ret;
+
+        indio_dev->trig = iio_trigger_get(mpu3050->trig);
+
+        return 0;
+}
+
+int mpu3050_common_probe(struct device *dev,
+                         struct regmap *map,
+                         int irq,
+                         const char *name)
+{
+        struct iio_dev *indio_dev;
+        struct mpu3050 *mpu3050;
+        unsigned int val;
+        int ret;
+
+        indio_dev = devm_iio_device_alloc(dev, sizeof(*mpu3050));
+        if (!indio_dev)
+                return -ENOMEM;
+        mpu3050 = iio_priv(indio_dev);
+
+        mpu3050->dev = dev;
+        mpu3050->map = map;
+        mutex_init(&mpu3050->lock);
+        /* Default fullscale: 2000 degrees per second */
+        mpu3050->fullscale = FS_2000_DPS;
+        /* 1 kHz, divide by 100, default frequency = 10 Hz */
+        mpu3050->lpf = MPU3050_DLPF_CFG_188HZ;
+        mpu3050->divisor = 99;
+
+        /* Read the mounting matrix, if present */
+        ret = of_iio_read_mount_matrix(dev, "mount-matrix",
+                                       &mpu3050->orientation);
+        if (ret)
+                return ret;
+
+        /* Fetch and turn on regulators */
+        mpu3050->regs[0].supply = mpu3050_reg_vdd;
+        mpu3050->regs[1].supply = mpu3050_reg_vlogic;
+        ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(mpu3050->regs),
+                                      mpu3050->regs);
+        if (ret) {
+                dev_err(dev, "Cannot get regulators\n");
+                return ret;
+        }
+
+        ret = mpu3050_power_up(mpu3050);
+        if (ret)
+                return ret;
+
+        ret = regmap_read(map, MPU3050_CHIP_ID_REG, &val);
+        if (ret) {
+                dev_err(dev, "could not read device ID\n");
+                ret = -ENODEV;
+
+                goto err_power_down;
+        }
+
+        if (val != MPU3050_CHIP_ID) {
+                dev_err(dev, "unsupported chip id %02x\n", (u8)val);
+                ret = -ENODEV;
+                goto err_power_down;
+        }
+
+        ret = regmap_read(map, MPU3050_PRODUCT_ID_REG, &val);
+        if (ret) {
+                dev_err(dev, "could not read device ID\n");
+                ret = -ENODEV;
+
+                goto err_power_down;
+        }
+        dev_info(dev, "found MPU-3050 part no: %d, version: %d\n",
+                 ((val >> 4) & 0xf), (val & 0xf));
+
+        ret = mpu3050_hw_init(mpu3050);
+        if (ret)
+                goto err_power_down;
+
+        indio_dev->dev.parent = dev;
+        indio_dev->channels = mpu3050_channels;
+        indio_dev->num_channels = ARRAY_SIZE(mpu3050_channels);
+        indio_dev->info = &mpu3050_info;
+        indio_dev->available_scan_masks = mpu3050_scan_masks;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->name = name;
+
+        ret = iio_triggered_buffer_setup(indio_dev, iio_pollfunc_store_time,
+                                         mpu3050_trigger_handler,
+                                         &mpu3050_buffer_setup_ops);
+        if (ret) {
+                dev_err(dev, "triggered buffer setup failed\n");
+                goto err_power_down;
+        }
+
+        ret = iio_device_register(indio_dev);
+        if (ret) {
+                dev_err(dev, "device register failed\n");
+                goto err_cleanup_buffer;
+        }
+
+        dev_set_drvdata(dev, indio_dev);
+
+        /* Check if we have an assigned IRQ to use as trigger */
+        if (irq) {
+                ret = mpu3050_trigger_probe(indio_dev, irq);
+                if (ret)
+                        dev_err(dev, "failed to register trigger\n");
+        }
+
+        /* Enable runtime PM */
+        pm_runtime_get_noresume(dev);
+        pm_runtime_set_active(dev);
+        pm_runtime_enable(dev);
+        /*
+         * Set autosuspend to two orders of magnitude larger than the
+         * start-up time. 100ms start-up time means 10000ms autosuspend,
+         * i.e. 10 seconds.
+         */
+        pm_runtime_set_autosuspend_delay(dev, 10000);
+        pm_runtime_use_autosuspend(dev);
+        pm_runtime_put(dev);
+
+        return 0;
+
+err_cleanup_buffer:
+        iio_triggered_buffer_cleanup(indio_dev);
+err_power_down:
+        mpu3050_power_down(mpu3050);
+
+        return ret;
+}
+EXPORT_SYMBOL(mpu3050_common_probe);
+
+int mpu3050_common_remove(struct device *dev)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+
+        pm_runtime_get_sync(dev);
+        pm_runtime_put_noidle(dev);
+        pm_runtime_disable(dev);
+        iio_triggered_buffer_cleanup(indio_dev);
+        if (mpu3050->irq)
+                free_irq(mpu3050->irq, mpu3050);
+        iio_device_unregister(indio_dev);
+        mpu3050_power_down(mpu3050);
+
+        return 0;
+}
+EXPORT_SYMBOL(mpu3050_common_remove);
+
+#ifdef CONFIG_PM
+static int mpu3050_runtime_suspend(struct device *dev)
+{
+        return mpu3050_power_down(iio_priv(dev_get_drvdata(dev)));
+}
+
+static int mpu3050_runtime_resume(struct device *dev)
+{
+        return mpu3050_power_up(iio_priv(dev_get_drvdata(dev)));
+}
+#endif /* CONFIG_PM */
+
+const struct dev_pm_ops mpu3050_dev_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+                                pm_runtime_force_resume)
+        SET_RUNTIME_PM_OPS(mpu3050_runtime_suspend,
+                           mpu3050_runtime_resume, NULL)
+};
+EXPORT_SYMBOL(mpu3050_dev_pm_ops);
+
+MODULE_AUTHOR("Linus Walleij");
+MODULE_DESCRIPTION("MPU3050 gyroscope driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/iio/gyro/mpu3050-i2c.c b/drivers/iio/gyro/mpu3050-i2c.c
new file mode 100644
index 000000000000..06007200bf49
--- /dev/null
+++ b/drivers/iio/gyro/mpu3050-i2c.c
@@ -0,0 +1,124 @@
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/i2c-mux.h>
+#include <linux/iio/iio.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/pm_runtime.h>
+
+#include "mpu3050.h"
+
+static const struct regmap_config mpu3050_i2c_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+};
+
+static int mpu3050_i2c_bypass_select(struct i2c_mux_core *mux, u32 chan_id)
+{
+        struct mpu3050 *mpu3050 = i2c_mux_priv(mux);
+
+        /* Just power up the device, that is all that is needed */
+        pm_runtime_get_sync(mpu3050->dev);
+        return 0;
+}
+
+static int mpu3050_i2c_bypass_deselect(struct i2c_mux_core *mux, u32 chan_id)
+{
+        struct mpu3050 *mpu3050 = i2c_mux_priv(mux);
+
+        pm_runtime_mark_last_busy(mpu3050->dev);
+        pm_runtime_put_autosuspend(mpu3050->dev);
+        return 0;
+}
+
+static int mpu3050_i2c_probe(struct i2c_client *client,
+                             const struct i2c_device_id *id)
+{
+        struct regmap *regmap;
+        const char *name;
+        struct mpu3050 *mpu3050;
+        int ret;
+
+        if (!i2c_check_functionality(client->adapter,
+                                     I2C_FUNC_SMBUS_I2C_BLOCK))
+                return -EOPNOTSUPP;
+
+        if (id)
+                name = id->name;
+        else
+                return -ENODEV;
+
+        regmap = devm_regmap_init_i2c(client, &mpu3050_i2c_regmap_config);
+        if (IS_ERR(regmap)) {
+                dev_err(&client->dev, "Failed to register i2c regmap %d\n",
+                        (int)PTR_ERR(regmap));
+                return PTR_ERR(regmap);
+        }
+
+        ret = mpu3050_common_probe(&client->dev, regmap, client->irq, name);
+        if (ret)
+                return ret;
+
+        /* The main driver is up, now register the I2C mux */
+        mpu3050 = iio_priv(dev_get_drvdata(&client->dev));
+        mpu3050->i2cmux = i2c_mux_alloc(client->adapter, &client->dev,
+                                        1, 0, I2C_MUX_LOCKED | I2C_MUX_GATE,
+                                        mpu3050_i2c_bypass_select,
+                                        mpu3050_i2c_bypass_deselect);
+        /* Just fail the mux, there is no point in killing the driver */
+        if (!mpu3050->i2cmux)
+                dev_err(&client->dev, "failed to allocate I2C mux\n");
+        else {
+                mpu3050->i2cmux->priv = mpu3050;
+                ret = i2c_mux_add_adapter(mpu3050->i2cmux, 0, 0, 0);
+                if (ret)
+                        dev_err(&client->dev, "failed to add I2C mux\n");
+        }
+
+        return 0;
+}
+
+static int mpu3050_i2c_remove(struct i2c_client *client)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(&client->dev);
+        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
+
+        if (mpu3050->i2cmux)
+                i2c_mux_del_adapters(mpu3050->i2cmux);
+
+        return mpu3050_common_remove(&client->dev);
+}
+
+/*
+ * device id table is used to identify what device can be
+ * supported by this driver
+ */
+static const struct i2c_device_id mpu3050_i2c_id[] = {
+        { "mpu3050" },
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, mpu3050_i2c_id);
+
+static const struct of_device_id mpu3050_i2c_of_match[] = {
+        { .compatible = "invensense,mpu3050", .data = "mpu3050" },
+        /* Deprecated vendor ID from the Input driver */
+        { .compatible = "invn,mpu3050", .data = "mpu3050" },
+        { },
+};
+MODULE_DEVICE_TABLE(of, mpu3050_i2c_of_match);
+
+static struct i2c_driver mpu3050_i2c_driver = {
+        .probe = mpu3050_i2c_probe,
+        .remove = mpu3050_i2c_remove,
+        .id_table = mpu3050_i2c_id,
+        .driver = {
+                .of_match_table = mpu3050_i2c_of_match,
+                .name = "mpu3050-i2c",
+                .pm = &mpu3050_dev_pm_ops,
+        },
+};
+module_i2c_driver(mpu3050_i2c_driver);
+
+MODULE_AUTHOR("Linus Walleij");
+MODULE_DESCRIPTION("Invensense MPU3050 gyroscope driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/iio/gyro/mpu3050.h b/drivers/iio/gyro/mpu3050.h
new file mode 100644
index 000000000000..bef87a714dc5
--- /dev/null
+++ b/drivers/iio/gyro/mpu3050.h
@@ -0,0 +1,96 @@
+#include <linux/iio/iio.h>
+#include <linux/mutex.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+#include <linux/i2c.h>
+
+/**
+ * enum mpu3050_fullscale - indicates the full range of the sensor in deg/sec
+ */
+enum mpu3050_fullscale {
+        FS_250_DPS = 0,
+        FS_500_DPS,
+        FS_1000_DPS,
+        FS_2000_DPS,
+};
+
+/**
+ * enum mpu3050_lpf - indicates the low pass filter width
+ */
+enum mpu3050_lpf {
+        /* This implicity sets sample frequency to 8 kHz */
+        LPF_256_HZ_NOLPF = 0,
+        /* All others sets the sample frequency to 1 kHz */
+        LPF_188_HZ,
+        LPF_98_HZ,
+        LPF_42_HZ,
+        LPF_20_HZ,
+        LPF_10_HZ,
+        LPF_5_HZ,
+        LPF_2100_HZ_NOLPF,
+};
+
+enum mpu3050_axis {
+        AXIS_X = 0,
+        AXIS_Y,
+        AXIS_Z,
+        AXIS_MAX,
+};
+
+/**
+ * struct mpu3050 - instance state container for the device
+ * @dev: parent device for this instance
+ * @orientation: mounting matrix, flipped axis etc
+ * @map: regmap to reach the registers
+ * @lock: serialization lock to marshal all requests
+ * @irq: the IRQ used for this device
+ * @regs: the regulators to power this device
+ * @fullscale: the current fullscale setting for the device
+ * @lpf: digital low pass filter setting for the device
+ * @divisor: base frequency divider: divides 8 or 1 kHz
+ * @calibration: the three signed 16-bit calibration settings that
+ * get written into the offset registers for each axis to compensate
+ * for DC offsets
+ * @trig: trigger for the MPU-3050 interrupt, if present
+ * @hw_irq_trigger: hardware interrupt trigger is in use
+ * @irq_actl: interrupt is active low
+ * @irq_latch: latched IRQ, this means that it is a level IRQ
+ * @irq_opendrain: the interrupt line shall be configured open drain
+ * @pending_fifo_footer: tells us if there is a pending footer in the FIFO
+ * that we have to read out first when handling the FIFO
+ * @hw_timestamp: latest hardware timestamp from the trigger IRQ, when in
+ * use
+ * @i2cmux: an I2C mux reflecting the fact that this sensor is a hub with
+ * a pass-through I2C interface coming out of it: this device needs to be
+ * powered up in order to reach devices on the other side of this mux
+ */
+struct mpu3050 {
+        struct device *dev;
+        struct iio_mount_matrix orientation;
+        struct regmap *map;
+        struct mutex lock;
+        int irq;
+        struct regulator_bulk_data regs[2];
+        enum mpu3050_fullscale fullscale;
+        enum mpu3050_lpf lpf;
+        u8 divisor;
+        s16 calibration[3];
+        struct iio_trigger *trig;
+        bool hw_irq_trigger;
+        bool irq_actl;
+        bool irq_latch;
+        bool irq_opendrain;
+        bool pending_fifo_footer;
+        s64 hw_timestamp;
+        struct i2c_mux_core *i2cmux;
+};
+
+/* Probe called from different transports */
+int mpu3050_common_probe(struct device *dev,
+                         struct regmap *map,
+                         int irq,
+                         const char *name);
+int mpu3050_common_remove(struct device *dev);
+
+/* PM ops */
+extern const struct dev_pm_ops mpu3050_dev_pm_ops;
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index aea034d8fe0f..2a42b3d583e8 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -39,79 +39,6 @@
 #define ST_GYRO_FS_AVL_500DPS                   500
 #define ST_GYRO_FS_AVL_2000DPS                  2000
 
-/* CUSTOM VALUES FOR SENSOR 1 */
-#define ST_GYRO_1_WAI_EXP                       0xd3
-#define ST_GYRO_1_ODR_ADDR                      0x20
-#define ST_GYRO_1_ODR_MASK                      0xc0
-#define ST_GYRO_1_ODR_AVL_100HZ_VAL             0x00
-#define ST_GYRO_1_ODR_AVL_200HZ_VAL             0x01
-#define ST_GYRO_1_ODR_AVL_400HZ_VAL             0x02
-#define ST_GYRO_1_ODR_AVL_800HZ_VAL             0x03
-#define ST_GYRO_1_PW_ADDR                       0x20
-#define ST_GYRO_1_PW_MASK                       0x08
-#define ST_GYRO_1_FS_ADDR                       0x23
-#define ST_GYRO_1_FS_MASK                       0x30
-#define ST_GYRO_1_FS_AVL_250_VAL                0x00
-#define ST_GYRO_1_FS_AVL_500_VAL                0x01
-#define ST_GYRO_1_FS_AVL_2000_VAL               0x02
-#define ST_GYRO_1_FS_AVL_250_GAIN               IIO_DEGREE_TO_RAD(8750)
-#define ST_GYRO_1_FS_AVL_500_GAIN               IIO_DEGREE_TO_RAD(17500)
-#define ST_GYRO_1_FS_AVL_2000_GAIN              IIO_DEGREE_TO_RAD(70000)
-#define ST_GYRO_1_BDU_ADDR                      0x23
-#define ST_GYRO_1_BDU_MASK                      0x80
-#define ST_GYRO_1_DRDY_IRQ_ADDR                 0x22
-#define ST_GYRO_1_DRDY_IRQ_INT2_MASK            0x08
-#define ST_GYRO_1_MULTIREAD_BIT                 true
-
-/* CUSTOM VALUES FOR SENSOR 2 */
-#define ST_GYRO_2_WAI_EXP                       0xd4
-#define ST_GYRO_2_ODR_ADDR                      0x20
-#define ST_GYRO_2_ODR_MASK                      0xc0
-#define ST_GYRO_2_ODR_AVL_95HZ_VAL              0x00
-#define ST_GYRO_2_ODR_AVL_190HZ_VAL             0x01
-#define ST_GYRO_2_ODR_AVL_380HZ_VAL             0x02
-#define ST_GYRO_2_ODR_AVL_760HZ_VAL             0x03
-#define ST_GYRO_2_PW_ADDR                       0x20
-#define ST_GYRO_2_PW_MASK                       0x08
-#define ST_GYRO_2_FS_ADDR                       0x23
-#define ST_GYRO_2_FS_MASK                       0x30
-#define ST_GYRO_2_FS_AVL_250_VAL                0x00
-#define ST_GYRO_2_FS_AVL_500_VAL                0x01
-#define ST_GYRO_2_FS_AVL_2000_VAL               0x02
-#define ST_GYRO_2_FS_AVL_250_GAIN               IIO_DEGREE_TO_RAD(8750)
-#define ST_GYRO_2_FS_AVL_500_GAIN               IIO_DEGREE_TO_RAD(17500)
-#define ST_GYRO_2_FS_AVL_2000_GAIN              IIO_DEGREE_TO_RAD(70000)
-#define ST_GYRO_2_BDU_ADDR                      0x23
-#define ST_GYRO_2_BDU_MASK                      0x80
-#define ST_GYRO_2_DRDY_IRQ_ADDR                 0x22
-#define ST_GYRO_2_DRDY_IRQ_INT2_MASK            0x08
-#define ST_GYRO_2_MULTIREAD_BIT                 true
-
-/* CUSTOM VALUES FOR SENSOR 3 */
-#define ST_GYRO_3_WAI_EXP                       0xd7
-#define ST_GYRO_3_ODR_ADDR                      0x20
-#define ST_GYRO_3_ODR_MASK                      0xc0
-#define ST_GYRO_3_ODR_AVL_95HZ_VAL              0x00
-#define ST_GYRO_3_ODR_AVL_190HZ_VAL             0x01
-#define ST_GYRO_3_ODR_AVL_380HZ_VAL             0x02
-#define ST_GYRO_3_ODR_AVL_760HZ_VAL             0x03
-#define ST_GYRO_3_PW_ADDR                       0x20
-#define ST_GYRO_3_PW_MASK                       0x08
-#define ST_GYRO_3_FS_ADDR                       0x23
-#define ST_GYRO_3_FS_MASK                       0x30
-#define ST_GYRO_3_FS_AVL_250_VAL                0x00
-#define ST_GYRO_3_FS_AVL_500_VAL                0x01
-#define ST_GYRO_3_FS_AVL_2000_VAL               0x02
-#define ST_GYRO_3_FS_AVL_250_GAIN               IIO_DEGREE_TO_RAD(8750)
-#define ST_GYRO_3_FS_AVL_500_GAIN               IIO_DEGREE_TO_RAD(17500)
-#define ST_GYRO_3_FS_AVL_2000_GAIN              IIO_DEGREE_TO_RAD(70000)
-#define ST_GYRO_3_BDU_ADDR                      0x23
-#define ST_GYRO_3_BDU_MASK                      0x80
-#define ST_GYRO_3_DRDY_IRQ_ADDR                 0x22
-#define ST_GYRO_3_DRDY_IRQ_INT2_MASK            0x08
-#define ST_GYRO_3_MULTIREAD_BIT                 true
-
-
 static const struct iio_chan_spec st_gyro_16bit_channels[] = {
         ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL,
                         BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
@@ -130,7 +57,7 @@ static const struct iio_chan_spec st_gyro_16bit_channels[] = {
 
 static const struct st_sensor_settings st_gyro_sensors_settings[] = {
         {
-                .wai = ST_GYRO_1_WAI_EXP,
+                .wai = 0xd3,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = L3G4200D_GYRO_DEV_NAME,
@@ -138,18 +65,18 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = {
                 },
                 .ch = (struct iio_chan_spec *)st_gyro_16bit_channels,
                 .odr = {
-                        .addr = ST_GYRO_1_ODR_ADDR,
-                        .mask = ST_GYRO_1_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0xc0,
                         .odr_avl = {
-                                { 100, ST_GYRO_1_ODR_AVL_100HZ_VAL, },
-                                { 200, ST_GYRO_1_ODR_AVL_200HZ_VAL, },
-                                { 400, ST_GYRO_1_ODR_AVL_400HZ_VAL, },
-                                { 800, ST_GYRO_1_ODR_AVL_800HZ_VAL, },
+                                { .hz = 100, .value = 0x00, },
+                                { .hz = 200, .value = 0x01, },
+                                { .hz = 400, .value = 0x02, },
+                                { .hz = 800, .value = 0x03, },
                         },
                 },
                 .pw = {
-                        .addr = ST_GYRO_1_PW_ADDR,
-                        .mask = ST_GYRO_1_PW_MASK,
+                        .addr = 0x20,
+                        .mask = 0x08,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
@@ -158,33 +85,33 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = {
                         .mask = ST_SENSORS_DEFAULT_AXIS_MASK,
                 },
                 .fs = {
-                        .addr = ST_GYRO_1_FS_ADDR,
-                        .mask = ST_GYRO_1_FS_MASK,
+                        .addr = 0x23,
+                        .mask = 0x30,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_GYRO_FS_AVL_250DPS,
-                                        .value = ST_GYRO_1_FS_AVL_250_VAL,
-                                        .gain = ST_GYRO_1_FS_AVL_250_GAIN,
+                                        .value = 0x00,
+                                        .gain = IIO_DEGREE_TO_RAD(8750),
                                 },
                                 [1] = {
                                         .num = ST_GYRO_FS_AVL_500DPS,
-                                        .value = ST_GYRO_1_FS_AVL_500_VAL,
-                                        .gain = ST_GYRO_1_FS_AVL_500_GAIN,
+                                        .value = 0x01,
+                                        .gain = IIO_DEGREE_TO_RAD(17500),
                                 },
                                 [2] = {
                                         .num = ST_GYRO_FS_AVL_2000DPS,
-                                        .value = ST_GYRO_1_FS_AVL_2000_VAL,
-                                        .gain = ST_GYRO_1_FS_AVL_2000_GAIN,
+                                        .value = 0x02,
+                                        .gain = IIO_DEGREE_TO_RAD(70000),
                                 },
                         },
                 },
                 .bdu = {
-                        .addr = ST_GYRO_1_BDU_ADDR,
-                        .mask = ST_GYRO_1_BDU_MASK,
+                        .addr = 0x23,
+                        .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = ST_GYRO_1_DRDY_IRQ_ADDR,
-                        .mask_int2 = ST_GYRO_1_DRDY_IRQ_INT2_MASK,
+                        .addr = 0x22,
+                        .mask_int2 = 0x08,
                         /*
                          * The sensor has IHL (active low) and open
                          * drain settings, but only for INT1 and not
@@ -192,11 +119,11 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = {
                          */
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_GYRO_1_MULTIREAD_BIT,
+                .multi_read_bit = true,
                 .bootime = 2,
         },
         {
-                .wai = ST_GYRO_2_WAI_EXP,
+                .wai = 0xd4,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = L3GD20_GYRO_DEV_NAME,
@@ -208,18 +135,18 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = {
                 },
                 .ch = (struct iio_chan_spec *)st_gyro_16bit_channels,
                 .odr = {
-                        .addr = ST_GYRO_2_ODR_ADDR,
-                        .mask = ST_GYRO_2_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0xc0,
                         .odr_avl = {
-                                { 95, ST_GYRO_2_ODR_AVL_95HZ_VAL, },
-                                { 190, ST_GYRO_2_ODR_AVL_190HZ_VAL, },
-                                { 380, ST_GYRO_2_ODR_AVL_380HZ_VAL, },
-                                { 760, ST_GYRO_2_ODR_AVL_760HZ_VAL, },
+                                { .hz = 95, .value = 0x00, },
+                                { .hz = 190, .value = 0x01, },
+                                { .hz = 380, .value = 0x02, },
+                                { .hz = 760, .value = 0x03, },
                         },
                 },
                 .pw = {
-                        .addr = ST_GYRO_2_PW_ADDR,
-                        .mask = ST_GYRO_2_PW_MASK,
+                        .addr = 0x20,
+                        .mask = 0x08,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
@@ -228,33 +155,33 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = {
                         .mask = ST_SENSORS_DEFAULT_AXIS_MASK,
                 },
                 .fs = {
-                        .addr = ST_GYRO_2_FS_ADDR,
-                        .mask = ST_GYRO_2_FS_MASK,
+                        .addr = 0x23,
+                        .mask = 0x30,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_GYRO_FS_AVL_250DPS,
-                                        .value = ST_GYRO_2_FS_AVL_250_VAL,
-                                        .gain = ST_GYRO_2_FS_AVL_250_GAIN,
+                                        .value = 0x00,
+                                        .gain = IIO_DEGREE_TO_RAD(8750),
                                 },
                                 [1] = {
                                         .num = ST_GYRO_FS_AVL_500DPS,
-                                        .value = ST_GYRO_2_FS_AVL_500_VAL,
-                                        .gain = ST_GYRO_2_FS_AVL_500_GAIN,
+                                        .value = 0x01,
+                                        .gain = IIO_DEGREE_TO_RAD(17500),
                                 },
                                 [2] = {
                                         .num = ST_GYRO_FS_AVL_2000DPS,
-                                        .value = ST_GYRO_2_FS_AVL_2000_VAL,
-                                        .gain = ST_GYRO_2_FS_AVL_2000_GAIN,
+                                        .value = 0x02,
+                                        .gain = IIO_DEGREE_TO_RAD(70000),
                                 },
                         },
                 },
                 .bdu = {
-                        .addr = ST_GYRO_2_BDU_ADDR,
-                        .mask = ST_GYRO_2_BDU_MASK,
+                        .addr = 0x23,
+                        .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = ST_GYRO_2_DRDY_IRQ_ADDR,
-                        .mask_int2 = ST_GYRO_2_DRDY_IRQ_INT2_MASK,
+                        .addr = 0x22,
+                        .mask_int2 = 0x08,
                         /*
                          * The sensor has IHL (active low) and open
                          * drain settings, but only for INT1 and not
@@ -262,29 +189,29 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = {
                          */
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_GYRO_2_MULTIREAD_BIT,
+                .multi_read_bit = true,
                 .bootime = 2,
         },
         {
-                .wai = ST_GYRO_3_WAI_EXP,
+                .wai = 0xd7,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = L3GD20_GYRO_DEV_NAME,
                 },
                 .ch = (struct iio_chan_spec *)st_gyro_16bit_channels,
                 .odr = {
-                        .addr = ST_GYRO_3_ODR_ADDR,
-                        .mask = ST_GYRO_3_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0xc0,
                         .odr_avl = {
-                                { 95, ST_GYRO_3_ODR_AVL_95HZ_VAL, },
-                                { 190, ST_GYRO_3_ODR_AVL_190HZ_VAL, },
-                                { 380, ST_GYRO_3_ODR_AVL_380HZ_VAL, },
-                                { 760, ST_GYRO_3_ODR_AVL_760HZ_VAL, },
+                                { .hz = 95, .value = 0x00, },
+                                { .hz = 190, .value = 0x01, },
+                                { .hz = 380, .value = 0x02, },
+                                { .hz = 760, .value = 0x03, },
                         },
                 },
                 .pw = {
-                        .addr = ST_GYRO_3_PW_ADDR,
-                        .mask = ST_GYRO_3_PW_MASK,
+                        .addr = 0x20,
+                        .mask = 0x08,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
@@ -293,33 +220,33 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = {
                         .mask = ST_SENSORS_DEFAULT_AXIS_MASK,
                 },
                 .fs = {
-                        .addr = ST_GYRO_3_FS_ADDR,
-                        .mask = ST_GYRO_3_FS_MASK,
+                        .addr = 0x23,
+                        .mask = 0x30,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_GYRO_FS_AVL_250DPS,
-                                        .value = ST_GYRO_3_FS_AVL_250_VAL,
-                                        .gain = ST_GYRO_3_FS_AVL_250_GAIN,
+                                        .value = 0x00,
+                                        .gain = IIO_DEGREE_TO_RAD(8750),
                                 },
                                 [1] = {
                                         .num = ST_GYRO_FS_AVL_500DPS,
-                                        .value = ST_GYRO_3_FS_AVL_500_VAL,
-                                        .gain = ST_GYRO_3_FS_AVL_500_GAIN,
+                                        .value = 0x01,
+                                        .gain = IIO_DEGREE_TO_RAD(17500),
                                 },
                                 [2] = {
                                         .num = ST_GYRO_FS_AVL_2000DPS,
-                                        .value = ST_GYRO_3_FS_AVL_2000_VAL,
-                                        .gain = ST_GYRO_3_FS_AVL_2000_GAIN,
+                                        .value = 0x02,
+                                        .gain = IIO_DEGREE_TO_RAD(70000),
                                 },
                         },
                 },
                 .bdu = {
-                        .addr = ST_GYRO_3_BDU_ADDR,
-                        .mask = ST_GYRO_3_BDU_MASK,
+                        .addr = 0x23,
+                        .mask = 0x80,
                 },
                 .drdy_irq = {
-                        .addr = ST_GYRO_3_DRDY_IRQ_ADDR,
-                        .mask_int2 = ST_GYRO_3_DRDY_IRQ_INT2_MASK,
+                        .addr = 0x22,
+                        .mask_int2 = 0x08,
                         /*
                          * The sensor has IHL (active low) and open
                          * drain settings, but only for INT1 and not
@@ -327,7 +254,7 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = {
                          */
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_GYRO_3_MULTIREAD_BIT,
+                .multi_read_bit = true,
                 .bootime = 2,
         },
 };
diff --git a/drivers/iio/humidity/Kconfig b/drivers/iio/humidity/Kconfig
index b17e2e2bd4f5..912477d54be2 100644
--- a/drivers/iio/humidity/Kconfig
+++ b/drivers/iio/humidity/Kconfig
@@ -27,6 +27,8 @@ config DHT11
 config HDC100X
         tristate "TI HDC100x relative humidity and temperature sensor"
         depends on I2C
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
         help
           Say yes here to build support for the Texas Instruments
           HDC1000 and HDC1008 relative humidity and temperature sensors.
@@ -34,6 +36,28 @@ config HDC100X
           To compile this driver as a module, choose M here: the module
           will be called hdc100x.
 
+config HTS221
+        tristate "STMicroelectronics HTS221 sensor Driver"
+        depends on (I2C || SPI)
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        select HTS221_I2C if (I2C)
+        select HTS221_SPI if (SPI_MASTER)
+        help
+          Say yes here to build support for STMicroelectronics HTS221
+          temperature-humidity sensor
+
+          To compile this driver as a module, choose M here: the module
+          will be called hts221.
+
+config HTS221_I2C
+        tristate
+        depends on HTS221
+
+config HTS221_SPI
+        tristate
+        depends on HTS221
+
 config HTU21
         tristate "Measurement Specialties HTU21 humidity & temperature sensor"
         depends on I2C
diff --git a/drivers/iio/humidity/Makefile b/drivers/iio/humidity/Makefile
index 4a73442fcd9c..a6850e47c100 100644
--- a/drivers/iio/humidity/Makefile
+++ b/drivers/iio/humidity/Makefile
@@ -5,6 +5,13 @@
 obj-$(CONFIG_AM2315) += am2315.o
 obj-$(CONFIG_DHT11) += dht11.o
 obj-$(CONFIG_HDC100X) += hdc100x.o
+
+hts221-y := hts221_core.o \
+            hts221_buffer.o
+obj-$(CONFIG_HTS221) += hts221.o
+obj-$(CONFIG_HTS221_I2C) += hts221_i2c.o
+obj-$(CONFIG_HTS221_SPI) += hts221_spi.o
+
 obj-$(CONFIG_HTU21) += htu21.o
 obj-$(CONFIG_SI7005) += si7005.o
 obj-$(CONFIG_SI7020) += si7020.o
diff --git a/drivers/iio/humidity/hdc100x.c b/drivers/iio/humidity/hdc100x.c
index e0c9c70c2a4a..265c34da52d1 100644
--- a/drivers/iio/humidity/hdc100x.c
+++ b/drivers/iio/humidity/hdc100x.c
@@ -22,11 +22,15 @@
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
 
 #define HDC100X_REG_TEMP                        0x00
 #define HDC100X_REG_HUMIDITY                    0x01
 
 #define HDC100X_REG_CONFIG                      0x02
+#define HDC100X_REG_CONFIG_ACQ_MODE             BIT(12)
 #define HDC100X_REG_CONFIG_HEATER_EN            BIT(13)
 
 struct hdc100x_data {
@@ -87,22 +91,40 @@ static const struct iio_chan_spec hdc100x_channels[] = {
                         BIT(IIO_CHAN_INFO_SCALE) |
                         BIT(IIO_CHAN_INFO_INT_TIME) |
                         BIT(IIO_CHAN_INFO_OFFSET),
+                .scan_index = 0,
+                .scan_type = {
+                        .sign = 's',
+                        .realbits = 16,
+                        .storagebits = 16,
+                        .endianness = IIO_BE,
+                },
         },
         {
                 .type = IIO_HUMIDITYRELATIVE,
                 .address = HDC100X_REG_HUMIDITY,
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
                         BIT(IIO_CHAN_INFO_SCALE) |
-                        BIT(IIO_CHAN_INFO_INT_TIME)
+                        BIT(IIO_CHAN_INFO_INT_TIME),
+                .scan_index = 1,
+                .scan_type = {
+                        .sign = 'u',
+                        .realbits = 16,
+                        .storagebits = 16,
+                        .endianness = IIO_BE,
+                },
         },
         {
                 .type = IIO_CURRENT,
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
                 .extend_name = "heater",
                 .output = 1,
+                .scan_index = -1,
         },
+        IIO_CHAN_SOFT_TIMESTAMP(2),
 };
 
+static const unsigned long hdc100x_scan_masks[] = {0x3, 0};
+
 static int hdc100x_update_config(struct hdc100x_data *data, int mask, int val)
 {
         int tmp = (~mask & data->config) | val;
@@ -183,7 +205,14 @@ static int hdc100x_read_raw(struct iio_dev *indio_dev,
                         *val = hdc100x_get_heater_status(data);
                         ret = IIO_VAL_INT;
                 } else {
+                        ret = iio_device_claim_direct_mode(indio_dev);
+                        if (ret) {
+                                mutex_unlock(&data->lock);
+                                return ret;
+                        }
+
                         ret = hdc100x_get_measurement(data, chan);
+                        iio_device_release_direct_mode(indio_dev);
                         if (ret >= 0) {
                                 *val = ret;
                                 ret = IIO_VAL_INT;
@@ -246,6 +275,78 @@ static int hdc100x_write_raw(struct iio_dev *indio_dev,
         }
 }
 
+static int hdc100x_buffer_postenable(struct iio_dev *indio_dev)
+{
+        struct hdc100x_data *data = iio_priv(indio_dev);
+        int ret;
+
+        /* Buffer is enabled. First set ACQ Mode, then attach poll func */
+        mutex_lock(&data->lock);
+        ret = hdc100x_update_config(data, HDC100X_REG_CONFIG_ACQ_MODE,
+                                    HDC100X_REG_CONFIG_ACQ_MODE);
+        mutex_unlock(&data->lock);
+        if (ret)
+                return ret;
+
+        return iio_triggered_buffer_postenable(indio_dev);
+}
+
+static int hdc100x_buffer_predisable(struct iio_dev *indio_dev)
+{
+        struct hdc100x_data *data = iio_priv(indio_dev);
+        int ret;
+
+        /* First detach poll func, then reset ACQ mode. OK to disable buffer */
+        ret = iio_triggered_buffer_predisable(indio_dev);
+        if (ret)
+                return ret;
+
+        mutex_lock(&data->lock);
+        ret = hdc100x_update_config(data, HDC100X_REG_CONFIG_ACQ_MODE, 0);
+        mutex_unlock(&data->lock);
+
+        return ret;
+}
+
+static const struct iio_buffer_setup_ops hdc_buffer_setup_ops = {
+        .postenable  = hdc100x_buffer_postenable,
+        .predisable  = hdc100x_buffer_predisable,
+};
+
+static irqreturn_t hdc100x_trigger_handler(int irq, void *p)
+{
+        struct iio_poll_func *pf = p;
+        struct iio_dev *indio_dev = pf->indio_dev;
+        struct hdc100x_data *data = iio_priv(indio_dev);
+        struct i2c_client *client = data->client;
+        int delay = data->adc_int_us[0] + data->adc_int_us[1];
+        int ret;
+        s16 buf[8];  /* 2x s16 + padding + 8 byte timestamp */
+
+        /* dual read starts at temp register */
+        mutex_lock(&data->lock);
+        ret = i2c_smbus_write_byte(client, HDC100X_REG_TEMP);
+        if (ret < 0) {
+                dev_err(&client->dev, "cannot start measurement\n");
+                goto err;
+        }
+        usleep_range(delay, delay + 1000);
+
+        ret = i2c_master_recv(client, (u8 *)buf, 4);
+        if (ret < 0) {
+                dev_err(&client->dev, "cannot read sensor data\n");
+                goto err;
+        }
+
+        iio_push_to_buffers_with_timestamp(indio_dev, buf,
+                                           iio_get_time_ns(indio_dev));
+err:
+        mutex_unlock(&data->lock);
+        iio_trigger_notify_done(indio_dev->trig);
+
+        return IRQ_HANDLED;
+}
+
 static const struct iio_info hdc100x_info = {
         .read_raw = hdc100x_read_raw,
         .write_raw = hdc100x_write_raw,
@@ -258,6 +359,7 @@ static int hdc100x_probe(struct i2c_client *client,
 {
         struct iio_dev *indio_dev;
         struct hdc100x_data *data;
+        int ret;
 
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA |
                                      I2C_FUNC_SMBUS_BYTE | I2C_FUNC_I2C))
@@ -279,12 +381,35 @@ static int hdc100x_probe(struct i2c_client *client,
 
         indio_dev->channels = hdc100x_channels;
         indio_dev->num_channels = ARRAY_SIZE(hdc100x_channels);
+        indio_dev->available_scan_masks = hdc100x_scan_masks;
 
         /* be sure we are in a known state */
         hdc100x_set_it_time(data, 0, hdc100x_int_time[0][0]);
         hdc100x_set_it_time(data, 1, hdc100x_int_time[1][0]);
+        hdc100x_update_config(data, HDC100X_REG_CONFIG_ACQ_MODE, 0);
+
+        ret = iio_triggered_buffer_setup(indio_dev, NULL,
+                                         hdc100x_trigger_handler,
+                                         &hdc_buffer_setup_ops);
+        if (ret < 0) {
+                dev_err(&client->dev, "iio triggered buffer setup failed\n");
+                return ret;
+        }
+        ret = iio_device_register(indio_dev);
+        if (ret < 0)
+                iio_triggered_buffer_cleanup(indio_dev);
+
+        return ret;
+}
+
+static int hdc100x_remove(struct i2c_client *client)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+
+        iio_device_unregister(indio_dev);
+        iio_triggered_buffer_cleanup(indio_dev);
 
-        return devm_iio_device_register(&client->dev, indio_dev);
+        return 0;
 }
 
 static const struct i2c_device_id hdc100x_id[] = {
@@ -298,6 +423,7 @@ static struct i2c_driver hdc100x_driver = {
                 .name   = "hdc100x",
         },
         .probe = hdc100x_probe,
+        .remove = hdc100x_remove,
         .id_table = hdc100x_id,
 };
 module_i2c_driver(hdc100x_driver);
diff --git a/drivers/iio/humidity/hts221.h b/drivers/iio/humidity/hts221.h
new file mode 100644
index 000000000000..c7154665512e
--- /dev/null
+++ b/drivers/iio/humidity/hts221.h
@@ -0,0 +1,73 @@
+/*
+ * STMicroelectronics hts221 sensor driver
+ *
+ * Copyright 2016 STMicroelectronics Inc.
+ *
+ * Lorenzo Bianconi <lorenzo.bianconi@st.com>
+ *
+ * Licensed under the GPL-2.
+ */
+
+#ifndef HTS221_H
+#define HTS221_H
+
+#define HTS221_DEV_NAME         "hts221"
+
+#include <linux/iio/iio.h>
+
+#define HTS221_RX_MAX_LENGTH    8
+#define HTS221_TX_MAX_LENGTH    8
+
+#define HTS221_DATA_SIZE        2
+
+struct hts221_transfer_buffer {
+        u8 rx_buf[HTS221_RX_MAX_LENGTH];
+        u8 tx_buf[HTS221_TX_MAX_LENGTH] ____cacheline_aligned;
+};
+
+struct hts221_transfer_function {
+        int (*read)(struct device *dev, u8 addr, int len, u8 *data);
+        int (*write)(struct device *dev, u8 addr, int len, u8 *data);
+};
+
+#define HTS221_AVG_DEPTH        8
+struct hts221_avg_avl {
+        u16 avg;
+        u8 val;
+};
+
+enum hts221_sensor_type {
+        HTS221_SENSOR_H,
+        HTS221_SENSOR_T,
+        HTS221_SENSOR_MAX,
+};
+
+struct hts221_sensor {
+        u8 cur_avg_idx;
+        int slope, b_gen;
+};
+
+struct hts221_hw {
+        const char *name;
+        struct device *dev;
+
+        struct mutex lock;
+        struct iio_trigger *trig;
+        int irq;
+
+        struct hts221_sensor sensors[HTS221_SENSOR_MAX];
+
+        u8 odr;
+
+        const struct hts221_transfer_function *tf;
+        struct hts221_transfer_buffer tb;
+};
+
+int hts221_config_drdy(struct hts221_hw *hw, bool enable);
+int hts221_probe(struct iio_dev *iio_dev);
+int hts221_power_on(struct hts221_hw *hw);
+int hts221_power_off(struct hts221_hw *hw);
+int hts221_allocate_buffers(struct hts221_hw *hw);
+int hts221_allocate_trigger(struct hts221_hw *hw);
+
+#endif /* HTS221_H */
diff --git a/drivers/iio/humidity/hts221_buffer.c b/drivers/iio/humidity/hts221_buffer.c
new file mode 100644
index 000000000000..72ddcdac21a2
--- /dev/null
+++ b/drivers/iio/humidity/hts221_buffer.c
@@ -0,0 +1,168 @@
+/*
+ * STMicroelectronics hts221 sensor driver
+ *
+ * Copyright 2016 STMicroelectronics Inc.
+ *
+ * Lorenzo Bianconi <lorenzo.bianconi@st.com>
+ *
+ * Licensed under the GPL-2.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/irqreturn.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/trigger.h>
+#include <linux/iio/events.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
+#include <linux/iio/buffer.h>
+
+#include "hts221.h"
+
+#define HTS221_REG_STATUS_ADDR          0x27
+#define HTS221_RH_DRDY_MASK             BIT(1)
+#define HTS221_TEMP_DRDY_MASK           BIT(0)
+
+static int hts221_trig_set_state(struct iio_trigger *trig, bool state)
+{
+        struct iio_dev *iio_dev = iio_trigger_get_drvdata(trig);
+        struct hts221_hw *hw = iio_priv(iio_dev);
+
+        return hts221_config_drdy(hw, state);
+}
+
+static const struct iio_trigger_ops hts221_trigger_ops = {
+        .owner = THIS_MODULE,
+        .set_trigger_state = hts221_trig_set_state,
+};
+
+static irqreturn_t hts221_trigger_handler_thread(int irq, void *private)
+{
+        struct hts221_hw *hw = (struct hts221_hw *)private;
+        u8 status;
+        int err;
+
+        err = hw->tf->read(hw->dev, HTS221_REG_STATUS_ADDR, sizeof(status),
+                           &status);
+        if (err < 0)
+                return IRQ_HANDLED;
+
+        /* 
+         * H_DA bit (humidity data available) is routed to DRDY line.
+         * Humidity sample is computed after temperature one.
+         * Here we can assume data channels are both available if H_DA bit
+         * is set in status register
+         */
+        if (!(status & HTS221_RH_DRDY_MASK))
+                return IRQ_NONE;
+
+        iio_trigger_poll_chained(hw->trig);
+
+        return IRQ_HANDLED;
+}
+
+int hts221_allocate_trigger(struct hts221_hw *hw)
+{
+        struct iio_dev *iio_dev = iio_priv_to_dev(hw);
+        unsigned long irq_type;
+        int err;
+
+        irq_type = irqd_get_trigger_type(irq_get_irq_data(hw->irq));
+
+        switch (irq_type) {
+        case IRQF_TRIGGER_HIGH:
+        case IRQF_TRIGGER_RISING:
+                break;
+        default:
+                dev_info(hw->dev,
+                         "mode %lx unsupported, using IRQF_TRIGGER_RISING\n",
+                         irq_type);
+                irq_type = IRQF_TRIGGER_RISING;
+                break;
+        }
+
+        err = devm_request_threaded_irq(hw->dev, hw->irq, NULL,
+                                        hts221_trigger_handler_thread,
+                                        irq_type | IRQF_ONESHOT,
+                                        hw->name, hw);
+        if (err) {
+                dev_err(hw->dev, "failed to request trigger irq %d\n",
+                        hw->irq);
+                return err;
+        }
+
+        hw->trig = devm_iio_trigger_alloc(hw->dev, "%s-trigger",
+                                          iio_dev->name);
+        if (!hw->trig)
+                return -ENOMEM;
+
+        iio_trigger_set_drvdata(hw->trig, iio_dev);
+        hw->trig->ops = &hts221_trigger_ops;
+        hw->trig->dev.parent = hw->dev;
+        iio_dev->trig = iio_trigger_get(hw->trig);
+
+        return devm_iio_trigger_register(hw->dev, hw->trig);
+}
+
+static int hts221_buffer_preenable(struct iio_dev *iio_dev)
+{
+        return hts221_power_on(iio_priv(iio_dev));
+}
+
+static int hts221_buffer_postdisable(struct iio_dev *iio_dev)
+{
+        return hts221_power_off(iio_priv(iio_dev));
+}
+
+static const struct iio_buffer_setup_ops hts221_buffer_ops = {
+        .preenable = hts221_buffer_preenable,
+        .postenable = iio_triggered_buffer_postenable,
+        .predisable = iio_triggered_buffer_predisable,
+        .postdisable = hts221_buffer_postdisable,
+};
+
+static irqreturn_t hts221_buffer_handler_thread(int irq, void *p)
+{
+        u8 buffer[ALIGN(2 * HTS221_DATA_SIZE, sizeof(s64)) + sizeof(s64)];
+        struct iio_poll_func *pf = p;
+        struct iio_dev *iio_dev = pf->indio_dev;
+        struct hts221_hw *hw = iio_priv(iio_dev);
+        struct iio_chan_spec const *ch;
+        int err;
+
+        /* humidity data */
+        ch = &iio_dev->channels[HTS221_SENSOR_H];
+        err = hw->tf->read(hw->dev, ch->address, HTS221_DATA_SIZE,
+                           buffer);
+        if (err < 0)
+                goto out;
+
+        /* temperature data */
+        ch = &iio_dev->channels[HTS221_SENSOR_T];
+        err = hw->tf->read(hw->dev, ch->address, HTS221_DATA_SIZE,
+                           buffer + HTS221_DATA_SIZE);
+        if (err < 0)
+                goto out;
+
+        iio_push_to_buffers_with_timestamp(iio_dev, buffer,
+                                           iio_get_time_ns(iio_dev));
+
+out:
+        iio_trigger_notify_done(hw->trig);
+
+        return IRQ_HANDLED;
+}
+
+int hts221_allocate_buffers(struct hts221_hw *hw)
+{
+        return devm_iio_triggered_buffer_setup(hw->dev, iio_priv_to_dev(hw),
+                                        NULL, hts221_buffer_handler_thread,
+                                        &hts221_buffer_ops);
+}
+
+MODULE_AUTHOR("Lorenzo Bianconi <lorenzo.bianconi@st.com>");
+MODULE_DESCRIPTION("STMicroelectronics hts221 buffer driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/humidity/hts221_core.c b/drivers/iio/humidity/hts221_core.c
new file mode 100644
index 000000000000..3f3ef4a1a474
--- /dev/null
+++ b/drivers/iio/humidity/hts221_core.c
@@ -0,0 +1,687 @@
+/*
+ * STMicroelectronics hts221 sensor driver
+ *
+ * Copyright 2016 STMicroelectronics Inc.
+ *
+ * Lorenzo Bianconi <lorenzo.bianconi@st.com>
+ *
+ * Licensed under the GPL-2.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/iio/sysfs.h>
+#include <linux/delay.h>
+#include <asm/unaligned.h>
+
+#include "hts221.h"
+
+#define HTS221_REG_WHOAMI_ADDR          0x0f
+#define HTS221_REG_WHOAMI_VAL           0xbc
+
+#define HTS221_REG_CNTRL1_ADDR          0x20
+#define HTS221_REG_CNTRL2_ADDR          0x21
+#define HTS221_REG_CNTRL3_ADDR          0x22
+
+#define HTS221_REG_AVG_ADDR             0x10
+#define HTS221_REG_H_OUT_L              0x28
+#define HTS221_REG_T_OUT_L              0x2a
+
+#define HTS221_HUMIDITY_AVG_MASK        0x07
+#define HTS221_TEMP_AVG_MASK            0x38
+
+#define HTS221_ODR_MASK                 0x87
+#define HTS221_BDU_MASK                 BIT(2)
+
+#define HTS221_DRDY_MASK                BIT(2)
+
+#define HTS221_ENABLE_SENSOR            BIT(7)
+
+#define HTS221_HUMIDITY_AVG_4           0x00 /* 0.4 %RH */
+#define HTS221_HUMIDITY_AVG_8           0x01 /* 0.3 %RH */
+#define HTS221_HUMIDITY_AVG_16          0x02 /* 0.2 %RH */
+#define HTS221_HUMIDITY_AVG_32          0x03 /* 0.15 %RH */
+#define HTS221_HUMIDITY_AVG_64          0x04 /* 0.1 %RH */
+#define HTS221_HUMIDITY_AVG_128         0x05 /* 0.07 %RH */
+#define HTS221_HUMIDITY_AVG_256         0x06 /* 0.05 %RH */
+#define HTS221_HUMIDITY_AVG_512         0x07 /* 0.03 %RH */
+
+#define HTS221_TEMP_AVG_2               0x00 /* 0.08 degC */
+#define HTS221_TEMP_AVG_4               0x08 /* 0.05 degC */
+#define HTS221_TEMP_AVG_8               0x10 /* 0.04 degC */
+#define HTS221_TEMP_AVG_16              0x18 /* 0.03 degC */
+#define HTS221_TEMP_AVG_32              0x20 /* 0.02 degC */
+#define HTS221_TEMP_AVG_64              0x28 /* 0.015 degC */
+#define HTS221_TEMP_AVG_128             0x30 /* 0.01 degC */
+#define HTS221_TEMP_AVG_256             0x38 /* 0.007 degC */
+
+/* calibration registers */
+#define HTS221_REG_0RH_CAL_X_H          0x36
+#define HTS221_REG_1RH_CAL_X_H          0x3a
+#define HTS221_REG_0RH_CAL_Y_H          0x30
+#define HTS221_REG_1RH_CAL_Y_H          0x31
+#define HTS221_REG_0T_CAL_X_L           0x3c
+#define HTS221_REG_1T_CAL_X_L           0x3e
+#define HTS221_REG_0T_CAL_Y_H           0x32
+#define HTS221_REG_1T_CAL_Y_H           0x33
+#define HTS221_REG_T1_T0_CAL_Y_H        0x35
+
+struct hts221_odr {
+        u8 hz;
+        u8 val;
+};
+
+struct hts221_avg {
+        u8 addr;
+        u8 mask;
+        struct hts221_avg_avl avg_avl[HTS221_AVG_DEPTH];
+};
+
+static const struct hts221_odr hts221_odr_table[] = {
+        {  1, 0x01 },   /* 1Hz */
+        {  7, 0x02 },   /* 7Hz */
+        { 13, 0x03 },   /* 12.5Hz */
+};
+
+static const struct hts221_avg hts221_avg_list[] = {
+        {
+                .addr = HTS221_REG_AVG_ADDR,
+                .mask = HTS221_HUMIDITY_AVG_MASK,
+                .avg_avl = {
+                        { 4, HTS221_HUMIDITY_AVG_4 },
+                        { 8, HTS221_HUMIDITY_AVG_8 },
+                        { 16, HTS221_HUMIDITY_AVG_16 },
+                        { 32, HTS221_HUMIDITY_AVG_32 },
+                        { 64, HTS221_HUMIDITY_AVG_64 },
+                        { 128, HTS221_HUMIDITY_AVG_128 },
+                        { 256, HTS221_HUMIDITY_AVG_256 },
+                        { 512, HTS221_HUMIDITY_AVG_512 },
+                },
+        },
+        {
+                .addr = HTS221_REG_AVG_ADDR,
+                .mask = HTS221_TEMP_AVG_MASK,
+                .avg_avl = {
+                        { 2, HTS221_TEMP_AVG_2 },
+                        { 4, HTS221_TEMP_AVG_4 },
+                        { 8, HTS221_TEMP_AVG_8 },
+                        { 16, HTS221_TEMP_AVG_16 },
+                        { 32, HTS221_TEMP_AVG_32 },
+                        { 64, HTS221_TEMP_AVG_64 },
+                        { 128, HTS221_TEMP_AVG_128 },
+                        { 256, HTS221_TEMP_AVG_256 },
+                },
+        },
+};
+
+static const struct iio_chan_spec hts221_channels[] = {
+        {
+                .type = IIO_HUMIDITYRELATIVE,
+                .address = HTS221_REG_H_OUT_L,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                                      BIT(IIO_CHAN_INFO_OFFSET) |
+                                      BIT(IIO_CHAN_INFO_SCALE) |
+                                      BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
+                .scan_index = 0,
+                .scan_type = {
+                        .sign = 's',
+                        .realbits = 16,
+                        .storagebits = 16,
+                        .endianness = IIO_LE,
+                },
+        },
+        {
+                .type = IIO_TEMP,
+                .address = HTS221_REG_T_OUT_L,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                                      BIT(IIO_CHAN_INFO_OFFSET) |
+                                      BIT(IIO_CHAN_INFO_SCALE) |
+                                      BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
+                .scan_index = 1,
+                .scan_type = {
+                        .sign = 's',
+                        .realbits = 16,
+                        .storagebits = 16,
+                        .endianness = IIO_LE,
+                },
+        },
+        IIO_CHAN_SOFT_TIMESTAMP(2),
+};
+
+static int hts221_write_with_mask(struct hts221_hw *hw, u8 addr, u8 mask,
+                                  u8 val)
+{
+        u8 data;
+        int err;
+
+        mutex_lock(&hw->lock);
+
+        err = hw->tf->read(hw->dev, addr, sizeof(data), &data);
+        if (err < 0) {
+                dev_err(hw->dev, "failed to read %02x register\n", addr);
+                goto unlock;
+        }
+
+        data = (data & ~mask) | (val & mask);
+
+        err = hw->tf->write(hw->dev, addr, sizeof(data), &data);
+        if (err < 0)
+                dev_err(hw->dev, "failed to write %02x register\n", addr);
+
+unlock:
+        mutex_unlock(&hw->lock);
+
+        return err;
+}
+
+static int hts221_check_whoami(struct hts221_hw *hw)
+{
+        u8 data;
+        int err;
+
+        err = hw->tf->read(hw->dev, HTS221_REG_WHOAMI_ADDR, sizeof(data),
+                           &data);
+        if (err < 0) {
+                dev_err(hw->dev, "failed to read whoami register\n");
+                return err;
+        }
+
+        if (data != HTS221_REG_WHOAMI_VAL) {
+                dev_err(hw->dev, "wrong whoami {%02x vs %02x}\n",
+                        data, HTS221_REG_WHOAMI_VAL);
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+int hts221_config_drdy(struct hts221_hw *hw, bool enable)
+{
+        u8 val = enable ? BIT(2) : 0;
+        int err;
+
+        err = hts221_write_with_mask(hw, HTS221_REG_CNTRL3_ADDR,
+                                     HTS221_DRDY_MASK, val);
+
+        return err < 0 ? err : 0;
+}
+
+static int hts221_update_odr(struct hts221_hw *hw, u8 odr)
+{
+        int i, err;
+        u8 val;
+
+        for (i = 0; i < ARRAY_SIZE(hts221_odr_table); i++)
+                if (hts221_odr_table[i].hz == odr)
+                        break;
+
+        if (i == ARRAY_SIZE(hts221_odr_table))
+                return -EINVAL;
+
+        val = HTS221_ENABLE_SENSOR | HTS221_BDU_MASK | hts221_odr_table[i].val;
+        err = hts221_write_with_mask(hw, HTS221_REG_CNTRL1_ADDR,
+                                     HTS221_ODR_MASK, val);
+        if (err < 0)
+                return err;
+
+        hw->odr = odr;
+
+        return 0;
+}
+
+static int hts221_update_avg(struct hts221_hw *hw,
+                             enum hts221_sensor_type type,
+                             u16 val)
+{
+        int i, err;
+        const struct hts221_avg *avg = &hts221_avg_list[type];
+
+        for (i = 0; i < HTS221_AVG_DEPTH; i++)
+                if (avg->avg_avl[i].avg == val)
+                        break;
+
+        if (i == HTS221_AVG_DEPTH)
+                return -EINVAL;
+
+        err = hts221_write_with_mask(hw, avg->addr, avg->mask,
+                                     avg->avg_avl[i].val);
+        if (err < 0)
+                return err;
+
+        hw->sensors[type].cur_avg_idx = i;
+
+        return 0;
+}
+
+static ssize_t hts221_sysfs_sampling_freq(struct device *dev,
+                                          struct device_attribute *attr,
+                                          char *buf)
+{
+        int i;
+        ssize_t len = 0;
+
+        for (i = 0; i < ARRAY_SIZE(hts221_odr_table); i++)
+                len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
+                                 hts221_odr_table[i].hz);
+        buf[len - 1] = '\n';
+
+        return len;
+}
+
+static ssize_t
+hts221_sysfs_rh_oversampling_avail(struct device *dev,
+                                   struct device_attribute *attr,
+                                   char *buf)
+{
+        const struct hts221_avg *avg = &hts221_avg_list[HTS221_SENSOR_H];
+        ssize_t len = 0;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(avg->avg_avl); i++)
+                len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
+                                 avg->avg_avl[i].avg);
+        buf[len - 1] = '\n';
+
+        return len;
+}
+
+static ssize_t
+hts221_sysfs_temp_oversampling_avail(struct device *dev,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        const struct hts221_avg *avg = &hts221_avg_list[HTS221_SENSOR_T];
+        ssize_t len = 0;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(avg->avg_avl); i++)
+                len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
+                                 avg->avg_avl[i].avg);
+        buf[len - 1] = '\n';
+
+        return len;
+}
+
+int hts221_power_on(struct hts221_hw *hw)
+{
+        return hts221_update_odr(hw, hw->odr);
+}
+
+int hts221_power_off(struct hts221_hw *hw)
+{
+        u8 data[] = {0x00, 0x00};
+
+        return hw->tf->write(hw->dev, HTS221_REG_CNTRL1_ADDR, sizeof(data),
+                             data);
+}
+
+static int hts221_parse_temp_caldata(struct hts221_hw *hw)
+{
+        int err, *slope, *b_gen;
+        s16 cal_x0, cal_x1, cal_y0, cal_y1;
+        u8 cal0, cal1;
+
+        err = hw->tf->read(hw->dev, HTS221_REG_0T_CAL_Y_H,
+                           sizeof(cal0), &cal0);
+        if (err < 0)
+                return err;
+
+        err = hw->tf->read(hw->dev, HTS221_REG_T1_T0_CAL_Y_H,
+                           sizeof(cal1), &cal1);
+        if (err < 0)
+                return err;
+        cal_y0 = (le16_to_cpu(cal1 & 0x3) << 8) | cal0;
+
+        err = hw->tf->read(hw->dev, HTS221_REG_1T_CAL_Y_H,
+                           sizeof(cal0), &cal0);
+        if (err < 0)
+                return err;
+        cal_y1 = (((cal1 & 0xc) >> 2) << 8) | cal0;
+
+        err = hw->tf->read(hw->dev, HTS221_REG_0T_CAL_X_L, sizeof(cal_x0),
+                           (u8 *)&cal_x0);
+        if (err < 0)
+                return err;
+        cal_x0 = le16_to_cpu(cal_x0);
+
+        err = hw->tf->read(hw->dev, HTS221_REG_1T_CAL_X_L, sizeof(cal_x1),
+                           (u8 *)&cal_x1);
+        if (err < 0)
+                return err;
+        cal_x1 = le16_to_cpu(cal_x1);
+
+        slope = &hw->sensors[HTS221_SENSOR_T].slope;
+        b_gen = &hw->sensors[HTS221_SENSOR_T].b_gen;
+
+        *slope = ((cal_y1 - cal_y0) * 8000) / (cal_x1 - cal_x0);
+        *b_gen = (((s32)cal_x1 * cal_y0 - (s32)cal_x0 * cal_y1) * 1000) /
+                 (cal_x1 - cal_x0);
+        *b_gen *= 8;
+
+        return 0;
+}
+
+static int hts221_parse_rh_caldata(struct hts221_hw *hw)
+{
+        int err, *slope, *b_gen;
+        s16 cal_x0, cal_x1, cal_y0, cal_y1;
+        u8 data;
+
+        err = hw->tf->read(hw->dev, HTS221_REG_0RH_CAL_Y_H, sizeof(data),
+                           &data);
+        if (err < 0)
+                return err;
+        cal_y0 = data;
+
+        err = hw->tf->read(hw->dev, HTS221_REG_1RH_CAL_Y_H, sizeof(data),
+                           &data);
+        if (err < 0)
+                return err;
+        cal_y1 = data;
+
+        err = hw->tf->read(hw->dev, HTS221_REG_0RH_CAL_X_H, sizeof(cal_x0),
+                           (u8 *)&cal_x0);
+        if (err < 0)
+                return err;
+        cal_x0 = le16_to_cpu(cal_x0);
+
+        err = hw->tf->read(hw->dev, HTS221_REG_1RH_CAL_X_H, sizeof(cal_x1),
+                           (u8 *)&cal_x1);
+        if (err < 0)
+                return err;
+        cal_x1 = le16_to_cpu(cal_x1);
+
+        slope = &hw->sensors[HTS221_SENSOR_H].slope;
+        b_gen = &hw->sensors[HTS221_SENSOR_H].b_gen;
+
+        *slope = ((cal_y1 - cal_y0) * 8000) / (cal_x1 - cal_x0);
+        *b_gen = (((s32)cal_x1 * cal_y0 - (s32)cal_x0 * cal_y1) * 1000) /
+                 (cal_x1 - cal_x0);
+        *b_gen *= 8;
+
+        return 0;
+}
+
+static int hts221_get_sensor_scale(struct hts221_hw *hw,
+                                   enum iio_chan_type ch_type,
+                                   int *val, int *val2)
+{
+        s64 tmp;
+        s32 rem, div, data;
+
+        switch (ch_type) {
+        case IIO_HUMIDITYRELATIVE:
+                data = hw->sensors[HTS221_SENSOR_H].slope;
+                div = (1 << 4) * 1000;
+                break;
+        case IIO_TEMP:
+                data = hw->sensors[HTS221_SENSOR_T].slope;
+                div = (1 << 6) * 1000;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        tmp = div_s64(data * 1000000000LL, div);
+        tmp = div_s64_rem(tmp, 1000000000LL, &rem);
+
+        *val = tmp;
+        *val2 = rem;
+
+        return IIO_VAL_INT_PLUS_NANO;
+}
+
+static int hts221_get_sensor_offset(struct hts221_hw *hw,
+                                    enum iio_chan_type ch_type,
+                                    int *val, int *val2)
+{
+        s64 tmp;
+        s32 rem, div, data;
+
+        switch (ch_type) {
+        case IIO_HUMIDITYRELATIVE:
+                data = hw->sensors[HTS221_SENSOR_H].b_gen;
+                div = hw->sensors[HTS221_SENSOR_H].slope;
+                break;
+        case IIO_TEMP:
+                data = hw->sensors[HTS221_SENSOR_T].b_gen;
+                div = hw->sensors[HTS221_SENSOR_T].slope;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        tmp = div_s64(data * 1000000000LL, div);
+        tmp = div_s64_rem(tmp, 1000000000LL, &rem);
+
+        *val = tmp;
+        *val2 = rem;
+
+        return IIO_VAL_INT_PLUS_NANO;
+}
+
+static int hts221_read_oneshot(struct hts221_hw *hw, u8 addr, int *val)
+{
+        u8 data[HTS221_DATA_SIZE];
+        int err;
+
+        err = hts221_power_on(hw);
+        if (err < 0)
+                return err;
+
+        msleep(50);
+
+        err = hw->tf->read(hw->dev, addr, sizeof(data), data);
+        if (err < 0)
+                return err;
+
+        hts221_power_off(hw);
+
+        *val = (s16)get_unaligned_le16(data);
+
+        return IIO_VAL_INT;
+}
+
+static int hts221_read_raw(struct iio_dev *iio_dev,
+                           struct iio_chan_spec const *ch,
+                           int *val, int *val2, long mask)
+{
+        struct hts221_hw *hw = iio_priv(iio_dev);
+        int ret;
+
+        ret = iio_device_claim_direct_mode(iio_dev);
+        if (ret)
+                return ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                ret = hts221_read_oneshot(hw, ch->address, val);
+                break;
+        case IIO_CHAN_INFO_SCALE:
+                ret = hts221_get_sensor_scale(hw, ch->type, val, val2);
+                break;
+        case IIO_CHAN_INFO_OFFSET:
+                ret = hts221_get_sensor_offset(hw, ch->type, val, val2);
+                break;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                *val = hw->odr;
+                ret = IIO_VAL_INT;
+                break;
+        case IIO_CHAN_INFO_OVERSAMPLING_RATIO: {
+                u8 idx;
+                const struct hts221_avg *avg;
+
+                switch (ch->type) {
+                case IIO_HUMIDITYRELATIVE:
+                        avg = &hts221_avg_list[HTS221_SENSOR_H];
+                        idx = hw->sensors[HTS221_SENSOR_H].cur_avg_idx;
+                        *val = avg->avg_avl[idx].avg;
+                        ret = IIO_VAL_INT;
+                        break;
+                case IIO_TEMP:
+                        avg = &hts221_avg_list[HTS221_SENSOR_T];
+                        idx = hw->sensors[HTS221_SENSOR_T].cur_avg_idx;
+                        *val = avg->avg_avl[idx].avg;
+                        ret = IIO_VAL_INT;
+                        break;
+                default:
+                        ret = -EINVAL;
+                        break;
+                }
+                break;
+        }
+        default:
+                ret = -EINVAL;
+                break;
+        }
+
+        iio_device_release_direct_mode(iio_dev);
+
+        return ret;
+}
+
+static int hts221_write_raw(struct iio_dev *iio_dev,
+                            struct iio_chan_spec const *chan,
+                            int val, int val2, long mask)
+{
+        struct hts221_hw *hw = iio_priv(iio_dev);
+        int ret;
+
+        ret = iio_device_claim_direct_mode(iio_dev);
+        if (ret)
+                return ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                ret = hts221_update_odr(hw, val);
+                break;
+        case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
+                switch (chan->type) {
+                case IIO_HUMIDITYRELATIVE:
+                        ret = hts221_update_avg(hw, HTS221_SENSOR_H, val);
+                        break;
+                case IIO_TEMP:
+                        ret = hts221_update_avg(hw, HTS221_SENSOR_T, val);
+                        break;
+                default:
+                        ret = -EINVAL;
+                        break;
+                }
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+
+        iio_device_release_direct_mode(iio_dev);
+
+        return ret;
+}
+
+static int hts221_validate_trigger(struct iio_dev *iio_dev,
+                                   struct iio_trigger *trig)
+{
+        struct hts221_hw *hw = iio_priv(iio_dev);
+
+        return hw->trig == trig ? 0 : -EINVAL;
+}
+
+static IIO_DEVICE_ATTR(in_humidity_oversampling_ratio_available, S_IRUGO,
+                       hts221_sysfs_rh_oversampling_avail, NULL, 0);
+static IIO_DEVICE_ATTR(in_temp_oversampling_ratio_available, S_IRUGO,
+                       hts221_sysfs_temp_oversampling_avail, NULL, 0);
+static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(hts221_sysfs_sampling_freq);
+
+static struct attribute *hts221_attributes[] = {
+        &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
+        &iio_dev_attr_in_humidity_oversampling_ratio_available.dev_attr.attr,
+        &iio_dev_attr_in_temp_oversampling_ratio_available.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group hts221_attribute_group = {
+        .attrs = hts221_attributes,
+};
+
+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,
+        .validate_trigger = hts221_validate_trigger,
+};
+
+static const unsigned long hts221_scan_masks[] = {0x3, 0x0};
+
+int hts221_probe(struct iio_dev *iio_dev)
+{
+        struct hts221_hw *hw = iio_priv(iio_dev);
+        int err;
+        u8 data;
+
+        mutex_init(&hw->lock);
+
+        err = hts221_check_whoami(hw);
+        if (err < 0)
+                return err;
+
+        hw->odr = hts221_odr_table[0].hz;
+
+        iio_dev->modes = INDIO_DIRECT_MODE;
+        iio_dev->dev.parent = hw->dev;
+        iio_dev->available_scan_masks = hts221_scan_masks;
+        iio_dev->channels = hts221_channels;
+        iio_dev->num_channels = ARRAY_SIZE(hts221_channels);
+        iio_dev->name = HTS221_DEV_NAME;
+        iio_dev->info = &hts221_info;
+
+        /* configure humidity sensor */
+        err = hts221_parse_rh_caldata(hw);
+        if (err < 0) {
+                dev_err(hw->dev, "failed to get rh calibration data\n");
+                return err;
+        }
+
+        data = hts221_avg_list[HTS221_SENSOR_H].avg_avl[3].avg;
+        err = hts221_update_avg(hw, HTS221_SENSOR_H, data);
+        if (err < 0) {
+                dev_err(hw->dev, "failed to set rh oversampling ratio\n");
+                return err;
+        }
+
+        /* configure temperature sensor */
+        err = hts221_parse_temp_caldata(hw);
+        if (err < 0) {
+                dev_err(hw->dev,
+                        "failed to get temperature calibration data\n");
+                return err;
+        }
+
+        data = hts221_avg_list[HTS221_SENSOR_T].avg_avl[3].avg;
+        err = hts221_update_avg(hw, HTS221_SENSOR_T, data);
+        if (err < 0) {
+                dev_err(hw->dev,
+                        "failed to set temperature oversampling ratio\n");
+                return err;
+        }
+
+        if (hw->irq > 0) {
+                err = hts221_allocate_buffers(hw);
+                if (err < 0)
+                        return err;
+
+                err = hts221_allocate_trigger(hw);
+                if (err)
+                        return err;
+        }
+
+        return devm_iio_device_register(hw->dev, iio_dev);
+}
+EXPORT_SYMBOL(hts221_probe);
+
+MODULE_AUTHOR("Lorenzo Bianconi <lorenzo.bianconi@st.com>");
+MODULE_DESCRIPTION("STMicroelectronics hts221 sensor driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/humidity/hts221_i2c.c b/drivers/iio/humidity/hts221_i2c.c
new file mode 100644
index 000000000000..367ecd509f31
--- /dev/null
+++ b/drivers/iio/humidity/hts221_i2c.c
@@ -0,0 +1,110 @@
+/*
+ * STMicroelectronics hts221 i2c driver
+ *
+ * Copyright 2016 STMicroelectronics Inc.
+ *
+ * Lorenzo Bianconi <lorenzo.bianconi@st.com>
+ *
+ * Licensed under the GPL-2.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/slab.h>
+#include "hts221.h"
+
+#define I2C_AUTO_INCREMENT      0x80
+
+static int hts221_i2c_read(struct device *dev, u8 addr, int len, u8 *data)
+{
+        struct i2c_msg msg[2];
+        struct i2c_client *client = to_i2c_client(dev);
+
+        if (len > 1)
+                addr |= I2C_AUTO_INCREMENT;
+
+        msg[0].addr = client->addr;
+        msg[0].flags = client->flags;
+        msg[0].len = 1;
+        msg[0].buf = &addr;
+
+        msg[1].addr = client->addr;
+        msg[1].flags = client->flags | I2C_M_RD;
+        msg[1].len = len;
+        msg[1].buf = data;
+
+        return i2c_transfer(client->adapter, msg, 2);
+}
+
+static int hts221_i2c_write(struct device *dev, u8 addr, int len, u8 *data)
+{
+        u8 send[len + 1];
+        struct i2c_msg msg;
+        struct i2c_client *client = to_i2c_client(dev);
+
+        if (len > 1)
+                addr |= I2C_AUTO_INCREMENT;
+
+        send[0] = addr;
+        memcpy(&send[1], data, len * sizeof(u8));
+
+        msg.addr = client->addr;
+        msg.flags = client->flags;
+        msg.len = len + 1;
+        msg.buf = send;
+
+        return i2c_transfer(client->adapter, &msg, 1);
+}
+
+static const struct hts221_transfer_function hts221_transfer_fn = {
+        .read = hts221_i2c_read,
+        .write = hts221_i2c_write,
+};
+
+static int hts221_i2c_probe(struct i2c_client *client,
+                            const struct i2c_device_id *id)
+{
+        struct hts221_hw *hw;
+        struct iio_dev *iio_dev;
+
+        iio_dev = devm_iio_device_alloc(&client->dev, sizeof(*hw));
+        if (!iio_dev)
+                return -ENOMEM;
+
+        i2c_set_clientdata(client, iio_dev);
+
+        hw = iio_priv(iio_dev);
+        hw->name = client->name;
+        hw->dev = &client->dev;
+        hw->irq = client->irq;
+        hw->tf = &hts221_transfer_fn;
+
+        return hts221_probe(iio_dev);
+}
+
+static const struct of_device_id hts221_i2c_of_match[] = {
+        { .compatible = "st,hts221", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, hts221_i2c_of_match);
+
+static const struct i2c_device_id hts221_i2c_id_table[] = {
+        { HTS221_DEV_NAME },
+        {},
+};
+MODULE_DEVICE_TABLE(i2c, hts221_i2c_id_table);
+
+static struct i2c_driver hts221_driver = {
+        .driver = {
+                .name = "hts221_i2c",
+                .of_match_table = of_match_ptr(hts221_i2c_of_match),
+        },
+        .probe = hts221_i2c_probe,
+        .id_table = hts221_i2c_id_table,
+};
+module_i2c_driver(hts221_driver);
+
+MODULE_AUTHOR("Lorenzo Bianconi <lorenzo.bianconi@st.com>");
+MODULE_DESCRIPTION("STMicroelectronics hts221 i2c driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/humidity/hts221_spi.c b/drivers/iio/humidity/hts221_spi.c
new file mode 100644
index 000000000000..70df5e7150c1
--- /dev/null
+++ b/drivers/iio/humidity/hts221_spi.c
@@ -0,0 +1,125 @@
+/*
+ * STMicroelectronics hts221 spi driver
+ *
+ * Copyright 2016 STMicroelectronics Inc.
+ *
+ * Lorenzo Bianconi <lorenzo.bianconi@st.com>
+ *
+ * Licensed under the GPL-2.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include "hts221.h"
+
+#define SENSORS_SPI_READ        0x80
+#define SPI_AUTO_INCREMENT      0x40
+
+static int hts221_spi_read(struct device *dev, u8 addr, int len, u8 *data)
+{
+        int err;
+        struct spi_device *spi = to_spi_device(dev);
+        struct iio_dev *iio_dev = spi_get_drvdata(spi);
+        struct hts221_hw *hw = iio_priv(iio_dev);
+
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = hw->tb.tx_buf,
+                        .bits_per_word = 8,
+                        .len = 1,
+                },
+                {
+                        .rx_buf = hw->tb.rx_buf,
+                        .bits_per_word = 8,
+                        .len = len,
+                }
+        };
+
+        if (len > 1)
+                addr |= SPI_AUTO_INCREMENT;
+        hw->tb.tx_buf[0] = addr | SENSORS_SPI_READ;
+
+        err = spi_sync_transfer(spi, xfers,  ARRAY_SIZE(xfers));
+        if (err < 0)
+                return err;
+
+        memcpy(data, hw->tb.rx_buf, len * sizeof(u8));
+
+        return len;
+}
+
+static int hts221_spi_write(struct device *dev, u8 addr, int len, u8 *data)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct iio_dev *iio_dev = spi_get_drvdata(spi);
+        struct hts221_hw *hw = iio_priv(iio_dev);
+
+        struct spi_transfer xfers = {
+                .tx_buf = hw->tb.tx_buf,
+                .bits_per_word = 8,
+                .len = len + 1,
+        };
+
+        if (len >= HTS221_TX_MAX_LENGTH)
+                return -ENOMEM;
+
+        if (len > 1)
+                addr |= SPI_AUTO_INCREMENT;
+        hw->tb.tx_buf[0] = addr;
+        memcpy(&hw->tb.tx_buf[1], data, len);
+
+        return spi_sync_transfer(spi, &xfers, 1);
+}
+
+static const struct hts221_transfer_function hts221_transfer_fn = {
+        .read = hts221_spi_read,
+        .write = hts221_spi_write,
+};
+
+static int hts221_spi_probe(struct spi_device *spi)
+{
+        struct hts221_hw *hw;
+        struct iio_dev *iio_dev;
+
+        iio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*hw));
+        if (!iio_dev)
+                return -ENOMEM;
+
+        spi_set_drvdata(spi, iio_dev);
+
+        hw = iio_priv(iio_dev);
+        hw->name = spi->modalias;
+        hw->dev = &spi->dev;
+        hw->irq = spi->irq;
+        hw->tf = &hts221_transfer_fn;
+
+        return hts221_probe(iio_dev);
+}
+
+static const struct of_device_id hts221_spi_of_match[] = {
+        { .compatible = "st,hts221", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, hts221_spi_of_match);
+
+static const struct spi_device_id hts221_spi_id_table[] = {
+        { HTS221_DEV_NAME },
+        {},
+};
+MODULE_DEVICE_TABLE(spi, hts221_spi_id_table);
+
+static struct spi_driver hts221_driver = {
+        .driver = {
+                .name = "hts221_spi",
+                .of_match_table = of_match_ptr(hts221_spi_of_match),
+        },
+        .probe = hts221_spi_probe,
+        .id_table = hts221_spi_id_table,
+};
+module_spi_driver(hts221_driver);
+
+MODULE_AUTHOR("Lorenzo Bianconi <lorenzo.bianconi@st.com>");
+MODULE_DESCRIPTION("STMicroelectronics hts221 spi driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/humidity/si7020.c b/drivers/iio/humidity/si7020.c
index ffc2ccf6374e..345a7656c5ef 100644
--- a/drivers/iio/humidity/si7020.c
+++ b/drivers/iio/humidity/si7020.c
@@ -154,8 +154,17 @@ static const struct i2c_device_id si7020_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, si7020_id);
 
+static const struct of_device_id si7020_dt_ids[] = {
+        { .compatible = "silabs,si7020" },
+        { }
+};
+MODULE_DEVICE_TABLE(of, si7020_dt_ids);
+
 static struct i2c_driver si7020_driver = {
-        .driver.name    = "si7020",
+        .driver = {
+                .name = "si7020",
+                .of_match_table = of_match_ptr(si7020_dt_ids),
+        },
         .probe          = si7020_probe,
         .id_table       = si7020_id,
 };
diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
index e0251b8c1a52..5355507f8fa1 100644
--- a/drivers/iio/imu/bmi160/bmi160_core.c
+++ b/drivers/iio/imu/bmi160/bmi160_core.c
@@ -398,7 +398,8 @@ static irqreturn_t bmi160_trigger_handler(int irq, void *p)
         struct iio_poll_func *pf = p;
         struct iio_dev *indio_dev = pf->indio_dev;
         struct bmi160_data *data = iio_priv(indio_dev);
-        s16 buf[16]; /* 3 sens x 3 axis x s16 + 3 x s16 pad + 4 x s16 tstamp */
+        __le16 buf[16];
+        /* 3 sens x 3 axis x __le16 + 3 x __le16 pad + 4 x __le16 tstamp */
         int i, ret, j = 0, base = BMI160_REG_DATA_MAGN_XOUT_L;
         __le16 sample;
 
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
index 19580d1db597..2c3f8964a3ea 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
@@ -126,7 +126,7 @@ static int inv_mpu_probe(struct i2c_client *client,
 
         st = iio_priv(dev_get_drvdata(&client->dev));
         st->muxc = i2c_mux_alloc(client->adapter, &client->dev,
-                                 1, 0, I2C_MUX_LOCKED,
+                                 1, 0, I2C_MUX_LOCKED | I2C_MUX_GATE,
                                  inv_mpu6050_select_bypass,
                                  inv_mpu6050_deselect_bypass);
         if (!st->muxc) {
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 158aaf44dd95..b12830b09c7d 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -307,10 +307,9 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev,
         const unsigned long *mask;
         unsigned long *trialmask;
 
-        trialmask = kmalloc(sizeof(*trialmask)*
-                            BITS_TO_LONGS(indio_dev->masklength),
-                            GFP_KERNEL);
-
+        trialmask = kmalloc_array(BITS_TO_LONGS(indio_dev->masklength),
+                                  sizeof(*trialmask),
+                                  GFP_KERNEL);
         if (trialmask == NULL)
                 return -ENOMEM;
         if (!indio_dev->masklength) {
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index fc340ed3dca1..aaca42862389 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -81,6 +81,8 @@ static const char * const iio_chan_type_name_spec[] = {
         [IIO_PH] = "ph",
         [IIO_UVINDEX] = "uvindex",
         [IIO_ELECTRICALCONDUCTIVITY] = "electricalconductivity",
+        [IIO_COUNT] = "count",
+        [IIO_INDEX] = "index",
 };
 
 static const char * const iio_modifier_names[] = {
@@ -575,66 +577,82 @@ int of_iio_read_mount_matrix(const struct device *dev,
 #endif
 EXPORT_SYMBOL(of_iio_read_mount_matrix);
 
-/**
- * iio_format_value() - Formats a IIO value into its string representation
- * @buf:        The buffer to which the formatted value gets written
- * @type:       One of the IIO_VAL_... constants. This decides how the val
- *              and val2 parameters are formatted.
- * @size:       Number of IIO value entries contained in vals
- * @vals:       Pointer to the values, exact meaning depends on the
- *              type parameter.
- *
- * Return: 0 by default, a negative number on failure or the
- *         total number of characters written for a type that belongs
- *         to the IIO_VAL_... constant.
- */
-ssize_t iio_format_value(char *buf, unsigned int type, int size, int *vals)
+static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type,
+                                  int size, const int *vals)
 {
         unsigned long long tmp;
+        int tmp0, tmp1;
         bool scale_db = false;
 
         switch (type) {
         case IIO_VAL_INT:
-                return sprintf(buf, "%d\n", vals[0]);
+                return snprintf(buf, len, "%d", vals[0]);
         case IIO_VAL_INT_PLUS_MICRO_DB:
                 scale_db = true;
         case IIO_VAL_INT_PLUS_MICRO:
                 if (vals[1] < 0)
-                        return sprintf(buf, "-%d.%06u%s\n", abs(vals[0]),
-                                       -vals[1], scale_db ? " dB" : "");
+                        return snprintf(buf, len, "-%d.%06u%s", abs(vals[0]),
+                                        -vals[1], scale_db ? " dB" : "");
                 else
-                        return sprintf(buf, "%d.%06u%s\n", vals[0], vals[1],
-                                scale_db ? " dB" : "");
+                        return snprintf(buf, len, "%d.%06u%s", vals[0], vals[1],
+                                        scale_db ? " dB" : "");
         case IIO_VAL_INT_PLUS_NANO:
                 if (vals[1] < 0)
-                        return sprintf(buf, "-%d.%09u\n", abs(vals[0]),
-                                       -vals[1]);
+                        return snprintf(buf, len, "-%d.%09u", abs(vals[0]),
+                                        -vals[1]);
                 else
-                        return sprintf(buf, "%d.%09u\n", vals[0], vals[1]);
+                        return snprintf(buf, len, "%d.%09u", vals[0], vals[1]);
         case IIO_VAL_FRACTIONAL:
                 tmp = div_s64((s64)vals[0] * 1000000000LL, vals[1]);
-                vals[0] = (int)div_s64_rem(tmp, 1000000000, &vals[1]);
-                return sprintf(buf, "%d.%09u\n", vals[0], abs(vals[1]));
+                tmp1 = vals[1];
+                tmp0 = (int)div_s64_rem(tmp, 1000000000, &tmp1);
+                return snprintf(buf, len, "%d.%09u", tmp0, abs(tmp1));
         case IIO_VAL_FRACTIONAL_LOG2:
                 tmp = (s64)vals[0] * 1000000000LL >> vals[1];
-                vals[1] = do_div(tmp, 1000000000LL);
-                vals[0] = tmp;
-                return sprintf(buf, "%d.%09u\n", vals[0], vals[1]);
+                tmp1 = do_div(tmp, 1000000000LL);
+                tmp0 = tmp;
+                return snprintf(buf, len, "%d.%09u", tmp0, tmp1);
         case IIO_VAL_INT_MULTIPLE:
         {
                 int i;
-                int len = 0;
+                int l = 0;
 
-                for (i = 0; i < size; ++i)
-                        len += snprintf(&buf[len], PAGE_SIZE - len, "%d ",
-                                                                vals[i]);
-                len += snprintf(&buf[len], PAGE_SIZE - len, "\n");
-                return len;
+                for (i = 0; i < size; ++i) {
+                        l += snprintf(&buf[l], len - l, "%d ", vals[i]);
+                        if (l >= len)
+                                break;
+                }
+                return l;
         }
         default:
                 return 0;
         }
 }
+
+/**
+ * iio_format_value() - Formats a IIO value into its string representation
+ * @buf:        The buffer to which the formatted value gets written
+ *              which is assumed to be big enough (i.e. PAGE_SIZE).
+ * @type:       One of the IIO_VAL_... constants. This decides how the val
+ *              and val2 parameters are formatted.
+ * @size:       Number of IIO value entries contained in vals
+ * @vals:       Pointer to the values, exact meaning depends on the
+ *              type parameter.
+ *
+ * Return: 0 by default, a negative number on failure or the
+ *         total number of characters written for a type that belongs
+ *         to the IIO_VAL_... constant.
+ */
+ssize_t iio_format_value(char *buf, unsigned int type, int size, int *vals)
+{
+        ssize_t len;
+
+        len = __iio_format_value(buf, PAGE_SIZE, type, size, vals);
+        if (len >= PAGE_SIZE - 1)
+                return -EFBIG;
+
+        return len + sprintf(buf + len, "\n");
+}
 EXPORT_SYMBOL_GPL(iio_format_value);
 
 static ssize_t iio_read_channel_info(struct device *dev,
@@ -662,6 +680,119 @@ static ssize_t iio_read_channel_info(struct device *dev,
         return iio_format_value(buf, ret, val_len, vals);
 }
 
+static ssize_t iio_format_avail_list(char *buf, const int *vals,
+                                     int type, int length)
+{
+        int i;
+        ssize_t len = 0;
+
+        switch (type) {
+        case IIO_VAL_INT:
+                for (i = 0; i < length; i++) {
+                        len += __iio_format_value(buf + len, PAGE_SIZE - len,
+                                                  type, 1, &vals[i]);
+                        if (len >= PAGE_SIZE)
+                                return -EFBIG;
+                        if (i < length - 1)
+                                len += snprintf(buf + len, PAGE_SIZE - len,
+                                                " ");
+                        else
+                                len += snprintf(buf + len, PAGE_SIZE - len,
+                                                "\n");
+                        if (len >= PAGE_SIZE)
+                                return -EFBIG;
+                }
+                break;
+        default:
+                for (i = 0; i < length / 2; i++) {
+                        len += __iio_format_value(buf + len, PAGE_SIZE - len,
+                                                  type, 2, &vals[i * 2]);
+                        if (len >= PAGE_SIZE)
+                                return -EFBIG;
+                        if (i < length / 2 - 1)
+                                len += snprintf(buf + len, PAGE_SIZE - len,
+                                                " ");
+                        else
+                                len += snprintf(buf + len, PAGE_SIZE - len,
+                                                "\n");
+                        if (len >= PAGE_SIZE)
+                                return -EFBIG;
+                }
+        }
+
+        return len;
+}
+
+static ssize_t iio_format_avail_range(char *buf, const int *vals, int type)
+{
+        int i;
+        ssize_t len;
+
+        len = snprintf(buf, PAGE_SIZE, "[");
+        switch (type) {
+        case IIO_VAL_INT:
+                for (i = 0; i < 3; i++) {
+                        len += __iio_format_value(buf + len, PAGE_SIZE - len,
+                                                  type, 1, &vals[i]);
+                        if (len >= PAGE_SIZE)
+                                return -EFBIG;
+                        if (i < 2)
+                                len += snprintf(buf + len, PAGE_SIZE - len,
+                                                " ");
+                        else
+                                len += snprintf(buf + len, PAGE_SIZE - len,
+                                                "]\n");
+                        if (len >= PAGE_SIZE)
+                                return -EFBIG;
+                }
+                break;
+        default:
+                for (i = 0; i < 3; i++) {
+                        len += __iio_format_value(buf + len, PAGE_SIZE - len,
+                                                  type, 2, &vals[i * 2]);
+                        if (len >= PAGE_SIZE)
+                                return -EFBIG;
+                        if (i < 2)
+                                len += snprintf(buf + len, PAGE_SIZE - len,
+                                                " ");
+                        else
+                                len += snprintf(buf + len, PAGE_SIZE - len,
+                                                "]\n");
+                        if (len >= PAGE_SIZE)
+                                return -EFBIG;
+                }
+        }
+
+        return len;
+}
+
+static ssize_t iio_read_channel_info_avail(struct device *dev,
+                                           struct device_attribute *attr,
+                                           char *buf)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        const int *vals;
+        int ret;
+        int length;
+        int type;
+
+        ret = indio_dev->info->read_avail(indio_dev, this_attr->c,
+                                          &vals, &type, &length,
+                                          this_attr->address);
+
+        if (ret < 0)
+                return ret;
+        switch (ret) {
+        case IIO_AVAIL_LIST:
+                return iio_format_avail_list(buf, vals, type, length);
+        case IIO_AVAIL_RANGE:
+                return iio_format_avail_range(buf, vals, type);
+        default:
+                return -EINVAL;
+        }
+}
+
 /**
  * iio_str_to_fixpoint() - Parse a fixed-point number from a string
  * @str: The string to parse
@@ -978,6 +1109,40 @@ static int iio_device_add_info_mask_type(struct iio_dev *indio_dev,
         return attrcount;
 }
 
+static int iio_device_add_info_mask_type_avail(struct iio_dev *indio_dev,
+                                               struct iio_chan_spec const *chan,
+                                               enum iio_shared_by shared_by,
+                                               const long *infomask)
+{
+        int i, ret, attrcount = 0;
+        char *avail_postfix;
+
+        for_each_set_bit(i, infomask, sizeof(infomask) * 8) {
+                avail_postfix = kasprintf(GFP_KERNEL,
+                                          "%s_available",
+                                          iio_chan_info_postfix[i]);
+                if (!avail_postfix)
+                        return -ENOMEM;
+
+                ret = __iio_add_chan_devattr(avail_postfix,
+                                             chan,
+                                             &iio_read_channel_info_avail,
+                                             NULL,
+                                             i,
+                                             shared_by,
+                                             &indio_dev->dev,
+                                             &indio_dev->channel_attr_list);
+                kfree(avail_postfix);
+                if ((ret == -EBUSY) && (shared_by != IIO_SEPARATE))
+                        continue;
+                else if (ret < 0)
+                        return ret;
+                attrcount++;
+        }
+
+        return attrcount;
+}
+
 static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
                                         struct iio_chan_spec const *chan)
 {
@@ -993,6 +1158,14 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
                 return ret;
         attrcount += ret;
 
+        ret = iio_device_add_info_mask_type_avail(indio_dev, chan,
+                                                  IIO_SEPARATE,
+                                                  &chan->
+                                                  info_mask_separate_available);
+        if (ret < 0)
+                return ret;
+        attrcount += ret;
+
         ret = iio_device_add_info_mask_type(indio_dev, chan,
                                             IIO_SHARED_BY_TYPE,
                                             &chan->info_mask_shared_by_type);
@@ -1000,6 +1173,14 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
                 return ret;
         attrcount += ret;
 
+        ret = iio_device_add_info_mask_type_avail(indio_dev, chan,
+                                                  IIO_SHARED_BY_TYPE,
+                                                  &chan->
+                                                  info_mask_shared_by_type_available);
+        if (ret < 0)
+                return ret;
+        attrcount += ret;
+
         ret = iio_device_add_info_mask_type(indio_dev, chan,
                                             IIO_SHARED_BY_DIR,
                                             &chan->info_mask_shared_by_dir);
@@ -1007,6 +1188,13 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
                 return ret;
         attrcount += ret;
 
+        ret = iio_device_add_info_mask_type_avail(indio_dev, chan,
+                                                  IIO_SHARED_BY_DIR,
+                                                  &chan->info_mask_shared_by_dir_available);
+        if (ret < 0)
+                return ret;
+        attrcount += ret;
+
         ret = iio_device_add_info_mask_type(indio_dev, chan,
                                             IIO_SHARED_BY_ALL,
                                             &chan->info_mask_shared_by_all);
@@ -1014,6 +1202,13 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
                 return ret;
         attrcount += ret;
 
+        ret = iio_device_add_info_mask_type_avail(indio_dev, chan,
+                                                  IIO_SHARED_BY_ALL,
+                                                  &chan->info_mask_shared_by_all_available);
+        if (ret < 0)
+                return ret;
+        attrcount += ret;
+
         if (chan->ext_info) {
                 unsigned int i = 0;
                 for (ext_info = chan->ext_info; ext_info->name; ext_info++) {
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index e1e104845e38..978729f6d7c4 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -717,6 +717,27 @@ bool iio_trigger_using_own(struct iio_dev *indio_dev)
 }
 EXPORT_SYMBOL(iio_trigger_using_own);
 
+/**
+ * iio_trigger_validate_own_device - Check if a trigger and IIO device belong to
+ *  the same device
+ * @trig: The IIO trigger to check
+ * @indio_dev: the IIO device to check
+ *
+ * This function can be used as the validate_device callback for triggers that
+ * can only be attached to their own device.
+ *
+ * Return: 0 if both the trigger and the IIO device belong to the same
+ * device, -EINVAL otherwise.
+ */
+int iio_trigger_validate_own_device(struct iio_trigger *trig,
+        struct iio_dev *indio_dev)
+{
+        if (indio_dev->dev.parent != trig->dev.parent)
+                return -EINVAL;
+        return 0;
+}
+EXPORT_SYMBOL(iio_trigger_validate_own_device);
+
 void iio_device_register_trigger_consumer(struct iio_dev *indio_dev)
 {
         indio_dev->groups[indio_dev->groupcounter++] =
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index c4757e6367e7..b0f4630a163f 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -658,6 +658,31 @@ err_unlock:
 }
 EXPORT_SYMBOL_GPL(iio_convert_raw_to_processed);
 
+static int iio_read_channel_attribute(struct iio_channel *chan,
+                                      int *val, int *val2,
+                                      enum iio_chan_info_enum attribute)
+{
+        int ret;
+
+        mutex_lock(&chan->indio_dev->info_exist_lock);
+        if (chan->indio_dev->info == NULL) {
+                ret = -ENODEV;
+                goto err_unlock;
+        }
+
+        ret = iio_channel_read(chan, val, val2, attribute);
+err_unlock:
+        mutex_unlock(&chan->indio_dev->info_exist_lock);
+
+        return ret;
+}
+
+int iio_read_channel_offset(struct iio_channel *chan, int *val, int *val2)
+{
+        return iio_read_channel_attribute(chan, val, val2, IIO_CHAN_INFO_OFFSET);
+}
+EXPORT_SYMBOL_GPL(iio_read_channel_offset);
+
 int iio_read_channel_processed(struct iio_channel *chan, int *val)
 {
         int ret;
@@ -687,21 +712,113 @@ EXPORT_SYMBOL_GPL(iio_read_channel_processed);
 
 int iio_read_channel_scale(struct iio_channel *chan, int *val, int *val2)
 {
+        return iio_read_channel_attribute(chan, val, val2, IIO_CHAN_INFO_SCALE);
+}
+EXPORT_SYMBOL_GPL(iio_read_channel_scale);
+
+static int iio_channel_read_avail(struct iio_channel *chan,
+                                  const int **vals, int *type, int *length,
+                                  enum iio_chan_info_enum info)
+{
+        if (!iio_channel_has_available(chan->channel, info))
+                return -EINVAL;
+
+        return chan->indio_dev->info->read_avail(chan->indio_dev, chan->channel,
+                                                 vals, type, length, info);
+}
+
+int iio_read_avail_channel_raw(struct iio_channel *chan,
+                               const int **vals, int *length)
+{
         int ret;
+        int type;
 
         mutex_lock(&chan->indio_dev->info_exist_lock);
-        if (chan->indio_dev->info == NULL) {
+        if (!chan->indio_dev->info) {
                 ret = -ENODEV;
                 goto err_unlock;
         }
 
-        ret = iio_channel_read(chan, val, val2, IIO_CHAN_INFO_SCALE);
+        ret = iio_channel_read_avail(chan,
+                                     vals, &type, length, IIO_CHAN_INFO_RAW);
 err_unlock:
         mutex_unlock(&chan->indio_dev->info_exist_lock);
 
+        if (ret >= 0 && type != IIO_VAL_INT) {
+                /* raw values are assumed to be IIO_VAL_INT */
+                ret = -EINVAL;
+                goto err_unlock;
+        }
+
         return ret;
 }
-EXPORT_SYMBOL_GPL(iio_read_channel_scale);
+EXPORT_SYMBOL_GPL(iio_read_avail_channel_raw);
+
+static int iio_channel_read_max(struct iio_channel *chan,
+                                int *val, int *val2, int *type,
+                                enum iio_chan_info_enum info)
+{
+        int unused;
+        const int *vals;
+        int length;
+        int ret;
+
+        if (!val2)
+                val2 = &unused;
+
+        ret = iio_channel_read_avail(chan, &vals, type, &length, info);
+        switch (ret) {
+        case IIO_AVAIL_RANGE:
+                switch (*type) {
+                case IIO_VAL_INT:
+                        *val = vals[2];
+                        break;
+                default:
+                        *val = vals[4];
+                        *val2 = vals[5];
+                }
+                return 0;
+
+        case IIO_AVAIL_LIST:
+                if (length <= 0)
+                        return -EINVAL;
+                switch (*type) {
+                case IIO_VAL_INT:
+                        *val = vals[--length];
+                        while (length) {
+                                if (vals[--length] > *val)
+                                        *val = vals[length];
+                        }
+                        break;
+                default:
+                        /* FIXME: learn about max for other iio values */
+                        return -EINVAL;
+                }
+                return 0;
+
+        default:
+                return ret;
+        }
+}
+
+int iio_read_max_channel_raw(struct iio_channel *chan, int *val)
+{
+        int ret;
+        int type;
+
+        mutex_lock(&chan->indio_dev->info_exist_lock);
+        if (!chan->indio_dev->info) {
+                ret = -ENODEV;
+                goto err_unlock;
+        }
+
+        ret = iio_channel_read_max(chan, val, NULL, &type, IIO_CHAN_INFO_RAW);
+err_unlock:
+        mutex_unlock(&chan->indio_dev->info_exist_lock);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(iio_read_max_channel_raw);
 
 int iio_get_channel_type(struct iio_channel *chan, enum iio_chan_type *type)
 {
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index ba2e64d7ee58..298ea5081a96 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -140,6 +140,18 @@ config GP2AP020A00F
           To compile this driver as a module, choose M here: the
           module will be called gp2ap020a00f.
 
+config SENSORS_ISL29018
+        tristate "Intersil 29018 light and proximity sensor"
+        depends on I2C
+        select REGMAP_I2C
+        default n
+        help
+         If you say yes here you get support for ambient light sensing and
+         proximity infrared sensing from Intersil ISL29018.
+         This driver will provide the measurements of ambient light intensity
+         in lux, proximity infrared sensing and normal infrared sensing.
+         Data from sensor is accessible via sysfs.
+
 config ISL29125
         tristate "Intersil ISL29125 digital color light sensor"
         depends on I2C
@@ -326,6 +338,13 @@ config SENSORS_TSL2563
          This driver can also be built as a module.  If so, the module
          will be called tsl2563.
 
+config TSL2583
+        tristate "TAOS TSL2580, TSL2581 and TSL2583 light-to-digital converters"
+        depends on I2C
+        help
+         Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices.
+         Access ALS data via iio, sysfs.
+
 config TSL4531
         tristate "TAOS TSL4531 ambient light sensors"
         depends on I2C
diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
index c5768df87a17..4de520036e6e 100644
--- a/drivers/iio/light/Makefile
+++ b/drivers/iio/light/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_CM36651)		+= cm36651.o
 obj-$(CONFIG_GP2AP020A00F)      += gp2ap020a00f.o
 obj-$(CONFIG_HID_SENSOR_ALS)    += hid-sensor-als.o
 obj-$(CONFIG_HID_SENSOR_PROX)   += hid-sensor-prox.o
+obj-$(CONFIG_SENSORS_ISL29018)  += isl29018.o
 obj-$(CONFIG_ISL29125)          += isl29125.o
 obj-$(CONFIG_JSA1212)           += jsa1212.o
 obj-$(CONFIG_SENSORS_LM3533)    += lm3533-als.o
@@ -30,6 +31,7 @@ obj-$(CONFIG_SI1145)		+= si1145.o
 obj-$(CONFIG_STK3310)          += stk3310.o
 obj-$(CONFIG_TCS3414)           += tcs3414.o
 obj-$(CONFIG_TCS3472)           += tcs3472.o
+obj-$(CONFIG_TSL2583)           += tsl2583.o
 obj-$(CONFIG_TSL4531)           += tsl4531.o
 obj-$(CONFIG_US5182D)           += us5182d.o
 obj-$(CONFIG_VCNL4000)          += vcnl4000.o
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/iio/light/isl29018.c
index a767a43c995c..917dd8b43e72 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/iio/light/isl29018.c
@@ -62,16 +62,6 @@
 #define ISL29035_BOUT_SHIFT             0x07
 #define ISL29035_BOUT_MASK              (0x01 << ISL29035_BOUT_SHIFT)
 
-#define ISL29018_INT_TIME_AVAIL         "0.090000 0.005630 0.000351 0.000021"
-#define ISL29023_INT_TIME_AVAIL         "0.090000 0.005600 0.000352 0.000022"
-#define ISL29035_INT_TIME_AVAIL         "0.105000 0.006500 0.000410 0.000025"
-
-static const char * const int_time_avail[] = {
-        ISL29018_INT_TIME_AVAIL,
-        ISL29023_INT_TIME_AVAIL,
-        ISL29035_INT_TIME_AVAIL,
-};
-
 enum isl29018_int_time {
         ISL29018_INT_TIME_16,
         ISL29018_INT_TIME_12,
@@ -110,7 +100,8 @@ struct isl29018_chip {
 static int isl29018_set_integration_time(struct isl29018_chip *chip,
                                          unsigned int utime)
 {
-        int i, ret;
+        unsigned int i;
+        int ret;
         unsigned int int_time, new_int_time;
 
         for (i = 0; i < ARRAY_SIZE(isl29018_int_utimes[chip->type]); ++i) {
@@ -145,7 +136,8 @@ static int isl29018_set_integration_time(struct isl29018_chip *chip,
 
 static int isl29018_set_scale(struct isl29018_chip *chip, int scale, int uscale)
 {
-        int i, ret;
+        unsigned int i;
+        int ret;
         struct isl29018_scale new_scale;
 
         for (i = 0; i < ARRAY_SIZE(isl29018_scales[chip->int_time]); ++i) {
@@ -276,29 +268,35 @@ static int isl29018_read_proximity_ir(struct isl29018_chip *chip, int scheme,
         return 0;
 }
 
-static ssize_t isl29018_show_scale_available(struct device *dev,
-                                    struct device_attribute *attr, char *buf)
+static ssize_t in_illuminance_scale_available_show
+                        (struct device *dev, struct device_attribute *attr,
+                         char *buf)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct isl29018_chip *chip = iio_priv(indio_dev);
-        int i, len = 0;
+        unsigned int i;
+        int len = 0;
 
+        mutex_lock(&chip->lock);
         for (i = 0; i < ARRAY_SIZE(isl29018_scales[chip->int_time]); ++i)
                 len += sprintf(buf + len, "%d.%06d ",
                                isl29018_scales[chip->int_time][i].scale,
                                isl29018_scales[chip->int_time][i].uscale);
+        mutex_unlock(&chip->lock);
 
         buf[len - 1] = '\n';
 
         return len;
 }
 
-static ssize_t isl29018_show_int_time_available(struct device *dev,
-                                       struct device_attribute *attr, char *buf)
+static ssize_t in_illuminance_integration_time_available_show
+                        (struct device *dev, struct device_attribute *attr,
+                         char *buf)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct isl29018_chip *chip = iio_priv(indio_dev);
-        int i, len = 0;
+        unsigned int i;
+        int len = 0;
 
         for (i = 0; i < ARRAY_SIZE(isl29018_int_utimes[chip->type]); ++i)
                 len += sprintf(buf + len, "0.%06d ",
@@ -309,9 +307,27 @@ static ssize_t isl29018_show_int_time_available(struct device *dev,
         return len;
 }
 
-static ssize_t isl29018_show_prox_infrared_suppression(struct device *dev,
-                                              struct device_attribute *attr,
-                                              char *buf)
+/*
+ * From ISL29018 Data Sheet (FN6619.4, Oct 8, 2012) regarding the
+ * infrared suppression:
+ *
+ *   Proximity Sensing Scheme: Bit 7. This bit programs the function
+ * of the proximity detection. Logic 0 of this bit, Scheme 0, makes
+ * full n (4, 8, 12, 16) bits (unsigned) proximity detection. The range
+ * of Scheme 0 proximity count is from 0 to 2^n. Logic 1 of this bit,
+ * Scheme 1, makes n-1 (3, 7, 11, 15) bits (2's complementary)
+ * proximity_less_ambient detection. The range of Scheme 1
+ * proximity count is from -2^(n-1) to 2^(n-1) . The sign bit is extended
+ * for resolutions less than 16. While Scheme 0 has wider dynamic
+ * range, Scheme 1 proximity detection is less affected by the
+ * ambient IR noise variation.
+ *
+ * 0 Sensing IR from LED and ambient
+ * 1 Sensing IR from LED with ambient IR rejection
+ */
+static ssize_t proximity_on_chip_ambient_infrared_suppression_show
+                        (struct device *dev, struct device_attribute *attr,
+                         char *buf)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct isl29018_chip *chip = iio_priv(indio_dev);
@@ -323,9 +339,9 @@ static ssize_t isl29018_show_prox_infrared_suppression(struct device *dev,
         return sprintf(buf, "%d\n", chip->prox_scheme);
 }
 
-static ssize_t isl29018_store_prox_infrared_suppression(struct device *dev,
-                                               struct device_attribute *attr,
-                                               const char *buf, size_t count)
+static ssize_t proximity_on_chip_ambient_infrared_suppression_store
+                        (struct device *dev, struct device_attribute *attr,
+                         const char *buf, size_t count)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct isl29018_chip *chip = iio_priv(indio_dev);
@@ -357,6 +373,10 @@ static int isl29018_write_raw(struct iio_dev *indio_dev,
         int ret = -EINVAL;
 
         mutex_lock(&chip->lock);
+        if (chip->suspended) {
+                ret = -EBUSY;
+                goto write_done;
+        }
         switch (mask) {
         case IIO_CHAN_INFO_CALIBSCALE:
                 if (chan->type == IIO_LIGHT) {
@@ -366,13 +386,8 @@ static int isl29018_write_raw(struct iio_dev *indio_dev,
                 }
                 break;
         case IIO_CHAN_INFO_INT_TIME:
-                if (chan->type == IIO_LIGHT) {
-                        if (val) {
-                                mutex_unlock(&chip->lock);
-                                return -EINVAL;
-                        }
+                if (chan->type == IIO_LIGHT && !val)
                         ret = isl29018_set_integration_time(chip, val2);
-                }
                 break;
         case IIO_CHAN_INFO_SCALE:
                 if (chan->type == IIO_LIGHT)
@@ -381,6 +396,8 @@ static int isl29018_write_raw(struct iio_dev *indio_dev,
         default:
                 break;
         }
+
+write_done:
         mutex_unlock(&chip->lock);
 
         return ret;
@@ -397,8 +414,8 @@ static int isl29018_read_raw(struct iio_dev *indio_dev,
 
         mutex_lock(&chip->lock);
         if (chip->suspended) {
-                mutex_unlock(&chip->lock);
-                return -EBUSY;
+                ret = -EBUSY;
+                goto read_done;
         }
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
@@ -445,7 +462,10 @@ static int isl29018_read_raw(struct iio_dev *indio_dev,
         default:
                 break;
         }
+
+read_done:
         mutex_unlock(&chip->lock);
+
         return ret;
 }
 
@@ -482,14 +502,9 @@ static const struct iio_chan_spec isl29023_channels[] = {
         ISL29018_IR_CHANNEL,
 };
 
-static IIO_DEVICE_ATTR(in_illuminance_integration_time_available, S_IRUGO,
-                       isl29018_show_int_time_available, NULL, 0);
-static IIO_DEVICE_ATTR(in_illuminance_scale_available, S_IRUGO,
-                      isl29018_show_scale_available, NULL, 0);
-static IIO_DEVICE_ATTR(proximity_on_chip_ambient_infrared_suppression,
-                                        S_IRUGO | S_IWUSR,
-                                        isl29018_show_prox_infrared_suppression,
-                                        isl29018_store_prox_infrared_suppression, 0);
+static IIO_DEVICE_ATTR_RO(in_illuminance_integration_time_available, 0);
+static IIO_DEVICE_ATTR_RO(in_illuminance_scale_available, 0);
+static IIO_DEVICE_ATTR_RW(proximity_on_chip_ambient_infrared_suppression, 0);
 
 #define ISL29018_DEV_ATTR(name) (&iio_dev_attr_##name.dev_attr.attr)
 
@@ -514,30 +529,6 @@ static const struct attribute_group isl29023_group = {
         .attrs = isl29023_attributes,
 };
 
-static int isl29035_detect(struct isl29018_chip *chip)
-{
-        int status;
-        unsigned int id;
-        struct device *dev = regmap_get_device(chip->regmap);
-
-        status = regmap_read(chip->regmap, ISL29035_REG_DEVICE_ID, &id);
-        if (status < 0) {
-                dev_err(dev,
-                        "Error reading ID register with error %d\n",
-                        status);
-                return status;
-        }
-
-        id = (id & ISL29035_DEVICE_ID_MASK) >> ISL29035_DEVICE_ID_SHIFT;
-
-        if (id != ISL29035_DEVICE_ID)
-                return -ENODEV;
-
-        /* Clear brownout bit */
-        return regmap_update_bits(chip->regmap, ISL29035_REG_DEVICE_ID,
-                                  ISL29035_BOUT_MASK, 0);
-}
-
 enum {
         isl29018,
         isl29023,
@@ -550,12 +541,31 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
         struct device *dev = regmap_get_device(chip->regmap);
 
         if (chip->type == isl29035) {
-                status = isl29035_detect(chip);
+                unsigned int id;
+
+                status = regmap_read(chip->regmap, ISL29035_REG_DEVICE_ID, &id);
+                if (status < 0) {
+                        dev_err(dev,
+                                "Error reading ID register with error %d\n",
+                                status);
+                        return status;
+                }
+
+                id = (id & ISL29035_DEVICE_ID_MASK) >> ISL29035_DEVICE_ID_SHIFT;
+
+                if (id != ISL29035_DEVICE_ID)
+                        return -ENODEV;
+
+                /* Clear brownout bit */
+                status = regmap_update_bits(chip->regmap,
+                                            ISL29035_REG_DEVICE_ID,
+                                            ISL29035_BOUT_MASK, 0);
                 if (status < 0)
                         return status;
         }
 
-        /* Code added per Intersil Application Note 1534:
+        /*
+         * Code added per Intersil Application Note 1534:
          *     When VDD sinks to approximately 1.8V or below, some of
          * the part's registers may change their state. When VDD
          * recovers to 2.25V (or greater), the part may thus be in an
@@ -582,7 +592,8 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
                 return status;
         }
 
-        /* See Intersil AN1534 comments above.
+        /*
+         * See Intersil AN1534 comments above.
          * "Operating Mode" (COMMAND1) register is reprogrammed when
          * data is read from the device.
          */
@@ -605,12 +616,10 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
 
         status = isl29018_set_integration_time(chip,
                         isl29018_int_utimes[chip->type][chip->int_time]);
-        if (status < 0) {
+        if (status < 0)
                 dev_err(dev, "Init of isl29018 fails\n");
-                return status;
-        }
 
-        return 0;
+        return status;
 }
 
 static const struct iio_info isl29018_info = {
@@ -713,6 +722,7 @@ static int isl29018_probe(struct i2c_client *client,
         indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
         if (!indio_dev)
                 return -ENOMEM;
+
         chip = iio_priv(indio_dev);
 
         i2c_set_clientdata(client, indio_dev);
@@ -752,6 +762,7 @@ static int isl29018_probe(struct i2c_client *client,
         indio_dev->name = name;
         indio_dev->dev.parent = &client->dev;
         indio_dev->modes = INDIO_DIRECT_MODE;
+
         return devm_iio_device_register(&client->dev, indio_dev);
 }
 
@@ -762,13 +773,15 @@ static int isl29018_suspend(struct device *dev)
 
         mutex_lock(&chip->lock);
 
-        /* Since this driver uses only polling commands, we are by default in
+        /*
+         * Since this driver uses only polling commands, we are by default in
          * auto shutdown (ie, power-down) mode.
          * So we do not have much to do here.
          */
         chip->suspended = true;
 
         mutex_unlock(&chip->lock);
+
         return 0;
 }
 
@@ -784,6 +797,7 @@ static int isl29018_resume(struct device *dev)
                 chip->suspended = false;
 
         mutex_unlock(&chip->lock);
+
         return err;
 }
 
@@ -807,7 +821,6 @@ static const struct i2c_device_id isl29018_id[] = {
         {"isl29035", isl29035},
         {}
 };
-
 MODULE_DEVICE_TABLE(i2c, isl29018_id);
 
 static const struct of_device_id isl29018_of_match[] = {
diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c
index 3afc53a3d0b6..b30e0c1c6cc4 100644
--- a/drivers/iio/light/ltr501.c
+++ b/drivers/iio/light/ltr501.c
@@ -631,14 +631,16 @@ static int ltr501_read_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_PROCESSED:
-                if (iio_buffer_enabled(indio_dev))
-                        return -EBUSY;
-
                 switch (chan->type) {
                 case IIO_LIGHT:
+                        ret = iio_device_claim_direct_mode(indio_dev);
+                        if (ret)
+                                return ret;
+
                         mutex_lock(&data->lock_als);
                         ret = ltr501_read_als(data, buf);
                         mutex_unlock(&data->lock_als);
+                        iio_device_release_direct_mode(indio_dev);
                         if (ret < 0)
                                 return ret;
                         *val = ltr501_calculate_lux(le16_to_cpu(buf[1]),
@@ -648,8 +650,9 @@ static int ltr501_read_raw(struct iio_dev *indio_dev,
                         return -EINVAL;
                 }
         case IIO_CHAN_INFO_RAW:
-                if (iio_buffer_enabled(indio_dev))
-                        return -EBUSY;
+                ret = iio_device_claim_direct_mode(indio_dev);
+                if (ret)
+                        return ret;
 
                 switch (chan->type) {
                 case IIO_INTENSITY:
@@ -657,21 +660,28 @@ static int ltr501_read_raw(struct iio_dev *indio_dev,
                         ret = ltr501_read_als(data, buf);
                         mutex_unlock(&data->lock_als);
                         if (ret < 0)
-                                return ret;
+                                break;
                         *val = le16_to_cpu(chan->address == LTR501_ALS_DATA1 ?
                                            buf[0] : buf[1]);
-                        return IIO_VAL_INT;
+                        ret = IIO_VAL_INT;
+                        break;
                 case IIO_PROXIMITY:
                         mutex_lock(&data->lock_ps);
                         ret = ltr501_read_ps(data);
                         mutex_unlock(&data->lock_ps);
                         if (ret < 0)
-                                return ret;
+                                break;
                         *val = ret & LTR501_PS_DATA_MASK;
-                        return IIO_VAL_INT;
+                        ret = IIO_VAL_INT;
+                        break;
                 default:
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        break;
                 }
+
+                iio_device_release_direct_mode(indio_dev);
+                return ret;
+
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_INTENSITY:
@@ -729,8 +739,9 @@ static int ltr501_write_raw(struct iio_dev *indio_dev,
         int i, ret, freq_val, freq_val2;
         struct ltr501_chip_info *info = data->chip_info;
 
-        if (iio_buffer_enabled(indio_dev))
-                return -EBUSY;
+        ret = iio_device_claim_direct_mode(indio_dev);
+        if (ret)
+                return ret;
 
         switch (mask) {
         case IIO_CHAN_INFO_SCALE:
@@ -739,85 +750,105 @@ static int ltr501_write_raw(struct iio_dev *indio_dev,
                         i = ltr501_get_gain_index(info->als_gain,
                                                   info->als_gain_tbl_size,
                                                   val, val2);
-                        if (i < 0)
-                                return -EINVAL;
+                        if (i < 0) {
+                                ret = -EINVAL;
+                                break;
+                        }
 
                         data->als_contr &= ~info->als_gain_mask;
                         data->als_contr |= i << info->als_gain_shift;
 
-                        return regmap_write(data->regmap, LTR501_ALS_CONTR,
-                                            data->als_contr);
+                        ret = regmap_write(data->regmap, LTR501_ALS_CONTR,
+                                           data->als_contr);
+                        break;
                 case IIO_PROXIMITY:
                         i = ltr501_get_gain_index(info->ps_gain,
                                                   info->ps_gain_tbl_size,
                                                   val, val2);
-                        if (i < 0)
-                                return -EINVAL;
+                        if (i < 0) {
+                                ret = -EINVAL;
+                                break;
+                        }
                         data->ps_contr &= ~LTR501_CONTR_PS_GAIN_MASK;
                         data->ps_contr |= i << LTR501_CONTR_PS_GAIN_SHIFT;
 
-                        return regmap_write(data->regmap, LTR501_PS_CONTR,
-                                            data->ps_contr);
+                        ret = regmap_write(data->regmap, LTR501_PS_CONTR,
+                                           data->ps_contr);
+                        break;
                 default:
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        break;
                 }
+                break;
+
         case IIO_CHAN_INFO_INT_TIME:
                 switch (chan->type) {
                 case IIO_INTENSITY:
-                        if (val != 0)
-                                return -EINVAL;
+                        if (val != 0) {
+                                ret = -EINVAL;
+                                break;
+                        }
                         mutex_lock(&data->lock_als);
-                        i = ltr501_set_it_time(data, val2);
+                        ret = ltr501_set_it_time(data, val2);
                         mutex_unlock(&data->lock_als);
-                        return i;
+                        break;
                 default:
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        break;
                 }
+                break;
+
         case IIO_CHAN_INFO_SAMP_FREQ:
                 switch (chan->type) {
                 case IIO_INTENSITY:
                         ret = ltr501_als_read_samp_freq(data, &freq_val,
                                                         &freq_val2);
                         if (ret < 0)
-                                return ret;
+                                break;
 
                         ret = ltr501_als_write_samp_freq(data, val, val2);
                         if (ret < 0)
-                                return ret;
+                                break;
 
                         /* update persistence count when changing frequency */
                         ret = ltr501_write_intr_prst(data, chan->type,
                                                      0, data->als_period);
 
                         if (ret < 0)
-                                return ltr501_als_write_samp_freq(data,
-                                                                  freq_val,
-                                                                  freq_val2);
-                        return ret;
+                                ret = ltr501_als_write_samp_freq(data, freq_val,
+                                                                 freq_val2);
+                        break;
                 case IIO_PROXIMITY:
                         ret = ltr501_ps_read_samp_freq(data, &freq_val,
                                                        &freq_val2);
                         if (ret < 0)
-                                return ret;
+                                break;
 
                         ret = ltr501_ps_write_samp_freq(data, val, val2);
                         if (ret < 0)
-                                return ret;
+                                break;
 
                         /* update persistence count when changing frequency */
                         ret = ltr501_write_intr_prst(data, chan->type,
                                                      0, data->ps_period);
 
                         if (ret < 0)
-                                return ltr501_ps_write_samp_freq(data,
-                                                                 freq_val,
-                                                                 freq_val2);
-                        return ret;
+                                ret = ltr501_ps_write_samp_freq(data, freq_val,
+                                                                freq_val2);
+                        break;
                 default:
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        break;
                 }
+                break;
+
+        default:
+                ret = -EINVAL;
+                break;
         }
-        return -EINVAL;
+
+        iio_device_release_direct_mode(indio_dev);
+        return ret;
 }
 
 static int ltr501_read_thresh(struct iio_dev *indio_dev,
diff --git a/drivers/iio/light/max44000.c b/drivers/iio/light/max44000.c
index 6511b20a2a29..a144ca3461fc 100644
--- a/drivers/iio/light/max44000.c
+++ b/drivers/iio/light/max44000.c
@@ -204,17 +204,18 @@ static int max44000_write_alspga(struct max44000_data *data, int val)
 static int max44000_read_alsval(struct max44000_data *data)
 {
         u16 regval;
+        __be16 val;
         int alstim, ret;
 
         ret = regmap_bulk_read(data->regmap, MAX44000_REG_ALS_DATA_HI,
-                               &regval, sizeof(regval));
+                               &val, sizeof(val));
         if (ret < 0)
                 return ret;
         alstim = ret = max44000_read_alstim(data);
         if (ret < 0)
                 return ret;
 
-        regval = be16_to_cpu(regval);
+        regval = be16_to_cpu(val);
 
         /*
          * Overflow is explained on datasheet page 17.
diff --git a/drivers/iio/light/tsl2583.c b/drivers/iio/light/tsl2583.c
new file mode 100644
index 000000000000..a78b6025c465
--- /dev/null
+++ b/drivers/iio/light/tsl2583.c
@@ -0,0 +1,913 @@
+/*
+ * Device driver for monitoring ambient light intensity (lux)
+ * within the TAOS tsl258x family of devices (tsl2580, tsl2581, tsl2583).
+ *
+ * Copyright (c) 2011, TAOS Corporation.
+ * Copyright (c) 2016 Brian Masney <masneyb@onstation.org>
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/i2c.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/mutex.h>
+#include <linux/unistd.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+
+/* Device Registers and Masks */
+#define TSL2583_CNTRL                   0x00
+#define TSL2583_ALS_TIME                0X01
+#define TSL2583_INTERRUPT               0x02
+#define TSL2583_GAIN                    0x07
+#define TSL2583_REVID                   0x11
+#define TSL2583_CHIPID                  0x12
+#define TSL2583_ALS_CHAN0LO             0x14
+#define TSL2583_ALS_CHAN0HI             0x15
+#define TSL2583_ALS_CHAN1LO             0x16
+#define TSL2583_ALS_CHAN1HI             0x17
+#define TSL2583_TMR_LO                  0x18
+#define TSL2583_TMR_HI                  0x19
+
+/* tsl2583 cmd reg masks */
+#define TSL2583_CMD_REG                 0x80
+#define TSL2583_CMD_SPL_FN              0x60
+#define TSL2583_CMD_ALS_INT_CLR         0x01
+
+/* tsl2583 cntrl reg masks */
+#define TSL2583_CNTL_ADC_ENBL           0x02
+#define TSL2583_CNTL_PWR_OFF            0x00
+#define TSL2583_CNTL_PWR_ON             0x01
+
+/* tsl2583 status reg masks */
+#define TSL2583_STA_ADC_VALID           0x01
+#define TSL2583_STA_ADC_INTR            0x10
+
+/* Lux calculation constants */
+#define TSL2583_LUX_CALC_OVER_FLOW      65535
+
+#define TSL2583_INTERRUPT_DISABLED      0x00
+
+#define TSL2583_CHIP_ID                 0x90
+#define TSL2583_CHIP_ID_MASK            0xf0
+
+/* Per-device data */
+struct tsl2583_als_info {
+        u16 als_ch0;
+        u16 als_ch1;
+        u16 lux;
+};
+
+struct tsl2583_lux {
+        unsigned int ratio;
+        unsigned int ch0;
+        unsigned int ch1;
+};
+
+static const struct tsl2583_lux tsl2583_default_lux[] = {
+        {  9830,  8520, 15729 },
+        { 12452, 10807, 23344 },
+        { 14746,  6383, 11705 },
+        { 17695,  4063,  6554 },
+        {     0,     0,     0 }  /* Termination segment */
+};
+
+#define TSL2583_MAX_LUX_TABLE_ENTRIES 11
+
+struct tsl2583_settings {
+        int als_time;
+        int als_gain;
+        int als_gain_trim;
+        int als_cal_target;
+
+        /*
+         * This structure is intentionally large to accommodate updates via
+         * sysfs. Sized to 11 = max 10 segments + 1 termination segment.
+         * Assumption is that one and only one type of glass used.
+         */
+        struct tsl2583_lux als_device_lux[TSL2583_MAX_LUX_TABLE_ENTRIES];
+};
+
+struct tsl2583_chip {
+        struct mutex als_mutex;
+        struct i2c_client *client;
+        struct tsl2583_als_info als_cur_info;
+        struct tsl2583_settings als_settings;
+        int als_time_scale;
+        int als_saturation;
+        bool suspended;
+};
+
+struct gainadj {
+        s16 ch0;
+        s16 ch1;
+        s16 mean;
+};
+
+/* Index = (0 - 3) Used to validate the gain selection index */
+static const struct gainadj gainadj[] = {
+        { 1, 1, 1 },
+        { 8, 8, 8 },
+        { 16, 16, 16 },
+        { 107, 115, 111 }
+};
+
+/*
+ * Provides initial operational parameter defaults.
+ * These defaults may be changed through the device's sysfs files.
+ */
+static void tsl2583_defaults(struct tsl2583_chip *chip)
+{
+        /*
+         * The integration time must be a multiple of 50ms and within the
+         * range [50, 600] ms.
+         */
+        chip->als_settings.als_time = 100;
+
+        /*
+         * This is an index into the gainadj table. Assume clear glass as the
+         * default.
+         */
+        chip->als_settings.als_gain = 0;
+
+        /* Default gain trim to account for aperture effects */
+        chip->als_settings.als_gain_trim = 1000;
+
+        /* Known external ALS reading used for calibration */
+        chip->als_settings.als_cal_target = 130;
+
+        /* Default lux table. */
+        memcpy(chip->als_settings.als_device_lux, tsl2583_default_lux,
+               sizeof(tsl2583_default_lux));
+}
+
+/*
+ * Reads and calculates current lux value.
+ * The raw ch0 and ch1 values of the ambient light sensed in the last
+ * integration cycle are read from the device.
+ * Time scale factor array values are adjusted based on the integration time.
+ * The raw values are multiplied by a scale factor, and device gain is obtained
+ * using gain index. Limit checks are done next, then the ratio of a multiple
+ * of ch1 value, to the ch0 value, is calculated. The array als_device_lux[]
+ * declared above is then scanned to find the first ratio value that is just
+ * above the ratio we just calculated. The ch0 and ch1 multiplier constants in
+ * the array are then used along with the time scale factor array values, to
+ * calculate the lux.
+ */
+static int tsl2583_get_lux(struct iio_dev *indio_dev)
+{
+        u16 ch0, ch1; /* separated ch0/ch1 data from device */
+        u32 lux; /* raw lux calculated from device data */
+        u64 lux64;
+        u32 ratio;
+        u8 buf[5];
+        struct tsl2583_lux *p;
+        struct tsl2583_chip *chip = iio_priv(indio_dev);
+        int i, ret;
+
+        ret = i2c_smbus_read_byte_data(chip->client, TSL2583_CMD_REG);
+        if (ret < 0) {
+                dev_err(&chip->client->dev, "%s: failed to read CMD_REG register\n",
+                        __func__);
+                goto done;
+        }
+
+        /* is data new & valid */
+        if (!(ret & TSL2583_STA_ADC_INTR)) {
+                dev_err(&chip->client->dev, "%s: data not valid; returning last value\n",
+                        __func__);
+                ret = chip->als_cur_info.lux; /* return LAST VALUE */
+                goto done;
+        }
+
+        for (i = 0; i < 4; i++) {
+                int reg = TSL2583_CMD_REG | (TSL2583_ALS_CHAN0LO + i);
+
+                ret = i2c_smbus_read_byte_data(chip->client, reg);
+                if (ret < 0) {
+                        dev_err(&chip->client->dev, "%s: failed to read register %x\n",
+                                __func__, reg);
+                        goto done;
+                }
+                buf[i] = ret;
+        }
+
+        /*
+         * Clear the pending interrupt status bit on the chip to allow the next
+         * integration cycle to start. This has to be done even though this
+         * driver currently does not support interrupts.
+         */
+        ret = i2c_smbus_write_byte(chip->client,
+                                   (TSL2583_CMD_REG | TSL2583_CMD_SPL_FN |
+                                    TSL2583_CMD_ALS_INT_CLR));
+        if (ret < 0) {
+                dev_err(&chip->client->dev, "%s: failed to clear the interrupt bit\n",
+                        __func__);
+                goto done; /* have no data, so return failure */
+        }
+
+        /* extract ALS/lux data */
+        ch0 = le16_to_cpup((const __le16 *)&buf[0]);
+        ch1 = le16_to_cpup((const __le16 *)&buf[2]);
+
+        chip->als_cur_info.als_ch0 = ch0;
+        chip->als_cur_info.als_ch1 = ch1;
+
+        if ((ch0 >= chip->als_saturation) || (ch1 >= chip->als_saturation))
+                goto return_max;
+
+        if (!ch0) {
+                /*
+                 * The sensor appears to be in total darkness so set the
+                 * calculated lux to 0 and return early to avoid a division by
+                 * zero below when calculating the ratio.
+                 */
+                ret = 0;
+                chip->als_cur_info.lux = 0;
+                goto done;
+        }
+
+        /* calculate ratio */
+        ratio = (ch1 << 15) / ch0;
+
+        /* convert to unscaled lux using the pointer to the table */
+        for (p = (struct tsl2583_lux *)chip->als_settings.als_device_lux;
+             p->ratio != 0 && p->ratio < ratio; p++)
+                ;
+
+        if (p->ratio == 0) {
+                lux = 0;
+        } else {
+                u32 ch0lux, ch1lux;
+
+                ch0lux = ((ch0 * p->ch0) +
+                          (gainadj[chip->als_settings.als_gain].ch0 >> 1))
+                         / gainadj[chip->als_settings.als_gain].ch0;
+                ch1lux = ((ch1 * p->ch1) +
+                          (gainadj[chip->als_settings.als_gain].ch1 >> 1))
+                         / gainadj[chip->als_settings.als_gain].ch1;
+
+                /* note: lux is 31 bit max at this point */
+                if (ch1lux > ch0lux) {
+                        dev_dbg(&chip->client->dev, "%s: No Data - Returning 0\n",
+                                __func__);
+                        ret = 0;
+                        chip->als_cur_info.lux = 0;
+                        goto done;
+                }
+
+                lux = ch0lux - ch1lux;
+        }
+
+        /* adjust for active time scale */
+        if (chip->als_time_scale == 0)
+                lux = 0;
+        else
+                lux = (lux + (chip->als_time_scale >> 1)) /
+                        chip->als_time_scale;
+
+        /*
+         * Adjust for active gain scale.
+         * The tsl2583_default_lux tables above have a factor of 8192 built in,
+         * so we need to shift right.
+         * User-specified gain provides a multiplier.
+         * Apply user-specified gain before shifting right to retain precision.
+         * Use 64 bits to avoid overflow on multiplication.
+         * Then go back to 32 bits before division to avoid using div_u64().
+         */
+        lux64 = lux;
+        lux64 = lux64 * chip->als_settings.als_gain_trim;
+        lux64 >>= 13;
+        lux = lux64;
+        lux = (lux + 500) / 1000;
+
+        if (lux > TSL2583_LUX_CALC_OVER_FLOW) { /* check for overflow */
+return_max:
+                lux = TSL2583_LUX_CALC_OVER_FLOW;
+        }
+
+        /* Update the structure with the latest VALID lux. */
+        chip->als_cur_info.lux = lux;
+        ret = lux;
+
+done:
+        return ret;
+}
+
+/*
+ * Obtain single reading and calculate the als_gain_trim (later used
+ * to derive actual lux).
+ * Return updated gain_trim value.
+ */
+static int tsl2583_als_calibrate(struct iio_dev *indio_dev)
+{
+        struct tsl2583_chip *chip = iio_priv(indio_dev);
+        unsigned int gain_trim_val;
+        int ret;
+        int lux_val;
+
+        ret = i2c_smbus_read_byte_data(chip->client,
+                                       TSL2583_CMD_REG | TSL2583_CNTRL);
+        if (ret < 0) {
+                dev_err(&chip->client->dev,
+                        "%s: failed to read from the CNTRL register\n",
+                        __func__);
+                return ret;
+        }
+
+        if ((ret & (TSL2583_CNTL_ADC_ENBL | TSL2583_CNTL_PWR_ON))
+                        != (TSL2583_CNTL_ADC_ENBL | TSL2583_CNTL_PWR_ON)) {
+                dev_err(&chip->client->dev,
+                        "%s: Device is not powered on and/or ADC is not enabled\n",
+                        __func__);
+                return -EINVAL;
+        } else if ((ret & TSL2583_STA_ADC_VALID) != TSL2583_STA_ADC_VALID) {
+                dev_err(&chip->client->dev,
+                        "%s: The two ADC channels have not completed an integration cycle\n",
+                        __func__);
+                return -ENODATA;
+        }
+
+        lux_val = tsl2583_get_lux(indio_dev);
+        if (lux_val < 0) {
+                dev_err(&chip->client->dev, "%s: failed to get lux\n",
+                        __func__);
+                return lux_val;
+        }
+
+        gain_trim_val = (unsigned int)(((chip->als_settings.als_cal_target)
+                        * chip->als_settings.als_gain_trim) / lux_val);
+        if ((gain_trim_val < 250) || (gain_trim_val > 4000)) {
+                dev_err(&chip->client->dev,
+                        "%s: trim_val of %d is not within the range [250, 4000]\n",
+                        __func__, gain_trim_val);
+                return -ENODATA;
+        }
+
+        chip->als_settings.als_gain_trim = (int)gain_trim_val;
+
+        return 0;
+}
+
+static int tsl2583_set_als_time(struct tsl2583_chip *chip)
+{
+        int als_count, als_time, ret;
+        u8 val;
+
+        /* determine als integration register */
+        als_count = (chip->als_settings.als_time * 100 + 135) / 270;
+        if (!als_count)
+                als_count = 1; /* ensure at least one cycle */
+
+        /* convert back to time (encompasses overrides) */
+        als_time = (als_count * 27 + 5) / 10;
+
+        val = 256 - als_count;
+        ret = i2c_smbus_write_byte_data(chip->client,
+                                        TSL2583_CMD_REG | TSL2583_ALS_TIME,
+                                        val);
+        if (ret < 0) {
+                dev_err(&chip->client->dev, "%s: failed to set the als time to %d\n",
+                        __func__, val);
+                return ret;
+        }
+
+        /* set chip struct re scaling and saturation */
+        chip->als_saturation = als_count * 922; /* 90% of full scale */
+        chip->als_time_scale = (als_time + 25) / 50;
+
+        return ret;
+}
+
+static int tsl2583_set_als_gain(struct tsl2583_chip *chip)
+{
+        int ret;
+
+        /* Set the gain based on als_settings struct */
+        ret = i2c_smbus_write_byte_data(chip->client,
+                                        TSL2583_CMD_REG | TSL2583_GAIN,
+                                        chip->als_settings.als_gain);
+        if (ret < 0)
+                dev_err(&chip->client->dev,
+                        "%s: failed to set the gain to %d\n", __func__,
+                        chip->als_settings.als_gain);
+
+        return ret;
+}
+
+static int tsl2583_set_power_state(struct tsl2583_chip *chip, u8 state)
+{
+        int ret;
+
+        ret = i2c_smbus_write_byte_data(chip->client,
+                                        TSL2583_CMD_REG | TSL2583_CNTRL, state);
+        if (ret < 0)
+                dev_err(&chip->client->dev,
+                        "%s: failed to set the power state to %d\n", __func__,
+                        state);
+
+        return ret;
+}
+
+/*
+ * Turn the device on.
+ * Configuration must be set before calling this function.
+ */
+static int tsl2583_chip_init_and_power_on(struct iio_dev *indio_dev)
+{
+        struct tsl2583_chip *chip = iio_priv(indio_dev);
+        int ret;
+
+        /* Power on the device; ADC off. */
+        ret = tsl2583_set_power_state(chip, TSL2583_CNTL_PWR_ON);
+        if (ret < 0)
+                return ret;
+
+        ret = i2c_smbus_write_byte_data(chip->client,
+                                        TSL2583_CMD_REG | TSL2583_INTERRUPT,
+                                        TSL2583_INTERRUPT_DISABLED);
+        if (ret < 0) {
+                dev_err(&chip->client->dev,
+                        "%s: failed to disable interrupts\n", __func__);
+                return ret;
+        }
+
+        ret = tsl2583_set_als_time(chip);
+        if (ret < 0)
+                return ret;
+
+        ret = tsl2583_set_als_gain(chip);
+        if (ret < 0)
+                return ret;
+
+        usleep_range(3000, 3500);
+
+        ret = tsl2583_set_power_state(chip, TSL2583_CNTL_PWR_ON |
+                                            TSL2583_CNTL_ADC_ENBL);
+        if (ret < 0)
+                return ret;
+
+        chip->suspended = false;
+
+        return ret;
+}
+
+/* Sysfs Interface Functions */
+
+static ssize_t in_illuminance_input_target_show(struct device *dev,
+                                                struct device_attribute *attr,
+                                                char *buf)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct tsl2583_chip *chip = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&chip->als_mutex);
+        ret = sprintf(buf, "%d\n", chip->als_settings.als_cal_target);
+        mutex_unlock(&chip->als_mutex);
+
+        return ret;
+}
+
+static ssize_t in_illuminance_input_target_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 tsl2583_chip *chip = iio_priv(indio_dev);
+        int value;
+
+        if (kstrtoint(buf, 0, &value) || !value)
+                return -EINVAL;
+
+        mutex_lock(&chip->als_mutex);
+        chip->als_settings.als_cal_target = value;
+        mutex_unlock(&chip->als_mutex);
+
+        return len;
+}
+
+static ssize_t in_illuminance_calibrate_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 tsl2583_chip *chip = iio_priv(indio_dev);
+        int value, ret;
+
+        if (kstrtoint(buf, 0, &value) || value != 1)
+                return -EINVAL;
+
+        mutex_lock(&chip->als_mutex);
+
+        if (chip->suspended) {
+                ret = -EBUSY;
+                goto done;
+        }
+
+        ret = tsl2583_als_calibrate(indio_dev);
+        if (ret < 0)
+                goto done;
+
+        ret = len;
+done:
+        mutex_unlock(&chip->als_mutex);
+
+        return ret;
+}
+
+static ssize_t in_illuminance_lux_table_show(struct device *dev,
+                                             struct device_attribute *attr,
+                                             char *buf)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct tsl2583_chip *chip = iio_priv(indio_dev);
+        unsigned int i;
+        int offset = 0;
+
+        for (i = 0; i < ARRAY_SIZE(chip->als_settings.als_device_lux); i++) {
+                offset += sprintf(buf + offset, "%u,%u,%u,",
+                                  chip->als_settings.als_device_lux[i].ratio,
+                                  chip->als_settings.als_device_lux[i].ch0,
+                                  chip->als_settings.als_device_lux[i].ch1);
+                if (chip->als_settings.als_device_lux[i].ratio == 0) {
+                        /*
+                         * We just printed the first "0" entry.
+                         * Now get rid of the extra "," and break.
+                         */
+                        offset--;
+                        break;
+                }
+        }
+
+        offset += sprintf(buf + offset, "\n");
+
+        return offset;
+}
+
+static ssize_t in_illuminance_lux_table_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 tsl2583_chip *chip = iio_priv(indio_dev);
+        const unsigned int max_ints = TSL2583_MAX_LUX_TABLE_ENTRIES * 3;
+        int value[TSL2583_MAX_LUX_TABLE_ENTRIES * 3 + 1];
+        int ret = -EINVAL;
+        unsigned int n;
+
+        mutex_lock(&chip->als_mutex);
+
+        get_options(buf, ARRAY_SIZE(value), value);
+
+        /*
+         * We now have an array of ints starting at value[1], and
+         * enumerated by value[0].
+         * We expect each group of three ints is one table entry,
+         * and the last table entry is all 0.
+         */
+        n = value[0];
+        if ((n % 3) || n < 6 || n > max_ints) {
+                dev_err(dev,
+                        "%s: The number of entries in the lux table must be a multiple of 3 and within the range [6, %d]\n",
+                        __func__, max_ints);
+                goto done;
+        }
+        if ((value[n - 2] | value[n - 1] | value[n]) != 0) {
+                dev_err(dev, "%s: The last 3 entries in the lux table must be zeros.\n",
+                        __func__);
+                goto done;
+        }
+
+        memcpy(chip->als_settings.als_device_lux, &value[1],
+               value[0] * sizeof(value[1]));
+
+        ret = len;
+
+done:
+        mutex_unlock(&chip->als_mutex);
+
+        return ret;
+}
+
+static IIO_CONST_ATTR(in_illuminance_calibscale_available, "1 8 16 111");
+static IIO_CONST_ATTR(in_illuminance_integration_time_available,
+                      "0.000050 0.000100 0.000150 0.000200 0.000250 0.000300 0.000350 0.000400 0.000450 0.000500 0.000550 0.000600 0.000650");
+static IIO_DEVICE_ATTR_RW(in_illuminance_input_target, 0);
+static IIO_DEVICE_ATTR_WO(in_illuminance_calibrate, 0);
+static IIO_DEVICE_ATTR_RW(in_illuminance_lux_table, 0);
+
+static struct attribute *sysfs_attrs_ctrl[] = {
+        &iio_const_attr_in_illuminance_calibscale_available.dev_attr.attr,
+        &iio_const_attr_in_illuminance_integration_time_available.dev_attr.attr,
+        &iio_dev_attr_in_illuminance_input_target.dev_attr.attr,
+        &iio_dev_attr_in_illuminance_calibrate.dev_attr.attr,
+        &iio_dev_attr_in_illuminance_lux_table.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group tsl2583_attribute_group = {
+        .attrs = sysfs_attrs_ctrl,
+};
+
+static const struct iio_chan_spec tsl2583_channels[] = {
+        {
+                .type = IIO_LIGHT,
+                .modified = 1,
+                .channel2 = IIO_MOD_LIGHT_IR,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+        },
+        {
+                .type = IIO_LIGHT,
+                .modified = 1,
+                .channel2 = IIO_MOD_LIGHT_BOTH,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+        },
+        {
+                .type = IIO_LIGHT,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |
+                                      BIT(IIO_CHAN_INFO_CALIBBIAS) |
+                                      BIT(IIO_CHAN_INFO_CALIBSCALE) |
+                                      BIT(IIO_CHAN_INFO_INT_TIME),
+        },
+};
+
+static int tsl2583_read_raw(struct iio_dev *indio_dev,
+                            struct iio_chan_spec const *chan,
+                            int *val, int *val2, long mask)
+{
+        struct tsl2583_chip *chip = iio_priv(indio_dev);
+        int ret = -EINVAL;
+
+        mutex_lock(&chip->als_mutex);
+
+        if (chip->suspended) {
+                ret = -EBUSY;
+                goto read_done;
+        }
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                if (chan->type == IIO_LIGHT) {
+                        ret = tsl2583_get_lux(indio_dev);
+                        if (ret < 0)
+                                goto read_done;
+
+                        /*
+                         * From page 20 of the TSL2581, TSL2583 data
+                         * sheet (TAOS134 − MARCH 2011):
+                         *
+                         * One of the photodiodes (channel 0) is
+                         * sensitive to both visible and infrared light,
+                         * while the second photodiode (channel 1) is
+                         * sensitive primarily to infrared light.
+                         */
+                        if (chan->channel2 == IIO_MOD_LIGHT_BOTH)
+                                *val = chip->als_cur_info.als_ch0;
+                        else
+                                *val = chip->als_cur_info.als_ch1;
+
+                        ret = IIO_VAL_INT;
+                }
+                break;
+        case IIO_CHAN_INFO_PROCESSED:
+                if (chan->type == IIO_LIGHT) {
+                        ret = tsl2583_get_lux(indio_dev);
+                        if (ret < 0)
+                                goto read_done;
+
+                        *val = ret;
+                        ret = IIO_VAL_INT;
+                }
+                break;
+        case IIO_CHAN_INFO_CALIBBIAS:
+                if (chan->type == IIO_LIGHT) {
+                        *val = chip->als_settings.als_gain_trim;
+                        ret = IIO_VAL_INT;
+                }
+                break;
+        case IIO_CHAN_INFO_CALIBSCALE:
+                if (chan->type == IIO_LIGHT) {
+                        *val = gainadj[chip->als_settings.als_gain].mean;
+                        ret = IIO_VAL_INT;
+                }
+                break;
+        case IIO_CHAN_INFO_INT_TIME:
+                if (chan->type == IIO_LIGHT) {
+                        *val = 0;
+                        *val2 = chip->als_settings.als_time;
+                        ret = IIO_VAL_INT_PLUS_MICRO;
+                }
+                break;
+        default:
+                break;
+        }
+
+read_done:
+        mutex_unlock(&chip->als_mutex);
+
+        return ret;
+}
+
+static int tsl2583_write_raw(struct iio_dev *indio_dev,
+                             struct iio_chan_spec const *chan,
+                             int val, int val2, long mask)
+{
+        struct tsl2583_chip *chip = iio_priv(indio_dev);
+        int ret = -EINVAL;
+
+        mutex_lock(&chip->als_mutex);
+
+        if (chip->suspended) {
+                ret = -EBUSY;
+                goto write_done;
+        }
+
+        switch (mask) {
+        case IIO_CHAN_INFO_CALIBBIAS:
+                if (chan->type == IIO_LIGHT) {
+                        chip->als_settings.als_gain_trim = val;
+                        ret = 0;
+                }
+                break;
+        case IIO_CHAN_INFO_CALIBSCALE:
+                if (chan->type == IIO_LIGHT) {
+                        unsigned int i;
+
+                        for (i = 0; i < ARRAY_SIZE(gainadj); i++) {
+                                if (gainadj[i].mean == val) {
+                                        chip->als_settings.als_gain = i;
+                                        ret = tsl2583_set_als_gain(chip);
+                                        break;
+                                }
+                        }
+                }
+                break;
+        case IIO_CHAN_INFO_INT_TIME:
+                if (chan->type == IIO_LIGHT && !val && val2 >= 50 &&
+                    val2 <= 650 && !(val2 % 50)) {
+                        chip->als_settings.als_time = val2;
+                        ret = tsl2583_set_als_time(chip);
+                }
+                break;
+        default:
+                break;
+        }
+
+write_done:
+        mutex_unlock(&chip->als_mutex);
+
+        return ret;
+}
+
+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,
+};
+
+static int tsl2583_probe(struct i2c_client *clientp,
+                         const struct i2c_device_id *idp)
+{
+        int ret;
+        struct tsl2583_chip *chip;
+        struct iio_dev *indio_dev;
+
+        if (!i2c_check_functionality(clientp->adapter,
+                                     I2C_FUNC_SMBUS_BYTE_DATA)) {
+                dev_err(&clientp->dev, "%s: i2c smbus byte data functionality is unsupported\n",
+                        __func__);
+                return -EOPNOTSUPP;
+        }
+
+        indio_dev = devm_iio_device_alloc(&clientp->dev, sizeof(*chip));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        chip = iio_priv(indio_dev);
+        chip->client = clientp;
+        i2c_set_clientdata(clientp, indio_dev);
+
+        mutex_init(&chip->als_mutex);
+        chip->suspended = true;
+
+        ret = i2c_smbus_read_byte_data(clientp,
+                                       TSL2583_CMD_REG | TSL2583_CHIPID);
+        if (ret < 0) {
+                dev_err(&clientp->dev,
+                        "%s: failed to read the chip ID register\n", __func__);
+                return ret;
+        }
+
+        if ((ret & TSL2583_CHIP_ID_MASK) != TSL2583_CHIP_ID) {
+                dev_err(&clientp->dev, "%s: received an unknown chip ID %x\n",
+                        __func__, ret);
+                return -EINVAL;
+        }
+
+        indio_dev->info = &tsl2583_info;
+        indio_dev->channels = tsl2583_channels;
+        indio_dev->num_channels = ARRAY_SIZE(tsl2583_channels);
+        indio_dev->dev.parent = &clientp->dev;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->name = chip->client->name;
+
+        ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev);
+        if (ret) {
+                dev_err(&clientp->dev, "%s: iio registration failed\n",
+                        __func__);
+                return ret;
+        }
+
+        /* Load up the V2 defaults (these are hard coded defaults for now) */
+        tsl2583_defaults(chip);
+
+        /* Make sure the chip is on */
+        ret = tsl2583_chip_init_and_power_on(indio_dev);
+        if (ret < 0)
+                return ret;
+
+        dev_info(&clientp->dev, "Light sensor found.\n");
+
+        return 0;
+}
+
+static int __maybe_unused tsl2583_suspend(struct device *dev)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+        struct tsl2583_chip *chip = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&chip->als_mutex);
+
+        ret = tsl2583_set_power_state(chip, TSL2583_CNTL_PWR_OFF);
+        chip->suspended = true;
+
+        mutex_unlock(&chip->als_mutex);
+
+        return ret;
+}
+
+static int __maybe_unused tsl2583_resume(struct device *dev)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+        struct tsl2583_chip *chip = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&chip->als_mutex);
+
+        ret = tsl2583_chip_init_and_power_on(indio_dev);
+
+        mutex_unlock(&chip->als_mutex);
+
+        return ret;
+}
+
+static SIMPLE_DEV_PM_OPS(tsl2583_pm_ops, tsl2583_suspend, tsl2583_resume);
+
+static struct i2c_device_id tsl2583_idtable[] = {
+        { "tsl2580", 0 },
+        { "tsl2581", 1 },
+        { "tsl2583", 2 },
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, tsl2583_idtable);
+
+static const struct of_device_id tsl2583_of_match[] = {
+        { .compatible = "amstaos,tsl2580", },
+        { .compatible = "amstaos,tsl2581", },
+        { .compatible = "amstaos,tsl2583", },
+        { },
+};
+MODULE_DEVICE_TABLE(of, tsl2583_of_match);
+
+/* Driver definition */
+static struct i2c_driver tsl2583_driver = {
+        .driver = {
+                .name = "tsl2583",
+                .pm = &tsl2583_pm_ops,
+                .of_match_table = tsl2583_of_match,
+        },
+        .id_table = tsl2583_idtable,
+        .probe = tsl2583_probe,
+};
+module_i2c_driver(tsl2583_driver);
+
+MODULE_AUTHOR("J. August Brenner <jbrenner@taosinc.com>");
+MODULE_AUTHOR("Brian Masney <masneyb@onstation.org>");
+MODULE_DESCRIPTION("TAOS tsl2583 ambient light sensor driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c
index 217353145676..ce09d771c1fb 100644
--- a/drivers/iio/magnetometer/ak8974.c
+++ b/drivers/iio/magnetometer/ak8974.c
@@ -287,7 +287,7 @@ static int ak8974_await_drdy(struct ak8974 *ak8974)
         return 0;
 }
 
-static int ak8974_getresult(struct ak8974 *ak8974, s16 *result)
+static int ak8974_getresult(struct ak8974 *ak8974, __le16 *result)
 {
         unsigned int src;
         int ret;
@@ -395,7 +395,7 @@ static int ak8974_selftest(struct ak8974 *ak8974)
 static int ak8974_get_u16_val(struct ak8974 *ak8974, u8 reg, u16 *val)
 {
         int ret;
-        u16 bulk;
+        __le16 bulk;
 
         ret = regmap_bulk_read(ak8974->map, reg, &bulk, 2);
         if (ret)
@@ -453,7 +453,7 @@ static int ak8974_read_raw(struct iio_dev *indio_dev,
                            long mask)
 {
         struct ak8974 *ak8974 = iio_priv(indio_dev);
-        s16 hw_values[3];
+        __le16 hw_values[3];
         int ret = -EINVAL;
 
         pm_runtime_get_sync(&ak8974->i2c->dev);
@@ -494,7 +494,7 @@ static void ak8974_fill_buffer(struct iio_dev *indio_dev)
 {
         struct ak8974 *ak8974 = iio_priv(indio_dev);
         int ret;
-        s16 hw_values[8]; /* Three axes + 64bit padding */
+        __le16 hw_values[8]; /* Three axes + 64bit padding */
 
         pm_runtime_get_sync(&ak8974->i2c->dev);
         mutex_lock(&ak8974->lock);
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index af8606cc7812..825369fb1c57 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -690,6 +690,7 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val)
         struct ak8975_data *data = iio_priv(indio_dev);
         const struct i2c_client *client = data->client;
         const struct ak_def *def = data->def;
+        __le16 rval;
         u16 buff;
         int ret;
 
@@ -703,7 +704,7 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val)
 
         ret = i2c_smbus_read_i2c_block_data_or_emulated(
                         client, def->data_regs[index],
-                        sizeof(buff), (u8*)&buff);
+                        sizeof(rval), (u8*)&rval);
         if (ret < 0)
                 goto exit;
 
@@ -713,7 +714,7 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val)
         pm_runtime_put_autosuspend(&data->client->dev);
 
         /* Swap bytes and convert to valid range. */
-        buff = le16_to_cpu(buff);
+        buff = le16_to_cpu(rval);
         *val = clamp_t(s16, buff, -def->range, def->range);
         return IIO_VAL_INT;
 
@@ -813,6 +814,7 @@ static void ak8975_fill_buffer(struct iio_dev *indio_dev)
         const struct ak_def *def = data->def;
         int ret;
         s16 buff[8]; /* 3 x 16 bits axis values + 1 aligned 64 bits timestamp */
+        __le16 fval[3];
 
         mutex_lock(&data->lock);
 
@@ -826,17 +828,17 @@ static void ak8975_fill_buffer(struct iio_dev *indio_dev)
          */
         ret = i2c_smbus_read_i2c_block_data_or_emulated(client,
                                                         def->data_regs[0],
-                                                        3 * sizeof(buff[0]),
-                                                        (u8 *)buff);
+                                                        3 * sizeof(fval[0]),
+                                                        (u8 *)fval);
         if (ret < 0)
                 goto unlock;
 
         mutex_unlock(&data->lock);
 
         /* Clamp to valid range. */
-        buff[0] = clamp_t(s16, le16_to_cpu(buff[0]), -def->range, def->range);
-        buff[1] = clamp_t(s16, le16_to_cpu(buff[1]), -def->range, def->range);
-        buff[2] = clamp_t(s16, le16_to_cpu(buff[2]), -def->range, def->range);
+        buff[0] = clamp_t(s16, le16_to_cpu(fval[0]), -def->range, def->range);
+        buff[1] = clamp_t(s16, le16_to_cpu(fval[1]), -def->range, def->range);
+        buff[2] = clamp_t(s16, le16_to_cpu(fval[2]), -def->range, def->range);
 
         iio_push_to_buffers_with_timestamp(indio_dev, buff,
                                            iio_get_time_ns(indio_dev));
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index d8a0c8da8db0..0e791b02ed4a 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -42,9 +42,17 @@ enum magn_3d_channel {
         MAGN_3D_CHANNEL_MAX,
 };
 
+struct common_attributes {
+        int scale_pre_decml;
+        int scale_post_decml;
+        int scale_precision;
+        int value_offset;
+};
+
 struct magn_3d_state {
         struct hid_sensor_hub_callbacks callbacks;
-        struct hid_sensor_common common_attributes;
+        struct hid_sensor_common magn_flux_attributes;
+        struct hid_sensor_common rot_attributes;
         struct hid_sensor_hub_attribute_info magn[MAGN_3D_CHANNEL_MAX];
 
         /* dynamically sized array to hold sensor values */
@@ -52,10 +60,8 @@ struct magn_3d_state {
         /* array of pointers to sensor value */
         u32 *magn_val_addr[MAGN_3D_CHANNEL_MAX];
 
-        int scale_pre_decml;
-        int scale_post_decml;
-        int scale_precision;
-        int value_offset;
+        struct common_attributes magn_flux_attr;
+        struct common_attributes rot_attr;
 };
 
 static const u32 magn_3d_addresses[MAGN_3D_CHANNEL_MAX] = {
@@ -162,41 +168,74 @@ static int magn_3d_read_raw(struct iio_dev *indio_dev,
         *val2 = 0;
         switch (mask) {
         case 0:
-                hid_sensor_power_state(&magn_state->common_attributes, true);
+                hid_sensor_power_state(&magn_state->magn_flux_attributes, true);
                 report_id =
                         magn_state->magn[chan->address].report_id;
                 address = magn_3d_addresses[chan->address];
                 if (report_id >= 0)
                         *val = sensor_hub_input_attr_get_raw_value(
-                                magn_state->common_attributes.hsdev,
+                                magn_state->magn_flux_attributes.hsdev,
                                 HID_USAGE_SENSOR_COMPASS_3D, address,
                                 report_id,
                                 SENSOR_HUB_SYNC);
                 else {
                         *val = 0;
-                        hid_sensor_power_state(&magn_state->common_attributes,
-                                                false);
+                        hid_sensor_power_state(
+                                &magn_state->magn_flux_attributes,
+                                false);
                         return -EINVAL;
                 }
-                hid_sensor_power_state(&magn_state->common_attributes, false);
+                hid_sensor_power_state(&magn_state->magn_flux_attributes,
+                                        false);
                 ret_type = IIO_VAL_INT;
                 break;
         case IIO_CHAN_INFO_SCALE:
-                *val = magn_state->scale_pre_decml;
-                *val2 = magn_state->scale_post_decml;
-                ret_type = magn_state->scale_precision;
+                switch (chan->type) {
+                case IIO_MAGN:
+                        *val = magn_state->magn_flux_attr.scale_pre_decml;
+                        *val2 = magn_state->magn_flux_attr.scale_post_decml;
+                        ret_type = magn_state->magn_flux_attr.scale_precision;
+                        break;
+                case IIO_ROT:
+                        *val = magn_state->rot_attr.scale_pre_decml;
+                        *val2 = magn_state->rot_attr.scale_post_decml;
+                        ret_type = magn_state->rot_attr.scale_precision;
+                        break;
+                default:
+                        ret_type = -EINVAL;
+                }
                 break;
         case IIO_CHAN_INFO_OFFSET:
-                *val = magn_state->value_offset;
-                ret_type = IIO_VAL_INT;
+                switch (chan->type) {
+                case IIO_MAGN:
+                        *val = magn_state->magn_flux_attr.value_offset;
+                        ret_type = IIO_VAL_INT;
+                        break;
+                case IIO_ROT:
+                        *val = magn_state->rot_attr.value_offset;
+                        ret_type = IIO_VAL_INT;
+                        break;
+                default:
+                        ret_type = -EINVAL;
+                }
                 break;
         case IIO_CHAN_INFO_SAMP_FREQ:
                 ret_type = hid_sensor_read_samp_freq_value(
-                        &magn_state->common_attributes, val, val2);
+                        &magn_state->magn_flux_attributes, val, val2);
                 break;
         case IIO_CHAN_INFO_HYSTERESIS:
-                ret_type = hid_sensor_read_raw_hyst_value(
-                        &magn_state->common_attributes, val, val2);
+                switch (chan->type) {
+                case IIO_MAGN:
+                        ret_type = hid_sensor_read_raw_hyst_value(
+                                &magn_state->magn_flux_attributes, val, val2);
+                        break;
+                case IIO_ROT:
+                        ret_type = hid_sensor_read_raw_hyst_value(
+                                &magn_state->rot_attributes, val, val2);
+                        break;
+                default:
+                        ret_type = -EINVAL;
+                }
                 break;
         default:
                 ret_type = -EINVAL;
@@ -219,11 +258,21 @@ static int magn_3d_write_raw(struct iio_dev *indio_dev,
         switch (mask) {
         case IIO_CHAN_INFO_SAMP_FREQ:
                 ret = hid_sensor_write_samp_freq_value(
-                                &magn_state->common_attributes, val, val2);
+                                &magn_state->magn_flux_attributes, val, val2);
                 break;
         case IIO_CHAN_INFO_HYSTERESIS:
-                ret = hid_sensor_write_raw_hyst_value(
-                                &magn_state->common_attributes, val, val2);
+                switch (chan->type) {
+                case IIO_MAGN:
+                        ret = hid_sensor_write_raw_hyst_value(
+                                &magn_state->magn_flux_attributes, val, val2);
+                        break;
+                case IIO_ROT:
+                        ret = hid_sensor_write_raw_hyst_value(
+                                &magn_state->rot_attributes, val, val2);
+                        break;
+                default:
+                        ret = -EINVAL;
+                }
                 break;
         default:
                 ret = -EINVAL;
@@ -254,7 +303,7 @@ static int magn_3d_proc_event(struct hid_sensor_hub_device *hsdev,
         struct magn_3d_state *magn_state = iio_priv(indio_dev);
 
         dev_dbg(&indio_dev->dev, "magn_3d_proc_event\n");
-        if (atomic_read(&magn_state->common_attributes.data_ready))
+        if (atomic_read(&magn_state->magn_flux_attributes.data_ready))
                 hid_sensor_push_data(indio_dev, magn_state->iio_vals);
 
         return 0;
@@ -389,21 +438,48 @@ static int magn_3d_parse_report(struct platform_device *pdev,
         dev_dbg(&pdev->dev, "magn_3d Setup %d IIO channels\n",
                         *chan_count);
 
-        st->scale_precision = hid_sensor_format_scale(
+        st->magn_flux_attr.scale_precision = hid_sensor_format_scale(
                                 HID_USAGE_SENSOR_COMPASS_3D,
                                 &st->magn[CHANNEL_SCAN_INDEX_X],
-                                &st->scale_pre_decml, &st->scale_post_decml);
+                                &st->magn_flux_attr.scale_pre_decml,
+                                &st->magn_flux_attr.scale_post_decml);
+        st->rot_attr.scale_precision
+                = hid_sensor_format_scale(
+                        HID_USAGE_SENSOR_ORIENT_COMP_MAGN_NORTH,
+                        &st->magn[CHANNEL_SCAN_INDEX_NORTH_MAGN_TILT_COMP],
+                        &st->rot_attr.scale_pre_decml,
+                        &st->rot_attr.scale_post_decml);
 
         /* Set Sensitivity field ids, when there is no individual modifier */
-        if (st->common_attributes.sensitivity.index < 0) {
+        if (st->magn_flux_attributes.sensitivity.index < 0) {
                 sensor_hub_input_get_attribute_info(hsdev,
                         HID_FEATURE_REPORT, usage_id,
                         HID_USAGE_SENSOR_DATA_MOD_CHANGE_SENSITIVITY_ABS |
                         HID_USAGE_SENSOR_DATA_ORIENTATION,
-                        &st->common_attributes.sensitivity);
+                        &st->magn_flux_attributes.sensitivity);
+                dev_dbg(&pdev->dev, "Sensitivity index:report %d:%d\n",
+                        st->magn_flux_attributes.sensitivity.index,
+                        st->magn_flux_attributes.sensitivity.report_id);
+        }
+        if (st->magn_flux_attributes.sensitivity.index < 0) {
+                sensor_hub_input_get_attribute_info(hsdev,
+                        HID_FEATURE_REPORT, usage_id,
+                        HID_USAGE_SENSOR_DATA_MOD_CHANGE_SENSITIVITY_ABS |
+                        HID_USAGE_SENSOR_ORIENT_MAGN_FLUX,
+                        &st->magn_flux_attributes.sensitivity);
+                dev_dbg(&pdev->dev, "Sensitivity index:report %d:%d\n",
+                        st->magn_flux_attributes.sensitivity.index,
+                        st->magn_flux_attributes.sensitivity.report_id);
+        }
+        if (st->rot_attributes.sensitivity.index < 0) {
+                sensor_hub_input_get_attribute_info(hsdev,
+                        HID_FEATURE_REPORT, usage_id,
+                        HID_USAGE_SENSOR_DATA_MOD_CHANGE_SENSITIVITY_ABS |
+                        HID_USAGE_SENSOR_ORIENT_COMP_MAGN_NORTH,
+                        &st->rot_attributes.sensitivity);
                 dev_dbg(&pdev->dev, "Sensitivity index:report %d:%d\n",
-                        st->common_attributes.sensitivity.index,
-                        st->common_attributes.sensitivity.report_id);
+                        st->rot_attributes.sensitivity.index,
+                        st->rot_attributes.sensitivity.report_id);
         }
 
         return 0;
@@ -428,16 +504,17 @@ static int hid_magn_3d_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, indio_dev);
 
         magn_state = iio_priv(indio_dev);
-        magn_state->common_attributes.hsdev = hsdev;
-        magn_state->common_attributes.pdev = pdev;
+        magn_state->magn_flux_attributes.hsdev = hsdev;
+        magn_state->magn_flux_attributes.pdev = pdev;
 
         ret = hid_sensor_parse_common_attributes(hsdev,
                                 HID_USAGE_SENSOR_COMPASS_3D,
-                                &magn_state->common_attributes);
+                                &magn_state->magn_flux_attributes);
         if (ret) {
                 dev_err(&pdev->dev, "failed to setup common attributes\n");
                 return ret;
         }
+        magn_state->rot_attributes = magn_state->magn_flux_attributes;
 
         ret = magn_3d_parse_report(pdev, hsdev,
                                 &channels, &chan_count,
@@ -460,9 +537,9 @@ static int hid_magn_3d_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "failed to initialize trigger buffer\n");
                 return ret;
         }
-        atomic_set(&magn_state->common_attributes.data_ready, 0);
+        atomic_set(&magn_state->magn_flux_attributes.data_ready, 0);
         ret = hid_sensor_setup_trigger(indio_dev, name,
-                                        &magn_state->common_attributes);
+                                        &magn_state->magn_flux_attributes);
         if (ret < 0) {
                 dev_err(&pdev->dev, "trigger setup failed\n");
                 goto error_unreg_buffer_funcs;
@@ -489,7 +566,7 @@ static int hid_magn_3d_probe(struct platform_device *pdev)
 error_iio_unreg:
         iio_device_unregister(indio_dev);
 error_remove_trigger:
-        hid_sensor_remove_trigger(&magn_state->common_attributes);
+        hid_sensor_remove_trigger(&magn_state->magn_flux_attributes);
 error_unreg_buffer_funcs:
         iio_triggered_buffer_cleanup(indio_dev);
         return ret;
@@ -504,7 +581,7 @@ static int hid_magn_3d_remove(struct platform_device *pdev)
 
         sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_COMPASS_3D);
         iio_device_unregister(indio_dev);
-        hid_sensor_remove_trigger(&magn_state->common_attributes);
+        hid_sensor_remove_trigger(&magn_state->magn_flux_attributes);
         iio_triggered_buffer_cleanup(indio_dev);
 
         return 0;
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 3e1f06b2224c..8e1b0861fbe4 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -46,139 +46,12 @@
 #define ST_MAGN_FS_AVL_15000MG                  15000
 #define ST_MAGN_FS_AVL_16000MG                  16000
 
-/* CUSTOM VALUES FOR SENSOR 0 */
-#define ST_MAGN_0_ODR_ADDR                      0x00
-#define ST_MAGN_0_ODR_MASK                      0x1c
-#define ST_MAGN_0_ODR_AVL_1HZ_VAL               0x00
-#define ST_MAGN_0_ODR_AVL_2HZ_VAL               0x01
-#define ST_MAGN_0_ODR_AVL_3HZ_VAL               0x02
-#define ST_MAGN_0_ODR_AVL_8HZ_VAL               0x03
-#define ST_MAGN_0_ODR_AVL_15HZ_VAL              0x04
-#define ST_MAGN_0_ODR_AVL_30HZ_VAL              0x05
-#define ST_MAGN_0_ODR_AVL_75HZ_VAL              0x06
-#define ST_MAGN_0_ODR_AVL_220HZ_VAL             0x07
-#define ST_MAGN_0_PW_ADDR                       0x02
-#define ST_MAGN_0_PW_MASK                       0x03
-#define ST_MAGN_0_PW_ON                         0x00
-#define ST_MAGN_0_PW_OFF                        0x03
-#define ST_MAGN_0_FS_ADDR                       0x01
-#define ST_MAGN_0_FS_MASK                       0xe0
-#define ST_MAGN_0_FS_AVL_1300_VAL               0x01
-#define ST_MAGN_0_FS_AVL_1900_VAL               0x02
-#define ST_MAGN_0_FS_AVL_2500_VAL               0x03
-#define ST_MAGN_0_FS_AVL_4000_VAL               0x04
-#define ST_MAGN_0_FS_AVL_4700_VAL               0x05
-#define ST_MAGN_0_FS_AVL_5600_VAL               0x06
-#define ST_MAGN_0_FS_AVL_8100_VAL               0x07
-#define ST_MAGN_0_FS_AVL_1300_GAIN_XY           1100
-#define ST_MAGN_0_FS_AVL_1900_GAIN_XY           855
-#define ST_MAGN_0_FS_AVL_2500_GAIN_XY           670
-#define ST_MAGN_0_FS_AVL_4000_GAIN_XY           450
-#define ST_MAGN_0_FS_AVL_4700_GAIN_XY           400
-#define ST_MAGN_0_FS_AVL_5600_GAIN_XY           330
-#define ST_MAGN_0_FS_AVL_8100_GAIN_XY           230
-#define ST_MAGN_0_FS_AVL_1300_GAIN_Z            980
-#define ST_MAGN_0_FS_AVL_1900_GAIN_Z            760
-#define ST_MAGN_0_FS_AVL_2500_GAIN_Z            600
-#define ST_MAGN_0_FS_AVL_4000_GAIN_Z            400
-#define ST_MAGN_0_FS_AVL_4700_GAIN_Z            355
-#define ST_MAGN_0_FS_AVL_5600_GAIN_Z            295
-#define ST_MAGN_0_FS_AVL_8100_GAIN_Z            205
-#define ST_MAGN_0_MULTIREAD_BIT                 false
-
-/* CUSTOM VALUES FOR SENSOR 1 */
-#define ST_MAGN_1_WAI_EXP                       0x3c
-#define ST_MAGN_1_ODR_ADDR                      0x00
-#define ST_MAGN_1_ODR_MASK                      0x1c
-#define ST_MAGN_1_ODR_AVL_1HZ_VAL               0x00
-#define ST_MAGN_1_ODR_AVL_2HZ_VAL               0x01
-#define ST_MAGN_1_ODR_AVL_3HZ_VAL               0x02
-#define ST_MAGN_1_ODR_AVL_8HZ_VAL               0x03
-#define ST_MAGN_1_ODR_AVL_15HZ_VAL              0x04
-#define ST_MAGN_1_ODR_AVL_30HZ_VAL              0x05
-#define ST_MAGN_1_ODR_AVL_75HZ_VAL              0x06
-#define ST_MAGN_1_ODR_AVL_220HZ_VAL             0x07
-#define ST_MAGN_1_PW_ADDR                       0x02
-#define ST_MAGN_1_PW_MASK                       0x03
-#define ST_MAGN_1_PW_ON                         0x00
-#define ST_MAGN_1_PW_OFF                        0x03
-#define ST_MAGN_1_FS_ADDR                       0x01
-#define ST_MAGN_1_FS_MASK                       0xe0
-#define ST_MAGN_1_FS_AVL_1300_VAL               0x01
-#define ST_MAGN_1_FS_AVL_1900_VAL               0x02
-#define ST_MAGN_1_FS_AVL_2500_VAL               0x03
-#define ST_MAGN_1_FS_AVL_4000_VAL               0x04
-#define ST_MAGN_1_FS_AVL_4700_VAL               0x05
-#define ST_MAGN_1_FS_AVL_5600_VAL               0x06
-#define ST_MAGN_1_FS_AVL_8100_VAL               0x07
-#define ST_MAGN_1_FS_AVL_1300_GAIN_XY           909
-#define ST_MAGN_1_FS_AVL_1900_GAIN_XY           1169
-#define ST_MAGN_1_FS_AVL_2500_GAIN_XY           1492
-#define ST_MAGN_1_FS_AVL_4000_GAIN_XY           2222
-#define ST_MAGN_1_FS_AVL_4700_GAIN_XY           2500
-#define ST_MAGN_1_FS_AVL_5600_GAIN_XY           3030
-#define ST_MAGN_1_FS_AVL_8100_GAIN_XY           4347
-#define ST_MAGN_1_FS_AVL_1300_GAIN_Z            1020
-#define ST_MAGN_1_FS_AVL_1900_GAIN_Z            1315
-#define ST_MAGN_1_FS_AVL_2500_GAIN_Z            1666
-#define ST_MAGN_1_FS_AVL_4000_GAIN_Z            2500
-#define ST_MAGN_1_FS_AVL_4700_GAIN_Z            2816
-#define ST_MAGN_1_FS_AVL_5600_GAIN_Z            3389
-#define ST_MAGN_1_FS_AVL_8100_GAIN_Z            4878
-#define ST_MAGN_1_MULTIREAD_BIT                 false
-
-/* CUSTOM VALUES FOR SENSOR 2 */
-#define ST_MAGN_2_WAI_EXP                       0x3d
-#define ST_MAGN_2_ODR_ADDR                      0x20
-#define ST_MAGN_2_ODR_MASK                      0x1c
-#define ST_MAGN_2_ODR_AVL_1HZ_VAL               0x00
-#define ST_MAGN_2_ODR_AVL_2HZ_VAL               0x01
-#define ST_MAGN_2_ODR_AVL_3HZ_VAL               0x02
-#define ST_MAGN_2_ODR_AVL_5HZ_VAL               0x03
-#define ST_MAGN_2_ODR_AVL_10HZ_VAL              0x04
-#define ST_MAGN_2_ODR_AVL_20HZ_VAL              0x05
-#define ST_MAGN_2_ODR_AVL_40HZ_VAL              0x06
-#define ST_MAGN_2_ODR_AVL_80HZ_VAL              0x07
-#define ST_MAGN_2_PW_ADDR                       0x22
-#define ST_MAGN_2_PW_MASK                       0x03
-#define ST_MAGN_2_PW_ON                         0x00
-#define ST_MAGN_2_PW_OFF                        0x03
-#define ST_MAGN_2_FS_ADDR                       0x21
-#define ST_MAGN_2_FS_MASK                       0x60
-#define ST_MAGN_2_FS_AVL_4000_VAL               0x00
-#define ST_MAGN_2_FS_AVL_8000_VAL               0x01
-#define ST_MAGN_2_FS_AVL_12000_VAL              0x02
-#define ST_MAGN_2_FS_AVL_16000_VAL              0x03
-#define ST_MAGN_2_FS_AVL_4000_GAIN              146
-#define ST_MAGN_2_FS_AVL_8000_GAIN              292
-#define ST_MAGN_2_FS_AVL_12000_GAIN             438
-#define ST_MAGN_2_FS_AVL_16000_GAIN             584
-#define ST_MAGN_2_MULTIREAD_BIT                 false
+/* Special L addresses for Sensor 2 */
 #define ST_MAGN_2_OUT_X_L_ADDR                  0x28
 #define ST_MAGN_2_OUT_Y_L_ADDR                  0x2a
 #define ST_MAGN_2_OUT_Z_L_ADDR                  0x2c
 
-/* CUSTOM VALUES FOR SENSOR 3 */
-#define ST_MAGN_3_WAI_ADDR                      0x4f
-#define ST_MAGN_3_WAI_EXP                       0x40
-#define ST_MAGN_3_ODR_ADDR                      0x60
-#define ST_MAGN_3_ODR_MASK                      0x0c
-#define ST_MAGN_3_ODR_AVL_10HZ_VAL              0x00
-#define ST_MAGN_3_ODR_AVL_20HZ_VAL              0x01
-#define ST_MAGN_3_ODR_AVL_50HZ_VAL              0x02
-#define ST_MAGN_3_ODR_AVL_100HZ_VAL             0x03
-#define ST_MAGN_3_PW_ADDR                       0x60
-#define ST_MAGN_3_PW_MASK                       0x03
-#define ST_MAGN_3_PW_ON                         0x00
-#define ST_MAGN_3_PW_OFF                        0x03
-#define ST_MAGN_3_BDU_ADDR                      0x62
-#define ST_MAGN_3_BDU_MASK                      0x10
-#define ST_MAGN_3_DRDY_IRQ_ADDR                 0x62
-#define ST_MAGN_3_DRDY_INT_MASK                 0x01
-#define ST_MAGN_3_IHL_IRQ_ADDR                  0x63
-#define ST_MAGN_3_IHL_IRQ_MASK                  0x04
-#define ST_MAGN_3_FS_AVL_15000_GAIN             1500
-#define ST_MAGN_3_MULTIREAD_BIT                 false
+/* Special L addresses for sensor 3 */
 #define ST_MAGN_3_OUT_X_L_ADDR                  0x68
 #define ST_MAGN_3_OUT_Y_L_ADDR                  0x6a
 #define ST_MAGN_3_OUT_Z_L_ADDR                  0x6c
@@ -240,77 +113,78 @@ static const struct st_sensor_settings st_magn_sensors_settings[] = {
                 },
                 .ch = (struct iio_chan_spec *)st_magn_16bit_channels,
                 .odr = {
-                        .addr = ST_MAGN_0_ODR_ADDR,
-                        .mask = ST_MAGN_0_ODR_MASK,
+                        .addr = 0x00,
+                        .mask = 0x1c,
                         .odr_avl = {
-                                { 1, ST_MAGN_0_ODR_AVL_1HZ_VAL, },
-                                { 2, ST_MAGN_0_ODR_AVL_2HZ_VAL, },
-                                { 3, ST_MAGN_0_ODR_AVL_3HZ_VAL, },
-                                { 8, ST_MAGN_0_ODR_AVL_8HZ_VAL, },
-                                { 15, ST_MAGN_0_ODR_AVL_15HZ_VAL, },
-                                { 30, ST_MAGN_0_ODR_AVL_30HZ_VAL, },
-                                { 75, ST_MAGN_0_ODR_AVL_75HZ_VAL, },
+                                { .hz = 1, .value = 0x00 },
+                                { .hz = 2, .value = 0x01 },
+                                { .hz = 3, .value = 0x02 },
+                                { .hz = 8, .value = 0x03 },
+                                { .hz = 15, .value = 0x04 },
+                                { .hz = 30, .value = 0x05 },
+                                { .hz = 75, .value = 0x06 },
+                                /* 220 Hz, 0x07 reportedly exist */
                         },
                 },
                 .pw = {
-                        .addr = ST_MAGN_0_PW_ADDR,
-                        .mask = ST_MAGN_0_PW_MASK,
-                        .value_on = ST_MAGN_0_PW_ON,
-                        .value_off = ST_MAGN_0_PW_OFF,
+                        .addr = 0x02,
+                        .mask = 0x03,
+                        .value_on = 0x00,
+                        .value_off = 0x03,
                 },
                 .fs = {
-                        .addr = ST_MAGN_0_FS_ADDR,
-                        .mask = ST_MAGN_0_FS_MASK,
+                        .addr = 0x01,
+                        .mask = 0xe0,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_MAGN_FS_AVL_1300MG,
-                                        .value = ST_MAGN_0_FS_AVL_1300_VAL,
-                                        .gain = ST_MAGN_0_FS_AVL_1300_GAIN_XY,
-                                        .gain2 = ST_MAGN_0_FS_AVL_1300_GAIN_Z,
+                                        .value = 0x01,
+                                        .gain = 1100,
+                                        .gain2 = 980,
                                 },
                                 [1] = {
                                         .num = ST_MAGN_FS_AVL_1900MG,
-                                        .value = ST_MAGN_0_FS_AVL_1900_VAL,
-                                        .gain = ST_MAGN_0_FS_AVL_1900_GAIN_XY,
-                                        .gain2 = ST_MAGN_0_FS_AVL_1900_GAIN_Z,
+                                        .value = 0x02,
+                                        .gain = 855,
+                                        .gain2 = 760,
                                 },
                                 [2] = {
                                         .num = ST_MAGN_FS_AVL_2500MG,
-                                        .value = ST_MAGN_0_FS_AVL_2500_VAL,
-                                        .gain = ST_MAGN_0_FS_AVL_2500_GAIN_XY,
-                                        .gain2 = ST_MAGN_0_FS_AVL_2500_GAIN_Z,
+                                        .value = 0x03,
+                                        .gain = 670,
+                                        .gain2 = 600,
                                 },
                                 [3] = {
                                         .num = ST_MAGN_FS_AVL_4000MG,
-                                        .value = ST_MAGN_0_FS_AVL_4000_VAL,
-                                        .gain = ST_MAGN_0_FS_AVL_4000_GAIN_XY,
-                                        .gain2 = ST_MAGN_0_FS_AVL_4000_GAIN_Z,
+                                        .value = 0x04,
+                                        .gain = 450,
+                                        .gain2 = 400,
                                 },
                                 [4] = {
                                         .num = ST_MAGN_FS_AVL_4700MG,
-                                        .value = ST_MAGN_0_FS_AVL_4700_VAL,
-                                        .gain = ST_MAGN_0_FS_AVL_4700_GAIN_XY,
-                                        .gain2 = ST_MAGN_0_FS_AVL_4700_GAIN_Z,
+                                        .value = 0x05,
+                                        .gain = 400,
+                                        .gain2 = 355,
                                 },
                                 [5] = {
                                         .num = ST_MAGN_FS_AVL_5600MG,
-                                        .value = ST_MAGN_0_FS_AVL_5600_VAL,
-                                        .gain = ST_MAGN_0_FS_AVL_5600_GAIN_XY,
-                                        .gain2 = ST_MAGN_0_FS_AVL_5600_GAIN_Z,
+                                        .value = 0x06,
+                                        .gain = 330,
+                                        .gain2 = 295,
                                 },
                                 [6] = {
                                         .num = ST_MAGN_FS_AVL_8100MG,
-                                        .value = ST_MAGN_0_FS_AVL_8100_VAL,
-                                        .gain = ST_MAGN_0_FS_AVL_8100_GAIN_XY,
-                                        .gain2 = ST_MAGN_0_FS_AVL_8100_GAIN_Z,
+                                        .value = 0x07,
+                                        .gain = 230,
+                                        .gain2 = 205,
                                 },
                         },
                 },
-                .multi_read_bit = ST_MAGN_0_MULTIREAD_BIT,
+                .multi_read_bit = false,
                 .bootime = 2,
         },
         {
-                .wai = ST_MAGN_1_WAI_EXP,
+                .wai = 0x3c,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LSM303DLHC_MAGN_DEV_NAME,
@@ -318,175 +192,175 @@ static const struct st_sensor_settings st_magn_sensors_settings[] = {
                 },
                 .ch = (struct iio_chan_spec *)st_magn_16bit_channels,
                 .odr = {
-                        .addr = ST_MAGN_1_ODR_ADDR,
-                        .mask = ST_MAGN_1_ODR_MASK,
+                        .addr = 0x00,
+                        .mask = 0x1c,
                         .odr_avl = {
-                                { 1, ST_MAGN_1_ODR_AVL_1HZ_VAL, },
-                                { 2, ST_MAGN_1_ODR_AVL_2HZ_VAL, },
-                                { 3, ST_MAGN_1_ODR_AVL_3HZ_VAL, },
-                                { 8, ST_MAGN_1_ODR_AVL_8HZ_VAL, },
-                                { 15, ST_MAGN_1_ODR_AVL_15HZ_VAL, },
-                                { 30, ST_MAGN_1_ODR_AVL_30HZ_VAL, },
-                                { 75, ST_MAGN_1_ODR_AVL_75HZ_VAL, },
-                                { 220, ST_MAGN_1_ODR_AVL_220HZ_VAL, },
+                                { .hz = 1, .value = 0x00 },
+                                { .hz = 2, .value = 0x01 },
+                                { .hz = 3, .value = 0x02 },
+                                { .hz = 8, .value = 0x03 },
+                                { .hz = 15, .value = 0x04 },
+                                { .hz = 30, .value = 0x05 },
+                                { .hz = 75, .value = 0x06 },
+                                { .hz = 220, .value = 0x07 },
                         },
                 },
                 .pw = {
-                        .addr = ST_MAGN_1_PW_ADDR,
-                        .mask = ST_MAGN_1_PW_MASK,
-                        .value_on = ST_MAGN_1_PW_ON,
-                        .value_off = ST_MAGN_1_PW_OFF,
+                        .addr = 0x02,
+                        .mask = 0x03,
+                        .value_on = 0x00,
+                        .value_off = 0x03,
                 },
                 .fs = {
-                        .addr = ST_MAGN_1_FS_ADDR,
-                        .mask = ST_MAGN_1_FS_MASK,
+                        .addr = 0x01,
+                        .mask = 0xe0,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_MAGN_FS_AVL_1300MG,
-                                        .value = ST_MAGN_1_FS_AVL_1300_VAL,
-                                        .gain = ST_MAGN_1_FS_AVL_1300_GAIN_XY,
-                                        .gain2 = ST_MAGN_1_FS_AVL_1300_GAIN_Z,
+                                        .value = 0x01,
+                                        .gain = 909,
+                                        .gain2 = 1020,
                                 },
                                 [1] = {
                                         .num = ST_MAGN_FS_AVL_1900MG,
-                                        .value = ST_MAGN_1_FS_AVL_1900_VAL,
-                                        .gain = ST_MAGN_1_FS_AVL_1900_GAIN_XY,
-                                        .gain2 = ST_MAGN_1_FS_AVL_1900_GAIN_Z,
+                                        .value = 0x02,
+                                        .gain = 1169,
+                                        .gain2 = 1315,
                                 },
                                 [2] = {
                                         .num = ST_MAGN_FS_AVL_2500MG,
-                                        .value = ST_MAGN_1_FS_AVL_2500_VAL,
-                                        .gain = ST_MAGN_1_FS_AVL_2500_GAIN_XY,
-                                        .gain2 = ST_MAGN_1_FS_AVL_2500_GAIN_Z,
+                                        .value = 0x03,
+                                        .gain = 1492,
+                                        .gain2 = 1666,
                                 },
                                 [3] = {
                                         .num = ST_MAGN_FS_AVL_4000MG,
-                                        .value = ST_MAGN_1_FS_AVL_4000_VAL,
-                                        .gain = ST_MAGN_1_FS_AVL_4000_GAIN_XY,
-                                        .gain2 = ST_MAGN_1_FS_AVL_4000_GAIN_Z,
+                                        .value = 0x04,
+                                        .gain = 2222,
+                                        .gain2 = 2500,
                                 },
                                 [4] = {
                                         .num = ST_MAGN_FS_AVL_4700MG,
-                                        .value = ST_MAGN_1_FS_AVL_4700_VAL,
-                                        .gain = ST_MAGN_1_FS_AVL_4700_GAIN_XY,
-                                        .gain2 = ST_MAGN_1_FS_AVL_4700_GAIN_Z,
+                                        .value = 0x05,
+                                        .gain = 2500,
+                                        .gain2 = 2816,
                                 },
                                 [5] = {
                                         .num = ST_MAGN_FS_AVL_5600MG,
-                                        .value = ST_MAGN_1_FS_AVL_5600_VAL,
-                                        .gain = ST_MAGN_1_FS_AVL_5600_GAIN_XY,
-                                        .gain2 = ST_MAGN_1_FS_AVL_5600_GAIN_Z,
+                                        .value = 0x06,
+                                        .gain = 3030,
+                                        .gain2 = 3389,
                                 },
                                 [6] = {
                                         .num = ST_MAGN_FS_AVL_8100MG,
-                                        .value = ST_MAGN_1_FS_AVL_8100_VAL,
-                                        .gain = ST_MAGN_1_FS_AVL_8100_GAIN_XY,
-                                        .gain2 = ST_MAGN_1_FS_AVL_8100_GAIN_Z,
+                                        .value = 0x07,
+                                        .gain = 4347,
+                                        .gain2 = 4878,
                                 },
                         },
                 },
-                .multi_read_bit = ST_MAGN_1_MULTIREAD_BIT,
+                .multi_read_bit = false,
                 .bootime = 2,
         },
         {
-                .wai = ST_MAGN_2_WAI_EXP,
+                .wai = 0x3d,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LIS3MDL_MAGN_DEV_NAME,
                 },
                 .ch = (struct iio_chan_spec *)st_magn_2_16bit_channels,
                 .odr = {
-                        .addr = ST_MAGN_2_ODR_ADDR,
-                        .mask = ST_MAGN_2_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0x1c,
                         .odr_avl = {
-                                { 1, ST_MAGN_2_ODR_AVL_1HZ_VAL, },
-                                { 2, ST_MAGN_2_ODR_AVL_2HZ_VAL, },
-                                { 3, ST_MAGN_2_ODR_AVL_3HZ_VAL, },
-                                { 5, ST_MAGN_2_ODR_AVL_5HZ_VAL, },
-                                { 10, ST_MAGN_2_ODR_AVL_10HZ_VAL, },
-                                { 20, ST_MAGN_2_ODR_AVL_20HZ_VAL, },
-                                { 40, ST_MAGN_2_ODR_AVL_40HZ_VAL, },
-                                { 80, ST_MAGN_2_ODR_AVL_80HZ_VAL, },
+                                { .hz = 1, .value = 0x00 },
+                                { .hz = 2, .value = 0x01 },
+                                { .hz = 3, .value = 0x02 },
+                                { .hz = 5, .value = 0x03 },
+                                { .hz = 10, .value = 0x04 },
+                                { .hz = 20, .value = 0x05 },
+                                { .hz = 40, .value = 0x06 },
+                                { .hz = 80, .value = 0x07 },
                         },
                 },
                 .pw = {
-                        .addr = ST_MAGN_2_PW_ADDR,
-                        .mask = ST_MAGN_2_PW_MASK,
-                        .value_on = ST_MAGN_2_PW_ON,
-                        .value_off = ST_MAGN_2_PW_OFF,
+                        .addr = 0x22,
+                        .mask = 0x03,
+                        .value_on = 0x00,
+                        .value_off = 0x03,
                 },
                 .fs = {
-                        .addr = ST_MAGN_2_FS_ADDR,
-                        .mask = ST_MAGN_2_FS_MASK,
+                        .addr = 0x21,
+                        .mask = 0x60,
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_MAGN_FS_AVL_4000MG,
-                                        .value = ST_MAGN_2_FS_AVL_4000_VAL,
-                                        .gain = ST_MAGN_2_FS_AVL_4000_GAIN,
+                                        .value = 0x00,
+                                        .gain = 146,
                                 },
                                 [1] = {
                                         .num = ST_MAGN_FS_AVL_8000MG,
-                                        .value = ST_MAGN_2_FS_AVL_8000_VAL,
-                                        .gain = ST_MAGN_2_FS_AVL_8000_GAIN,
+                                        .value = 0x01,
+                                        .gain = 292,
                                 },
                                 [2] = {
                                         .num = ST_MAGN_FS_AVL_12000MG,
-                                        .value = ST_MAGN_2_FS_AVL_12000_VAL,
-                                        .gain = ST_MAGN_2_FS_AVL_12000_GAIN,
+                                        .value = 0x02,
+                                        .gain = 438,
                                 },
                                 [3] = {
                                         .num = ST_MAGN_FS_AVL_16000MG,
-                                        .value = ST_MAGN_2_FS_AVL_16000_VAL,
-                                        .gain = ST_MAGN_2_FS_AVL_16000_GAIN,
+                                        .value = 0x03,
+                                        .gain = 584,
                                 },
                         },
                 },
-                .multi_read_bit = ST_MAGN_2_MULTIREAD_BIT,
+                .multi_read_bit = false,
                 .bootime = 2,
         },
         {
-                .wai = ST_MAGN_3_WAI_EXP,
-                .wai_addr = ST_MAGN_3_WAI_ADDR,
+                .wai = 0x40,
+                .wai_addr = 0x4f,
                 .sensors_supported = {
                         [0] = LSM303AGR_MAGN_DEV_NAME,
                 },
                 .ch = (struct iio_chan_spec *)st_magn_3_16bit_channels,
                 .odr = {
-                        .addr = ST_MAGN_3_ODR_ADDR,
-                        .mask = ST_MAGN_3_ODR_MASK,
+                        .addr = 0x60,
+                        .mask = 0x0c,
                         .odr_avl = {
-                                { 10, ST_MAGN_3_ODR_AVL_10HZ_VAL, },
-                                { 20, ST_MAGN_3_ODR_AVL_20HZ_VAL, },
-                                { 50, ST_MAGN_3_ODR_AVL_50HZ_VAL, },
-                                { 100, ST_MAGN_3_ODR_AVL_100HZ_VAL, },
+                                { .hz = 10, .value = 0x00 },
+                                { .hz = 20, .value = 0x01 },
+                                { .hz = 50, .value = 0x02 },
+                                { .hz = 100, .value = 0x03 },
                         },
                 },
                 .pw = {
-                        .addr = ST_MAGN_3_PW_ADDR,
-                        .mask = ST_MAGN_3_PW_MASK,
-                        .value_on = ST_MAGN_3_PW_ON,
-                        .value_off = ST_MAGN_3_PW_OFF,
+                        .addr = 0x60,
+                        .mask = 0x03,
+                        .value_on = 0x00,
+                        .value_off = 0x03,
                 },
                 .fs = {
                         .fs_avl = {
                                 [0] = {
                                         .num = ST_MAGN_FS_AVL_15000MG,
-                                        .gain = ST_MAGN_3_FS_AVL_15000_GAIN,
+                                        .gain = 1500,
                                 },
                         },
                 },
                 .bdu = {
-                        .addr = ST_MAGN_3_BDU_ADDR,
-                        .mask = ST_MAGN_3_BDU_MASK,
+                        .addr = 0x62,
+                        .mask = 0x10,
                 },
                 .drdy_irq = {
-                        .addr = ST_MAGN_3_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_MAGN_3_DRDY_INT_MASK,
-                        .addr_ihl = ST_MAGN_3_IHL_IRQ_ADDR,
-                        .mask_ihl = ST_MAGN_3_IHL_IRQ_MASK,
+                        .addr = 0x62,
+                        .mask_int1 = 0x01,
+                        .addr_ihl = 0x63,
+                        .mask_ihl = 0x04,
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_MAGN_3_MULTIREAD_BIT,
+                .multi_read_bit = false,
                 .bootime = 2,
         },
 };
diff --git a/drivers/iio/potentiometer/mcp4531.c b/drivers/iio/potentiometer/mcp4531.c
index 13b6ae2fcf7b..0d1bcf89ae17 100644
--- a/drivers/iio/potentiometer/mcp4531.c
+++ b/drivers/iio/potentiometer/mcp4531.c
@@ -38,7 +38,7 @@
 
 struct mcp4531_cfg {
         int wipers;
-        int max_pos;
+        int avail[3];
         int kohms;
 };
 
@@ -78,38 +78,38 @@ enum mcp4531_type {
 };
 
 static const struct mcp4531_cfg mcp4531_cfg[] = {
-        [MCP453x_502] = { .wipers = 1, .max_pos = 128, .kohms =   5, },
-        [MCP453x_103] = { .wipers = 1, .max_pos = 128, .kohms =  10, },
-        [MCP453x_503] = { .wipers = 1, .max_pos = 128, .kohms =  50, },
-        [MCP453x_104] = { .wipers = 1, .max_pos = 128, .kohms = 100, },
-        [MCP454x_502] = { .wipers = 1, .max_pos = 128, .kohms =   5, },
-        [MCP454x_103] = { .wipers = 1, .max_pos = 128, .kohms =  10, },
-        [MCP454x_503] = { .wipers = 1, .max_pos = 128, .kohms =  50, },
-        [MCP454x_104] = { .wipers = 1, .max_pos = 128, .kohms = 100, },
-        [MCP455x_502] = { .wipers = 1, .max_pos = 256, .kohms =   5, },
-        [MCP455x_103] = { .wipers = 1, .max_pos = 256, .kohms =  10, },
-        [MCP455x_503] = { .wipers = 1, .max_pos = 256, .kohms =  50, },
-        [MCP455x_104] = { .wipers = 1, .max_pos = 256, .kohms = 100, },
-        [MCP456x_502] = { .wipers = 1, .max_pos = 256, .kohms =   5, },
-        [MCP456x_103] = { .wipers = 1, .max_pos = 256, .kohms =  10, },
-        [MCP456x_503] = { .wipers = 1, .max_pos = 256, .kohms =  50, },
-        [MCP456x_104] = { .wipers = 1, .max_pos = 256, .kohms = 100, },
-        [MCP463x_502] = { .wipers = 2, .max_pos = 128, .kohms =   5, },
-        [MCP463x_103] = { .wipers = 2, .max_pos = 128, .kohms =  10, },
-        [MCP463x_503] = { .wipers = 2, .max_pos = 128, .kohms =  50, },
-        [MCP463x_104] = { .wipers = 2, .max_pos = 128, .kohms = 100, },
-        [MCP464x_502] = { .wipers = 2, .max_pos = 128, .kohms =   5, },
-        [MCP464x_103] = { .wipers = 2, .max_pos = 128, .kohms =  10, },
-        [MCP464x_503] = { .wipers = 2, .max_pos = 128, .kohms =  50, },
-        [MCP464x_104] = { .wipers = 2, .max_pos = 128, .kohms = 100, },
-        [MCP465x_502] = { .wipers = 2, .max_pos = 256, .kohms =   5, },
-        [MCP465x_103] = { .wipers = 2, .max_pos = 256, .kohms =  10, },
-        [MCP465x_503] = { .wipers = 2, .max_pos = 256, .kohms =  50, },
-        [MCP465x_104] = { .wipers = 2, .max_pos = 256, .kohms = 100, },
-        [MCP466x_502] = { .wipers = 2, .max_pos = 256, .kohms =   5, },
-        [MCP466x_103] = { .wipers = 2, .max_pos = 256, .kohms =  10, },
-        [MCP466x_503] = { .wipers = 2, .max_pos = 256, .kohms =  50, },
-        [MCP466x_104] = { .wipers = 2, .max_pos = 256, .kohms = 100, },
+        [MCP453x_502] = { .wipers = 1, .avail = { 0, 1, 128 }, .kohms =   5, },
+        [MCP453x_103] = { .wipers = 1, .avail = { 0, 1, 128 }, .kohms =  10, },
+        [MCP453x_503] = { .wipers = 1, .avail = { 0, 1, 128 }, .kohms =  50, },
+        [MCP453x_104] = { .wipers = 1, .avail = { 0, 1, 128 }, .kohms = 100, },
+        [MCP454x_502] = { .wipers = 1, .avail = { 0, 1, 128 }, .kohms =   5, },
+        [MCP454x_103] = { .wipers = 1, .avail = { 0, 1, 128 }, .kohms =  10, },
+        [MCP454x_503] = { .wipers = 1, .avail = { 0, 1, 128 }, .kohms =  50, },
+        [MCP454x_104] = { .wipers = 1, .avail = { 0, 1, 128 }, .kohms = 100, },
+        [MCP455x_502] = { .wipers = 1, .avail = { 0, 1, 256 }, .kohms =   5, },
+        [MCP455x_103] = { .wipers = 1, .avail = { 0, 1, 256 }, .kohms =  10, },
+        [MCP455x_503] = { .wipers = 1, .avail = { 0, 1, 256 }, .kohms =  50, },
+        [MCP455x_104] = { .wipers = 1, .avail = { 0, 1, 256 }, .kohms = 100, },
+        [MCP456x_502] = { .wipers = 1, .avail = { 0, 1, 256 }, .kohms =   5, },
+        [MCP456x_103] = { .wipers = 1, .avail = { 0, 1, 256 }, .kohms =  10, },
+        [MCP456x_503] = { .wipers = 1, .avail = { 0, 1, 256 }, .kohms =  50, },
+        [MCP456x_104] = { .wipers = 1, .avail = { 0, 1, 256 }, .kohms = 100, },
+        [MCP463x_502] = { .wipers = 2, .avail = { 0, 1, 128 }, .kohms =   5, },
+        [MCP463x_103] = { .wipers = 2, .avail = { 0, 1, 128 }, .kohms =  10, },
+        [MCP463x_503] = { .wipers = 2, .avail = { 0, 1, 128 }, .kohms =  50, },
+        [MCP463x_104] = { .wipers = 2, .avail = { 0, 1, 128 }, .kohms = 100, },
+        [MCP464x_502] = { .wipers = 2, .avail = { 0, 1, 128 }, .kohms =   5, },
+        [MCP464x_103] = { .wipers = 2, .avail = { 0, 1, 128 }, .kohms =  10, },
+        [MCP464x_503] = { .wipers = 2, .avail = { 0, 1, 128 }, .kohms =  50, },
+        [MCP464x_104] = { .wipers = 2, .avail = { 0, 1, 128 }, .kohms = 100, },
+        [MCP465x_502] = { .wipers = 2, .avail = { 0, 1, 256 }, .kohms =   5, },
+        [MCP465x_103] = { .wipers = 2, .avail = { 0, 1, 256 }, .kohms =  10, },
+        [MCP465x_503] = { .wipers = 2, .avail = { 0, 1, 256 }, .kohms =  50, },
+        [MCP465x_104] = { .wipers = 2, .avail = { 0, 1, 256 }, .kohms = 100, },
+        [MCP466x_502] = { .wipers = 2, .avail = { 0, 1, 256 }, .kohms =   5, },
+        [MCP466x_103] = { .wipers = 2, .avail = { 0, 1, 256 }, .kohms =  10, },
+        [MCP466x_503] = { .wipers = 2, .avail = { 0, 1, 256 }, .kohms =  50, },
+        [MCP466x_104] = { .wipers = 2, .avail = { 0, 1, 256 }, .kohms = 100, },
 };
 
 #define MCP4531_WRITE (0 << 2)
@@ -124,13 +124,14 @@ struct mcp4531_data {
         const struct mcp4531_cfg *cfg;
 };
 
-#define MCP4531_CHANNEL(ch) {                                   \
-        .type = IIO_RESISTANCE,                                 \
-        .indexed = 1,                                           \
-        .output = 1,                                            \
-        .channel = (ch),                                        \
-        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),           \
-        .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),   \
+#define MCP4531_CHANNEL(ch) {                                           \
+        .type = IIO_RESISTANCE,                                         \
+        .indexed = 1,                                                   \
+        .output = 1,                                                    \
+        .channel = (ch),                                                \
+        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),                   \
+        .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),           \
+        .info_mask_shared_by_type_available = BIT(IIO_CHAN_INFO_RAW),   \
 }
 
 static const struct iio_chan_spec mcp4531_channels[] = {
@@ -156,13 +157,31 @@ static int mcp4531_read_raw(struct iio_dev *indio_dev,
                 return IIO_VAL_INT;
         case IIO_CHAN_INFO_SCALE:
                 *val = 1000 * data->cfg->kohms;
-                *val2 = data->cfg->max_pos;
+                *val2 = data->cfg->avail[2];
                 return IIO_VAL_FRACTIONAL;
         }
 
         return -EINVAL;
 }
 
+static int mcp4531_read_avail(struct iio_dev *indio_dev,
+                              struct iio_chan_spec const *chan,
+                              const int **vals, int *type, int *length,
+                              long mask)
+{
+        struct mcp4531_data *data = iio_priv(indio_dev);
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                *length = ARRAY_SIZE(data->cfg->avail);
+                *vals = data->cfg->avail;
+                *type = IIO_VAL_INT;
+                return IIO_AVAIL_RANGE;
+        }
+
+        return -EINVAL;
+}
+
 static int mcp4531_write_raw(struct iio_dev *indio_dev,
                              struct iio_chan_spec const *chan,
                              int val, int val2, long mask)
@@ -172,7 +191,7 @@ static int mcp4531_write_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
-                if (val > data->cfg->max_pos || val < 0)
+                if (val > data->cfg->avail[2] || val < 0)
                         return -EINVAL;
                 break;
         default:
@@ -186,6 +205,7 @@ static int mcp4531_write_raw(struct iio_dev *indio_dev,
 
 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,
 };
diff --git a/drivers/iio/potentiostat/Kconfig b/drivers/iio/potentiostat/Kconfig
new file mode 100644
index 000000000000..1e3baf2cc97d
--- /dev/null
+++ b/drivers/iio/potentiostat/Kconfig
@@ -0,0 +1,22 @@
+#
+# Potentiostat drivers
+#
+# When adding new entries keep the list in alphabetical order
+
+menu "Digital potentiostats"
+
+config LMP91000
+        tristate "Texas Instruments LMP91000 potentiostat driver"
+        depends on I2C
+        select REGMAP_I2C
+        select IIO_BUFFER
+        select IIO_BUFFER_CB
+        select IIO_TRIGGERED_BUFFER
+        help
+          Say yes here to build support for the Texas Instruments
+          LMP91000 digital potentiostat chip.
+
+          To compile this driver as a module, choose M here: the
+          module will be called lmp91000
+
+endmenu
diff --git a/drivers/iio/potentiostat/Makefile b/drivers/iio/potentiostat/Makefile
new file mode 100644
index 000000000000..64d315ef4449
--- /dev/null
+++ b/drivers/iio/potentiostat/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for industrial I/O potentiostat drivers
+#
+
+# When adding new entries keep the list in alphabetical order
+obj-$(CONFIG_LMP91000) += lmp91000.o
diff --git a/drivers/iio/potentiostat/lmp91000.c b/drivers/iio/potentiostat/lmp91000.c
new file mode 100644
index 000000000000..e22714365022
--- /dev/null
+++ b/drivers/iio/potentiostat/lmp91000.c
@@ -0,0 +1,446 @@
+/*
+ * lmp91000.c - Support for Texas Instruments digital potentiostats
+ *
+ * Copyright (C) 2016 Matt Ranostay <mranostay@gmail.com>
+ *
+ * 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.
+ *
+ * TODO: bias voltage + polarity control, and multiple chip support
+ */
+
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/consumer.h>
+#include <linux/iio/trigger.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
+
+#define LMP91000_REG_LOCK               0x01
+#define LMP91000_REG_TIACN              0x10
+#define LMP91000_REG_TIACN_GAIN_SHIFT   2
+
+#define LMP91000_REG_REFCN              0x11
+#define LMP91000_REG_REFCN_EXT_REF      0x20
+#define LMP91000_REG_REFCN_50_ZERO      0x80
+
+#define LMP91000_REG_MODECN             0x12
+#define LMP91000_REG_MODECN_3LEAD       0x03
+#define LMP91000_REG_MODECN_TEMP        0x07
+
+#define LMP91000_DRV_NAME       "lmp91000"
+
+static const int lmp91000_tia_gain[] = { 0, 2750, 3500, 7000, 14000, 35000,
+                                         120000, 350000 };
+
+static const int lmp91000_rload[] = { 10, 33, 50, 100 };
+
+#define LMP91000_TEMP_BASE      -40
+
+static const u16 lmp91000_temp_lut[] = {
+        1875, 1867, 1860, 1852, 1844, 1836, 1828, 1821, 1813, 1805,
+        1797, 1789, 1782, 1774, 1766, 1758, 1750, 1742, 1734, 1727,
+        1719, 1711, 1703, 1695, 1687, 1679, 1671, 1663, 1656, 1648,
+        1640, 1632, 1624, 1616, 1608, 1600, 1592, 1584, 1576, 1568,
+        1560, 1552, 1544, 1536, 1528, 1520, 1512, 1504, 1496, 1488,
+        1480, 1472, 1464, 1456, 1448, 1440, 1432, 1424, 1415, 1407,
+        1399, 1391, 1383, 1375, 1367, 1359, 1351, 1342, 1334, 1326,
+        1318, 1310, 1302, 1293, 1285, 1277, 1269, 1261, 1253, 1244,
+        1236, 1228, 1220, 1212, 1203, 1195, 1187, 1179, 1170, 1162,
+        1154, 1146, 1137, 1129, 1121, 1112, 1104, 1096, 1087, 1079,
+        1071, 1063, 1054, 1046, 1038, 1029, 1021, 1012, 1004,  996,
+         987,  979,  971,  962,  954,  945,  937,  929,  920,  912,
+         903,  895,  886,  878,  870,  861 };
+
+static const struct regmap_config lmp91000_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+};
+
+struct lmp91000_data {
+        struct regmap *regmap;
+        struct device *dev;
+
+        struct iio_trigger *trig;
+        struct iio_cb_buffer *cb_buffer;
+        struct iio_channel *adc_chan;
+
+        struct completion completion;
+        u8 chan_select;
+
+        u32 buffer[4]; /* 64-bit data + 64-bit timestamp */
+};
+
+static const struct iio_chan_spec lmp91000_channels[] = {
+        { /* chemical channel mV */
+                .type = IIO_VOLTAGE,
+                .channel = 0,
+                .address = LMP91000_REG_MODECN_3LEAD,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                                      BIT(IIO_CHAN_INFO_OFFSET) |
+                                      BIT(IIO_CHAN_INFO_SCALE),
+                .scan_index = 0,
+                .scan_type = {
+                        .sign = 's',
+                        .realbits = 32,
+                        .storagebits = 32,
+                },
+        },
+        IIO_CHAN_SOFT_TIMESTAMP(1),
+        { /* temperature channel mV */
+                .type = IIO_TEMP,
+                .channel = 1,
+                .address = LMP91000_REG_MODECN_TEMP,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+                .scan_index = -1,
+        },
+};
+
+static int lmp91000_read(struct lmp91000_data *data, int channel, int *val)
+{
+        int state, ret;
+
+        ret = regmap_read(data->regmap, LMP91000_REG_MODECN, &state);
+        if (ret)
+                return -EINVAL;
+
+        ret = regmap_write(data->regmap, LMP91000_REG_MODECN, channel);
+        if (ret)
+                return -EINVAL;
+
+        /* delay till first temperature reading is complete */
+        if ((state != channel) && (channel == LMP91000_REG_MODECN_TEMP))
+                usleep_range(3000, 4000);
+
+        data->chan_select = channel != LMP91000_REG_MODECN_3LEAD;
+
+        iio_trigger_poll_chained(data->trig);
+
+        ret = wait_for_completion_timeout(&data->completion, HZ);
+        reinit_completion(&data->completion);
+
+        if (!ret)
+                return -ETIMEDOUT;
+
+        *val = data->buffer[data->chan_select];
+
+        return 0;
+}
+
+static irqreturn_t lmp91000_buffer_handler(int irq, void *private)
+{
+        struct iio_poll_func *pf = private;
+        struct iio_dev *indio_dev = pf->indio_dev;
+        struct lmp91000_data *data = iio_priv(indio_dev);
+        int ret, val;
+
+        memset(data->buffer, 0, sizeof(data->buffer));
+
+        ret = lmp91000_read(data, LMP91000_REG_MODECN_3LEAD, &val);
+        if (!ret) {
+                data->buffer[0] = val;
+                iio_push_to_buffers_with_timestamp(indio_dev, data->buffer,
+                                                   iio_get_time_ns(indio_dev));
+        }
+
+        iio_trigger_notify_done(indio_dev->trig);
+
+        return IRQ_HANDLED;
+}
+
+static int lmp91000_read_raw(struct iio_dev *indio_dev,
+                             struct iio_chan_spec const *chan,
+                             int *val, int *val2, long mask)
+{
+        struct lmp91000_data *data = iio_priv(indio_dev);
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+        case IIO_CHAN_INFO_PROCESSED: {
+                int ret = iio_channel_start_all_cb(data->cb_buffer);
+
+                if (ret)
+                        return ret;
+
+                ret = lmp91000_read(data, chan->address, val);
+
+                iio_channel_stop_all_cb(data->cb_buffer);
+
+                if (ret)
+                        return ret;
+
+                if (mask == IIO_CHAN_INFO_PROCESSED) {
+                        int tmp, i;
+
+                        ret = iio_convert_raw_to_processed(data->adc_chan,
+                                                           *val, &tmp, 1);
+                        if (ret)
+                                return ret;
+
+                        for (i = 0; i < ARRAY_SIZE(lmp91000_temp_lut); i++)
+                                if (lmp91000_temp_lut[i] < tmp)
+                                        break;
+
+                        *val = (LMP91000_TEMP_BASE + i) * 1000;
+                }
+                return IIO_VAL_INT;
+        }
+        case IIO_CHAN_INFO_OFFSET:
+                return iio_read_channel_offset(data->adc_chan, val, val2);
+        case IIO_CHAN_INFO_SCALE:
+                return iio_read_channel_scale(data->adc_chan, val, val2);
+        }
+
+        return -EINVAL;
+}
+
+static const struct iio_info lmp91000_info = {
+        .driver_module = THIS_MODULE,
+        .read_raw = lmp91000_read_raw,
+};
+
+static int lmp91000_read_config(struct lmp91000_data *data)
+{
+        struct device *dev = data->dev;
+        struct device_node *np = dev->of_node;
+        unsigned int reg, val;
+        int i, ret;
+
+        ret = of_property_read_u32(np, "ti,tia-gain-ohm", &val);
+        if (ret) {
+                if (of_property_read_bool(np, "ti,external-tia-resistor"))
+                        val = 0;
+                else {
+                        dev_err(dev, "no ti,tia-gain-ohm defined");
+                        return ret;
+                }
+        }
+
+        ret = -EINVAL;
+        for (i = 0; i < ARRAY_SIZE(lmp91000_tia_gain); i++) {
+                if (lmp91000_tia_gain[i] == val) {
+                        reg = i << LMP91000_REG_TIACN_GAIN_SHIFT;
+                        ret = 0;
+                        break;
+                }
+        }
+
+        if (ret) {
+                dev_err(dev, "invalid ti,tia-gain-ohm %d\n", val);
+                return ret;
+        }
+
+        ret = of_property_read_u32(np, "ti,rload-ohm", &val);
+        if (ret) {
+                val = 100;
+                dev_info(dev, "no ti,rload-ohm defined, default to %d\n", val);
+        }
+
+        ret = -EINVAL;
+        for (i = 0; i < ARRAY_SIZE(lmp91000_rload); i++) {
+                if (lmp91000_rload[i] == val) {
+                        reg |= i;
+                        ret = 0;
+                        break;
+                }
+        }
+
+        if (ret) {
+                dev_err(dev, "invalid ti,rload-ohm %d\n", val);
+                return ret;
+        }
+
+        regmap_write(data->regmap, LMP91000_REG_LOCK, 0);
+        regmap_write(data->regmap, LMP91000_REG_TIACN, reg);
+        regmap_write(data->regmap, LMP91000_REG_REFCN, LMP91000_REG_REFCN_EXT_REF
+                                        | LMP91000_REG_REFCN_50_ZERO);
+        regmap_write(data->regmap, LMP91000_REG_LOCK, 1);
+
+        return 0;
+}
+
+static int lmp91000_buffer_cb(const void *val, void *private)
+{
+        struct iio_dev *indio_dev = private;
+        struct lmp91000_data *data = iio_priv(indio_dev);
+
+        data->buffer[data->chan_select] = *((int *)val);
+        complete_all(&data->completion);
+
+        return 0;
+}
+
+static const struct iio_trigger_ops lmp91000_trigger_ops = {
+        .owner = THIS_MODULE,
+};
+
+
+static int lmp91000_buffer_preenable(struct iio_dev *indio_dev)
+{
+        struct lmp91000_data *data = iio_priv(indio_dev);
+
+        return iio_channel_start_all_cb(data->cb_buffer);
+}
+
+static int lmp91000_buffer_predisable(struct iio_dev *indio_dev)
+{
+        struct lmp91000_data *data = iio_priv(indio_dev);
+
+        iio_channel_stop_all_cb(data->cb_buffer);
+
+        return 0;
+}
+
+static const struct iio_buffer_setup_ops lmp91000_buffer_setup_ops = {
+        .preenable = lmp91000_buffer_preenable,
+        .postenable = iio_triggered_buffer_postenable,
+        .predisable = lmp91000_buffer_predisable,
+};
+
+static int lmp91000_probe(struct i2c_client *client,
+                          const struct i2c_device_id *id)
+{
+        struct device *dev = &client->dev;
+        struct lmp91000_data *data;
+        struct iio_dev *indio_dev;
+        int ret;
+
+        indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        indio_dev->info = &lmp91000_info;
+        indio_dev->channels = lmp91000_channels;
+        indio_dev->num_channels = ARRAY_SIZE(lmp91000_channels);
+        indio_dev->name = LMP91000_DRV_NAME;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        i2c_set_clientdata(client, indio_dev);
+
+        data = iio_priv(indio_dev);
+        data->dev = dev;
+        data->regmap = devm_regmap_init_i2c(client, &lmp91000_regmap_config);
+        if (IS_ERR(data->regmap)) {
+                dev_err(dev, "regmap initialization failed.\n");
+                return PTR_ERR(data->regmap);
+        }
+
+        data->trig = devm_iio_trigger_alloc(data->dev, "%s-mux%d",
+                                            indio_dev->name, indio_dev->id);
+        if (!data->trig) {
+                dev_err(dev, "cannot allocate iio trigger.\n");
+                return -ENOMEM;
+        }
+
+        data->trig->ops = &lmp91000_trigger_ops;
+        data->trig->dev.parent = dev;
+        init_completion(&data->completion);
+
+        ret = lmp91000_read_config(data);
+        if (ret)
+                return ret;
+
+        ret = iio_trigger_set_immutable(iio_channel_cb_get_iio_dev(data->cb_buffer),
+                                        data->trig);
+        if (ret) {
+                dev_err(dev, "cannot set immutable trigger.\n");
+                return ret;
+        }
+
+        ret = iio_trigger_register(data->trig);
+        if (ret) {
+                dev_err(dev, "cannot register iio trigger.\n");
+                return ret;
+        }
+
+        ret = iio_triggered_buffer_setup(indio_dev, NULL,
+                                         &lmp91000_buffer_handler,
+                                         &lmp91000_buffer_setup_ops);
+        if (ret)
+                goto error_unreg_trigger;
+
+        data->cb_buffer = iio_channel_get_all_cb(dev, &lmp91000_buffer_cb,
+                                                 indio_dev);
+
+        if (IS_ERR(data->cb_buffer)) {
+                if (PTR_ERR(data->cb_buffer) == -ENODEV)
+                        ret = -EPROBE_DEFER;
+                else
+                        ret = PTR_ERR(data->cb_buffer);
+
+                goto error_unreg_buffer;
+        }
+
+        data->adc_chan = iio_channel_cb_get_channels(data->cb_buffer);
+
+        ret = iio_device_register(indio_dev);
+        if (ret)
+                goto error_unreg_cb_buffer;
+
+        return 0;
+
+error_unreg_cb_buffer:
+        iio_channel_release_all_cb(data->cb_buffer);
+
+error_unreg_buffer:
+        iio_triggered_buffer_cleanup(indio_dev);
+
+error_unreg_trigger:
+        iio_trigger_unregister(data->trig);
+
+        return ret;
+}
+
+static int lmp91000_remove(struct i2c_client *client)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+        struct lmp91000_data *data = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+
+        iio_channel_stop_all_cb(data->cb_buffer);
+        iio_channel_release_all_cb(data->cb_buffer);
+
+        iio_triggered_buffer_cleanup(indio_dev);
+        iio_trigger_unregister(data->trig);
+
+        return 0;
+}
+
+static const struct of_device_id lmp91000_of_match[] = {
+        { .compatible = "ti,lmp91000", },
+        { },
+};
+MODULE_DEVICE_TABLE(of, lmp91000_of_match);
+
+static const struct i2c_device_id lmp91000_id[] = {
+        { "lmp91000", 0 },
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, lmp91000_id);
+
+static struct i2c_driver lmp91000_driver = {
+        .driver = {
+                .name = LMP91000_DRV_NAME,
+                .of_match_table = of_match_ptr(lmp91000_of_match),
+        },
+        .probe = lmp91000_probe,
+        .remove = lmp91000_remove,
+        .id_table = lmp91000_id,
+};
+module_i2c_driver(lmp91000_driver);
+
+MODULE_AUTHOR("Matt Ranostay <mranostay@gmail.com>");
+MODULE_DESCRIPTION("LMP91000 digital potentiostat");
+MODULE_LICENSE("GPL");
diff --git a/drivers/iio/pressure/Kconfig b/drivers/iio/pressure/Kconfig
index 15cd416365c1..bd8d96b96771 100644
--- a/drivers/iio/pressure/Kconfig
+++ b/drivers/iio/pressure/Kconfig
@@ -5,6 +5,16 @@
 
 menu "Pressure sensors"
 
+config ABP060MG
+        tristate "Honeywell ABP pressure sensor driver"
+        depends on I2C
+        help
+          Say yes here to build support for the Honeywell ABP pressure
+          sensors.
+
+          To compile this driver as a module, choose M here: the module
+          will be called abp060mg.
+
 config BMP280
         tristate "Bosch Sensortec BMP180/BMP280 pressure sensor I2C driver"
         depends on (I2C || SPI_MASTER)
diff --git a/drivers/iio/pressure/Makefile b/drivers/iio/pressure/Makefile
index fff77185a5cc..de3dbc81dc5a 100644
--- a/drivers/iio/pressure/Makefile
+++ b/drivers/iio/pressure/Makefile
@@ -3,6 +3,7 @@
 #
 
 # When adding new entries keep the list in alphabetical order
+obj-$(CONFIG_ABP060MG) += abp060mg.o
 obj-$(CONFIG_BMP280) += bmp280.o
 bmp280-objs := bmp280-core.o bmp280-regmap.o
 obj-$(CONFIG_BMP280_I2C) += bmp280-i2c.o
diff --git a/drivers/iio/pressure/abp060mg.c b/drivers/iio/pressure/abp060mg.c
new file mode 100644
index 000000000000..43bdd0b9155f
--- /dev/null
+++ b/drivers/iio/pressure/abp060mg.c
@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 2016 - Marcin Malagowski <mrc@bourne.st>
+ *
+ * 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.
+ */
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/iio/iio.h>
+
+#define ABP060MG_ERROR_MASK   0xC000
+#define ABP060MG_RESP_TIME_MS 40
+#define ABP060MG_MIN_COUNTS   1638  /* = 0x0666 (10% of u14) */
+#define ABP060MG_MAX_COUNTS   14745 /* = 0x3999 (90% of u14) */
+#define ABP060MG_NUM_COUNTS   (ABP060MG_MAX_COUNTS - ABP060MG_MIN_COUNTS)
+
+enum abp_variant {
+        /* gage [kPa] */
+        ABP006KG, ABP010KG, ABP016KG, ABP025KG, ABP040KG, ABP060KG, ABP100KG,
+        ABP160KG, ABP250KG, ABP400KG, ABP600KG, ABP001GG,
+        /* differential [kPa] */
+        ABP006KD, ABP010KD, ABP016KD, ABP025KD, ABP040KD, ABP060KD, ABP100KD,
+        ABP160KD, ABP250KD, ABP400KD,
+        /* gage [psi] */
+        ABP001PG, ABP005PG, ABP015PG, ABP030PG, ABP060PG, ABP100PG, ABP150PG,
+        /* differential [psi] */
+        ABP001PD, ABP005PD, ABP015PD, ABP030PD, ABP060PD,
+};
+
+struct abp_config {
+        int min;
+        int max;
+};
+
+static struct abp_config abp_config[] = {
+        /* mbar & kPa variants */
+        [ABP006KG] = { .min =       0, .max =     6000 },
+        [ABP010KG] = { .min =       0, .max =    10000 },
+        [ABP016KG] = { .min =       0, .max =    16000 },
+        [ABP025KG] = { .min =       0, .max =    25000 },
+        [ABP040KG] = { .min =       0, .max =    40000 },
+        [ABP060KG] = { .min =       0, .max =    60000 },
+        [ABP100KG] = { .min =       0, .max =   100000 },
+        [ABP160KG] = { .min =       0, .max =   160000 },
+        [ABP250KG] = { .min =       0, .max =   250000 },
+        [ABP400KG] = { .min =       0, .max =   400000 },
+        [ABP600KG] = { .min =       0, .max =   600000 },
+        [ABP001GG] = { .min =       0, .max =  1000000 },
+        [ABP006KD] = { .min =   -6000, .max =     6000 },
+        [ABP010KD] = { .min =  -10000, .max =    10000 },
+        [ABP016KD] = { .min =  -16000, .max =    16000 },
+        [ABP025KD] = { .min =  -25000, .max =    25000 },
+        [ABP040KD] = { .min =  -40000, .max =    40000 },
+        [ABP060KD] = { .min =  -60000, .max =    60000 },
+        [ABP100KD] = { .min = -100000, .max =   100000 },
+        [ABP160KD] = { .min = -160000, .max =   160000 },
+        [ABP250KD] = { .min = -250000, .max =   250000 },
+        [ABP400KD] = { .min = -400000, .max =   400000 },
+        /* psi variants (1 psi ~ 6895 Pa) */
+        [ABP001PG] = { .min =       0, .max =     6985 },
+        [ABP005PG] = { .min =       0, .max =    34474 },
+        [ABP015PG] = { .min =       0, .max =   103421 },
+        [ABP030PG] = { .min =       0, .max =   206843 },
+        [ABP060PG] = { .min =       0, .max =   413686 },
+        [ABP100PG] = { .min =       0, .max =   689476 },
+        [ABP150PG] = { .min =       0, .max =  1034214 },
+        [ABP001PD] = { .min =   -6895, .max =     6895 },
+        [ABP005PD] = { .min =  -34474, .max =    34474 },
+        [ABP015PD] = { .min = -103421, .max =   103421 },
+        [ABP030PD] = { .min = -206843, .max =   206843 },
+        [ABP060PD] = { .min = -413686, .max =   413686 },
+};
+
+struct abp_state {
+        struct i2c_client *client;
+        struct mutex lock;
+
+        /*
+         * bus-dependent MEASURE_REQUEST length.
+         * If no SMBUS_QUICK support, need to send dummy byte
+         */
+        int mreq_len;
+
+        /* model-dependent values (calculated on probe) */
+        int scale;
+        int offset;
+};
+
+static const struct iio_chan_spec abp060mg_channels[] = {
+        {
+                .type = IIO_PRESSURE,
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+                        BIT(IIO_CHAN_INFO_OFFSET) | BIT(IIO_CHAN_INFO_SCALE),
+        },
+};
+
+static int abp060mg_get_measurement(struct abp_state *state, int *val)
+{
+        struct i2c_client *client = state->client;
+        __be16 buf[2];
+        u16 pressure;
+        int ret;
+
+        buf[0] = 0;
+        ret = i2c_master_send(client, (u8 *)&buf, state->mreq_len);
+        if (ret < 0)
+                return ret;
+
+        msleep_interruptible(ABP060MG_RESP_TIME_MS);
+
+        ret = i2c_master_recv(client, (u8 *)&buf, sizeof(buf));
+        if (ret < 0)
+                return ret;
+
+        pressure = be16_to_cpu(buf[0]);
+        if (pressure & ABP060MG_ERROR_MASK)
+                return -EIO;
+
+        if (pressure < ABP060MG_MIN_COUNTS || pressure > ABP060MG_MAX_COUNTS)
+                return -EIO;
+
+        *val = pressure;
+
+        return IIO_VAL_INT;
+}
+
+static int abp060mg_read_raw(struct iio_dev *indio_dev,
+                        struct iio_chan_spec const *chan, int *val,
+                        int *val2, long mask)
+{
+        struct abp_state *state = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&state->lock);
+
+        switch (mask) {
+        case IIO_CHAN_INFO_RAW:
+                ret = abp060mg_get_measurement(state, val);
+                break;
+        case IIO_CHAN_INFO_OFFSET:
+                *val = state->offset;
+                ret = IIO_VAL_INT;
+                break;
+        case IIO_CHAN_INFO_SCALE:
+                *val = state->scale;
+                *val2 = ABP060MG_NUM_COUNTS * 1000; /* to kPa */
+                ret = IIO_VAL_FRACTIONAL;
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+
+        mutex_unlock(&state->lock);
+        return ret;
+}
+
+static const struct iio_info abp060mg_info = {
+        .driver_module = THIS_MODULE,
+        .read_raw = abp060mg_read_raw,
+};
+
+static void abp060mg_init_device(struct iio_dev *indio_dev, unsigned long id)
+{
+        struct abp_state *state = iio_priv(indio_dev);
+        struct abp_config *cfg = &abp_config[id];
+
+        state->scale = cfg->max - cfg->min;
+        state->offset = -ABP060MG_MIN_COUNTS;
+
+        if (cfg->min < 0) /* differential */
+                state->offset -= ABP060MG_NUM_COUNTS >> 1;
+}
+
+static int abp060mg_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        struct iio_dev *indio_dev;
+        struct abp_state *state;
+        unsigned long cfg_id = id->driver_data;
+
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*state));
+        if (!indio_dev)
+                return -ENOMEM;
+
+        state = iio_priv(indio_dev);
+        i2c_set_clientdata(client, state);
+        state->client = client;
+
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_QUICK))
+                state->mreq_len = 1;
+
+        abp060mg_init_device(indio_dev, cfg_id);
+
+        indio_dev->dev.parent = &client->dev;
+        indio_dev->name = dev_name(&client->dev);
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->info = &abp060mg_info;
+
+        indio_dev->channels = abp060mg_channels;
+        indio_dev->num_channels = ARRAY_SIZE(abp060mg_channels);
+
+        mutex_init(&state->lock);
+
+        return devm_iio_device_register(&client->dev, indio_dev);
+}
+
+static const struct i2c_device_id abp060mg_id_table[] = {
+        /* mbar & kPa variants (abp060m [60 mbar] == abp006k [6 kPa]) */
+        /*    gage: */
+        { "abp060mg", ABP006KG }, { "abp006kg", ABP006KG },
+        { "abp100mg", ABP010KG }, { "abp010kg", ABP010KG },
+        { "abp160mg", ABP016KG }, { "abp016kg", ABP016KG },
+        { "abp250mg", ABP025KG }, { "abp025kg", ABP025KG },
+        { "abp400mg", ABP040KG }, { "abp040kg", ABP040KG },
+        { "abp600mg", ABP060KG }, { "abp060kg", ABP060KG },
+        { "abp001bg", ABP100KG }, { "abp100kg", ABP100KG },
+        { "abp1_6bg", ABP160KG }, { "abp160kg", ABP160KG },
+        { "abp2_5bg", ABP250KG }, { "abp250kg", ABP250KG },
+        { "abp004bg", ABP400KG }, { "abp400kg", ABP400KG },
+        { "abp006bg", ABP600KG }, { "abp600kg", ABP600KG },
+        { "abp010bg", ABP001GG }, { "abp001gg", ABP001GG },
+        /*    differential: */
+        { "abp060md", ABP006KD }, { "abp006kd", ABP006KD },
+        { "abp100md", ABP010KD }, { "abp010kd", ABP010KD },
+        { "abp160md", ABP016KD }, { "abp016kd", ABP016KD },
+        { "abp250md", ABP025KD }, { "abp025kd", ABP025KD },
+        { "abp400md", ABP040KD }, { "abp040kd", ABP040KD },
+        { "abp600md", ABP060KD }, { "abp060kd", ABP060KD },
+        { "abp001bd", ABP100KD }, { "abp100kd", ABP100KD },
+        { "abp1_6bd", ABP160KD }, { "abp160kd", ABP160KD },
+        { "abp2_5bd", ABP250KD }, { "abp250kd", ABP250KD },
+        { "abp004bd", ABP400KD }, { "abp400kd", ABP400KD },
+        /* psi variants */
+        /*    gage: */
+        { "abp001pg", ABP001PG },
+        { "abp005pg", ABP005PG },
+        { "abp015pg", ABP015PG },
+        { "abp030pg", ABP030PG },
+        { "abp060pg", ABP060PG },
+        { "abp100pg", ABP100PG },
+        { "abp150pg", ABP150PG },
+        /*    differential: */
+        { "abp001pd", ABP001PD },
+        { "abp005pd", ABP005PD },
+        { "abp015pd", ABP015PD },
+        { "abp030pd", ABP030PD },
+        { "abp060pd", ABP060PD },
+        { /* empty */ },
+};
+MODULE_DEVICE_TABLE(i2c, abp060mg_id_table);
+
+static struct i2c_driver abp060mg_driver = {
+        .driver = {
+                .name = "abp060mg",
+        },
+        .probe = abp060mg_probe,
+        .id_table = abp060mg_id_table,
+};
+module_i2c_driver(abp060mg_driver);
+
+MODULE_AUTHOR("Marcin Malagowski <mrc@bourne.st>");
+MODULE_DESCRIPTION("Honeywell ABP pressure sensor driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c
index 6392d7b62841..cc3f84139157 100644
--- a/drivers/iio/pressure/mpl3115.c
+++ b/drivers/iio/pressure/mpl3115.c
@@ -82,8 +82,9 @@ static int mpl3115_read_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
-                if (iio_buffer_enabled(indio_dev))
-                        return -EBUSY;
+                ret = iio_device_claim_direct_mode(indio_dev);
+                if (ret)
+                        return ret;
 
                 switch (chan->type) {
                 case IIO_PRESSURE: /* in 0.25 pascal / LSB */
@@ -91,32 +92,39 @@ static int mpl3115_read_raw(struct iio_dev *indio_dev,
                         ret = mpl3115_request(data);
                         if (ret < 0) {
                                 mutex_unlock(&data->lock);
-                                return ret;
+                                break;
                         }
                         ret = i2c_smbus_read_i2c_block_data(data->client,
                                 MPL3115_OUT_PRESS, 3, (u8 *) &tmp);
                         mutex_unlock(&data->lock);
                         if (ret < 0)
-                                return ret;
+                                break;
                         *val = be32_to_cpu(tmp) >> 12;
-                        return IIO_VAL_INT;
+                        ret = IIO_VAL_INT;
+                        break;
                 case IIO_TEMP: /* in 0.0625 celsius / LSB */
                         mutex_lock(&data->lock);
                         ret = mpl3115_request(data);
                         if (ret < 0) {
                                 mutex_unlock(&data->lock);
-                                return ret;
+                                break;
                         }
                         ret = i2c_smbus_read_i2c_block_data(data->client,
                                 MPL3115_OUT_TEMP, 2, (u8 *) &tmp);
                         mutex_unlock(&data->lock);
                         if (ret < 0)
-                                return ret;
+                                break;
                         *val = sign_extend32(be32_to_cpu(tmp) >> 20, 11);
-                        return IIO_VAL_INT;
+                        ret = IIO_VAL_INT;
+                        break;
                 default:
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        break;
                 }
+
+                iio_device_release_direct_mode(indio_dev);
+                return ret;
+
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_PRESSURE:
diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c
index a74ed1f0c880..6bd53e702667 100644
--- a/drivers/iio/pressure/ms5611_core.c
+++ b/drivers/iio/pressure/ms5611_core.c
@@ -392,17 +392,14 @@ static int ms5611_init(struct iio_dev *indio_dev)
 
         /* Enable attached regulator if any. */
         st->vdd = devm_regulator_get(indio_dev->dev.parent, "vdd");
-        if (!IS_ERR(st->vdd)) {
-                ret = regulator_enable(st->vdd);
-                if (ret) {
-                        dev_err(indio_dev->dev.parent,
-                                "failed to enable Vdd supply: %d\n", ret);
-                        return ret;
-                }
-        } else {
-                ret = PTR_ERR(st->vdd);
-                if (ret != -ENODEV)
-                        return ret;
+        if (IS_ERR(st->vdd))
+                return PTR_ERR(st->vdd);
+
+        ret = regulator_enable(st->vdd);
+        if (ret) {
+                dev_err(indio_dev->dev.parent,
+                        "failed to enable Vdd supply: %d\n", ret);
+                return ret;
         }
 
         ret = ms5611_reset(indio_dev);
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 55df9a75eb3a..e19e0787864c 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -112,115 +112,24 @@
 #define ST_PRESS_1_OUT_XL_ADDR                  0x28
 #define ST_TEMP_1_OUT_L_ADDR                    0x2b
 
-/*
- * CUSTOM VALUES FOR LPS331AP SENSOR
- * See LPS331AP datasheet:
- * http://www2.st.com/resource/en/datasheet/lps331ap.pdf
- */
-#define ST_PRESS_LPS331AP_WAI_EXP               0xbb
-#define ST_PRESS_LPS331AP_ODR_ADDR              0x20
-#define ST_PRESS_LPS331AP_ODR_MASK              0x70
-#define ST_PRESS_LPS331AP_ODR_AVL_1HZ_VAL       0x01
-#define ST_PRESS_LPS331AP_ODR_AVL_7HZ_VAL       0x05
-#define ST_PRESS_LPS331AP_ODR_AVL_13HZ_VAL      0x06
-#define ST_PRESS_LPS331AP_ODR_AVL_25HZ_VAL      0x07
-#define ST_PRESS_LPS331AP_PW_ADDR               0x20
-#define ST_PRESS_LPS331AP_PW_MASK               0x80
-#define ST_PRESS_LPS331AP_FS_ADDR               0x23
-#define ST_PRESS_LPS331AP_FS_MASK               0x30
-#define ST_PRESS_LPS331AP_BDU_ADDR              0x20
-#define ST_PRESS_LPS331AP_BDU_MASK              0x04
-#define ST_PRESS_LPS331AP_DRDY_IRQ_ADDR         0x22
-#define ST_PRESS_LPS331AP_DRDY_IRQ_INT1_MASK    0x04
-#define ST_PRESS_LPS331AP_DRDY_IRQ_INT2_MASK    0x20
-#define ST_PRESS_LPS331AP_IHL_IRQ_ADDR          0x22
-#define ST_PRESS_LPS331AP_IHL_IRQ_MASK          0x80
-#define ST_PRESS_LPS331AP_OD_IRQ_ADDR           0x22
-#define ST_PRESS_LPS331AP_OD_IRQ_MASK           0x40
-#define ST_PRESS_LPS331AP_MULTIREAD_BIT         true
-
-/*
- * CUSTOM VALUES FOR THE OBSOLETE LPS001WP SENSOR
- */
-
 /* LPS001WP pressure resolution */
 #define ST_PRESS_LPS001WP_LSB_PER_MBAR          16UL
 /* LPS001WP temperature resolution */
 #define ST_PRESS_LPS001WP_LSB_PER_CELSIUS       64UL
-
-#define ST_PRESS_LPS001WP_WAI_EXP               0xba
-#define ST_PRESS_LPS001WP_ODR_ADDR              0x20
-#define ST_PRESS_LPS001WP_ODR_MASK              0x30
-#define ST_PRESS_LPS001WP_ODR_AVL_1HZ_VAL       0x01
-#define ST_PRESS_LPS001WP_ODR_AVL_7HZ_VAL       0x02
-#define ST_PRESS_LPS001WP_ODR_AVL_13HZ_VAL      0x03
-#define ST_PRESS_LPS001WP_PW_ADDR               0x20
-#define ST_PRESS_LPS001WP_PW_MASK               0x40
+/* LPS001WP pressure gain */
 #define ST_PRESS_LPS001WP_FS_AVL_PRESS_GAIN \
         (100000000UL / ST_PRESS_LPS001WP_LSB_PER_MBAR)
-#define ST_PRESS_LPS001WP_BDU_ADDR              0x20
-#define ST_PRESS_LPS001WP_BDU_MASK              0x04
-#define ST_PRESS_LPS001WP_MULTIREAD_BIT         true
+/* LPS001WP pressure and temp L addresses */
 #define ST_PRESS_LPS001WP_OUT_L_ADDR            0x28
 #define ST_TEMP_LPS001WP_OUT_L_ADDR             0x2a
 
-/*
- * CUSTOM VALUES FOR LPS25H SENSOR
- * See LPS25H datasheet:
- * http://www2.st.com/resource/en/datasheet/lps25h.pdf
- */
-#define ST_PRESS_LPS25H_WAI_EXP                 0xbd
-#define ST_PRESS_LPS25H_ODR_ADDR                0x20
-#define ST_PRESS_LPS25H_ODR_MASK                0x70
-#define ST_PRESS_LPS25H_ODR_AVL_1HZ_VAL         0x01
-#define ST_PRESS_LPS25H_ODR_AVL_7HZ_VAL         0x02
-#define ST_PRESS_LPS25H_ODR_AVL_13HZ_VAL        0x03
-#define ST_PRESS_LPS25H_ODR_AVL_25HZ_VAL        0x04
-#define ST_PRESS_LPS25H_PW_ADDR                 0x20
-#define ST_PRESS_LPS25H_PW_MASK                 0x80
-#define ST_PRESS_LPS25H_BDU_ADDR                0x20
-#define ST_PRESS_LPS25H_BDU_MASK                0x04
-#define ST_PRESS_LPS25H_DRDY_IRQ_ADDR           0x23
-#define ST_PRESS_LPS25H_DRDY_IRQ_INT1_MASK      0x01
-#define ST_PRESS_LPS25H_DRDY_IRQ_INT2_MASK      0x10
-#define ST_PRESS_LPS25H_IHL_IRQ_ADDR            0x22
-#define ST_PRESS_LPS25H_IHL_IRQ_MASK            0x80
-#define ST_PRESS_LPS25H_OD_IRQ_ADDR             0x22
-#define ST_PRESS_LPS25H_OD_IRQ_MASK             0x40
-#define ST_PRESS_LPS25H_MULTIREAD_BIT           true
+/* LPS25H pressure and temp L addresses */
 #define ST_PRESS_LPS25H_OUT_XL_ADDR             0x28
 #define ST_TEMP_LPS25H_OUT_L_ADDR               0x2b
 
-/*
- * CUSTOM VALUES FOR LPS22HB SENSOR
- * See LPS22HB datasheet:
- * http://www2.st.com/resource/en/datasheet/lps22hb.pdf
- */
-
 /* LPS22HB temperature sensitivity */
 #define ST_PRESS_LPS22HB_LSB_PER_CELSIUS        100UL
 
-#define ST_PRESS_LPS22HB_WAI_EXP                0xb1
-#define ST_PRESS_LPS22HB_ODR_ADDR               0x10
-#define ST_PRESS_LPS22HB_ODR_MASK               0x70
-#define ST_PRESS_LPS22HB_ODR_AVL_1HZ_VAL        0x01
-#define ST_PRESS_LPS22HB_ODR_AVL_10HZ_VAL       0x02
-#define ST_PRESS_LPS22HB_ODR_AVL_25HZ_VAL       0x03
-#define ST_PRESS_LPS22HB_ODR_AVL_50HZ_VAL       0x04
-#define ST_PRESS_LPS22HB_ODR_AVL_75HZ_VAL       0x05
-#define ST_PRESS_LPS22HB_PW_ADDR                0x10
-#define ST_PRESS_LPS22HB_PW_MASK                0x70
-#define ST_PRESS_LPS22HB_BDU_ADDR               0x10
-#define ST_PRESS_LPS22HB_BDU_MASK               0x02
-#define ST_PRESS_LPS22HB_DRDY_IRQ_ADDR          0x12
-#define ST_PRESS_LPS22HB_DRDY_IRQ_INT1_MASK     0x04
-#define ST_PRESS_LPS22HB_DRDY_IRQ_INT2_MASK     0x08
-#define ST_PRESS_LPS22HB_IHL_IRQ_ADDR           0x12
-#define ST_PRESS_LPS22HB_IHL_IRQ_MASK           0x80
-#define ST_PRESS_LPS22HB_OD_IRQ_ADDR            0x12
-#define ST_PRESS_LPS22HB_OD_IRQ_MASK            0x40
-#define ST_PRESS_LPS22HB_MULTIREAD_BIT          true
-
 static const struct iio_chan_spec st_press_1_channels[] = {
         {
                 .type = IIO_PRESSURE,
@@ -321,7 +230,12 @@ static const struct iio_chan_spec st_press_lps22hb_channels[] = {
 
 static const struct st_sensor_settings st_press_sensors_settings[] = {
         {
-                .wai = ST_PRESS_LPS331AP_WAI_EXP,
+                /*
+                 * CUSTOM VALUES FOR LPS331AP SENSOR
+                 * See LPS331AP datasheet:
+                 * http://www2.st.com/resource/en/datasheet/lps331ap.pdf
+                 */
+                .wai = 0xbb,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LPS331AP_PRESS_DEV_NAME,
@@ -329,24 +243,24 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                 .ch = (struct iio_chan_spec *)st_press_1_channels,
                 .num_ch = ARRAY_SIZE(st_press_1_channels),
                 .odr = {
-                        .addr = ST_PRESS_LPS331AP_ODR_ADDR,
-                        .mask = ST_PRESS_LPS331AP_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0x70,
                         .odr_avl = {
-                                { 1, ST_PRESS_LPS331AP_ODR_AVL_1HZ_VAL, },
-                                { 7, ST_PRESS_LPS331AP_ODR_AVL_7HZ_VAL, },
-                                { 13, ST_PRESS_LPS331AP_ODR_AVL_13HZ_VAL, },
-                                { 25, ST_PRESS_LPS331AP_ODR_AVL_25HZ_VAL, },
+                                { .hz = 1, .value = 0x01 },
+                                { .hz = 7, .value = 0x05 },
+                                { .hz = 13, .value = 0x06 },
+                                { .hz = 25, .value = 0x07 },
                         },
                 },
                 .pw = {
-                        .addr = ST_PRESS_LPS331AP_PW_ADDR,
-                        .mask = ST_PRESS_LPS331AP_PW_MASK,
+                        .addr = 0x20,
+                        .mask = 0x80,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
                 .fs = {
-                        .addr = ST_PRESS_LPS331AP_FS_ADDR,
-                        .mask = ST_PRESS_LPS331AP_FS_MASK,
+                        .addr = 0x23,
+                        .mask = 0x30,
                         .fs_avl = {
                                 /*
                                  * Pressure and temperature sensitivity values
@@ -360,24 +274,27 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         },
                 },
                 .bdu = {
-                        .addr = ST_PRESS_LPS331AP_BDU_ADDR,
-                        .mask = ST_PRESS_LPS331AP_BDU_MASK,
+                        .addr = 0x20,
+                        .mask = 0x04,
                 },
                 .drdy_irq = {
-                        .addr = ST_PRESS_LPS331AP_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_PRESS_LPS331AP_DRDY_IRQ_INT1_MASK,
-                        .mask_int2 = ST_PRESS_LPS331AP_DRDY_IRQ_INT2_MASK,
-                        .addr_ihl = ST_PRESS_LPS331AP_IHL_IRQ_ADDR,
-                        .mask_ihl = ST_PRESS_LPS331AP_IHL_IRQ_MASK,
-                        .addr_od = ST_PRESS_LPS331AP_OD_IRQ_ADDR,
-                        .mask_od = ST_PRESS_LPS331AP_OD_IRQ_MASK,
+                        .addr = 0x22,
+                        .mask_int1 = 0x04,
+                        .mask_int2 = 0x20,
+                        .addr_ihl = 0x22,
+                        .mask_ihl = 0x80,
+                        .addr_od = 0x22,
+                        .mask_od = 0x40,
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_PRESS_LPS331AP_MULTIREAD_BIT,
+                .multi_read_bit = true,
                 .bootime = 2,
         },
         {
-                .wai = ST_PRESS_LPS001WP_WAI_EXP,
+                /*
+                 * CUSTOM VALUES FOR LPS001WP SENSOR
+                 */
+                .wai = 0xba,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LPS001WP_PRESS_DEV_NAME,
@@ -385,17 +302,17 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                 .ch = (struct iio_chan_spec *)st_press_lps001wp_channels,
                 .num_ch = ARRAY_SIZE(st_press_lps001wp_channels),
                 .odr = {
-                        .addr = ST_PRESS_LPS001WP_ODR_ADDR,
-                        .mask = ST_PRESS_LPS001WP_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0x30,
                         .odr_avl = {
-                                { 1, ST_PRESS_LPS001WP_ODR_AVL_1HZ_VAL, },
-                                { 7, ST_PRESS_LPS001WP_ODR_AVL_7HZ_VAL, },
-                                { 13, ST_PRESS_LPS001WP_ODR_AVL_13HZ_VAL, },
+                                { .hz = 1, .value = 0x01 },
+                                { .hz = 7, .value = 0x02 },
+                                { .hz = 13, .value = 0x03 },
                         },
                 },
                 .pw = {
-                        .addr = ST_PRESS_LPS001WP_PW_ADDR,
-                        .mask = ST_PRESS_LPS001WP_PW_MASK,
+                        .addr = 0x20,
+                        .mask = 0x40,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
@@ -413,17 +330,22 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         },
                 },
                 .bdu = {
-                        .addr = ST_PRESS_LPS001WP_BDU_ADDR,
-                        .mask = ST_PRESS_LPS001WP_BDU_MASK,
+                        .addr = 0x20,
+                        .mask = 0x04,
                 },
                 .drdy_irq = {
                         .addr = 0,
                 },
-                .multi_read_bit = ST_PRESS_LPS001WP_MULTIREAD_BIT,
+                .multi_read_bit = true,
                 .bootime = 2,
         },
         {
-                .wai = ST_PRESS_LPS25H_WAI_EXP,
+                /*
+                 * CUSTOM VALUES FOR LPS25H SENSOR
+                 * See LPS25H datasheet:
+                 * http://www2.st.com/resource/en/datasheet/lps25h.pdf
+                 */
+                .wai = 0xbd,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LPS25H_PRESS_DEV_NAME,
@@ -431,18 +353,18 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                 .ch = (struct iio_chan_spec *)st_press_1_channels,
                 .num_ch = ARRAY_SIZE(st_press_1_channels),
                 .odr = {
-                        .addr = ST_PRESS_LPS25H_ODR_ADDR,
-                        .mask = ST_PRESS_LPS25H_ODR_MASK,
+                        .addr = 0x20,
+                        .mask = 0x70,
                         .odr_avl = {
-                                { 1, ST_PRESS_LPS25H_ODR_AVL_1HZ_VAL, },
-                                { 7, ST_PRESS_LPS25H_ODR_AVL_7HZ_VAL, },
-                                { 13, ST_PRESS_LPS25H_ODR_AVL_13HZ_VAL, },
-                                { 25, ST_PRESS_LPS25H_ODR_AVL_25HZ_VAL, },
+                                { .hz = 1, .value = 0x01 },
+                                { .hz = 7, .value = 0x02 },
+                                { .hz = 13, .value = 0x03 },
+                                { .hz = 25, .value = 0x04 },
                         },
                 },
                 .pw = {
-                        .addr = ST_PRESS_LPS25H_PW_ADDR,
-                        .mask = ST_PRESS_LPS25H_PW_MASK,
+                        .addr = 0x20,
+                        .mask = 0x80,
                         .value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
@@ -460,24 +382,29 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         },
                 },
                 .bdu = {
-                        .addr = ST_PRESS_LPS25H_BDU_ADDR,
-                        .mask = ST_PRESS_LPS25H_BDU_MASK,
+                        .addr = 0x20,
+                        .mask = 0x04,
                 },
                 .drdy_irq = {
-                        .addr = ST_PRESS_LPS25H_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_PRESS_LPS25H_DRDY_IRQ_INT1_MASK,
-                        .mask_int2 = ST_PRESS_LPS25H_DRDY_IRQ_INT2_MASK,
-                        .addr_ihl = ST_PRESS_LPS25H_IHL_IRQ_ADDR,
-                        .mask_ihl = ST_PRESS_LPS25H_IHL_IRQ_MASK,
-                        .addr_od = ST_PRESS_LPS25H_OD_IRQ_ADDR,
-                        .mask_od = ST_PRESS_LPS25H_OD_IRQ_MASK,
+                        .addr = 0x23,
+                        .mask_int1 = 0x01,
+                        .mask_int2 = 0x10,
+                        .addr_ihl = 0x22,
+                        .mask_ihl = 0x80,
+                        .addr_od = 0x22,
+                        .mask_od = 0x40,
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_PRESS_LPS25H_MULTIREAD_BIT,
+                .multi_read_bit = true,
                 .bootime = 2,
         },
         {
-                .wai = ST_PRESS_LPS22HB_WAI_EXP,
+                /*
+                 * CUSTOM VALUES FOR LPS22HB SENSOR
+                 * See LPS22HB datasheet:
+                 * http://www2.st.com/resource/en/datasheet/lps22hb.pdf
+                 */
+                .wai = 0xb1,
                 .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                 .sensors_supported = {
                         [0] = LPS22HB_PRESS_DEV_NAME,
@@ -485,19 +412,19 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                 .ch = (struct iio_chan_spec *)st_press_lps22hb_channels,
                 .num_ch = ARRAY_SIZE(st_press_lps22hb_channels),
                 .odr = {
-                        .addr = ST_PRESS_LPS22HB_ODR_ADDR,
-                        .mask = ST_PRESS_LPS22HB_ODR_MASK,
+                        .addr = 0x10,
+                        .mask = 0x70,
                         .odr_avl = {
-                                { 1, ST_PRESS_LPS22HB_ODR_AVL_1HZ_VAL, },
-                                { 10, ST_PRESS_LPS22HB_ODR_AVL_10HZ_VAL, },
-                                { 25, ST_PRESS_LPS22HB_ODR_AVL_25HZ_VAL, },
-                                { 50, ST_PRESS_LPS22HB_ODR_AVL_50HZ_VAL, },
-                                { 75, ST_PRESS_LPS22HB_ODR_AVL_75HZ_VAL, },
+                                { .hz = 1, .value = 0x01 },
+                                { .hz = 10, .value = 0x02 },
+                                { .hz = 25, .value = 0x03 },
+                                { .hz = 50, .value = 0x04 },
+                                { .hz = 75, .value = 0x05 },
                         },
                 },
                 .pw = {
-                        .addr = ST_PRESS_LPS22HB_PW_ADDR,
-                        .mask = ST_PRESS_LPS22HB_PW_MASK,
+                        .addr = 0x10,
+                        .mask = 0x70,
                         .value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
                 },
                 .fs = {
@@ -514,20 +441,20 @@ static const struct st_sensor_settings st_press_sensors_settings[] = {
                         },
                 },
                 .bdu = {
-                        .addr = ST_PRESS_LPS22HB_BDU_ADDR,
-                        .mask = ST_PRESS_LPS22HB_BDU_MASK,
+                        .addr = 0x10,
+                        .mask = 0x02,
                 },
                 .drdy_irq = {
-                        .addr = ST_PRESS_LPS22HB_DRDY_IRQ_ADDR,
-                        .mask_int1 = ST_PRESS_LPS22HB_DRDY_IRQ_INT1_MASK,
-                        .mask_int2 = ST_PRESS_LPS22HB_DRDY_IRQ_INT2_MASK,
-                        .addr_ihl = ST_PRESS_LPS22HB_IHL_IRQ_ADDR,
-                        .mask_ihl = ST_PRESS_LPS22HB_IHL_IRQ_MASK,
-                        .addr_od = ST_PRESS_LPS22HB_OD_IRQ_ADDR,
-                        .mask_od = ST_PRESS_LPS22HB_OD_IRQ_MASK,
+                        .addr = 0x12,
+                        .mask_int1 = 0x04,
+                        .mask_int2 = 0x08,
+                        .addr_ihl = 0x12,
+                        .mask_ihl = 0x80,
+                        .addr_od = 0x12,
+                        .mask_od = 0x40,
                         .addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,
                 },
-                .multi_read_bit = ST_PRESS_LPS22HB_MULTIREAD_BIT,
+                .multi_read_bit = true,
         },
 };
 
diff --git a/drivers/iio/pressure/zpa2326.c b/drivers/iio/pressure/zpa2326.c
index 19d2eb46fda6..c720c3ac0b9b 100644
--- a/drivers/iio/pressure/zpa2326.c
+++ b/drivers/iio/pressure/zpa2326.c
@@ -147,12 +147,8 @@ struct zpa2326_private {
 #define zpa2326_warn(_idev, _format, _arg...) \
         dev_warn(_idev->dev.parent, _format, ##_arg)
 
-#ifdef DEBUG
 #define zpa2326_dbg(_idev, _format, _arg...) \
         dev_dbg(_idev->dev.parent, _format, ##_arg)
-#else
-#define zpa2326_dbg(_idev, _format, _arg...)
-#endif
 
 bool zpa2326_isreg_writeable(struct device *dev, unsigned int reg)
 {
diff --git a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
index 3141c3c161bb..1fa9eefa0982 100644
--- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
+++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
@@ -301,8 +301,6 @@ static int lidar_probe(struct i2c_client *client,
         if (ret)
                 goto error_unreg_buffer;
         pm_runtime_enable(&client->dev);
-
-        pm_runtime_mark_last_busy(&client->dev);
         pm_runtime_idle(&client->dev);
 
         return 0;
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index c8f027b4ea4c..0f3fab47fe48 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -183,6 +183,7 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
                 tscadc->irq = err;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        tscadc->tscadc_phys_base = res->start;
         tscadc->tscadc_base = devm_ioremap_resource(&pdev->dev, res);
         if (IS_ERR(tscadc->tscadc_base))
                 return PTR_ERR(tscadc->tscadc_base);
diff --git a/drivers/net/ethernet/alacritech/slicoss.c b/drivers/net/ethernet/alacritech/slicoss.c
index b9fbd0107008..b21d8aa8d653 100644
--- a/drivers/net/ethernet/alacritech/slicoss.c
+++ b/drivers/net/ethernet/alacritech/slicoss.c
@@ -1567,7 +1567,6 @@ static const struct net_device_ops slic_netdev_ops = {
         .ndo_set_mac_address    = eth_mac_addr,
         .ndo_get_stats64        = slic_get_stats,
         .ndo_set_rx_mode        = slic_set_rx_mode,
-        .ndo_change_mtu         = eth_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
diff --git a/drivers/platform/chrome/cros_ec_dev.c b/drivers/platform/chrome/cros_ec_dev.c
index 8abd80dbcbed..47268ecedc4d 100644
--- a/drivers/platform/chrome/cros_ec_dev.c
+++ b/drivers/platform/chrome/cros_ec_dev.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/fs.h>
+#include <linux/mfd/core.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
@@ -87,6 +88,41 @@ exit:
         return ret;
 }
 
+static int cros_ec_check_features(struct cros_ec_dev *ec, int feature)
+{
+        struct cros_ec_command *msg;
+        int ret;
+
+        if (ec->features[0] == -1U && ec->features[1] == -1U) {
+                /* features bitmap not read yet */
+
+                msg = kmalloc(sizeof(*msg) + sizeof(ec->features), GFP_KERNEL);
+                if (!msg)
+                        return -ENOMEM;
+
+                msg->version = 0;
+                msg->command = EC_CMD_GET_FEATURES + ec->cmd_offset;
+                msg->insize = sizeof(ec->features);
+                msg->outsize = 0;
+
+                ret = cros_ec_cmd_xfer(ec->ec_dev, msg);
+                if (ret < 0 || msg->result != EC_RES_SUCCESS) {
+                        dev_warn(ec->dev, "cannot get EC features: %d/%d\n",
+                                 ret, msg->result);
+                        memset(ec->features, 0, sizeof(ec->features));
+                }
+
+                memcpy(ec->features, msg->data, sizeof(ec->features));
+
+                dev_dbg(ec->dev, "EC features %08x %08x\n",
+                        ec->features[0], ec->features[1]);
+
+                kfree(msg);
+        }
+
+        return ec->features[feature / 32] & EC_FEATURE_MASK_0(feature);
+}
+
 /* Device file ops */
 static int ec_device_open(struct inode *inode, struct file *filp)
 {
@@ -230,6 +266,123 @@ static void __remove(struct device *dev)
         kfree(ec);
 }
 
+static void cros_ec_sensors_register(struct cros_ec_dev *ec)
+{
+        /*
+         * Issue a command to get the number of sensor reported.
+         * Build an array of sensors driver and register them all.
+         */
+        int ret, i, id, sensor_num;
+        struct mfd_cell *sensor_cells;
+        struct cros_ec_sensor_platform *sensor_platforms;
+        int sensor_type[MOTIONSENSE_TYPE_MAX];
+        struct ec_params_motion_sense *params;
+        struct ec_response_motion_sense *resp;
+        struct cros_ec_command *msg;
+
+        msg = kzalloc(sizeof(struct cros_ec_command) +
+                      max(sizeof(*params), sizeof(*resp)), GFP_KERNEL);
+        if (msg == NULL)
+                return;
+
+        msg->version = 2;
+        msg->command = EC_CMD_MOTION_SENSE_CMD + ec->cmd_offset;
+        msg->outsize = sizeof(*params);
+        msg->insize = sizeof(*resp);
+
+        params = (struct ec_params_motion_sense *)msg->data;
+        params->cmd = MOTIONSENSE_CMD_DUMP;
+
+        ret = cros_ec_cmd_xfer(ec->ec_dev, msg);
+        if (ret < 0 || msg->result != EC_RES_SUCCESS) {
+                dev_warn(ec->dev, "cannot get EC sensor information: %d/%d\n",
+                         ret, msg->result);
+                goto error;
+        }
+
+        resp = (struct ec_response_motion_sense *)msg->data;
+        sensor_num = resp->dump.sensor_count;
+        /* Allocate 2 extra sensors in case lid angle or FIFO are needed */
+        sensor_cells = kzalloc(sizeof(struct mfd_cell) * (sensor_num + 2),
+                               GFP_KERNEL);
+        if (sensor_cells == NULL)
+                goto error;
+
+        sensor_platforms = kzalloc(sizeof(struct cros_ec_sensor_platform) *
+                  (sensor_num + 1), GFP_KERNEL);
+        if (sensor_platforms == NULL)
+                goto error_platforms;
+
+        memset(sensor_type, 0, sizeof(sensor_type));
+        id = 0;
+        for (i = 0; i < sensor_num; i++) {
+                params->cmd = MOTIONSENSE_CMD_INFO;
+                params->info.sensor_num = i;
+                ret = cros_ec_cmd_xfer(ec->ec_dev, msg);
+                if (ret < 0 || msg->result != EC_RES_SUCCESS) {
+                        dev_warn(ec->dev, "no info for EC sensor %d : %d/%d\n",
+                                 i, ret, msg->result);
+                        continue;
+                }
+                switch (resp->info.type) {
+                case MOTIONSENSE_TYPE_ACCEL:
+                        sensor_cells[id].name = "cros-ec-accel";
+                        break;
+                case MOTIONSENSE_TYPE_GYRO:
+                        sensor_cells[id].name = "cros-ec-gyro";
+                        break;
+                case MOTIONSENSE_TYPE_MAG:
+                        sensor_cells[id].name = "cros-ec-mag";
+                        break;
+                case MOTIONSENSE_TYPE_PROX:
+                        sensor_cells[id].name = "cros-ec-prox";
+                        break;
+                case MOTIONSENSE_TYPE_LIGHT:
+                        sensor_cells[id].name = "cros-ec-light";
+                        break;
+                case MOTIONSENSE_TYPE_ACTIVITY:
+                        sensor_cells[id].name = "cros-ec-activity";
+                        break;
+                default:
+                        dev_warn(ec->dev, "unknown type %d\n", resp->info.type);
+                        continue;
+                }
+                sensor_platforms[id].sensor_num = i;
+                sensor_cells[id].id = sensor_type[resp->info.type];
+                sensor_cells[id].platform_data = &sensor_platforms[id];
+                sensor_cells[id].pdata_size =
+                        sizeof(struct cros_ec_sensor_platform);
+
+                sensor_type[resp->info.type]++;
+                id++;
+        }
+        if (sensor_type[MOTIONSENSE_TYPE_ACCEL] >= 2) {
+                sensor_platforms[id].sensor_num = sensor_num;
+
+                sensor_cells[id].name = "cros-ec-angle";
+                sensor_cells[id].id = 0;
+                sensor_cells[id].platform_data = &sensor_platforms[id];
+                sensor_cells[id].pdata_size =
+                        sizeof(struct cros_ec_sensor_platform);
+                id++;
+        }
+        if (cros_ec_check_features(ec, EC_FEATURE_MOTION_SENSE_FIFO)) {
+                sensor_cells[id].name = "cros-ec-ring";
+                id++;
+        }
+
+        ret = mfd_add_devices(ec->dev, 0, sensor_cells, id,
+                              NULL, 0, NULL);
+        if (ret)
+                dev_err(ec->dev, "failed to add EC sensors\n");
+
+        kfree(sensor_platforms);
+error_platforms:
+        kfree(sensor_cells);
+error:
+        kfree(msg);
+}
+
 static int ec_device_probe(struct platform_device *pdev)
 {
         int retval = -ENOMEM;
@@ -245,6 +398,8 @@ static int ec_device_probe(struct platform_device *pdev)
         ec->ec_dev = dev_get_drvdata(dev->parent);
         ec->dev = dev;
         ec->cmd_offset = ec_platform->cmd_offset;
+        ec->features[0] = -1U; /* Not cached yet */
+        ec->features[1] = -1U; /* Not cached yet */
         device_initialize(&ec->class_dev);
         cdev_init(&ec->cdev, &fops);
 
@@ -282,6 +437,10 @@ static int ec_device_probe(struct platform_device *pdev)
                 goto dev_reg_failed;
         }
 
+        /* check whether this EC is a sensor hub. */
+        if (cros_ec_check_features(ec, EC_FEATURE_MOTION_SENSE))
+                cros_ec_sensors_register(ec);
+
         return 0;
 
 dev_reg_failed:
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 58a7b3504b82..cd005cd41413 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -24,8 +24,6 @@ menuconfig STAGING
 
 if STAGING
 
-source "drivers/staging/slicoss/Kconfig"
-
 source "drivers/staging/wlan-ng/Kconfig"
 
 source "drivers/staging/comedi/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 2fa9745db614..831e2e891989 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -1,7 +1,6 @@
 # Makefile for staging directory
 
 obj-y                           += media/
-obj-$(CONFIG_SLICOSS)           += slicoss/
 obj-$(CONFIG_PRISM2_USB)        += wlan-ng/
 obj-$(CONFIG_COMEDI)            += comedi/
 obj-$(CONFIG_FB_OLPC_DCON)      += olpc_dcon/
@@ -41,4 +40,4 @@ obj-$(CONFIG_MOST)		+= most/
 obj-$(CONFIG_ISDN_I4L)          += i4l/
 obj-$(CONFIG_KS7010)            += ks7010/
 obj-$(CONFIG_GREYBUS)           += greybus/
-obj-$(CONFIG_BCM2708_VCHIQ)     += vc04_services/
+obj-$(CONFIG_BCM2835_VCHIQ)     += vc04_services/
diff --git a/drivers/staging/android/TODO b/drivers/staging/android/TODO
index 64d8c8720960..8f3ac37bfe12 100644
--- a/drivers/staging/android/TODO
+++ b/drivers/staging/android/TODO
@@ -25,13 +25,5 @@ ion/
    exposes existing cma regions and doesn't reserve unecessarily memory when
    booting a system which doesn't use ion.
 
-sync framework:
- - remove CONFIG_SW_SYNC_USER, it is used only for testing/debugging and
- should not be upstreamed.
- - port CONFIG_SW_SYNC_USER tests interfaces to use debugfs somehow
- - port libsync tests to kselftest
- - clean up and ABI check for security issues
- - move it to drivers/base/dma-buf
-
 Please send patches to Greg Kroah-Hartman <greg@kroah.com> and Cc:
 Arve Hjønnevåg <arve@android.com> and Riley Andrews <riandrews@android.com>
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index ca9a53c03f0f..7cbad0d45b9c 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -100,39 +100,43 @@ static DEFINE_MUTEX(ashmem_mutex);
 static struct kmem_cache *ashmem_area_cachep __read_mostly;
 static struct kmem_cache *ashmem_range_cachep __read_mostly;
 
-#define range_size(range) \
-        ((range)->pgend - (range)->pgstart + 1)
+static inline unsigned long range_size(struct ashmem_range *range)
+{
+        return range->pgend - range->pgstart + 1;
+}
 
-#define range_on_lru(range) \
-        ((range)->purged == ASHMEM_NOT_PURGED)
+static inline bool range_on_lru(struct ashmem_range *range)
+{
+        return range->purged == ASHMEM_NOT_PURGED;
+}
 
-static inline int page_range_subsumes_range(struct ashmem_range *range,
-                                            size_t start, size_t end)
+static inline bool page_range_subsumes_range(struct ashmem_range *range,
+                                             size_t start, size_t end)
 {
-        return (((range)->pgstart >= (start)) && ((range)->pgend <= (end)));
+        return (range->pgstart >= start) && (range->pgend <= end);
 }
 
-static inline int page_range_subsumed_by_range(struct ashmem_range *range,
-                                               size_t start, size_t end)
+static inline bool page_range_subsumed_by_range(struct ashmem_range *range,
+                                                size_t start, size_t end)
 {
-        return (((range)->pgstart <= (start)) && ((range)->pgend >= (end)));
+        return (range->pgstart <= start) && (range->pgend >= end);
 }
 
-static inline int page_in_range(struct ashmem_range *range, size_t page)
+static inline bool page_in_range(struct ashmem_range *range, size_t page)
 {
-        return (((range)->pgstart <= (page)) && ((range)->pgend >= (page)));
+        return (range->pgstart <= page) && (range->pgend >= page);
 }
 
-static inline int page_range_in_range(struct ashmem_range *range,
-                                      size_t start, size_t end)
+static inline bool page_range_in_range(struct ashmem_range *range,
+                                       size_t start, size_t end)
 {
-        return (page_in_range(range, start) || page_in_range(range, end) ||
-                page_range_subsumes_range(range, start, end));
+        return page_in_range(range, start) || page_in_range(range, end) ||
+                page_range_subsumes_range(range, start, end);
 }
 
-static inline int range_before_page(struct ashmem_range *range, size_t page)
+static inline bool range_before_page(struct ashmem_range *range, size_t page)
 {
-        return ((range)->pgend < (page));
+        return range->pgend < page;
 }
 
 #define PROT_MASK               (PROT_EXEC | PROT_READ | PROT_WRITE)
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 209a8f7ef02b..d5cc3070e83f 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1013,7 +1013,7 @@ static int ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf,
         return 0;
 }
 
-static struct dma_buf_ops dma_buf_ops = {
+static const struct dma_buf_ops dma_buf_ops = {
         .map_dma_buf = ion_map_dma_buf,
         .unmap_dma_buf = ion_unmap_dma_buf,
         .mmap = ion_mmap,
diff --git a/drivers/staging/android/ion/ion_dummy_driver.c b/drivers/staging/android/ion/ion_dummy_driver.c
index b23f2c76c753..cf5c010d32bc 100644
--- a/drivers/staging/android/ion/ion_dummy_driver.c
+++ b/drivers/staging/android/ion/ion_dummy_driver.c
@@ -58,7 +58,7 @@ static struct ion_platform_heap dummy_heaps[] = {
                 },
 };
 
-static struct ion_platform_data dummy_ion_pdata = {
+static const struct ion_platform_data dummy_ion_pdata = {
         .nr = ARRAY_SIZE(dummy_heaps),
         .heaps = dummy_heaps,
 };
diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index 7e023d505af8..3ebbb75746e8 100644
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -30,7 +30,7 @@
 
 static gfp_t high_order_gfp_flags = (GFP_HIGHUSER | __GFP_ZERO | __GFP_NOWARN |
                                      __GFP_NORETRY) & ~__GFP_RECLAIM;
-static gfp_t low_order_gfp_flags  = (GFP_HIGHUSER | __GFP_ZERO);
+static gfp_t low_order_gfp_flags  = GFP_HIGHUSER | __GFP_ZERO;
 static const unsigned int orders[] = {8, 4, 0};
 
 static int order_to_index(unsigned int order)
diff --git a/drivers/staging/android/uapi/ion_test.h b/drivers/staging/android/uapi/ion_test.h
index ffef06f63133..480242e02f8d 100644
--- a/drivers/staging/android/uapi/ion_test.h
+++ b/drivers/staging/android/uapi/ion_test.h
@@ -66,5 +66,4 @@ struct ion_test_rw_data {
 #define ION_IOC_TEST_KERNEL_MAPPING \
                         _IOW(ION_IOC_MAGIC, 0xf2, struct ion_test_rw_data)
 
-
 #endif /* _UAPI_LINUX_ION_H */
diff --git a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
index 7b8be5293883..bf3fe7c61be5 100644
--- a/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
+++ b/drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
@@ -68,7 +68,7 @@ struct clk_wzrd {
         struct clk *axi_clk;
         struct clk *clks_internal[wzrd_clk_int_max];
         struct clk *clkout[WZRD_NUM_OUTPUTS];
-        int speed_grade;
+        unsigned int speed_grade;
         bool suspended;
 };
 
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 08fb26b51a5f..a1c1081906c5 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -245,6 +245,22 @@ enum comedi_subdevice_type {
 /* configuration instructions */
 
 /**
+ * enum comedi_io_direction - COMEDI I/O directions
+ * @COMEDI_INPUT:       Input.
+ * @COMEDI_OUTPUT:      Output.
+ * @COMEDI_OPENDRAIN:   Open-drain (or open-collector) output.
+ *
+ * These are used by the %INSN_CONFIG_DIO_QUERY configuration instruction to
+ * report a direction.  They may also be used in other places where a direction
+ * needs to be specified.
+ */
+enum comedi_io_direction {
+        COMEDI_INPUT = 0,
+        COMEDI_OUTPUT = 1,
+        COMEDI_OPENDRAIN = 2
+};
+
+/**
  * enum configuration_ids - COMEDI configuration instruction codes
  * @INSN_CONFIG_DIO_INPUT:      Configure digital I/O as input.
  * @INSN_CONFIG_DIO_OUTPUT:     Configure digital I/O as output.
@@ -296,9 +312,9 @@ enum comedi_subdevice_type {
  * @INSN_CONFIG_PWM_GET_H_BRIDGE: Get PWM H bridge duty cycle and polarity.
  */
 enum configuration_ids {
-        INSN_CONFIG_DIO_INPUT = 0,
-        INSN_CONFIG_DIO_OUTPUT = 1,
-        INSN_CONFIG_DIO_OPENDRAIN = 2,
+        INSN_CONFIG_DIO_INPUT = COMEDI_INPUT,
+        INSN_CONFIG_DIO_OUTPUT = COMEDI_OUTPUT,
+        INSN_CONFIG_DIO_OPENDRAIN = COMEDI_OPENDRAIN,
         INSN_CONFIG_ANALOG_TRIG = 16,
 /*      INSN_CONFIG_WAVEFORM = 17, */
 /*      INSN_CONFIG_TRIG = 18, */
@@ -397,22 +413,6 @@ enum comedi_digital_trig_op {
 };
 
 /**
- * enum comedi_io_direction - COMEDI I/O directions
- * @COMEDI_INPUT:       Input.
- * @COMEDI_OUTPUT:      Output.
- * @COMEDI_OPENDRAIN:   Open-drain (or open-collector) output.
- *
- * These are used by the %INSN_CONFIG_DIO_QUERY configuration instruction to
- * report a direction.  They may also be used in other places where a direction
- * needs to be specified.
- */
-enum comedi_io_direction {
-        COMEDI_INPUT = 0,
-        COMEDI_OUTPUT = 1,
-        COMEDI_OPENDRAIN = 2
-};
-
-/**
  * enum comedi_support_level - support level for a COMEDI feature
  * @COMEDI_UNKNOWN_SUPPORT:     Unspecified support for feature.
  * @COMEDI_SUPPORTED:           Feature is supported.
@@ -1104,18 +1104,19 @@ enum ni_gpct_other_select {
 enum ni_gpct_arm_source {
         NI_GPCT_ARM_IMMEDIATE = 0x0,
         /*
-         * Start both the counter and the adjacent pared
-         * counter simultaneously
+         * Start both the counter and the adjacent paired counter simultaneously
          */
         NI_GPCT_ARM_PAIRED_IMMEDIATE = 0x1,
         /*
-         * NI doesn't document bits for selecting hardware arm triggers.
-         * If the NI_GPCT_ARM_UNKNOWN bit is set, we will pass the least
-         * significant bits (3 bits for 660x or 5 bits for m-series)
-         * through to the hardware.  This will at least allow someone to
-         * figure out what the bits do later.
+         * If the NI_GPCT_HW_ARM bit is set, we will pass the least significant
+         * bits (3 bits for 660x or 5 bits for m-series) through to the
+         * hardware. To select a hardware trigger, pass the appropriate select
+         * bit, e.g.,
+         * NI_GPCT_HW_ARM | NI_GPCT_AI_START1_GATE_SELECT or
+         * NI_GPCT_HW_ARM | NI_GPCT_PFI_GATE_SELECT(pfi_number)
          */
-        NI_GPCT_ARM_UNKNOWN = 0x1000,
+        NI_GPCT_HW_ARM = 0x1000,
+        NI_GPCT_ARM_UNKNOWN = NI_GPCT_HW_ARM,   /* for backward compatibility */
 };
 
 /* digital filtering options for ni 660x for use with INSN_CONFIG_FILTER. */
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index dcb637665eb7..0c7c37a8ff33 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -426,6 +426,18 @@ enum comedi_cb {
  * handler will be called with the COMEDI device structure's board_ptr member
  * pointing to the matched pointer to a board name within the driver's private
  * array of static, read-only board type information.
+ *
+ * The @detach handler has two roles.  If a COMEDI device was successfully
+ * configured by the @attach or @auto_attach handler, it is called when the
+ * device is being deconfigured (by the %COMEDI_DEVCONFIG ioctl, or due to
+ * unloading of the driver, or due to device removal).  It is also called when
+ * the @attach or @auto_attach handler returns an error.  Therefore, the
+ * @attach or @auto_attach handlers can defer clean-up on error until the
+ * @detach handler is called.  If the @attach or @auto_attach handlers free
+ * any resources themselves, they must prevent the @detach handler from
+ * freeing the same resources.  The @detach handler must not assume that all
+ * resources requested by the @attach or @auto_attach handler were
+ * successfully allocated.
  */
 struct comedi_driver {
         /* private: */
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index ccb37d1f0f8e..987414741605 100644
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -248,8 +248,8 @@ static void cb_pcidda_write_caldac(struct comedi_device *dev,
         cb_pcidda_serial_out(dev, value, num_caldac_bits);
 
 /*
-* latch stream into appropriate caldac deselect reference dac
-*/
+ * latch stream into appropriate caldac deselect reference dac
+ */
         cal2_bits = DESELECT_REF_DAC_BIT | DUMMY_BIT;
         /*  deactivate caldacs (one caldac for every two channels) */
         for (i = 0; i < max_num_caldacs; i++)
diff --git a/drivers/staging/comedi/drivers/mite.c b/drivers/staging/comedi/drivers/mite.c
index b1c0860135d0..05126ba4ba51 100644
--- a/drivers/staging/comedi/drivers/mite.c
+++ b/drivers/staging/comedi/drivers/mite.c
@@ -837,7 +837,7 @@ static int mite_setup(struct comedi_device *dev, struct mite *mite,
          * of 0x61f and bursts worked. 6281 powered up with register value of
          * 0x1f and bursts didn't work. The NI windows driver reads the
          * register, then does a bitwise-or of 0x600 with it and writes it back.
-        *
+         *
          * The bits 0x90180700 in MITE_UNKNOWN_DMA_BURST_REG can be
          * written and read back.  The bits 0x1f always read as 1.
          * The rest always read as zero.
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 0f97d7b611d7..b2e382888981 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -1832,11 +1832,10 @@ static int ni_ai_insn_read(struct comedi_device *dev,
                            unsigned int *data)
 {
         struct ni_private *devpriv = dev->private;
-        unsigned int mask = (s->maxdata + 1) >> 1;
+        unsigned int mask = s->maxdata;
         int i, n;
         unsigned int signbits;
         unsigned int d;
-        unsigned long dl;
 
         ni_load_channelgain_list(dev, s, 1, &insn->chanspec);
 
@@ -1875,7 +1874,7 @@ static int ni_ai_insn_read(struct comedi_device *dev,
                                 return -ETIME;
                         }
                         d += signbits;
-                        data[n] = d;
+                        data[n] = d & 0xffff;
                 }
         } else if (devpriv->is_6143) {
                 for (n = 0; n < insn->n; n++) {
@@ -1887,15 +1886,15 @@ static int ni_ai_insn_read(struct comedi_device *dev,
                          * bit to move a single 16bit stranded sample into
                          * the FIFO.
                          */
-                        dl = 0;
+                        d = 0;
                         for (i = 0; i < NI_TIMEOUT; i++) {
                                 if (ni_readl(dev, NI6143_AI_FIFO_STATUS_REG) &
                                     0x01) {
                                         /* Get stranded sample into FIFO */
                                         ni_writel(dev, 0x01,
                                                   NI6143_AI_FIFO_CTRL_REG);
-                                        dl = ni_readl(dev,
-                                                      NI6143_AI_FIFO_DATA_REG);
+                                        d = ni_readl(dev,
+                                                     NI6143_AI_FIFO_DATA_REG);
                                         break;
                                 }
                         }
@@ -1903,7 +1902,7 @@ static int ni_ai_insn_read(struct comedi_device *dev,
                                 dev_err(dev->class_dev, "timeout\n");
                                 return -ETIME;
                         }
-                        data[n] = (((dl >> 16) & 0xFFFF) + signbits) & 0xFFFF;
+                        data[n] = (((d >> 16) & 0xFFFF) + signbits) & 0xFFFF;
                 }
         } else {
                 for (n = 0; n < insn->n; n++) {
@@ -1919,14 +1918,13 @@ static int ni_ai_insn_read(struct comedi_device *dev,
                                 return -ETIME;
                         }
                         if (devpriv->is_m_series) {
-                                dl = ni_readl(dev, NI_M_AI_FIFO_DATA_REG);
-                                dl &= mask;
-                                data[n] = dl;
+                                d = ni_readl(dev, NI_M_AI_FIFO_DATA_REG);
+                                d &= mask;
+                                data[n] = d;
                         } else {
                                 d = ni_readw(dev, NI_E_AI_FIFO_DATA_REG);
-                                /* subtle: needs to be short addition */
                                 d += signbits;
-                                data[n] = d;
+                                data[n] = d & 0xffff;
                         }
                 }
         }
@@ -2729,66 +2727,36 @@ static int ni_ao_insn_write(struct comedi_device *dev,
         return insn->n;
 }
 
-static int ni_ao_insn_config(struct comedi_device *dev,
-                             struct comedi_subdevice *s,
-                             struct comedi_insn *insn, unsigned int *data)
-{
-        const struct ni_board_struct *board = dev->board_ptr;
-        struct ni_private *devpriv = dev->private;
-        unsigned int nbytes;
-
-        switch (data[0]) {
-        case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE:
-                switch (data[1]) {
-                case COMEDI_OUTPUT:
-                        nbytes = comedi_samples_to_bytes(s,
-                                                         board->ao_fifo_depth);
-                        data[2] = 1 + nbytes;
-                        if (devpriv->mite)
-                                data[2] += devpriv->mite->fifo_size;
-                        break;
-                case COMEDI_INPUT:
-                        data[2] = 0;
-                        break;
-                default:
-                        return -EINVAL;
-                }
-                return 0;
-        default:
-                break;
-        }
-
-        return -EINVAL;
-}
-
-static int ni_ao_inttrig(struct comedi_device *dev,
-                         struct comedi_subdevice *s,
-                         unsigned int trig_num)
+/*
+ * Arms the AO device in preparation for a trigger event.
+ * This function also allocates and prepares a DMA channel (or FIFO if DMA is
+ * not used).  As a part of this preparation, this function preloads the DAC
+ * registers with the first values of the output stream.  This ensures that the
+ * first clock cycle after the trigger can be used for output.
+ *
+ * Note that this function _must_ happen after a user has written data to the
+ * output buffers via either mmap or write(fileno,...).
+ */
+static int ni_ao_arm(struct comedi_device *dev,
+                     struct comedi_subdevice *s)
 {
         struct ni_private *devpriv = dev->private;
-        struct comedi_cmd *cmd = &s->async->cmd;
         int ret;
         int interrupt_b_bits;
         int i;
         static const int timeout = 1000;
 
         /*
-         * Require trig_num == cmd->start_arg when cmd->start_src == TRIG_INT.
-         * For backwards compatibility, also allow trig_num == 0 when
-         * cmd->start_src != TRIG_INT (i.e. when cmd->start_src == TRIG_EXT);
-         * in that case, the internal trigger is being used as a pre-trigger
-         * before the external trigger.
+         * Prevent ao from doing things like trying to allocate the ao dma
+         * channel multiple times.
          */
-        if (!(trig_num == cmd->start_arg ||
-              (trig_num == 0 && cmd->start_src != TRIG_INT)))
+        if (!devpriv->ao_needs_arming) {
+                dev_dbg(dev->class_dev, "%s: device does not need arming!\n",
+                        __func__);
                 return -EINVAL;
+        }
 
-        /*
-         * Null trig at beginning prevent ao start trigger from executing more
-         * than once per command (and doing things like trying to allocate the
-         * ao dma channel multiple times).
-         */
-        s->async->inttrig = NULL;
+        devpriv->ao_needs_arming = 0;
 
         ni_set_bits(dev, NISTC_INTB_ENA_REG,
                     NISTC_INTB_ENA_AO_FIFO | NISTC_INTB_ENA_AO_ERR, 0);
@@ -2840,6 +2808,75 @@ static int ni_ao_inttrig(struct comedi_device *dev,
                            devpriv->ao_cmd1,
                       NISTC_AO_CMD1_REG);
 
+        return 0;
+}
+
+static int ni_ao_insn_config(struct comedi_device *dev,
+                             struct comedi_subdevice *s,
+                             struct comedi_insn *insn, unsigned int *data)
+{
+        const struct ni_board_struct *board = dev->board_ptr;
+        struct ni_private *devpriv = dev->private;
+        unsigned int nbytes;
+
+        switch (data[0]) {
+        case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE:
+                switch (data[1]) {
+                case COMEDI_OUTPUT:
+                        nbytes = comedi_samples_to_bytes(s,
+                                                         board->ao_fifo_depth);
+                        data[2] = 1 + nbytes;
+                        if (devpriv->mite)
+                                data[2] += devpriv->mite->fifo_size;
+                        break;
+                case COMEDI_INPUT:
+                        data[2] = 0;
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                return 0;
+        case INSN_CONFIG_ARM:
+                return ni_ao_arm(dev, s);
+        default:
+                break;
+        }
+
+        return -EINVAL;
+}
+
+static int ni_ao_inttrig(struct comedi_device *dev,
+                         struct comedi_subdevice *s,
+                         unsigned int trig_num)
+{
+        struct ni_private *devpriv = dev->private;
+        struct comedi_cmd *cmd = &s->async->cmd;
+        int ret;
+
+        /*
+         * Require trig_num == cmd->start_arg when cmd->start_src == TRIG_INT.
+         * For backwards compatibility, also allow trig_num == 0 when
+         * cmd->start_src != TRIG_INT (i.e. when cmd->start_src == TRIG_EXT);
+         * in that case, the internal trigger is being used as a pre-trigger
+         * before the external trigger.
+         */
+        if (!(trig_num == cmd->start_arg ||
+              (trig_num == 0 && cmd->start_src != TRIG_INT)))
+                return -EINVAL;
+
+        /*
+         * Null trig at beginning prevent ao start trigger from executing more
+         * than once per command.
+         */
+        s->async->inttrig = NULL;
+
+        if (devpriv->ao_needs_arming) {
+                /* only arm this device if it still needs arming */
+                ret = ni_ao_arm(dev, s);
+                if (ret)
+                        return ret;
+        }
+
         ni_stc_writew(dev, NISTC_AO_CMD2_START1_PULSE | devpriv->ao_cmd2,
                       NISTC_AO_CMD2_REG);
 
@@ -3227,10 +3264,17 @@ static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         ni_ao_cmd_set_interrupts(dev, s);
 
         /*
-         * arm(ing) and star(ting) happen in ni_ao_inttrig, which _must_ be
-         * called for ao commands since 1) TRIG_NOW is not supported and 2) DMA
-         * must be setup and initially written to before arm/start happen.
+         * arm(ing) must happen later so that DMA can be setup and DACs
+         * preloaded with the actual output buffer before starting.
+         *
+         * start(ing) must happen _after_ arming is completed.  Starting can be
+         * done either via ni_ao_inttrig, or via an external trigger.
+         *
+         * **Currently, ni_ao_inttrig will automatically attempt a call to
+         * ni_ao_arm if the device still needs arming at that point.  This
+         * allows backwards compatibility.
          */
+        devpriv->ao_needs_arming = 1;
         return 0;
 }
 
diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index 1966519cb6e5..f27b545f83eb 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -1053,6 +1053,20 @@ struct ni_private {
         unsigned int is_67xx:1;
         unsigned int is_6711:1;
         unsigned int is_6713:1;
+
+        /*
+         * Boolean value of whether device needs to be armed.
+         *
+         * Currently, only NI AO devices are known to be needing arming, since
+         * the DAC registers must be preloaded before triggering.
+         * This variable should only be set true during a command operation
+         * (e.g ni_ao_cmd) and should then be set false by the arming
+         * function (e.g. ni_ao_arm).
+         *
+         * This variable helps to ensure that multiple DMA allocations are not
+         * possible.
+         */
+        unsigned int ao_needs_arming:1;
 };
 
 static const struct comedi_lrange range_ni_E_ao_ext;
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c
index 5ab49a798164..15cb4088467b 100644
--- a/drivers/staging/comedi/drivers/ni_tio.c
+++ b/drivers/staging/comedi/drivers/ni_tio.c
@@ -452,8 +452,9 @@ static void ni_tio_set_sync_mode(struct ni_gpct *counter)
         unsigned int bits = 0;
         unsigned int reg;
         unsigned int mode;
-        unsigned int clk_src;
-        u64 ps;
+        unsigned int clk_src = 0;
+        u64 ps = 0;
+        int ret;
         bool force_alt_sync;
 
         /* only m series and 660x variants have counting mode registers */
@@ -483,9 +484,12 @@ static void ni_tio_set_sync_mode(struct ni_gpct *counter)
                 break;
         }
 
-        ni_tio_generic_clock_src_select(counter, &clk_src);
-        ni_tio_clock_period_ps(counter, clk_src, &ps);
-
+        ret = ni_tio_generic_clock_src_select(counter, &clk_src);
+        if (ret)
+                return;
+        ret = ni_tio_clock_period_ps(counter, clk_src, &ps);
+        if (ret)
+                return;
         /*
          * It's not clear what we should do if clock_period is unknown, so we
          * are not using the alt sync bit in that case.
@@ -809,7 +813,7 @@ static int ni_tio_get_clock_src(struct ni_gpct *counter,
                                 unsigned int *clock_source,
                                 unsigned int *period_ns)
 {
-        u64 temp64;
+        u64 temp64 = 0;
         int ret;
 
         ret = ni_tio_generic_clock_src_select(counter, clock_source);
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index 5aeed44dff70..5b5df0596ad9 100644
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -771,9 +771,9 @@ static int pcl818_ai_cancel(struct comedi_device *dev,
                      s->async->scans_done < cmd->stop_arg)) {
                         if (!devpriv->ai_cmd_canceled) {
                                 /*
-                                * Wait for running dma transfer to end,
-                                * do cleanup in interrupt.
-                                */
+                                 * Wait for running dma transfer to end,
+                                 * do cleanup in interrupt.
+                                 */
                                 devpriv->ai_cmd_canceled = 1;
                                 return 0;
                         }
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index c14a02564432..0dd5fe286855 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -75,24 +75,24 @@ struct s626_buffer_dma {
 };
 
 struct s626_private {
-        uint8_t ai_cmd_running;         /* ai_cmd is running */
+        u8 ai_cmd_running;              /* ai_cmd is running */
         unsigned int ai_sample_timer;   /* time between samples in
                                          * units of the timer */
         int ai_convert_count;           /* conversion counter */
         unsigned int ai_convert_timer;  /* time between conversion in
                                          * units of the timer */
-        uint16_t counter_int_enabs;     /* counter interrupt enable mask
+        u16 counter_int_enabs;          /* counter interrupt enable mask
                                          * for MISC2 register */
-        uint8_t adc_items;              /* number of items in ADC poll list */
+        u8 adc_items;                   /* number of items in ADC poll list */
         struct s626_buffer_dma rps_buf; /* DMA buffer used to hold ADC (RPS1)
                                          * program */
         struct s626_buffer_dma ana_buf; /* DMA buffer used to receive ADC data
                                          * and hold DAC data */
-        uint32_t *dac_wbuf;             /* pointer to logical adrs of DMA buffer
+        u32 *dac_wbuf;                  /* pointer to logical adrs of DMA buffer
                                          * used to hold DAC data */
-        uint16_t dacpol;                /* image of DAC polarity register */
-        uint8_t trim_setpoint[12];      /* images of TrimDAC setpoints */
-        uint32_t i2c_adrs;              /* I2C device address for onboard EEPROM
+        u16 dacpol;                     /* image of DAC polarity register */
+        u8 trim_setpoint[12];           /* images of TrimDAC setpoints */
+        u32 i2c_adrs;                   /* I2C device address for onboard EEPROM
                                          * (board rev dependent) */
 };
 
@@ -179,7 +179,7 @@ static void s626_debi_transfer(struct comedi_device *dev)
 /*
  * Read a value from a gate array register.
  */
-static uint16_t s626_debi_read(struct comedi_device *dev, uint16_t addr)
+static u16 s626_debi_read(struct comedi_device *dev, u16 addr)
 {
         /* Set up DEBI control register value in shadow RAM */
         writel(S626_DEBI_CMD_RDWORD | addr, dev->mmio + S626_P_DEBICMD);
@@ -193,8 +193,8 @@ static uint16_t s626_debi_read(struct comedi_device *dev, uint16_t addr)
 /*
  * Write a value to a gate array register.
  */
-static void s626_debi_write(struct comedi_device *dev, uint16_t addr,
-                            uint16_t wdata)
+static void s626_debi_write(struct comedi_device *dev, u16 addr,
+                            u16 wdata)
 {
         /* Set up DEBI control register value in shadow RAM */
         writel(S626_DEBI_CMD_WRWORD | addr, dev->mmio + S626_P_DEBICMD);
@@ -241,7 +241,7 @@ static int s626_i2c_handshake_eoc(struct comedi_device *dev,
         return -EBUSY;
 }
 
-static int s626_i2c_handshake(struct comedi_device *dev, uint32_t val)
+static int s626_i2c_handshake(struct comedi_device *dev, u32 val)
 {
         unsigned int ctrl;
         int ret;
@@ -267,8 +267,8 @@ static int s626_i2c_handshake(struct comedi_device *dev, uint32_t val)
         return ctrl & S626_I2C_ERR;
 }
 
-/* Read uint8_t from EEPROM. */
-static uint8_t s626_i2c_read(struct comedi_device *dev, uint8_t addr)
+/* Read u8 from EEPROM. */
+static u8 s626_i2c_read(struct comedi_device *dev, u8 addr)
 {
         struct s626_private *devpriv = dev->private;
 
@@ -304,10 +304,10 @@ static uint8_t s626_i2c_read(struct comedi_device *dev, uint8_t addr)
 /* ***********  DAC FUNCTIONS *********** */
 
 /* TrimDac LogicalChan-to-PhysicalChan mapping table. */
-static const uint8_t s626_trimchan[] = { 10, 9, 8, 3, 2, 7, 6, 1, 0, 5, 4 };
+static const u8 s626_trimchan[] = { 10, 9, 8, 3, 2, 7, 6, 1, 0, 5, 4 };
 
 /* TrimDac LogicalChan-to-EepromAdrs mapping table. */
-static const uint8_t s626_trimadrs[] = {
+static const u8 s626_trimadrs[] = {
         0x40, 0x41, 0x42, 0x50, 0x51, 0x52, 0x53, 0x60, 0x61, 0x62, 0x63
 };
 
@@ -357,7 +357,7 @@ static int s626_send_dac_eoc(struct comedi_device *dev,
  * channel 2.  Assumes: (1) TSL2 slot records initialized, and (2)
  * dacpol contains valid target image.
  */
-static int s626_send_dac(struct comedi_device *dev, uint32_t val)
+static int s626_send_dac(struct comedi_device *dev, u32 val)
 {
         struct s626_private *devpriv = dev->private;
         int ret;
@@ -516,12 +516,12 @@ static int s626_send_dac(struct comedi_device *dev, uint32_t val)
  * Private helper function: Write setpoint to an application DAC channel.
  */
 static int s626_set_dac(struct comedi_device *dev,
-                        uint16_t chan, int16_t dacdata)
+                        u16 chan, int16_t dacdata)
 {
         struct s626_private *devpriv = dev->private;
-        uint16_t signmask;
-        uint32_t ws_image;
-        uint32_t val;
+        u16 signmask;
+        u32 ws_image;
+        u32 val;
 
         /*
          * Adjust DAC data polarity and set up Polarity Control Register image.
@@ -535,7 +535,7 @@ static int s626_set_dac(struct comedi_device *dev,
         }
 
         /* Limit DAC setpoint value to valid range. */
-        if ((uint16_t)dacdata > 0x1FFF)
+        if ((u16)dacdata > 0x1FFF)
                 dacdata = 0x1FFF;
 
         /*
@@ -575,23 +575,23 @@ static int s626_set_dac(struct comedi_device *dev,
                                  * (write to non-existent trimdac). */
         val |= 0x00004000;      /* Address the two main dual-DAC devices
                                  * (TSL's chip select enables target device). */
-        val |= ((uint32_t)(chan & 1) << 15);    /* Address the DAC channel
+        val |= ((u32)(chan & 1) << 15); /* Address the DAC channel
                                                  * within the device. */
-        val |= (uint32_t)dacdata;       /* Include DAC setpoint data. */
+        val |= (u32)dacdata;    /* Include DAC setpoint data. */
         return s626_send_dac(dev, val);
 }
 
 static int s626_write_trim_dac(struct comedi_device *dev,
-                               uint8_t logical_chan, uint8_t dac_data)
+                               u8 logical_chan, u8 dac_data)
 {
         struct s626_private *devpriv = dev->private;
-        uint32_t chan;
+        u32 chan;
 
         /*
          * Save the new setpoint in case the application needs to read it back
          * later.
          */
-        devpriv->trim_setpoint[logical_chan] = (uint8_t)dac_data;
+        devpriv->trim_setpoint[logical_chan] = (u8)dac_data;
 
         /* Map logical channel number to physical channel number. */
         chan = s626_trimchan[logical_chan];
@@ -633,7 +633,7 @@ static int s626_write_trim_dac(struct comedi_device *dev,
 
 static int s626_load_trim_dacs(struct comedi_device *dev)
 {
-        uint8_t i;
+        u8 i;
         int ret;
 
         /* Copy TrimDac setpoint values from EEPROM to TrimDacs. */
@@ -661,7 +661,7 @@ static int s626_load_trim_dacs(struct comedi_device *dev)
  * latches B.
  */
 static void s626_set_latch_source(struct comedi_device *dev,
-                                  unsigned int chan, uint16_t value)
+                                  unsigned int chan, u16 value)
 {
         s626_debi_replace(dev, S626_LP_CRB(chan),
                           ~(S626_CRBMSK_INTCTRL | S626_CRBMSK_LATCHSRC),
@@ -672,7 +672,7 @@ static void s626_set_latch_source(struct comedi_device *dev,
  * Write value into counter preload register.
  */
 static void s626_preload(struct comedi_device *dev,
-                         unsigned int chan, uint32_t value)
+                         unsigned int chan, u32 value)
 {
         s626_debi_write(dev, S626_LP_CNTR(chan), value);
         s626_debi_write(dev, S626_LP_CNTR(chan) + 2, value >> 16);
@@ -686,7 +686,7 @@ static void s626_preload(struct comedi_device *dev,
 static void s626_reset_cap_flags(struct comedi_device *dev,
                                  unsigned int chan)
 {
-        uint16_t set;
+        u16 set;
 
         set = S626_SET_CRB_INTRESETCMD(1);
         if (chan < 3)
@@ -704,12 +704,12 @@ static void s626_reset_cap_flags(struct comedi_device *dev,
  * ClkPol, ClkEnab, IndexSrc, IndexPol, LoadSrc.
  */
 static void s626_set_mode_a(struct comedi_device *dev,
-                            unsigned int chan, uint16_t setup,
-                            uint16_t disable_int_src)
+                            unsigned int chan, u16 setup,
+                            u16 disable_int_src)
 {
         struct s626_private *devpriv = dev->private;
-        uint16_t cra;
-        uint16_t crb;
+        u16 cra;
+        u16 crb;
         unsigned int cntsrc, clkmult, clkpol;
 
         /* Initialize CRA and CRB images. */
@@ -782,12 +782,12 @@ static void s626_set_mode_a(struct comedi_device *dev,
 }
 
 static void s626_set_mode_b(struct comedi_device *dev,
-                            unsigned int chan, uint16_t setup,
-                            uint16_t disable_int_src)
+                            unsigned int chan, u16 setup,
+                            u16 disable_int_src)
 {
         struct s626_private *devpriv = dev->private;
-        uint16_t cra;
-        uint16_t crb;
+        u16 cra;
+        u16 crb;
         unsigned int cntsrc, clkmult, clkpol;
 
         /* Initialize CRA and CRB images. */
@@ -868,7 +868,7 @@ static void s626_set_mode_b(struct comedi_device *dev,
 
 static void s626_set_mode(struct comedi_device *dev,
                           unsigned int chan,
-                          uint16_t setup, uint16_t disable_int_src)
+                          u16 setup, u16 disable_int_src)
 {
         if (chan < 3)
                 s626_set_mode_a(dev, chan, setup, disable_int_src);
@@ -880,7 +880,7 @@ static void s626_set_mode(struct comedi_device *dev,
  * Return/set a counter's enable.  enab: 0=always enabled, 1=enabled by index.
  */
 static void s626_set_enable(struct comedi_device *dev,
-                            unsigned int chan, uint16_t enab)
+                            unsigned int chan, u16 enab)
 {
         unsigned int mask = S626_CRBMSK_INTCTRL;
         unsigned int set;
@@ -901,11 +901,11 @@ static void s626_set_enable(struct comedi_device *dev,
  * 2=OverflowA (B counters only), 3=disabled.
  */
 static void s626_set_load_trig(struct comedi_device *dev,
-                               unsigned int chan, uint16_t trig)
+                               unsigned int chan, u16 trig)
 {
-        uint16_t reg;
-        uint16_t mask;
-        uint16_t set;
+        u16 reg;
+        u16 mask;
+        u16 set;
 
         if (chan < 3) {
                 reg = S626_LP_CRA(chan);
@@ -925,11 +925,11 @@ static void s626_set_load_trig(struct comedi_device *dev,
  * 2=IndexOnly, 3=IndexAndOverflow.
  */
 static void s626_set_int_src(struct comedi_device *dev,
-                             unsigned int chan, uint16_t int_source)
+                             unsigned int chan, u16 int_source)
 {
         struct s626_private *devpriv = dev->private;
-        uint16_t cra_reg = S626_LP_CRA(chan);
-        uint16_t crb_reg = S626_LP_CRB(chan);
+        u16 cra_reg = S626_LP_CRA(chan);
+        u16 crb_reg = S626_LP_CRB(chan);
 
         if (chan < 3) {
                 /* Reset any pending counter overflow or index captures */
@@ -941,7 +941,7 @@ static void s626_set_int_src(struct comedi_device *dev,
                 s626_debi_replace(dev, cra_reg, ~S626_CRAMSK_INTSRC_A,
                                   S626_SET_CRA_INTSRC_A(int_source));
         } else {
-                uint16_t crb;
+                u16 crb;
 
                 /* Cache writeable CRB register image */
                 crb = s626_debi_read(dev, crb_reg);
@@ -985,7 +985,7 @@ static void s626_pulse_index(struct comedi_device *dev,
                              unsigned int chan)
 {
         if (chan < 3) {
-                uint16_t cra;
+                u16 cra;
 
                 cra = s626_debi_read(dev, S626_LP_CRA(chan));
 
@@ -994,7 +994,7 @@ static void s626_pulse_index(struct comedi_device *dev,
                                 (cra ^ S626_CRAMSK_INDXPOL_A));
                 s626_debi_write(dev, S626_LP_CRA(chan), cra);
         } else {
-                uint16_t crb;
+                u16 crb;
 
                 crb = s626_debi_read(dev, S626_LP_CRB(chan));
                 crb &= ~S626_CRBMSK_INTCTRL;
@@ -1062,7 +1062,7 @@ static int s626_dio_clear_irq(struct comedi_device *dev)
 }
 
 static void s626_handle_dio_interrupt(struct comedi_device *dev,
-                                      uint16_t irqbit, uint8_t group)
+                                      u16 irqbit, u8 group)
 {
         struct s626_private *devpriv = dev->private;
         struct comedi_subdevice *s = dev->read_subdev;
@@ -1110,8 +1110,8 @@ static void s626_handle_dio_interrupt(struct comedi_device *dev,
 
 static void s626_check_dio_interrupts(struct comedi_device *dev)
 {
-        uint16_t irqbit;
-        uint8_t group;
+        u16 irqbit;
+        u8 group;
 
         for (group = 0; group < S626_DIO_BANKS; group++) {
                 /* read interrupt type */
@@ -1131,7 +1131,7 @@ static void s626_check_counter_interrupts(struct comedi_device *dev)
         struct comedi_subdevice *s = dev->read_subdev;
         struct comedi_async *async = s->async;
         struct comedi_cmd *cmd = &async->cmd;
-        uint16_t irqbit;
+        u16 irqbit;
 
         /* read interrupt type */
         irqbit = s626_debi_read(dev, S626_LP_RDMISC2);
@@ -1196,7 +1196,7 @@ static bool s626_handle_eos_interrupt(struct comedi_device *dev)
          * first uint16_t in the buffer because it contains junk data
          * from the final ADC of the previous poll list scan.
          */
-        uint32_t *readaddr = (uint32_t *)devpriv->ana_buf.logical_base + 1;
+        u32 *readaddr = (u32 *)devpriv->ana_buf.logical_base + 1;
         int i;
 
         /* get the data and hand it over to comedi */
@@ -1231,7 +1231,7 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
 {
         struct comedi_device *dev = d;
         unsigned long flags;
-        uint32_t irqtype, irqstatus;
+        u32 irqtype, irqstatus;
 
         if (!dev->attached)
                 return IRQ_NONE;
@@ -1272,25 +1272,25 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
 /*
  * This function builds the RPS program for hardware driven acquisition.
  */
-static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
+static void s626_reset_adc(struct comedi_device *dev, u8 *ppl)
 {
         struct s626_private *devpriv = dev->private;
         struct comedi_subdevice *s = dev->read_subdev;
         struct comedi_cmd *cmd = &s->async->cmd;
-        uint32_t *rps;
-        uint32_t jmp_adrs;
-        uint16_t i;
-        uint16_t n;
-        uint32_t local_ppl;
+        u32 *rps;
+        u32 jmp_adrs;
+        u16 i;
+        u16 n;
+        u32 local_ppl;
 
         /* Stop RPS program in case it is currently running */
         s626_mc_disable(dev, S626_MC1_ERPS1, S626_P_MC1);
 
         /* Set starting logical address to write RPS commands. */
-        rps = (uint32_t *)devpriv->rps_buf.logical_base;
+        rps = (u32 *)devpriv->rps_buf.logical_base;
 
         /* Initialize RPS instruction pointer */
-        writel((uint32_t)devpriv->rps_buf.physical_base,
+        writel((u32)devpriv->rps_buf.physical_base,
                dev->mmio + S626_P_RPSADDR1);
 
         /* Construct RPS program in rps_buf DMA buffer */
@@ -1372,8 +1372,8 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
                  * flushes the RPS' instruction prefetch pipeline.
                  */
                 jmp_adrs =
-                        (uint32_t)devpriv->rps_buf.physical_base +
-                        (uint32_t)((unsigned long)rps -
+                        (u32)devpriv->rps_buf.physical_base +
+                        (u32)((unsigned long)rps -
                                    (unsigned long)devpriv->
                                                   rps_buf.logical_base);
                 for (i = 0; i < (10 * S626_RPSCLK_PER_US / 2); i++) {
@@ -1408,7 +1408,7 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
                 /* Transfer ADC data from FB BUFFER 1 register to DMA buffer. */
                 *rps++ = S626_RPS_STREG |
                          (S626_BUGFIX_STREG(S626_P_FB_BUFFER1) >> 2);
-                *rps++ = (uint32_t)devpriv->ana_buf.physical_base +
+                *rps++ = (u32)devpriv->ana_buf.physical_base +
                          (devpriv->adc_items << 2);
 
                 /*
@@ -1452,7 +1452,7 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
 
         /* Transfer final ADC data from FB BUFFER 1 register to DMA buffer. */
         *rps++ = S626_RPS_STREG | (S626_BUGFIX_STREG(S626_P_FB_BUFFER1) >> 2);
-        *rps++ = (uint32_t)devpriv->ana_buf.physical_base +
+        *rps++ = (u32)devpriv->ana_buf.physical_base +
                  (devpriv->adc_items << 2);
 
         /* Indicate ADC scan loop is finished. */
@@ -1465,7 +1465,7 @@ static void s626_reset_adc(struct comedi_device *dev, uint8_t *ppl)
 
         /* Restart RPS program at its beginning. */
         *rps++ = S626_RPS_JUMP; /* Branch to start of RPS program. */
-        *rps++ = (uint32_t)devpriv->rps_buf.physical_base;
+        *rps++ = (u32)devpriv->rps_buf.physical_base;
 
         /* End of RPS program build */
 }
@@ -1488,11 +1488,11 @@ static int s626_ai_insn_read(struct comedi_device *dev,
                              struct comedi_insn *insn,
                              unsigned int *data)
 {
-        uint16_t chan = CR_CHAN(insn->chanspec);
-        uint16_t range = CR_RANGE(insn->chanspec);
-        uint16_t adc_spec = 0;
-        uint32_t gpio_image;
-        uint32_t tmp;
+        u16 chan = CR_CHAN(insn->chanspec);
+        u16 range = CR_RANGE(insn->chanspec);
+        u16 adc_spec = 0;
+        u32 gpio_image;
+        u32 tmp;
         int ret;
         int n;
 
@@ -1585,7 +1585,7 @@ static int s626_ai_insn_read(struct comedi_device *dev,
         return n;
 }
 
-static int s626_ai_load_polllist(uint8_t *ppl, struct comedi_cmd *cmd)
+static int s626_ai_load_polllist(u8 *ppl, struct comedi_cmd *cmd)
 {
         int n;
 
@@ -1651,7 +1651,7 @@ static int s626_ns_to_timer(unsigned int *nanosec, unsigned int flags)
 static void s626_timer_load(struct comedi_device *dev,
                             unsigned int chan, int tick)
 {
-        uint16_t setup =
+        u16 setup =
                 /* Preload upon index. */
                 S626_SET_STD_LOADSRC(S626_LOADSRC_INDX) |
                 /* Disable hardware index. */
@@ -1664,7 +1664,7 @@ static void s626_timer_load(struct comedi_device *dev,
                 S626_SET_STD_CLKMULT(S626_CLKMULT_1X) |
                 /* Enabled by index */
                 S626_SET_STD_CLKENAB(S626_CLKENAB_INDEX);
-        uint16_t value_latchsrc = S626_LATCHSRC_A_INDXA;
+        u16 value_latchsrc = S626_LATCHSRC_A_INDXA;
         /* uint16_t enab = S626_CLKENAB_ALWAYS; */
 
         s626_set_mode(dev, chan, setup, false);
@@ -1693,7 +1693,7 @@ static void s626_timer_load(struct comedi_device *dev,
 static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
         struct s626_private *devpriv = dev->private;
-        uint8_t ppl[16];
+        u8 ppl[16];
         struct comedi_cmd *cmd = &s->async->cmd;
         int tick;
 
@@ -1953,7 +1953,7 @@ static int s626_ao_insn_write(struct comedi_device *dev,
 
 static void s626_dio_init(struct comedi_device *dev)
 {
-        uint16_t group;
+        u16 group;
 
         /* Prepare to treat writes to WRCapSel as capture disables. */
         s626_debi_write(dev, S626_LP_MISC1, S626_MISC1_NOEDCAP);
@@ -2017,7 +2017,7 @@ static int s626_enc_insn_config(struct comedi_device *dev,
                                 struct comedi_insn *insn, unsigned int *data)
 {
         unsigned int chan = CR_CHAN(insn->chanspec);
-        uint16_t setup =
+        u16 setup =
                 /* Preload upon index. */
                 S626_SET_STD_LOADSRC(S626_LOADSRC_INDX) |
                 /* Disable hardware index. */
@@ -2032,8 +2032,8 @@ static int s626_enc_insn_config(struct comedi_device *dev,
                 S626_SET_STD_CLKENAB(S626_CLKENAB_INDEX);
         /* uint16_t disable_int_src = true; */
         /* uint32_t Preloadvalue;              //Counter initial value */
-        uint16_t value_latchsrc = S626_LATCHSRC_AB_READ;
-        uint16_t enab = S626_CLKENAB_ALWAYS;
+        u16 value_latchsrc = S626_LATCHSRC_AB_READ;
+        u16 enab = S626_CLKENAB_ALWAYS;
 
         /* (data==NULL) ? (Preloadvalue=0) : (Preloadvalue=data[0]); */
 
@@ -2052,7 +2052,7 @@ static int s626_enc_insn_read(struct comedi_device *dev,
                               unsigned int *data)
 {
         unsigned int chan = CR_CHAN(insn->chanspec);
-        uint16_t cntr_latch_reg = S626_LP_CNTR(chan);
+        u16 cntr_latch_reg = S626_LP_CNTR(chan);
         int i;
 
         for (i = 0; i < insn->n; i++) {
@@ -2090,7 +2090,7 @@ static int s626_enc_insn_write(struct comedi_device *dev,
         return 1;
 }
 
-static void s626_write_misc2(struct comedi_device *dev, uint16_t new_image)
+static void s626_write_misc2(struct comedi_device *dev, u16 new_image)
 {
         s626_debi_write(dev, S626_LP_MISC1, S626_MISC1_WENABLE);
         s626_debi_write(dev, S626_LP_WRMISC2, new_image);
@@ -2100,7 +2100,7 @@ static void s626_write_misc2(struct comedi_device *dev, uint16_t new_image)
 static void s626_counters_init(struct comedi_device *dev)
 {
         int chan;
-        uint16_t setup =
+        u16 setup =
                 /* Preload upon index. */
                 S626_SET_STD_LOADSRC(S626_LOADSRC_INDX) |
                 /* Disable hardware index. */
@@ -2169,7 +2169,7 @@ static int s626_initialize(struct comedi_device *dev)
 {
         struct s626_private *devpriv = dev->private;
         dma_addr_t phys_buf;
-        uint16_t chan;
+        u16 chan;
         int i;
         int ret;
 
@@ -2248,7 +2248,7 @@ static int s626_initialize(struct comedi_device *dev)
          */
 
         /* Physical start of RPS program */
-        writel((uint32_t)devpriv->rps_buf.physical_base,
+        writel((u32)devpriv->rps_buf.physical_base,
                dev->mmio + S626_P_RPSADDR1);
         /* RPS program performs no explicit mem writes */
         writel(0, dev->mmio + S626_P_RPSPAGE1);
@@ -2318,16 +2318,16 @@ static int s626_initialize(struct comedi_device *dev)
          * enabled.
          */
         phys_buf = devpriv->ana_buf.physical_base +
-                   (S626_DAC_WDMABUF_OS * sizeof(uint32_t));
-        writel((uint32_t)phys_buf, dev->mmio + S626_P_BASEA2_OUT);
-        writel((uint32_t)(phys_buf + sizeof(uint32_t)),
+                   (S626_DAC_WDMABUF_OS * sizeof(u32));
+        writel((u32)phys_buf, dev->mmio + S626_P_BASEA2_OUT);
+        writel((u32)(phys_buf + sizeof(u32)),
                dev->mmio + S626_P_PROTA2_OUT);
 
         /*
          * Cache Audio2's output DMA buffer logical address.  This is
          * where DAC data is buffered for A2 output DMA transfers.
          */
-        devpriv->dac_wbuf = (uint32_t *)devpriv->ana_buf.logical_base +
+        devpriv->dac_wbuf = (u32 *)devpriv->ana_buf.logical_base +
                             S626_DAC_WDMABUF_OS;
 
         /*
diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
index d0a8a28edd36..55d43c076b1c 100644
--- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
+++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c
@@ -250,3 +250,15 @@ int comedi_get_n_channels(struct comedi_device *dev, unsigned int subdevice)
         return n;
 }
 EXPORT_SYMBOL_GPL(comedi_get_n_channels);
+
+static int __init kcomedilib_module_init(void)
+{
+        return 0;
+}
+
+static void __exit kcomedilib_module_exit(void)
+{
+}
+
+module_init(kcomedilib_module_init);
+module_exit(kcomedilib_module_exit);
diff --git a/drivers/staging/dgnc/Makefile b/drivers/staging/dgnc/Makefile
index 995c874f40eb..40ff0d007695 100644
--- a/drivers/staging/dgnc/Makefile
+++ b/drivers/staging/dgnc/Makefile
@@ -2,5 +2,4 @@ obj-$(CONFIG_DGNC) += dgnc.o
 
 dgnc-objs :=   dgnc_cls.o dgnc_driver.o\
                dgnc_mgmt.o dgnc_neo.o\
-               dgnc_tty.o dgnc_sysfs.o\
-               dgnc_utils.o
+               dgnc_tty.o dgnc_utils.o
diff --git a/drivers/staging/dgnc/dgnc_cls.c b/drivers/staging/dgnc/dgnc_cls.c
index aedca66cbe41..c20ffdd254d8 100644
--- a/drivers/staging/dgnc/dgnc_cls.c
+++ b/drivers/staging/dgnc/dgnc_cls.c
@@ -385,9 +385,8 @@ static void cls_copy_data_from_uart_to_queue(struct channel_t *ch)
                 ch->ch_rxcount++;
         }
 
-        /*
-         * Write new final heads to channel structure.
-         */
+        /* Write new final heads to channel structure. */
+
         ch->ch_r_head = head & RQUEUEMASK;
         ch->ch_e_head = head & EQUEUEMASK;
 
@@ -666,9 +665,8 @@ static void cls_param(struct tty_struct *tty)
         if (!bd || bd->magic != DGNC_BOARD_MAGIC)
                 return;
 
-        /*
-         * If baud rate is zero, flush queues, and set mval to drop DTR.
-         */
+        /* If baud rate is zero, flush queues, and set mval to drop DTR. */
+
         if ((ch->ch_c_cflag & (CBAUD)) == 0) {
                 ch->ch_r_head = 0;
                 ch->ch_r_tail = 0;
@@ -887,9 +885,8 @@ static void cls_param(struct tty_struct *tty)
         cls_parse_modem(ch, readb(&ch->ch_cls_uart->msr));
 }
 
-/*
- * Our board poller function.
- */
+/* Our board poller function. */
+
 static void cls_tasklet(unsigned long data)
 {
         struct dgnc_board *bd = (struct dgnc_board *)data;
@@ -914,9 +911,8 @@ static void cls_tasklet(unsigned long data)
          */
         spin_lock_irqsave(&bd->bd_intr_lock, flags);
 
-        /*
-         * If board is ready, parse deeper to see if there is anything to do.
-         */
+        /* If board is ready, parse deeper to see if there is anything to do. */
+
         if ((state == BOARD_READY) && (ports > 0)) {
                 /* Loop on each port */
                 for (i = 0; i < ports; i++) {
@@ -938,9 +934,8 @@ static void cls_tasklet(unsigned long data)
                         cls_copy_data_from_queue_to_uart(ch);
                         dgnc_wakeup_writes(ch);
 
-                        /*
-                         * Check carrier function.
-                         */
+                        /* Check carrier function. */
+
                         dgnc_carrier(ch);
 
                         /*
@@ -992,9 +987,8 @@ static irqreturn_t cls_intr(int irq, void *voidbrd)
         for (i = 0; i < brd->nasync; i++)
                 cls_parse_isr(brd, i);
 
-        /*
-         * Schedule tasklet to more in-depth servicing at a better time.
-         */
+        /* Schedule tasklet to more in-depth servicing at a better time. */
+
         tasklet_schedule(&brd->helper_tasklet);
 
         spin_unlock_irqrestore(&brd->bd_intr_lock, flags);
@@ -1043,9 +1037,7 @@ static int cls_drain(struct tty_struct *tty, uint seconds)
         un->un_flags |= UN_EMPTY;
         spin_unlock_irqrestore(&ch->ch_lock, flags);
 
-        /*
-         * NOTE: Do something with time passed in.
-         */
+        /* NOTE: Do something with time passed in. */
 
         /* If ret is non-zero, user ctrl-c'ed us */
 
@@ -1112,9 +1104,8 @@ static void cls_uart_init(struct channel_t *ch)
         readb(&ch->ch_cls_uart->msr);
 }
 
-/*
- * Turns off UART.
- */
+/* Turns off UART.  */
+
 static void cls_uart_off(struct channel_t *ch)
 {
         writeb(0, &ch->ch_cls_uart->ier);
@@ -1160,9 +1151,8 @@ static void cls_send_break(struct channel_t *ch, int msecs)
         if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
                 return;
 
-        /*
-         * If we receive a time of 0, this means turn off the break.
-         */
+        /* If we receive a time of 0, this means turn off the break. */
+
         if (msecs == 0) {
                 /* Turn break off, and unset some variables */
                 if (ch->ch_flags & CH_BREAK_SENDING) {
diff --git a/drivers/staging/dgnc/dgnc_cls.h b/drivers/staging/dgnc/dgnc_cls.h
index 2597e36d38c4..463ad30efb3b 100644
--- a/drivers/staging/dgnc/dgnc_cls.h
+++ b/drivers/staging/dgnc/dgnc_cls.h
@@ -69,7 +69,7 @@ struct cls_uart_struct {
 #define UART_EXAR654_EFR_IXON     0x2     /* Receiver compares Xon1/Xoff1 */
 #define UART_EXAR654_EFR_IXOFF    0x8     /* Transmit Xon1/Xoff1 */
 #define UART_EXAR654_EFR_RTSDTR   0x40    /* Auto RTS/DTR Flow Control Enable */
-#define UART_EXAR654_EFR_CTSDSR   0x80    /* Auto CTS/DSR Flow COntrol Enable */
+#define UART_EXAR654_EFR_CTSDSR   0x80    /* Auto CTS/DSR Flow Control Enable */
 #define UART_EXAR654_IER_XOFF     0x20    /* Xoff Interrupt Enable */
 #define UART_EXAR654_IER_RTSDTR   0x40    /* Output Interrupt Enable */
 #define UART_EXAR654_IER_CTSDSR   0x80    /* Input Interrupt Enable */
diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c
index fd372d3afa46..5381dbddd8bb 100644
--- a/drivers/staging/dgnc/dgnc_driver.c
+++ b/drivers/staging/dgnc/dgnc_driver.c
@@ -24,31 +24,14 @@
 #include "dgnc_tty.h"
 #include "dgnc_cls.h"
 #include "dgnc_neo.h"
-#include "dgnc_sysfs.h"
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Digi International, http://www.digi.com");
 MODULE_DESCRIPTION("Driver for the Digi International Neo and Classic PCI based product line");
 MODULE_SUPPORTED_DEVICE("dgnc");
 
-/**************************************************************************
- *
- * protos for this file
- *
- */
-static int              dgnc_start(void);
-static int dgnc_request_irq(struct dgnc_board *brd);
-static void dgnc_free_irq(struct dgnc_board *brd);
-static struct dgnc_board *dgnc_found_board(struct pci_dev *pdev, int id);
-static void             dgnc_cleanup_board(struct dgnc_board *brd);
-static void             dgnc_poll_handler(ulong dummy);
-static int              dgnc_init_one(struct pci_dev *pdev,
-                                      const struct pci_device_id *ent);
-static int              dgnc_do_remap(struct dgnc_board *brd);
+/* File operations permitted on Control/Management major. */
 
-/*
- * File operations permitted on Control/Management major.
- */
 static const struct file_operations dgnc_board_fops = {
         .owner          =       THIS_MODULE,
         .unlocked_ioctl =       dgnc_mgmt_ioctl,
@@ -56,9 +39,8 @@ static const struct file_operations dgnc_board_fops = {
         .release        =       dgnc_mgmt_close
 };
 
-/*
- * Globals
- */
+/* Globals */
+
 uint                    dgnc_num_boards;
 struct dgnc_board               *dgnc_board[MAXBOARDS];
 DEFINE_SPINLOCK(dgnc_global_lock);
@@ -66,14 +48,12 @@ DEFINE_SPINLOCK(dgnc_poll_lock); /* Poll scheduling lock */
 uint                    dgnc_major;
 int                     dgnc_poll_tick = 20;    /* Poll interval - 20 ms */
 
-/*
- * Static vars.
- */
+/* Static vars. */
+
 static struct class *dgnc_class;
 
-/*
- * Poller stuff
- */
+/* Poller stuff */
+
 static ulong            dgnc_poll_time; /* Time of next poll */
 static uint             dgnc_poll_stop; /* Used to tell poller to stop */
 static struct timer_list dgnc_poll_timer;
@@ -93,7 +73,7 @@ struct board_id {
         unsigned int is_pci_express;
 };
 
-static struct board_id dgnc_ids[] = {
+static const struct board_id dgnc_ids[] = {
         {       PCI_DEVICE_CLASSIC_4_PCI_NAME,          4,      0       },
         {       PCI_DEVICE_CLASSIC_4_422_PCI_NAME,      4,      0       },
         {       PCI_DEVICE_CLASSIC_8_PCI_NAME,          8,      0       },
@@ -114,274 +94,20 @@ static struct board_id dgnc_ids[] = {
         {       NULL,                                   0,      0       }
 };
 
-static struct pci_driver dgnc_driver = {
-        .name           = "dgnc",
-        .probe          = dgnc_init_one,
-        .id_table       = dgnc_pci_tbl,
-};
-
-/************************************************************************
- *
- * Driver load/unload functions
- *
- ************************************************************************/
-
-static void cleanup(bool sysfiles)
-{
-        int i;
-        unsigned long flags;
-
-        spin_lock_irqsave(&dgnc_poll_lock, flags);
-        dgnc_poll_stop = 1;
-        spin_unlock_irqrestore(&dgnc_poll_lock, flags);
-
-        /* Turn off poller right away. */
-        del_timer_sync(&dgnc_poll_timer);
-
-        if (sysfiles)
-                dgnc_remove_driver_sysfiles(&dgnc_driver);
-
-        device_destroy(dgnc_class, MKDEV(dgnc_major, 0));
-        class_destroy(dgnc_class);
-        unregister_chrdev(dgnc_major, "dgnc");
-
-        for (i = 0; i < dgnc_num_boards; ++i) {
-                dgnc_remove_ports_sysfiles(dgnc_board[i]);
-                dgnc_cleanup_tty(dgnc_board[i]);
-                dgnc_cleanup_board(dgnc_board[i]);
-        }
-
-        dgnc_tty_post_uninit();
-}
-
-/*
- * dgnc_cleanup_module()
- *
- * Module unload.  This is where it all ends.
- */
-static void __exit dgnc_cleanup_module(void)
-{
-        cleanup(true);
-        pci_unregister_driver(&dgnc_driver);
-}
-
-/*
- * init_module()
- *
- * Module load.  This is where it all starts.
- */
-static int __init dgnc_init_module(void)
-{
-        int rc;
-
-        /*
-         * Initialize global stuff
-         */
-        rc = dgnc_start();
-
-        if (rc < 0)
-                return rc;
-
-        /*
-         * Find and configure all the cards
-         */
-        rc = pci_register_driver(&dgnc_driver);
-        if (rc) {
-                pr_warn("WARNING: dgnc driver load failed.  No Digi Neo or Classic boards found.\n");
-                cleanup(false);
-                return rc;
-        }
-        dgnc_create_driver_sysfiles(&dgnc_driver);
-
-        return 0;
-}
-
-module_init(dgnc_init_module);
-module_exit(dgnc_cleanup_module);
+/* Remap PCI memory. */
 
-/*
- * Start of driver.
- */
-static int dgnc_start(void)
+static int dgnc_do_remap(struct dgnc_board *brd)
 {
         int rc = 0;
-        unsigned long flags;
-        struct device *dev;
-
-        /* make sure timer is initialized before we do anything else */
-        init_timer(&dgnc_poll_timer);
-
-        /*
-         * Register our base character device into the kernel.
-         * This allows the download daemon to connect to the downld device
-         * before any of the boards are init'ed.
-         *
-         * Register management/dpa devices
-         */
-        rc = register_chrdev(0, "dgnc", &dgnc_board_fops);
-        if (rc < 0) {
-                pr_err(DRVSTR ": Can't register dgnc driver device (%d)\n", rc);
-                return rc;
-        }
-        dgnc_major = rc;
-
-        dgnc_class = class_create(THIS_MODULE, "dgnc_mgmt");
-        if (IS_ERR(dgnc_class)) {
-                rc = PTR_ERR(dgnc_class);
-                pr_err(DRVSTR ": Can't create dgnc_mgmt class (%d)\n", rc);
-                goto failed_class;
-        }
-
-        dev = device_create(dgnc_class, NULL,
-                            MKDEV(dgnc_major, 0),
-                        NULL, "dgnc_mgmt");
-        if (IS_ERR(dev)) {
-                rc = PTR_ERR(dev);
-                pr_err(DRVSTR ": Can't create device (%d)\n", rc);
-                goto failed_device;
-        }
-
-        /*
-         * Init any global tty stuff.
-         */
-        rc = dgnc_tty_preinit();
-
-        if (rc < 0) {
-                pr_err(DRVSTR ": tty preinit - not enough memory (%d)\n", rc);
-                goto failed_tty;
-        }
-
-        /* Start the poller */
-        spin_lock_irqsave(&dgnc_poll_lock, flags);
-        setup_timer(&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);
-
-        add_timer(&dgnc_poll_timer);
-
-        return 0;
-
-failed_tty:
-        device_destroy(dgnc_class, MKDEV(dgnc_major, 0));
-failed_device:
-        class_destroy(dgnc_class);
-failed_class:
-        unregister_chrdev(dgnc_major, "dgnc");
-        return rc;
-}
-
-/* returns count (>= 0), or negative on error */
-static int dgnc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-        int rc;
-        struct dgnc_board *brd;
-
-        /* wake up and enable device */
-        rc = pci_enable_device(pdev);
-
-        if (rc)
-                return -EIO;
-
-        brd = dgnc_found_board(pdev, ent->driver_data);
-        if (IS_ERR(brd))
-                return PTR_ERR(brd);
-
-        /*
-         * Do tty device initialization.
-         */
-
-        rc = dgnc_tty_register(brd);
-        if (rc < 0) {
-                pr_err(DRVSTR ": Can't register tty devices (%d)\n", rc);
-                goto failed;
-        }
-
-        rc = dgnc_request_irq(brd);
-        if (rc < 0) {
-                pr_err(DRVSTR ": Can't finalize board init (%d)\n", rc);
-                goto unregister_tty;
-        }
-
-        rc = dgnc_tty_init(brd);
-        if (rc < 0) {
-                pr_err(DRVSTR ": Can't init tty devices (%d)\n", rc);
-                goto free_irq;
-        }
-
-        brd->state = BOARD_READY;
-        brd->dpastatus = BD_RUNNING;
 
-        dgnc_create_ports_sysfiles(brd);
-
-        dgnc_board[dgnc_num_boards++] = brd;
-
-        return 0;
-
-free_irq:
-        dgnc_free_irq(brd);
-unregister_tty:
-        dgnc_tty_unregister(brd);
-
-failed:
-        kfree(brd);
+        brd->re_map_membase = ioremap(brd->membase, 0x1000);
+        if (!brd->re_map_membase)
+                rc = -ENOMEM;
 
         return rc;
 }
 
 /*
- * dgnc_cleanup_board()
- *
- * Free all the memory associated with a board
- */
-static void dgnc_cleanup_board(struct dgnc_board *brd)
-{
-        int i = 0;
-
-        if (!brd || brd->magic != DGNC_BOARD_MAGIC)
-                return;
-
-        switch (brd->device) {
-        case PCI_DEVICE_CLASSIC_4_DID:
-        case PCI_DEVICE_CLASSIC_8_DID:
-        case PCI_DEVICE_CLASSIC_4_422_DID:
-        case PCI_DEVICE_CLASSIC_8_422_DID:
-
-                /* Tell card not to interrupt anymore. */
-                outb(0, brd->iobase + 0x4c);
-                break;
-
-        default:
-                break;
-        }
-
-        if (brd->irq)
-                free_irq(brd->irq, brd);
-
-        tasklet_kill(&brd->helper_tasklet);
-
-        if (brd->re_map_membase) {
-                iounmap(brd->re_map_membase);
-                brd->re_map_membase = NULL;
-        }
-
-        /* Free all allocated channels structs */
-        for (i = 0; i < MAXPORTS ; i++) {
-                if (brd->channels[i]) {
-                        kfree(brd->channels[i]->ch_rqueue);
-                        kfree(brd->channels[i]->ch_equeue);
-                        kfree(brd->channels[i]->ch_wqueue);
-                        kfree(brd->channels[i]);
-                        brd->channels[i] = NULL;
-                }
-        }
-
-        dgnc_board[brd->boardnum] = NULL;
-
-        kfree(brd);
-}
-
-/*
  * dgnc_found_board()
  *
  * A board has been found, init it.
@@ -587,21 +313,6 @@ static void dgnc_free_irq(struct dgnc_board *brd)
 }
 
 /*
- * Remap PCI memory.
- */
-static int dgnc_do_remap(struct dgnc_board *brd)
-{
-        int rc = 0;
-
-        brd->re_map_membase = ioremap(brd->membase, 0x1000);
-        if (!brd->re_map_membase)
-                rc = -ENOMEM;
-
-        return rc;
-}
-
-/*
- *
  * Function:
  *
  *    dgnc_poll_handler
@@ -623,7 +334,6 @@ static int dgnc_do_remap(struct dgnc_board *brd)
  *    As each timer expires, it determines (a) whether the "transmit"
  *    waiter needs to be woken up, and (b) whether the poller needs to
  *    be rescheduled.
- *
  */
 
 static void dgnc_poll_handler(ulong dummy)
@@ -651,9 +361,8 @@ static void dgnc_poll_handler(ulong dummy)
                 spin_unlock_irqrestore(&brd->bd_lock, flags);
         }
 
-        /*
-         * Schedule ourself back at the nominal wakeup interval.
-         */
+        /* Schedule ourself back at the nominal wakeup interval. */
+
         spin_lock_irqsave(&dgnc_poll_lock, flags);
         dgnc_poll_time += dgnc_jiffies_from_ms(dgnc_poll_tick);
 
@@ -669,3 +378,240 @@ static void dgnc_poll_handler(ulong dummy)
         if (!dgnc_poll_stop)
                 add_timer(&dgnc_poll_timer);
 }
+
+/* returns count (>= 0), or negative on error */
+static int dgnc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        int rc;
+        struct dgnc_board *brd;
+
+        /* wake up and enable device */
+        rc = pci_enable_device(pdev);
+
+        if (rc)
+                return -EIO;
+
+        brd = dgnc_found_board(pdev, ent->driver_data);
+        if (IS_ERR(brd))
+                return PTR_ERR(brd);
+
+        /* Do tty device initialization. */
+
+        rc = dgnc_tty_register(brd);
+        if (rc < 0) {
+                pr_err(DRVSTR ": Can't register tty devices (%d)\n", rc);
+                goto failed;
+        }
+
+        rc = dgnc_request_irq(brd);
+        if (rc < 0) {
+                pr_err(DRVSTR ": Can't finalize board init (%d)\n", rc);
+                goto unregister_tty;
+        }
+
+        rc = dgnc_tty_init(brd);
+        if (rc < 0) {
+                pr_err(DRVSTR ": Can't init tty devices (%d)\n", rc);
+                goto free_irq;
+        }
+
+        brd->state = BOARD_READY;
+        brd->dpastatus = BD_RUNNING;
+
+        dgnc_board[dgnc_num_boards++] = brd;
+
+        return 0;
+
+free_irq:
+        dgnc_free_irq(brd);
+unregister_tty:
+        dgnc_tty_unregister(brd);
+
+failed:
+        kfree(brd);
+
+        return rc;
+}
+
+static struct pci_driver dgnc_driver = {
+        .name           = "dgnc",
+        .probe          = dgnc_init_one,
+        .id_table       = dgnc_pci_tbl,
+};
+
+/* Start of driver. */
+
+static int dgnc_start(void)
+{
+        int rc = 0;
+        unsigned long flags;
+        struct device *dev;
+
+        /* make sure timer is initialized before we do anything else */
+        init_timer(&dgnc_poll_timer);
+
+        /*
+         * Register our base character device into the kernel.
+         * This allows the download daemon to connect to the downld device
+         * before any of the boards are init'ed.
+         *
+         * Register management/dpa devices
+         */
+        rc = register_chrdev(0, "dgnc", &dgnc_board_fops);
+        if (rc < 0) {
+                pr_err(DRVSTR ": Can't register dgnc driver device (%d)\n", rc);
+                return rc;
+        }
+        dgnc_major = rc;
+
+        dgnc_class = class_create(THIS_MODULE, "dgnc_mgmt");
+        if (IS_ERR(dgnc_class)) {
+                rc = PTR_ERR(dgnc_class);
+                pr_err(DRVSTR ": Can't create dgnc_mgmt class (%d)\n", rc);
+                goto failed_class;
+        }
+
+        dev = device_create(dgnc_class, NULL,
+                            MKDEV(dgnc_major, 0),
+                        NULL, "dgnc_mgmt");
+        if (IS_ERR(dev)) {
+                rc = PTR_ERR(dev);
+                pr_err(DRVSTR ": Can't create device (%d)\n", rc);
+                goto failed_device;
+        }
+
+        /* Start the poller */
+        spin_lock_irqsave(&dgnc_poll_lock, flags);
+        setup_timer(&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);
+
+        add_timer(&dgnc_poll_timer);
+
+        return 0;
+
+failed_device:
+        class_destroy(dgnc_class);
+failed_class:
+        unregister_chrdev(dgnc_major, "dgnc");
+        return rc;
+}
+
+/*
+ * dgnc_cleanup_board()
+ *
+ * Free all the memory associated with a board
+ */
+static void dgnc_cleanup_board(struct dgnc_board *brd)
+{
+        int i = 0;
+
+        if (!brd || brd->magic != DGNC_BOARD_MAGIC)
+                return;
+
+        switch (brd->device) {
+        case PCI_DEVICE_CLASSIC_4_DID:
+        case PCI_DEVICE_CLASSIC_8_DID:
+        case PCI_DEVICE_CLASSIC_4_422_DID:
+        case PCI_DEVICE_CLASSIC_8_422_DID:
+
+                /* Tell card not to interrupt anymore. */
+                outb(0, brd->iobase + 0x4c);
+                break;
+
+        default:
+                break;
+        }
+
+        if (brd->irq)
+                free_irq(brd->irq, brd);
+
+        tasklet_kill(&brd->helper_tasklet);
+
+        if (brd->re_map_membase) {
+                iounmap(brd->re_map_membase);
+                brd->re_map_membase = NULL;
+        }
+
+        /* Free all allocated channels structs */
+        for (i = 0; i < MAXPORTS ; i++) {
+                if (brd->channels[i]) {
+                        kfree(brd->channels[i]->ch_rqueue);
+                        kfree(brd->channels[i]->ch_equeue);
+                        kfree(brd->channels[i]->ch_wqueue);
+                        kfree(brd->channels[i]);
+                        brd->channels[i] = NULL;
+                }
+        }
+
+        dgnc_board[brd->boardnum] = NULL;
+
+        kfree(brd);
+}
+
+/* Driver load/unload functions */
+
+static void cleanup(void)
+{
+        int i;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dgnc_poll_lock, flags);
+        dgnc_poll_stop = 1;
+        spin_unlock_irqrestore(&dgnc_poll_lock, flags);
+
+        /* Turn off poller right away. */
+        del_timer_sync(&dgnc_poll_timer);
+
+        device_destroy(dgnc_class, MKDEV(dgnc_major, 0));
+        class_destroy(dgnc_class);
+        unregister_chrdev(dgnc_major, "dgnc");
+
+        for (i = 0; i < dgnc_num_boards; ++i) {
+                dgnc_cleanup_tty(dgnc_board[i]);
+                dgnc_cleanup_board(dgnc_board[i]);
+        }
+}
+
+/*
+ * dgnc_cleanup_module()
+ *
+ * Module unload.  This is where it all ends.
+ */
+static void __exit dgnc_cleanup_module(void)
+{
+        cleanup();
+        pci_unregister_driver(&dgnc_driver);
+}
+
+/*
+ * init_module()
+ *
+ * Module load.  This is where it all starts.
+ */
+static int __init dgnc_init_module(void)
+{
+        int rc;
+
+        /* Initialize global stuff */
+
+        rc = dgnc_start();
+
+        if (rc < 0)
+                return rc;
+
+        /* Find and configure all the cards */
+
+        rc = pci_register_driver(&dgnc_driver);
+        if (rc) {
+                pr_warn("WARNING: dgnc driver load failed.  No Digi Neo or Classic boards found.\n");
+                cleanup();
+                return rc;
+        }
+
+        return 0;
+}
+
+module_init(dgnc_init_module);
+module_exit(dgnc_cleanup_module);
diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h
index 879202663a98..c8119f2fe881 100644
--- a/drivers/staging/dgnc/dgnc_driver.h
+++ b/drivers/staging/dgnc/dgnc_driver.h
@@ -12,11 +12,8 @@
  * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  * PURPOSE.  See the GNU General Public License for more details.
  *
- *************************************************************************
- *
  * Driver includes
- *
- *************************************************************************/
+ */
 
 #ifndef __DGNC_DRIVER_H
 #define __DGNC_DRIVER_H
@@ -26,19 +23,14 @@
 #include <linux/interrupt.h>
 
 #include "digi.h"               /* Digi specific ioctl header */
-#include "dgnc_sysfs.h"         /* Support for SYSFS */
 
-/*************************************************************************
- *
- * Driver defines
- *
- *************************************************************************/
+/* Driver defines */
 
-/* Driver identification and error statments */
-#define PROCSTR         "dgnc"                  /* /proc entries         */
-#define DEVSTR          "/dev/dg/dgnc"          /* /dev entries          */
-#define DRVSTR          "dgnc"                  /* Driver name string    */
-#define DG_PART         "40002369_F"            /* RPM part number       */
+/* Driver identification and error statements */
+#define PROCSTR         "dgnc"                  /* /proc entries */
+#define DEVSTR          "/dev/dg/dgnc"          /* /dev entries */
+#define DRVSTR          "dgnc"                  /* Driver name string */
+#define DG_PART         "40002369_F"            /* RPM part number */
 
 #define TRC_TO_CONSOLE 1
 
@@ -61,7 +53,8 @@
 #define PORT_NUM(dev)   ((dev) & 0x7f)
 #define IS_PRINT(dev)   (((dev) & 0xff) >= 0x80)
 
-/* MAX number of stop characters we will send
+/*
+ *MAX number of stop characters we will send
  * when our read queue is getting full
  */
 #define MAX_STOPS_SENT 5
@@ -88,35 +81,28 @@
 #define   _POSIX_VDISABLE '\0'
 #endif
 
-/*
- * All the possible states the driver can be while being loaded.
- */
+/* All the possible states the driver can be while being loaded. */
+
 enum {
         DRIVER_INITIALIZED = 0,
         DRIVER_READY
 };
 
-/*
- * All the possible states the board can be while booting up.
- */
+/* All the possible states the board can be while booting up. */
+
 enum {
         BOARD_FAILED = 0,
         BOARD_FOUND,
         BOARD_READY
 };
 
-/*************************************************************************
- *
- * Structures and closely related defines.
- *
- *************************************************************************/
+/* Structures and closely related defines. */
 
 struct dgnc_board;
 struct channel_t;
 
-/************************************************************************
- * Per board operations structure                                      *
- ************************************************************************/
+/* Per board operations structure */
+
 struct board_ops {
         void (*tasklet)(unsigned long data);
         irqreturn_t (*intr)(int irq, void *voidbrd);
@@ -138,16 +124,14 @@ struct board_ops {
         void (*send_immediate_char)(struct channel_t *ch, unsigned char);
 };
 
-/************************************************************************
- * Device flag definitions for bd_flags.
- ************************************************************************/
+/* Device flag definitions for bd_flags. */
+
 #define BD_IS_PCI_EXPRESS     0x0001      /* Is a PCI Express board */
 
-/*
- *      Per-board information
- */
+/*      Per-board information */
+
 struct dgnc_board {
-        int             magic;          /* Board Magic number.  */
+        int             magic;          /* Board Magic number. */
         int             boardnum;       /* Board number: 0-32 */
 
         int             type;           /* Type of board */
@@ -220,62 +204,56 @@ struct dgnc_board {
 
 };
 
-/************************************************************************
- * Unit flag definitions for un_flags.
- ************************************************************************/
-#define UN_ISOPEN       0x0001          /* Device is open               */
-#define UN_CLOSING      0x0002          /* Line is being closed         */
-#define UN_IMM          0x0004          /* Service immediately          */
-#define UN_BUSY         0x0008          /* Some work this channel       */
-#define UN_BREAKI       0x0010          /* Input break received         */
+/* Unit flag definitions for un_flags. */
+#define UN_ISOPEN       0x0001          /* Device is open */
+#define UN_CLOSING      0x0002          /* Line is being closed */
+#define UN_IMM          0x0004          /* Service immediately */
+#define UN_BUSY         0x0008          /* Some work this channel */
+#define UN_BREAKI       0x0010          /* Input break received */
 #define UN_PWAIT        0x0020          /* Printer waiting for terminal */
-#define UN_TIME         0x0040          /* Waiting on time              */
-#define UN_EMPTY        0x0080          /* Waiting output queue empty   */
+#define UN_TIME         0x0040          /* Waiting on time */
+#define UN_EMPTY        0x0080          /* Waiting output queue empty */
 #define UN_LOW          0x0100          /* Waiting output low water mark*/
-#define UN_EXCL_OPEN    0x0200          /* Open for exclusive use       */
-#define UN_WOPEN        0x0400          /* Device waiting for open      */
-#define UN_WIOCTL       0x0800          /* Device waiting for open      */
-#define UN_HANGUP       0x8000          /* Carrier lost                 */
+#define UN_EXCL_OPEN    0x0200          /* Open for exclusive use */
+#define UN_WOPEN        0x0400          /* Device waiting for open */
+#define UN_WIOCTL       0x0800          /* Device waiting for open */
+#define UN_HANGUP       0x8000          /* Carrier lost */
 
 struct device;
 
-/************************************************************************
- * Structure for terminal or printer unit.
- ************************************************************************/
+/* Structure for terminal or printer unit. */
 struct un_t {
-        int     magic;          /* Unit Magic Number.                   */
+        int     magic;          /* Unit Magic Number. */
         struct  channel_t *un_ch;
         ulong   un_time;
         uint    un_type;
-        uint    un_open_count;  /* Counter of opens to port             */
-        struct tty_struct *un_tty;/* Pointer to unit tty structure      */
-        uint    un_flags;       /* Unit flags                           */
+        uint    un_open_count;          /* Counter of opens to port */
+        struct tty_struct *un_tty;      /* Pointer to unit tty structure */
+        uint    un_flags;               /* Unit flags */
         wait_queue_head_t un_flags_wait; /* Place to sleep to wait on unit */
-        uint    un_dev;         /* Minor device number                  */
+        uint    un_dev;                 /* Minor device number */
         struct device *un_sysfs;
 };
 
-/************************************************************************
- * Device flag definitions for ch_flags.
- ************************************************************************/
-#define CH_PRON         0x0001          /* Printer on string            */
-#define CH_STOP         0x0002          /* Output is stopped            */
-#define CH_STOPI        0x0004          /* Input is stopped             */
-#define CH_CD           0x0008          /* Carrier is present           */
-#define CH_FCAR         0x0010          /* Carrier forced on            */
-#define CH_HANGUP       0x0020          /* Hangup received              */
-
-#define CH_RECEIVER_OFF 0x0040          /* Receiver is off              */
-#define CH_OPENING      0x0080          /* Port in fragile open state   */
-#define CH_CLOSING      0x0100          /* Port in fragile close state  */
-#define CH_FIFO_ENABLED 0x0200          /* Port has FIFOs enabled       */
-#define CH_TX_FIFO_EMPTY 0x0400         /* TX Fifo is completely empty  */
-#define CH_TX_FIFO_LWM  0x0800          /* TX Fifo is below Low Water   */
-#define CH_BREAK_SENDING 0x1000         /* Break is being sent          */
-#define CH_LOOPBACK 0x2000              /* Channel is in lookback mode  */
+/* Device flag definitions for ch_flags. */
+#define CH_PRON         0x0001          /* Printer on string */
+#define CH_STOP         0x0002          /* Output is stopped */
+#define CH_STOPI        0x0004          /* Input is stopped */
+#define CH_CD           0x0008          /* Carrier is present */
+#define CH_FCAR         0x0010          /* Carrier forced on */
+#define CH_HANGUP       0x0020          /* Hangup received */
+
+#define CH_RECEIVER_OFF 0x0040          /* Receiver is off */
+#define CH_OPENING      0x0080          /* Port in fragile open state */
+#define CH_CLOSING      0x0100          /* Port in fragile close state */
+#define CH_FIFO_ENABLED 0x0200          /* Port has FIFOs enabled */
+#define CH_TX_FIFO_EMPTY 0x0400         /* TX Fifo is completely empty */
+#define CH_TX_FIFO_LWM  0x0800          /* TX Fifo is below Low Water */
+#define CH_BREAK_SENDING 0x1000         /* Break is being sent */
+#define CH_LOOPBACK     0x2000          /* Channel is in lookback mode */
 #define CH_BAUD0        0x08000         /* Used for checking B0 transitions */
-#define CH_FORCED_STOP  0x20000         /* Output is forcibly stopped   */
-#define CH_FORCED_STOPI 0x40000         /* Input is forcibly stopped    */
+#define CH_FORCED_STOP  0x20000         /* Output is forcibly stopped */
+#define CH_FORCED_STOPI 0x40000         /* Input is forcibly stopped */
 
 /* Our Read/Error/Write queue sizes */
 #define RQUEUEMASK      0x1FFF          /* 8 K - 1 */
@@ -285,43 +263,41 @@ struct un_t {
 #define EQUEUESIZE      RQUEUESIZE
 #define WQUEUESIZE      (WQUEUEMASK + 1)
 
-/************************************************************************
- * Channel information structure.
- ************************************************************************/
+/* Channel information structure. */
 struct channel_t {
-        int magic;                      /* Channel Magic Number         */
-        struct dgnc_board       *ch_bd;         /* Board structure pointer */
+        int magic;                      /* Channel Magic Number */
+        struct dgnc_board *ch_bd;       /* Board structure pointer */
         struct digi_t   ch_digi;        /* Transparent Print structure  */
-        struct un_t     ch_tun;         /* Terminal unit info      */
-        struct un_t     ch_pun;         /* Printer unit info        */
+        struct un_t     ch_tun;         /* Terminal unit info */
+        struct un_t     ch_pun;         /* Printer unit info */
 
         spinlock_t      ch_lock;        /* provide for serialization */
         wait_queue_head_t ch_flags_wait;
 
-        uint            ch_portnum;     /* Port number, 0 offset.       */
-        uint            ch_open_count;  /* open count                   */
-        uint            ch_flags;       /* Channel flags                */
+        uint            ch_portnum;     /* Port number, 0 offset. */
+        uint            ch_open_count;  /* open count */
+        uint            ch_flags;       /* Channel flags */
 
         ulong           ch_close_delay; /* How long we should
                                          * drop RTS/DTR for
                                          */
 
-        ulong           ch_cpstime;     /* Time for CPS calculations    */
+        ulong           ch_cpstime;     /* Time for CPS calculations */
 
-        tcflag_t        ch_c_iflag;     /* channel iflags              */
-        tcflag_t        ch_c_cflag;     /* channel cflags              */
-        tcflag_t        ch_c_oflag;     /* channel oflags              */
-        tcflag_t        ch_c_lflag;     /* channel lflags              */
-        unsigned char   ch_stopc;       /* Stop character              */
-        unsigned char   ch_startc;      /* Start character            */
+        tcflag_t        ch_c_iflag;     /* channel iflags */
+        tcflag_t        ch_c_cflag;     /* channel cflags */
+        tcflag_t        ch_c_oflag;     /* channel oflags */
+        tcflag_t        ch_c_lflag;     /* channel lflags */
+        unsigned char   ch_stopc;       /* Stop character */
+        unsigned char   ch_startc;      /* Start character */
 
         uint            ch_old_baud;    /* Cache of the current baud */
         uint            ch_custom_speed;/* Custom baud, if set */
 
         uint            ch_wopen;       /* Waiting for open process cnt */
 
-        unsigned char           ch_mostat;      /* FEP output modem status */
-        unsigned char           ch_mistat;      /* FEP input modem status */
+        unsigned char   ch_mostat;      /* FEP output modem status */
+        unsigned char   ch_mistat;      /* FEP input modem status */
 
         struct neo_uart_struct __iomem *ch_neo_uart;    /* Pointer to the
                                                          * "mapped" UART struct
@@ -347,10 +323,10 @@ struct channel_t {
         ulong           ch_rxcount;     /* total of data received so far */
         ulong           ch_txcount;     /* total of data transmitted so far */
 
-        unsigned char           ch_r_tlevel;    /* Receive Trigger level */
-        unsigned char           ch_t_tlevel;    /* Transmit Trigger level */
+        unsigned char   ch_r_tlevel;    /* Receive Trigger level */
+        unsigned char   ch_t_tlevel;    /* Transmit Trigger level */
 
-        unsigned char           ch_r_watermark; /* Receive Watermark */
+        unsigned char   ch_r_watermark; /* Receive Watermark */
 
         ulong           ch_stop_sending_break;  /* Time we should STOP
                                                  * sending a break
@@ -374,16 +350,15 @@ struct channel_t {
 
 };
 
-/*
- * Our Global Variables.
- */
+/* Our Global Variables. */
+
 extern uint             dgnc_major;             /* Our driver/mgmt major */
 extern int              dgnc_poll_tick;         /* Poll interval - 20 ms */
 extern spinlock_t       dgnc_global_lock;       /* Driver global spinlock */
 extern spinlock_t       dgnc_poll_lock;         /* Poll scheduling lock */
 extern uint             dgnc_num_boards;        /* Total number of boards */
-extern struct dgnc_board        *dgnc_board[MAXBOARDS]; /* Array of board
-                                                         * structs
-                                                         */
+extern struct dgnc_board *dgnc_board[MAXBOARDS];/* Array of board
+                                                 * structs
+                                                 */
 
 #endif
diff --git a/drivers/staging/dgnc/dgnc_mgmt.c b/drivers/staging/dgnc/dgnc_mgmt.c
index 683c098391d9..9d9b15d6358a 100644
--- a/drivers/staging/dgnc/dgnc_mgmt.c
+++ b/drivers/staging/dgnc/dgnc_mgmt.c
@@ -13,13 +13,11 @@
  * PURPOSE.  See the GNU General Public License for more details.
  */
 
-/************************************************************************
- *
+/*
  * This file implements the mgmt functionality for the
  * Neo and ClassicBoard based product lines.
- *
- ************************************************************************
  */
+
 #include <linux/kernel.h>
 #include <linux/ctype.h>
 #include <linux/sched.h>        /* For jiffies, task states */
diff --git a/drivers/staging/dgnc/dgnc_neo.c b/drivers/staging/dgnc/dgnc_neo.c
index 5becb3741b67..3eefefe53174 100644
--- a/drivers/staging/dgnc/dgnc_neo.c
+++ b/drivers/staging/dgnc/dgnc_neo.c
@@ -107,7 +107,8 @@ static inline void neo_set_cts_flow_control(struct channel_t *ch)
         /* Turn off auto Xon flow control */
         efr &= ~UART_17158_EFR_IXON;
 
-        /* Why? Because Exar's spec says we have to zero it
+        /*
+         * Why? Because Exar's spec says we have to zero it
          * out before setting it
          */
         writeb(0, &ch->ch_neo_uart->efr);
@@ -145,7 +146,8 @@ static inline void neo_set_rts_flow_control(struct channel_t *ch)
         ier &= ~UART_17158_IER_XOFF;
         efr &= ~UART_17158_EFR_IXOFF;
 
-        /* Why? Because Exar's spec says we have to zero it
+        /*
+         * Why? Because Exar's spec says we have to zero it
          * out before setting it
          */
         writeb(0, &ch->ch_neo_uart->efr);
@@ -185,7 +187,8 @@ static inline void neo_set_ixon_flow_control(struct channel_t *ch)
         /* Turn on auto Xon flow control */
         efr |= (UART_17158_EFR_ECB | UART_17158_EFR_IXON);
 
-        /* Why? Because Exar's spec says we have to zero it
+        /*
+         * Why? Because Exar's spec says we have to zero it
          * out before setting it
          */
         writeb(0, &ch->ch_neo_uart->efr);
@@ -225,7 +228,8 @@ static inline void neo_set_ixoff_flow_control(struct channel_t *ch)
         ier |= UART_17158_IER_XOFF;
         efr |= (UART_17158_EFR_ECB | UART_17158_EFR_IXOFF);
 
-        /* Why? Because Exar's spec says we have to zero it
+        /*
+         * Why? Because Exar's spec says we have to zero it
          * out before setting it
          */
         writeb(0, &ch->ch_neo_uart->efr);
@@ -268,7 +272,8 @@ static inline void neo_set_no_input_flow_control(struct channel_t *ch)
         else
                 efr &= ~(UART_17158_EFR_ECB | UART_17158_EFR_IXOFF);
 
-        /* Why? Because Exar's spec says we have to zero
+        /*
+         * Why? Because Exar's spec says we have to zero
          * it out before setting it
          */
         writeb(0, &ch->ch_neo_uart->efr);
@@ -308,7 +313,8 @@ static inline void neo_set_no_output_flow_control(struct channel_t *ch)
         else
                 efr &= ~(UART_17158_EFR_ECB | UART_17158_EFR_IXON);
 
-        /* Why? Because Exar's spec says we have to zero it
+        /*
+         * Why? Because Exar's spec says we have to zero it
          * out before setting it
          */
         writeb(0, &ch->ch_neo_uart->efr);
@@ -351,9 +357,8 @@ static inline void neo_set_new_start_stop_chars(struct channel_t *ch)
         neo_pci_posting_flush(ch->ch_bd);
 }
 
-/*
- * No locks are assumed to be held when calling this function.
- */
+/* No locks are assumed to be held when calling this function. */
+
 static inline void neo_clear_break(struct channel_t *ch, int force)
 {
         unsigned long flags;
@@ -381,9 +386,8 @@ static inline void neo_clear_break(struct channel_t *ch, int force)
         spin_unlock_irqrestore(&ch->ch_lock, flags);
 }
 
-/*
- * Parse the ISR register.
- */
+/* Parse the ISR register. */
+
 static inline void neo_parse_isr(struct dgnc_board *brd, uint port)
 {
         struct channel_t *ch;
@@ -412,8 +416,8 @@ static inline void neo_parse_isr(struct dgnc_board *brd, uint port)
                 if (isr & (UART_17158_IIR_RDI_TIMEOUT | UART_IIR_RDI)) {
                         /* Read data from uart -> queue */
                         neo_copy_data_from_uart_to_queue(ch);
-
-                        /* Call our tty layer to enforce queue
+                        /*
+                         * Call our tty layer to enforce queue
                          * flow control if needed.
                          */
                         spin_lock_irqsave(&ch->ch_lock, flags);
@@ -438,7 +442,8 @@ static inline void neo_parse_isr(struct dgnc_board *brd, uint port)
                          * one it was, so we can suspend or resume data flow.
                          */
                         if (cause == UART_17158_XON_DETECT) {
-                                /* Is output stopped right now, if so,
+                                /*
+                                 * Is output stopped right now, if so,
                                  * resume it
                                  */
                                 if (brd->channels[port]->ch_flags & CH_STOP) {
@@ -609,9 +614,8 @@ static void neo_param(struct tty_struct *tty)
         if (!bd || bd->magic != DGNC_BOARD_MAGIC)
                 return;
 
-        /*
-         * If baud rate is zero, flush queues, and set mval to drop DTR.
-         */
+        /* If baud rate is zero, flush queues, and set mval to drop DTR. */
+
         if ((ch->ch_c_cflag & (CBAUD)) == 0) {
                 ch->ch_r_head = 0;
                 ch->ch_r_tail = 0;
@@ -672,7 +676,8 @@ static void neo_param(struct tty_struct *tty)
                                 4800,   9600,   19200,  38400 }
                 };
 
-                /* Only use the TXPrint baud rate if the terminal unit
+                /*
+                 * Only use the TXPrint baud rate if the terminal unit
                  * is NOT open
                  */
                 if (!(ch->ch_tun.un_flags & UN_ISOPEN) &&
@@ -797,7 +802,8 @@ static void neo_param(struct tty_struct *tty)
         if (ch->ch_digi.digi_flags & CTSPACE || ch->ch_c_cflag & CRTSCTS) {
                 neo_set_cts_flow_control(ch);
         } else if (ch->ch_c_iflag & IXON) {
-                /* If start/stop is set to disable, then we should
+                /*
+                 * If start/stop is set to disable, then we should
                  * disable flow control
                  */
                 if ((ch->ch_startc == _POSIX_VDISABLE) ||
@@ -812,7 +818,8 @@ static void neo_param(struct tty_struct *tty)
         if (ch->ch_digi.digi_flags & RTSPACE || ch->ch_c_cflag & CRTSCTS) {
                 neo_set_rts_flow_control(ch);
         } else if (ch->ch_c_iflag & IXOFF) {
-                /* If start/stop is set to disable, then we should
+                /*
+                 * If start/stop is set to disable, then we should
                  * disable flow control
                  */
                 if ((ch->ch_startc == _POSIX_VDISABLE) ||
@@ -840,9 +847,8 @@ static void neo_param(struct tty_struct *tty)
         neo_parse_modem(ch, readb(&ch->ch_neo_uart->msr));
 }
 
-/*
- * Our board poller function.
- */
+/* Our board poller function. */
+
 static void neo_tasklet(unsigned long data)
 {
         struct dgnc_board *bd = (struct dgnc_board *)data;
@@ -867,9 +873,8 @@ static void neo_tasklet(unsigned long data)
          */
         spin_lock_irqsave(&bd->bd_intr_lock, flags);
 
-        /*
-         * If board is ready, parse deeper to see if there is anything to do.
-         */
+        /* If board is ready, parse deeper to see if there is anything to do. */
+
         if ((state == BOARD_READY) && (ports > 0)) {
                 /* Loop on each port */
                 for (i = 0; i < ports; i++) {
@@ -997,9 +1002,9 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
                         break;
 
                 case UART_17158_RX_LINE_STATUS:
-                        /*
-                         * RXRDY and RX LINE Status (logic OR of LSR[4:1])
-                         */
+
+                        /* RXRDY and RX LINE Status (logic OR of LSR[4:1]) */
+
                         neo_parse_lsr(brd, port);
                         break;
 
@@ -1022,9 +1027,9 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
                         break;
 
                 case UART_17158_MSR:
-                        /*
-                         * MSR or flow control was seen.
-                         */
+
+                        /* MSR or flow control was seen. */
+
                         neo_parse_isr(brd, port);
                         break;
 
@@ -1041,9 +1046,8 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
                 port++;
         }
 
-        /*
-         * Schedule tasklet to more in-depth servicing at a better time.
-         */
+        /* Schedule tasklet to more in-depth servicing at a better time. */
+
         tasklet_schedule(&brd->helper_tasklet);
 
         spin_unlock_irqrestore(&brd->bd_intr_lock, flags);
@@ -1238,9 +1242,8 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch)
                         ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
                 }
 
-                /*
-                 * Discard character if we are ignoring the error mask.
-                 */
+                /* Discard character if we are ignoring the error mask. */
+
                 if (linestatus & error_mask)  {
                         unsigned char discard;
 
@@ -1279,9 +1282,8 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch)
                 ch->ch_rxcount++;
         }
 
-        /*
-         * Write new final heads to channel structure.
-         */
+        /* Write new final heads to channel structure. */
+
         ch->ch_r_head = head & RQUEUEMASK;
         ch->ch_e_head = head & EQUEUEMASK;
 
@@ -1412,9 +1414,8 @@ static void neo_copy_data_from_queue_to_uart(struct channel_t *ch)
             (ch->ch_flags & CH_BREAK_SENDING))
                 goto exit_unlock;
 
-        /*
-         * If FIFOs are disabled. Send data directly to txrx register
-         */
+        /* If FIFOs are disabled. Send data directly to txrx register */
+
         if (!(ch->ch_flags & CH_FIFO_ENABLED)) {
                 unsigned char lsrbits = readb(&ch->ch_neo_uart->lsr);
 
@@ -1458,9 +1459,8 @@ static void neo_copy_data_from_queue_to_uart(struct channel_t *ch)
                 goto exit_unlock;
         }
 
-        /*
-         * We have to do it this way, because of the EXAR TXFIFO count bug.
-         */
+        /* We have to do it this way, because of the EXAR TXFIFO count bug. */
+
         if ((ch->ch_bd->dvid & 0xf0) < UART_XR17E158_DVID) {
                 if (!(ch->ch_flags & (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM)))
                         goto exit_unlock;
@@ -1645,9 +1645,8 @@ static void neo_send_stop_character(struct channel_t *ch)
         }
 }
 
-/*
- * neo_uart_init
- */
+/* neo_uart_init */
+
 static void neo_uart_init(struct channel_t *ch)
 {
         writeb(0, &ch->ch_neo_uart->ier);
@@ -1668,9 +1667,8 @@ static void neo_uart_init(struct channel_t *ch)
         neo_pci_posting_flush(ch->ch_bd);
 }
 
-/*
- * Make the UART completely turn off.
- */
+/* Make the UART completely turn off. */
+
 static void neo_uart_off(struct channel_t *ch)
 {
         /* Turn off UART enhanced bits */
@@ -1705,9 +1703,8 @@ static uint neo_get_uart_bytes_left(struct channel_t *ch)
 /* Channel lock MUST be held by the calling function! */
 static void neo_send_break(struct channel_t *ch, int msecs)
 {
-        /*
-         * If we receive a time of 0, this means turn off the break.
-         */
+        /* If we receive a time of 0, this means turn off the break. */
+
         if (msecs == 0) {
                 if (ch->ch_flags & CH_BREAK_SENDING) {
                         unsigned char temp = readb(&ch->ch_neo_uart->lcr);
diff --git a/drivers/staging/dgnc/dgnc_neo.h b/drivers/staging/dgnc/dgnc_neo.h
index abddd48353d0..77ecd9baae45 100644
--- a/drivers/staging/dgnc/dgnc_neo.h
+++ b/drivers/staging/dgnc/dgnc_neo.h
@@ -18,37 +18,38 @@
 
 #include "dgnc_driver.h"
 
-/************************************************************************
- * Per channel/port NEO UART structure                                  *
- ************************************************************************
- *              Base Structure Entries Usage Meanings to Host           *
- *                                                                      *
- *      W = read write          R = read only                           *
- *                      U = Unused.                                     *
- ************************************************************************/
+/*
+ *      Per channel/port NEO UART structure
+ *      Base Structure Entries Usage Meanings to Host
+ *
+ *      W = read write          R = read only
+ *                      U = Unused.
+ */
 
 struct neo_uart_struct {
-        u8 txrx;                /* WR  RHR/THR - Holding Reg */
+        u8 txrx;        /* WR  RHR/THR - Holding Reg */
         u8 ier;         /* WR  IER - Interrupt Enable Reg */
-        u8 isr_fcr;             /* WR  ISR/FCR - Interrupt Status Reg/Fifo Control Reg */
+        u8 isr_fcr;     /* WR  ISR/FCR - Interrupt Status Reg/Fifo
+                         * Control Reg
+                         */
         u8 lcr;         /* WR  LCR - Line Control Reg */
         u8 mcr;         /* WR  MCR - Modem Control Reg */
         u8 lsr;         /* WR  LSR - Line Status Reg */
         u8 msr;         /* WR  MSR - Modem Status Reg */
         u8 spr;         /* WR  SPR - Scratch Pad Reg */
-        u8 fctr;                /* WR  FCTR - Feature Control Reg */
+        u8 fctr;        /* WR  FCTR - Feature Control Reg */
         u8 efr;         /* WR  EFR - Enhanced Function Reg */
-        u8 tfifo;               /* WR  TXCNT/TXTRG - Transmit FIFO Reg */
-        u8 rfifo;               /* WR  RXCNT/RXTRG - Receive  FIFO Reg */
+        u8 tfifo;       /* WR  TXCNT/TXTRG - Transmit FIFO Reg */
+        u8 rfifo;       /* WR  RXCNT/RXTRG - Receive  FIFO Reg */
         u8 xoffchar1;   /* WR  XOFF 1 - XOff Character 1 Reg */
         u8 xoffchar2;   /* WR  XOFF 2 - XOff Character 2 Reg */
         u8 xonchar1;    /* WR  XON 1 - Xon Character 1 Reg */
         u8 xonchar2;    /* WR  XON 2 - XOn Character 2 Reg */
 
         u8 reserved1[0x2ff - 0x200]; /* U   Reserved by Exar */
-        u8 txrxburst[64];       /* RW  64 bytes of RX/TX FIFO Data */
+        u8 txrxburst[64];            /* RW  64 bytes of RX/TX FIFO Data */
         u8 reserved2[0x37f - 0x340]; /* U   Reserved by Exar */
-        u8 rxburst_with_errors[64];     /* R  64 bytes of RX FIFO Data + LSR */
+        u8 rxburst_with_errors[64];  /* R  64 bytes of RX FIFO Data + LSR */
 };
 
 /* Where to read the extended interrupt register (32bits instead of 8bits) */
@@ -108,7 +109,9 @@ struct neo_uart_struct {
 /* 17158 Extended IIR's */
 #define UART_17158_IIR_RDI_TIMEOUT      0x0C    /* Receiver data TIMEOUT */
 #define UART_17158_IIR_XONXOFF          0x10    /* Received an XON/XOFF char */
-#define UART_17158_IIR_HWFLOW_STATE_CHANGE 0x20 /* CTS/DSR or RTS/DTR state change */
+#define UART_17158_IIR_HWFLOW_STATE_CHANGE 0x20 /* CTS/DSR or RTS/DTR
+                                                 * state change
+                                                 */
 #define UART_17158_IIR_FIFO_ENABLED     0xC0    /* 16550 FIFOs are Enabled */
 
 /*
@@ -119,8 +122,12 @@ struct neo_uart_struct {
 #define UART_17158_RXRDY_TIMEOUT        0x2     /* RX Ready Timeout */
 #define UART_17158_TXRDY                0x3     /* TX Ready */
 #define UART_17158_MSR                  0x4     /* Modem State Change */
-#define UART_17158_TX_AND_FIFO_CLR      0x40    /* Transmitter Holding Reg Empty */
-#define UART_17158_RX_FIFO_DATA_ERROR   0x80    /* UART detected an RX FIFO Data error */
+#define UART_17158_TX_AND_FIFO_CLR      0x40    /* Transmitter Holding
+                                                 * Reg Empty
+                                                 */
+#define UART_17158_RX_FIFO_DATA_ERROR   0x80    /* UART detected an RX FIFO
+                                                 * Data error
+                                                 */
 
 /*
  * These are the EXTENDED definitions for the 17C158's Interrupt
@@ -130,19 +137,22 @@ struct neo_uart_struct {
 #define UART_17158_EFR_IXON     0x2     /* Receiver compares Xon1/Xoff1 */
 #define UART_17158_EFR_IXOFF    0x8     /* Transmit Xon1/Xoff1 */
 #define UART_17158_EFR_RTSDTR   0x40    /* Auto RTS/DTR Flow Control Enable */
-#define UART_17158_EFR_CTSDSR   0x80    /* Auto CTS/DSR Flow COntrol Enable */
+#define UART_17158_EFR_CTSDSR   0x80    /* Auto CTS/DSR Flow Control Enable */
 
-#define UART_17158_XOFF_DETECT  0x1     /* Indicates whether chip saw an incoming XOFF char  */
-#define UART_17158_XON_DETECT   0x2     /* Indicates whether chip saw an incoming XON char */
+#define UART_17158_XOFF_DETECT  0x1     /* Indicates whether chip saw an
+                                         * incoming XOFF char
+                                         */
+#define UART_17158_XON_DETECT   0x2     /* Indicates whether chip saw an
+                                         * incoming XON char
+                                         */
 
 #define UART_17158_IER_RSVD1    0x10    /* Reserved by Exar */
 #define UART_17158_IER_XOFF     0x20    /* Xoff Interrupt Enable */
 #define UART_17158_IER_RTSDTR   0x40    /* Output Interrupt Enable */
 #define UART_17158_IER_CTSDSR   0x80    /* Input Interrupt Enable */
 
-/*
- * Our Global Variables
- */
+/* Our Global Variables */
+
 extern struct board_ops dgnc_neo_ops;
 
 #endif
diff --git a/drivers/staging/dgnc/dgnc_sysfs.c b/drivers/staging/dgnc/dgnc_sysfs.c
deleted file mode 100644
index 290bf6e226ac..000000000000
--- a/drivers/staging/dgnc/dgnc_sysfs.c
+++ /dev/null
@@ -1,703 +0,0 @@
-/*
- * Copyright 2004 Digi International (www.digi.com)
- *      Scott H Kilau <Scott_Kilau at digi dot com>
- *
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/ctype.h>
-#include <linux/string.h>
-#include <linux/serial_reg.h>
-#include <linux/device.h>
-#include <linux/pci.h>
-#include <linux/kdev_t.h>
-
-#include "dgnc_driver.h"
-#include "dgnc_mgmt.h"
-
-static ssize_t version_show(struct device_driver *ddp, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%s\n", DG_PART);
-}
-static DRIVER_ATTR_RO(version);
-
-static ssize_t boards_show(struct device_driver *ddp, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%d\n", dgnc_num_boards);
-}
-static DRIVER_ATTR_RO(boards);
-
-static ssize_t maxboards_show(struct device_driver *ddp, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%d\n", MAXBOARDS);
-}
-static DRIVER_ATTR_RO(maxboards);
-
-static ssize_t pollrate_show(struct device_driver *ddp, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%dms\n", dgnc_poll_tick);
-}
-
-static ssize_t pollrate_store(struct device_driver *ddp,
-                              const char *buf, size_t count)
-{
-        unsigned long flags;
-        int tick;
-        int ret;
-
-        ret = sscanf(buf, "%d\n", &tick);
-        if (ret != 1)
-                return -EINVAL;
-
-        spin_lock_irqsave(&dgnc_poll_lock, flags);
-        dgnc_poll_tick = tick;
-        spin_unlock_irqrestore(&dgnc_poll_lock, flags);
-
-        return count;
-}
-static DRIVER_ATTR_RW(pollrate);
-
-void dgnc_create_driver_sysfiles(struct pci_driver *dgnc_driver)
-{
-        int rc = 0;
-        struct device_driver *driverfs = &dgnc_driver->driver;
-
-        rc |= driver_create_file(driverfs, &driver_attr_version);
-        rc |= driver_create_file(driverfs, &driver_attr_boards);
-        rc |= driver_create_file(driverfs, &driver_attr_maxboards);
-        rc |= driver_create_file(driverfs, &driver_attr_pollrate);
-        if (rc)
-                pr_err("DGNC: sysfs driver_create_file failed!\n");
-}
-
-void dgnc_remove_driver_sysfiles(struct pci_driver *dgnc_driver)
-{
-        struct device_driver *driverfs = &dgnc_driver->driver;
-
-        driver_remove_file(driverfs, &driver_attr_version);
-        driver_remove_file(driverfs, &driver_attr_boards);
-        driver_remove_file(driverfs, &driver_attr_maxboards);
-        driver_remove_file(driverfs, &driver_attr_pollrate);
-}
-
-#define DGNC_VERIFY_BOARD(p, bd)                                \
-        do {                                                    \
-                if (!p)                                         \
-                        return 0;                               \
-                                                                \
-                bd = dev_get_drvdata(p);                        \
-                if (!bd || bd->magic != DGNC_BOARD_MAGIC)       \
-                        return 0;                               \
-                if (bd->state != BOARD_READY)                   \
-                        return 0;                               \
-        } while (0)
-
-static ssize_t vpd_show(struct device *p, struct device_attribute *attr,
-                        char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-        int i = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        count += sprintf(buf + count,
-                "\n      0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F");
-        for (i = 0; i < 0x40 * 2; i++) {
-                if (!(i % 16))
-                        count += sprintf(buf + count, "\n%04X ", i * 2);
-                count += sprintf(buf + count, "%02X ", bd->vpd[i]);
-        }
-        count += sprintf(buf + count, "\n");
-
-        return count;
-}
-static DEVICE_ATTR_RO(vpd);
-
-static ssize_t serial_number_show(struct device *p,
-                                  struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        if (bd->serial_num[0] == '\0')
-                count += sprintf(buf + count, "<UNKNOWN>\n");
-        else
-                count += sprintf(buf + count, "%s\n", bd->serial_num);
-
-        return count;
-}
-static DEVICE_ATTR_RO(serial_number);
-
-static ssize_t ports_state_show(struct device *p,
-                                struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-        int i = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        for (i = 0; i < bd->nasync; i++) {
-                count += snprintf(buf + count, PAGE_SIZE - count,
-                        "%d %s\n", bd->channels[i]->ch_portnum,
-                        bd->channels[i]->ch_open_count ? "Open" : "Closed");
-        }
-        return count;
-}
-static DEVICE_ATTR_RO(ports_state);
-
-static ssize_t ports_baud_show(struct device *p,
-                               struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-        int i = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        for (i = 0; i < bd->nasync; i++) {
-                count +=  snprintf(buf + count, PAGE_SIZE - count,
-                        "%d %d\n", bd->channels[i]->ch_portnum,
-                        bd->channels[i]->ch_old_baud);
-        }
-        return count;
-}
-static DEVICE_ATTR_RO(ports_baud);
-
-static ssize_t ports_msignals_show(struct device *p,
-                                   struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-        int i = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        for (i = 0; i < bd->nasync; i++) {
-                struct channel_t *ch = bd->channels[i];
-
-                if (ch->ch_open_count) {
-                        count += snprintf(buf + count, PAGE_SIZE - count,
-                                "%d %s %s %s %s %s %s\n",
-                                ch->ch_portnum,
-                                (ch->ch_mostat & UART_MCR_RTS) ? "RTS" : "",
-                                (ch->ch_mistat & UART_MSR_CTS) ? "CTS" : "",
-                                (ch->ch_mostat & UART_MCR_DTR) ? "DTR" : "",
-                                (ch->ch_mistat & UART_MSR_DSR) ? "DSR" : "",
-                                (ch->ch_mistat & UART_MSR_DCD) ? "DCD" : "",
-                                (ch->ch_mistat & UART_MSR_RI)  ? "RI"  : "");
-                } else {
-                        count += snprintf(buf + count, PAGE_SIZE - count,
-                                "%d\n", ch->ch_portnum);
-                }
-        }
-        return count;
-}
-static DEVICE_ATTR_RO(ports_msignals);
-
-static ssize_t ports_iflag_show(struct device *p,
-                                struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-        int i = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        for (i = 0; i < bd->nasync; i++) {
-                count += snprintf(buf + count, PAGE_SIZE - count, "%d %x\n",
-                        bd->channels[i]->ch_portnum,
-                        bd->channels[i]->ch_c_iflag);
-        }
-        return count;
-}
-static DEVICE_ATTR_RO(ports_iflag);
-
-static ssize_t ports_cflag_show(struct device *p,
-                                struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-        int i = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        for (i = 0; i < bd->nasync; i++) {
-                count += snprintf(buf + count, PAGE_SIZE - count, "%d %x\n",
-                        bd->channels[i]->ch_portnum,
-                        bd->channels[i]->ch_c_cflag);
-        }
-        return count;
-}
-static DEVICE_ATTR_RO(ports_cflag);
-
-static ssize_t ports_oflag_show(struct device *p,
-                                struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-        int i = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        for (i = 0; i < bd->nasync; i++) {
-                count += snprintf(buf + count, PAGE_SIZE - count, "%d %x\n",
-                        bd->channels[i]->ch_portnum,
-                        bd->channels[i]->ch_c_oflag);
-        }
-        return count;
-}
-static DEVICE_ATTR_RO(ports_oflag);
-
-static ssize_t ports_lflag_show(struct device *p,
-                                struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-        int i = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        for (i = 0; i < bd->nasync; i++) {
-                count += snprintf(buf + count, PAGE_SIZE - count, "%d %x\n",
-                        bd->channels[i]->ch_portnum,
-                        bd->channels[i]->ch_c_lflag);
-        }
-        return count;
-}
-static DEVICE_ATTR_RO(ports_lflag);
-
-static ssize_t ports_digi_flag_show(struct device *p,
-                                    struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-        int i = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        for (i = 0; i < bd->nasync; i++) {
-                count += snprintf(buf + count, PAGE_SIZE - count, "%d %x\n",
-                        bd->channels[i]->ch_portnum,
-                        bd->channels[i]->ch_digi.digi_flags);
-        }
-        return count;
-}
-static DEVICE_ATTR_RO(ports_digi_flag);
-
-static ssize_t ports_rxcount_show(struct device *p,
-                                  struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-        int i = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        for (i = 0; i < bd->nasync; i++) {
-                count += snprintf(buf + count, PAGE_SIZE - count, "%d %ld\n",
-                        bd->channels[i]->ch_portnum,
-                        bd->channels[i]->ch_rxcount);
-        }
-        return count;
-}
-static DEVICE_ATTR_RO(ports_rxcount);
-
-static ssize_t ports_txcount_show(struct device *p,
-                                  struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        int count = 0;
-        int i = 0;
-
-        DGNC_VERIFY_BOARD(p, bd);
-
-        for (i = 0; i < bd->nasync; i++) {
-                count += snprintf(buf + count, PAGE_SIZE - count, "%d %ld\n",
-                        bd->channels[i]->ch_portnum,
-                        bd->channels[i]->ch_txcount);
-        }
-        return count;
-}
-static DEVICE_ATTR_RO(ports_txcount);
-
-/* this function creates the sys files that will export each signal status
- * to sysfs each value will be put in a separate filename
- */
-void dgnc_create_ports_sysfiles(struct dgnc_board *bd)
-{
-        int rc = 0;
-
-        dev_set_drvdata(&bd->pdev->dev, bd);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_ports_state);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_ports_baud);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_ports_msignals);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_ports_iflag);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_ports_cflag);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_ports_oflag);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_ports_lflag);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_ports_digi_flag);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_ports_rxcount);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_ports_txcount);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_vpd);
-        rc |= device_create_file(&bd->pdev->dev, &dev_attr_serial_number);
-        if (rc)
-                dev_err(&bd->pdev->dev, "dgnc: sysfs device_create_file failed!\n");
-}
-
-/* removes all the sys files created for that port */
-void dgnc_remove_ports_sysfiles(struct dgnc_board *bd)
-{
-        device_remove_file(&bd->pdev->dev, &dev_attr_ports_state);
-        device_remove_file(&bd->pdev->dev, &dev_attr_ports_baud);
-        device_remove_file(&bd->pdev->dev, &dev_attr_ports_msignals);
-        device_remove_file(&bd->pdev->dev, &dev_attr_ports_iflag);
-        device_remove_file(&bd->pdev->dev, &dev_attr_ports_cflag);
-        device_remove_file(&bd->pdev->dev, &dev_attr_ports_oflag);
-        device_remove_file(&bd->pdev->dev, &dev_attr_ports_lflag);
-        device_remove_file(&bd->pdev->dev, &dev_attr_ports_digi_flag);
-        device_remove_file(&bd->pdev->dev, &dev_attr_ports_rxcount);
-        device_remove_file(&bd->pdev->dev, &dev_attr_ports_txcount);
-        device_remove_file(&bd->pdev->dev, &dev_attr_vpd);
-        device_remove_file(&bd->pdev->dev, &dev_attr_serial_number);
-}
-
-static ssize_t tty_state_show(struct device *d,
-                              struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        struct channel_t *ch;
-        struct un_t *un;
-
-        if (!d)
-                return 0;
-        un = dev_get_drvdata(d);
-        if (!un || un->magic != DGNC_UNIT_MAGIC)
-                return 0;
-        ch = un->un_ch;
-        if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
-                return 0;
-        bd = ch->ch_bd;
-        if (!bd || bd->magic != DGNC_BOARD_MAGIC)
-                return 0;
-        if (bd->state != BOARD_READY)
-                return 0;
-
-        return snprintf(buf, PAGE_SIZE, "%s",
-                        un->un_open_count ? "Open" : "Closed");
-}
-static DEVICE_ATTR_RO(tty_state);
-
-static ssize_t tty_baud_show(struct device *d,
-                             struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        struct channel_t *ch;
-        struct un_t *un;
-
-        if (!d)
-                return 0;
-        un = dev_get_drvdata(d);
-        if (!un || un->magic != DGNC_UNIT_MAGIC)
-                return 0;
-        ch = un->un_ch;
-        if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
-                return 0;
-        bd = ch->ch_bd;
-        if (!bd || bd->magic != DGNC_BOARD_MAGIC)
-                return 0;
-        if (bd->state != BOARD_READY)
-                return 0;
-
-        return snprintf(buf, PAGE_SIZE, "%d\n", ch->ch_old_baud);
-}
-static DEVICE_ATTR_RO(tty_baud);
-
-static ssize_t tty_msignals_show(struct device *d,
-                                 struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        struct channel_t *ch;
-        struct un_t *un;
-
-        if (!d)
-                return 0;
-        un = dev_get_drvdata(d);
-        if (!un || un->magic != DGNC_UNIT_MAGIC)
-                return 0;
-        ch = un->un_ch;
-        if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
-                return 0;
-        bd = ch->ch_bd;
-        if (!bd || bd->magic != DGNC_BOARD_MAGIC)
-                return 0;
-        if (bd->state != BOARD_READY)
-                return 0;
-
-        if (ch->ch_open_count) {
-                return snprintf(buf, PAGE_SIZE, "%s %s %s %s %s %s\n",
-                        (ch->ch_mostat & UART_MCR_RTS) ? "RTS" : "",
-                        (ch->ch_mistat & UART_MSR_CTS) ? "CTS" : "",
-                        (ch->ch_mostat & UART_MCR_DTR) ? "DTR" : "",
-                        (ch->ch_mistat & UART_MSR_DSR) ? "DSR" : "",
-                        (ch->ch_mistat & UART_MSR_DCD) ? "DCD" : "",
-                        (ch->ch_mistat & UART_MSR_RI)  ? "RI"  : "");
-        }
-        return 0;
-}
-static DEVICE_ATTR_RO(tty_msignals);
-
-static ssize_t tty_iflag_show(struct device *d,
-                              struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        struct channel_t *ch;
-        struct un_t *un;
-
-        if (!d)
-                return 0;
-        un = dev_get_drvdata(d);
-        if (!un || un->magic != DGNC_UNIT_MAGIC)
-                return 0;
-        ch = un->un_ch;
-        if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
-                return 0;
-        bd = ch->ch_bd;
-        if (!bd || bd->magic != DGNC_BOARD_MAGIC)
-                return 0;
-        if (bd->state != BOARD_READY)
-                return 0;
-
-        return snprintf(buf, PAGE_SIZE, "%x\n", ch->ch_c_iflag);
-}
-static DEVICE_ATTR_RO(tty_iflag);
-
-static ssize_t tty_cflag_show(struct device *d,
-                              struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        struct channel_t *ch;
-        struct un_t *un;
-
-        if (!d)
-                return 0;
-        un = dev_get_drvdata(d);
-        if (!un || un->magic != DGNC_UNIT_MAGIC)
-                return 0;
-        ch = un->un_ch;
-        if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
-                return 0;
-        bd = ch->ch_bd;
-        if (!bd || bd->magic != DGNC_BOARD_MAGIC)
-                return 0;
-        if (bd->state != BOARD_READY)
-                return 0;
-
-        return snprintf(buf, PAGE_SIZE, "%x\n", ch->ch_c_cflag);
-}
-static DEVICE_ATTR_RO(tty_cflag);
-
-static ssize_t tty_oflag_show(struct device *d,
-                              struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        struct channel_t *ch;
-        struct un_t *un;
-
-        if (!d)
-                return 0;
-        un = dev_get_drvdata(d);
-        if (!un || un->magic != DGNC_UNIT_MAGIC)
-                return 0;
-        ch = un->un_ch;
-        if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
-                return 0;
-        bd = ch->ch_bd;
-        if (!bd || bd->magic != DGNC_BOARD_MAGIC)
-                return 0;
-        if (bd->state != BOARD_READY)
-                return 0;
-
-        return snprintf(buf, PAGE_SIZE, "%x\n", ch->ch_c_oflag);
-}
-static DEVICE_ATTR_RO(tty_oflag);
-
-static ssize_t tty_lflag_show(struct device *d,
-                              struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        struct channel_t *ch;
-        struct un_t *un;
-
-        if (!d)
-                return 0;
-        un = dev_get_drvdata(d);
-        if (!un || un->magic != DGNC_UNIT_MAGIC)
-                return 0;
-        ch = un->un_ch;
-        if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
-                return 0;
-        bd = ch->ch_bd;
-        if (!bd || bd->magic != DGNC_BOARD_MAGIC)
-                return 0;
-        if (bd->state != BOARD_READY)
-                return 0;
-
-        return snprintf(buf, PAGE_SIZE, "%x\n", ch->ch_c_lflag);
-}
-static DEVICE_ATTR_RO(tty_lflag);
-
-static ssize_t tty_digi_flag_show(struct device *d,
-                                  struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        struct channel_t *ch;
-        struct un_t *un;
-
-        if (!d)
-                return 0;
-        un = dev_get_drvdata(d);
-        if (!un || un->magic != DGNC_UNIT_MAGIC)
-                return 0;
-        ch = un->un_ch;
-        if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
-                return 0;
-        bd = ch->ch_bd;
-        if (!bd || bd->magic != DGNC_BOARD_MAGIC)
-                return 0;
-        if (bd->state != BOARD_READY)
-                return 0;
-
-        return snprintf(buf, PAGE_SIZE, "%x\n", ch->ch_digi.digi_flags);
-}
-static DEVICE_ATTR_RO(tty_digi_flag);
-
-static ssize_t tty_rxcount_show(struct device *d,
-                                struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        struct channel_t *ch;
-        struct un_t *un;
-
-        if (!d)
-                return 0;
-        un = dev_get_drvdata(d);
-        if (!un || un->magic != DGNC_UNIT_MAGIC)
-                return 0;
-        ch = un->un_ch;
-        if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
-                return 0;
-        bd = ch->ch_bd;
-        if (!bd || bd->magic != DGNC_BOARD_MAGIC)
-                return 0;
-        if (bd->state != BOARD_READY)
-                return 0;
-
-        return snprintf(buf, PAGE_SIZE, "%ld\n", ch->ch_rxcount);
-}
-static DEVICE_ATTR_RO(tty_rxcount);
-
-static ssize_t tty_txcount_show(struct device *d,
-                                struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        struct channel_t *ch;
-        struct un_t *un;
-
-        if (!d)
-                return 0;
-        un = dev_get_drvdata(d);
-        if (!un || un->magic != DGNC_UNIT_MAGIC)
-                return 0;
-        ch = un->un_ch;
-        if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
-                return 0;
-        bd = ch->ch_bd;
-        if (!bd || bd->magic != DGNC_BOARD_MAGIC)
-                return 0;
-        if (bd->state != BOARD_READY)
-                return 0;
-
-        return snprintf(buf, PAGE_SIZE, "%ld\n", ch->ch_txcount);
-}
-static DEVICE_ATTR_RO(tty_txcount);
-
-static ssize_t tty_custom_name_show(struct device *d,
-                                    struct device_attribute *attr, char *buf)
-{
-        struct dgnc_board *bd;
-        struct channel_t *ch;
-        struct un_t *un;
-
-        if (!d)
-                return 0;
-        un = dev_get_drvdata(d);
-        if (!un || un->magic != DGNC_UNIT_MAGIC)
-                return 0;
-        ch = un->un_ch;
-        if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
-                return 0;
-        bd = ch->ch_bd;
-        if (!bd || bd->magic != DGNC_BOARD_MAGIC)
-                return 0;
-        if (bd->state != BOARD_READY)
-                return 0;
-
-        return snprintf(buf, PAGE_SIZE, "%sn%d%c\n",
-                (un->un_type == DGNC_PRINT) ? "pr" : "tty",
-                bd->boardnum + 1, 'a' + ch->ch_portnum);
-}
-static DEVICE_ATTR_RO(tty_custom_name);
-
-static struct attribute *dgnc_sysfs_tty_entries[] = {
-        &dev_attr_tty_state.attr,
-        &dev_attr_tty_baud.attr,
-        &dev_attr_tty_msignals.attr,
-        &dev_attr_tty_iflag.attr,
-        &dev_attr_tty_cflag.attr,
-        &dev_attr_tty_oflag.attr,
-        &dev_attr_tty_lflag.attr,
-        &dev_attr_tty_digi_flag.attr,
-        &dev_attr_tty_rxcount.attr,
-        &dev_attr_tty_txcount.attr,
-        &dev_attr_tty_custom_name.attr,
-        NULL
-};
-
-static const struct attribute_group dgnc_tty_attribute_group = {
-        .name = NULL,
-        .attrs = dgnc_sysfs_tty_entries,
-};
-
-void dgnc_create_tty_sysfs(struct un_t *un, struct device *c)
-{
-        int ret;
-
-        ret = sysfs_create_group(&c->kobj, &dgnc_tty_attribute_group);
-        if (ret) {
-                dev_err(c, "dgnc: failed to create sysfs tty device attributes.\n");
-                sysfs_remove_group(&c->kobj, &dgnc_tty_attribute_group);
-                return;
-        }
-
-        dev_set_drvdata(c, un);
-}
-
-void dgnc_remove_tty_sysfs(struct device *c)
-{
-        sysfs_remove_group(&c->kobj, &dgnc_tty_attribute_group);
-}
-
diff --git a/drivers/staging/dgnc/dgnc_sysfs.h b/drivers/staging/dgnc/dgnc_sysfs.h
deleted file mode 100644
index 7be7d55bc49e..000000000000
--- a/drivers/staging/dgnc/dgnc_sysfs.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2003 Digi International (www.digi.com)
- *      Scott H Kilau <Scott_Kilau at digi dot com>
- *
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- */
-
-#ifndef __DGNC_SYSFS_H
-#define __DGNC_SYSFS_H
-
-#include <linux/device.h>
-#include "dgnc_driver.h"
-
-struct dgnc_board;
-struct channel_t;
-struct un_t;
-struct pci_driver;
-struct class_device;
-
-void dgnc_create_ports_sysfiles(struct dgnc_board *bd);
-void dgnc_remove_ports_sysfiles(struct dgnc_board *bd);
-
-void dgnc_create_driver_sysfiles(struct pci_driver *);
-void dgnc_remove_driver_sysfiles(struct pci_driver *);
-
-int dgnc_tty_class_init(void);
-int dgnc_tty_class_destroy(void);
-
-void dgnc_create_tty_sysfs(struct un_t *un, struct device *c);
-void dgnc_remove_tty_sysfs(struct device *c);
-
-#endif
diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c
index 953d9310fa74..1e10c0fe4745 100644
--- a/drivers/staging/dgnc/dgnc_tty.c
+++ b/drivers/staging/dgnc/dgnc_tty.c
@@ -13,13 +13,9 @@
  * PURPOSE.  See the GNU General Public License for more details.
  */
 
-/************************************************************************
- *
+/*
  * This file implements the tty driver functionality for the
  * Neo and ClassicBoard PCI based product lines.
- *
- ************************************************************************
- *
  */
 
 #include <linux/kernel.h>
@@ -39,27 +35,20 @@
 #include "dgnc_tty.h"
 #include "dgnc_neo.h"
 #include "dgnc_cls.h"
-#include "dgnc_sysfs.h"
 #include "dgnc_utils.h"
 
-/*
- * internal variables
- */
-static unsigned char            *dgnc_TmpWriteBuf;
-
-/*
- * Default transparent print information.
- */
-static struct digi_t dgnc_digi_init = {
-        .digi_flags =   DIGI_COOK,      /* Flags                        */
-        .digi_maxcps =  100,            /* Max CPS                      */
-        .digi_maxchar = 50,             /* Max chars in print queue     */
-        .digi_bufsize = 100,            /* Printer buffer size          */
-        .digi_onlen =   4,              /* size of printer on string    */
-        .digi_offlen =  4,              /* size of printer off string   */
-        .digi_onstr =   "\033[5i",      /* ANSI printer on string ]     */
-        .digi_offstr =  "\033[4i",      /* ANSI printer off string ]    */
-        .digi_term =    "ansi"          /* default terminal type        */
+/* Default transparent print information. */
+
+static const struct digi_t dgnc_digi_init = {
+        .digi_flags =   DIGI_COOK,      /* Flags */
+        .digi_maxcps =  100,            /* Max CPS */
+        .digi_maxchar = 50,             /* Max chars in print queue */
+        .digi_bufsize = 100,            /* Printer buffer size */
+        .digi_onlen =   4,              /* size of printer on string */
+        .digi_offlen =  4,              /* size of printer off string */
+        .digi_onstr =   "\033[5i",      /* ANSI printer on string ] */
+        .digi_offstr =  "\033[4i",      /* ANSI printer off string ] */
+        .digi_term =    "ansi"          /* default terminal type */
 };
 
 /*
@@ -69,7 +58,7 @@ static struct digi_t dgnc_digi_init = {
  * This defines a raw port at 9600 baud, 8 data bits, no parity,
  * 1 stop bit.
  */
-static struct ktermios DgncDefaultTermios = {
+static struct ktermios default_termios = {
         .c_iflag =      (DEFAULT_IFLAGS),       /* iflags */
         .c_oflag =      (DEFAULT_OFLAGS),       /* oflags */
         .c_cflag =      (DEFAULT_CFLAGS),       /* cflags */
@@ -113,6 +102,8 @@ static int dgnc_tty_write(struct tty_struct *tty, const unsigned char *buf,
 static void dgnc_tty_set_termios(struct tty_struct *tty,
                                  struct ktermios *old_termios);
 static void dgnc_tty_send_xchar(struct tty_struct *tty, char ch);
+static void dgnc_set_signal_low(struct channel_t *ch, const unsigned char line);
+static void dgnc_wake_up_unit(struct un_t *unit);
 
 static const struct tty_operations dgnc_tty_ops = {
         .open = dgnc_tty_open,
@@ -137,36 +128,7 @@ static const struct tty_operations dgnc_tty_ops = {
         .send_xchar = dgnc_tty_send_xchar
 };
 
-/************************************************************************
- *
- * TTY Initialization/Cleanup Functions
- *
- ************************************************************************/
-
-/*
- * dgnc_tty_preinit()
- *
- * Initialize any global tty related data before we download any boards.
- */
-int dgnc_tty_preinit(void)
-{
-        /*
-         * Allocate a buffer for doing the copy from user space to
-         * kernel space in dgnc_write().  We only use one buffer and
-         * control access to it with a semaphore.  If we are paging, we
-         * are already in trouble so one buffer won't hurt much anyway.
-         *
-         * We are okay to sleep in the malloc, as this routine
-         * is only called during module load, (not in interrupt context),
-         * and with no locks held.
-         */
-        dgnc_TmpWriteBuf = kmalloc(WRITEBUFLEN, GFP_KERNEL);
-
-        if (!dgnc_TmpWriteBuf)
-                return -ENOMEM;
-
-        return 0;
-}
+/* TTY Initialization/Cleanup Functions */
 
 /*
  * dgnc_tty_register()
@@ -194,7 +156,7 @@ int dgnc_tty_register(struct dgnc_board *brd)
         brd->serial_driver->minor_start = 0;
         brd->serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
         brd->serial_driver->subtype = SERIAL_TYPE_NORMAL;
-        brd->serial_driver->init_termios = DgncDefaultTermios;
+        brd->serial_driver->init_termios = default_termios;
         brd->serial_driver->driver_name = DRVSTR;
 
         /*
@@ -233,7 +195,7 @@ int dgnc_tty_register(struct dgnc_board *brd)
         brd->print_driver->minor_start = 0x80;
         brd->print_driver->type = TTY_DRIVER_TYPE_SERIAL;
         brd->print_driver->subtype = SERIAL_TYPE_NORMAL;
-        brd->print_driver->init_termios = DgncDefaultTermios;
+        brd->print_driver->init_termios = default_termios;
         brd->print_driver->driver_name = DRVSTR;
 
         /*
@@ -285,9 +247,7 @@ int dgnc_tty_init(struct dgnc_board *brd)
         if (!brd)
                 return -ENXIO;
 
-        /*
-         * Initialize board structure elements.
-         */
+        /* Initialize board structure elements. */
 
         vaddr = brd->re_map_membase;
 
@@ -345,12 +305,10 @@ int dgnc_tty_init(struct dgnc_board *brd)
                         classp = tty_register_device(brd->serial_driver, i,
                                                      &ch->ch_bd->pdev->dev);
                         ch->ch_tun.un_sysfs = classp;
-                        dgnc_create_tty_sysfs(&ch->ch_tun, classp);
 
                         classp = tty_register_device(brd->print_driver, i,
                                                      &ch->ch_bd->pdev->dev);
                         ch->ch_pun.un_sysfs = classp;
-                        dgnc_create_tty_sysfs(&ch->ch_pun, classp);
                 }
         }
 
@@ -365,17 +323,6 @@ err_free_channels:
 }
 
 /*
- * dgnc_tty_post_uninit()
- *
- * UnInitialize any global tty related data.
- */
-void dgnc_tty_post_uninit(void)
-{
-        kfree(dgnc_TmpWriteBuf);
-        dgnc_TmpWriteBuf = NULL;
-}
-
-/*
  * dgnc_cleanup_tty()
  *
  * Uninitialize the TTY portion of this driver.  Free all memory and
@@ -385,20 +332,14 @@ void dgnc_cleanup_tty(struct dgnc_board *brd)
 {
         int i = 0;
 
-        for (i = 0; i < brd->nasync; i++) {
-                if (brd->channels[i])
-                        dgnc_remove_tty_sysfs(brd->channels[i]->
-                                              ch_tun.un_sysfs);
+        for (i = 0; i < brd->nasync; i++)
                 tty_unregister_device(brd->serial_driver, i);
-        }
+
         tty_unregister_driver(brd->serial_driver);
 
-        for (i = 0; i < brd->nasync; i++) {
-                if (brd->channels[i])
-                        dgnc_remove_tty_sysfs(brd->channels[i]->
-                                              ch_pun.un_sysfs);
+        for (i = 0; i < brd->nasync; i++)
                 tty_unregister_device(brd->print_driver, i);
-        }
+
         tty_unregister_driver(brd->print_driver);
 
         put_tty_driver(brd->serial_driver);
@@ -437,9 +378,7 @@ static void dgnc_wmove(struct channel_t *ch, char *buf, uint n)
         }
 
         if (n > 0) {
-                /*
-                 * Move rest of data.
-                 */
+                /* Move rest of data. */
                 remain = n;
                 memcpy(ch->ch_wqueue + head, buf, remain);
                 head += remain;
@@ -509,9 +448,8 @@ void dgnc_input(struct channel_t *ch)
                 goto exit_unlock;
         }
 
-        /*
-         * If we are throttled, simply don't read any data.
-         */
+        /* If we are throttled, simply don't read any data. */
+
         if (ch->ch_flags & CH_FORCED_STOPI)
                 goto exit_unlock;
 
@@ -624,10 +562,10 @@ exit_unlock:
                 tty_ldisc_deref(ld);
 }
 
-/************************************************************************
+/*
  * Determines when CARRIER changes state and takes appropriate
  * action.
- ************************************************************************/
+ */
 void dgnc_carrier(struct channel_t *ch)
 {
         int virt_carrier = 0;
@@ -645,28 +583,24 @@ void dgnc_carrier(struct channel_t *ch)
         if (ch->ch_c_cflag & CLOCAL)
                 virt_carrier = 1;
 
-        /*
-         * Test for a VIRTUAL carrier transition to HIGH.
-         */
+        /* Test for a VIRTUAL carrier transition to HIGH. */
+
         if (((ch->ch_flags & CH_FCAR) == 0) && (virt_carrier == 1)) {
                 /*
                  * When carrier rises, wake any threads waiting
                  * for carrier in the open routine.
                  */
-
                 if (waitqueue_active(&ch->ch_flags_wait))
                         wake_up_interruptible(&ch->ch_flags_wait);
         }
 
-        /*
-         * Test for a PHYSICAL carrier transition to HIGH.
-         */
+        /* Test for a PHYSICAL carrier transition to HIGH. */
+
         if (((ch->ch_flags & CH_CD) == 0) && (phys_carrier == 1)) {
                 /*
                  * When carrier rises, wake any threads waiting
                  * for carrier in the open routine.
                  */
-
                 if (waitqueue_active(&ch->ch_flags_wait))
                         wake_up_interruptible(&ch->ch_flags_wait);
         }
@@ -704,9 +638,8 @@ void dgnc_carrier(struct channel_t *ch)
                         tty_hangup(ch->ch_pun.un_tty);
         }
 
-        /*
-         *  Make sure that our cached values reflect the current reality.
-         */
+        /*  Make sure that our cached values reflect the current reality. */
+
         if (virt_carrier == 1)
                 ch->ch_flags |= CH_FCAR;
         else
@@ -718,9 +651,8 @@ void dgnc_carrier(struct channel_t *ch)
                 ch->ch_flags &= ~CH_CD;
 }
 
-/*
- *  Assign the custom baud rate to the channel structure
- */
+/*  Assign the custom baud rate to the channel structure */
+
 static void dgnc_set_custom_speed(struct channel_t *ch, uint newrate)
 {
         int testdiv;
@@ -854,6 +786,12 @@ void dgnc_check_queue_flow_control(struct channel_t *ch)
         }
 }
 
+static void dgnc_set_signal_low(struct channel_t *ch, const unsigned char sig)
+{
+        ch->ch_mostat &= ~(sig);
+        ch->ch_bd->bd_ops->assert_modem_signals(ch);
+}
+
 void dgnc_wakeup_writes(struct channel_t *ch)
 {
         int qlen = 0;
@@ -864,9 +802,8 @@ void dgnc_wakeup_writes(struct channel_t *ch)
 
         spin_lock_irqsave(&ch->ch_lock, flags);
 
-        /*
-         * If channel now has space, wake up anyone waiting on the condition.
-         */
+        /* If channel now has space, wake up anyone waiting on the condition. */
+
         qlen = ch->ch_w_head - ch->ch_w_tail;
         if (qlen < 0)
                 qlen += WQUEUESIZE;
@@ -892,19 +829,15 @@ void dgnc_wakeup_writes(struct channel_t *ch)
                                  * If RTS Toggle mode is on, whenever
                                  * the queue and UART is empty, keep RTS low.
                                  */
-                                if (ch->ch_digi.digi_flags & DIGI_RTS_TOGGLE) {
-                                        ch->ch_mostat &= ~(UART_MCR_RTS);
-                                        ch->ch_bd->bd_ops->assert_modem_signals(ch);
-                                }
+                                if (ch->ch_digi.digi_flags & DIGI_RTS_TOGGLE)
+                                        dgnc_set_signal_low(ch, UART_MCR_RTS);
 
                                 /*
                                  * If DTR Toggle mode is on, whenever
                                  * the queue and UART is empty, keep DTR low.
                                  */
-                                if (ch->ch_digi.digi_flags & DIGI_DTR_TOGGLE) {
-                                        ch->ch_mostat &= ~(UART_MCR_DTR);
-                                        ch->ch_bd->bd_ops->assert_modem_signals(ch);
-                                }
+                                if (ch->ch_digi.digi_flags & DIGI_DTR_TOGGLE)
+                                        dgnc_set_signal_low(ch, UART_MCR_DTR);
                         }
                 }
 
@@ -930,7 +863,7 @@ void dgnc_wakeup_writes(struct channel_t *ch)
         spin_unlock_irqrestore(&ch->ch_lock, flags);
 }
 
-struct dgnc_board *find_board_by_major(unsigned int major)
+static struct dgnc_board *find_board_by_major(unsigned int major)
 {
         int i;
 
@@ -948,16 +881,10 @@ struct dgnc_board *find_board_by_major(unsigned int major)
         return NULL;
 }
 
-/************************************************************************
- *
- * TTY Entry points and helper functions
- *
- ************************************************************************/
+/* TTY Entry points and helper functions */
+
+/* dgnc_tty_open() */
 
-/*
- * dgnc_tty_open()
- *
- */
 static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
 {
         struct dgnc_board       *brd;
@@ -1045,8 +972,8 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
          * ch_flags_wait to wake us back up.
          */
         rc = wait_event_interruptible(ch->ch_flags_wait,
-                (((ch->ch_tun.un_flags | ch->ch_pun.un_flags) &
-                  UN_CLOSING) == 0));
+                        (((ch->ch_tun.un_flags |
+                           ch->ch_pun.un_flags) & UN_CLOSING) == 0));
 
         /* If ret is non-zero, user ctrl-c'ed us */
         if (rc)
@@ -1057,9 +984,8 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
         /* Store our unit into driver_data, so we always have it available. */
         tty->driver_data = un;
 
-        /*
-         * Initialize tty's
-         */
+        /* Initialize tty's */
+
         if (!(un->un_flags & UN_ISOPEN)) {
                 /* Store important variables. */
                 un->un_tty     = tty;
@@ -1096,13 +1022,10 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
         ch->ch_flags &= ~(CH_OPENING);
         wake_up_interruptible(&ch->ch_flags_wait);
 
-        /*
-         * Initialize if neither terminal or printer is open.
-         */
+        /* Initialize if neither terminal or printer is open. */
+
         if (!((ch->ch_tun.un_flags | ch->ch_pun.un_flags) & UN_ISOPEN)) {
-                /*
-                 * Flush input queues.
-                 */
+                /* Flush input queues. */
                 ch->ch_r_head = 0;
                 ch->ch_r_tail = 0;
                 ch->ch_e_head = 0;
@@ -1138,16 +1061,13 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
                 brd->bd_ops->uart_init(ch);
         }
 
-        /*
-         * Run param in case we changed anything
-         */
+        /* Run param in case we changed anything */
+
         brd->bd_ops->param(tty);
 
         dgnc_carrier(ch);
 
-        /*
-         * follow protocol for opening port
-         */
+        /* follow protocol for opening port */
 
         spin_unlock_irqrestore(&ch->ch_lock, flags);
 
@@ -1248,9 +1168,8 @@ static int dgnc_block_til_ready(struct tty_struct *tty,
                         break;
                 }
 
-                /*
-                 * Store the flags before we let go of channel lock
-                 */
+                /* Store the flags before we let go of channel lock */
+
                 if (sleep_on_un_flags)
                         old_flags = ch->ch_tun.un_flags | ch->ch_pun.un_flags;
                 else
@@ -1269,12 +1188,13 @@ static int dgnc_block_til_ready(struct tty_struct *tty,
                  * from the current value.
                  */
                 if (sleep_on_un_flags)
-                        retval = wait_event_interruptible(un->un_flags_wait,
-                                (old_flags != (ch->ch_tun.un_flags |
-                                               ch->ch_pun.un_flags)));
+                        retval = wait_event_interruptible
+                                (un->un_flags_wait,
+                                 (old_flags != (ch->ch_tun.un_flags |
+                                                ch->ch_pun.un_flags)));
                 else
                         retval = wait_event_interruptible(ch->ch_flags_wait,
-                                (old_flags != ch->ch_flags));
+                                        (old_flags != ch->ch_flags));
 
                 /*
                  * We got woken up for some reason.
@@ -1304,10 +1224,8 @@ static void dgnc_tty_hangup(struct tty_struct *tty)
         dgnc_tty_flush_buffer(tty);
 }
 
-/*
- * dgnc_tty_close()
- *
- */
+/* dgnc_tty_close() */
+
 static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
 {
         struct dgnc_board *bd;
@@ -1377,9 +1295,8 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
             !(ch->ch_digi.digi_flags & DIGI_PRINTER)) {
                 ch->ch_flags &= ~(CH_STOPI | CH_FORCED_STOPI);
 
-                /*
-                 * turn off print device when closing print device.
-                 */
+                /* turn off print device when closing print device. */
+
                 if ((un->un_type == DGNC_PRINT) && (ch->ch_flags & CH_PRON)) {
                         dgnc_wmove(ch, ch->ch_digi.digi_offstr,
                                    (int)ch->ch_digi.digi_offlen);
@@ -1399,9 +1316,8 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
 
                 tty->closing = 0;
 
-                /*
-                 * If we have HUPCL set, lower DTR and RTS
-                 */
+                /* If we have HUPCL set, lower DTR and RTS */
+
                 if (ch->ch_c_cflag & HUPCL) {
                         /* Drop RTS/DTR */
                         ch->ch_mostat &= ~(UART_MCR_DTR | UART_MCR_RTS);
@@ -1424,9 +1340,8 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
                 /* Turn off UART interrupts for this port */
                 ch->ch_bd->bd_ops->uart_off(ch);
         } else {
-                /*
-                 * turn off print device when closing print device.
-                 */
+                /* turn off print device when closing print device. */
+
                 if ((un->un_type == DGNC_PRINT) && (ch->ch_flags & CH_PRON)) {
                         dgnc_wmove(ch, ch->ch_digi.digi_offstr,
                                    (int)ch->ch_digi.digi_offlen);
@@ -1543,7 +1458,7 @@ static int dgnc_tty_write_room(struct tty_struct *tty)
         int ret = 0;
         unsigned long flags;
 
-        if (!tty || !dgnc_TmpWriteBuf)
+        if (!tty)
                 return 0;
 
         un = tty->driver_data;
@@ -1598,9 +1513,8 @@ static int dgnc_tty_write_room(struct tty_struct *tty)
  */
 static int dgnc_tty_put_char(struct tty_struct *tty, unsigned char c)
 {
-        /*
-         * Simply call tty_write.
-         */
+        /* Simply call tty_write. */
+
         dgnc_tty_write(tty, &c, 1);
         return 1;
 }
@@ -1623,7 +1537,7 @@ static int dgnc_tty_write(struct tty_struct *tty,
         ushort tmask;
         uint remain;
 
-        if (!tty || !dgnc_TmpWriteBuf)
+        if (!tty)
                 return 0;
 
         un = tty->driver_data;
@@ -1667,9 +1581,8 @@ static int dgnc_tty_write(struct tty_struct *tty,
          */
         count = min(count, bufcount);
 
-        /*
-         * Bail if no space left.
-         */
+        /* Bail if no space left. */
+
         if (count <= 0)
                 goto exit_retry;
 
@@ -1712,9 +1625,7 @@ static int dgnc_tty_write(struct tty_struct *tty,
         }
 
         if (n > 0) {
-                /*
-                 * Move rest of data.
-                 */
+                /* Move rest of data. */
                 remain = n;
                 memcpy(ch->ch_wqueue + head, buf, remain);
                 head += remain;
@@ -1749,9 +1660,7 @@ exit_retry:
         return 0;
 }
 
-/*
- * Return modem signals to ld.
- */
+/* Return modem signals to ld. */
 
 static int dgnc_tty_tiocmget(struct tty_struct *tty)
 {
@@ -1960,9 +1869,8 @@ static void dgnc_tty_send_xchar(struct tty_struct *tty, char c)
         dev_dbg(tty->dev, "dgnc_tty_send_xchar finish\n");
 }
 
-/*
- * Return modem signals to ld.
- */
+/* Return modem signals to ld. */
+
 static inline int dgnc_get_mstat(struct channel_t *ch)
 {
         unsigned char mstat;
@@ -1994,9 +1902,8 @@ static inline int dgnc_get_mstat(struct channel_t *ch)
         return result;
 }
 
-/*
- * Return modem signals to ld.
- */
+/* Return modem signals to ld. */
+
 static int dgnc_get_modem_info(struct channel_t *ch,
                                unsigned int  __user *value)
 {
@@ -2070,9 +1977,6 @@ static int dgnc_set_modem_info(struct channel_t *ch,
  * dgnc_tty_digigeta()
  *
  * Ioctl to get the information for ditty.
- *
- *
- *
  */
 static int dgnc_tty_digigeta(struct tty_struct *tty,
                              struct digi_t __user *retinfo)
@@ -2112,9 +2016,6 @@ static int dgnc_tty_digigeta(struct tty_struct *tty,
  * dgnc_tty_digiseta()
  *
  * Ioctl to set the information for ditty.
- *
- *
- *
  */
 static int dgnc_tty_digiseta(struct tty_struct *tty,
                              struct digi_t __user *new_info)
@@ -2145,9 +2046,8 @@ static int dgnc_tty_digiseta(struct tty_struct *tty,
 
         spin_lock_irqsave(&ch->ch_lock, flags);
 
-        /*
-         * Handle transistions to and from RTS Toggle.
-         */
+        /* Handle transitions to and from RTS Toggle. */
+
         if (!(ch->ch_digi.digi_flags & DIGI_RTS_TOGGLE) &&
             (new_digi.digi_flags & DIGI_RTS_TOGGLE))
                 ch->ch_mostat &= ~(UART_MCR_RTS);
@@ -2155,9 +2055,8 @@ static int dgnc_tty_digiseta(struct tty_struct *tty,
             !(new_digi.digi_flags & DIGI_RTS_TOGGLE))
                 ch->ch_mostat |= (UART_MCR_RTS);
 
-        /*
-         * Handle transistions to and from DTR Toggle.
-         */
+        /* Handle transitions to and from DTR Toggle. */
+
         if (!(ch->ch_digi.digi_flags & DIGI_DTR_TOGGLE) &&
             (new_digi.digi_flags & DIGI_DTR_TOGGLE))
                 ch->ch_mostat &= ~(UART_MCR_DTR);
@@ -2195,9 +2094,8 @@ static int dgnc_tty_digiseta(struct tty_struct *tty,
         return 0;
 }
 
-/*
- * dgnc_set_termios()
- */
+/* dgnc_set_termios() */
+
 static void dgnc_tty_set_termios(struct tty_struct *tty,
                                  struct ktermios *old_termios)
 {
@@ -2428,11 +2326,18 @@ static void dgnc_tty_flush_buffer(struct tty_struct *tty)
         spin_unlock_irqrestore(&ch->ch_lock, flags);
 }
 
-/*****************************************************************************
- *
- * The IOCTL function and all of its helpers
+/*
+ * dgnc_wake_up_unit()
  *
- *****************************************************************************/
+ * Wakes up processes waiting in the unit's (teminal/printer) wait queue
+ */
+static void dgnc_wake_up_unit(struct un_t *unit)
+{
+        unit->un_flags &= ~(UN_LOW | UN_EMPTY);
+        wake_up_interruptible(&unit->un_flags_wait);
+}
+
+/* The IOCTL function and all of its helpers */
 
 /*
  * dgnc_tty_ioctl()
@@ -2506,7 +2411,8 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                 return 0;
 
         case TCSBRKP:
-                /* support for POSIX tcsendbreak()
+                /*
+                 * support for POSIX tcsendbreak()
                  * According to POSIX.1 spec (7.2.2.1.2) breaks should be
                  * between 0.25 and 0.5 seconds so we'll ask for something
                  * in the middle: 0.375 seconds.
@@ -2583,9 +2489,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                 spin_unlock_irqrestore(&ch->ch_lock, flags);
                 return dgnc_set_modem_info(ch, cmd, uarg);
 
-                /*
-                 * Here are any additional ioctl's that we want to implement
-                 */
+                /* Here are any additional ioctl's that we want to implement */
 
         case TCFLSH:
                 /*
@@ -2615,17 +2519,11 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                                 ch->ch_w_head = ch->ch_w_tail;
                                 ch_bd_ops->flush_uart_write(ch);
 
-                                if (ch->ch_tun.un_flags & (UN_LOW | UN_EMPTY)) {
-                                        ch->ch_tun.un_flags &=
-                                                ~(UN_LOW | UN_EMPTY);
-                                        wake_up_interruptible(&ch->ch_tun.un_flags_wait);
-                                }
-
-                                if (ch->ch_pun.un_flags & (UN_LOW|UN_EMPTY)) {
-                                        ch->ch_pun.un_flags &=
-                                                ~(UN_LOW | UN_EMPTY);
-                                        wake_up_interruptible(&ch->ch_pun.un_flags_wait);
-                                }
+                                if (ch->ch_tun.un_flags & (UN_LOW | UN_EMPTY))
+                                        dgnc_wake_up_unit(&ch->ch_tun);
+
+                                if (ch->ch_pun.un_flags & (UN_LOW | UN_EMPTY))
+                                        dgnc_wake_up_unit(&ch->ch_pun);
                         }
                 }
 
@@ -2705,9 +2603,10 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
         case DIGI_LOOPBACK:
                 {
                         uint loopback = 0;
-                        /* Let go of locks when accessing user space,
+                        /*
+                         * Let go of locks when accessing user space,
                          * could sleep
-                        */
+                         */
                         spin_unlock_irqrestore(&ch->ch_lock, flags);
                         rc = get_user(loopback, (unsigned int __user *)arg);
                         if (rc)
@@ -2749,7 +2648,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
          * This ioctl allows insertion of a character into the front
          * of any pending data to be transmitted.
          *
-         * This ioctl is to satify the "Send Character Immediate"
+         * This ioctl is to satisfy the "Send Character Immediate"
          * call that the RealPort protocol spec requires.
          */
         case DIGI_REALPORT_SENDIMMEDIATE:
@@ -2769,7 +2668,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
         /*
          * This ioctl returns all the current counts for the port.
          *
-         * This ioctl is to satify the "Line Error Counters"
+         * This ioctl is to satisfy the "Line Error Counters"
          * call that the RealPort protocol spec requires.
          */
         case DIGI_REALPORT_GETCOUNTERS:
@@ -2795,7 +2694,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
         /*
          * This ioctl returns all current events.
          *
-         * This ioctl is to satify the "Event Reporting"
+         * This ioctl is to satisfy the "Event Reporting"
          * call that the RealPort protocol spec requires.
          */
         case DIGI_REALPORT_GETEVENTS:
@@ -2831,23 +2730,23 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 
                 spin_unlock_irqrestore(&ch->ch_lock, flags);
 
-                /*
-                 * Get data from user first.
-                 */
+                /* Get data from user first. */
+
                 if (copy_from_user(&buf, uarg, sizeof(buf)))
                         return -EFAULT;
 
                 spin_lock_irqsave(&ch->ch_lock, flags);
 
-                /*
-                 * Figure out how much data is in our RX and TX queues.
-                 */
+                /* Figure out how much data is in our RX and TX queues. */
+
                 buf.rxbuf = (ch->ch_r_head - ch->ch_r_tail) & RQUEUEMASK;
                 buf.txbuf = (ch->ch_w_head - ch->ch_w_tail) & WQUEUEMASK;
 
                 /*
-                 * Is the UART empty? Add that value to whats in our TX queue.
+                 * Is the UART empty?
+                 * Add that value to whats in our TX queue.
                  */
+
                 count = buf.txbuf + ch_bd_ops->get_uart_bytes_left(ch);
 
                 /*
@@ -2867,9 +2766,8 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                 if (buf.txbuf > tdist)
                         buf.txbuf = tdist;
 
-                /*
-                 * Report whether our queue and UART TX are completely empty.
-                 */
+                /* Report whether our queue and UART TX are completely empty. */
+
                 if (count)
                         buf.txdone = 0;
                 else
diff --git a/drivers/staging/dgnc/dgnc_tty.h b/drivers/staging/dgnc/dgnc_tty.h
index 24c9a412211e..1ee0eeeb4730 100644
--- a/drivers/staging/dgnc/dgnc_tty.h
+++ b/drivers/staging/dgnc/dgnc_tty.h
@@ -21,11 +21,9 @@
 int     dgnc_tty_register(struct dgnc_board *brd);
 void dgnc_tty_unregister(struct dgnc_board *brd);
 
-int     dgnc_tty_preinit(void);
-int     dgnc_tty_init(struct dgnc_board *);
+int     dgnc_tty_init(struct dgnc_board *brd);
 
-void    dgnc_tty_post_uninit(void);
-void    dgnc_cleanup_tty(struct dgnc_board *);
+void    dgnc_cleanup_tty(struct dgnc_board *brd);
 
 void    dgnc_input(struct channel_t *ch);
 void    dgnc_carrier(struct channel_t *ch);
diff --git a/drivers/staging/dgnc/digi.h b/drivers/staging/dgnc/digi.h
index 5b983e6f5ee2..ec2e3dda6119 100644
--- a/drivers/staging/dgnc/digi.h
+++ b/drivers/staging/dgnc/digi.h
@@ -17,16 +17,16 @@
 #define __DIGI_H
 
 #ifndef TIOCM_LE
-#define         TIOCM_LE        0x01            /* line enable          */
-#define         TIOCM_DTR       0x02            /* data terminal ready  */
-#define         TIOCM_RTS       0x04            /* request to send      */
-#define         TIOCM_ST        0x08            /* secondary transmit   */
-#define         TIOCM_SR        0x10            /* secondary receive    */
-#define         TIOCM_CTS       0x20            /* clear to send        */
-#define         TIOCM_CAR       0x40            /* carrier detect       */
-#define         TIOCM_RNG       0x80            /* ring indicator       */
-#define         TIOCM_DSR       0x100           /* data set ready       */
-#define         TIOCM_RI        TIOCM_RNG       /* ring (alternate)     */
+#define         TIOCM_LE        0x01            /* line enable */
+#define         TIOCM_DTR       0x02            /* data terminal ready */
+#define         TIOCM_RTS       0x04            /* request to send */
+#define         TIOCM_ST        0x08            /* secondary transmit */
+#define         TIOCM_SR        0x10            /* secondary receive */
+#define         TIOCM_CTS       0x20            /* clear to send */
+#define         TIOCM_CAR       0x40            /* carrier detect */
+#define         TIOCM_RNG       0x80            /* ring indicator */
+#define         TIOCM_DSR       0x100           /* data set ready */
+#define         TIOCM_RI        TIOCM_RNG       /* ring (alternate) */
 #define         TIOCM_CD        TIOCM_CAR       /* carrier detect (alt) */
 #endif
 
@@ -40,72 +40,71 @@
 #define TIOCMBIS        (('d' << 8) | 255)      /* set modem ctrl state */
 #endif
 
-#define DIGI_GETA       (('e' << 8) | 94)       /* Read params          */
-#define DIGI_SETA       (('e' << 8) | 95)       /* Set params           */
-#define DIGI_SETAW      (('e' << 8) | 96)       /* Drain & set params   */
+#define DIGI_GETA       (('e' << 8) | 94)       /* Read params */
+#define DIGI_SETA       (('e' << 8) | 95)       /* Set params */
+#define DIGI_SETAW      (('e' << 8) | 96)       /* Drain & set params */
 #define DIGI_SETAF      (('e' << 8) | 97)       /* Drain, flush & set params */
-#define DIGI_GET_NI_INFO (('d' << 8) | 250) /* Non-intelligent state info */
-#define DIGI_LOOPBACK (('d' << 8) | 252) /*
-                                        * Enable/disable UART
-                                        * internal loopback
-                                        */
-#define DIGI_FAST       0x0002          /* Fast baud rates              */
-#define RTSPACE         0x0004          /* RTS input flow control       */
-#define CTSPACE         0x0008          /* CTS output flow control      */
+#define DIGI_GET_NI_INFO (('d' << 8) | 250)     /* Non-intelligent state info */
+#define DIGI_LOOPBACK (('d' << 8) | 252)        /*
+                                                 * Enable/disable UART
+                                                 * internal loopback
+                                                 */
+#define DIGI_FAST       0x0002          /* Fast baud rates */
+#define RTSPACE         0x0004          /* RTS input flow control */
+#define CTSPACE         0x0008          /* CTS output flow control */
 #define DIGI_COOK       0x0080          /* Cooked processing done in FEP */
-#define DIGI_FORCEDCD   0x0100          /* Force carrier                */
-#define DIGI_ALTPIN     0x0200          /* Alternate RJ-45 pin config   */
+#define DIGI_FORCEDCD   0x0100          /* Force carrier */
+#define DIGI_ALTPIN     0x0200          /* Alternate RJ-45 pin config */
 #define DIGI_PRINTER    0x0800          /* Hold port open for flow cntrl*/
-#define DIGI_DTR_TOGGLE 0x2000          /* Support DTR Toggle           */
-#define DIGI_RTS_TOGGLE 0x8000          /* Support RTS Toggle           */
-#define DIGI_PLEN       28              /* String length                */
-#define DIGI_TSIZ       10              /* Terminal string len          */
+#define DIGI_DTR_TOGGLE 0x2000          /* Support DTR Toggle */
+#define DIGI_RTS_TOGGLE 0x8000          /* Support RTS Toggle */
+#define DIGI_PLEN       28              /* String length */
+#define DIGI_TSIZ       10              /* Terminal string len */
 
-/************************************************************************
+/*
  * Structure used with ioctl commands for DIGI parameters.
- ************************************************************************/
+ */
 struct digi_t {
-        unsigned short  digi_flags;             /* Flags (see above)    */
-        unsigned short  digi_maxcps;            /* Max printer CPS      */
+        unsigned short  digi_flags;             /* Flags (see above) */
+        unsigned short  digi_maxcps;            /* Max printer CPS */
         unsigned short  digi_maxchar;           /* Max chars in print queue */
-        unsigned short  digi_bufsize;           /* Buffer size          */
-        unsigned char   digi_onlen;             /* Length of ON string  */
+        unsigned short  digi_bufsize;           /* Buffer size */
+        unsigned char   digi_onlen;             /* Length of ON string */
         unsigned char   digi_offlen;            /* Length of OFF string */
-        char            digi_onstr[DIGI_PLEN];  /* Printer on string    */
-        char            digi_offstr[DIGI_PLEN]; /* Printer off string   */
-        char            digi_term[DIGI_TSIZ];   /* terminal string      */
+        char            digi_onstr[DIGI_PLEN];  /* Printer on string */
+        char            digi_offstr[DIGI_PLEN]; /* Printer off string */
+        char            digi_term[DIGI_TSIZ];   /* terminal string */
 };
 
-/************************************************************************
- * Structure to get driver status information
- ************************************************************************/
+/* Structure to get driver status information */
+
 struct digi_dinfo {
-        unsigned int    dinfo_nboards;          /* # boards configured  */
+        unsigned int    dinfo_nboards;          /* # boards configured */
         char            dinfo_reserved[12];     /* for future expansion */
-        char            dinfo_version[16];      /* driver version       */
+        char            dinfo_version[16];      /* driver version */
 };
 
-#define DIGI_GETDD      (('d' << 8) | 248)      /* get driver info      */
+#define DIGI_GETDD      (('d' << 8) | 248)      /* get driver info */
 
-/************************************************************************
+/*
  * Structure used with ioctl commands for per-board information
  *
  * physsize and memsize differ when board has "windowed" memory
- ************************************************************************/
+ */
 struct digi_info {
-        unsigned int    info_bdnum;             /* Board number (0 based)  */
-        unsigned int    info_ioport;            /* io port address         */
-        unsigned int    info_physaddr;          /* memory address          */
+        unsigned int    info_bdnum;             /* Board number (0 based) */
+        unsigned int    info_ioport;            /* io port address */
+        unsigned int    info_physaddr;          /* memory address */
         unsigned int    info_physsize;          /* Size of host mem window */
         unsigned int    info_memsize;           /* Amount of dual-port mem */
-                                                /* on board                */
-        unsigned short  info_bdtype;            /* Board type              */
-        unsigned short  info_nports;            /* number of ports         */
-        char            info_bdstate;           /* board state             */
-        char            info_reserved[7];       /* for future expansion    */
+                                                /* on board */
+        unsigned short  info_bdtype;            /* Board type */
+        unsigned short  info_nports;            /* number of ports */
+        char            info_bdstate;           /* board state */
+        char            info_reserved[7];       /* for future expansion */
 };
 
-#define DIGI_GETBD      (('d' << 8) | 249)      /* get board info          */
+#define DIGI_GETBD      (('d' << 8) | 249)      /* get board info */
 
 struct digi_getbuffer /* Struct for holding buffer use counts */
 {
@@ -139,7 +138,7 @@ struct digi_getcounter {
 #define DIGI_REALPORT_GETEVENTS (('e' << 8) | 111)
 
 #define EV_OPU 0x0001 /* !<Output paused by client */
-#define EV_OPS 0x0002 /* !<Output paused by reqular sw flowctrl */
+#define EV_OPS 0x0002 /* !<Output paused by regular sw flowctrl */
 #define EV_IPU 0x0010 /* !<Input paused unconditionally by user */
 #define EV_IPS 0x0020 /* !<Input paused by high/low water marks */
 #define EV_TXB 0x0040 /* !<Transmit break pending */
diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
index c3e298843b43..3f42fa8b0bf3 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -153,7 +153,6 @@ static void _nbu2ss_ep0_complete(struct usb_ep *_ep, struct usb_request *_req)
         udc = (struct nbu2ss_udc *)_req->context;
         p_ctrl = &udc->ctrl;
         if ((p_ctrl->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD) {
-
                 if (p_ctrl->bRequest == USB_REQ_SET_FEATURE) {
                         /*-------------------------------------------------*/
                         /* SET_FEATURE */
@@ -263,7 +262,7 @@ static int _nbu2ss_ep_init(struct nbu2ss_udc *udc, struct nbu2ss_ep *ep)
         }
 
         _nbu2ss_bitset(&udc->p_regs->EP_REGS[num].EP_CONTROL, data);
-        _nbu2ss_endpoint_toggle_reset(udc, (ep->epnum|ep->direct));
+        _nbu2ss_endpoint_toggle_reset(udc, (ep->epnum | ep->direct));
 
         if (ep->direct == USB_DIR_OUT) {
                 /*---------------------------------------------------------*/
@@ -460,7 +459,7 @@ static void _nbu2ss_ep_in_end(
                 if (length)
                         _nbu2ss_writel(&preg->EP_REGS[num].EP_WRITE, data32);
 
-                data = ((((u32)length) << 5) & EPn_DW) | EPn_DEND;
+                data = (((length) << 5) & EPn_DW) | EPn_DEND;
                 _nbu2ss_bitset(&preg->EP_REGS[num].EP_CONTROL, data);
 
                 _nbu2ss_bitset(&preg->EP_REGS[num].EP_CONTROL, EPn_AUTO);
@@ -753,7 +752,6 @@ static int _nbu2ss_ep0_out_transfer(
         /* Receive data confirmation */
         iRecvLength = _nbu2ss_readl(&udc->p_regs->EP0_LENGTH) & EP0_LDATA;
         if (iRecvLength != 0) {
-
                 fRcvZero = 0;
 
                 iRemainSize = req->req.length - req->req.actual;
@@ -928,9 +926,8 @@ static int _nbu2ss_epn_out_pio(
 
         req->req.actual += result;
 
-        if ((req->req.actual == req->req.length)
-                        || ((req->req.actual % ep->ep.maxpacket) != 0)) {
-
+        if ((req->req.actual == req->req.length) ||
+            ((req->req.actual % ep->ep.maxpacket) != 0)) {
                 result = 0;
         }
 
@@ -956,9 +953,8 @@ static int _nbu2ss_epn_out_data(
 
         iBufSize = min((req->req.length - req->req.actual), data_size);
 
-        if ((ep->ep_type != USB_ENDPOINT_XFER_INT)
-                && (req->req.dma != 0)
-                && (iBufSize  >= sizeof(u32))) {
+        if ((ep->ep_type != USB_ENDPOINT_XFER_INT) && (req->req.dma != 0) &&
+            (iBufSize  >= sizeof(u32))) {
                 nret = _nbu2ss_out_dma(udc, req, num, iBufSize);
         } else {
                 iBufSize = min_t(u32, iBufSize, ep->ep.maxpacket);
@@ -999,9 +995,8 @@ static int _nbu2ss_epn_out_transfer(
                         }
                 }
         } else {
-                if ((req->req.actual == req->req.length)
-                        || ((req->req.actual % ep->ep.maxpacket) != 0)) {
-
+                if ((req->req.actual == req->req.length) ||
+                    ((req->req.actual % ep->ep.maxpacket) != 0)) {
                         result = 0;
                 }
         }
@@ -1170,9 +1165,8 @@ static int _nbu2ss_epn_in_data(
 
         num = ep->epnum - 1;
 
-        if ((ep->ep_type != USB_ENDPOINT_XFER_INT)
-                && (req->req.dma != 0)
-                && (data_size >= sizeof(u32))) {
+        if ((ep->ep_type != USB_ENDPOINT_XFER_INT) && (req->req.dma != 0) &&
+            (data_size >= sizeof(u32))) {
                 nret = _nbu2ss_in_dma(udc, ep, req, num, data_size);
         } else {
                 data_size = min_t(u32, data_size, ep->ep.maxpacket);
@@ -1557,7 +1551,6 @@ static void _nbu2ss_epn_set_stall(
                 for (limit_cnt = 0
                         ; limit_cnt < IN_DATA_EMPTY_COUNT
                         ; limit_cnt++) {
-
                         regdata = _nbu2ss_readl(
                                 &preg->EP_REGS[ep->epnum - 1].EP_STATUS);
 
@@ -1582,11 +1575,8 @@ static int std_req_get_status(struct nbu2ss_udc *udc)
         u8      ep_adrs;
         int     result = -EINVAL;
 
-        if ((udc->ctrl.wValue != 0x0000)
-                || (direction != USB_DIR_IN)) {
-
+        if ((udc->ctrl.wValue != 0x0000) || (direction != USB_DIR_IN))
                 return result;
-        }
 
         length = min_t(u16, udc->ctrl.wLength, sizeof(status_data));
 
@@ -1852,7 +1842,7 @@ static inline void _nbu2ss_ep0_int(struct nbu2ss_udc *udc)
 
         status = _nbu2ss_readl(&udc->p_regs->EP0_STATUS);
         intr = status & EP0_STATUS_RW_BIT;
-        _nbu2ss_writel(&udc->p_regs->EP0_STATUS, ~(u32)intr);
+        _nbu2ss_writel(&udc->p_regs->EP0_STATUS, ~intr);
 
         status &= (SETUP_INT | EP0_IN_INT | EP0_OUT_INT
                         | STG_END_INT | EP0_OUT_NULL_INT);
@@ -1897,9 +1887,8 @@ static inline void _nbu2ss_ep0_int(struct nbu2ss_udc *udc)
                         break;
 
                 case EP0_OUT_STATUS_PAHSE:
-                        if ((status & STG_END_INT)
-                        || (status & SETUP_INT)
-                        || (status & EP0_OUT_NULL_INT)) {
+                        if ((status & STG_END_INT) || (status & SETUP_INT) ||
+                            (status & EP0_OUT_NULL_INT)) {
                                 status &= ~(STG_END_INT
                                                 | EP0_OUT_INT
                                                 | EP0_OUT_NULL_INT);
@@ -1982,7 +1971,6 @@ static inline void _nbu2ss_epn_in_int(
 
         } else {
                 if (req->zero && ((req->req.actual % ep->ep.maxpacket) == 0)) {
-
                         status =
                         _nbu2ss_readl(&preg->EP_REGS[ep->epnum - 1].EP_STATUS);
 
@@ -2127,7 +2115,7 @@ static inline void _nbu2ss_epn_int(struct nbu2ss_udc *udc, u32 epnum)
         status = _nbu2ss_readl(&udc->p_regs->EP_REGS[num].EP_STATUS);
 
         /* Interrupt Clear */
-        _nbu2ss_writel(&udc->p_regs->EP_REGS[num].EP_STATUS, ~(u32)status);
+        _nbu2ss_writel(&udc->p_regs->EP_REGS[num].EP_STATUS, ~status);
 
         req = list_first_entry_or_null(&ep->queue, struct nbu2ss_req, queue);
         if (!req) {
@@ -2330,7 +2318,6 @@ static inline void _nbu2ss_check_vbus(struct nbu2ss_udc *udc)
         /* VBUS ON Check*/
         reg_dt = gpio_get_value(VBUS_VALUE);
         if (reg_dt == 0) {
-
                 udc->linux_suspended = 0;
 
                 _nbu2ss_reset_controller(udc);
@@ -2502,7 +2489,6 @@ static irqreturn_t _nbu2ss_udc_irq(int irq, void *_udc)
                         int_bit = status >> 8;
 
                         for (epnum = 0; epnum < NUM_ENDPOINTS; epnum++) {
-
                                 if (0x01 & int_bit)
                                         _nbu2ss_ep_int(udc, epnum);
 
@@ -2546,9 +2532,8 @@ static int nbu2ss_ep_enable(
         }
 
         ep_type = usb_endpoint_type(desc);
-        if ((ep_type == USB_ENDPOINT_XFER_CONTROL)
-                || (ep_type == USB_ENDPOINT_XFER_ISOC)) {
-
+        if ((ep_type == USB_ENDPOINT_XFER_CONTROL) ||
+            (ep_type == USB_ENDPOINT_XFER_ISOC)) {
                 pr_err(" *** %s, bat bmAttributes\n", __func__);
                 return -EINVAL;
         }
@@ -2557,9 +2542,7 @@ static int nbu2ss_ep_enable(
         if (udc->vbus_active == 0)
                 return -ESHUTDOWN;
 
-        if ((!udc->driver)
-                || (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
-
+        if ((!udc->driver) || (udc->gadget.speed == USB_SPEED_UNKNOWN)) {
                 dev_err(ep->udc->dev, " *** %s, udc !!\n", __func__);
                 return -ESHUTDOWN;
         }
@@ -2674,10 +2657,7 @@ static int nbu2ss_ep_queue(
         }
 
         req = container_of(_req, struct nbu2ss_req, req);
-        if (unlikely
-            (!_req->complete || !_req->buf
-             || !list_empty(&req->queue))) {
-
+        if (unlikely(!_req->complete || !_req->buf || !list_empty(&req->queue))) {
                 if (!_req->complete)
                         pr_err("udc: %s --- !_req->complete\n", __func__);
 
@@ -2736,7 +2716,6 @@ static int nbu2ss_ep_queue(
         list_add_tail(&req->queue, &ep->queue);
 
         if (bflag && !ep->stalled) {
-
                 result = _nbu2ss_start_transfer(udc, ep, req, FALSE);
                 if (result < 0) {
                         dev_err(udc->dev, " *** %s, result = %d\n", __func__,
@@ -2938,7 +2917,7 @@ static void  nbu2ss_ep_fifo_flush(struct usb_ep *_ep)
 }
 
 /*-------------------------------------------------------------------------*/
-static struct usb_ep_ops nbu2ss_ep_ops = {
+static const struct usb_ep_ops nbu2ss_ep_ops = {
         .enable         = nbu2ss_ep_enable,
         .disable        = nbu2ss_ep_disable,
 
@@ -2979,9 +2958,7 @@ static int nbu2ss_gad_get_frame(struct usb_gadget *pgadget)
         if (data == 0)
                 return -EINVAL;
 
-        data = _nbu2ss_readl(&udc->p_regs->USB_ADDRESS) & FRAME;
-
-        return data;
+        return _nbu2ss_readl(&udc->p_regs->USB_ADDRESS) & FRAME;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -3307,8 +3284,8 @@ static int nbu2ss_drv_remove(struct platform_device *pdev)
         for (i = 0; i < NUM_ENDPOINTS; i++) {
                 ep = &udc->ep[i];
                 if (ep->virt_buf)
-                        dma_free_coherent(NULL, PAGE_SIZE,
-                                (void *)ep->virt_buf, ep->phys_buf);
+                        dma_free_coherent(NULL, PAGE_SIZE, (void *)ep->virt_buf,
+                                          ep->phys_buf);
         }
 
         /* Interrupt Handler - Release */
diff --git a/drivers/staging/fbtft/fb_agm1264k-fl.c b/drivers/staging/fbtft/fb_agm1264k-fl.c
index 7561385761e9..a6e3af74a904 100644
--- a/drivers/staging/fbtft/fb_agm1264k-fl.c
+++ b/drivers/staging/fbtft/fb_agm1264k-fl.c
@@ -264,6 +264,39 @@ construct_line_bitmap(struct fbtft_par *par, u8 *dest, signed short *src,
         }
 }
 
+static void iterate_diffusion_matrix(u32 xres, u32 yres, int x,
+                                     int y, signed short *convert_buf,
+                                     signed short pixel, signed short error)
+{
+        u16 i, j;
+
+        /* diffusion matrix row */
+        for (i = 0; i < DIFFUSING_MATRIX_WIDTH; ++i)
+                /* diffusion matrix column */
+                for (j = 0; j < DIFFUSING_MATRIX_HEIGHT; ++j) {
+                        signed short *write_pos;
+                        signed char coeff;
+
+                        /* skip pixels out of zone */
+                        if (x + i < 0 || x + i >= xres || y + j >= yres)
+                                continue;
+                        write_pos = &convert_buf[(y + j) * xres + x + i];
+                        coeff = diffusing_matrix[i][j];
+                        if (-1 == coeff)
+                                /* pixel itself */
+                                *write_pos = pixel;
+                        else {
+                                signed short p = *write_pos + error * coeff;
+
+                                if (p > WHITE)
+                                        p = WHITE;
+                                if (p < BLACK)
+                                        p = BLACK;
+                                *write_pos = p;
+                        }
+                }
+}
+
 static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
 {
         u16 *vmem16 = (u16 *)par->info->screen_buffer;
@@ -303,7 +336,6 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
                         signed short error_b = pixel - BLACK;
                         signed short error_w = pixel - WHITE;
                         signed short error;
-                        u16 i, j;
 
                         /* what color close? */
                         if (abs(error_b) >= abs(error_w)) {
@@ -318,36 +350,10 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
 
                         error /= 8;
 
-                        /* diffusion matrix row */
-                        for (i = 0; i < DIFFUSING_MATRIX_WIDTH; ++i)
-                                /* diffusion matrix column */
-                                for (j = 0; j < DIFFUSING_MATRIX_HEIGHT; ++j) {
-                                        signed short *write_pos;
-                                        signed char coeff;
-
-                                        /* skip pixels out of zone */
-                                        if (x + i < 0 ||
-                                                x + i >= par->info->var.xres
-                                                || y + j >= par->info->var.yres)
-                                                continue;
-                                        write_pos = &convert_buf[
-                                                (y + j) * par->info->var.xres +
-                                                x + i];
-                                        coeff = diffusing_matrix[i][j];
-                                        if (coeff == -1)
-                                                /* pixel itself */
-                                                *write_pos = pixel;
-                                        else {
-                                                signed short p = *write_pos +
-                                                        error * coeff;
-
-                                                if (p > WHITE)
-                                                        p = WHITE;
-                                                if (p < BLACK)
-                                                        p = BLACK;
-                                                *write_pos = p;
-                                        }
-                                }
+                        iterate_diffusion_matrix(par->info->var.xres,
+                                                 par->info->var.yres,
+                                                 x, y, convert_buf,
+                                                 pixel, error);
                 }
 
         /* 1 string = 2 pages */
diff --git a/drivers/staging/fbtft/fb_ili9325.c b/drivers/staging/fbtft/fb_ili9325.c
index c31e2e051d4a..19e33bab9cac 100644
--- a/drivers/staging/fbtft/fb_ili9325.c
+++ b/drivers/staging/fbtft/fb_ili9325.c
@@ -33,26 +33,23 @@
                         "04 16 2 7 6 3 2 1 7 7"
 
 static unsigned int bt = 6; /* VGL=Vci*4 , VGH=Vci*4 */
-module_param(bt, uint, 0);
+module_param(bt, uint, 0000);
 MODULE_PARM_DESC(bt, "Sets the factor used in the step-up circuits");
 
 static unsigned int vc = 0x03; /* Vci1=Vci*0.80 */
-module_param(vc, uint, 0);
-MODULE_PARM_DESC(vc,
-"Sets the ratio factor of Vci to generate the reference voltages Vci1");
+module_param(vc, uint, 0000);
+MODULE_PARM_DESC(vc, "Sets the ratio factor of Vci to generate the reference voltages Vci1");
 
 static unsigned int vrh = 0x0d; /* VREG1OUT=Vci*1.85 */
-module_param(vrh, uint, 0);
-MODULE_PARM_DESC(vrh,
-"Set the amplifying rate (1.6 ~ 1.9) of Vci applied to output the VREG1OUT");
+module_param(vrh, uint, 0000);
+MODULE_PARM_DESC(vrh, "Set the amplifying rate (1.6 ~ 1.9) of Vci applied to output the VREG1OUT");
 
 static unsigned int vdv = 0x12; /* VCOMH amplitude=VREG1OUT*0.98 */
-module_param(vdv, uint, 0);
-MODULE_PARM_DESC(vdv,
-"Select the factor of VREG1OUT to set the amplitude of Vcom");
+module_param(vdv, uint, 0000);
+MODULE_PARM_DESC(vdv, "Select the factor of VREG1OUT to set the amplitude of Vcom");
 
 static unsigned int vcm = 0x0a; /* VCOMH=VREG1OUT*0.735 */
-module_param(vcm, uint, 0);
+module_param(vcm, uint, 0000);
 MODULE_PARM_DESC(vcm, "Set the internal VcomH voltage");
 
 /*
diff --git a/drivers/staging/fbtft/fb_ili9481.c b/drivers/staging/fbtft/fb_ili9481.c
index 242adb3859bd..4e75f5abe2f9 100644
--- a/drivers/staging/fbtft/fb_ili9481.c
+++ b/drivers/staging/fbtft/fb_ili9481.c
@@ -27,7 +27,7 @@
 #define WIDTH           320
 #define HEIGHT          480
 
-static int default_init_sequence[] = {
+static s16 default_init_sequence[] = {
         /* SLP_OUT - Sleep out */
         -1, MIPI_DCS_EXIT_SLEEP_MODE,
         -2, 50,
diff --git a/drivers/staging/fbtft/fb_ili9486.c b/drivers/staging/fbtft/fb_ili9486.c
index fa38d8885f0b..f4b314265f9e 100644
--- a/drivers/staging/fbtft/fb_ili9486.c
+++ b/drivers/staging/fbtft/fb_ili9486.c
@@ -26,7 +26,7 @@
 #define HEIGHT          480
 
 /* this init sequence matches PiScreen */
-static int default_init_sequence[] = {
+static s16 default_init_sequence[] = {
         /* Interface Mode Control */
         -1, 0xb0, 0x0,
         -1, MIPI_DCS_EXIT_SLEEP_MODE,
diff --git a/drivers/staging/fbtft/fb_s6d02a1.c b/drivers/staging/fbtft/fb_s6d02a1.c
index 774b0ff69e6d..eb712aa0d692 100644
--- a/drivers/staging/fbtft/fb_s6d02a1.c
+++ b/drivers/staging/fbtft/fb_s6d02a1.c
@@ -24,7 +24,7 @@
 
 #define DRVNAME "fb_s6d02a1"
 
-static int default_init_sequence[] = {
+static s16 default_init_sequence[] = {
 
         -1, 0xf0, 0x5a, 0x5a,
 
diff --git a/drivers/staging/fbtft/fb_st7735r.c b/drivers/staging/fbtft/fb_st7735r.c
index 6670f2bb62ec..710b74bbba97 100644
--- a/drivers/staging/fbtft/fb_st7735r.c
+++ b/drivers/staging/fbtft/fb_st7735r.c
@@ -25,7 +25,7 @@
 #define DEFAULT_GAMMA   "0F 1A 0F 18 2F 28 20 22 1F 1B 23 37 00 07 02 10\n" \
                         "0F 1B 0F 17 33 2C 29 2E 30 30 39 3F 00 07 03 10"
 
-static int default_init_sequence[] = {
+static s16 default_init_sequence[] = {
         -1, MIPI_DCS_SOFT_RESET,
         -2, 150,                               /* delay */
 
diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
index 587f68aa466c..bbe89c9c4fb9 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -253,7 +253,8 @@ static int fbtft_backlight_update_status(struct backlight_device *bd)
                 "%s: polarity=%d, power=%d, fb_blank=%d\n",
                 __func__, polarity, bd->props.power, bd->props.fb_blank);
 
-        if ((bd->props.power == FB_BLANK_UNBLANK) && (bd->props.fb_blank == FB_BLANK_UNBLANK))
+        if ((bd->props.power == FB_BLANK_UNBLANK) &&
+            (bd->props.fb_blank == FB_BLANK_UNBLANK))
                 gpio_set_value(par->gpio.led[0], polarity);
         else
                 gpio_set_value(par->gpio.led[0], !polarity);
@@ -299,7 +300,8 @@ void fbtft_register_backlight(struct fbtft_par *par)
                 bl_props.state |= BL_CORE_DRIVER1;
 
         bd = backlight_device_register(dev_driver_string(par->info->device),
-                                par->info->device, par, &fbtft_bl_ops, &bl_props);
+                                       par->info->device, par,
+                                       &fbtft_bl_ops, &bl_props);
         if (IS_ERR(bd)) {
                 dev_err(par->info->device,
                         "cannot register backlight device (%ld)\n",
@@ -350,9 +352,11 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned int start_line,
         bool timeit = false;
         int ret = 0;
 
-        if (unlikely(par->debug & (DEBUG_TIME_FIRST_UPDATE | DEBUG_TIME_EACH_UPDATE))) {
+        if (unlikely(par->debug & (DEBUG_TIME_FIRST_UPDATE |
+                        DEBUG_TIME_EACH_UPDATE))) {
                 if ((par->debug & DEBUG_TIME_EACH_UPDATE) ||
-                                ((par->debug & DEBUG_TIME_FIRST_UPDATE) && !par->first_update_done)) {
+                                ((par->debug & DEBUG_TIME_FIRST_UPDATE) &&
+                                !par->first_update_done)) {
                         ts_start = ktime_get();
                         timeit = true;
                 }
@@ -361,15 +365,17 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned int start_line,
         /* Sanity checks */
         if (start_line > end_line) {
                 dev_warn(par->info->device,
-                        "%s: start_line=%u is larger than end_line=%u. Shouldn't happen, will do full display update\n",
-                        __func__, start_line, end_line);
+                         "%s: start_line=%u is larger than end_line=%u. Shouldn't happen, will do full display update\n",
+                         __func__, start_line, end_line);
                 start_line = 0;
                 end_line = par->info->var.yres - 1;
         }
-        if (start_line > par->info->var.yres - 1 || end_line > par->info->var.yres - 1) {
+        if (start_line > par->info->var.yres - 1 ||
+            end_line > par->info->var.yres - 1) {
                 dev_warn(par->info->device,
                         "%s: start_line=%u or end_line=%u is larger than max=%d. Shouldn't happen, will do full display update\n",
-                        __func__, start_line, end_line, par->info->var.yres - 1);
+                         __func__, start_line,
+                         end_line, par->info->var.yres - 1);
                 start_line = 0;
                 end_line = par->info->var.yres - 1;
         }
@@ -660,12 +666,13 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
         unsigned int bpp = display->bpp;
         unsigned int fps = display->fps;
         int vmem_size, i;
-        int *init_sequence = display->init_sequence;
+        s16 *init_sequence = display->init_sequence;
         char *gamma = display->gamma;
         unsigned long *gamma_curves = NULL;
 
         /* sanity check */
-        if (display->gamma_num * display->gamma_len > FBTFT_GAMMA_MAX_VALUES_TOTAL) {
+        if (display->gamma_num * display->gamma_len >
+                        FBTFT_GAMMA_MAX_VALUES_TOTAL) {
                 dev_err(dev, "FBTFT_GAMMA_MAX_VALUES_TOTAL=%d is exceeded\n",
                         FBTFT_GAMMA_MAX_VALUES_TOTAL);
                 return NULL;
@@ -832,11 +839,13 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
 #ifdef CONFIG_HAS_DMA
                 if (dma) {
                         dev->coherent_dma_mask = ~0;
-                        txbuf = dmam_alloc_coherent(dev, txbuflen, &par->txbuf.dma, GFP_DMA);
+                        txbuf = dmam_alloc_coherent(dev, txbuflen,
+                                                    &par->txbuf.dma, GFP_DMA);
                 } else
 #endif
                 {
-                        txbuf = devm_kzalloc(par->info->device, txbuflen, GFP_KERNEL);
+                        txbuf = devm_kzalloc(par->info->device,
+                                             txbuflen, GFP_KERNEL);
                 }
                 if (!txbuf)
                         goto alloc_fail;
diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
index 89c4b5b76ce6..aacdde92cc2e 100644
--- a/drivers/staging/fbtft/fbtft.h
+++ b/drivers/staging/fbtft/fbtft.h
@@ -124,7 +124,7 @@ struct fbtft_display {
         unsigned int bpp;
         unsigned int fps;
         int txbuflen;
-        int *init_sequence;
+        s16 *init_sequence;
         char *gamma;
         int gamma_num;
         int gamma_len;
@@ -229,7 +229,7 @@ struct fbtft_par {
                 int led[16];
                 int aux[16];
         } gpio;
-        int *init_sequence;
+        s16 *init_sequence;
         struct {
                 struct mutex lock;
                 unsigned long *curves;
diff --git a/drivers/staging/fbtft/fbtft_device.c b/drivers/staging/fbtft/fbtft_device.c
index e9211831b6a1..de46f8d988d2 100644
--- a/drivers/staging/fbtft/fbtft_device.c
+++ b/drivers/staging/fbtft/fbtft_device.c
@@ -96,9 +96,9 @@ static unsigned int buswidth = 8;
 module_param(buswidth, uint, 0);
 MODULE_PARM_DESC(buswidth, "Display bus width, used with the custom argument");
 
-static int init[FBTFT_MAX_INIT_SEQUENCE];
+static s16 init[FBTFT_MAX_INIT_SEQUENCE];
 static int init_num;
-module_param_array(init, int, &init_num, 0);
+module_param_array(init, short, &init_num, 0);
 MODULE_PARM_DESC(init, "Init sequence, used with the custom argument");
 
 static unsigned long debug;
@@ -131,7 +131,7 @@ static void adafruit18_green_tab_set_addr_win(struct fbtft_par *par,
                 "D0 00 14 15 13 2C 42 43 4E 09 16 14 18 21\n" \
                 "D0 00 14 15 13 0B 43 55 53 0C 17 14 23 20"
 
-static int cberry28_init_sequence[] = {
+static s16 cberry28_init_sequence[] = {
         /* turn off sleep mode */
         -1, MIPI_DCS_EXIT_SLEEP_MODE,
         -2, 120,
@@ -180,7 +180,7 @@ static int cberry28_init_sequence[] = {
         -3,
 };
 
-static int hy28b_init_sequence[] = {
+static s16 hy28b_init_sequence[] = {
         -1, 0x00e7, 0x0010, -1, 0x0000, 0x0001,
         -1, 0x0001, 0x0100, -1, 0x0002, 0x0700,
         -1, 0x0003, 0x1030, -1, 0x0004, 0x0000,
@@ -211,7 +211,7 @@ static int hy28b_init_sequence[] = {
         "04 1F 4 7 7 0 7 7 6 0\n" \
         "0F 00 1 7 4 0 0 0 6 7"
 
-static int pitft_init_sequence[] = {
+static s16 pitft_init_sequence[] = {
         -1, MIPI_DCS_SOFT_RESET,
         -2, 5,
         -1, MIPI_DCS_SET_DISPLAY_OFF,
@@ -242,7 +242,7 @@ static int pitft_init_sequence[] = {
         -3
 };
 
-static int waveshare32b_init_sequence[] = {
+static s16 waveshare32b_init_sequence[] = {
         -1, 0xCB, 0x39, 0x2C, 0x00, 0x34, 0x02,
         -1, 0xCF, 0x00, 0xC1, 0x30,
         -1, 0xE8, 0x85, 0x00, 0x78,
diff --git a/drivers/staging/fbtft/flexfb.c b/drivers/staging/fbtft/flexfb.c
index ce0d254148e4..ded10718712b 100644
--- a/drivers/staging/fbtft/flexfb.c
+++ b/drivers/staging/fbtft/flexfb.c
@@ -38,9 +38,9 @@ static unsigned int height;
 module_param(height, uint, 0);
 MODULE_PARM_DESC(height, "Display height");
 
-static int init[512];
+static s16 init[512];
 static int init_num;
-module_param_array(init, int, &init_num, 0);
+module_param_array(init, short, &init_num, 0);
 MODULE_PARM_DESC(init, "Init sequence");
 
 static unsigned int setaddrwin;
@@ -63,68 +63,316 @@ static bool latched;
 module_param(latched, bool, 0);
 MODULE_PARM_DESC(latched, "Use with latched 16-bit databus");
 
-static int *initp;
+static s16 *initp;
 static int initp_num;
 
 /* default init sequences */
-static int st7735r_init[] = {
--1, 0x01, -2, 150, -1, 0x11, -2, 500, -1, 0xB1, 0x01, 0x2C, 0x2D, -1, 0xB2, 0x01, 0x2C, 0x2D, -1, 0xB3, 0x01, 0x2C, 0x2D, 0x01, 0x2C, 0x2D,
--1, 0xB4, 0x07, -1, 0xC0, 0xA2, 0x02, 0x84, -1, 0xC1, 0xC5, -1, 0xC2, 0x0A, 0x00, -1, 0xC3, 0x8A, 0x2A, -1, 0xC4, 0x8A, 0xEE, -1, 0xC5, 0x0E,
--1, 0x20, -1, 0x36, 0xC0, -1, 0x3A, 0x05, -1, 0xE0, 0x0f, 0x1a, 0x0f, 0x18, 0x2f, 0x28, 0x20, 0x22, 0x1f, 0x1b, 0x23, 0x37, 0x00, 0x07, 0x02, 0x10,
--1, 0xE1, 0x0f, 0x1b, 0x0f, 0x17, 0x33, 0x2c, 0x29, 0x2e, 0x30, 0x30, 0x39, 0x3f, 0x00, 0x07, 0x03, 0x10, -1, 0x29, -2, 100, -1, 0x13, -2, 10, -3 };
-
-static int ssd1289_init[] = {
--1, 0x00, 0x0001, -1, 0x03, 0xA8A4, -1, 0x0C, 0x0000, -1, 0x0D, 0x080C, -1, 0x0E, 0x2B00, -1, 0x1E, 0x00B7, -1, 0x01, 0x2B3F, -1, 0x02, 0x0600,
--1, 0x10, 0x0000, -1, 0x11, 0x6070, -1, 0x05, 0x0000, -1, 0x06, 0x0000, -1, 0x16, 0xEF1C, -1, 0x17, 0x0003, -1, 0x07, 0x0233, -1, 0x0B, 0x0000,
--1, 0x0F, 0x0000, -1, 0x41, 0x0000, -1, 0x42, 0x0000, -1, 0x48, 0x0000, -1, 0x49, 0x013F, -1, 0x4A, 0x0000, -1, 0x4B, 0x0000, -1, 0x44, 0xEF00,
--1, 0x45, 0x0000, -1, 0x46, 0x013F, -1, 0x30, 0x0707, -1, 0x31, 0x0204, -1, 0x32, 0x0204, -1, 0x33, 0x0502, -1, 0x34, 0x0507, -1, 0x35, 0x0204,
--1, 0x36, 0x0204, -1, 0x37, 0x0502, -1, 0x3A, 0x0302, -1, 0x3B, 0x0302, -1, 0x23, 0x0000, -1, 0x24, 0x0000, -1, 0x25, 0x8000, -1, 0x4f, 0x0000,
--1, 0x4e, 0x0000, -1, 0x22, -3 };
-
-static int hx8340bn_init[] = {
--1, 0xC1, 0xFF, 0x83, 0x40, -1, 0x11, -2, 150, -1, 0xCA, 0x70, 0x00, 0xD9, -1, 0xB0, 0x01, 0x11,
--1, 0xC9, 0x90, 0x49, 0x10, 0x28, 0x28, 0x10, 0x00, 0x06, -2, 20, -1, 0xC2, 0x60, 0x71, 0x01, 0x0E, 0x05, 0x02, 0x09, 0x31, 0x0A,
--1, 0xC3, 0x67, 0x30, 0x61, 0x17, 0x48, 0x07, 0x05, 0x33, -2, 10, -1, 0xB5, 0x35, 0x20, 0x45, -1, 0xB4, 0x33, 0x25, 0x4C, -2, 10,
--1, 0x3A, 0x05, -1, 0x29, -2, 10, -3 };
-
-static int ili9225_init[] = {
--1, 0x0001, 0x011C, -1, 0x0002, 0x0100, -1, 0x0003, 0x1030, -1, 0x0008, 0x0808, -1, 0x000C, 0x0000, -1, 0x000F, 0x0A01, -1, 0x0020, 0x0000,
--1, 0x0021, 0x0000, -2, 50, -1, 0x0010, 0x0A00, -1, 0x0011, 0x1038, -2, 50, -1, 0x0012, 0x1121, -1, 0x0013, 0x004E, -1, 0x0014, 0x676F,
--1, 0x0030, 0x0000, -1, 0x0031, 0x00DB, -1, 0x0032, 0x0000, -1, 0x0033, 0x0000, -1, 0x0034, 0x00DB, -1, 0x0035, 0x0000, -1, 0x0036, 0x00AF,
--1, 0x0037, 0x0000, -1, 0x0038, 0x00DB, -1, 0x0039, 0x0000, -1, 0x0050, 0x0000, -1, 0x0051, 0x060A, -1, 0x0052, 0x0D0A, -1, 0x0053, 0x0303,
--1, 0x0054, 0x0A0D, -1, 0x0055, 0x0A06, -1, 0x0056, 0x0000, -1, 0x0057, 0x0303, -1, 0x0058, 0x0000, -1, 0x0059, 0x0000, -2, 50,
--1, 0x0007, 0x1017, -2, 50, -3 };
-
-static int ili9320_init[] = {
--1, 0x00E5, 0x8000, -1, 0x0000, 0x0001, -1, 0x0001, 0x0100, -1, 0x0002, 0x0700, -1, 0x0003, 0x1030, -1, 0x0004, 0x0000, -1, 0x0008, 0x0202,
--1, 0x0009, 0x0000, -1, 0x000A, 0x0000, -1, 0x000C, 0x0000, -1, 0x000D, 0x0000, -1, 0x000F, 0x0000, -1, 0x0010, 0x0000, -1, 0x0011, 0x0007,
--1, 0x0012, 0x0000, -1, 0x0013, 0x0000, -2, 200, -1, 0x0010, 0x17B0, -1, 0x0011, 0x0031, -2, 50, -1, 0x0012, 0x0138, -2, 50, -1, 0x0013, 0x1800,
--1, 0x0029, 0x0008, -2, 50, -1, 0x0020, 0x0000, -1, 0x0021, 0x0000, -1, 0x0030, 0x0000, -1, 0x0031, 0x0505, -1, 0x0032, 0x0004,
--1, 0x0035, 0x0006, -1, 0x0036, 0x0707, -1, 0x0037, 0x0105, -1, 0x0038, 0x0002, -1, 0x0039, 0x0707, -1, 0x003C, 0x0704, -1, 0x003D, 0x0807,
--1, 0x0050, 0x0000, -1, 0x0051, 0x00EF, -1, 0x0052, 0x0000, -1, 0x0053, 0x013F, -1, 0x0060, 0x2700, -1, 0x0061, 0x0001, -1, 0x006A, 0x0000,
--1, 0x0080, 0x0000, -1, 0x0081, 0x0000, -1, 0x0082, 0x0000, -1, 0x0083, 0x0000, -1, 0x0084, 0x0000, -1, 0x0085, 0x0000, -1, 0x0090, 0x0010,
--1, 0x0092, 0x0000, -1, 0x0093, 0x0003, -1, 0x0095, 0x0110, -1, 0x0097, 0x0000, -1, 0x0098, 0x0000, -1, 0x0007, 0x0173, -3 };
-
-static int ili9325_init[] = {
--1, 0x00E3, 0x3008, -1, 0x00E7, 0x0012, -1, 0x00EF, 0x1231, -1, 0x0001, 0x0100, -1, 0x0002, 0x0700, -1, 0x0003, 0x1030, -1, 0x0004, 0x0000,
--1, 0x0008, 0x0207, -1, 0x0009, 0x0000, -1, 0x000A, 0x0000, -1, 0x000C, 0x0000, -1, 0x000D, 0x0000, -1, 0x000F, 0x0000, -1, 0x0010, 0x0000,
--1, 0x0011, 0x0007, -1, 0x0012, 0x0000, -1, 0x0013, 0x0000, -2, 200, -1, 0x0010, 0x1690, -1, 0x0011, 0x0223, -2, 50, -1, 0x0012, 0x000D, -2, 50,
--1, 0x0013, 0x1200, -1, 0x0029, 0x000A, -1, 0x002B, 0x000C, -2, 50, -1, 0x0020, 0x0000, -1, 0x0021, 0x0000, -1, 0x0030, 0x0000,
--1, 0x0031, 0x0506, -1, 0x0032, 0x0104, -1, 0x0035, 0x0207, -1, 0x0036, 0x000F, -1, 0x0037, 0x0306, -1, 0x0038, 0x0102, -1, 0x0039, 0x0707,
--1, 0x003C, 0x0702, -1, 0x003D, 0x1604, -1, 0x0050, 0x0000, -1, 0x0051, 0x00EF, -1, 0x0052, 0x0000, -1, 0x0053, 0x013F, -1, 0x0060, 0xA700,
--1, 0x0061, 0x0001, -1, 0x006A, 0x0000, -1, 0x0080, 0x0000, -1, 0x0081, 0x0000, -1, 0x0082, 0x0000, -1, 0x0083, 0x0000, -1, 0x0084, 0x0000,
--1, 0x0085, 0x0000, -1, 0x0090, 0x0010, -1, 0x0092, 0x0600, -1, 0x0007, 0x0133, -3 };
-
-static int ili9341_init[] = {
--1, 0x28, -2, 20, -1, 0xCF, 0x00, 0x83, 0x30, -1, 0xED, 0x64, 0x03, 0x12, 0x81, -1, 0xE8, 0x85, 0x01, 0x79,
--1, 0xCB, 0x39, 0x2c, 0x00, 0x34, 0x02, -1, 0xF7, 0x20, -1, 0xEA, 0x00, 0x00, -1, 0xC0, 0x26, -1, 0xC1, 0x11,
--1, 0xC5, 0x35, 0x3E, -1, 0xC7, 0xBE, -1, 0xB1, 0x00, 0x1B, -1, 0xB6, 0x0a, 0x82, 0x27, 0x00, -1, 0xB7, 0x07,
--1, 0x3A, 0x55, -1, 0x36, 0x48, -1, 0x11, -2, 120, -1, 0x29, -2, 20, -3 };
-
-static int ssd1351_init[] = { -1, 0xfd, 0x12, -1, 0xfd, 0xb1, -1, 0xae, -1, 0xb3, 0xf1, -1, 0xca, 0x7f, -1, 0xa0, 0x74,
-                              -1, 0x15, 0x00, 0x7f, -1, 0x75, 0x00, 0x7f, -1, 0xa1, 0x00, -1, 0xa2, 0x00, -1, 0xb5, 0x00,
-                              -1, 0xab, 0x01, -1, 0xb1, 0x32, -1, 0xb4, 0xa0, 0xb5, 0x55, -1, 0xbb, 0x17, -1, 0xbe, 0x05,
-                              -1, 0xc1, 0xc8, 0x80, 0xc8, -1, 0xc7, 0x0f, -1, 0xb6, 0x01, -1, 0xa6, -1, 0xaf, -3 };
+static s16 st7735r_init[] = {
+        -1, 0x01,
+        -2, 150,
+        -1, 0x11,
+        -2, 500,
+        -1, 0xB1, 0x01, 0x2C, 0x2D,
+        -1, 0xB2, 0x01, 0x2C, 0x2D,
+        -1, 0xB3, 0x01, 0x2C, 0x2D, 0x01, 0x2C, 0x2D,
+        -1, 0xB4, 0x07,
+        -1, 0xC0, 0xA2, 0x02, 0x84,
+        -1, 0xC1, 0xC5,
+        -1, 0xC2, 0x0A, 0x00,
+        -1, 0xC3, 0x8A, 0x2A,
+        -1, 0xC4, 0x8A, 0xEE,
+        -1, 0xC5, 0x0E,
+        -1, 0x20,
+        -1, 0x36, 0xC0,
+        -1, 0x3A, 0x05,
+        -1, 0xE0, 0x0f, 0x1a, 0x0f, 0x18, 0x2f, 0x28, 0x20, 0x22,
+            0x1f, 0x1b, 0x23, 0x37, 0x00, 0x07, 0x02, 0x10,
+        -1, 0xE1, 0x0f, 0x1b, 0x0f, 0x17, 0x33, 0x2c, 0x29, 0x2e,
+            0x30, 0x30, 0x39, 0x3f, 0x00, 0x07, 0x03, 0x10,
+        -1, 0x29,
+        -2, 100,
+        -1, 0x13,
+        -2, 10,
+        -3
+};
+
+static s16 ssd1289_init[] = {
+        -1, 0x00, 0x0001,
+        -1, 0x03, 0xA8A4,
+        -1, 0x0C, 0x0000,
+        -1, 0x0D, 0x080C,
+        -1, 0x0E, 0x2B00,
+        -1, 0x1E, 0x00B7,
+        -1, 0x01, 0x2B3F,
+        -1, 0x02, 0x0600,
+        -1, 0x10, 0x0000,
+        -1, 0x11, 0x6070,
+        -1, 0x05, 0x0000,
+        -1, 0x06, 0x0000,
+        -1, 0x16, 0xEF1C,
+        -1, 0x17, 0x0003,
+        -1, 0x07, 0x0233,
+        -1, 0x0B, 0x0000,
+        -1, 0x0F, 0x0000,
+        -1, 0x41, 0x0000,
+        -1, 0x42, 0x0000,
+        -1, 0x48, 0x0000,
+        -1, 0x49, 0x013F,
+        -1, 0x4A, 0x0000,
+        -1, 0x4B, 0x0000,
+        -1, 0x44, 0xEF00,
+        -1, 0x45, 0x0000,
+        -1, 0x46, 0x013F,
+        -1, 0x30, 0x0707,
+        -1, 0x31, 0x0204,
+        -1, 0x32, 0x0204,
+        -1, 0x33, 0x0502,
+        -1, 0x34, 0x0507,
+        -1, 0x35, 0x0204,
+        -1, 0x36, 0x0204,
+        -1, 0x37, 0x0502,
+        -1, 0x3A, 0x0302,
+        -1, 0x3B, 0x0302,
+        -1, 0x23, 0x0000,
+        -1, 0x24, 0x0000,
+        -1, 0x25, 0x8000,
+        -1, 0x4f, 0x0000,
+        -1, 0x4e, 0x0000,
+        -1, 0x22,
+        -3
+};
+
+static s16 hx8340bn_init[] = {
+        -1, 0xC1, 0xFF, 0x83, 0x40,
+        -1, 0x11,
+        -2, 150,
+        -1, 0xCA, 0x70, 0x00, 0xD9,
+        -1, 0xB0, 0x01, 0x11,
+        -1, 0xC9, 0x90, 0x49, 0x10, 0x28, 0x28, 0x10, 0x00, 0x06,
+        -2, 20,
+        -1, 0xC2, 0x60, 0x71, 0x01, 0x0E, 0x05, 0x02, 0x09, 0x31, 0x0A,
+        -1, 0xC3, 0x67, 0x30, 0x61, 0x17, 0x48, 0x07, 0x05, 0x33,
+        -2, 10,
+        -1, 0xB5, 0x35, 0x20, 0x45,
+        -1, 0xB4, 0x33, 0x25, 0x4C,
+        -2, 10,
+        -1, 0x3A, 0x05,
+        -1, 0x29,
+        -2, 10,
+        -3
+};
+
+static s16 ili9225_init[] = {
+        -1, 0x0001, 0x011C,
+        -1, 0x0002, 0x0100,
+        -1, 0x0003, 0x1030,
+        -1, 0x0008, 0x0808,
+        -1, 0x000C, 0x0000,
+        -1, 0x000F, 0x0A01,
+        -1, 0x0020, 0x0000,
+        -1, 0x0021, 0x0000,
+        -2, 50,
+        -1, 0x0010, 0x0A00,
+        -1, 0x0011, 0x1038,
+        -2, 50,
+        -1, 0x0012, 0x1121,
+        -1, 0x0013, 0x004E,
+        -1, 0x0014, 0x676F,
+        -1, 0x0030, 0x0000,
+        -1, 0x0031, 0x00DB,
+        -1, 0x0032, 0x0000,
+        -1, 0x0033, 0x0000,
+        -1, 0x0034, 0x00DB,
+        -1, 0x0035, 0x0000,
+        -1, 0x0036, 0x00AF,
+        -1, 0x0037, 0x0000,
+        -1, 0x0038, 0x00DB,
+        -1, 0x0039, 0x0000,
+        -1, 0x0050, 0x0000,
+        -1, 0x0051, 0x060A,
+        -1, 0x0052, 0x0D0A,
+        -1, 0x0053, 0x0303,
+        -1, 0x0054, 0x0A0D,
+        -1, 0x0055, 0x0A06,
+        -1, 0x0056, 0x0000,
+        -1, 0x0057, 0x0303,
+        -1, 0x0058, 0x0000,
+        -1, 0x0059, 0x0000,
+        -2, 50,
+        -1, 0x0007, 0x1017,
+        -2, 50,
+        -3
+};
+
+static s16 ili9320_init[] = {
+        -1, 0x00E5, 0x8000,
+        -1, 0x0000, 0x0001,
+        -1, 0x0001, 0x0100,
+        -1, 0x0002, 0x0700,
+        -1, 0x0003, 0x1030,
+        -1, 0x0004, 0x0000,
+        -1, 0x0008, 0x0202,
+        -1, 0x0009, 0x0000,
+        -1, 0x000A, 0x0000,
+        -1, 0x000C, 0x0000,
+        -1, 0x000D, 0x0000,
+        -1, 0x000F, 0x0000,
+        -1, 0x0010, 0x0000,
+        -1, 0x0011, 0x0007,
+        -1, 0x0012, 0x0000,
+        -1, 0x0013, 0x0000,
+        -2, 200,
+        -1, 0x0010, 0x17B0,
+        -1, 0x0011, 0x0031,
+        -2, 50,
+        -1, 0x0012, 0x0138,
+        -2, 50,
+        -1, 0x0013, 0x1800,
+        -1, 0x0029, 0x0008,
+        -2, 50,
+        -1, 0x0020, 0x0000,
+        -1, 0x0021, 0x0000,
+        -1, 0x0030, 0x0000,
+        -1, 0x0031, 0x0505,
+        -1, 0x0032, 0x0004,
+        -1, 0x0035, 0x0006,
+        -1, 0x0036, 0x0707,
+        -1, 0x0037, 0x0105,
+        -1, 0x0038, 0x0002,
+        -1, 0x0039, 0x0707,
+        -1, 0x003C, 0x0704,
+        -1, 0x003D, 0x0807,
+        -1, 0x0050, 0x0000,
+        -1, 0x0051, 0x00EF,
+        -1, 0x0052, 0x0000,
+        -1, 0x0053, 0x013F,
+        -1, 0x0060, 0x2700,
+        -1, 0x0061, 0x0001,
+        -1, 0x006A, 0x0000,
+        -1, 0x0080, 0x0000,
+        -1, 0x0081, 0x0000,
+        -1, 0x0082, 0x0000,
+        -1, 0x0083, 0x0000,
+        -1, 0x0084, 0x0000,
+        -1, 0x0085, 0x0000,
+        -1, 0x0090, 0x0010,
+        -1, 0x0092, 0x0000,
+        -1, 0x0093, 0x0003,
+        -1, 0x0095, 0x0110,
+        -1, 0x0097, 0x0000,
+        -1, 0x0098, 0x0000,
+        -1, 0x0007, 0x0173,
+        -3
+};
+
+static s16 ili9325_init[] = {
+        -1, 0x00E3, 0x3008,
+        -1, 0x00E7, 0x0012,
+        -1, 0x00EF, 0x1231,
+        -1, 0x0001, 0x0100,
+        -1, 0x0002, 0x0700,
+        -1, 0x0003, 0x1030,
+        -1, 0x0004, 0x0000,
+        -1, 0x0008, 0x0207,
+        -1, 0x0009, 0x0000,
+        -1, 0x000A, 0x0000,
+        -1, 0x000C, 0x0000,
+        -1, 0x000D, 0x0000,
+        -1, 0x000F, 0x0000,
+        -1, 0x0010, 0x0000,
+        -1, 0x0011, 0x0007,
+        -1, 0x0012, 0x0000,
+        -1, 0x0013, 0x0000,
+        -2, 200,
+        -1, 0x0010, 0x1690,
+        -1, 0x0011, 0x0223,
+        -2, 50,
+        -1, 0x0012, 0x000D,
+        -2, 50,
+        -1, 0x0013, 0x1200,
+        -1, 0x0029, 0x000A,
+        -1, 0x002B, 0x000C,
+        -2, 50,
+        -1, 0x0020, 0x0000,
+        -1, 0x0021, 0x0000,
+        -1, 0x0030, 0x0000,
+        -1, 0x0031, 0x0506,
+        -1, 0x0032, 0x0104,
+        -1, 0x0035, 0x0207,
+        -1, 0x0036, 0x000F,
+        -1, 0x0037, 0x0306,
+        -1, 0x0038, 0x0102,
+        -1, 0x0039, 0x0707,
+        -1, 0x003C, 0x0702,
+        -1, 0x003D, 0x1604,
+        -1, 0x0050, 0x0000,
+        -1, 0x0051, 0x00EF,
+        -1, 0x0052, 0x0000,
+        -1, 0x0053, 0x013F,
+        -1, 0x0060, 0xA700,
+        -1, 0x0061, 0x0001,
+        -1, 0x006A, 0x0000,
+        -1, 0x0080, 0x0000,
+        -1, 0x0081, 0x0000,
+        -1, 0x0082, 0x0000,
+        -1, 0x0083, 0x0000,
+        -1, 0x0084, 0x0000,
+        -1, 0x0085, 0x0000,
+        -1, 0x0090, 0x0010,
+        -1, 0x0092, 0x0600,
+        -1, 0x0007, 0x0133,
+        -3
+};
+
+static s16 ili9341_init[] = {
+        -1, 0x28,
+        -2, 20,
+        -1, 0xCF, 0x00, 0x83, 0x30,
+        -1, 0xED, 0x64, 0x03, 0x12, 0x81,
+        -1, 0xE8, 0x85, 0x01, 0x79,
+        -1, 0xCB, 0x39, 0x2c, 0x00, 0x34, 0x02,
+        -1, 0xF7, 0x20,
+        -1, 0xEA, 0x00, 0x00,
+        -1, 0xC0, 0x26,
+        -1, 0xC1, 0x11,
+        -1, 0xC5, 0x35, 0x3E,
+        -1, 0xC7, 0xBE,
+        -1, 0xB1, 0x00, 0x1B,
+        -1, 0xB6, 0x0a, 0x82, 0x27, 0x00,
+        -1, 0xB7, 0x07,
+        -1, 0x3A, 0x55,
+        -1, 0x36, 0x48,
+        -1, 0x11,
+        -2, 120,
+        -1, 0x29,
+        -2, 20,
+        -3
+};
+
+static s16 ssd1351_init[] = {
+        -1, 0xfd, 0x12,
+        -1, 0xfd, 0xb1,
+        -1, 0xae,
+        -1, 0xb3, 0xf1,
+        -1, 0xca, 0x7f,
+        -1, 0xa0, 0x74,
+        -1, 0x15, 0x00, 0x7f,
+        -1, 0x75, 0x00, 0x7f,
+        -1, 0xa1, 0x00,
+        -1, 0xa2, 0x00,
+        -1, 0xb5, 0x00,
+        -1, 0xab, 0x01,
+        -1, 0xb1, 0x32,
+        -1, 0xb4, 0xa0, 0xb5, 0x55,
+        -1, 0xbb, 0x17,
+        -1, 0xbe, 0x05,
+        -1, 0xc1, 0xc8, 0x80, 0xc8,
+        -1, 0xc7, 0x0f,
+        -1, 0xb6, 0x01,
+        -1, 0xa6,
+        -1, 0xaf,
+        -3
+};
 
 /**
  * struct flexfb_lcd_controller - Describes the LCD controller properties
@@ -142,7 +390,7 @@ struct flexfb_lcd_controller {
         unsigned int height;
         unsigned int setaddrwin;
         unsigned int regwidth;
-        int *init_seq;
+        s16 *init_seq;
         int init_seq_sz;
 };
 
@@ -582,6 +830,7 @@ static const struct platform_device_id flexfb_platform_ids[] = {
         { "flexpfb", 0 },
         { },
 };
+MODULE_DEVICE_TABLE(platform, flexfb_platform_ids);
 
 static struct platform_driver flexfb_platform_driver = {
         .driver = {
diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig
index 1f959339c671..5c009ab48f00 100644
--- a/drivers/staging/fsl-mc/bus/Kconfig
+++ b/drivers/staging/fsl-mc/bus/Kconfig
@@ -1,25 +1,17 @@
 #
-# Freescale Management Complex (MC) bus drivers
+# DPAA2 fsl-mc bus
 #
-# Copyright (C) 2014 Freescale Semiconductor, Inc.
+# Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
 #
 # This file is released under the GPLv2
 #
 
 config FSL_MC_BUS
-        bool "Freescale Management Complex (MC) bus driver"
-        depends on OF && ARM64
+        bool "QorIQ DPAA2 fsl-mc bus driver"
+        depends on OF && ARCH_LAYERSCAPE
         select GENERIC_MSI_IRQ_DOMAIN
         help
-          Driver to enable the bus infrastructure for the Freescale
-          QorIQ Management Complex (fsl-mc). The fsl-mc is a hardware
-          module of the QorIQ LS2 SoCs, that does resource management
-          for hardware building-blocks in the SoC that can be used
-          to dynamically create networking hardware objects such as
-          network interfaces (NICs), crypto accelerator instances,
-          or L2 switches.
-
-          Only enable this option when building the kernel for
-          Freescale QorQIQ LS2xxxx SoCs.
-
-
+          Driver to enable the bus infrastructure for the QorIQ DPAA2
+          architecture.  The fsl-mc bus driver handles discovery of
+          DPAA2 objects (which are represented as Linux devices) and
+          binding objects to drivers.
diff --git a/drivers/staging/fsl-mc/include/dpbp-cmd.h b/drivers/staging/fsl-mc/bus/dpbp-cmd.h
index 2860411ddb51..7d86539b5414 100644
--- a/drivers/staging/fsl-mc/include/dpbp-cmd.h
+++ b/drivers/staging/fsl-mc/bus/dpbp-cmd.h
@@ -1,4 +1,5 @@
-/* Copyright 2013-2016 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,7 +12,6 @@
  * names of any contributors may be used to endorse or promote products
  * derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
@@ -33,37 +33,48 @@
 #define _FSL_DPBP_CMD_H
 
 /* DPBP Version */
-#define DPBP_VER_MAJOR                          2
+#define DPBP_VER_MAJOR                          3
 #define DPBP_VER_MINOR                          2
 
+/* Command versioning */
+#define DPBP_CMD_BASE_VERSION                   1
+#define DPBP_CMD_ID_OFFSET                      4
+
+#define DPBP_CMD(id)    ((id << DPBP_CMD_ID_OFFSET) | DPBP_CMD_BASE_VERSION)
+
 /* Command IDs */
-#define DPBP_CMDID_CLOSE                                0x800
-#define DPBP_CMDID_OPEN                                 0x804
-#define DPBP_CMDID_CREATE                               0x904
-#define DPBP_CMDID_DESTROY                              0x900
-
-#define DPBP_CMDID_ENABLE                               0x002
-#define DPBP_CMDID_DISABLE                              0x003
-#define DPBP_CMDID_GET_ATTR                             0x004
-#define DPBP_CMDID_RESET                                0x005
-#define DPBP_CMDID_IS_ENABLED                           0x006
-
-#define DPBP_CMDID_SET_IRQ                              0x010
-#define DPBP_CMDID_GET_IRQ                              0x011
-#define DPBP_CMDID_SET_IRQ_ENABLE                       0x012
-#define DPBP_CMDID_GET_IRQ_ENABLE                       0x013
-#define DPBP_CMDID_SET_IRQ_MASK                         0x014
-#define DPBP_CMDID_GET_IRQ_MASK                         0x015
-#define DPBP_CMDID_GET_IRQ_STATUS                       0x016
-#define DPBP_CMDID_CLEAR_IRQ_STATUS                     0x017
-
-#define DPBP_CMDID_SET_NOTIFICATIONS            0x01b0
-#define DPBP_CMDID_GET_NOTIFICATIONS            0x01b1
+#define DPBP_CMDID_CLOSE                DPBP_CMD(0x800)
+#define DPBP_CMDID_OPEN                 DPBP_CMD(0x804)
+#define DPBP_CMDID_CREATE               DPBP_CMD(0x904)
+#define DPBP_CMDID_DESTROY              DPBP_CMD(0x984)
+#define DPBP_CMDID_GET_API_VERSION      DPBP_CMD(0xa04)
+
+#define DPBP_CMDID_ENABLE               DPBP_CMD(0x002)
+#define DPBP_CMDID_DISABLE              DPBP_CMD(0x003)
+#define DPBP_CMDID_GET_ATTR             DPBP_CMD(0x004)
+#define DPBP_CMDID_RESET                DPBP_CMD(0x005)
+#define DPBP_CMDID_IS_ENABLED           DPBP_CMD(0x006)
+
+#define DPBP_CMDID_SET_IRQ              DPBP_CMD(0x010)
+#define DPBP_CMDID_GET_IRQ              DPBP_CMD(0x011)
+#define DPBP_CMDID_SET_IRQ_ENABLE       DPBP_CMD(0x012)
+#define DPBP_CMDID_GET_IRQ_ENABLE       DPBP_CMD(0x013)
+#define DPBP_CMDID_SET_IRQ_MASK         DPBP_CMD(0x014)
+#define DPBP_CMDID_GET_IRQ_MASK         DPBP_CMD(0x015)
+#define DPBP_CMDID_GET_IRQ_STATUS       DPBP_CMD(0x016)
+#define DPBP_CMDID_CLEAR_IRQ_STATUS     DPBP_CMD(0x017)
+
+#define DPBP_CMDID_SET_NOTIFICATIONS    DPBP_CMD(0x01b0)
+#define DPBP_CMDID_GET_NOTIFICATIONS    DPBP_CMD(0x01b1)
 
 struct dpbp_cmd_open {
         __le32 dpbp_id;
 };
 
+struct dpbp_cmd_destroy {
+        __le32 object_id;
+};
+
 #define DPBP_ENABLE                     0x1
 
 struct dpbp_rsp_is_enabled {
diff --git a/drivers/staging/fsl-mc/bus/dpbp.c b/drivers/staging/fsl-mc/bus/dpbp.c
index 5d4cd812a400..cf4782f6a049 100644
--- a/drivers/staging/fsl-mc/bus/dpbp.c
+++ b/drivers/staging/fsl-mc/bus/dpbp.c
@@ -1,4 +1,5 @@
-/* Copyright 2013-2016 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,7 +12,6 @@
  * names of any contributors may be used to endorse or promote products
  * derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
@@ -32,7 +32,8 @@
 #include "../include/mc-sys.h"
 #include "../include/mc-cmd.h"
 #include "../include/dpbp.h"
-#include "../include/dpbp-cmd.h"
+
+#include "dpbp-cmd.h"
 
 /**
  * dpbp_open() - Open a control session for the specified object.
@@ -107,28 +108,26 @@ EXPORT_SYMBOL(dpbp_close);
 /**
  * dpbp_create() - Create the DPBP object.
  * @mc_io:      Pointer to MC portal's I/O object
+ * @dprc_token: Parent container token; '0' for default container
  * @cmd_flags:  Command flags; one or more of 'MC_CMD_FLAG_'
  * @cfg:        Configuration structure
- * @token:      Returned token; use in subsequent API calls
+ * @obj_id:     Returned object id; use in subsequent API calls
  *
  * Create the DPBP object, allocate required resources and
  * perform required initialization.
  *
- * The object can be created either by declaring it in the
- * DPL file, or by calling this function.
- * This function returns a unique authentication token,
- * associated with the specific object ID and the specific MC
- * portal; this token must be used in all subsequent calls to
- * this specific object. For objects that are created using the
- * DPL file, call dpbp_open function to get an authentication
- * token first.
+ * This function accepts an authentication token of a parent
+ * container that this object should be assigned to and returns
+ * an object id. This object_id will be used in all subsequent calls to
+ * this specific object.
  *
  * Return:      '0' on Success; Error code otherwise.
  */
 int dpbp_create(struct fsl_mc_io *mc_io,
+                u16 dprc_token,
                 u32 cmd_flags,
                 const struct dpbp_cfg *cfg,
-                u16 *token)
+                u32 *obj_id)
 {
         struct mc_command cmd = { 0 };
         int err;
@@ -137,7 +136,7 @@ int dpbp_create(struct fsl_mc_io *mc_io,
 
         /* prepare command */
         cmd.header = mc_encode_cmd_header(DPBP_CMDID_CREATE,
-                                          cmd_flags, 0);
+                                          cmd_flags, dprc_token);
 
         /* send command to mc*/
         err = mc_send_command(mc_io, &cmd);
@@ -145,7 +144,7 @@ int dpbp_create(struct fsl_mc_io *mc_io,
                 return err;
 
         /* retrieve response parameters */
-        *token = mc_cmd_hdr_read_token(&cmd);
+        *obj_id = mc_cmd_read_object_id(&cmd);
 
         return 0;
 }
@@ -153,20 +152,25 @@ int dpbp_create(struct fsl_mc_io *mc_io,
 /**
  * dpbp_destroy() - Destroy the DPBP object and release all its resources.
  * @mc_io:      Pointer to MC portal's I/O object
+ * @dprc_token: Parent container token; '0' for default container
  * @cmd_flags:  Command flags; one or more of 'MC_CMD_FLAG_'
- * @token:      Token of DPBP object
+ * @obj_id:     ID of DPBP object
  *
  * Return:      '0' on Success; error code otherwise.
  */
 int dpbp_destroy(struct fsl_mc_io *mc_io,
+                 u16 dprc_token,
                  u32 cmd_flags,
-                 u16 token)
+                 u32 obj_id)
 {
+        struct dpbp_cmd_destroy *cmd_params;
         struct mc_command cmd = { 0 };
 
         /* prepare command */
         cmd.header = mc_encode_cmd_header(DPBP_CMDID_DESTROY,
-                                          cmd_flags, token);
+                                          cmd_flags, dprc_token);
+        cmd_params = (struct dpbp_cmd_destroy *)cmd.params;
+        cmd_params->object_id = cpu_to_le32(obj_id);
 
         /* send command to mc*/
         return mc_send_command(mc_io, &cmd);
@@ -609,8 +613,6 @@ int dpbp_get_attributes(struct fsl_mc_io *mc_io,
         rsp_params = (struct dpbp_rsp_get_attributes *)cmd.params;
         attr->bpid = le16_to_cpu(rsp_params->bpid);
         attr->id = le32_to_cpu(rsp_params->id);
-        attr->version.major = le16_to_cpu(rsp_params->version_major);
-        attr->version.minor = le16_to_cpu(rsp_params->version_minor);
 
         return 0;
 }
@@ -689,3 +691,35 @@ int dpbp_get_notifications(struct fsl_mc_io *mc_io,
 
         return 0;
 }
+
+/**
+ * dpbp_get_api_version - Get Data Path Buffer Pool 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 Buffer Pool API
+ * @minor_ver:  Minor version of Buffer Pool API
+ *
+ * Return:      '0' on Success; Error code otherwise.
+ */
+int dpbp_get_api_version(struct fsl_mc_io *mc_io,
+                         u32 cmd_flags,
+                         u16 *major_ver,
+                         u16 *minor_ver)
+{
+        struct mc_command cmd = { 0 };
+        int err;
+
+        /* prepare command */
+        cmd.header = mc_encode_cmd_header(DPBP_CMDID_GET_API_VERSION,
+                                          cmd_flags, 0);
+
+        /* send command to mc */
+        err = mc_send_command(mc_io, &cmd);
+        if (err)
+                return err;
+
+        /* retrieve response parameters */
+        mc_cmd_read_api_version(&cmd, major_ver, minor_ver);
+
+        return 0;
+}
diff --git a/drivers/staging/fsl-mc/include/dpcon-cmd.h b/drivers/staging/fsl-mc/bus/dpcon-cmd.h
index 536b2ef13507..d0a5e194c5e1 100644
--- a/drivers/staging/fsl-mc/include/dpcon-cmd.h
+++ b/drivers/staging/fsl-mc/bus/dpcon-cmd.h
@@ -1,4 +1,5 @@
-/* Copyright 2013-2015 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,7 +12,6 @@
  * names of any contributors may be used to endorse or promote products
  * derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
diff --git a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h b/drivers/staging/fsl-mc/bus/dpmcp-cmd.h
index d098a6d8f6bc..7cb514963c26 100644
--- a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h
+++ b/drivers/staging/fsl-mc/bus/dpmcp-cmd.h
@@ -1,4 +1,5 @@
-/* Copyright 2013-2016 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,7 +12,6 @@
  * names of any contributors may be used to endorse or promote products
  * derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
@@ -33,25 +33,32 @@
 #define _FSL_DPMCP_CMD_H
 
 /* Minimal supported DPMCP Version */
-#define DPMCP_MIN_VER_MAJOR                             3
-#define DPMCP_MIN_VER_MINOR                             0
+#define DPMCP_MIN_VER_MAJOR             3
+#define DPMCP_MIN_VER_MINOR             0
+
+/* Command versioning */
+#define DPMCP_CMD_BASE_VERSION          1
+#define DPMCP_CMD_ID_OFFSET             4
+
+#define DPMCP_CMD(id)   ((id << DPMCP_CMD_ID_OFFSET) | DPMCP_CMD_BASE_VERSION)
 
 /* Command IDs */
-#define DPMCP_CMDID_CLOSE                               0x800
-#define DPMCP_CMDID_OPEN                                0x80b
-#define DPMCP_CMDID_CREATE                              0x90b
-#define DPMCP_CMDID_DESTROY                             0x900
-
-#define DPMCP_CMDID_GET_ATTR                            0x004
-#define DPMCP_CMDID_RESET                               0x005
-
-#define DPMCP_CMDID_SET_IRQ                             0x010
-#define DPMCP_CMDID_GET_IRQ                             0x011
-#define DPMCP_CMDID_SET_IRQ_ENABLE                      0x012
-#define DPMCP_CMDID_GET_IRQ_ENABLE                      0x013
-#define DPMCP_CMDID_SET_IRQ_MASK                        0x014
-#define DPMCP_CMDID_GET_IRQ_MASK                        0x015
-#define DPMCP_CMDID_GET_IRQ_STATUS                      0x016
+#define DPMCP_CMDID_CLOSE               DPMCP_CMD(0x800)
+#define DPMCP_CMDID_OPEN                DPMCP_CMD(0x80b)
+#define DPMCP_CMDID_CREATE              DPMCP_CMD(0x90b)
+#define DPMCP_CMDID_DESTROY             DPMCP_CMD(0x98b)
+#define DPMCP_CMDID_GET_API_VERSION     DPMCP_CMD(0xa0b)
+
+#define DPMCP_CMDID_GET_ATTR            DPMCP_CMD(0x004)
+#define DPMCP_CMDID_RESET               DPMCP_CMD(0x005)
+
+#define DPMCP_CMDID_SET_IRQ             DPMCP_CMD(0x010)
+#define DPMCP_CMDID_GET_IRQ             DPMCP_CMD(0x011)
+#define DPMCP_CMDID_SET_IRQ_ENABLE      DPMCP_CMD(0x012)
+#define DPMCP_CMDID_GET_IRQ_ENABLE      DPMCP_CMD(0x013)
+#define DPMCP_CMDID_SET_IRQ_MASK        DPMCP_CMD(0x014)
+#define DPMCP_CMDID_GET_IRQ_MASK        DPMCP_CMD(0x015)
+#define DPMCP_CMDID_GET_IRQ_STATUS      DPMCP_CMD(0x016)
 
 struct dpmcp_cmd_open {
         __le32 dpmcp_id;
@@ -61,6 +68,10 @@ struct dpmcp_cmd_create {
         __le32 portal_id;
 };
 
+struct dpmcp_cmd_destroy {
+        __le32 object_id;
+};
+
 struct dpmcp_cmd_set_irq {
         /* cmd word 0 */
         u8 irq_index;
diff --git a/drivers/staging/fsl-mc/bus/dpmcp.c b/drivers/staging/fsl-mc/bus/dpmcp.c
index 55766f78a528..e4d16519bcb4 100644
--- a/drivers/staging/fsl-mc/bus/dpmcp.c
+++ b/drivers/staging/fsl-mc/bus/dpmcp.c
@@ -1,4 +1,5 @@
-/* Copyright 2013-2016 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,7 +12,6 @@
  * names of any contributors may be used to endorse or promote products
  * derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
@@ -106,28 +106,29 @@ int dpmcp_close(struct fsl_mc_io *mc_io,
 /**
  * dpmcp_create() - Create the DPMCP object.
  * @mc_io:      Pointer to MC portal's I/O object
+ * @dprc_token: Parent container token; '0' for default container
  * @cmd_flags:  Command flags; one or more of 'MC_CMD_FLAG_'
  * @cfg:        Configuration structure
- * @token:      Returned token; use in subsequent API calls
+ * @obj_id:     Returned object id; use in subsequent API calls
  *
  * Create the DPMCP object, allocate required resources and
  * perform required initialization.
  *
  * The object can be created either by declaring it in the
  * DPL file, or by calling this function.
- * This function returns a unique authentication token,
- * associated with the specific object ID and the specific MC
- * portal; this token must be used in all subsequent calls to
- * this specific object. For objects that are created using the
- * DPL file, call dpmcp_open function to get an authentication
- * token first.
+
+ * This function accepts an authentication token of a parent
+ * container that this object should be assigned to and returns
+ * an object id. This object_id will be used in all subsequent calls to
+ * this specific object.
  *
  * Return:      '0' on Success; Error code otherwise.
  */
 int dpmcp_create(struct fsl_mc_io *mc_io,
+                 u16 dprc_token,
                  u32 cmd_flags,
                  const struct dpmcp_cfg *cfg,
-                 u16 *token)
+                 u32 *obj_id)
 {
         struct mc_command cmd = { 0 };
         struct dpmcp_cmd_create *cmd_params;
@@ -136,7 +137,7 @@ int dpmcp_create(struct fsl_mc_io *mc_io,
 
         /* prepare command */
         cmd.header = mc_encode_cmd_header(DPMCP_CMDID_CREATE,
-                                          cmd_flags, 0);
+                                          cmd_flags, dprc_token);
         cmd_params = (struct dpmcp_cmd_create *)cmd.params;
         cmd_params->portal_id = cpu_to_le32(cfg->portal_id);
 
@@ -146,7 +147,7 @@ int dpmcp_create(struct fsl_mc_io *mc_io,
                 return err;
 
         /* retrieve response parameters */
-        *token = mc_cmd_hdr_read_token(&cmd);
+        *obj_id = mc_cmd_read_object_id(&cmd);
 
         return 0;
 }
@@ -154,20 +155,25 @@ int dpmcp_create(struct fsl_mc_io *mc_io,
 /**
  * dpmcp_destroy() - Destroy the DPMCP object and release all its resources.
  * @mc_io:      Pointer to MC portal's I/O object
+ * @dprc_token: Parent container token; '0' for default container
  * @cmd_flags:  Command flags; one or more of 'MC_CMD_FLAG_'
- * @token:      Token of DPMCP object
+ * @obj_id:     ID of DPMCP object
  *
  * Return:      '0' on Success; error code otherwise.
  */
 int dpmcp_destroy(struct fsl_mc_io *mc_io,
+                  u16 dprc_token,
                   u32 cmd_flags,
-                  u16 token)
+                  u32 obj_id)
 {
         struct mc_command cmd = { 0 };
+        struct dpmcp_cmd_destroy *cmd_params;
 
         /* prepare command */
         cmd.header = mc_encode_cmd_header(DPMCP_CMDID_DESTROY,
-                                          cmd_flags, token);
+                                          cmd_flags, dprc_token);
+        cmd_params = (struct dpmcp_cmd_destroy *)cmd.params;
+        cmd_params->object_id = cpu_to_le32(obj_id);
 
         /* send command to mc*/
         return mc_send_command(mc_io, &cmd);
@@ -497,8 +503,38 @@ int dpmcp_get_attributes(struct fsl_mc_io *mc_io,
         /* retrieve response parameters */
         rsp_params = (struct dpmcp_rsp_get_attributes *)cmd.params;
         attr->id = le32_to_cpu(rsp_params->id);
-        attr->version.major = le16_to_cpu(rsp_params->version_major);
-        attr->version.minor = le16_to_cpu(rsp_params->version_minor);
+
+        return 0;
+}
+
+/**
+ * dpmcp_get_api_version - Get Data Path Management Command Portal 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 Management Command Portal API
+ * @minor_ver:  Minor version of Data Path Management Command Portal API
+ *
+ * Return:      '0' on Success; Error code otherwise.
+ */
+int dpmcp_get_api_version(struct fsl_mc_io *mc_io,
+                          u32 cmd_flags,
+                          u16 *major_ver,
+                          u16 *minor_ver)
+{
+        struct mc_command cmd = { 0 };
+        int err;
+
+        /* prepare command */
+        cmd.header = mc_encode_cmd_header(DPMCP_CMDID_GET_API_VERSION,
+                                          cmd_flags, 0);
+
+        /* send command to mc */
+        err = mc_send_command(mc_io, &cmd);
+        if (err)
+                return err;
+
+        /* retrieve response parameters */
+        mc_cmd_read_api_version(&cmd, major_ver, minor_ver);
 
         return 0;
 }
diff --git a/drivers/staging/fsl-mc/bus/dpmcp.h b/drivers/staging/fsl-mc/bus/dpmcp.h
index fe79d4d9293d..98a100d543f6 100644
--- a/drivers/staging/fsl-mc/bus/dpmcp.h
+++ b/drivers/staging/fsl-mc/bus/dpmcp.h
@@ -1,4 +1,5 @@
-/* Copyright 2013-2015 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,7 +12,6 @@
  * names of any contributors may be used to endorse or promote products
  * derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
@@ -32,23 +32,24 @@
 #ifndef __FSL_DPMCP_H
 #define __FSL_DPMCP_H
 
-/* Data Path Management Command Portal API
+/*
+ * Data Path Management Command Portal API
  * Contains initialization APIs and runtime control APIs for DPMCP
  */
 
 struct fsl_mc_io;
 
 int dpmcp_open(struct fsl_mc_io *mc_io,
-               uint32_t cmd_flags,
+               u32 cmd_flags,
                int dpmcp_id,
-               uint16_t *token);
+               u16 *token);
 
 /* Get portal ID from pool */
 #define DPMCP_GET_PORTAL_ID_FROM_POOL (-1)
 
 int dpmcp_close(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token);
+                u32 cmd_flags,
+                u16 token);
 
 /**
  * struct dpmcp_cfg - Structure representing DPMCP configuration
@@ -59,18 +60,20 @@ struct dpmcp_cfg {
         int portal_id;
 };
 
-int dpmcp_create(struct fsl_mc_io       *mc_io,
-                 uint32_t               cmd_flags,
-                 const struct dpmcp_cfg *cfg,
-                uint16_t                *token);
+int dpmcp_create(struct fsl_mc_io *mc_io,
+                 u16 dprc_token,
+                 u32 cmd_flags,
+                 const struct dpmcp_cfg *cfg,
+                 u32 *obj_id);
 
 int dpmcp_destroy(struct fsl_mc_io *mc_io,
-                  uint32_t cmd_flags,
-                  uint16_t token);
+                  u16 dprc_token,
+                  u32 cmd_flags,
+                  u32 obj_id);
 
 int dpmcp_reset(struct fsl_mc_io *mc_io,
-                uint32_t cmd_flags,
-                uint16_t token);
+                u32 cmd_flags,
+                u16 token);
 
 /* IRQ */
 /* IRQ Index */
@@ -85,75 +88,65 @@ int dpmcp_reset(struct fsl_mc_io *mc_io,
  * @irq_num: A user defined number associated with this IRQ
  */
 struct dpmcp_irq_cfg {
-             uint64_t           paddr;
-             uint32_t           val;
-             int                irq_num;
+             u64 paddr;
+             u32 val;
+             int irq_num;
 };
 
-int dpmcp_set_irq(struct fsl_mc_io      *mc_io,
-                  uint32_t              cmd_flags,
-                  uint16_t              token,
-                 uint8_t                irq_index,
-                  struct dpmcp_irq_cfg  *irq_cfg);
-
-int dpmcp_get_irq(struct fsl_mc_io      *mc_io,
-                  uint32_t              cmd_flags,
-                  uint16_t              token,
-                 uint8_t                irq_index,
-                 int                    *type,
-                 struct dpmcp_irq_cfg   *irq_cfg);
-
-int dpmcp_set_irq_enable(struct fsl_mc_io       *mc_io,
-                         uint32_t               cmd_flags,
-                         uint16_t               token,
-                        uint8_t                 irq_index,
-                        uint8_t                 en);
-
-int dpmcp_get_irq_enable(struct fsl_mc_io       *mc_io,
-                         uint32_t               cmd_flags,
-                         uint16_t               token,
-                        uint8_t                 irq_index,
-                        uint8_t                 *en);
-
-int dpmcp_set_irq_mask(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t         token,
-                      uint8_t           irq_index,
-                      uint32_t          mask);
-
-int dpmcp_get_irq_mask(struct fsl_mc_io *mc_io,
-                       uint32_t cmd_flags,
-                       uint16_t         token,
-                      uint8_t           irq_index,
-                      uint32_t          *mask);
-
-int dpmcp_get_irq_status(struct fsl_mc_io       *mc_io,
-                         uint32_t               cmd_flags,
-                         uint16_t               token,
-                        uint8_t                 irq_index,
-                        uint32_t                *status);
+int dpmcp_set_irq(struct fsl_mc_io *mc_io,
+                  u32 cmd_flags,
+                  u16 token,
+                  u8 irq_index,
+                  struct dpmcp_irq_cfg *irq_cfg);
+
+int dpmcp_get_irq(struct fsl_mc_io *mc_io,
+                  u32 cmd_flags,
+                  u16 token,
+                  u8 irq_index,
+                  int *type,
+                  struct dpmcp_irq_cfg *irq_cfg);
+
+int dpmcp_set_irq_enable(struct fsl_mc_io *mc_io,
+                         u32 cmd_flags,
+                         u16 token,
+                         u8 irq_index,
+                         u8 en);
+
+int dpmcp_get_irq_enable(struct fsl_mc_io *mc_io,
+                         u32 cmd_flags,
+                         u16 token,
+                         u8 irq_index,
+                         u8 *en);
+
+int dpmcp_set_irq_mask(struct fsl_mc_io *mc_io,
+                       u32 cmd_flags,
+                       u16 token,
+                       u8 irq_index,
+                       u32 mask);
+
+int dpmcp_get_irq_mask(struct fsl_mc_io *mc_io,
+                       u32 cmd_flags,
+                       u16 token,
+                       u8 irq_index,
+                       u32 *mask);
+
+int dpmcp_get_irq_status(struct fsl_mc_io *mc_io,
+                         u32 cmd_flags,
+                         u16 token,
+                         u8 irq_index,
+                         u32 *status);
 
 /**
  * struct dpmcp_attr - Structure representing DPMCP attributes
  * @id:         DPMCP object ID
- * @version:    DPMCP version
  */
 struct dpmcp_attr {
         int id;
-        /**
-         * struct version - Structure representing DPMCP version
-         * @major:      DPMCP major version
-         * @minor:      DPMCP minor version
-         */
-        struct {
-                uint16_t major;
-                uint16_t minor;
-        } version;
 };
 
-int dpmcp_get_attributes(struct fsl_mc_io       *mc_io,
-                         uint32_t               cmd_flags,
-                         uint16_t               token,
-                        struct dpmcp_attr       *attr);
+int dpmcp_get_attributes(struct fsl_mc_io *mc_io,
+                         u32 cmd_flags,
+                         u16 token,
+                         struct dpmcp_attr *attr);
 
 #endif /* __FSL_DPMCP_H */
diff --git a/drivers/staging/fsl-mc/bus/dpmng-cmd.h b/drivers/staging/fsl-mc/bus/dpmng-cmd.h
index a7b77d58c8cd..cdddfb80eecc 100644
--- a/drivers/staging/fsl-mc/bus/dpmng-cmd.h
+++ b/drivers/staging/fsl-mc/bus/dpmng-cmd.h
@@ -12,7 +12,6 @@
  *       names of any contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
@@ -41,13 +40,14 @@
 #ifndef __FSL_DPMNG_CMD_H
 #define __FSL_DPMNG_CMD_H
 
-/* Command IDs */
-#define DPMNG_CMDID_GET_CONT_ID                 0x830
-#define DPMNG_CMDID_GET_VERSION                 0x831
+/* Command versioning */
+#define DPMNG_CMD_BASE_VERSION          1
+#define DPMNG_CMD_ID_OFFSET             4
 
-struct dpmng_rsp_get_container_id {
-        __le32 container_id;
-};
+#define DPMNG_CMD(id)   ((id << DPMNG_CMD_ID_OFFSET) | DPMNG_CMD_BASE_VERSION)
+
+/* Command IDs */
+#define DPMNG_CMDID_GET_VERSION         DPMNG_CMD(0x831)
 
 struct dpmng_rsp_get_version {
         __le32 revision;
diff --git a/drivers/staging/fsl-mc/bus/dpmng.c b/drivers/staging/fsl-mc/bus/dpmng.c
index 96b1d67756fa..ad5d5bbec529 100644
--- a/drivers/staging/fsl-mc/bus/dpmng.c
+++ b/drivers/staging/fsl-mc/bus/dpmng.c
@@ -1,4 +1,5 @@
-/* Copyright 2013-2016 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,7 +12,6 @@
  * names of any contributors may be used to endorse or promote products
  * derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
@@ -72,36 +72,3 @@ int mc_get_version(struct fsl_mc_io *mc_io,
 }
 EXPORT_SYMBOL(mc_get_version);
 
-/**
- * dpmng_get_container_id() - Get container ID associated with a given portal.
- * @mc_io:              Pointer to MC portal's I/O object
- * @cmd_flags:          Command flags; one or more of 'MC_CMD_FLAG_'
- * @container_id:       Requested container ID
- *
- * Return:      '0' on Success; Error code otherwise.
- */
-int dpmng_get_container_id(struct fsl_mc_io *mc_io,
-                           u32 cmd_flags,
-                           int *container_id)
-{
-        struct mc_command cmd = { 0 };
-        struct dpmng_rsp_get_container_id *rsp_params;
-        int err;
-
-        /* prepare command */
-        cmd.header = mc_encode_cmd_header(DPMNG_CMDID_GET_CONT_ID,
-                                          cmd_flags,
-                                          0);
-
-        /* send command to mc*/
-        err = mc_send_command(mc_io, &cmd);
-        if (err)
-                return err;
-
-        /* retrieve response parameters */
-        rsp_params = (struct dpmng_rsp_get_container_id *)cmd.params;
-        *container_id = le32_to_cpu(rsp_params->container_id);
-
-        return 0;
-}
-
diff --git a/drivers/staging/fsl-mc/bus/dprc-cmd.h b/drivers/staging/fsl-mc/bus/dprc-cmd.h
index 009d65673155..588b8cafdbc7 100644
--- a/drivers/staging/fsl-mc/bus/dprc-cmd.h
+++ b/drivers/staging/fsl-mc/bus/dprc-cmd.h
@@ -12,7 +12,6 @@
  *       names of any contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
@@ -42,48 +41,56 @@
 #define _FSL_DPRC_CMD_H
 
 /* Minimal supported DPRC Version */
-#define DPRC_MIN_VER_MAJOR                      5
+#define DPRC_MIN_VER_MAJOR                      6
 #define DPRC_MIN_VER_MINOR                      0
 
+/* Command versioning */
+#define DPRC_CMD_BASE_VERSION                   1
+#define DPRC_CMD_ID_OFFSET                      4
+
+#define DPRC_CMD(id)    ((id << DPRC_CMD_ID_OFFSET) | DPRC_CMD_BASE_VERSION)
+
 /* Command IDs */
-#define DPRC_CMDID_CLOSE                        0x800
-#define DPRC_CMDID_OPEN                         0x805
-#define DPRC_CMDID_CREATE                       0x905
-
-#define DPRC_CMDID_GET_ATTR                     0x004
-#define DPRC_CMDID_RESET_CONT                   0x005
-
-#define DPRC_CMDID_SET_IRQ                      0x010
-#define DPRC_CMDID_GET_IRQ                      0x011
-#define DPRC_CMDID_SET_IRQ_ENABLE               0x012
-#define DPRC_CMDID_GET_IRQ_ENABLE               0x013
-#define DPRC_CMDID_SET_IRQ_MASK                 0x014
-#define DPRC_CMDID_GET_IRQ_MASK                 0x015
-#define DPRC_CMDID_GET_IRQ_STATUS               0x016
-#define DPRC_CMDID_CLEAR_IRQ_STATUS             0x017
-
-#define DPRC_CMDID_CREATE_CONT                  0x151
-#define DPRC_CMDID_DESTROY_CONT                 0x152
-#define DPRC_CMDID_SET_RES_QUOTA                0x155
-#define DPRC_CMDID_GET_RES_QUOTA                0x156
-#define DPRC_CMDID_ASSIGN                       0x157
-#define DPRC_CMDID_UNASSIGN                     0x158
-#define DPRC_CMDID_GET_OBJ_COUNT                0x159
-#define DPRC_CMDID_GET_OBJ                      0x15A
-#define DPRC_CMDID_GET_RES_COUNT                0x15B
-#define DPRC_CMDID_GET_RES_IDS                  0x15C
-#define DPRC_CMDID_GET_OBJ_REG                  0x15E
-#define DPRC_CMDID_SET_OBJ_IRQ                  0x15F
-#define DPRC_CMDID_GET_OBJ_IRQ                  0x160
-#define DPRC_CMDID_SET_OBJ_LABEL                0x161
-#define DPRC_CMDID_GET_OBJ_DESC                 0x162
-
-#define DPRC_CMDID_CONNECT                      0x167
-#define DPRC_CMDID_DISCONNECT                   0x168
-#define DPRC_CMDID_GET_POOL                     0x169
-#define DPRC_CMDID_GET_POOL_COUNT               0x16A
-
-#define DPRC_CMDID_GET_CONNECTION               0x16C
+#define DPRC_CMDID_CLOSE                        DPRC_CMD(0x800)
+#define DPRC_CMDID_OPEN                         DPRC_CMD(0x805)
+#define DPRC_CMDID_CREATE                       DPRC_CMD(0x905)
+#define DPRC_CMDID_GET_API_VERSION              DPRC_CMD(0xa05)
+
+#define DPRC_CMDID_GET_ATTR                     DPRC_CMD(0x004)
+#define DPRC_CMDID_RESET_CONT                   DPRC_CMD(0x005)
+
+#define DPRC_CMDID_SET_IRQ                      DPRC_CMD(0x010)
+#define DPRC_CMDID_GET_IRQ                      DPRC_CMD(0x011)
+#define DPRC_CMDID_SET_IRQ_ENABLE               DPRC_CMD(0x012)
+#define DPRC_CMDID_GET_IRQ_ENABLE               DPRC_CMD(0x013)
+#define DPRC_CMDID_SET_IRQ_MASK                 DPRC_CMD(0x014)
+#define DPRC_CMDID_GET_IRQ_MASK                 DPRC_CMD(0x015)
+#define DPRC_CMDID_GET_IRQ_STATUS               DPRC_CMD(0x016)
+#define DPRC_CMDID_CLEAR_IRQ_STATUS             DPRC_CMD(0x017)
+
+#define DPRC_CMDID_CREATE_CONT                  DPRC_CMD(0x151)
+#define DPRC_CMDID_DESTROY_CONT                 DPRC_CMD(0x152)
+#define DPRC_CMDID_GET_CONT_ID                  DPRC_CMD(0x830)
+#define DPRC_CMDID_SET_RES_QUOTA                DPRC_CMD(0x155)
+#define DPRC_CMDID_GET_RES_QUOTA                DPRC_CMD(0x156)
+#define DPRC_CMDID_ASSIGN                       DPRC_CMD(0x157)
+#define DPRC_CMDID_UNASSIGN                     DPRC_CMD(0x158)
+#define DPRC_CMDID_GET_OBJ_COUNT                DPRC_CMD(0x159)
+#define DPRC_CMDID_GET_OBJ                      DPRC_CMD(0x15A)
+#define DPRC_CMDID_GET_RES_COUNT                DPRC_CMD(0x15B)
+#define DPRC_CMDID_GET_RES_IDS                  DPRC_CMD(0x15C)
+#define DPRC_CMDID_GET_OBJ_REG                  DPRC_CMD(0x15E)
+#define DPRC_CMDID_SET_OBJ_IRQ                  DPRC_CMD(0x15F)
+#define DPRC_CMDID_GET_OBJ_IRQ                  DPRC_CMD(0x160)
+#define DPRC_CMDID_SET_OBJ_LABEL                DPRC_CMD(0x161)
+#define DPRC_CMDID_GET_OBJ_DESC                 DPRC_CMD(0x162)
+
+#define DPRC_CMDID_CONNECT                      DPRC_CMD(0x167)
+#define DPRC_CMDID_DISCONNECT                   DPRC_CMD(0x168)
+#define DPRC_CMDID_GET_POOL                     DPRC_CMD(0x169)
+#define DPRC_CMDID_GET_POOL_COUNT               DPRC_CMD(0x16A)
+
+#define DPRC_CMDID_GET_CONNECTION               DPRC_CMD(0x16C)
 
 struct dprc_cmd_open {
         __le32 container_id;
@@ -199,9 +206,6 @@ struct dprc_rsp_get_attributes {
         /* response word 1 */
         __le32 options;
         __le32 portal_id;
-        /* response word 2 */
-        __le16 version_major;
-        __le16 version_minor;
 };
 
 struct dprc_cmd_set_res_quota {
diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c
index c5ee4639682b..4e416d89b736 100644
--- a/drivers/staging/fsl-mc/bus/dprc-driver.c
+++ b/drivers/staging/fsl-mc/bus/dprc-driver.c
@@ -1,7 +1,7 @@
 /*
  * Freescale data path resource container (DPRC) driver
  *
- * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ * Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
  * Author: German Rivera <German.Rivera@freescale.com>
  *
  * This file is licensed under the terms of the GNU General Public
@@ -505,7 +505,7 @@ static int register_dprc_irq_handler(struct fsl_mc_device *mc_dev)
                                           dprc_irq0_handler,
                                           dprc_irq0_handler_thread,
                                           IRQF_NO_SUSPEND | IRQF_ONESHOT,
-                                          "FSL MC DPRC irq0",
+                                          dev_name(&mc_dev->dev),
                                           &mc_dev->dev);
         if (error < 0) {
                 dev_err(&mc_dev->dev,
@@ -597,6 +597,7 @@ static int dprc_probe(struct fsl_mc_device *mc_dev)
         struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev);
         bool mc_io_created = false;
         bool msi_domain_set = false;
+        u16 major_ver, minor_ver;
 
         if (WARN_ON(strcmp(mc_dev->obj_desc.type, "dprc") != 0))
                 return -EINVAL;
@@ -669,13 +670,21 @@ static int dprc_probe(struct fsl_mc_device *mc_dev)
                 goto error_cleanup_open;
         }
 
-        if (mc_bus->dprc_attr.version.major < DPRC_MIN_VER_MAJOR ||
-           (mc_bus->dprc_attr.version.major == DPRC_MIN_VER_MAJOR &&
-            mc_bus->dprc_attr.version.minor < DPRC_MIN_VER_MINOR)) {
+        error = dprc_get_api_version(mc_dev->mc_io, 0,
+                                     &major_ver,
+                                     &minor_ver);
+        if (error < 0) {
+                dev_err(&mc_dev->dev, "dprc_get_api_version() failed: %d\n",
+                        error);
+                goto error_cleanup_open;
+        }
+
+        if (major_ver < DPRC_MIN_VER_MAJOR ||
+           (major_ver == DPRC_MIN_VER_MAJOR &&
+            minor_ver < DPRC_MIN_VER_MINOR)) {
                 dev_err(&mc_dev->dev,
                         "ERROR: DPRC version %d.%d not supported\n",
-                        mc_bus->dprc_attr.version.major,
-                        mc_bus->dprc_attr.version.minor);
+                        major_ver, minor_ver);
                 error = -ENOTSUPP;
                 goto error_cleanup_open;
         }
diff --git a/drivers/staging/fsl-mc/bus/dprc.c b/drivers/staging/fsl-mc/bus/dprc.c
index 9fea3def6041..572edd4c066e 100644
--- a/drivers/staging/fsl-mc/bus/dprc.c
+++ b/drivers/staging/fsl-mc/bus/dprc.c
@@ -1,4 +1,5 @@
-/* Copyright 2013-2016 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,7 +12,6 @@
  * names of any contributors may be used to endorse or promote products
  * derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
@@ -565,8 +565,6 @@ int dprc_get_attributes(struct fsl_mc_io *mc_io,
         attr->icid = le16_to_cpu(rsp_params->icid);
         attr->options = le32_to_cpu(rsp_params->options);
         attr->portal_id = le32_to_cpu(rsp_params->portal_id);
-        attr->version.major = le16_to_cpu(rsp_params->version_major);
-        attr->version.minor = le16_to_cpu(rsp_params->version_minor);
 
         return 0;
 }
@@ -1386,3 +1384,66 @@ int dprc_get_connection(struct fsl_mc_io *mc_io,
 
         return 0;
 }
+
+/**
+ * dprc_get_api_version - Get Data Path Resource Container 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 Resource Container API
+ * @minor_ver:  Minor version of Data Path Resource Container API
+ *
+ * Return:      '0' on Success; Error code otherwise.
+ */
+int dprc_get_api_version(struct fsl_mc_io *mc_io,
+                         u32 cmd_flags,
+                         u16 *major_ver,
+                         u16 *minor_ver)
+{
+        struct mc_command cmd = { 0 };
+        int err;
+
+        /* prepare command */
+        cmd.header = mc_encode_cmd_header(DPRC_CMDID_GET_API_VERSION,
+                                          cmd_flags, 0);
+
+        /* send command to mc */
+        err = mc_send_command(mc_io, &cmd);
+        if (err)
+                return err;
+
+        /* retrieve response parameters */
+        mc_cmd_read_api_version(&cmd, major_ver, minor_ver);
+
+        return 0;
+}
+
+/**
+ * dprc_get_container_id - Get container ID associated with a given portal.
+ * @mc_io:              Pointer to Mc portal's I/O object
+ * @cmd_flags:          Command flags; one or more of 'MC_CMD_FLAG_'
+ * @container_id:       Requested container id
+ *
+ * Return:      '0' on Success; Error code otherwise.
+ */
+int dprc_get_container_id(struct fsl_mc_io *mc_io,
+                          u32 cmd_flags,
+                          int *container_id)
+{
+        struct mc_command cmd = { 0 };
+        int err;
+
+        /* prepare command */
+        cmd.header = mc_encode_cmd_header(DPRC_CMDID_GET_CONT_ID,
+                                          cmd_flags,
+                                          0);
+
+        /* send command to mc*/
+        err = mc_send_command(mc_io, &cmd);
+        if (err)
+                return err;
+
+        /* retrieve response parameters */
+        *container_id = (int)mc_cmd_read_object_id(&cmd);
+
+        return 0;
+}
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
index e93ab53bae67..ce07096c3b1f 100644
--- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
+++ b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
@@ -1,7 +1,7 @@
 /*
- * Freescale MC object device allocator driver
+ * fsl-mc object allocator driver
  *
- * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ * Copyright (C) 2013-2016 Freescale Semiconductor, Inc.
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -12,9 +12,9 @@
 #include <linux/msi.h>
 #include "../include/mc-bus.h"
 #include "../include/mc-sys.h"
-#include "../include/dpbp-cmd.h"
-#include "../include/dpcon-cmd.h"
 
+#include "dpbp-cmd.h"
+#include "dpcon-cmd.h"
 #include "fsl-mc-private.h"
 
 #define FSL_MC_IS_ALLOCATABLE(_obj_type) \
@@ -23,15 +23,12 @@
          strcmp(_obj_type, "dpcon") == 0)
 
 /**
- * fsl_mc_resource_pool_add_device - add allocatable device to a resource
- * pool of a given MC bus
+ * fsl_mc_resource_pool_add_device - add allocatable object to a resource
+ * pool of a given fsl-mc bus
  *
- * @mc_bus: pointer to the MC bus
- * @pool_type: MC bus pool type
- * @mc_dev: Pointer to allocatable MC object device
- *
- * It adds an allocatable MC object device to a container's resource pool of
- * the given resource type
+ * @mc_bus: pointer to the fsl-mc bus
+ * @pool_type: pool type
+ * @mc_dev: pointer to allocatable fsl-mc device
  */
 static int __must_check fsl_mc_resource_pool_add_device(struct fsl_mc_bus
                                                                 *mc_bus,
@@ -95,10 +92,10 @@ out:
  * fsl_mc_resource_pool_remove_device - remove an allocatable device from a
  * resource pool
  *
- * @mc_dev: Pointer to allocatable MC object device
+ * @mc_dev: pointer to allocatable fsl-mc device
  *
- * It permanently removes an allocatable MC object device from the resource
- * pool, the device is currently in, as long as it is in the pool's free list.
+ * It permanently removes an allocatable fsl-mc device from the resource
+ * pool. It's an error if the device is in use.
  */
 static int __must_check fsl_mc_resource_pool_remove_device(struct fsl_mc_device
                                                                    *mc_dev)
@@ -255,17 +252,18 @@ out_unlock:
 EXPORT_SYMBOL_GPL(fsl_mc_resource_free);
 
 /**
- * fsl_mc_object_allocate - Allocates a MC object device of the given
- * pool type from a given MC bus
+ * fsl_mc_object_allocate - Allocates an fsl-mc object of the given
+ * pool type from a given fsl-mc bus instance
  *
- * @mc_dev: MC device for which the MC object device is to be allocated
- * @pool_type: MC bus resource pool type
- * @new_mc_dev: Pointer to area where the pointer to the allocated
- * MC object device is to be returned
+ * @mc_dev: fsl-mc device which is used in conjunction with the
+ * allocated object
+ * @pool_type: pool type
+ * @new_mc_dev: pointer to area where the pointer to the allocated device
+ * is to be returned
  *
- * This function allocates a MC object device from the device's parent DPRC,
- * from the corresponding MC bus' pool of allocatable MC object devices of
- * the given resource type. mc_dev cannot be a DPRC itself.
+ * Allocatable objects are always used in conjunction with some functional
+ * device.  This function allocates an object of the specified type from
+ * the DPRC containing the functional device.
  *
  * NOTE: pool_type must be different from FSL_MC_POOL_MCP, since MC
  * portals are allocated using fsl_mc_portal_allocate(), instead of
@@ -312,10 +310,9 @@ error:
 EXPORT_SYMBOL_GPL(fsl_mc_object_allocate);
 
 /**
- * fsl_mc_object_free - Returns an allocatable MC object device to the
- * corresponding resource pool of a given MC bus.
- *
- * @mc_adev: Pointer to the MC object device
+ * fsl_mc_object_free - Returns an fsl-mc object to the resource
+ * pool where it came from.
+ * @mc_adev: Pointer to the fsl-mc device
  */
 void fsl_mc_object_free(struct fsl_mc_device *mc_adev)
 {
@@ -332,8 +329,14 @@ void fsl_mc_object_free(struct fsl_mc_device *mc_adev)
 EXPORT_SYMBOL_GPL(fsl_mc_object_free);
 
 /*
- * Initialize the interrupt pool associated with a MC bus.
- * It allocates a block of IRQs from the GIC-ITS
+ * A DPRC and the devices in the DPRC all share the same GIC-ITS device
+ * ID.  A block of IRQs is pre-allocated and maintained in a pool
+ * from which devices can allocate them when needed.
+ */
+
+/*
+ * Initialize the interrupt pool associated with an fsl-mc bus.
+ * It allocates a block of IRQs from the GIC-ITS.
  */
 int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus,
                              unsigned int irq_count)
@@ -395,7 +398,7 @@ cleanup_msi_irqs:
 EXPORT_SYMBOL_GPL(fsl_mc_populate_irq_pool);
 
 /**
- * Teardown the interrupt pool associated with an MC bus.
+ * Teardown the interrupt pool associated with an fsl-mc bus.
  * It frees the IRQs that were allocated to the pool, back to the GIC-ITS.
  */
 void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus)
@@ -422,11 +425,7 @@ void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus)
 EXPORT_SYMBOL_GPL(fsl_mc_cleanup_irq_pool);
 
 /**
- * It allocates the IRQs required by a given MC object device. The
- * IRQs are allocated from the interrupt pool associated with the
- * MC bus that contains the device, if the device is not a DPRC device.
- * Otherwise, the IRQs are allocated from the interrupt pool associated
- * with the MC bus that represents the DPRC device itself.
+ * Allocate the IRQs required by a given fsl-mc device.
  */
 int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev)
 {
@@ -495,8 +494,7 @@ error_resource_alloc:
 EXPORT_SYMBOL_GPL(fsl_mc_allocate_irqs);
 
 /*
- * It frees the IRQs that were allocated for a MC object device, by
- * returning them to the corresponding interrupt pool.
+ * Frees the IRQs that were allocated for an fsl-mc device.
  */
 void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev)
 {
@@ -605,7 +603,7 @@ static int fsl_mc_allocator_probe(struct fsl_mc_device *mc_dev)
                 return error;
 
         dev_dbg(&mc_dev->dev,
-                "Allocatable MC object device bound to fsl_mc_allocator driver");
+                "Allocatable fsl-mc device bound to fsl_mc_allocator driver");
         return 0;
 }
 
@@ -627,7 +625,7 @@ static int fsl_mc_allocator_remove(struct fsl_mc_device *mc_dev)
         }
 
         dev_dbg(&mc_dev->dev,
-                "Allocatable MC object device unbound from fsl_mc_allocator driver");
+                "Allocatable fsl-mc device unbound from fsl_mc_allocator driver");
         return 0;
 }
 
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c
index 44f64b6f0fc9..5ac373c0c716 100644
--- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c
+++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c
@@ -1,7 +1,7 @@
 /*
  * Freescale Management Complex (MC) bus driver
  *
- * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ * Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
  * Author: German Rivera <German.Rivera@freescale.com>
  *
  * This file is licensed under the terms of the GNU General Public
@@ -9,6 +9,8 @@
  * warranty of any kind, whether express or implied.
  */
 
+#define pr_fmt(fmt) "fsl-mc: " fmt
+
 #include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/of_address.h>
@@ -34,7 +36,7 @@ static struct kmem_cache *mc_dev_cache;
 
 /**
  * struct fsl_mc - Private data of a "fsl,qoriq-mc" platform device
- * @root_mc_bus_dev: MC object device representing the root DPRC
+ * @root_mc_bus_dev: fsl-mc device representing the root DPRC
  * @num_translation_ranges: number of entries in addr_translation_ranges
  * @translation_ranges: array of bus to system address translation ranges
  */
@@ -62,8 +64,8 @@ struct fsl_mc_addr_translation_range {
 
 /**
  * fsl_mc_bus_match - device to driver matching callback
- * @dev: the MC object device structure to match against
- * @drv: the device driver to search for matching MC object device id
+ * @dev: the fsl-mc device to match against
+ * @drv: the device driver to search for matching fsl-mc object type
  * structures
  *
  * Returns 1 on success, 0 otherwise.
@@ -91,7 +93,7 @@ static int fsl_mc_bus_match(struct device *dev, struct device_driver *drv)
 
         /*
          * Traverse the match_id table of the given driver, trying to find
-         * a matching for the given MC object device.
+         * a matching for the given device.
          */
         for (id = mc_drv->match_id_table; id->vendor != 0x0; id++) {
                 if (id->vendor == mc_dev->obj_desc.vendor &&
@@ -164,8 +166,7 @@ static int fsl_mc_driver_probe(struct device *dev)
 
         error = mc_drv->probe(mc_dev);
         if (error < 0) {
-                dev_err(dev, "MC object device probe callback failed: %d\n",
-                        error);
+                dev_err(dev, "%s failed: %d\n", __func__, error);
                 return error;
         }
 
@@ -183,9 +184,7 @@ static int fsl_mc_driver_remove(struct device *dev)
 
         error = mc_drv->remove(mc_dev);
         if (error < 0) {
-                dev_err(dev,
-                        "MC object device remove callback failed: %d\n",
-                        error);
+                dev_err(dev, "%s failed: %d\n", __func__, error);
                 return error;
         }
 
@@ -232,8 +231,6 @@ int __fsl_mc_driver_register(struct fsl_mc_driver *mc_driver,
                 return error;
         }
 
-        pr_info("MC object device driver %s registered\n",
-                mc_driver->driver.name);
         return 0;
 }
 EXPORT_SYMBOL_GPL(__fsl_mc_driver_register);
@@ -315,21 +312,6 @@ static int get_dprc_icid(struct fsl_mc_io *mc_io,
         return error;
 }
 
-static int get_dprc_version(struct fsl_mc_io *mc_io,
-                            int container_id, u16 *major, u16 *minor)
-{
-        struct dprc_attributes attr;
-        int error;
-
-        error = get_dprc_attr(mc_io, container_id, &attr);
-        if (error == 0) {
-                *major = attr.version.major;
-                *minor = attr.version.minor;
-        }
-
-        return error;
-}
-
 static int translate_mc_addr(struct fsl_mc_device *mc_dev,
                              enum dprc_region_type mc_region_type,
                              u64 mc_offset, phys_addr_t *phys_addr)
@@ -452,7 +434,7 @@ bool fsl_mc_is_root_dprc(struct device *dev)
 }
 
 /**
- * Add a newly discovered MC object device to be visible in Linux
+ * Add a newly discovered fsl-mc device to be visible in Linux
  */
 int fsl_mc_device_add(struct dprc_obj_desc *obj_desc,
                       struct fsl_mc_io *mc_io,
@@ -533,8 +515,8 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc,
                         goto error_cleanup_dev;
         } else {
                 /*
-                 * A non-DPRC MC object device has to be a child of another
-                 * MC object (specifically a DPRC object)
+                 * A non-DPRC object has to be a child of a DPRC, use the
+                 * parent's ICID and interrupt domain.
                  */
                 mc_dev->icid = parent_mc_dev->icid;
                 mc_dev->dma_mask = FSL_MC_DEFAULT_DMA_MASK;
@@ -572,8 +554,7 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc,
         }
 
         (void)get_device(&mc_dev->dev);
-        dev_dbg(parent_dev, "Added MC object device %s\n",
-                dev_name(&mc_dev->dev));
+        dev_dbg(parent_dev, "added %s\n", dev_name(&mc_dev->dev));
 
         *new_mc_dev = mc_dev;
         return 0;
@@ -590,10 +571,10 @@ error_cleanup_dev:
 EXPORT_SYMBOL_GPL(fsl_mc_device_add);
 
 /**
- * fsl_mc_device_remove - Remove a MC object device from being visible to
+ * fsl_mc_device_remove - Remove an fsl-mc device from being visible to
  * Linux
  *
- * @mc_dev: Pointer to a MC object device object
+ * @mc_dev: Pointer to an fsl-mc device
  */
 void fsl_mc_device_remove(struct fsl_mc_device *mc_dev)
 {
@@ -749,8 +730,6 @@ static int fsl_mc_bus_probe(struct platform_device *pdev)
         struct mc_version mc_version;
         struct resource res;
 
-        dev_info(&pdev->dev, "Root MC bus device probed");
-
         mc = devm_kzalloc(&pdev->dev, sizeof(*mc), GFP_KERNEL);
         if (!mc)
                 return -ENOMEM;
@@ -783,8 +762,7 @@ static int fsl_mc_bus_probe(struct platform_device *pdev)
                 goto error_cleanup_mc_io;
         }
 
-        dev_info(&pdev->dev,
-                 "Freescale Management Complex Firmware version: %u.%u.%u\n",
+        dev_info(&pdev->dev, "MC firmware version: %u.%u.%u\n",
                  mc_version.major, mc_version.minor, mc_version.revision);
 
         error = get_mc_addr_translation_ranges(&pdev->dev,
@@ -793,7 +771,7 @@ static int fsl_mc_bus_probe(struct platform_device *pdev)
         if (error < 0)
                 goto error_cleanup_mc_io;
 
-        error = dpmng_get_container_id(mc_io, 0, &container_id);
+        error = dprc_get_container_id(mc_io, 0, &container_id);
         if (error < 0) {
                 dev_err(&pdev->dev,
                         "dpmng_get_container_id() failed: %d\n", error);
@@ -801,8 +779,9 @@ static int fsl_mc_bus_probe(struct platform_device *pdev)
         }
 
         memset(&obj_desc, 0, sizeof(struct dprc_obj_desc));
-        error = get_dprc_version(mc_io, container_id,
-                                 &obj_desc.ver_major, &obj_desc.ver_minor);
+        error = dprc_get_api_version(mc_io, 0,
+                                     &obj_desc.ver_major,
+                                     &obj_desc.ver_minor);
         if (error < 0)
                 goto error_cleanup_mc_io;
 
@@ -840,7 +819,6 @@ static int fsl_mc_bus_remove(struct platform_device *pdev)
         fsl_destroy_mc_io(mc->root_mc_bus_dev->mc_io);
         mc->root_mc_bus_dev->mc_io = NULL;
 
-        dev_info(&pdev->dev, "Root MC bus device removed");
         return 0;
 }
 
@@ -875,12 +853,10 @@ static int __init fsl_mc_bus_driver_init(void)
 
         error = bus_register(&fsl_mc_bus_type);
         if (error < 0) {
-                pr_err("fsl-mc bus type registration failed: %d\n", error);
+                pr_err("bus type registration failed: %d\n", error);
                 goto error_cleanup_cache;
         }
 
-        pr_info("fsl-mc bus type registered\n");
-
         error = platform_driver_register(&fsl_mc_bus_driver);
         if (error < 0) {
                 pr_err("platform_driver_register() failed: %d\n", error);
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c
index 3d46b1b1fa18..7975c6e6fee3 100644
--- a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c
+++ b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c
@@ -1,7 +1,7 @@
 /*
  * Freescale Management Complex (MC) bus driver MSI support
  *
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
  * Author: German Rivera <German.Rivera@freescale.com>
  *
  * This file is licensed under the terms of the GNU General Public
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/staging/fsl-mc/bus/fsl-mc-private.h
index d459c2673f39..5c49c9d2df6a 100644
--- a/drivers/staging/fsl-mc/bus/fsl-mc-private.h
+++ b/drivers/staging/fsl-mc/bus/fsl-mc-private.h
@@ -10,6 +10,9 @@
 #ifndef _FSL_MC_PRIVATE_H_
 #define _FSL_MC_PRIVATE_H_
 
+#include "../include/mc.h"
+#include "../include/mc-bus.h"
+
 int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc,
                                    struct fsl_mc_io *mc_io,
                                    struct device *parent_dev,
diff --git a/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c
index 7a6ac640752f..6b1cd574644f 100644
--- a/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c
+++ b/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c
@@ -1,7 +1,7 @@
 /*
  * Freescale Management Complex (MC) bus driver MSI support
  *
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
  * Author: German Rivera <German.Rivera@freescale.com>
  *
  * This file is licensed under the terms of the GNU General Public
@@ -19,7 +19,7 @@
 #include "../include/mc-bus.h"
 
 static struct irq_chip its_msi_irq_chip = {
-        .name = "fsl-mc-bus-msi",
+        .name = "ITS-fMSI",
         .irq_mask = irq_chip_mask_parent,
         .irq_unmask = irq_chip_unmask_parent,
         .irq_eoi = irq_chip_eoi_parent,
diff --git a/drivers/staging/fsl-mc/bus/mc-io.c b/drivers/staging/fsl-mc/bus/mc-io.c
index 798c965fe203..d66b87f0903b 100644
--- a/drivers/staging/fsl-mc/bus/mc-io.c
+++ b/drivers/staging/fsl-mc/bus/mc-io.c
@@ -1,4 +1,5 @@
-/* Copyright 2013-2016 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -11,7 +12,6 @@
  *       names of any contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
diff --git a/drivers/staging/fsl-mc/bus/mc-sys.c b/drivers/staging/fsl-mc/bus/mc-sys.c
index 285917c7c8e4..4d82802b384d 100644
--- a/drivers/staging/fsl-mc/bus/mc-sys.c
+++ b/drivers/staging/fsl-mc/bus/mc-sys.c
@@ -1,4 +1,5 @@
-/* Copyright 2013-2014 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * I/O services to send MC commands to the MC hardware
  *
@@ -13,7 +14,6 @@
  *       names of any contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
  *
- *
  * ALTERNATIVELY, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") as published by the Free Software
  * Foundation, either version 2 of that License or (at your option) any
@@ -67,7 +67,7 @@ static u16 mc_cmd_hdr_read_cmdid(struct mc_command *cmd)
         struct mc_cmd_header *hdr = (struct mc_cmd_header *)&cmd->header;
         u16 cmd_id = le16_to_cpu(hdr->cmd_id);
 
-        return (cmd_id & MC_CMD_HDR_CMDID_MASK) >> MC_CMD_HDR_CMDID_SHIFT;
+        return cmd_id;
 }
 
 static int mc_status_to_error(enum mc_cmd_status status)
@@ -200,7 +200,7 @@ static int mc_polling_wait_preemptible(struct fsl_mc_io *mc_io,
 
                 if (time_after_eq(jiffies, jiffies_until_timeout)) {
                         dev_dbg(mc_io->dev,
-                                "MC command timed out (portal: %#llx, obj handle: %#x, command: %#x)\n",
+                                "MC command timed out (portal: %#llx, dprc handle: %#x, command: %#x)\n",
                                  mc_io->portal_phys_addr,
                                  (unsigned int)mc_cmd_hdr_read_token(cmd),
                                  (unsigned int)mc_cmd_hdr_read_cmdid(cmd));
@@ -240,7 +240,7 @@ static int mc_polling_wait_atomic(struct fsl_mc_io *mc_io,
                 timeout_usecs -= MC_CMD_COMPLETION_POLLING_MAX_SLEEP_USECS;
                 if (timeout_usecs == 0) {
                         dev_dbg(mc_io->dev,
-                                "MC command timed out (portal: %#llx, obj handle: %#x, command: %#x)\n",
+                                "MC command timed out (portal: %#llx, dprc handle: %#x, command: %#x)\n",
                                  mc_io->portal_phys_addr,
                                  (unsigned int)mc_cmd_hdr_read_token(cmd),
                                  (unsigned int)mc_cmd_hdr_read_cmdid(cmd));
@@ -294,7 +294,7 @@ int mc_send_command(struct fsl_mc_io *mc_io, struct mc_command *cmd)
 
         if (status != MC_CMD_STATUS_OK) {
                 dev_dbg(mc_io->dev,
-                        "MC command failed: portal: %#llx, obj handle: %#x, command: %#x, status: %s (%#x)\n",
+                        "MC command failed: portal: %#llx, dprc handle: %#x, command: %#x, status: %s (%#x)\n",
                          mc_io->portal_phys_addr,
                          (unsigned int)mc_cmd_hdr_read_token(cmd),
                          (unsigned int)mc_cmd_hdr_read_cmdid(cmd),
diff --git a/drivers/staging/fsl-mc/include/dpbp.h b/drivers/staging/fsl-mc/include/dpbp.h
index e14e85a5d6df..bf34b1e0e730 100644
--- a/drivers/staging/fsl-mc/include/dpbp.h
+++ b/drivers/staging/fsl-mc/include/dpbp.h
@@ -1,4 +1,5 @@
-/* Copyright 2013-2015 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -32,7 +33,8 @@
 #ifndef __FSL_DPBP_H
 #define __FSL_DPBP_H
 
-/* Data Path Buffer Pool API
+/*
+ * Data Path Buffer Pool API
  * Contains initialization APIs and runtime control APIs for DPBP
  */
 
@@ -44,8 +46,8 @@ int dpbp_open(struct fsl_mc_io *mc_io,
               u16 *token);
 
 int dpbp_close(struct fsl_mc_io *mc_io,
-               u32              cmd_flags,
-               u16      token);
+               u32 cmd_flags,
+               u16 token);
 
 /**
  * struct dpbp_cfg - Structure representing DPBP configuration
@@ -55,14 +57,16 @@ struct dpbp_cfg {
         u32 options;
 };
 
-int dpbp_create(struct fsl_mc_io        *mc_io,
-                u32             cmd_flags,
-                const struct dpbp_cfg   *cfg,
-                u16             *token);
+int dpbp_create(struct fsl_mc_io *mc_io,
+                u16 dprc_token,
+                u32 cmd_flags,
+                const struct dpbp_cfg *cfg,
+                u32 *obj_id);
 
 int dpbp_destroy(struct fsl_mc_io *mc_io,
+                 u16 dprc_token,
                  u32 cmd_flags,
-                 u16 token);
+                 u32 obj_id);
 
 int dpbp_enable(struct fsl_mc_io *mc_io,
                 u32 cmd_flags,
@@ -88,85 +92,75 @@ int dpbp_reset(struct fsl_mc_io *mc_io,
  * @irq_num: A user defined number associated with this IRQ
  */
 struct dpbp_irq_cfg {
-             u64                addr;
-             u32                val;
-             int                irq_num;
+             u64 addr;
+             u32 val;
+             int irq_num;
 };
 
-int dpbp_set_irq(struct fsl_mc_io       *mc_io,
-                 u32            cmd_flags,
-                 u16            token,
-                 u8             irq_index,
-                 struct dpbp_irq_cfg    *irq_cfg);
-
-int dpbp_get_irq(struct fsl_mc_io       *mc_io,
-                 u32            cmd_flags,
-                 u16            token,
-                 u8             irq_index,
-                 int                    *type,
-                 struct dpbp_irq_cfg    *irq_cfg);
-
-int dpbp_set_irq_enable(struct fsl_mc_io        *mc_io,
-                        u32             cmd_flags,
-                        u16             token,
-                        u8                      irq_index,
-                        u8                      en);
-
-int dpbp_get_irq_enable(struct fsl_mc_io        *mc_io,
-                        u32             cmd_flags,
-                        u16             token,
-                        u8                      irq_index,
-                        u8                      *en);
+int dpbp_set_irq(struct fsl_mc_io *mc_io,
+                 u32 cmd_flags,
+                 u16 token,
+                 u8 irq_index,
+                 struct dpbp_irq_cfg *irq_cfg);
+
+int dpbp_get_irq(struct fsl_mc_io *mc_io,
+                 u32 cmd_flags,
+                 u16 token,
+                 u8 irq_index,
+                 int *type,
+                 struct dpbp_irq_cfg *irq_cfg);
+
+int dpbp_set_irq_enable(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 token,
+                        u8 irq_index,
+                        u8 en);
+
+int dpbp_get_irq_enable(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 token,
+                        u8 irq_index,
+                        u8 *en);
 
 int dpbp_set_irq_mask(struct fsl_mc_io  *mc_io,
-                      u32               cmd_flags,
-                      u16               token,
-                      u8                irq_index,
-                      u32               mask);
+                      u32 cmd_flags,
+                      u16 token,
+                      u8 irq_index,
+                      u32 mask);
 
 int dpbp_get_irq_mask(struct fsl_mc_io  *mc_io,
-                      u32               cmd_flags,
-                      u16               token,
-                      u8                irq_index,
-                      u32               *mask);
-
-int dpbp_get_irq_status(struct fsl_mc_io        *mc_io,
-                        u32             cmd_flags,
-                        u16             token,
-                        u8                      irq_index,
-                        u32             *status);
-
-int dpbp_clear_irq_status(struct fsl_mc_io      *mc_io,
-                          u32           cmd_flags,
-                          u16           token,
-                          u8            irq_index,
-                          u32           status);
+                      u32 cmd_flags,
+                      u16 token,
+                      u8 irq_index,
+                      u32 *mask);
+
+int dpbp_get_irq_status(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 token,
+                        u8 irq_index,
+                        u32 *status);
+
+int dpbp_clear_irq_status(struct fsl_mc_io *mc_io,
+                          u32 cmd_flags,
+                          u16 token,
+                          u8 irq_index,
+                          u32 status);
 
 /**
  * struct dpbp_attr - Structure representing DPBP attributes
  * @id:         DPBP object ID
- * @version:    DPBP version
  * @bpid:       Hardware buffer pool ID; should be used as an argument in
  *              acquire/release operations on buffers
  */
 struct dpbp_attr {
         int id;
-        /**
-         * struct version - Structure representing DPBP version
-         * @major:      DPBP major version
-         * @minor:      DPBP minor version
-         */
-        struct {
-                u16 major;
-                u16 minor;
-        } version;
         u16 bpid;
 };
 
-int dpbp_get_attributes(struct fsl_mc_io        *mc_io,
-                        u32     cmd_flags,
-                        u16             token,
-                        struct dpbp_attr        *attr);
+int dpbp_get_attributes(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 token,
+                        struct dpbp_attr *attr);
 
 /**
  *  DPBP notifications options
@@ -196,24 +190,29 @@ int dpbp_get_attributes(struct fsl_mc_io	*mc_io,
  * @options: Mask of available options; use 'DPBP_NOTIF_OPT_<X>' values
  */
 struct dpbp_notification_cfg {
-        u32     depletion_entry;
-        u32     depletion_exit;
-        u32     surplus_entry;
-        u32     surplus_exit;
-        u64     message_iova;
-        u64     message_ctx;
-        u16     options;
+        u32 depletion_entry;
+        u32 depletion_exit;
+        u32 surplus_entry;
+        u32 surplus_exit;
+        u64 message_iova;
+        u64 message_ctx;
+        u16 options;
 };
 
-int dpbp_set_notifications(struct fsl_mc_io     *mc_io,
-                           u32          cmd_flags,
-                           u16          token,
-                           struct dpbp_notification_cfg *cfg);
+int dpbp_set_notifications(struct fsl_mc_io *mc_io,
+                           u32 cmd_flags,
+                           u16 token,
+                           struct dpbp_notification_cfg *cfg);
+
+int dpbp_get_notifications(struct fsl_mc_io *mc_io,
+                           u32 cmd_flags,
+                           u16 token,
+                           struct dpbp_notification_cfg *cfg);
 
-int dpbp_get_notifications(struct fsl_mc_io     *mc_io,
-                           u32          cmd_flags,
-                           u16          token,
-                           struct dpbp_notification_cfg *cfg);
+int dpbp_get_api_version(struct fsl_mc_io *mc_io,
+                         u32 cmd_flags,
+                         u16 *major_ver,
+                         u16 *minor_ver);
 
 /** @} */
 
diff --git a/drivers/staging/fsl-mc/include/dpmng.h b/drivers/staging/fsl-mc/include/dpmng.h
index e5cfd017f9a5..7d8e255da578 100644
--- a/drivers/staging/fsl-mc/include/dpmng.h
+++ b/drivers/staging/fsl-mc/include/dpmng.h
@@ -1,4 +1,5 @@
-/* Copyright 2013-2015 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -32,7 +33,8 @@
 #ifndef __FSL_DPMNG_H
 #define __FSL_DPMNG_H
 
-/* Management Complex General API
+/*
+ * Management Complex General API
  * Contains general API for the Management Complex firmware
  */
 
@@ -58,12 +60,12 @@ struct mc_version {
         u32 revision;
 };
 
-int mc_get_version(struct fsl_mc_io     *mc_io,
-                   u32          cmd_flags,
-                   struct mc_version    *mc_ver_info);
+int mc_get_version(struct fsl_mc_io *mc_io,
+                   u32 cmd_flags,
+                   struct mc_version *mc_ver_info);
 
-int dpmng_get_container_id(struct fsl_mc_io     *mc_io,
-                           u32          cmd_flags,
-                           int                  *container_id);
+int dpmng_get_container_id(struct fsl_mc_io *mc_io,
+                           u32 cmd_flags,
+                           int *container_id);
 
 #endif /* __FSL_DPMNG_H */
diff --git a/drivers/staging/fsl-mc/include/dprc.h b/drivers/staging/fsl-mc/include/dprc.h
index 593b2bbe7f71..f9ea769ccfab 100644
--- a/drivers/staging/fsl-mc/include/dprc.h
+++ b/drivers/staging/fsl-mc/include/dprc.h
@@ -1,4 +1,5 @@
-/* Copyright 2013-2015 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -34,7 +35,8 @@
 
 #include "mc-cmd.h"
 
-/* Data Path Resource Container API
+/*
+ * Data Path Resource Container API
  * Contains DPRC API for managing and querying DPAA resources
  */
 
@@ -70,12 +72,14 @@ int dprc_close(struct fsl_mc_io *mc_io,
  * and can be retrieved using dprc_get_attributes()
  */
 
-/* Spawn Policy Option allowed - Indicates that the new container is allowed
+/*
+ * Spawn Policy Option allowed - Indicates that the new container is allowed
  * to spawn and have its own child containers.
  */
 #define DPRC_CFG_OPT_SPAWN_ALLOWED              0x00000001
 
-/* General Container allocation policy - Indicates that the new container is
+/*
+ * General Container allocation policy - Indicates that the new container is
  * allowed to allocate requested resources from its parent container; if not
  * set, the container is only allowed to use resources in its own pools; Note
  * that this is a container's global policy, but the parent container may
@@ -83,12 +87,14 @@ int dprc_close(struct fsl_mc_io *mc_io,
  */
 #define DPRC_CFG_OPT_ALLOC_ALLOWED              0x00000002
 
-/* Object initialization allowed - software context associated with this
+/*
+ * Object initialization allowed - software context associated with this
  * container is allowed to invoke object initialization operations.
  */
 #define DPRC_CFG_OPT_OBJ_CREATE_ALLOWED 0x00000004
 
-/* Topology change allowed - software context associated with this
+/*
+ * Topology change allowed - software context associated with this
  * container is allowed to invoke topology operations, such as attach/detach
  * of network objects.
  */
@@ -116,17 +122,17 @@ struct dprc_cfg {
         char label[16];
 };
 
-int dprc_create_container(struct fsl_mc_io      *mc_io,
-                          u32           cmd_flags,
-                          u16           token,
-                          struct dprc_cfg       *cfg,
-                          int                   *child_container_id,
-                          u64           *child_portal_offset);
+int dprc_create_container(struct fsl_mc_io *mc_io,
+                          u32 cmd_flags,
+                          u16 token,
+                          struct dprc_cfg *cfg,
+                          int *child_container_id,
+                          u64 *child_portal_offset);
 
-int dprc_destroy_container(struct fsl_mc_io     *mc_io,
-                           u32          cmd_flags,
-                           u16          token,
-                           int                  child_container_id);
+int dprc_destroy_container(struct fsl_mc_io *mc_io,
+                           u32 cmd_flags,
+                           u16 token,
+                           int child_container_id);
 
 int dprc_reset_container(struct fsl_mc_io *mc_io,
                          u32 cmd_flags,
@@ -139,7 +145,7 @@ int dprc_reset_container(struct fsl_mc_io *mc_io,
 #define DPRC_IRQ_INDEX          0
 
 /* Number of dprc's IRQs */
-#define DPRC_NUM_OF_IRQS                1
+#define DPRC_NUM_OF_IRQS        1
 
 /* DPRC IRQ events */
 
@@ -151,12 +157,14 @@ int dprc_reset_container(struct fsl_mc_io *mc_io,
 #define DPRC_IRQ_EVENT_RES_ADDED                0x00000004
 /* IRQ event - Indicates that resources removed from the container */
 #define DPRC_IRQ_EVENT_RES_REMOVED              0x00000008
-/* IRQ event - Indicates that one of the descendant containers that opened by
+/*
+ * IRQ event - Indicates that one of the descendant containers that opened by
  * this container is destroyed
  */
 #define DPRC_IRQ_EVENT_CONTAINER_DESTROYED      0x00000010
 
-/* IRQ event - Indicates that on one of the container's opened object is
+/*
+ * IRQ event - Indicates that on one of the container's opened object is
  * destroyed
  */
 #define DPRC_IRQ_EVENT_OBJ_DESTROYED            0x00000020
@@ -171,59 +179,59 @@ int dprc_reset_container(struct fsl_mc_io *mc_io,
  * @irq_num:    A user defined number associated with this IRQ
  */
 struct dprc_irq_cfg {
-             phys_addr_t        paddr;
-             u32                val;
-             int                irq_num;
+             phys_addr_t paddr;
+             u32 val;
+             int irq_num;
 };
 
-int dprc_set_irq(struct fsl_mc_io       *mc_io,
-                 u32            cmd_flags,
-                 u16            token,
-                 u8             irq_index,
-                 struct dprc_irq_cfg    *irq_cfg);
-
-int dprc_get_irq(struct fsl_mc_io       *mc_io,
-                 u32            cmd_flags,
-                 u16            token,
-                 u8             irq_index,
-                 int                    *type,
-                 struct dprc_irq_cfg    *irq_cfg);
-
-int dprc_set_irq_enable(struct fsl_mc_io        *mc_io,
-                        u32             cmd_flags,
-                        u16             token,
-                        u8                      irq_index,
-                        u8                      en);
-
-int dprc_get_irq_enable(struct fsl_mc_io        *mc_io,
-                        u32             cmd_flags,
-                        u16             token,
-                        u8                      irq_index,
-                        u8                      *en);
-
-int dprc_set_irq_mask(struct fsl_mc_io  *mc_io,
-                      u32               cmd_flags,
-                      u16               token,
-                      u8                irq_index,
-                      u32               mask);
-
-int dprc_get_irq_mask(struct fsl_mc_io  *mc_io,
-                      u32               cmd_flags,
-                      u16               token,
-                      u8                irq_index,
-                      u32               *mask);
-
-int dprc_get_irq_status(struct fsl_mc_io        *mc_io,
-                        u32             cmd_flags,
-                        u16             token,
-                        u8                      irq_index,
-                        u32             *status);
-
-int dprc_clear_irq_status(struct fsl_mc_io      *mc_io,
-                          u32           cmd_flags,
-                          u16           token,
-                          u8            irq_index,
-                          u32           status);
+int dprc_set_irq(struct fsl_mc_io *mc_io,
+                 u32 cmd_flags,
+                 u16 token,
+                 u8 irq_index,
+                 struct dprc_irq_cfg *irq_cfg);
+
+int dprc_get_irq(struct fsl_mc_io *mc_io,
+                 u32 cmd_flags,
+                 u16 token,
+                 u8 irq_index,
+                 int *type,
+                 struct dprc_irq_cfg *irq_cfg);
+
+int dprc_set_irq_enable(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 token,
+                        u8 irq_index,
+                        u8 en);
+
+int dprc_get_irq_enable(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 token,
+                        u8 irq_index,
+                        u8 *en);
+
+int dprc_set_irq_mask(struct fsl_mc_io *mc_io,
+                      u32 cmd_flags,
+                      u16 token,
+                      u8 irq_index,
+                      u32 mask);
+
+int dprc_get_irq_mask(struct fsl_mc_io *mc_io,
+                      u32 cmd_flags,
+                      u16 token,
+                      u8 irq_index,
+                      u32 *mask);
+
+int dprc_get_irq_status(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 token,
+                        u8 irq_index,
+                        u32 *status);
+
+int dprc_clear_irq_status(struct fsl_mc_io *mc_io,
+                          u32 cmd_flags,
+                          u16 token,
+                          u8 irq_index,
+                          u32 status);
 
 /**
  * struct dprc_attributes - Container attributes
@@ -231,63 +239,56 @@ int dprc_clear_irq_status(struct fsl_mc_io	*mc_io,
  * @icid: Container's ICID
  * @portal_id: Container's portal ID
  * @options: Container's options as set at container's creation
- * @version: DPRC version
  */
 struct dprc_attributes {
         int container_id;
         u16 icid;
         int portal_id;
         u64 options;
-        /**
-         * struct version - DPRC version
-         * @major: DPRC major version
-         * @minor: DPRC minor version
-         */
-        struct {
-                u16 major;
-                u16 minor;
-        } version;
 };
 
-int dprc_get_attributes(struct fsl_mc_io        *mc_io,
-                        u32             cmd_flags,
-                        u16             token,
-                        struct dprc_attributes  *attributes);
+int dprc_get_attributes(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 token,
+                        struct dprc_attributes *attributes);
 
 int dprc_set_res_quota(struct fsl_mc_io *mc_io,
-                       u32              cmd_flags,
-                       u16              token,
-                       int              child_container_id,
-                       char             *type,
-                       u16              quota);
+                       u32 cmd_flags,
+                       u16 token,
+                       int child_container_id,
+                       char *type,
+                       u16 quota);
 
 int dprc_get_res_quota(struct fsl_mc_io *mc_io,
-                       u32              cmd_flags,
-                       u16              token,
-                       int              child_container_id,
-                       char             *type,
-                       u16              *quota);
+                       u32 cmd_flags,
+                       u16 token,
+                       int child_container_id,
+                       char *type,
+                       u16 *quota);
 
 /* Resource request options */
 
-/* Explicit resource ID request - The requested objects/resources
+/*
+ * Explicit resource ID request - The requested objects/resources
  * are explicit and sequential (in case of resources).
  * The base ID is given at res_req at base_align field
  */
-#define DPRC_RES_REQ_OPT_EXPLICIT               0x00000001
+#define DPRC_RES_REQ_OPT_EXPLICIT       0x00000001
 
-/* Aligned resources request - Relevant only for resources
+/*
+ * Aligned resources request - Relevant only for resources
  * request (and not objects). Indicates that resources base ID should be
  * sequential and aligned to the value given at dprc_res_req base_align field
  */
-#define DPRC_RES_REQ_OPT_ALIGNED                0x00000002
+#define DPRC_RES_REQ_OPT_ALIGNED        0x00000002
 
-/* Plugged Flag - Relevant only for object assignment request.
+/*
+ * Plugged Flag - Relevant only for object assignment request.
  * Indicates that after all objects assigned. An interrupt will be invoked at
  * the relevant GPP. The assigned object will be marked as plugged.
  * plugged objects can't be assigned from their container
  */
-#define DPRC_RES_REQ_OPT_PLUGGED                0x00000004
+#define DPRC_RES_REQ_OPT_PLUGGED        0x00000004
 
 /**
  * struct dprc_res_req - Resource request descriptor, to be used in assignment
@@ -312,33 +313,33 @@ struct dprc_res_req {
         int id_base_align;
 };
 
-int dprc_assign(struct fsl_mc_io        *mc_io,
-                u32             cmd_flags,
-                u16             token,
-                int                     container_id,
-                struct dprc_res_req     *res_req);
-
-int dprc_unassign(struct fsl_mc_io      *mc_io,
-                  u32           cmd_flags,
-                  u16           token,
-                  int                   child_container_id,
-                  struct dprc_res_req   *res_req);
-
-int dprc_get_pool_count(struct fsl_mc_io        *mc_io,
-                        u32             cmd_flags,
-                        u16             token,
-                        int                     *pool_count);
-
-int dprc_get_pool(struct fsl_mc_io      *mc_io,
-                  u32           cmd_flags,
-                  u16           token,
-                  int                   pool_index,
-                  char                  *type);
+int dprc_assign(struct fsl_mc_io *mc_io,
+                u32 cmd_flags,
+                u16 token,
+                int container_id,
+                struct dprc_res_req *res_req);
+
+int dprc_unassign(struct fsl_mc_io *mc_io,
+                  u32 cmd_flags,
+                  u16 token,
+                  int child_container_id,
+                  struct dprc_res_req *res_req);
+
+int dprc_get_pool_count(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 token,
+                        int *pool_count);
+
+int dprc_get_pool(struct fsl_mc_io *mc_io,
+                  u32 cmd_flags,
+                  u16 token,
+                  int pool_index,
+                  char *type);
 
 int dprc_get_obj_count(struct fsl_mc_io *mc_io,
-                       u32              cmd_flags,
-                       u16              token,
-                       int              *obj_count);
+                       u32 cmd_flags,
+                       u16 token,
+                       int *obj_count);
 
 /* Objects Attributes Flags */
 
@@ -353,7 +354,7 @@ int dprc_get_obj_count(struct fsl_mc_io *mc_io,
  * masters;
  * user is responsible for proper memory handling through IOMMU configuration.
  */
-#define DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY               0x0001
+#define DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY       0x0001
 
 /**
  * struct dprc_obj_desc - Object descriptor, returned from dprc_get_obj()
@@ -381,41 +382,41 @@ struct dprc_obj_desc {
         u16 flags;
 };
 
-int dprc_get_obj(struct fsl_mc_io       *mc_io,
-                 u32            cmd_flags,
-                 u16            token,
-                 int                    obj_index,
-                 struct dprc_obj_desc   *obj_desc);
-
-int dprc_get_obj_desc(struct fsl_mc_io          *mc_io,
-                      u32               cmd_flags,
-                        u16             token,
-                        char                    *obj_type,
-                        int                     obj_id,
-                        struct dprc_obj_desc    *obj_desc);
-
-int dprc_set_obj_irq(struct fsl_mc_io           *mc_io,
-                     u32                        cmd_flags,
-                     u16                        token,
-                     char                       *obj_type,
-                     int                        obj_id,
-                     u8                 irq_index,
-                     struct dprc_irq_cfg        *irq_cfg);
-
-int dprc_get_obj_irq(struct fsl_mc_io           *mc_io,
-                     u32                        cmd_flags,
-                     u16                        token,
-                     char                       *obj_type,
-                     int                        obj_id,
-                     u8                 irq_index,
-                     int                        *type,
-                     struct dprc_irq_cfg        *irq_cfg);
-
-int dprc_get_res_count(struct fsl_mc_io *mc_io,
-                       u32              cmd_flags,
-                       u16              token,
-                       char             *type,
-                       int              *res_count);
+int dprc_get_obj(struct fsl_mc_io *mc_io,
+                 u32 cmd_flags,
+                 u16 token,
+                 int obj_index,
+                 struct dprc_obj_desc *obj_desc);
+
+int dprc_get_obj_desc(struct fsl_mc_io *mc_io,
+                      u32 cmd_flags,
+                      u16 token,
+                      char *obj_type,
+                      int obj_id,
+                      struct dprc_obj_desc *obj_desc);
+
+int dprc_set_obj_irq(struct fsl_mc_io *mc_io,
+                     u32 cmd_flags,
+                     u16 token,
+                     char *obj_type,
+                     int obj_id,
+                     u8 irq_index,
+                     struct dprc_irq_cfg *irq_cfg);
+
+int dprc_get_obj_irq(struct fsl_mc_io *mc_io,
+                     u32 cmd_flags,
+                     u16 token,
+                     char *obj_type,
+                     int obj_id,
+                     u8 irq_index,
+                     int *type,
+                     struct dprc_irq_cfg *irq_cfg);
+
+int dprc_get_res_count(struct fsl_mc_io *mc_io,
+                       u32 cmd_flags,
+                       u16 token,
+                       char *type,
+                       int *res_count);
 
 /**
  * enum dprc_iter_status - Iteration status
@@ -444,11 +445,11 @@ struct dprc_res_ids_range_desc {
         enum dprc_iter_status iter_status;
 };
 
-int dprc_get_res_ids(struct fsl_mc_io                   *mc_io,
-                     u32                                cmd_flags,
-                     u16                                token,
-                     char                               *type,
-                     struct dprc_res_ids_range_desc     *range_desc);
+int dprc_get_res_ids(struct fsl_mc_io *mc_io,
+                     u32 cmd_flags,
+                     u16 token,
+                     char *type,
+                     struct dprc_res_ids_range_desc *range_desc);
 
 /* Region flags */
 /* Cacheable - Indicates that region should be mapped as cacheable */
@@ -481,20 +482,20 @@ struct dprc_region_desc {
         enum dprc_region_type type;
 };
 
-int dprc_get_obj_region(struct fsl_mc_io        *mc_io,
-                        u32             cmd_flags,
-                        u16             token,
-                        char                    *obj_type,
-                        int                     obj_id,
-                        u8                      region_index,
-                        struct dprc_region_desc *region_desc);
-
-int dprc_set_obj_label(struct fsl_mc_io *mc_io,
-                       u32              cmd_flags,
-                       u16              token,
-                       char             *obj_type,
-                       int              obj_id,
-                       char             *label);
+int dprc_get_obj_region(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 token,
+                        char *obj_type,
+                        int obj_id,
+                        u8 region_index,
+                        struct dprc_region_desc *region_desc);
+
+int dprc_set_obj_label(struct fsl_mc_io *mc_io,
+                       u32 cmd_flags,
+                       u16 token,
+                       char *obj_type,
+                       int obj_id,
+                       char *label);
 
 /**
  * struct dprc_endpoint - Endpoint description for link connect/disconnect
@@ -521,24 +522,33 @@ struct dprc_connection_cfg {
         u32 max_rate;
 };
 
-int dprc_connect(struct fsl_mc_io               *mc_io,
-                 u32                    cmd_flags,
-                 u16                    token,
-                 const struct dprc_endpoint     *endpoint1,
-                 const struct dprc_endpoint     *endpoint2,
+int dprc_connect(struct fsl_mc_io *mc_io,
+                 u32 cmd_flags,
+                 u16 token,
+                 const struct dprc_endpoint *endpoint1,
+                 const struct dprc_endpoint *endpoint2,
                  const struct dprc_connection_cfg *cfg);
 
-int dprc_disconnect(struct fsl_mc_io            *mc_io,
-                    u32                 cmd_flags,
-                    u16                 token,
-                    const struct dprc_endpoint  *endpoint);
-
-int dprc_get_connection(struct fsl_mc_io                *mc_io,
-                        u32                     cmd_flags,
-                        u16                     token,
-                        const struct dprc_endpoint      *endpoint1,
-                        struct dprc_endpoint            *endpoint2,
-                        int                             *state);
+int dprc_disconnect(struct fsl_mc_io *mc_io,
+                    u32 cmd_flags,
+                    u16 token,
+                    const struct dprc_endpoint *endpoint);
+
+int dprc_get_connection(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 token,
+                        const struct dprc_endpoint *endpoint1,
+                        struct dprc_endpoint *endpoint2,
+                        int *state);
+
+int dprc_get_api_version(struct fsl_mc_io *mc_io,
+                         u32 cmd_flags,
+                         u16 *major_ver,
+                         u16 *minor_ver);
+
+int dprc_get_container_id(struct fsl_mc_io *mc_io,
+                          u32 cmd_flags,
+                          int *container_id);
 
 #endif /* _FSL_DPRC_H */
 
diff --git a/drivers/staging/fsl-mc/include/mc-bus.h b/drivers/staging/fsl-mc/include/mc-bus.h
index 170684a57ca2..42700de94d59 100644
--- a/drivers/staging/fsl-mc/include/mc-bus.h
+++ b/drivers/staging/fsl-mc/include/mc-bus.h
@@ -1,7 +1,7 @@
 /*
  * Freescale Management Complex (MC) bus declarations
  *
- * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ * Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
  * Author: German Rivera <German.Rivera@freescale.com>
  *
  * This file is licensed under the terms of the GNU General Public
@@ -42,8 +42,8 @@ struct msi_domain_info;
  */
 struct fsl_mc_resource_pool {
         enum fsl_mc_pool_type type;
-        int16_t max_count;
-        int16_t free_count;
+        int max_count;
+        int free_count;
         struct mutex mutex;     /* serializes access to free_list */
         struct list_head free_list;
         struct fsl_mc_bus *mc_bus;
diff --git a/drivers/staging/fsl-mc/include/mc-cmd.h b/drivers/staging/fsl-mc/include/mc-cmd.h
index 5decb9890c31..2e08aa31b084 100644
--- a/drivers/staging/fsl-mc/include/mc-cmd.h
+++ b/drivers/staging/fsl-mc/include/mc-cmd.h
@@ -1,4 +1,5 @@
-/* Copyright 2013-2015 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -48,6 +49,15 @@ struct mc_command {
         u64 params[MC_CMD_NUM_OF_PARAMS];
 };
 
+struct mc_rsp_create {
+        __le32 object_id;
+};
+
+struct mc_rsp_api_ver {
+        __le16 major_ver;
+        __le16 minor_ver;
+};
+
 enum mc_cmd_status {
         MC_CMD_STATUS_OK = 0x0, /* Completed successfully */
         MC_CMD_STATUS_READY = 0x1, /* Ready to be processed */
@@ -72,11 +82,6 @@ enum mc_cmd_status {
 /* Command completion flag */
 #define MC_CMD_FLAG_INTR_DIS    0x01
 
-#define MC_CMD_HDR_CMDID_MASK           0xFFF0
-#define MC_CMD_HDR_CMDID_SHIFT          4
-#define MC_CMD_HDR_TOKEN_MASK           0xFFC0
-#define MC_CMD_HDR_TOKEN_SHIFT          6
-
 static inline u64 mc_encode_cmd_header(u16 cmd_id,
                                        u32 cmd_flags,
                                        u16 token)
@@ -84,10 +89,8 @@ static inline u64 mc_encode_cmd_header(u16 cmd_id,
         u64 header = 0;
         struct mc_cmd_header *hdr = (struct mc_cmd_header *)&header;
 
-        hdr->cmd_id = cpu_to_le16((cmd_id << MC_CMD_HDR_CMDID_SHIFT) &
-                                  MC_CMD_HDR_CMDID_MASK);
-        hdr->token = cpu_to_le16((token << MC_CMD_HDR_TOKEN_SHIFT) &
-                                 MC_CMD_HDR_TOKEN_MASK);
+        hdr->cmd_id = cpu_to_le16(cmd_id);
+        hdr->token  = cpu_to_le16(token);
         hdr->status = MC_CMD_STATUS_READY;
         if (cmd_flags & MC_CMD_FLAG_PRI)
                 hdr->flags_hw = MC_CMD_FLAG_PRI;
@@ -102,7 +105,26 @@ static inline u16 mc_cmd_hdr_read_token(struct mc_command *cmd)
         struct mc_cmd_header *hdr = (struct mc_cmd_header *)&cmd->header;
         u16 token = le16_to_cpu(hdr->token);
 
-        return (token & MC_CMD_HDR_TOKEN_MASK) >> MC_CMD_HDR_TOKEN_SHIFT;
+        return token;
+}
+
+static inline u32 mc_cmd_read_object_id(struct mc_command *cmd)
+{
+        struct mc_rsp_create *rsp_params;
+
+        rsp_params = (struct mc_rsp_create *)cmd->params;
+        return le32_to_cpu(rsp_params->object_id);
+}
+
+static inline void mc_cmd_read_api_version(struct mc_command *cmd,
+                                           u16 *major_ver,
+                                           u16 *minor_ver)
+{
+        struct mc_rsp_api_ver *rsp_params;
+
+        rsp_params = (struct mc_rsp_api_ver *)cmd->params;
+        *major_ver = le16_to_cpu(rsp_params->major_ver);
+        *minor_ver = le16_to_cpu(rsp_params->minor_ver);
 }
 
 #endif /* __FSL_MC_CMD_H */
diff --git a/drivers/staging/fsl-mc/include/mc-sys.h b/drivers/staging/fsl-mc/include/mc-sys.h
index 89ad0cf54702..dca7f9084e05 100644
--- a/drivers/staging/fsl-mc/include/mc-sys.h
+++ b/drivers/staging/fsl-mc/include/mc-sys.h
@@ -1,4 +1,5 @@
-/* Copyright 2013-2014 Freescale Semiconductor Inc.
+/*
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
  *
  * Interface of the I/O services to send MC commands to the MC hardware
  *
diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h
index f6e720e84460..1c46c0c2a895 100644
--- a/drivers/staging/fsl-mc/include/mc.h
+++ b/drivers/staging/fsl-mc/include/mc.h
@@ -1,7 +1,7 @@
 /*
  * Freescale Management Complex (MC) bus public interface
  *
- * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ * Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
  * Author: German Rivera <German.Rivera@freescale.com>
  *
  * This file is licensed under the terms of the GNU General Public
@@ -81,7 +81,7 @@ enum fsl_mc_pool_type {
  */
 struct fsl_mc_resource {
         enum fsl_mc_pool_type type;
-        int32_t id;
+        s32 id;
         void *data;
         struct fsl_mc_resource_pool *parent_pool;
         struct list_head node;
diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c
index 49c718b91e55..41a49c8194e5 100644
--- a/drivers/staging/fwserial/fwserial.c
+++ b/drivers/staging/fwserial/fwserial.c
@@ -1667,12 +1667,6 @@ static inline void fill_plug_rsp_nack(struct fwserial_mgmt_pkt *pkt)
         pkt->hdr.len = cpu_to_be16(mgmt_pkt_expected_len(pkt->hdr.code));
 }
 
-static inline void fill_unplug_req(struct fwserial_mgmt_pkt *pkt)
-{
-        pkt->hdr.code = cpu_to_be16(FWSC_VIRT_CABLE_UNPLUG);
-        pkt->hdr.len = cpu_to_be16(mgmt_pkt_expected_len(pkt->hdr.code));
-}
-
 static inline void fill_unplug_rsp_nack(struct fwserial_mgmt_pkt *pkt)
 {
         pkt->hdr.code = cpu_to_be16(FWSC_VIRT_CABLE_UNPLUG_RSP | FWSC_RSP_NACK);
diff --git a/drivers/staging/gdm724x/gdm_lte.h b/drivers/staging/gdm724x/gdm_lte.h
index 88414e5a70cc..7ddeabc0e50a 100644
--- a/drivers/staging/gdm724x/gdm_lte.h
+++ b/drivers/staging/gdm724x/gdm_lte.h
@@ -47,15 +47,15 @@ struct phy_dev {
         void    *priv_dev;
         struct net_device *dev[MAX_NIC_TYPE];
         int     (*send_hci_func)(void *priv_dev, void *data, int len,
-                        void (*cb)(void *cb_data), void *cb_data);
+                                 void (*cb)(void *cb_data), void *cb_data);
         int     (*send_sdu_func)(void *priv_dev, void *data, int len,
-                        unsigned int dftEpsId, unsigned int epsId,
-                        void (*cb)(void *cb_data), void *cb_data,
-                        int dev_idx, int nic_type);
+                                 unsigned int dftEpsId, unsigned int epsId,
+                                 void (*cb)(void *cb_data), void *cb_data,
+                                 int dev_idx, int nic_type);
         int     (*rcv_func)(void *priv_dev,
-                        int (*cb)(void *cb_data, void *data, int len,
-                                  int context),
-                        void *cb_data, int context);
+                            int (*cb)(void *cb_data, void *data, int len,
+                                      int context),
+                            void *cb_data, int context);
         struct gdm_endian * (*get_endian)(void *priv_dev);
 };
 
diff --git a/drivers/staging/gdm724x/gdm_tty.h b/drivers/staging/gdm724x/gdm_tty.h
index 297438b4ddcb..195c5902989f 100644
--- a/drivers/staging/gdm724x/gdm_tty.h
+++ b/drivers/staging/gdm724x/gdm_tty.h
@@ -17,7 +17,6 @@
 #include <linux/types.h>
 #include <linux/tty.h>
 
-
 #define TTY_MAX_COUNT           2
 
 #define MAX_ISSUE_NUM 3
diff --git a/drivers/staging/gdm724x/netlink_k.h b/drivers/staging/gdm724x/netlink_k.h
index 7cf979b3f826..5ebd73157f5a 100644
--- a/drivers/staging/gdm724x/netlink_k.h
+++ b/drivers/staging/gdm724x/netlink_k.h
@@ -18,7 +18,8 @@
 #include <net/sock.h>
 
 struct sock *netlink_init(int unit,
-        void (*cb)(struct net_device *dev, u16 type, void *msg, int len));
+                          void (*cb)(struct net_device *dev,
+                                     u16 type, void *msg, int len));
 int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len);
 
 #endif /* _NETLINK_K_H_ */
diff --git a/drivers/staging/greybus/arche-apb-ctrl.c b/drivers/staging/greybus/arche-apb-ctrl.c
index 70323aa11f24..3fda0cd6bb42 100644
--- a/drivers/staging/greybus/arche-apb-ctrl.c
+++ b/drivers/staging/greybus/arche-apb-ctrl.c
@@ -183,7 +183,7 @@ static int standby_boot_seq(struct platform_device *pdev)
          * Pasted from WDM spec,
          *  - A falling edge on POWEROFF_L is detected (a)
          *  - WDM enters standby mode, but no output signals are changed
-         * */
+         */
 
         /* TODO: POWEROFF_L is input to WDM module  */
         apb->state = ARCHE_PLATFORM_STATE_STANDBY;
@@ -285,8 +285,10 @@ static ssize_t state_store(struct device *dev,
                 if (apb->state == ARCHE_PLATFORM_STATE_FW_FLASHING)
                         return count;
 
-                /* First we want to make sure we power off everything
-                 * and then enter FW flashing state */
+                /*
+                 * First we want to make sure we power off everything
+                 * and then enter FW flashing state
+                 */
                 poweroff_seq(pdev);
                 ret = fw_flashing_seq(pdev);
         } else {
diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c
index d33d6fe078ad..338c2d3ee842 100644
--- a/drivers/staging/greybus/arche-platform.c
+++ b/drivers/staging/greybus/arche-platform.c
@@ -457,7 +457,8 @@ retry:
                         goto exit;
 
                 /* First we want to make sure we power off everything
-                 * and then activate back again */
+                 * and then activate back again
+                 */
                 device_for_each_child(arche_pdata->dev, NULL, apb_poweroff);
                 arche_platform_poweroff_seq(arche_pdata);
 
diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c
index 8a0744b58a32..f8862c6d7102 100644
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -405,7 +405,6 @@ static void gbcodec_shutdown(struct snd_pcm_substream *substream,
         params->state = GBAUDIO_CODEC_SHUTDOWN;
         mutex_unlock(&codec->lock);
         pm_relax(dai->dev);
-        return;
 }
 
 static int gbcodec_hw_params(struct snd_pcm_substream *substream,
@@ -655,8 +654,10 @@ static int gbcodec_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
                         ret = gb_audio_apbridgea_shutdown_rx(data->connection,
                                                              0);
                 params->state = GBAUDIO_CODEC_STOP;
-        } else
+        } else {
                 ret = -EINVAL;
+        }
+
         if (ret)
                 dev_err_ratelimited(dai->dev,
                                     "%s:Error during %s %s stream:%d\n",
diff --git a/drivers/staging/greybus/audio_codec.h b/drivers/staging/greybus/audio_codec.h
index ca027bd99ad7..62fd93939a1f 100644
--- a/drivers/staging/greybus/audio_codec.h
+++ b/drivers/staging/greybus/audio_codec.h
@@ -158,7 +158,6 @@ struct gbaudio_module_info {
         int dev_id;     /* check if it should be bundle_id/hd_cport_id */
         int vid;
         int pid;
-        int slot;
         int type;
         int set_uevent;
         char vstr[NAME_SIZE];
diff --git a/drivers/staging/greybus/audio_manager.h b/drivers/staging/greybus/audio_manager.h
index c4ca09754a6a..5ab8f5e0ed3f 100644
--- a/drivers/staging/greybus/audio_manager.h
+++ b/drivers/staging/greybus/audio_manager.h
@@ -18,10 +18,9 @@
 
 struct gb_audio_manager_module_descriptor {
         char name[GB_AUDIO_MANAGER_MODULE_NAME_LEN];
-        int slot;
         int vid;
         int pid;
-        int cport;
+        int intf_id;
         unsigned int ip_devices;
         unsigned int op_devices;
 };
diff --git a/drivers/staging/greybus/audio_manager_module.c b/drivers/staging/greybus/audio_manager_module.c
index a10e96ad79c1..adc16977452d 100644
--- a/drivers/staging/greybus/audio_manager_module.c
+++ b/drivers/staging/greybus/audio_manager_module.c
@@ -81,16 +81,6 @@ static ssize_t gb_audio_module_name_show(
 static struct gb_audio_manager_module_attribute gb_audio_module_name_attribute =
         __ATTR(name, 0664, gb_audio_module_name_show, NULL);
 
-static ssize_t gb_audio_module_slot_show(
-        struct gb_audio_manager_module *module,
-        struct gb_audio_manager_module_attribute *attr, char *buf)
-{
-        return sprintf(buf, "%d", module->desc.slot);
-}
-
-static struct gb_audio_manager_module_attribute gb_audio_module_slot_attribute =
-        __ATTR(slot, 0664, gb_audio_module_slot_show, NULL);
-
 static ssize_t gb_audio_module_vid_show(
         struct gb_audio_manager_module *module,
         struct gb_audio_manager_module_attribute *attr, char *buf)
@@ -111,16 +101,16 @@ static ssize_t gb_audio_module_pid_show(
 static struct gb_audio_manager_module_attribute gb_audio_module_pid_attribute =
         __ATTR(pid, 0664, gb_audio_module_pid_show, NULL);
 
-static ssize_t gb_audio_module_cport_show(
+static ssize_t gb_audio_module_intf_id_show(
         struct gb_audio_manager_module *module,
         struct gb_audio_manager_module_attribute *attr, char *buf)
 {
-        return sprintf(buf, "%d", module->desc.cport);
+        return sprintf(buf, "%d", module->desc.intf_id);
 }
 
 static struct gb_audio_manager_module_attribute
-                                        gb_audio_module_cport_attribute =
-        __ATTR(cport, 0664, gb_audio_module_cport_show, NULL);
+                                        gb_audio_module_intf_id_attribute =
+        __ATTR(intf_id, 0664, gb_audio_module_intf_id_show, NULL);
 
 static ssize_t gb_audio_module_ip_devices_show(
         struct gb_audio_manager_module *module,
@@ -146,10 +136,9 @@ static struct gb_audio_manager_module_attribute
 
 static struct attribute *gb_audio_module_default_attrs[] = {
         &gb_audio_module_name_attribute.attr,
-        &gb_audio_module_slot_attribute.attr,
         &gb_audio_module_vid_attribute.attr,
         &gb_audio_module_pid_attribute.attr,
-        &gb_audio_module_cport_attribute.attr,
+        &gb_audio_module_intf_id_attribute.attr,
         &gb_audio_module_ip_devices_attribute.attr,
         &gb_audio_module_op_devices_attribute.attr,
         NULL,   /* need to NULL terminate the list of attributes */
@@ -164,29 +153,26 @@ static struct kobj_type gb_audio_module_type = {
 static void send_add_uevent(struct gb_audio_manager_module *module)
 {
         char name_string[128];
-        char slot_string[64];
         char vid_string[64];
         char pid_string[64];
-        char cport_string[64];
+        char intf_id_string[64];
         char ip_devices_string[64];
         char op_devices_string[64];
 
         char *envp[] = {
                 name_string,
-                slot_string,
                 vid_string,
                 pid_string,
-                cport_string,
+                intf_id_string,
                 ip_devices_string,
                 op_devices_string,
                 NULL
         };
 
         snprintf(name_string, 128, "NAME=%s", module->desc.name);
-        snprintf(slot_string, 64, "SLOT=%d", module->desc.slot);
         snprintf(vid_string, 64, "VID=%d", module->desc.vid);
         snprintf(pid_string, 64, "PID=%d", module->desc.pid);
-        snprintf(cport_string, 64, "CPORT=%d", module->desc.cport);
+        snprintf(intf_id_string, 64, "INTF_ID=%d", module->desc.intf_id);
         snprintf(ip_devices_string, 64, "I/P DEVICES=0x%X",
                  module->desc.ip_devices);
         snprintf(op_devices_string, 64, "O/P DEVICES=0x%X",
@@ -246,13 +232,12 @@ int gb_audio_manager_module_create(
 
 void gb_audio_manager_module_dump(struct gb_audio_manager_module *module)
 {
-        pr_info("audio module #%d name=%s slot=%d vid=%d pid=%d cport=%d i/p devices=0x%X o/p devices=0x%X\n",
+        pr_info("audio module #%d name=%s vid=%d pid=%d intf_id=%d i/p devices=0x%X o/p devices=0x%X\n",
                 module->id,
                 module->desc.name,
-                module->desc.slot,
                 module->desc.vid,
                 module->desc.pid,
-                module->desc.cport,
+                module->desc.intf_id,
                 module->desc.ip_devices,
                 module->desc.op_devices);
 }
diff --git a/drivers/staging/greybus/audio_manager_sysfs.c b/drivers/staging/greybus/audio_manager_sysfs.c
index d8bf8591ff9e..34ebd147052f 100644
--- a/drivers/staging/greybus/audio_manager_sysfs.c
+++ b/drivers/staging/greybus/audio_manager_sysfs.c
@@ -20,10 +20,9 @@ static ssize_t manager_sysfs_add_store(
 
         int num = sscanf(buf,
                         "name=%" GB_AUDIO_MANAGER_MODULE_NAME_LEN_SSCANF "s "
-                        "slot=%d vid=%d pid=%d cport=%d i/p devices=0x%X"
-                        "o/p devices=0x%X",
-                        desc.name, &desc.slot, &desc.vid, &desc.pid,
-                        &desc.cport, &desc.ip_devices, &desc.op_devices);
+                        "vid=%d pid=%d intf_id=%d i/p devices=0x%X o/p devices=0x%X",
+                        desc.name, &desc.vid, &desc.pid, &desc.intf_id,
+                        &desc.ip_devices, &desc.op_devices);
 
         if (num != 7)
                 return -EINVAL;
@@ -44,7 +43,7 @@ static ssize_t manager_sysfs_remove_store(
 {
         int id;
 
-        int num = sscanf(buf, "%d", &id);
+        int num = kstrtoint(buf, 10, &id);
 
         if (num != 1)
                 return -EINVAL;
@@ -65,16 +64,17 @@ static ssize_t manager_sysfs_dump_store(
 {
         int id;
 
-        int num = sscanf(buf, "%d", &id);
+        int num = kstrtoint(buf, 10, &id);
 
         if (num == 1) {
                 num = gb_audio_manager_dump_module(id);
                 if (num)
                         return num;
-        } else if (!strncmp("all", buf, 3))
+        } else if (!strncmp("all", buf, 3)) {
                 gb_audio_manager_dump_all();
-        else
+        } else {
                 return -EINVAL;
+        }
 
         return count;
 }
diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c
index ae1c0fa85752..17a9948b1ba1 100644
--- a/drivers/staging/greybus/audio_module.c
+++ b/drivers/staging/greybus/audio_module.c
@@ -207,10 +207,8 @@ static int gb_audio_add_data_connection(struct gbaudio_module_info *gbmodule,
         struct gbaudio_data_connection *dai;
 
         dai = devm_kzalloc(gbmodule->dev, sizeof(*dai), GFP_KERNEL);
-        if (!dai) {
-                dev_err(gbmodule->dev, "DAI Malloc failure\n");
+        if (!dai)
                 return -ENOMEM;
-        }
 
         connection = gb_connection_create_offloaded(bundle,
                                         le16_to_cpu(cport_desc->id),
@@ -345,10 +343,9 @@ static int gb_audio_probe(struct gb_bundle *bundle,
         dev_dbg(dev, "Inform set_event:%d to above layer\n", 1);
         /* prepare for the audio manager */
         strlcpy(desc.name, gbmodule->name, GB_AUDIO_MANAGER_MODULE_NAME_LEN);
-        desc.slot = 1; /* todo */
         desc.vid = 2; /* todo */
         desc.pid = 3; /* todo */
-        desc.cport = gbmodule->dev_id;
+        desc.intf_id = gbmodule->dev_id;
         desc.op_devices = gbmodule->op_devices;
         desc.ip_devices = gbmodule->ip_devices;
         gbmodule->manager_id = gb_audio_manager_add(&desc);
diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c
index b6251691a33d..8b216ca99cf9 100644
--- a/drivers/staging/greybus/audio_topology.c
+++ b/drivers/staging/greybus/audio_topology.c
@@ -114,6 +114,7 @@ static int gbaudio_map_widgetname(struct gbaudio_module_info *module,
                                   const char *name)
 {
         struct gbaudio_widget *widget;
+
         list_for_each_entry(widget, &module->widget_list, list) {
                 if (!strncmp(widget->name, name, NAME_SIZE))
                         return widget->id;
@@ -1044,8 +1045,10 @@ static int gbaudio_tplg_create_widget(struct gbaudio_module_info *module,
                         control->texts = (const char * const *)
                                 gb_generate_enum_strings(module, gbenum);
                         control->items = gbenum->items;
-                } else
+                } else {
                         csize = sizeof(struct gb_audio_control);
+                }
+
                 *w_size += csize;
                 curr = (void *)curr + csize;
                 list_add(&control->list, &module->widget_ctl_list);
@@ -1190,8 +1193,9 @@ static int gbaudio_tplg_process_kcontrols(struct gbaudio_module_info *module,
                         control->texts = (const char * const *)
                                 gb_generate_enum_strings(module, gbenum);
                         control->items = gbenum->items;
-                } else
+                } else {
                         csize = sizeof(struct gb_audio_control);
+                }
 
                 list_add(&control->list, &module->ctl_list);
                 dev_dbg(module->dev, "%d:%s created of type %d\n", curr->id,
diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c
index 491bdd720c0c..1c5b41ae6774 100644
--- a/drivers/staging/greybus/camera.c
+++ b/drivers/staging/greybus/camera.c
@@ -289,6 +289,7 @@ static const int gb_camera_configure_streams_validate_response(
 
         for (i = 0; i < resp->num_streams; i++) {
                 struct gb_camera_stream_config_response *cfg = &resp->config[i];
+
                 if (cfg->padding) {
                         gcam_err(gcam, "stream #%u padding != 0\n", i);
                         return -EIO;
@@ -796,7 +797,7 @@ static int gb_camera_op_configure_streams(void *priv, unsigned int *nstreams,
         if (gb_nstreams > GB_CAMERA_MAX_STREAMS)
                 return -EINVAL;
 
-        gb_streams = kzalloc(gb_nstreams * sizeof(*gb_streams), GFP_KERNEL);
+        gb_streams = kcalloc(gb_nstreams, sizeof(*gb_streams), GFP_KERNEL);
         if (!gb_streams)
                 return -ENOMEM;
 
@@ -937,7 +938,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam,
                 return ret;
 
         /* For each stream to configure parse width, height and format */
-        streams = kzalloc(nstreams * sizeof(*streams), GFP_KERNEL);
+        streams = kcalloc(nstreams, sizeof(*streams), GFP_KERNEL);
         if (!streams)
                 return -ENOMEM;
 
@@ -1118,7 +1119,7 @@ static ssize_t gb_camera_debugfs_write(struct file *file,
         char *kbuf;
 
         if (len > 1024)
-               return -EINVAL;
+                return -EINVAL;
 
         kbuf = kmalloc(len + 1, GFP_KERNEL);
         if (!kbuf)
diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index baab460eeaa3..f1d256df06d5 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -175,10 +175,9 @@ static int output_sync(struct es2_ap_dev *es2, void *req, u16 size, u8 cmd)
         u8 *data;
         int retval;
 
-        data = kmalloc(size, GFP_KERNEL);
+        data = kmemdup(req, size, GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
-        memcpy(data, req, size);
 
         retval = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                                  cmd,
@@ -1034,7 +1033,7 @@ static struct arpc *arpc_alloc(void *payload, u16 size, u8 type)
                 goto err_free_req;
 
         rpc->req->type = type;
-        rpc->req->size = cpu_to_le16(sizeof(rpc->req) + size);
+        rpc->req->size = cpu_to_le16(sizeof(*rpc->req) + size);
         memcpy(rpc->req->data, payload, size);
 
         init_completion(&rpc->response_received);
diff --git a/drivers/staging/greybus/log.c b/drivers/staging/greybus/log.c
index 70dd9e5a1cf2..1a18ab1ff8aa 100644
--- a/drivers/staging/greybus/log.c
+++ b/drivers/staging/greybus/log.c
@@ -55,8 +55,10 @@ static int gb_log_request_handler(struct gb_operation *op)
         /* Ensure the buffer is 0 terminated */
         receive->msg[len - 1] = '\0';
 
-        /* Print with dev_dbg() so that it can be easily turned off using
-         * dynamic debugging (and prevent any DoS) */
+        /*
+         * Print with dev_dbg() so that it can be easily turned off using
+         * dynamic debugging (and prevent any DoS)
+         */
         dev_dbg(dev, "%s", receive->msg);
 
         return 0;
diff --git a/drivers/staging/greybus/sdio.c b/drivers/staging/greybus/sdio.c
index 5649ef1e379d..66b37ea29ef0 100644
--- a/drivers/staging/greybus/sdio.c
+++ b/drivers/staging/greybus/sdio.c
@@ -191,9 +191,8 @@ static int _gb_sdio_process_events(struct gb_sdio_host *host, u8 event)
                 state_changed = 1;
         }
 
-        if (event & GB_SDIO_WP) {
+        if (event & GB_SDIO_WP)
                 host->read_only = true;
-        }
 
         if (state_changed) {
                 dev_info(mmc_dev(host->mmc), "card %s now event\n",
diff --git a/drivers/staging/greybus/timesync.c b/drivers/staging/greybus/timesync.c
index 2e68af7dea6d..e586627f4bbc 100644
--- a/drivers/staging/greybus/timesync.c
+++ b/drivers/staging/greybus/timesync.c
@@ -807,11 +807,11 @@ static int gb_timesync_schedule(struct gb_timesync_svc *timesync_svc, int state)
                 return -EINVAL;
 
         mutex_lock(&timesync_svc->mutex);
-        if (timesync_svc->state !=  GB_TIMESYNC_STATE_INVALID) {
+        if (timesync_svc->state !=  GB_TIMESYNC_STATE_INVALID)
                 gb_timesync_set_state_atomic(timesync_svc, state);
-        } else {
+        else
                 ret = -ENODEV;
-        }
+
         mutex_unlock(&timesync_svc->mutex);
         return ret;
 }
diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index 2633d2bfb1b4..6d39f4a04754 100644
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -623,9 +623,6 @@ static int get_serial_info(struct gb_tty *gb_tty,
 {
         struct serial_struct tmp;
 
-        if (!info)
-                return -EINVAL;
-
         memset(&tmp, 0, sizeof(tmp));
         tmp.flags = ASYNC_LOW_LATENCY | ASYNC_SKIP_TEST;
         tmp.type = PORT_16550A;
@@ -711,25 +708,20 @@ static int wait_serial_change(struct gb_tty *gb_tty, unsigned long arg)
         return retval;
 }
 
-static int get_serial_usage(struct gb_tty *gb_tty,
-                            struct serial_icounter_struct __user *count)
+static int gb_tty_get_icount(struct tty_struct *tty,
+                             struct serial_icounter_struct *icount)
 {
-        struct serial_icounter_struct icount;
-        int retval = 0;
-
-        memset(&icount, 0, sizeof(icount));
-        icount.dsr = gb_tty->iocount.dsr;
-        icount.rng = gb_tty->iocount.rng;
-        icount.dcd = gb_tty->iocount.dcd;
-        icount.frame = gb_tty->iocount.frame;
-        icount.overrun = gb_tty->iocount.overrun;
-        icount.parity = gb_tty->iocount.parity;
-        icount.brk = gb_tty->iocount.brk;
+        struct gb_tty *gb_tty = tty->driver_data;
 
-        if (copy_to_user(count, &icount, sizeof(icount)) > 0)
-                retval = -EFAULT;
+        icount->dsr = gb_tty->iocount.dsr;
+        icount->rng = gb_tty->iocount.rng;
+        icount->dcd = gb_tty->iocount.dcd;
+        icount->frame = gb_tty->iocount.frame;
+        icount->overrun = gb_tty->iocount.overrun;
+        icount->parity = gb_tty->iocount.parity;
+        icount->brk = gb_tty->iocount.brk;
 
-        return retval;
+        return 0;
 }
 
 static int gb_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
@@ -746,9 +738,6 @@ static int gb_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
                                        (struct serial_struct __user *)arg);
         case TIOCMIWAIT:
                 return wait_serial_change(gb_tty, arg);
-        case TIOCGICOUNT:
-                return get_serial_usage(gb_tty,
-                                        (struct serial_icounter_struct __user *)arg);
         }
 
         return -ENOIOCTLCMD;
@@ -830,9 +819,10 @@ static const struct tty_operations gb_ops = {
         .set_termios =          gb_tty_set_termios,
         .tiocmget =             gb_tty_tiocmget,
         .tiocmset =             gb_tty_tiocmset,
+        .get_icount =           gb_tty_get_icount,
 };
 
-static struct tty_port_operations gb_port_ops = {
+static const struct tty_port_operations gb_port_ops = {
         .dtr_rts =              gb_tty_dtr_rts,
         .activate =             gb_tty_port_activate,
         .shutdown =             gb_tty_port_shutdown,
diff --git a/drivers/staging/gs_fpgaboot/gs_fpgaboot.c b/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
index 8ed4d395be58..19b550fff04b 100644
--- a/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
+++ b/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
@@ -38,7 +38,7 @@ static u8 bits_magic[] = {
 static struct platform_device   *firmware_pdev;
 
 static char     *file = "xlinx_fpga_firmware.bit";
-module_param(file, charp, S_IRUGO);
+module_param(file, charp, 0444);
 MODULE_PARM_DESC(file, "Xilinx FPGA firmware file.");
 
 static void read_bitstream(char *bitdata, char *buf, int *offset, int rdsize)
diff --git a/drivers/staging/i4l/act2000/act2000_isa.c b/drivers/staging/i4l/act2000/act2000_isa.c
index ad7a0391369f..76ff5de65781 100644
--- a/drivers/staging/i4l/act2000/act2000_isa.c
+++ b/drivers/staging/i4l/act2000/act2000_isa.c
@@ -259,6 +259,7 @@ act2000_isa_receive(act2000_card *card)
                                                "act2000_isa_receive: Invalid CAPI msg\n");
                                         {
                                                 int i; __u8 *p; __u8 *t; __u8 tmp[30];
+
                                                 for (i = 0, p = (__u8 *)&card->idat.isa.rcvhdr, t = tmp; i < 8; i++)
                                                         t += sprintf(t, "%02x ", *(p++));
                                                 printk(KERN_WARNING "act2000_isa_receive: %s\n", tmp);
diff --git a/drivers/staging/i4l/act2000/capi.c b/drivers/staging/i4l/act2000/capi.c
index 62f56294853c..61386a78fb91 100644
--- a/drivers/staging/i4l/act2000/capi.c
+++ b/drivers/staging/i4l/act2000/capi.c
@@ -99,7 +99,7 @@ actcapi_chkhdr(act2000_card *card, actcapi_msghdr *hdr)
         for (i = 0; i < num_valid_imsg; i++)
                 if ((hdr->cmd.cmd == valid_msg[i].cmd.cmd) &&
                     (hdr->cmd.subcmd == valid_msg[i].cmd.subcmd)) {
-                        return (i ? 1 : 2);
+                        return i ? 1 : 2;
                 }
         return 0;
 }
@@ -506,6 +506,7 @@ static int
 new_plci(act2000_card *card, __u16 plci)
 {
         int i;
+
         for (i = 0; i < ACT2000_BCH; i++)
                 if (card->bch[i].plci == 0x8000) {
                         card->bch[i].plci = plci;
@@ -518,6 +519,7 @@ static int
 find_plci(act2000_card *card, __u16 plci)
 {
         int i;
+
         for (i = 0; i < ACT2000_BCH; i++)
                 if (card->bch[i].plci == plci)
                         return i;
@@ -528,6 +530,7 @@ static int
 find_ncci(act2000_card *card, __u16 ncci)
 {
         int i;
+
         for (i = 0; i < ACT2000_BCH; i++)
                 if (card->bch[i].ncci == ncci)
                         return i;
@@ -538,6 +541,7 @@ static int
 find_dialing(act2000_card *card, __u16 callref)
 {
         int i;
+
         for (i = 0; i < ACT2000_BCH; i++)
                 if ((card->bch[i].callref == callref) &&
                     (card->bch[i].fsm_state == ACT2000_STATE_OCALL))
@@ -1088,6 +1092,7 @@ actcapi_debug_msg(struct sk_buff *skb, int direction)
                         int l = msg->hdr.len - 12;
                         int j;
                         char *p = tmp;
+
                         for (j = 0; j < l; j++)
                                 p += sprintf(p, "%02x ", msg->msg.info_ind.el.display[j]);
                         printk(KERN_DEBUG " D = '%s'\n", tmp);
diff --git a/drivers/staging/i4l/act2000/module.c b/drivers/staging/i4l/act2000/module.c
index 99c9c0a1c63e..6aa120319e52 100644
--- a/drivers/staging/i4l/act2000/module.c
+++ b/drivers/staging/i4l/act2000/module.c
@@ -19,8 +19,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 
-static unsigned short act2000_isa_ports[] =
-{
+static unsigned short act2000_isa_ports[] = {
         0x0200, 0x0240, 0x0280, 0x02c0, 0x0300, 0x0340, 0x0380,
         0xcfe0, 0xcfa0, 0xcf60, 0xcf20, 0xcee0, 0xcea0, 0xce60,
 };
@@ -95,7 +94,7 @@ act2000_find_msn(act2000_card *card, char *msn, int ia5)
                 p = p->next;
         }
         if (!ia5)
-                return (1 << (eaz - '0'));
+                return 1 << (eaz - '0');
         else
                 return eaz;
 }
@@ -111,10 +110,10 @@ act2000_find_eaz(act2000_card *card, char eaz)
 
         while (p) {
                 if (p->eaz == eaz)
-                        return (p->msn);
+                        return p->msn;
                 p = p->next;
         }
-        return ("\0");
+        return "\0";
 }
 
 /*
@@ -293,7 +292,7 @@ act2000_command(act2000_card *card, isdn_ctrl *c)
                         if (ret)
                                 return ret;
                         if (card->flags & ACT2000_FLAGS_RUNNING)
-                                return (actcapi_manufacturer_req_msn(card));
+                                return actcapi_manufacturer_req_msn(card);
                         return 0;
                 case ACT2000_IOCTL_ADDCARD:
                         if (copy_from_user(&cdef, arg,
@@ -377,6 +376,7 @@ act2000_command(act2000_card *card, isdn_ctrl *c)
                         }
                         if (card->ptype == ISDN_PTYPE_1TR6) {
                                 int i;
+
                                 chan->eazmask = 0;
                                 for (i = 0; i < strlen(c->parm.num); i++)
                                         if (isdigit(c->parm.num[i]))
@@ -512,7 +512,7 @@ if_command(isdn_ctrl *c)
         act2000_card *card = act2000_findcard(c->driver);
 
         if (card)
-                return (act2000_command(card, c));
+                return act2000_command(card, c);
         printk(KERN_ERR
                "act2000: if_command %d called with invalid driverId %d!\n",
                c->command, c->driver);
@@ -527,7 +527,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel)
         if (card) {
                 if (!(card->flags & ACT2000_FLAGS_RUNNING))
                         return -ENODEV;
-                return (len);
+                return len;
         }
         printk(KERN_ERR
                "act2000: if_writecmd called with invalid driverId!\n");
@@ -542,7 +542,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel)
         if (card) {
                 if (!(card->flags & ACT2000_FLAGS_RUNNING))
                         return -ENODEV;
-                return (act2000_readstatus(buf, len, card));
+                return act2000_readstatus(buf, len, card);
         }
         printk(KERN_ERR
                "act2000: if_readstatus called with invalid driverId!\n");
@@ -557,7 +557,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb)
         if (card) {
                 if (!(card->flags & ACT2000_FLAGS_RUNNING))
                         return -ENODEV;
-                return (act2000_sendbuf(card, channel, ack, skb));
+                return act2000_sendbuf(card, channel, ack, skb);
         }
         printk(KERN_ERR
                "act2000: if_sendbuf called with invalid driverId!\n");
@@ -574,6 +574,7 @@ act2000_alloccard(int bus, int port, int irq, char *id)
 {
         int i;
         act2000_card *card;
+
         if (!(card = kzalloc(sizeof(act2000_card), GFP_KERNEL))) {
                 printk(KERN_WARNING
                        "act2000: (%s) Could not allocate card-struct.\n", id);
@@ -776,7 +777,7 @@ act2000_addcard(int bus, int port, int irq, char *id)
                         failed++;
                 }
         }
-        return (added - failed);
+        return added - failed;
 }
 
 #define DRIVERNAME "IBM Active 2000 ISDN driver"
@@ -795,6 +796,7 @@ static void __exit act2000_exit(void)
 {
         act2000_card *card = cards;
         act2000_card *last;
+
         while (card) {
                 unregister_card(card);
                 del_timer_sync(&card->ptimer);
diff --git a/drivers/staging/i4l/icn/icn.c b/drivers/staging/i4l/icn/icn.c
index 514bfc2c5b53..3750ba38adc5 100644
--- a/drivers/staging/i4l/icn/icn.c
+++ b/drivers/staging/i4l/icn/icn.c
@@ -411,8 +411,7 @@ typedef struct icn_stat {
         int action;
 } icn_stat;
 /* *INDENT-OFF* */
-static icn_stat icn_stat_table[] =
-{
+static icn_stat icn_stat_table[] = {
         {"BCON_",          ISDN_STAT_BCONN, 1}, /* B-Channel connected        */
         {"BDIS_",          ISDN_STAT_BHUP,  2}, /* B-Channel disconnected     */
         /*
diff --git a/drivers/staging/i4l/icn/icn.h b/drivers/staging/i4l/icn/icn.h
index f8f2e76d34bf..07e2e0196527 100644
--- a/drivers/staging/i4l/icn/icn.h
+++ b/drivers/staging/i4l/icn/icn.h
@@ -54,7 +54,7 @@ typedef struct icn_cdef {
 
 /* some useful macros for debugging */
 #ifdef ICN_DEBUG_PORT
-#define OUTB_P(v, p) {printk(KERN_DEBUG "icn: outb_p(0x%02x,0x%03x)\n", v, p); outb_p(v, p);}
+#define OUTB_P(v, p) {pr_debug("icn: outb_p(0x%02x,0x%03x)\n", v, p); outb_p(v, p);}
 #else
 #define OUTB_P outb
 #endif
@@ -186,8 +186,7 @@ typedef icn_dev *icn_devptr;
 #ifdef __KERNEL__
 
 static icn_card *cards = (icn_card *) 0;
-static u_char chan2bank[] =
-{0, 4, 8, 12};                  /* for icn_map_channel() */
+static u_char chan2bank[] = {0, 4, 8, 12};                  /* for icn_map_channel() */
 
 static icn_dev dev;
 
diff --git a/drivers/staging/i4l/pcbit/callbacks.c b/drivers/staging/i4l/pcbit/callbacks.c
index efb6d6a3639a..212ab0b229d4 100644
--- a/drivers/staging/i4l/pcbit/callbacks.c
+++ b/drivers/staging/i4l/pcbit/callbacks.c
@@ -22,7 +22,7 @@
 #include <linux/mm.h>
 #include <linux/skbuff.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <linux/isdnif.h>
 
diff --git a/drivers/staging/i4l/pcbit/capi.c b/drivers/staging/i4l/pcbit/capi.c
index 373f90feda5a..a6c4e00dc726 100644
--- a/drivers/staging/i4l/pcbit/capi.c
+++ b/drivers/staging/i4l/pcbit/capi.c
@@ -27,7 +27,6 @@
  *              encode our number in CallerPN and ConnectedPN
  */
 
-#include <linux/string.h>
 #include <linux/kernel.h>
 
 #include <linux/types.h>
@@ -36,8 +35,8 @@
 
 #include <linux/skbuff.h>
 
-#include <asm/io.h>
-#include <asm/string.h>
+#include <linux/io.h>
+#include <linux/string.h>
 
 #include <linux/isdnif.h>
 
diff --git a/drivers/staging/i4l/pcbit/drv.c b/drivers/staging/i4l/pcbit/drv.c
index d417df5efb5f..89b0b5b94ce5 100644
--- a/drivers/staging/i4l/pcbit/drv.c
+++ b/drivers/staging/i4l/pcbit/drv.c
@@ -27,12 +27,11 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
-#include <linux/string.h>
 #include <linux/skbuff.h>
 
 #include <linux/isdnif.h>
-#include <asm/string.h>
-#include <asm/io.h>
+#include <linux/string.h>
+#include <linux/io.h>
 #include <linux/ioport.h>
 
 #include "pcbit.h"
diff --git a/drivers/staging/i4l/pcbit/edss1.c b/drivers/staging/i4l/pcbit/edss1.c
index 6d291d548423..5980d1b5da95 100644
--- a/drivers/staging/i4l/pcbit/edss1.c
+++ b/drivers/staging/i4l/pcbit/edss1.c
@@ -23,7 +23,7 @@
 #include <linux/skbuff.h>
 
 #include <linux/timer.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <linux/isdnif.h>
 
diff --git a/drivers/staging/i4l/pcbit/layer2.c b/drivers/staging/i4l/pcbit/layer2.c
index a136c72547e5..0592bf6ee9c9 100644
--- a/drivers/staging/i4l/pcbit/layer2.c
+++ b/drivers/staging/i4l/pcbit/layer2.c
@@ -36,7 +36,7 @@
 
 #include <linux/isdnif.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 
 
 #include "pcbit.h"
diff --git a/drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2583 b/drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2583
deleted file mode 100644
index 470f7ad9c073..000000000000
--- a/drivers/staging/iio/Documentation/light/sysfs-bus-iio-light-tsl2583
+++ /dev/null
@@ -1,6 +0,0 @@
-What:           /sys/bus/iio/devices/device[n]/in_illuminance0_calibrate
-KernelVersion:  2.6.37
-Contact:        linux-iio@vger.kernel.org
-Description:
-                This property causes an internal calibration of the als gain trim
-                value which is later used in calculating illuminance in lux.
diff --git a/drivers/staging/iio/TODO b/drivers/staging/iio/TODO
index 93a896883e37..4922402e2e98 100644
--- a/drivers/staging/iio/TODO
+++ b/drivers/staging/iio/TODO
@@ -1,76 +1,8 @@
-2009 8/18
-
-Core:
-1) Get reviews
-2) Additional testing
-3) Ensure all desirable features present by adding more devices.
-   Major changes not expected except in response to comments
-
-Max1363 core:
-1) Possibly add sysfs exports of constant useful to userspace.
-Would be nice
-2) Support hardware generated interrupts
-3) Expand device set. Lots of other maxim adc's have very
-   similar interfaces.
-
-MXS LRADC driver:
-This is a classic MFD device as it combines the following subdevices
- - touchscreen controller (input subsystem related device)
- - general purpose ADC channels
- - battery voltage monitor (power subsystem related device)
- - die temperature monitor (thermal management)
-
-At least the battery voltage and die temperature feature is required in-kernel
-by a driver of the SoC's battery charging unit to avoid any damage to the
-silicon and the battery.
-
-TSL2561
-Would be nice
-1) Open question of userspace vs kernel space balance when
-converting to useful light measurements from device ones.
-2) Add sysfs elements necessary to allow device agnostic
-unit conversion.
-
-LIS3L02DQ core
-
-LIS3L02DQ ring
-
-KXSD9
-Currently minimal driver, would be nice to add:
-1) Support for all chip generated interrupts (events),
-basically get support up to level of lis3l02dq driver.
-
-Ring buffer core
-
-SCA3000
-Would be nice
-1) Testing on devices other than sca3000-e05
-
-Trigger core support
-1) Discussion of approach. Is it general enough?
-
-Ring Buffer:
-1) Discussion of approach.
-There are probably better ways of doing this. The
-intention is to allow for more than one software ring
-buffer implementation as different users will have
-different requirements.  This one suits mid range
-frequencies (100Hz - 4kHz).
-2) Lots of testing
-
-GPIO trigger
-1) Add control over the type of interrupt etc.  This will
-necessitate a header that is also visible from arch board
-files. (avoided at the moment to keep the driver set
-contained in staging).
+2016 10/09
 
 ADI Drivers:
 CC the device-drivers-devel@blackfin.uclinux.org mailing list when
 e-mailing the normal IIO list (see below).
 
-Documentation
-1) Lots of cleanup and expansion.
-2) Some device require individual docs.
-
 Contact: Jonathan Cameron <jic23@kernel.org>.
 Mailing list: linux-iio@vger.kernel.org
diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig
index 1c994b57c7d2..c6b0f5eae7ab 100644
--- a/drivers/staging/iio/accel/Kconfig
+++ b/drivers/staging/iio/accel/Kconfig
@@ -51,14 +51,4 @@ config ADIS16240
           To compile this driver as a module, say M here: the module will be
           called adis16240.
 
-config SCA3000
-        depends on IIO_BUFFER
-        depends on SPI
-        tristate "VTI SCA3000 series accelerometers"
-        help
-          Say Y here to build support for the VTI SCA3000 series of SPI
-          accelerometers. These devices use a hardware ring buffer.
-
-          To compile this driver as a module, say M here: the module will be
-          called sca3000.
 endmenu
diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile
index 1810a434a755..febb137b60c4 100644
--- a/drivers/staging/iio/accel/Makefile
+++ b/drivers/staging/iio/accel/Makefile
@@ -13,6 +13,3 @@ obj-$(CONFIG_ADIS16209) += adis16209.o
 
 adis16240-y             := adis16240_core.o
 obj-$(CONFIG_ADIS16240) += adis16240.o
-
-sca3000-y               := sca3000_core.o sca3000_ring.o
-obj-$(CONFIG_SCA3000)   += sca3000.o
diff --git a/drivers/staging/iio/accel/sca3000.h b/drivers/staging/iio/accel/sca3000.h
deleted file mode 100644
index 4dcc8575cbe3..000000000000
--- a/drivers/staging/iio/accel/sca3000.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * sca3000.c -- support VTI sca3000 series accelerometers
- *              via SPI
- *
- * Copyright (c) 2007 Jonathan Cameron <jic23@kernel.org>
- *
- * Partly based upon tle62x0.c
- *
- * 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.
- *
- * Initial mode is direct measurement.
- *
- * Untested things
- *
- * Temperature reading (the e05 I'm testing with doesn't have a sensor)
- *
- * Free fall detection mode - supported but untested as I'm not droping my
- * dubious wire rig far enough to test it.
- *
- * Unsupported as yet
- *
- * Time stamping of data from ring. Various ideas on how to do this but none
- * are remotely simple. Suggestions welcome.
- *
- * Individual enabling disabling of channels going into ring buffer
- *
- * Overflow handling (this is signaled for all but 8 bit ring buffer mode.)
- *
- * Motion detector using AND combinations of signals.
- *
- * Note: Be very careful about not touching an register bytes marked
- * as reserved on the data sheet. They really mean it as changing convents of
- * some will cause the device to lock up.
- *
- * Known issues - on rare occasions the interrupts lock up. Not sure why as yet.
- * Can probably alleviate this by reading the interrupt register on start, but
- * that is really just brushing the problem under the carpet.
- */
-#ifndef _SCA3000
-#define _SCA3000
-
-#define SCA3000_WRITE_REG(a) (((a) << 2) | 0x02)
-#define SCA3000_READ_REG(a) ((a) << 2)
-
-#define SCA3000_REG_ADDR_REVID                  0x00
-#define SCA3000_REVID_MAJOR_MASK                0xf0
-#define SCA3000_REVID_MINOR_MASK                0x0f
-
-#define SCA3000_REG_ADDR_STATUS                 0x02
-#define SCA3000_LOCKED                          0x20
-#define SCA3000_EEPROM_CS_ERROR                 0x02
-#define SCA3000_SPI_FRAME_ERROR                 0x01
-
-/* All reads done using register decrement so no need to directly access LSBs */
-#define SCA3000_REG_ADDR_X_MSB                  0x05
-#define SCA3000_REG_ADDR_Y_MSB                  0x07
-#define SCA3000_REG_ADDR_Z_MSB                  0x09
-
-#define SCA3000_REG_ADDR_RING_OUT               0x0f
-
-/* Temp read untested - the e05 doesn't have the sensor */
-#define SCA3000_REG_ADDR_TEMP_MSB               0x13
-
-#define SCA3000_REG_ADDR_MODE                   0x14
-#define SCA3000_MODE_PROT_MASK                  0x28
-
-#define SCA3000_RING_BUF_ENABLE                 0x80
-#define SCA3000_RING_BUF_8BIT                   0x40
-/*
- * Free fall detection triggers an interrupt if the acceleration
- * is below a threshold for equivalent of 25cm drop
- */
-#define SCA3000_FREE_FALL_DETECT                0x10
-#define SCA3000_MEAS_MODE_NORMAL                0x00
-#define SCA3000_MEAS_MODE_OP_1                  0x01
-#define SCA3000_MEAS_MODE_OP_2                  0x02
-
-/*
- * In motion detection mode the accelerations are band pass filtered
- * (approx 1 - 25Hz) and then a programmable threshold used to trigger
- * and interrupt.
- */
-#define SCA3000_MEAS_MODE_MOT_DET               0x03
-
-#define SCA3000_REG_ADDR_BUF_COUNT              0x15
-
-#define SCA3000_REG_ADDR_INT_STATUS             0x16
-
-#define SCA3000_INT_STATUS_THREE_QUARTERS       0x80
-#define SCA3000_INT_STATUS_HALF                 0x40
-
-#define SCA3000_INT_STATUS_FREE_FALL            0x08
-#define SCA3000_INT_STATUS_Y_TRIGGER            0x04
-#define SCA3000_INT_STATUS_X_TRIGGER            0x02
-#define SCA3000_INT_STATUS_Z_TRIGGER            0x01
-
-/* Used to allow access to multiplexed registers */
-#define SCA3000_REG_ADDR_CTRL_SEL               0x18
-/* Only available for SCA3000-D03 and SCA3000-D01 */
-#define SCA3000_REG_CTRL_SEL_I2C_DISABLE        0x01
-#define SCA3000_REG_CTRL_SEL_MD_CTRL            0x02
-#define SCA3000_REG_CTRL_SEL_MD_Y_TH            0x03
-#define SCA3000_REG_CTRL_SEL_MD_X_TH            0x04
-#define SCA3000_REG_CTRL_SEL_MD_Z_TH            0x05
-/*
- * BE VERY CAREFUL WITH THIS, IF 3 BITS ARE NOT SET the device
- * will not function
- */
-#define SCA3000_REG_CTRL_SEL_OUT_CTRL           0x0B
-#define SCA3000_OUT_CTRL_PROT_MASK              0xE0
-#define SCA3000_OUT_CTRL_BUF_X_EN               0x10
-#define SCA3000_OUT_CTRL_BUF_Y_EN               0x08
-#define SCA3000_OUT_CTRL_BUF_Z_EN               0x04
-#define SCA3000_OUT_CTRL_BUF_DIV_MASK           0x03
-#define SCA3000_OUT_CTRL_BUF_DIV_4              0x02
-#define SCA3000_OUT_CTRL_BUF_DIV_2              0x01
-
-/*
- * Control which motion detector interrupts are on.
- * For now only OR combinations are supported.
- */
-#define SCA3000_MD_CTRL_PROT_MASK               0xC0
-#define SCA3000_MD_CTRL_OR_Y                    0x01
-#define SCA3000_MD_CTRL_OR_X                    0x02
-#define SCA3000_MD_CTRL_OR_Z                    0x04
-/* Currently unsupported */
-#define SCA3000_MD_CTRL_AND_Y                   0x08
-#define SCA3000_MD_CTRL_AND_X                   0x10
-#define SAC3000_MD_CTRL_AND_Z                   0x20
-
-/*
- * Some control registers of complex access methods requiring this register to
- * be used to remove a lock.
- */
-#define SCA3000_REG_ADDR_UNLOCK                 0x1e
-
-#define SCA3000_REG_ADDR_INT_MASK               0x21
-#define SCA3000_INT_MASK_PROT_MASK              0x1C
-
-#define SCA3000_INT_MASK_RING_THREE_QUARTER     0x80
-#define SCA3000_INT_MASK_RING_HALF              0x40
-
-#define SCA3000_INT_MASK_ALL_INTS               0x02
-#define SCA3000_INT_MASK_ACTIVE_HIGH            0x01
-#define SCA3000_INT_MASK_ACTIVE_LOW             0x00
-
-/* Values of multiplexed registers (write to ctrl_data after select) */
-#define SCA3000_REG_ADDR_CTRL_DATA              0x22
-
-/*
- * Measurement modes available on some sca3000 series chips. Code assumes others
- * may become available in the future.
- *
- * Bypass - Bypass the low-pass filter in the signal channel so as to increase
- *          signal bandwidth.
- *
- * Narrow - Narrow low-pass filtering of the signal channel and half output
- *          data rate by decimation.
- *
- * Wide - Widen low-pass filtering of signal channel to increase bandwidth
- */
-#define SCA3000_OP_MODE_BYPASS                  0x01
-#define SCA3000_OP_MODE_NARROW                  0x02
-#define SCA3000_OP_MODE_WIDE                    0x04
-#define SCA3000_MAX_TX 6
-#define SCA3000_MAX_RX 2
-
-/**
- * struct sca3000_state - device instance state information
- * @us:                 the associated spi device
- * @info:                       chip variant information
- * @interrupt_handler_ws:       event interrupt handler for all events
- * @last_timestamp:             the timestamp of the last event
- * @mo_det_use_count:           reference counter for the motion detection unit
- * @lock:                       lock used to protect elements of sca3000_state
- *                              and the underlying device state.
- * @bpse:                       number of bits per scan element
- * @tx:                 dma-able transmit buffer
- * @rx:                 dma-able receive buffer
- **/
-struct sca3000_state {
-        struct spi_device               *us;
-        const struct sca3000_chip_info  *info;
-        struct work_struct              interrupt_handler_ws;
-        s64                             last_timestamp;
-        int                             mo_det_use_count;
-        struct mutex                    lock;
-        int                             bpse;
-        /* Can these share a cacheline ? */
-        u8                              rx[2] ____cacheline_aligned;
-        u8                              tx[6] ____cacheline_aligned;
-};
-
-/**
- * struct sca3000_chip_info - model dependent parameters
- * @scale:                      scale * 10^-6
- * @temp_output:                some devices have temperature sensors.
- * @measurement_mode_freq:      normal mode sampling frequency
- * @option_mode_1:              first optional mode. Not all models have one
- * @option_mode_1_freq:         option mode 1 sampling frequency
- * @option_mode_2:              second optional mode. Not all chips have one
- * @option_mode_2_freq:         option mode 2 sampling frequency
- *
- * This structure is used to hold information about the functionality of a given
- * sca3000 variant.
- **/
-struct sca3000_chip_info {
-        unsigned int            scale;
-        bool                    temp_output;
-        int                     measurement_mode_freq;
-        int                     option_mode_1;
-        int                     option_mode_1_freq;
-        int                     option_mode_2;
-        int                     option_mode_2_freq;
-        int                     mot_det_mult_xz[6];
-        int                     mot_det_mult_y[7];
-};
-
-int sca3000_read_data_short(struct sca3000_state *st,
-                            u8 reg_address_high,
-                            int len);
-
-/**
- * sca3000_write_reg() write a single register
- * @address:    address of register on chip
- * @val:        value to be written to register
- *
- * The main lock must be held.
- **/
-int sca3000_write_reg(struct sca3000_state *st, u8 address, u8 val);
-
-#ifdef CONFIG_IIO_BUFFER
-/**
- * sca3000_register_ring_funcs() setup the ring state change functions
- **/
-void sca3000_register_ring_funcs(struct iio_dev *indio_dev);
-
-/**
- * sca3000_configure_ring() - allocate and configure ring buffer
- * @indio_dev: iio-core device whose ring is to be configured
- *
- * The hardware ring buffer needs far fewer ring buffer functions than
- * a software one as a lot of things are handled automatically.
- * This function also tells the iio core that our device supports a
- * hardware ring buffer mode.
- **/
-int sca3000_configure_ring(struct iio_dev *indio_dev);
-
-/**
- * sca3000_unconfigure_ring() - deallocate the ring buffer
- * @indio_dev: iio-core device whose ring we are freeing
- **/
-void sca3000_unconfigure_ring(struct iio_dev *indio_dev);
-
-/**
- * sca3000_ring_int_process() handles ring related event pushing and escalation
- * @val:        the event code
- **/
-void sca3000_ring_int_process(u8 val, struct iio_buffer *ring);
-
-#else
-static inline void sca3000_register_ring_funcs(struct iio_dev *indio_dev)
-{
-}
-
-static inline
-int sca3000_register_ring_access_and_init(struct iio_dev *indio_dev)
-{
-        return 0;
-}
-
-static inline void sca3000_ring_int_process(u8 val, void *ring)
-{
-}
-
-#endif
-#endif /* _SCA3000 */
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
deleted file mode 100644
index 564b36d4f648..000000000000
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ /dev/null
@@ -1,1210 +0,0 @@
-/*
- * sca3000_core.c -- support VTI sca3000 series accelerometers via SPI
- *
- * 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.
- *
- * Copyright (c) 2009 Jonathan Cameron <jic23@kernel.org>
- *
- * See industrialio/accels/sca3000.h for comments.
- */
-
-#include <linux/interrupt.h>
-#include <linux/fs.h>
-#include <linux/device.h>
-#include <linux/slab.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/sysfs.h>
-#include <linux/module.h>
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-#include <linux/iio/events.h>
-#include <linux/iio/buffer.h>
-
-#include "sca3000.h"
-
-enum sca3000_variant {
-        d01,
-        e02,
-        e04,
-        e05,
-};
-
-/*
- * Note where option modes are not defined, the chip simply does not
- * support any.
- * Other chips in the sca3000 series use i2c and are not included here.
- *
- * Some of these devices are only listed in the family data sheet and
- * do not actually appear to be available.
- */
-static const struct sca3000_chip_info sca3000_spi_chip_info_tbl[] = {
-        [d01] = {
-                .scale = 7357,
-                .temp_output = true,
-                .measurement_mode_freq = 250,
-                .option_mode_1 = SCA3000_OP_MODE_BYPASS,
-                .option_mode_1_freq = 250,
-                .mot_det_mult_xz = {50, 100, 200, 350, 650, 1300},
-                .mot_det_mult_y = {50, 100, 150, 250, 450, 850, 1750},
-        },
-        [e02] = {
-                .scale = 9810,
-                .measurement_mode_freq = 125,
-                .option_mode_1 = SCA3000_OP_MODE_NARROW,
-                .option_mode_1_freq = 63,
-                .mot_det_mult_xz = {100, 150, 300, 550, 1050, 2050},
-                .mot_det_mult_y = {50, 100, 200, 350, 700, 1350, 2700},
-        },
-        [e04] = {
-                .scale = 19620,
-                .measurement_mode_freq = 100,
-                .option_mode_1 = SCA3000_OP_MODE_NARROW,
-                .option_mode_1_freq = 50,
-                .option_mode_2 = SCA3000_OP_MODE_WIDE,
-                .option_mode_2_freq = 400,
-                .mot_det_mult_xz = {200, 300, 600, 1100, 2100, 4100},
-                .mot_det_mult_y = {100, 200, 400, 7000, 1400, 2700, 54000},
-        },
-        [e05] = {
-                .scale = 61313,
-                .measurement_mode_freq = 200,
-                .option_mode_1 = SCA3000_OP_MODE_NARROW,
-                .option_mode_1_freq = 50,
-                .option_mode_2 = SCA3000_OP_MODE_WIDE,
-                .option_mode_2_freq = 400,
-                .mot_det_mult_xz = {600, 900, 1700, 3200, 6100, 11900},
-                .mot_det_mult_y = {300, 600, 1200, 2000, 4100, 7800, 15600},
-        },
-};
-
-int sca3000_write_reg(struct sca3000_state *st, u8 address, u8 val)
-{
-        st->tx[0] = SCA3000_WRITE_REG(address);
-        st->tx[1] = val;
-        return spi_write(st->us, st->tx, 2);
-}
-
-int sca3000_read_data_short(struct sca3000_state *st,
-                            u8 reg_address_high,
-                            int len)
-{
-        struct spi_transfer xfer[2] = {
-                {
-                        .len = 1,
-                        .tx_buf = st->tx,
-                }, {
-                        .len = len,
-                        .rx_buf = st->rx,
-                }
-        };
-        st->tx[0] = SCA3000_READ_REG(reg_address_high);
-
-        return spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));
-}
-
-/**
- * sca3000_reg_lock_on() test if the ctrl register lock is on
- *
- * Lock must be held.
- **/
-static int sca3000_reg_lock_on(struct sca3000_state *st)
-{
-        int ret;
-
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_STATUS, 1);
-        if (ret < 0)
-                return ret;
-
-        return !(st->rx[0] & SCA3000_LOCKED);
-}
-
-/**
- * __sca3000_unlock_reg_lock() unlock the control registers
- *
- * Note the device does not appear to support doing this in a single transfer.
- * This should only ever be used as part of ctrl reg read.
- * Lock must be held before calling this
- **/
-static int __sca3000_unlock_reg_lock(struct sca3000_state *st)
-{
-        struct spi_transfer xfer[3] = {
-                {
-                        .len = 2,
-                        .cs_change = 1,
-                        .tx_buf = st->tx,
-                }, {
-                        .len = 2,
-                        .cs_change = 1,
-                        .tx_buf = st->tx + 2,
-                }, {
-                        .len = 2,
-                        .tx_buf = st->tx + 4,
-                },
-        };
-        st->tx[0] = SCA3000_WRITE_REG(SCA3000_REG_ADDR_UNLOCK);
-        st->tx[1] = 0x00;
-        st->tx[2] = SCA3000_WRITE_REG(SCA3000_REG_ADDR_UNLOCK);
-        st->tx[3] = 0x50;
-        st->tx[4] = SCA3000_WRITE_REG(SCA3000_REG_ADDR_UNLOCK);
-        st->tx[5] = 0xA0;
-
-        return spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));
-}
-
-/**
- * sca3000_write_ctrl_reg() write to a lock protect ctrl register
- * @sel: selects which registers we wish to write to
- * @val: the value to be written
- *
- * Certain control registers are protected against overwriting by the lock
- * register and use a shared write address. This function allows writing of
- * these registers.
- * Lock must be held.
- **/
-static int sca3000_write_ctrl_reg(struct sca3000_state *st,
-                                  u8 sel,
-                                  uint8_t val)
-{
-        int ret;
-
-        ret = sca3000_reg_lock_on(st);
-        if (ret < 0)
-                goto error_ret;
-        if (ret) {
-                ret = __sca3000_unlock_reg_lock(st);
-                if (ret)
-                        goto error_ret;
-        }
-
-        /* Set the control select register */
-        ret = sca3000_write_reg(st, SCA3000_REG_ADDR_CTRL_SEL, sel);
-        if (ret)
-                goto error_ret;
-
-        /* Write the actual value into the register */
-        ret = sca3000_write_reg(st, SCA3000_REG_ADDR_CTRL_DATA, val);
-
-error_ret:
-        return ret;
-}
-
-/**
- * sca3000_read_ctrl_reg() read from lock protected control register.
- *
- * Lock must be held.
- **/
-static int sca3000_read_ctrl_reg(struct sca3000_state *st,
-                                 u8 ctrl_reg)
-{
-        int ret;
-
-        ret = sca3000_reg_lock_on(st);
-        if (ret < 0)
-                goto error_ret;
-        if (ret) {
-                ret = __sca3000_unlock_reg_lock(st);
-                if (ret)
-                        goto error_ret;
-        }
-        /* Set the control select register */
-        ret = sca3000_write_reg(st, SCA3000_REG_ADDR_CTRL_SEL, ctrl_reg);
-        if (ret)
-                goto error_ret;
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_CTRL_DATA, 1);
-        if (ret)
-                goto error_ret;
-        return st->rx[0];
-error_ret:
-        return ret;
-}
-
-/**
- * sca3000_show_rev() - sysfs interface to read the chip revision number
- **/
-static ssize_t sca3000_show_rev(struct device *dev,
-                                struct device_attribute *attr,
-                                char *buf)
-{
-        int len = 0, ret;
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct sca3000_state *st = iio_priv(indio_dev);
-
-        mutex_lock(&st->lock);
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_REVID, 1);
-        if (ret < 0)
-                goto error_ret;
-        len += sprintf(buf + len,
-                       "major=%d, minor=%d\n",
-                       st->rx[0] & SCA3000_REVID_MAJOR_MASK,
-                       st->rx[0] & SCA3000_REVID_MINOR_MASK);
-error_ret:
-        mutex_unlock(&st->lock);
-
-        return ret ? ret : len;
-}
-
-/**
- * sca3000_show_available_measurement_modes() display available modes
- *
- * This is all read from chip specific data in the driver. Not all
- * of the sca3000 series support modes other than normal.
- **/
-static ssize_t
-sca3000_show_available_measurement_modes(struct device *dev,
-                                         struct device_attribute *attr,
-                                         char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct sca3000_state *st = iio_priv(indio_dev);
-        int len = 0;
-
-        len += sprintf(buf + len, "0 - normal mode");
-        switch (st->info->option_mode_1) {
-        case SCA3000_OP_MODE_NARROW:
-                len += sprintf(buf + len, ", 1 - narrow mode");
-                break;
-        case SCA3000_OP_MODE_BYPASS:
-                len += sprintf(buf + len, ", 1 - bypass mode");
-                break;
-        }
-        switch (st->info->option_mode_2) {
-        case SCA3000_OP_MODE_WIDE:
-                len += sprintf(buf + len, ", 2 - wide mode");
-                break;
-        }
-        /* always supported */
-        len += sprintf(buf + len, " 3 - motion detection\n");
-
-        return len;
-}
-
-/**
- * sca3000_show_measurement_mode() sysfs read of current mode
- **/
-static ssize_t
-sca3000_show_measurement_mode(struct device *dev,
-                              struct device_attribute *attr,
-                              char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct sca3000_state *st = iio_priv(indio_dev);
-        int len = 0, ret;
-
-        mutex_lock(&st->lock);
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-        if (ret)
-                goto error_ret;
-        /* mask bottom 2 bits - only ones that are relevant */
-        st->rx[0] &= 0x03;
-        switch (st->rx[0]) {
-        case SCA3000_MEAS_MODE_NORMAL:
-                len += sprintf(buf + len, "0 - normal mode\n");
-                break;
-        case SCA3000_MEAS_MODE_MOT_DET:
-                len += sprintf(buf + len, "3 - motion detection\n");
-                break;
-        case SCA3000_MEAS_MODE_OP_1:
-                switch (st->info->option_mode_1) {
-                case SCA3000_OP_MODE_NARROW:
-                        len += sprintf(buf + len, "1 - narrow mode\n");
-                        break;
-                case SCA3000_OP_MODE_BYPASS:
-                        len += sprintf(buf + len, "1 - bypass mode\n");
-                        break;
-                }
-                break;
-        case SCA3000_MEAS_MODE_OP_2:
-                switch (st->info->option_mode_2) {
-                case SCA3000_OP_MODE_WIDE:
-                        len += sprintf(buf + len, "2 - wide mode\n");
-                        break;
-                }
-                break;
-        }
-
-error_ret:
-        mutex_unlock(&st->lock);
-
-        return ret ? ret : len;
-}
-
-/**
- * sca3000_store_measurement_mode() set the current mode
- **/
-static ssize_t
-sca3000_store_measurement_mode(struct device *dev,
-                               struct device_attribute *attr,
-                               const char *buf,
-                               size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct sca3000_state *st = iio_priv(indio_dev);
-        int ret;
-        u8 mask = 0x03;
-        u8 val;
-
-        mutex_lock(&st->lock);
-        ret = kstrtou8(buf, 10, &val);
-        if (ret)
-                goto error_ret;
-        if (val > 3) {
-                ret = -EINVAL;
-                goto error_ret;
-        }
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-        if (ret)
-                goto error_ret;
-        st->rx[0] &= ~mask;
-        st->rx[0] |= (val & mask);
-        ret = sca3000_write_reg(st, SCA3000_REG_ADDR_MODE, st->rx[0]);
-        if (ret)
-                goto error_ret;
-        mutex_unlock(&st->lock);
-
-        return len;
-
-error_ret:
-        mutex_unlock(&st->lock);
-
-        return ret;
-}
-
-/*
- * Not even vaguely standard attributes so defined here rather than
- * in the relevant IIO core headers
- */
-static IIO_DEVICE_ATTR(measurement_mode_available, S_IRUGO,
-                       sca3000_show_available_measurement_modes,
-                       NULL, 0);
-
-static IIO_DEVICE_ATTR(measurement_mode, S_IRUGO | S_IWUSR,
-                       sca3000_show_measurement_mode,
-                       sca3000_store_measurement_mode,
-                       0);
-
-/* More standard attributes */
-
-static IIO_DEVICE_ATTR(revision, S_IRUGO, sca3000_show_rev, NULL, 0);
-
-static const struct iio_event_spec sca3000_event = {
-        .type = IIO_EV_TYPE_MAG,
-        .dir = IIO_EV_DIR_RISING,
-        .mask_separate = BIT(IIO_EV_INFO_VALUE) | BIT(IIO_EV_INFO_ENABLE),
-};
-
-#define SCA3000_CHAN(index, mod)                                \
-        {                                                       \
-                .type = IIO_ACCEL,                              \
-                .modified = 1,                                  \
-                .channel2 = mod,                                \
-                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),   \
-                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\
-                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),\
-                .address = index,                               \
-                .scan_index = index,                            \
-                .scan_type = {                                  \
-                        .sign = 's',                            \
-                        .realbits = 11,                         \
-                        .storagebits = 16,                      \
-                        .shift = 5,                             \
-                },                                              \
-                .event_spec = &sca3000_event,                   \
-                .num_event_specs = 1,                           \
-        }
-
-static const struct iio_chan_spec sca3000_channels[] = {
-        SCA3000_CHAN(0, IIO_MOD_X),
-        SCA3000_CHAN(1, IIO_MOD_Y),
-        SCA3000_CHAN(2, IIO_MOD_Z),
-};
-
-static const struct iio_chan_spec sca3000_channels_with_temp[] = {
-        SCA3000_CHAN(0, IIO_MOD_X),
-        SCA3000_CHAN(1, IIO_MOD_Y),
-        SCA3000_CHAN(2, IIO_MOD_Z),
-        {
-                .type = IIO_TEMP,
-                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |
-                        BIT(IIO_CHAN_INFO_OFFSET),
-                /* No buffer support */
-                .scan_index = -1,
-        },
-};
-
-static u8 sca3000_addresses[3][3] = {
-        [0] = {SCA3000_REG_ADDR_X_MSB, SCA3000_REG_CTRL_SEL_MD_X_TH,
-               SCA3000_MD_CTRL_OR_X},
-        [1] = {SCA3000_REG_ADDR_Y_MSB, SCA3000_REG_CTRL_SEL_MD_Y_TH,
-               SCA3000_MD_CTRL_OR_Y},
-        [2] = {SCA3000_REG_ADDR_Z_MSB, SCA3000_REG_CTRL_SEL_MD_Z_TH,
-               SCA3000_MD_CTRL_OR_Z},
-};
-
-/**
- * __sca3000_get_base_freq() obtain mode specific base frequency
- *
- * lock must be held
- **/
-static inline int __sca3000_get_base_freq(struct sca3000_state *st,
-                                          const struct sca3000_chip_info *info,
-                                          int *base_freq)
-{
-        int ret;
-
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-        if (ret)
-                goto error_ret;
-        switch (0x03 & st->rx[0]) {
-        case SCA3000_MEAS_MODE_NORMAL:
-                *base_freq = info->measurement_mode_freq;
-                break;
-        case SCA3000_MEAS_MODE_OP_1:
-                *base_freq = info->option_mode_1_freq;
-                break;
-        case SCA3000_MEAS_MODE_OP_2:
-                *base_freq = info->option_mode_2_freq;
-                break;
-        default:
-                ret = -EINVAL;
-        }
-error_ret:
-        return ret;
-}
-
-/**
- * read_raw handler for IIO_CHAN_INFO_SAMP_FREQ
- *
- * lock must be held
- **/
-static int read_raw_samp_freq(struct sca3000_state *st, int *val)
-{
-        int ret;
-
-        ret = __sca3000_get_base_freq(st, st->info, val);
-        if (ret)
-                return ret;
-
-        ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
-        if (ret < 0)
-                return ret;
-
-        if (*val > 0) {
-                ret &= SCA3000_OUT_CTRL_BUF_DIV_MASK;
-                switch (ret) {
-                case SCA3000_OUT_CTRL_BUF_DIV_2:
-                        *val /= 2;
-                        break;
-                case SCA3000_OUT_CTRL_BUF_DIV_4:
-                        *val /= 4;
-                        break;
-                }
-        }
-
-        return 0;
-}
-
-/**
- * write_raw handler for IIO_CHAN_INFO_SAMP_FREQ
- *
- * lock must be held
- **/
-static int write_raw_samp_freq(struct sca3000_state *st, int val)
-{
-        int ret, base_freq, ctrlval;
-
-        ret = __sca3000_get_base_freq(st, st->info, &base_freq);
-        if (ret)
-                return ret;
-
-        ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
-        if (ret < 0)
-                return ret;
-
-        ctrlval = ret & ~SCA3000_OUT_CTRL_BUF_DIV_MASK;
-
-        if (val == base_freq / 2)
-                ctrlval |= SCA3000_OUT_CTRL_BUF_DIV_2;
-        if (val == base_freq / 4)
-                ctrlval |= SCA3000_OUT_CTRL_BUF_DIV_4;
-        else if (val != base_freq)
-                return -EINVAL;
-
-        return sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL,
-                                     ctrlval);
-}
-
-static int sca3000_read_raw(struct iio_dev *indio_dev,
-                            struct iio_chan_spec const *chan,
-                            int *val,
-                            int *val2,
-                            long mask)
-{
-        struct sca3000_state *st = iio_priv(indio_dev);
-        int ret;
-        u8 address;
-
-        switch (mask) {
-        case IIO_CHAN_INFO_RAW:
-                mutex_lock(&st->lock);
-                if (chan->type == IIO_ACCEL) {
-                        if (st->mo_det_use_count) {
-                                mutex_unlock(&st->lock);
-                                return -EBUSY;
-                        }
-                        address = sca3000_addresses[chan->address][0];
-                        ret = sca3000_read_data_short(st, address, 2);
-                        if (ret < 0) {
-                                mutex_unlock(&st->lock);
-                                return ret;
-                        }
-                        *val = (be16_to_cpup((__be16 *)st->rx) >> 3) & 0x1FFF;
-                        *val = ((*val) << (sizeof(*val) * 8 - 13)) >>
-                                (sizeof(*val) * 8 - 13);
-                } else {
-                        /* get the temperature when available */
-                        ret = sca3000_read_data_short(st,
-                                                      SCA3000_REG_ADDR_TEMP_MSB,
-                                                      2);
-                        if (ret < 0) {
-                                mutex_unlock(&st->lock);
-                                return ret;
-                        }
-                        *val = ((st->rx[0] & 0x3F) << 3) |
-                               ((st->rx[1] & 0xE0) >> 5);
-                }
-                mutex_unlock(&st->lock);
-                return IIO_VAL_INT;
-        case IIO_CHAN_INFO_SCALE:
-                *val = 0;
-                if (chan->type == IIO_ACCEL)
-                        *val2 = st->info->scale;
-                else /* temperature */
-                        *val2 = 555556;
-                return IIO_VAL_INT_PLUS_MICRO;
-        case IIO_CHAN_INFO_OFFSET:
-                *val = -214;
-                *val2 = 600000;
-                return IIO_VAL_INT_PLUS_MICRO;
-        case IIO_CHAN_INFO_SAMP_FREQ:
-                mutex_lock(&st->lock);
-                ret = read_raw_samp_freq(st, val);
-                mutex_unlock(&st->lock);
-                return ret ? ret : IIO_VAL_INT;
-        default:
-                return -EINVAL;
-        }
-}
-
-static int sca3000_write_raw(struct iio_dev *indio_dev,
-                             struct iio_chan_spec const *chan,
-                             int val, int val2, long mask)
-{
-        struct sca3000_state *st = iio_priv(indio_dev);
-        int ret;
-
-        switch (mask) {
-        case IIO_CHAN_INFO_SAMP_FREQ:
-                if (val2)
-                        return -EINVAL;
-                mutex_lock(&st->lock);
-                ret = write_raw_samp_freq(st, val);
-                mutex_unlock(&st->lock);
-                return ret;
-        default:
-                return -EINVAL;
-        }
-
-        return ret;
-}
-
-/**
- * sca3000_read_av_freq() sysfs function to get available frequencies
- *
- * The later modes are only relevant to the ring buffer - and depend on current
- * mode. Note that data sheet gives rather wide tolerances for these so integer
- * division will give good enough answer and not all chips have them specified
- * at all.
- **/
-static ssize_t sca3000_read_av_freq(struct device *dev,
-                                    struct device_attribute *attr,
-                                    char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct sca3000_state *st = iio_priv(indio_dev);
-        int len = 0, ret, val;
-
-        mutex_lock(&st->lock);
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-        val = st->rx[0];
-        mutex_unlock(&st->lock);
-        if (ret)
-                goto error_ret;
-
-        switch (val & 0x03) {
-        case SCA3000_MEAS_MODE_NORMAL:
-                len += sprintf(buf + len, "%d %d %d\n",
-                               st->info->measurement_mode_freq,
-                               st->info->measurement_mode_freq / 2,
-                               st->info->measurement_mode_freq / 4);
-                break;
-        case SCA3000_MEAS_MODE_OP_1:
-                len += sprintf(buf + len, "%d %d %d\n",
-                               st->info->option_mode_1_freq,
-                               st->info->option_mode_1_freq / 2,
-                               st->info->option_mode_1_freq / 4);
-                break;
-        case SCA3000_MEAS_MODE_OP_2:
-                len += sprintf(buf + len, "%d %d %d\n",
-                               st->info->option_mode_2_freq,
-                               st->info->option_mode_2_freq / 2,
-                               st->info->option_mode_2_freq / 4);
-                break;
-        }
-        return len;
-error_ret:
-        return ret;
-}
-
-/*
- * Should only really be registered if ring buffer support is compiled in.
- * Does no harm however and doing it right would add a fair bit of complexity
- */
-static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(sca3000_read_av_freq);
-
-/**
- * sca3000_read_thresh() - query of a threshold
- **/
-static int sca3000_read_thresh(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)
-{
-        int ret, i;
-        struct sca3000_state *st = iio_priv(indio_dev);
-        int num = chan->channel2;
-
-        mutex_lock(&st->lock);
-        ret = sca3000_read_ctrl_reg(st, sca3000_addresses[num][1]);
-        mutex_unlock(&st->lock);
-        if (ret < 0)
-                return ret;
-        *val = 0;
-        if (num == 1)
-                for_each_set_bit(i, (unsigned long *)&ret,
-                                 ARRAY_SIZE(st->info->mot_det_mult_y))
-                        *val += st->info->mot_det_mult_y[i];
-        else
-                for_each_set_bit(i, (unsigned long *)&ret,
-                                 ARRAY_SIZE(st->info->mot_det_mult_xz))
-                        *val += st->info->mot_det_mult_xz[i];
-
-        return IIO_VAL_INT;
-}
-
-/**
- * sca3000_write_thresh() control of threshold
- **/
-static int sca3000_write_thresh(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 sca3000_state *st = iio_priv(indio_dev);
-        int num = chan->channel2;
-        int ret;
-        int i;
-        u8 nonlinear = 0;
-
-        if (num == 1) {
-                i = ARRAY_SIZE(st->info->mot_det_mult_y);
-                while (i > 0)
-                        if (val >= st->info->mot_det_mult_y[--i]) {
-                                nonlinear |= (1 << i);
-                                val -= st->info->mot_det_mult_y[i];
-                        }
-        } else {
-                i = ARRAY_SIZE(st->info->mot_det_mult_xz);
-                while (i > 0)
-                        if (val >= st->info->mot_det_mult_xz[--i]) {
-                                nonlinear |= (1 << i);
-                                val -= st->info->mot_det_mult_xz[i];
-                        }
-        }
-
-        mutex_lock(&st->lock);
-        ret = sca3000_write_ctrl_reg(st, sca3000_addresses[num][1], nonlinear);
-        mutex_unlock(&st->lock);
-
-        return ret;
-}
-
-static struct attribute *sca3000_attributes[] = {
-        &iio_dev_attr_revision.dev_attr.attr,
-        &iio_dev_attr_measurement_mode_available.dev_attr.attr,
-        &iio_dev_attr_measurement_mode.dev_attr.attr,
-        &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
-        NULL,
-};
-
-static const struct attribute_group sca3000_attribute_group = {
-        .attrs = sca3000_attributes,
-};
-
-/**
- * sca3000_event_handler() - handling ring and non ring events
- *
- * Ring related interrupt handler. Depending on event, push to
- * the ring buffer event chrdev or the event one.
- *
- * This function is complicated by the fact that the devices can signify ring
- * and non ring events via the same interrupt line and they can only
- * be distinguished via a read of the relevant status register.
- **/
-static irqreturn_t sca3000_event_handler(int irq, void *private)
-{
-        struct iio_dev *indio_dev = private;
-        struct sca3000_state *st = iio_priv(indio_dev);
-        int ret, val;
-        s64 last_timestamp = iio_get_time_ns(indio_dev);
-
-        /*
-         * Could lead if badly timed to an extra read of status reg,
-         * but ensures no interrupt is missed.
-         */
-        mutex_lock(&st->lock);
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_INT_STATUS, 1);
-        val = st->rx[0];
-        mutex_unlock(&st->lock);
-        if (ret)
-                goto done;
-
-        sca3000_ring_int_process(val, indio_dev->buffer);
-
-        if (val & SCA3000_INT_STATUS_FREE_FALL)
-                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),
-                               last_timestamp);
-
-        if (val & SCA3000_INT_STATUS_Y_TRIGGER)
-                iio_push_event(indio_dev,
-                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
-                                                  0,
-                                                  IIO_MOD_Y,
-                                                  IIO_EV_TYPE_MAG,
-                                                  IIO_EV_DIR_RISING),
-                               last_timestamp);
-
-        if (val & SCA3000_INT_STATUS_X_TRIGGER)
-                iio_push_event(indio_dev,
-                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
-                                                  0,
-                                                  IIO_MOD_X,
-                                                  IIO_EV_TYPE_MAG,
-                                                  IIO_EV_DIR_RISING),
-                               last_timestamp);
-
-        if (val & SCA3000_INT_STATUS_Z_TRIGGER)
-                iio_push_event(indio_dev,
-                               IIO_MOD_EVENT_CODE(IIO_ACCEL,
-                                                  0,
-                                                  IIO_MOD_Z,
-                                                  IIO_EV_TYPE_MAG,
-                                                  IIO_EV_DIR_RISING),
-                               last_timestamp);
-
-done:
-        return IRQ_HANDLED;
-}
-
-/**
- * sca3000_read_event_config() what events are enabled
- **/
-static int sca3000_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 sca3000_state *st = iio_priv(indio_dev);
-        int ret;
-        u8 protect_mask = 0x03;
-        int num = chan->channel2;
-
-        /* read current value of mode register */
-        mutex_lock(&st->lock);
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-        if (ret)
-                goto error_ret;
-
-        if ((st->rx[0] & protect_mask) != SCA3000_MEAS_MODE_MOT_DET) {
-                ret = 0;
-        } else {
-                ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL);
-                if (ret < 0)
-                        goto error_ret;
-                /* only supporting logical or's for now */
-                ret = !!(ret & sca3000_addresses[num][2]);
-        }
-error_ret:
-        mutex_unlock(&st->lock);
-
-        return ret;
-}
-
-/**
- * sca3000_query_free_fall_mode() is free fall mode enabled
- **/
-static ssize_t sca3000_query_free_fall_mode(struct device *dev,
-                                            struct device_attribute *attr,
-                                            char *buf)
-{
-        int ret;
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct sca3000_state *st = iio_priv(indio_dev);
-        int val;
-
-        mutex_lock(&st->lock);
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-        val = st->rx[0];
-        mutex_unlock(&st->lock);
-        if (ret < 0)
-                return ret;
-        return sprintf(buf, "%d\n", !!(val & SCA3000_FREE_FALL_DETECT));
-}
-
-/**
- * sca3000_set_free_fall_mode() simple on off control for free fall int
- *
- * In these chips the free fall detector should send an interrupt if
- * the device falls more than 25cm.  This has not been tested due
- * to fragile wiring.
- **/
-static ssize_t sca3000_set_free_fall_mode(struct device *dev,
-                                          struct device_attribute *attr,
-                                          const char *buf,
-                                          size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct sca3000_state *st = iio_priv(indio_dev);
-        u8 val;
-        int ret;
-        u8 protect_mask = SCA3000_FREE_FALL_DETECT;
-
-        mutex_lock(&st->lock);
-        ret = kstrtou8(buf, 10, &val);
-        if (ret)
-                goto error_ret;
-
-        /* read current value of mode register */
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-        if (ret)
-                goto error_ret;
-
-        /* if off and should be on */
-        if (val && !(st->rx[0] & protect_mask))
-                ret = sca3000_write_reg(st, SCA3000_REG_ADDR_MODE,
-                                        (st->rx[0] | SCA3000_FREE_FALL_DETECT));
-        /* if on and should be off */
-        else if (!val && (st->rx[0] & protect_mask))
-                ret = sca3000_write_reg(st, SCA3000_REG_ADDR_MODE,
-                                        (st->rx[0] & ~protect_mask));
-error_ret:
-        mutex_unlock(&st->lock);
-
-        return ret ? ret : len;
-}
-
-/**
- * sca3000_write_event_config() simple on off control for motion detector
- *
- * This is a per axis control, but enabling any will result in the
- * motion detector unit being enabled.
- * N.B. enabling motion detector stops normal data acquisition.
- * There is a complexity in knowing which mode to return to when
- * this mode is disabled.  Currently normal mode is assumed.
- **/
-static int sca3000_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 sca3000_state *st = iio_priv(indio_dev);
-        int ret, ctrlval;
-        u8 protect_mask = 0x03;
-        int num = chan->channel2;
-
-        mutex_lock(&st->lock);
-        /*
-         * First read the motion detector config to find out if
-         * this axis is on
-         */
-        ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL);
-        if (ret < 0)
-                goto exit_point;
-        ctrlval = ret;
-        /* if off and should be on */
-        if (state && !(ctrlval & sca3000_addresses[num][2])) {
-                ret = sca3000_write_ctrl_reg(st,
-                                             SCA3000_REG_CTRL_SEL_MD_CTRL,
-                                             ctrlval |
-                                             sca3000_addresses[num][2]);
-                if (ret)
-                        goto exit_point;
-                st->mo_det_use_count++;
-        } else if (!state && (ctrlval & sca3000_addresses[num][2])) {
-                ret = sca3000_write_ctrl_reg(st,
-                                             SCA3000_REG_CTRL_SEL_MD_CTRL,
-                                             ctrlval &
-                                             ~(sca3000_addresses[num][2]));
-                if (ret)
-                        goto exit_point;
-                st->mo_det_use_count--;
-        }
-
-        /* read current value of mode register */
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-        if (ret)
-                goto exit_point;
-        /* if off and should be on */
-        if ((st->mo_det_use_count) &&
-            ((st->rx[0] & protect_mask) != SCA3000_MEAS_MODE_MOT_DET))
-                ret = sca3000_write_reg(st, SCA3000_REG_ADDR_MODE,
-                                        (st->rx[0] & ~protect_mask)
-                                        | SCA3000_MEAS_MODE_MOT_DET);
-        /* if on and should be off */
-        else if (!(st->mo_det_use_count) &&
-                 ((st->rx[0] & protect_mask) == SCA3000_MEAS_MODE_MOT_DET))
-                ret = sca3000_write_reg(st, SCA3000_REG_ADDR_MODE,
-                                        (st->rx[0] & ~protect_mask));
-exit_point:
-        mutex_unlock(&st->lock);
-
-        return ret;
-}
-
-/* Free fall detector related event attribute */
-static IIO_DEVICE_ATTR_NAMED(accel_xayaz_mag_falling_en,
-                             in_accel_x & y & z_mag_falling_en,
-                             S_IRUGO | S_IWUSR,
-                             sca3000_query_free_fall_mode,
-                             sca3000_set_free_fall_mode,
-                             0);
-
-static IIO_CONST_ATTR_NAMED(accel_xayaz_mag_falling_period,
-                            in_accel_x & y & z_mag_falling_period,
-                            "0.226");
-
-static struct attribute *sca3000_event_attributes[] = {
-        &iio_dev_attr_accel_xayaz_mag_falling_en.dev_attr.attr,
-        &iio_const_attr_accel_xayaz_mag_falling_period.dev_attr.attr,
-        NULL,
-};
-
-static struct attribute_group sca3000_event_attribute_group = {
-        .attrs = sca3000_event_attributes,
-        .name = "events",
-};
-
-/**
- * sca3000_clean_setup() get the device into a predictable state
- *
- * Devices use flash memory to store many of the register values
- * and hence can come up in somewhat unpredictable states.
- * Hence reset everything on driver load.
- **/
-static int sca3000_clean_setup(struct sca3000_state *st)
-{
-        int ret;
-
-        mutex_lock(&st->lock);
-        /* Ensure all interrupts have been acknowledged */
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_INT_STATUS, 1);
-        if (ret)
-                goto error_ret;
-
-        /* Turn off all motion detection channels */
-        ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL);
-        if (ret < 0)
-                goto error_ret;
-        ret = sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL,
-                                     ret & SCA3000_MD_CTRL_PROT_MASK);
-        if (ret)
-                goto error_ret;
-
-        /* Disable ring buffer */
-        ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
-        if (ret < 0)
-                goto error_ret;
-        ret = sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL,
-                                     (ret & SCA3000_OUT_CTRL_PROT_MASK)
-                                     | SCA3000_OUT_CTRL_BUF_X_EN
-                                     | SCA3000_OUT_CTRL_BUF_Y_EN
-                                     | SCA3000_OUT_CTRL_BUF_Z_EN
-                                     | SCA3000_OUT_CTRL_BUF_DIV_4);
-        if (ret)
-                goto error_ret;
-        /* Enable interrupts, relevant to mode and set up as active low */
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_INT_MASK, 1);
-        if (ret)
-                goto error_ret;
-        ret = sca3000_write_reg(st,
-                                SCA3000_REG_ADDR_INT_MASK,
-                                (ret & SCA3000_INT_MASK_PROT_MASK)
-                                | SCA3000_INT_MASK_ACTIVE_LOW);
-        if (ret)
-                goto error_ret;
-        /*
-         * Select normal measurement mode, free fall off, ring off
-         * Ring in 12 bit mode - it is fine to overwrite reserved bits 3,5
-         * as that occurs in one of the example on the datasheet
-         */
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-        if (ret)
-                goto error_ret;
-        ret = sca3000_write_reg(st, SCA3000_REG_ADDR_MODE,
-                                (st->rx[0] & SCA3000_MODE_PROT_MASK));
-        st->bpse = 11;
-
-error_ret:
-        mutex_unlock(&st->lock);
-        return ret;
-}
-
-static const struct iio_info sca3000_info = {
-        .attrs = &sca3000_attribute_group,
-        .read_raw = &sca3000_read_raw,
-        .write_raw = &sca3000_write_raw,
-        .event_attrs = &sca3000_event_attribute_group,
-        .read_event_value = &sca3000_read_thresh,
-        .write_event_value = &sca3000_write_thresh,
-        .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)
-{
-        int ret;
-        struct sca3000_state *st;
-        struct iio_dev *indio_dev;
-
-        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
-        if (!indio_dev)
-                return -ENOMEM;
-
-        st = iio_priv(indio_dev);
-        spi_set_drvdata(spi, indio_dev);
-        st->us = spi;
-        mutex_init(&st->lock);
-        st->info = &sca3000_spi_chip_info_tbl[spi_get_device_id(spi)
-                                              ->driver_data];
-
-        indio_dev->dev.parent = &spi->dev;
-        indio_dev->name = spi_get_device_id(spi)->name;
-        indio_dev->info = &sca3000_info;
-        if (st->info->temp_output) {
-                indio_dev->channels = sca3000_channels_with_temp;
-                indio_dev->num_channels =
-                        ARRAY_SIZE(sca3000_channels_with_temp);
-        } else {
-                indio_dev->channels = sca3000_channels;
-                indio_dev->num_channels = ARRAY_SIZE(sca3000_channels);
-        }
-        indio_dev->modes = INDIO_DIRECT_MODE;
-
-        sca3000_configure_ring(indio_dev);
-        ret = iio_device_register(indio_dev);
-        if (ret < 0)
-                return ret;
-
-        if (spi->irq) {
-                ret = request_threaded_irq(spi->irq,
-                                           NULL,
-                                           &sca3000_event_handler,
-                                           IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                                           "sca3000",
-                                           indio_dev);
-                if (ret)
-                        goto error_unregister_dev;
-        }
-        sca3000_register_ring_funcs(indio_dev);
-        ret = sca3000_clean_setup(st);
-        if (ret)
-                goto error_free_irq;
-        return 0;
-
-error_free_irq:
-        if (spi->irq)
-                free_irq(spi->irq, indio_dev);
-error_unregister_dev:
-        iio_device_unregister(indio_dev);
-        return ret;
-}
-
-static int sca3000_stop_all_interrupts(struct sca3000_state *st)
-{
-        int ret;
-
-        mutex_lock(&st->lock);
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_INT_MASK, 1);
-        if (ret)
-                goto error_ret;
-        ret = sca3000_write_reg(st, SCA3000_REG_ADDR_INT_MASK,
-                                (st->rx[0] &
-                                 ~(SCA3000_INT_MASK_RING_THREE_QUARTER |
-                                   SCA3000_INT_MASK_RING_HALF |
-                                   SCA3000_INT_MASK_ALL_INTS)));
-error_ret:
-        mutex_unlock(&st->lock);
-        return ret;
-}
-
-static int sca3000_remove(struct spi_device *spi)
-{
-        struct iio_dev *indio_dev = spi_get_drvdata(spi);
-        struct sca3000_state *st = iio_priv(indio_dev);
-
-        /* Must ensure no interrupts can be generated after this! */
-        sca3000_stop_all_interrupts(st);
-        if (spi->irq)
-                free_irq(spi->irq, indio_dev);
-        iio_device_unregister(indio_dev);
-        sca3000_unconfigure_ring(indio_dev);
-
-        return 0;
-}
-
-static const struct spi_device_id sca3000_id[] = {
-        {"sca3000_d01", d01},
-        {"sca3000_e02", e02},
-        {"sca3000_e04", e04},
-        {"sca3000_e05", e05},
-        {}
-};
-MODULE_DEVICE_TABLE(spi, sca3000_id);
-
-static struct spi_driver sca3000_driver = {
-        .driver = {
-                .name = "sca3000",
-        },
-        .probe = sca3000_probe,
-        .remove = sca3000_remove,
-        .id_table = sca3000_id,
-};
-module_spi_driver(sca3000_driver);
-
-MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>");
-MODULE_DESCRIPTION("VTI SCA3000 Series Accelerometers SPI driver");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c
deleted file mode 100644
index d1cb9b9cf22b..000000000000
--- a/drivers/staging/iio/accel/sca3000_ring.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * sca3000_ring.c -- support VTI sca3000 series accelerometers via SPI
- *
- * 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.
- *
- * Copyright (c) 2009 Jonathan Cameron <jic23@kernel.org>
- *
- */
-
-#include <linux/interrupt.h>
-#include <linux/fs.h>
-#include <linux/slab.h>
-#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/sysfs.h>
-#include <linux/sched.h>
-#include <linux/poll.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-#include <linux/iio/buffer.h>
-#include "../ring_hw.h"
-#include "sca3000.h"
-
-/* RFC / future work
- *
- * The internal ring buffer doesn't actually change what it holds depending
- * on which signals are enabled etc, merely whether you can read them.
- * As such the scan mode selection is somewhat different than for a software
- * ring buffer and changing it actually covers any data already in the buffer.
- * Currently scan elements aren't configured so it doesn't matter.
- */
-
-static int sca3000_read_data(struct sca3000_state *st,
-                             u8 reg_address_high,
-                             u8 **rx_p,
-                             int len)
-{
-        int ret;
-        struct spi_transfer xfer[2] = {
-                {
-                        .len = 1,
-                        .tx_buf = st->tx,
-                }, {
-                        .len = len,
-                }
-        };
-        *rx_p = kmalloc(len, GFP_KERNEL);
-        if (!*rx_p) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-        xfer[1].rx_buf = *rx_p;
-        st->tx[0] = SCA3000_READ_REG(reg_address_high);
-        ret = spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));
-        if (ret) {
-                dev_err(get_device(&st->us->dev), "problem reading register");
-                goto error_free_rx;
-        }
-
-        return 0;
-error_free_rx:
-        kfree(*rx_p);
-error_ret:
-        return ret;
-}
-
-/**
- * sca3000_read_first_n_hw_rb() - main ring access, pulls data from ring
- * @r:                  the ring
- * @count:              number of samples to try and pull
- * @data:               output the actual samples pulled from the hw ring
- *
- * Currently does not provide timestamps.  As the hardware doesn't add them they
- * can only be inferred approximately from ring buffer events such as 50% full
- * and knowledge of when buffer was last emptied.  This is left to userspace.
- **/
-static int sca3000_read_first_n_hw_rb(struct iio_buffer *r,
-                                      size_t count, char __user *buf)
-{
-        struct iio_hw_buffer *hw_ring = iio_to_hw_buf(r);
-        struct iio_dev *indio_dev = hw_ring->private;
-        struct sca3000_state *st = iio_priv(indio_dev);
-        u8 *rx;
-        int ret, i, num_available, num_read = 0;
-        int bytes_per_sample = 1;
-
-        if (st->bpse == 11)
-                bytes_per_sample = 2;
-
-        mutex_lock(&st->lock);
-        if (count % bytes_per_sample) {
-                ret = -EINVAL;
-                goto error_ret;
-        }
-
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_BUF_COUNT, 1);
-        if (ret)
-                goto error_ret;
-        num_available = st->rx[0];
-        /*
-         * num_available is the total number of samples available
-         * i.e. number of time points * number of channels.
-         */
-        if (count > num_available * bytes_per_sample)
-                num_read = num_available * bytes_per_sample;
-        else
-                num_read = count;
-
-        ret = sca3000_read_data(st,
-                                SCA3000_REG_ADDR_RING_OUT,
-                                &rx, num_read);
-        if (ret)
-                goto error_ret;
-
-        for (i = 0; i < num_read / sizeof(u16); i++)
-                *(((u16 *)rx) + i) = be16_to_cpup((__be16 *)rx + i);
-
-        if (copy_to_user(buf, rx, num_read))
-                ret = -EFAULT;
-        kfree(rx);
-        r->stufftoread = 0;
-error_ret:
-        mutex_unlock(&st->lock);
-
-        return ret ? ret : num_read;
-}
-
-static size_t sca3000_ring_buf_data_available(struct iio_buffer *r)
-{
-        return r->stufftoread ? r->watermark : 0;
-}
-
-/**
- * sca3000_query_ring_int() is the hardware ring status interrupt enabled
- **/
-static ssize_t sca3000_query_ring_int(struct device *dev,
-                                      struct device_attribute *attr,
-                                      char *buf)
-{
-        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-        int ret, val;
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct sca3000_state *st = iio_priv(indio_dev);
-
-        mutex_lock(&st->lock);
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_INT_MASK, 1);
-        val = st->rx[0];
-        mutex_unlock(&st->lock);
-        if (ret)
-                return ret;
-
-        return sprintf(buf, "%d\n", !!(val & this_attr->address));
-}
-
-/**
- * sca3000_set_ring_int() set state of ring status interrupt
- **/
-static ssize_t sca3000_set_ring_int(struct device *dev,
-                                    struct device_attribute *attr,
-                                    const char *buf,
-                                    size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct sca3000_state *st = iio_priv(indio_dev);
-        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-        u8 val;
-        int ret;
-
-        mutex_lock(&st->lock);
-        ret = kstrtou8(buf, 10, &val);
-        if (ret)
-                goto error_ret;
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_INT_MASK, 1);
-        if (ret)
-                goto error_ret;
-        if (val)
-                ret = sca3000_write_reg(st,
-                                        SCA3000_REG_ADDR_INT_MASK,
-                                        st->rx[0] | this_attr->address);
-        else
-                ret = sca3000_write_reg(st,
-                                        SCA3000_REG_ADDR_INT_MASK,
-                                        st->rx[0] & ~this_attr->address);
-error_ret:
-        mutex_unlock(&st->lock);
-
-        return ret ? ret : len;
-}
-
-static IIO_DEVICE_ATTR(50_percent, S_IRUGO | S_IWUSR,
-                       sca3000_query_ring_int,
-                       sca3000_set_ring_int,
-                       SCA3000_INT_MASK_RING_HALF);
-
-static IIO_DEVICE_ATTR(75_percent, S_IRUGO | S_IWUSR,
-                       sca3000_query_ring_int,
-                       sca3000_set_ring_int,
-                       SCA3000_INT_MASK_RING_THREE_QUARTER);
-
-static ssize_t sca3000_show_buffer_scale(struct device *dev,
-                                         struct device_attribute *attr,
-                                         char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct sca3000_state *st = iio_priv(indio_dev);
-
-        return sprintf(buf, "0.%06d\n", 4 * st->info->scale);
-}
-
-static IIO_DEVICE_ATTR(in_accel_scale,
-                       S_IRUGO,
-                       sca3000_show_buffer_scale,
-                       NULL,
-                       0);
-
-/*
- * Ring buffer attributes
- * This device is a bit unusual in that the sampling frequency and bpse
- * only apply to the ring buffer.  At all times full rate and accuracy
- * is available via direct reading from registers.
- */
-static const struct attribute *sca3000_ring_attributes[] = {
-        &iio_dev_attr_50_percent.dev_attr.attr,
-        &iio_dev_attr_75_percent.dev_attr.attr,
-        &iio_dev_attr_in_accel_scale.dev_attr.attr,
-        NULL,
-};
-
-static struct iio_buffer *sca3000_rb_allocate(struct iio_dev *indio_dev)
-{
-        struct iio_buffer *buf;
-        struct iio_hw_buffer *ring;
-
-        ring = kzalloc(sizeof(*ring), GFP_KERNEL);
-        if (!ring)
-                return NULL;
-
-        ring->private = indio_dev;
-        buf = &ring->buf;
-        buf->stufftoread = 0;
-        buf->length = 64;
-        buf->attrs = sca3000_ring_attributes;
-        iio_buffer_init(buf);
-
-        return buf;
-}
-
-static void sca3000_ring_release(struct iio_buffer *r)
-{
-        kfree(iio_to_hw_buf(r));
-}
-
-static const struct iio_buffer_access_funcs sca3000_ring_access_funcs = {
-        .read_first_n = &sca3000_read_first_n_hw_rb,
-        .data_available = sca3000_ring_buf_data_available,
-        .release = sca3000_ring_release,
-
-        .modes = INDIO_BUFFER_HARDWARE,
-};
-
-int sca3000_configure_ring(struct iio_dev *indio_dev)
-{
-        struct iio_buffer *buffer;
-
-        buffer = sca3000_rb_allocate(indio_dev);
-        if (!buffer)
-                return -ENOMEM;
-        indio_dev->modes |= INDIO_BUFFER_HARDWARE;
-
-        indio_dev->buffer->access = &sca3000_ring_access_funcs;
-
-        iio_device_attach_buffer(indio_dev, buffer);
-
-        return 0;
-}
-
-void sca3000_unconfigure_ring(struct iio_dev *indio_dev)
-{
-        iio_buffer_put(indio_dev->buffer);
-}
-
-static inline
-int __sca3000_hw_ring_state_set(struct iio_dev *indio_dev, bool state)
-{
-        struct sca3000_state *st = iio_priv(indio_dev);
-        int ret;
-
-        mutex_lock(&st->lock);
-        ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-        if (ret)
-                goto error_ret;
-        if (state) {
-                dev_info(&indio_dev->dev, "supposedly enabling ring buffer\n");
-                ret = sca3000_write_reg(st,
-                                        SCA3000_REG_ADDR_MODE,
-                                        (st->rx[0] | SCA3000_RING_BUF_ENABLE));
-        } else
-                ret = sca3000_write_reg(st,
-                                        SCA3000_REG_ADDR_MODE,
-                                        (st->rx[0] & ~SCA3000_RING_BUF_ENABLE));
-error_ret:
-        mutex_unlock(&st->lock);
-
-        return ret;
-}
-
-/**
- * sca3000_hw_ring_preenable() hw ring buffer preenable function
- *
- * Very simple enable function as the chip will allows normal reads
- * during ring buffer operation so as long as it is indeed running
- * before we notify the core, the precise ordering does not matter.
- **/
-static int sca3000_hw_ring_preenable(struct iio_dev *indio_dev)
-{
-        return __sca3000_hw_ring_state_set(indio_dev, 1);
-}
-
-static int sca3000_hw_ring_postdisable(struct iio_dev *indio_dev)
-{
-        return __sca3000_hw_ring_state_set(indio_dev, 0);
-}
-
-static const struct iio_buffer_setup_ops sca3000_ring_setup_ops = {
-        .preenable = &sca3000_hw_ring_preenable,
-        .postdisable = &sca3000_hw_ring_postdisable,
-};
-
-void sca3000_register_ring_funcs(struct iio_dev *indio_dev)
-{
-        indio_dev->setup_ops = &sca3000_ring_setup_ops;
-}
-
-/**
- * sca3000_ring_int_process() ring specific interrupt handling.
- *
- * This is only split from the main interrupt handler so as to
- * reduce the amount of code if the ring buffer is not enabled.
- **/
-void sca3000_ring_int_process(u8 val, struct iio_buffer *ring)
-{
-        if (val & (SCA3000_INT_STATUS_THREE_QUARTERS |
-                   SCA3000_INT_STATUS_HALF)) {
-                ring->stufftoread = true;
-                wake_up_interruptible(&ring->pollq);
-        }
-}
diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index 3cdd83ccec8e..ac09485923b6 100644
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -2,7 +2,6 @@
 # Makefile for industrial I/O ADC drivers
 #
 
-ad7606-y := ad7606_core.o ad7606_ring.o
 obj-$(CONFIG_AD7606_IFACE_PARALLEL) += ad7606_par.o
 obj-$(CONFIG_AD7606_IFACE_SPI) += ad7606_spi.o
 obj-$(CONFIG_AD7606) += ad7606.o
diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index 1cf6b79801a9..1fb68c01abd5 100644
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -152,7 +152,8 @@
  */
 
 struct ad7192_state {
-        struct regulator                *reg;
+        struct regulator                *avdd;
+        struct regulator                *dvdd;
         u16                             int_vref_mv;
         u32                             mclk;
         u32                             f_order;
@@ -322,57 +323,6 @@ out:
         return ret;
 }
 
-static ssize_t ad7192_read_frequency(struct device *dev,
-                                     struct device_attribute *attr,
-                                     char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct ad7192_state *st = iio_priv(indio_dev);
-
-        return sprintf(buf, "%d\n", st->mclk /
-                        (st->f_order * 1024 * AD7192_MODE_RATE(st->mode)));
-}
-
-static ssize_t ad7192_write_frequency(struct device *dev,
-                                      struct device_attribute *attr,
-                                      const char *buf,
-                                      size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct ad7192_state *st = iio_priv(indio_dev);
-        unsigned long lval;
-        int div, ret;
-
-        ret = kstrtoul(buf, 10, &lval);
-        if (ret)
-                return ret;
-        if (lval == 0)
-                return -EINVAL;
-
-        ret = iio_device_claim_direct_mode(indio_dev);
-        if (ret)
-                return ret;
-
-        div = st->mclk / (lval * st->f_order * 1024);
-        if (div < 1 || div > 1023) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        st->mode &= ~AD7192_MODE_RATE(-1);
-        st->mode |= AD7192_MODE_RATE(div);
-        ad_sd_write_reg(&st->sd, AD7192_REG_MODE, 3, st->mode);
-
-out:
-        iio_device_release_direct_mode(indio_dev);
-
-        return ret ? ret : len;
-}
-
-static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
-                ad7192_read_frequency,
-                ad7192_write_frequency);
-
 static ssize_t
 ad7192_show_scale_available(struct device *dev,
                             struct device_attribute *attr, char *buf)
@@ -471,7 +421,6 @@ static IIO_DEVICE_ATTR(ac_excitation_en, S_IRUGO | S_IWUSR,
                        AD7192_REG_MODE);
 
 static struct attribute *ad7192_attributes[] = {
-        &iio_dev_attr_sampling_frequency.dev_attr.attr,
         &iio_dev_attr_in_v_m_v_scale_available.dev_attr.attr,
         &iio_dev_attr_in_voltage_scale_available.dev_attr.attr,
         &iio_dev_attr_bridge_switch_en.dev_attr.attr,
@@ -484,7 +433,6 @@ static const struct attribute_group ad7192_attribute_group = {
 };
 
 static struct attribute *ad7195_attributes[] = {
-        &iio_dev_attr_sampling_frequency.dev_attr.attr,
         &iio_dev_attr_in_v_m_v_scale_available.dev_attr.attr,
         &iio_dev_attr_in_voltage_scale_available.dev_attr.attr,
         &iio_dev_attr_bridge_switch_en.dev_attr.attr,
@@ -536,6 +484,10 @@ static int ad7192_read_raw(struct iio_dev *indio_dev,
                 if (chan->type == IIO_TEMP)
                         *val -= 273 * ad7192_get_temp_scale(unipolar);
                 return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                *val = st->mclk /
+                        (st->f_order * 1024 * AD7192_MODE_RATE(st->mode));
+                return IIO_VAL_INT;
         }
 
         return -EINVAL;
@@ -548,7 +500,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,
                             long mask)
 {
         struct ad7192_state *st = iio_priv(indio_dev);
-        int ret, i;
+        int ret, i, div;
         unsigned int tmp;
 
         ret = iio_device_claim_direct_mode(indio_dev);
@@ -572,6 +524,22 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,
                                 break;
                         }
                 break;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                if (!val) {
+                        ret = -EINVAL;
+                        break;
+                }
+
+                div = st->mclk / (val * st->f_order * 1024);
+                if (div < 1 || div > 1023) {
+                        ret = -EINVAL;
+                        break;
+                }
+
+                st->mode &= ~AD7192_MODE_RATE(-1);
+                st->mode |= AD7192_MODE_RATE(div);
+                ad_sd_write_reg(&st->sd, AD7192_REG_MODE, 3, st->mode);
+                break;
         default:
                 ret = -EINVAL;
         }
@@ -585,7 +553,14 @@ static int ad7192_write_raw_get_fmt(struct iio_dev *indio_dev,
                                     struct iio_chan_spec const *chan,
                                     long mask)
 {
-        return IIO_VAL_INT_PLUS_NANO;
+        switch (mask) {
+        case IIO_CHAN_INFO_SCALE:
+                return IIO_VAL_INT_PLUS_NANO;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                return IIO_VAL_INT;
+        default:
+                return -EINVAL;
+        }
 }
 
 static const struct iio_info ad7192_info = {
@@ -659,15 +634,30 @@ static int ad7192_probe(struct spi_device *spi)
 
         st = iio_priv(indio_dev);
 
-        st->reg = devm_regulator_get(&spi->dev, "vcc");
-        if (!IS_ERR(st->reg)) {
-                ret = regulator_enable(st->reg);
-                if (ret)
-                        return ret;
+        st->avdd = devm_regulator_get(&spi->dev, "avdd");
+        if (IS_ERR(st->avdd))
+                return PTR_ERR(st->avdd);
 
-                voltage_uv = regulator_get_voltage(st->reg);
+        ret = regulator_enable(st->avdd);
+        if (ret) {
+                dev_err(&spi->dev, "Failed to enable specified AVdd supply\n");
+                return ret;
+        }
+
+        st->dvdd = devm_regulator_get(&spi->dev, "dvdd");
+        if (IS_ERR(st->dvdd)) {
+                ret = PTR_ERR(st->dvdd);
+                goto error_disable_avdd;
         }
 
+        ret = regulator_enable(st->dvdd);
+        if (ret) {
+                dev_err(&spi->dev, "Failed to enable specified DVdd supply\n");
+                goto error_disable_avdd;
+        }
+
+        voltage_uv = regulator_get_voltage(st->avdd);
+
         if (pdata->vref_mv)
                 st->int_vref_mv = pdata->vref_mv;
         else if (voltage_uv)
@@ -701,7 +691,7 @@ static int ad7192_probe(struct spi_device *spi)
 
         ret = ad_sd_setup_buffer_and_trigger(indio_dev);
         if (ret)
-                goto error_disable_reg;
+                goto error_disable_dvdd;
 
         ret = ad7192_setup(st, pdata);
         if (ret)
@@ -714,9 +704,10 @@ static int ad7192_probe(struct spi_device *spi)
 
 error_remove_trigger:
         ad_sd_cleanup_buffer_and_trigger(indio_dev);
-error_disable_reg:
-        if (!IS_ERR(st->reg))
-                regulator_disable(st->reg);
+error_disable_dvdd:
+        regulator_disable(st->dvdd);
+error_disable_avdd:
+        regulator_disable(st->avdd);
 
         return ret;
 }
@@ -729,8 +720,8 @@ static int ad7192_remove(struct spi_device *spi)
         iio_device_unregister(indio_dev);
         ad_sd_cleanup_buffer_and_trigger(indio_dev);
 
-        if (!IS_ERR(st->reg))
-                regulator_disable(st->reg);
+        regulator_disable(st->dvdd);
+        regulator_disable(st->avdd);
 
         return 0;
 }
diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index b460dda7eb65..ee679ac0368f 100644
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -777,7 +777,7 @@ static struct attribute *ad7280_event_attributes[] = {
         NULL,
 };
 
-static struct attribute_group ad7280_event_attrs_group = {
+static const struct attribute_group ad7280_event_attrs_group = {
         .attrs = ad7280_event_attributes,
 };
 
diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606.c
index f79ee61851f6..453190864b2f 100644
--- a/drivers/staging/iio/adc/ad7606_core.c
+++ b/drivers/staging/iio/adc/ad7606.c
@@ -13,7 +13,7 @@
 #include <linux/sysfs.h>
 #include <linux/regulator/consumer.h>
 #include <linux/err.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/module.h>
@@ -21,58 +21,109 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
 
 #include "ad7606.h"
 
-int ad7606_reset(struct ad7606_state *st)
+static int ad7606_reset(struct ad7606_state *st)
 {
-        if (gpio_is_valid(st->pdata->gpio_reset)) {
-                gpio_set_value(st->pdata->gpio_reset, 1);
+        if (st->gpio_reset) {
+                gpiod_set_value(st->gpio_reset, 1);
                 ndelay(100); /* t_reset >= 100ns */
-                gpio_set_value(st->pdata->gpio_reset, 0);
+                gpiod_set_value(st->gpio_reset, 0);
                 return 0;
         }
 
         return -ENODEV;
 }
 
+static int ad7606_read_samples(struct ad7606_state *st)
+{
+        unsigned int num = st->chip_info->num_channels;
+        u16 *data = st->data;
+        int ret;
+
+        /*
+         * The frstdata signal is set to high while and after reading the sample
+         * of the first channel and low for all other channels. This can be used
+         * to check that the incoming data is correctly aligned. During normal
+         * operation the data should never become unaligned, but some glitch or
+         * electrostatic discharge might cause an extra read or clock cycle.
+         * Monitoring the frstdata signal allows to recover from such failure
+         * situations.
+         */
+
+        if (st->gpio_frstdata) {
+                ret = st->bops->read_block(st->dev, 1, data);
+                if (ret)
+                        return ret;
+
+                if (!gpiod_get_value(st->gpio_frstdata)) {
+                        ad7606_reset(st);
+                        return -EIO;
+                }
+
+                data++;
+                num--;
+        }
+
+        return st->bops->read_block(st->dev, num, data);
+}
+
+static irqreturn_t ad7606_trigger_handler(int irq, void *p)
+{
+        struct iio_poll_func *pf = p;
+        struct ad7606_state *st = iio_priv(pf->indio_dev);
+
+        gpiod_set_value(st->gpio_convst, 1);
+
+        return IRQ_HANDLED;
+}
+
+/**
+ * ad7606_poll_bh_to_ring() bh of trigger launched polling to ring buffer
+ * @work_s:     the work struct through which this was scheduled
+ *
+ * Currently there is no option in this driver to disable the saving of
+ * timestamps within the ring.
+ * I think the one copy of this at a time was to avoid problems if the
+ * trigger was set far too high and the reads then locked up the computer.
+ **/
+static void ad7606_poll_bh_to_ring(struct work_struct *work_s)
+{
+        struct ad7606_state *st = container_of(work_s, struct ad7606_state,
+                                                poll_work);
+        struct iio_dev *indio_dev = iio_priv_to_dev(st);
+        int ret;
+
+        ret = ad7606_read_samples(st);
+        if (ret == 0)
+                iio_push_to_buffers_with_timestamp(indio_dev, st->data,
+                                                   iio_get_time_ns(indio_dev));
+
+        gpiod_set_value(st->gpio_convst, 0);
+        iio_trigger_notify_done(indio_dev->trig);
+}
+
 static int ad7606_scan_direct(struct iio_dev *indio_dev, unsigned int ch)
 {
         struct ad7606_state *st = iio_priv(indio_dev);
         int ret;
 
         st->done = false;
-        gpio_set_value(st->pdata->gpio_convst, 1);
+        gpiod_set_value(st->gpio_convst, 1);
 
         ret = wait_event_interruptible(st->wq_data_avail, st->done);
         if (ret)
                 goto error_ret;
 
-        if (gpio_is_valid(st->pdata->gpio_frstdata)) {
-                ret = st->bops->read_block(st->dev, 1, st->data);
-                if (ret)
-                        goto error_ret;
-                if (!gpio_get_value(st->pdata->gpio_frstdata)) {
-                        /* This should never happen */
-                        ad7606_reset(st);
-                        ret = -EIO;
-                        goto error_ret;
-                }
-                ret = st->bops->read_block(st->dev,
-                        st->chip_info->num_channels - 1, &st->data[1]);
-                if (ret)
-                        goto error_ret;
-        } else {
-                ret = st->bops->read_block(st->dev,
-                        st->chip_info->num_channels, st->data);
-                if (ret)
-                        goto error_ret;
-        }
-
-        ret = st->data[ch];
+        ret = ad7606_read_samples(st);
+        if (ret == 0)
+                ret = st->data[ch];
 
 error_ret:
-        gpio_set_value(st->pdata->gpio_convst, 0);
+        gpiod_set_value(st->gpio_convst, 0);
 
         return ret;
 }
@@ -103,6 +154,9 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,
                 *val = st->range * 2;
                 *val2 = st->chip_info->channels[0].scan_type.realbits;
                 return IIO_VAL_FRACTIONAL_LOG2;
+        case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
+                *val = st->oversampling;
+                return IIO_VAL_INT;
         }
         return -EINVAL;
 }
@@ -129,12 +183,11 @@ static ssize_t ad7606_store_range(struct device *dev,
         if (ret)
                 return ret;
 
-        if (!(lval == 5000 || lval == 10000)) {
-                dev_err(dev, "range is not supported\n");
+        if (!(lval == 5000 || lval == 10000))
                 return -EINVAL;
-        }
+
         mutex_lock(&indio_dev->mlock);
-        gpio_set_value(st->pdata->gpio_range, lval == 10000);
+        gpiod_set_value(st->gpio_range, lval == 10000);
         st->range = lval;
         mutex_unlock(&indio_dev->mlock);
 
@@ -145,19 +198,9 @@ static IIO_DEVICE_ATTR(in_voltage_range, S_IRUGO | S_IWUSR,
                        ad7606_show_range, ad7606_store_range, 0);
 static IIO_CONST_ATTR(in_voltage_range_available, "5000 10000");
 
-static ssize_t ad7606_show_oversampling_ratio(struct device *dev,
-                                              struct device_attribute *attr,
-                                              char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct ad7606_state *st = iio_priv(indio_dev);
-
-        return sprintf(buf, "%u\n", st->oversampling);
-}
-
 static int ad7606_oversampling_get_index(unsigned int val)
 {
-        unsigned char supported[] = {0, 2, 4, 8, 16, 32, 64};
+        unsigned char supported[] = {1, 2, 4, 8, 16, 32, 64};
         int i;
 
         for (i = 0; i < ARRAY_SIZE(supported); i++)
@@ -167,44 +210,45 @@ static int ad7606_oversampling_get_index(unsigned int val)
         return -EINVAL;
 }
 
-static ssize_t ad7606_store_oversampling_ratio(struct device *dev,
-                                               struct device_attribute *attr,
-                                               const char *buf, size_t count)
+static int ad7606_write_raw(struct iio_dev *indio_dev,
+                            struct iio_chan_spec const *chan,
+                            int val,
+                            int val2,
+                            long mask)
 {
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct ad7606_state *st = iio_priv(indio_dev);
-        unsigned long lval;
+        int values[3];
         int ret;
 
-        ret = kstrtoul(buf, 10, &lval);
-        if (ret)
-                return ret;
+        switch (mask) {
+        case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
+                if (val2)
+                        return -EINVAL;
+                ret = ad7606_oversampling_get_index(val);
+                if (ret < 0)
+                        return ret;
 
-        ret = ad7606_oversampling_get_index(lval);
-        if (ret < 0) {
-                dev_err(dev, "oversampling %lu is not supported\n", lval);
-                return ret;
-        }
+                values[0] = (ret >> 0) & 1;
+                values[1] = (ret >> 1) & 1;
+                values[2] = (ret >> 2) & 1;
 
-        mutex_lock(&indio_dev->mlock);
-        gpio_set_value(st->pdata->gpio_os0, (ret >> 0) & 1);
-        gpio_set_value(st->pdata->gpio_os1, (ret >> 1) & 1);
-        gpio_set_value(st->pdata->gpio_os1, (ret >> 2) & 1);
-        st->oversampling = lval;
-        mutex_unlock(&indio_dev->mlock);
+                mutex_lock(&indio_dev->mlock);
+                gpiod_set_array_value(ARRAY_SIZE(values), st->gpio_os->desc,
+                                      values);
+                st->oversampling = val;
+                mutex_unlock(&indio_dev->mlock);
 
-        return count;
+                return 0;
+        default:
+                return -EINVAL;
+        }
 }
 
-static IIO_DEVICE_ATTR(oversampling_ratio, S_IRUGO | S_IWUSR,
-                       ad7606_show_oversampling_ratio,
-                       ad7606_store_oversampling_ratio, 0);
-static IIO_CONST_ATTR(oversampling_ratio_available, "0 2 4 8 16 32 64");
+static IIO_CONST_ATTR(oversampling_ratio_available, "1 2 4 8 16 32 64");
 
 static struct attribute *ad7606_attributes_os_and_range[] = {
         &iio_dev_attr_in_voltage_range.dev_attr.attr,
         &iio_const_attr_in_voltage_range_available.dev_attr.attr,
-        &iio_dev_attr_oversampling_ratio.dev_attr.attr,
         &iio_const_attr_oversampling_ratio_available.dev_attr.attr,
         NULL,
 };
@@ -214,7 +258,6 @@ static const struct attribute_group ad7606_attribute_group_os_and_range = {
 };
 
 static struct attribute *ad7606_attributes_os[] = {
-        &iio_dev_attr_oversampling_ratio.dev_attr.attr,
         &iio_const_attr_oversampling_ratio_available.dev_attr.attr,
         NULL,
 };
@@ -241,6 +284,8 @@ static const struct attribute_group ad7606_attribute_group_range = {
                 .address = num,                                 \
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),   \
                 .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\
+                .info_mask_shared_by_all =                      \
+                        BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO),  \
                 .scan_index = num,                              \
                 .scan_type = {                                  \
                         .sign = 's',                            \
@@ -267,20 +312,14 @@ static const struct ad7606_chip_info ad7606_chip_info_tbl[] = {
          * More devices added in future
          */
         [ID_AD7606_8] = {
-                .name = "ad7606",
-                .int_vref_mv = 2500,
                 .channels = ad7606_channels,
                 .num_channels = 9,
         },
         [ID_AD7606_6] = {
-                .name = "ad7606-6",
-                .int_vref_mv = 2500,
                 .channels = ad7606_channels,
                 .num_channels = 7,
         },
         [ID_AD7606_4] = {
-                .name = "ad7606-4",
-                .int_vref_mv = 2500,
                 .channels = ad7606_channels,
                 .num_channels = 5,
         },
@@ -288,119 +327,34 @@ static const struct ad7606_chip_info ad7606_chip_info_tbl[] = {
 
 static int ad7606_request_gpios(struct ad7606_state *st)
 {
-        struct gpio gpio_array[3] = {
-                [0] = {
-                        .gpio =  st->pdata->gpio_os0,
-                        .flags = GPIOF_DIR_OUT | ((st->oversampling & 1) ?
-                                 GPIOF_INIT_HIGH : GPIOF_INIT_LOW),
-                        .label = "AD7606_OS0",
-                },
-                [1] = {
-                        .gpio =  st->pdata->gpio_os1,
-                        .flags = GPIOF_DIR_OUT | ((st->oversampling & 2) ?
-                                 GPIOF_INIT_HIGH : GPIOF_INIT_LOW),
-                        .label = "AD7606_OS1",
-                },
-                [2] = {
-                        .gpio =  st->pdata->gpio_os2,
-                        .flags = GPIOF_DIR_OUT | ((st->oversampling & 4) ?
-                                 GPIOF_INIT_HIGH : GPIOF_INIT_LOW),
-                        .label = "AD7606_OS2",
-                },
-        };
-        int ret;
-
-        if (gpio_is_valid(st->pdata->gpio_convst)) {
-                ret = gpio_request_one(st->pdata->gpio_convst,
-                                       GPIOF_OUT_INIT_LOW,
-                                       "AD7606_CONVST");
-                if (ret) {
-                        dev_err(st->dev, "failed to request GPIO CONVST\n");
-                        goto error_ret;
-                }
-        } else {
-                ret = -EIO;
-                goto error_ret;
-        }
-
-        if (gpio_is_valid(st->pdata->gpio_os0) &&
-            gpio_is_valid(st->pdata->gpio_os1) &&
-            gpio_is_valid(st->pdata->gpio_os2)) {
-                ret = gpio_request_array(gpio_array, ARRAY_SIZE(gpio_array));
-                if (ret < 0)
-                        goto error_free_convst;
-        }
-
-        if (gpio_is_valid(st->pdata->gpio_reset)) {
-                ret = gpio_request_one(st->pdata->gpio_reset,
-                                       GPIOF_OUT_INIT_LOW,
-                                       "AD7606_RESET");
-                if (ret < 0)
-                        goto error_free_os;
-        }
-
-        if (gpio_is_valid(st->pdata->gpio_range)) {
-                ret = gpio_request_one(st->pdata->gpio_range, GPIOF_DIR_OUT |
-                                       ((st->range == 10000) ? GPIOF_INIT_HIGH :
-                                        GPIOF_INIT_LOW), "AD7606_RANGE");
-                if (ret < 0)
-                        goto error_free_reset;
-        }
-        if (gpio_is_valid(st->pdata->gpio_stby)) {
-                ret = gpio_request_one(st->pdata->gpio_stby,
-                                       GPIOF_OUT_INIT_HIGH,
-                                       "AD7606_STBY");
-                if (ret < 0)
-                        goto error_free_range;
-        }
-
-        if (gpio_is_valid(st->pdata->gpio_frstdata)) {
-                ret = gpio_request_one(st->pdata->gpio_frstdata, GPIOF_IN,
-                                       "AD7606_FRSTDATA");
-                if (ret < 0)
-                        goto error_free_stby;
-        }
-
-        return 0;
-
-error_free_stby:
-        if (gpio_is_valid(st->pdata->gpio_stby))
-                gpio_free(st->pdata->gpio_stby);
-error_free_range:
-        if (gpio_is_valid(st->pdata->gpio_range))
-                gpio_free(st->pdata->gpio_range);
-error_free_reset:
-        if (gpio_is_valid(st->pdata->gpio_reset))
-                gpio_free(st->pdata->gpio_reset);
-error_free_os:
-        if (gpio_is_valid(st->pdata->gpio_os0) &&
-            gpio_is_valid(st->pdata->gpio_os1) &&
-            gpio_is_valid(st->pdata->gpio_os2))
-                gpio_free_array(gpio_array, ARRAY_SIZE(gpio_array));
-error_free_convst:
-        gpio_free(st->pdata->gpio_convst);
-error_ret:
-        return ret;
-}
-
-static void ad7606_free_gpios(struct ad7606_state *st)
-{
-        if (gpio_is_valid(st->pdata->gpio_frstdata))
-                gpio_free(st->pdata->gpio_frstdata);
-        if (gpio_is_valid(st->pdata->gpio_stby))
-                gpio_free(st->pdata->gpio_stby);
-        if (gpio_is_valid(st->pdata->gpio_range))
-                gpio_free(st->pdata->gpio_range);
-        if (gpio_is_valid(st->pdata->gpio_reset))
-                gpio_free(st->pdata->gpio_reset);
-        if (gpio_is_valid(st->pdata->gpio_os0) &&
-            gpio_is_valid(st->pdata->gpio_os1) &&
-            gpio_is_valid(st->pdata->gpio_os2)) {
-                gpio_free(st->pdata->gpio_os2);
-                gpio_free(st->pdata->gpio_os1);
-                gpio_free(st->pdata->gpio_os0);
-        }
-        gpio_free(st->pdata->gpio_convst);
+        struct device *dev = st->dev;
+
+        st->gpio_convst = devm_gpiod_get(dev, "conversion-start",
+                                         GPIOD_OUT_LOW);
+        if (IS_ERR(st->gpio_convst))
+                return PTR_ERR(st->gpio_convst);
+
+        st->gpio_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
+        if (IS_ERR(st->gpio_reset))
+                return PTR_ERR(st->gpio_reset);
+
+        st->gpio_range = devm_gpiod_get_optional(dev, "range", GPIOD_OUT_LOW);
+        if (IS_ERR(st->gpio_range))
+                return PTR_ERR(st->gpio_range);
+
+        st->gpio_standby = devm_gpiod_get_optional(dev, "standby",
+                                                   GPIOD_OUT_HIGH);
+        if (IS_ERR(st->gpio_standby))
+                return PTR_ERR(st->gpio_standby);
+
+        st->gpio_frstdata = devm_gpiod_get_optional(dev, "first-data",
+                                                    GPIOD_IN);
+        if (IS_ERR(st->gpio_frstdata))
+                return PTR_ERR(st->gpio_frstdata);
+
+        st->gpio_os = devm_gpiod_get_array_optional(dev, "oversampling-ratio",
+                        GPIOD_OUT_LOW);
+        return PTR_ERR_OR_ZERO(st->gpio_os);
 }
 
 /**
@@ -429,12 +383,14 @@ static const struct iio_info ad7606_info_no_os_or_range = {
 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,
 };
 
@@ -444,81 +400,73 @@ static const struct iio_info ad7606_info_range = {
         .attrs = &ad7606_attribute_group_range,
 };
 
-struct iio_dev *ad7606_probe(struct device *dev, int irq,
-                             void __iomem *base_address,
-                             unsigned int id,
-                             const struct ad7606_bus_ops *bops)
+int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,
+                 const char *name, unsigned int id,
+                 const struct ad7606_bus_ops *bops)
 {
-        struct ad7606_platform_data *pdata = dev->platform_data;
         struct ad7606_state *st;
         int ret;
         struct iio_dev *indio_dev;
 
         indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
         if (!indio_dev)
-                return ERR_PTR(-ENOMEM);
+                return -ENOMEM;
 
         st = iio_priv(indio_dev);
 
         st->dev = dev;
         st->bops = bops;
         st->base_address = base_address;
-        st->range = pdata->default_range == 10000 ? 10000 : 5000;
+        st->range = 5000;
+        st->oversampling = 1;
+        INIT_WORK(&st->poll_work, &ad7606_poll_bh_to_ring);
 
-        ret = ad7606_oversampling_get_index(pdata->default_os);
-        if (ret < 0) {
-                dev_warn(dev, "oversampling %d is not supported\n",
-                         pdata->default_os);
-                st->oversampling = 0;
-        } else {
-                st->oversampling = pdata->default_os;
-        }
+        st->reg = devm_regulator_get(dev, "avcc");
+        if (IS_ERR(st->reg))
+                return PTR_ERR(st->reg);
 
-        st->reg = devm_regulator_get(dev, "vcc");
-        if (!IS_ERR(st->reg)) {
-                ret = regulator_enable(st->reg);
-                if (ret)
-                        return ERR_PTR(ret);
+        ret = regulator_enable(st->reg);
+        if (ret) {
+                dev_err(dev, "Failed to enable specified AVcc supply\n");
+                return ret;
         }
 
-        st->pdata = pdata;
+        ret = ad7606_request_gpios(st);
+        if (ret)
+                goto error_disable_reg;
+
         st->chip_info = &ad7606_chip_info_tbl[id];
 
         indio_dev->dev.parent = dev;
-        if (gpio_is_valid(st->pdata->gpio_os0) &&
-            gpio_is_valid(st->pdata->gpio_os1) &&
-            gpio_is_valid(st->pdata->gpio_os2)) {
-                if (gpio_is_valid(st->pdata->gpio_range))
+        if (st->gpio_os) {
+                if (st->gpio_range)
                         indio_dev->info = &ad7606_info_os_and_range;
                 else
                         indio_dev->info = &ad7606_info_os;
         } else {
-                if (gpio_is_valid(st->pdata->gpio_range))
+                if (st->gpio_range)
                         indio_dev->info = &ad7606_info_range;
                 else
                         indio_dev->info = &ad7606_info_no_os_or_range;
         }
         indio_dev->modes = INDIO_DIRECT_MODE;
-        indio_dev->name = st->chip_info->name;
+        indio_dev->name = name;
         indio_dev->channels = st->chip_info->channels;
         indio_dev->num_channels = st->chip_info->num_channels;
 
         init_waitqueue_head(&st->wq_data_avail);
 
-        ret = ad7606_request_gpios(st);
-        if (ret)
-                goto error_disable_reg;
-
         ret = ad7606_reset(st);
         if (ret)
                 dev_warn(st->dev, "failed to RESET: no RESET GPIO specified\n");
 
-        ret = request_irq(irq, ad7606_interrupt,
-                          IRQF_TRIGGER_FALLING, st->chip_info->name, indio_dev);
+        ret = request_irq(irq, ad7606_interrupt, IRQF_TRIGGER_FALLING, name,
+                          indio_dev);
         if (ret)
-                goto error_free_gpios;
+                goto error_disable_reg;
 
-        ret = ad7606_register_ring_funcs_and_init(indio_dev);
+        ret = iio_triggered_buffer_setup(indio_dev, &ad7606_trigger_handler,
+                                         NULL, NULL);
         if (ret)
                 goto error_free_irq;
 
@@ -526,35 +474,31 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq,
         if (ret)
                 goto error_unregister_ring;
 
-        return indio_dev;
+        dev_set_drvdata(dev, indio_dev);
+
+        return 0;
 error_unregister_ring:
-        ad7606_ring_cleanup(indio_dev);
+        iio_triggered_buffer_cleanup(indio_dev);
 
 error_free_irq:
         free_irq(irq, indio_dev);
 
-error_free_gpios:
-        ad7606_free_gpios(st);
-
 error_disable_reg:
-        if (!IS_ERR(st->reg))
-                regulator_disable(st->reg);
-        return ERR_PTR(ret);
+        regulator_disable(st->reg);
+        return ret;
 }
 EXPORT_SYMBOL_GPL(ad7606_probe);
 
-int ad7606_remove(struct iio_dev *indio_dev, int irq)
+int ad7606_remove(struct device *dev, int irq)
 {
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct ad7606_state *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        ad7606_ring_cleanup(indio_dev);
+        iio_triggered_buffer_cleanup(indio_dev);
 
         free_irq(irq, indio_dev);
-        if (!IS_ERR(st->reg))
-                regulator_disable(st->reg);
-
-        ad7606_free_gpios(st);
+        regulator_disable(st->reg);
 
         return 0;
 }
@@ -567,10 +511,9 @@ static int ad7606_suspend(struct device *dev)
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct ad7606_state *st = iio_priv(indio_dev);
 
-        if (gpio_is_valid(st->pdata->gpio_stby)) {
-                if (gpio_is_valid(st->pdata->gpio_range))
-                        gpio_set_value(st->pdata->gpio_range, 1);
-                gpio_set_value(st->pdata->gpio_stby, 0);
+        if (st->gpio_standby) {
+                gpiod_set_value(st->gpio_range, 1);
+                gpiod_set_value(st->gpio_standby, 0);
         }
 
         return 0;
@@ -581,12 +524,9 @@ static int ad7606_resume(struct device *dev)
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct ad7606_state *st = iio_priv(indio_dev);
 
-        if (gpio_is_valid(st->pdata->gpio_stby)) {
-                if (gpio_is_valid(st->pdata->gpio_range))
-                        gpio_set_value(st->pdata->gpio_range,
-                                       st->range == 10000);
-
-                gpio_set_value(st->pdata->gpio_stby, 1);
+        if (st->gpio_standby) {
+                gpiod_set_value(st->gpio_range, st->range == 10000);
+                gpiod_set_value(st->gpio_standby, 1);
                 ad7606_reset(st);
         }
 
diff --git a/drivers/staging/iio/adc/ad7606.h b/drivers/staging/iio/adc/ad7606.h
index 39f50440d915..746f9553d2ba 100644
--- a/drivers/staging/iio/adc/ad7606.h
+++ b/drivers/staging/iio/adc/ad7606.h
@@ -9,48 +9,14 @@
 #ifndef IIO_ADC_AD7606_H_
 #define IIO_ADC_AD7606_H_
 
-/*
- * TODO: struct ad7606_platform_data needs to go into include/linux/iio
- */
-
-/**
- * struct ad7606_platform_data - platform/board specific information
- * @default_os:         default oversampling value {0, 2, 4, 8, 16, 32, 64}
- * @default_range:      default range +/-{5000, 10000} mVolt
- * @gpio_convst:        number of gpio connected to the CONVST pin
- * @gpio_reset:         gpio connected to the RESET pin, if not used set to -1
- * @gpio_range:         gpio connected to the RANGE pin, if not used set to -1
- * @gpio_os0:           gpio connected to the OS0 pin, if not used set to -1
- * @gpio_os1:           gpio connected to the OS1 pin, if not used set to -1
- * @gpio_os2:           gpio connected to the OS2 pin, if not used set to -1
- * @gpio_frstdata:      gpio connected to the FRSTDAT pin, if not used set to -1
- * @gpio_stby:          gpio connected to the STBY pin, if not used set to -1
- */
-
-struct ad7606_platform_data {
-        unsigned int                    default_os;
-        unsigned int                    default_range;
-        unsigned int                    gpio_convst;
-        unsigned int                    gpio_reset;
-        unsigned int                    gpio_range;
-        unsigned int                    gpio_os0;
-        unsigned int                    gpio_os1;
-        unsigned int                    gpio_os2;
-        unsigned int                    gpio_frstdata;
-        unsigned int                    gpio_stby;
-};
-
 /**
  * struct ad7606_chip_info - chip specific information
  * @name:               identification string for chip
- * @int_vref_mv:        the internal reference voltage
  * @channels:           channel specification
  * @num_channels:       number of channels
  */
 
 struct ad7606_chip_info {
-        const char                      *name;
-        u16                             int_vref_mv;
         const struct iio_chan_spec      *channels;
         unsigned int                    num_channels;
 };
@@ -62,7 +28,6 @@ struct ad7606_chip_info {
 struct ad7606_state {
         struct device                   *dev;
         const struct ad7606_chip_info   *chip_info;
-        struct ad7606_platform_data     *pdata;
         struct regulator                *reg;
         struct work_struct              poll_work;
         wait_queue_head_t               wq_data_avail;
@@ -72,12 +37,19 @@ struct ad7606_state {
         bool                            done;
         void __iomem                    *base_address;
 
+        struct gpio_desc                *gpio_convst;
+        struct gpio_desc                *gpio_reset;
+        struct gpio_desc                *gpio_range;
+        struct gpio_desc                *gpio_standby;
+        struct gpio_desc                *gpio_frstdata;
+        struct gpio_descs               *gpio_os;
+
         /*
          * DMA (thus cache coherency maintenance) requires the
          * transfer buffers to live in their own cache lines.
+         * 8 * 16-bit samples + 64-bit timestamp
          */
-
-        unsigned short                  data[8] ____cacheline_aligned;
+        unsigned short                  data[12] ____cacheline_aligned;
 };
 
 struct ad7606_bus_ops {
@@ -85,11 +57,10 @@ struct ad7606_bus_ops {
         int (*read_block)(struct device *, int, void *);
 };
 
-struct iio_dev *ad7606_probe(struct device *dev, int irq,
-                              void __iomem *base_address, unsigned int id,
-                              const struct ad7606_bus_ops *bops);
-int ad7606_remove(struct iio_dev *indio_dev, int irq);
-int ad7606_reset(struct ad7606_state *st);
+int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,
+                 const char *name, unsigned int id,
+                 const struct ad7606_bus_ops *bops);
+int ad7606_remove(struct device *dev, int irq);
 
 enum ad7606_supported_device_ids {
         ID_AD7606_8,
@@ -97,9 +68,6 @@ enum ad7606_supported_device_ids {
         ID_AD7606_4
 };
 
-int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev);
-void ad7606_ring_cleanup(struct iio_dev *indio_dev);
-
 #ifdef CONFIG_PM_SLEEP
 extern const struct dev_pm_ops ad7606_pm_ops;
 #define AD7606_PM_OPS (&ad7606_pm_ops)
diff --git a/drivers/staging/iio/adc/ad7606_par.c b/drivers/staging/iio/adc/ad7606_par.c
index 84d23930fdde..cd6c410c0484 100644
--- a/drivers/staging/iio/adc/ad7606_par.c
+++ b/drivers/staging/iio/adc/ad7606_par.c
@@ -49,8 +49,8 @@ static const struct ad7606_bus_ops ad7606_par8_bops = {
 
 static int ad7606_par_probe(struct platform_device *pdev)
 {
+        const struct platform_device_id *id = platform_get_device_id(pdev);
         struct resource *res;
-        struct iio_dev *indio_dev;
         void __iomem *addr;
         resource_size_t remap_size;
         int irq;
@@ -68,26 +68,15 @@ static int ad7606_par_probe(struct platform_device *pdev)
 
         remap_size = resource_size(res);
 
-        indio_dev = ad7606_probe(&pdev->dev, irq, addr,
-                                 platform_get_device_id(pdev)->driver_data,
-                                 remap_size > 1 ? &ad7606_par16_bops :
-                                 &ad7606_par8_bops);
-
-        if (IS_ERR(indio_dev))
-                return PTR_ERR(indio_dev);
-
-        platform_set_drvdata(pdev, indio_dev);
-
-        return 0;
+        return ad7606_probe(&pdev->dev, irq, addr,
+                            id->name, id->driver_data,
+                            remap_size > 1 ? &ad7606_par16_bops :
+                            &ad7606_par8_bops);
 }
 
 static int ad7606_par_remove(struct platform_device *pdev)
 {
-        struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-
-        ad7606_remove(indio_dev, platform_get_irq(pdev, 0));
-
-        return 0;
+        return ad7606_remove(&pdev->dev, platform_get_irq(pdev, 0));
 }
 
 static const struct platform_device_id ad7606_driver_ids[] = {
diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c
deleted file mode 100644
index 0572df9aad85..000000000000
--- a/drivers/staging/iio/adc/ad7606_ring.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2011-2012 Analog Devices Inc.
- *
- * Licensed under the GPL-2.
- *
- */
-
-#include <linux/interrupt.h>
-#include <linux/gpio.h>
-#include <linux/device.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-
-#include <linux/iio/iio.h>
-#include <linux/iio/buffer.h>
-#include <linux/iio/trigger_consumer.h>
-#include <linux/iio/triggered_buffer.h>
-
-#include "ad7606.h"
-
-/**
- * ad7606_trigger_handler_th() th/bh of trigger launched polling to ring buffer
- *
- **/
-static irqreturn_t ad7606_trigger_handler_th_bh(int irq, void *p)
-{
-        struct iio_poll_func *pf = p;
-        struct ad7606_state *st = iio_priv(pf->indio_dev);
-
-        gpio_set_value(st->pdata->gpio_convst, 1);
-
-        return IRQ_HANDLED;
-}
-
-/**
- * ad7606_poll_bh_to_ring() bh of trigger launched polling to ring buffer
- * @work_s:     the work struct through which this was scheduled
- *
- * Currently there is no option in this driver to disable the saving of
- * timestamps within the ring.
- * I think the one copy of this at a time was to avoid problems if the
- * trigger was set far too high and the reads then locked up the computer.
- **/
-static void ad7606_poll_bh_to_ring(struct work_struct *work_s)
-{
-        struct ad7606_state *st = container_of(work_s, struct ad7606_state,
-                                                poll_work);
-        struct iio_dev *indio_dev = iio_priv_to_dev(st);
-        __u8 *buf;
-        int ret;
-
-        buf = kzalloc(indio_dev->scan_bytes, GFP_KERNEL);
-        if (!buf)
-                return;
-
-        if (gpio_is_valid(st->pdata->gpio_frstdata)) {
-                ret = st->bops->read_block(st->dev, 1, buf);
-                if (ret)
-                        goto done;
-                if (!gpio_get_value(st->pdata->gpio_frstdata)) {
-                        /* This should never happen. However
-                         * some signal glitch caused by bad PCB desgin or
-                         * electrostatic discharge, could cause an extra read
-                         * or clock. This allows recovery.
-                         */
-                        ad7606_reset(st);
-                        goto done;
-                }
-                ret = st->bops->read_block(st->dev,
-                        st->chip_info->num_channels - 1, buf + 2);
-                if (ret)
-                        goto done;
-        } else {
-                ret = st->bops->read_block(st->dev,
-                        st->chip_info->num_channels, buf);
-                if (ret)
-                        goto done;
-        }
-
-        iio_push_to_buffers_with_timestamp(indio_dev, buf,
-                                           iio_get_time_ns(indio_dev));
-done:
-        gpio_set_value(st->pdata->gpio_convst, 0);
-        iio_trigger_notify_done(indio_dev->trig);
-        kfree(buf);
-}
-
-int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
-{
-        struct ad7606_state *st = iio_priv(indio_dev);
-
-        INIT_WORK(&st->poll_work, &ad7606_poll_bh_to_ring);
-
-        return iio_triggered_buffer_setup(indio_dev,
-                &ad7606_trigger_handler_th_bh, &ad7606_trigger_handler_th_bh,
-                NULL);
-}
-
-void ad7606_ring_cleanup(struct iio_dev *indio_dev)
-{
-        iio_triggered_buffer_cleanup(indio_dev);
-}
diff --git a/drivers/staging/iio/adc/ad7606_spi.c b/drivers/staging/iio/adc/ad7606_spi.c
index 9587fa86dc69..c9b1f26685f4 100644
--- a/drivers/staging/iio/adc/ad7606_spi.c
+++ b/drivers/staging/iio/adc/ad7606_spi.c
@@ -42,25 +42,16 @@ static const struct ad7606_bus_ops ad7606_spi_bops = {
 
 static int ad7606_spi_probe(struct spi_device *spi)
 {
-        struct iio_dev *indio_dev;
+        const struct spi_device_id *id = spi_get_device_id(spi);
 
-        indio_dev = ad7606_probe(&spi->dev, spi->irq, NULL,
-                                 spi_get_device_id(spi)->driver_data,
-                                 &ad7606_spi_bops);
-
-        if (IS_ERR(indio_dev))
-                return PTR_ERR(indio_dev);
-
-        spi_set_drvdata(spi, indio_dev);
-
-        return 0;
+        return ad7606_probe(&spi->dev, spi->irq, NULL,
+                            id->name, id->driver_data,
+                            &ad7606_spi_bops);
 }
 
 static int ad7606_spi_remove(struct spi_device *spi)
 {
-        struct iio_dev *indio_dev = dev_get_drvdata(&spi->dev);
-
-        return ad7606_remove(indio_dev, spi->irq);
+        return ad7606_remove(&spi->dev, spi->irq);
 }
 
 static const struct spi_device_id ad7606_id[] = {
diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c
index c9a0c2aa602f..e14960038d3e 100644
--- a/drivers/staging/iio/adc/ad7780.c
+++ b/drivers/staging/iio/adc/ad7780.c
@@ -173,14 +173,16 @@ static int ad7780_probe(struct spi_device *spi)
 
         ad_sd_init(&st->sd, indio_dev, spi, &ad7780_sigma_delta_info);
 
-        st->reg = devm_regulator_get(&spi->dev, "vcc");
-        if (!IS_ERR(st->reg)) {
-                ret = regulator_enable(st->reg);
-                if (ret)
-                        return ret;
-
-                voltage_uv = regulator_get_voltage(st->reg);
+        st->reg = devm_regulator_get(&spi->dev, "avdd");
+        if (IS_ERR(st->reg))
+                return PTR_ERR(st->reg);
+
+        ret = regulator_enable(st->reg);
+        if (ret) {
+                dev_err(&spi->dev, "Failed to enable specified AVdd supply\n");
+                return ret;
         }
+        voltage_uv = regulator_get_voltage(st->reg);
 
         st->chip_info =
                 &ad7780_chip_info_tbl[spi_get_device_id(spi)->driver_data];
@@ -222,8 +224,7 @@ static int ad7780_probe(struct spi_device *spi)
 error_cleanup_buffer_and_trigger:
         ad_sd_cleanup_buffer_and_trigger(indio_dev);
 error_disable_reg:
-        if (!IS_ERR(st->reg))
-                regulator_disable(st->reg);
+        regulator_disable(st->reg);
 
         return ret;
 }
@@ -236,8 +237,7 @@ static int ad7780_remove(struct spi_device *spi)
         iio_device_unregister(indio_dev);
         ad_sd_cleanup_buffer_and_trigger(indio_dev);
 
-        if (!IS_ERR(st->reg))
-                regulator_disable(st->reg);
+        regulator_disable(st->reg);
 
         return 0;
 }
diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c
index 5e8115b01011..72551f827382 100644
--- a/drivers/staging/iio/adc/ad7816.c
+++ b/drivers/staging/iio/adc/ad7816.c
@@ -327,7 +327,7 @@ static struct attribute *ad7816_event_attributes[] = {
         NULL,
 };
 
-static struct attribute_group ad7816_event_attribute_group = {
+static const struct attribute_group ad7816_event_attribute_group = {
         .attrs = ad7816_event_attributes,
         .name = "events",
 };
diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c
index 3faffe59c933..a7d90c8bac5e 100644
--- a/drivers/staging/iio/addac/adt7316.c
+++ b/drivers/staging/iio/addac/adt7316.c
@@ -2039,7 +2039,7 @@ static struct attribute *adt7316_event_attributes[] = {
         NULL,
 };
 
-static struct attribute_group adt7316_event_attribute_group = {
+static const struct attribute_group adt7316_event_attribute_group = {
         .attrs = adt7316_event_attributes,
         .name = "events",
 };
@@ -2060,7 +2060,7 @@ static struct attribute *adt7516_event_attributes[] = {
         NULL,
 };
 
-static struct attribute_group adt7516_event_attribute_group = {
+static const struct attribute_group adt7516_event_attribute_group = {
         .attrs = adt7516_event_attributes,
         .name = "events",
 };
diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c
index 5578a077fcfb..6998c3ddfb6a 100644
--- a/drivers/staging/iio/cdc/ad7150.c
+++ b/drivers/staging/iio/cdc/ad7150.c
@@ -562,7 +562,7 @@ static struct attribute *ad7150_event_attributes[] = {
         NULL,
 };
 
-static struct attribute_group ad7150_event_attribute_group = {
+static const struct attribute_group ad7150_event_attribute_group = {
         .attrs = ad7150_event_attributes,
         .name = "events",
 };
diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c
index 485d0a5af53c..b91b50f345bd 100644
--- a/drivers/staging/iio/cdc/ad7152.c
+++ b/drivers/staging/iio/cdc/ad7152.c
@@ -89,6 +89,7 @@ struct ad7152_chip_info {
          */
         u8      filter_rate_setup;
         u8      setup[2];
+        struct mutex state_lock;        /* protect hardware state */
 };
 
 static inline ssize_t ad7152_start_calib(struct device *dev,
@@ -115,10 +116,10 @@ static inline ssize_t ad7152_start_calib(struct device *dev,
         else
                 regval |= AD7152_CONF_CH2EN;
 
-        mutex_lock(&indio_dev->mlock);
+        mutex_lock(&chip->state_lock);
         ret = i2c_smbus_write_byte_data(chip->client, AD7152_REG_CFG, regval);
         if (ret < 0) {
-                mutex_unlock(&indio_dev->mlock);
+                mutex_unlock(&chip->state_lock);
                 return ret;
         }
 
@@ -126,14 +127,15 @@ static inline ssize_t ad7152_start_calib(struct device *dev,
                 mdelay(20);
                 ret = i2c_smbus_read_byte_data(chip->client, AD7152_REG_CFG);
                 if (ret < 0) {
-                        mutex_unlock(&indio_dev->mlock);
+                        mutex_unlock(&chip->state_lock);
                         return ret;
                 }
         } while ((ret == regval) && timeout--);
 
-        mutex_unlock(&indio_dev->mlock);
+        mutex_unlock(&chip->state_lock);
         return len;
 }
+
 static ssize_t ad7152_start_offset_calib(struct device *dev,
                                          struct device_attribute *attr,
                                          const char *buf,
@@ -142,6 +144,7 @@ static ssize_t ad7152_start_offset_calib(struct device *dev,
         return ad7152_start_calib(dev, attr, buf, len,
                                   AD7152_CONF_MODE_OFFS_CAL);
 }
+
 static ssize_t ad7152_start_gain_calib(struct device *dev,
                                        struct device_attribute *attr,
                                        const char *buf,
@@ -165,63 +168,12 @@ static const unsigned char ad7152_filter_rate_table[][2] = {
         {200, 5 + 1}, {50, 20 + 1}, {20, 50 + 1}, {17, 60 + 1},
 };
 
-static ssize_t ad7152_show_filter_rate_setup(struct device *dev,
-                struct device_attribute *attr,
-                char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct ad7152_chip_info *chip = iio_priv(indio_dev);
-
-        return sprintf(buf, "%d\n",
-                       ad7152_filter_rate_table[chip->filter_rate_setup][0]);
-}
-
-static ssize_t ad7152_store_filter_rate_setup(struct device *dev,
-                struct device_attribute *attr,
-                const char *buf,
-                size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct ad7152_chip_info *chip = iio_priv(indio_dev);
-        u8 data;
-        int ret, i;
-
-        ret = kstrtou8(buf, 10, &data);
-        if (ret < 0)
-                return ret;
-
-        for (i = 0; i < ARRAY_SIZE(ad7152_filter_rate_table); i++)
-                if (data >= ad7152_filter_rate_table[i][0])
-                        break;
-
-        if (i >= ARRAY_SIZE(ad7152_filter_rate_table))
-                i = ARRAY_SIZE(ad7152_filter_rate_table) - 1;
-
-        mutex_lock(&indio_dev->mlock);
-        ret = i2c_smbus_write_byte_data(chip->client,
-                        AD7152_REG_CFG2, AD7152_CFG2_OSR(i));
-        if (ret < 0) {
-                mutex_unlock(&indio_dev->mlock);
-                return ret;
-        }
-
-        chip->filter_rate_setup = i;
-        mutex_unlock(&indio_dev->mlock);
-
-        return len;
-}
-
-static IIO_DEV_ATTR_SAMP_FREQ(S_IRUGO | S_IWUSR,
-                ad7152_show_filter_rate_setup,
-                ad7152_store_filter_rate_setup);
-
 static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("200 50 20 17");
 
 static IIO_CONST_ATTR(in_capacitance_scale_available,
                       "0.000061050 0.000030525 0.000015263 0.000007631");
 
 static struct attribute *ad7152_attributes[] = {
-        &iio_dev_attr_sampling_frequency.dev_attr.attr,
         &iio_dev_attr_in_capacitance0_calibbias_calibration.dev_attr.attr,
         &iio_dev_attr_in_capacitance1_calibbias_calibration.dev_attr.attr,
         &iio_dev_attr_in_capacitance0_calibscale_calibration.dev_attr.attr,
@@ -247,6 +199,51 @@ static const int ad7152_scale_table[] = {
         30525, 7631, 15263, 61050
 };
 
+/**
+ * read_raw handler for IIO_CHAN_INFO_SAMP_FREQ
+ *
+ * lock must be held
+ **/
+static int ad7152_read_raw_samp_freq(struct device *dev, int *val)
+{
+        struct ad7152_chip_info *chip = iio_priv(dev_to_iio_dev(dev));
+
+        *val = ad7152_filter_rate_table[chip->filter_rate_setup][0];
+
+        return 0;
+}
+
+/**
+ * write_raw handler for IIO_CHAN_INFO_SAMP_FREQ
+ *
+ * lock must be held
+ **/
+static int ad7152_write_raw_samp_freq(struct device *dev, int val)
+{
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+        struct ad7152_chip_info *chip = iio_priv(indio_dev);
+        int ret, i;
+
+        for (i = 0; i < ARRAY_SIZE(ad7152_filter_rate_table); i++)
+                if (val >= ad7152_filter_rate_table[i][0])
+                        break;
+
+        if (i >= ARRAY_SIZE(ad7152_filter_rate_table))
+                i = ARRAY_SIZE(ad7152_filter_rate_table) - 1;
+
+        mutex_lock(&chip->state_lock);
+        ret = i2c_smbus_write_byte_data(chip->client,
+                                        AD7152_REG_CFG2, AD7152_CFG2_OSR(i));
+        if (ret < 0) {
+                mutex_unlock(&chip->state_lock);
+                return ret;
+        }
+
+        chip->filter_rate_setup = i;
+        mutex_unlock(&chip->state_lock);
+
+        return ret;
+}
 static int ad7152_write_raw(struct iio_dev *indio_dev,
                             struct iio_chan_spec const *chan,
                             int val,
@@ -256,7 +253,7 @@ static int ad7152_write_raw(struct iio_dev *indio_dev,
         struct ad7152_chip_info *chip = iio_priv(indio_dev);
         int ret, i;
 
-        mutex_lock(&indio_dev->mlock);
+        mutex_lock(&chip->state_lock);
 
         switch (mask) {
         case IIO_CHAN_INFO_CALIBSCALE:
@@ -309,14 +306,26 @@ static int ad7152_write_raw(struct iio_dev *indio_dev,
 
                 ret = 0;
                 break;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                if (val2) {
+                        ret = -EINVAL;
+                        goto out;
+                }
+                ret = ad7152_write_raw_samp_freq(&indio_dev->dev, val);
+                if (ret < 0)
+                        goto out;
+
+                ret = 0;
+                break;
         default:
                 ret = -EINVAL;
         }
 
 out:
-        mutex_unlock(&indio_dev->mlock);
+        mutex_unlock(&chip->state_lock);
         return ret;
 }
+
 static int ad7152_read_raw(struct iio_dev *indio_dev,
                            struct iio_chan_spec const *chan,
                            int *val, int *val2,
@@ -326,7 +335,7 @@ static int ad7152_read_raw(struct iio_dev *indio_dev,
         int ret;
         u8 regval = 0;
 
-        mutex_lock(&indio_dev->mlock);
+        mutex_lock(&chip->state_lock);
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
@@ -403,11 +412,18 @@ static int ad7152_read_raw(struct iio_dev *indio_dev,
 
                 ret = IIO_VAL_INT_PLUS_NANO;
                 break;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                ret = ad7152_read_raw_samp_freq(&indio_dev->dev, val);
+                if (ret < 0)
+                        goto out;
+
+                ret = IIO_VAL_INT;
+                break;
         default:
                 ret = -EINVAL;
         }
 out:
-        mutex_unlock(&indio_dev->mlock);
+        mutex_unlock(&chip->state_lock);
         return ret;
 }
 
@@ -440,6 +456,7 @@ static const struct iio_chan_spec ad7152_channels[] = {
                 BIT(IIO_CHAN_INFO_CALIBSCALE) |
                 BIT(IIO_CHAN_INFO_CALIBBIAS) |
                 BIT(IIO_CHAN_INFO_SCALE),
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
         }, {
                 .type = IIO_CAPACITANCE,
                 .differential = 1,
@@ -450,6 +467,7 @@ static const struct iio_chan_spec ad7152_channels[] = {
                 BIT(IIO_CHAN_INFO_CALIBSCALE) |
                 BIT(IIO_CHAN_INFO_CALIBBIAS) |
                 BIT(IIO_CHAN_INFO_SCALE),
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
         }, {
                 .type = IIO_CAPACITANCE,
                 .indexed = 1,
@@ -458,6 +476,7 @@ static const struct iio_chan_spec ad7152_channels[] = {
                 BIT(IIO_CHAN_INFO_CALIBSCALE) |
                 BIT(IIO_CHAN_INFO_CALIBBIAS) |
                 BIT(IIO_CHAN_INFO_SCALE),
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
         }, {
                 .type = IIO_CAPACITANCE,
                 .differential = 1,
@@ -468,8 +487,10 @@ static const struct iio_chan_spec ad7152_channels[] = {
                 BIT(IIO_CHAN_INFO_CALIBSCALE) |
                 BIT(IIO_CHAN_INFO_CALIBBIAS) |
                 BIT(IIO_CHAN_INFO_SCALE),
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
         }
 };
+
 /*
  * device probe and remove
  */
@@ -489,6 +510,7 @@ static int ad7152_probe(struct i2c_client *client,
         i2c_set_clientdata(client, indio_dev);
 
         chip->client = client;
+        mutex_init(&chip->state_lock);
 
         /* Establish that the iio_dev is a child of the i2c device */
         indio_dev->name = id->name;
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
index 5771d4ee8ef1..81f8b9ee1120 100644
--- a/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@ -70,8 +70,10 @@
 #define AD7746_EXCSETUP_EXCLVL(x)       (((x) & 0x3) << 0)
 
 /* Config Register Bit Designations (AD7746_REG_CFG) */
-#define AD7746_CONF_VTFS(x)             ((x) << 6)
-#define AD7746_CONF_CAPFS(x)            ((x) << 3)
+#define AD7746_CONF_VTFS_SHIFT          6
+#define AD7746_CONF_CAPFS_SHIFT         3
+#define AD7746_CONF_VTFS_MASK           GENMASK(7, 6)
+#define AD7746_CONF_CAPFS_MASK          GENMASK(5, 3)
 #define AD7746_CONF_MODE_IDLE           (0 << 0)
 #define AD7746_CONF_MODE_CONT_CONV      (1 << 0)
 #define AD7746_CONF_MODE_SINGLE_CONV    (2 << 0)
@@ -122,7 +124,8 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
+                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |
+                        BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7746_REG_VT_DATA_HIGH << 8 |
                         AD7746_VTSETUP_VTMD_EXT_VIN,
         },
@@ -132,7 +135,8 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .channel = 1,
                 .extend_name = "supply",
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
+                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |
+                        BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7746_REG_VT_DATA_HIGH << 8 |
                         AD7746_VTSETUP_VTMD_VDD_MON,
         },
@@ -159,7 +163,7 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
                 BIT(IIO_CHAN_INFO_CALIBSCALE) | BIT(IIO_CHAN_INFO_OFFSET),
                 .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_CALIBBIAS) |
-                BIT(IIO_CHAN_INFO_SCALE),
+                BIT(IIO_CHAN_INFO_SCALE) | BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7746_REG_CAP_DATA_HIGH << 8,
         },
         [CIN1_DIFF] = {
@@ -171,7 +175,7 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
                 BIT(IIO_CHAN_INFO_CALIBSCALE) | BIT(IIO_CHAN_INFO_OFFSET),
                 .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_CALIBBIAS) |
-                BIT(IIO_CHAN_INFO_SCALE),
+                BIT(IIO_CHAN_INFO_SCALE) | BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7746_REG_CAP_DATA_HIGH << 8 |
                         AD7746_CAPSETUP_CAPDIFF
         },
@@ -182,7 +186,7 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
                 BIT(IIO_CHAN_INFO_CALIBSCALE) | BIT(IIO_CHAN_INFO_OFFSET),
                 .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_CALIBBIAS) |
-                BIT(IIO_CHAN_INFO_SCALE),
+                BIT(IIO_CHAN_INFO_SCALE) | BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7746_REG_CAP_DATA_HIGH << 8 |
                         AD7746_CAPSETUP_CIN2,
         },
@@ -195,7 +199,7 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
                 BIT(IIO_CHAN_INFO_CALIBSCALE) | BIT(IIO_CHAN_INFO_OFFSET),
                 .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_CALIBBIAS) |
-                BIT(IIO_CHAN_INFO_SCALE),
+                BIT(IIO_CHAN_INFO_SCALE) | BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7746_REG_CAP_DATA_HIGH << 8 |
                         AD7746_CAPSETUP_CAPDIFF | AD7746_CAPSETUP_CIN2,
         }
@@ -215,15 +219,16 @@ static int ad7746_select_channel(struct iio_dev *indio_dev,
                             struct iio_chan_spec const *chan)
 {
         struct ad7746_chip_info *chip = iio_priv(indio_dev);
-        int ret, delay;
+        int ret, delay, idx;
         u8 vt_setup, cap_setup;
 
         switch (chan->type) {
         case IIO_CAPACITANCE:
                 cap_setup = (chan->address & 0xFF) | AD7746_CAPSETUP_CAPEN;
                 vt_setup = chip->vt_setup & ~AD7746_VTSETUP_VTEN;
-                delay = ad7746_cap_filter_rate_table[(chip->config >> 3) &
-                        0x7][1];
+                idx = (chip->config & AD7746_CONF_CAPFS_MASK) >>
+                        AD7746_CONF_CAPFS_SHIFT;
+                delay = ad7746_cap_filter_rate_table[idx][1];
 
                 if (chip->capdac_set != chan->channel) {
                         ret = i2c_smbus_write_byte_data(chip->client,
@@ -244,8 +249,9 @@ static int ad7746_select_channel(struct iio_dev *indio_dev,
         case IIO_TEMP:
                 vt_setup = (chan->address & 0xFF) | AD7746_VTSETUP_VTEN;
                 cap_setup = chip->cap_setup & ~AD7746_CAPSETUP_CAPEN;
-                delay = ad7746_cap_filter_rate_table[(chip->config >> 6) &
-                        0x3][1];
+                idx = (chip->config & AD7746_CONF_VTFS_MASK) >>
+                        AD7746_CONF_VTFS_SHIFT;
+                delay = ad7746_cap_filter_rate_table[idx][1];
                 break;
         default:
                 return -EINVAL;
@@ -355,101 +361,47 @@ static IIO_DEVICE_ATTR(in_capacitance1_calibscale_calibration,
 static IIO_DEVICE_ATTR(in_voltage0_calibscale_calibration,
                        S_IWUSR, NULL, ad7746_start_gain_calib, VIN);
 
-static ssize_t ad7746_show_cap_filter_rate_setup(struct device *dev,
-                struct device_attribute *attr,
-                char *buf)
+static int ad7746_store_cap_filter_rate_setup(struct ad7746_chip_info *chip,
+                                              int val)
 {
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct ad7746_chip_info *chip = iio_priv(indio_dev);
-
-        return sprintf(buf, "%d\n", ad7746_cap_filter_rate_table[
-                        (chip->config >> 3) & 0x7][0]);
-}
-
-static ssize_t ad7746_store_cap_filter_rate_setup(struct device *dev,
-                struct device_attribute *attr,
-                const char *buf,
-                size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct ad7746_chip_info *chip = iio_priv(indio_dev);
-        u8 data;
-        int ret, i;
-
-        ret = kstrtou8(buf, 10, &data);
-        if (ret < 0)
-                return ret;
+        int i;
 
         for (i = 0; i < ARRAY_SIZE(ad7746_cap_filter_rate_table); i++)
-                if (data >= ad7746_cap_filter_rate_table[i][0])
+                if (val >= ad7746_cap_filter_rate_table[i][0])
                         break;
 
         if (i >= ARRAY_SIZE(ad7746_cap_filter_rate_table))
                 i = ARRAY_SIZE(ad7746_cap_filter_rate_table) - 1;
 
-        mutex_lock(&indio_dev->mlock);
-        chip->config &= ~AD7746_CONF_CAPFS(0x7);
-        chip->config |= AD7746_CONF_CAPFS(i);
-        mutex_unlock(&indio_dev->mlock);
+        chip->config &= ~AD7746_CONF_CAPFS_MASK;
+        chip->config |= i << AD7746_CONF_CAPFS_SHIFT;
 
-        return len;
+        return 0;
 }
 
-static ssize_t ad7746_show_vt_filter_rate_setup(struct device *dev,
-                struct device_attribute *attr,
-                char *buf)
+static int ad7746_store_vt_filter_rate_setup(struct ad7746_chip_info *chip,
+                                             int val)
 {
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct ad7746_chip_info *chip = iio_priv(indio_dev);
-
-        return sprintf(buf, "%d\n", ad7746_vt_filter_rate_table[
-                        (chip->config >> 6) & 0x3][0]);
-}
-
-static ssize_t ad7746_store_vt_filter_rate_setup(struct device *dev,
-                struct device_attribute *attr,
-                const char *buf,
-                size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct ad7746_chip_info *chip = iio_priv(indio_dev);
-        u8 data;
-        int ret, i;
-
-        ret = kstrtou8(buf, 10, &data);
-        if (ret < 0)
-                return ret;
+        int i;
 
         for (i = 0; i < ARRAY_SIZE(ad7746_vt_filter_rate_table); i++)
-                if (data >= ad7746_vt_filter_rate_table[i][0])
+                if (val >= ad7746_vt_filter_rate_table[i][0])
                         break;
 
         if (i >= ARRAY_SIZE(ad7746_vt_filter_rate_table))
                 i = ARRAY_SIZE(ad7746_vt_filter_rate_table) - 1;
 
-        mutex_lock(&indio_dev->mlock);
-        chip->config &= ~AD7746_CONF_VTFS(0x3);
-        chip->config |= AD7746_CONF_VTFS(i);
-        mutex_unlock(&indio_dev->mlock);
+        chip->config &= ~AD7746_CONF_VTFS_MASK;
+        chip->config |= i << AD7746_CONF_VTFS_SHIFT;
 
-        return len;
+        return 0;
 }
 
-static IIO_DEVICE_ATTR(in_capacitance_sampling_frequency,
-                       S_IRUGO | S_IWUSR, ad7746_show_cap_filter_rate_setup,
-                        ad7746_store_cap_filter_rate_setup, 0);
-
-static IIO_DEVICE_ATTR(in_voltage_sampling_frequency,
-                       S_IRUGO | S_IWUSR, ad7746_show_vt_filter_rate_setup,
-                       ad7746_store_vt_filter_rate_setup, 0);
-
 static IIO_CONST_ATTR(in_voltage_sampling_frequency_available, "50 31 16 8");
 static IIO_CONST_ATTR(in_capacitance_sampling_frequency_available,
                        "91 84 50 26 16 13 11 9");
 
 static struct attribute *ad7746_attributes[] = {
-        &iio_dev_attr_in_capacitance_sampling_frequency.dev_attr.attr,
-        &iio_dev_attr_in_voltage_sampling_frequency.dev_attr.attr,
         &iio_dev_attr_in_capacitance0_calibbias_calibration.dev_attr.attr,
         &iio_dev_attr_in_capacitance0_calibscale_calibration.dev_attr.attr,
         &iio_dev_attr_in_capacitance1_calibscale_calibration.dev_attr.attr,
@@ -547,6 +499,23 @@ static int ad7746_write_raw(struct iio_dev *indio_dev,
 
                 ret = 0;
                 break;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                if (val2) {
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                switch (chan->type) {
+                case IIO_CAPACITANCE:
+                        ret = ad7746_store_cap_filter_rate_setup(chip, val);
+                        break;
+                case IIO_VOLTAGE:
+                        ret = ad7746_store_vt_filter_rate_setup(chip, val);
+                        break;
+                default:
+                        ret = -EINVAL;
+                }
+                break;
         default:
                 ret = -EINVAL;
         }
@@ -562,7 +531,7 @@ static int ad7746_read_raw(struct iio_dev *indio_dev,
                            long mask)
 {
         struct ad7746_chip_info *chip = iio_priv(indio_dev);
-        int ret, delay;
+        int ret, delay, idx;
         u8 regval, reg;
 
         mutex_lock(&indio_dev->mlock);
@@ -667,6 +636,24 @@ static int ad7746_read_raw(struct iio_dev *indio_dev,
                 }
 
                 break;
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                switch (chan->type) {
+                case IIO_CAPACITANCE:
+                        idx = (chip->config & AD7746_CONF_CAPFS_MASK) >>
+                                AD7746_CONF_CAPFS_SHIFT;
+                        *val = ad7746_cap_filter_rate_table[idx][0];
+                        ret = IIO_VAL_INT;
+                        break;
+                case IIO_VOLTAGE:
+                        idx = (chip->config & AD7746_CONF_VTFS_MASK) >>
+                                AD7746_CONF_VTFS_SHIFT;
+                        *val = ad7746_vt_filter_rate_table[idx][0];
+                        ret = IIO_VAL_INT;
+                        break;
+                default:
+                        ret = -EINVAL;
+                }
+                break;
         default:
                 ret = -EINVAL;
         }
diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
index 358400b22d33..a5b2f068168d 100644
--- a/drivers/staging/iio/frequency/ad9832.c
+++ b/drivers/staging/iio/frequency/ad9832.c
@@ -204,7 +204,6 @@ static int ad9832_probe(struct spi_device *spi)
         struct ad9832_platform_data *pdata = dev_get_platdata(&spi->dev);
         struct iio_dev *indio_dev;
         struct ad9832_state *st;
-        struct regulator *reg;
         int ret;
 
         if (!pdata) {
@@ -212,21 +211,35 @@ static int ad9832_probe(struct spi_device *spi)
                 return -ENODEV;
         }
 
-        reg = devm_regulator_get(&spi->dev, "vcc");
-        if (!IS_ERR(reg)) {
-                ret = regulator_enable(reg);
-                if (ret)
-                        return ret;
-        }
-
         indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
-        if (!indio_dev) {
-                ret = -ENOMEM;
-                goto error_disable_reg;
-        }
+        if (!indio_dev)
+                return -ENOMEM;
+
         spi_set_drvdata(spi, indio_dev);
         st = iio_priv(indio_dev);
-        st->reg = reg;
+
+        st->avdd = devm_regulator_get(&spi->dev, "avdd");
+        if (IS_ERR(st->avdd))
+                return PTR_ERR(st->avdd);
+
+        ret = regulator_enable(st->avdd);
+        if (ret) {
+                dev_err(&spi->dev, "Failed to enable specified AVDD supply\n");
+                return ret;
+        }
+
+        st->dvdd = devm_regulator_get(&spi->dev, "dvdd");
+        if (IS_ERR(st->dvdd)) {
+                ret = PTR_ERR(st->dvdd);
+                goto error_disable_avdd;
+        }
+
+        ret = regulator_enable(st->dvdd);
+        if (ret) {
+                dev_err(&spi->dev, "Failed to enable specified DVDD supply\n");
+                goto error_disable_avdd;
+        }
+
         st->mclk = pdata->mclk;
         st->spi = spi;
 
@@ -277,42 +290,43 @@ static int ad9832_probe(struct spi_device *spi)
         ret = spi_sync(st->spi, &st->msg);
         if (ret) {
                 dev_err(&spi->dev, "device init failed\n");
-                goto error_disable_reg;
+                goto error_disable_dvdd;
         }
 
         ret = ad9832_write_frequency(st, AD9832_FREQ0HM, pdata->freq0);
         if (ret)
-                goto error_disable_reg;
+                goto error_disable_dvdd;
 
         ret = ad9832_write_frequency(st, AD9832_FREQ1HM, pdata->freq1);
         if (ret)
-                goto error_disable_reg;
+                goto error_disable_dvdd;
 
         ret = ad9832_write_phase(st, AD9832_PHASE0H, pdata->phase0);
         if (ret)
-                goto error_disable_reg;
+                goto error_disable_dvdd;
 
         ret = ad9832_write_phase(st, AD9832_PHASE1H, pdata->phase1);
         if (ret)
-                goto error_disable_reg;
+                goto error_disable_dvdd;
 
         ret = ad9832_write_phase(st, AD9832_PHASE2H, pdata->phase2);
         if (ret)
-                goto error_disable_reg;
+                goto error_disable_dvdd;
 
         ret = ad9832_write_phase(st, AD9832_PHASE3H, pdata->phase3);
         if (ret)
-                goto error_disable_reg;
+                goto error_disable_dvdd;
 
         ret = iio_device_register(indio_dev);
         if (ret)
-                goto error_disable_reg;
+                goto error_disable_dvdd;
 
         return 0;
 
-error_disable_reg:
-        if (!IS_ERR(reg))
-                regulator_disable(reg);
+error_disable_dvdd:
+        regulator_disable(st->dvdd);
+error_disable_avdd:
+        regulator_disable(st->avdd);
 
         return ret;
 }
@@ -323,8 +337,8 @@ static int ad9832_remove(struct spi_device *spi)
         struct ad9832_state *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        if (!IS_ERR(st->reg))
-                regulator_disable(st->reg);
+        regulator_disable(st->dvdd);
+        regulator_disable(st->avdd);
 
         return 0;
 }
diff --git a/drivers/staging/iio/frequency/ad9832.h b/drivers/staging/iio/frequency/ad9832.h
index d32323b46be6..1b08b04482a4 100644
--- a/drivers/staging/iio/frequency/ad9832.h
+++ b/drivers/staging/iio/frequency/ad9832.h
@@ -58,7 +58,8 @@
 /**
  * struct ad9832_state - driver instance specific data
  * @spi:                spi_device
- * @reg:                supply regulator
+ * @avdd:               supply regulator for the analog section
+ * @dvdd:               supply regulator for the digital section
  * @mclk:               external master clock
  * @ctrl_fp:            cached frequency/phase control word
  * @ctrl_ss:            cached sync/selsrc control word
@@ -76,7 +77,8 @@
 
 struct ad9832_state {
         struct spi_device               *spi;
-        struct regulator                *reg;
+        struct regulator                *avdd;
+        struct regulator                *dvdd;
         unsigned long                   mclk;
         unsigned short                  ctrl_fp;
         unsigned short                  ctrl_ss;
diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c
index 6366216e4f37..19216af1dfc9 100644
--- a/drivers/staging/iio/frequency/ad9834.c
+++ b/drivers/staging/iio/frequency/ad9834.c
@@ -329,11 +329,14 @@ static int ad9834_probe(struct spi_device *spi)
                 return -ENODEV;
         }
 
-        reg = devm_regulator_get(&spi->dev, "vcc");
-        if (!IS_ERR(reg)) {
-                ret = regulator_enable(reg);
-                if (ret)
-                        return ret;
+        reg = devm_regulator_get(&spi->dev, "avdd");
+        if (IS_ERR(reg))
+                return PTR_ERR(reg);
+
+        ret = regulator_enable(reg);
+        if (ret) {
+                dev_err(&spi->dev, "Failed to enable specified AVDD supply\n");
+                return ret;
         }
 
         indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
@@ -416,8 +419,7 @@ static int ad9834_probe(struct spi_device *spi)
         return 0;
 
 error_disable_reg:
-        if (!IS_ERR(reg))
-                regulator_disable(reg);
+        regulator_disable(reg);
 
         return ret;
 }
@@ -428,8 +430,7 @@ static int ad9834_remove(struct spi_device *spi)
         struct ad9834_state *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        if (!IS_ERR(st->reg))
-                regulator_disable(st->reg);
+        regulator_disable(st->reg);
 
         return 0;
 }
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 3892a7470410..944789843938 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -726,13 +726,16 @@ static int ad5933_probe(struct i2c_client *client,
         if (!pdata)
                 pdata = &ad5933_default_pdata;
 
-        st->reg = devm_regulator_get(&client->dev, "vcc");
-        if (!IS_ERR(st->reg)) {
-                ret = regulator_enable(st->reg);
-                if (ret)
-                        return ret;
-                voltage_uv = regulator_get_voltage(st->reg);
+        st->reg = devm_regulator_get(&client->dev, "vdd");
+        if (IS_ERR(st->reg))
+                return PTR_ERR(st->reg);
+
+        ret = regulator_enable(st->reg);
+        if (ret) {
+                dev_err(&client->dev, "Failed to enable specified VDD supply\n");
+                return ret;
         }
+        voltage_uv = regulator_get_voltage(st->reg);
 
         if (voltage_uv)
                 st->vref_mv = voltage_uv / 1000;
@@ -775,8 +778,7 @@ static int ad5933_probe(struct i2c_client *client,
 error_unreg_ring:
         iio_kfifo_free(indio_dev->buffer);
 error_disable_reg:
-        if (!IS_ERR(st->reg))
-                regulator_disable(st->reg);
+        regulator_disable(st->reg);
 
         return ret;
 }
@@ -788,8 +790,7 @@ static int ad5933_remove(struct i2c_client *client)
 
         iio_device_unregister(indio_dev);
         iio_kfifo_free(indio_dev->buffer);
-        if (!IS_ERR(st->reg))
-                regulator_disable(st->reg);
+        regulator_disable(st->reg);
 
         return 0;
 }
diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
index ca8d6e66c899..4fbf6298c0f3 100644
--- a/drivers/staging/iio/light/Kconfig
+++ b/drivers/staging/iio/light/Kconfig
@@ -3,18 +3,6 @@
 #
 menu "Light sensors"
 
-config SENSORS_ISL29018
-        tristate "ISL 29018 light and proximity sensor"
-        depends on I2C
-        select REGMAP_I2C
-        default n
-        help
-         If you say yes here you get support for ambient light sensing and
-         proximity infrared sensing from Intersil ISL29018.
-         This driver will provide the measurements of ambient light intensity
-         in lux, proximity infrared sensing and normal infrared sensing.
-         Data from sensor is accessible via sysfs.
-
 config SENSORS_ISL29028
         tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor"
         depends on I2C
@@ -25,13 +13,6 @@ config SENSORS_ISL29028
          Proximity value via iio. The ISL29028 provides the concurrent sensing
          of ambient light and proximity.
 
-config TSL2583
-        tristate "TAOS TSL2580, TSL2581 and TSL2583 light-to-digital converters"
-        depends on I2C
-        help
-         Provides support for the TAOS tsl2580, tsl2581 and tsl2583 devices.
-         Access ALS data via iio, sysfs.
-
 config TSL2x7x
         tristate "TAOS TSL/TMD2x71 and TSL/TMD2x72 Family of light and proximity sensors"
         depends on I2C
diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile
index 9960fdf7c15b..f8693e9fdc94 100644
--- a/drivers/staging/iio/light/Makefile
+++ b/drivers/staging/iio/light/Makefile
@@ -2,7 +2,5 @@
 # Makefile for industrial I/O Light sensors
 #
 
-obj-$(CONFIG_SENSORS_ISL29018)  += isl29018.o
 obj-$(CONFIG_SENSORS_ISL29028)  += isl29028.o
-obj-$(CONFIG_TSL2583)   += tsl2583.o
 obj-$(CONFIG_TSL2x7x)   += tsl2x7x_core.o
diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
deleted file mode 100644
index 08f1583ee34e..000000000000
--- a/drivers/staging/iio/light/tsl2583.c
+++ /dev/null
@@ -1,963 +0,0 @@
-/*
- * Device driver for monitoring ambient light intensity (lux)
- * within the TAOS tsl258x family of devices (tsl2580, tsl2581).
- *
- * Copyright (c) 2011, TAOS Corporation.
- *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/i2c.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-#include <linux/string.h>
-#include <linux/mutex.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/iio/iio.h>
-
-#define TSL258X_MAX_DEVICE_REGS         32
-
-/* Triton register offsets */
-#define TSL258X_REG_MAX         8
-
-/* Device Registers and Masks */
-#define TSL258X_CNTRL                   0x00
-#define TSL258X_ALS_TIME                0X01
-#define TSL258X_INTERRUPT               0x02
-#define TSL258X_GAIN                    0x07
-#define TSL258X_REVID                   0x11
-#define TSL258X_CHIPID                  0x12
-#define TSL258X_ALS_CHAN0LO             0x14
-#define TSL258X_ALS_CHAN0HI             0x15
-#define TSL258X_ALS_CHAN1LO             0x16
-#define TSL258X_ALS_CHAN1HI             0x17
-#define TSL258X_TMR_LO                  0x18
-#define TSL258X_TMR_HI                  0x19
-
-/* tsl2583 cmd reg masks */
-#define TSL258X_CMD_REG                 0x80
-#define TSL258X_CMD_SPL_FN              0x60
-#define TSL258X_CMD_ALS_INT_CLR 0X01
-
-/* tsl2583 cntrl reg masks */
-#define TSL258X_CNTL_ADC_ENBL   0x02
-#define TSL258X_CNTL_PWR_ON             0x01
-
-/* tsl2583 status reg masks */
-#define TSL258X_STA_ADC_VALID   0x01
-#define TSL258X_STA_ADC_INTR    0x10
-
-/* Lux calculation constants */
-#define TSL258X_LUX_CALC_OVER_FLOW              65535
-
-enum {
-        TSL258X_CHIP_UNKNOWN = 0,
-        TSL258X_CHIP_WORKING = 1,
-        TSL258X_CHIP_SUSPENDED = 2
-};
-
-/* Per-device data */
-struct taos_als_info {
-        u16 als_ch0;
-        u16 als_ch1;
-        u16 lux;
-};
-
-struct taos_settings {
-        int als_time;
-        int als_gain;
-        int als_gain_trim;
-        int als_cal_target;
-};
-
-struct tsl2583_chip {
-        struct mutex als_mutex;
-        struct i2c_client *client;
-        struct taos_als_info als_cur_info;
-        struct taos_settings taos_settings;
-        int als_time_scale;
-        int als_saturation;
-        int taos_chip_status;
-        u8 taos_config[8];
-};
-
-/*
- * Initial values for device - this values can/will be changed by driver.
- * and applications as needed.
- * These values are dynamic.
- */
-static const u8 taos_config[8] = {
-                0x00, 0xee, 0x00, 0x03, 0x00, 0xFF, 0xFF, 0x00
-}; /*   cntrl atime intC  Athl0 Athl1 Athh0 Athh1 gain */
-
-struct taos_lux {
-        unsigned int ratio;
-        unsigned int ch0;
-        unsigned int ch1;
-};
-
-/* This structure is intentionally large to accommodate updates via sysfs. */
-/* Sized to 11 = max 10 segments + 1 termination segment */
-/* Assumption is one and only one type of glass used  */
-static struct taos_lux taos_device_lux[11] = {
-        {  9830,  8520, 15729 },
-        { 12452, 10807, 23344 },
-        { 14746,  6383, 11705 },
-        { 17695,  4063,  6554 },
-};
-
-struct gainadj {
-        s16 ch0;
-        s16 ch1;
-};
-
-/* Index = (0 - 3) Used to validate the gain selection index */
-static const struct gainadj gainadj[] = {
-        { 1, 1 },
-        { 8, 8 },
-        { 16, 16 },
-        { 107, 115 }
-};
-
-/*
- * Provides initial operational parameter defaults.
- * These defaults may be changed through the device's sysfs files.
- */
-static void taos_defaults(struct tsl2583_chip *chip)
-{
-        /* Operational parameters */
-        chip->taos_settings.als_time = 100;
-        /* must be a multiple of 50mS */
-        chip->taos_settings.als_gain = 0;
-        /* this is actually an index into the gain table */
-        /* assume clear glass as default */
-        chip->taos_settings.als_gain_trim = 1000;
-        /* default gain trim to account for aperture effects */
-        chip->taos_settings.als_cal_target = 130;
-        /* Known external ALS reading used for calibration */
-}
-
-/*
- * Read a number of bytes starting at register (reg) location.
- * Return 0, or i2c_smbus_write_byte ERROR code.
- */
-static int
-taos_i2c_read(struct i2c_client *client, u8 reg, u8 *val, unsigned int len)
-{
-        int i, ret;
-
-        for (i = 0; i < len; i++) {
-                /* select register to write */
-                ret = i2c_smbus_write_byte(client, (TSL258X_CMD_REG | reg));
-                if (ret < 0) {
-                        dev_err(&client->dev,
-                                "taos_i2c_read failed to write register %x\n",
-                                reg);
-                        return ret;
-                }
-                /* read the data */
-                *val = i2c_smbus_read_byte(client);
-                val++;
-                reg++;
-        }
-        return 0;
-}
-
-/*
- * Reads and calculates current lux value.
- * The raw ch0 and ch1 values of the ambient light sensed in the last
- * integration cycle are read from the device.
- * Time scale factor array values are adjusted based on the integration time.
- * The raw values are multiplied by a scale factor, and device gain is obtained
- * using gain index. Limit checks are done next, then the ratio of a multiple
- * of ch1 value, to the ch0 value, is calculated. The array taos_device_lux[]
- * declared above is then scanned to find the first ratio value that is just
- * above the ratio we just calculated. The ch0 and ch1 multiplier constants in
- * the array are then used along with the time scale factor array values, to
- * calculate the lux.
- */
-static int taos_get_lux(struct iio_dev *indio_dev)
-{
-        u16 ch0, ch1; /* separated ch0/ch1 data from device */
-        u32 lux; /* raw lux calculated from device data */
-        u64 lux64;
-        u32 ratio;
-        u8 buf[5];
-        struct taos_lux *p;
-        struct tsl2583_chip *chip = iio_priv(indio_dev);
-        int i, ret;
-        u32 ch0lux = 0;
-        u32 ch1lux = 0;
-
-        if (mutex_trylock(&chip->als_mutex) == 0) {
-                dev_info(&chip->client->dev, "taos_get_lux device is busy\n");
-                return chip->als_cur_info.lux; /* busy, so return LAST VALUE */
-        }
-
-        if (chip->taos_chip_status != TSL258X_CHIP_WORKING) {
-                /* device is not enabled */
-                dev_err(&chip->client->dev, "taos_get_lux device is not enabled\n");
-                ret = -EBUSY;
-                goto out_unlock;
-        }
-
-        ret = taos_i2c_read(chip->client, (TSL258X_CMD_REG), &buf[0], 1);
-        if (ret < 0) {
-                dev_err(&chip->client->dev, "taos_get_lux failed to read CMD_REG\n");
-                goto out_unlock;
-        }
-        /* is data new & valid */
-        if (!(buf[0] & TSL258X_STA_ADC_INTR)) {
-                dev_err(&chip->client->dev, "taos_get_lux data not valid\n");
-                ret = chip->als_cur_info.lux; /* return LAST VALUE */
-                goto out_unlock;
-        }
-
-        for (i = 0; i < 4; i++) {
-                int reg = TSL258X_CMD_REG | (TSL258X_ALS_CHAN0LO + i);
-
-                ret = taos_i2c_read(chip->client, reg, &buf[i], 1);
-                if (ret < 0) {
-                        dev_err(&chip->client->dev,
-                                "taos_get_lux failed to read register %x\n",
-                                reg);
-                        goto out_unlock;
-                }
-        }
-
-        /*
-         * clear status, really interrupt status (interrupts are off), but
-         * we use the bit anyway - don't forget 0x80 - this is a command
-         */
-        ret = i2c_smbus_write_byte(chip->client,
-                                   (TSL258X_CMD_REG | TSL258X_CMD_SPL_FN |
-                                    TSL258X_CMD_ALS_INT_CLR));
-
-        if (ret < 0) {
-                dev_err(&chip->client->dev,
-                        "taos_i2c_write_command failed in taos_get_lux, err = %d\n",
-                        ret);
-                goto out_unlock; /* have no data, so return failure */
-        }
-
-        /* extract ALS/lux data */
-        ch0 = le16_to_cpup((const __le16 *)&buf[0]);
-        ch1 = le16_to_cpup((const __le16 *)&buf[2]);
-
-        chip->als_cur_info.als_ch0 = ch0;
-        chip->als_cur_info.als_ch1 = ch1;
-
-        if ((ch0 >= chip->als_saturation) || (ch1 >= chip->als_saturation))
-                goto return_max;
-
-        if (!ch0) {
-                /* have no data, so return LAST VALUE */
-                ret = 0;
-                chip->als_cur_info.lux = 0;
-                goto out_unlock;
-        }
-        /* calculate ratio */
-        ratio = (ch1 << 15) / ch0;
-        /* convert to unscaled lux using the pointer to the table */
-        for (p = (struct taos_lux *)taos_device_lux;
-             p->ratio != 0 && p->ratio < ratio; p++)
-                ;
-
-        if (p->ratio == 0) {
-                lux = 0;
-        } else {
-                ch0lux = ((ch0 * p->ch0) +
-                          (gainadj[chip->taos_settings.als_gain].ch0 >> 1))
-                         / gainadj[chip->taos_settings.als_gain].ch0;
-                ch1lux = ((ch1 * p->ch1) +
-                          (gainadj[chip->taos_settings.als_gain].ch1 >> 1))
-                         / gainadj[chip->taos_settings.als_gain].ch1;
-                lux = ch0lux - ch1lux;
-        }
-
-        /* note: lux is 31 bit max at this point */
-        if (ch1lux > ch0lux) {
-                dev_dbg(&chip->client->dev, "No Data - Return last value\n");
-                ret = 0;
-                chip->als_cur_info.lux = 0;
-                goto out_unlock;
-        }
-
-        /* adjust for active time scale */
-        if (chip->als_time_scale == 0)
-                lux = 0;
-        else
-                lux = (lux + (chip->als_time_scale >> 1)) /
-                        chip->als_time_scale;
-
-        /* Adjust for active gain scale.
-         * The taos_device_lux tables above have a factor of 8192 built in,
-         * so we need to shift right.
-         * User-specified gain provides a multiplier.
-         * Apply user-specified gain before shifting right to retain precision.
-         * Use 64 bits to avoid overflow on multiplication.
-         * Then go back to 32 bits before division to avoid using div_u64().
-         */
-        lux64 = lux;
-        lux64 = lux64 * chip->taos_settings.als_gain_trim;
-        lux64 >>= 13;
-        lux = lux64;
-        lux = (lux + 500) / 1000;
-        if (lux > TSL258X_LUX_CALC_OVER_FLOW) { /* check for overflow */
-return_max:
-                lux = TSL258X_LUX_CALC_OVER_FLOW;
-        }
-
-        /* Update the structure with the latest VALID lux. */
-        chip->als_cur_info.lux = lux;
-        ret = lux;
-
-out_unlock:
-        mutex_unlock(&chip->als_mutex);
-        return ret;
-}
-
-/*
- * Obtain single reading and calculate the als_gain_trim (later used
- * to derive actual lux).
- * Return updated gain_trim value.
- */
-static int taos_als_calibrate(struct iio_dev *indio_dev)
-{
-        struct tsl2583_chip *chip = iio_priv(indio_dev);
-        u8 reg_val;
-        unsigned int gain_trim_val;
-        int ret;
-        int lux_val;
-
-        ret = i2c_smbus_write_byte(chip->client,
-                                   (TSL258X_CMD_REG | TSL258X_CNTRL));
-        if (ret < 0) {
-                dev_err(&chip->client->dev,
-                        "taos_als_calibrate failed to reach the CNTRL register, ret=%d\n",
-                        ret);
-                return ret;
-        }
-
-        reg_val = i2c_smbus_read_byte(chip->client);
-        if ((reg_val & (TSL258X_CNTL_ADC_ENBL | TSL258X_CNTL_PWR_ON))
-                        != (TSL258X_CNTL_ADC_ENBL | TSL258X_CNTL_PWR_ON)) {
-                dev_err(&chip->client->dev,
-                        "taos_als_calibrate failed: device not powered on with ADC enabled\n");
-                return -1;
-        }
-
-        ret = i2c_smbus_write_byte(chip->client,
-                                   (TSL258X_CMD_REG | TSL258X_CNTRL));
-        if (ret < 0) {
-                dev_err(&chip->client->dev,
-                        "taos_als_calibrate failed to reach the STATUS register, ret=%d\n",
-                        ret);
-                return ret;
-        }
-        reg_val = i2c_smbus_read_byte(chip->client);
-
-        if ((reg_val & TSL258X_STA_ADC_VALID) != TSL258X_STA_ADC_VALID) {
-                dev_err(&chip->client->dev,
-                        "taos_als_calibrate failed: STATUS - ADC not valid.\n");
-                return -ENODATA;
-        }
-        lux_val = taos_get_lux(indio_dev);
-        if (lux_val < 0) {
-                dev_err(&chip->client->dev, "taos_als_calibrate failed to get lux\n");
-                return lux_val;
-        }
-        gain_trim_val = (unsigned int)(((chip->taos_settings.als_cal_target)
-                        * chip->taos_settings.als_gain_trim) / lux_val);
-
-        if ((gain_trim_val < 250) || (gain_trim_val > 4000)) {
-                dev_err(&chip->client->dev,
-                        "taos_als_calibrate failed: trim_val of %d is out of range\n",
-                        gain_trim_val);
-                return -ENODATA;
-        }
-        chip->taos_settings.als_gain_trim = (int)gain_trim_val;
-
-        return (int)gain_trim_val;
-}
-
-/*
- * Turn the device on.
- * Configuration must be set before calling this function.
- */
-static int taos_chip_on(struct iio_dev *indio_dev)
-{
-        int i;
-        int ret;
-        u8 *uP;
-        u8 utmp;
-        int als_count;
-        int als_time;
-        struct tsl2583_chip *chip = iio_priv(indio_dev);
-
-        /* and make sure we're not already on */
-        if (chip->taos_chip_status == TSL258X_CHIP_WORKING) {
-                /* if forcing a register update - turn off, then on */
-                dev_info(&chip->client->dev, "device is already enabled\n");
-                return -EINVAL;
-        }
-
-        /* determine als integration register */
-        als_count = (chip->taos_settings.als_time * 100 + 135) / 270;
-        if (!als_count)
-                als_count = 1; /* ensure at least one cycle */
-
-        /* convert back to time (encompasses overrides) */
-        als_time = (als_count * 27 + 5) / 10;
-        chip->taos_config[TSL258X_ALS_TIME] = 256 - als_count;
-
-        /* Set the gain based on taos_settings struct */
-        chip->taos_config[TSL258X_GAIN] = chip->taos_settings.als_gain;
-
-        /* set chip struct re scaling and saturation */
-        chip->als_saturation = als_count * 922; /* 90% of full scale */
-        chip->als_time_scale = (als_time + 25) / 50;
-
-        /*
-         * TSL258x Specific power-on / adc enable sequence
-         * Power on the device 1st.
-         */
-        utmp = TSL258X_CNTL_PWR_ON;
-        ret = i2c_smbus_write_byte_data(chip->client,
-                                        TSL258X_CMD_REG | TSL258X_CNTRL, utmp);
-        if (ret < 0) {
-                dev_err(&chip->client->dev, "taos_chip_on failed on CNTRL reg.\n");
-                return ret;
-        }
-
-        /*
-         * Use the following shadow copy for our delay before enabling ADC.
-         * Write all the registers.
-         */
-        for (i = 0, uP = chip->taos_config; i < TSL258X_REG_MAX; i++) {
-                ret = i2c_smbus_write_byte_data(chip->client,
-                                                TSL258X_CMD_REG + i,
-                                                *uP++);
-                if (ret < 0) {
-                        dev_err(&chip->client->dev,
-                                "taos_chip_on failed on reg %d.\n", i);
-                        return ret;
-                }
-        }
-
-        usleep_range(3000, 3500);
-        /*
-         * NOW enable the ADC
-         * initialize the desired mode of operation
-         */
-        utmp = TSL258X_CNTL_PWR_ON | TSL258X_CNTL_ADC_ENBL;
-        ret = i2c_smbus_write_byte_data(chip->client,
-                                        TSL258X_CMD_REG | TSL258X_CNTRL,
-                                        utmp);
-        if (ret < 0) {
-                dev_err(&chip->client->dev, "taos_chip_on failed on 2nd CTRL reg.\n");
-                return ret;
-        }
-        chip->taos_chip_status = TSL258X_CHIP_WORKING;
-
-        return ret;
-}
-
-static int taos_chip_off(struct iio_dev *indio_dev)
-{
-        struct tsl2583_chip *chip = iio_priv(indio_dev);
-
-        /* turn device off */
-        chip->taos_chip_status = TSL258X_CHIP_SUSPENDED;
-        return i2c_smbus_write_byte_data(chip->client,
-                                        TSL258X_CMD_REG | TSL258X_CNTRL,
-                                        0x00);
-}
-
-/* Sysfs Interface Functions */
-
-static ssize_t taos_power_state_show(struct device *dev,
-                                     struct device_attribute *attr, char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct tsl2583_chip *chip = iio_priv(indio_dev);
-
-        return sprintf(buf, "%d\n", chip->taos_chip_status);
-}
-
-static ssize_t taos_power_state_store(struct device *dev,
-                                      struct device_attribute *attr,
-                                      const char *buf, size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        int value;
-
-        if (kstrtoint(buf, 0, &value))
-                return -EINVAL;
-
-        if (!value)
-                taos_chip_off(indio_dev);
-        else
-                taos_chip_on(indio_dev);
-
-        return len;
-}
-
-static ssize_t taos_gain_show(struct device *dev,
-                              struct device_attribute *attr, char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct tsl2583_chip *chip = iio_priv(indio_dev);
-        char gain[4] = {0};
-
-        switch (chip->taos_settings.als_gain) {
-        case 0:
-                strcpy(gain, "001");
-                break;
-        case 1:
-                strcpy(gain, "008");
-                break;
-        case 2:
-                strcpy(gain, "016");
-                break;
-        case 3:
-                strcpy(gain, "111");
-                break;
-        }
-
-        return sprintf(buf, "%s\n", gain);
-}
-
-static ssize_t taos_gain_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 tsl2583_chip *chip = iio_priv(indio_dev);
-        int value;
-
-        if (kstrtoint(buf, 0, &value))
-                return -EINVAL;
-
-        switch (value) {
-        case 1:
-                chip->taos_settings.als_gain = 0;
-                break;
-        case 8:
-                chip->taos_settings.als_gain = 1;
-                break;
-        case 16:
-                chip->taos_settings.als_gain = 2;
-                break;
-        case 111:
-                chip->taos_settings.als_gain = 3;
-                break;
-        default:
-                dev_err(dev, "Invalid Gain Index (must be 1,8,16,111)\n");
-                return -1;
-        }
-
-        return len;
-}
-
-static ssize_t taos_gain_available_show(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
-{
-        return sprintf(buf, "%s\n", "1 8 16 111");
-}
-
-static ssize_t taos_als_time_show(struct device *dev,
-                                  struct device_attribute *attr, char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct tsl2583_chip *chip = iio_priv(indio_dev);
-
-        return sprintf(buf, "%d\n", chip->taos_settings.als_time);
-}
-
-static ssize_t taos_als_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 tsl2583_chip *chip = iio_priv(indio_dev);
-        int value;
-
-        if (kstrtoint(buf, 0, &value))
-                return -EINVAL;
-
-        if ((value < 50) || (value > 650))
-                return -EINVAL;
-
-        if (value % 50)
-                return -EINVAL;
-
-        chip->taos_settings.als_time = value;
-
-        return len;
-}
-
-static ssize_t taos_als_time_available_show(struct device *dev,
-                                            struct device_attribute *attr,
-                                            char *buf)
-{
-        return sprintf(buf, "%s\n",
-                "50 100 150 200 250 300 350 400 450 500 550 600 650");
-}
-
-static ssize_t taos_als_trim_show(struct device *dev,
-                                  struct device_attribute *attr, char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct tsl2583_chip *chip = iio_priv(indio_dev);
-
-        return sprintf(buf, "%d\n", chip->taos_settings.als_gain_trim);
-}
-
-static ssize_t taos_als_trim_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 tsl2583_chip *chip = iio_priv(indio_dev);
-        int value;
-
-        if (kstrtoint(buf, 0, &value))
-                return -EINVAL;
-
-        if (value)
-                chip->taos_settings.als_gain_trim = value;
-
-        return len;
-}
-
-static ssize_t taos_als_cal_target_show(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        struct tsl2583_chip *chip = iio_priv(indio_dev);
-
-        return sprintf(buf, "%d\n", chip->taos_settings.als_cal_target);
-}
-
-static ssize_t taos_als_cal_target_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 tsl2583_chip *chip = iio_priv(indio_dev);
-        int value;
-
-        if (kstrtoint(buf, 0, &value))
-                return -EINVAL;
-
-        if (value)
-                chip->taos_settings.als_cal_target = value;
-
-        return len;
-}
-
-static ssize_t taos_lux_show(struct device *dev, struct device_attribute *attr,
-                             char *buf)
-{
-        int ret;
-
-        ret = taos_get_lux(dev_to_iio_dev(dev));
-        if (ret < 0)
-                return ret;
-
-        return sprintf(buf, "%d\n", ret);
-}
-
-static ssize_t taos_do_calibrate(struct device *dev,
-                                 struct device_attribute *attr,
-                                 const char *buf, size_t len)
-{
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        int value;
-
-        if (kstrtoint(buf, 0, &value))
-                return -EINVAL;
-
-        if (value == 1)
-                taos_als_calibrate(indio_dev);
-
-        return len;
-}
-
-static ssize_t taos_luxtable_show(struct device *dev,
-                                  struct device_attribute *attr, char *buf)
-{
-        int i;
-        int offset = 0;
-
-        for (i = 0; i < ARRAY_SIZE(taos_device_lux); i++) {
-                offset += sprintf(buf + offset, "%u,%u,%u,",
-                                  taos_device_lux[i].ratio,
-                                  taos_device_lux[i].ch0,
-                                  taos_device_lux[i].ch1);
-                if (taos_device_lux[i].ratio == 0) {
-                        /*
-                         * We just printed the first "0" entry.
-                         * Now get rid of the extra "," and break.
-                         */
-                        offset--;
-                        break;
-                }
-        }
-
-        offset += sprintf(buf + offset, "\n");
-        return offset;
-}
-
-static ssize_t taos_luxtable_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 tsl2583_chip *chip = iio_priv(indio_dev);
-        int value[ARRAY_SIZE(taos_device_lux) * 3 + 1];
-        int n;
-
-        get_options(buf, ARRAY_SIZE(value), value);
-
-        /* We now have an array of ints starting at value[1], and
-         * enumerated by value[0].
-         * We expect each group of three ints is one table entry,
-         * and the last table entry is all 0.
-         */
-        n = value[0];
-        if ((n % 3) || n < 6 || n > ((ARRAY_SIZE(taos_device_lux) - 1) * 3)) {
-                dev_info(dev, "LUX TABLE INPUT ERROR 1 Value[0]=%d\n", n);
-                return -EINVAL;
-        }
-        if ((value[(n - 2)] | value[(n - 1)] | value[n]) != 0) {
-                dev_info(dev, "LUX TABLE INPUT ERROR 2 Value[0]=%d\n", n);
-                return -EINVAL;
-        }
-
-        if (chip->taos_chip_status == TSL258X_CHIP_WORKING)
-                taos_chip_off(indio_dev);
-
-        /* Zero out the table */
-        memset(taos_device_lux, 0, sizeof(taos_device_lux));
-        memcpy(taos_device_lux, &value[1], (value[0] * 4));
-
-        taos_chip_on(indio_dev);
-
-        return len;
-}
-
-static DEVICE_ATTR(power_state, S_IRUGO | S_IWUSR,
-                taos_power_state_show, taos_power_state_store);
-
-static DEVICE_ATTR(illuminance0_calibscale, S_IRUGO | S_IWUSR,
-                taos_gain_show, taos_gain_store);
-static DEVICE_ATTR(illuminance0_calibscale_available, S_IRUGO,
-                taos_gain_available_show, NULL);
-
-static DEVICE_ATTR(illuminance0_integration_time, S_IRUGO | S_IWUSR,
-                taos_als_time_show, taos_als_time_store);
-static DEVICE_ATTR(illuminance0_integration_time_available, S_IRUGO,
-                taos_als_time_available_show, NULL);
-
-static DEVICE_ATTR(illuminance0_calibbias, S_IRUGO | S_IWUSR,
-                taos_als_trim_show, taos_als_trim_store);
-
-static DEVICE_ATTR(illuminance0_input_target, S_IRUGO | S_IWUSR,
-                taos_als_cal_target_show, taos_als_cal_target_store);
-
-static DEVICE_ATTR(illuminance0_input, S_IRUGO, taos_lux_show, NULL);
-static DEVICE_ATTR(illuminance0_calibrate, S_IWUSR, NULL, taos_do_calibrate);
-static DEVICE_ATTR(illuminance0_lux_table, S_IRUGO | S_IWUSR,
-                taos_luxtable_show, taos_luxtable_store);
-
-static struct attribute *sysfs_attrs_ctrl[] = {
-        &dev_attr_power_state.attr,
-        &dev_attr_illuminance0_calibscale.attr,                 /* Gain  */
-        &dev_attr_illuminance0_calibscale_available.attr,
-        &dev_attr_illuminance0_integration_time.attr,   /* I time*/
-        &dev_attr_illuminance0_integration_time_available.attr,
-        &dev_attr_illuminance0_calibbias.attr,                  /* trim  */
-        &dev_attr_illuminance0_input_target.attr,
-        &dev_attr_illuminance0_input.attr,
-        &dev_attr_illuminance0_calibrate.attr,
-        &dev_attr_illuminance0_lux_table.attr,
-        NULL
-};
-
-static const struct attribute_group tsl2583_attribute_group = {
-        .attrs = sysfs_attrs_ctrl,
-};
-
-/* Use the default register values to identify the Taos device */
-static int taos_tsl258x_device(unsigned char *bufp)
-{
-        return ((bufp[TSL258X_CHIPID] & 0xf0) == 0x90);
-}
-
-static const struct iio_info tsl2583_info = {
-        .attrs = &tsl2583_attribute_group,
-        .driver_module = THIS_MODULE,
-};
-
-/*
- * Client probe function - When a valid device is found, the driver's device
- * data structure is updated, and initialization completes successfully.
- */
-static int taos_probe(struct i2c_client *clientp,
-                      const struct i2c_device_id *idp)
-{
-        int i, ret;
-        unsigned char buf[TSL258X_MAX_DEVICE_REGS];
-        struct tsl2583_chip *chip;
-        struct iio_dev *indio_dev;
-
-        if (!i2c_check_functionality(clientp->adapter,
-                                     I2C_FUNC_SMBUS_BYTE_DATA)) {
-                dev_err(&clientp->dev, "taos_probe() - i2c smbus byte data func unsupported\n");
-                return -EOPNOTSUPP;
-        }
-
-        indio_dev = devm_iio_device_alloc(&clientp->dev, sizeof(*chip));
-        if (!indio_dev)
-                return -ENOMEM;
-        chip = iio_priv(indio_dev);
-        chip->client = clientp;
-        i2c_set_clientdata(clientp, indio_dev);
-
-        mutex_init(&chip->als_mutex);
-        chip->taos_chip_status = TSL258X_CHIP_UNKNOWN;
-        memcpy(chip->taos_config, taos_config, sizeof(chip->taos_config));
-
-        for (i = 0; i < TSL258X_MAX_DEVICE_REGS; i++) {
-                ret = i2c_smbus_write_byte(clientp,
-                                (TSL258X_CMD_REG | (TSL258X_CNTRL + i)));
-                if (ret < 0) {
-                        dev_err(&clientp->dev,
-                                "i2c_smbus_write_byte to cmd reg failed in taos_probe(), err = %d\n",
-                                ret);
-                        return ret;
-                }
-                ret = i2c_smbus_read_byte(clientp);
-                if (ret < 0) {
-                        dev_err(&clientp->dev,
-                                "i2c_smbus_read_byte from reg failed in taos_probe(), err = %d\n",
-                                ret);
-                        return ret;
-                }
-                buf[i] = ret;
-        }
-
-        if (!taos_tsl258x_device(buf)) {
-                dev_info(&clientp->dev,
-                         "i2c device found but does not match expected id in taos_probe()\n");
-                return -EINVAL;
-        }
-
-        ret = i2c_smbus_write_byte(clientp, (TSL258X_CMD_REG | TSL258X_CNTRL));
-        if (ret < 0) {
-                dev_err(&clientp->dev,
-                        "i2c_smbus_write_byte() to cmd reg failed in taos_probe(), err = %d\n",
-                        ret);
-                return ret;
-        }
-
-        indio_dev->info = &tsl2583_info;
-        indio_dev->dev.parent = &clientp->dev;
-        indio_dev->modes = INDIO_DIRECT_MODE;
-        indio_dev->name = chip->client->name;
-        ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev);
-        if (ret) {
-                dev_err(&clientp->dev, "iio registration failed\n");
-                return ret;
-        }
-
-        /* Load up the V2 defaults (these are hard coded defaults for now) */
-        taos_defaults(chip);
-
-        /* Make sure the chip is on */
-        taos_chip_on(indio_dev);
-
-        dev_info(&clientp->dev, "Light sensor found.\n");
-        return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int taos_suspend(struct device *dev)
-{
-        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
-        struct tsl2583_chip *chip = iio_priv(indio_dev);
-        int ret = 0;
-
-        mutex_lock(&chip->als_mutex);
-
-        if (chip->taos_chip_status == TSL258X_CHIP_WORKING) {
-                ret = taos_chip_off(indio_dev);
-                chip->taos_chip_status = TSL258X_CHIP_SUSPENDED;
-        }
-
-        mutex_unlock(&chip->als_mutex);
-        return ret;
-}
-
-static int taos_resume(struct device *dev)
-{
-        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
-        struct tsl2583_chip *chip = iio_priv(indio_dev);
-        int ret = 0;
-
-        mutex_lock(&chip->als_mutex);
-
-        if (chip->taos_chip_status == TSL258X_CHIP_SUSPENDED)
-                ret = taos_chip_on(indio_dev);
-
-        mutex_unlock(&chip->als_mutex);
-        return ret;
-}
-
-static SIMPLE_DEV_PM_OPS(taos_pm_ops, taos_suspend, taos_resume);
-#define TAOS_PM_OPS (&taos_pm_ops)
-#else
-#define TAOS_PM_OPS NULL
-#endif
-
-static struct i2c_device_id taos_idtable[] = {
-        { "tsl2580", 0 },
-        { "tsl2581", 1 },
-        { "tsl2583", 2 },
-        {}
-};
-MODULE_DEVICE_TABLE(i2c, taos_idtable);
-
-/* Driver definition */
-static struct i2c_driver taos_driver = {
-        .driver = {
-                .name = "tsl2583",
-                .pm = TAOS_PM_OPS,
-        },
-        .id_table = taos_idtable,
-        .probe = taos_probe,
-};
-module_i2c_driver(taos_driver);
-
-MODULE_AUTHOR("J. August Brenner<jbrenner@taosinc.com>");
-MODULE_DESCRIPTION("TAOS tsl2583 ambient light sensor driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index ebb8a1993303..3af8f77b8e41 100644
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -465,38 +465,26 @@ err_ret:
         return ret;
 }
 
-static ssize_t ade7758_read_frequency(struct device *dev,
-                                      struct device_attribute *attr, char *buf)
+static int ade7758_read_samp_freq(struct device *dev, int *val)
 {
         int ret;
         u8 t;
-        int sps;
 
         ret = ade7758_spi_read_reg_8(dev, ADE7758_WAVMODE, &t);
         if (ret)
                 return ret;
 
         t = (t >> 5) & 0x3;
-        sps = 26040 / (1 << t);
+        *val = 26040 / (1 << t);
 
-        return sprintf(buf, "%d SPS\n", sps);
+        return 0;
 }
 
-static ssize_t ade7758_write_frequency(struct device *dev,
-                                       struct device_attribute *attr,
-                                       const char *buf, size_t len)
+static int ade7758_write_samp_freq(struct device *dev, int val)
 {
-        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-        u16 val;
         int ret;
         u8 reg, t;
 
-        ret = kstrtou16(buf, 10, &val);
-        if (ret)
-                return ret;
-
-        mutex_lock(&indio_dev->mlock);
-
         switch (val) {
         case 26040:
                 t = 0;
@@ -525,9 +513,49 @@ static ssize_t ade7758_write_frequency(struct device *dev,
         ret = ade7758_spi_write_reg_8(dev, ADE7758_WAVMODE, reg);
 
 out:
-        mutex_unlock(&indio_dev->mlock);
+        return ret;
+}
 
-        return ret ? ret : len;
+static int ade7758_read_raw(struct iio_dev *indio_dev,
+                            struct iio_chan_spec const *chan,
+                            int *val,
+                            int *val2,
+                            long mask)
+{
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                mutex_lock(&indio_dev->mlock);
+                ret = ade7758_read_samp_freq(&indio_dev->dev, val);
+                mutex_unlock(&indio_dev->mlock);
+                return ret;
+        default:
+                return -EINVAL;
+        }
+
+        return ret;
+}
+
+static int ade7758_write_raw(struct iio_dev *indio_dev,
+                             struct iio_chan_spec const *chan,
+                             int val, int val2, long mask)
+{
+        int ret;
+
+        switch (mask) {
+        case IIO_CHAN_INFO_SAMP_FREQ:
+                if (val2)
+                        return -EINVAL;
+                mutex_lock(&indio_dev->mlock);
+                ret = ade7758_write_samp_freq(&indio_dev->dev, val);
+                mutex_unlock(&indio_dev->mlock);
+                return ret;
+        default:
+                return -EINVAL;
+        }
+
+        return ret;
 }
 
 static IIO_DEV_ATTR_TEMP_RAW(ade7758_read_8bit);
@@ -553,17 +581,12 @@ static IIO_DEV_ATTR_BVAHR(ade7758_read_16bit,
 static IIO_DEV_ATTR_CVAHR(ade7758_read_16bit,
                 ADE7758_CVAHR);
 
-static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
-                ade7758_read_frequency,
-                ade7758_write_frequency);
-
 static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("26040 13020 6510 3255");
 
 static struct attribute *ade7758_attributes[] = {
         &iio_dev_attr_in_temp_raw.dev_attr.attr,
         &iio_const_attr_in_temp_offset.dev_attr.attr,
         &iio_const_attr_in_temp_scale.dev_attr.attr,
-        &iio_dev_attr_sampling_frequency.dev_attr.attr,
         &iio_const_attr_sampling_frequency_available.dev_attr.attr,
         &iio_dev_attr_awatthr.dev_attr.attr,
         &iio_dev_attr_bwatthr.dev_attr.attr,
@@ -611,6 +634,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .type = IIO_VOLTAGE,
                 .indexed = 1,
                 .channel = 0,
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_A, AD7758_VOLTAGE),
                 .scan_index = 0,
                 .scan_type = {
@@ -622,6 +646,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .type = IIO_CURRENT,
                 .indexed = 1,
                 .channel = 0,
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_A, AD7758_CURRENT),
                 .scan_index = 1,
                 .scan_type = {
@@ -634,6 +659,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .extend_name = "apparent",
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_A, AD7758_APP_PWR),
                 .scan_index = 2,
                 .scan_type = {
@@ -646,6 +672,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .extend_name = "active",
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_A, AD7758_ACT_PWR),
                 .scan_index = 3,
                 .scan_type = {
@@ -658,6 +685,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .extend_name = "reactive",
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_A, AD7758_REACT_PWR),
                 .scan_index = 4,
                 .scan_type = {
@@ -669,6 +697,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .type = IIO_VOLTAGE,
                 .indexed = 1,
                 .channel = 1,
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_B, AD7758_VOLTAGE),
                 .scan_index = 5,
                 .scan_type = {
@@ -680,6 +709,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .type = IIO_CURRENT,
                 .indexed = 1,
                 .channel = 1,
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_B, AD7758_CURRENT),
                 .scan_index = 6,
                 .scan_type = {
@@ -692,6 +722,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .indexed = 1,
                 .channel = 1,
                 .extend_name = "apparent",
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_B, AD7758_APP_PWR),
                 .scan_index = 7,
                 .scan_type = {
@@ -704,6 +735,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .indexed = 1,
                 .channel = 1,
                 .extend_name = "active",
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_B, AD7758_ACT_PWR),
                 .scan_index = 8,
                 .scan_type = {
@@ -716,6 +748,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .indexed = 1,
                 .channel = 1,
                 .extend_name = "reactive",
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_B, AD7758_REACT_PWR),
                 .scan_index = 9,
                 .scan_type = {
@@ -727,6 +760,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .type = IIO_VOLTAGE,
                 .indexed = 1,
                 .channel = 2,
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_C, AD7758_VOLTAGE),
                 .scan_index = 10,
                 .scan_type = {
@@ -738,6 +772,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .type = IIO_CURRENT,
                 .indexed = 1,
                 .channel = 2,
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_C, AD7758_CURRENT),
                 .scan_index = 11,
                 .scan_type = {
@@ -750,6 +785,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .indexed = 1,
                 .channel = 2,
                 .extend_name = "apparent",
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_C, AD7758_APP_PWR),
                 .scan_index = 12,
                 .scan_type = {
@@ -762,6 +798,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .indexed = 1,
                 .channel = 2,
                 .extend_name = "active",
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_C, AD7758_ACT_PWR),
                 .scan_index = 13,
                 .scan_type = {
@@ -774,6 +811,7 @@ static const struct iio_chan_spec ade7758_channels[] = {
                 .indexed = 1,
                 .channel = 2,
                 .extend_name = "reactive",
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
                 .address = AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR),
                 .scan_index = 14,
                 .scan_type = {
@@ -787,6 +825,8 @@ static const struct iio_chan_spec ade7758_channels[] = {
 
 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,
 };
 
diff --git a/drivers/staging/iio/ring_hw.h b/drivers/staging/iio/ring_hw.h
deleted file mode 100644
index 75bf47bfee78..000000000000
--- a/drivers/staging/iio/ring_hw.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * ring_hw.h - common functionality for iio hardware ring buffers
- *
- * 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.
- *
- * Copyright (c) 2009 Jonathan Cameron <jic23@kernel.org>
- *
- */
-
-#ifndef _RING_HW_H_
-#define _RING_HW_H_
-
-/**
- * struct iio_hw_ring_buffer- hardware ring buffer
- * @buf:        generic ring buffer elements
- * @private:    device specific data
- */
-struct iio_hw_buffer {
-        struct iio_buffer buf;
-        void *private;
-};
-
-#define iio_to_hw_buf(r) container_of(r, struct iio_hw_buffer, buf)
-
-#endif /* _RING_HW_H_ */
diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c
index 81c46f4d0935..a604c83c957e 100644
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ b/drivers/staging/ks7010/ks7010_sdio.c
@@ -35,18 +35,18 @@ MODULE_DEVICE_TABLE(sdio, ks7010_sdio_ids);
 /* macro */
 
 #define inc_txqhead(priv) \
-        (priv->tx_dev.qhead = (priv->tx_dev.qhead + 1) % TX_DEVICE_BUFF_SIZE)
+        (priv->tx_dev.qhead = (priv->tx_dev.qhead + 1) % TX_DEVICE_BUFF_SIZE)
 #define inc_txqtail(priv) \
-        (priv->tx_dev.qtail = (priv->tx_dev.qtail + 1) % TX_DEVICE_BUFF_SIZE)
+        (priv->tx_dev.qtail = (priv->tx_dev.qtail + 1) % TX_DEVICE_BUFF_SIZE)
 #define cnt_txqbody(priv) \
-        (((priv->tx_dev.qtail + TX_DEVICE_BUFF_SIZE) - (priv->tx_dev.qhead)) % TX_DEVICE_BUFF_SIZE)
+        (((priv->tx_dev.qtail + TX_DEVICE_BUFF_SIZE) - (priv->tx_dev.qhead)) % TX_DEVICE_BUFF_SIZE)
 
 #define inc_rxqhead(priv) \
-        (priv->rx_dev.qhead = (priv->rx_dev.qhead + 1) % RX_DEVICE_BUFF_SIZE)
+        (priv->rx_dev.qhead = (priv->rx_dev.qhead + 1) % RX_DEVICE_BUFF_SIZE)
 #define inc_rxqtail(priv) \
-        (priv->rx_dev.qtail = (priv->rx_dev.qtail + 1) % RX_DEVICE_BUFF_SIZE)
+        (priv->rx_dev.qtail = (priv->rx_dev.qtail + 1) % RX_DEVICE_BUFF_SIZE)
 #define cnt_rxqbody(priv) \
-        (((priv->rx_dev.qtail + RX_DEVICE_BUFF_SIZE) - (priv->rx_dev.qhead)) % RX_DEVICE_BUFF_SIZE)
+        (((priv->rx_dev.qtail + RX_DEVICE_BUFF_SIZE) - (priv->rx_dev.qhead)) % RX_DEVICE_BUFF_SIZE)
 
 static int ks7010_sdio_read(struct ks_wlan_private *priv, unsigned int address,
                             unsigned char *buffer, int length)
@@ -76,10 +76,9 @@ static int ks7010_sdio_write(struct ks_wlan_private *priv, unsigned int address,
         card = priv->ks_wlan_hw.sdio_card;
 
         if (length == 1)        /* CMD52 */
-                sdio_writeb(card->func, *buffer, (unsigned int)address, &rc);
+                sdio_writeb(card->func, *buffer, address, &rc);
         else    /* CMD53 */
-                rc = sdio_memcpy_toio(card->func, (unsigned int)address, buffer,
-                                      length);
+                rc = sdio_memcpy_toio(card->func, address, buffer, length);
 
         if (rc != 0)
                 DPRINTK(1, "sdio error=%d size=%d\n", rc, length);
@@ -255,7 +254,7 @@ int ks_wlan_hw_power_save(struct ks_wlan_private *priv)
 
 static int enqueue_txdev(struct ks_wlan_private *priv, unsigned char *p,
                          unsigned long size,
-                         void (*complete_handler) (void *arg1, void *arg2),
+                         void (*complete_handler)(void *arg1, void *arg2),
                          void *arg1, void *arg2)
 {
         struct tx_device_buffer *sp;
@@ -294,6 +293,7 @@ static int write_to_device(struct ks_wlan_private *priv, unsigned char *buffer,
         int retval;
         unsigned char rw_data;
         struct hostif_hdr *hdr;
+
         hdr = (struct hostif_hdr *)buffer;
 
         DPRINTK(4, "size=%d\n", hdr->size);
@@ -353,11 +353,12 @@ static void tx_device_task(void *dev)
 }
 
 int ks_wlan_hw_tx(struct ks_wlan_private *priv, void *p, unsigned long size,
-                  void (*complete_handler) (void *arg1, void *arg2),
+                  void (*complete_handler)(void *arg1, void *arg2),
                   void *arg1, void *arg2)
 {
         int result = 0;
         struct hostif_hdr *hdr;
+
         hdr = (struct hostif_hdr *)p;
 
         if (hdr->event < HIF_DATA_REQ || HIF_REQ_MAX < hdr->event) {
@@ -412,7 +413,7 @@ static void ks_wlan_hw_rx(void *dev, uint16_t size)
         /* receive data */
         if (cnt_rxqbody(priv) >= (RX_DEVICE_BUFF_SIZE - 1)) {
                 /* in case of buffer overflow */
-                DPRINTK(1, "rx buffer overflow \n");
+                DPRINTK(1, "rx buffer overflow\n");
                 goto error_out;
         }
         rx_buffer = &priv->rx_dev.rx_dev_buff[priv->rx_dev.qtail];
@@ -658,10 +659,12 @@ static void ks_sdio_interrupt(struct sdio_func *func)
 static int trx_device_init(struct ks_wlan_private *priv)
 {
         /* initialize values (tx) */
-        priv->tx_dev.qtail = priv->tx_dev.qhead = 0;
+        priv->tx_dev.qhead = 0;
+        priv->tx_dev.qtail = 0;
 
         /* initialize values (rx) */
-        priv->rx_dev.qtail = priv->rx_dev.qhead = 0;
+        priv->rx_dev.qhead = 0;
+        priv->rx_dev.qtail = 0;
 
         /* initialize spinLock (tx,rx) */
         spin_lock_init(&priv->tx_dev.tx_dev_lock);
@@ -718,7 +721,7 @@ static int ks7010_sdio_update_index(struct ks_wlan_private *priv, u32 index)
         return rc;
 }
 
-#define ROM_BUFF_SIZE (64*1024)
+#define ROM_BUFF_SIZE (64 * 1024)
 static int ks7010_sdio_data_compare(struct ks_wlan_private *priv, u32 address,
                                     unsigned char *data, unsigned int size)
 {
@@ -955,7 +958,7 @@ static int ks7010_sdio_probe(struct sdio_func *func,
         priv = NULL;
         netdev = NULL;
 
-        /* initilize ks_sdio_card */
+        /* initialize ks_sdio_card */
         card = kzalloc(sizeof(*card), GFP_KERNEL);
         if (!card)
                 return -ENOMEM;
@@ -1117,6 +1120,7 @@ static void ks7010_sdio_remove(struct sdio_func *func)
         int ret;
         struct ks_sdio_card *card;
         struct ks_wlan_private *priv;
+
         DPRINTK(1, "ks7010_sdio_remove()\n");
 
         card = sdio_get_drvdata(func);
@@ -1142,6 +1146,7 @@ static void ks7010_sdio_remove(struct sdio_func *func)
                 /* send stop request to MAC */
                 {
                         struct hostif_stop_request_t *pp;
+
                         pp = kzalloc(hif_align_size(sizeof(*pp)), GFP_KERNEL);
                         if (!pp) {
                                 DPRINTK(3, "allocate memory failed..\n");
diff --git a/drivers/staging/ks7010/ks7010_sdio.h b/drivers/staging/ks7010/ks7010_sdio.h
index c72064b48bd8..0f5fd848e23d 100644
--- a/drivers/staging/ks7010/ks7010_sdio.h
+++ b/drivers/staging/ks7010/ks7010_sdio.h
@@ -1,5 +1,5 @@
 /*
- *   Driver for KeyStream, KS7010 based SDIO cards. 
+ *   Driver for KeyStream, KS7010 based SDIO cards.
  *
  *   Copyright (C) 2006-2008 KeyStream Corp.
  *   Copyright (C) 2009 Renesas Technology Corp.
@@ -41,7 +41,7 @@
 /* Write Index Register */
 #define WRITE_INDEX             0x000010
 
-/* Write Status/Read Data Size Register 
+/* Write Status/Read Data Size Register
  * for network packet (less than 2048 bytes data)
  */
 #define WSTATUS_RSIZE           0x000014
@@ -53,14 +53,14 @@
 /* ARM to SD interrupt Pending */
 #define INT_PENDING             0x000024
 
-#define INT_GCR_B               (1<<7)
-#define INT_GCR_A               (1<<6)
-#define INT_WRITE_STATUS        (1<<5)
-#define INT_WRITE_INDEX         (1<<4)
-#define INT_WRITE_SIZE          (1<<3)
-#define INT_READ_STATUS         (1<<2)
-#define INT_READ_INDEX          (1<<1)
-#define INT_READ_SIZE           (1<<0)
+#define INT_GCR_B              BIT(7)
+#define INT_GCR_A              BIT(6)
+#define INT_WRITE_STATUS       BIT(5)
+#define INT_WRITE_INDEX        BIT(4)
+#define INT_WRITE_SIZE         BIT(3)
+#define INT_READ_STATUS        BIT(2)
+#define INT_READ_INDEX         BIT(1)
+#define INT_READ_SIZE          BIT(0)
 
 /* General Communication Register A */
 #define GCR_A                   0x000028
@@ -100,7 +100,7 @@ struct hw_info_t {
 struct ks_sdio_packet {
         struct ks_sdio_packet *next;
         u16 nb;
-        u8 buffer[0] __attribute__ ((aligned(4)));
+        u8 buffer[0] __aligned(4);
 };
 
 struct ks_sdio_card {
diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
index c57ca581550a..1fbd495e5e63 100644
--- a/drivers/staging/ks7010/ks_hostif.c
+++ b/drivers/staging/ks7010/ks_hostif.c
@@ -23,11 +23,11 @@
 
 /* macro */
 #define inc_smeqhead(priv) \
-        ( priv->sme_i.qhead = (priv->sme_i.qhead + 1) % SME_EVENT_BUFF_SIZE )
+        (priv->sme_i.qhead = (priv->sme_i.qhead + 1) % SME_EVENT_BUFF_SIZE)
 #define inc_smeqtail(priv) \
-        ( priv->sme_i.qtail = (priv->sme_i.qtail + 1) % SME_EVENT_BUFF_SIZE )
+        (priv->sme_i.qtail = (priv->sme_i.qtail + 1) % SME_EVENT_BUFF_SIZE)
 #define cnt_smeqbody(priv) \
-        (((priv->sme_i.qtail + SME_EVENT_BUFF_SIZE) - (priv->sme_i.qhead)) % SME_EVENT_BUFF_SIZE )
+        (((priv->sme_i.qtail + SME_EVENT_BUFF_SIZE) - (priv->sme_i.qhead)) % SME_EVENT_BUFF_SIZE)
 
 #define KS_WLAN_MEM_FLAG (GFP_ATOMIC)
 
@@ -97,11 +97,10 @@ int ks_wlan_do_power_save(struct ks_wlan_private *priv)
 {
         DPRINTK(4, "psstatus.status=%d\n", atomic_read(&priv->psstatus.status));
 
-        if ((priv->connect_status & CONNECT_STATUS_MASK) == CONNECT_STATUS) {
+        if ((priv->connect_status & CONNECT_STATUS_MASK) == CONNECT_STATUS)
                 hostif_sme_enqueue(priv, SME_POW_MNGMT_REQUEST);
-        } else {
+        else
                 priv->dev_state = DEVICE_STATE_READY;
-        }
         return 0;
 }
 
@@ -187,13 +186,7 @@ int get_current_ap(struct ks_wlan_private *priv, struct link_ap_info_t *ap_info)
                 memcpy(wrqu.ap_addr.sa_data,
                        &(priv->current_ap.bssid[0]), ETH_ALEN);
                 DPRINTK(3,
-                        "IWEVENT: connect bssid=%02x:%02x:%02x:%02x:%02x:%02x\n",
-                        (unsigned char)wrqu.ap_addr.sa_data[0],
-                        (unsigned char)wrqu.ap_addr.sa_data[1],
-                        (unsigned char)wrqu.ap_addr.sa_data[2],
-                        (unsigned char)wrqu.ap_addr.sa_data[3],
-                        (unsigned char)wrqu.ap_addr.sa_data[4],
-                        (unsigned char)wrqu.ap_addr.sa_data[5]);
+                        "IWEVENT: connect bssid=%pM\n", wrqu.ap_addr.sa_data);
                 wireless_send_event(netdev, SIOCGIWAP, &wrqu, NULL);
         }
         DPRINTK(4, "\n    Link AP\n");
@@ -420,16 +413,11 @@ void hostif_data_indication(struct ks_wlan_private *priv)
                                         /*  needed parameters: count, keyid, key type, TSC */
                                         sprintf(buf,
                                                 "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr="
-                                                "%02x:%02x:%02x:%02x:%02x:%02x)",
+                                                "%pM)",
                                                 auth_type - 1,
                                                 eth_hdr->
                                                 h_dest[0] & 0x01 ? "broad" :
-                                                "uni", eth_hdr->h_source[0],
-                                                eth_hdr->h_source[1],
-                                                eth_hdr->h_source[2],
-                                                eth_hdr->h_source[3],
-                                                eth_hdr->h_source[4],
-                                                eth_hdr->h_source[5]);
+                                                "uni", eth_hdr->h_source);
                                         memset(&wrqu, 0, sizeof(wrqu));
                                         wrqu.data.length = strlen(buf);
                                         DPRINTK(4,
@@ -476,8 +464,6 @@ void hostif_data_indication(struct ks_wlan_private *priv)
                         skb->dev->last_rx = jiffies;
                         netif_rx(skb);
                 } else {
-                        printk(KERN_WARNING
-                               "ks_wlan: Memory squeeze, dropping packet.\n");
                         priv->nstats.rx_dropped++;
                 }
                 break;
@@ -511,8 +497,6 @@ void hostif_data_indication(struct ks_wlan_private *priv)
                         skb->dev->last_rx = jiffies;
                         netif_rx(skb);
                 } else {
-                        printk(KERN_WARNING
-                               "ks_wlan: Memory squeeze, dropping packet.\n");
                         priv->nstats.rx_dropped++;
                 }
                 break;
@@ -560,10 +544,7 @@ void hostif_mib_get_confirm(struct ks_wlan_private *priv)
                 dev->dev_addr[5] = priv->eth_addr[5];
                 dev->dev_addr[6] = 0x00;
                 dev->dev_addr[7] = 0x00;
-                printk(KERN_INFO
-                       "ks_wlan: MAC ADDRESS = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                       priv->eth_addr[0], priv->eth_addr[1], priv->eth_addr[2],
-                       priv->eth_addr[3], priv->eth_addr[4], priv->eth_addr[5]);
+                netdev_info(dev, "MAC ADDRESS = %pM\n", priv->eth_addr);
                 break;
         case DOT11_PRODUCT_VERSION:
                 /* firmware version */
@@ -571,8 +552,8 @@ void hostif_mib_get_confirm(struct ks_wlan_private *priv)
                 priv->version_size = priv->rx_size;
                 memcpy(priv->firmware_version, priv->rxp, priv->rx_size);
                 priv->firmware_version[priv->rx_size] = '\0';
-                printk(KERN_INFO "ks_wlan: firmware ver. = %s\n",
-                       priv->firmware_version);
+                netdev_info(dev, "firmware ver. = %s\n",
+                            priv->firmware_version);
                 hostif_sme_enqueue(priv, SME_GET_PRODUCT_VERSION);
                 /* wake_up_interruptible_all(&priv->confirm_wait); */
                 complete(&priv->confirm_wait);
@@ -592,12 +573,12 @@ void hostif_mib_get_confirm(struct ks_wlan_private *priv)
                 } else if (priv->eeprom_sum.type == 1) {
                         if (priv->eeprom_sum.result == 0) {
                                 priv->eeprom_checksum = EEPROM_NG;
-                                printk("LOCAL_EEPROM_SUM NG\n");
+                                netdev_info(dev, "LOCAL_EEPROM_SUM NG\n");
                         } else if (priv->eeprom_sum.result == 1) {
                                 priv->eeprom_checksum = EEPROM_OK;
                         }
                 } else {
-                        printk("LOCAL_EEPROM_SUM error!\n");
+                        netdev_err(dev, "LOCAL_EEPROM_SUM error!\n");
                 }
                 break;
         default:
@@ -705,15 +686,13 @@ void hostif_mib_set_confirm(struct ks_wlan_private *priv)
                 break;
         case DOT11_GMK1_TSC:
                 DPRINTK(2, "DOT11_GMK1_TSC:mib_status=%d\n", (int)mib_status);
-                if (atomic_read(&priv->psstatus.snooze_guard)) {
+                if (atomic_read(&priv->psstatus.snooze_guard))
                         atomic_set(&priv->psstatus.snooze_guard, 0);
-                }
                 break;
         case DOT11_GMK2_TSC:
                 DPRINTK(2, "DOT11_GMK2_TSC:mib_status=%d\n", (int)mib_status);
-                if (atomic_read(&priv->psstatus.snooze_guard)) {
+                if (atomic_read(&priv->psstatus.snooze_guard))
                         atomic_set(&priv->psstatus.snooze_guard, 0);
-                }
                 break;
         case LOCAL_PMK:
                 DPRINTK(2, "LOCAL_PMK:mib_status=%d\n", (int)mib_status);
@@ -766,8 +745,9 @@ void hostif_sleep_confirm(struct ks_wlan_private *priv)
 static
 void hostif_start_confirm(struct ks_wlan_private *priv)
 {
-#ifdef  WPS
+#ifdef WPS
         union iwreq_data wrqu;
+
         wrqu.data.length = 0;
         wrqu.data.flags = 0;
         wrqu.ap_addr.sa_family = ARPHRD_ETHER;
@@ -789,6 +769,7 @@ void hostif_connect_indication(struct ks_wlan_private *priv)
         unsigned int old_status = priv->connect_status;
         struct net_device *netdev = priv->net_dev;
         union iwreq_data wrqu0;
+
         connect_code = get_WORD(priv);
 
         switch (connect_code) {
@@ -894,7 +875,7 @@ void hostif_stop_confirm(struct ks_wlan_private *priv)
                 netif_carrier_off(netdev);
                 tmp = FORCE_DISCONNECT & priv->connect_status;
                 priv->connect_status = tmp | DISCONNECT_STATUS;
-                printk("IWEVENT: disconnect\n");
+                netdev_info(netdev, "IWEVENT: disconnect\n");
 
                 wrqu0.data.length = 0;
                 wrqu0.data.flags = 0;
@@ -904,7 +885,7 @@ void hostif_stop_confirm(struct ks_wlan_private *priv)
                     && (old_status & CONNECT_STATUS_MASK) == CONNECT_STATUS) {
                         eth_zero_addr(wrqu0.ap_addr.sa_data);
                         DPRINTK(3, "IWEVENT: disconnect\n");
-                        printk("IWEVENT: disconnect\n");
+                        netdev_info(netdev, "IWEVENT: disconnect\n");
                         DPRINTK(3, "disconnect :: scan_ind_count=%d\n",
                                 priv->scan_ind_count);
                         wireless_send_event(netdev, SIOCGIWAP, &wrqu0, NULL);
@@ -928,6 +909,7 @@ static
 void hostif_infrastructure_set_confirm(struct ks_wlan_private *priv)
 {
         uint16_t result_code;
+
         DPRINTK(3, "\n");
         result_code = get_WORD(priv);
         DPRINTK(3, "result code = %d\n", result_code);
@@ -993,6 +975,7 @@ void hostif_bss_scan_confirm(struct ks_wlan_private *priv)
         unsigned int result_code;
         struct net_device *dev = priv->net_dev;
         union iwreq_data wrqu;
+
         result_code = get_DWORD(priv);
         DPRINTK(2, "result=%d :: scan_ind_count=%d\n", result_code,
                 priv->scan_ind_count);
@@ -1110,7 +1093,7 @@ void hostif_event_check(struct ks_wlan_private *priv)
         case HIF_AP_SET_CONF:
         default:
                 //DPRINTK(1, "undefined event[%04X]\n", event);
-                printk("undefined event[%04X]\n", event);
+                netdev_err(priv->net_dev, "undefined event[%04X]\n", event);
                 /* wake_up_all(&priv->confirm_wait); */
                 complete(&priv->confirm_wait);
                 break;
@@ -1184,9 +1167,7 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *packet)
         eth = (struct ethhdr *)packet->data;
         if (memcmp(&priv->eth_addr[0], eth->h_source, ETH_ALEN)) {
                 DPRINTK(1, "invalid mac address !!\n");
-                DPRINTK(1, "ethernet->h_source=%02X:%02X:%02X:%02X:%02X:%02X\n",
-                        eth->h_source[0], eth->h_source[1], eth->h_source[2],
-                        eth->h_source[3], eth->h_source[4], eth->h_source[5]);
+                DPRINTK(1, "ethernet->h_source=%pM\n", eth->h_source);
                 dev_kfree_skb(packet);
                 kfree(pp);
                 return -3;
@@ -1244,7 +1225,7 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *packet)
                         pp->auth_type = cpu_to_le16((uint16_t) TYPE_AUTH);      /* no encryption */
                 } else {
                         if (priv->wpa.pairwise_suite == IW_AUTH_CIPHER_TKIP) {
-                                MichaelMICFunction(&michel_mic, (uint8_t *) priv->wpa.key[0].tx_mic_key, (uint8_t *) & pp->data[0], (int)packet_len, (uint8_t) 0,       /* priority */
+                                MichaelMICFunction(&michel_mic, (uint8_t *) priv->wpa.key[0].tx_mic_key, (uint8_t *) &pp->data[0], (int)packet_len, (uint8_t) 0,        /* priority */
                                                    (uint8_t *) michel_mic.
                                                    Result);
                                 memcpy(p, michel_mic.Result, 8);
@@ -1294,10 +1275,11 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *packet)
         return result;
 }
 
-#define ps_confirm_wait_inc(priv)  do{if(atomic_read(&priv->psstatus.status) > PS_ACTIVE_SET){ \
-                                                  atomic_inc(&priv->psstatus.confirm_wait); \
-                                                  /* atomic_set(&priv->psstatus.status, PS_CONF_WAIT);*/ \
-                                      } }while(0)
+#define ps_confirm_wait_inc(priv) do { \
+        if (atomic_read(&priv->psstatus.status) > PS_ACTIVE_SET) { \
+                atomic_inc(&priv->psstatus.confirm_wait); \
+                /* atomic_set(&priv->psstatus.status, PS_CONF_WAIT);*/ \
+        } } while (0)
 
 static
 void hostif_mib_get_request(struct ks_wlan_private *priv,
@@ -1891,6 +1873,7 @@ static
 void hostif_sme_set_wep(struct ks_wlan_private *priv, int type)
 {
         uint32_t val;
+
         switch (type) {
         case SME_WEP_INDEX_REQUEST:
                 val = cpu_to_le32((uint32_t) (priv->reg.wep_index));
@@ -1936,18 +1919,17 @@ void hostif_sme_set_wep(struct ks_wlan_private *priv, int type)
                 break;
         }
 
-        return;
 }
 
 struct wpa_suite_t {
         unsigned short size;
         unsigned char suite[4][CIPHER_ID_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct rsn_mode_t {
         uint32_t rsn_mode;
         uint16_t rsn_capability;
-} __attribute__ ((packed));
+} __packed;
 
 static
 void hostif_sme_set_rsn(struct ks_wlan_private *priv, int type)
@@ -2125,7 +2107,6 @@ void hostif_sme_set_rsn(struct ks_wlan_private *priv, int type)
                 break;
 
         }
-        return;
 }
 
 static
@@ -2216,10 +2197,7 @@ void hostif_sme_mode_setup(struct ks_wlan_private *priv)
                 } else {
                         hostif_infrastructure_set2_request(priv);
                         DPRINTK(2,
-                                "Infra bssid = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                priv->reg.bssid[0], priv->reg.bssid[1],
-                                priv->reg.bssid[2], priv->reg.bssid[3],
-                                priv->reg.bssid[4], priv->reg.bssid[5]);
+                                "Infra bssid = %pM\n", priv->reg.bssid);
                 }
                 break;
         case MODE_ADHOC:
@@ -2229,17 +2207,13 @@ void hostif_sme_mode_setup(struct ks_wlan_private *priv)
                 } else {
                         hostif_adhoc_set2_request(priv);
                         DPRINTK(2,
-                                "Adhoc bssid = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                priv->reg.bssid[0], priv->reg.bssid[1],
-                                priv->reg.bssid[2], priv->reg.bssid[3],
-                                priv->reg.bssid[4], priv->reg.bssid[5]);
+                                "Adhoc bssid = %pM\n", priv->reg.bssid);
                 }
                 break;
         default:
                 break;
         }
 
-        return;
 }
 
 static
@@ -2340,7 +2314,6 @@ void hostif_sme_powermgt_set(struct ks_wlan_private *priv)
         }
         hostif_power_mngmt_request(priv, mode, wake_up, receiveDTIMs);
 
-        return;
 }
 
 static
@@ -2358,13 +2331,13 @@ void hostif_sme_sleep_set(struct ks_wlan_private *priv)
                 break;
         }
 
-        return;
 }
 
 static
 void hostif_sme_set_key(struct ks_wlan_private *priv, int type)
 {
         uint32_t val;
+
         switch (type) {
         case SME_SET_FLAG:
                 val = cpu_to_le32((uint32_t) (priv->reg.privacy_invoked));
@@ -2416,7 +2389,6 @@ void hostif_sme_set_key(struct ks_wlan_private *priv, int type)
                                        &priv->wpa.key[2].rx_seq[0]);
                 break;
         }
-        return;
 }
 
 static
@@ -2427,16 +2399,14 @@ void hostif_sme_set_pmksa(struct ks_wlan_private *priv)
                 struct {
                         uint8_t bssid[ETH_ALEN];
                         uint8_t pmkid[IW_PMKID_LEN];
-                } __attribute__ ((packed)) list[PMK_LIST_MAX];
-        } __attribute__ ((packed)) pmkcache;
+                } __packed list[PMK_LIST_MAX];
+        } __packed pmkcache;
         struct pmk_t *pmk;
-        struct list_head *ptr;
         int i;
 
         DPRINTK(4, "pmklist.size=%d\n", priv->pmklist.size);
         i = 0;
-        list_for_each(ptr, &priv->pmklist.head) {
-                pmk = list_entry(ptr, struct pmk_t, list);
+        list_for_each_entry(pmk, &priv->pmklist.head, list) {
                 if (i < PMK_LIST_MAX) {
                         memcpy(pmkcache.list[i].bssid, pmk->bssid, ETH_ALEN);
                         memcpy(pmkcache.list[i].pmkid, pmk->pmkid,
@@ -2461,9 +2431,8 @@ void hostif_sme_execute(struct ks_wlan_private *priv, int event)
         DPRINTK(3, "event=%d\n", event);
         switch (event) {
         case SME_START:
-                if (priv->dev_state == DEVICE_STATE_BOOT) {
+                if (priv->dev_state == DEVICE_STATE_BOOT)
                         hostif_mib_get_request(priv, DOT11_MAC_ADDRESS);
-                }
                 break;
         case SME_MULTICAST_REQUEST:
                 hostif_sme_multicast_set(priv);
@@ -2508,14 +2477,12 @@ void hostif_sme_execute(struct ks_wlan_private *priv, int event)
                 }
                 break;
         case SME_GET_MAC_ADDRESS:
-                if (priv->dev_state == DEVICE_STATE_BOOT) {
+                if (priv->dev_state == DEVICE_STATE_BOOT)
                         hostif_mib_get_request(priv, DOT11_PRODUCT_VERSION);
-                }
                 break;
         case SME_GET_PRODUCT_VERSION:
-                if (priv->dev_state == DEVICE_STATE_BOOT) {
+                if (priv->dev_state == DEVICE_STATE_BOOT)
                         priv->dev_state = DEVICE_STATE_PREINIT;
-                }
                 break;
         case SME_STOP_REQUEST:
                 hostif_stop_request(priv);
@@ -2594,9 +2561,8 @@ void hostif_sme_execute(struct ks_wlan_private *priv, int event)
                 /* for power save */
                 atomic_set(&priv->psstatus.snooze_guard, 0);
                 atomic_set(&priv->psstatus.confirm_wait, 0);
-                if (priv->dev_state == DEVICE_STATE_PREINIT) {
+                if (priv->dev_state == DEVICE_STATE_PREINIT)
                         priv->dev_state = DEVICE_STATE_INIT;
-                }
                 /* wake_up_interruptible_all(&priv->confirm_wait); */
                 complete(&priv->confirm_wait);
                 break;
@@ -2652,7 +2618,6 @@ void hostif_sme_task(unsigned long dev)
                                 tasklet_schedule(&priv->sme_task);
                 }
         }
-        return;
 }
 
 /* send to Station Management Entity module */
@@ -2672,7 +2637,7 @@ void hostif_sme_enqueue(struct ks_wlan_private *priv, unsigned short event)
         } else {
                 /* in case of buffer overflow */
                 //DPRINTK(2,"sme queue buffer overflow\n");
-                printk("sme queue buffer overflow\n");
+                netdev_err(priv->net_dev, "sme queue buffer overflow\n");
         }
 
         tasklet_schedule(&priv->sme_task);
@@ -2736,5 +2701,4 @@ int hostif_init(struct ks_wlan_private *priv)
 void hostif_exit(struct ks_wlan_private *priv)
 {
         tasklet_kill(&priv->sme_task);
-        return;
 }
diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h
index c2cc288ae899..279e9b06fc4b 100644
--- a/drivers/staging/ks7010/ks_wlan.h
+++ b/drivers/staging/ks7010/ks_wlan.h
@@ -14,7 +14,6 @@
 
 #define WPS
 
-#include <linux/version.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -25,13 +24,13 @@
 #include <linux/netdevice.h>    /* struct net_device_stats,  struct sk_buff     */
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
-#include <asm/atomic.h> /* struct atmic_t                               */
+#include <linux/atomic.h>       /* struct atomic_t */
 #include <linux/timer.h>        /* struct timer_list */
 #include <linux/string.h>
 #include <linux/completion.h>   /* struct completion */
 #include <linux/workqueue.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include "ks7010_sdio.h"
 
@@ -43,36 +42,36 @@
 #endif
 
 struct ks_wlan_parameter {
-        uint8_t operation_mode; /* Operation Mode */
-        uint8_t channel;        /*  Channel */
-        uint8_t tx_rate;        /*  Transmit Rate */
+        u8 operation_mode;      /* Operation Mode */
+        u8 channel;     /*  Channel */
+        u8 tx_rate;     /*  Transmit Rate */
         struct {
-                uint8_t size;
-                uint8_t body[16];
+                u8 size;
+                u8 body[16];
         } rate_set;
-        uint8_t bssid[ETH_ALEN];        /* BSSID */
+        u8 bssid[ETH_ALEN];     /* BSSID */
         struct {
-                uint8_t size;
-                uint8_t body[32 + 1];
+                u8 size;
+                u8 body[32 + 1];
         } ssid; /*  SSID */
-        uint8_t preamble;       /*  Preamble */
-        uint8_t powermgt;       /*  PowerManagementMode */
-        uint32_t scan_type;     /*  AP List Scan Type */
+        u8 preamble;    /*  Preamble */
+        u8 powermgt;    /*  PowerManagementMode */
+        u32 scan_type;  /*  AP List Scan Type */
 #define BEACON_LOST_COUNT_MIN 0
 #define BEACON_LOST_COUNT_MAX 65535
-        uint32_t beacon_lost_count;     /*  Beacon Lost Count */
-        uint32_t rts;   /*  RTS Threashold */
-        uint32_t fragment;      /*  Fragmentation Threashold */
-        uint32_t privacy_invoked;
-        uint32_t wep_index;
+        u32 beacon_lost_count;  /*  Beacon Lost Count */
+        u32 rts;        /*  RTS Threashold */
+        u32 fragment;   /*  Fragmentation Threashold */
+        u32 privacy_invoked;
+        u32 wep_index;
         struct {
-                uint8_t size;
-                uint8_t val[13 * 2 + 1];
+                u8 size;
+                u8 val[13 * 2 + 1];
         } wep_key[4];
-        uint16_t authenticate_type;
-        uint16_t phy_type;      /* 11b/11g/11bg mode type */
-        uint16_t cts_mode;      /* for 11g/11bg mode cts mode */
-        uint16_t phy_info_timer;        /* phy information timer */
+        u16 authenticate_type;
+        u16 phy_type;   /* 11b/11g/11bg mode type */
+        u16 cts_mode;   /* for 11g/11bg mode cts mode */
+        u16 phy_info_timer;     /* phy information timer */
 };
 
 enum {
@@ -216,37 +215,37 @@ struct hostt_t {
 
 #define RSN_IE_BODY_MAX 64
 struct rsn_ie_t {
-        uint8_t id;     /* 0xdd = WPA or 0x30 = RSN */
-        uint8_t size;   /* max ? 255 ? */
-        uint8_t body[RSN_IE_BODY_MAX];
+        u8 id;  /* 0xdd = WPA or 0x30 = RSN */
+        u8 size;        /* max ? 255 ? */
+        u8 body[RSN_IE_BODY_MAX];
 } __packed;
 
 #ifdef WPS
 #define WPS_IE_BODY_MAX 255
 struct wps_ie_t {
-        uint8_t id;     /* 221 'dd <len> 00 50 F2 04' */
-        uint8_t size;   /* max ? 255 ? */
-        uint8_t body[WPS_IE_BODY_MAX];
+        u8 id;  /* 221 'dd <len> 00 50 F2 04' */
+        u8 size;        /* max ? 255 ? */
+        u8 body[WPS_IE_BODY_MAX];
 } __packed;
 #endif /* WPS */
 
 struct local_ap_t {
-        uint8_t bssid[6];
-        uint8_t rssi;
-        uint8_t sq;
+        u8 bssid[6];
+        u8 rssi;
+        u8 sq;
         struct {
-                uint8_t size;
-                uint8_t body[32];
-                uint8_t ssid_pad;
+                u8 size;
+                u8 body[32];
+                u8 ssid_pad;
         } ssid;
         struct {
-                uint8_t size;
-                uint8_t body[16];
-                uint8_t rate_pad;
+                u8 size;
+                u8 body[16];
+                u8 rate_pad;
         } rate_set;
-        uint16_t capability;
-        uint8_t channel;
-        uint8_t noise;
+        u16 capability;
+        u8 channel;
+        u8 noise;
         struct rsn_ie_t wpa_ie;
         struct rsn_ie_t rsn_ie;
 #ifdef WPS
@@ -262,15 +261,15 @@ struct local_aplist_t {
 };
 
 struct local_gain_t {
-        uint8_t TxMode;
-        uint8_t RxMode;
-        uint8_t TxGain;
-        uint8_t RxGain;
+        u8 TxMode;
+        u8 RxMode;
+        u8 TxGain;
+        u8 RxGain;
 };
 
 struct local_eeprom_sum_t {
-        uint8_t type;
-        uint8_t result;
+        u8 type;
+        u8 result;
 };
 
 enum {
@@ -352,25 +351,25 @@ enum {
 #define MIC_KEY_SIZE 8
 
 struct wpa_key_t {
-        uint32_t ext_flags;     /* IW_ENCODE_EXT_xxx */
-        uint8_t tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
-        uint8_t rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
+        u32 ext_flags;  /* IW_ENCODE_EXT_xxx */
+        u8 tx_seq[IW_ENCODE_SEQ_MAX_SIZE];      /* LSB first */
+        u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE];      /* LSB first */
         struct sockaddr addr;   /* ff:ff:ff:ff:ff:ff for broadcast/multicast
                                  * (group) keys or unicast address for
                                  * individual keys */
-        uint16_t alg;
-        uint16_t key_len;       /* WEP: 5 or 13, TKIP: 32, CCMP: 16 */
-        uint8_t key_val[IW_ENCODING_TOKEN_MAX];
-        uint8_t tx_mic_key[MIC_KEY_SIZE];
-        uint8_t rx_mic_key[MIC_KEY_SIZE];
+        u16 alg;
+        u16 key_len;    /* WEP: 5 or 13, TKIP: 32, CCMP: 16 */
+        u8 key_val[IW_ENCODING_TOKEN_MAX];
+        u8 tx_mic_key[MIC_KEY_SIZE];
+        u8 rx_mic_key[MIC_KEY_SIZE];
 };
 #define WPA_KEY_INDEX_MAX 4
 #define WPA_RX_SEQ_LEN 6
 
 struct mic_failure_t {
-        uint16_t failure;       /* MIC Failure counter 0 or 1 or 2 */
-        uint16_t counter;       /* 1sec counter 0-60 */
-        uint32_t last_failure_time;
+        u16 failure;    /* MIC Failure counter 0 or 1 or 2 */
+        u16 counter;    /* 1sec counter 0-60 */
+        u32 last_failure_time;
         int stop;       /* stop flag */
 };
 
@@ -391,12 +390,12 @@ struct wpa_status_t {
 #include <linux/list.h>
 #define PMK_LIST_MAX 8
 struct pmk_list_t {
-        uint16_t size;
+        u16 size;
         struct list_head head;
         struct pmk_t {
                 struct list_head list;
-                uint8_t bssid[ETH_ALEN];
-                uint8_t pmkid[IW_PMKID_LEN];
+                u8 bssid[ETH_ALEN];
+                u8 pmkid[IW_PMKID_LEN];
         } pmk[PMK_LIST_MAX];
 };
 
@@ -404,7 +403,7 @@ struct pmk_list_t {
 struct wps_status_t {
         int wps_enabled;
         int ielen;
-        uint8_t ie[255];
+        u8 ie[255];
 };
 #endif /* WPS */
 
@@ -439,7 +438,7 @@ struct ks_wlan_private {
         struct pmk_list_t pmklist;
         /* wireless parameter */
         struct ks_wlan_parameter reg;
-        uint8_t current_rate;
+        u8 current_rate;
 
         char nick[IW_ESSID_MAX_SIZE + 1];
 
@@ -472,24 +471,24 @@ struct ks_wlan_private {
         /* spinlock_t lock; */
 #define FORCE_DISCONNECT    0x80000000
 #define CONNECT_STATUS_MASK 0x7FFFFFFF
-        uint32_t connect_status;        /* connect status */
+        u32 connect_status;     /* connect status */
         int infra_status;       /* Infractructure status */
 
-        uint8_t data_buff[0x1000];
+        u8 data_buff[0x1000];
 
-        uint8_t scan_ssid_len;
-        uint8_t scan_ssid[IW_ESSID_MAX_SIZE + 1];
+        u8 scan_ssid_len;
+        u8 scan_ssid[IW_ESSID_MAX_SIZE + 1];
         struct local_gain_t gain;
 #ifdef WPS
         struct net_device *l2_dev;
         int l2_fd;
         struct wps_status_t wps;
 #endif /* WPS */
-        uint8_t sleep_mode;
+        u8 sleep_mode;
 
-        uint8_t region;
+        u8 region;
         struct local_eeprom_sum_t eeprom_sum;
-        uint8_t eeprom_checksum;
+        u8 eeprom_checksum;
 
         struct hostt_t hostt;
 
diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index b2b4fa4c3834..e5d04adaeb1a 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -24,9 +24,9 @@
 #include <linux/pci.h>
 #include <linux/ctype.h>
 #include <linux/timer.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 static int wep_on_off;
 #define WEP_OFF         0
@@ -50,10 +50,10 @@ static const long frequency_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
 /* A few details needed for WEP (Wireless Equivalent Privacy) */
 #define MAX_KEY_SIZE 13 /* 128 (?) bits */
 #define MIN_KEY_SIZE  5 /* 40 bits RC4 - WEP */
-typedef struct wep_key_t {
+struct wep_key {
         u16 len;
         u8 key[16];     /* 40-bit and 104-bit keys */
-} wep_key_t;
+};
 
 /* Backward compatibility */
 #ifndef IW_ENCODE_NOKEY
@@ -88,9 +88,9 @@ int ks_wlan_update_phy_information(struct ks_wlan_private *priv)
 
         DPRINTK(4, "in_interrupt = %ld\n", in_interrupt());
 
-        if (priv->dev_state < DEVICE_STATE_READY) {
+        if (priv->dev_state < DEVICE_STATE_READY)
                 return -1;      /* not finished initialize */
-        }
+
         if (atomic_read(&update_phyinfo))
                 return 1;
 
@@ -182,19 +182,18 @@ static int ks_wlan_get_name(struct net_device *dev,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
-        if (priv->dev_state < DEVICE_STATE_READY) {
+        if (priv->dev_state < DEVICE_STATE_READY)
                 strcpy(cwrq, "NOT READY!");
-        } else if (priv->reg.phy_type == D_11B_ONLY_MODE) {
+        else if (priv->reg.phy_type == D_11B_ONLY_MODE)
                 strcpy(cwrq, "IEEE 802.11b");
-        } else if (priv->reg.phy_type == D_11G_ONLY_MODE) {
+        else if (priv->reg.phy_type == D_11G_ONLY_MODE)
                 strcpy(cwrq, "IEEE 802.11g");
-        } else {
+        else
                 strcpy(cwrq, "IEEE 802.11b/g");
-        }
 
         return 0;
 }
@@ -209,9 +208,8 @@ static int ks_wlan_set_freq(struct net_device *dev,
             (struct ks_wlan_private *)netdev_priv(dev);
         int rc = -EINPROGRESS;  /* Call commit handler */
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
 
         /* for SLEEP MODE */
         /* If setting by frequency, convert to a channel */
@@ -219,6 +217,7 @@ static int ks_wlan_set_freq(struct net_device *dev,
             (fwrq->m >= (int)2.412e8) && (fwrq->m <= (int)2.487e8)) {
                 int f = fwrq->m / 100000;
                 int c = 0;
+
                 while ((c < 14) && (f != frequency_list[c]))
                         c++;
                 /* Hack to fall through... */
@@ -257,13 +256,13 @@ static int ks_wlan_get_freq(struct net_device *dev,
             (struct ks_wlan_private *)netdev_priv(dev);
         int f;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
-        if ((priv->connect_status & CONNECT_STATUS_MASK) == CONNECT_STATUS) {
+        if ((priv->connect_status & CONNECT_STATUS_MASK) == CONNECT_STATUS)
                 f = (int)priv->current_ap.channel;
-        } else
+                else
                 f = (int)priv->reg.channel;
         fwrq->m = frequency_list[f - 1] * 100000;
         fwrq->e = 1;
@@ -283,9 +282,9 @@ static int ks_wlan_set_essid(struct net_device *dev,
 
         DPRINTK(2, " %d\n", dwrq->flags);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
 
         /* for SLEEP MODE */
         /* Check if we asked for `any' */
@@ -301,14 +300,14 @@ static int ks_wlan_set_essid(struct net_device *dev,
                         len--;
 
                 /* Check the size of the string */
-                if (len > IW_ESSID_MAX_SIZE) {
+                if (len > IW_ESSID_MAX_SIZE)
                         return -EINVAL;
-                }
+
 #else
                 /* Check the size of the string */
-                if (dwrq->length > IW_ESSID_MAX_SIZE + 1) {
+                if (dwrq->length > IW_ESSID_MAX_SIZE + 1)
                         return -E2BIG;
-                }
+
 #endif
 
                 /* Set the SSID */
@@ -340,9 +339,9 @@ static int ks_wlan_get_essid(struct net_device *dev,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
 
         /* for SLEEP MODE */
         /* Note : if dwrq->flags != 0, we should
@@ -385,25 +384,23 @@ static int ks_wlan_set_wap(struct net_device *dev, struct iw_request_info *info,
 
         DPRINTK(2, "\n");
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         if (priv->reg.operation_mode == MODE_ADHOC ||
             priv->reg.operation_mode == MODE_INFRASTRUCTURE) {
-                memcpy(priv->reg.bssid, (u8 *) & ap_addr->sa_data, ETH_ALEN);
+                memcpy(priv->reg.bssid, &ap_addr->sa_data, ETH_ALEN);
 
-                if (is_valid_ether_addr((u8 *) priv->reg.bssid)) {
+                if (is_valid_ether_addr((u8 *)priv->reg.bssid))
                         priv->need_commit |= SME_MODE_SET;
-                }
+
         } else {
                 eth_zero_addr(priv->reg.bssid);
                 return -EOPNOTSUPP;
         }
 
-        DPRINTK(2, "bssid = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                priv->reg.bssid[0], priv->reg.bssid[1], priv->reg.bssid[2],
-                priv->reg.bssid[3], priv->reg.bssid[4], priv->reg.bssid[5]);
+        DPRINTK(2, "bssid = %pM\n", priv->reg.bssid);
 
         /* Write it to the card */
         if (priv->need_commit) {
@@ -421,15 +418,14 @@ static int ks_wlan_get_wap(struct net_device *dev, struct iw_request_info *info,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
-        if ((priv->connect_status & CONNECT_STATUS_MASK) == CONNECT_STATUS) {
+        if ((priv->connect_status & CONNECT_STATUS_MASK) == CONNECT_STATUS)
                 memcpy(awrq->sa_data, &(priv->current_ap.bssid[0]), ETH_ALEN);
-        } else {
+        else
                 eth_zero_addr(awrq->sa_data);
-        }
 
         awrq->sa_family = ARPHRD_ETHER;
 
@@ -445,15 +441,14 @@ static int ks_wlan_set_nick(struct net_device *dev,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
 
         /* for SLEEP MODE */
         /* Check the size of the string */
-        if (dwrq->length > 16 + 1) {
+        if (dwrq->length > 16 + 1)
                 return -E2BIG;
-        }
+
         memset(priv->nick, 0, sizeof(priv->nick));
         memcpy(priv->nick, extra, dwrq->length);
 
@@ -469,9 +464,9 @@ static int ks_wlan_get_nick(struct net_device *dev,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         strncpy(extra, priv->nick, 16);
         extra[16] = '\0';
@@ -490,9 +485,9 @@ static int ks_wlan_set_rate(struct net_device *dev,
             (struct ks_wlan_private *)netdev_priv(dev);
         int i = 0;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         if (priv->reg.phy_type == D_11B_ONLY_MODE) {
                 if (vwrq->fixed == 1) {
@@ -727,13 +722,13 @@ static int ks_wlan_get_rate(struct net_device *dev,
         DPRINTK(2, "in_interrupt = %ld update_phyinfo = %d\n",
                 in_interrupt(), atomic_read(&update_phyinfo));
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
-        if (!atomic_read(&update_phyinfo)) {
+        if (!atomic_read(&update_phyinfo))
                 ks_wlan_update_phy_information(priv);
-        }
+
         vwrq->value = ((priv->current_rate) & RATE_MASK) * 500000;
         if (priv->reg.tx_rate == TX_RATE_FIXED)
                 vwrq->fixed = 1;
@@ -752,15 +747,15 @@ static int ks_wlan_set_rts(struct net_device *dev, struct iw_request_info *info,
             (struct ks_wlan_private *)netdev_priv(dev);
         int rthr = vwrq->value;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         if (vwrq->disabled)
                 rthr = 2347;
-        if ((rthr < 0) || (rthr > 2347)) {
+        if ((rthr < 0) || (rthr > 2347))
                 return -EINVAL;
-        }
+
         priv->reg.rts = rthr;
         priv->need_commit |= SME_RTS;
 
@@ -775,9 +770,9 @@ static int ks_wlan_get_rts(struct net_device *dev, struct iw_request_info *info,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         vwrq->value = priv->reg.rts;
         vwrq->disabled = (vwrq->value >= 2347);
@@ -796,15 +791,15 @@ static int ks_wlan_set_frag(struct net_device *dev,
             (struct ks_wlan_private *)netdev_priv(dev);
         int fthr = vwrq->value;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         if (vwrq->disabled)
                 fthr = 2346;
-        if ((fthr < 256) || (fthr > 2346)) {
+        if ((fthr < 256) || (fthr > 2346))
                 return -EINVAL;
-        }
+
         fthr &= ~0x1;   /* Get an even value - is it really needed ??? */
         priv->reg.fragment = fthr;
         priv->need_commit |= SME_FRAG;
@@ -821,9 +816,9 @@ static int ks_wlan_get_frag(struct net_device *dev,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         vwrq->value = priv->reg.fragment;
         vwrq->disabled = (vwrq->value >= 2346);
@@ -835,7 +830,7 @@ static int ks_wlan_get_frag(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Wireless Handler : set Mode of Operation */
 static int ks_wlan_set_mode(struct net_device *dev,
-                            struct iw_request_info *info, __u32 * uwrq,
+                            struct iw_request_info *info, __u32 *uwrq,
                             char *extra)
 {
         struct ks_wlan_private *priv =
@@ -843,9 +838,9 @@ static int ks_wlan_set_mode(struct net_device *dev,
 
         DPRINTK(2, "mode=%d\n", *uwrq);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         switch (*uwrq) {
         case IW_MODE_ADHOC:
@@ -871,15 +866,14 @@ static int ks_wlan_set_mode(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Wireless Handler : get Mode of Operation */
 static int ks_wlan_get_mode(struct net_device *dev,
-                            struct iw_request_info *info, __u32 * uwrq,
+                            struct iw_request_info *info, __u32 *uwrq,
                             char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
 
         /* for SLEEP MODE */
         /* If not managed, assume it's ad-hoc */
@@ -906,16 +900,15 @@ static int ks_wlan_set_encode(struct net_device *dev,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        wep_key_t key;
+        struct wep_key key;
         int index = (dwrq->flags & IW_ENCODE_INDEX);
         int current_index = priv->reg.wep_index;
         int i;
 
         DPRINTK(2, "flags=%04X\n", dwrq->flags);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
 
         /* for SLEEP MODE */
         /* index check */
@@ -959,9 +952,9 @@ static int ks_wlan_set_encode(struct net_device *dev,
                         }
                         /* Send the key to the card */
                         priv->reg.wep_key[index].size = key.len;
-                        for (i = 0; i < (priv->reg.wep_key[index].size); i++) {
+                        for (i = 0; i < (priv->reg.wep_key[index].size); i++)
                                 priv->reg.wep_key[index].val[i] = key.key[i];
-                        }
+
                         priv->need_commit |= (SME_WEP_VAL1 << index);
                         priv->reg.wep_index = index;
                         priv->need_commit |= SME_WEP_INDEX;
@@ -973,9 +966,9 @@ static int ks_wlan_set_encode(struct net_device *dev,
                         priv->reg.wep_key[2].size = 0;
                         priv->reg.wep_key[3].size = 0;
                         priv->reg.privacy_invoked = 0x00;
-                        if (priv->reg.authenticate_type == AUTH_TYPE_SHARED_KEY) {
+                        if (priv->reg.authenticate_type == AUTH_TYPE_SHARED_KEY)
                                 priv->need_commit |= SME_MODE_SET;
-                        }
+
                         priv->reg.authenticate_type = AUTH_TYPE_OPEN_SYSTEM;
                         wep_on_off = WEP_OFF;
                         priv->need_commit |= SME_WEP_FLAG;
@@ -997,14 +990,14 @@ static int ks_wlan_set_encode(struct net_device *dev,
                 priv->need_commit |= SME_WEP_FLAG;
 
         if (dwrq->flags & IW_ENCODE_OPEN) {
-                if (priv->reg.authenticate_type == AUTH_TYPE_SHARED_KEY) {
+                if (priv->reg.authenticate_type == AUTH_TYPE_SHARED_KEY)
                         priv->need_commit |= SME_MODE_SET;
-                }
+
                 priv->reg.authenticate_type = AUTH_TYPE_OPEN_SYSTEM;
         } else if (dwrq->flags & IW_ENCODE_RESTRICTED) {
-                if (priv->reg.authenticate_type == AUTH_TYPE_OPEN_SYSTEM) {
+                if (priv->reg.authenticate_type == AUTH_TYPE_OPEN_SYSTEM)
                         priv->need_commit |= SME_MODE_SET;
-                }
+
                 priv->reg.authenticate_type = AUTH_TYPE_SHARED_KEY;
         }
 //      return -EINPROGRESS;            /* Call commit handler */
@@ -1026,9 +1019,9 @@ static int ks_wlan_get_encode(struct net_device *dev,
         char zeros[16];
         int index = (dwrq->flags & IW_ENCODE_INDEX) - 1;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         dwrq->flags = IW_ENCODE_DISABLED;
 
@@ -1056,9 +1049,8 @@ static int ks_wlan_get_encode(struct net_device *dev,
         /* Copy the key to the user buffer */
         if ((index >= 0) && (index < 4))
                 dwrq->length = priv->reg.wep_key[index].size;
-        if (dwrq->length > 16) {
+        if (dwrq->length > 16)
                 dwrq->length = 0;
-        }
 #if 1   /* IW_ENCODE_NOKEY; */
         if (dwrq->length) {
                 if ((index >= 0) && (index < 4))
@@ -1086,9 +1078,8 @@ static int ks_wlan_get_txpow(struct net_device *dev,
                              struct iw_request_info *info,
                              struct iw_param *vwrq, char *extra)
 {
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
 
         /* for SLEEP MODE */
         /* Not Support */
@@ -1113,9 +1104,8 @@ static int ks_wlan_get_retry(struct net_device *dev,
                              struct iw_request_info *info,
                              struct iw_param *vwrq, char *extra)
 {
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
 
         /* for SLEEP MODE */
         /* Not Support */
@@ -1139,9 +1129,9 @@ static int ks_wlan_get_range(struct net_device *dev,
 
         DPRINTK(2, "\n");
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         dwrq->length = sizeof(struct iw_range);
         memset(range, 0, sizeof(*range));
@@ -1267,9 +1257,9 @@ static int ks_wlan_set_power(struct net_device *dev,
             (struct ks_wlan_private *)netdev_priv(dev);
         short enabled;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         enabled = vwrq->disabled ? 0 : 1;
         if (enabled == 0) {     /* 0 */
@@ -1301,9 +1291,8 @@ static int ks_wlan_get_power(struct net_device *dev,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         if (priv->reg.powermgt > 0)
                 vwrq->disabled = 0;
@@ -1322,9 +1311,8 @@ static int ks_wlan_get_iwstats(struct net_device *dev,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         vwrq->qual = 0; /* not supported */
         vwrq->level = priv->wstats.qual.level;
@@ -1372,9 +1360,8 @@ static int ks_wlan_get_aplist(struct net_device *dev,
 
         int i;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         for (i = 0; i < priv->aplist.size; i++) {
                 memcpy(address[i].sa_data, &(priv->aplist.ap[i].bssid[0]),
@@ -1404,11 +1391,11 @@ static int ks_wlan_set_scan(struct net_device *dev,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
         struct iw_scan_req *req = NULL;
+
         DPRINTK(2, "\n");
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
 
         /* for SLEEP MODE */
         /* specified SSID SCAN */
@@ -1598,11 +1585,11 @@ static int ks_wlan_get_scan(struct net_device *dev,
             (struct ks_wlan_private *)netdev_priv(dev);
         int i;
         char *current_ev = extra;
+
         DPRINTK(2, "\n");
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         if (priv->sme_i.sme_flag & SME_AP_SCAN) {
                 DPRINTK(2, "flag AP_SCAN\n");
@@ -1675,9 +1662,8 @@ static int ks_wlan_set_genie(struct net_device *dev,
 
         DPRINTK(2, "\n");
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         return 0;
 //      return -EOPNOTSUPP;
@@ -1696,26 +1682,23 @@ static int ks_wlan_set_auth_mode(struct net_device *dev,
 
         DPRINTK(2, "index=%d:value=%08X\n", index, value);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         switch (index) {
         case IW_AUTH_WPA_VERSION:       /* 0 */
                 switch (value) {
                 case IW_AUTH_WPA_VERSION_DISABLED:
                         priv->wpa.version = value;
-                        if (priv->wpa.rsn_enabled) {
+                        if (priv->wpa.rsn_enabled)
                                 priv->wpa.rsn_enabled = 0;
-                        }
                         priv->need_commit |= SME_RSN;
                         break;
                 case IW_AUTH_WPA_VERSION_WPA:
                 case IW_AUTH_WPA_VERSION_WPA2:
                         priv->wpa.version = value;
-                        if (!(priv->wpa.rsn_enabled)) {
+                        if (!(priv->wpa.rsn_enabled))
                                 priv->wpa.rsn_enabled = 1;
-                        }
                         priv->need_commit |= SME_RSN;
                         break;
                 default:
@@ -1832,11 +1815,11 @@ static int ks_wlan_get_auth_mode(struct net_device *dev,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
         int index = (vwrq->flags & IW_AUTH_INDEX);
+
         DPRINTK(2, "index=%d\n", index);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
 
         /* for SLEEP MODE */
         /*  WPA (not used ?? wpa_supplicant) */
@@ -1886,18 +1869,17 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
         DPRINTK(2, "flags=%04X:: ext_flags=%08X\n", dwrq->flags,
                 enc->ext_flags);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         if (index < 1 || index > 4)
                 return -EINVAL;
         else
                 index--;
 
-        if (dwrq->flags & IW_ENCODE_DISABLED) {
+        if (dwrq->flags & IW_ENCODE_DISABLED)
                 priv->wpa.key[index].key_len = 0;
-        }
 
         if (enc) {
                 priv->wpa.key[index].ext_flags = enc->ext_flags;
@@ -1986,9 +1968,8 @@ static int ks_wlan_get_encode_ext(struct net_device *dev,
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
 
         /* for SLEEP MODE */
         /*  WPA (not used ?? wpa_supplicant)
@@ -2015,13 +1996,13 @@ static int ks_wlan_set_pmksa(struct net_device *dev,
 
         DPRINTK(2, "\n");
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
-        if (!extra) {
+        if (!extra)
                 return -EINVAL;
-        }
+
         pmksa = (struct iw_pmksa *)extra;
         DPRINTK(2, "cmd=%d\n", pmksa->cmd);
 
@@ -2141,16 +2122,16 @@ static struct iw_statistics *ks_get_wireless_stats(struct net_device *dev)
 /*------------------------------------------------------------------*/
 /* Private handler : set stop request */
 static int ks_wlan_set_stop_request(struct net_device *dev,
-                                    struct iw_request_info *info, __u32 * uwrq,
+                                    struct iw_request_info *info, __u32 *uwrq,
                                     char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
         DPRINTK(2, "\n");
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         if (!(*uwrq))
                 return -EINVAL;
@@ -2173,15 +2154,14 @@ static int ks_wlan_set_mlme(struct net_device *dev,
 
         DPRINTK(2, ":%d :%d\n", mlme->cmd, mlme->reason_code);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         switch (mlme->cmd) {
         case IW_MLME_DEAUTH:
-                if (mlme->reason_code == WLAN_REASON_MIC_FAILURE) {
+                if (mlme->reason_code == WLAN_REASON_MIC_FAILURE)
                         return 0;
-                }
         case IW_MLME_DISASSOC:
                 mode = 1;
                 return ks_wlan_set_stop_request(dev, NULL, &mode, NULL);
@@ -2207,14 +2187,14 @@ static int ks_wlan_get_firmware_version(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : set force disconnect status */
 static int ks_wlan_set_detach(struct net_device *dev,
-                              struct iw_request_info *info, __u32 * uwrq,
+                              struct iw_request_info *info, __u32 *uwrq,
                               char *extra)
 {
         struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         if (*uwrq == CONNECT_STATUS) {  /* 0 */
                 priv->connect_status &= ~FORCE_DISCONNECT;
@@ -2232,14 +2212,14 @@ static int ks_wlan_set_detach(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get force disconnect status */
 static int ks_wlan_get_detach(struct net_device *dev,
-                              struct iw_request_info *info, __u32 * uwrq,
+                              struct iw_request_info *info, __u32 *uwrq,
                               char *extra)
 {
         struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         *uwrq = ((priv->connect_status & FORCE_DISCONNECT) ? 1 : 0);
         return 0;
@@ -2248,14 +2228,14 @@ static int ks_wlan_get_detach(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get connect status */
 static int ks_wlan_get_connect(struct net_device *dev,
-                               struct iw_request_info *info, __u32 * uwrq,
+                               struct iw_request_info *info, __u32 *uwrq,
                                char *extra)
 {
         struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         *uwrq = (priv->connect_status & CONNECT_STATUS_MASK);
         return 0;
@@ -2265,15 +2245,15 @@ static int ks_wlan_get_connect(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : set preamble */
 static int ks_wlan_set_preamble(struct net_device *dev,
-                                struct iw_request_info *info, __u32 * uwrq,
+                                struct iw_request_info *info, __u32 *uwrq,
                                 char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         if (*uwrq == LONG_PREAMBLE) {   /* 0 */
                 priv->reg.preamble = LONG_PREAMBLE;
@@ -2290,15 +2270,15 @@ static int ks_wlan_set_preamble(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get preamble */
 static int ks_wlan_get_preamble(struct net_device *dev,
-                                struct iw_request_info *info, __u32 * uwrq,
+                                struct iw_request_info *info, __u32 *uwrq,
                                 char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         *uwrq = priv->reg.preamble;
         return 0;
@@ -2307,15 +2287,15 @@ static int ks_wlan_get_preamble(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : set power save mode */
 static int ks_wlan_set_powermgt(struct net_device *dev,
-                                struct iw_request_info *info, __u32 * uwrq,
+                                struct iw_request_info *info, __u32 *uwrq,
                                 char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         if (*uwrq == POWMGT_ACTIVE_MODE) {      /* 0 */
                 priv->reg.powermgt = POWMGT_ACTIVE_MODE;
@@ -2340,15 +2320,15 @@ static int ks_wlan_set_powermgt(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get power save made */
 static int ks_wlan_get_powermgt(struct net_device *dev,
-                                struct iw_request_info *info, __u32 * uwrq,
+                                struct iw_request_info *info, __u32 *uwrq,
                                 char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
+
         /* for SLEEP MODE */
         *uwrq = priv->reg.powermgt;
         return 0;
@@ -2357,15 +2337,14 @@ static int ks_wlan_get_powermgt(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : set scan type */
 static int ks_wlan_set_scan_type(struct net_device *dev,
-                                 struct iw_request_info *info, __u32 * uwrq,
+                                 struct iw_request_info *info, __u32 *uwrq,
                                  char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         if (*uwrq == ACTIVE_SCAN) {     /* 0 */
                 priv->reg.scan_type = ACTIVE_SCAN;
@@ -2380,15 +2359,14 @@ static int ks_wlan_set_scan_type(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get scan type */
 static int ks_wlan_get_scan_type(struct net_device *dev,
-                                 struct iw_request_info *info, __u32 * uwrq,
+                                 struct iw_request_info *info, __u32 *uwrq,
                                  char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         *uwrq = priv->reg.scan_type;
         return 0;
@@ -2404,9 +2382,8 @@ static int ks_wlan_data_write(struct net_device *dev,
         struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
         unsigned char *wbuff = NULL;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         wbuff = (unsigned char *)kmalloc(dwrq->length, GFP_ATOMIC);
         if (!wbuff)
@@ -2428,9 +2405,8 @@ static int ks_wlan_data_read(struct net_device *dev,
         struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
         unsigned short read_length;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         if (!atomic_read(&priv->event_count)) {
                 if (priv->dev_state < DEVICE_STATE_BOOT) {      /* Remove device */
@@ -2488,9 +2464,8 @@ static int ks_wlan_get_wep_ascii(struct net_device *dev,
         int i, j, len = 0;
         char tmp[WEP_ASCII_BUFF_SIZE];
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         strcpy(tmp, " WEP keys ASCII \n");
         len += strlen(" WEP keys ASCII \n");
@@ -2531,19 +2506,18 @@ static int ks_wlan_get_wep_ascii(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : set beacon lost count */
 static int ks_wlan_set_beacon_lost(struct net_device *dev,
-                                   struct iw_request_info *info, __u32 * uwrq,
+                                   struct iw_request_info *info, __u32 *uwrq,
                                    char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
-        if (*uwrq >= BEACON_LOST_COUNT_MIN && *uwrq <= BEACON_LOST_COUNT_MAX) {
+        if (*uwrq >= BEACON_LOST_COUNT_MIN && *uwrq <= BEACON_LOST_COUNT_MAX)
                 priv->reg.beacon_lost_count = *uwrq;
-        } else
+        else
                 return -EINVAL;
 
         if (priv->reg.operation_mode == MODE_INFRASTRUCTURE) {
@@ -2556,15 +2530,14 @@ static int ks_wlan_set_beacon_lost(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get beacon lost count */
 static int ks_wlan_get_beacon_lost(struct net_device *dev,
-                                   struct iw_request_info *info, __u32 * uwrq,
+                                   struct iw_request_info *info, __u32 *uwrq,
                                    char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         *uwrq = priv->reg.beacon_lost_count;
         return 0;
@@ -2573,15 +2546,14 @@ static int ks_wlan_get_beacon_lost(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : set phy type */
 static int ks_wlan_set_phy_type(struct net_device *dev,
-                                struct iw_request_info *info, __u32 * uwrq,
+                                struct iw_request_info *info, __u32 *uwrq,
                                 char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         if (*uwrq == D_11B_ONLY_MODE) { /* 0 */
                 priv->reg.phy_type = D_11B_ONLY_MODE;
@@ -2599,15 +2571,14 @@ static int ks_wlan_set_phy_type(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get phy type */
 static int ks_wlan_get_phy_type(struct net_device *dev,
-                                struct iw_request_info *info, __u32 * uwrq,
+                                struct iw_request_info *info, __u32 *uwrq,
                                 char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         *uwrq = priv->reg.phy_type;
         return 0;
@@ -2616,15 +2587,14 @@ static int ks_wlan_get_phy_type(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : set cts mode */
 static int ks_wlan_set_cts_mode(struct net_device *dev,
-                                struct iw_request_info *info, __u32 * uwrq,
+                                struct iw_request_info *info, __u32 *uwrq,
                                 char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         if (*uwrq == CTS_MODE_FALSE) {  /* 0 */
                 priv->reg.cts_mode = CTS_MODE_FALSE;
@@ -2644,15 +2614,14 @@ static int ks_wlan_set_cts_mode(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get cts mode */
 static int ks_wlan_get_cts_mode(struct net_device *dev,
-                                struct iw_request_info *info, __u32 * uwrq,
+                                struct iw_request_info *info, __u32 *uwrq,
                                 char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         *uwrq = priv->reg.cts_mode;
         return 0;
@@ -2662,7 +2631,7 @@ static int ks_wlan_get_cts_mode(struct net_device *dev,
 /* Private handler : set sleep mode */
 static int ks_wlan_set_sleep_mode(struct net_device *dev,
                                   struct iw_request_info *info,
-                                  __u32 * uwrq, char *extra)
+                                  __u32 *uwrq, char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
@@ -2692,7 +2661,7 @@ static int ks_wlan_set_sleep_mode(struct net_device *dev,
 /* Private handler : get sleep mode */
 static int ks_wlan_get_sleep_mode(struct net_device *dev,
                                   struct iw_request_info *info,
-                                  __u32 * uwrq, char *extra)
+                                  __u32 *uwrq, char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
@@ -2708,16 +2677,15 @@ static int ks_wlan_get_sleep_mode(struct net_device *dev,
 /* Private handler : set phy information timer */
 static int ks_wlan_set_phy_information_timer(struct net_device *dev,
                                              struct iw_request_info *info,
-                                             __u32 * uwrq, char *extra)
+                                             __u32 *uwrq, char *extra)
 {
         struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         if (*uwrq >= 0 && *uwrq <= 0xFFFF)      /* 0-65535 */
-                priv->reg.phy_info_timer = (uint16_t) * uwrq;
+                priv->reg.phy_info_timer = (uint16_t)*uwrq;
         else
                 return -EINVAL;
 
@@ -2730,13 +2698,12 @@ static int ks_wlan_set_phy_information_timer(struct net_device *dev,
 /* Private handler : get phy information timer */
 static int ks_wlan_get_phy_information_timer(struct net_device *dev,
                                              struct iw_request_info *info,
-                                             __u32 * uwrq, char *extra)
+                                             __u32 *uwrq, char *extra)
 {
         struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         *uwrq = priv->reg.phy_info_timer;
         return 0;
@@ -2747,16 +2714,15 @@ static int ks_wlan_get_phy_information_timer(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : set WPS enable */
 static int ks_wlan_set_wps_enable(struct net_device *dev,
-                                  struct iw_request_info *info, __u32 * uwrq,
+                                  struct iw_request_info *info, __u32 *uwrq,
                                   char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
         DPRINTK(2, "\n");
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         if (*uwrq == 0 || *uwrq == 1)
                 priv->wps.wps_enabled = *uwrq;
@@ -2771,16 +2737,15 @@ static int ks_wlan_set_wps_enable(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get WPS enable */
 static int ks_wlan_get_wps_enable(struct net_device *dev,
-                                  struct iw_request_info *info, __u32 * uwrq,
+                                  struct iw_request_info *info, __u32 *uwrq,
                                   char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
         DPRINTK(2, "\n");
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         *uwrq = priv->wps.wps_enabled;
         netdev_info(dev, "return=%d\n", *uwrq);
@@ -2801,16 +2766,14 @@ static int ks_wlan_set_wps_probe_req(struct net_device *dev,
 
         DPRINTK(2, "\n");
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         DPRINTK(2, "dwrq->length=%d\n", dwrq->length);
 
         /* length check */
-        if (p[1] + 2 != dwrq->length || dwrq->length > 256) {
+        if (p[1] + 2 != dwrq->length || dwrq->length > 256)
                 return -EINVAL;
-        }
 
         priv->wps.ielen = p[1] + 2 + 1; /* IE header + IE + sizeof(len) */
         len = p[1] + 2; /* IE header + IE */
@@ -2833,14 +2796,14 @@ static int ks_wlan_set_wps_probe_req(struct net_device *dev,
 /* Private handler : get WPS probe req */
 static int ks_wlan_get_wps_probe_req(struct net_device *dev,
                                      struct iw_request_info *info,
-                                     __u32 * uwrq, char *extra)
+                                     __u32 *uwrq, char *extra)
 {
         struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
+
         DPRINTK(2, "\n");
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         return 0;
 }
@@ -2850,18 +2813,17 @@ static int ks_wlan_get_wps_probe_req(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : set tx gain control value */
 static int ks_wlan_set_tx_gain(struct net_device *dev,
-                               struct iw_request_info *info, __u32 * uwrq,
+                               struct iw_request_info *info, __u32 *uwrq,
                                char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         if (*uwrq >= 0 && *uwrq <= 0xFF)        /* 0-255 */
-                priv->gain.TxGain = (uint8_t) * uwrq;
+                priv->gain.TxGain = (uint8_t)*uwrq;
         else
                 return -EINVAL;
 
@@ -2877,15 +2839,14 @@ static int ks_wlan_set_tx_gain(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get tx gain control value */
 static int ks_wlan_get_tx_gain(struct net_device *dev,
-                               struct iw_request_info *info, __u32 * uwrq,
+                               struct iw_request_info *info, __u32 *uwrq,
                                char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         *uwrq = priv->gain.TxGain;
         hostif_sme_enqueue(priv, SME_GET_GAIN);
@@ -2895,18 +2856,17 @@ static int ks_wlan_get_tx_gain(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : set rx gain control value */
 static int ks_wlan_set_rx_gain(struct net_device *dev,
-                               struct iw_request_info *info, __u32 * uwrq,
+                               struct iw_request_info *info, __u32 *uwrq,
                                char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         if (*uwrq >= 0 && *uwrq <= 0xFF)        /* 0-255 */
-                priv->gain.RxGain = (uint8_t) * uwrq;
+                priv->gain.RxGain = (uint8_t)*uwrq;
         else
                 return -EINVAL;
 
@@ -2922,15 +2882,14 @@ static int ks_wlan_set_rx_gain(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get rx gain control value */
 static int ks_wlan_get_rx_gain(struct net_device *dev,
-                               struct iw_request_info *info, __u32 * uwrq,
+                               struct iw_request_info *info, __u32 *uwrq,
                                char *extra)
 {
         struct ks_wlan_private *priv =
             (struct ks_wlan_private *)netdev_priv(dev);
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         *uwrq = priv->gain.RxGain;
         hostif_sme_enqueue(priv, SME_GET_GAIN);
@@ -2941,17 +2900,16 @@ static int ks_wlan_get_rx_gain(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : set region value */
 static int ks_wlan_set_region(struct net_device *dev,
-                              struct iw_request_info *info, __u32 * uwrq,
+                              struct iw_request_info *info, __u32 *uwrq,
                               char *extra)
 {
         struct ks_wlan_private *priv = (struct ks_wlan_private *)dev->priv;
 
-        if (priv->sleep_mode == SLP_SLEEP) {
+        if (priv->sleep_mode == SLP_SLEEP)
                 return -EPERM;
-        }
         /* for SLEEP MODE */
         if (*uwrq >= 0x9 && *uwrq <= 0xF)       /* 0x9-0xf */
-                priv->region = (uint8_t) * uwrq;
+                priv->region = (uint8_t)*uwrq;
         else
                 return -EINVAL;
 
@@ -2963,7 +2921,7 @@ static int ks_wlan_set_region(struct net_device *dev,
 /*------------------------------------------------------------------*/
 /* Private handler : get eeprom checksum result */
 static int ks_wlan_get_eeprom_cksum(struct net_device *dev,
-                                    struct iw_request_info *info, __u32 * uwrq,
+                                    struct iw_request_info *info, __u32 *uwrq,
                                     char *extra)
 {
         struct ks_wlan_private *priv =
@@ -3090,7 +3048,7 @@ static void print_hif_event(struct net_device *dev, int event)
 /*------------------------------------------------------------------*/
 /* Private handler : get host command history */
 static int ks_wlan_hostt(struct net_device *dev, struct iw_request_info *info,
-                         __u32 * uwrq, char *extra)
+                         __u32 *uwrq, char *extra)
 {
         int i, event;
         struct ks_wlan_private *priv =
@@ -3293,6 +3251,7 @@ static int ks_wlan_netdev_ioctl(struct net_device *dev, struct ifreq *rq,
 {
         int rc = 0;
         struct iwreq *wrq = (struct iwreq *)rq;
+
         switch (cmd) {
         case SIOCIWFIRSTPRIV + 20:      /* KS_WLAN_SET_STOP_REQ */
                 rc = ks_wlan_set_stop_request(dev, NULL, &(wrq->u.mode), NULL);
@@ -3311,9 +3270,8 @@ struct net_device_stats *ks_wlan_get_stats(struct net_device *dev)
 {
         struct ks_wlan_private *priv = netdev_priv(dev);
 
-        if (priv->dev_state < DEVICE_STATE_READY) {
+        if (priv->dev_state < DEVICE_STATE_READY)
                 return NULL;    /* not finished initialize */
-        }
 
         return &priv->nstats;
 }
@@ -3323,6 +3281,7 @@ int ks_wlan_set_mac_address(struct net_device *dev, void *addr)
 {
         struct ks_wlan_private *priv = netdev_priv(dev);
         struct sockaddr *mac_addr = (struct sockaddr *)addr;
+
         if (netif_running(dev))
                 return -EBUSY;
         memcpy(dev->dev_addr, mac_addr->sa_data, dev->addr_len);
@@ -3330,10 +3289,7 @@ int ks_wlan_set_mac_address(struct net_device *dev, void *addr)
 
         priv->mac_address_valid = 0;
         hostif_sme_enqueue(priv, SME_MACADDRESS_SET_REQUEST);
-        netdev_info(dev,
-               "ks_wlan: MAC ADDRESS = %02x:%02x:%02x:%02x:%02x:%02x\n",
-               priv->eth_addr[0], priv->eth_addr[1], priv->eth_addr[2],
-               priv->eth_addr[3], priv->eth_addr[4], priv->eth_addr[5]);
+        netdev_info(dev, "ks_wlan:  MAC ADDRESS = %pM\n", priv->eth_addr);
         return 0;
 }
 
@@ -3344,9 +3300,8 @@ void ks_wlan_tx_timeout(struct net_device *dev)
 
         DPRINTK(1, "head(%d) tail(%d)!!\n", priv->tx_dev.qhead,
                 priv->tx_dev.qtail);
-        if (!netif_queue_stopped(dev)) {
+        if (!netif_queue_stopped(dev))
                 netif_stop_queue(dev);
-        }
         priv->nstats.tx_errors++;
         netif_wake_queue(dev);
 }
@@ -3375,9 +3330,8 @@ int ks_wlan_start_xmit(struct sk_buff *skb, struct net_device *dev)
         netif_trans_update(dev);
 
         DPRINTK(4, "rc=%d\n", rc);
-        if (rc) {
+        if (rc)
                 rc = 0;
-        }
 
         return rc;
 }
@@ -3410,9 +3364,8 @@ void ks_wlan_set_multicast_list(struct net_device *dev)
         struct ks_wlan_private *priv = netdev_priv(dev);
 
         DPRINTK(4, "\n");
-        if (priv->dev_state < DEVICE_STATE_READY) {
+        if (priv->dev_state < DEVICE_STATE_READY)
                 return; /* not finished initialize */
-        }
         hostif_sme_enqueue(priv, SME_MULTICAST_REQUEST);
 }
 
@@ -3426,8 +3379,8 @@ int ks_wlan_open(struct net_device *dev)
         if (!priv->mac_address_valid) {
                 netdev_err(dev, "ks_wlan : %s Not READY !!\n", dev->name);
                 return -EBUSY;
-        } else
-                netif_start_queue(dev);
+        }
+        netif_start_queue(dev);
 
         return 0;
 }
@@ -3474,9 +3427,8 @@ int ks_wlan_net_start(struct net_device *dev)
 
         /* phy information update timer */
         atomic_set(&update_phyinfo, 0);
-        init_timer(&update_phyinfo_timer);
-        update_phyinfo_timer.function = ks_wlan_update_phyinfo_timeout;
-        update_phyinfo_timer.data = (unsigned long)priv;
+        setup_timer(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout,
+                    (unsigned long)priv);
 
         /* dummy address set */
         memcpy(priv->eth_addr, dummy_addr, ETH_ALEN);
diff --git a/drivers/staging/ks7010/michael_mic.c b/drivers/staging/ks7010/michael_mic.c
index 78ae2b8fb7f3..2f535c08e172 100644
--- a/drivers/staging/ks7010/michael_mic.c
+++ b/drivers/staging/ks7010/michael_mic.c
@@ -14,10 +14,11 @@
 #include "michael_mic.h"
 
 // Rotation functions on 32 bit values
-#define ROL32( A, n )   ( ((A) << (n)) | ( ((A)>>(32-(n))) & ( (1UL << (n)) - 1 ) ) )
-#define ROR32( A, n )   ROL32( (A), 32-(n) )
+#define ROL32(A, n)     (((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
+#define ROR32(A, n)     ROL32((A), 32-(n))
 // Convert from Byte[] to UInt32 in a portable way
-#define getUInt32( A, B )       (uint32_t)(A[B+0] << 0) + (A[B+1] << 8) + (A[B+2] << 16) + (A[B+3] << 24)
+#define getUInt32(A, B) ((uint32_t)(A[B+0] << 0) \
+                + (A[B+1] << 8) + (A[B+2] << 16) + (A[B+3] << 24))
 
 // Convert from UInt32 to Byte[] in a portable way
 #define putUInt32(A, B, C)                                      \
@@ -48,21 +49,22 @@ void MichaelInitializeFunction(struct michel_mic_t *Mic, uint8_t *key)
 }
 
 #define MichaelBlockFunction(L, R)                              \
-do{                                                             \
-        R ^= ROL32( L, 17 );                                    \
+do {                                                            \
+        R ^= ROL32(L, 17);                                      \
         L += R;                                                 \
         R ^= ((L & 0xff00ff00) >> 8) | ((L & 0x00ff00ff) << 8); \
         L += R;                                                 \
-        R ^= ROL32( L, 3 );                                     \
+        R ^= ROL32(L, 3);                                       \
         L += R;                                                 \
-        R ^= ROR32( L, 2 );                                     \
+        R ^= ROR32(L, 2);                                       \
         L += R;                                                 \
-}while(0)
+} while (0)
 
 static
 void MichaelAppend(struct michel_mic_t *Mic, uint8_t *src, int nBytes)
 {
         int addlen;
+
         if (Mic->nBytesInM) {
                 addlen = 4 - Mic->nBytesInM;
                 if (addlen > nBytes)
@@ -96,7 +98,8 @@ void MichaelAppend(struct michel_mic_t *Mic, uint8_t *src, int nBytes)
 static
 void MichaelGetMIC(struct michel_mic_t *Mic, uint8_t *dst)
 {
-        uint8_t *data = Mic->M;
+        u8 *data = Mic->M;
+
         switch (Mic->nBytesInM) {
         case 0:
                 Mic->L ^= 0x5a;
@@ -122,11 +125,11 @@ void MichaelGetMIC(struct michel_mic_t *Mic, uint8_t *dst)
         MichaelClear(Mic);
 }
 
-void MichaelMICFunction(struct michel_mic_t *Mic, uint8_t *Key,
-                        uint8_t *Data, int Len, uint8_t priority,
-                        uint8_t *Result)
+void MichaelMICFunction(struct michel_mic_t *Mic, u8 *Key,
+                        u8 *Data, int Len, u8 priority,
+                        u8 *Result)
 {
-        uint8_t pad_data[4] = { priority, 0, 0, 0 };
+        u8 pad_data[4] = { priority, 0, 0, 0 };
         // Compute the MIC value
         /*
          * IEEE802.11i  page 47
diff --git a/drivers/staging/ks7010/michael_mic.h b/drivers/staging/ks7010/michael_mic.h
index efaa21788fc7..248f849fc4a5 100644
--- a/drivers/staging/ks7010/michael_mic.h
+++ b/drivers/staging/ks7010/michael_mic.h
@@ -11,15 +11,15 @@
 
 /* MichelMIC routine define */
 struct michel_mic_t {
-        uint32_t K0;    // Key 
-        uint32_t K1;    // Key 
-        uint32_t L;     // Current state 
-        uint32_t R;     // Current state 
-        uint8_t M[4];   // Message accumulator (single word) 
-        int nBytesInM;  // # bytes in M 
-        uint8_t Result[8];
+        u32 K0; // Key
+        u32 K1; // Key
+        u32 L;  // Current state
+        u32 R;  // Current state
+        u8 M[4];        // Message accumulator (single word)
+        int nBytesInM;  // # bytes in M
+        u8 Result[8];
 };
 
-void MichaelMICFunction(struct michel_mic_t *Mic, uint8_t *Key,
-                        uint8_t *Data, int Len, uint8_t priority,
-                        uint8_t *Result);
+void MichaelMICFunction(struct michel_mic_t *Mic, u8 *Key,
+                        u8 *Data, int Len, u8 priority,
+                        u8 *Result);
diff --git a/drivers/staging/lustre/include/linux/libcfs/curproc.h b/drivers/staging/lustre/include/linux/libcfs/curproc.h
index be0675d8ff5e..1ea27c9e3708 100644
--- a/drivers/staging/lustre/include/linux/libcfs/curproc.h
+++ b/drivers/staging/lustre/include/linux/libcfs/curproc.h
@@ -53,7 +53,7 @@
 #define current_pid()           (current->pid)
 #define current_comm()          (current->comm)
 
-typedef __u32 cfs_cap_t;
+typedef u32 cfs_cap_t;
 
 #define CFS_CAP_CHOWN              0
 #define CFS_CAP_DAC_OVERRIDE        1
@@ -65,15 +65,15 @@ typedef __u32 cfs_cap_t;
 #define CFS_CAP_SYS_BOOT               23
 #define CFS_CAP_SYS_RESOURCE       24
 
-#define CFS_CAP_FS_MASK ((1 << CFS_CAP_CHOWN) |          \
-                         (1 << CFS_CAP_DAC_OVERRIDE) |    \
-                         (1 << CFS_CAP_DAC_READ_SEARCH) |       \
-                         (1 << CFS_CAP_FOWNER) |                \
-                         (1 << CFS_CAP_FSETID) |               \
-                         (1 << CFS_CAP_LINUX_IMMUTABLE) |       \
-                         (1 << CFS_CAP_SYS_ADMIN) |          \
-                         (1 << CFS_CAP_SYS_BOOT) |            \
-                         (1 << CFS_CAP_SYS_RESOURCE))
+#define CFS_CAP_FS_MASK (BIT(CFS_CAP_CHOWN) |           \
+                         BIT(CFS_CAP_DAC_OVERRIDE) |    \
+                         BIT(CFS_CAP_DAC_READ_SEARCH) | \
+                         BIT(CFS_CAP_FOWNER) |          \
+                         BIT(CFS_CAP_FSETID) |          \
+                         BIT(CFS_CAP_LINUX_IMMUTABLE) | \
+                         BIT(CFS_CAP_SYS_ADMIN) |       \
+                         BIT(CFS_CAP_SYS_BOOT) |        \
+                         BIT(CFS_CAP_SYS_RESOURCE))
 
 void cfs_cap_raise(cfs_cap_t cap);
 void cfs_cap_lower(cfs_cap_t cap);
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
index 3b92d38d37e2..cc2c0e97bb7e 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
@@ -61,7 +61,7 @@
 sigset_t cfs_block_allsigs(void);
 sigset_t cfs_block_sigs(unsigned long sigs);
 sigset_t cfs_block_sigsinv(unsigned long sigs);
-void cfs_restore_sigs(sigset_t);
+void cfs_restore_sigs(sigset_t sigset);
 void cfs_clear_sigpending(void);
 
 /*
@@ -71,7 +71,7 @@ void cfs_clear_sigpending(void);
 /* returns a random 32-bit integer */
 unsigned int cfs_rand(void);
 /* seed the generator */
-void cfs_srand(unsigned int, unsigned int);
+void cfs_srand(unsigned int seed1, unsigned int seed2);
 void cfs_get_random_bytes(void *buf, int size);
 
 #include "libcfs_debug.h"
@@ -125,7 +125,6 @@ extern struct miscdevice libcfs_dev;
 /**
  * The path of debug log dump upcall script.
  */
-extern char lnet_upcall[1024];
 extern char lnet_debug_log_upcall[1024];
 
 extern struct cfs_wi_sched *cfs_sched_rehash;
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h
index 81d8079e3b5e..6d8752a368fa 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h
@@ -92,7 +92,7 @@ struct cfs_cpt_table {
         /* node mask */
         nodemask_t              ctb_nodemask;
         /* version */
-        __u64                   ctb_version;
+        u64                     ctb_version;
 };
 
 static inline cpumask_t *
@@ -211,7 +211,7 @@ int cfs_cpu_ht_nsiblings(int cpu);
  */
 void *cfs_percpt_alloc(struct cfs_cpt_table *cptab, unsigned int size);
 /*
- * destory per-cpu-partition variable
+ * destroy per-cpu-partition variable
  */
 void cfs_percpt_free(void *vars);
 int cfs_percpt_number(void *vars);
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h
index 02be7d7608a5..8f34c5ddc63e 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h
@@ -29,10 +29,12 @@
 #define _LIBCFS_CRYPTO_H
 
 struct cfs_crypto_hash_type {
-        char            *cht_name;      /**< hash algorithm name, equal to
-                                         * format name for crypto api */
-        unsigned int    cht_key;        /**< init key by default (valid for
-                                         * 4 bytes context like crc32, adler */
+        char            *cht_name;      /*< hash algorithm name, equal to
+                                         * format name for crypto api
+                                         */
+        unsigned int    cht_key;        /*< init key by default (valid for
+                                         * 4 bytes context like crc32, adler
+                                         */
         unsigned int    cht_size;       /**< hash digest size */
 };
 
@@ -135,7 +137,7 @@ static inline unsigned char cfs_crypto_hash_alg(const char *algname)
         enum cfs_crypto_hash_alg hash_alg;
 
         for (hash_alg = 0; hash_alg < CFS_HASH_ALG_MAX; hash_alg++)
-                if (strcmp(hash_types[hash_alg].cht_name, algname) == 0)
+                if (!strcmp(hash_types[hash_alg].cht_name, algname))
                         return hash_alg;
 
         return CFS_HASH_ALG_UNKNOWN;
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h
index bdbbe934584c..fedb46dff696 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h
@@ -39,8 +39,8 @@ extern int cfs_fail_err;
 extern wait_queue_head_t cfs_race_waitq;
 extern int cfs_race_state;
 
-int __cfs_fail_check_set(__u32 id, __u32 value, int set);
-int __cfs_fail_timeout_set(__u32 id, __u32 value, int ms, int set);
+int __cfs_fail_check_set(u32 id, u32 value, int set);
+int __cfs_fail_timeout_set(u32 id, u32 value, int ms, int set);
 
 enum {
         CFS_FAIL_LOC_NOSET      = 0,
@@ -55,11 +55,11 @@ enum {
 
 #define CFS_FAILED_BIT       30
 /* CFS_FAILED is 0x40000000 */
-#define CFS_FAILED        (1 << CFS_FAILED_BIT)
+#define CFS_FAILED              BIT(CFS_FAILED_BIT)
 
 #define CFS_FAIL_ONCE_BIT    31
 /* CFS_FAIL_ONCE is 0x80000000 */
-#define CFS_FAIL_ONCE       (1 << CFS_FAIL_ONCE_BIT)
+#define CFS_FAIL_ONCE           BIT(CFS_FAIL_ONCE_BIT)
 
 /* The following flags aren't made to be combined */
 #define CFS_FAIL_SKIP   0x20000000 /* skip N times then fail */
@@ -69,14 +69,14 @@ enum {
 
 #define CFS_FAULT       0x02000000 /* match any CFS_FAULT_CHECK */
 
-static inline bool CFS_FAIL_PRECHECK(__u32 id)
+static inline bool CFS_FAIL_PRECHECK(u32 id)
 {
-        return cfs_fail_loc != 0 &&
+        return cfs_fail_loc &&
                ((cfs_fail_loc & CFS_FAIL_MASK_LOC) == (id & CFS_FAIL_MASK_LOC) ||
-                (cfs_fail_loc & id & CFS_FAULT));
+                (cfs_fail_loc & id & CFS_FAULT));
 }
 
-static inline int cfs_fail_check_set(__u32 id, __u32 value,
+static inline int cfs_fail_check_set(u32 id, u32 value,
                                      int set, int quiet)
 {
         int ret = 0;
@@ -103,28 +103,34 @@ static inline int cfs_fail_check_set(__u32 id, __u32 value,
 #define CFS_FAIL_CHECK_QUIET(id) \
         cfs_fail_check_set(id, 0, CFS_FAIL_LOC_NOSET, 1)
 
-/* If id hit cfs_fail_loc and cfs_fail_val == (-1 or value) return 1,
- * otherwise return 0 */
+/*
+ * If id hit cfs_fail_loc and cfs_fail_val == (-1 or value) return 1,
+ * otherwise return 0
+ */
 #define CFS_FAIL_CHECK_VALUE(id, value) \
         cfs_fail_check_set(id, value, CFS_FAIL_LOC_VALUE, 0)
 #define CFS_FAIL_CHECK_VALUE_QUIET(id, value) \
         cfs_fail_check_set(id, value, CFS_FAIL_LOC_VALUE, 1)
 
-/* If id hit cfs_fail_loc, cfs_fail_loc |= value and return 1,
- * otherwise return 0 */
+/*
+ * If id hit cfs_fail_loc, cfs_fail_loc |= value and return 1,
+ * otherwise return 0
+ */
 #define CFS_FAIL_CHECK_ORSET(id, value) \
         cfs_fail_check_set(id, value, CFS_FAIL_LOC_ORSET, 0)
 #define CFS_FAIL_CHECK_ORSET_QUIET(id, value) \
         cfs_fail_check_set(id, value, CFS_FAIL_LOC_ORSET, 1)
 
-/* If id hit cfs_fail_loc, cfs_fail_loc = value and return 1,
- * otherwise return 0 */
+/*
+ * If id hit cfs_fail_loc, cfs_fail_loc = value and return 1,
+ * otherwise return 0
+ */
 #define CFS_FAIL_CHECK_RESET(id, value) \
         cfs_fail_check_set(id, value, CFS_FAIL_LOC_RESET, 0)
 #define CFS_FAIL_CHECK_RESET_QUIET(id, value) \
         cfs_fail_check_set(id, value, CFS_FAIL_LOC_RESET, 1)
 
-static inline int cfs_fail_timeout_set(__u32 id, __u32 value, int ms, int set)
+static inline int cfs_fail_timeout_set(u32 id, u32 value, int ms, int set)
 {
         if (unlikely(CFS_FAIL_PRECHECK(id)))
                 return __cfs_fail_timeout_set(id, value, ms, set);
@@ -138,8 +144,10 @@ static inline int cfs_fail_timeout_set(__u32 id, __u32 value, int ms, int set)
 #define CFS_FAIL_TIMEOUT_MS(id, ms) \
         cfs_fail_timeout_set(id, 0, ms, CFS_FAIL_LOC_NOSET)
 
-/* If id hit cfs_fail_loc, cfs_fail_loc |= value and
- * sleep seconds or milliseconds */
+/*
+ * If id hit cfs_fail_loc, cfs_fail_loc |= value and
+ * sleep seconds or milliseconds
+ */
 #define CFS_FAIL_TIMEOUT_ORSET(id, value, secs) \
         cfs_fail_timeout_set(id, value, secs * 1000, CFS_FAIL_LOC_ORSET)
 
@@ -152,13 +160,14 @@ static inline int cfs_fail_timeout_set(__u32 id, __u32 value, int ms, int set)
 #define CFS_FAULT_CHECK(id)                     \
         CFS_FAIL_CHECK(CFS_FAULT | (id))
 
-/* The idea here is to synchronise two threads to force a race. The
+/*
+ * The idea here is to synchronise two threads to force a race. The
  * first thread that calls this with a matching fail_loc is put to
  * sleep. The next thread that calls with the same fail_loc wakes up
- * the first and continues. */
-static inline void cfs_race(__u32 id)
+ * the first and continues.
+ */
+static inline void cfs_race(u32 id)
 {
-
         if (CFS_FAIL_PRECHECK(id)) {
                 if (unlikely(__cfs_fail_check_set(id, 0, CFS_FAIL_LOC_NOSET))) {
                         int rc;
@@ -166,7 +175,7 @@ static inline void cfs_race(__u32 id)
                         cfs_race_state = 0;
                         CERROR("cfs_race id %x sleeping\n", id);
                         rc = wait_event_interruptible(cfs_race_waitq,
-                                                      cfs_race_state != 0);
+                                                      !!cfs_race_state);
                         CERROR("cfs_fail_race id %x awake, rc=%d\n", id, rc);
                 } else {
                         CERROR("cfs_fail_race id %x waking\n", id);
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
index 6949a1846635..0cc2fc465c1a 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
@@ -57,8 +57,10 @@
 
 /** disable debug */
 #define CFS_HASH_DEBUG_NONE     0
-/** record hash depth and output to console when it's too deep,
- *  computing overhead is low but consume more memory */
+/*
+ * record hash depth and output to console when it's too deep,
+ * computing overhead is low but consume more memory
+ */
 #define CFS_HASH_DEBUG_1        1
 /** expensive, check key validation */
 #define CFS_HASH_DEBUG_2        2
@@ -87,8 +89,8 @@ union cfs_hash_lock {
  */
 struct cfs_hash_bucket {
         union cfs_hash_lock     hsb_lock;       /**< bucket lock */
-        __u32                   hsb_count;      /**< current entries */
-        __u32                   hsb_version;    /**< change version */
+        u32                     hsb_count;      /**< current entries */
+        u32                     hsb_version;    /**< change version */
         unsigned int            hsb_index;      /**< index of bucket */
         int                     hsb_depmax;     /**< max depth on bucket */
         long                    hsb_head[0];    /**< hash-head array */
@@ -123,38 +125,40 @@ enum cfs_hash_tag {
          *  . Some functions will be disabled with this flag, i.e:
          *    cfs_hash_for_each_empty, cfs_hash_rehash
          */
-        CFS_HASH_NO_LOCK        = 1 << 0,
+        CFS_HASH_NO_LOCK        = BIT(0),
         /** no bucket lock, use one spinlock to protect the whole hash */
-        CFS_HASH_NO_BKTLOCK     = 1 << 1,
+        CFS_HASH_NO_BKTLOCK     = BIT(1),
         /** rwlock to protect bucket */
-        CFS_HASH_RW_BKTLOCK     = 1 << 2,
+        CFS_HASH_RW_BKTLOCK     = BIT(2),
         /** spinlock to protect bucket */
-        CFS_HASH_SPIN_BKTLOCK   = 1 << 3,
+        CFS_HASH_SPIN_BKTLOCK   = BIT(3),
         /** always add new item to tail */
-        CFS_HASH_ADD_TAIL       = 1 << 4,
+        CFS_HASH_ADD_TAIL       = BIT(4),
         /** hash-table doesn't have refcount on item */
-        CFS_HASH_NO_ITEMREF     = 1 << 5,
+        CFS_HASH_NO_ITEMREF     = BIT(5),
         /** big name for param-tree */
-        CFS_HASH_BIGNAME        = 1 << 6,
+        CFS_HASH_BIGNAME        = BIT(6),
         /** track global count */
-        CFS_HASH_COUNTER        = 1 << 7,
+        CFS_HASH_COUNTER        = BIT(7),
         /** rehash item by new key */
-        CFS_HASH_REHASH_KEY     = 1 << 8,
+        CFS_HASH_REHASH_KEY     = BIT(8),
         /** Enable dynamic hash resizing */
-        CFS_HASH_REHASH         = 1 << 9,
+        CFS_HASH_REHASH         = BIT(9),
         /** can shrink hash-size */
-        CFS_HASH_SHRINK         = 1 << 10,
+        CFS_HASH_SHRINK         = BIT(10),
         /** assert hash is empty on exit */
-        CFS_HASH_ASSERT_EMPTY   = 1 << 11,
+        CFS_HASH_ASSERT_EMPTY   = BIT(11),
         /** record hlist depth */
-        CFS_HASH_DEPTH          = 1 << 12,
+        CFS_HASH_DEPTH          = BIT(12),
         /**
          * rehash is always scheduled in a different thread, so current
          * change on hash table is non-blocking
          */
-        CFS_HASH_NBLK_CHANGE    = 1 << 13,
-        /** NB, we typed hs_flags as  __u16, please change it
-         * if you need to extend >=16 flags */
+        CFS_HASH_NBLK_CHANGE    = BIT(13),
+        /**
+         * NB, we typed hs_flags as  u16, please change it
+         * if you need to extend >=16 flags
+         */
 };
 
 /** most used attributes */
@@ -201,8 +205,10 @@ enum cfs_hash_tag {
  */
 
 struct cfs_hash {
-        /** serialize with rehash, or serialize all operations if
-         * the hash-table has CFS_HASH_NO_BKTLOCK */
+        /**
+         * serialize with rehash, or serialize all operations if
+         * the hash-table has CFS_HASH_NO_BKTLOCK
+         */
         union cfs_hash_lock             hs_lock;
         /** hash operations */
         struct cfs_hash_ops             *hs_ops;
@@ -215,31 +221,31 @@ struct cfs_hash {
         /** total number of items on this hash-table */
         atomic_t                        hs_count;
         /** hash flags, see cfs_hash_tag for detail */
-        __u16                           hs_flags;
+        u16                             hs_flags;
         /** # of extra-bytes for bucket, for user saving extended attributes */
-        __u16                           hs_extra_bytes;
+        u16                             hs_extra_bytes;
         /** wants to iterate */
-        __u8                            hs_iterating;
+        u8                              hs_iterating;
         /** hash-table is dying */
-        __u8                            hs_exiting;
+        u8                              hs_exiting;
         /** current hash bits */
-        __u8                            hs_cur_bits;
+        u8                              hs_cur_bits;
         /** min hash bits */
-        __u8                            hs_min_bits;
+        u8                              hs_min_bits;
         /** max hash bits */
-        __u8                            hs_max_bits;
+        u8                              hs_max_bits;
         /** bits for rehash */
-        __u8                            hs_rehash_bits;
+        u8                              hs_rehash_bits;
         /** bits for each bucket */
-        __u8                            hs_bkt_bits;
+        u8                              hs_bkt_bits;
         /** resize min threshold */
-        __u16                           hs_min_theta;
+        u16                             hs_min_theta;
         /** resize max threshold */
-        __u16                           hs_max_theta;
+        u16                             hs_max_theta;
         /** resize count */
-        __u32                           hs_rehash_count;
+        u32                             hs_rehash_count;
         /** # of iterators (caller of cfs_hash_for_each_*) */
-        __u32                           hs_iterators;
+        u32                             hs_iterators;
         /** rehash workitem */
         struct cfs_workitem             hs_rehash_wi;
         /** refcount on this hash table */
@@ -291,8 +297,8 @@ struct cfs_hash_hlist_ops {
 
 struct cfs_hash_ops {
         /** return hashed value from @key */
-        unsigned (*hs_hash)(struct cfs_hash *hs, const void *key,
-                            unsigned mask);
+        unsigned int (*hs_hash)(struct cfs_hash *hs, const void *key,
+                                unsigned int mask);
         /** return key address of @hnode */
         void *   (*hs_key)(struct hlist_node *hnode);
         /** copy key from @hnode to @key */
@@ -317,110 +323,112 @@ struct cfs_hash_ops {
 
 /** total number of buckets in @hs */
 #define CFS_HASH_NBKT(hs)       \
-        (1U << ((hs)->hs_cur_bits - (hs)->hs_bkt_bits))
+        BIT((hs)->hs_cur_bits - (hs)->hs_bkt_bits)
 
 /** total number of buckets in @hs while rehashing */
 #define CFS_HASH_RH_NBKT(hs)    \
-        (1U << ((hs)->hs_rehash_bits - (hs)->hs_bkt_bits))
+        BIT((hs)->hs_rehash_bits - (hs)->hs_bkt_bits)
 
 /** number of hlist for in bucket */
-#define CFS_HASH_BKT_NHLIST(hs) (1U << (hs)->hs_bkt_bits)
+#define CFS_HASH_BKT_NHLIST(hs) BIT((hs)->hs_bkt_bits)
 
 /** total number of hlist in @hs */
-#define CFS_HASH_NHLIST(hs)     (1U << (hs)->hs_cur_bits)
+#define CFS_HASH_NHLIST(hs)     BIT((hs)->hs_cur_bits)
 
 /** total number of hlist in @hs while rehashing */
-#define CFS_HASH_RH_NHLIST(hs)  (1U << (hs)->hs_rehash_bits)
+#define CFS_HASH_RH_NHLIST(hs)  BIT((hs)->hs_rehash_bits)
 
 static inline int
 cfs_hash_with_no_lock(struct cfs_hash *hs)
 {
         /* caller will serialize all operations for this hash-table */
-        return (hs->hs_flags & CFS_HASH_NO_LOCK) != 0;
+        return hs->hs_flags & CFS_HASH_NO_LOCK;
 }
 
 static inline int
 cfs_hash_with_no_bktlock(struct cfs_hash *hs)
 {
         /* no bucket lock, one single lock to protect the hash-table */
-        return (hs->hs_flags & CFS_HASH_NO_BKTLOCK) != 0;
+        return hs->hs_flags & CFS_HASH_NO_BKTLOCK;
 }
 
 static inline int
 cfs_hash_with_rw_bktlock(struct cfs_hash *hs)
 {
         /* rwlock to protect hash bucket */
-        return (hs->hs_flags & CFS_HASH_RW_BKTLOCK) != 0;
+        return hs->hs_flags & CFS_HASH_RW_BKTLOCK;
 }
 
 static inline int
 cfs_hash_with_spin_bktlock(struct cfs_hash *hs)
 {
         /* spinlock to protect hash bucket */
-        return (hs->hs_flags & CFS_HASH_SPIN_BKTLOCK) != 0;
+        return hs->hs_flags & CFS_HASH_SPIN_BKTLOCK;
 }
 
 static inline int
 cfs_hash_with_add_tail(struct cfs_hash *hs)
 {
-        return (hs->hs_flags & CFS_HASH_ADD_TAIL) != 0;
+        return hs->hs_flags & CFS_HASH_ADD_TAIL;
 }
 
 static inline int
 cfs_hash_with_no_itemref(struct cfs_hash *hs)
 {
-        /* hash-table doesn't keep refcount on item,
+        /*
+         * hash-table doesn't keep refcount on item,
          * item can't be removed from hash unless it's
-         * ZERO refcount */
-        return (hs->hs_flags & CFS_HASH_NO_ITEMREF) != 0;
+         * ZERO refcount
+         */
+        return hs->hs_flags & CFS_HASH_NO_ITEMREF;
 }
 
 static inline int
 cfs_hash_with_bigname(struct cfs_hash *hs)
 {
-        return (hs->hs_flags & CFS_HASH_BIGNAME) != 0;
+        return hs->hs_flags & CFS_HASH_BIGNAME;
 }
 
 static inline int
 cfs_hash_with_counter(struct cfs_hash *hs)
 {
-        return (hs->hs_flags & CFS_HASH_COUNTER) != 0;
+        return hs->hs_flags & CFS_HASH_COUNTER;
 }
 
 static inline int
 cfs_hash_with_rehash(struct cfs_hash *hs)
 {
-        return (hs->hs_flags & CFS_HASH_REHASH) != 0;
+        return hs->hs_flags & CFS_HASH_REHASH;
 }
 
 static inline int
 cfs_hash_with_rehash_key(struct cfs_hash *hs)
 {
-        return (hs->hs_flags & CFS_HASH_REHASH_KEY) != 0;
+        return hs->hs_flags & CFS_HASH_REHASH_KEY;
 }
 
 static inline int
 cfs_hash_with_shrink(struct cfs_hash *hs)
 {
-        return (hs->hs_flags & CFS_HASH_SHRINK) != 0;
+        return hs->hs_flags & CFS_HASH_SHRINK;
 }
 
 static inline int
 cfs_hash_with_assert_empty(struct cfs_hash *hs)
 {
-        return (hs->hs_flags & CFS_HASH_ASSERT_EMPTY) != 0;
+        return hs->hs_flags & CFS_HASH_ASSERT_EMPTY;
 }
 
 static inline int
 cfs_hash_with_depth(struct cfs_hash *hs)
 {
-        return (hs->hs_flags & CFS_HASH_DEPTH) != 0;
+        return hs->hs_flags & CFS_HASH_DEPTH;
 }
 
 static inline int
 cfs_hash_with_nblk_change(struct cfs_hash *hs)
 {
-        return (hs->hs_flags & CFS_HASH_NBLK_CHANGE) != 0;
+        return hs->hs_flags & CFS_HASH_NBLK_CHANGE;
 }
 
 static inline int
@@ -434,14 +442,14 @@ static inline int
 cfs_hash_is_rehashing(struct cfs_hash *hs)
 {
         /* rehash is launched */
-        return hs->hs_rehash_bits != 0;
+        return !!hs->hs_rehash_bits;
 }
 
 static inline int
 cfs_hash_is_iterating(struct cfs_hash *hs)
 {
         /* someone is calling cfs_hash_for_each_* */
-        return hs->hs_iterating || hs->hs_iterators != 0;
+        return hs->hs_iterating || hs->hs_iterators;
 }
 
 static inline int
@@ -453,7 +461,7 @@ cfs_hash_bkt_size(struct cfs_hash *hs)
 }
 
 static inline unsigned
-cfs_hash_id(struct cfs_hash *hs, const void *key, unsigned mask)
+cfs_hash_id(struct cfs_hash *hs, const void *key, unsigned int mask)
 {
         return hs->hs_ops->hs_hash(hs, key, mask);
 }
@@ -562,7 +570,7 @@ cfs_hash_bd_index_get(struct cfs_hash *hs, struct cfs_hash_bd *bd)
 }
 
 static inline void
-cfs_hash_bd_index_set(struct cfs_hash *hs, unsigned index,
+cfs_hash_bd_index_set(struct cfs_hash *hs, unsigned int index,
                       struct cfs_hash_bd *bd)
 {
         bd->bd_bucket = hs->hs_buckets[index >> hs->hs_bkt_bits];
@@ -576,14 +584,14 @@ cfs_hash_bd_extra_get(struct cfs_hash *hs, struct cfs_hash_bd *bd)
                cfs_hash_bkt_size(hs) - hs->hs_extra_bytes;
 }
 
-static inline __u32
+static inline u32
 cfs_hash_bd_version_get(struct cfs_hash_bd *bd)
 {
         /* need hold cfs_hash_bd_lock */
         return bd->bd_bucket->hsb_version;
 }
 
-static inline __u32
+static inline u32
 cfs_hash_bd_count_get(struct cfs_hash_bd *bd)
 {
         /* need hold cfs_hash_bd_lock */
@@ -669,10 +677,10 @@ cfs_hash_dual_bd_finddel_locked(struct cfs_hash *hs, struct cfs_hash_bd *bds,
 
 /* Hash init/cleanup functions */
 struct cfs_hash *
-cfs_hash_create(char *name, unsigned cur_bits, unsigned max_bits,
-                unsigned bkt_bits, unsigned extra_bytes,
-                unsigned min_theta, unsigned max_theta,
-                struct cfs_hash_ops *ops, unsigned flags);
+cfs_hash_create(char *name, unsigned int cur_bits, unsigned int max_bits,
+                unsigned int bkt_bits, unsigned int extra_bytes,
+                unsigned int min_theta, unsigned int max_theta,
+                struct cfs_hash_ops *ops, unsigned int flags);
 
 struct cfs_hash *cfs_hash_getref(struct cfs_hash *hs);
 void cfs_hash_putref(struct cfs_hash *hs);
@@ -700,27 +708,28 @@ typedef int (*cfs_hash_for_each_cb_t)(struct cfs_hash *hs,
 void *
 cfs_hash_lookup(struct cfs_hash *hs, const void *key);
 void
-cfs_hash_for_each(struct cfs_hash *hs, cfs_hash_for_each_cb_t, void *data);
+cfs_hash_for_each(struct cfs_hash *hs, cfs_hash_for_each_cb_t cb, void *data);
 void
-cfs_hash_for_each_safe(struct cfs_hash *hs, cfs_hash_for_each_cb_t, void *data);
+cfs_hash_for_each_safe(struct cfs_hash *hs, cfs_hash_for_each_cb_t cb,
+                       void *data);
 int
-cfs_hash_for_each_nolock(struct cfs_hash *hs, cfs_hash_for_each_cb_t,
-                         void *data);
+cfs_hash_for_each_nolock(struct cfs_hash *hs, cfs_hash_for_each_cb_t cb,
+                         void *data, int start);
 int
-cfs_hash_for_each_empty(struct cfs_hash *hs, cfs_hash_for_each_cb_t,
+cfs_hash_for_each_empty(struct cfs_hash *hs, cfs_hash_for_each_cb_t cb,
                         void *data);
 void
 cfs_hash_for_each_key(struct cfs_hash *hs, const void *key,
-                      cfs_hash_for_each_cb_t, void *data);
+                      cfs_hash_for_each_cb_t cb, void *data);
 typedef int (*cfs_hash_cond_opt_cb_t)(void *obj, void *data);
 void
-cfs_hash_cond_del(struct cfs_hash *hs, cfs_hash_cond_opt_cb_t, void *data);
+cfs_hash_cond_del(struct cfs_hash *hs, cfs_hash_cond_opt_cb_t cb, void *data);
 
 void
-cfs_hash_hlist_for_each(struct cfs_hash *hs, unsigned hindex,
-                        cfs_hash_for_each_cb_t, void *data);
+cfs_hash_hlist_for_each(struct cfs_hash *hs, unsigned int hindex,
+                        cfs_hash_for_each_cb_t cb, void *data);
 int  cfs_hash_is_empty(struct cfs_hash *hs);
-__u64 cfs_hash_size_get(struct cfs_hash *hs);
+u64 cfs_hash_size_get(struct cfs_hash *hs);
 
 /*
  * Rehash - Theta is calculated to be the average chained
@@ -766,8 +775,8 @@ cfs_hash_bucket_validate(struct cfs_hash *hs, struct cfs_hash_bd *bd,
 #endif /* CFS_HASH_DEBUG_LEVEL */
 
 #define CFS_HASH_THETA_BITS     10
-#define CFS_HASH_MIN_THETA      (1U << (CFS_HASH_THETA_BITS - 1))
-#define CFS_HASH_MAX_THETA      (1U << (CFS_HASH_THETA_BITS + 1))
+#define CFS_HASH_MIN_THETA      BIT(CFS_HASH_THETA_BITS - 1)
+#define CFS_HASH_MAX_THETA      BIT(CFS_HASH_THETA_BITS + 1)
 
 /* Return integer component of theta */
 static inline int __cfs_hash_theta_int(int theta)
@@ -792,8 +801,8 @@ static inline void
 __cfs_hash_set_theta(struct cfs_hash *hs, int min, int max)
 {
         LASSERT(min < max);
-        hs->hs_min_theta = (__u16)min;
-        hs->hs_max_theta = (__u16)max;
+        hs->hs_min_theta = (u16)min;
+        hs->hs_max_theta = (u16)max;
 }
 
 /* Generic debug formatting routines mainly for proc handler */
@@ -805,11 +814,11 @@ void cfs_hash_debug_str(struct cfs_hash *hs, struct seq_file *m);
  * Generic djb2 hash algorithm for character arrays.
  */
 static inline unsigned
-cfs_hash_djb2_hash(const void *key, size_t size, unsigned mask)
+cfs_hash_djb2_hash(const void *key, size_t size, unsigned int mask)
 {
-        unsigned i, hash = 5381;
+        unsigned int i, hash = 5381;
 
-        LASSERT(key != NULL);
+        LASSERT(key);
 
         for (i = 0; i < size; i++)
                 hash = hash * 33 + ((char *)key)[i];
@@ -821,7 +830,7 @@ cfs_hash_djb2_hash(const void *key, size_t size, unsigned mask)
  * Generic u32 hash algorithm.
  */
 static inline unsigned
-cfs_hash_u32_hash(const __u32 key, unsigned mask)
+cfs_hash_u32_hash(const u32 key, unsigned int mask)
 {
         return ((key * CFS_GOLDEN_RATIO_PRIME_32) & mask);
 }
@@ -830,9 +839,9 @@ cfs_hash_u32_hash(const __u32 key, unsigned mask)
  * Generic u64 hash algorithm.
  */
 static inline unsigned
-cfs_hash_u64_hash(const __u64 key, unsigned mask)
+cfs_hash_u64_hash(const u64 key, unsigned int mask)
 {
-        return ((unsigned)(key * CFS_GOLDEN_RATIO_PRIME_64) & mask);
+        return ((unsigned int)(key * CFS_GOLDEN_RATIO_PRIME_64) & mask);
 }
 
 /** iterate over all buckets in @bds (array of struct cfs_hash_bd) */
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
index e0e1a5d0949d..aab15d8112a4 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
@@ -75,7 +75,7 @@ do {									\
 
 #define KLASSERT(e) LASSERT(e)
 
-void __noreturn lbug_with_loc(struct libcfs_debug_msg_data *);
+void __noreturn lbug_with_loc(struct libcfs_debug_msg_data *msg);
 
 #define LBUG()                                                    \
 do {                                                                \
@@ -96,7 +96,7 @@ do {									    \
 
 #define LIBCFS_ALLOC_POST(ptr, size)                                        \
 do {                                                                        \
-        if (unlikely((ptr) == NULL)) {                                      \
+        if (unlikely(!(ptr))) {                                             \
                 CERROR("LNET: out of memory at %s:%d (tried to alloc '"     \
                        #ptr "' = %d)\n", __FILE__, __LINE__, (int)(size));  \
         } else {                                                            \
@@ -147,7 +147,7 @@ do {									    \
 
 #define LIBCFS_FREE(ptr, size)                                    \
 do {                                                                \
-        if (unlikely((ptr) == NULL)) {                            \
+        if (unlikely(!(ptr))) {                                         \
                 CERROR("LIBCFS: free NULL '" #ptr "' (%d bytes) at "    \
                        "%s:%d\n", (int)(size), __FILE__, __LINE__);     \
                 break;                                            \
@@ -169,8 +169,6 @@ do {								    \
 #define ntohs(x) ___ntohs(x)
 #endif
 
-void libcfs_run_upcall(char **argv);
-void libcfs_run_lbug_upcall(struct libcfs_debug_msg_data *);
 void libcfs_debug_dumplog(void);
 int libcfs_debug_init(unsigned long bufsize);
 int libcfs_debug_cleanup(void);
@@ -280,7 +278,7 @@ do {							    \
 #define CFS_FREE_PTR(ptr)       LIBCFS_FREE(ptr, sizeof(*(ptr)))
 
 /** Compile-time assertion.
-
+ *
  * Check an invariant described by a constant expression at compile time by
  * forcing a compiler error if it does not hold.  \a cond must be a constant
  * expression as defined by the ISO C Standard:
@@ -306,7 +304,8 @@ do {							    \
 /* --------------------------------------------------------------------
  * Light-weight trace
  * Support for temporary event tracing with minimal Heisenberg effect.
- * -------------------------------------------------------------------- */
+ * --------------------------------------------------------------------
+ */
 
 #define MKSTR(ptr) ((ptr)) ? (ptr) : ""
 
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
index 0ee60ff336f2..41795d9b3b9b 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
@@ -62,9 +62,9 @@ struct cfs_range_expr {
          * Link to cfs_expr_list::el_exprs.
          */
         struct list_head        re_link;
-        __u32           re_lo;
-        __u32           re_hi;
-        __u32           re_stride;
+        u32             re_lo;
+        u32             re_hi;
+        u32             re_stride;
 };
 
 struct cfs_expr_list {
@@ -74,24 +74,26 @@ struct cfs_expr_list {
 
 char *cfs_trimwhite(char *str);
 int cfs_gettok(struct cfs_lstr *next, char delim, struct cfs_lstr *res);
-int cfs_str2num_check(char *str, int nob, unsigned *num,
-                      unsigned min, unsigned max);
-int cfs_expr_list_match(__u32 value, struct cfs_expr_list *expr_list);
+int cfs_str2num_check(char *str, int nob, unsigned int *num,
+                      unsigned int min, unsigned int max);
+int cfs_expr_list_match(u32 value, struct cfs_expr_list *expr_list);
 int cfs_expr_list_print(char *buffer, int count,
                         struct cfs_expr_list *expr_list);
 int cfs_expr_list_values(struct cfs_expr_list *expr_list,
-                         int max, __u32 **values);
+                         int max, u32 **values);
 static inline void
-cfs_expr_list_values_free(__u32 *values, int num)
+cfs_expr_list_values_free(u32 *values, int num)
 {
-        /* This array is allocated by LIBCFS_ALLOC(), so it shouldn't be freed
+        /*
+         * This array is allocated by LIBCFS_ALLOC(), so it shouldn't be freed
          * by OBD_FREE() if it's called by module other than libcfs & LNet,
-         * otherwise we will see fake memory leak */
+         * otherwise we will see fake memory leak
+         */
         LIBCFS_FREE(values, num * sizeof(values[0]));
 }
 
 void cfs_expr_list_free(struct cfs_expr_list *expr_list);
-int cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max,
+int cfs_expr_list_parse(char *str, int len, unsigned int min, unsigned int max,
                         struct cfs_expr_list **elpp);
 void cfs_expr_list_free_list(struct list_head *list);
 
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h
index a7e1340e69a1..2accd9a85472 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h
@@ -62,9 +62,9 @@
 
 struct cfs_wi_sched;
 
-void cfs_wi_sched_destroy(struct cfs_wi_sched *);
+void cfs_wi_sched_destroy(struct cfs_wi_sched *sched);
 int cfs_wi_sched_create(char *name, struct cfs_cpt_table *cptab, int cpt,
-                        int nthrs, struct cfs_wi_sched **);
+                        int nthrs, struct cfs_wi_sched **sched_pp);
 
 struct cfs_workitem;
 
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 f63cb47bc309..dd0cd0442b86 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h
@@ -52,17 +52,17 @@ struct cfs_cpu_partition {
         /* nodes mask for this partition */
         nodemask_t                      *cpt_nodemask;
         /* spread rotor for NUMA allocator */
-        unsigned                        cpt_spread_rotor;
+        unsigned int                    cpt_spread_rotor;
 };
 
 /** descriptor for CPU partitions */
 struct cfs_cpt_table {
         /* version, reserved for hotplug */
-        unsigned                        ctb_version;
+        unsigned int                    ctb_version;
         /* spread rotor for NUMA allocator */
-        unsigned                        ctb_spread_rotor;
+        unsigned int                    ctb_spread_rotor;
         /* # of CPU partitions */
-        unsigned                        ctb_nparts;
+        unsigned int                    ctb_nparts;
         /* partitions tables */
         struct cfs_cpu_partition        *ctb_parts;
         /* shadow HW CPU to CPU partition ID */
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 b646acd1f7e7..709e1ce98d8d 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
@@ -76,23 +76,23 @@ static inline long cfs_duration_sec(long d)
 
 #define cfs_time_current_64 get_jiffies_64
 
-static inline __u64 cfs_time_add_64(__u64 t, __u64 d)
+static inline u64 cfs_time_add_64(u64 t, u64 d)
 {
         return t + d;
 }
 
-static inline __u64 cfs_time_shift_64(int seconds)
+static inline u64 cfs_time_shift_64(int seconds)
 {
         return cfs_time_add_64(cfs_time_current_64(),
                                cfs_time_seconds(seconds));
 }
 
-static inline int cfs_time_before_64(__u64 t1, __u64 t2)
+static inline int cfs_time_before_64(u64 t1, u64 t2)
 {
         return (__s64)t2 - (__s64)t1 > 0;
 }
 
-static inline int cfs_time_beforeq_64(__u64 t1, __u64 t2)
+static inline int cfs_time_beforeq_64(u64 t1, u64 t2)
 {
         return (__s64)t2 - (__s64)t1 >= 0;
 }
diff --git a/drivers/staging/lustre/include/linux/lnet/lnetst.h b/drivers/staging/lustre/include/linux/lnet/lnetst.h
index 417044552d3f..8a84888635ff 100644
--- a/drivers/staging/lustre/include/linux/lnet/lnetst.h
+++ b/drivers/staging/lustre/include/linux/lnet/lnetst.h
@@ -244,7 +244,7 @@ typedef struct {
         int              lstio_ses_timeout;     /* IN: session timeout */
         int              lstio_ses_force;       /* IN: force create ? */
         /** IN: session features */
-        unsigned         lstio_ses_feats;
+        unsigned int     lstio_ses_feats;
         lst_sid_t __user *lstio_ses_idp;        /* OUT: session id */
         int              lstio_ses_nmlen;       /* IN: name length */
         char __user      *lstio_ses_namep;      /* IN: session name */
@@ -255,7 +255,7 @@ typedef struct {
         lst_sid_t __user        *lstio_ses_idp;         /* OUT: session id */
         int __user              *lstio_ses_keyp;        /* OUT: local key */
         /** OUT: session features */
-        unsigned __user         *lstio_ses_featp;
+        unsigned int __user     *lstio_ses_featp;
         lstcon_ndlist_ent_t __user *lstio_ses_ndinfo;   /* OUT: */
         int                      lstio_ses_nmlen;       /* IN: name length */
         char __user             *lstio_ses_namep;       /* OUT: session name */
@@ -328,7 +328,7 @@ typedef struct {
         char __user             *lstio_grp_namep;       /* IN: group name */
         int                      lstio_grp_count;       /* IN: # of nodes */
         /** OUT: session features */
-        unsigned __user         *lstio_grp_featp;
+        unsigned int __user     *lstio_grp_featp;
         lnet_process_id_t __user *lstio_grp_idsp;       /* IN: nodes */
         struct list_head __user *lstio_grp_resultp;     /* OUT: list head of
                                                                 result buffer */
@@ -490,6 +490,8 @@ typedef struct {
         int     blk_size;       /* size (bytes) */
         int     blk_time;       /* time of running the test*/
         int     blk_flags;      /* reserved flags */
+        int     blk_cli_off;    /* bulk offset on client */
+        int     blk_srv_off;    /* reserved: bulk offset on server */
 } lst_test_bulk_param_t;
 
 typedef struct {
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index 9e8802181452..7f761b327166 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -1489,7 +1489,7 @@ out_fpo:
 static void kiblnd_fail_fmr_poolset(struct kib_fmr_poolset *fps,
                                     struct list_head *zombies)
 {
-        if (!fps->fps_net) /* intialized? */
+        if (!fps->fps_net) /* initialized? */
                 return;
 
         spin_lock(&fps->fps_lock);
@@ -1637,7 +1637,7 @@ int kiblnd_fmr_pool_map(struct kib_fmr_poolset *fps, struct kib_tx *tx,
 {
         __u64 *pages = tx->tx_pages;
         bool is_rx = (rd != tx->tx_rd);
-        bool tx_pages_mapped = 0;
+        bool tx_pages_mapped = false;
         struct kib_fmr_pool *fpo;
         int npages = 0;
         __u64 version;
@@ -1812,7 +1812,7 @@ static void kiblnd_destroy_pool_list(struct list_head *head)
 
 static void kiblnd_fail_poolset(struct kib_poolset *ps, struct list_head *zombies)
 {
-        if (!ps->ps_net) /* intialized? */
+        if (!ps->ps_net) /* initialized? */
                 return;
 
         spin_lock(&ps->ps_lock);
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
index b27de8888149..c7917abf9944 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -1912,12 +1912,12 @@ kiblnd_close_conn_locked(struct kib_conn *conn, int error)
                        libcfs_nid2str(peer->ibp_nid));
         } else {
                 CNETERR("Closing conn to %s: error %d%s%s%s%s%s\n",
-                        libcfs_nid2str(peer->ibp_nid), error,
-                        list_empty(&conn->ibc_tx_queue) ? "" : "(sending)",
-                        list_empty(&conn->ibc_tx_noops) ? "" : "(sending_noops)",
-                        list_empty(&conn->ibc_tx_queue_rsrvd) ? "" : "(sending_rsrvd)",
-                        list_empty(&conn->ibc_tx_queue_nocred) ? "" : "(sending_nocred)",
-                        list_empty(&conn->ibc_active_txs) ? "" : "(waiting)");
+                        libcfs_nid2str(peer->ibp_nid), error,
+                        list_empty(&conn->ibc_tx_queue) ? "" : "(sending)",
+                        list_empty(&conn->ibc_tx_noops) ? "" : "(sending_noops)",
+                        list_empty(&conn->ibc_tx_queue_rsrvd) ? "" : "(sending_rsrvd)",
+                        list_empty(&conn->ibc_tx_queue_nocred) ? "" : "(sending_nocred)",
+                        list_empty(&conn->ibc_active_txs) ? "" : "(waiting)");
         }
 
         dev = ((struct kib_net *)peer->ibp_ni->ni_data)->ibn_dev;
@@ -2643,7 +2643,7 @@ kiblnd_check_reconnect(struct kib_conn *conn, int version,
         if (incarnation)
                 peer->ibp_incarnation = incarnation;
 out:
-        write_unlock_irqrestore(glock, flags);
+        write_unlock_irqrestore(glock, flags);
 
         CNETERR("%s: %s (%s), %x, %x, msg_size: %d, queue_depth: %d/%d, max_frags: %d/%d\n",
                 libcfs_nid2str(peer->ibp_nid),
@@ -2651,7 +2651,7 @@ out:
                 reason, IBLND_MSG_VERSION, version, msg_size,
                 conn->ibc_queue_depth, queue_dep,
                 conn->ibc_max_frags, frag_num);
-        /**
+        /**
          * if conn::ibc_reconnect is TRUE, connd will reconnect to the peer
          * while destroying the zombie
          */
@@ -2976,7 +2976,7 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event)
         case RDMA_CM_EVENT_ADDR_ERROR:
                 peer = (struct kib_peer *)cmid->context;
                 CNETERR("%s: ADDR ERROR %d\n",
-                        libcfs_nid2str(peer->ibp_nid), event->status);
+                        libcfs_nid2str(peer->ibp_nid), event->status);
                 kiblnd_peer_connect_failed(peer, 1, -EHOSTUNREACH);
                 kiblnd_peer_decref(peer);
                 return -EHOSTUNREACH;      /* rc destroys cmid */
@@ -3021,7 +3021,7 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event)
                         return kiblnd_active_connect(cmid);
 
                 CNETERR("Can't resolve route for %s: %d\n",
-                        libcfs_nid2str(peer->ibp_nid), event->status);
+                        libcfs_nid2str(peer->ibp_nid), event->status);
                 kiblnd_peer_connect_failed(peer, 1, event->status);
                 kiblnd_peer_decref(peer);
                 return event->status;      /* rc destroys cmid */
@@ -3031,7 +3031,7 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event)
                 LASSERT(conn->ibc_state == IBLND_CONN_ACTIVE_CONNECT ||
                         conn->ibc_state == IBLND_CONN_PASSIVE_WAIT);
                 CNETERR("%s: UNREACHABLE %d\n",
-                        libcfs_nid2str(conn->ibc_peer->ibp_nid), event->status);
+                        libcfs_nid2str(conn->ibc_peer->ibp_nid), event->status);
                 kiblnd_connreq_done(conn, -ENETDOWN);
                 kiblnd_conn_decref(conn);
                 return 0;
@@ -3269,14 +3269,14 @@ kiblnd_disconnect_conn(struct kib_conn *conn)
 #define KIB_RECONN_HIGH_RACE    10
 /**
  * Allow connd to take a break and handle other things after consecutive
- * reconnection attemps.
+ * reconnection attempts.
  */
 #define KIB_RECONN_BREAK        100
 
 int
 kiblnd_connd(void *arg)
 {
-        spinlock_t *lock= &kiblnd_data.kib_connd_lock;
+        spinlock_t *lock = &kiblnd_data.kib_connd_lock;
         wait_queue_t wait;
         unsigned long flags;
         struct kib_conn *conn;
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index cbc9a9c5385f..b74cf635faee 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -96,7 +96,8 @@ ksocknal_destroy_route(struct ksock_route *route)
 }
 
 static int
-ksocknal_create_peer(struct ksock_peer **peerp, lnet_ni_t *ni, lnet_process_id_t id)
+ksocknal_create_peer(struct ksock_peer **peerp, lnet_ni_t *ni,
+                     lnet_process_id_t id)
 {
         int cpt = lnet_cpt_of_nid(id.nid);
         struct ksock_net *net = ni->ni_data;
@@ -319,7 +320,8 @@ ksocknal_get_peer_info(lnet_ni_t *ni, int index,
 }
 
 static void
-ksocknal_associate_route_conn_locked(struct ksock_route *route, struct ksock_conn *conn)
+ksocknal_associate_route_conn_locked(struct ksock_route *route,
+                                     struct ksock_conn *conn)
 {
         struct ksock_peer *peer = route->ksnr_peer;
         int type = conn->ksnc_type;
@@ -821,7 +823,8 @@ ksocknal_select_ips(struct ksock_peer *peer, __u32 *peerips, int n_peerips)
                                 if (k < peer->ksnp_n_passive_ips) /* using it already */
                                         continue;
 
-                                k = ksocknal_match_peerip(iface, peerips, n_peerips);
+                                k = ksocknal_match_peerip(iface, peerips,
+                                                          n_peerips);
                                 xor = ip ^ peerips[k];
                                 this_netmatch = !(xor & iface->ksni_netmask) ? 1 : 0;
 
@@ -1302,8 +1305,11 @@ ksocknal_create_conn(lnet_ni_t *ni, struct ksock_route *route,
 
         /* Take packets blocking for this connection. */
         list_for_each_entry_safe(tx, txtmp, &peer->ksnp_tx_queue, tx_list) {
-                if (conn->ksnc_proto->pro_match_tx(conn, tx, tx->tx_nonblk) == SOCKNAL_MATCH_NO)
-                                continue;
+                int match = conn->ksnc_proto->pro_match_tx(conn, tx,
+                                                           tx->tx_nonblk);
+
+                if (match == SOCKNAL_MATCH_NO)
+                        continue;
 
                 list_del(&tx->tx_list);
                 ksocknal_queue_tx_locked(tx, conn);
@@ -1493,8 +1499,8 @@ ksocknal_close_conn_locked(struct ksock_conn *conn, int error)
                         spin_unlock_bh(&conn->ksnc_scheduler->kss_lock);
                 }
 
-                peer->ksnp_proto = NULL;        /* renegotiate protocol version */
-                peer->ksnp_error = error;       /* stash last conn close reason */
+                peer->ksnp_proto = NULL;  /* renegotiate protocol version */
+                peer->ksnp_error = error; /* stash last conn close reason */
 
                 if (list_empty(&peer->ksnp_routes)) {
                         /*
@@ -1786,7 +1792,8 @@ ksocknal_close_matching_conns(lnet_process_id_t id, __u32 ipaddr)
                               (id.pid == LNET_PID_ANY || id.pid == peer->ksnp_id.pid)))
                                 continue;
 
-                        count += ksocknal_close_peer_conns_locked(peer, ipaddr, 0);
+                        count += ksocknal_close_peer_conns_locked(peer, ipaddr,
+                                                                  0);
                 }
         }
 
@@ -2026,7 +2033,10 @@ ksocknal_add_interface(lnet_ni_t *ni, __u32 ipaddress, __u32 netmask)
                 }
 
                 rc = 0;
-                /* NB only new connections will pay attention to the new interface! */
+                /*
+                 * NB only new connections will pay attention to the
+                 * new interface!
+                 */
         }
 
         write_unlock_bh(&ksocknal_data.ksnd_global_lock);
@@ -2200,8 +2210,9 @@ ksocknal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg)
                 int txmem;
                 int rxmem;
                 int nagle;
-                struct ksock_conn *conn = ksocknal_get_conn_by_idx(ni, data->ioc_count);
+                struct ksock_conn *conn;
 
+                conn = ksocknal_get_conn_by_idx(ni, data->ioc_count);
                 if (!conn)
                         return -ENOENT;
 
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
index e6ca0cf52691..842c45393b38 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
@@ -84,7 +84,8 @@ struct ksock_sched {				/* per scheduler state */
         struct list_head        kss_zombie_noop_txs; /* zombie noop tx list */
         wait_queue_head_t       kss_waitq;      /* where scheduler sleeps */
         int                     kss_nconns;     /* # connections assigned to
-                                                 * this scheduler */
+                                                 * this scheduler
+                                                 */
         struct ksock_sched_info *kss_info;      /* owner of it */
 };
 
@@ -110,15 +111,19 @@ struct ksock_interface {			/* in-use interface */
 
 struct ksock_tunables {
         int          *ksnd_timeout;            /* "stuck" socket timeout
-                                                * (seconds) */
+                                                * (seconds)
+                                                */
         int          *ksnd_nscheds;            /* # scheduler threads in each
-                                                * pool while starting */
+                                                * pool while starting
+                                                */
         int          *ksnd_nconnds;            /* # connection daemons */
         int          *ksnd_nconnds_max;        /* max # connection daemons */
         int          *ksnd_min_reconnectms;    /* first connection retry after
-                                                * (ms)... */
+                                                * (ms)...
+                                                */
         int          *ksnd_max_reconnectms;    /* ...exponentially increasing to
-                                                * this */
+                                                * this
+                                                */
         int          *ksnd_eager_ack;          /* make TCP ack eagerly? */
         int          *ksnd_typed_conns;        /* drive sockets by type? */
         int          *ksnd_min_bulk;           /* smallest "large" message */
@@ -126,9 +131,11 @@ struct ksock_tunables {
         int          *ksnd_rx_buffer_size;     /* socket rx buffer size */
         int          *ksnd_nagle;              /* enable NAGLE? */
         int          *ksnd_round_robin;        /* round robin for multiple
-                                                * interfaces */
+                                                * interfaces
+                                                */
         int          *ksnd_keepalive;          /* # secs for sending keepalive
-                                                * NOOP */
+                                                * NOOP
+                                                */
         int          *ksnd_keepalive_idle;     /* # idle secs before 1st probe
                                                 */
         int          *ksnd_keepalive_count;    /* # probes */
@@ -137,20 +144,26 @@ struct ksock_tunables {
         int          *ksnd_peertxcredits;      /* # concurrent sends to 1 peer
                                                 */
         int          *ksnd_peerrtrcredits;     /* # per-peer router buffer
-                                                * credits */
+                                                * credits
+                                                */
         int          *ksnd_peertimeout;        /* seconds to consider peer dead
                                                 */
         int          *ksnd_enable_csum;        /* enable check sum */
         int          *ksnd_inject_csum_error;  /* set non-zero to inject
-                                                * checksum error */
+                                                * checksum error
+                                                */
         int          *ksnd_nonblk_zcack;       /* always send zc-ack on
-                                                * non-blocking connection */
+                                                * non-blocking connection
+                                                */
         unsigned int *ksnd_zc_min_payload;     /* minimum zero copy payload
-                                                * size */
+                                                * size
+                                                */
         int          *ksnd_zc_recv;            /* enable ZC receive (for
-                                                * Chelsio TOE) */
+                                                * Chelsio TOE)
+                                                */
         int          *ksnd_zc_recv_min_nfrags; /* minimum # of fragments to
-                                                * enable ZC receive */
+                                                * enable ZC receive
+                                                */
 };
 
 struct ksock_net {
@@ -174,9 +187,11 @@ struct ksock_nal_data {
         int                     ksnd_nnets;             /* # networks set up */
         struct list_head        ksnd_nets;              /* list of nets */
         rwlock_t                ksnd_global_lock;       /* stabilize peer/conn
-                                                         * ops */
+                                                         * ops
+                                                         */
         struct list_head        *ksnd_peers;            /* hash table of all my
-                                                         * known peers */
+                                                         * known peers
+                                                         */
         int                     ksnd_peer_hash_size;    /* size of ksnd_peers */
 
         int                     ksnd_nthreads;          /* # live threads */
@@ -187,11 +202,14 @@ struct ksock_nal_data {
         atomic_t                ksnd_nactive_txs;       /* #active txs */
 
         struct list_head        ksnd_deathrow_conns;    /* conns to close:
-                                                         * reaper_lock*/
+                                                         * reaper_lock
+                                                         */
         struct list_head        ksnd_zombie_conns;      /* conns to free:
-                                                         * reaper_lock */
+                                                         * reaper_lock
+                                                         */
         struct list_head        ksnd_enomem_conns;      /* conns to retry:
-                                                         * reaper_lock*/
+                                                         * reaper_lock
+                                                         */
         wait_queue_head_t       ksnd_reaper_waitq;      /* reaper sleeps here */
         unsigned long           ksnd_reaper_waketime;   /* when reaper will wake
                                                          */
@@ -201,30 +219,34 @@ struct ksock_nal_data {
         int                     ksnd_stall_tx;          /* test sluggish sender
                                                          */
         int                     ksnd_stall_rx;          /* test sluggish
-                                                         * receiver */
-
+                                                         * receiver
+                                                         */
         struct list_head        ksnd_connd_connreqs;    /* incoming connection
-                                                         * requests */
+                                                         * requests
+                                                         */
         struct list_head        ksnd_connd_routes;      /* routes waiting to be
-                                                         * connected */
+                                                         * connected
+                                                         */
         wait_queue_head_t       ksnd_connd_waitq;       /* connds sleep here */
         int                     ksnd_connd_connecting;  /* # connds connecting
                                                          */
         time64_t                ksnd_connd_failed_stamp;/* time stamp of the
                                                          * last failed
-                                                         * connecting attempt */
+                                                         * connecting attempt
+                                                         */
         time64_t                ksnd_connd_starting_stamp;/* time stamp of the
                                                            * last starting connd
                                                            */
-        unsigned                ksnd_connd_starting;    /* # starting connd */
-        unsigned                ksnd_connd_running;     /* # running connd */
+        unsigned int            ksnd_connd_starting;    /* # starting connd */
+        unsigned int            ksnd_connd_running;     /* # running connd */
         spinlock_t              ksnd_connd_lock;        /* serialise */
 
         struct list_head        ksnd_idle_noop_txs;     /* list head for freed
-                                                         * noop tx */
+                                                         * noop tx
+                                                         */
         spinlock_t              ksnd_tx_lock;           /* serialise, g_lock
-                                                         * unsafe */
-
+                                                         * unsafe
+                                                         */
 };
 
 #define SOCKNAL_INIT_NOTHING 0
@@ -304,18 +326,21 @@ struct ksock_conn {
         struct list_head   ksnc_list;         /* stash on peer's conn list */
         struct socket      *ksnc_sock;        /* actual socket */
         void               *ksnc_saved_data_ready;  /* socket's original
-                                                     * data_ready() callback */
+                                                     * data_ready() callback
+                                                     */
         void               *ksnc_saved_write_space; /* socket's original
-                                                     * write_space() callback */
+                                                     * write_space() callback
+                                                     */
         atomic_t           ksnc_conn_refcount;/* conn refcount */
         atomic_t           ksnc_sock_refcount;/* sock refcount */
         struct ksock_sched *ksnc_scheduler;     /* who schedules this connection
-                                                 */
+                                                 */
         __u32              ksnc_myipaddr;     /* my IP */
         __u32              ksnc_ipaddr;       /* peer's IP */
         int                ksnc_port;         /* peer's port */
         signed int         ksnc_type:3;       /* type of connection, should be
-                                               * signed value */
+                                               * signed value
+                                               */
         unsigned int       ksnc_closing:1;    /* being shut down */
         unsigned int       ksnc_flip:1;       /* flip or not, only for V2.x */
         unsigned int       ksnc_zc_capable:1; /* enable to ZC */
@@ -323,9 +348,11 @@ struct ksock_conn {
 
         /* reader */
         struct list_head   ksnc_rx_list;      /* where I enq waiting input or a
-                                               * forwarding descriptor */
+                                               * forwarding descriptor
+                                               */
         unsigned long      ksnc_rx_deadline;  /* when (in jiffies) receive times
-                                               * out */
+                                               * out
+                                               */
         __u8               ksnc_rx_started;   /* started receiving a message */
         __u8               ksnc_rx_ready;     /* data ready to read */
         __u8               ksnc_rx_scheduled; /* being progressed */
@@ -338,7 +365,8 @@ struct ksock_conn {
         lnet_kiov_t        *ksnc_rx_kiov;     /* the page frags */
         union ksock_rxiovspace ksnc_rx_iov_space; /* space for frag descriptors */
         __u32              ksnc_rx_csum;      /* partial checksum for incoming
-                                               * data */
+                                               * data
+                                               */
         void               *ksnc_cookie;      /* rx lnet_finalize passthru arg
                                                */
         ksock_msg_t        ksnc_msg;          /* incoming message buffer:
@@ -346,14 +374,16 @@ struct ksock_conn {
                                                * whole struct
                                                * V1.x message is a bare
                                                * lnet_hdr_t, it's stored in
-                                               * ksnc_msg.ksm_u.lnetmsg */
-
+                                               * ksnc_msg.ksm_u.lnetmsg
+                                               */
         /* WRITER */
         struct list_head   ksnc_tx_list;      /* where I enq waiting for output
-                                               * space */
+                                               * space
+                                               */
         struct list_head   ksnc_tx_queue;     /* packets waiting to be sent */
-        struct ksock_tx         *ksnc_tx_carrier;  /* next TX that can carry a LNet
-                                               * message or ZC-ACK */
+        struct ksock_tx   *ksnc_tx_carrier;   /* next TX that can carry a LNet
+                                               * message or ZC-ACK
+                                               */
         unsigned long      ksnc_tx_deadline;  /* when (in jiffies) tx times out
                                                */
         int                ksnc_tx_bufnob;    /* send buffer marker */
@@ -361,7 +391,8 @@ struct ksock_conn {
         int                ksnc_tx_ready;     /* write space */
         int                ksnc_tx_scheduled; /* being progressed */
         unsigned long      ksnc_tx_last_post; /* time stamp of the last posted
-                                               * TX */
+                                               * TX
+                                               */
 };
 
 struct ksock_route {
@@ -370,20 +401,24 @@ struct ksock_route {
         struct ksock_peer *ksnr_peer;          /* owning peer */
         atomic_t          ksnr_refcount;       /* # users */
         unsigned long     ksnr_timeout;        /* when (in jiffies) reconnection
-                                                * can happen next */
+                                                * can happen next
+                                                */
         long              ksnr_retry_interval; /* how long between retries */
         __u32             ksnr_myipaddr;       /* my IP */
         __u32             ksnr_ipaddr;         /* IP address to connect to */
         int               ksnr_port;           /* port to connect to */
         unsigned int      ksnr_scheduled:1;    /* scheduled for attention */
         unsigned int      ksnr_connecting:1;   /* connection establishment in
-                                                * progress */
+                                                * progress
+                                                */
         unsigned int      ksnr_connected:4;    /* connections established by
-                                                * type */
+                                                * type
+                                                */
         unsigned int      ksnr_deleted:1;      /* been removed from peer? */
         unsigned int      ksnr_share_count;    /* created explicitly? */
         int               ksnr_conn_count;     /* # conns established by this
-                                                * route */
+                                                * route
+                                                */
 };
 
 #define SOCKNAL_KEEPALIVE_PING 1 /* cookie for keepalive ping */
@@ -391,7 +426,8 @@ struct ksock_route {
 struct ksock_peer {
         struct list_head   ksnp_list;           /* stash on global peer list */
         unsigned long      ksnp_last_alive;     /* when (in jiffies) I was last
-                                                 * alive */
+                                                 * alive
+                                                 */
         lnet_process_id_t  ksnp_id;             /* who's on the other end(s) */
         atomic_t           ksnp_refcount;       /* # users */
         int                ksnp_sharecount;     /* lconf usage counter */
@@ -408,7 +444,8 @@ struct ksock_peer {
         struct list_head   ksnp_tx_queue;       /* waiting packets */
         spinlock_t         ksnp_lock;           /* serialize, g_lock unsafe */
         struct list_head   ksnp_zc_req_list;    /* zero copy requests wait for
-                                                 * ACK  */
+                                                 * ACK
+                                                 */
         unsigned long      ksnp_send_keepalive; /* time to send keepalive */
         lnet_ni_t          *ksnp_ni;            /* which network */
         int                ksnp_n_passive_ips;  /* # of... */
@@ -429,7 +466,8 @@ extern struct ksock_tunables ksocknal_tunables;
 #define SOCKNAL_MATCH_NO  0 /* TX can't match type of connection */
 #define SOCKNAL_MATCH_YES 1 /* TX matches type of connection */
 #define SOCKNAL_MATCH_MAY 2 /* TX can be sent on the connection, but not
-                             * preferred */
+                             * preferred
+                             */
 
 struct ksock_proto {
         /* version number of protocol */
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
index c1c6f604e6ad..972f6094be75 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
@@ -620,7 +620,8 @@ ksocknal_launch_all_connections_locked(struct ksock_peer *peer)
 }
 
 struct ksock_conn *
-ksocknal_find_conn_locked(struct ksock_peer *peer, struct ksock_tx *tx, int nonblk)
+ksocknal_find_conn_locked(struct ksock_peer *peer, struct ksock_tx *tx,
+                          int nonblk)
 {
         struct list_head *tmp;
         struct ksock_conn *conn;
@@ -630,10 +631,12 @@ ksocknal_find_conn_locked(struct ksock_peer *peer, struct ksock_tx *tx, int nonb
         int fnob = 0;
 
         list_for_each(tmp, &peer->ksnp_conns) {
-                struct ksock_conn *c  = list_entry(tmp, struct ksock_conn, ksnc_list);
-                int nob = atomic_read(&c->ksnc_tx_nob) +
-                        c->ksnc_sock->sk->sk_wmem_queued;
-                int rc;
+                struct ksock_conn *c;
+                int nob, rc;
+
+                c = list_entry(tmp, struct ksock_conn, ksnc_list);
+                nob = atomic_read(&c->ksnc_tx_nob) +
+                      c->ksnc_sock->sk->sk_wmem_queued;
 
                 LASSERT(!c->ksnc_closing);
                 LASSERT(c->ksnc_proto &&
@@ -752,9 +755,9 @@ ksocknal_queue_tx_locked(struct ksock_tx *tx, struct ksock_conn *conn)
                 LASSERT(msg->ksm_zc_cookies[1]);
                 LASSERT(conn->ksnc_proto->pro_queue_tx_zcack);
 
+                /* ZC ACK piggybacked on ztx release tx later */
                 if (conn->ksnc_proto->pro_queue_tx_zcack(conn, tx, 0))
-                        ztx = tx; /* ZC ACK piggybacked on ztx release tx later */
-
+                        ztx = tx;
         } else {
                 /*
                  * It's a normal packet - can it piggback a noop zc-ack that
@@ -796,7 +799,8 @@ ksocknal_find_connectable_route_locked(struct ksock_peer *peer)
 
                 LASSERT(!route->ksnr_connecting || route->ksnr_scheduled);
 
-                if (route->ksnr_scheduled)      /* connections being established */
+                /* connections being established */
+                if (route->ksnr_scheduled)
                         continue;
 
                 /* all route types connected ? */
@@ -1514,7 +1518,10 @@ int ksocknal_scheduler(void *arg)
                         rc = ksocknal_process_transmit(conn, tx);
 
                         if (rc == -ENOMEM || rc == -EAGAIN) {
-                                /* Incomplete send: replace tx on HEAD of tx_queue */
+                                /*
+                                 * Incomplete send: replace tx on HEAD of
+                                 * tx_queue
+                                 */
                                 spin_lock_bh(&sched->kss_lock);
                                 list_add(&tx->tx_list, &conn->ksnc_tx_queue);
                         } else {
@@ -1724,7 +1731,8 @@ ksocknal_recv_hello(lnet_ni_t *ni, struct ksock_conn *conn,
         timeout = active ? *ksocknal_tunables.ksnd_timeout :
                             lnet_acceptor_timeout();
 
-        rc = lnet_sock_read(sock, &hello->kshm_magic, sizeof(hello->kshm_magic), timeout);
+        rc = lnet_sock_read(sock, &hello->kshm_magic,
+                            sizeof(hello->kshm_magic), timeout);
         if (rc) {
                 CERROR("Error %d reading HELLO from %pI4h\n",
                        rc, &conn->ksnc_ipaddr);
@@ -1798,7 +1806,8 @@ ksocknal_recv_hello(lnet_ni_t *ni, struct ksock_conn *conn,
             conn->ksnc_port > LNET_ACCEPTOR_MAX_RESERVED_PORT) {
                 /* Userspace NAL assigns peer process ID from socket */
                 recv_id.pid = conn->ksnc_port | LNET_PID_USERFLAG;
-                recv_id.nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), conn->ksnc_ipaddr);
+                recv_id.nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid),
+                                         conn->ksnc_ipaddr);
         } else {
                 recv_id.nid = hello->kshm_src_nid;
                 recv_id.pid = hello->kshm_src_pid;
@@ -1882,7 +1891,8 @@ ksocknal_connect(struct ksock_route *route)
                 if (peer->ksnp_accepting > 0) {
                         CDEBUG(D_NET,
                                "peer %s(%d) already connecting to me, retry later.\n",
-                               libcfs_nid2str(peer->ksnp_id.nid), peer->ksnp_accepting);
+                               libcfs_nid2str(peer->ksnp_id.nid),
+                               peer->ksnp_accepting);
                         retry_later = 1;
                 }
 
@@ -2241,7 +2251,8 @@ ksocknal_connd(void *arg)
 
                 /* Nothing to do for 'timeout'  */
                 set_current_state(TASK_INTERRUPTIBLE);
-                add_wait_queue_exclusive(&ksocknal_data.ksnd_connd_waitq, &wait);
+                add_wait_queue_exclusive(&ksocknal_data.ksnd_connd_waitq,
+                                         &wait);
                 spin_unlock_bh(connd_lock);
 
                 nloops = 0;
@@ -2371,7 +2382,8 @@ ksocknal_send_keepalive_locked(struct ksock_peer *peer)
         struct ksock_conn *conn;
         struct ksock_tx *tx;
 
-        if (list_empty(&peer->ksnp_conns)) /* last_alive will be updated by create_conn */
+        /* last_alive will be updated by create_conn */
+        if (list_empty(&peer->ksnp_conns))
                 return 0;
 
         if (peer->ksnp_proto != &ksocknal_protocol_v3x)
@@ -2473,8 +2485,8 @@ ksocknal_check_peer_timeouts(int idx)
                  * holding only shared lock
                  */
                 if (!list_empty(&peer->ksnp_tx_queue)) {
-                        struct ksock_tx *tx = list_entry(peer->ksnp_tx_queue.next,
-                                                    struct ksock_tx, tx_list);
+                        tx = list_entry(peer->ksnp_tx_queue.next,
+                                        struct ksock_tx, tx_list);
 
                         if (cfs_time_aftereq(cfs_time_current(),
                                              tx->tx_deadline)) {
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
index 6c95e989ca12..4bcab4bcc2de 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
@@ -202,7 +202,8 @@ ksocknal_lib_recv_iov(struct ksock_conn *conn)
                                 fragnob = sum;
 
                         conn->ksnc_rx_csum = ksocknal_csum(conn->ksnc_rx_csum,
-                                                           iov[i].iov_base, fragnob);
+                                                           iov[i].iov_base,
+                                                           fragnob);
                 }
                 conn->ksnc_msg.ksm_csum = saved_csum;
         }
@@ -291,7 +292,8 @@ ksocknal_lib_csum_tx(struct ksock_tx *tx)
 }
 
 int
-ksocknal_lib_get_conn_tunables(struct ksock_conn *conn, int *txmem, int *rxmem, int *nagle)
+ksocknal_lib_get_conn_tunables(struct ksock_conn *conn, int *txmem,
+                               int *rxmem, int *nagle)
 {
         struct socket *sock = conn->ksnc_sock;
         int len;
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
index 82e174f6d9fe..8f0ff6ca1f39 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
@@ -194,7 +194,10 @@ ksocknal_queue_tx_zcack_v3(struct ksock_conn *conn,
         }
 
         if (!tx->tx_msg.ksm_zc_cookies[0]) {
-                /* NOOP tx has only one ZC-ACK cookie, can carry at least one more */
+                /*
+                 * NOOP tx has only one ZC-ACK cookie,
+                 * can carry at least one more
+                 */
                 if (tx->tx_msg.ksm_zc_cookies[1] > cookie) {
                         tx->tx_msg.ksm_zc_cookies[0] = tx->tx_msg.ksm_zc_cookies[1];
                         tx->tx_msg.ksm_zc_cookies[1] = cookie;
@@ -203,7 +206,10 @@ ksocknal_queue_tx_zcack_v3(struct ksock_conn *conn,
                 }
 
                 if (tx->tx_msg.ksm_zc_cookies[0] - tx->tx_msg.ksm_zc_cookies[1] > 2) {
-                        /* not likely to carry more ACKs, skip it to simplify logic */
+                        /*
+                         * not likely to carry more ACKs, skip it
+                         * to simplify logic
+                         */
                         ksocknal_next_tx_carrier(conn);
                 }
 
@@ -237,7 +243,10 @@ ksocknal_queue_tx_zcack_v3(struct ksock_conn *conn,
                 }
 
         } else {
-                /* ksm_zc_cookies[0] < ksm_zc_cookies[1], it is range of cookies */
+                /*
+                 * ksm_zc_cookies[0] < ksm_zc_cookies[1],
+                 * it is range of cookies
+                 */
                 if (cookie >= tx->tx_msg.ksm_zc_cookies[0] &&
                     cookie <= tx->tx_msg.ksm_zc_cookies[1]) {
                         CWARN("%s: duplicated ZC cookie: %llu\n",
@@ -425,7 +434,8 @@ ksocknal_handle_zcack(struct ksock_conn *conn, __u64 cookie1, __u64 cookie2)
                                  tx_zc_list) {
                 __u64 c = tx->tx_msg.ksm_zc_cookies[0];
 
-                if (c == cookie1 || c == cookie2 || (cookie1 < c && c < cookie2)) {
+                if (c == cookie1 || c == cookie2 ||
+                    (cookie1 < c && c < cookie2)) {
                         tx->tx_msg.ksm_zc_cookies[0] = 0;
                         list_del(&tx->tx_zc_list);
                         list_add(&tx->tx_zc_list, &zlist);
@@ -639,7 +649,8 @@ out:
 }
 
 static int
-ksocknal_recv_hello_v2(struct ksock_conn *conn, ksock_hello_msg_t *hello, int timeout)
+ksocknal_recv_hello_v2(struct ksock_conn *conn, ksock_hello_msg_t *hello,
+                       int timeout)
 {
         struct socket *sock = conn->ksnc_sock;
         int rc;
@@ -737,7 +748,10 @@ ksocknal_pack_msg_v2(struct ksock_tx *tx)
                 tx->tx_nob = offsetof(ksock_msg_t,  ksm_u.lnetmsg.ksnm_hdr);
                 tx->tx_resid = offsetof(ksock_msg_t,  ksm_u.lnetmsg.ksnm_hdr);
         }
-        /* Don't checksum before start sending, because packet can be piggybacked with ACK */
+        /*
+         * Don't checksum before start sending, because packet can be
+         * piggybacked with ACK
+         */
 }
 
 static void
diff --git a/drivers/staging/lustre/lnet/libcfs/debug.c b/drivers/staging/lustre/lnet/libcfs/debug.c
index 23b36b890964..a38db2322225 100644
--- a/drivers/staging/lustre/lnet/libcfs/debug.c
+++ b/drivers/staging/lustre/lnet/libcfs/debug.c
@@ -57,7 +57,7 @@ static int libcfs_param_debug_mb_set(const char *val,
                                      const struct kernel_param *kp)
 {
         int rc;
-        unsigned num;
+        unsigned int num;
 
         rc = kstrtouint(val, 0, &num);
         if (rc < 0)
@@ -228,7 +228,8 @@ int libcfs_panic_in_progress;
 static const char *
 libcfs_debug_subsys2str(int subsys)
 {
-        static const char *libcfs_debug_subsystems[] = LIBCFS_DEBUG_SUBSYS_NAMES;
+        static const char * const libcfs_debug_subsystems[] =
+                LIBCFS_DEBUG_SUBSYS_NAMES;
 
         if (subsys >= ARRAY_SIZE(libcfs_debug_subsystems))
                 return NULL;
@@ -240,7 +241,8 @@ libcfs_debug_subsys2str(int subsys)
 static const char *
 libcfs_debug_dbg2str(int debug)
 {
-        static const char *libcfs_debug_masks[] = LIBCFS_DEBUG_MASKS_NAMES;
+        static const char * const libcfs_debug_masks[] =
+                LIBCFS_DEBUG_MASKS_NAMES;
 
         if (debug >= ARRAY_SIZE(libcfs_debug_masks))
                 return NULL;
@@ -253,17 +255,17 @@ libcfs_debug_mask2str(char *str, int size, int mask, int is_subsys)
 {
         const char *(*fn)(int bit) = is_subsys ? libcfs_debug_subsys2str :
                                                  libcfs_debug_dbg2str;
-        int        len = 0;
-        const char   *token;
-        int        i;
+        int len = 0;
+        const char *token;
+        int i;
 
-        if (mask == 0) {                        /* "0" */
+        if (!mask) {                    /* "0" */
                 if (size > 0)
                         str[0] = '0';
                 len = 1;
         } else {                                /* space-separated tokens */
                 for (i = 0; i < 32; i++) {
-                        if ((mask & (1 << i)) == 0)
+                        if (!(mask & (1 << i)))
                                 continue;
 
                         token = fn(i);
@@ -276,7 +278,7 @@ libcfs_debug_mask2str(char *str, int size, int mask, int is_subsys)
                                 len++;
                         }
 
-                        while (*token != 0) {
+                        while (*token) {
                                 if (len < size)
                                         str[len] = *token;
                                 token++;
@@ -299,10 +301,10 @@ libcfs_debug_str2mask(int *mask, const char *str, int is_subsys)
 {
         const char *(*fn)(int bit) = is_subsys ? libcfs_debug_subsys2str :
                                                  libcfs_debug_dbg2str;
-        int      m = 0;
-        int      matched;
-        int      n;
-        int      t;
+        int m = 0;
+        int matched;
+        int n;
+        int t;
 
         /* Allow a number for backwards compatibility */
 
@@ -313,7 +315,7 @@ libcfs_debug_str2mask(int *mask, const char *str, int is_subsys)
         t = sscanf(str, "%i%n", &m, &matched);
         if (t >= 1 && matched == n) {
                 /* don't print warning for lctl set_param debug=0 or -1 */
-                if (m != 0 && m != -1)
+                if (m && m != -1)
                         CWARN("You are trying to use a numerical value for the mask - this will be deprecated in a future release.\n");
                 *mask = m;
                 return 0;
@@ -387,8 +389,8 @@ EXPORT_SYMBOL(libcfs_debug_dumplog);
 
 int libcfs_debug_init(unsigned long bufsize)
 {
-        int    rc = 0;
         unsigned int max = libcfs_debug_mb;
+        int rc = 0;
 
         init_waitqueue_head(&debug_ctlwq);
 
@@ -414,9 +416,9 @@ int libcfs_debug_init(unsigned long bufsize)
                 max = max / num_possible_cpus();
                 max <<= (20 - PAGE_SHIFT);
         }
-        rc = cfs_tracefile_init(max);
 
-        if (rc == 0) {
+        rc = cfs_tracefile_init(max);
+        if (!rc) {
                 libcfs_register_panic_notifier();
                 libcfs_debug_mb = cfs_trace_get_debug_mb();
         }
diff --git a/drivers/staging/lustre/lnet/libcfs/fail.c b/drivers/staging/lustre/lnet/libcfs/fail.c
index e4b1a0a86eae..12dd50ad4efb 100644
--- a/drivers/staging/lustre/lnet/libcfs/fail.c
+++ b/drivers/staging/lustre/lnet/libcfs/fail.c
@@ -46,7 +46,7 @@ EXPORT_SYMBOL(cfs_race_waitq);
 int cfs_race_state;
 EXPORT_SYMBOL(cfs_race_state);
 
-int __cfs_fail_check_set(__u32 id, __u32 value, int set)
+int __cfs_fail_check_set(u32 id, u32 value, int set)
 {
         static atomic_t cfs_fail_count = ATOMIC_INIT(0);
 
@@ -113,6 +113,7 @@ int __cfs_fail_check_set(__u32 id, __u32 value, int set)
                 break;
         case CFS_FAIL_LOC_RESET:
                 cfs_fail_loc = value;
+                atomic_set(&cfs_fail_count, 0);
                 break;
         default:
                 LASSERTF(0, "called with bad set %u\n", set);
@@ -123,7 +124,7 @@ int __cfs_fail_check_set(__u32 id, __u32 value, int set)
 }
 EXPORT_SYMBOL(__cfs_fail_check_set);
 
-int __cfs_fail_timeout_set(__u32 id, __u32 value, int ms, int set)
+int __cfs_fail_timeout_set(u32 id, u32 value, int ms, int set)
 {
         int ret;
 
diff --git a/drivers/staging/lustre/lnet/libcfs/hash.c b/drivers/staging/lustre/lnet/libcfs/hash.c
index 23283b6e09ab..c93c59d8fe6c 100644
--- a/drivers/staging/lustre/lnet/libcfs/hash.c
+++ b/drivers/staging/lustre/lnet/libcfs/hash.c
@@ -289,7 +289,7 @@ cfs_hash_hd_hhead_size(struct cfs_hash *hs)
 static struct hlist_head *
 cfs_hash_hd_hhead(struct cfs_hash *hs, struct cfs_hash_bd *bd)
 {
-        struct cfs_hash_head_dep   *head;
+        struct cfs_hash_head_dep *head;
 
         head = (struct cfs_hash_head_dep *)&bd->bd_bucket->hsb_head[0];
         return &head[bd->bd_offset].hd_head;
@@ -492,7 +492,7 @@ cfs_hash_bd_get(struct cfs_hash *hs, const void *key, struct cfs_hash_bd *bd)
                 cfs_hash_bd_from_key(hs, hs->hs_buckets,
                                      hs->hs_cur_bits, key, bd);
         } else {
-                LASSERT(hs->hs_rehash_bits != 0);
+                LASSERT(hs->hs_rehash_bits);
                 cfs_hash_bd_from_key(hs, hs->hs_rehash_buckets,
                                      hs->hs_rehash_bits, key, bd);
         }
@@ -507,14 +507,14 @@ cfs_hash_bd_dep_record(struct cfs_hash *hs, struct cfs_hash_bd *bd, int dep_cur)
 
         bd->bd_bucket->hsb_depmax = dep_cur;
 # if CFS_HASH_DEBUG_LEVEL >= CFS_HASH_DEBUG_1
-        if (likely(warn_on_depth == 0 ||
+        if (likely(!warn_on_depth ||
                    max(warn_on_depth, hs->hs_dep_max) >= dep_cur))
                 return;
 
         spin_lock(&hs->hs_dep_lock);
-        hs->hs_dep_max  = dep_cur;
-        hs->hs_dep_bkt  = bd->bd_bucket->hsb_index;
-        hs->hs_dep_off  = bd->bd_offset;
+        hs->hs_dep_max = dep_cur;
+        hs->hs_dep_bkt = bd->bd_bucket->hsb_index;
+        hs->hs_dep_off = bd->bd_offset;
         hs->hs_dep_bits = hs->hs_cur_bits;
         spin_unlock(&hs->hs_dep_lock);
 
@@ -531,7 +531,7 @@ cfs_hash_bd_add_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd,
         rc = hs->hs_hops->hop_hnode_add(hs, bd, hnode);
         cfs_hash_bd_dep_record(hs, bd, rc);
         bd->bd_bucket->hsb_version++;
-        if (unlikely(bd->bd_bucket->hsb_version == 0))
+        if (unlikely(!bd->bd_bucket->hsb_version))
                 bd->bd_bucket->hsb_version++;
         bd->bd_bucket->hsb_count++;
 
@@ -551,7 +551,7 @@ cfs_hash_bd_del_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd,
         LASSERT(bd->bd_bucket->hsb_count > 0);
         bd->bd_bucket->hsb_count--;
         bd->bd_bucket->hsb_version++;
-        if (unlikely(bd->bd_bucket->hsb_version == 0))
+        if (unlikely(!bd->bd_bucket->hsb_version))
                 bd->bd_bucket->hsb_version++;
 
         if (cfs_hash_with_counter(hs)) {
@@ -571,7 +571,7 @@ cfs_hash_bd_move_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd_old,
         struct cfs_hash_bucket *nbkt = bd_new->bd_bucket;
         int rc;
 
-        if (cfs_hash_bd_compare(bd_old, bd_new) == 0)
+        if (!cfs_hash_bd_compare(bd_old, bd_new))
                 return;
 
         /* use cfs_hash_bd_hnode_add/del, to avoid atomic & refcount ops
@@ -584,11 +584,11 @@ cfs_hash_bd_move_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd_old,
         LASSERT(obkt->hsb_count > 0);
         obkt->hsb_count--;
         obkt->hsb_version++;
-        if (unlikely(obkt->hsb_version == 0))
+        if (unlikely(!obkt->hsb_version))
                 obkt->hsb_version++;
         nbkt->hsb_count++;
         nbkt->hsb_version++;
-        if (unlikely(nbkt->hsb_version == 0))
+        if (unlikely(!nbkt->hsb_version))
                 nbkt->hsb_version++;
 }
 
@@ -629,7 +629,7 @@ cfs_hash_bd_lookup_intent(struct cfs_hash *hs, struct cfs_hash_bd *bd,
         struct hlist_head *hhead = cfs_hash_bd_hhead(hs, bd);
         struct hlist_node *ehnode;
         struct hlist_node *match;
-        int intent_add = (intent & CFS_HS_LOOKUP_MASK_ADD) != 0;
+        int intent_add = intent & CFS_HS_LOOKUP_MASK_ADD;
 
         /* with this function, we can avoid a lot of useless refcount ops,
          * which are expensive atomic operations most time.
@@ -643,13 +643,13 @@ cfs_hash_bd_lookup_intent(struct cfs_hash *hs, struct cfs_hash_bd *bd,
                         continue;
 
                 /* match and ... */
-                if ((intent & CFS_HS_LOOKUP_MASK_DEL) != 0) {
+                if (intent & CFS_HS_LOOKUP_MASK_DEL) {
                         cfs_hash_bd_del_locked(hs, bd, ehnode);
                         return ehnode;
                 }
 
                 /* caller wants refcount? */
-                if ((intent & CFS_HS_LOOKUP_MASK_REF) != 0)
+                if (intent & CFS_HS_LOOKUP_MASK_REF)
                         cfs_hash_get(hs, ehnode);
                 return ehnode;
         }
@@ -682,7 +682,7 @@ EXPORT_SYMBOL(cfs_hash_bd_peek_locked);
 
 static void
 cfs_hash_multi_bd_lock(struct cfs_hash *hs, struct cfs_hash_bd *bds,
-                       unsigned n, int excl)
+                       unsigned int n, int excl)
 {
         struct cfs_hash_bucket *prev = NULL;
         int i;
@@ -704,7 +704,7 @@ cfs_hash_multi_bd_lock(struct cfs_hash *hs, struct cfs_hash_bd *bds,
 
 static void
 cfs_hash_multi_bd_unlock(struct cfs_hash *hs, struct cfs_hash_bd *bds,
-                         unsigned n, int excl)
+                         unsigned int n, int excl)
 {
         struct cfs_hash_bucket *prev = NULL;
         int i;
@@ -719,10 +719,10 @@ cfs_hash_multi_bd_unlock(struct cfs_hash *hs, struct cfs_hash_bd *bds,
 
 static struct hlist_node *
 cfs_hash_multi_bd_lookup_locked(struct cfs_hash *hs, struct cfs_hash_bd *bds,
-                                unsigned n, const void *key)
+                                unsigned int n, const void *key)
 {
         struct hlist_node *ehnode;
-        unsigned i;
+        unsigned int i;
 
         cfs_hash_for_each_bd(bds, n, i) {
                 ehnode = cfs_hash_bd_lookup_intent(hs, &bds[i], key, NULL,
@@ -735,12 +735,12 @@ cfs_hash_multi_bd_lookup_locked(struct cfs_hash *hs, struct cfs_hash_bd *bds,
 
 static struct hlist_node *
 cfs_hash_multi_bd_findadd_locked(struct cfs_hash *hs, struct cfs_hash_bd *bds,
-                                 unsigned n, const void *key,
+                                 unsigned int n, const void *key,
                                  struct hlist_node *hnode, int noref)
 {
         struct hlist_node *ehnode;
         int intent;
-        unsigned i;
+        unsigned int i;
 
         LASSERT(hnode);
         intent = (!noref * CFS_HS_LOOKUP_MASK_REF) | CFS_HS_LOOKUP_IT_PEEK;
@@ -766,7 +766,7 @@ cfs_hash_multi_bd_findadd_locked(struct cfs_hash *hs, struct cfs_hash_bd *bds,
 
 static struct hlist_node *
 cfs_hash_multi_bd_finddel_locked(struct cfs_hash *hs, struct cfs_hash_bd *bds,
-                                 unsigned n, const void *key,
+                                 unsigned int n, const void *key,
                                  struct hlist_node *hnode)
 {
         struct hlist_node *ehnode;
@@ -815,7 +815,7 @@ cfs_hash_dual_bd_get(struct cfs_hash *hs, const void *key,
                 return;
         }
 
-        LASSERT(hs->hs_rehash_bits != 0);
+        LASSERT(hs->hs_rehash_bits);
         cfs_hash_bd_from_key(hs, hs->hs_rehash_buckets,
                              hs->hs_rehash_bits, key, &bds[1]);
 
@@ -883,7 +883,7 @@ cfs_hash_buckets_realloc(struct cfs_hash *hs, struct cfs_hash_bucket **old_bkts,
         struct cfs_hash_bucket **new_bkts;
         int i;
 
-        LASSERT(old_size == 0 || old_bkts);
+        LASSERT(!old_size || old_bkts);
 
         if (old_bkts && old_size == new_size)
                 return old_bkts;
@@ -908,9 +908,9 @@ cfs_hash_buckets_realloc(struct cfs_hash *hs, struct cfs_hash_bucket **old_bkts,
                         return NULL;
                 }
 
-                new_bkts[i]->hsb_index   = i;
-                new_bkts[i]->hsb_version = 1;  /* shouldn't be zero */
-                new_bkts[i]->hsb_depmax  = -1; /* unknown */
+                new_bkts[i]->hsb_index = i;
+                new_bkts[i]->hsb_version = 1;   /* shouldn't be zero */
+                new_bkts[i]->hsb_depmax = -1;   /* unknown */
                 bd.bd_bucket = new_bkts[i];
                 cfs_hash_bd_for_each_hlist(hs, &bd, hhead)
                         INIT_HLIST_HEAD(hhead);
@@ -950,9 +950,9 @@ static int cfs_hash_dep_print(struct cfs_workitem *wi)
         int bits;
 
         spin_lock(&hs->hs_dep_lock);
-        dep  = hs->hs_dep_max;
-        bkt  = hs->hs_dep_bkt;
-        off  = hs->hs_dep_off;
+        dep = hs->hs_dep_max;
+        bkt = hs->hs_dep_bkt;
+        off = hs->hs_dep_off;
         bits = hs->hs_dep_bits;
         spin_unlock(&hs->hs_dep_lock);
 
@@ -976,7 +976,7 @@ static void cfs_hash_depth_wi_cancel(struct cfs_hash *hs)
                 return;
 
         spin_lock(&hs->hs_dep_lock);
-        while (hs->hs_dep_bits != 0) {
+        while (hs->hs_dep_bits) {
                 spin_unlock(&hs->hs_dep_lock);
                 cond_resched();
                 spin_lock(&hs->hs_dep_lock);
@@ -992,10 +992,10 @@ static inline void cfs_hash_depth_wi_cancel(struct cfs_hash *hs) {}
 #endif /* CFS_HASH_DEBUG_LEVEL >= CFS_HASH_DEBUG_1 */
 
 struct cfs_hash *
-cfs_hash_create(char *name, unsigned cur_bits, unsigned max_bits,
-                unsigned bkt_bits, unsigned extra_bytes,
-                unsigned min_theta, unsigned max_theta,
-                struct cfs_hash_ops *ops, unsigned flags)
+cfs_hash_create(char *name, unsigned int cur_bits, unsigned int max_bits,
+                unsigned int bkt_bits, unsigned int extra_bytes,
+                unsigned int min_theta, unsigned int max_theta,
+                struct cfs_hash_ops *ops, unsigned int flags)
 {
         struct cfs_hash *hs;
         int len;
@@ -1010,18 +1010,17 @@ cfs_hash_create(char *name, unsigned cur_bits, unsigned max_bits,
         LASSERT(ops->hs_get);
         LASSERT(ops->hs_put_locked);
 
-        if ((flags & CFS_HASH_REHASH) != 0)
+        if (flags & CFS_HASH_REHASH)
                 flags |= CFS_HASH_COUNTER; /* must have counter */
 
         LASSERT(cur_bits > 0);
         LASSERT(cur_bits >= bkt_bits);
         LASSERT(max_bits >= cur_bits && max_bits < 31);
-        LASSERT(ergo((flags & CFS_HASH_REHASH) == 0, cur_bits == max_bits));
-        LASSERT(ergo((flags & CFS_HASH_REHASH) != 0,
-                     (flags & CFS_HASH_NO_LOCK) == 0));
-        LASSERT(ergo((flags & CFS_HASH_REHASH_KEY) != 0, ops->hs_keycpy));
+        LASSERT(ergo(!(flags & CFS_HASH_REHASH), cur_bits == max_bits));
+        LASSERT(ergo(flags & CFS_HASH_REHASH, !(flags & CFS_HASH_NO_LOCK)));
+        LASSERT(ergo(flags & CFS_HASH_REHASH_KEY, ops->hs_keycpy));
 
-        len = (flags & CFS_HASH_BIGNAME) == 0 ?
+        len = !(flags & CFS_HASH_BIGNAME) ?
               CFS_HASH_NAME_LEN : CFS_HASH_BIGNAME_LEN;
         LIBCFS_ALLOC(hs, offsetof(struct cfs_hash, hs_name[len]));
         if (!hs)
@@ -1036,12 +1035,12 @@ cfs_hash_create(char *name, unsigned cur_bits, unsigned max_bits,
         cfs_hash_lock_setup(hs);
         cfs_hash_hlist_setup(hs);
 
-        hs->hs_cur_bits = (__u8)cur_bits;
-        hs->hs_min_bits = (__u8)cur_bits;
-        hs->hs_max_bits = (__u8)max_bits;
-        hs->hs_bkt_bits = (__u8)bkt_bits;
+        hs->hs_cur_bits = (u8)cur_bits;
+        hs->hs_min_bits = (u8)cur_bits;
+        hs->hs_max_bits = (u8)max_bits;
+        hs->hs_bkt_bits = (u8)bkt_bits;
 
-        hs->hs_ops         = ops;
+        hs->hs_ops = ops;
         hs->hs_extra_bytes = extra_bytes;
         hs->hs_rehash_bits = 0;
         cfs_wi_init(&hs->hs_rehash_wi, hs, cfs_hash_rehash_worker);
@@ -1107,12 +1106,12 @@ cfs_hash_destroy(struct cfs_hash *hs)
                                 cfs_hash_exit(hs, hnode);
                         }
                 }
-                LASSERT(bd.bd_bucket->hsb_count == 0);
+                LASSERT(!bd.bd_bucket->hsb_count);
                 cfs_hash_bd_unlock(hs, &bd, 1);
                 cond_resched();
         }
 
-        LASSERT(atomic_read(&hs->hs_count) == 0);
+        LASSERT(!atomic_read(&hs->hs_count));
 
         cfs_hash_buckets_free(hs->hs_buckets, cfs_hash_bkt_size(hs),
                               0, CFS_HASH_NBKT(hs));
@@ -1216,7 +1215,7 @@ cfs_hash_find_or_add(struct cfs_hash *hs, const void *key,
         struct cfs_hash_bd bds[2];
         int bits = 0;
 
-        LASSERT(hlist_unhashed(hnode));
+        LASSERTF(hlist_unhashed(hnode), "hnode = %p\n", hnode);
 
         cfs_hash_lock(hs, 0);
         cfs_hash_dual_bd_get_and_lock(hs, key, bds, 1);
@@ -1293,7 +1292,7 @@ cfs_hash_del(struct cfs_hash *hs, const void *key, struct hlist_node *hnode)
         }
 
         if (hnode) {
-                obj  = cfs_hash_object(hs, hnode);
+                obj = cfs_hash_object(hs, hnode);
                 bits = cfs_hash_rehash_bits(hs);
         }
 
@@ -1388,7 +1387,7 @@ cfs_hash_for_each_exit(struct cfs_hash *hs)
         bits = cfs_hash_rehash_bits(hs);
         cfs_hash_unlock(hs, 1);
         /* NB: it's race on cfs_has_t::hs_iterating, see above */
-        if (remained == 0)
+        if (!remained)
                 hs->hs_iterating = 0;
         if (bits > 0) {
                 cfs_hash_rehash(hs, atomic_read(&hs->hs_count) <
@@ -1406,14 +1405,14 @@ cfs_hash_for_each_exit(struct cfs_hash *hs)
  *    . if @removal_safe is true, use can remove current item by
  *      cfs_hash_bd_del_locked
  */
-static __u64
+static u64
 cfs_hash_for_each_tight(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,
                         void *data, int remove_safe)
 {
         struct hlist_node *hnode;
         struct hlist_node *pos;
         struct cfs_hash_bd bd;
-        __u64 count = 0;
+        u64 count = 0;
         int excl = !!remove_safe;
         int loop = 0;
         int i;
@@ -1526,7 +1525,7 @@ cfs_hash_is_empty(struct cfs_hash *hs)
 }
 EXPORT_SYMBOL(cfs_hash_is_empty);
 
-__u64
+u64
 cfs_hash_size_get(struct cfs_hash *hs)
 {
         return cfs_hash_with_counter(hs) ?
@@ -1552,26 +1551,33 @@ EXPORT_SYMBOL(cfs_hash_size_get);
  */
 static int
 cfs_hash_for_each_relax(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,
-                        void *data)
+                        void *data, int start)
 {
         struct hlist_node *hnode;
         struct hlist_node *tmp;
         struct cfs_hash_bd bd;
-        __u32 version;
+        u32 version;
         int count = 0;
         int stop_on_change;
-        int rc;
+        int end = -1;
+        int rc = 0;
         int i;
 
         stop_on_change = cfs_hash_with_rehash_key(hs) ||
                          !cfs_hash_with_no_itemref(hs) ||
                          !hs->hs_ops->hs_put_locked;
         cfs_hash_lock(hs, 0);
+again:
         LASSERT(!cfs_hash_is_rehashing(hs));
 
         cfs_hash_for_each_bucket(hs, &bd, i) {
                 struct hlist_head *hhead;
 
+                if (i < start)
+                        continue;
+                else if (end > 0 && i >= end)
+                        break;
+
                 cfs_hash_bd_lock(hs, &bd, 0);
                 version = cfs_hash_bd_version_get(&bd);
 
@@ -1611,14 +1617,19 @@ cfs_hash_for_each_relax(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,
                 if (rc) /* callback wants to break iteration */
                         break;
         }
-        cfs_hash_unlock(hs, 0);
+        if (start > 0 && !rc) {
+                end = start;
+                start = 0;
+                goto again;
+        }
 
+        cfs_hash_unlock(hs, 0);
         return count;
 }
 
 int
 cfs_hash_for_each_nolock(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,
-                         void *data)
+                         void *data, int start)
 {
         if (cfs_hash_with_no_lock(hs) ||
             cfs_hash_with_rehash_key(hs) ||
@@ -1630,7 +1641,7 @@ cfs_hash_for_each_nolock(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,
                 return -EOPNOTSUPP;
 
         cfs_hash_for_each_enter(hs);
-        cfs_hash_for_each_relax(hs, func, data);
+        cfs_hash_for_each_relax(hs, func, data, start);
         cfs_hash_for_each_exit(hs);
 
         return 0;
@@ -1652,7 +1663,7 @@ int
 cfs_hash_for_each_empty(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,
                         void *data)
 {
-        unsigned i = 0;
+        unsigned int i = 0;
 
         if (cfs_hash_with_no_lock(hs))
                 return -EOPNOTSUPP;
@@ -1662,7 +1673,7 @@ cfs_hash_for_each_empty(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,
                 return -EOPNOTSUPP;
 
         cfs_hash_for_each_enter(hs);
-        while (cfs_hash_for_each_relax(hs, func, data)) {
+        while (cfs_hash_for_each_relax(hs, func, data, 0)) {
                 CDEBUG(D_INFO, "Try to empty hash: %s, loop: %u\n",
                        hs->hs_name, i++);
         }
@@ -1672,7 +1683,7 @@ cfs_hash_for_each_empty(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,
 EXPORT_SYMBOL(cfs_hash_for_each_empty);
 
 void
-cfs_hash_hlist_for_each(struct cfs_hash *hs, unsigned hindex,
+cfs_hash_hlist_for_each(struct cfs_hash *hs, unsigned int hindex,
                         cfs_hash_for_each_cb_t func, void *data)
 {
         struct hlist_head *hhead;
@@ -1704,7 +1715,7 @@ EXPORT_SYMBOL(cfs_hash_hlist_for_each);
  * the passed callback @func and pass to it as an argument each hash
  * item and the private @data. During the callback the bucket lock
  * is held so the callback must never sleep.
-   */
+ */
 void
 cfs_hash_for_each_key(struct cfs_hash *hs, const void *key,
                       cfs_hash_for_each_cb_t func, void *data)
@@ -1936,7 +1947,7 @@ out:
         /* can't refer to @hs anymore because it could be destroyed */
         if (bkts)
                 cfs_hash_buckets_free(bkts, bsize, new_size, old_size);
-        if (rc != 0)
+        if (rc)
                 CDEBUG(D_INFO, "early quit of rehashing: %d\n", rc);
         /* return 1 only if cfs_wi_exit is called */
         return rc == -ESRCH;
@@ -2005,7 +2016,7 @@ cfs_hash_full_bkts(struct cfs_hash *hs)
         if (!hs->hs_rehash_buckets)
                 return hs->hs_buckets;
 
-        LASSERT(hs->hs_rehash_bits != 0);
+        LASSERT(hs->hs_rehash_bits);
         return hs->hs_rehash_bits > hs->hs_cur_bits ?
                hs->hs_rehash_buckets : hs->hs_buckets;
 }
@@ -2017,7 +2028,7 @@ cfs_hash_full_nbkt(struct cfs_hash *hs)
         if (!hs->hs_rehash_buckets)
                 return CFS_HASH_NBKT(hs);
 
-        LASSERT(hs->hs_rehash_bits != 0);
+        LASSERT(hs->hs_rehash_bits);
         return hs->hs_rehash_bits > hs->hs_cur_bits ?
                CFS_HASH_RH_NBKT(hs) : CFS_HASH_NBKT(hs);
 }
diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
index 33352af6c27f..55caa19def51 100644
--- a/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
+++ b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
@@ -74,7 +74,7 @@ EXPORT_SYMBOL(cfs_cpt_table_free);
 int
 cfs_cpt_table_print(struct cfs_cpt_table *cptab, char *buf, int len)
 {
-        int     rc;
+        int rc;
 
         rc = snprintf(buf, len, "%d\t: %d\n", 0, 0);
         len -= rc;
diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_lock.c b/drivers/staging/lustre/lnet/libcfs/libcfs_lock.c
index 83543f928279..1967b97c4afc 100644
--- a/drivers/staging/lustre/lnet/libcfs/libcfs_lock.c
+++ b/drivers/staging/lustre/lnet/libcfs/libcfs_lock.c
@@ -52,9 +52,9 @@ struct cfs_percpt_lock *
 cfs_percpt_lock_create(struct cfs_cpt_table *cptab,
                        struct lock_class_key *keys)
 {
-        struct cfs_percpt_lock  *pcl;
-        spinlock_t              *lock;
-        int                     i;
+        struct cfs_percpt_lock *pcl;
+        spinlock_t *lock;
+        int i;
 
         /* NB: cptab can be NULL, pcl will be for HW CPUs on that case */
         LIBCFS_ALLOC(pcl, sizeof(*pcl));
@@ -73,7 +73,7 @@ cfs_percpt_lock_create(struct cfs_cpt_table *cptab,
 
         cfs_percpt_for_each(lock, i, pcl->pcl_locks) {
                 spin_lock_init(lock);
-                if (keys != NULL)
+                if (keys)
                         lockdep_set_class(lock, &keys[i]);
         }
 
@@ -94,8 +94,8 @@ void
 cfs_percpt_lock(struct cfs_percpt_lock *pcl, int index)
         __acquires(pcl->pcl_locks)
 {
-        int     ncpt = cfs_cpt_number(pcl->pcl_cptab);
-        int     i;
+        int ncpt = cfs_cpt_number(pcl->pcl_cptab);
+        int i;
 
         LASSERT(index >= CFS_PERCPT_LOCK_EX && index < ncpt);
 
@@ -114,7 +114,7 @@ cfs_percpt_lock(struct cfs_percpt_lock *pcl, int index)
         /* exclusive lock request */
         for (i = 0; i < ncpt; i++) {
                 spin_lock(pcl->pcl_locks[i]);
-                if (i == 0) {
+                if (!i) {
                         LASSERT(!pcl->pcl_locked);
                         /* nobody should take private lock after this
                          * so I wouldn't starve for too long time
@@ -130,8 +130,8 @@ void
 cfs_percpt_unlock(struct cfs_percpt_lock *pcl, int index)
         __releases(pcl->pcl_locks)
 {
-        int     ncpt = cfs_cpt_number(pcl->pcl_cptab);
-        int     i;
+        int ncpt = cfs_cpt_number(pcl->pcl_cptab);
+        int i;
 
         index = ncpt == 1 ? 0 : index;
 
@@ -141,7 +141,7 @@ cfs_percpt_unlock(struct cfs_percpt_lock *pcl, int index)
         }
 
         for (i = ncpt - 1; i >= 0; i--) {
-                if (i == 0) {
+                if (!i) {
                         LASSERT(pcl->pcl_locked);
                         pcl->pcl_locked = 0;
                 }
diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c b/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c
index d0e81bb41cdc..ef085ba23194 100644
--- a/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c
+++ b/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c
@@ -43,8 +43,8 @@ struct cfs_var_array {
 void
 cfs_percpt_free(void *vars)
 {
-        struct  cfs_var_array *arr;
-        int     i;
+        struct cfs_var_array *arr;
+        int i;
 
         arr = container_of(vars, struct cfs_var_array, va_ptrs[0]);
 
@@ -72,9 +72,9 @@ EXPORT_SYMBOL(cfs_percpt_free);
 void *
 cfs_percpt_alloc(struct cfs_cpt_table *cptab, unsigned int size)
 {
-        struct cfs_var_array    *arr;
-        int                     count;
-        int                     i;
+        struct cfs_var_array *arr;
+        int count;
+        int i;
 
         count = cfs_cpt_number(cptab);
 
@@ -120,8 +120,8 @@ EXPORT_SYMBOL(cfs_percpt_number);
 void
 cfs_array_free(void *vars)
 {
-        struct cfs_var_array    *arr;
-        int                     i;
+        struct cfs_var_array *arr;
+        int i;
 
         arr = container_of(vars, struct cfs_var_array, va_ptrs[0]);
 
@@ -144,15 +144,15 @@ EXPORT_SYMBOL(cfs_array_free);
 void *
 cfs_array_alloc(int count, unsigned int size)
 {
-        struct cfs_var_array    *arr;
-        int                     i;
+        struct cfs_var_array *arr;
+        int i;
 
         LIBCFS_ALLOC(arr, offsetof(struct cfs_var_array, va_ptrs[count]));
         if (!arr)
                 return NULL;
 
-        arr->va_count   = count;
-        arr->va_size    = size;
+        arr->va_count = count;
+        arr->va_size = size;
 
         for (i = 0; i < count; i++) {
                 LIBCFS_ALLOC(arr->va_ptrs[i], size);
diff --git a/drivers/staging/lustre/lnet/libcfs/libcfs_string.c b/drivers/staging/lustre/lnet/libcfs/libcfs_string.c
index 56a614d7713b..02de1ee720fd 100644
--- a/drivers/staging/lustre/lnet/libcfs/libcfs_string.c
+++ b/drivers/staging/lustre/lnet/libcfs/libcfs_string.c
@@ -79,7 +79,7 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit),
                 for (i = 0; i < 32; i++) {
                         debugstr = bit2str(i);
                         if (debugstr && strlen(debugstr) == len &&
-                            strncasecmp(str, debugstr, len) == 0) {
+                            !strncasecmp(str, debugstr, len)) {
                                 if (op == '-')
                                         newmask &= ~(1 << i);
                                 else
@@ -89,7 +89,7 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit),
                         }
                 }
                 if (!found && len == 3 &&
-                    (strncasecmp(str, "ALL", len) == 0)) {
+                    !strncasecmp(str, "ALL", len)) {
                         if (op == '-')
                                 newmask = minmask;
                         else
@@ -112,7 +112,7 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit),
 char *cfs_firststr(char *str, size_t size)
 {
         size_t i = 0;
-        char  *end;
+        char *end;
 
         /* trim leading spaces */
         while (i < size && *str && isspace(*str)) {
@@ -182,7 +182,7 @@ cfs_gettok(struct cfs_lstr *next, char delim, struct cfs_lstr *res)
                 next->ls_len--;
         }
 
-        if (next->ls_len == 0) /* whitespaces only */
+        if (!next->ls_len) /* whitespaces only */
                 return 0;
 
         if (*next->ls_str == delim) {
@@ -222,8 +222,8 @@ EXPORT_SYMBOL(cfs_gettok);
  * \retval 0 otherwise
  */
 int
-cfs_str2num_check(char *str, int nob, unsigned *num,
-                  unsigned min, unsigned max)
+cfs_str2num_check(char *str, int nob, unsigned int *num,
+                  unsigned int min, unsigned int max)
 {
         bool all_numbers = true;
         char *endp, cache;
@@ -273,11 +273,11 @@ EXPORT_SYMBOL(cfs_str2num_check);
  * -ENOMEM will be returned.
  */
 static int
-cfs_range_expr_parse(struct cfs_lstr *src, unsigned min, unsigned max,
+cfs_range_expr_parse(struct cfs_lstr *src, unsigned int min, unsigned int max,
                      int bracketed, struct cfs_range_expr **expr)
 {
-        struct cfs_range_expr   *re;
-        struct cfs_lstr         tok;
+        struct cfs_range_expr *re;
+        struct cfs_lstr tok;
 
         LIBCFS_ALLOC(re, sizeof(*re));
         if (!re)
@@ -391,7 +391,7 @@ cfs_expr_list_print(char *buffer, int count, struct cfs_expr_list *expr_list)
                 i += scnprintf(buffer + i, count - i, "[");
 
         list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
-                if (j++ != 0)
+                if (j++)
                         i += scnprintf(buffer + i, count - i, ",");
                 i += cfs_range_expr_print(buffer + i, count - i, expr,
                                           numexprs > 1);
@@ -411,13 +411,13 @@ EXPORT_SYMBOL(cfs_expr_list_print);
  * \retval 0 otherwise
  */
 int
-cfs_expr_list_match(__u32 value, struct cfs_expr_list *expr_list)
+cfs_expr_list_match(u32 value, struct cfs_expr_list *expr_list)
 {
-        struct cfs_range_expr   *expr;
+        struct cfs_range_expr *expr;
 
         list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
                 if (value >= expr->re_lo && value <= expr->re_hi &&
-                    ((value - expr->re_lo) % expr->re_stride) == 0)
+                    !((value - expr->re_lo) % expr->re_stride))
                         return 1;
         }
 
@@ -433,21 +433,21 @@ EXPORT_SYMBOL(cfs_expr_list_match);
  * \retval < 0 for failure
  */
 int
-cfs_expr_list_values(struct cfs_expr_list *expr_list, int max, __u32 **valpp)
+cfs_expr_list_values(struct cfs_expr_list *expr_list, int max, u32 **valpp)
 {
-        struct cfs_range_expr   *expr;
-        __u32                   *val;
-        int                     count = 0;
-        int                     i;
+        struct cfs_range_expr *expr;
+        u32 *val;
+        int count = 0;
+        int i;
 
         list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
                 for (i = expr->re_lo; i <= expr->re_hi; i++) {
-                        if (((i - expr->re_lo) % expr->re_stride) == 0)
+                        if (!((i - expr->re_lo) % expr->re_stride))
                                 count++;
                 }
         }
 
-        if (count == 0) /* empty expression list */
+        if (!count) /* empty expression list */
                 return 0;
 
         if (count > max) {
@@ -463,7 +463,7 @@ cfs_expr_list_values(struct cfs_expr_list *expr_list, int max, __u32 **valpp)
         count = 0;
         list_for_each_entry(expr, &expr_list->el_exprs, re_link) {
                 for (i = expr->re_lo; i <= expr->re_hi; i++) {
-                        if (((i - expr->re_lo) % expr->re_stride) == 0)
+                        if (!((i - expr->re_lo) % expr->re_stride))
                                 val[count++] = i;
                 }
         }
@@ -501,13 +501,13 @@ EXPORT_SYMBOL(cfs_expr_list_free);
  * \retval -errno otherwise
  */
 int
-cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max,
+cfs_expr_list_parse(char *str, int len, unsigned int min, unsigned int max,
                     struct cfs_expr_list **elpp)
 {
-        struct cfs_expr_list    *expr_list;
-        struct cfs_range_expr   *expr;
-        struct cfs_lstr         src;
-        int                     rc;
+        struct cfs_expr_list *expr_list;
+        struct cfs_range_expr *expr;
+        struct cfs_lstr src;
+        int rc;
 
         LIBCFS_ALLOC(expr_list, sizeof(*expr_list));
         if (!expr_list)
@@ -533,18 +533,18 @@ cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max,
                         }
 
                         rc = cfs_range_expr_parse(&tok, min, max, 1, &expr);
-                        if (rc != 0)
+                        if (rc)
                                 break;
 
                         list_add_tail(&expr->re_link, &expr_list->el_exprs);
                 }
         } else {
                 rc = cfs_range_expr_parse(&src, min, max, 0, &expr);
-                if (rc == 0)
+                if (!rc)
                         list_add_tail(&expr->re_link, &expr_list->el_exprs);
         }
 
-        if (rc != 0)
+        if (rc)
                 cfs_expr_list_free(expr_list);
         else
                 *elpp = expr_list;
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
index e8b1a61420de..6b9cf06e8df2 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
@@ -55,6 +55,8 @@ MODULE_PARM_DESC(cpu_npartitions, "# of CPU partitions");
  * i.e: "N 0[0,1] 1[2,3]" the first character 'N' means numbers in bracket
  *       are NUMA node ID, number before bracket is CPU partition ID.
  *
+ * i.e: "N", shortcut expression to create CPT from NUMA & CPU topology
+ *
  * NB: If user specified cpu_pattern, cpu_npartitions will be ignored
  */
 static char     *cpu_pattern = "";
@@ -88,7 +90,7 @@ cfs_node_to_cpumask(int node, cpumask_t *mask)
 void
 cfs_cpt_table_free(struct cfs_cpt_table *cptab)
 {
-        int     i;
+        int i;
 
         if (cptab->ctb_cpu2cpt) {
                 LIBCFS_FREE(cptab->ctb_cpu2cpt,
@@ -126,7 +128,7 @@ struct cfs_cpt_table *
 cfs_cpt_table_alloc(unsigned int ncpt)
 {
         struct cfs_cpt_table *cptab;
-        int     i;
+        int i;
 
         LIBCFS_ALLOC(cptab, sizeof(*cptab));
         if (!cptab)
@@ -177,10 +179,10 @@ EXPORT_SYMBOL(cfs_cpt_table_alloc);
 int
 cfs_cpt_table_print(struct cfs_cpt_table *cptab, char *buf, int len)
 {
-        char    *tmp = buf;
-        int     rc = 0;
-        int     i;
-        int     j;
+        char *tmp = buf;
+        int rc = 0;
+        int i;
+        int j;
 
         for (i = 0; i < cptab->ctb_nparts; i++) {
                 if (len > 0) {
@@ -271,7 +273,7 @@ EXPORT_SYMBOL(cfs_cpt_nodemask);
 int
 cfs_cpt_set_cpu(struct cfs_cpt_table *cptab, int cpt, int cpu)
 {
-        int     node;
+        int node;
 
         LASSERT(cpt >= 0 && cpt < cptab->ctb_nparts);
 
@@ -311,8 +313,8 @@ EXPORT_SYMBOL(cfs_cpt_set_cpu);
 void
 cfs_cpt_unset_cpu(struct cfs_cpt_table *cptab, int cpt, int cpu)
 {
-        int     node;
-        int     i;
+        int node;
+        int i;
 
         LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
 
@@ -371,9 +373,9 @@ EXPORT_SYMBOL(cfs_cpt_unset_cpu);
 int
 cfs_cpt_set_cpumask(struct cfs_cpt_table *cptab, int cpt, cpumask_t *mask)
 {
-        int     i;
+        int i;
 
-        if (cpumask_weight(mask) == 0 ||
+        if (!cpumask_weight(mask) ||
             cpumask_any_and(mask, cpu_online_mask) >= nr_cpu_ids) {
                 CDEBUG(D_INFO, "No online CPU is found in the CPU mask for CPU partition %d\n",
                        cpt);
@@ -392,7 +394,7 @@ EXPORT_SYMBOL(cfs_cpt_set_cpumask);
 void
 cfs_cpt_unset_cpumask(struct cfs_cpt_table *cptab, int cpt, cpumask_t *mask)
 {
-        int     i;
+        int i;
 
         for_each_cpu(i, mask)
                 cfs_cpt_unset_cpu(cptab, cpt, i);
@@ -402,8 +404,8 @@ EXPORT_SYMBOL(cfs_cpt_unset_cpumask);
 int
 cfs_cpt_set_node(struct cfs_cpt_table *cptab, int cpt, int node)
 {
-        cpumask_t       *mask;
-        int             rc;
+        cpumask_t *mask;
+        int rc;
 
         if (node < 0 || node >= MAX_NUMNODES) {
                 CDEBUG(D_INFO,
@@ -449,7 +451,7 @@ EXPORT_SYMBOL(cfs_cpt_unset_node);
 int
 cfs_cpt_set_nodemask(struct cfs_cpt_table *cptab, int cpt, nodemask_t *mask)
 {
-        int     i;
+        int i;
 
         for_each_node_mask(i, *mask) {
                 if (!cfs_cpt_set_node(cptab, cpt, i))
@@ -463,7 +465,7 @@ EXPORT_SYMBOL(cfs_cpt_set_nodemask);
 void
 cfs_cpt_unset_nodemask(struct cfs_cpt_table *cptab, int cpt, nodemask_t *mask)
 {
-        int     i;
+        int i;
 
         for_each_node_mask(i, *mask)
                 cfs_cpt_unset_node(cptab, cpt, i);
@@ -473,8 +475,8 @@ EXPORT_SYMBOL(cfs_cpt_unset_nodemask);
 void
 cfs_cpt_clear(struct cfs_cpt_table *cptab, int cpt)
 {
-        int     last;
-        int     i;
+        int last;
+        int i;
 
         if (cpt == CFS_CPT_ANY) {
                 last = cptab->ctb_nparts - 1;
@@ -493,10 +495,10 @@ EXPORT_SYMBOL(cfs_cpt_clear);
 int
 cfs_cpt_spread_node(struct cfs_cpt_table *cptab, int cpt)
 {
-        nodemask_t      *mask;
-        int             weight;
-        int             rotor;
-        int             node;
+        nodemask_t *mask;
+        int weight;
+        int rotor;
+        int node;
 
         /* convert CPU partition ID to HW node id */
 
@@ -514,7 +516,7 @@ cfs_cpt_spread_node(struct cfs_cpt_table *cptab, int cpt)
         rotor %= weight;
 
         for_each_node_mask(node, *mask) {
-                if (rotor-- == 0)
+                if (!rotor--)
                         return node;
         }
 
@@ -526,8 +528,8 @@ EXPORT_SYMBOL(cfs_cpt_spread_node);
 int
 cfs_cpt_current(struct cfs_cpt_table *cptab, int remap)
 {
-        int     cpu = smp_processor_id();
-        int     cpt = cptab->ctb_cpu2cpt[cpu];
+        int cpu = smp_processor_id();
+        int cpt = cptab->ctb_cpu2cpt[cpu];
 
         if (cpt < 0) {
                 if (!remap)
@@ -555,10 +557,10 @@ EXPORT_SYMBOL(cfs_cpt_of_cpu);
 int
 cfs_cpt_bind(struct cfs_cpt_table *cptab, int cpt)
 {
-        cpumask_t       *cpumask;
-        nodemask_t      *nodemask;
-        int             rc;
-        int             i;
+        cpumask_t *cpumask;
+        nodemask_t *nodemask;
+        int rc;
+        int i;
 
         LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
 
@@ -582,7 +584,7 @@ cfs_cpt_bind(struct cfs_cpt_table *cptab, int cpt)
 
                 rc = set_cpus_allowed_ptr(current, cpumask);
                 set_mems_allowed(*nodemask);
-                if (rc == 0)
+                if (!rc)
                         schedule(); /* switch to allowed CPU */
 
                 return rc;
@@ -601,10 +603,10 @@ static int
 cfs_cpt_choose_ncpus(struct cfs_cpt_table *cptab, int cpt,
                      cpumask_t *node, int number)
 {
-        cpumask_t       *socket = NULL;
-        cpumask_t       *core = NULL;
-        int             rc = 0;
-        int             cpu;
+        cpumask_t *socket = NULL;
+        cpumask_t *core = NULL;
+        int rc = 0;
+        int cpu;
 
         LASSERT(number > 0);
 
@@ -638,7 +640,7 @@ cfs_cpt_choose_ncpus(struct cfs_cpt_table *cptab, int cpt,
                 LASSERT(!cpumask_empty(socket));
 
                 while (!cpumask_empty(socket)) {
-                        int     i;
+                        int i;
 
                         /* get cpumask for hts in the same core */
                         cpumask_copy(core, topology_sibling_cpumask(cpu));
@@ -656,14 +658,14 @@ cfs_cpt_choose_ncpus(struct cfs_cpt_table *cptab, int cpt,
                                         goto out;
                                 }
 
-                                if (--number == 0)
+                                if (!--number)
                                         goto out;
                         }
                         cpu = cpumask_first(socket);
                 }
         }
 
- out:
+out:
         if (socket)
                 LIBCFS_FREE(socket, cpumask_size());
         if (core)
@@ -676,9 +678,9 @@ cfs_cpt_choose_ncpus(struct cfs_cpt_table *cptab, int cpt,
 static unsigned int
 cfs_cpt_num_estimate(void)
 {
-        unsigned nnode = num_online_nodes();
-        unsigned ncpu  = num_online_cpus();
-        unsigned ncpt;
+        unsigned int nnode = num_online_nodes();
+        unsigned int ncpu = num_online_cpus();
+        unsigned int ncpt;
 
         if (ncpu <= CPT_WEIGHT_MIN) {
                 ncpt = 1;
@@ -703,14 +705,14 @@ cfs_cpt_num_estimate(void)
 
         ncpt = nnode;
 
- out:
+out:
 #if (BITS_PER_LONG == 32)
         /* config many CPU partitions on 32-bit system could consume
          * too much memory
          */
         ncpt = min(2U, ncpt);
 #endif
-        while (ncpu % ncpt != 0)
+        while (ncpu % ncpt)
                 ncpt--; /* worst case is 1 */
 
         return ncpt;
@@ -720,11 +722,11 @@ static struct cfs_cpt_table *
 cfs_cpt_table_create(int ncpt)
 {
         struct cfs_cpt_table *cptab = NULL;
-        cpumask_t       *mask = NULL;
-        int             cpt = 0;
-        int             num;
-        int             rc;
-        int             i;
+        cpumask_t *mask = NULL;
+        int cpt = 0;
+        int num;
+        int rc;
+        int i;
 
         rc = cfs_cpt_num_estimate();
         if (ncpt <= 0)
@@ -735,7 +737,7 @@ cfs_cpt_table_create(int ncpt)
                       ncpt, rc);
         }
 
-        if (num_online_cpus() % ncpt != 0) {
+        if (num_online_cpus() % ncpt) {
                 CERROR("CPU number %d is not multiple of cpu_npartition %d, please try different cpu_npartitions value or set pattern string by cpu_pattern=STRING\n",
                        (int)num_online_cpus(), ncpt);
                 goto failed;
@@ -748,7 +750,7 @@ cfs_cpt_table_create(int ncpt)
         }
 
         num = num_online_cpus() / ncpt;
-        if (num == 0) {
+        if (!num) {
                 CERROR("CPU changed while setting CPU partition\n");
                 goto failed;
         }
@@ -764,7 +766,7 @@ cfs_cpt_table_create(int ncpt)
 
                 while (!cpumask_empty(mask)) {
                         struct cfs_cpu_partition *part;
-                        int    n;
+                        int n;
 
                         /*
                          * Each emulated NUMA node has all allowed CPUs in
@@ -817,27 +819,36 @@ cfs_cpt_table_create(int ncpt)
 static struct cfs_cpt_table *
 cfs_cpt_table_create_pattern(char *pattern)
 {
-        struct cfs_cpt_table    *cptab;
-        char                    *str    = pattern;
-        int                     node    = 0;
-        int                     high;
-        int                     ncpt;
-        int                     c;
-
-        for (ncpt = 0;; ncpt++) { /* quick scan bracket */
-                str = strchr(str, '[');
-                if (!str)
-                        break;
-                str++;
-        }
+        struct cfs_cpt_table *cptab;
+        char *str;
+        int node = 0;
+        int high;
+        int ncpt = 0;
+        int cpt;
+        int rc;
+        int c;
+        int i;
 
         str = cfs_trimwhite(pattern);
         if (*str == 'n' || *str == 'N') {
                 pattern = str + 1;
-                node = 1;
+                if (*pattern != '\0') {
+                        node = 1;
+                } else { /* shortcut to create CPT from NUMA & CPU topology */
+                        node = -1;
+                        ncpt = num_online_nodes();
+                }
+        }
+
+        if (!ncpt) { /* scanning bracket which is mark of partition */
+                for (str = pattern;; str++, ncpt++) {
+                        str = strchr(str, '[');
+                        if (!str)
+                                break;
+                }
         }
 
-        if (ncpt == 0 ||
+        if (!ncpt ||
             (node && ncpt > num_online_nodes()) ||
             (!node && ncpt > num_online_cpus())) {
                 CERROR("Invalid pattern %s, or too many partitions %d\n",
@@ -845,25 +856,39 @@ cfs_cpt_table_create_pattern(char *pattern)
                 return NULL;
         }
 
-        high = node ? MAX_NUMNODES - 1 : nr_cpu_ids - 1;
-
         cptab = cfs_cpt_table_alloc(ncpt);
         if (!cptab) {
                 CERROR("Failed to allocate cpu partition table\n");
                 return NULL;
         }
 
+        if (node < 0) { /* shortcut to create CPT from NUMA & CPU topology */
+                cpt = 0;
+
+                for_each_online_node(i) {
+                        if (cpt >= ncpt) {
+                                CERROR("CPU changed while setting CPU partition table, %d/%d\n",
+                                       cpt, ncpt);
+                                goto failed;
+                        }
+
+                        rc = cfs_cpt_set_node(cptab, cpt++, i);
+                        if (!rc)
+                                goto failed;
+                }
+                return cptab;
+        }
+
+        high = node ? MAX_NUMNODES - 1 : nr_cpu_ids - 1;
+
         for (str = cfs_trimwhite(pattern), c = 0;; c++) {
-                struct cfs_range_expr   *range;
-                struct cfs_expr_list    *el;
-                char                    *bracket = strchr(str, '[');
-                int                     cpt;
-                int                     rc;
-                int                     i;
-                int                     n;
+                struct cfs_range_expr *range;
+                struct cfs_expr_list *el;
+                char *bracket = strchr(str, '[');
+                int n;
 
                 if (!bracket) {
-                        if (*str != 0) {
+                        if (*str) {
                                 CERROR("Invalid pattern %s\n", str);
                                 goto failed;
                         }
@@ -886,7 +911,7 @@ cfs_cpt_table_create_pattern(char *pattern)
                         goto failed;
                 }
 
-                if (cfs_cpt_weight(cptab, cpt) != 0) {
+                if (cfs_cpt_weight(cptab, cpt)) {
                         CERROR("Partition %d has already been set.\n", cpt);
                         goto failed;
                 }
@@ -905,14 +930,14 @@ cfs_cpt_table_create_pattern(char *pattern)
                 }
 
                 if (cfs_expr_list_parse(str, (bracket - str) + 1,
-                                        0, high, &el) != 0) {
+                                        0, high, &el)) {
                         CERROR("Can't parse number range: %s\n", str);
                         goto failed;
                 }
 
                 list_for_each_entry(range, &el->el_exprs, re_link) {
                         for (i = range->re_lo; i <= range->re_hi; i++) {
-                                if ((i - range->re_lo) % range->re_stride != 0)
+                                if ((i - range->re_lo) % range->re_stride)
                                         continue;
 
                                 rc = node ? cfs_cpt_set_node(cptab, cpt, i) :
@@ -945,8 +970,8 @@ cfs_cpt_table_create_pattern(char *pattern)
 static int
 cfs_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu)
 {
-        unsigned int  cpu = (unsigned long)hcpu;
-        bool         warn;
+        unsigned int cpu = (unsigned long)hcpu;
+        bool warn;
 
         switch (action) {
         case CPU_DEAD:
@@ -1019,7 +1044,7 @@ cfs_cpu_init(void)
         register_hotcpu_notifier(&cfs_cpu_notifier);
 #endif
 
-        if (*cpu_pattern != 0) {
+        if (*cpu_pattern) {
                 cfs_cpt_table = cfs_cpt_table_create_pattern(cpu_pattern);
                 if (!cfs_cpt_table) {
                         CERROR("Failed to create cptab from pattern %s\n",
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
index 7f56d2c9dd00..68e34b4a76c9 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
@@ -64,7 +64,7 @@ static int cfs_crypto_hash_alloc(enum cfs_crypto_hash_alg hash_alg,
                                  unsigned int key_len)
 {
         struct crypto_ahash *tfm;
-        int     err = 0;
+        int err = 0;
 
         *type = cfs_crypto_hash_type(hash_alg);
 
@@ -93,12 +93,12 @@ static int cfs_crypto_hash_alloc(enum cfs_crypto_hash_alg hash_alg,
 
         if (key)
                 err = crypto_ahash_setkey(tfm, key, key_len);
-        else if ((*type)->cht_key != 0)
+        else if ((*type)->cht_key)
                 err = crypto_ahash_setkey(tfm,
                                           (unsigned char *)&((*type)->cht_key),
                                           (*type)->cht_size);
 
-        if (err != 0) {
+        if (err) {
                 ahash_request_free(*req);
                 crypto_free_ahash(tfm);
                 return err;
@@ -147,16 +147,16 @@ int cfs_crypto_hash_digest(enum cfs_crypto_hash_alg hash_alg,
                            unsigned char *key, unsigned int key_len,
                            unsigned char *hash, unsigned int *hash_len)
 {
-        struct scatterlist      sl;
+        struct scatterlist sl;
         struct ahash_request *req;
-        int                     err;
-        const struct cfs_crypto_hash_type       *type;
+        int err;
+        const struct cfs_crypto_hash_type *type;
 
-        if (!buf || buf_len == 0 || !hash_len)
+        if (!buf || !buf_len || !hash_len)
                 return -EINVAL;
 
         err = cfs_crypto_hash_alloc(hash_alg, &type, &req, key, key_len);
-        if (err != 0)
+        if (err)
                 return err;
 
         if (!hash || *hash_len < type->cht_size) {
@@ -177,7 +177,7 @@ int cfs_crypto_hash_digest(enum cfs_crypto_hash_alg hash_alg,
 EXPORT_SYMBOL(cfs_crypto_hash_digest);
 
 /**
- * Allocate and initialize desriptor for hash algorithm.
+ * Allocate and initialize descriptor for hash algorithm.
  *
  * This should be used to initialize a hash descriptor for multiple calls
  * to a single hash function when computing the hash across multiple
@@ -198,8 +198,8 @@ cfs_crypto_hash_init(enum cfs_crypto_hash_alg hash_alg,
                      unsigned char *key, unsigned int key_len)
 {
         struct ahash_request *req;
-        int                  err;
-        const struct cfs_crypto_hash_type       *type;
+        int err;
+        const struct cfs_crypto_hash_type *type;
 
         err = cfs_crypto_hash_alloc(hash_alg, &type, &req, key, key_len);
 
@@ -273,7 +273,7 @@ EXPORT_SYMBOL(cfs_crypto_hash_update);
 int cfs_crypto_hash_final(struct cfs_crypto_hash_desc *hdesc,
                           unsigned char *hash, unsigned int *hash_len)
 {
-        int     err;
+        int err;
         struct ahash_request *req = (void *)hdesc;
         int size = crypto_ahash_digestsize(crypto_ahash_reqtfm(req));
 
@@ -312,8 +312,8 @@ static void cfs_crypto_performance_test(enum cfs_crypto_hash_alg hash_alg)
 {
         int buf_len = max(PAGE_SIZE, 1048576UL);
         void *buf;
-        unsigned long              start, end;
-        int                          bcount, err = 0;
+        unsigned long start, end;
+        int bcount, err = 0;
         struct page *page;
         unsigned char hash[CFS_CRYPTO_HASH_DIGESTSIZE_MAX];
         unsigned int hash_len = sizeof(hash);
@@ -358,7 +358,7 @@ out_err:
                 CDEBUG(D_INFO, "Crypto hash algorithm %s test error: rc = %d\n",
                        cfs_crypto_hash_name(hash_alg), err);
         } else {
-                unsigned long   tmp;
+                unsigned long tmp;
 
                 tmp = ((bcount * buf_len / jiffies_to_msecs(end - start)) *
                        1000) / (1024 * 1024);
@@ -440,6 +440,6 @@ int cfs_crypto_register(void)
  */
 void cfs_crypto_unregister(void)
 {
-        if (adler32 == 0)
+        if (!adler32)
                 cfs_crypto_adler32_unregister();
 }
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h
index 18e8cd4d8758..d0b3aa80cfa6 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h
@@ -1,4 +1,4 @@
- /*
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c
index 435b784c52f8..39a72e3f0c18 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c
@@ -57,7 +57,6 @@
 
 #include <linux/kallsyms.h>
 
-char lnet_upcall[1024] = "/usr/lib/lustre/lnet_upcall";
 char lnet_debug_log_upcall[1024] = "/usr/lib/lustre/lnet_debug_log_upcall";
 
 /**
@@ -68,11 +67,12 @@ char lnet_debug_log_upcall[1024] = "/usr/lib/lustre/lnet_debug_log_upcall";
 void libcfs_run_debug_log_upcall(char *file)
 {
         char *argv[3];
-        int   rc;
-        char *envp[] = {
+        int rc;
+        static const char * const envp[] = {
                 "HOME=/",
                 "PATH=/sbin:/bin:/usr/sbin:/usr/bin",
-                NULL};
+                NULL
+        };
 
         argv[0] = lnet_debug_log_upcall;
 
@@ -81,7 +81,7 @@ void libcfs_run_debug_log_upcall(char *file)
 
         argv[2] = NULL;
 
-        rc = call_usermodehelper(argv[0], argv, envp, 1);
+        rc = call_usermodehelper(argv[0], argv, (char **)envp, 1);
         if (rc < 0 && rc != -ENOENT) {
                 CERROR("Error %d invoking LNET debug log upcall %s %s; check /sys/kernel/debug/lnet/debug_log_upcall\n",
                        rc, argv[0], argv[1]);
@@ -91,57 +91,6 @@ void libcfs_run_debug_log_upcall(char *file)
         }
 }
 
-void libcfs_run_upcall(char **argv)
-{
-        int   rc;
-        int   argc;
-        char *envp[] = {
-                "HOME=/",
-                "PATH=/sbin:/bin:/usr/sbin:/usr/bin",
-                NULL};
-
-        argv[0] = lnet_upcall;
-        argc = 1;
-        while (argv[argc])
-                argc++;
-
-        LASSERT(argc >= 2);
-
-        rc = call_usermodehelper(argv[0], argv, envp, 1);
-        if (rc < 0 && rc != -ENOENT) {
-                CERROR("Error %d invoking LNET upcall %s %s%s%s%s%s%s%s%s; check /sys/kernel/debug/lnet/upcall\n",
-                       rc, argv[0], argv[1],
-                       argc < 3 ? "" : ",", argc < 3 ? "" : argv[2],
-                       argc < 4 ? "" : ",", argc < 4 ? "" : argv[3],
-                       argc < 5 ? "" : ",", argc < 5 ? "" : argv[4],
-                       argc < 6 ? "" : ",...");
-        } else {
-                CDEBUG(D_HA, "Invoked LNET upcall %s %s%s%s%s%s%s%s%s\n",
-                       argv[0], argv[1],
-                       argc < 3 ? "" : ",", argc < 3 ? "" : argv[2],
-                       argc < 4 ? "" : ",", argc < 4 ? "" : argv[3],
-                       argc < 5 ? "" : ",", argc < 5 ? "" : argv[4],
-                       argc < 6 ? "" : ",...");
-        }
-}
-
-void libcfs_run_lbug_upcall(struct libcfs_debug_msg_data *msgdata)
-{
-        char *argv[6];
-        char buf[32];
-
-        snprintf(buf, sizeof(buf), "%d", msgdata->msg_line);
-
-        argv[1] = "LBUG";
-        argv[2] = (char *)msgdata->msg_file;
-        argv[3] = (char *)msgdata->msg_fn;
-        argv[4] = buf;
-        argv[5] = NULL;
-
-        libcfs_run_upcall(argv);
-}
-EXPORT_SYMBOL(libcfs_run_lbug_upcall);
-
 /* coverity[+kill] */
 void __noreturn lbug_with_loc(struct libcfs_debug_msg_data *msgdata)
 {
@@ -156,7 +105,6 @@ void __noreturn lbug_with_loc(struct libcfs_debug_msg_data *msgdata)
         dump_stack();
         if (!libcfs_panic_on_lbug)
                 libcfs_debug_dumplog();
-        libcfs_run_lbug_upcall(msgdata);
         if (libcfs_panic_on_lbug)
                 panic("LBUG");
         set_task_state(current, TASK_UNINTERRUPTIBLE);
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
index 38308f8b6aae..3f5d58babc2f 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
@@ -83,7 +83,7 @@ static inline bool libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data)
                 CERROR("LIBCFS ioctl: plen2 nonzero but no pbuf2 pointer\n");
                 return true;
         }
-        if ((__u32)libcfs_ioctl_packlen(data) != data->ioc_hdr.ioc_len) {
+        if ((u32)libcfs_ioctl_packlen(data) != data->ioc_hdr.ioc_len) {
                 CERROR("LIBCFS ioctl: packlen != ioc_len\n");
                 return true;
         }
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
index 291d286eab48..cf902154f0aa 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
@@ -45,8 +45,8 @@
 sigset_t
 cfs_block_allsigs(void)
 {
-        unsigned long     flags;
-        sigset_t        old;
+        unsigned long flags;
+        sigset_t old;
 
         spin_lock_irqsave(&current->sighand->siglock, flags);
         old = current->blocked;
@@ -60,8 +60,8 @@ EXPORT_SYMBOL(cfs_block_allsigs);
 
 sigset_t cfs_block_sigs(unsigned long sigs)
 {
-        unsigned long  flags;
-        sigset_t        old;
+        unsigned long flags;
+        sigset_t old;
 
         spin_lock_irqsave(&current->sighand->siglock, flags);
         old = current->blocked;
@@ -91,7 +91,7 @@ EXPORT_SYMBOL(cfs_block_sigsinv);
 void
 cfs_restore_sigs(sigset_t old)
 {
-        unsigned long  flags;
+        unsigned long flags;
 
         spin_lock_irqsave(&current->sighand->siglock, flags);
         current->blocked = old;
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c
index 8b551d2708ba..75eb84e7f0f8 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c
@@ -49,8 +49,8 @@ static DECLARE_RWSEM(cfs_tracefile_sem);
 
 int cfs_tracefile_init_arch(void)
 {
-        int    i;
-        int    j;
+        int i;
+        int j;
         struct cfs_trace_cpu_data *tcd;
 
         /* initialize trace_data */
@@ -85,14 +85,14 @@ int cfs_tracefile_init_arch(void)
 
 out:
         cfs_tracefile_fini_arch();
-        printk(KERN_ERR "lnet: Not enough memory\n");
+        pr_err("lnet: Not enough memory\n");
         return -ENOMEM;
 }
 
 void cfs_tracefile_fini_arch(void)
 {
-        int    i;
-        int    j;
+        int i;
+        int j;
 
         for (i = 0; i < num_possible_cpus(); i++)
                 for (j = 0; j < 3; j++) {
@@ -224,26 +224,26 @@ void cfs_print_to_console(struct ptldebug_header *hdr, int mask,
 {
         char *prefix = "Lustre", *ptype = NULL;
 
-        if ((mask & D_EMERG) != 0) {
+        if (mask & D_EMERG) {
                 prefix = dbghdr_to_err_string(hdr);
                 ptype = KERN_EMERG;
-        } else if ((mask & D_ERROR) != 0) {
+        } else if (mask & D_ERROR) {
                 prefix = dbghdr_to_err_string(hdr);
                 ptype = KERN_ERR;
-        } else if ((mask & D_WARNING) != 0) {
+        } else if (mask & D_WARNING) {
                 prefix = dbghdr_to_info_string(hdr);
                 ptype = KERN_WARNING;
-        } else if ((mask & (D_CONSOLE | libcfs_printk)) != 0) {
+        } else if (mask & (D_CONSOLE | libcfs_printk)) {
                 prefix = dbghdr_to_info_string(hdr);
                 ptype = KERN_INFO;
         }
 
-        if ((mask & D_CONSOLE) != 0) {
-                printk("%s%s: %.*s", ptype, prefix, len, buf);
+        if (mask & D_CONSOLE) {
+                pr_info("%s%s: %.*s", ptype, prefix, len, buf);
         } else {
-                printk("%s%s: %d:%d:(%s:%d:%s()) %.*s", ptype, prefix,
-                       hdr->ph_pid, hdr->ph_extern_pid, file, hdr->ph_line_num,
-                       fn, len, buf);
+                pr_info("%s%s: %d:%d:(%s:%d:%s()) %.*s", ptype, prefix,
+                        hdr->ph_pid, hdr->ph_extern_pid, file,
+                        hdr->ph_line_num, fn, len, buf);
         }
 }
 
diff --git a/drivers/staging/lustre/lnet/libcfs/module.c b/drivers/staging/lustre/lnet/libcfs/module.c
index 86b4d25cad46..161e04226521 100644
--- a/drivers/staging/lustre/lnet/libcfs/module.c
+++ b/drivers/staging/lustre/lnet/libcfs/module.c
@@ -183,12 +183,12 @@ EXPORT_SYMBOL(lprocfs_call_handler);
 static int __proc_dobitmasks(void *data, int write,
                              loff_t pos, void __user *buffer, int nob)
 {
-        const int     tmpstrlen = 512;
-        char     *tmpstr;
-        int        rc;
+        const int tmpstrlen = 512;
+        char *tmpstr;
+        int rc;
         unsigned int *mask = data;
-        int        is_subsys = (mask == &libcfs_subsystem_debug) ? 1 : 0;
-        int        is_printk = (mask == &libcfs_printk) ? 1 : 0;
+        int is_subsys = (mask == &libcfs_subsystem_debug) ? 1 : 0;
+        int is_printk = (mask == &libcfs_printk) ? 1 : 0;
 
         rc = cfs_trace_allocate_string_buffer(&tmpstr, tmpstrlen);
         if (rc < 0)
@@ -293,8 +293,8 @@ static int __proc_cpt_table(void *data, int write,
                             loff_t pos, void __user *buffer, int nob)
 {
         char *buf = NULL;
-        int   len = 4096;
-        int   rc  = 0;
+        int len = 4096;
+        int rc  = 0;
 
         if (write)
                 return -EPERM;
@@ -365,14 +365,6 @@ static struct ctl_table lnet_table[] = {
                 .mode     = 0444,
                 .proc_handler = &proc_cpt_table,
         },
-
-        {
-                .procname = "upcall",
-                .data     = lnet_upcall,
-                .maxlen   = sizeof(lnet_upcall),
-                .mode     = 0644,
-                .proc_handler = &proc_dostring,
-        },
         {
                 .procname = "debug_log_upcall",
                 .data     = lnet_debug_log_upcall,
@@ -547,7 +539,7 @@ static int libcfs_init(void)
         }
 
         rc = cfs_cpu_init();
-        if (rc != 0)
+        if (rc)
                 goto cleanup_debug;
 
         rc = misc_register(&libcfs_dev);
@@ -566,7 +558,7 @@ static int libcfs_init(void)
         rc = min(cfs_cpt_weight(cfs_cpt_table, CFS_CPT_ANY), 4);
         rc = cfs_wi_sched_create("cfs_rh", cfs_cpt_table, CFS_CPT_ANY,
                                  rc, &cfs_sched_rehash);
-        if (rc != 0) {
+        if (rc) {
                 CERROR("Startup workitem scheduler: error: %d\n", rc);
                 goto cleanup_deregister;
         }
diff --git a/drivers/staging/lustre/lnet/libcfs/prng.c b/drivers/staging/lustre/lnet/libcfs/prng.c
index a9bdb284fd15..21d5a3912c5f 100644
--- a/drivers/staging/lustre/lnet/libcfs/prng.c
+++ b/drivers/staging/lustre/lnet/libcfs/prng.c
@@ -33,7 +33,7 @@
  * x(n)=a*x(n-1)+carry mod 2^16 and y(n)=b*y(n-1)+carry mod 2^16,
  * number and carry packed within the same 32 bit integer.
  * algorithm recommended by Marsaglia
-*/
+ */
 
 #include "../../include/linux/libcfs/libcfs.h"
 
diff --git a/drivers/staging/lustre/lnet/libcfs/tracefile.c b/drivers/staging/lustre/lnet/libcfs/tracefile.c
index 1c7efdfaffcf..d7b29f8997c0 100644
--- a/drivers/staging/lustre/lnet/libcfs/tracefile.c
+++ b/drivers/staging/lustre/lnet/libcfs/tracefile.c
@@ -59,13 +59,13 @@ struct page_collection {
          * ->tcd_daemon_pages and ->tcd_pages to the ->pc_pages. Otherwise,
          * only ->tcd_pages are spilled.
          */
-        int             pc_want_daemon_pages;
+        int                     pc_want_daemon_pages;
 };
 
 struct tracefiled_ctl {
         struct completion       tctl_start;
         struct completion       tctl_stop;
-        wait_queue_head_t               tctl_waitq;
+        wait_queue_head_t       tctl_waitq;
         pid_t                   tctl_pid;
         atomic_t                tctl_shutdown;
 };
@@ -77,24 +77,24 @@ struct cfs_trace_page {
         /*
          * page itself
          */
-        struct page       *page;
+        struct page             *page;
         /*
          * linkage into one of the lists in trace_data_union or
          * page_collection
          */
-        struct list_head           linkage;
+        struct list_head        linkage;
         /*
          * number of bytes used within this page
          */
-        unsigned int     used;
+        unsigned int            used;
         /*
          * cpu that owns this page
          */
-        unsigned short       cpu;
+        unsigned short          cpu;
         /*
          * type(context) of this page
          */
-        unsigned short       type;
+        unsigned short          type;
 };
 
 static void put_pages_on_tcd_daemon_list(struct page_collection *pc,
@@ -108,7 +108,7 @@ cfs_tage_from_list(struct list_head *list)
 
 static struct cfs_trace_page *cfs_tage_alloc(gfp_t gfp)
 {
-        struct page         *page;
+        struct page *page;
         struct cfs_trace_page *tage;
 
         /* My caller is trying to free memory */
@@ -236,7 +236,7 @@ static void cfs_tcd_shrink(struct cfs_trace_cpu_data *tcd)
         INIT_LIST_HEAD(&pc.pc_pages);
 
         list_for_each_entry_safe(tage, tmp, &tcd->tcd_pages, linkage) {
-                if (pgcount-- == 0)
+                if (!pgcount--)
                         break;
 
                 list_move_tail(&tage->linkage, &pc.pc_pages);
@@ -278,7 +278,7 @@ int libcfs_debug_msg(struct libcfs_debug_msg_data *msgdata,
                      const char *format, ...)
 {
         va_list args;
-        int     rc;
+        int rc;
 
         va_start(args, format);
         rc = libcfs_debug_vmsg2(msgdata, format, args, NULL);
@@ -293,21 +293,21 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
                        const char *format2, ...)
 {
         struct cfs_trace_cpu_data *tcd = NULL;
-        struct ptldebug_header     header = {0};
-        struct cfs_trace_page     *tage;
+        struct ptldebug_header header = { 0 };
+        struct cfs_trace_page *tage;
         /* string_buf is used only if tcd != NULL, and is always set then */
-        char                  *string_buf = NULL;
-        char                  *debug_buf;
-        int                     known_size;
-        int                     needed = 85; /* average message length */
-        int                     max_nob;
-        va_list             ap;
-        int                     depth;
-        int                     i;
-        int                     remain;
-        int                     mask = msgdata->msg_mask;
-        const char              *file = kbasename(msgdata->msg_file);
-        struct cfs_debug_limit_state   *cdls = msgdata->msg_cdls;
+        char *string_buf = NULL;
+        char *debug_buf;
+        int known_size;
+        int needed = 85; /* average message length */
+        int max_nob;
+        va_list ap;
+        int depth;
+        int i;
+        int remain;
+        int mask = msgdata->msg_mask;
+        const char *file = kbasename(msgdata->msg_file);
+        struct cfs_debug_limit_state *cdls = msgdata->msg_cdls;
 
         tcd = cfs_trace_get_tcd();
 
@@ -320,7 +320,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
         if (!tcd)               /* arch may not log in IRQ context */
                 goto console;
 
-        if (tcd->tcd_cur_pages == 0)
+        if (!tcd->tcd_cur_pages)
                 header.ph_flags |= PH_FLAG_FIRST_RECORD;
 
         if (tcd->tcd_shutting_down) {
@@ -423,7 +423,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
         __LASSERT(tage->used <= PAGE_SIZE);
 
 console:
-        if ((mask & libcfs_printk) == 0) {
+        if (!(mask & libcfs_printk)) {
                 /* no console output requested */
                 if (tcd)
                         cfs_trace_put_tcd(tcd);
@@ -432,7 +432,7 @@ console:
 
         if (cdls) {
                 if (libcfs_console_ratelimit &&
-                    cdls->cdls_next != 0 &&     /* not first time ever */
+                    cdls->cdls_next &&          /* not first time ever */
                     !cfs_time_after(cfs_time_current(), cdls->cdls_next)) {
                         /* skipping a console message */
                         cdls->cdls_count++;
@@ -489,7 +489,7 @@ console:
                 put_cpu();
         }
 
-        if (cdls && cdls->cdls_count != 0) {
+        if (cdls && cdls->cdls_count) {
                 string_buf = cfs_trace_get_console_buffer();
 
                 needed = snprintf(string_buf, CFS_TRACE_CONSOLE_BUFFER_SIZE,
@@ -535,9 +535,9 @@ panic_collect_pages(struct page_collection *pc)
          * CPUs have been stopped during a panic.  If this isn't true for some
          * arch, this will have to be implemented separately in each arch.
          */
-        int                     i;
-        int                     j;
         struct cfs_trace_cpu_data *tcd;
+        int i;
+        int j;
 
         INIT_LIST_HEAD(&pc->pc_pages);
 
@@ -698,11 +698,11 @@ void cfs_trace_debug_print(void)
 
 int cfs_tracefile_dump_all_pages(char *filename)
 {
-        struct page_collection  pc;
-        struct file             *filp;
-        struct cfs_trace_page   *tage;
-        struct cfs_trace_page   *tmp;
-        char                    *buf;
+        struct page_collection pc;
+        struct file *filp;
+        struct cfs_trace_page *tage;
+        struct cfs_trace_page *tmp;
+        char *buf;
         mm_segment_t __oldfs;
         int rc;
 
@@ -778,7 +778,7 @@ void cfs_trace_flush_pages(void)
 int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob,
                             const char __user *usr_buffer, int usr_buffer_nob)
 {
-        int    nob;
+        int nob;
 
         if (usr_buffer_nob > knl_buffer_nob)
                 return -EOVERFLOW;
@@ -810,7 +810,7 @@ int cfs_trace_copyout_string(char __user *usr_buffer, int usr_buffer_nob,
          * NB if 'append' != NULL, it's a single character to append to the
          * copied out string - usually "\n" or "" (i.e. a terminating zero byte)
          */
-        int   nob = strlen(knl_buffer);
+        int nob = strlen(knl_buffer);
 
         if (nob > usr_buffer_nob)
                 nob = usr_buffer_nob;
@@ -843,16 +843,16 @@ int cfs_trace_allocate_string_buffer(char **str, int nob)
 
 int cfs_trace_dump_debug_buffer_usrstr(void __user *usr_str, int usr_str_nob)
 {
-        char     *str;
-        int        rc;
+        char *str;
+        int rc;
 
         rc = cfs_trace_allocate_string_buffer(&str, usr_str_nob + 1);
-        if (rc != 0)
+        if (rc)
                 return rc;
 
         rc = cfs_trace_copyin_string(str, usr_str_nob + 1,
                                      usr_str, usr_str_nob);
-        if (rc != 0)
+        if (rc)
                 goto out;
 
         if (str[0] != '/') {
@@ -867,17 +867,17 @@ out:
 
 int cfs_trace_daemon_command(char *str)
 {
-        int       rc = 0;
+        int rc = 0;
 
         cfs_tracefile_write_lock();
 
-        if (strcmp(str, "stop") == 0) {
+        if (!strcmp(str, "stop")) {
                 cfs_tracefile_write_unlock();
                 cfs_trace_stop_thread();
                 cfs_tracefile_write_lock();
                 memset(cfs_tracefile, 0, sizeof(cfs_tracefile));
 
-        } else if (strncmp(str, "size=", 5) == 0) {
+        } else if (!strncmp(str, "size=", 5)) {
                 unsigned long tmp;
 
                 rc = kstrtoul(str + 5, 10, &tmp);
@@ -909,15 +909,15 @@ int cfs_trace_daemon_command(char *str)
 int cfs_trace_daemon_command_usrstr(void __user *usr_str, int usr_str_nob)
 {
         char *str;
-        int   rc;
+        int rc;
 
         rc = cfs_trace_allocate_string_buffer(&str, usr_str_nob + 1);
-        if (rc != 0)
+        if (rc)
                 return rc;
 
         rc = cfs_trace_copyin_string(str, usr_str_nob + 1,
                                      usr_str, usr_str_nob);
-        if (rc == 0)
+        if (!rc)
                 rc = cfs_trace_daemon_command(str);
 
         kfree(str);
@@ -1003,7 +1003,7 @@ static int tracefiled(void *arg)
 
                 filp = NULL;
                 cfs_tracefile_read_lock();
-                if (cfs_tracefile[0] != 0) {
+                if (cfs_tracefile[0]) {
                         filp = filp_open(cfs_tracefile,
                                          O_CREAT | O_RDWR | O_LARGEFILE,
                                          0600);
@@ -1072,7 +1072,7 @@ static int tracefiled(void *arg)
                 __LASSERT(list_empty(&pc.pc_pages));
 end_loop:
                 if (atomic_read(&tctl->tctl_shutdown)) {
-                        if (last_loop == 0) {
+                        if (!last_loop) {
                                 last_loop = 1;
                                 continue;
                         } else {
@@ -1135,13 +1135,13 @@ void cfs_trace_stop_thread(void)
 int cfs_tracefile_init(int max_pages)
 {
         struct cfs_trace_cpu_data *tcd;
-        int                 i;
-        int                 j;
-        int                 rc;
-        int                 factor;
+        int i;
+        int j;
+        int rc;
+        int factor;
 
         rc = cfs_tracefile_init_arch();
-        if (rc != 0)
+        if (rc)
                 return rc;
 
         cfs_tcd_for_each(tcd, i, j) {
diff --git a/drivers/staging/lustre/lnet/libcfs/tracefile.h b/drivers/staging/lustre/lnet/libcfs/tracefile.h
index d878676bc375..f644cbc5a277 100644
--- a/drivers/staging/lustre/lnet/libcfs/tracefile.h
+++ b/drivers/staging/lustre/lnet/libcfs/tracefile.h
@@ -45,7 +45,7 @@ enum cfs_trace_buf_type {
 /* trace file lock routines */
 
 #define TRACEFILE_NAME_SIZE 1024
-extern char      cfs_tracefile[TRACEFILE_NAME_SIZE];
+extern char cfs_tracefile[TRACEFILE_NAME_SIZE];
 extern long long cfs_tracefile_size;
 
 void libcfs_run_debug_log_upcall(char *file);
@@ -80,7 +80,7 @@ int cfs_trace_get_debug_mb(void);
 void libcfs_debug_dumplog_internal(void *arg);
 void libcfs_register_panic_notifier(void);
 void libcfs_unregister_panic_notifier(void);
-extern int  libcfs_panic_in_progress;
+extern int libcfs_panic_in_progress;
 int cfs_trace_max_debug_mb(void);
 
 #define TCD_MAX_PAGES (5 << (20 - PAGE_SHIFT))
@@ -113,14 +113,14 @@ union cfs_trace_data_union {
                  * tcd_for_each_type_lock
                  */
                 spinlock_t              tcd_lock;
-                unsigned long      tcd_lock_flags;
+                unsigned long           tcd_lock_flags;
 
                 /*
                  * pages with trace records not yet processed by tracefiled.
                  */
-                struct list_head              tcd_pages;
+                struct list_head        tcd_pages;
                 /* number of pages on ->tcd_pages */
-                unsigned long      tcd_cur_pages;
+                unsigned long           tcd_cur_pages;
 
                 /*
                  * pages with trace records already processed by
@@ -132,9 +132,9 @@ union cfs_trace_data_union {
                  * (put_pages_on_daemon_list()). LRU pages from this list are
                  * discarded when list grows too large.
                  */
-                struct list_head              tcd_daemon_pages;
+                struct list_head        tcd_daemon_pages;
                 /* number of pages on ->tcd_daemon_pages */
-                unsigned long      tcd_cur_daemon_pages;
+                unsigned long           tcd_cur_daemon_pages;
 
                 /*
                  * Maximal number of pages allowed on ->tcd_pages and
@@ -142,7 +142,7 @@ union cfs_trace_data_union {
                  * Always TCD_MAX_PAGES * tcd_pages_factor / 100 in current
                  * implementation.
                  */
-                unsigned long      tcd_max_pages;
+                unsigned long           tcd_max_pages;
 
                 /*
                  * preallocated pages to write trace records into. Pages from
@@ -166,15 +166,15 @@ union cfs_trace_data_union {
                  * TCD_STOCK_PAGES pagesful are consumed by trace records all
                  * emitted in non-blocking contexts. Which is quite unlikely.
                  */
-                struct list_head              tcd_stock_pages;
+                struct list_head        tcd_stock_pages;
                 /* number of pages on ->tcd_stock_pages */
-                unsigned long      tcd_cur_stock_pages;
+                unsigned long           tcd_cur_stock_pages;
 
-                unsigned short    tcd_shutting_down;
-                unsigned short    tcd_cpu;
-                unsigned short    tcd_type;
+                unsigned short          tcd_shutting_down;
+                unsigned short          tcd_cpu;
+                unsigned short          tcd_type;
                 /* The factors to share debug memory. */
-                unsigned short    tcd_pages_factor;
+                unsigned short          tcd_pages_factor;
         } tcd;
         char __pad[L1_CACHE_ALIGN(sizeof(struct cfs_trace_cpu_data))];
 };
diff --git a/drivers/staging/lustre/lnet/libcfs/workitem.c b/drivers/staging/lustre/lnet/libcfs/workitem.c
index e98c818a14fb..d0512da6bcde 100644
--- a/drivers/staging/lustre/lnet/libcfs/workitem.c
+++ b/drivers/staging/lustre/lnet/libcfs/workitem.c
@@ -45,7 +45,7 @@ struct cfs_wi_sched {
         /* chain on global list */
         struct list_head                ws_list;
         /** serialised workitems */
-        spinlock_t              ws_lock;
+        spinlock_t                      ws_lock;
         /** where schedulers sleep */
         wait_queue_head_t               ws_waitq;
         /** concurrent workitems */
@@ -59,26 +59,26 @@ struct cfs_wi_sched {
          */
         struct list_head                ws_rerunq;
         /** CPT-table for this scheduler */
-        struct cfs_cpt_table    *ws_cptab;
+        struct cfs_cpt_table            *ws_cptab;
         /** CPT id for affinity */
-        int                     ws_cpt;
+        int                             ws_cpt;
         /** number of scheduled workitems */
-        int                     ws_nscheduled;
+        int                             ws_nscheduled;
         /** started scheduler thread, protected by cfs_wi_data::wi_glock */
-        unsigned int            ws_nthreads:30;
+        unsigned int                    ws_nthreads:30;
         /** shutting down, protected by cfs_wi_data::wi_glock */
-        unsigned int            ws_stopping:1;
+        unsigned int                    ws_stopping:1;
         /** serialize starting thread, protected by cfs_wi_data::wi_glock */
-        unsigned int            ws_starting:1;
+        unsigned int                    ws_starting:1;
         /** scheduler name */
-        char                    ws_name[CFS_WS_NAME_LEN];
+        char                            ws_name[CFS_WS_NAME_LEN];
 };
 
 static struct cfs_workitem_data {
         /** serialize */
         spinlock_t              wi_glock;
         /** list of all schedulers */
-        struct list_head                wi_scheds;
+        struct list_head        wi_scheds;
         /** WI module is initialized */
         int                     wi_init;
         /** shutting down the whole WI module */
@@ -136,7 +136,7 @@ EXPORT_SYMBOL(cfs_wi_exit);
 int
 cfs_wi_deschedule(struct cfs_wi_sched *sched, struct cfs_workitem *wi)
 {
-        int     rc;
+        int rc;
 
         LASSERT(!in_interrupt()); /* because we use plain spinlock */
         LASSERT(!sched->ws_stopping);
@@ -202,13 +202,13 @@ EXPORT_SYMBOL(cfs_wi_schedule);
 
 static int cfs_wi_scheduler(void *arg)
 {
-        struct cfs_wi_sched     *sched = (struct cfs_wi_sched *)arg;
+        struct cfs_wi_sched *sched = (struct cfs_wi_sched *)arg;
 
         cfs_block_allsigs();
 
         /* CPT affinity scheduler? */
         if (sched->ws_cptab)
-                if (cfs_cpt_bind(sched->ws_cptab, sched->ws_cpt) != 0)
+                if (cfs_cpt_bind(sched->ws_cptab, sched->ws_cpt))
                         CWARN("Failed to bind %s on CPT %d\n",
                               sched->ws_name, sched->ws_cpt);
 
@@ -223,8 +223,8 @@ static int cfs_wi_scheduler(void *arg)
         spin_lock(&sched->ws_lock);
 
         while (!sched->ws_stopping) {
-                int          nloops = 0;
-                int          rc;
+                int nloops = 0;
+                int rc;
                 struct cfs_workitem *wi;
 
                 while (!list_empty(&sched->ws_runq) &&
@@ -238,16 +238,16 @@ static int cfs_wi_scheduler(void *arg)
                         LASSERT(sched->ws_nscheduled > 0);
                         sched->ws_nscheduled--;
 
-                        wi->wi_running   = 1;
+                        wi->wi_running = 1;
                         wi->wi_scheduled = 0;
 
                         spin_unlock(&sched->ws_lock);
                         nloops++;
 
-                        rc = (*wi->wi_action) (wi);
+                        rc = (*wi->wi_action)(wi);
 
                         spin_lock(&sched->ws_lock);
-                        if (rc != 0) /* WI should be dead, even be freed! */
+                        if (rc) /* WI should be dead, even be freed! */
                                 continue;
 
                         wi->wi_running = 0;
@@ -273,7 +273,7 @@ static int cfs_wi_scheduler(void *arg)
 
                 spin_unlock(&sched->ws_lock);
                 rc = wait_event_interruptible_exclusive(sched->ws_waitq,
-                                                !cfs_wi_sched_cansleep(sched));
+                                                        !cfs_wi_sched_cansleep(sched));
                 spin_lock(&sched->ws_lock);
         }
 
@@ -289,7 +289,7 @@ static int cfs_wi_scheduler(void *arg)
 void
 cfs_wi_sched_destroy(struct cfs_wi_sched *sched)
 {
-        int     i;
+        int i;
 
         LASSERT(cfs_wi_data.wi_init);
         LASSERT(!cfs_wi_data.wi_stopping);
@@ -325,7 +325,7 @@ cfs_wi_sched_destroy(struct cfs_wi_sched *sched)
         list_del(&sched->ws_list);
 
         spin_unlock(&cfs_wi_data.wi_glock);
-        LASSERT(sched->ws_nscheduled == 0);
+        LASSERT(!sched->ws_nscheduled);
 
         LIBCFS_FREE(sched, sizeof(*sched));
 }
@@ -335,8 +335,8 @@ int
 cfs_wi_sched_create(char *name, struct cfs_cpt_table *cptab,
                     int cpt, int nthrs, struct cfs_wi_sched **sched_pp)
 {
-        struct cfs_wi_sched     *sched;
-        int                     rc;
+        struct cfs_wi_sched *sched;
+        int rc;
 
         LASSERT(cfs_wi_data.wi_init);
         LASSERT(!cfs_wi_data.wi_stopping);
@@ -364,7 +364,7 @@ cfs_wi_sched_create(char *name, struct cfs_cpt_table *cptab,
 
         rc = 0;
         while (nthrs > 0)  {
-                char    name[16];
+                char name[16];
                 struct task_struct *task;
 
                 spin_lock(&cfs_wi_data.wi_glock);
@@ -431,7 +431,7 @@ cfs_wi_startup(void)
 void
 cfs_wi_shutdown(void)
 {
-        struct cfs_wi_sched     *sched;
+        struct cfs_wi_sched *sched;
         struct cfs_wi_sched *temp;
 
         spin_lock(&cfs_wi_data.wi_glock);
@@ -447,7 +447,7 @@ cfs_wi_shutdown(void)
         list_for_each_entry(sched, &cfs_wi_data.wi_scheds, ws_list) {
                 spin_lock(&cfs_wi_data.wi_glock);
 
-                while (sched->ws_nthreads != 0) {
+                while (sched->ws_nthreads) {
                         spin_unlock(&cfs_wi_data.wi_glock);
                         set_current_state(TASK_UNINTERRUPTIBLE);
                         schedule_timeout(cfs_time_seconds(1) / 20);
diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index 4daf828198c3..b2ba10d59f84 100644
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -1551,16 +1551,16 @@ LNetNIInit(lnet_pid_t requested_pid)
 
                 rc = lnet_check_routes();
                 if (rc)
-                        goto err_destory_routes;
+                        goto err_destroy_routes;
 
                 rc = lnet_rtrpools_alloc(im_a_router);
                 if (rc)
-                        goto err_destory_routes;
+                        goto err_destroy_routes;
         }
 
         rc = lnet_acceptor_start();
         if (rc)
-                goto err_destory_routes;
+                goto err_destroy_routes;
 
         the_lnet.ln_refcount = 1;
         /* Now I may use my own API functions... */
@@ -1587,7 +1587,7 @@ err_stop_ping:
 err_acceptor_stop:
         the_lnet.ln_refcount = 0;
         lnet_acceptor_stop();
-err_destory_routes:
+err_destroy_routes:
         if (!the_lnet.ln_nis_from_mod_params)
                 lnet_destroy_routes();
 err_shutdown_lndnis:
diff --git a/drivers/staging/lustre/lnet/lnet/lib-me.c b/drivers/staging/lustre/lnet/lnet/lib-me.c
index b430046dc294..eb796a86e6ab 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-me.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-me.c
@@ -271,21 +271,3 @@ lnet_me_unlink(lnet_me_t *me)
         lnet_res_lh_invalidate(&me->me_lh);
         lnet_me_free(me);
 }
-
-#if 0
-static void
-lib_me_dump(lnet_me_t *me)
-{
-        CWARN("Match Entry %p (%#llx)\n", me,
-              me->me_lh.lh_cookie);
-
-        CWARN("\tMatch/Ignore\t= %016lx / %016lx\n",
-              me->me_match_bits, me->me_ignore_bits);
-
-        CWARN("\tMD\t= %p\n", me->md);
-        CWARN("\tprev\t= %p\n",
-              list_entry(me->me_list.prev, lnet_me_t, me_list));
-        CWARN("\tnext\t= %p\n",
-              list_entry(me->me_list.next, lnet_me_t, me_list));
-}
-#endif
diff --git a/drivers/staging/lustre/lnet/lnet/lib-move.c b/drivers/staging/lustre/lnet/lnet/lib-move.c
index 48e6f8f2392f..f3dd6e42f4d4 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-move.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-move.c
@@ -192,6 +192,7 @@ lnet_copy_iov2iter(struct iov_iter *to,
         left = siov->iov_len - soffset;
         do {
                 size_t n, copy = left;
+
                 LASSERT(nsiov > 0);
 
                 if (copy > nob)
diff --git a/drivers/staging/lustre/lnet/lnet/nidstrings.c b/drivers/staging/lustre/lnet/lnet/nidstrings.c
index a6d7a6159b8f..a9fe3e69daae 100644
--- a/drivers/staging/lustre/lnet/lnet/nidstrings.c
+++ b/drivers/staging/lustre/lnet/lnet/nidstrings.c
@@ -193,7 +193,7 @@ add_nidrange(const struct cfs_lstr *src,
         struct netstrfns *nf;
         struct nidrange *nr;
         int endlen;
-        unsigned netnum;
+        unsigned int netnum;
 
         if (src->ls_len >= LNET_NIDSTR_SIZE)
                 return NULL;
@@ -247,10 +247,8 @@ parse_nidrange(struct cfs_lstr *src, struct list_head *nidlist)
 {
         struct cfs_lstr addrrange;
         struct cfs_lstr net;
-        struct cfs_lstr tmp;
         struct nidrange *nr;
 
-        tmp = *src;
         if (!cfs_gettok(src, '@', &addrrange))
                 goto failed;
 
@@ -1156,7 +1154,7 @@ EXPORT_SYMBOL(libcfs_nid2str_r);
 static struct netstrfns *
 libcfs_str2net_internal(const char *str, __u32 *net)
 {
-        struct netstrfns *uninitialized_var(nf);
+        struct netstrfns *nf = NULL;
         int nob;
         unsigned int netnum;
         int i;
diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c
index 063ad55ec950..8afa0abf15cd 100644
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -903,6 +903,7 @@ lnet_create_rc_data_locked(lnet_peer_t *gateway)
 {
         lnet_rc_data_t *rcd = NULL;
         lnet_ping_info_t *pi;
+        lnet_md_t md;
         int rc;
         int i;
 
@@ -925,15 +926,15 @@ lnet_create_rc_data_locked(lnet_peer_t *gateway)
         }
         rcd->rcd_pinginfo = pi;
 
+        md.start = pi;
+        md.user_ptr = rcd;
+        md.length = LNET_PINGINFO_SIZE;
+        md.threshold = LNET_MD_THRESH_INF;
+        md.options = LNET_MD_TRUNCATE;
+        md.eq_handle = the_lnet.ln_rc_eqh;
+
         LASSERT(!LNetHandleIsInvalid(the_lnet.ln_rc_eqh));
-        rc = LNetMDBind((lnet_md_t){.start     = pi,
-                                    .user_ptr  = rcd,
-                                    .length    = LNET_PINGINFO_SIZE,
-                                    .threshold = LNET_MD_THRESH_INF,
-                                    .options   = LNET_MD_TRUNCATE,
-                                    .eq_handle = the_lnet.ln_rc_eqh},
-                        LNET_UNLINK,
-                        &rcd->rcd_mdh);
+        rc = LNetMDBind(md, LNET_UNLINK, &rcd->rcd_mdh);
         if (rc < 0) {
                 CERROR("Can't bind MD: %d\n", rc);
                 goto out;
diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
index b20c5d394e3b..67b460f41d6e 100644
--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
@@ -44,6 +44,10 @@ static int brw_inject_errors;
 module_param(brw_inject_errors, int, 0644);
 MODULE_PARM_DESC(brw_inject_errors, "# data errors to inject randomly, zero by default");
 
+#define BRW_POISON      0xbeefbeefbeefbeefULL
+#define BRW_MAGIC       0xeeb0eeb1eeb2eeb3ULL
+#define BRW_MSIZE       sizeof(u64)
+
 static void
 brw_client_fini(struct sfw_test_instance *tsi)
 {
@@ -67,6 +71,7 @@ brw_client_init(struct sfw_test_instance *tsi)
 {
         struct sfw_session *sn = tsi->tsi_batch->bat_session;
         int flags;
+        int off;
         int npg;
         int len;
         int opc;
@@ -87,6 +92,7 @@ brw_client_init(struct sfw_test_instance *tsi)
                  * but we have to keep it for compatibility
                  */
                 len = npg * PAGE_SIZE;
+                off = 0;
         } else {
                 struct test_bulk_req_v1 *breq = &tsi->tsi_u.bulk_v1;
 
@@ -99,9 +105,13 @@ brw_client_init(struct sfw_test_instance *tsi)
                 opc = breq->blk_opc;
                 flags = breq->blk_flags;
                 len = breq->blk_len;
-                npg = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
+                off = breq->blk_offset & ~PAGE_MASK;
+                npg = (off + len + PAGE_SIZE - 1) >> PAGE_SHIFT;
         }
 
+        if (off % BRW_MSIZE)
+                return -EINVAL;
+
         if (npg > LNET_MAX_IOV || npg <= 0)
                 return -EINVAL;
 
@@ -114,7 +124,7 @@ brw_client_init(struct sfw_test_instance *tsi)
 
         list_for_each_entry(tsu, &tsi->tsi_units, tsu_list) {
                 bulk = srpc_alloc_bulk(lnet_cpt_of_nid(tsu->tsu_dest.nid),
-                                       npg, len, opc == LST_BRW_READ);
+                                       off, npg, len, opc == LST_BRW_READ);
                 if (!bulk) {
                         brw_client_fini(tsi);
                         return -ENOMEM;
@@ -126,12 +136,7 @@ brw_client_init(struct sfw_test_instance *tsi)
         return 0;
 }
 
-#define BRW_POISON      0xbeefbeefbeefbeefULL
-#define BRW_MAGIC       0xeeb0eeb1eeb2eeb3ULL
-#define BRW_MSIZE       sizeof(__u64)
-
-static int
-brw_inject_one_error(void)
+int brw_inject_one_error(void)
 {
         struct timespec64 ts;
 
@@ -147,12 +152,13 @@ brw_inject_one_error(void)
 }
 
 static void
-brw_fill_page(struct page *pg, int pattern, __u64 magic)
+brw_fill_page(struct page *pg, int off, int len, int pattern, __u64 magic)
 {
-        char *addr = page_address(pg);
+        char *addr = page_address(pg) + off;
         int i;
 
         LASSERT(addr);
+        LASSERT(!(off % BRW_MSIZE) && !(len % BRW_MSIZE));
 
         if (pattern == LST_BRW_CHECK_NONE)
                 return;
@@ -162,14 +168,16 @@ brw_fill_page(struct page *pg, int pattern, __u64 magic)
 
         if (pattern == LST_BRW_CHECK_SIMPLE) {
                 memcpy(addr, &magic, BRW_MSIZE);
-                addr += PAGE_SIZE - BRW_MSIZE;
-                memcpy(addr, &magic, BRW_MSIZE);
+                if (len > BRW_MSIZE) {
+                        addr += PAGE_SIZE - BRW_MSIZE;
+                        memcpy(addr, &magic, BRW_MSIZE);
+                }
                 return;
         }
 
         if (pattern == LST_BRW_CHECK_FULL) {
-                for (i = 0; i < PAGE_SIZE / BRW_MSIZE; i++)
-                        memcpy(addr + i * BRW_MSIZE, &magic, BRW_MSIZE);
+                for (i = 0; i < len; i += BRW_MSIZE)
+                        memcpy(addr + i, &magic, BRW_MSIZE);
                 return;
         }
 
@@ -177,13 +185,14 @@ brw_fill_page(struct page *pg, int pattern, __u64 magic)
 }
 
 static int
-brw_check_page(struct page *pg, int pattern, __u64 magic)
+brw_check_page(struct page *pg, int off, int len, int pattern, __u64 magic)
 {
-        char *addr = page_address(pg);
+        char *addr = page_address(pg) + off;
         __u64 data = 0; /* make compiler happy */
         int i;
 
         LASSERT(addr);
+        LASSERT(!(off % BRW_MSIZE) && !(len % BRW_MSIZE));
 
         if (pattern == LST_BRW_CHECK_NONE)
                 return 0;
@@ -193,21 +202,21 @@ brw_check_page(struct page *pg, int pattern, __u64 magic)
                 if (data != magic)
                         goto bad_data;
 
-                addr += PAGE_SIZE - BRW_MSIZE;
-                data = *((__u64 *)addr);
-                if (data != magic)
-                        goto bad_data;
-
+                if (len > BRW_MSIZE) {
+                        addr += PAGE_SIZE - BRW_MSIZE;
+                        data = *((__u64 *)addr);
+                        if (data != magic)
+                                goto bad_data;
+                }
                 return 0;
         }
 
         if (pattern == LST_BRW_CHECK_FULL) {
-                for (i = 0; i < PAGE_SIZE / BRW_MSIZE; i++) {
-                        data = *(((__u64 *)addr) + i);
+                for (i = 0; i < len; i += BRW_MSIZE) {
+                        data = *(u64 *)(addr + i);
                         if (data != magic)
                                 goto bad_data;
                 }
-
                 return 0;
         }
 
@@ -226,8 +235,12 @@ brw_fill_bulk(struct srpc_bulk *bk, int pattern, __u64 magic)
         struct page *pg;
 
         for (i = 0; i < bk->bk_niov; i++) {
+                int off, len;
+
                 pg = bk->bk_iovs[i].bv_page;
-                brw_fill_page(pg, pattern, magic);
+                off = bk->bk_iovs[i].bv_offset;
+                len = bk->bk_iovs[i].bv_len;
+                brw_fill_page(pg, off, len, pattern, magic);
         }
 }
 
@@ -238,8 +251,12 @@ brw_check_bulk(struct srpc_bulk *bk, int pattern, __u64 magic)
         struct page *pg;
 
         for (i = 0; i < bk->bk_niov; i++) {
+                int off, len;
+
                 pg = bk->bk_iovs[i].bv_page;
-                if (brw_check_page(pg, pattern, magic)) {
+                off = bk->bk_iovs[i].bv_offset;
+                len = bk->bk_iovs[i].bv_len;
+                if (brw_check_page(pg, off, len, pattern, magic)) {
                         CERROR("Bulk page %p (%d/%d) is corrupted!\n",
                                pg, i, bk->bk_niov);
                         return 1;
@@ -276,6 +293,7 @@ brw_client_prep_rpc(struct sfw_test_unit *tsu,
                 len = npg * PAGE_SIZE;
         } else {
                 struct test_bulk_req_v1 *breq = &tsi->tsi_u.bulk_v1;
+                int off;
 
                 /*
                  * I should never get this step if it's unknown feature
@@ -286,7 +304,8 @@ brw_client_prep_rpc(struct sfw_test_unit *tsu,
                 opc = breq->blk_opc;
                 flags = breq->blk_flags;
                 len = breq->blk_len;
-                npg = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
+                off = breq->blk_offset;
+                npg = (off + len + PAGE_SIZE - 1) >> PAGE_SHIFT;
         }
 
         rc = sfw_create_test_rpc(tsu, dest, sn->sn_features, npg, len, &rpc);
diff --git a/drivers/staging/lustre/lnet/selftest/conctl.c b/drivers/staging/lustre/lnet/selftest/conctl.c
index b786f8b4a73d..94383023c1be 100644
--- a/drivers/staging/lustre/lnet/selftest/conctl.c
+++ b/drivers/staging/lustre/lnet/selftest/conctl.c
@@ -315,7 +315,7 @@ lst_group_update_ioctl(lstio_group_update_args_t *args)
 static int
 lst_nodes_add_ioctl(lstio_group_nodes_args_t *args)
 {
-        unsigned feats;
+        unsigned int feats;
         int rc;
         char *name;
 
@@ -742,6 +742,10 @@ static int lst_test_add_ioctl(lstio_test_args_t *args)
              PAGE_SIZE - sizeof(struct lstcon_test)))
                 return -EINVAL;
 
+        /* Enforce zero parameter length if there's no parameter */
+        if (!args->lstio_tes_param && args->lstio_tes_param_len)
+                return -EINVAL;
+
         LIBCFS_ALLOC(batch_name, args->lstio_tes_bat_nmlen + 1);
         if (!batch_name)
                 return rc;
diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.c b/drivers/staging/lustre/lnet/selftest/conrpc.c
index 55afb53b0743..994422c62487 100644
--- a/drivers/staging/lustre/lnet/selftest/conrpc.c
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.c
@@ -86,8 +86,9 @@ lstcon_rpc_done(struct srpc_client_rpc *rpc)
 }
 
 static int
-lstcon_rpc_init(struct lstcon_node *nd, int service, unsigned feats,
-                int bulk_npg, int bulk_len, int embedded, struct lstcon_rpc *crpc)
+lstcon_rpc_init(struct lstcon_node *nd, int service, unsigned int feats,
+                int bulk_npg, int bulk_len, int embedded,
+                struct lstcon_rpc *crpc)
 {
         crpc->crp_rpc = sfw_create_rpc(nd->nd_id, service,
                                        feats, bulk_npg, bulk_len,
@@ -111,7 +112,7 @@ lstcon_rpc_init(struct lstcon_node *nd, int service, unsigned feats,
 }
 
 static int
-lstcon_rpc_prep(struct lstcon_node *nd, int service, unsigned feats,
+lstcon_rpc_prep(struct lstcon_node *nd, int service, unsigned int feats,
                 int bulk_npg, int bulk_len, struct lstcon_rpc **crpcpp)
 {
         struct lstcon_rpc *crpc = NULL;
@@ -292,8 +293,8 @@ lstcon_rpc_trans_abort(struct lstcon_rpc_trans *trans, int error)
 
                 spin_lock(&rpc->crpc_lock);
 
-                if (!crpc->crp_posted ||        /* not posted */
-                    crpc->crp_stamp) {          /* rpc done or aborted already */
+                if (!crpc->crp_posted || /* not posted */
+                    crpc->crp_stamp) {   /* rpc done or aborted already */
                         if (!crpc->crp_stamp) {
                                 crpc->crp_stamp = cfs_time_current();
                                 crpc->crp_status = -EINTR;
@@ -589,7 +590,7 @@ lstcon_rpc_trans_destroy(struct lstcon_rpc_trans *trans)
 
 int
 lstcon_sesrpc_prep(struct lstcon_node *nd, int transop,
-                   unsigned feats, struct lstcon_rpc **crpc)
+                   unsigned int feats, struct lstcon_rpc **crpc)
 {
         struct srpc_mksn_reqst *msrq;
         struct srpc_rmsn_reqst *rsrq;
@@ -627,7 +628,8 @@ lstcon_sesrpc_prep(struct lstcon_node *nd, int transop,
 }
 
 int
-lstcon_dbgrpc_prep(struct lstcon_node *nd, unsigned feats, struct lstcon_rpc **crpc)
+lstcon_dbgrpc_prep(struct lstcon_node *nd, unsigned int feats,
+                   struct lstcon_rpc **crpc)
 {
         struct srpc_debug_reqst *drq;
         int rc;
@@ -645,7 +647,7 @@ lstcon_dbgrpc_prep(struct lstcon_node *nd, unsigned feats, struct lstcon_rpc **c
 }
 
 int
-lstcon_batrpc_prep(struct lstcon_node *nd, int transop, unsigned feats,
+lstcon_batrpc_prep(struct lstcon_node *nd, int transop, unsigned int feats,
                    struct lstcon_tsb_hdr *tsb, struct lstcon_rpc **crpc)
 {
         struct lstcon_batch *batch;
@@ -678,7 +680,8 @@ lstcon_batrpc_prep(struct lstcon_node *nd, int transop, unsigned feats,
 }
 
 int
-lstcon_statrpc_prep(struct lstcon_node *nd, unsigned feats, struct lstcon_rpc **crpc)
+lstcon_statrpc_prep(struct lstcon_node *nd, unsigned int feats,
+                    struct lstcon_rpc **crpc)
 {
         struct srpc_stat_reqst *srq;
         int rc;
@@ -776,7 +779,8 @@ lstcon_pingrpc_prep(lst_test_ping_param_t *param, struct srpc_test_reqst *req)
 }
 
 static int
-lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param, struct srpc_test_reqst *req)
+lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param,
+                       struct srpc_test_reqst *req)
 {
         struct test_bulk_req *brq = &req->tsr_u.bulk_v0;
 
@@ -789,20 +793,21 @@ lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param, struct srpc_test_reqst *req
 }
 
 static int
-lstcon_bulkrpc_v1_prep(lst_test_bulk_param_t *param, struct srpc_test_reqst *req)
+lstcon_bulkrpc_v1_prep(lst_test_bulk_param_t *param, bool is_client,
+                       struct srpc_test_reqst *req)
 {
         struct test_bulk_req_v1 *brq = &req->tsr_u.bulk_v1;
 
         brq->blk_opc = param->blk_opc;
         brq->blk_flags = param->blk_flags;
         brq->blk_len = param->blk_size;
-        brq->blk_offset = 0; /* reserved */
+        brq->blk_offset = is_client ? param->blk_cli_off : param->blk_srv_off;
 
         return 0;
 }
 
 int
-lstcon_testrpc_prep(struct lstcon_node *nd, int transop, unsigned feats,
+lstcon_testrpc_prep(struct lstcon_node *nd, int transop, unsigned int feats,
                     struct lstcon_test *test, struct lstcon_rpc **crpc)
 {
         struct lstcon_group *sgrp = test->tes_src_grp;
@@ -897,7 +902,8 @@ lstcon_testrpc_prep(struct lstcon_node *nd, int transop, unsigned feats,
                                                     &test->tes_param[0], trq);
                 } else {
                         rc = lstcon_bulkrpc_v1_prep((lst_test_bulk_param_t *)
-                                                    &test->tes_param[0], trq);
+                                                    &test->tes_param[0],
+                                                    trq->tsr_is_client, trq);
                 }
 
                 break;
@@ -1084,7 +1090,7 @@ lstcon_rpc_trans_ndlist(struct list_head *ndlist,
         struct lstcon_ndlink *ndl;
         struct lstcon_node *nd;
         struct lstcon_rpc *rpc;
-        unsigned feats;
+        unsigned int feats;
         int rc;
 
         /* Creating session RPG for list of nodes */
diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.h b/drivers/staging/lustre/lnet/selftest/conrpc.h
index 7ec6fc96959e..e629e87c461c 100644
--- a/drivers/staging/lustre/lnet/selftest/conrpc.h
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.h
@@ -78,8 +78,8 @@ struct lstcon_rpc_trans {
         struct list_head  tas_olink;         /* link chain on owner list */
         struct list_head  tas_link;          /* link chain on global list */
         int               tas_opc;           /* operation code of transaction */
-        unsigned          tas_feats_updated; /* features mask is uptodate */
-        unsigned          tas_features;      /* test features mask */
+        unsigned int      tas_feats_updated; /* features mask is uptodate */
+        unsigned int      tas_features;      /* test features mask */
         wait_queue_head_t tas_waitq;         /* wait queue head */
         atomic_t          tas_remaining;     /* # of un-scheduled rpcs */
         struct list_head  tas_rpcs_list;     /* queued requests */
@@ -106,14 +106,16 @@ typedef int (*lstcon_rpc_readent_func_t)(int, struct srpc_msg *,
                                          lstcon_rpc_ent_t __user *);
 
 int  lstcon_sesrpc_prep(struct lstcon_node *nd, int transop,
-                        unsigned version, struct lstcon_rpc **crpc);
+                        unsigned int version, struct lstcon_rpc **crpc);
 int  lstcon_dbgrpc_prep(struct lstcon_node *nd,
-                        unsigned version, struct lstcon_rpc **crpc);
-int  lstcon_batrpc_prep(struct lstcon_node *nd, int transop, unsigned version,
-                        struct lstcon_tsb_hdr *tsb, struct lstcon_rpc **crpc);
-int  lstcon_testrpc_prep(struct lstcon_node *nd, int transop, unsigned version,
-                         struct lstcon_test *test, struct lstcon_rpc **crpc);
-int  lstcon_statrpc_prep(struct lstcon_node *nd, unsigned version,
+                        unsigned int version, struct lstcon_rpc **crpc);
+int  lstcon_batrpc_prep(struct lstcon_node *nd, int transop,
+                        unsigned int version, struct lstcon_tsb_hdr *tsb,
+                        struct lstcon_rpc **crpc);
+int  lstcon_testrpc_prep(struct lstcon_node *nd, int transop,
+                         unsigned int version, struct lstcon_test *test,
+                         struct lstcon_rpc **crpc);
+int  lstcon_statrpc_prep(struct lstcon_node *nd, unsigned int version,
                          struct lstcon_rpc **crpc);
 void lstcon_rpc_put(struct lstcon_rpc *crpc);
 int  lstcon_rpc_trans_prep(struct list_head *translist,
@@ -129,7 +131,8 @@ int  lstcon_rpc_trans_interpreter(struct lstcon_rpc_trans *trans,
                                   lstcon_rpc_readent_func_t readent);
 void lstcon_rpc_trans_abort(struct lstcon_rpc_trans *trans, int error);
 void lstcon_rpc_trans_destroy(struct lstcon_rpc_trans *trans);
-void lstcon_rpc_trans_addreq(struct lstcon_rpc_trans *trans, struct lstcon_rpc *req);
+void lstcon_rpc_trans_addreq(struct lstcon_rpc_trans *trans,
+                             struct lstcon_rpc *req);
 int  lstcon_rpc_trans_postwait(struct lstcon_rpc_trans *trans, int timeout);
 int  lstcon_rpc_pinger_start(void);
 void lstcon_rpc_pinger_stop(void);
diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c
index a0fcbf3bcc95..1456d2395cc9 100644
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -86,7 +86,7 @@ lstcon_node_find(lnet_process_id_t id, struct lstcon_node **ndpp, int create)
         if (!create)
                 return -ENOENT;
 
-        LIBCFS_ALLOC(*ndpp, sizeof(struct lstcon_node) + sizeof(struct lstcon_ndlink));
+        LIBCFS_ALLOC(*ndpp, sizeof(**ndpp) + sizeof(*ndl));
         if (!*ndpp)
                 return -ENOMEM;
 
@@ -131,12 +131,12 @@ lstcon_node_put(struct lstcon_node *nd)
         list_del(&ndl->ndl_link);
         list_del(&ndl->ndl_hlink);
 
-        LIBCFS_FREE(nd, sizeof(struct lstcon_node) + sizeof(struct lstcon_ndlink));
+        LIBCFS_FREE(nd, sizeof(*nd) + sizeof(*ndl));
 }
 
 static int
-lstcon_ndlink_find(struct list_head *hash,
-                   lnet_process_id_t id, struct lstcon_ndlink **ndlpp, int create)
+lstcon_ndlink_find(struct list_head *hash, lnet_process_id_t id,
+                   struct lstcon_ndlink **ndlpp, int create)
 {
         unsigned int idx = LNET_NIDADDR(id.nid) % LST_NODE_HASHSIZE;
         struct lstcon_ndlink *ndl;
@@ -230,7 +230,8 @@ lstcon_group_addref(struct lstcon_group *grp)
         grp->grp_ref++;
 }
 
-static void lstcon_group_ndlink_release(struct lstcon_group *, struct lstcon_ndlink *);
+static void lstcon_group_ndlink_release(struct lstcon_group *,
+                                        struct lstcon_ndlink *);
 
 static void
 lstcon_group_drain(struct lstcon_group *grp, int keep)
@@ -397,7 +398,8 @@ lstcon_sesrpc_readent(int transop, struct srpc_msg *msg,
 static int
 lstcon_group_nodes_add(struct lstcon_group *grp,
                        int count, lnet_process_id_t __user *ids_up,
-                       unsigned *featp, struct list_head __user *result_up)
+                       unsigned int *featp,
+                       struct list_head __user *result_up)
 {
         struct lstcon_rpc_trans *trans;
         struct lstcon_ndlink    *ndl;
@@ -542,7 +544,8 @@ lstcon_group_add(char *name)
 
 int
 lstcon_nodes_add(char *name, int count, lnet_process_id_t __user *ids_up,
-                 unsigned *featp, struct list_head __user *result_up)
+                 unsigned int *featp,
+                 struct list_head __user *result_up)
 {
         struct lstcon_group *grp;
         int rc;
@@ -820,7 +823,7 @@ lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gents_p,
 
         lstcon_group_decref(grp);
 
-        return 0;
+        return rc;
 }
 
 static int
@@ -1181,7 +1184,8 @@ lstcon_testrpc_condition(int transop, struct lstcon_node *nd, void *arg)
 }
 
 static int
-lstcon_test_nodes_add(struct lstcon_test *test, struct list_head __user *result_up)
+lstcon_test_nodes_add(struct lstcon_test *test,
+                      struct list_head __user *result_up)
 {
         struct lstcon_rpc_trans *trans;
         struct lstcon_group *grp;
@@ -1364,7 +1368,8 @@ out:
 }
 
 static int
-lstcon_test_find(struct lstcon_batch *batch, int idx, struct lstcon_test **testpp)
+lstcon_test_find(struct lstcon_batch *batch, int idx,
+                 struct lstcon_test **testpp)
 {
         struct lstcon_test *test;
 
@@ -1702,7 +1707,7 @@ lstcon_new_session_id(lst_sid_t *sid)
 }
 
 int
-lstcon_session_new(char *name, int key, unsigned feats,
+lstcon_session_new(char *name, int key, unsigned int feats,
                    int timeout, int force, lst_sid_t __user *sid_up)
 {
         int rc = 0;
@@ -1868,7 +1873,7 @@ lstcon_session_end(void)
 }
 
 int
-lstcon_session_feats_check(unsigned feats)
+lstcon_session_feats_check(unsigned int feats)
 {
         int rc = 0;
 
diff --git a/drivers/staging/lustre/lnet/selftest/console.h b/drivers/staging/lustre/lnet/selftest/console.h
index 78388a611c22..5dc1de48a10e 100644
--- a/drivers/staging/lustre/lnet/selftest/console.h
+++ b/drivers/staging/lustre/lnet/selftest/console.h
@@ -92,14 +92,16 @@ struct lstcon_batch {
         int              bat_ntest;       /* # of test */
         int              bat_state;       /* state of the batch */
         int              bat_arg;         /* parameter for run|stop, timeout
-                                           * for run, force for stop */
+                                           * for run, force for stop
+                                           */
         char             bat_name[LST_NAME_SIZE];/* name of batch */
 
         struct list_head bat_test_list;   /* list head of tests (struct lstcon_test)
                                            */
         struct list_head bat_trans_list;  /* list head of transaction */
         struct list_head bat_cli_list;    /* list head of client nodes
-                                           * (struct lstcon_node) */
+                                           * (struct lstcon_node)
+                                           */
         struct list_head *bat_cli_hash;   /* hash table of client nodes */
         struct list_head bat_srv_list;    /* list head of server nodes */
         struct list_head *bat_srv_hash;   /* hash table of server nodes */
@@ -144,13 +146,14 @@ struct lstcon_session {
         int                 ses_timeout;      /* timeout in seconds */
         time64_t            ses_laststamp;    /* last operation stamp (seconds)
                                                */
-        unsigned            ses_features;     /* tests features of the session
+        unsigned int        ses_features;     /* tests features of the session
                                                */
-        unsigned            ses_feats_updated:1; /* features are synced with
-                                                  * remote test nodes */
-        unsigned            ses_force:1;      /* force creating */
-        unsigned            ses_shutdown:1;   /* session is shutting down */
-        unsigned            ses_expired:1;    /* console is timedout */
+        unsigned int        ses_feats_updated:1; /* features are synced with
+                                                  * remote test nodes
+                                                  */
+        unsigned int        ses_force:1;      /* force creating */
+        unsigned int        ses_shutdown:1;   /* session is shutting down */
+        unsigned int        ses_expired:1;    /* console is timedout */
         __u64               ses_id_cookie;    /* batch id cookie */
         char                ses_name[LST_NAME_SIZE];/* session name */
         struct lstcon_rpc_trans *ses_ping;              /* session pinger */
@@ -188,14 +191,14 @@ int lstcon_ioctl_entry(unsigned int cmd, struct libcfs_ioctl_hdr *hdr);
 int lstcon_console_init(void);
 int lstcon_console_fini(void);
 int lstcon_session_match(lst_sid_t sid);
-int lstcon_session_new(char *name, int key, unsigned version,
+int lstcon_session_new(char *name, int key, unsigned int version,
                        int timeout, int flags, lst_sid_t __user *sid_up);
 int lstcon_session_info(lst_sid_t __user *sid_up, int __user *key,
                         unsigned __user *verp, lstcon_ndlist_ent_t __user *entp,
                         char __user *name_up, int len);
 int lstcon_session_end(void);
 int lstcon_session_debug(int timeout, struct list_head __user *result_up);
-int lstcon_session_feats_check(unsigned feats);
+int lstcon_session_feats_check(unsigned int feats);
 int lstcon_batch_debug(int timeout, char *name,
                        int client, struct list_head __user *result_up);
 int lstcon_group_debug(int timeout, char *name,
@@ -207,7 +210,7 @@ int lstcon_group_del(char *name);
 int lstcon_group_clean(char *name, int args);
 int lstcon_group_refresh(char *name, struct list_head __user *result_up);
 int lstcon_nodes_add(char *name, int nnd, lnet_process_id_t __user *nds_up,
-                     unsigned *featp, struct list_head __user *result_up);
+                     unsigned int *featp, struct list_head __user *result_up);
 int lstcon_nodes_remove(char *name, int nnd, lnet_process_id_t __user *nds_up,
                         struct list_head __user *result_up);
 int lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gent_up,
diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
index abbd6287b4bd..48dcc330dc9b 100644
--- a/drivers/staging/lustre/lnet/selftest/framework.c
+++ b/drivers/staging/lustre/lnet/selftest/framework.c
@@ -131,7 +131,8 @@ sfw_find_test_case(int id)
 }
 
 static int
-sfw_register_test(struct srpc_service *service, struct sfw_test_client_ops *cliops)
+sfw_register_test(struct srpc_service *service,
+                  struct sfw_test_client_ops *cliops)
 {
         struct sfw_test_case *tsc;
 
@@ -254,7 +255,7 @@ sfw_session_expired(void *data)
 
 static inline void
 sfw_init_session(struct sfw_session *sn, lst_sid_t sid,
-                 unsigned features, const char *name)
+                 unsigned int features, const char *name)
 {
         struct stt_timer *timer = &sn->sn_timer;
 
@@ -469,7 +470,8 @@ sfw_make_session(struct srpc_mksn_reqst *request, struct srpc_mksn_reply *reply)
 }
 
 static int
-sfw_remove_session(struct srpc_rmsn_reqst *request, struct srpc_rmsn_reply *reply)
+sfw_remove_session(struct srpc_rmsn_reqst *request,
+                   struct srpc_rmsn_reply *reply)
 {
         struct sfw_session *sn = sfw_data.fw_session;
 
@@ -501,7 +503,8 @@ sfw_remove_session(struct srpc_rmsn_reqst *request, struct srpc_rmsn_reply *repl
 }
 
 static int
-sfw_debug_session(struct srpc_debug_reqst *request, struct srpc_debug_reply *reply)
+sfw_debug_session(struct srpc_debug_reqst *request,
+                  struct srpc_debug_reply *reply)
 {
         struct sfw_session *sn = sfw_data.fw_session;
 
@@ -897,7 +900,7 @@ sfw_test_rpc_done(struct srpc_client_rpc *rpc)
 
 int
 sfw_create_test_rpc(struct sfw_test_unit *tsu, lnet_process_id_t peer,
-                    unsigned features, int nblk, int blklen,
+                    unsigned int features, int nblk, int blklen,
                     struct srpc_client_rpc **rpcpp)
 {
         struct srpc_client_rpc *rpc = NULL;
@@ -1064,7 +1067,8 @@ sfw_stop_batch(struct sfw_batch *tsb, int force)
 }
 
 static int
-sfw_query_batch(struct sfw_batch *tsb, int testidx, struct srpc_batch_reply *reply)
+sfw_query_batch(struct sfw_batch *tsb, int testidx,
+                struct srpc_batch_reply *reply)
 {
         struct sfw_test_instance *tsi;
 
@@ -1101,7 +1105,7 @@ sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len,
         LASSERT(!rpc->srpc_bulk);
         LASSERT(npages > 0 && npages <= LNET_MAX_IOV);
 
-        rpc->srpc_bulk = srpc_alloc_bulk(cpt, npages, len, sink);
+        rpc->srpc_bulk = srpc_alloc_bulk(cpt, 0, npages, len, sink);
         if (!rpc->srpc_bulk)
                 return -ENOMEM;
 
@@ -1179,7 +1183,8 @@ sfw_add_test(struct srpc_server_rpc *rpc)
 }
 
 static int
-sfw_control_batch(struct srpc_batch_reqst *request, struct srpc_batch_reply *reply)
+sfw_control_batch(struct srpc_batch_reqst *request,
+                  struct srpc_batch_reply *reply)
 {
         struct sfw_session *sn = sfw_data.fw_session;
         int rc = 0;
@@ -1225,7 +1230,7 @@ sfw_handle_server_rpc(struct srpc_server_rpc *rpc)
         struct srpc_service *sv = rpc->srpc_scd->scd_svc;
         struct srpc_msg *reply = &rpc->srpc_replymsg;
         struct srpc_msg *request = &rpc->srpc_reqstbuf->buf_msg;
-        unsigned features = LST_FEATS_MASK;
+        unsigned int features = LST_FEATS_MASK;
         int rc = 0;
 
         LASSERT(!sfw_data.fw_active_srpc);
@@ -1375,7 +1380,7 @@ sfw_bulk_ready(struct srpc_server_rpc *rpc, int status)
 
 struct srpc_client_rpc *
 sfw_create_rpc(lnet_process_id_t peer, int service,
-               unsigned features, int nbulkiov, int bulklen,
+               unsigned int features, int nbulkiov, int bulklen,
                void (*done)(struct srpc_client_rpc *), void *priv)
 {
         struct srpc_client_rpc *rpc = NULL;
diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
index 9331ca4e3606..b9601b00a273 100644
--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
@@ -159,8 +159,8 @@ ping_client_done_rpc(struct sfw_test_unit *tsu, struct srpc_client_rpc *rpc)
 
         ktime_get_real_ts64(&ts);
         CDEBUG(D_NET, "%d reply in %u usec\n", reply->pnr_seq,
-               (unsigned)((ts.tv_sec - reqst->pnr_time_sec) * 1000000 +
-                          (ts.tv_nsec / NSEC_PER_USEC - reqst->pnr_time_usec)));
+               (unsigned int)((ts.tv_sec - reqst->pnr_time_sec) * 1000000 +
+                              (ts.tv_nsec / NSEC_PER_USEC - reqst->pnr_time_usec)));
 }
 
 static int
diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c
index f5619d8744ef..ce9de8c9be57 100644
--- a/drivers/staging/lustre/lnet/selftest/rpc.c
+++ b/drivers/staging/lustre/lnet/selftest/rpc.c
@@ -84,14 +84,13 @@ void srpc_set_counters(const srpc_counters_t *cnt)
 }
 
 static int
-srpc_add_bulk_page(struct srpc_bulk *bk, struct page *pg, int i, int nob)
+srpc_add_bulk_page(struct srpc_bulk *bk, struct page *pg, int i, int off,
+                   int nob)
 {
-        nob = min_t(int, nob, PAGE_SIZE);
+        LASSERT(off < PAGE_SIZE);
+        LASSERT(nob > 0 && nob <= PAGE_SIZE);
 
-        LASSERT(nob > 0);
-        LASSERT(i >= 0 && i < bk->bk_niov);
-
-        bk->bk_iovs[i].bv_offset = 0;
+        bk->bk_iovs[i].bv_offset = off;
         bk->bk_iovs[i].bv_page = pg;
         bk->bk_iovs[i].bv_len = nob;
         return nob;
@@ -117,7 +116,8 @@ srpc_free_bulk(struct srpc_bulk *bk)
 }
 
 struct srpc_bulk *
-srpc_alloc_bulk(int cpt, unsigned bulk_npg, unsigned bulk_len, int sink)
+srpc_alloc_bulk(int cpt, unsigned int bulk_off, unsigned int bulk_npg,
+                unsigned int bulk_len, int sink)
 {
         struct srpc_bulk *bk;
         int i;
@@ -148,8 +148,11 @@ srpc_alloc_bulk(int cpt, unsigned bulk_npg, unsigned bulk_len, int sink)
                         return NULL;
                 }
 
-                nob = srpc_add_bulk_page(bk, pg, i, bulk_len);
+                nob = min_t(unsigned int, bulk_off + bulk_len, PAGE_SIZE) -
+                      bulk_off;
+                srpc_add_bulk_page(bk, pg, i, bulk_off, nob);
                 bulk_len -= nob;
+                bulk_off = 0;
         }
 
         return bk;
@@ -693,7 +696,8 @@ srpc_finish_service(struct srpc_service *sv)
 
 /* called with sv->sv_lock held */
 static void
-srpc_service_recycle_buffer(struct srpc_service_cd *scd, struct srpc_buffer *buf)
+srpc_service_recycle_buffer(struct srpc_service_cd *scd,
+                            struct srpc_buffer *buf)
 __must_hold(&scd->scd_lock)
 {
         if (!scd->scd_svc->sv_shuttingdown && scd->scd_buf_adjust >= 0) {
diff --git a/drivers/staging/lustre/lnet/selftest/rpc.h b/drivers/staging/lustre/lnet/selftest/rpc.h
index 4ab2ee264004..f353a634cc8e 100644
--- a/drivers/staging/lustre/lnet/selftest/rpc.h
+++ b/drivers/staging/lustre/lnet/selftest/rpc.h
@@ -113,7 +113,8 @@ struct srpc_join_reply {
         __u32                   join_status;    /* returned status */
         lst_sid_t               join_sid;       /* session id */
         __u32                   join_timeout;   /* # seconds' inactivity to
-                                                 * expire */
+                                                 * expire
+                                                 */
         char                    join_session[LST_NAME_SIZE]; /* session name */
 } WIRE_ATTR;
 
@@ -175,7 +176,7 @@ struct test_bulk_req_v1 {
         __u16              blk_opc;        /* bulk operation code */
         __u16              blk_flags;      /* data check flags */
         __u32              blk_len;        /* data length */
-        __u32              blk_offset;     /* reserved: offset */
+        __u32              blk_offset;     /* offset */
 } WIRE_ATTR;
 
 struct test_ping_req {
@@ -190,7 +191,8 @@ struct srpc_test_reqst {
         lst_bid_t               tsr_bid;        /* batch id */
         __u32                   tsr_service;    /* test type: bulk|ping|... */
         __u32                   tsr_loop;       /* test client loop count or
-                                                 * # server buffers needed */
+                                                 * # server buffers needed
+                                                 */
         __u32                   tsr_concur;     /* concurrency of test */
         __u8                    tsr_is_client;  /* is test client or not */
         __u8                    tsr_stop_onerr; /* stop on error */
diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h b/drivers/staging/lustre/lnet/selftest/selftest.h
index d033ac03d953..c8833a016b6d 100644
--- a/drivers/staging/lustre/lnet/selftest/selftest.h
+++ b/drivers/staging/lustre/lnet/selftest/selftest.h
@@ -131,7 +131,8 @@ srpc_service2reply(int service)
 
 enum srpc_event_type {
         SRPC_BULK_REQ_RCVD   = 1, /* passive bulk request(PUT sink/GET source)
-                                   * received */
+                                   * received
+                                   */
         SRPC_BULK_PUT_SENT   = 2, /* active bulk PUT sent (source) */
         SRPC_BULK_GET_RPLD   = 3, /* active bulk GET replied (sink) */
         SRPC_REPLY_RCVD      = 4, /* incoming reply received */
@@ -295,7 +296,8 @@ struct srpc_service_cd {
 #define SFW_TEST_WI_MIN         256
 #define SFW_TEST_WI_MAX         2048
 /* extra buffers for tolerating buggy peers, or unbalanced number
- * of peers between partitions  */
+ * of peers between partitions
+ */
 #define SFW_TEST_WI_EXTRA       64
 
 /* number of server workitems (mini-thread) for framework service */
@@ -347,9 +349,11 @@ struct sfw_batch {
 
 struct sfw_test_client_ops {
         int  (*tso_init)(struct sfw_test_instance *tsi); /* initialize test
-                                                          * client */
+                                                          * client
+                                                          */
         void (*tso_fini)(struct sfw_test_instance *tsi); /* finalize test
-                                                          * client */
+                                                          * client
+                                                          */
         int  (*tso_prep_rpc)(struct sfw_test_unit *tsu,
                              lnet_process_id_t dest,
                              struct srpc_client_rpc **rpc);     /* prep a tests rpc */
@@ -374,7 +378,8 @@ struct sfw_test_instance {
         spinlock_t                 tsi_lock;            /* serialize */
         unsigned int               tsi_stopping:1;      /* test is stopping */
         atomic_t                   tsi_nactive;         /* # of active test
-                                                         * unit */
+                                                         * unit
+                                                         */
         struct list_head           tsi_units;           /* test units */
         struct list_head           tsi_free_rpcs;       /* free rpcs */
         struct list_head           tsi_active_rpcs;     /* active rpcs */
@@ -386,8 +391,10 @@ struct sfw_test_instance {
         } tsi_u;
 };
 
-/* XXX: trailing (PAGE_SIZE % sizeof(lnet_process_id_t)) bytes at the end of
- * pages are not used */
+/*
+ * XXX: trailing (PAGE_SIZE % sizeof(lnet_process_id_t)) bytes at the end of
+ * pages are not used
+ */
 #define SFW_MAX_CONCUR     LST_MAX_CONCUR
 #define SFW_ID_PER_PAGE    (PAGE_SIZE / sizeof(lnet_process_id_packed_t))
 #define SFW_MAX_NDESTS     (LNET_MAX_IOV * SFW_ID_PER_PAGE)
@@ -410,10 +417,10 @@ struct sfw_test_case {
 
 struct srpc_client_rpc *
 sfw_create_rpc(lnet_process_id_t peer, int service,
-               unsigned features, int nbulkiov, int bulklen,
+               unsigned int features, int nbulkiov, int bulklen,
                void (*done)(struct srpc_client_rpc *), void *priv);
 int sfw_create_test_rpc(struct sfw_test_unit *tsu,
-                        lnet_process_id_t peer, unsigned features,
+                        lnet_process_id_t peer, unsigned int features,
                         int nblk, int blklen, struct srpc_client_rpc **rpc);
 void sfw_abort_rpc(struct srpc_client_rpc *rpc);
 void sfw_post_rpc(struct srpc_client_rpc *rpc);
@@ -434,8 +441,9 @@ srpc_create_client_rpc(lnet_process_id_t peer, int service,
 void srpc_post_rpc(struct srpc_client_rpc *rpc);
 void srpc_abort_rpc(struct srpc_client_rpc *rpc, int why);
 void srpc_free_bulk(struct srpc_bulk *bk);
-struct srpc_bulk *srpc_alloc_bulk(int cpt, unsigned bulk_npg,
-                                  unsigned bulk_len, int sink);
+struct srpc_bulk *srpc_alloc_bulk(int cpt, unsigned int off,
+                                  unsigned int bulk_npg, unsigned int bulk_len,
+                                  int sink);
 int srpc_send_rpc(struct swi_workitem *wi);
 int srpc_send_reply(struct srpc_server_rpc *rpc);
 int srpc_add_service(struct srpc_service *sv);
diff --git a/drivers/staging/lustre/lnet/selftest/timer.c b/drivers/staging/lustre/lnet/selftest/timer.c
index dcd22580b1f0..2fe692df19d0 100644
--- a/drivers/staging/lustre/lnet/selftest/timer.c
+++ b/drivers/staging/lustre/lnet/selftest/timer.c
@@ -46,16 +46,17 @@
  * to cover a time period of 1024 seconds into the future before wrapping.
  */
 #define STTIMER_MINPOLL        3        /* log2 min poll interval (8 s) */
-#define STTIMER_SLOTTIME       (1 << STTIMER_MINPOLL)
+#define STTIMER_SLOTTIME        BIT(STTIMER_MINPOLL)
 #define STTIMER_SLOTTIMEMASK   (~(STTIMER_SLOTTIME - 1))
-#define STTIMER_NSLOTS         (1 << 7)
+#define STTIMER_NSLOTS          BIT(7)
 #define STTIMER_SLOT(t)        (&stt_data.stt_hash[(((t) >> STTIMER_MINPOLL) & \
                                                     (STTIMER_NSLOTS - 1))])
 
 static struct st_timer_data {
         spinlock_t        stt_lock;
         unsigned long     stt_prev_slot; /* start time of the slot processed
-                                          * previously */
+                                          * previously
+                                          */
         struct list_head  stt_hash[STTIMER_NSLOTS];
         int               stt_shuttingdown;
         wait_queue_head_t stt_waitq;
diff --git a/drivers/staging/lustre/lustre/fid/fid_request.c b/drivers/staging/lustre/lustre/fid/fid_request.c
index edd72b926f81..999f250ceed0 100644
--- a/drivers/staging/lustre/lustre/fid/fid_request.c
+++ b/drivers/staging/lustre/lustre/fid/fid_request.c
@@ -74,7 +74,7 @@ static int seq_client_rpc(struct lu_client_seq *seq,
 
         /* Zero out input range, this is not recovery yet. */
         in = req_capsule_client_get(&req->rq_pill, &RMF_SEQ_RANGE);
-        range_init(in);
+        lu_seq_range_init(in);
 
         ptlrpc_request_set_replen(req);
 
@@ -112,25 +112,21 @@ static int seq_client_rpc(struct lu_client_seq *seq,
 
         ptlrpc_at_set_req_timeout(req);
 
-        if (opc != SEQ_ALLOC_SUPER && seq->lcs_type == LUSTRE_SEQ_METADATA)
-                mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
         rc = ptlrpc_queue_wait(req);
-        if (opc != SEQ_ALLOC_SUPER && seq->lcs_type == LUSTRE_SEQ_METADATA)
-                mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
         if (rc)
                 goto out_req;
 
         out = req_capsule_server_get(&req->rq_pill, &RMF_SEQ_RANGE);
         *output = *out;
 
-        if (!range_is_sane(output)) {
+        if (!lu_seq_range_is_sane(output)) {
                 CERROR("%s: Invalid range received from server: "
                        DRANGE "\n", seq->lcs_name, PRANGE(output));
                 rc = -EINVAL;
                 goto out_req;
         }
 
-        if (range_is_exhausted(output)) {
+        if (lu_seq_range_is_exhausted(output)) {
                 CERROR("%s: Range received from server is exhausted: "
                        DRANGE "]\n", seq->lcs_name, PRANGE(output));
                 rc = -EINVAL;
@@ -170,9 +166,9 @@ static int seq_client_alloc_seq(const struct lu_env *env,
 {
         int rc;
 
-        LASSERT(range_is_sane(&seq->lcs_space));
+        LASSERT(lu_seq_range_is_sane(&seq->lcs_space));
 
-        if (range_is_exhausted(&seq->lcs_space)) {
+        if (lu_seq_range_is_exhausted(&seq->lcs_space)) {
                 rc = seq_client_alloc_meta(env, seq);
                 if (rc) {
                         CERROR("%s: Can't allocate new meta-sequence, rc %d\n",
@@ -185,7 +181,7 @@ static int seq_client_alloc_seq(const struct lu_env *env,
                 rc = 0;
         }
 
-        LASSERT(!range_is_exhausted(&seq->lcs_space));
+        LASSERT(!lu_seq_range_is_exhausted(&seq->lcs_space));
         *seqnr = seq->lcs_space.lsr_start;
         seq->lcs_space.lsr_start += 1;
 
@@ -320,7 +316,7 @@ void seq_client_flush(struct lu_client_seq *seq)
 
         seq->lcs_space.lsr_index = -1;
 
-        range_init(&seq->lcs_space);
+        lu_seq_range_init(&seq->lcs_space);
         mutex_unlock(&seq->lcs_mutex);
 }
 EXPORT_SYMBOL(seq_client_flush);
diff --git a/drivers/staging/lustre/lustre/fid/lproc_fid.c b/drivers/staging/lustre/lustre/fid/lproc_fid.c
index 3ed32d77f38b..97d4849c7199 100644
--- a/drivers/staging/lustre/lustre/fid/lproc_fid.c
+++ b/drivers/staging/lustre/lustre/fid/lproc_fid.c
@@ -83,7 +83,7 @@ ldebugfs_fid_write_common(const char __user *buffer, size_t count,
                     (unsigned long long *)&tmp.lsr_end);
         if (rc != 2)
                 return -EINVAL;
-        if (!range_is_sane(&tmp) || range_is_zero(&tmp) ||
+        if (!lu_seq_range_is_sane(&tmp) || lu_seq_range_is_zero(&tmp) ||
             tmp.lsr_start < range->lsr_start || tmp.lsr_end > range->lsr_end)
                 return -EINVAL;
         *range = tmp;
diff --git a/drivers/staging/lustre/lustre/fld/fld_cache.c b/drivers/staging/lustre/lustre/fld/fld_cache.c
index 0100a935f4ff..11f697496180 100644
--- a/drivers/staging/lustre/lustre/fld/fld_cache.c
+++ b/drivers/staging/lustre/lustre/fld/fld_cache.c
@@ -143,7 +143,7 @@ restart_fixup:
                 c_range = &f_curr->fce_range;
                 n_range = &f_next->fce_range;
 
-                LASSERT(range_is_sane(c_range));
+                LASSERT(lu_seq_range_is_sane(c_range));
                 if (&f_next->fce_list == head)
                         break;
 
@@ -358,7 +358,7 @@ struct fld_cache_entry
 {
         struct fld_cache_entry *f_new;
 
-        LASSERT(range_is_sane(range));
+        LASSERT(lu_seq_range_is_sane(range));
 
         f_new = kzalloc(sizeof(*f_new), GFP_NOFS);
         if (!f_new)
@@ -503,7 +503,7 @@ int fld_cache_lookup(struct fld_cache *cache,
                 }
 
                 prev = flde;
-                if (range_within(&flde->fce_range, seq)) {
+                if (lu_seq_range_within(&flde->fce_range, seq)) {
                         *range = flde->fce_range;
 
                         cache->fci_stat.fst_cache++;
diff --git a/drivers/staging/lustre/lustre/fld/fld_internal.h b/drivers/staging/lustre/lustre/fld/fld_internal.h
index 08eaec735d6f..4a7f0b71c48d 100644
--- a/drivers/staging/lustre/lustre/fld/fld_internal.h
+++ b/drivers/staging/lustre/lustre/fld/fld_internal.h
@@ -62,11 +62,6 @@
 #include "../include/lustre_req_layout.h"
 #include "../include/lustre_fld.h"
 
-enum {
-        LUSTRE_FLD_INIT = 1 << 0,
-        LUSTRE_FLD_RUN  = 1 << 1
-};
-
 struct fld_stats {
         __u64   fst_count;
         __u64   fst_cache;
diff --git a/drivers/staging/lustre/lustre/fld/fld_request.c b/drivers/staging/lustre/lustre/fld/fld_request.c
index 0de72b717ce5..4cade7a16800 100644
--- a/drivers/staging/lustre/lustre/fld/fld_request.c
+++ b/drivers/staging/lustre/lustre/fld/fld_request.c
@@ -159,11 +159,6 @@ int fld_client_add_target(struct lu_client_fld *fld,
         LASSERT(name);
         LASSERT(tar->ft_srv || tar->ft_exp);
 
-        if (fld->lcf_flags != LUSTRE_FLD_INIT) {
-                CERROR("%s: Attempt to add target %s (idx %llu) on fly - skip it\n",
-                       fld->lcf_name, name, tar->ft_idx);
-                return 0;
-        }
         CDEBUG(D_INFO, "%s: Adding target %s (idx %llu)\n",
                fld->lcf_name, name, tar->ft_idx);
 
@@ -282,7 +277,6 @@ int fld_client_init(struct lu_client_fld *fld,
         fld->lcf_count = 0;
         spin_lock_init(&fld->lcf_lock);
         fld->lcf_hash = &fld_hash[hash];
-        fld->lcf_flags = LUSTRE_FLD_INIT;
         INIT_LIST_HEAD(&fld->lcf_targets);
 
         cache_size = FLD_CLIENT_CACHE_SIZE /
@@ -421,8 +415,6 @@ int fld_client_lookup(struct lu_client_fld *fld, u64 seq, u32 *mds,
         struct lu_fld_target *target;
         int rc;
 
-        fld->lcf_flags |= LUSTRE_FLD_RUN;
-
         rc = fld_cache_lookup(fld->lcf_cache, seq, &res);
         if (rc == 0) {
                 *mds = res.lsr_index;
diff --git a/drivers/staging/lustre/lustre/include/cl_object.h b/drivers/staging/lustre/lustre/include/cl_object.h
index 89292c93dcd5..dc685610c4c4 100644
--- a/drivers/staging/lustre/lustre/include/cl_object.h
+++ b/drivers/staging/lustre/lustre/include/cl_object.h
@@ -59,10 +59,6 @@
  *               read/write system call it is associated with the single user
  *               thread, that issued the system call).
  *
- *   - cl_req      represents a collection of pages for a transfer. cl_req is
- *               constructed by req-forming engine that tries to saturate
- *               transport with large and continuous transfers.
- *
  * Terminology
  *
  *     - to avoid confusion high-level I/O operation like read or write system
@@ -103,11 +99,8 @@
 struct inode;
 
 struct cl_device;
-struct cl_device_operations;
 
 struct cl_object;
-struct cl_object_page_operations;
-struct cl_object_lock_operations;
 
 struct cl_page;
 struct cl_page_slice;
@@ -120,27 +113,7 @@ struct cl_page_operations;
 struct cl_io;
 struct cl_io_slice;
 
-struct cl_req;
-struct cl_req_slice;
-
-/**
- * Operations for each data device in the client stack.
- *
- * \see vvp_cl_ops, lov_cl_ops, lovsub_cl_ops, osc_cl_ops
- */
-struct cl_device_operations {
-        /**
-         * Initialize cl_req. This method is called top-to-bottom on all
-         * devices in the stack to get them a chance to allocate layer-private
-         * data, and to attach them to the cl_req by calling
-         * cl_req_slice_add().
-         *
-         * \see osc_req_init(), lov_req_init(), lovsub_req_init()
-         * \see vvp_req_init()
-         */
-        int (*cdo_req_init)(const struct lu_env *env, struct cl_device *dev,
-                            struct cl_req *req);
-};
+struct cl_req_attr;
 
 /**
  * Device in the client stack.
@@ -150,8 +123,6 @@ struct cl_device_operations {
 struct cl_device {
         /** Super-class. */
         struct lu_device                   cd_lu_dev;
-        /** Per-layer operation vector. */
-        const struct cl_device_operations *cd_ops;
 };
 
 /** \addtogroup cl_object cl_object
@@ -267,7 +238,7 @@ struct cl_object_conf {
                 /**
                  * Object layout. This is consumed by lov.
                  */
-                struct lustre_md *coc_md;
+                struct lu_buf     coc_layout;
                 /**
                  * Description of particular stripe location in the
                  * cluster. This is consumed by osc.
@@ -301,6 +272,26 @@ enum {
         OBJECT_CONF_WAIT = 2
 };
 
+enum {
+        CL_LAYOUT_GEN_NONE      = (u32)-2,      /* layout lock was cancelled */
+        CL_LAYOUT_GEN_EMPTY     = (u32)-1,      /* for empty layout */
+};
+
+struct cl_layout {
+        /** the buffer to return the layout in lov_mds_md format. */
+        struct lu_buf   cl_buf;
+        /** size of layout in lov_mds_md format. */
+        size_t          cl_size;
+        /** Layout generation. */
+        u32             cl_layout_gen;
+        /**
+         * True if this is a released file.
+         * Temporarily added for released file truncate in ll_setattr_raw().
+         * It will be removed later. -Jinshan
+         */
+        bool            cl_is_released;
+};
+
 /**
  * Operations implemented for each cl object layer.
  *
@@ -400,6 +391,27 @@ struct cl_object_operations {
          */
         int (*coo_getstripe)(const struct lu_env *env, struct cl_object *obj,
                              struct lov_user_md __user *lum);
+        /**
+         * Get FIEMAP mapping from the object.
+         */
+        int (*coo_fiemap)(const struct lu_env *env, struct cl_object *obj,
+                          struct ll_fiemap_info_key *fmkey,
+                          struct fiemap *fiemap, size_t *buflen);
+        /**
+         * Get layout and generation of the object.
+         */
+        int (*coo_layout_get)(const struct lu_env *env, struct cl_object *obj,
+                              struct cl_layout *layout);
+        /**
+         * Get maximum size of the object.
+         */
+        loff_t (*coo_maxbytes)(struct cl_object *obj);
+        /**
+         * Set request attributes.
+         */
+        void (*coo_req_attr_set)(const struct lu_env *env,
+                                 struct cl_object *obj,
+                                 struct cl_req_attr *attr);
 };
 
 /**
@@ -591,7 +603,7 @@ enum cl_page_state {
          *
          *     - [cl_page_state::CPS_PAGEOUT] page is dirty, the
          *     req-formation engine decides that it wants to include this page
-         *     into an cl_req being constructed, and yanks it from the cache;
+         *     into an RPC being constructed, and yanks it from the cache;
          *
          *     - [cl_page_state::CPS_FREEING] VM callback is executed to
          *     evict the page form the memory;
@@ -660,7 +672,7 @@ enum cl_page_state {
          * Page is being read in, as a part of a transfer. This is quite
          * similar to the cl_page_state::CPS_PAGEOUT state, except that
          * read-in is always "immediate"---there is no such thing a sudden
-         * construction of read cl_req from cached, presumably not up to date,
+         * construction of read request from cached, presumably not up to date,
          * pages.
          *
          * Underlying VM page is locked for the duration of transfer.
@@ -714,8 +726,6 @@ struct cl_page {
         struct list_head         cp_batch;
         /** List of slices. Immutable after creation. */
         struct list_head         cp_layers;
-        /** Linkage of pages within cl_req. */
-        struct list_head         cp_flight;
         /**
          * Page state. This field is const to avoid accidental update, it is
          * modified only internally within cl_page.c. Protected by a VM lock.
@@ -732,12 +742,6 @@ struct cl_page {
          * by sub-io. Protected by a VM lock.
          */
         struct cl_io        *cp_owner;
-        /**
-         * Owning IO request in cl_page_state::CPS_PAGEOUT and
-         * cl_page_state::CPS_PAGEIN states. This field is maintained only in
-         * the top-level pages. Protected by a VM lock.
-         */
-        struct cl_req      *cp_req;
         /** List of references to this page, for debugging. */
         struct lu_ref       cp_reference;
         /** Link to an object, for debugging. */
@@ -779,7 +783,6 @@ enum cl_lock_mode {
 
 /**
  * Requested transfer type.
- * \ingroup cl_req
  */
 enum cl_req_type {
         CRT_READ,
@@ -884,26 +887,6 @@ struct cl_page_operations {
         /** Destructor. Frees resources and slice itself. */
         void (*cpo_fini)(const struct lu_env *env,
                          struct cl_page_slice *slice);
-
-        /**
-         * Checks whether the page is protected by a cl_lock. This is a
-         * per-layer method, because certain layers have ways to check for the
-         * lock much more efficiently than through the generic locks scan, or
-         * implement locking mechanisms separate from cl_lock, e.g.,
-         * LL_FILE_GROUP_LOCKED in vvp. If \a pending is true, check for locks
-         * being canceled, or scheduled for cancellation as soon as the last
-         * user goes away, too.
-         *
-         * \retval    -EBUSY: page is protected by a lock of a given mode;
-         * \retval  -ENODATA: page is not protected by a lock;
-         * \retval       0: this layer cannot decide.
-         *
-         * \see cl_page_is_under_lock()
-         */
-        int (*cpo_is_under_lock)(const struct lu_env *env,
-                                 const struct cl_page_slice *slice,
-                                 struct cl_io *io, pgoff_t *max);
-
         /**
          * Optional debugging helper. Prints given page slice.
          *
@@ -915,8 +898,7 @@ struct cl_page_operations {
         /**
          * \name transfer
          *
-         * Transfer methods. See comment on cl_req for a description of
-         * transfer formation and life-cycle.
+         * Transfer methods.
          *
          * @{
          */
@@ -962,7 +944,7 @@ struct cl_page_operations {
                                        int ioret);
                 /**
                  * Called when cached page is about to be added to the
-                 * cl_req as a part of req formation.
+                 * ptlrpc request as a part of req formation.
                  *
                  * \return    0       : proceed with this page;
                  * \return    -EAGAIN : skip this page;
@@ -1365,7 +1347,6 @@ struct cl_2queue {
  *     (3) sort all locks to avoid dead-locks, and acquire them
  *
  *     (4) process the chunk: call per-page methods
- *       (cl_io_operations::cio_read_page() for read,
  *       cl_io_operations::cio_prepare_write(),
  *       cl_io_operations::cio_commit_write() for write)
  *
@@ -1388,6 +1369,8 @@ enum cl_io_type {
         CIT_WRITE,
         /** truncate, utime system calls */
         CIT_SETATTR,
+        /** get data version */
+        CIT_DATA_VERSION,
         /**
          * page fault handling
          */
@@ -1467,6 +1450,31 @@ struct cl_io_slice {
 
 typedef void (*cl_commit_cbt)(const struct lu_env *, struct cl_io *,
                               struct cl_page *);
+
+struct cl_read_ahead {
+        /*
+         * Maximum page index the readahead window will end.
+         * This is determined DLM lock coverage, RPC and stripe boundary.
+         * cra_end is included.
+         */
+        pgoff_t cra_end;
+        /*
+         * Release routine. If readahead holds resources underneath, this
+         * function should be called to release it.
+         */
+        void (*cra_release)(const struct lu_env *env, void *cbdata);
+        /* Callback data for cra_release routine */
+        void *cra_cbdata;
+};
+
+static inline void cl_read_ahead_release(const struct lu_env *env,
+                                         struct cl_read_ahead *ra)
+{
+        if (ra->cra_release)
+                ra->cra_release(env, ra->cra_cbdata);
+        memset(ra, 0, sizeof(*ra));
+}
+
 /**
  * Per-layer io operations.
  * \see vvp_io_ops, lov_io_ops, lovsub_io_ops, osc_io_ops
@@ -1573,16 +1581,13 @@ struct cl_io_operations {
                                  struct cl_page_list *queue, int from, int to,
                                  cl_commit_cbt cb);
         /**
-         * Read missing page.
-         *
-         * Called by a top-level cl_io_operations::op[CIT_READ]::cio_start()
-         * method, when it hits not-up-to-date page in the range. Optional.
+         * Decide maximum read ahead extent
          *
          * \pre io->ci_type == CIT_READ
          */
-        int (*cio_read_page)(const struct lu_env *env,
-                             const struct cl_io_slice *slice,
-                             const struct cl_page_slice *page);
+        int (*cio_read_ahead)(const struct lu_env *env,
+                              const struct cl_io_slice *slice,
+                              pgoff_t start, struct cl_read_ahead *ra);
         /**
          * Optional debugging helper. Print given io slice.
          */
@@ -1765,10 +1770,15 @@ struct cl_io {
                 struct cl_io_rw_common ci_rw;
                 struct cl_setattr_io {
                         struct ost_lvb   sa_attr;
+                        unsigned int             sa_attr_flags;
                         unsigned int     sa_valid;
                         int             sa_stripe_index;
-                        struct lu_fid  *sa_parent_fid;
+                        const struct lu_fid     *sa_parent_fid;
                 } ci_setattr;
+                struct cl_data_version_io {
+                        u64 dv_data_version;
+                        int dv_flags;
+                } ci_data_version;
                 struct cl_fault_io {
                         /** page index within file. */
                         pgoff_t  ft_index;
@@ -1836,179 +1846,20 @@ struct cl_io {
 
 /** @} cl_io */
 
-/** \addtogroup cl_req cl_req
- * @{
- */
-/** \struct cl_req
- * Transfer.
- *
- * There are two possible modes of transfer initiation on the client:
- *
- *     - immediate transfer: this is started when a high level io wants a page
- *       or a collection of pages to be transferred right away. Examples:
- *       read-ahead, synchronous read in the case of non-page aligned write,
- *       page write-out as a part of extent lock cancellation, page write-out
- *       as a part of memory cleansing. Immediate transfer can be both
- *       cl_req_type::CRT_READ and cl_req_type::CRT_WRITE;
- *
- *     - opportunistic transfer (cl_req_type::CRT_WRITE only), that happens
- *       when io wants to transfer a page to the server some time later, when
- *       it can be done efficiently. Example: pages dirtied by the write(2)
- *       path.
- *
- * In any case, transfer takes place in the form of a cl_req, which is a
- * representation for a network RPC.
- *
- * Pages queued for an opportunistic transfer are cached until it is decided
- * that efficient RPC can be composed of them. This decision is made by "a
- * req-formation engine", currently implemented as a part of osc
- * layer. Req-formation depends on many factors: the size of the resulting
- * RPC, whether or not multi-object RPCs are supported by the server,
- * max-rpc-in-flight limitations, size of the dirty cache, etc.
- *
- * For the immediate transfer io submits a cl_page_list, that req-formation
- * engine slices into cl_req's, possibly adding cached pages to some of
- * the resulting req's.
- *
- * Whenever a page from cl_page_list is added to a newly constructed req, its
- * cl_page_operations::cpo_prep() layer methods are called. At that moment,
- * page state is atomically changed from cl_page_state::CPS_OWNED to
- * cl_page_state::CPS_PAGEOUT or cl_page_state::CPS_PAGEIN, cl_page::cp_owner
- * is zeroed, and cl_page::cp_req is set to the
- * req. cl_page_operations::cpo_prep() method at the particular layer might
- * return -EALREADY to indicate that it does not need to submit this page
- * at all. This is possible, for example, if page, submitted for read,
- * became up-to-date in the meantime; and for write, the page don't have
- * dirty bit marked. \see cl_io_submit_rw()
- *
- * Whenever a cached page is added to a newly constructed req, its
- * cl_page_operations::cpo_make_ready() layer methods are called. At that
- * moment, page state is atomically changed from cl_page_state::CPS_CACHED to
- * cl_page_state::CPS_PAGEOUT, and cl_page::cp_req is set to
- * req. cl_page_operations::cpo_make_ready() method at the particular layer
- * might return -EAGAIN to indicate that this page is not eligible for the
- * transfer right now.
- *
- * FUTURE
- *
- * Plan is to divide transfers into "priority bands" (indicated when
- * submitting cl_page_list, and queuing a page for the opportunistic transfer)
- * and allow glueing of cached pages to immediate transfers only within single
- * band. This would make high priority transfers (like lock cancellation or
- * memory pressure induced write-out) really high priority.
- *
- */
-
 /**
  * Per-transfer attributes.
  */
 struct cl_req_attr {
+        enum cl_req_type cra_type;
+        u64              cra_flags;
+        struct cl_page  *cra_page;
+
         /** Generic attributes for the server consumption. */
         struct obdo     *cra_oa;
         /** Jobid */
         char             cra_jobid[LUSTRE_JOBID_SIZE];
 };
 
-/**
- * Transfer request operations definable at every layer.
- *
- * Concurrency: transfer formation engine synchronizes calls to all transfer
- * methods.
- */
-struct cl_req_operations {
-        /**
-         * Invoked top-to-bottom by cl_req_prep() when transfer formation is
-         * complete (all pages are added).
-         *
-         * \see osc_req_prep()
-         */
-        int  (*cro_prep)(const struct lu_env *env,
-                         const struct cl_req_slice *slice);
-        /**
-         * Called top-to-bottom to fill in \a oa fields. This is called twice
-         * with different flags, see bug 10150 and osc_build_req().
-         *
-         * \param obj an object from cl_req which attributes are to be set in
-         *          \a oa.
-         *
-         * \param oa struct obdo where attributes are placed
-         *
-         * \param flags \a oa fields to be filled.
-         */
-        void (*cro_attr_set)(const struct lu_env *env,
-                             const struct cl_req_slice *slice,
-                             const struct cl_object *obj,
-                             struct cl_req_attr *attr, u64 flags);
-        /**
-         * Called top-to-bottom from cl_req_completion() to notify layers that
-         * transfer completed. Has to free all state allocated by
-         * cl_device_operations::cdo_req_init().
-         */
-        void (*cro_completion)(const struct lu_env *env,
-                               const struct cl_req_slice *slice, int ioret);
-};
-
-/**
- * A per-object state that (potentially multi-object) transfer request keeps.
- */
-struct cl_req_obj {
-        /** object itself */
-        struct cl_object   *ro_obj;
-        /** reference to cl_req_obj::ro_obj. For debugging. */
-        struct lu_ref_link  ro_obj_ref;
-        /* something else? Number of pages for a given object? */
-};
-
-/**
- * Transfer request.
- *
- * Transfer requests are not reference counted, because IO sub-system owns
- * them exclusively and knows when to free them.
- *
- * Life cycle.
- *
- * cl_req is created by cl_req_alloc() that calls
- * cl_device_operations::cdo_req_init() device methods to allocate per-req
- * state in every layer.
- *
- * Then pages are added (cl_req_page_add()), req keeps track of all objects it
- * contains pages for.
- *
- * Once all pages were collected, cl_page_operations::cpo_prep() method is
- * called top-to-bottom. At that point layers can modify req, let it pass, or
- * deny it completely. This is to support things like SNS that have transfer
- * ordering requirements invisible to the individual req-formation engine.
- *
- * On transfer completion (or transfer timeout, or failure to initiate the
- * transfer of an allocated req), cl_req_operations::cro_completion() method
- * is called, after execution of cl_page_operations::cpo_completion() of all
- * req's pages.
- */
-struct cl_req {
-        enum cl_req_type      crq_type;
-        /** A list of pages being transferred */
-        struct list_head            crq_pages;
-        /** Number of pages in cl_req::crq_pages */
-        unsigned              crq_nrpages;
-        /** An array of objects which pages are in ->crq_pages */
-        struct cl_req_obj    *crq_o;
-        /** Number of elements in cl_req::crq_objs[] */
-        unsigned              crq_nrobjs;
-        struct list_head            crq_layers;
-};
-
-/**
- * Per-layer state for request.
- */
-struct cl_req_slice {
-        struct cl_req    *crs_req;
-        struct cl_device *crs_dev;
-        struct list_head        crs_linkage;
-        const struct cl_req_operations *crs_ops;
-};
-
-/* @} cl_req */
-
 enum cache_stats_item {
         /** how many cache lookups were performed */
         CS_lookup = 0,
@@ -2153,9 +2004,6 @@ void cl_lock_slice_add(struct cl_lock *lock, struct cl_lock_slice *slice,
                        const struct cl_lock_operations *ops);
 void cl_io_slice_add(struct cl_io *io, struct cl_io_slice *slice,
                      struct cl_object *obj, const struct cl_io_operations *ops);
-void cl_req_slice_add(struct cl_req *req, struct cl_req_slice *slice,
-                      struct cl_device *dev,
-                      const struct cl_req_operations *ops);
 /** @} helpers */
 
 /** \defgroup cl_object cl_object
@@ -2183,6 +2031,12 @@ int cl_object_prune(const struct lu_env *env, struct cl_object *obj);
 void cl_object_kill(const struct lu_env *env, struct cl_object *obj);
 int  cl_object_getstripe(const struct lu_env *env, struct cl_object *obj,
                          struct lov_user_md __user *lum);
+int cl_object_fiemap(const struct lu_env *env, struct cl_object *obj,
+                     struct ll_fiemap_info_key *fmkey, struct fiemap *fiemap,
+                     size_t *buflen);
+int cl_object_layout_get(const struct lu_env *env, struct cl_object *obj,
+                         struct cl_layout *cl);
+loff_t cl_object_maxbytes(struct cl_object *obj);
 
 /**
  * Returns true, iff \a o0 and \a o1 are slices of the same object.
@@ -2302,8 +2156,6 @@ void cl_page_discard(const struct lu_env *env, struct cl_io *io,
 void cl_page_delete(const struct lu_env *env, struct cl_page *pg);
 int cl_page_is_vmlocked(const struct lu_env *env, const struct cl_page *pg);
 void cl_page_export(const struct lu_env *env, struct cl_page *pg, int uptodate);
-int cl_page_is_under_lock(const struct lu_env *env, struct cl_io *io,
-                          struct cl_page *page, pgoff_t *max_index);
 loff_t cl_offset(const struct cl_object *obj, pgoff_t idx);
 pgoff_t cl_index(const struct cl_object *obj, loff_t offset);
 size_t cl_page_size(const struct cl_object *obj);
@@ -2414,8 +2266,6 @@ int cl_io_lock_add(const struct lu_env *env, struct cl_io *io,
                    struct cl_io_lock_link *link);
 int cl_io_lock_alloc_add(const struct lu_env *env, struct cl_io *io,
                          struct cl_lock_descr *descr);
-int cl_io_read_page(const struct lu_env *env, struct cl_io *io,
-                    struct cl_page *page);
 int cl_io_submit_rw(const struct lu_env *env, struct cl_io *io,
                     enum cl_req_type iot, struct cl_2queue *queue);
 int cl_io_submit_sync(const struct lu_env *env, struct cl_io *io,
@@ -2424,6 +2274,8 @@ int cl_io_submit_sync(const struct lu_env *env, struct cl_io *io,
 int cl_io_commit_async(const struct lu_env *env, struct cl_io *io,
                        struct cl_page_list *queue, int from, int to,
                        cl_commit_cbt cb);
+int cl_io_read_ahead(const struct lu_env *env, struct cl_io *io,
+                     pgoff_t start, struct cl_read_ahead *ra);
 int cl_io_is_going(const struct lu_env *env);
 
 /**
@@ -2520,19 +2372,8 @@ void cl_2queue_init_page(struct cl_2queue *queue, struct cl_page *page);
 
 /** @} cl_page_list */
 
-/** \defgroup cl_req cl_req
- * @{
- */
-struct cl_req *cl_req_alloc(const struct lu_env *env, struct cl_page *page,
-                            enum cl_req_type crt, int nr_objects);
-
-void cl_req_page_add(const struct lu_env *env, struct cl_req *req,
-                     struct cl_page *page);
-void cl_req_page_done(const struct lu_env *env, struct cl_page *page);
-int  cl_req_prep(const struct lu_env *env, struct cl_req *req);
-void cl_req_attr_set(const struct lu_env *env, struct cl_req *req,
-                     struct cl_req_attr *attr, u64 flags);
-void cl_req_completion(const struct lu_env *env, struct cl_req *req, int ioret);
+void cl_req_attr_set(const struct lu_env *env, struct cl_object *obj,
+                     struct cl_req_attr *attr);
 
 /** \defgroup cl_sync_io cl_sync_io
  * @{
@@ -2568,8 +2409,6 @@ void cl_sync_io_end(const struct lu_env *env, struct cl_sync_io *anchor);
 
 /** @} cl_sync_io */
 
-/** @} cl_req */
-
 /** \defgroup cl_env cl_env
  *
  * lu_env handling for a client.
@@ -2593,35 +2432,13 @@ void cl_sync_io_end(const struct lu_env *env, struct cl_sync_io *anchor);
  *     - allocation and destruction of environment is amortized by caching no
  *     longer used environments instead of destroying them;
  *
- *     - there is a notion of "current" environment, attached to the kernel
- *     data structure representing current thread Top-level lustre code
- *     allocates an environment and makes it current, then calls into
- *     non-lustre code, that in turn calls lustre back. Low-level lustre
- *     code thus called can fetch environment created by the top-level code
- *     and reuse it, avoiding additional environment allocation.
- *       Right now, three interfaces can attach the cl_env to running thread:
- *       - cl_env_get
- *       - cl_env_implant
- *       - cl_env_reexit(cl_env_reenter had to be called priorly)
- *
  * \see lu_env, lu_context, lu_context_key
  * @{
  */
 
-struct cl_env_nest {
-        int   cen_refcheck;
-        void *cen_cookie;
-};
-
 struct lu_env *cl_env_get(int *refcheck);
 struct lu_env *cl_env_alloc(int *refcheck, __u32 tags);
-struct lu_env *cl_env_nested_get(struct cl_env_nest *nest);
 void cl_env_put(struct lu_env *env, int *refcheck);
-void cl_env_nested_put(struct cl_env_nest *nest, struct lu_env *env);
-void *cl_env_reenter(void);
-void cl_env_reexit(void *cookie);
-void cl_env_implant(struct lu_env *env, int *refcheck);
-void cl_env_unplant(struct lu_env *env, int *refcheck);
 unsigned int cl_env_cache_purge(unsigned int nr);
 struct lu_env *cl_env_percpu_get(void);
 void cl_env_percpu_put(struct lu_env *env);
diff --git a/drivers/staging/lustre/lustre/include/llog_swab.h b/drivers/staging/lustre/lustre/include/llog_swab.h
new file mode 100644
index 000000000000..fd7ffb154ad1
--- /dev/null
+++ b/drivers/staging/lustre/lustre/include/llog_swab.h
@@ -0,0 +1,65 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * 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,
+ * 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 version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2014, Intel Corporation.
+ *
+ * Copyright 2015 Cray Inc, all rights reserved.
+ * Author: Ben Evans.
+ *
+ * We assume all nodes are either little-endian or big-endian, and we
+ * always send messages in the sender's native format.  The receiver
+ * detects the message format by checking the 'magic' field of the message
+ * (see lustre_msg_swabbed() below).
+ *
+ * Each type has corresponding 'lustre_swab_xxxtypexxx()' routines
+ * are implemented in ptlrpc/pack_generic.c.  These 'swabbers' convert the
+ * type from "other" endian, in-place in the message buffer.
+ *
+ * A swabber takes a single pointer argument.  The caller must already have
+ * verified that the length of the message buffer >= sizeof (type).
+ *
+ * For variable length types, a second 'lustre_swab_v_xxxtypexxx()' routine
+ * may be defined that swabs just the variable part, after the caller has
+ * verified that the message buffer is large enough.
+ */
+
+#ifndef _LLOG_SWAB_H_
+#define _LLOG_SWAB_H_
+
+#include "lustre/lustre_idl.h"
+struct lustre_cfg;
+
+void lustre_swab_lu_fid(struct lu_fid *fid);
+void lustre_swab_ost_id(struct ost_id *oid);
+void lustre_swab_llogd_body(struct llogd_body *d);
+void lustre_swab_llog_hdr(struct llog_log_hdr *h);
+void lustre_swab_llogd_conn_body(struct llogd_conn_body *d);
+void lustre_swab_llog_rec(struct llog_rec_hdr *rec);
+void lustre_swab_lu_seq_range(struct lu_seq_range *range);
+void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg);
+void lustre_swab_cfg_marker(struct cfg_marker *marker,
+                            int swab, int size);
+
+#endif
diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h b/drivers/staging/lustre/lustre/include/lprocfs_status.h
index cc0713ef8ae5..62753dae0bfa 100644
--- a/drivers/staging/lustre/lustre/include/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h
@@ -43,6 +43,8 @@
 #include <linux/spinlock.h>
 #include <linux/types.h>
 
+#include "../../include/linux/libcfs/libcfs.h"
+#include "lustre_cfg.h"
 #include "lustre/lustre_idl.h"
 
 struct lprocfs_vars {
@@ -540,7 +542,8 @@ lprocfs_alloc_stats(unsigned int num, enum lprocfs_stats_flags flags);
 void lprocfs_clear_stats(struct lprocfs_stats *stats);
 void lprocfs_free_stats(struct lprocfs_stats **stats);
 void lprocfs_counter_init(struct lprocfs_stats *stats, int index,
-                          unsigned conf, const char *name, const char *units);
+                          unsigned int conf, const char *name,
+                          const char *units);
 struct obd_export;
 int lprocfs_exp_cleanup(struct obd_export *exp);
 struct dentry *ldebugfs_add_simple(struct dentry *root,
@@ -701,9 +704,9 @@ static struct lustre_attr lustre_attr_##name = __ATTR(name, mode, show, store)
 extern const struct sysfs_ops lustre_sysfs_ops;
 
 struct root_squash_info;
-int lprocfs_wr_root_squash(const char *buffer, unsigned long count,
+int lprocfs_wr_root_squash(const char __user *buffer, unsigned long count,
                            struct root_squash_info *squash, char *name);
-int lprocfs_wr_nosquash_nids(const char *buffer, unsigned long count,
+int lprocfs_wr_nosquash_nids(const char __user *buffer, unsigned long count,
                              struct root_squash_info *squash, char *name);
 
 /* all quota proc functions */
diff --git a/drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h b/drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h
index c2340d643e84..b8ad5559a3b9 100644
--- a/drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h
+++ b/drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h
@@ -41,79 +41,24 @@
 #ifndef _LUSTRE_FIEMAP_H
 #define _LUSTRE_FIEMAP_H
 
-struct ll_fiemap_extent {
-        __u64 fe_logical;  /* logical offset in bytes for the start of
-                            * the extent from the beginning of the file
-                            */
-        __u64 fe_physical; /* physical offset in bytes for the start
-                            * of the extent from the beginning of the disk
-                            */
-        __u64 fe_length;   /* length in bytes for this extent */
-        __u64 fe_reserved64[2];
-        __u32 fe_flags;    /* FIEMAP_EXTENT_* flags for this extent */
-        __u32 fe_device;   /* device number for this extent */
-        __u32 fe_reserved[2];
-};
-
-struct ll_user_fiemap {
-        __u64 fm_start;  /* logical offset (inclusive) at
-                          * which to start mapping (in)
-                          */
-        __u64 fm_length; /* logical length of mapping which
-                          * userspace wants (in)
-                          */
-        __u32 fm_flags;  /* FIEMAP_FLAG_* flags for request (in/out) */
-        __u32 fm_mapped_extents;/* number of extents that were mapped (out) */
-        __u32 fm_extent_count;  /* size of fm_extents array (in) */
-        __u32 fm_reserved;
-        struct ll_fiemap_extent fm_extents[0]; /* array of mapped extents (out) */
-};
-
-#define FIEMAP_MAX_OFFSET      (~0ULL)
+#ifndef __KERNEL__
+#include <stddef.h>
+#include <fiemap.h>
+#endif
 
-#define FIEMAP_FLAG_SYNC                0x00000001 /* sync file data before
-                                                    * map
-                                                    */
-#define FIEMAP_FLAG_XATTR               0x00000002 /* map extended attribute
-                                                    * tree
-                                                    */
-#define FIEMAP_EXTENT_LAST              0x00000001 /* Last extent in file. */
-#define FIEMAP_EXTENT_UNKNOWN           0x00000002 /* Data location unknown. */
-#define FIEMAP_EXTENT_DELALLOC          0x00000004 /* Location still pending.
-                                                    * Sets EXTENT_UNKNOWN.
-                                                    */
-#define FIEMAP_EXTENT_ENCODED           0x00000008 /* Data can not be read
-                                                    * while fs is unmounted
-                                                    */
-#define FIEMAP_EXTENT_DATA_ENCRYPTED    0x00000080 /* Data is encrypted by fs.
-                                                    * Sets EXTENT_NO_DIRECT.
-                                                    */
-#define FIEMAP_EXTENT_NOT_ALIGNED       0x00000100 /* Extent offsets may not be
-                                                    * block aligned.
-                                                    */
-#define FIEMAP_EXTENT_DATA_INLINE       0x00000200 /* Data mixed with metadata.
-                                                    * Sets EXTENT_NOT_ALIGNED.*/
-#define FIEMAP_EXTENT_DATA_TAIL         0x00000400 /* Multiple files in block.
-                                                    * Sets EXTENT_NOT_ALIGNED.
-                                                    */
-#define FIEMAP_EXTENT_UNWRITTEN         0x00000800 /* Space allocated, but
-                                                    * no data (i.e. zero).
-                                                    */
-#define FIEMAP_EXTENT_MERGED            0x00001000 /* File does not natively
-                                                    * support extents. Result
-                                                    * merged for efficiency.
-                                                    */
+/* XXX: We use fiemap_extent::fe_reserved[0] */
+#define fe_device       fe_reserved[0]
 
 static inline size_t fiemap_count_to_size(size_t extent_count)
 {
-        return (sizeof(struct ll_user_fiemap) + extent_count *
-                                               sizeof(struct ll_fiemap_extent));
+        return sizeof(struct fiemap) + extent_count *
+                                       sizeof(struct fiemap_extent);
 }
 
 static inline unsigned fiemap_size_to_count(size_t array_size)
 {
-        return ((array_size - sizeof(struct ll_user_fiemap)) /
-                                               sizeof(struct ll_fiemap_extent));
+        return (array_size - sizeof(struct fiemap)) /
+                sizeof(struct fiemap_extent);
 }
 
 #define FIEMAP_FLAG_DEVICE_ORDER 0x40000000 /* return device ordered mapping */
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index 72eaee95c6b8..65ce503ad595 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -48,8 +48,7 @@
  * that the Lustre wire protocol is not influenced by external dependencies.
  *
  * The only other acceptable items in this file are VERY SIMPLE accessor
- * functions to avoid callers grubbing inside the structures, and the
- * prototypes of the swabber functions for each struct.  Nothing that
+ * functions to avoid callers grubbing inside the structures. Nothing that
  * depends on external functions or definitions should be in here.
  *
  * Structs must be properly aligned to put 64-bit values on an 8-byte
@@ -64,23 +63,6 @@
  * in the code to ensure that new/old clients that see this larger struct
  * do not fail, otherwise you need to implement protocol compatibility).
  *
- * We assume all nodes are either little-endian or big-endian, and we
- * always send messages in the sender's native format.  The receiver
- * detects the message format by checking the 'magic' field of the message
- * (see lustre_msg_swabbed() below).
- *
- * Each wire type has corresponding 'lustre_swab_xxxtypexxx()' routines,
- * implemented either here, inline (trivial implementations) or in
- * ptlrpc/pack_generic.c.  These 'swabbers' convert the type from "other"
- * endian, in-place in the message buffer.
- *
- * A swabber takes a single pointer argument.  The caller must already have
- * verified that the length of the message buffer >= sizeof (type).
- *
- * For variable length types, a second 'lustre_swab_v_xxxtypexxx()' routine
- * may be defined that swabs just the variable part, after the caller has
- * verified that the message buffer is large enough.
- *
  * @{
  */
 
@@ -192,113 +174,6 @@ struct lu_seq_range_array {
 
 #define LU_SEQ_RANGE_MASK       0x3
 
-static inline unsigned fld_range_type(const struct lu_seq_range *range)
-{
-        return range->lsr_flags & LU_SEQ_RANGE_MASK;
-}
-
-static inline bool fld_range_is_ost(const struct lu_seq_range *range)
-{
-        return fld_range_type(range) == LU_SEQ_RANGE_OST;
-}
-
-static inline bool fld_range_is_mdt(const struct lu_seq_range *range)
-{
-        return fld_range_type(range) == LU_SEQ_RANGE_MDT;
-}
-
-/**
- * This all range is only being used when fld client sends fld query request,
- * but it does not know whether the seq is MDT or OST, so it will send req
- * with ALL type, which means either seq type gotten from lookup can be
- * expected.
- */
-static inline unsigned fld_range_is_any(const struct lu_seq_range *range)
-{
-        return fld_range_type(range) == LU_SEQ_RANGE_ANY;
-}
-
-static inline void fld_range_set_type(struct lu_seq_range *range,
-                                      unsigned flags)
-{
-        range->lsr_flags |= flags;
-}
-
-static inline void fld_range_set_mdt(struct lu_seq_range *range)
-{
-        fld_range_set_type(range, LU_SEQ_RANGE_MDT);
-}
-
-static inline void fld_range_set_ost(struct lu_seq_range *range)
-{
-        fld_range_set_type(range, LU_SEQ_RANGE_OST);
-}
-
-static inline void fld_range_set_any(struct lu_seq_range *range)
-{
-        fld_range_set_type(range, LU_SEQ_RANGE_ANY);
-}
-
-/**
- * returns  width of given range \a r
- */
-
-static inline __u64 range_space(const struct lu_seq_range *range)
-{
-        return range->lsr_end - range->lsr_start;
-}
-
-/**
- * initialize range to zero
- */
-
-static inline void range_init(struct lu_seq_range *range)
-{
-        memset(range, 0, sizeof(*range));
-}
-
-/**
- * check if given seq id \a s is within given range \a r
- */
-
-static inline bool range_within(const struct lu_seq_range *range,
-                                __u64 s)
-{
-        return s >= range->lsr_start && s < range->lsr_end;
-}
-
-static inline bool range_is_sane(const struct lu_seq_range *range)
-{
-        return (range->lsr_end >= range->lsr_start);
-}
-
-static inline bool range_is_zero(const struct lu_seq_range *range)
-{
-        return (range->lsr_start == 0 && range->lsr_end == 0);
-}
-
-static inline bool range_is_exhausted(const struct lu_seq_range *range)
-
-{
-        return range_space(range) == 0;
-}
-
-/* return 0 if two range have the same location */
-static inline int range_compare_loc(const struct lu_seq_range *r1,
-                                    const struct lu_seq_range *r2)
-{
-        return r1->lsr_index != r2->lsr_index ||
-               r1->lsr_flags != r2->lsr_flags;
-}
-
-#define DRANGE "[%#16.16Lx-%#16.16Lx):%x:%s"
-
-#define PRANGE(range)           \
-        (range)->lsr_start,     \
-        (range)->lsr_end,       \
-        (range)->lsr_index,     \
-        fld_range_is_mdt(range) ? "mdt" : "ost"
-
 /** \defgroup lu_fid lu_fid
  * @{
  */
@@ -310,7 +185,7 @@ static inline int range_compare_loc(const struct lu_seq_range *r1,
  */
 enum lma_compat {
         LMAC_HSM        = 0x00000001,
-        LMAC_SOM        = 0x00000002,
+/*      LMAC_SOM        = 0x00000002, obsolete since 2.8.0 */
         LMAC_NOT_IN_OI  = 0x00000004, /* the object does NOT need OI mapping */
         LMAC_FID_ON_OST = 0x00000008, /* For OST-object, its OI mapping is
                                        * under /O/<seq>/d<x>.
@@ -644,13 +519,14 @@ static inline void ostid_set_id(struct ost_id *oi, __u64 oid)
 {
         if (fid_seq_is_mdt0(oi->oi.oi_seq)) {
                 if (oid >= IDIF_MAX_OID) {
-                        CERROR("Bad %llu to set " DOSTID "\n", oid, POSTID(oi));
+                        CERROR("Too large OID %#llx to set MDT0 " DOSTID "\n",
+                               oid, POSTID(oi));
                         return;
                 }
                 oi->oi.oi_id = oid;
         } else if (fid_is_idif(&oi->oi_fid)) {
                 if (oid >= IDIF_MAX_OID) {
-                        CERROR("Bad %llu to set "DOSTID"\n",
+                        CERROR("Too large OID %#llx to set IDIF " DOSTID "\n",
                                oid, POSTID(oi));
                         return;
                 }
@@ -676,7 +552,7 @@ static inline int fid_set_id(struct lu_fid *fid, __u64 oid)
 
         if (fid_is_idif(fid)) {
                 if (oid >= IDIF_MAX_OID) {
-                        CERROR("Too large OID %#llx to set IDIF "DFID"\n",
+                        CERROR("Too large OID %#llx to set IDIF " DFID "\n",
                                (unsigned long long)oid, PFID(fid));
                         return -EBADF;
                 }
@@ -685,7 +561,7 @@ static inline int fid_set_id(struct lu_fid *fid, __u64 oid)
                 fid->f_ver = oid >> 48;
         } else {
                 if (oid >= OBIF_MAX_OID) {
-                        CERROR("Too large OID %#llx to set REG "DFID"\n",
+                        CERROR("Too large OID %#llx to set REG " DFID "\n",
                                (unsigned long long)oid, PFID(fid));
                         return -EBADF;
                 }
@@ -785,8 +661,6 @@ static inline ino_t lu_igif_ino(const struct lu_fid *fid)
         return fid_seq(fid);
 }
 
-void lustre_swab_ost_id(struct ost_id *oid);
-
 /**
  * Get inode generation from a igif.
  * \param fid a igif to get inode generation from.
@@ -847,9 +721,6 @@ static inline bool fid_is_sane(const struct lu_fid *fid)
                 fid_seq_is_rsvd(fid_seq(fid)));
 }
 
-void lustre_swab_lu_fid(struct lu_fid *fid);
-void lustre_swab_lu_seq_range(struct lu_seq_range *range);
-
 static inline bool lu_fid_eq(const struct lu_fid *f0, const struct lu_fid *f1)
 {
         return memcmp(f0, f1, sizeof(*f0)) == 0;
@@ -1099,8 +970,10 @@ struct ptlrpc_body_v3 {
         __u32 pb_version;
         __u32 pb_opc;
         __u32 pb_status;
-        __u64 pb_last_xid;
-        __u64 pb_last_seen;
+        __u64 pb_last_xid; /* highest replied XID without lower unreplied XID */
+        __u16 pb_tag;      /* virtual slot idx for multiple modifying RPCs */
+        __u16 pb_padding0;
+        __u32 pb_padding1;
         __u64 pb_last_committed;
         __u64 pb_transno;
         __u32 pb_flags;
@@ -1112,8 +985,11 @@ struct ptlrpc_body_v3 {
         __u64 pb_slv;
         /* VBR: pre-versions */
         __u64 pb_pre_versions[PTLRPC_NUM_VERSIONS];
+        __u64 pb_mbits; /**< match bits for bulk request */
         /* padding for future needs */
-        __u64 pb_padding[4];
+        __u64 pb_padding64_0;
+        __u64 pb_padding64_1;
+        __u64 pb_padding64_2;
         char  pb_jobid[LUSTRE_JOBID_SIZE];
 };
 
@@ -1125,8 +1001,10 @@ struct ptlrpc_body_v2 {
         __u32 pb_version;
         __u32 pb_opc;
         __u32 pb_status;
-        __u64 pb_last_xid;
-        __u64 pb_last_seen;
+        __u64 pb_last_xid; /* highest replied XID without lower unreplied XID */
+        __u16 pb_tag;      /* virtual slot idx for multiple modifying RPCs */
+        __u16 pb_padding0;
+        __u32 pb_padding1;
         __u64 pb_last_committed;
         __u64 pb_transno;
         __u32 pb_flags;
@@ -1140,12 +1018,13 @@ struct ptlrpc_body_v2 {
         __u64 pb_slv;
         /* VBR: pre-versions */
         __u64 pb_pre_versions[PTLRPC_NUM_VERSIONS];
+        __u64 pb_mbits; /**< unused in V2 */
         /* padding for future needs */
-        __u64 pb_padding[4];
+        __u64 pb_padding64_0;
+        __u64 pb_padding64_1;
+        __u64 pb_padding64_2;
 };
 
-void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
-
 /* message body offset for lustre_msg_v2 */
 /* ptlrpc body offset in all request/reply messages */
 #define MSG_PTLRPC_BODY_OFF          0
@@ -1282,7 +1161,16 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
                                                          */
 #define OBD_CONNECT_LFSCK       0x40000000000000ULL/* support online LFSCK */
 #define OBD_CONNECT_UNLINK_CLOSE 0x100000000000000ULL/* close file in unlink */
+#define OBD_CONNECT_MULTIMODRPCS 0x200000000000000ULL /* support multiple modify
+                                                       *  RPCs in parallel
+                                                       */
 #define OBD_CONNECT_DIR_STRIPE   0x400000000000000ULL/* striped DNE dir */
+#define OBD_CONNECT_SUBTREE      0x800000000000000ULL /* fileset mount */
+#define OBD_CONNECT_LOCK_AHEAD   0x1000000000000000ULL /* lock ahead */
+/** bulk matchbits is sent within ptlrpc_body */
+#define OBD_CONNECT_BULK_MBITS   0x2000000000000000ULL
+#define OBD_CONNECT_OBDOPACK     0x4000000000000000ULL /* compact OUT obdo */
+#define OBD_CONNECT_FLAGS2       0x8000000000000000ULL /* second flags word */
 
 /* XXX README XXX:
  * Please DO NOT add flag values here before first ensuring that this same
@@ -1313,25 +1201,6 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
  * If we eventually have separate connect data for different types, which we
  * almost certainly will, then perhaps we stick a union in here.
  */
-struct obd_connect_data_v1 {
-        __u64 ocd_connect_flags; /* OBD_CONNECT_* per above */
-        __u32 ocd_version;       /* lustre release version number */
-        __u32 ocd_grant;         /* initial cache grant amount (bytes) */
-        __u32 ocd_index;         /* LOV index to connect to */
-        __u32 ocd_brw_size;      /* Maximum BRW size in bytes, must be 2^n */
-        __u64 ocd_ibits_known;   /* inode bits this client understands */
-        __u8  ocd_blocksize;     /* log2 of the backend filesystem blocksize */
-        __u8  ocd_inodespace;    /* log2 of the per-inode space consumption */
-        __u16 ocd_grant_extent;  /* per-extent grant overhead, in 1K blocks */
-        __u32 ocd_unused;       /* also fix lustre_swab_connect */
-        __u64 ocd_transno;       /* first transno from client to be replayed */
-        __u32 ocd_group;         /* MDS group on OST */
-        __u32 ocd_cksum_types;   /* supported checksum algorithms */
-        __u32 ocd_max_easize;    /* How big LOV EA can be on MDS */
-        __u32 ocd_instance;      /* also fix lustre_swab_connect */
-        __u64 ocd_maxbytes;      /* Maximum stripe size in bytes */
-};
-
 struct obd_connect_data {
         __u64 ocd_connect_flags; /* OBD_CONNECT_* per above */
         __u32 ocd_version;       /* lustre release version number */
@@ -1354,8 +1223,10 @@ struct obd_connect_data {
          * any field after ocd_maxbytes on the receiver without a valid flag
          * may result in out-of-bound memory access and kernel oops.
          */
-        __u64 padding1;   /* added 2.1.0. also fix lustre_swab_connect */
-        __u64 padding2;   /* added 2.1.0. also fix lustre_swab_connect */
+        __u16 ocd_maxmodrpcs;   /* Maximum modify RPCs in parallel */
+        __u16 padding0;         /* added 2.1.0. also fix lustre_swab_connect */
+        __u32 padding1;         /* added 2.1.0. also fix lustre_swab_connect */
+        __u64 ocd_connect_flags2;
         __u64 padding3;   /* added 2.1.0. also fix lustre_swab_connect */
         __u64 padding4;   /* added 2.1.0. also fix lustre_swab_connect */
         __u64 padding5;   /* added 2.1.0. also fix lustre_swab_connect */
@@ -1380,8 +1251,6 @@ struct obd_connect_data {
  * reserve the flag for future use.
  */
 
-void lustre_swab_connect(struct obd_connect_data *ocd);
-
 /*
  * Supported checksum algorithms. Up to 32 checksum types are supported.
  * (32-bit mask stored in obd_connect_data::ocd_cksum_types)
@@ -1416,7 +1285,7 @@ enum ost_cmd {
         OST_STATFS     = 13,
         OST_SYNC       = 16,
         OST_SET_INFO   = 17,
-        OST_QUOTACHECK = 18,
+        OST_QUOTACHECK = 18, /* not used since 2.4 */
         OST_QUOTACTL   = 19,
         OST_QUOTA_ADJUST_QUNIT = 20, /* not used since 2.4 */
         OST_LAST_OPC
@@ -1580,8 +1449,6 @@ static inline void lmm_oi_cpu_to_le(struct ost_id *dst_oi,
         dst_oi->oi.oi_seq = cpu_to_le64(src_oi->oi.oi_seq);
 }
 
-/* extern void lustre_swab_lov_mds_md(struct lov_mds_md *llm); */
-
 #define MAX_MD_SIZE                                                     \
         (sizeof(struct lov_mds_md) + 4 * sizeof(struct lov_ost_data))
 #define MIN_MD_SIZE                                                     \
@@ -1674,7 +1541,7 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic)
 #define OBD_MD_FLCKSUM     (0x00100000ULL) /* bulk data checksum */
 #define OBD_MD_FLQOS       (0x00200000ULL) /* quality of service stats */
 /*#define OBD_MD_FLOSCOPQ    (0x00400000ULL) osc opaque data, never used */
-#define OBD_MD_FLCOOKIE    (0x00800000ULL) /* log cancellation cookie */
+/*      OBD_MD_FLCOOKIE    (0x00800000ULL) obsolete in 2.8 */
 #define OBD_MD_FLGROUP     (0x01000000ULL) /* group */
 #define OBD_MD_FLFID       (0x02000000ULL) /* ->ost write inline fid */
 #define OBD_MD_FLEPOCH     (0x04000000ULL) /* ->ost write with ioepoch */
@@ -1713,7 +1580,9 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic)
 /*      OBD_MD_FLRMTRGETFACL (0x0008000000000000ULL) lfs rgetfacl, obsolete */
 
 #define OBD_MD_FLDATAVERSION (0x0010000000000000ULL) /* iversion sum */
-#define OBD_MD_FLRELEASED    (0x0020000000000000ULL) /* file released */
+#define OBD_MD_CLOSE_INTENT_EXECED (0x0020000000000000ULL) /* close intent
+                                                            * executed
+                                                            */
 
 #define OBD_MD_DEFAULT_MEA   (0x0040000000000000ULL) /* default MEA */
 
@@ -1742,11 +1611,6 @@ struct hsm_state_set {
         __u64   hss_clearmask;
 };
 
-void lustre_swab_hsm_user_state(struct hsm_user_state *hus);
-void lustre_swab_hsm_state_set(struct hsm_state_set *hss);
-
-void lustre_swab_obd_statfs(struct obd_statfs *os);
-
 /* ost_body.data values for OST_BRW */
 
 #define OBD_BRW_READ            0x01
@@ -1786,14 +1650,16 @@ struct obd_ioobj {
         __u32           ioo_bufcnt;     /* number of niobufs for this object */
 };
 
+/*
+ * NOTE: IOOBJ_MAX_BRW_BITS defines the _offset_ of the max_brw field in
+ * ioo_max_brw, NOT the maximum number of bits in PTLRPC_BULK_OPS_BITS.
+ * That said, ioo_max_brw is a 32-bit field so the limit is also 16 bits.
+ */
 #define IOOBJ_MAX_BRW_BITS      16
-#define IOOBJ_TYPE_MASK         ((1U << IOOBJ_MAX_BRW_BITS) - 1)
 #define ioobj_max_brw_get(ioo)  (((ioo)->ioo_max_brw >> IOOBJ_MAX_BRW_BITS) + 1)
 #define ioobj_max_brw_set(ioo, num)                                     \
 do { (ioo)->ioo_max_brw = ((num) - 1) << IOOBJ_MAX_BRW_BITS; } while (0)
 
-void lustre_swab_obd_ioobj(struct obd_ioobj *ioo);
-
 /* multiple of 8 bytes => can array */
 struct niobuf_remote {
         __u64   rnb_offset;
@@ -1801,8 +1667,6 @@ struct niobuf_remote {
         __u32   rnb_flags;
 };
 
-void lustre_swab_niobuf_remote(struct niobuf_remote *nbr);
-
 /* lock value block communicated between the filter and llite */
 
 /* OST_LVB_ERR_INIT is needed because the return code in rc is
@@ -1824,8 +1688,6 @@ struct ost_lvb_v1 {
         __u64           lvb_blocks;
 };
 
-void lustre_swab_ost_lvb_v1(struct ost_lvb_v1 *lvb);
-
 struct ost_lvb {
         __u64           lvb_size;
         __s64           lvb_mtime;
@@ -1838,8 +1700,6 @@ struct ost_lvb {
         __u32           lvb_padding;
 };
 
-void lustre_swab_ost_lvb(struct ost_lvb *lvb);
-
 /*
  *   lquota data structures
  */
@@ -1866,8 +1726,6 @@ struct obd_quotactl {
         struct obd_dqblk        qc_dqblk;
 };
 
-void lustre_swab_obd_quotactl(struct obd_quotactl *q);
-
 #define Q_COPY(out, in, member) (out)->member = (in)->member
 
 #define QCTL_COPY(out, in)              \
@@ -1905,8 +1763,6 @@ struct lquota_lvb {
         __u64   lvb_pad1;
 };
 
-void lustre_swab_lquota_lvb(struct lquota_lvb *lvb);
-
 /* op codes */
 enum quota_cmd {
         QUOTA_DQACQ     = 601,
@@ -1933,9 +1789,9 @@ enum mds_cmd {
         MDS_PIN                 = 42, /* obsolete, never used in a release */
         MDS_UNPIN               = 43, /* obsolete, never used in a release */
         MDS_SYNC                = 44,
-        MDS_DONE_WRITING        = 45,
+        MDS_DONE_WRITING        = 45, /* obsolete since 2.8.0 */
         MDS_SET_INFO            = 46,
-        MDS_QUOTACHECK          = 47,
+        MDS_QUOTACHECK          = 47, /* not used since 2.4 */
         MDS_QUOTACTL            = 48,
         MDS_GETXATTR            = 49,
         MDS_SETXATTR            = 50, /* obsolete, now it's MDS_REINT op */
@@ -1972,8 +1828,6 @@ enum mdt_reint_cmd {
         REINT_MAX
 };
 
-void lustre_swab_generic_32s(__u32 *val);
-
 /* the disposition of the intent outlines what was executed */
 #define DISP_IT_EXECD   0x00000001
 #define DISP_LOOKUP_EXECD    0x00000002
@@ -2031,36 +1885,19 @@ enum {
 #define MDS_STATUS_CONN 1
 #define MDS_STATUS_LOV 2
 
-/* mdt_thread_info.mti_flags. */
-enum md_op_flags {
-        /* The flag indicates Size-on-MDS attributes are changed. */
-        MF_SOM_CHANGE      = (1 << 0),
-        /* Flags indicates an epoch opens or closes. */
-        MF_EPOCH_OPEN      = (1 << 1),
-        MF_EPOCH_CLOSE    = (1 << 2),
-        MF_MDC_CANCEL_FID1      = (1 << 3),
-        MF_MDC_CANCEL_FID2      = (1 << 4),
-        MF_MDC_CANCEL_FID3      = (1 << 5),
-        MF_MDC_CANCEL_FID4      = (1 << 6),
-        /* There is a pending attribute update. */
-        MF_SOM_AU              = (1 << 7),
-        /* Cancel OST locks while getattr OST attributes. */
-        MF_GETATTR_LOCK  = (1 << 8),
-        MF_GET_MDT_IDX    = (1 << 9),
-};
-
-#define MF_SOM_LOCAL_FLAGS (MF_SOM_CHANGE | MF_EPOCH_OPEN | MF_EPOCH_CLOSE)
-
-#define LUSTRE_BFLAG_UNCOMMITTED_WRITES   0x1
-
 /* these should be identical to their EXT4_*_FL counterparts, they are
  * redefined here only to avoid dragging in fs/ext4/ext4.h
  */
 #define LUSTRE_SYNC_FL   0x00000008 /* Synchronous updates */
 #define LUSTRE_IMMUTABLE_FL    0x00000010 /* Immutable file */
 #define LUSTRE_APPEND_FL       0x00000020 /* writes to file may only append */
+#define LUSTRE_NODUMP_FL        0x00000040 /* do not dump file */
 #define LUSTRE_NOATIME_FL      0x00000080 /* do not update atime */
+#define LUSTRE_INDEX_FL         0x00001000 /* hash-indexed directory */
 #define LUSTRE_DIRSYNC_FL      0x00010000 /* dirsync behaviour (dir only) */
+#define LUSTRE_TOPDIR_FL        0x00020000 /* Top of directory hierarchies*/
+#define LUSTRE_DIRECTIO_FL      0x00100000 /* Use direct i/o */
+#define LUSTRE_INLINE_DATA_FL   0x10000000 /* Inode has inline data. */
 
 /* Convert wire LUSTRE_*_FL to corresponding client local VFS S_* values
  * for the client inode i_flags.  The LUSTRE_*_FL are the Lustre wire
@@ -2113,7 +1950,7 @@ struct mdt_body {
         __u32   mbo_mode;
         __u32   mbo_uid;
         __u32   mbo_gid;
-        __u32   mbo_flags;
+        __u32   mbo_flags;      /* LUSTRE_*_FL file attributes */
         __u32   mbo_rdev;
         __u32   mbo_nlink;      /* #bytes to read in the case of MDS_READPAGE */
         __u32   mbo_unused2;    /* was "generation" until 2.4.0 */
@@ -2121,7 +1958,7 @@ struct mdt_body {
         __u32   mbo_eadatasize;
         __u32   mbo_aclsize;
         __u32   mbo_max_mdsize;
-        __u32   mbo_max_cookiesize;
+        __u32   mbo_unused3;    /* was max_cookiesize until 2.8 */
         __u32   mbo_uid_h;      /* high 32-bits of uid, for FUID */
         __u32   mbo_gid_h;      /* high 32-bits of gid, for FUID */
         __u32   mbo_padding_5;  /* also fix lustre_swab_mdt_body */
@@ -2132,17 +1969,13 @@ struct mdt_body {
         __u64   mbo_padding_10;
 }; /* 216 */
 
-void lustre_swab_mdt_body(struct mdt_body *b);
-
 struct mdt_ioepoch {
-        struct lustre_handle handle;
-        __u64  ioepoch;
-        __u32  flags;
-        __u32  padding;
+        struct lustre_handle mio_handle;
+        __u64 mio_unused1; /* was ioepoch */
+        __u32 mio_unused2; /* was flags */
+        __u32 mio_padding;
 };
 
-void lustre_swab_mdt_ioepoch(struct mdt_ioepoch *b);
-
 /* permissions for md_perm.mp_perm */
 enum {
         CFS_SETUID_PERM = 0x01,
@@ -2178,8 +2011,6 @@ struct mdt_rec_setattr {
         __u32      sa_padding_5;
 };
 
-void lustre_swab_mdt_rec_setattr(struct mdt_rec_setattr *sa);
-
 /*
  * Attribute flags used in mdt_rec_setattr::sa_valid.
  * The kernel's #defines for ATTR_* should not be used over the network
@@ -2207,12 +2038,9 @@ void lustre_swab_mdt_rec_setattr(struct mdt_rec_setattr *sa);
 
 #define MDS_FMODE_CLOSED         00000000
 #define MDS_FMODE_EXEC     00000004
-/* IO Epoch is opened on a closed file. */
-#define MDS_FMODE_EPOCH   01000000
-/* IO Epoch is opened on a file truncate. */
-#define MDS_FMODE_TRUNC   02000000
-/* Size-on-MDS Attribute Update is pending. */
-#define MDS_FMODE_SOM       04000000
+/*      MDS_FMODE_EPOCH         01000000 obsolete since 2.8.0 */
+/*      MDS_FMODE_TRUNC         02000000 obsolete since 2.8.0 */
+/*      MDS_FMODE_SOM           04000000 obsolete since 2.8.0 */
 
 #define MDS_OPEN_CREATED         00000010
 #define MDS_OPEN_CROSS     00000020
@@ -2258,7 +2086,7 @@ enum mds_op_bias {
         MDS_CROSS_REF           = 1 << 1,
         MDS_VTX_BYPASS          = 1 << 2,
         MDS_PERM_BYPASS         = 1 << 3,
-        MDS_SOM                 = 1 << 4,
+/*      MDS_SOM                 = 1 << 4, obsolete since 2.8.0 */
         MDS_QUOTA_IGNORE        = 1 << 5,
         MDS_CLOSE_CLEANUP       = 1 << 6,
         MDS_KEEP_ORPHAN         = 1 << 7,
@@ -2268,6 +2096,7 @@ enum mds_op_bias {
         MDS_OWNEROVERRIDE       = 1 << 11,
         MDS_HSM_RELEASE         = 1 << 12,
         MDS_RENAME_MIGRATE      = BIT(13),
+        MDS_CLOSE_LAYOUT_SWAP   = BIT(14),
 };
 
 /* instance of mdt_reint_rec */
@@ -2456,8 +2285,6 @@ struct mdt_rec_reint {
         __u32      rr_padding_4; /* also fix lustre_swab_mdt_rec_reint */
 };
 
-void lustre_swab_mdt_rec_reint(struct mdt_rec_reint *rr);
-
 /* lmv structures */
 struct lmv_desc {
         __u32 ld_tgt_count;             /* how many MDS's */
@@ -2547,8 +2374,6 @@ union lmv_mds_md {
         struct lmv_user_md      lmv_user_md;
 };
 
-void lustre_swab_lmv_mds_md(union lmv_mds_md *lmm);
-
 static inline ssize_t lmv_mds_md_size(int stripe_count, unsigned int lmm_magic)
 {
         ssize_t len = -EINVAL;
@@ -2652,8 +2477,6 @@ struct lov_desc {
 
 #define ld_magic ld_active_tgt_count       /* for swabbing from llogs */
 
-void lustre_swab_lov_desc(struct lov_desc *ld);
-
 /*
  *   LDLM requests:
  */
@@ -2749,24 +2572,38 @@ struct ldlm_flock_wire {
  * on the resource type.
  */
 
-typedef union {
+union ldlm_wire_policy_data {
         struct ldlm_extent l_extent;
         struct ldlm_flock_wire l_flock;
         struct ldlm_inodebits l_inodebits;
-} ldlm_wire_policy_data_t;
+};
 
 union ldlm_gl_desc {
         struct ldlm_gl_lquota_desc      lquota_desc;
 };
 
-void lustre_swab_gl_desc(union ldlm_gl_desc *);
+enum ldlm_intent_flags {
+        IT_OPEN         = BIT(0),
+        IT_CREAT        = BIT(1),
+        IT_OPEN_CREAT   = BIT(1) | BIT(0),
+        IT_READDIR      = BIT(2),
+        IT_GETATTR      = BIT(3),
+        IT_LOOKUP       = BIT(4),
+        IT_UNLINK       = BIT(5),
+        IT_TRUNC        = BIT(6),
+        IT_GETXATTR     = BIT(7),
+        IT_EXEC         = BIT(8),
+        IT_PIN          = BIT(9),
+        IT_LAYOUT       = BIT(10),
+        IT_QUOTA_DQACQ  = BIT(11),
+        IT_QUOTA_CONN   = BIT(12),
+        IT_SETXATTR     = BIT(13),
+};
 
 struct ldlm_intent {
         __u64 opc;
 };
 
-void lustre_swab_ldlm_intent(struct ldlm_intent *i);
-
 struct ldlm_resource_desc {
         enum ldlm_type lr_type;
         __u32 lr_padding;       /* also fix lustre_swab_ldlm_resource_desc */
@@ -2777,7 +2614,7 @@ struct ldlm_lock_desc {
         struct ldlm_resource_desc l_resource;
         enum ldlm_mode l_req_mode;
         enum ldlm_mode l_granted_mode;
-        ldlm_wire_policy_data_t l_policy_data;
+        union ldlm_wire_policy_data l_policy_data;
 };
 
 #define LDLM_LOCKREQ_HANDLES 2
@@ -2790,8 +2627,6 @@ struct ldlm_request {
         struct lustre_handle lock_handle[LDLM_LOCKREQ_HANDLES];
 };
 
-void lustre_swab_ldlm_request(struct ldlm_request *rq);
-
 /* If LDLM_ENQUEUE, 1 slot is already occupied, 1 is available.
  * Otherwise, 2 are available.
  */
@@ -2813,8 +2648,6 @@ struct ldlm_reply {
         __u64  lock_policy_res2;
 };
 
-void lustre_swab_ldlm_reply(struct ldlm_reply *r);
-
 #define ldlm_flags_to_wire(flags)    ((__u32)(flags))
 #define ldlm_flags_from_wire(flags)  ((__u64)(flags))
 
@@ -2858,8 +2691,6 @@ struct mgs_target_info {
         char         mti_params[MTI_PARAM_MAXLEN];
 };
 
-void lustre_swab_mgs_target_info(struct mgs_target_info *oinfo);
-
 struct mgs_nidtbl_entry {
         __u64      mne_version;    /* table version of this entry */
         __u32      mne_instance;   /* target instance # */
@@ -2874,8 +2705,6 @@ struct mgs_nidtbl_entry {
         } u;
 };
 
-void lustre_swab_mgs_nidtbl_entry(struct mgs_nidtbl_entry *oinfo);
-
 struct mgs_config_body {
         char     mcb_name[MTI_NAME_MAXLEN]; /* logname */
         __u64    mcb_offset;    /* next index of config log to request */
@@ -2885,15 +2714,11 @@ struct mgs_config_body {
         __u32    mcb_units;     /* # of units for bulk transfer */
 };
 
-void lustre_swab_mgs_config_body(struct mgs_config_body *body);
-
 struct mgs_config_res {
         __u64    mcr_offset;    /* index of last config log */
         __u64    mcr_size;      /* size of the log */
 };
 
-void lustre_swab_mgs_config_res(struct mgs_config_res *body);
-
 /* Config marker flags (in config log) */
 #define CM_START       0x01
 #define CM_END   0x02
@@ -2913,8 +2738,6 @@ struct cfg_marker {
         char          cm_comment[MTI_NAME_MAXLEN];
 };
 
-void lustre_swab_cfg_marker(struct cfg_marker *marker, int swab, int size);
-
 /*
  * Opcodes for multiple servers.
  */
@@ -2922,7 +2745,7 @@ void lustre_swab_cfg_marker(struct cfg_marker *marker, int swab, int size);
 enum obd_cmd {
         OBD_PING = 400,
         OBD_LOG_CANCEL,
-        OBD_QC_CALLBACK,
+        OBD_QC_CALLBACK, /* not used since 2.4 */
         OBD_IDX_READ,
         OBD_LAST_OPC
 };
@@ -3155,23 +2978,32 @@ struct llog_gen_rec {
         struct llog_rec_tail    lgr_tail;
 };
 
-/* On-disk header structure of each log object, stored in little endian order */
-#define LLOG_CHUNK_SIZE  8192
-#define LLOG_HEADER_SIZE        (96)
-#define LLOG_BITMAP_BYTES       (LLOG_CHUNK_SIZE - LLOG_HEADER_SIZE)
-
-#define LLOG_MIN_REC_SIZE       (24) /* round(llog_rec_hdr + llog_rec_tail) */
-
 /* flags for the logs */
 enum llog_flag {
         LLOG_F_ZAP_WHEN_EMPTY   = 0x1,
         LLOG_F_IS_CAT           = 0x2,
         LLOG_F_IS_PLAIN         = 0x4,
         LLOG_F_EXT_JOBID        = BIT(3),
+        LLOG_F_IS_FIXSIZE       = BIT(4),
 
+        /*
+         * Note: Flags covered by LLOG_F_EXT_MASK will be inherited from
+         * catlog to plain log, so do not add LLOG_F_IS_FIXSIZE here,
+         * because the catlog record is usually fixed size, but its plain
+         * log record can be variable
+         */
         LLOG_F_EXT_MASK = LLOG_F_EXT_JOBID,
 };
 
+/* On-disk header structure of each log object, stored in little endian order */
+#define LLOG_MIN_CHUNK_SIZE     8192
+#define LLOG_HEADER_SIZE        (96)    /* sizeof (llog_log_hdr) +
+                                         * sizeof(llh_tail) - sizeof(llh_bitmap)
+                                         */
+#define LLOG_BITMAP_BYTES       (LLOG_MIN_CHUNK_SIZE - LLOG_HEADER_SIZE)
+#define LLOG_MIN_REC_SIZE       (24)    /* round(llog_rec_hdr + llog_rec_tail) */
+
+/* flags for the logs */
 struct llog_log_hdr {
         struct llog_rec_hdr     llh_hdr;
         __s64              llh_timestamp;
@@ -3183,13 +3015,30 @@ struct llog_log_hdr {
         /* for a catalog the first plain slot is next to it */
         struct obd_uuid  llh_tgtuuid;
         __u32              llh_reserved[LLOG_HEADER_SIZE / sizeof(__u32) - 23];
+        /* These fields must always be at the end of the llog_log_hdr.
+         * Note: llh_bitmap size is variable because llog chunk size could be
+         * bigger than LLOG_MIN_CHUNK_SIZE, i.e. sizeof(llog_log_hdr) > 8192
+         * bytes, and the real size is stored in llh_hdr.lrh_len, which means
+         * llh_tail should only be referred by LLOG_HDR_TAIL().
+         * But this structure is also used by client/server llog interface
+         * (see llog_client.c), it will be kept in its original way to avoid
+         * compatibility issue.
+         */
         __u32              llh_bitmap[LLOG_BITMAP_BYTES / sizeof(__u32)];
         struct llog_rec_tail    llh_tail;
 } __packed;
 
-#define LLOG_BITMAP_SIZE(llh)  (__u32)((llh->llh_hdr.lrh_len -          \
-                                        llh->llh_bitmap_offset -        \
-                                        sizeof(llh->llh_tail)) * 8)
+#undef LLOG_HEADER_SIZE
+#undef LLOG_BITMAP_BYTES
+
+#define LLOG_HDR_BITMAP_SIZE(llh) (__u32)((llh->llh_hdr.lrh_len -       \
+                                           llh->llh_bitmap_offset -     \
+                                           sizeof(llh->llh_tail)) * 8)
+#define LLOG_HDR_BITMAP(llh)    (__u32 *)((char *)(llh) +               \
+                                          (llh)->llh_bitmap_offset)
+#define LLOG_HDR_TAIL(llh)      ((struct llog_rec_tail *)((char *)llh + \
+                                                         llh->llh_hdr.lrh_len - \
+                                                         sizeof(llh->llh_tail)))
 
 /** log cookies are used to reference a specific log file and a record
  * therein
@@ -3259,7 +3108,8 @@ struct obdo {
         __u32              o_parent_ver;
         struct lustre_handle    o_handle;  /* brw: lock handle to prolong locks
                                             */
-        struct llog_cookie      o_lcookie; /* destroy: unlink cookie from MDS
+        struct llog_cookie      o_lcookie; /* destroy: unlink cookie from MDS,
+                                            * obsolete in 2.8, reused in OSP
                                             */
         __u32                   o_uid_h;
         __u32                   o_gid_h;
@@ -3333,30 +3183,11 @@ struct ost_body {
 
 /* Key for FIEMAP to be used in get_info calls */
 struct ll_fiemap_info_key {
-        char    name[8];
-        struct  obdo oa;
-        struct  ll_user_fiemap fiemap;
+        char            lfik_name[8];
+        struct obdo     lfik_oa;
+        struct fiemap   lfik_fiemap;
 };
 
-void lustre_swab_ost_body(struct ost_body *b);
-void lustre_swab_ost_last_id(__u64 *id);
-void lustre_swab_fiemap(struct ll_user_fiemap *fiemap);
-
-void lustre_swab_lov_user_md_v1(struct lov_user_md_v1 *lum);
-void lustre_swab_lov_user_md_v3(struct lov_user_md_v3 *lum);
-void lustre_swab_lov_user_md_objects(struct lov_user_ost_data *lod,
-                                     int stripe_count);
-void lustre_swab_lov_mds_md(struct lov_mds_md *lmm);
-
-/* llog_swab.c */
-void lustre_swab_llogd_body(struct llogd_body *d);
-void lustre_swab_llog_hdr(struct llog_log_hdr *h);
-void lustre_swab_llogd_conn_body(struct llogd_conn_body *d);
-void lustre_swab_llog_rec(struct llog_rec_hdr *rec);
-
-struct lustre_cfg;
-void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg);
-
 /* Functions for dumping PTLRPC fields */
 void dump_rniobuf(struct niobuf_remote *rnb);
 void dump_ioo(struct obd_ioobj *nb);
@@ -3394,8 +3225,6 @@ struct lustre_capa {
         __u8        lc_hmac[CAPA_HMAC_MAX_LEN];   /** HMAC */
 } __packed;
 
-void lustre_swab_lustre_capa(struct lustre_capa *c);
-
 /** lustre_capa::lc_opc */
 enum {
         CAPA_OPC_BODY_WRITE   = 1 << 0,  /**< write object data */
@@ -3458,8 +3287,6 @@ struct getinfo_fid2path {
         char        gf_path[0];
 } __packed;
 
-void lustre_swab_fid2path(struct getinfo_fid2path *gf);
-
 /** path2parent request/reply structures */
 struct getparent {
         struct lu_fid   gp_fid;         /**< parent FID */
@@ -3486,8 +3313,6 @@ struct layout_intent {
         __u64 li_end;
 };
 
-void lustre_swab_layout_intent(struct layout_intent *li);
-
 /**
  * On the wire version of hsm_progress structure.
  *
@@ -3506,13 +3331,6 @@ struct hsm_progress_kernel {
         __u64                   hpk_padding2;
 } __packed;
 
-void lustre_swab_hsm_user_state(struct hsm_user_state *hus);
-void lustre_swab_hsm_current_action(struct hsm_current_action *action);
-void lustre_swab_hsm_progress_kernel(struct hsm_progress_kernel *hpk);
-void lustre_swab_hsm_user_state(struct hsm_user_state *hus);
-void lustre_swab_hsm_user_item(struct hsm_user_item *hui);
-void lustre_swab_hsm_request(struct hsm_request *hr);
-
 /** layout swap request structure
  * fid1 and fid2 are in mdt_body
  */
@@ -3520,8 +3338,6 @@ struct mdc_swap_layouts {
         __u64      msl_flags;
 } __packed;
 
-void lustre_swab_swap_layouts(struct mdc_swap_layouts *msl);
-
 struct close_data {
         struct lustre_handle    cd_handle;
         struct lu_fid           cd_fid;
@@ -3529,7 +3345,5 @@ struct close_data {
         __u64                   cd_reserved[8];
 };
 
-void lustre_swab_close_data(struct close_data *data);
-
 #endif
 /** @} lustreidl */
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h
index f3d7c94c3b50..eb08df33b2db 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h
@@ -363,8 +363,8 @@ obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
 /*      OBD_IOC_LOV_GETSTRIPE   155 LL_IOC_LOV_GETSTRIPE */
 /*      OBD_IOC_LOV_SETEA       156 LL_IOC_LOV_SETEA */
 /*      lustre/lustre_user.h    157-159 */
-#define OBD_IOC_QUOTACHECK      _IOW('f', 160, int)
-#define OBD_IOC_POLL_QUOTACHECK _IOR('f', 161, struct if_quotacheck *)
+/*      OBD_IOC_QUOTACHECK      _IOW('f', 160, int) */
+/*      OBD_IOC_POLL_QUOTACHECK _IOR('f', 161, struct if_quotacheck *) */
 #define OBD_IOC_QUOTACTL        _IOWR('f', 162, struct if_quotactl)
 /*      lustre/lustre_user.h    163-176 */
 #define OBD_IOC_CHANGELOG_REG   _IOW('f', 177, struct obd_ioctl_data)
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
index 6fc985571cba..3301ad652db1 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
@@ -63,9 +63,13 @@
 #if __BITS_PER_LONG != 64 || defined(__ARCH_WANT_STAT64)
 typedef struct stat64   lstat_t;
 #define lstat_f  lstat64
+#define fstat_f         fstat64
+#define fstatat_f       fstatat64
 #else
 typedef struct stat     lstat_t;
 #define lstat_f  lstat
+#define fstat_f         fstat
+#define fstatat_f       fstatat
 #endif
 
 #define HAVE_LOV_USER_MDS_DATA
@@ -82,7 +86,6 @@ typedef struct stat     lstat_t;
 #define FSFILT_IOC_SETVERSION        _IOW('f', 4, long)
 #define FSFILT_IOC_GETVERSION_OLD        _IOR('v', 1, long)
 #define FSFILT_IOC_SETVERSION_OLD        _IOW('v', 2, long)
-#define FSFILT_IOC_FIEMAP                _IOWR('f', 11, struct ll_user_fiemap)
 #endif
 
 /* FIEMAP flags supported by Lustre */
@@ -235,7 +238,7 @@ struct ost_id {
 /* #define LL_IOC_POLL_QUOTACHECK       161 OBD_IOC_POLL_QUOTACHECK */
 /* #define LL_IOC_QUOTACTL              162 OBD_IOC_QUOTACTL */
 #define IOC_OBD_STATFS            _IOWR('f', 164, struct obd_statfs *)
-#define IOC_LOV_GETINFO          _IOWR('f', 165, struct lov_user_mds_data *)
+/*      IOC_LOV_GETINFO                 165 obsolete */
 #define LL_IOC_FLUSHCTX          _IOW('f', 166, long)
 /* LL_IOC_RMTACL                        167 obsolete */
 #define LL_IOC_GETOBDCOUNT            _IOR('f', 168, long)
@@ -343,6 +346,9 @@ enum ll_lease_type {
 #define LOV_ALL_STRIPES       0xffff /* only valid for directories */
 #define LOV_V1_INSANE_STRIPE_COUNT 65532 /* maximum stripe count bz13933 */
 
+#define XATTR_LUSTRE_PREFIX     "lustre."
+#define XATTR_LUSTRE_LOV        "lustre.lov"
+
 #define lov_user_ost_data lov_user_ost_data_v1
 struct lov_user_ost_data_v1 {     /* per-stripe data structure */
         struct ost_id l_ost_oi;   /* OST object ID */
@@ -451,8 +457,6 @@ static inline int lmv_user_md_size(int stripes, int lmm_magic)
                       stripes * sizeof(struct lmv_user_mds_data);
 }
 
-void lustre_swab_lmv_user_md(struct lmv_user_md *lum);
-
 struct ll_recreate_obj {
         __u64 lrc_id;
         __u32 lrc_ost_idx;
@@ -522,25 +526,20 @@ static inline void obd_uuid2fsname(char *buf, char *uuid, int buflen)
 }
 
 /* printf display format
- * e.g. printf("file FID is "DFID"\n", PFID(fid));
+ * * usage: printf("file FID is "DFID"\n", PFID(fid));
  */
 #define FID_NOBRACE_LEN 40
 #define FID_LEN (FID_NOBRACE_LEN + 2)
 #define DFID_NOBRACE "%#llx:0x%x:0x%x"
 #define DFID "["DFID_NOBRACE"]"
-#define PFID(fid)     \
-        (fid)->f_seq, \
-        (fid)->f_oid, \
-        (fid)->f_ver
+#define PFID(fid) (unsigned long long)(fid)->f_seq, (fid)->f_oid, (fid)->f_ver
 
-/* scanf input parse format -- strip '[' first.
- * e.g. sscanf(fidstr, SFID, RFID(&fid));
+/* scanf input parse format for fids in DFID_NOBRACE format
+ * Need to strip '[' from DFID format first or use "["SFID"]" at caller.
+ * usage: sscanf(fidstr, SFID, RFID(&fid));
  */
 #define SFID "0x%llx:0x%x:0x%x"
-#define RFID(fid)     \
-        &((fid)->f_seq), \
-        &((fid)->f_oid), \
-        &((fid)->f_ver)
+#define RFID(fid) &((fid)->f_seq), &((fid)->f_oid), &((fid)->f_ver)
 
 /********* Quotas **********/
 
@@ -551,23 +550,18 @@ static inline void obd_uuid2fsname(char *buf, char *uuid, int buflen)
 #define Q_FINVALIDATE  0x800104 /* deprecated as of 2.4 */
 
 /* these must be explicitly translated into linux Q_* in ll_dir_ioctl */
-#define LUSTRE_Q_QUOTAON    0x800002     /* turn quotas on */
-#define LUSTRE_Q_QUOTAOFF   0x800003     /* turn quotas off */
+#define LUSTRE_Q_QUOTAON    0x800002    /* deprecated as of 2.4 */
+#define LUSTRE_Q_QUOTAOFF   0x800003    /* deprecated as of 2.4 */
 #define LUSTRE_Q_GETINFO    0x800005     /* get information about quota files */
 #define LUSTRE_Q_SETINFO    0x800006     /* set information about quota files */
 #define LUSTRE_Q_GETQUOTA   0x800007     /* get user quota structure */
 #define LUSTRE_Q_SETQUOTA   0x800008     /* set user quota structure */
 /* lustre-specific control commands */
-#define LUSTRE_Q_INVALIDATE  0x80000b     /* invalidate quota data */
-#define LUSTRE_Q_FINVALIDATE 0x80000c     /* invalidate filter quota data */
+#define LUSTRE_Q_INVALIDATE  0x80000b   /* deprecated as of 2.4 */
+#define LUSTRE_Q_FINVALIDATE 0x80000c   /* deprecated as of 2.4 */
 
 #define UGQUOTA 2       /* set both USRQUOTA and GRPQUOTA */
 
-struct if_quotacheck {
-        char                obd_type[16];
-        struct obd_uuid  obd_uuid;
-};
-
 #define IDENTITY_DOWNCALL_MAGIC 0x6d6dd629
 
 /* permission */
@@ -649,6 +643,7 @@ struct if_quotactl {
 #define SWAP_LAYOUTS_CHECK_DV2          (1 << 1)
 #define SWAP_LAYOUTS_KEEP_MTIME         (1 << 2)
 #define SWAP_LAYOUTS_KEEP_ATIME         (1 << 3)
+#define SWAP_LAYOUTS_CLOSE              BIT(4)
 
 /* Swap XATTR_NAME_HSM as well, only on the MDT so far */
 #define SWAP_LAYOUTS_MDS_HSM            (1 << 31)
@@ -999,6 +994,7 @@ struct ioc_data_version {
  * See HSM_FLAGS below.
  */
 enum hsm_states {
+        HS_NONE         = 0x00000000,
         HS_EXISTS       = 0x00000001,
         HS_DIRTY        = 0x00000002,
         HS_RELEASED     = 0x00000004,
diff --git a/drivers/staging/lustre/lustre/include/lustre_compat.h b/drivers/staging/lustre/lustre/include/lustre_compat.h
index 567c438e93cb..300e96fb032a 100644
--- a/drivers/staging/lustre/lustre/include/lustre_compat.h
+++ b/drivers/staging/lustre/lustre/include/lustre_compat.h
@@ -74,4 +74,6 @@
 # define ext2_find_next_zero_bit  find_next_zero_bit_le
 #endif
 
+#define TIMES_SET_FLAGS (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET)
+
 #endif /* _LUSTRE_COMPAT_H */
diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index d03534432624..b7e61d082e55 100644
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -59,7 +59,7 @@ struct obd_device;
 #define OBD_LDLM_DEVICENAME  "ldlm"
 
 #define LDLM_DEFAULT_LRU_SIZE (100 * num_online_cpus())
-#define LDLM_DEFAULT_MAX_ALIVE (cfs_time_seconds(36000))
+#define LDLM_DEFAULT_MAX_ALIVE (cfs_time_seconds(3900)) /* 65 min */
 #define LDLM_DEFAULT_PARALLEL_AST_LIMIT 1024
 
 /**
@@ -86,10 +86,10 @@ enum ldlm_error {
  * decisions about lack of conflicts or do any autonomous lock granting without
  * first speaking to a server.
  */
-typedef enum {
+enum ldlm_side {
         LDLM_NAMESPACE_SERVER = 1 << 0,
         LDLM_NAMESPACE_CLIENT = 1 << 1
-} ldlm_side_t;
+};
 
 /**
  * The blocking callback is overloaded to perform two functions.  These flags
@@ -359,7 +359,7 @@ struct ldlm_namespace {
         struct obd_device       *ns_obd;
 
         /** Flag indicating if namespace is on client instead of server */
-        ldlm_side_t             ns_client;
+        enum ldlm_side          ns_client;
 
         /** Resource hash table for namespace. */
         struct cfs_hash         *ns_rs_hash;
@@ -550,20 +550,18 @@ struct ldlm_flock {
         __u64 owner;
         __u64 blocking_owner;
         struct obd_export *blocking_export;
-        /* Protected by the hash lock */
-        __u32 blocking_refs;
         __u32 pid;
 };
 
-typedef union {
+union ldlm_policy_data {
         struct ldlm_extent l_extent;
         struct ldlm_flock l_flock;
         struct ldlm_inodebits l_inodebits;
-} ldlm_policy_data_t;
+};
 
 void ldlm_convert_policy_to_local(struct obd_export *exp, enum ldlm_type type,
-                                  const ldlm_wire_policy_data_t *wpolicy,
-                                  ldlm_policy_data_t *lpolicy);
+                                  const union ldlm_wire_policy_data *wpolicy,
+                                  union ldlm_policy_data *lpolicy);
 
 enum lvb_type {
         LVB_T_NONE      = 0,
@@ -692,7 +690,7 @@ struct ldlm_lock {
          * Representation of private data specific for a lock type.
          * Examples are: extent range for extent lock or bitmask for ibits locks
          */
-        ldlm_policy_data_t      l_policy_data;
+        union ldlm_policy_data  l_policy_data;
 
         /**
          * Lock state flags. Protected by lr_lock.
@@ -967,8 +965,8 @@ struct ldlm_ast_work {
  * Common ldlm_enqueue parameters
  */
 struct ldlm_enqueue_info {
-        __u32 ei_type;   /** Type of the lock being enqueued. */
-        __u32 ei_mode;   /** Mode of the lock being enqueued. */
+        enum ldlm_type  ei_type;  /** Type of the lock being enqueued. */
+        enum ldlm_mode  ei_mode;  /** Mode of the lock being enqueued. */
         void *ei_cb_bl;  /** blocking lock callback */
         void *ei_cb_cp;  /** lock completion callback */
         void *ei_cb_gl;  /** lock glimpse callback */
@@ -979,7 +977,7 @@ struct ldlm_enqueue_info {
 extern struct obd_ops ldlm_obd_ops;
 
 extern char *ldlm_lockname[];
-char *ldlm_it2str(int it);
+const char *ldlm_it2str(enum ldlm_intent_flags it);
 
 /**
  * Just a fancy CDEBUG call with log level preset to LDLM_DEBUG.
@@ -1168,16 +1166,18 @@ do {					    \
 struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock);
 void ldlm_lock_put(struct ldlm_lock *lock);
 void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc);
-void ldlm_lock_addref(const struct lustre_handle *lockh, __u32 mode);
-int  ldlm_lock_addref_try(const struct lustre_handle *lockh, __u32 mode);
-void ldlm_lock_decref(const struct lustre_handle *lockh, __u32 mode);
-void ldlm_lock_decref_and_cancel(const struct lustre_handle *lockh, __u32 mode);
+void ldlm_lock_addref(const struct lustre_handle *lockh, enum ldlm_mode mode);
+int  ldlm_lock_addref_try(const struct lustre_handle *lockh,
+                          enum ldlm_mode mode);
+void ldlm_lock_decref(const struct lustre_handle *lockh, enum ldlm_mode mode);
+void ldlm_lock_decref_and_cancel(const struct lustre_handle *lockh,
+                                 enum ldlm_mode mode);
 void ldlm_lock_fail_match_locked(struct ldlm_lock *lock);
 void ldlm_lock_allow_match(struct ldlm_lock *lock);
 void ldlm_lock_allow_match_locked(struct ldlm_lock *lock);
 enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags,
                                const struct ldlm_res_id *,
-                               enum ldlm_type type, ldlm_policy_data_t *,
+                               enum ldlm_type type, union ldlm_policy_data *,
                                enum ldlm_mode mode, struct lustre_handle *,
                                int unref);
 enum ldlm_mode ldlm_revalidate_lock_handle(const struct lustre_handle *lockh,
@@ -1189,7 +1189,7 @@ void ldlm_unlink_lock_skiplist(struct ldlm_lock *req);
 /* resource.c */
 struct ldlm_namespace *
 ldlm_namespace_new(struct obd_device *obd, char *name,
-                   ldlm_side_t client, enum ldlm_appetite apt,
+                   enum ldlm_side client, enum ldlm_appetite apt,
                    enum ldlm_ns_type ns_type);
 int ldlm_namespace_cleanup(struct ldlm_namespace *ns, __u64 flags);
 void ldlm_namespace_get(struct ldlm_namespace *ns);
@@ -1208,7 +1208,7 @@ void ldlm_resource_add_lock(struct ldlm_resource *res,
                             struct ldlm_lock *lock);
 void ldlm_resource_unlink_lock(struct ldlm_lock *lock);
 void ldlm_res2desc(struct ldlm_resource *res, struct ldlm_resource_desc *desc);
-void ldlm_dump_all_namespaces(ldlm_side_t client, int level);
+void ldlm_dump_all_namespaces(enum ldlm_side client, int level);
 void ldlm_namespace_dump(int level, struct ldlm_namespace *);
 void ldlm_resource_dump(int level, struct ldlm_resource *);
 int ldlm_lock_change_resource(struct ldlm_namespace *, struct ldlm_lock *,
@@ -1241,7 +1241,7 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data);
 int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp,
                      struct ldlm_enqueue_info *einfo,
                      const struct ldlm_res_id *res_id,
-                     ldlm_policy_data_t const *policy, __u64 *flags,
+                     union ldlm_policy_data const *policy, __u64 *flags,
                      void *lvb, __u32 lvb_len, enum lvb_type lvb_type,
                      struct lustre_handle *lockh, int async);
 int ldlm_prep_enqueue_req(struct obd_export *exp,
@@ -1265,13 +1265,13 @@ int ldlm_cli_cancel_unused(struct ldlm_namespace *, const struct ldlm_res_id *,
                            enum ldlm_cancel_flags flags, void *opaque);
 int ldlm_cli_cancel_unused_resource(struct ldlm_namespace *ns,
                                     const struct ldlm_res_id *res_id,
-                                    ldlm_policy_data_t *policy,
+                                    union ldlm_policy_data *policy,
                                     enum ldlm_mode mode,
                                     enum ldlm_cancel_flags flags,
                                     void *opaque);
 int ldlm_cancel_resource_local(struct ldlm_resource *res,
                                struct list_head *cancels,
-                               ldlm_policy_data_t *policy,
+                               union ldlm_policy_data *policy,
                                enum ldlm_mode mode, __u64 lock_flags,
                                enum ldlm_cancel_flags cancel_flags,
                                void *opaque);
@@ -1333,7 +1333,7 @@ int ldlm_pools_init(void);
 void ldlm_pools_fini(void);
 
 int ldlm_pool_init(struct ldlm_pool *pl, struct ldlm_namespace *ns,
-                   int idx, ldlm_side_t client);
+                   int idx, enum ldlm_side client);
 void ldlm_pool_fini(struct ldlm_pool *pl);
 void ldlm_pool_add(struct ldlm_pool *pl, struct ldlm_lock *lock);
 void ldlm_pool_del(struct ldlm_pool *pl, struct ldlm_lock *lock);
diff --git a/drivers/staging/lustre/lustre/include/lustre_fid.h b/drivers/staging/lustre/lustre/include/lustre_fid.h
index 316780693193..b5a1aadbcb93 100644
--- a/drivers/staging/lustre/lustre/include/lustre_fid.h
+++ b/drivers/staging/lustre/lustre/include/lustre_fid.h
@@ -150,6 +150,7 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 #include "lustre/lustre_idl.h"
+#include "seq_range.h"
 
 struct lu_env;
 struct lu_site;
diff --git a/drivers/staging/lustre/lustre/include/lustre_fld.h b/drivers/staging/lustre/lustre/include/lustre_fld.h
index 932410d3e3cc..6ef1b03cb986 100644
--- a/drivers/staging/lustre/lustre/include/lustre_fld.h
+++ b/drivers/staging/lustre/lustre/include/lustre_fld.h
@@ -103,8 +103,6 @@ struct lu_client_fld {
 
         /** Client fld debugfs entry name. */
         char                     lcf_name[LUSTRE_MDT_MAXNAMELEN];
-
-        int                      lcf_flags;
 };
 
 /* Client methods */
diff --git a/drivers/staging/lustre/lustre/include/lustre_ha.h b/drivers/staging/lustre/lustre/include/lustre_ha.h
index cde7ed702c86..dec1e99d594d 100644
--- a/drivers/staging/lustre/lustre/include/lustre_ha.h
+++ b/drivers/staging/lustre/lustre/include/lustre_ha.h
@@ -53,6 +53,7 @@ void ptlrpc_activate_import(struct obd_import *imp);
 void ptlrpc_deactivate_import(struct obd_import *imp);
 void ptlrpc_invalidate_import(struct obd_import *imp);
 void ptlrpc_fail_import(struct obd_import *imp, __u32 conn_cnt);
+void ptlrpc_pinger_force(struct obd_import *imp);
 
 /** @} ha */
 
diff --git a/drivers/staging/lustre/lustre/include/lustre_import.h b/drivers/staging/lustre/lustre/include/lustre_import.h
index 5461ba33d90c..f0c931ce1a67 100644
--- a/drivers/staging/lustre/lustre/include/lustre_import.h
+++ b/drivers/staging/lustre/lustre/include/lustre_import.h
@@ -185,6 +185,11 @@ struct obd_import {
         struct list_head               *imp_replay_cursor;
         /** @} */
 
+        /** List of not replied requests */
+        struct list_head        imp_unreplied_list;
+        /** Known maximal replied XID */
+        __u64                   imp_known_replied_xid;
+
         /** obd device for this import */
         struct obd_device       *imp_obd;
 
@@ -294,7 +299,9 @@ struct obd_import {
                                    */
                                   imp_force_reconnect:1,
                                   /* import has tried to connect with server */
-                                  imp_connect_tried:1;
+                                  imp_connect_tried:1,
+                                 /* connected but not FULL yet */
+                                 imp_connected:1;
         __u32                imp_connect_op;
         struct obd_connect_data   imp_connect_data;
         __u64                imp_connect_flags_orig;
diff --git a/drivers/staging/lustre/lustre/include/lustre_lib.h b/drivers/staging/lustre/lustre/include/lustre_lib.h
index 6b231913ba2e..27f3148c4344 100644
--- a/drivers/staging/lustre/lustre/include/lustre_lib.h
+++ b/drivers/staging/lustre/lustre/include/lustre_lib.h
@@ -350,8 +350,6 @@ do {									   \
         l_wait_event_exclusive_head(wq, condition, &lwi);       \
 })
 
-#define LIBLUSTRE_CLIENT (0)
-
 /** @} lib */
 
 #endif /* _LUSTRE_LIB_H */
diff --git a/drivers/staging/lustre/lustre/include/lustre_lmv.h b/drivers/staging/lustre/lustre/include/lustre_lmv.h
index d7f7afa8dfa7..5aa3645e64dc 100644
--- a/drivers/staging/lustre/lustre/include/lustre_lmv.h
+++ b/drivers/staging/lustre/lustre/include/lustre_lmv.h
@@ -76,18 +76,7 @@ lsm_md_eq(const struct lmv_stripe_md *lsm1, const struct lmv_stripe_md *lsm2)
 
 union lmv_mds_md;
 
-int lmv_unpack_md(struct obd_export *exp, struct lmv_stripe_md **lsmp,
-                  const union lmv_mds_md *lmm, int stripe_count);
-
-static inline int lmv_alloc_memmd(struct lmv_stripe_md **lsmp, int stripe_count)
-{
-        return lmv_unpack_md(NULL, lsmp, NULL, stripe_count);
-}
-
-static inline void lmv_free_memmd(struct lmv_stripe_md *lsm)
-{
-        lmv_unpack_md(NULL, &lsm, NULL, 0);
-}
+void lmv_free_memmd(struct lmv_stripe_md *lsm);
 
 static inline void lmv1_le_to_cpu(struct lmv_mds_md_v1 *lmv_dst,
                                   const struct lmv_mds_md_v1 *lmv_src)
diff --git a/drivers/staging/lustre/lustre/include/lustre_log.h b/drivers/staging/lustre/lustre/include/lustre_log.h
index 995b266932e3..35e37eb1bc2c 100644
--- a/drivers/staging/lustre/lustre/include/lustre_log.h
+++ b/drivers/staging/lustre/lustre/include/lustre_log.h
@@ -214,6 +214,7 @@ struct llog_handle {
         spinlock_t               lgh_hdr_lock; /* protect lgh_hdr data */
         struct llog_logid        lgh_id; /* id of this log */
         struct llog_log_hdr     *lgh_hdr;
+        size_t                   lgh_hdr_size;
         int                      lgh_last_idx;
         int                      lgh_cur_idx; /* used during llog_process */
         __u64                    lgh_cur_offset; /* used during llog_process */
@@ -244,6 +245,11 @@ struct llog_ctxt {
         struct mutex             loc_mutex; /* protect loc_imp */
         atomic_t             loc_refcount;
         long                 loc_flags; /* flags, see above defines */
+        /*
+         * llog chunk size, and llog record size can not be bigger than
+         * loc_chunk_size
+         */
+        __u32                   loc_chunk_size;
 };
 
 #define LLOG_PROC_BREAK 0x0001
diff --git a/drivers/staging/lustre/lustre/include/lustre_mdc.h b/drivers/staging/lustre/lustre/include/lustre_mdc.h
index 8fc2d3f2dfd6..198ceb0c66f9 100644
--- a/drivers/staging/lustre/lustre/include/lustre_mdc.h
+++ b/drivers/staging/lustre/lustre/include/lustre_mdc.h
@@ -156,16 +156,39 @@ static inline void mdc_put_rpc_lock(struct mdc_rpc_lock *lck,
         mutex_unlock(&lck->rpcl_mutex);
 }
 
+static inline void mdc_get_mod_rpc_slot(struct ptlrpc_request *req,
+                                        struct lookup_intent *it)
+{
+        struct client_obd *cli = &req->rq_import->imp_obd->u.cli;
+        u32 opc;
+        u16 tag;
+
+        opc = lustre_msg_get_opc(req->rq_reqmsg);
+        tag = obd_get_mod_rpc_slot(cli, opc, it);
+        lustre_msg_set_tag(req->rq_reqmsg, tag);
+}
+
+static inline void mdc_put_mod_rpc_slot(struct ptlrpc_request *req,
+                                        struct lookup_intent *it)
+{
+        struct client_obd *cli = &req->rq_import->imp_obd->u.cli;
+        u32 opc;
+        u16 tag;
+
+        opc = lustre_msg_get_opc(req->rq_reqmsg);
+        tag = lustre_msg_get_tag(req->rq_reqmsg);
+        obd_put_mod_rpc_slot(cli, opc, it, tag);
+}
+
 /**
- * Update the maximum possible easize and cookiesize.
+ * Update the maximum possible easize.
  *
- * The values are learned from ptlrpc replies sent by the MDT.  The
- * default easize and cookiesize is initialized to the minimum value but
- * allowed to grow up to a single page in size if required to handle the
+ * This value is learned from ptlrpc replies sent by the MDT. The
+ * default easize is initialized to the minimum value but allowed
+ * to grow up to a single page in size if required to handle the
  * common case.
  *
- * \see client_obd::cl_default_mds_easize and
- * client_obd::cl_default_mds_cookiesize
+ * \see client_obd::cl_default_mds_easize
  *
  * \param[in] exp       export for MDC device
  * \param[in] body      body of ptlrpc reply from MDT
@@ -176,7 +199,7 @@ static inline void mdc_update_max_ea_from_body(struct obd_export *exp,
 {
         if (body->mbo_valid & OBD_MD_FLMODEASIZE) {
                 struct client_obd *cli = &exp->exp_obd->u.cli;
-                u32 def_cookiesize, def_easize;
+                u32 def_easize;
 
                 if (cli->cl_max_mds_easize < body->mbo_max_mdsize)
                         cli->cl_max_mds_easize = body->mbo_max_mdsize;
@@ -184,13 +207,6 @@ static inline void mdc_update_max_ea_from_body(struct obd_export *exp,
                 def_easize = min_t(__u32, body->mbo_max_mdsize,
                                    OBD_MAX_DEFAULT_EA_SIZE);
                 cli->cl_default_mds_easize = def_easize;
-
-                if (cli->cl_max_mds_cookiesize < body->mbo_max_cookiesize)
-                        cli->cl_max_mds_cookiesize = body->mbo_max_cookiesize;
-
-                def_cookiesize = min_t(__u32, body->mbo_max_cookiesize,
-                                       OBD_MAX_DEFAULT_COOKIE_SIZE);
-                cli->cl_default_mds_cookiesize = def_cookiesize;
         }
 }
 
diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h
index e9aba99ee52a..411eb0dc7f38 100644
--- a/drivers/staging/lustre/lustre/include/lustre_net.h
+++ b/drivers/staging/lustre/lustre/include/lustre_net.h
@@ -50,6 +50,7 @@
  * @{
  */
 
+#include <linux/uio.h>
 #include "../../include/linux/libcfs/libcfs.h"
 #include "../../include/linux/lnet/nidstr.h"
 #include "../../include/linux/lnet/api.h"
@@ -68,13 +69,17 @@
 #define PTLRPC_MD_OPTIONS  0
 
 /**
- * Max # of bulk operations in one request.
+ * log2 max # of bulk operations in one request: 2=4MB/RPC, 5=32MB/RPC, ...
  * In order for the client and server to properly negotiate the maximum
  * possible transfer size, PTLRPC_BULK_OPS_COUNT must be a power-of-two
  * value.  The client is free to limit the actual RPC size for any bulk
  * transfer via cl_max_pages_per_rpc to some non-power-of-two value.
+ * NOTE: This is limited to 16 (=64GB RPCs) by IOOBJ_MAX_BRW_BITS.
  */
-#define PTLRPC_BULK_OPS_BITS    2
+#define PTLRPC_BULK_OPS_BITS    4
+#if PTLRPC_BULK_OPS_BITS > 16
+#error "More than 65536 BRW RPCs not allowed by IOOBJ_MAX_BRW_BITS."
+#endif
 #define PTLRPC_BULK_OPS_COUNT   (1U << PTLRPC_BULK_OPS_BITS)
 /**
  * PTLRPC_BULK_OPS_MASK is for the convenience of the client only, and
@@ -437,6 +442,10 @@ struct ptlrpc_reply_state {
         unsigned long     rs_committed:1;/* the transaction was committed
                                           * and the rs was dispatched
                                           */
+        atomic_t                rs_refcount;    /* number of users */
+        /** Number of locks awaiting client ACK */
+        int                     rs_nlocks;
+
         /** Size of the state */
         int                 rs_size;
         /** opcode */
@@ -449,7 +458,6 @@ struct ptlrpc_reply_state {
         struct ptlrpc_service_part *rs_svcpt;
         /** Lnet metadata handle for the reply */
         lnet_handle_md_t       rs_md_h;
-        atomic_t           rs_refcount;
 
         /** Context for the service thread */
         struct ptlrpc_svc_ctx *rs_svc_ctx;
@@ -466,8 +474,6 @@ struct ptlrpc_reply_state {
          */
         struct lustre_msg     *rs_msg;    /* reply message */
 
-        /** Number of locks awaiting client ACK */
-        int                 rs_nlocks;
         /** Handles of locks awaiting client reply ACK */
         struct lustre_handle   rs_locks[RS_MAX_LOCKS];
         /** Lock modes of locks in \a rs_locks */
@@ -515,717 +521,7 @@ struct lu_env;
 
 struct ldlm_lock;
 
-/**
- * \defgroup nrs Network Request Scheduler
- * @{
- */
-struct ptlrpc_nrs_policy;
-struct ptlrpc_nrs_resource;
-struct ptlrpc_nrs_request;
-
-/**
- * NRS control operations.
- *
- * These are common for all policies.
- */
-enum ptlrpc_nrs_ctl {
-        /**
-         * Not a valid opcode.
-         */
-        PTLRPC_NRS_CTL_INVALID,
-        /**
-         * Activate the policy.
-         */
-        PTLRPC_NRS_CTL_START,
-        /**
-         * Reserved for multiple primary policies, which may be a possibility
-         * in the future.
-         */
-        PTLRPC_NRS_CTL_STOP,
-        /**
-         * Policies can start using opcodes from this value and onwards for
-         * their own purposes; the assigned value itself is arbitrary.
-         */
-        PTLRPC_NRS_CTL_1ST_POL_SPEC = 0x20,
-};
-
-/**
- * ORR policy operations
- */
-enum nrs_ctl_orr {
-        NRS_CTL_ORR_RD_QUANTUM = PTLRPC_NRS_CTL_1ST_POL_SPEC,
-        NRS_CTL_ORR_WR_QUANTUM,
-        NRS_CTL_ORR_RD_OFF_TYPE,
-        NRS_CTL_ORR_WR_OFF_TYPE,
-        NRS_CTL_ORR_RD_SUPP_REQ,
-        NRS_CTL_ORR_WR_SUPP_REQ,
-};
-
-/**
- * NRS policy operations.
- *
- * These determine the behaviour of a policy, and are called in response to
- * NRS core events.
- */
-struct ptlrpc_nrs_pol_ops {
-        /**
-         * Called during policy registration; this operation is optional.
-         *
-         * \param[in,out] policy The policy being initialized
-         */
-        int     (*op_policy_init)(struct ptlrpc_nrs_policy *policy);
-        /**
-         * Called during policy unregistration; this operation is optional.
-         *
-         * \param[in,out] policy The policy being unregistered/finalized
-         */
-        void    (*op_policy_fini)(struct ptlrpc_nrs_policy *policy);
-        /**
-         * Called when activating a policy via lprocfs; policies allocate and
-         * initialize their resources here; this operation is optional.
-         *
-         * \param[in,out] policy The policy being started
-         *
-         * \see nrs_policy_start_locked()
-         */
-        int     (*op_policy_start)(struct ptlrpc_nrs_policy *policy);
-        /**
-         * Called when deactivating a policy via lprocfs; policies deallocate
-         * their resources here; this operation is optional
-         *
-         * \param[in,out] policy The policy being stopped
-         *
-         * \see nrs_policy_stop0()
-         */
-        void    (*op_policy_stop)(struct ptlrpc_nrs_policy *policy);
-        /**
-         * Used for policy-specific operations; i.e. not generic ones like
-         * \e PTLRPC_NRS_CTL_START and \e PTLRPC_NRS_CTL_GET_INFO; analogous
-         * to an ioctl; this operation is optional.
-         *
-         * \param[in,out]        policy The policy carrying out operation \a opc
-         * \param[in]     opc    The command operation being carried out
-         * \param[in,out] arg    An generic buffer for communication between the
-         *                       user and the control operation
-         *
-         * \retval -ve error
-         * \retval   0 success
-         *
-         * \see ptlrpc_nrs_policy_control()
-         */
-        int     (*op_policy_ctl)(struct ptlrpc_nrs_policy *policy,
-                                 enum ptlrpc_nrs_ctl opc, void *arg);
-
-        /**
-         * Called when obtaining references to the resources of the resource
-         * hierarchy for a request that has arrived for handling at the PTLRPC
-         * service. Policies should return -ve for requests they do not wish
-         * to handle. This operation is mandatory.
-         *
-         * \param[in,out] policy  The policy we're getting resources for.
-         * \param[in,out] nrq     The request we are getting resources for.
-         * \param[in]     parent  The parent resource of the resource being
-         *                        requested; set to NULL if none.
-         * \param[out]    resp    The resource is to be returned here; the
-         *                        fallback policy in an NRS head should
-         *                        \e always return a non-NULL pointer value.
-         * \param[in]  moving_req When set, signifies that this is an attempt
-         *                        to obtain resources for a request being moved
-         *                        to the high-priority NRS head by
-         *                        ldlm_lock_reorder_req().
-         *                        This implies two things:
-         *                        1. We are under obd_export::exp_rpc_lock and
-         *                        so should not sleep.
-         *                        2. We should not perform non-idempotent or can
-         *                        skip performing idempotent operations that
-         *                        were carried out when resources were first
-         *                        taken for the request when it was initialized
-         *                        in ptlrpc_nrs_req_initialize().
-         *
-         * \retval 0, +ve The level of the returned resource in the resource
-         *                hierarchy; currently only 0 (for a non-leaf resource)
-         *                and 1 (for a leaf resource) are supported by the
-         *                framework.
-         * \retval -ve    error
-         *
-         * \see ptlrpc_nrs_req_initialize()
-         * \see ptlrpc_nrs_hpreq_add_nolock()
-         */
-        int     (*op_res_get)(struct ptlrpc_nrs_policy *policy,
-                              struct ptlrpc_nrs_request *nrq,
-                              const struct ptlrpc_nrs_resource *parent,
-                              struct ptlrpc_nrs_resource **resp,
-                              bool moving_req);
-        /**
-         * Called when releasing references taken for resources in the resource
-         * hierarchy for the request; this operation is optional.
-         *
-         * \param[in,out] policy The policy the resource belongs to
-         * \param[in] res        The resource to be freed
-         *
-         * \see ptlrpc_nrs_req_finalize()
-         * \see ptlrpc_nrs_hpreq_add_nolock()
-         */
-        void    (*op_res_put)(struct ptlrpc_nrs_policy *policy,
-                              const struct ptlrpc_nrs_resource *res);
-
-        /**
-         * Obtains a request for handling from the policy, and optionally
-         * removes the request from the policy; this operation is mandatory.
-         *
-         * \param[in,out] policy The policy to poll
-         * \param[in]     peek   When set, signifies that we just want to
-         *                       examine the request, and not handle it, so the
-         *                       request is not removed from the policy.
-         * \param[in]     force  When set, it will force a policy to return a
-         *                       request if it has one queued.
-         *
-         * \retval NULL No request available for handling
-         * \retval valid-pointer The request polled for handling
-         *
-         * \see ptlrpc_nrs_req_get_nolock()
-         */
-        struct ptlrpc_nrs_request *
-                (*op_req_get)(struct ptlrpc_nrs_policy *policy, bool peek,
-                              bool force);
-        /**
-         * Called when attempting to add a request to a policy for later
-         * handling; this operation is mandatory.
-         *
-         * \param[in,out] policy  The policy on which to enqueue \a nrq
-         * \param[in,out] nrq The request to enqueue
-         *
-         * \retval 0    success
-         * \retval != 0 error
-         *
-         * \see ptlrpc_nrs_req_add_nolock()
-         */
-        int     (*op_req_enqueue)(struct ptlrpc_nrs_policy *policy,
-                                  struct ptlrpc_nrs_request *nrq);
-        /**
-         * Removes a request from the policy's set of pending requests. Normally
-         * called after a request has been polled successfully from the policy
-         * for handling; this operation is mandatory.
-         *
-         * \param[in,out] policy The policy the request \a nrq belongs to
-         * \param[in,out] nrq    The request to dequeue
-         */
-        void    (*op_req_dequeue)(struct ptlrpc_nrs_policy *policy,
-                                  struct ptlrpc_nrs_request *nrq);
-        /**
-         * Called after the request being carried out. Could be used for
-         * job/resource control; this operation is optional.
-         *
-         * \param[in,out] policy The policy which is stopping to handle request
-         *                       \a nrq
-         * \param[in,out] nrq    The request
-         *
-         * \pre assert_spin_locked(&svcpt->scp_req_lock)
-         *
-         * \see ptlrpc_nrs_req_stop_nolock()
-         */
-        void    (*op_req_stop)(struct ptlrpc_nrs_policy *policy,
-                               struct ptlrpc_nrs_request *nrq);
-        /**
-         * Registers the policy's lprocfs interface with a PTLRPC service.
-         *
-         * \param[in] svc The service
-         *
-         * \retval 0    success
-         * \retval != 0 error
-         */
-        int     (*op_lprocfs_init)(struct ptlrpc_service *svc);
-        /**
-         * Unegisters the policy's lprocfs interface with a PTLRPC service.
-         *
-         * In cases of failed policy registration in
-         * \e ptlrpc_nrs_policy_register(), this function may be called for a
-         * service which has not registered the policy successfully, so
-         * implementations of this method should make sure their operations are
-         * safe in such cases.
-         *
-         * \param[in] svc The service
-         */
-        void    (*op_lprocfs_fini)(struct ptlrpc_service *svc);
-};
-
-/**
- * Policy flags
- */
-enum nrs_policy_flags {
-        /**
-         * Fallback policy, use this flag only on a single supported policy per
-         * service. The flag cannot be used on policies that use
-         * \e PTLRPC_NRS_FL_REG_EXTERN
-         */
-        PTLRPC_NRS_FL_FALLBACK          = (1 << 0),
-        /**
-         * Start policy immediately after registering.
-         */
-        PTLRPC_NRS_FL_REG_START         = (1 << 1),
-        /**
-         * This is a policy registering from a module different to the one NRS
-         * core ships in (currently ptlrpc).
-         */
-        PTLRPC_NRS_FL_REG_EXTERN        = (1 << 2),
-};
-
-/**
- * NRS queue type.
- *
- * Denotes whether an NRS instance is for handling normal or high-priority
- * RPCs, or whether an operation pertains to one or both of the NRS instances
- * in a service.
- */
-enum ptlrpc_nrs_queue_type {
-        PTLRPC_NRS_QUEUE_REG    = (1 << 0),
-        PTLRPC_NRS_QUEUE_HP     = (1 << 1),
-        PTLRPC_NRS_QUEUE_BOTH   = (PTLRPC_NRS_QUEUE_REG | PTLRPC_NRS_QUEUE_HP)
-};
-
-/**
- * NRS head
- *
- * A PTLRPC service has at least one NRS head instance for handling normal
- * priority RPCs, and may optionally have a second NRS head instance for
- * handling high-priority RPCs. Each NRS head maintains a list of available
- * policies, of which one and only one policy is acting as the fallback policy,
- * and optionally a different policy may be acting as the primary policy. For
- * all RPCs handled by this NRS head instance, NRS core will first attempt to
- * enqueue the RPC using the primary policy (if any). The fallback policy is
- * used in the following cases:
- * - when there was no primary policy in the
- *   ptlrpc_nrs_pol_state::NRS_POL_STATE_STARTED state at the time the request
- *   was initialized.
- * - when the primary policy that was at the
- *   ptlrpc_nrs_pol_state::PTLRPC_NRS_POL_STATE_STARTED state at the time the
- *   RPC was initialized, denoted it did not wish, or for some other reason was
- *   not able to handle the request, by returning a non-valid NRS resource
- *   reference.
- * - when the primary policy that was at the
- *   ptlrpc_nrs_pol_state::PTLRPC_NRS_POL_STATE_STARTED state at the time the
- *   RPC was initialized, fails later during the request enqueueing stage.
- *
- * \see nrs_resource_get_safe()
- * \see nrs_request_enqueue()
- */
-struct ptlrpc_nrs {
-        spinlock_t                      nrs_lock;
-        /** XXX Possibly replace svcpt->scp_req_lock with another lock here. */
-        /**
-         * List of registered policies
-         */
-        struct list_head                        nrs_policy_list;
-        /**
-         * List of policies with queued requests. Policies that have any
-         * outstanding requests are queued here, and this list is queried
-         * in a round-robin manner from NRS core when obtaining a request
-         * for handling. This ensures that requests from policies that at some
-         * point transition away from the
-         * ptlrpc_nrs_pol_state::NRS_POL_STATE_STARTED state are drained.
-         */
-        struct list_head                        nrs_policy_queued;
-        /**
-         * Service partition for this NRS head
-         */
-        struct ptlrpc_service_part     *nrs_svcpt;
-        /**
-         * Primary policy, which is the preferred policy for handling RPCs
-         */
-        struct ptlrpc_nrs_policy       *nrs_policy_primary;
-        /**
-         * Fallback policy, which is the backup policy for handling RPCs
-         */
-        struct ptlrpc_nrs_policy       *nrs_policy_fallback;
-        /**
-         * This NRS head handles either HP or regular requests
-         */
-        enum ptlrpc_nrs_queue_type      nrs_queue_type;
-        /**
-         * # queued requests from all policies in this NRS head
-         */
-        unsigned long                   nrs_req_queued;
-        /**
-         * # scheduled requests from all policies in this NRS head
-         */
-        unsigned long                   nrs_req_started;
-        /**
-         * # policies on this NRS
-         */
-        unsigned                        nrs_num_pols;
-        /**
-         * This NRS head is in progress of starting a policy
-         */
-        unsigned                        nrs_policy_starting:1;
-        /**
-         * In progress of shutting down the whole NRS head; used during
-         * unregistration
-         */
-        unsigned                        nrs_stopping:1;
-};
-
-#define NRS_POL_NAME_MAX                16
-
-struct ptlrpc_nrs_pol_desc;
-
-/**
- * Service compatibility predicate; this determines whether a policy is adequate
- * for handling RPCs of a particular PTLRPC service.
- *
- * XXX:This should give the same result during policy registration and
- * unregistration, and for all partitions of a service; so the result should not
- * depend on temporal service or other properties, that may influence the
- * result.
- */
-typedef bool (*nrs_pol_desc_compat_t) (const struct ptlrpc_service *svc,
-                                       const struct ptlrpc_nrs_pol_desc *desc);
-
-struct ptlrpc_nrs_pol_conf {
-        /**
-         * Human-readable policy name
-         */
-        char                               nc_name[NRS_POL_NAME_MAX];
-        /**
-         * NRS operations for this policy
-         */
-        const struct ptlrpc_nrs_pol_ops   *nc_ops;
-        /**
-         * Service compatibility predicate
-         */
-        nrs_pol_desc_compat_t              nc_compat;
-        /**
-         * Set for policies that support a single ptlrpc service, i.e. ones that
-         * have \a pd_compat set to nrs_policy_compat_one(). The variable value
-         * depicts the name of the single service that such policies are
-         * compatible with.
-         */
-        const char                        *nc_compat_svc_name;
-        /**
-         * Owner module for this policy descriptor; policies registering from a
-         * different module to the one the NRS framework is held within
-         * (currently ptlrpc), should set this field to THIS_MODULE.
-         */
-        struct module                     *nc_owner;
-        /**
-         * Policy registration flags; a bitmask of \e nrs_policy_flags
-         */
-        unsigned                           nc_flags;
-};
-
-/**
- * NRS policy registering descriptor
- *
- * Is used to hold a description of a policy that can be passed to NRS core in
- * order to register the policy with NRS heads in different PTLRPC services.
- */
-struct ptlrpc_nrs_pol_desc {
-        /**
-         * Human-readable policy name
-         */
-        char                                    pd_name[NRS_POL_NAME_MAX];
-        /**
-         * Link into nrs_core::nrs_policies
-         */
-        struct list_head                                pd_list;
-        /**
-         * NRS operations for this policy
-         */
-        const struct ptlrpc_nrs_pol_ops        *pd_ops;
-        /**
-         * Service compatibility predicate
-         */
-        nrs_pol_desc_compat_t                   pd_compat;
-        /**
-         * Set for policies that are compatible with only one PTLRPC service.
-         *
-         * \see ptlrpc_nrs_pol_conf::nc_compat_svc_name
-         */
-        const char                             *pd_compat_svc_name;
-        /**
-         * Owner module for this policy descriptor.
-         *
-         * We need to hold a reference to the module whenever we might make use
-         * of any of the module's contents, i.e.
-         * - If one or more instances of the policy are at a state where they
-         *   might be handling a request, i.e.
-         *   ptlrpc_nrs_pol_state::NRS_POL_STATE_STARTED or
-         *   ptlrpc_nrs_pol_state::NRS_POL_STATE_STOPPING as we will have to
-         *   call into the policy's ptlrpc_nrs_pol_ops() handlers. A reference
-         *   is taken on the module when
-         *   \e ptlrpc_nrs_pol_desc::pd_refs becomes 1, and released when it
-         *   becomes 0, so that we hold only one reference to the module maximum
-         *   at any time.
-         *
-         *   We do not need to hold a reference to the module, even though we
-         *   might use code and data from the module, in the following cases:
-         * - During external policy registration, because this should happen in
-         *   the module's init() function, in which case the module is safe from
-         *   removal because a reference is being held on the module by the
-         *   kernel, and iirc kmod (and I guess module-init-tools also) will
-         *   serialize any racing processes properly anyway.
-         * - During external policy unregistration, because this should happen
-         *   in a module's exit() function, and any attempts to start a policy
-         *   instance would need to take a reference on the module, and this is
-         *   not possible once we have reached the point where the exit()
-         *   handler is called.
-         * - During service registration and unregistration, as service setup
-         *   and cleanup, and policy registration, unregistration and policy
-         *   instance starting, are serialized by \e nrs_core::nrs_mutex, so
-         *   as long as users adhere to the convention of registering policies
-         *   in init() and unregistering them in module exit() functions, there
-         *   should not be a race between these operations.
-         * - During any policy-specific lprocfs operations, because a reference
-         *   is held by the kernel on a proc entry that has been entered by a
-         *   syscall, so as long as proc entries are removed during unregistration time,
-         *   then unregistration and lprocfs operations will be properly
-         *   serialized.
-         */
-        struct module                          *pd_owner;
-        /**
-         * Bitmask of \e nrs_policy_flags
-         */
-        unsigned                                pd_flags;
-        /**
-         * # of references on this descriptor
-         */
-        atomic_t                                pd_refs;
-};
-
-/**
- * NRS policy state
- *
- * Policies transition from one state to the other during their lifetime
- */
-enum ptlrpc_nrs_pol_state {
-        /**
-         * Not a valid policy state.
-         */
-        NRS_POL_STATE_INVALID,
-        /**
-         * Policies are at this state either at the start of their life, or
-         * transition here when the user selects a different policy to act
-         * as the primary one.
-         */
-        NRS_POL_STATE_STOPPED,
-        /**
-         * Policy is progress of stopping
-         */
-        NRS_POL_STATE_STOPPING,
-        /**
-         * Policy is in progress of starting
-         */
-        NRS_POL_STATE_STARTING,
-        /**
-         * A policy is in this state in two cases:
-         * - it is the fallback policy, which is always in this state.
-         * - it has been activated by the user; i.e. it is the primary policy,
-         */
-        NRS_POL_STATE_STARTED,
-};
-
-/**
- * NRS policy information
- *
- * Used for obtaining information for the status of a policy via lprocfs
- */
-struct ptlrpc_nrs_pol_info {
-        /**
-         * Policy name
-         */
-        char                            pi_name[NRS_POL_NAME_MAX];
-        /**
-         * Current policy state
-         */
-        enum ptlrpc_nrs_pol_state       pi_state;
-        /**
-         * # RPCs enqueued for later dispatching by the policy
-         */
-        long                            pi_req_queued;
-        /**
-         * # RPCs started for dispatch by the policy
-         */
-        long                            pi_req_started;
-        /**
-         * Is this a fallback policy?
-         */
-        unsigned                        pi_fallback:1;
-};
-
-/**
- * NRS policy
- *
- * There is one instance of this for each policy in each NRS head of each
- * PTLRPC service partition.
- */
-struct ptlrpc_nrs_policy {
-        /**
-         * Linkage into the NRS head's list of policies,
-         * ptlrpc_nrs:nrs_policy_list
-         */
-        struct list_head                        pol_list;
-        /**
-         * Linkage into the NRS head's list of policies with enqueued
-         * requests ptlrpc_nrs:nrs_policy_queued
-         */
-        struct list_head                        pol_list_queued;
-        /**
-         * Current state of this policy
-         */
-        enum ptlrpc_nrs_pol_state       pol_state;
-        /**
-         * Bitmask of nrs_policy_flags
-         */
-        unsigned                        pol_flags;
-        /**
-         * # RPCs enqueued for later dispatching by the policy
-         */
-        long                            pol_req_queued;
-        /**
-         * # RPCs started for dispatch by the policy
-         */
-        long                            pol_req_started;
-        /**
-         * Usage Reference count taken on the policy instance
-         */
-        long                            pol_ref;
-        /**
-         * The NRS head this policy has been created at
-         */
-        struct ptlrpc_nrs              *pol_nrs;
-        /**
-         * Private policy data; varies by policy type
-         */
-        void                           *pol_private;
-        /**
-         * Policy descriptor for this policy instance.
-         */
-        struct ptlrpc_nrs_pol_desc     *pol_desc;
-};
-
-/**
- * NRS resource
- *
- * Resources are embedded into two types of NRS entities:
- * - Inside NRS policies, in the policy's private data in
- *   ptlrpc_nrs_policy::pol_private
- * - In objects that act as prime-level scheduling entities in different NRS
- *   policies; e.g. on a policy that performs round robin or similar order
- *   scheduling across client NIDs, there would be one NRS resource per unique
- *   client NID. On a policy which performs round robin scheduling across
- *   backend filesystem objects, there would be one resource associated with
- *   each of the backend filesystem objects partaking in the scheduling
- *   performed by the policy.
- *
- * NRS resources share a parent-child relationship, in which resources embedded
- * in policy instances are the parent entities, with all scheduling entities
- * a policy schedules across being the children, thus forming a simple resource
- * hierarchy. This hierarchy may be extended with one or more levels in the
- * future if the ability to have more than one primary policy is added.
- *
- * Upon request initialization, references to the then active NRS policies are
- * taken and used to later handle the dispatching of the request with one of
- * these policies.
- *
- * \see nrs_resource_get_safe()
- * \see ptlrpc_nrs_req_add()
- */
-struct ptlrpc_nrs_resource {
-        /**
-         * This NRS resource's parent; is NULL for resources embedded in NRS
-         * policy instances; i.e. those are top-level ones.
-         */
-        struct ptlrpc_nrs_resource     *res_parent;
-        /**
-         * The policy associated with this resource.
-         */
-        struct ptlrpc_nrs_policy       *res_policy;
-};
-
-enum {
-        NRS_RES_FALLBACK,
-        NRS_RES_PRIMARY,
-        NRS_RES_MAX
-};
-
-/* \name fifo
- *
- * FIFO policy
- *
- * This policy is a logical wrapper around previous, non-NRS functionality.
- * It dispatches RPCs in the same order as they arrive from the network. This
- * policy is currently used as the fallback policy, and the only enabled policy
- * on all NRS heads of all PTLRPC service partitions.
- * @{
- */
-
-/**
- * Private data structure for the FIFO policy
- */
-struct nrs_fifo_head {
-        /**
-         * Resource object for policy instance.
-         */
-        struct ptlrpc_nrs_resource      fh_res;
-        /**
-         * List of queued requests.
-         */
-        struct list_head                        fh_list;
-        /**
-         * For debugging purposes.
-         */
-        __u64                           fh_sequence;
-};
-
-struct nrs_fifo_req {
-        struct list_head                fr_list;
-        __u64                   fr_sequence;
-};
-
-/** @} fifo */
-
-/**
- * NRS request
- *
- * Instances of this object exist embedded within ptlrpc_request; the main
- * purpose of this object is to hold references to the request's resources
- * for the lifetime of the request, and to hold properties that policies use
- * use for determining the request's scheduling priority.
- */
-struct ptlrpc_nrs_request {
-        /**
-         * The request's resource hierarchy.
-         */
-        struct ptlrpc_nrs_resource     *nr_res_ptrs[NRS_RES_MAX];
-        /**
-         * Index into ptlrpc_nrs_request::nr_res_ptrs of the resource of the
-         * policy that was used to enqueue the request.
-         *
-         * \see nrs_request_enqueue()
-         */
-        unsigned                        nr_res_idx;
-        unsigned                        nr_initialized:1;
-        unsigned                        nr_enqueued:1;
-        unsigned                        nr_started:1;
-        unsigned                        nr_finalized:1;
-
-        /**
-         * Policy-specific fields, used for determining a request's scheduling
-         * priority, and other supporting functionality.
-         */
-        union {
-                /**
-                 * Fields for the FIFO policy
-                 */
-                struct nrs_fifo_req     fifo;
-        } nr_u;
-        /**
-         * Externally-registering policies may want to use this to allocate
-         * their own request properties.
-         */
-        void                           *ext;
-};
-
-/** @} nrs */
+#include "lustre_nrs.h"
 
 /**
  * Basic request prioritization operations structure.
@@ -1304,6 +600,8 @@ struct ptlrpc_cli_req {
         union ptlrpc_async_args          cr_async_args;
         /** Opaq data for replay and commit callbacks. */
         void                            *cr_cb_data;
+        /** Link to the imp->imp_unreplied_list */
+        struct list_head                 cr_unreplied_list;
         /**
          * Commit callback, called when request is committed and about to be
          * freed.
@@ -1343,6 +641,7 @@ struct ptlrpc_cli_req {
 #define rq_interpret_reply      rq_cli.cr_reply_interp
 #define rq_async_args           rq_cli.cr_async_args
 #define rq_cb_data              rq_cli.cr_cb_data
+#define rq_unreplied_list       rq_cli.cr_unreplied_list
 #define rq_commit_cb            rq_cli.cr_commit_cb
 #define rq_replay_cb            rq_cli.cr_replay_cb
 
@@ -1505,6 +804,8 @@ struct ptlrpc_request {
         __u64 rq_transno;
         /** xid */
         __u64 rq_xid;
+        /** bulk match bits */
+        u64                             rq_mbits;
         /**
          * List item to for replay list. Not yet committed requests get linked
          * there.
@@ -1793,10 +1094,93 @@ struct ptlrpc_bulk_page {
         struct page     *bp_page;
 };
 
-#define BULK_GET_SOURCE   0
-#define BULK_PUT_SINK     1
-#define BULK_GET_SINK     2
-#define BULK_PUT_SOURCE   3
+enum ptlrpc_bulk_op_type {
+        PTLRPC_BULK_OP_ACTIVE   = 0x00000001,
+        PTLRPC_BULK_OP_PASSIVE  = 0x00000002,
+        PTLRPC_BULK_OP_PUT      = 0x00000004,
+        PTLRPC_BULK_OP_GET      = 0x00000008,
+        PTLRPC_BULK_BUF_KVEC    = 0x00000010,
+        PTLRPC_BULK_BUF_KIOV    = 0x00000020,
+        PTLRPC_BULK_GET_SOURCE  = PTLRPC_BULK_OP_PASSIVE | PTLRPC_BULK_OP_GET,
+        PTLRPC_BULK_PUT_SINK    = PTLRPC_BULK_OP_PASSIVE | PTLRPC_BULK_OP_PUT,
+        PTLRPC_BULK_GET_SINK    = PTLRPC_BULK_OP_ACTIVE | PTLRPC_BULK_OP_GET,
+        PTLRPC_BULK_PUT_SOURCE  = PTLRPC_BULK_OP_ACTIVE | PTLRPC_BULK_OP_PUT,
+};
+
+static inline bool ptlrpc_is_bulk_op_get(enum ptlrpc_bulk_op_type type)
+{
+        return (type & PTLRPC_BULK_OP_GET) == PTLRPC_BULK_OP_GET;
+}
+
+static inline bool ptlrpc_is_bulk_get_source(enum ptlrpc_bulk_op_type type)
+{
+        return (type & PTLRPC_BULK_GET_SOURCE) == PTLRPC_BULK_GET_SOURCE;
+}
+
+static inline bool ptlrpc_is_bulk_put_sink(enum ptlrpc_bulk_op_type type)
+{
+        return (type & PTLRPC_BULK_PUT_SINK) == PTLRPC_BULK_PUT_SINK;
+}
+
+static inline bool ptlrpc_is_bulk_get_sink(enum ptlrpc_bulk_op_type type)
+{
+        return (type & PTLRPC_BULK_GET_SINK) == PTLRPC_BULK_GET_SINK;
+}
+
+static inline bool ptlrpc_is_bulk_put_source(enum ptlrpc_bulk_op_type type)
+{
+        return (type & PTLRPC_BULK_PUT_SOURCE) == PTLRPC_BULK_PUT_SOURCE;
+}
+
+static inline bool ptlrpc_is_bulk_desc_kvec(enum ptlrpc_bulk_op_type type)
+{
+        return ((type & PTLRPC_BULK_BUF_KVEC) | (type & PTLRPC_BULK_BUF_KIOV))
+                == PTLRPC_BULK_BUF_KVEC;
+}
+
+static inline bool ptlrpc_is_bulk_desc_kiov(enum ptlrpc_bulk_op_type type)
+{
+        return ((type & PTLRPC_BULK_BUF_KVEC) | (type & PTLRPC_BULK_BUF_KIOV))
+                == PTLRPC_BULK_BUF_KIOV;
+}
+
+static inline bool ptlrpc_is_bulk_op_active(enum ptlrpc_bulk_op_type type)
+{
+        return ((type & PTLRPC_BULK_OP_ACTIVE) |
+                (type & PTLRPC_BULK_OP_PASSIVE)) == PTLRPC_BULK_OP_ACTIVE;
+}
+
+static inline bool ptlrpc_is_bulk_op_passive(enum ptlrpc_bulk_op_type type)
+{
+        return ((type & PTLRPC_BULK_OP_ACTIVE) |
+                (type & PTLRPC_BULK_OP_PASSIVE)) == PTLRPC_BULK_OP_PASSIVE;
+}
+
+struct ptlrpc_bulk_frag_ops {
+        /**
+         * Add a page \a page to the bulk descriptor \a desc
+         * Data to transfer in the page starts at offset \a pageoffset and
+         * amount of data to transfer from the page is \a len
+         */
+        void (*add_kiov_frag)(struct ptlrpc_bulk_desc *desc,
+                              struct page *page, int pageoffset, int len);
+
+        /*
+         * Add a \a fragment to the bulk descriptor \a desc.
+         * Data to transfer in the fragment is pointed to by \a frag
+         * The size of the fragment is \a len
+         */
+        int (*add_iov_frag)(struct ptlrpc_bulk_desc *desc, void *frag, int len);
+
+        /**
+         * Uninitialize and free bulk descriptor \a desc.
+         * Works on bulk descriptors both from server and client side.
+         */
+        void (*release_frags)(struct ptlrpc_bulk_desc *desc);
+};
+
+extern const struct ptlrpc_bulk_frag_ops ptlrpc_bulk_kiov_pin_ops;
+extern const struct ptlrpc_bulk_frag_ops ptlrpc_bulk_kiov_nopin_ops;
 
 /**
  * Definition of bulk descriptor.
@@ -1811,14 +1195,14 @@ struct ptlrpc_bulk_page {
 struct ptlrpc_bulk_desc {
         /** completed with failure */
         unsigned long bd_failure:1;
-        /** {put,get}{source,sink} */
-        unsigned long bd_type:2;
         /** client side */
         unsigned long bd_registered:1;
         /** For serialization with callback */
         spinlock_t bd_lock;
         /** Import generation when request for this bulk was sent */
         int bd_import_generation;
+        /** {put,get}{source,sink}{kvec,kiov} */
+        enum ptlrpc_bulk_op_type bd_type;
         /** LNet portal for this bulk */
         __u32 bd_portal;
         /** Server side - export this bulk created for */
@@ -1827,13 +1211,14 @@ struct ptlrpc_bulk_desc {
         struct obd_import *bd_import;
         /** Back pointer to the request */
         struct ptlrpc_request *bd_req;
+        struct ptlrpc_bulk_frag_ops *bd_frag_ops;
         wait_queue_head_t           bd_waitq;   /* server side only WQ */
         int                 bd_iov_count;    /* # entries in bd_iov */
         int                 bd_max_iov;      /* allocated size of bd_iov */
         int                 bd_nob;       /* # bytes covered */
         int                 bd_nob_transferred; /* # bytes GOT/PUT */
 
-        __u64             bd_last_xid;
+        u64                     bd_last_mbits;
 
         struct ptlrpc_cb_id    bd_cbid;  /* network callback info */
         lnet_nid_t           bd_sender;       /* stash event::sender */
@@ -1842,14 +1227,31 @@ struct ptlrpc_bulk_desc {
         /** array of associated MDs */
         lnet_handle_md_t        bd_mds[PTLRPC_BULK_OPS_COUNT];
 
-        /*
-         * encrypt iov, size is either 0 or bd_iov_count.
-         */
-        lnet_kiov_t        *bd_enc_iov;
-
-        lnet_kiov_t         bd_iov[0];
+        union {
+                struct {
+                        /*
+                         * encrypt iov, size is either 0 or bd_iov_count.
+                         */
+                        struct bio_vec *bd_enc_vec;
+                        struct bio_vec *bd_vec; /* Array of bio_vecs */
+                } bd_kiov;
+
+                struct {
+                        struct kvec *bd_enc_kvec;
+                        struct kvec *bd_kvec;   /* Array of kvecs */
+                } bd_kvec;
+        } bd_u;
 };
 
+#define GET_KIOV(desc)                  ((desc)->bd_u.bd_kiov.bd_vec)
+#define BD_GET_KIOV(desc, i)            ((desc)->bd_u.bd_kiov.bd_vec[i])
+#define GET_ENC_KIOV(desc)              ((desc)->bd_u.bd_kiov.bd_enc_vec)
+#define BD_GET_ENC_KIOV(desc, i)        ((desc)->bd_u.bd_kiov.bd_enc_vec[i])
+#define GET_KVEC(desc)                  ((desc)->bd_u.bd_kvec.bd_kvec)
+#define BD_GET_KVEC(desc, i)            ((desc)->bd_u.bd_kvec.bd_kvec[i])
+#define GET_ENC_KVEC(desc)              ((desc)->bd_u.bd_kvec.bd_enc_kvec)
+#define BD_GET_ENC_KVEC(desc, i)        ((desc)->bd_u.bd_kvec.bd_enc_kvec[i])
+
 enum {
         SVC_STOPPED     = 1 << 0,
         SVC_STOPPING    = 1 << 1,
@@ -2464,21 +1866,17 @@ int ptlrpc_request_bufs_pack(struct ptlrpc_request *request,
 void ptlrpc_req_finished(struct ptlrpc_request *request);
 struct ptlrpc_request *ptlrpc_request_addref(struct ptlrpc_request *req);
 struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_imp(struct ptlrpc_request *req,
-                                              unsigned npages, unsigned max_brw,
-                                              unsigned type, unsigned portal);
-void __ptlrpc_free_bulk(struct ptlrpc_bulk_desc *bulk, int pin);
-static inline void ptlrpc_free_bulk_pin(struct ptlrpc_bulk_desc *bulk)
-{
-        __ptlrpc_free_bulk(bulk, 1);
-}
-
-static inline void ptlrpc_free_bulk_nopin(struct ptlrpc_bulk_desc *bulk)
-{
-        __ptlrpc_free_bulk(bulk, 0);
-}
-
+                                              unsigned int nfrags,
+                                              unsigned int max_brw,
+                                              unsigned int type,
+                                              unsigned int portal,
+                                              const struct ptlrpc_bulk_frag_ops *ops);
+
+int ptlrpc_prep_bulk_frag(struct ptlrpc_bulk_desc *desc,
+                          void *frag, int len);
 void __ptlrpc_prep_bulk_page(struct ptlrpc_bulk_desc *desc,
-                             struct page *page, int pageoffset, int len, int);
+                             struct page *page, int pageoffset, int len,
+                             int pin);
 static inline void ptlrpc_prep_bulk_page_pin(struct ptlrpc_bulk_desc *desc,
                                              struct page *page, int pageoffset,
                                              int len)
@@ -2493,6 +1891,16 @@ static inline void ptlrpc_prep_bulk_page_nopin(struct ptlrpc_bulk_desc *desc,
         __ptlrpc_prep_bulk_page(desc, page, pageoffset, len, 0);
 }
 
+void ptlrpc_free_bulk(struct ptlrpc_bulk_desc *bulk);
+
+static inline void ptlrpc_release_bulk_page_pin(struct ptlrpc_bulk_desc *desc)
+{
+        int i;
+
+        for (i = 0; i < desc->bd_iov_count ; i++)
+                put_page(BD_GET_KIOV(desc, i).bv_page);
+}
+
 void ptlrpc_retain_replayable_request(struct ptlrpc_request *req,
                                       struct obd_import *imp);
 __u64 ptlrpc_next_xid(void);
@@ -2652,6 +2060,7 @@ struct lustre_handle *lustre_msg_get_handle(struct lustre_msg *msg);
 __u32 lustre_msg_get_type(struct lustre_msg *msg);
 void lustre_msg_add_version(struct lustre_msg *msg, u32 version);
 __u32 lustre_msg_get_opc(struct lustre_msg *msg);
+__u16 lustre_msg_get_tag(struct lustre_msg *msg);
 __u64 lustre_msg_get_last_committed(struct lustre_msg *msg);
 __u64 *lustre_msg_get_versions(struct lustre_msg *msg);
 __u64 lustre_msg_get_transno(struct lustre_msg *msg);
@@ -2670,6 +2079,8 @@ void lustre_msg_set_handle(struct lustre_msg *msg,
                            struct lustre_handle *handle);
 void lustre_msg_set_type(struct lustre_msg *msg, __u32 type);
 void lustre_msg_set_opc(struct lustre_msg *msg, __u32 opc);
+void lustre_msg_set_last_xid(struct lustre_msg *msg, u64 last_xid);
+void lustre_msg_set_tag(struct lustre_msg *msg, __u16 tag);
 void lustre_msg_set_versions(struct lustre_msg *msg, __u64 *versions);
 void lustre_msg_set_transno(struct lustre_msg *msg, __u64 transno);
 void lustre_msg_set_status(struct lustre_msg *msg, __u32 status);
@@ -2679,6 +2090,7 @@ void lustre_msg_set_timeout(struct lustre_msg *msg, __u32 timeout);
 void lustre_msg_set_service_time(struct lustre_msg *msg, __u32 service_time);
 void lustre_msg_set_jobid(struct lustre_msg *msg, char *jobid);
 void lustre_msg_set_cksum(struct lustre_msg *msg, __u32 cksum);
+void lustre_msg_set_mbits(struct lustre_msg *msg, u64 mbits);
 
 static inline void
 lustre_shrink_reply(struct ptlrpc_request *req, int segment,
diff --git a/drivers/staging/lustre/lustre/include/lustre_nrs.h b/drivers/staging/lustre/lustre/include/lustre_nrs.h
new file mode 100644
index 000000000000..a5028aaa19cd
--- /dev/null
+++ b/drivers/staging/lustre/lustre/include/lustre_nrs.h
@@ -0,0 +1,717 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * 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,
+ * 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 version 2 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2014, Intel Corporation.
+ *
+ * Copyright 2012 Xyratex Technology Limited
+ */
+/*
+ *
+ * Network Request Scheduler (NRS)
+ *
+ */
+
+#ifndef _LUSTRE_NRS_H
+#define _LUSTRE_NRS_H
+
+/**
+ * \defgroup nrs Network Request Scheduler
+ * @{
+ */
+struct ptlrpc_nrs_policy;
+struct ptlrpc_nrs_resource;
+struct ptlrpc_nrs_request;
+
+/**
+ * NRS control operations.
+ *
+ * These are common for all policies.
+ */
+enum ptlrpc_nrs_ctl {
+        /**
+         * Not a valid opcode.
+         */
+        PTLRPC_NRS_CTL_INVALID,
+        /**
+         * Activate the policy.
+         */
+        PTLRPC_NRS_CTL_START,
+        /**
+         * Reserved for multiple primary policies, which may be a possibility
+         * in the future.
+         */
+        PTLRPC_NRS_CTL_STOP,
+        /**
+         * Policies can start using opcodes from this value and onwards for
+         * their own purposes; the assigned value itself is arbitrary.
+         */
+        PTLRPC_NRS_CTL_1ST_POL_SPEC = 0x20,
+};
+
+/**
+ * NRS policy operations.
+ *
+ * These determine the behaviour of a policy, and are called in response to
+ * NRS core events.
+ */
+struct ptlrpc_nrs_pol_ops {
+        /**
+         * Called during policy registration; this operation is optional.
+         *
+         * \param[in,out] policy The policy being initialized
+         */
+        int     (*op_policy_init)(struct ptlrpc_nrs_policy *policy);
+        /**
+         * Called during policy unregistration; this operation is optional.
+         *
+         * \param[in,out] policy The policy being unregistered/finalized
+         */
+        void    (*op_policy_fini)(struct ptlrpc_nrs_policy *policy);
+        /**
+         * Called when activating a policy via lprocfs; policies allocate and
+         * initialize their resources here; this operation is optional.
+         *
+         * \param[in,out] policy The policy being started
+         *
+         * \see nrs_policy_start_locked()
+         */
+        int     (*op_policy_start)(struct ptlrpc_nrs_policy *policy);
+        /**
+         * Called when deactivating a policy via lprocfs; policies deallocate
+         * their resources here; this operation is optional
+         *
+         * \param[in,out] policy The policy being stopped
+         *
+         * \see nrs_policy_stop0()
+         */
+        void    (*op_policy_stop)(struct ptlrpc_nrs_policy *policy);
+        /**
+         * Used for policy-specific operations; i.e. not generic ones like
+         * \e PTLRPC_NRS_CTL_START and \e PTLRPC_NRS_CTL_GET_INFO; analogous
+         * to an ioctl; this operation is optional.
+         *
+         * \param[in,out]        policy The policy carrying out operation \a opc
+         * \param[in]     opc    The command operation being carried out
+         * \param[in,out] arg    An generic buffer for communication between the
+         *                       user and the control operation
+         *
+         * \retval -ve error
+         * \retval   0 success
+         *
+         * \see ptlrpc_nrs_policy_control()
+         */
+        int     (*op_policy_ctl)(struct ptlrpc_nrs_policy *policy,
+                                 enum ptlrpc_nrs_ctl opc, void *arg);
+
+        /**
+         * Called when obtaining references to the resources of the resource
+         * hierarchy for a request that has arrived for handling at the PTLRPC
+         * service. Policies should return -ve for requests they do not wish
+         * to handle. This operation is mandatory.
+         *
+         * \param[in,out] policy  The policy we're getting resources for.
+         * \param[in,out] nrq     The request we are getting resources for.
+         * \param[in]     parent  The parent resource of the resource being
+         *                        requested; set to NULL if none.
+         * \param[out]    resp    The resource is to be returned here; the
+         *                        fallback policy in an NRS head should
+         *                        \e always return a non-NULL pointer value.
+         * \param[in]  moving_req When set, signifies that this is an attempt
+         *                        to obtain resources for a request being moved
+         *                        to the high-priority NRS head by
+         *                        ldlm_lock_reorder_req().
+         *                        This implies two things:
+         *                        1. We are under obd_export::exp_rpc_lock and
+         *                        so should not sleep.
+         *                        2. We should not perform non-idempotent or can
+         *                        skip performing idempotent operations that
+         *                        were carried out when resources were first
+         *                        taken for the request when it was initialized
+         *                        in ptlrpc_nrs_req_initialize().
+         *
+         * \retval 0, +ve The level of the returned resource in the resource
+         *                hierarchy; currently only 0 (for a non-leaf resource)
+         *                and 1 (for a leaf resource) are supported by the
+         *                framework.
+         * \retval -ve    error
+         *
+         * \see ptlrpc_nrs_req_initialize()
+         * \see ptlrpc_nrs_hpreq_add_nolock()
+         * \see ptlrpc_nrs_req_hp_move()
+         */
+        int     (*op_res_get)(struct ptlrpc_nrs_policy *policy,
+                              struct ptlrpc_nrs_request *nrq,
+                              const struct ptlrpc_nrs_resource *parent,
+                              struct ptlrpc_nrs_resource **resp,
+                              bool moving_req);
+        /**
+         * Called when releasing references taken for resources in the resource
+         * hierarchy for the request; this operation is optional.
+         *
+         * \param[in,out] policy The policy the resource belongs to
+         * \param[in] res        The resource to be freed
+         *
+         * \see ptlrpc_nrs_req_finalize()
+         * \see ptlrpc_nrs_hpreq_add_nolock()
+         * \see ptlrpc_nrs_req_hp_move()
+         */
+        void    (*op_res_put)(struct ptlrpc_nrs_policy *policy,
+                              const struct ptlrpc_nrs_resource *res);
+
+        /**
+         * Obtains a request for handling from the policy, and optionally
+         * removes the request from the policy; this operation is mandatory.
+         *
+         * \param[in,out] policy The policy to poll
+         * \param[in]     peek   When set, signifies that we just want to
+         *                       examine the request, and not handle it, so the
+         *                       request is not removed from the policy.
+         * \param[in]     force  When set, it will force a policy to return a
+         *                       request if it has one queued.
+         *
+         * \retval NULL No request available for handling
+         * \retval valid-pointer The request polled for handling
+         *
+         * \see ptlrpc_nrs_req_get_nolock()
+         */
+        struct ptlrpc_nrs_request *
+                (*op_req_get)(struct ptlrpc_nrs_policy *policy, bool peek,
+                              bool force);
+        /**
+         * Called when attempting to add a request to a policy for later
+         * handling; this operation is mandatory.
+         *
+         * \param[in,out] policy  The policy on which to enqueue \a nrq
+         * \param[in,out] nrq The request to enqueue
+         *
+         * \retval 0    success
+         * \retval != 0 error
+         *
+         * \see ptlrpc_nrs_req_add_nolock()
+         */
+        int     (*op_req_enqueue)(struct ptlrpc_nrs_policy *policy,
+                                  struct ptlrpc_nrs_request *nrq);
+        /**
+         * Removes a request from the policy's set of pending requests. Normally
+         * called after a request has been polled successfully from the policy
+         * for handling; this operation is mandatory.
+         *
+         * \param[in,out] policy The policy the request \a nrq belongs to
+         * \param[in,out] nrq    The request to dequeue
+         *
+         * \see ptlrpc_nrs_req_del_nolock()
+         */
+        void    (*op_req_dequeue)(struct ptlrpc_nrs_policy *policy,
+                                  struct ptlrpc_nrs_request *nrq);
+        /**
+         * Called after the request being carried out. Could be used for
+         * job/resource control; this operation is optional.
+         *
+         * \param[in,out] policy The policy which is stopping to handle request
+         *                       \a nrq
+         * \param[in,out] nrq    The request
+         *
+         * \pre assert_spin_locked(&svcpt->scp_req_lock)
+         *
+         * \see ptlrpc_nrs_req_stop_nolock()
+         */
+        void    (*op_req_stop)(struct ptlrpc_nrs_policy *policy,
+                               struct ptlrpc_nrs_request *nrq);
+        /**
+         * Registers the policy's lprocfs interface with a PTLRPC service.
+         *
+         * \param[in] svc The service
+         *
+         * \retval 0    success
+         * \retval != 0 error
+         */
+        int     (*op_lprocfs_init)(struct ptlrpc_service *svc);
+        /**
+         * Unegisters the policy's lprocfs interface with a PTLRPC service.
+         *
+         * In cases of failed policy registration in
+         * \e ptlrpc_nrs_policy_register(), this function may be called for a
+         * service which has not registered the policy successfully, so
+         * implementations of this method should make sure their operations are
+         * safe in such cases.
+         *
+         * \param[in] svc The service
+         */
+        void    (*op_lprocfs_fini)(struct ptlrpc_service *svc);
+};
+
+/**
+ * Policy flags
+ */
+enum nrs_policy_flags {
+        /**
+         * Fallback policy, use this flag only on a single supported policy per
+         * service. The flag cannot be used on policies that use
+         * \e PTLRPC_NRS_FL_REG_EXTERN
+         */
+        PTLRPC_NRS_FL_FALLBACK          = BIT(0),
+        /**
+         * Start policy immediately after registering.
+         */
+        PTLRPC_NRS_FL_REG_START         = BIT(1),
+        /**
+         * This is a policy registering from a module different to the one NRS
+         * core ships in (currently ptlrpc).
+         */
+        PTLRPC_NRS_FL_REG_EXTERN        = BIT(2),
+};
+
+/**
+ * NRS queue type.
+ *
+ * Denotes whether an NRS instance is for handling normal or high-priority
+ * RPCs, or whether an operation pertains to one or both of the NRS instances
+ * in a service.
+ */
+enum ptlrpc_nrs_queue_type {
+        PTLRPC_NRS_QUEUE_REG    = BIT(0),
+        PTLRPC_NRS_QUEUE_HP     = BIT(1),
+        PTLRPC_NRS_QUEUE_BOTH   = (PTLRPC_NRS_QUEUE_REG | PTLRPC_NRS_QUEUE_HP)
+};
+
+/**
+ * NRS head
+ *
+ * A PTLRPC service has at least one NRS head instance for handling normal
+ * priority RPCs, and may optionally have a second NRS head instance for
+ * handling high-priority RPCs. Each NRS head maintains a list of available
+ * policies, of which one and only one policy is acting as the fallback policy,
+ * and optionally a different policy may be acting as the primary policy. For
+ * all RPCs handled by this NRS head instance, NRS core will first attempt to
+ * enqueue the RPC using the primary policy (if any). The fallback policy is
+ * used in the following cases:
+ * - when there was no primary policy in the
+ *   ptlrpc_nrs_pol_state::NRS_POL_STATE_STARTED state at the time the request
+ *   was initialized.
+ * - when the primary policy that was at the
+ *   ptlrpc_nrs_pol_state::PTLRPC_NRS_POL_STATE_STARTED state at the time the
+ *   RPC was initialized, denoted it did not wish, or for some other reason was
+ *   not able to handle the request, by returning a non-valid NRS resource
+ *   reference.
+ * - when the primary policy that was at the
+ *   ptlrpc_nrs_pol_state::PTLRPC_NRS_POL_STATE_STARTED state at the time the
+ *   RPC was initialized, fails later during the request enqueueing stage.
+ *
+ * \see nrs_resource_get_safe()
+ * \see nrs_request_enqueue()
+ */
+struct ptlrpc_nrs {
+        spinlock_t                      nrs_lock;
+        /** XXX Possibly replace svcpt->scp_req_lock with another lock here. */
+        /**
+         * List of registered policies
+         */
+        struct list_head                nrs_policy_list;
+        /**
+         * List of policies with queued requests. Policies that have any
+         * outstanding requests are queued here, and this list is queried
+         * in a round-robin manner from NRS core when obtaining a request
+         * for handling. This ensures that requests from policies that at some
+         * point transition away from the
+         * ptlrpc_nrs_pol_state::NRS_POL_STATE_STARTED state are drained.
+         */
+        struct list_head                nrs_policy_queued;
+        /**
+         * Service partition for this NRS head
+         */
+        struct ptlrpc_service_part     *nrs_svcpt;
+        /**
+         * Primary policy, which is the preferred policy for handling RPCs
+         */
+        struct ptlrpc_nrs_policy       *nrs_policy_primary;
+        /**
+         * Fallback policy, which is the backup policy for handling RPCs
+         */
+        struct ptlrpc_nrs_policy       *nrs_policy_fallback;
+        /**
+         * This NRS head handles either HP or regular requests
+         */
+        enum ptlrpc_nrs_queue_type      nrs_queue_type;
+        /**
+         * # queued requests from all policies in this NRS head
+         */
+        unsigned long                   nrs_req_queued;
+        /**
+         * # scheduled requests from all policies in this NRS head
+         */
+        unsigned long                   nrs_req_started;
+        /**
+         * # policies on this NRS
+         */
+        unsigned int                    nrs_num_pols;
+        /**
+         * This NRS head is in progress of starting a policy
+         */
+        unsigned int                    nrs_policy_starting:1;
+        /**
+         * In progress of shutting down the whole NRS head; used during
+         * unregistration
+         */
+        unsigned int                    nrs_stopping:1;
+        /**
+         * NRS policy is throttling request
+         */
+        unsigned int                    nrs_throttling:1;
+};
+
+#define NRS_POL_NAME_MAX                16
+#define NRS_POL_ARG_MAX                 16
+
+struct ptlrpc_nrs_pol_desc;
+
+/**
+ * Service compatibility predicate; this determines whether a policy is adequate
+ * for handling RPCs of a particular PTLRPC service.
+ *
+ * XXX:This should give the same result during policy registration and
+ * unregistration, and for all partitions of a service; so the result should not
+ * depend on temporal service or other properties, that may influence the
+ * result.
+ */
+typedef bool (*nrs_pol_desc_compat_t)(const struct ptlrpc_service *svc,
+                                      const struct ptlrpc_nrs_pol_desc *desc);
+
+struct ptlrpc_nrs_pol_conf {
+        /**
+         * Human-readable policy name
+         */
+        char                               nc_name[NRS_POL_NAME_MAX];
+        /**
+         * NRS operations for this policy
+         */
+        const struct ptlrpc_nrs_pol_ops   *nc_ops;
+        /**
+         * Service compatibility predicate
+         */
+        nrs_pol_desc_compat_t              nc_compat;
+        /**
+         * Set for policies that support a single ptlrpc service, i.e. ones that
+         * have \a pd_compat set to nrs_policy_compat_one(). The variable value
+         * depicts the name of the single service that such policies are
+         * compatible with.
+         */
+        const char                        *nc_compat_svc_name;
+        /**
+         * Owner module for this policy descriptor; policies registering from a
+         * different module to the one the NRS framework is held within
+         * (currently ptlrpc), should set this field to THIS_MODULE.
+         */
+        struct module                     *nc_owner;
+        /**
+         * Policy registration flags; a bitmask of \e nrs_policy_flags
+         */
+        unsigned int                       nc_flags;
+};
+
+/**
+ * NRS policy registering descriptor
+ *
+ * Is used to hold a description of a policy that can be passed to NRS core in
+ * order to register the policy with NRS heads in different PTLRPC services.
+ */
+struct ptlrpc_nrs_pol_desc {
+        /**
+         * Human-readable policy name
+         */
+        char                                    pd_name[NRS_POL_NAME_MAX];
+        /**
+         * Link into nrs_core::nrs_policies
+         */
+        struct list_head                        pd_list;
+        /**
+         * NRS operations for this policy
+         */
+        const struct ptlrpc_nrs_pol_ops        *pd_ops;
+        /**
+         * Service compatibility predicate
+         */
+        nrs_pol_desc_compat_t                   pd_compat;
+        /**
+         * Set for policies that are compatible with only one PTLRPC service.
+         *
+         * \see ptlrpc_nrs_pol_conf::nc_compat_svc_name
+         */
+        const char                             *pd_compat_svc_name;
+        /**
+         * Owner module for this policy descriptor.
+         *
+         * We need to hold a reference to the module whenever we might make use
+         * of any of the module's contents, i.e.
+         * - If one or more instances of the policy are at a state where they
+         *   might be handling a request, i.e.
+         *   ptlrpc_nrs_pol_state::NRS_POL_STATE_STARTED or
+         *   ptlrpc_nrs_pol_state::NRS_POL_STATE_STOPPING as we will have to
+         *   call into the policy's ptlrpc_nrs_pol_ops() handlers. A reference
+         *   is taken on the module when
+         *   \e ptlrpc_nrs_pol_desc::pd_refs becomes 1, and released when it
+         *   becomes 0, so that we hold only one reference to the module maximum
+         *   at any time.
+         *
+         *   We do not need to hold a reference to the module, even though we
+         *   might use code and data from the module, in the following cases:
+         * - During external policy registration, because this should happen in
+         *   the module's init() function, in which case the module is safe from
+         *   removal because a reference is being held on the module by the
+         *   kernel, and iirc kmod (and I guess module-init-tools also) will
+         *   serialize any racing processes properly anyway.
+         * - During external policy unregistration, because this should happen
+         *   in a module's exit() function, and any attempts to start a policy
+         *   instance would need to take a reference on the module, and this is
+         *   not possible once we have reached the point where the exit()
+         *   handler is called.
+         * - During service registration and unregistration, as service setup
+         *   and cleanup, and policy registration, unregistration and policy
+         *   instance starting, are serialized by \e nrs_core::nrs_mutex, so
+         *   as long as users adhere to the convention of registering policies
+         *   in init() and unregistering them in module exit() functions, there
+         *   should not be a race between these operations.
+         * - During any policy-specific lprocfs operations, because a reference
+         *   is held by the kernel on a proc entry that has been entered by a
+         *   syscall, so as long as proc entries are removed during
+         *   unregistration time, then unregistration and lprocfs operations
+         *   will be properly serialized.
+         */
+        struct module                          *pd_owner;
+        /**
+         * Bitmask of \e nrs_policy_flags
+         */
+        unsigned int                            pd_flags;
+        /**
+         * # of references on this descriptor
+         */
+        atomic_t                                pd_refs;
+};
+
+/**
+ * NRS policy state
+ *
+ * Policies transition from one state to the other during their lifetime
+ */
+enum ptlrpc_nrs_pol_state {
+        /**
+         * Not a valid policy state.
+         */
+        NRS_POL_STATE_INVALID,
+        /**
+         * Policies are at this state either at the start of their life, or
+         * transition here when the user selects a different policy to act
+         * as the primary one.
+         */
+        NRS_POL_STATE_STOPPED,
+        /**
+         * Policy is progress of stopping
+         */
+        NRS_POL_STATE_STOPPING,
+        /**
+         * Policy is in progress of starting
+         */
+        NRS_POL_STATE_STARTING,
+        /**
+         * A policy is in this state in two cases:
+         * - it is the fallback policy, which is always in this state.
+         * - it has been activated by the user; i.e. it is the primary policy,
+         */
+        NRS_POL_STATE_STARTED,
+};
+
+/**
+ * NRS policy information
+ *
+ * Used for obtaining information for the status of a policy via lprocfs
+ */
+struct ptlrpc_nrs_pol_info {
+        /**
+         * Policy name
+         */
+        char                            pi_name[NRS_POL_NAME_MAX];
+        /**
+         * Policy argument
+         */
+        char                            pi_arg[NRS_POL_ARG_MAX];
+        /**
+         * Current policy state
+         */
+        enum ptlrpc_nrs_pol_state       pi_state;
+        /**
+         * # RPCs enqueued for later dispatching by the policy
+         */
+        long                            pi_req_queued;
+        /**
+         * # RPCs started for dispatch by the policy
+         */
+        long                            pi_req_started;
+        /**
+         * Is this a fallback policy?
+         */
+        unsigned                        pi_fallback:1;
+};
+
+/**
+ * NRS policy
+ *
+ * There is one instance of this for each policy in each NRS head of each
+ * PTLRPC service partition.
+ */
+struct ptlrpc_nrs_policy {
+        /**
+         * Linkage into the NRS head's list of policies,
+         * ptlrpc_nrs:nrs_policy_list
+         */
+        struct list_head                pol_list;
+        /**
+         * Linkage into the NRS head's list of policies with enqueued
+         * requests ptlrpc_nrs:nrs_policy_queued
+         */
+        struct list_head                pol_list_queued;
+        /**
+         * Current state of this policy
+         */
+        enum ptlrpc_nrs_pol_state       pol_state;
+        /**
+         * Bitmask of nrs_policy_flags
+         */
+        unsigned int                    pol_flags;
+        /**
+         * # RPCs enqueued for later dispatching by the policy
+         */
+        long                            pol_req_queued;
+        /**
+         * # RPCs started for dispatch by the policy
+         */
+        long                            pol_req_started;
+        /**
+         * Usage Reference count taken on the policy instance
+         */
+        long                            pol_ref;
+        /**
+         * Human-readable policy argument
+         */
+        char                            pol_arg[NRS_POL_ARG_MAX];
+        /**
+         * The NRS head this policy has been created at
+         */
+        struct ptlrpc_nrs              *pol_nrs;
+        /**
+         * Private policy data; varies by policy type
+         */
+        void                           *pol_private;
+        /**
+         * Policy descriptor for this policy instance.
+         */
+        struct ptlrpc_nrs_pol_desc     *pol_desc;
+};
+
+/**
+ * NRS resource
+ *
+ * Resources are embedded into two types of NRS entities:
+ * - Inside NRS policies, in the policy's private data in
+ *   ptlrpc_nrs_policy::pol_private
+ * - In objects that act as prime-level scheduling entities in different NRS
+ *   policies; e.g. on a policy that performs round robin or similar order
+ *   scheduling across client NIDs, there would be one NRS resource per unique
+ *   client NID. On a policy which performs round robin scheduling across
+ *   backend filesystem objects, there would be one resource associated with
+ *   each of the backend filesystem objects partaking in the scheduling
+ *   performed by the policy.
+ *
+ * NRS resources share a parent-child relationship, in which resources embedded
+ * in policy instances are the parent entities, with all scheduling entities
+ * a policy schedules across being the children, thus forming a simple resource
+ * hierarchy. This hierarchy may be extended with one or more levels in the
+ * future if the ability to have more than one primary policy is added.
+ *
+ * Upon request initialization, references to the then active NRS policies are
+ * taken and used to later handle the dispatching of the request with one of
+ * these policies.
+ *
+ * \see nrs_resource_get_safe()
+ * \see ptlrpc_nrs_req_add()
+ */
+struct ptlrpc_nrs_resource {
+        /**
+         * This NRS resource's parent; is NULL for resources embedded in NRS
+         * policy instances; i.e. those are top-level ones.
+         */
+        struct ptlrpc_nrs_resource     *res_parent;
+        /**
+         * The policy associated with this resource.
+         */
+        struct ptlrpc_nrs_policy       *res_policy;
+};
+
+enum {
+        NRS_RES_FALLBACK,
+        NRS_RES_PRIMARY,
+        NRS_RES_MAX
+};
+
+#include "lustre_nrs_fifo.h"
+
+/**
+ * NRS request
+ *
+ * Instances of this object exist embedded within ptlrpc_request; the main
+ * purpose of this object is to hold references to the request's resources
+ * for the lifetime of the request, and to hold properties that policies use
+ * use for determining the request's scheduling priority.
+ **/
+struct ptlrpc_nrs_request {
+        /**
+         * The request's resource hierarchy.
+         */
+        struct ptlrpc_nrs_resource     *nr_res_ptrs[NRS_RES_MAX];
+        /**
+         * Index into ptlrpc_nrs_request::nr_res_ptrs of the resource of the
+         * policy that was used to enqueue the request.
+         *
+         * \see nrs_request_enqueue()
+         */
+        unsigned int                    nr_res_idx;
+        unsigned int                    nr_initialized:1;
+        unsigned int                    nr_enqueued:1;
+        unsigned int                    nr_started:1;
+        unsigned int                    nr_finalized:1;
+
+        /**
+         * Policy-specific fields, used for determining a request's scheduling
+         * priority, and other supporting functionality.
+         */
+        union {
+                /**
+                 * Fields for the FIFO policy
+                 */
+                struct nrs_fifo_req     fifo;
+        } nr_u;
+        /**
+         * Externally-registering policies may want to use this to allocate
+         * their own request properties.
+         */
+        void                           *ext;
+};
+
+/** @} nrs */
+#endif
diff --git a/drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h b/drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h
new file mode 100644
index 000000000000..3b5418eac6c4
--- /dev/null
+++ b/drivers/staging/lustre/lustre/include/lustre_nrs_fifo.h
@@ -0,0 +1,70 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * 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,
+ * 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 version 2 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2014, Intel Corporation.
+ *
+ * Copyright 2012 Xyratex Technology Limited
+ */
+/*
+ *
+ * Network Request Scheduler (NRS) First-in First-out (FIFO) policy
+ *
+ */
+
+#ifndef _LUSTRE_NRS_FIFO_H
+#define _LUSTRE_NRS_FIFO_H
+
+/* \name fifo
+ *
+ * FIFO policy
+ *
+ * This policy is a logical wrapper around previous, non-NRS functionality.
+ * It dispatches RPCs in the same order as they arrive from the network. This
+ * policy is currently used as the fallback policy, and the only enabled policy
+ * on all NRS heads of all PTLRPC service partitions.
+ * @{
+ */
+
+/**
+ * Private data structure for the FIFO policy
+ */
+struct nrs_fifo_head {
+        /**
+         * Resource object for policy instance.
+         */
+        struct ptlrpc_nrs_resource      fh_res;
+        /**
+         * List of queued requests.
+         */
+        struct list_head                fh_list;
+        /**
+         * For debugging purposes.
+         */
+        __u64                           fh_sequence;
+};
+
+struct nrs_fifo_req {
+        struct list_head        fr_list;
+        __u64                   fr_sequence;
+};
+
+/** @} fifo */
+#endif
diff --git a/drivers/staging/lustre/lustre/include/lustre_req_layout.h b/drivers/staging/lustre/lustre/include/lustre_req_layout.h
index a13558e53274..fbcd39572cd0 100644
--- a/drivers/staging/lustre/lustre/include/lustre_req_layout.h
+++ b/drivers/staging/lustre/lustre/include/lustre_req_layout.h
@@ -148,13 +148,12 @@ extern struct req_format RQF_MDS_GETATTR;
  */
 extern struct req_format RQF_MDS_GETATTR_NAME;
 extern struct req_format RQF_MDS_CLOSE;
-extern struct req_format RQF_MDS_RELEASE_CLOSE;
+extern struct req_format RQF_MDS_INTENT_CLOSE;
 extern struct req_format RQF_MDS_CONNECT;
 extern struct req_format RQF_MDS_DISCONNECT;
 extern struct req_format RQF_MDS_GET_INFO;
 extern struct req_format RQF_MDS_READPAGE;
 extern struct req_format RQF_MDS_WRITEPAGE;
-extern struct req_format RQF_MDS_DONE_WRITING;
 extern struct req_format RQF_MDS_REINT;
 extern struct req_format RQF_MDS_REINT_CREATE;
 extern struct req_format RQF_MDS_REINT_CREATE_ACL;
@@ -166,10 +165,9 @@ extern struct req_format RQF_MDS_REINT_LINK;
 extern struct req_format RQF_MDS_REINT_RENAME;
 extern struct req_format RQF_MDS_REINT_SETATTR;
 extern struct req_format RQF_MDS_REINT_SETXATTR;
-extern struct req_format RQF_MDS_QUOTACHECK;
 extern struct req_format RQF_MDS_QUOTACTL;
-extern struct req_format RQF_QC_CALLBACK;
 extern struct req_format RQF_MDS_SWAP_LAYOUTS;
+extern struct req_format RQF_MDS_REINT_MIGRATE;
 /* MDS hsm formats */
 extern struct req_format RQF_MDS_HSM_STATE_GET;
 extern struct req_format RQF_MDS_HSM_STATE_SET;
@@ -181,7 +179,6 @@ extern struct req_format RQF_MDS_HSM_REQUEST;
 /* OST req_format */
 extern struct req_format RQF_OST_CONNECT;
 extern struct req_format RQF_OST_DISCONNECT;
-extern struct req_format RQF_OST_QUOTACHECK;
 extern struct req_format RQF_OST_QUOTACTL;
 extern struct req_format RQF_OST_GETATTR;
 extern struct req_format RQF_OST_SETATTR;
diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h b/drivers/staging/lustre/lustre/include/lustre_sec.h
index 90c183424802..03a970bcac55 100644
--- a/drivers/staging/lustre/lustre/include/lustre_sec.h
+++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
@@ -50,6 +50,7 @@ struct brw_page;
 /* Linux specific */
 struct key;
 struct seq_file;
+struct lustre_cfg;
 
 /*
  * forward declaration
@@ -1029,6 +1030,8 @@ int  sptlrpc_target_export_check(struct obd_export *exp,
 
 /* bulk security api */
 void sptlrpc_enc_pool_put_pages(struct ptlrpc_bulk_desc *desc);
+int get_free_pages_in_pool(void);
+int pool_is_at_full_capacity(void);
 
 int sptlrpc_cli_wrap_bulk(struct ptlrpc_request *req,
                           struct ptlrpc_bulk_desc *desc);
diff --git a/drivers/staging/lustre/lustre/include/lustre_swab.h b/drivers/staging/lustre/lustre/include/lustre_swab.h
new file mode 100644
index 000000000000..26d01c2d6633
--- /dev/null
+++ b/drivers/staging/lustre/lustre/include/lustre_swab.h
@@ -0,0 +1,102 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * 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,
+ * 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 version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2014, Intel Corporation.
+ *
+ * Copyright 2015 Cray Inc, all rights reserved.
+ * Author: Ben Evans.
+ *
+ * We assume all nodes are either little-endian or big-endian, and we
+ * always send messages in the sender's native format.  The receiver
+ * detects the message format by checking the 'magic' field of the message
+ * (see lustre_msg_swabbed() below).
+ *
+ * Each wire type has corresponding 'lustre_swab_xxxtypexxx()' routines
+ * are implemented in ptlrpc/lustre_swab.c.  These 'swabbers' convert the
+ * type from "other" endian, in-place in the message buffer.
+ *
+ * A swabber takes a single pointer argument.  The caller must already have
+ * verified that the length of the message buffer >= sizeof (type).
+ *
+ * For variable length types, a second 'lustre_swab_v_xxxtypexxx()' routine
+ * may be defined that swabs just the variable part, after the caller has
+ * verified that the message buffer is large enough.
+ */
+
+#ifndef _LUSTRE_SWAB_H_
+#define _LUSTRE_SWAB_H_
+
+#include "lustre/lustre_idl.h"
+
+void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
+void lustre_swab_connect(struct obd_connect_data *ocd);
+void lustre_swab_hsm_user_state(struct hsm_user_state *hus);
+void lustre_swab_hsm_state_set(struct hsm_state_set *hss);
+void lustre_swab_obd_statfs(struct obd_statfs *os);
+void lustre_swab_obd_ioobj(struct obd_ioobj *ioo);
+void lustre_swab_niobuf_remote(struct niobuf_remote *nbr);
+void lustre_swab_ost_lvb_v1(struct ost_lvb_v1 *lvb);
+void lustre_swab_ost_lvb(struct ost_lvb *lvb);
+void lustre_swab_obd_quotactl(struct obd_quotactl *q);
+void lustre_swab_lquota_lvb(struct lquota_lvb *lvb);
+void lustre_swab_generic_32s(__u32 *val);
+void lustre_swab_mdt_body(struct mdt_body *b);
+void lustre_swab_mdt_ioepoch(struct mdt_ioepoch *b);
+void lustre_swab_mdt_rec_setattr(struct mdt_rec_setattr *sa);
+void lustre_swab_mdt_rec_reint(struct mdt_rec_reint *rr);
+void lustre_swab_lmv_desc(struct lmv_desc *ld);
+void lustre_swab_lmv_mds_md(union lmv_mds_md *lmm);
+void lustre_swab_lov_desc(struct lov_desc *ld);
+void lustre_swab_gl_desc(union ldlm_gl_desc *desc);
+void lustre_swab_ldlm_intent(struct ldlm_intent *i);
+void lustre_swab_ldlm_request(struct ldlm_request *rq);
+void lustre_swab_ldlm_reply(struct ldlm_reply *r);
+void lustre_swab_mgs_target_info(struct mgs_target_info *oinfo);
+void lustre_swab_mgs_nidtbl_entry(struct mgs_nidtbl_entry *oinfo);
+void lustre_swab_mgs_config_body(struct mgs_config_body *body);
+void lustre_swab_mgs_config_res(struct mgs_config_res *body);
+void lustre_swab_ost_body(struct ost_body *b);
+void lustre_swab_ost_last_id(__u64 *id);
+void lustre_swab_fiemap(struct fiemap *fiemap);
+void lustre_swab_lov_user_md_v1(struct lov_user_md_v1 *lum);
+void lustre_swab_lov_user_md_v3(struct lov_user_md_v3 *lum);
+void lustre_swab_lov_user_md_objects(struct lov_user_ost_data *lod,
+                                     int stripe_count);
+void lustre_swab_lov_mds_md(struct lov_mds_md *lmm);
+void lustre_swab_lustre_capa(struct lustre_capa *c);
+void lustre_swab_lustre_capa_key(struct lustre_capa_key *k);
+void lustre_swab_fid2path(struct getinfo_fid2path *gf);
+void lustre_swab_layout_intent(struct layout_intent *li);
+void lustre_swab_hsm_user_state(struct hsm_user_state *hus);
+void lustre_swab_hsm_current_action(struct hsm_current_action *action);
+void lustre_swab_hsm_progress_kernel(struct hsm_progress_kernel *hpk);
+void lustre_swab_hsm_user_state(struct hsm_user_state *hus);
+void lustre_swab_hsm_user_item(struct hsm_user_item *hui);
+void lustre_swab_hsm_request(struct hsm_request *hr);
+void lustre_swab_swap_layouts(struct mdc_swap_layouts *msl);
+void lustre_swab_close_data(struct close_data *data);
+void lustre_swab_lmv_user_md(struct lmv_user_md *lum);
+
+#endif
diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
index f6fc4dd05bd6..0f48e9c3d9e3 100644
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
@@ -73,70 +73,17 @@ static inline void loi_init(struct lov_oinfo *loi)
 {
 }
 
-/*
- * If we are unable to get the maximum object size from the OST in
- * ocd_maxbytes using OBD_CONNECT_MAXBYTES, then we fall back to using
- * the old maximum object size from ext3.
- */
-#define LUSTRE_EXT3_STRIPE_MAXBYTES 0x1fffffff000ULL
-
-struct lov_stripe_md {
-        atomic_t     lsm_refc;
-        spinlock_t      lsm_lock;
-        pid_t       lsm_lock_owner; /* debugging */
-
-        /* maximum possible file size, might change as OSTs status changes,
-         * e.g. disconnected, deactivated
-         */
-        __u64           lsm_maxbytes;
-        struct ost_id   lsm_oi;
-        __u32           lsm_magic;
-        __u32           lsm_stripe_size;
-        __u32           lsm_pattern;    /* striping pattern (RAID0, RAID1) */
-        __u16           lsm_stripe_count;
-        __u16           lsm_layout_gen;
-        char            lsm_pool_name[LOV_MAXPOOLNAME + 1];
-        struct lov_oinfo *lsm_oinfo[0];
-};
-
-static inline bool lsm_is_released(struct lov_stripe_md *lsm)
-{
-        return !!(lsm->lsm_pattern & LOV_PATTERN_F_RELEASED);
-}
-
-static inline bool lsm_has_objects(struct lov_stripe_md *lsm)
-{
-        if (!lsm)
-                return false;
-        if (lsm_is_released(lsm))
-                return false;
-        return true;
-}
-
-static inline int lov_stripe_md_size(unsigned int stripe_count)
-{
-        struct lov_stripe_md lsm;
-
-        return sizeof(lsm) + stripe_count * sizeof(lsm.lsm_oinfo[0]);
-}
-
+struct lov_stripe_md;
 struct obd_info;
 
 typedef int (*obd_enqueue_update_f)(void *cookie, int rc);
 
 /* obd info for a particular level (lov, osc). */
 struct obd_info {
-        /* Flags used for set request specific flags:
-           - while lock handling, the flags obtained on the enqueue
-           request are set here.
-           - while stats, the flags used for control delay/resend.
-           - while setattr, the flags used for distinguish punch operation
-         */
+        /* OBD_STATFS_* flags */
         __u64              oi_flags;
         /* lsm data specific for every OSC. */
         struct lov_stripe_md   *oi_md;
-        /* obdo data specific for every OSC, if needed at all. */
-        struct obdo         *oi_oa;
         /* statfs data specific for every OSC, if needed at all. */
         struct obd_statfs      *oi_osfs;
         /* An update callback which is called to update some data on upper
@@ -204,7 +151,6 @@ enum obd_cl_sem_lock_class {
  * on the MDS.
  */
 #define OBD_MAX_DEFAULT_EA_SIZE         4096
-#define OBD_MAX_DEFAULT_COOKIE_SIZE     4096
 
 struct mdc_rpc_lock;
 struct obd_import;
@@ -214,7 +160,7 @@ struct client_obd {
         struct obd_import       *cl_import; /* ptlrpc connection state */
         size_t                   cl_conn_count;
         /*
-         * Cache maximum and default values for easize and cookiesize. This is
+         * Cache maximum and default values for easize. This is
          * strictly a performance optimization to minimize calls to
          * obd_size_diskmd(). The default values are used to calculate the
          * initial size of a request buffer. The ptlrpc layer will resize the
@@ -235,18 +181,6 @@ struct client_obd {
          * run-time if a larger observed size is advertised by the MDT.
          */
         u32                      cl_max_mds_easize;
-        /* Default cookie size for llog cookies (see struct llog_cookie). It is
-         * initialized to zero at mount-time, then it tracks the largest
-         * observed cookie size advertised by the MDT, up to a maximum value of
-         * OBD_MAX_DEFAULT_COOKIE_SIZE. Note that llog_cookies are not
-         * used by clients communicating with MDS versions 2.4.0 and later.
-         */
-        u32                      cl_default_mds_cookiesize;
-        /* Maximum possible cookie size computed at mount-time based on
-         * the number of OSTs in the filesystem. May be increased at
-         * run-time if a larger observed size is advertised by the MDT.
-         */
-        u32                      cl_max_mds_cookiesize;
 
         enum lustre_sec_part     cl_sp_me;
         enum lustre_sec_part     cl_sp_to;
@@ -313,15 +247,42 @@ struct client_obd {
         struct obd_histogram     cl_read_offset_hist;
         struct obd_histogram     cl_write_offset_hist;
 
-        /* lru for osc caching pages */
+        /* LRU for osc caching pages */
         struct cl_client_cache  *cl_cache;
-        struct list_head         cl_lru_osc; /* member of cl_cache->ccc_lru */
+        /** member of cl_cache->ccc_lru */
+        struct list_head         cl_lru_osc;
+        /** # of available LRU slots left in the per-OSC cache.
+         * Available LRU slots are shared by all OSCs of the same file system,
+         * therefore this is a pointer to cl_client_cache::ccc_lru_left.
+         */
         atomic_long_t           *cl_lru_left;
+        /** # of busy LRU pages. A page is considered busy if it's in writeback
+         * queue, or in transfer. Busy pages can't be discarded so they are not
+         * in LRU cache.
+         */
         atomic_long_t            cl_lru_busy;
+        /** # of LRU pages in the cache for this client_obd */
         atomic_long_t            cl_lru_in_list;
+        /** # of threads are shrinking LRU cache. To avoid contention, it's not
+         * allowed to have multiple threads shrinking LRU cache.
+         */
         atomic_t                 cl_lru_shrinkers;
-        struct list_head         cl_lru_list; /* lru page list */
-        spinlock_t               cl_lru_list_lock; /* page list protector */
+        /** The time when this LRU cache was last used. */
+        time64_t                 cl_lru_last_used;
+        /** stats: how many reclaims have happened for this client_obd.
+         * reclaim and shrink - shrink is async, voluntarily rebalancing;
+         * reclaim is sync, initiated by IO thread when the LRU slots are
+         * in shortage.
+         */
+        u64                      cl_lru_reclaim;
+        /** List of LRU pages for this client_obd */
+        struct list_head         cl_lru_list;
+        /** Lock for LRU page list */
+        spinlock_t               cl_lru_list_lock;
+        /** # of unstable pages in this client_obd.
+         * An unstable page is a page state that WRITE RPC has finished but
+         * the transaction has NOT yet committed.
+         */
         atomic_long_t            cl_unstable_count;
 
         /* number of in flight destroy rpcs is limited to max_rpcs_in_flight */
@@ -329,7 +290,17 @@ struct client_obd {
         wait_queue_head_t             cl_destroy_waitq;
 
         struct mdc_rpc_lock     *cl_rpc_lock;
-        struct mdc_rpc_lock     *cl_close_lock;
+
+        /* modify rpcs in flight
+         * currently used for metadata only
+         */
+        spinlock_t               cl_mod_rpcs_lock;
+        u16                      cl_max_mod_rpcs_in_flight;
+        u16                      cl_mod_rpcs_in_flight;
+        u16                      cl_close_rpcs_in_flight;
+        wait_queue_head_t        cl_mod_rpcs_waitq;
+        unsigned long           *cl_mod_tag_bitmap;
+        struct obd_histogram     cl_mod_rpcs_hist;
 
         /* mgc datastruct */
         atomic_t             cl_mgc_refcount;
@@ -345,13 +316,6 @@ struct client_obd {
         /* also protected by the poorly named _loi_list_lock lock above */
         struct osc_async_rc      cl_ar;
 
-        /* used by quotacheck when the servers are older than 2.4 */
-        int                   cl_qchk_stat; /* quotacheck stat of the peer */
-#define CL_NOT_QUOTACHECKED 1   /* client->cl_qchk_stat init value */
-#if OBD_OCD_VERSION(2, 7, 53, 0) < LUSTRE_VERSION_CODE
-#warning "please consider removing quotacheck compatibility code"
-#endif
-
         /* sequence manager */
         struct lu_client_seq    *cl_seq;
 
@@ -454,8 +418,6 @@ struct lmv_obd {
         int                     connected;
         int                     max_easize;
         int                     max_def_easize;
-        int                     max_cookiesize;
-        int                     max_def_cookiesize;
 
         u32                     tgts_size; /* size of tgts array */
         struct lmv_tgt_desc     **tgts;
@@ -469,9 +431,9 @@ struct niobuf_local {
         __u32           lnb_page_offset;
         __u32           lnb_len;
         __u32           lnb_flags;
+        int             lnb_rc;
         struct page     *lnb_page;
         void            *lnb_data;
-        int             lnb_rc;
 };
 
 #define LUSTRE_FLD_NAME  "fld"
@@ -512,21 +474,6 @@ struct niobuf_local {
 /* Don't conflict with on-wire flags OBD_BRW_WRITE, etc */
 #define N_LOCAL_TEMP_PAGE 0x10000000
 
-struct obd_trans_info {
-        __u64               oti_xid;
-        /* Only used on the server side for tracking acks. */
-        struct oti_req_ack_lock {
-                struct lustre_handle lock;
-                __u32           mode;
-        }                       oti_ack_locks[4];
-        void                *oti_handle;
-        struct llog_cookie       oti_onecookie;
-        struct llog_cookie      *oti_logcookies;
-
-        /** VBR: versions */
-        __u64               oti_pre_version;
-};
-
 /*
  * Events signalled through obd_notify() upcall-chain.
  */
@@ -587,15 +534,14 @@ struct lvfs_run_ctxt {
 
 struct obd_device {
         struct obd_type *obd_type;
-        __u32              obd_magic;
+        u32                      obd_magic; /* OBD_DEVICE_MAGIC */
+        int                      obd_minor; /* device number: lctl dl */
+        struct lu_device        *obd_lu_dev;
 
         /* common and UUID name of this device */
-        char                obd_name[MAX_OBD_NAME];
-        struct obd_uuid  obd_uuid;
-
-        struct lu_device       *obd_lu_dev;
+        struct obd_uuid          obd_uuid;
+        char                     obd_name[MAX_OBD_NAME];
 
-        int                  obd_minor;
         /* bitfield modification is protected by obd_dev_lock */
         unsigned long obd_attached:1,      /* finished attach */
                       obd_set_up:1,     /* finished setup */
@@ -619,22 +565,22 @@ struct obd_device {
         unsigned long obd_recovery_expired:1;
         /* uuid-export hash body */
         struct cfs_hash      *obd_uuid_hash;
-        atomic_t            obd_refcount;
         wait_queue_head_t            obd_refcount_waitq;
         struct list_head              obd_exports;
         struct list_head              obd_unlinked_exports;
         struct list_head              obd_delayed_exports;
+        atomic_t                        obd_refcount;
         int                  obd_num_exports;
         spinlock_t              obd_nid_lock;
         struct ldlm_namespace  *obd_namespace;
         struct ptlrpc_client    obd_ldlm_client; /* XXX OST/MDS only */
         /* a spinlock is OK for what we do now, may need a semaphore later */
         spinlock_t              obd_dev_lock; /* protect OBD bitfield above */
-        struct mutex            obd_dev_mutex;
-        __u64                   obd_last_committed;
         spinlock_t              obd_osfs_lock;
         struct obd_statfs       obd_osfs;       /* locked by obd_osfs_lock */
         __u64                   obd_osfs_age;
+        u64                     obd_last_committed;
+        struct mutex            obd_dev_mutex;
         struct lvfs_run_ctxt    obd_lvfs_ctxt;
         struct obd_llog_group   obd_olg;        /* default llog group */
         struct obd_device       *obd_observer;
@@ -648,12 +594,13 @@ struct obd_device {
                 struct lov_obd lov;
                 struct lmv_obd lmv;
         } u;
+
         /* Fields used by LProcFS */
-        unsigned int       obd_cntr_base;
-        struct lprocfs_stats  *obd_stats;
+        struct lprocfs_stats    *obd_stats;
+        unsigned int             obd_cntr_base;
 
-        unsigned int       md_cntr_base;
-        struct lprocfs_stats  *md_stats;
+        struct lprocfs_stats    *md_stats;
+        unsigned int             md_cntr_base;
 
         struct dentry           *obd_debugfs_entry;
         struct dentry           *obd_svc_debugfs_entry;
@@ -665,9 +612,11 @@ struct obd_device {
         /**
          * Ldlm pool part. Save last calculated SLV and Limit.
          */
-        rwlock_t                obd_pool_lock;
-        int                 obd_pool_limit;
-        __u64             obd_pool_slv;
+        rwlock_t                 obd_pool_lock;
+        u64                      obd_pool_slv;
+        int                      obd_pool_limit;
+
+        int                      obd_conn_inprogress;
 
         /**
          * A list of outstanding class_incref()'s against this obd. For
@@ -675,19 +624,10 @@ struct obd_device {
          */
         struct lu_ref     obd_reference;
 
-        int                    obd_conn_inprogress;
-
         struct kobject          obd_kobj; /* sysfs object */
         struct completion       obd_kobj_unregister;
 };
 
-enum obd_cleanup_stage {
-/* Special case hack for MDS LOVs */
-        OBD_CLEANUP_EARLY,
-/* can be directly mapped to .ldto_device_fini() */
-        OBD_CLEANUP_EXPORTS,
-};
-
 /* get/set_info keys */
 #define KEY_ASYNC              "async"
 #define KEY_CHANGELOG_CLEAR     "changelog_clear"
@@ -704,7 +644,6 @@ enum obd_cleanup_stage {
 #define KEY_INTERMDS        "inter_mds"
 #define KEY_LAST_ID          "last_id"
 #define KEY_LAST_FID            "last_fid"
-#define KEY_LOVDESC          "lovdesc"
 #define KEY_MAX_EASIZE          "max_easize"
 #define KEY_DEFAULT_EASIZE      "default_easize"
 #define KEY_MGSSEC            "mgssec"
@@ -720,22 +659,6 @@ enum obd_cleanup_stage {
 
 struct lu_context;
 
-/* /!\ must be coherent with include/linux/namei.h on patched kernel */
-#define IT_OPEN     (1 << 0)
-#define IT_CREAT    (1 << 1)
-#define IT_READDIR  (1 << 2)
-#define IT_GETATTR  (1 << 3)
-#define IT_LOOKUP   (1 << 4)
-#define IT_UNLINK   (1 << 5)
-#define IT_TRUNC    (1 << 6)
-#define IT_GETXATTR (1 << 7)
-#define IT_EXEC     (1 << 8)
-#define IT_PIN      (1 << 9)
-#define IT_LAYOUT   (1 << 10)
-#define IT_QUOTA_DQACQ (1 << 11)
-#define IT_QUOTA_CONN  (1 << 12)
-#define IT_SETXATTR (1 << 13)
-
 static inline int it_to_lock_mode(struct lookup_intent *it)
 {
         /* CREAT needs to be tested before open (both could be set) */
@@ -755,6 +678,14 @@ static inline int it_to_lock_mode(struct lookup_intent *it)
         return -EINVAL;
 }
 
+enum md_op_flags {
+        MF_MDC_CANCEL_FID1      = BIT(0),
+        MF_MDC_CANCEL_FID2      = BIT(1),
+        MF_MDC_CANCEL_FID3      = BIT(2),
+        MF_MDC_CANCEL_FID4      = BIT(3),
+        MF_GET_MDT_IDX          = BIT(4),
+};
+
 enum md_cli_flags {
         CLI_SET_MEA     = BIT(0),
         CLI_RM_ENTRY    = BIT(1),
@@ -789,8 +720,6 @@ struct md_op_data {
         __u64              op_valid;
         loff_t            op_attr_blocks;
 
-        /* Size-on-MDS epoch and flags. */
-        __u64              op_ioepoch;
         __u32              op_flags;
 
         /* Various operation flags. */
@@ -839,15 +768,13 @@ struct obd_ops {
         int (*iocontrol)(unsigned int cmd, struct obd_export *exp, int len,
                          void *karg, void __user *uarg);
         int (*get_info)(const struct lu_env *env, struct obd_export *,
-                        __u32 keylen, void *key, __u32 *vallen, void *val,
-                        struct lov_stripe_md *lsm);
+                        __u32 keylen, void *key, __u32 *vallen, void *val);
         int (*set_info_async)(const struct lu_env *, struct obd_export *,
                               __u32 keylen, void *key,
                               __u32 vallen, void *val,
                               struct ptlrpc_request_set *set);
         int (*setup)(struct obd_device *dev, struct lustre_cfg *cfg);
-        int (*precleanup)(struct obd_device *dev,
-                          enum obd_cleanup_stage cleanup_stage);
+        int (*precleanup)(struct obd_device *dev);
         int (*cleanup)(struct obd_device *dev);
         int (*process_config)(struct obd_device *dev, u32 len, void *data);
         int (*postrecov)(struct obd_device *dev);
@@ -887,35 +814,23 @@ struct obd_ops {
                       struct obd_statfs *osfs, __u64 max_age, __u32 flags);
         int (*statfs_async)(struct obd_export *exp, struct obd_info *oinfo,
                             __u64 max_age, struct ptlrpc_request_set *set);
-        int (*packmd)(struct obd_export *exp, struct lov_mds_md **disk_tgt,
-                      struct lov_stripe_md *mem_src);
-        int (*unpackmd)(struct obd_export *exp,
-                        struct lov_stripe_md **mem_tgt,
-                        struct lov_mds_md *disk_src, int disk_len);
         int (*create)(const struct lu_env *env, struct obd_export *exp,
-                      struct obdo *oa, struct obd_trans_info *oti);
+                      struct obdo *oa);
         int (*destroy)(const struct lu_env *env, struct obd_export *exp,
-                       struct obdo *oa, struct obd_trans_info *oti);
+                       struct obdo *oa);
         int (*setattr)(const struct lu_env *, struct obd_export *exp,
-                       struct obd_info *oinfo, struct obd_trans_info *oti);
-        int (*setattr_async)(struct obd_export *exp, struct obd_info *oinfo,
-                             struct obd_trans_info *oti,
-                             struct ptlrpc_request_set *rqset);
+                       struct obdo *oa);
         int (*getattr)(const struct lu_env *env, struct obd_export *exp,
-                       struct obd_info *oinfo);
-        int (*getattr_async)(struct obd_export *exp, struct obd_info *oinfo,
-                             struct ptlrpc_request_set *set);
+                       struct obdo *oa);
         int (*preprw)(const struct lu_env *env, int cmd,
                       struct obd_export *exp, struct obdo *oa, int objcount,
                       struct obd_ioobj *obj, struct niobuf_remote *remote,
-                      int *nr_pages, struct niobuf_local *local,
-                      struct obd_trans_info *oti);
+                      int *nr_pages, struct niobuf_local *local);
         int (*commitrw)(const struct lu_env *env, int cmd,
                         struct obd_export *exp, struct obdo *oa,
                         int objcount, struct obd_ioobj *obj,
                         struct niobuf_remote *remote, int pages,
-                        struct niobuf_local *local,
-                        struct obd_trans_info *oti, int rc);
+                        struct niobuf_local *local, int rc);
         int (*init_export)(struct obd_export *exp);
         int (*destroy_export)(struct obd_export *exp);
 
@@ -930,8 +845,6 @@ struct obd_ops {
         struct obd_uuid *(*get_uuid)(struct obd_export *exp);
 
         /* quota methods */
-        int (*quotacheck)(struct obd_device *, struct obd_export *,
-                          struct obd_quotactl *);
         int (*quotactl)(struct obd_device *, struct obd_export *,
                         struct obd_quotactl *);
 
@@ -954,7 +867,7 @@ struct obd_ops {
 /* lmv structures */
 struct lustre_md {
         struct mdt_body  *body;
-        struct lov_stripe_md    *lsm;
+        struct lu_buf            layout;
         struct lmv_stripe_md    *lmv;
 #ifdef CONFIG_FS_POSIX_ACL
         struct posix_acl        *posix_acl;
@@ -992,10 +905,8 @@ struct md_ops {
         int (*create)(struct obd_export *, struct md_op_data *,
                       const void *, size_t, umode_t, uid_t, gid_t,
                       cfs_cap_t, __u64, struct ptlrpc_request **);
-        int (*done_writing)(struct obd_export *, struct md_op_data  *,
-                            struct md_open_data *);
         int (*enqueue)(struct obd_export *, struct ldlm_enqueue_info *,
-                       const ldlm_policy_data_t *,
+                       const union ldlm_policy_data *,
                        struct lookup_intent *, struct md_op_data *,
                        struct lustre_handle *, __u64);
         int (*getattr)(struct obd_export *, struct md_op_data *,
@@ -1012,8 +923,7 @@ struct md_ops {
                       const char *, size_t, const char *, size_t,
                       struct ptlrpc_request **);
         int (*setattr)(struct obd_export *, struct md_op_data *, void *,
-                       size_t, void *, size_t, struct ptlrpc_request **,
-                         struct md_open_data **mod);
+                       size_t, struct ptlrpc_request **);
         int (*sync)(struct obd_export *, const struct lu_fid *,
                     struct ptlrpc_request **);
         int (*read_page)(struct obd_export *, struct md_op_data *,
@@ -1030,7 +940,7 @@ struct md_ops {
                         u64, const char *, const char *, int, int, int,
                         struct ptlrpc_request **);
 
-        int (*init_ea_size)(struct obd_export *, u32, u32, u32, u32);
+        int (*init_ea_size)(struct obd_export *, u32, u32);
 
         int (*get_lustre_md)(struct obd_export *, struct ptlrpc_request *,
                              struct obd_export *, struct obd_export *,
@@ -1052,11 +962,11 @@ struct md_ops {
 
         enum ldlm_mode (*lock_match)(struct obd_export *, __u64,
                                      const struct lu_fid *, enum ldlm_type,
-                                     ldlm_policy_data_t *, enum ldlm_mode,
+                                     union ldlm_policy_data *, enum ldlm_mode,
                                      struct lustre_handle *);
 
         int (*cancel_unused)(struct obd_export *, const struct lu_fid *,
-                             ldlm_policy_data_t *, enum ldlm_mode,
+                             union ldlm_policy_data *, enum ldlm_mode,
                              enum ldlm_cancel_flags flags, void *opaque);
 
         int (*get_fid_from_lsm)(struct obd_export *,
@@ -1071,6 +981,8 @@ struct md_ops {
         int (*revalidate_lock)(struct obd_export *, struct lookup_intent *,
                                struct lu_fid *, __u64 *bits);
 
+        int (*unpackmd)(struct obd_export *exp, struct lmv_stripe_md **plsm,
+                        const union lmv_mds_md *lmv, size_t lmv_size);
         /*
          * NOTE: If adding ops, add another LPROCFS_MD_OP_INIT() line to
          * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
@@ -1078,33 +990,6 @@ struct md_ops {
          */
 };
 
-struct lsm_operations {
-        void (*lsm_free)(struct lov_stripe_md *);
-        void (*lsm_stripe_by_index)(struct lov_stripe_md *, int *, u64 *,
-                                    u64 *);
-        void (*lsm_stripe_by_offset)(struct lov_stripe_md *, int *, u64 *,
-                                     u64 *);
-        int (*lsm_lmm_verify)(struct lov_mds_md *lmm, int lmm_bytes,
-                              __u16 *stripe_count);
-        int (*lsm_unpackmd)(struct lov_obd *lov, struct lov_stripe_md *lsm,
-                            struct lov_mds_md *lmm);
-};
-
-extern const struct lsm_operations lsm_v1_ops;
-extern const struct lsm_operations lsm_v3_ops;
-static inline const struct lsm_operations *lsm_op_find(int magic)
-{
-        switch (magic) {
-        case LOV_MAGIC_V1:
-               return &lsm_v1_ops;
-        case LOV_MAGIC_V3:
-               return &lsm_v3_ops;
-        default:
-               CERROR("Cannot recognize lsm_magic %08x\n", magic);
-               return NULL;
-        }
-}
-
 static inline struct md_open_data *obd_mod_alloc(void)
 {
         struct md_open_data *mod;
diff --git a/drivers/staging/lustre/lustre/include/obd_class.h b/drivers/staging/lustre/lustre/include/obd_class.h
index 16094dbec08b..7ec25202cd22 100644
--- a/drivers/staging/lustre/lustre/include/obd_class.h
+++ b/drivers/staging/lustre/lustre/include/obd_class.h
@@ -100,6 +100,13 @@ int obd_get_request_slot(struct client_obd *cli);
 void obd_put_request_slot(struct client_obd *cli);
 __u32 obd_get_max_rpcs_in_flight(struct client_obd *cli);
 int obd_set_max_rpcs_in_flight(struct client_obd *cli, __u32 max);
+int obd_set_max_mod_rpcs_in_flight(struct client_obd *cli, u16 max);
+int obd_mod_rpc_stats_seq_show(struct client_obd *cli, struct seq_file *seq);
+
+u16 obd_get_mod_rpc_slot(struct client_obd *cli, u32 opc,
+                         struct lookup_intent *it);
+void obd_put_mod_rpc_slot(struct client_obd *cli, u32 opc,
+                          struct lookup_intent *it, u16 tag);
 
 struct llog_handle;
 struct llog_rec_hdr;
@@ -175,10 +182,13 @@ struct lustre_profile {
         char        *lp_profile;
         char        *lp_dt;
         char        *lp_md;
+        int                     lp_refs;
+        bool                    lp_list_deleted;
 };
 
 struct lustre_profile *class_get_profile(const char *prof);
 void class_del_profile(const char *prof);
+void class_put_profile(struct lustre_profile *lprof);
 void class_del_profiles(void);
 
 #if LUSTRE_TRACKS_LOCK_EXP_REFS
@@ -269,10 +279,8 @@ static inline int lprocfs_climp_check(struct obd_device *obd)
 struct inode;
 struct lu_attr;
 struct obdo;
-void obdo_refresh_inode(struct inode *dst, const struct obdo *src, u32 valid);
 
 void obdo_to_ioobj(const struct obdo *oa, struct obd_ioobj *ioobj);
-void md_from_obdo(struct md_op_data *op_data, const struct obdo *oa, u32 valid);
 
 #define OBT(dev)        (dev)->obd_type
 #define OBP(dev, op)    (dev)->obd_type->typ_dt_ops->op
@@ -417,16 +425,14 @@ static inline int class_devno_max(void)
 
 static inline int obd_get_info(const struct lu_env *env,
                                struct obd_export *exp, __u32 keylen,
-                               void *key, __u32 *vallen, void *val,
-                               struct lov_stripe_md *lsm)
+                               void *key, __u32 *vallen, void *val)
 {
         int rc;
 
         EXP_CHECK_DT_OP(exp, get_info);
         EXP_COUNTER_INCREMENT(exp, get_info);
 
-        rc = OBP(exp->exp_obd, get_info)(env, exp, keylen, key, vallen, val,
-                                         lsm);
+        rc = OBP(exp->exp_obd, get_info)(env, exp, keylen, key, vallen, val);
         return rc;
 }
 
@@ -505,8 +511,7 @@ static inline int obd_setup(struct obd_device *obd, struct lustre_cfg *cfg)
         return rc;
 }
 
-static inline int obd_precleanup(struct obd_device *obd,
-                                 enum obd_cleanup_stage cleanup_stage)
+static inline int obd_precleanup(struct obd_device *obd)
 {
         int rc;
         DECLARE_LU_VARS(ldt, d);
@@ -517,20 +522,18 @@ static inline int obd_precleanup(struct obd_device *obd,
         ldt = obd->obd_type->typ_lu;
         d = obd->obd_lu_dev;
         if (ldt && d) {
-                if (cleanup_stage == OBD_CLEANUP_EXPORTS) {
-                        struct lu_env env;
+                struct lu_env env;
 
-                        rc = lu_env_init(&env, ldt->ldt_ctx_tags);
-                        if (rc == 0) {
-                                ldt->ldt_ops->ldto_device_fini(&env, d);
-                                lu_env_fini(&env);
-                        }
+                rc = lu_env_init(&env, ldt->ldt_ctx_tags);
+                if (!rc) {
+                        ldt->ldt_ops->ldto_device_fini(&env, d);
+                        lu_env_fini(&env);
                 }
         }
         OBD_CHECK_DT_OP(obd, precleanup, 0);
         OBD_COUNTER_INCREMENT(obd, precleanup);
 
-        rc = OBP(obd, precleanup)(obd, cleanup_stage);
+        rc = OBP(obd, precleanup)(obd);
         return rc;
 }
 
@@ -612,181 +615,51 @@ obd_process_config(struct obd_device *obd, int datalen, void *data)
         return rc;
 }
 
-/* Pack an in-memory MD struct for storage on disk.
- * Returns +ve size of packed MD (0 for free), or -ve error.
- *
- * If @disk_tgt == NULL, MD size is returned (max size if @mem_src == NULL).
- * If @*disk_tgt != NULL and @mem_src == NULL, @*disk_tgt will be freed.
- * If @*disk_tgt == NULL, it will be allocated
- */
-static inline int obd_packmd(struct obd_export *exp,
-                             struct lov_mds_md **disk_tgt,
-                             struct lov_stripe_md *mem_src)
-{
-        int rc;
-
-        EXP_CHECK_DT_OP(exp, packmd);
-        EXP_COUNTER_INCREMENT(exp, packmd);
-
-        rc = OBP(exp->exp_obd, packmd)(exp, disk_tgt, mem_src);
-        return rc;
-}
-
-static inline int obd_size_diskmd(struct obd_export *exp,
-                                  struct lov_stripe_md *mem_src)
-{
-        return obd_packmd(exp, NULL, mem_src);
-}
-
-static inline int obd_free_diskmd(struct obd_export *exp,
-                                  struct lov_mds_md **disk_tgt)
-{
-        LASSERT(disk_tgt);
-        LASSERT(*disk_tgt);
-        /*
-         * LU-2590, for caller's convenience, *disk_tgt could be host
-         * endianness, it needs swab to LE if necessary, while just
-         * lov_mds_md header needs it for figuring out how much memory
-         * needs to be freed.
-         */
-        if ((cpu_to_le32(LOV_MAGIC) != LOV_MAGIC) &&
-            (((*disk_tgt)->lmm_magic == LOV_MAGIC_V1) ||
-             ((*disk_tgt)->lmm_magic == LOV_MAGIC_V3)))
-                lustre_swab_lov_mds_md(*disk_tgt);
-        return obd_packmd(exp, disk_tgt, NULL);
-}
-
-/* Unpack an MD struct from disk to in-memory format.
- * Returns +ve size of unpacked MD (0 for free), or -ve error.
- *
- * If @mem_tgt == NULL, MD size is returned (max size if @disk_src == NULL).
- * If @*mem_tgt != NULL and @disk_src == NULL, @*mem_tgt will be freed.
- * If @*mem_tgt == NULL, it will be allocated
- */
-static inline int obd_unpackmd(struct obd_export *exp,
-                               struct lov_stripe_md **mem_tgt,
-                               struct lov_mds_md *disk_src,
-                               int disk_len)
-{
-        int rc;
-
-        EXP_CHECK_DT_OP(exp, unpackmd);
-        EXP_COUNTER_INCREMENT(exp, unpackmd);
-
-        rc = OBP(exp->exp_obd, unpackmd)(exp, mem_tgt, disk_src, disk_len);
-        return rc;
-}
-
-static inline int obd_free_memmd(struct obd_export *exp,
-                                 struct lov_stripe_md **mem_tgt)
-{
-        int rc;
-
-        LASSERT(mem_tgt);
-        LASSERT(*mem_tgt);
-        rc = obd_unpackmd(exp, mem_tgt, NULL, 0);
-        *mem_tgt = NULL;
-        return rc;
-}
-
 static inline int obd_create(const struct lu_env *env, struct obd_export *exp,
-                             struct obdo *obdo, struct obd_trans_info *oti)
+                             struct obdo *obdo)
 {
         int rc;
 
         EXP_CHECK_DT_OP(exp, create);
         EXP_COUNTER_INCREMENT(exp, create);
 
-        rc = OBP(exp->exp_obd, create)(env, exp, obdo, oti);
+        rc = OBP(exp->exp_obd, create)(env, exp, obdo);
         return rc;
 }
 
 static inline int obd_destroy(const struct lu_env *env, struct obd_export *exp,
-                              struct obdo *obdo, struct obd_trans_info *oti)
+                              struct obdo *obdo)
 {
         int rc;
 
         EXP_CHECK_DT_OP(exp, destroy);
         EXP_COUNTER_INCREMENT(exp, destroy);
 
-        rc = OBP(exp->exp_obd, destroy)(env, exp, obdo, oti);
+        rc = OBP(exp->exp_obd, destroy)(env, exp, obdo);
         return rc;
 }
 
 static inline int obd_getattr(const struct lu_env *env, struct obd_export *exp,
-                              struct obd_info *oinfo)
+                              struct obdo *oa)
 {
         int rc;
 
         EXP_CHECK_DT_OP(exp, getattr);
         EXP_COUNTER_INCREMENT(exp, getattr);
 
-        rc = OBP(exp->exp_obd, getattr)(env, exp, oinfo);
-        return rc;
-}
-
-static inline int obd_getattr_async(struct obd_export *exp,
-                                    struct obd_info *oinfo,
-                                    struct ptlrpc_request_set *set)
-{
-        int rc;
-
-        EXP_CHECK_DT_OP(exp, getattr_async);
-        EXP_COUNTER_INCREMENT(exp, getattr_async);
-
-        rc = OBP(exp->exp_obd, getattr_async)(exp, oinfo, set);
+        rc = OBP(exp->exp_obd, getattr)(env, exp, oa);
         return rc;
 }
 
 static inline int obd_setattr(const struct lu_env *env, struct obd_export *exp,
-                              struct obd_info *oinfo,
-                              struct obd_trans_info *oti)
+                              struct obdo *oa)
 {
         int rc;
 
         EXP_CHECK_DT_OP(exp, setattr);
         EXP_COUNTER_INCREMENT(exp, setattr);
 
-        rc = OBP(exp->exp_obd, setattr)(env, exp, oinfo, oti);
-        return rc;
-}
-
-/* This performs all the requests set init/wait/destroy actions. */
-static inline int obd_setattr_rqset(struct obd_export *exp,
-                                    struct obd_info *oinfo,
-                                    struct obd_trans_info *oti)
-{
-        struct ptlrpc_request_set *set = NULL;
-        int rc;
-
-        EXP_CHECK_DT_OP(exp, setattr_async);
-        EXP_COUNTER_INCREMENT(exp, setattr_async);
-
-        set =  ptlrpc_prep_set();
-        if (!set)
-                return -ENOMEM;
-
-        rc = OBP(exp->exp_obd, setattr_async)(exp, oinfo, oti, set);
-        if (rc == 0)
-                rc = ptlrpc_set_wait(set);
-        ptlrpc_set_destroy(set);
-        return rc;
-}
-
-/* This adds all the requests into @set if @set != NULL, otherwise
- * all requests are sent asynchronously without waiting for response.
- */
-static inline int obd_setattr_async(struct obd_export *exp,
-                                    struct obd_info *oinfo,
-                                    struct obd_trans_info *oti,
-                                    struct ptlrpc_request_set *set)
-{
-        int rc;
-
-        EXP_CHECK_DT_OP(exp, setattr_async);
-        EXP_COUNTER_INCREMENT(exp, setattr_async);
-
-        rc = OBP(exp->exp_obd, setattr_async)(exp, oinfo, oti, set);
+        rc = OBP(exp->exp_obd, setattr)(env, exp, oa);
         return rc;
 }
 
@@ -1053,15 +926,16 @@ static inline int obd_statfs_rqset(struct obd_export *exp,
                                    __u32 flags)
 {
         struct ptlrpc_request_set *set = NULL;
-        struct obd_info oinfo = { };
+        struct obd_info oinfo = {
+                .oi_osfs = osfs,
+                .oi_flags = flags,
+        };
         int rc = 0;
 
-        set =  ptlrpc_prep_set();
+        set = ptlrpc_prep_set();
         if (!set)
                 return -ENOMEM;
 
-        oinfo.oi_osfs = osfs;
-        oinfo.oi_flags = flags;
         rc = obd_statfs_async(exp, &oinfo, max_age, set);
         if (rc == 0)
                 rc = ptlrpc_set_wait(set);
@@ -1112,8 +986,7 @@ static inline int obd_preprw(const struct lu_env *env, int cmd,
                              struct obd_export *exp, struct obdo *oa,
                              int objcount, struct obd_ioobj *obj,
                              struct niobuf_remote *remote, int *pages,
-                             struct niobuf_local *local,
-                             struct obd_trans_info *oti)
+                             struct niobuf_local *local)
 {
         int rc;
 
@@ -1121,7 +994,7 @@ static inline int obd_preprw(const struct lu_env *env, int cmd,
         EXP_COUNTER_INCREMENT(exp, preprw);
 
         rc = OBP(exp->exp_obd, preprw)(env, cmd, exp, oa, objcount, obj, remote,
-                                       pages, local, oti);
+                                       pages, local);
         return rc;
 }
 
@@ -1129,14 +1002,13 @@ static inline int obd_commitrw(const struct lu_env *env, int cmd,
                                struct obd_export *exp, struct obdo *oa,
                                int objcount, struct obd_ioobj *obj,
                                struct niobuf_remote *rnb, int pages,
-                               struct niobuf_local *local,
-                               struct obd_trans_info *oti, int rc)
+                               struct niobuf_local *local, int rc)
 {
         EXP_CHECK_DT_OP(exp, commitrw);
         EXP_COUNTER_INCREMENT(exp, commitrw);
 
         rc = OBP(exp->exp_obd, commitrw)(env, cmd, exp, oa, objcount, obj,
-                                         rnb, pages, local, oti, rc);
+                                         rnb, pages, local, rc);
         return rc;
 }
 
@@ -1219,18 +1091,6 @@ static inline int obd_notify_observer(struct obd_device *observer,
         return rc1 ? rc1 : rc2;
 }
 
-static inline int obd_quotacheck(struct obd_export *exp,
-                                 struct obd_quotactl *oqctl)
-{
-        int rc;
-
-        EXP_CHECK_DT_OP(exp, quotacheck);
-        EXP_COUNTER_INCREMENT(exp, quotacheck);
-
-        rc = OBP(exp->exp_obd, quotacheck)(exp->exp_obd, exp, oqctl);
-        return rc;
-}
-
 static inline int obd_quotactl(struct obd_export *exp,
                                struct obd_quotactl *oqctl)
 {
@@ -1346,21 +1206,9 @@ static inline int md_create(struct obd_export *exp, struct md_op_data *op_data,
         return rc;
 }
 
-static inline int md_done_writing(struct obd_export *exp,
-                                  struct md_op_data *op_data,
-                                  struct md_open_data *mod)
-{
-        int rc;
-
-        EXP_CHECK_MD_OP(exp, done_writing);
-        EXP_MD_COUNTER_INCREMENT(exp, done_writing);
-        rc = MDP(exp->exp_obd, done_writing)(exp, op_data, mod);
-        return rc;
-}
-
 static inline int md_enqueue(struct obd_export *exp,
                              struct ldlm_enqueue_info *einfo,
-                             const ldlm_policy_data_t *policy,
+                             const union ldlm_policy_data *policy,
                              struct lookup_intent *it,
                              struct md_op_data *op_data,
                              struct lustre_handle *lockh,
@@ -1428,16 +1276,14 @@ static inline int md_rename(struct obd_export *exp, struct md_op_data *op_data,
 }
 
 static inline int md_setattr(struct obd_export *exp, struct md_op_data *op_data,
-                             void *ea, size_t ealen, void *ea2, size_t ea2len,
-                             struct ptlrpc_request **request,
-                             struct md_open_data **mod)
+                             void *ea, size_t ealen,
+                             struct ptlrpc_request **request)
 {
         int rc;
 
         EXP_CHECK_MD_OP(exp, setattr);
         EXP_MD_COUNTER_INCREMENT(exp, setattr);
-        rc = MDP(exp->exp_obd, setattr)(exp, op_data, ea, ealen,
-                                        ea2, ea2len, request, mod);
+        rc = MDP(exp->exp_obd, setattr)(exp, op_data, ea, ealen, request);
         return rc;
 }
 
@@ -1561,7 +1407,7 @@ static inline int md_set_lock_data(struct obd_export *exp,
 
 static inline int md_cancel_unused(struct obd_export *exp,
                                    const struct lu_fid *fid,
-                                   ldlm_policy_data_t *policy,
+                                   union ldlm_policy_data *policy,
                                    enum ldlm_mode mode,
                                    enum ldlm_cancel_flags flags,
                                    void *opaque)
@@ -1579,7 +1425,7 @@ static inline int md_cancel_unused(struct obd_export *exp,
 static inline enum ldlm_mode md_lock_match(struct obd_export *exp, __u64 flags,
                                            const struct lu_fid *fid,
                                            enum ldlm_type type,
-                                           ldlm_policy_data_t *policy,
+                                           union ldlm_policy_data *policy,
                                            enum ldlm_mode mode,
                                            struct lustre_handle *lockh)
 {
@@ -1589,14 +1435,12 @@ static inline enum ldlm_mode md_lock_match(struct obd_export *exp, __u64 flags,
                                              policy, mode, lockh);
 }
 
-static inline int md_init_ea_size(struct obd_export *exp, int easize,
-                                  int def_asize, int cookiesize,
-                                  int def_cookiesize)
+static inline int md_init_ea_size(struct obd_export *exp, u32 easize,
+                                  u32 def_asize)
 {
         EXP_CHECK_MD_OP(exp, init_ea_size);
         EXP_MD_COUNTER_INCREMENT(exp, init_ea_size);
-        return MDP(exp->exp_obd, init_ea_size)(exp, easize, def_asize,
-                                               cookiesize, def_cookiesize);
+        return MDP(exp->exp_obd, init_ea_size)(exp, easize, def_asize);
 }
 
 static inline int md_intent_getattr_async(struct obd_export *exp,
@@ -1636,6 +1480,24 @@ static inline int md_get_fid_from_lsm(struct obd_export *exp,
         return rc;
 }
 
+/* Unpack an MD struct from disk to in-memory format.
+ * Returns +ve size of unpacked MD (0 for free), or -ve error.
+ *
+ * If *plsm != NULL and lmm == NULL then *lsm will be freed.
+ * If *plsm == NULL then it will be allocated.
+ */
+static inline int md_unpackmd(struct obd_export *exp,
+                              struct lmv_stripe_md **plsm,
+                              const union lmv_mds_md *lmm, size_t lmm_size)
+{
+        int rc;
+
+        EXP_CHECK_MD_OP(exp, unpackmd);
+        EXP_MD_COUNTER_INCREMENT(exp, unpackmd);
+        rc = MDP(exp->exp_obd, unpackmd)(exp, plsm, lmm, lmm_size);
+        return rc;
+}
+
 /* OBD Metadata Support */
 
 int obd_init_caches(void);
diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h
index b346a7f10aa4..aaedec7d793c 100644
--- a/drivers/staging/lustre/lustre/include/obd_support.h
+++ b/drivers/staging/lustre/lustre/include/obd_support.h
@@ -172,14 +172,14 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_MDS_ALL_REQUEST_NET     0x123
 #define OBD_FAIL_MDS_SYNC_NET       0x124
 #define OBD_FAIL_MDS_SYNC_PACK     0x125
-#define OBD_FAIL_MDS_DONE_WRITING_NET    0x126
-#define OBD_FAIL_MDS_DONE_WRITING_PACK   0x127
+/*      OBD_FAIL_MDS_DONE_WRITING_NET   0x126 obsolete since 2.8.0 */
+/*      OBD_FAIL_MDS_DONE_WRITING_PACK  0x127 obsolete since 2.8.0 */
 #define OBD_FAIL_MDS_ALLOC_OBDO   0x128
 #define OBD_FAIL_MDS_PAUSE_OPEN   0x129
 #define OBD_FAIL_MDS_STATFS_LCW_SLEEP    0x12a
 #define OBD_FAIL_MDS_OPEN_CREATE         0x12b
 #define OBD_FAIL_MDS_OST_SETATTR         0x12c
-#define OBD_FAIL_MDS_QUOTACHECK_NET      0x12d
+/*      OBD_FAIL_MDS_QUOTACHECK_NET      0x12d obsolete since 2.4 */
 #define OBD_FAIL_MDS_QUOTACTL_NET       0x12e
 #define OBD_FAIL_MDS_CLIENT_ADD   0x12f
 #define OBD_FAIL_MDS_GETXATTR_NET       0x130
@@ -264,7 +264,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_OST_ENOSPC           0x215
 #define OBD_FAIL_OST_EROFS             0x216
 #define OBD_FAIL_OST_ENOENT           0x217
-#define OBD_FAIL_OST_QUOTACHECK_NET      0x218
+/*      OBD_FAIL_OST_QUOTACHECK_NET      0x218 obsolete since 2.4 */
 #define OBD_FAIL_OST_QUOTACTL_NET       0x219
 #define OBD_FAIL_OST_CHECKSUM_RECEIVE    0x21a
 #define OBD_FAIL_OST_CHECKSUM_SEND       0x21b
@@ -321,6 +321,8 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_LDLM_CP_CB_WAIT4        0x322
 #define OBD_FAIL_LDLM_CP_CB_WAIT5        0x323
 
+#define OBD_FAIL_LDLM_GRANT_CHECK        0x32a
+
 /* LOCKLESS IO */
 #define OBD_FAIL_LDLM_SET_CONTENTION     0x385
 
@@ -343,6 +345,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_OSC_CP_ENQ_RACE         0x410
 #define OBD_FAIL_OSC_NO_GRANT       0x411
 #define OBD_FAIL_OSC_DELAY_SETTIME       0x412
+#define OBD_FAIL_OSC_DELAY_IO            0x414
 
 #define OBD_FAIL_PTLRPC           0x500
 #define OBD_FAIL_PTLRPC_ACK           0x501
@@ -373,7 +376,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_OBD_PING_NET       0x600
 #define OBD_FAIL_OBD_LOG_CANCEL_NET      0x601
 #define OBD_FAIL_OBD_LOGD_NET       0x602
-#define OBD_FAIL_OBD_QC_CALLBACK_NET     0x603
+/*      OBD_FAIL_OBD_QC_CALLBACK_NET     0x603 obsolete since 2.4 */
 #define OBD_FAIL_OBD_DQACQ             0x604
 #define OBD_FAIL_OBD_LLOG_SETUP   0x605
 #define OBD_FAIL_OBD_LOG_CANCEL_REP      0x606
@@ -458,6 +461,8 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_LOV_INIT                           0x1403
 #define OBD_FAIL_GLIMPSE_DELAY                      0x1404
 #define OBD_FAIL_LLITE_XATTR_ENOMEM                 0x1405
+#define OBD_FAIL_MAKE_LOVEA_HOLE                    0x1406
+#define OBD_FAIL_LLITE_LOST_LAYOUT                  0x1407
 #define OBD_FAIL_GETATTR_DELAY                      0x1409
 
 #define OBD_FAIL_FID_INDIR      0x1501
diff --git a/drivers/staging/lustre/lustre/include/seq_range.h b/drivers/staging/lustre/lustre/include/seq_range.h
new file mode 100644
index 000000000000..30c4dd66d5c4
--- /dev/null
+++ b/drivers/staging/lustre/lustre/include/seq_range.h
@@ -0,0 +1,199 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * 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,
+ * 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 version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2014, Intel Corporation.
+ *
+ * Copyright 2015 Cray Inc, all rights reserved.
+ * Author: Ben Evans.
+ *
+ * Define lu_seq_range  associated functions
+ */
+
+#ifndef _SEQ_RANGE_H_
+#define _SEQ_RANGE_H_
+
+#include "lustre/lustre_idl.h"
+
+/**
+ * computes the sequence range type \a range
+ */
+
+static inline unsigned int fld_range_type(const struct lu_seq_range *range)
+{
+        return range->lsr_flags & LU_SEQ_RANGE_MASK;
+}
+
+/**
+ *  Is this sequence range an OST? \a range
+ */
+
+static inline bool fld_range_is_ost(const struct lu_seq_range *range)
+{
+        return fld_range_type(range) == LU_SEQ_RANGE_OST;
+}
+
+/**
+ *  Is this sequence range an MDT? \a range
+ */
+
+static inline bool fld_range_is_mdt(const struct lu_seq_range *range)
+{
+        return fld_range_type(range) == LU_SEQ_RANGE_MDT;
+}
+
+/**
+ * ANY range is only used when the fld client sends a fld query request,
+ * but it does not know whether the seq is an MDT or OST, so it will send the
+ * request with ANY type, which means any seq type from the lookup can be
+ * expected. /a range
+ */
+static inline unsigned int fld_range_is_any(const struct lu_seq_range *range)
+{
+        return fld_range_type(range) == LU_SEQ_RANGE_ANY;
+}
+
+/**
+ * Apply flags to range \a range \a flags
+ */
+
+static inline void fld_range_set_type(struct lu_seq_range *range,
+                                      unsigned int flags)
+{
+        range->lsr_flags |= flags;
+}
+
+/**
+ * Add MDT to range type \a range
+ */
+
+static inline void fld_range_set_mdt(struct lu_seq_range *range)
+{
+        fld_range_set_type(range, LU_SEQ_RANGE_MDT);
+}
+
+/**
+ * Add OST to range type \a range
+ */
+
+static inline void fld_range_set_ost(struct lu_seq_range *range)
+{
+        fld_range_set_type(range, LU_SEQ_RANGE_OST);
+}
+
+/**
+ * Add ANY to range type \a range
+ */
+
+static inline void fld_range_set_any(struct lu_seq_range *range)
+{
+        fld_range_set_type(range, LU_SEQ_RANGE_ANY);
+}
+
+/**
+ * computes width of given sequence range \a range
+ */
+
+static inline u64 lu_seq_range_space(const struct lu_seq_range *range)
+{
+        return range->lsr_end - range->lsr_start;
+}
+
+/**
+ * initialize range to zero \a range
+ */
+
+static inline void lu_seq_range_init(struct lu_seq_range *range)
+{
+        memset(range, 0, sizeof(*range));
+}
+
+/**
+ * check if given seq id \a s is within given range \a range
+ */
+
+static inline bool lu_seq_range_within(const struct lu_seq_range *range,
+                                       u64 seq)
+{
+        return seq >= range->lsr_start && seq < range->lsr_end;
+}
+
+/**
+ * Is the range sane?  Is the end after the beginning? \a range
+ */
+
+static inline bool lu_seq_range_is_sane(const struct lu_seq_range *range)
+{
+        return range->lsr_end >= range->lsr_start;
+}
+
+/**
+ * Is the range 0? \a range
+ */
+
+static inline bool lu_seq_range_is_zero(const struct lu_seq_range *range)
+{
+        return range->lsr_start == 0 && range->lsr_end == 0;
+}
+
+/**
+ * Is the range out of space? \a range
+ */
+
+static inline bool lu_seq_range_is_exhausted(const struct lu_seq_range *range)
+{
+        return lu_seq_range_space(range) == 0;
+}
+
+/**
+ * return 0 if two ranges have the same location, nonzero if they are
+ * different \a r1 \a r2
+ */
+
+static inline int lu_seq_range_compare_loc(const struct lu_seq_range *r1,
+                                           const struct lu_seq_range *r2)
+{
+        return r1->lsr_index != r2->lsr_index ||
+                r1->lsr_flags != r2->lsr_flags;
+}
+
+#if !defined(__REQ_LAYOUT_USER__)
+/**
+ * byte swap range structure \a range
+ */
+
+void lustre_swab_lu_seq_range(struct lu_seq_range *range);
+#endif
+/**
+ * printf string and argument list for sequence range
+ */
+#define DRANGE "[%#16.16llx-%#16.16llx]:%x:%s"
+
+#define PRANGE(range)           \
+        (range)->lsr_start,     \
+        (range)->lsr_end,       \
+        (range)->lsr_index,     \
+        fld_range_is_mdt(range) ? "mdt" : "ost"
+
+#endif
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
index ecf472e4813d..32b73ee62639 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
@@ -193,6 +193,26 @@ void ldlm_extent_add_lock(struct ldlm_resource *res,
          * add the locks into grant list, for debug purpose, ..
          */
         ldlm_resource_add_lock(res, &res->lr_granted, lock);
+
+        if (OBD_FAIL_CHECK(OBD_FAIL_LDLM_GRANT_CHECK)) {
+                struct ldlm_lock *lck;
+
+                list_for_each_entry_reverse(lck, &res->lr_granted,
+                                            l_res_link) {
+                        if (lck == lock)
+                                continue;
+                        if (lockmode_compat(lck->l_granted_mode,
+                                            lock->l_granted_mode))
+                                continue;
+                        if (ldlm_extent_overlap(&lck->l_req_extent,
+                                                &lock->l_req_extent)) {
+                                CDEBUG(D_ERROR, "granting conflicting lock %p %p\n",
+                                       lck, lock);
+                                ldlm_resource_dump(D_ERROR, res);
+                                LBUG();
+                        }
+                }
+        }
 }
 
 /** Remove cancelled lock from resource interval tree. */
@@ -220,8 +240,8 @@ void ldlm_extent_unlink_lock(struct ldlm_lock *lock)
         }
 }
 
-void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                      ldlm_policy_data_t *lpolicy)
+void ldlm_extent_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,
+                                      union ldlm_policy_data *lpolicy)
 {
         memset(lpolicy, 0, sizeof(*lpolicy));
         lpolicy->l_extent.start = wpolicy->l_extent.start;
@@ -229,8 +249,8 @@ void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
         lpolicy->l_extent.gid = wpolicy->l_extent.gid;
 }
 
-void ldlm_extent_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,
-                                      ldlm_wire_policy_data_t *wpolicy)
+void ldlm_extent_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
+                                      union ldlm_wire_policy_data *wpolicy)
 {
         memset(wpolicy, 0, sizeof(*wpolicy));
         wpolicy->l_extent.start = lpolicy->l_extent.start;
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
index 861f36f039b5..722160784f83 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
@@ -612,22 +612,8 @@ granted:
 }
 EXPORT_SYMBOL(ldlm_flock_completion_ast);
 
-void ldlm_flock_policy_wire18_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                       ldlm_policy_data_t *lpolicy)
-{
-        memset(lpolicy, 0, sizeof(*lpolicy));
-        lpolicy->l_flock.start = wpolicy->l_flock.lfw_start;
-        lpolicy->l_flock.end = wpolicy->l_flock.lfw_end;
-        lpolicy->l_flock.pid = wpolicy->l_flock.lfw_pid;
-        /* Compat code, old clients had no idea about owner field and
-         * relied solely on pid for ownership. Introduced in LU-104, 2.1,
-         * April 2011
-         */
-        lpolicy->l_flock.owner = wpolicy->l_flock.lfw_pid;
-}
-
-void ldlm_flock_policy_wire21_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                       ldlm_policy_data_t *lpolicy)
+void ldlm_flock_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,
+                                     union ldlm_policy_data *lpolicy)
 {
         memset(lpolicy, 0, sizeof(*lpolicy));
         lpolicy->l_flock.start = wpolicy->l_flock.lfw_start;
@@ -636,8 +622,8 @@ void ldlm_flock_policy_wire21_to_local(const ldlm_wire_policy_data_t *wpolicy,
         lpolicy->l_flock.owner = wpolicy->l_flock.lfw_owner;
 }
 
-void ldlm_flock_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,
-                                     ldlm_wire_policy_data_t *wpolicy)
+void ldlm_flock_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
+                                     union ldlm_wire_policy_data *wpolicy)
 {
         memset(wpolicy, 0, sizeof(*wpolicy));
         wpolicy->l_flock.lfw_start = lpolicy->l_flock.start;
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c b/drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c
index 79f4e6fa193e..8e1709dc073c 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c
@@ -54,15 +54,15 @@
 #include "../include/lustre_lib.h"
 #include "ldlm_internal.h"
 
-void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                     ldlm_policy_data_t *lpolicy)
+void ldlm_ibits_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,
+                                     union ldlm_policy_data *lpolicy)
 {
         memset(lpolicy, 0, sizeof(*lpolicy));
         lpolicy->l_inodebits.bits = wpolicy->l_inodebits.bits;
 }
 
-void ldlm_ibits_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,
-                                     ldlm_wire_policy_data_t *wpolicy)
+void ldlm_ibits_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
+                                     union ldlm_wire_policy_data *wpolicy)
 {
         memset(wpolicy, 0, sizeof(*wpolicy));
         wpolicy->l_inodebits.bits = lpolicy->l_inodebits.bits;
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
index 5e82cfc245b2..5c02501d0560 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
@@ -39,13 +39,13 @@ extern struct list_head ldlm_srv_namespace_list;
 extern struct mutex ldlm_cli_namespace_lock;
 extern struct list_head ldlm_cli_active_namespace_list;
 
-static inline int ldlm_namespace_nr_read(ldlm_side_t client)
+static inline int ldlm_namespace_nr_read(enum ldlm_side client)
 {
         return client == LDLM_NAMESPACE_SERVER ?
                 ldlm_srv_namespace_nr : ldlm_cli_namespace_nr;
 }
 
-static inline void ldlm_namespace_nr_inc(ldlm_side_t client)
+static inline void ldlm_namespace_nr_inc(enum ldlm_side client)
 {
         if (client == LDLM_NAMESPACE_SERVER)
                 ldlm_srv_namespace_nr++;
@@ -53,7 +53,7 @@ static inline void ldlm_namespace_nr_inc(ldlm_side_t client)
                 ldlm_cli_namespace_nr++;
 }
 
-static inline void ldlm_namespace_nr_dec(ldlm_side_t client)
+static inline void ldlm_namespace_nr_dec(enum ldlm_side client)
 {
         if (client == LDLM_NAMESPACE_SERVER)
                 ldlm_srv_namespace_nr--;
@@ -61,13 +61,13 @@ static inline void ldlm_namespace_nr_dec(ldlm_side_t client)
                 ldlm_cli_namespace_nr--;
 }
 
-static inline struct list_head *ldlm_namespace_list(ldlm_side_t client)
+static inline struct list_head *ldlm_namespace_list(enum ldlm_side client)
 {
         return client == LDLM_NAMESPACE_SERVER ?
                 &ldlm_srv_namespace_list : &ldlm_cli_active_namespace_list;
 }
 
-static inline struct mutex *ldlm_namespace_lock(ldlm_side_t client)
+static inline struct mutex *ldlm_namespace_lock(enum ldlm_side client)
 {
         return client == LDLM_NAMESPACE_SERVER ?
                 &ldlm_srv_namespace_lock : &ldlm_cli_namespace_lock;
@@ -79,22 +79,23 @@ static inline int ldlm_ns_empty(struct ldlm_namespace *ns)
         return atomic_read(&ns->ns_bref) == 0;
 }
 
-void ldlm_namespace_move_to_active_locked(struct ldlm_namespace *, ldlm_side_t);
+void ldlm_namespace_move_to_active_locked(struct ldlm_namespace *,
+                                          enum ldlm_side);
 void ldlm_namespace_move_to_inactive_locked(struct ldlm_namespace *,
-                                            ldlm_side_t);
-struct ldlm_namespace *ldlm_namespace_first_locked(ldlm_side_t);
+                                            enum ldlm_side);
+struct ldlm_namespace *ldlm_namespace_first_locked(enum ldlm_side);
 
 /* ldlm_request.c */
 /* Cancel lru flag, it indicates we cancel aged locks. */
 enum {
-        LDLM_CANCEL_AGED   = 1 << 0, /* Cancel aged locks (non lru resize). */
-        LDLM_CANCEL_PASSED = 1 << 1, /* Cancel passed number of locks. */
-        LDLM_CANCEL_SHRINK = 1 << 2, /* Cancel locks from shrinker. */
-        LDLM_CANCEL_LRUR   = 1 << 3, /* Cancel locks from lru resize. */
-        LDLM_CANCEL_NO_WAIT = 1 << 4, /* Cancel locks w/o blocking (neither
-                                       * sending nor waiting for any rpcs)
-                                       */
-        LDLM_CANCEL_LRUR_NO_WAIT = 1 << 5, /* LRUR + NO_WAIT */
+        LDLM_LRU_FLAG_AGED      = BIT(0), /* Cancel aged locks (non lru resize). */
+        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. */
+        LDLM_LRU_FLAG_NO_WAIT   = BIT(4), /* Cancel locks w/o blocking (neither
+                                           * sending nor waiting for any rpcs)
+                                           */
+        LDLM_LRU_FLAG_LRUR_NO_WAIT = BIT(5), /* LRUR + NO_WAIT */
 };
 
 int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr,
@@ -137,10 +138,10 @@ ldlm_lock_create(struct ldlm_namespace *ns, const struct ldlm_res_id *,
                  void *data, __u32 lvb_len, enum lvb_type lvb_type);
 enum ldlm_error ldlm_lock_enqueue(struct ldlm_namespace *, struct ldlm_lock **,
                                   void *cookie, __u64 *flags);
-void ldlm_lock_addref_internal(struct ldlm_lock *, __u32 mode);
-void ldlm_lock_addref_internal_nolock(struct ldlm_lock *, __u32 mode);
-void ldlm_lock_decref_internal(struct ldlm_lock *, __u32 mode);
-void ldlm_lock_decref_internal_nolock(struct ldlm_lock *, __u32 mode);
+void ldlm_lock_addref_internal(struct ldlm_lock *, enum ldlm_mode mode);
+void ldlm_lock_addref_internal_nolock(struct ldlm_lock *, enum ldlm_mode mode);
+void ldlm_lock_decref_internal(struct ldlm_lock *, enum ldlm_mode mode);
+void ldlm_lock_decref_internal_nolock(struct ldlm_lock *, enum ldlm_mode mode);
 int ldlm_run_ast_work(struct ldlm_namespace *ns, struct list_head *rpc_list,
                       enum ldlm_desc_ast_t ast_type);
 int ldlm_lock_remove_from_lru_check(struct ldlm_lock *lock, time_t last_use);
@@ -311,28 +312,25 @@ static inline int is_granted_or_cancelled(struct ldlm_lock *lock)
         return ret;
 }
 
-typedef void (*ldlm_policy_wire_to_local_t)(const ldlm_wire_policy_data_t *,
-                                            ldlm_policy_data_t *);
-
-typedef void (*ldlm_policy_local_to_wire_t)(const ldlm_policy_data_t *,
-                                            ldlm_wire_policy_data_t *);
-
-void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                     ldlm_policy_data_t *lpolicy);
-void ldlm_plain_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,
-                                     ldlm_wire_policy_data_t *wpolicy);
-void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                     ldlm_policy_data_t *lpolicy);
-void ldlm_ibits_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,
-                                     ldlm_wire_policy_data_t *wpolicy);
-void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                      ldlm_policy_data_t *lpolicy);
-void ldlm_extent_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,
-                                      ldlm_wire_policy_data_t *wpolicy);
-void ldlm_flock_policy_wire18_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                       ldlm_policy_data_t *lpolicy);
-void ldlm_flock_policy_wire21_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                       ldlm_policy_data_t *lpolicy);
-
-void ldlm_flock_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,
-                                     ldlm_wire_policy_data_t *wpolicy);
+typedef void (*ldlm_policy_wire_to_local_t)(const union ldlm_wire_policy_data *,
+                                            union ldlm_policy_data *);
+
+typedef void (*ldlm_policy_local_to_wire_t)(const union ldlm_policy_data *,
+                                            union ldlm_wire_policy_data *);
+
+void ldlm_plain_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,
+                                     union ldlm_policy_data *lpolicy);
+void ldlm_plain_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
+                                     union ldlm_wire_policy_data *wpolicy);
+void ldlm_ibits_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,
+                                     union ldlm_policy_data *lpolicy);
+void ldlm_ibits_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
+                                     union ldlm_wire_policy_data *wpolicy);
+void ldlm_extent_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,
+                                      union ldlm_policy_data *lpolicy);
+void ldlm_extent_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
+                                      union ldlm_wire_policy_data *wpolicy);
+void ldlm_flock_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,
+                                     union ldlm_policy_data *lpolicy);
+void ldlm_flock_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
+                                     union ldlm_wire_policy_data *wpolicy);
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
index 153e990c494e..9be01426c955 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
@@ -170,6 +170,9 @@ int client_import_del_conn(struct obd_import *imp, struct obd_uuid *uuid)
                                 ptlrpc_connection_put(dlmexp->exp_connection);
                                 dlmexp->exp_connection = NULL;
                         }
+
+                        if (dlmexp)
+                                class_export_put(dlmexp);
                 }
 
                 list_del(&imp_conn->oic_item);
@@ -372,6 +375,25 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
         } else {
                 cli->cl_max_rpcs_in_flight = OBD_MAX_RIF_DEFAULT;
         }
+
+        spin_lock_init(&cli->cl_mod_rpcs_lock);
+        spin_lock_init(&cli->cl_mod_rpcs_hist.oh_lock);
+        cli->cl_max_mod_rpcs_in_flight = 0;
+        cli->cl_mod_rpcs_in_flight = 0;
+        cli->cl_close_rpcs_in_flight = 0;
+        init_waitqueue_head(&cli->cl_mod_rpcs_waitq);
+        cli->cl_mod_tag_bitmap = NULL;
+
+        if (connect_op == MDS_CONNECT) {
+                cli->cl_max_mod_rpcs_in_flight = cli->cl_max_rpcs_in_flight - 1;
+                cli->cl_mod_tag_bitmap = kcalloc(BITS_TO_LONGS(OBD_MAX_RIF_MAX),
+                                                 sizeof(long), GFP_NOFS);
+                if (!cli->cl_mod_tag_bitmap) {
+                        rc = -ENOMEM;
+                        goto err;
+                }
+        }
+
         rc = ldlm_get_ref();
         if (rc) {
                 CERROR("ldlm_get_ref failed: %d\n", rc);
@@ -399,9 +421,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
         }
 
         cli->cl_import = imp;
-        /* cli->cl_max_mds_{easize,cookiesize} updated by mdc_init_ea_size() */
+        /* cli->cl_max_mds_easize updated by mdc_init_ea_size() */
         cli->cl_max_mds_easize = sizeof(struct lov_mds_md_v3);
-        cli->cl_max_mds_cookiesize = sizeof(struct llog_cookie);
 
         if (LUSTRE_CFG_BUFLEN(lcfg, 3) > 0) {
                 if (!strcmp(lustre_cfg_string(lcfg, 3), "inactive")) {
@@ -425,8 +446,6 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
                 goto err_import;
         }
 
-        cli->cl_qchk_stat = CL_NOT_QUOTACHECKED;
-
         return rc;
 
 err_import:
@@ -434,12 +453,16 @@ err_import:
 err_ldlm:
         ldlm_put_ref();
 err:
+        kfree(cli->cl_mod_tag_bitmap);
+        cli->cl_mod_tag_bitmap = NULL;
         return rc;
 }
 EXPORT_SYMBOL(client_obd_setup);
 
 int client_obd_cleanup(struct obd_device *obddev)
 {
+        struct client_obd *cli = &obddev->u.cli;
+
         ldlm_namespace_free_post(obddev->obd_namespace);
         obddev->obd_namespace = NULL;
 
@@ -447,6 +470,10 @@ int client_obd_cleanup(struct obd_device *obddev)
         LASSERT(!obddev->u.cli.cl_import);
 
         ldlm_put_ref();
+
+        kfree(cli->cl_mod_tag_bitmap);
+        cli->cl_mod_tag_bitmap = NULL;
+
         return 0;
 }
 EXPORT_SYMBOL(client_obd_cleanup);
@@ -461,6 +488,7 @@ int client_connect_import(const struct lu_env *env,
         struct obd_import       *imp    = cli->cl_import;
         struct obd_connect_data *ocd;
         struct lustre_handle    conn    = { 0 };
+        bool is_mdc = false;
         int                  rc;
 
         *exp = NULL;
@@ -487,6 +515,10 @@ int client_connect_import(const struct lu_env *env,
         ocd = &imp->imp_connect_data;
         if (data) {
                 *ocd = *data;
+                is_mdc = !strncmp(imp->imp_obd->obd_type->typ_name,
+                                  LUSTRE_MDC_NAME, 3);
+                if (is_mdc)
+                        data->ocd_connect_flags |= OBD_CONNECT_MULTIMODRPCS;
                 imp->imp_connect_flags_orig = data->ocd_connect_flags;
         }
 
@@ -502,6 +534,11 @@ int client_connect_import(const struct lu_env *env,
                          ocd->ocd_connect_flags, "old %#llx, new %#llx\n",
                          data->ocd_connect_flags, ocd->ocd_connect_flags);
                 data->ocd_connect_flags = ocd->ocd_connect_flags;
+                /* clear the flag as it was not set and is not known
+                 * by upper layers
+                 */
+                if (is_mdc)
+                        data->ocd_connect_flags &= ~OBD_CONNECT_MULTIMODRPCS;
         }
 
         ptlrpc_pinger_add_import(imp);
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
index 3c48b4fb96f1..a4a291acb659 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
@@ -39,6 +39,7 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 #include "../include/lustre_intent.h"
+#include "../include/lustre_swab.h"
 #include "../include/obd_class.h"
 #include "ldlm_internal.h"
 
@@ -63,17 +64,10 @@ static char *ldlm_typename[] = {
         [LDLM_IBITS]    = "IBT",
 };
 
-static ldlm_policy_wire_to_local_t ldlm_policy_wire18_to_local[] = {
+static ldlm_policy_wire_to_local_t ldlm_policy_wire_to_local[] = {
         [LDLM_PLAIN - LDLM_MIN_TYPE]    = ldlm_plain_policy_wire_to_local,
         [LDLM_EXTENT - LDLM_MIN_TYPE]   = ldlm_extent_policy_wire_to_local,
-        [LDLM_FLOCK - LDLM_MIN_TYPE]    = ldlm_flock_policy_wire18_to_local,
-        [LDLM_IBITS - LDLM_MIN_TYPE]    = ldlm_ibits_policy_wire_to_local,
-};
-
-static ldlm_policy_wire_to_local_t ldlm_policy_wire21_to_local[] = {
-        [LDLM_PLAIN - LDLM_MIN_TYPE]    = ldlm_plain_policy_wire_to_local,
-        [LDLM_EXTENT - LDLM_MIN_TYPE]   = ldlm_extent_policy_wire_to_local,
-        [LDLM_FLOCK - LDLM_MIN_TYPE]    = ldlm_flock_policy_wire21_to_local,
+        [LDLM_FLOCK - LDLM_MIN_TYPE]    = ldlm_flock_policy_wire_to_local,
         [LDLM_IBITS - LDLM_MIN_TYPE]    = ldlm_ibits_policy_wire_to_local,
 };
 
@@ -88,8 +82,8 @@ static ldlm_policy_local_to_wire_t ldlm_policy_local_to_wire[] = {
  * Converts lock policy from local format to on the wire lock_desc format
  */
 static void ldlm_convert_policy_to_wire(enum ldlm_type type,
-                                        const ldlm_policy_data_t *lpolicy,
-                                        ldlm_wire_policy_data_t *wpolicy)
+                                        const union ldlm_policy_data *lpolicy,
+                                        union ldlm_wire_policy_data *wpolicy)
 {
         ldlm_policy_local_to_wire_t convert;
 
@@ -102,23 +96,17 @@ static void ldlm_convert_policy_to_wire(enum ldlm_type type,
  * Converts lock policy from on the wire lock_desc format to local format
  */
 void ldlm_convert_policy_to_local(struct obd_export *exp, enum ldlm_type type,
-                                  const ldlm_wire_policy_data_t *wpolicy,
-                                  ldlm_policy_data_t *lpolicy)
+                                  const union ldlm_wire_policy_data *wpolicy,
+                                  union ldlm_policy_data *lpolicy)
 {
         ldlm_policy_wire_to_local_t convert;
-        int new_client;
 
-        /** some badness for 2.0.0 clients, but 2.0.0 isn't supported */
-        new_client = (exp_connect_flags(exp) & OBD_CONNECT_FULL20) != 0;
-        if (new_client)
-                convert = ldlm_policy_wire21_to_local[type - LDLM_MIN_TYPE];
-        else
-                convert = ldlm_policy_wire18_to_local[type - LDLM_MIN_TYPE];
+        convert = ldlm_policy_wire_to_local[type - LDLM_MIN_TYPE];
 
         convert(wpolicy, lpolicy);
 }
 
-char *ldlm_it2str(int it)
+const char *ldlm_it2str(enum ldlm_intent_flags it)
 {
         switch (it) {
         case IT_OPEN:
@@ -140,7 +128,7 @@ char *ldlm_it2str(int it)
         case IT_LAYOUT:
                 return "layout";
         default:
-                CERROR("Unknown intent %d\n", it);
+                CERROR("Unknown intent 0x%08x\n", it);
                 return "UNKNOWN";
         }
 }
@@ -512,7 +500,6 @@ int ldlm_lock_change_resource(struct ldlm_namespace *ns, struct ldlm_lock *lock,
 
         return 0;
 }
-EXPORT_SYMBOL(ldlm_lock_change_resource);
 
 /** \defgroup ldlm_handles LDLM HANDLES
  * Ways to get hold of locks without any addresses.
@@ -595,7 +582,6 @@ void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc)
                                     &lock->l_policy_data,
                                     &desc->l_policy_data);
 }
-EXPORT_SYMBOL(ldlm_lock2desc);
 
 /**
  * Add a lock to list of conflicting locks to send AST to.
@@ -658,7 +644,7 @@ static void ldlm_add_ast_work_item(struct ldlm_lock *lock,
  * r/w reference type is determined by \a mode
  * Calls ldlm_lock_addref_internal.
  */
-void ldlm_lock_addref(const struct lustre_handle *lockh, __u32 mode)
+void ldlm_lock_addref(const struct lustre_handle *lockh, enum ldlm_mode mode)
 {
         struct ldlm_lock *lock;
 
@@ -676,7 +662,8 @@ EXPORT_SYMBOL(ldlm_lock_addref);
  * Removes lock from LRU if it is there.
  * Assumes the LDLM lock is already locked.
  */
-void ldlm_lock_addref_internal_nolock(struct ldlm_lock *lock, __u32 mode)
+void ldlm_lock_addref_internal_nolock(struct ldlm_lock *lock,
+                                      enum ldlm_mode mode)
 {
         ldlm_lock_remove_from_lru(lock);
         if (mode & (LCK_NL | LCK_CR | LCK_PR)) {
@@ -700,7 +687,7 @@ void ldlm_lock_addref_internal_nolock(struct ldlm_lock *lock, __u32 mode)
  *
  * \retval -EAGAIN lock is being canceled.
  */
-int ldlm_lock_addref_try(const struct lustre_handle *lockh, __u32 mode)
+int ldlm_lock_addref_try(const struct lustre_handle *lockh, enum ldlm_mode mode)
 {
         struct ldlm_lock *lock;
         int            result;
@@ -726,7 +713,7 @@ EXPORT_SYMBOL(ldlm_lock_addref_try);
  * Locks LDLM lock and calls ldlm_lock_addref_internal_nolock to do the work.
  * Only called for local locks.
  */
-void ldlm_lock_addref_internal(struct ldlm_lock *lock, __u32 mode)
+void ldlm_lock_addref_internal(struct ldlm_lock *lock, enum ldlm_mode mode)
 {
         lock_res_and_lock(lock);
         ldlm_lock_addref_internal_nolock(lock, mode);
@@ -740,7 +727,8 @@ void ldlm_lock_addref_internal(struct ldlm_lock *lock, __u32 mode)
  * Does NOT add lock to LRU if no r/w references left to accommodate flock locks
  * that cannot be placed in LRU.
  */
-void ldlm_lock_decref_internal_nolock(struct ldlm_lock *lock, __u32 mode)
+void ldlm_lock_decref_internal_nolock(struct ldlm_lock *lock,
+                                      enum ldlm_mode mode)
 {
         LDLM_DEBUG(lock, "ldlm_lock_decref(%s)", ldlm_lockname[mode]);
         if (mode & (LCK_NL | LCK_CR | LCK_PR)) {
@@ -766,7 +754,7 @@ void ldlm_lock_decref_internal_nolock(struct ldlm_lock *lock, __u32 mode)
  * on the namespace.
  * For blocked LDLM locks if r/w count drops to zero, blocking_ast is called.
  */
-void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode)
+void ldlm_lock_decref_internal(struct ldlm_lock *lock, enum ldlm_mode mode)
 {
         struct ldlm_namespace *ns;
 
@@ -786,11 +774,16 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode)
         }
 
         if (!lock->l_readers && !lock->l_writers &&
-            ldlm_is_cbpending(lock)) {
+            (ldlm_is_cbpending(lock) || lock->l_req_mode == LCK_GROUP)) {
                 /* If we received a blocked AST and this was the last reference,
                  * run the callback.
+                 * Group locks are special:
+                 * They must not go in LRU, but they are not called back
+                 * like non-group locks, instead they are manually released.
+                 * They have an l_writers reference which they keep until
+                 * they are manually released, so we remove them when they have
+                 * no more reader or writer references. - LU-6368
                  */
-
                 LDLM_DEBUG(lock, "final decref done on cbpending lock");
 
                 LDLM_LOCK_GET(lock); /* dropped by bl thread */
@@ -832,7 +825,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode)
 /**
  * Decrease reader/writer refcount for LDLM lock with handle \a lockh
  */
-void ldlm_lock_decref(const struct lustre_handle *lockh, __u32 mode)
+void ldlm_lock_decref(const struct lustre_handle *lockh, enum ldlm_mode mode)
 {
         struct ldlm_lock *lock = __ldlm_handle2lock(lockh, 0);
 
@@ -846,10 +839,9 @@ EXPORT_SYMBOL(ldlm_lock_decref);
  * Decrease reader/writer refcount for LDLM lock with handle
  * \a lockh and mark it for subsequent cancellation once r/w refcount
  * drops to zero instead of putting into LRU.
- *
- * Typical usage is for GROUP locks which we cannot allow to be cached.
  */
-void ldlm_lock_decref_and_cancel(const struct lustre_handle *lockh, __u32 mode)
+void ldlm_lock_decref_and_cancel(const struct lustre_handle *lockh,
+                                 enum ldlm_mode mode)
 {
         struct ldlm_lock *lock = __ldlm_handle2lock(lockh, 0);
 
@@ -1055,88 +1047,173 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list)
 }
 
 /**
- * Search for a lock with given properties in a queue.
+ * Describe the overlap between two locks.  itree_overlap_cb data.
+ */
+struct lock_match_data {
+        struct ldlm_lock        *lmd_old;
+        struct ldlm_lock        *lmd_lock;
+        enum ldlm_mode          *lmd_mode;
+        union ldlm_policy_data  *lmd_policy;
+        __u64                    lmd_flags;
+        int                      lmd_unref;
+};
+
+/**
+ * Check if the given @lock meets the criteria for a match.
+ * A reference on the lock is taken if matched.
  *
- * \retval a referenced lock or NULL.  See the flag descriptions below, in the
- * comment above ldlm_lock_match
+ * \param lock  test-against this lock
+ * \param data  parameters
  */
-static struct ldlm_lock *search_queue(struct list_head *queue,
-                                      enum ldlm_mode *mode,
-                                      ldlm_policy_data_t *policy,
-                                      struct ldlm_lock *old_lock,
-                                      __u64 flags, int unref)
+static int lock_matches(struct ldlm_lock *lock, struct lock_match_data *data)
 {
-        struct ldlm_lock *lock;
-        struct list_head       *tmp;
+        union ldlm_policy_data *lpol = &lock->l_policy_data;
+        enum ldlm_mode match;
 
-        list_for_each(tmp, queue) {
-                enum ldlm_mode match;
+        if (lock == data->lmd_old)
+                return INTERVAL_ITER_STOP;
 
-                lock = list_entry(tmp, struct ldlm_lock, l_res_link);
-
-                if (lock == old_lock)
-                        break;
+        /*
+         * Check if this lock can be matched.
+         * Used by LU-2919(exclusive open) for open lease lock
+         */
+        if (ldlm_is_excl(lock))
+                return INTERVAL_ITER_CONT;
 
-                /* Check if this lock can be matched.
-                 * Used by LU-2919(exclusive open) for open lease lock
-                 */
-                if (ldlm_is_excl(lock))
-                        continue;
+        /*
+         * llite sometimes wants to match locks that will be
+         * canceled when their users drop, but we allow it to match
+         * if it passes in CBPENDING and the lock still has users.
+         * this is generally only going to be used by children
+         * whose parents already hold a lock so forward progress
+         * can still happen.
+         */
+        if (ldlm_is_cbpending(lock) &&
+            !(data->lmd_flags & LDLM_FL_CBPENDING))
+                return INTERVAL_ITER_CONT;
 
-                /* llite sometimes wants to match locks that will be
-                 * canceled when their users drop, but we allow it to match
-                 * if it passes in CBPENDING and the lock still has users.
-                 * this is generally only going to be used by children
-                 * whose parents already hold a lock so forward progress
-                 * can still happen.
-                 */
-                if (ldlm_is_cbpending(lock) && !(flags & LDLM_FL_CBPENDING))
-                        continue;
-                if (!unref && ldlm_is_cbpending(lock) &&
-                    lock->l_readers == 0 && lock->l_writers == 0)
-                        continue;
+        if (!data->lmd_unref && ldlm_is_cbpending(lock) &&
+            !lock->l_readers && !lock->l_writers)
+                return INTERVAL_ITER_CONT;
 
-                if (!(lock->l_req_mode & *mode))
-                        continue;
-                match = lock->l_req_mode;
+        if (!(lock->l_req_mode & *data->lmd_mode))
+                return INTERVAL_ITER_CONT;
+        match = lock->l_req_mode;
 
-                if (lock->l_resource->lr_type == LDLM_EXTENT &&
-                    (lock->l_policy_data.l_extent.start >
-                     policy->l_extent.start ||
-                     lock->l_policy_data.l_extent.end < policy->l_extent.end))
-                        continue;
+        switch (lock->l_resource->lr_type) {
+        case LDLM_EXTENT:
+                if (lpol->l_extent.start > data->lmd_policy->l_extent.start ||
+                    lpol->l_extent.end < data->lmd_policy->l_extent.end)
+                        return INTERVAL_ITER_CONT;
 
                 if (unlikely(match == LCK_GROUP) &&
-                    lock->l_resource->lr_type == LDLM_EXTENT &&
-                    policy->l_extent.gid != LDLM_GID_ANY &&
-                    lock->l_policy_data.l_extent.gid != policy->l_extent.gid)
-                        continue;
-
-                /* We match if we have existing lock with same or wider set
+                    data->lmd_policy->l_extent.gid != LDLM_GID_ANY &&
+                    lpol->l_extent.gid != data->lmd_policy->l_extent.gid)
+                        return INTERVAL_ITER_CONT;
+                break;
+        case LDLM_IBITS:
+                /*
+                 * We match if we have existing lock with same or wider set
                  * of bits.
                  */
-                if (lock->l_resource->lr_type == LDLM_IBITS &&
-                    ((lock->l_policy_data.l_inodebits.bits &
-                      policy->l_inodebits.bits) !=
-                      policy->l_inodebits.bits))
-                        continue;
+                if ((lpol->l_inodebits.bits &
+                     data->lmd_policy->l_inodebits.bits) !=
+                    data->lmd_policy->l_inodebits.bits)
+                        return INTERVAL_ITER_CONT;
+                break;
+        default:
+                break;
+        }
+        /*
+         * We match if we have existing lock with same or wider set
+         * of bits.
+         */
+        if (!data->lmd_unref && LDLM_HAVE_MASK(lock, GONE))
+                return INTERVAL_ITER_CONT;
+
+        if ((data->lmd_flags & LDLM_FL_LOCAL_ONLY) &&
+            !ldlm_is_local(lock))
+                return INTERVAL_ITER_CONT;
+
+        if (data->lmd_flags & LDLM_FL_TEST_LOCK) {
+                LDLM_LOCK_GET(lock);
+                ldlm_lock_touch_in_lru(lock);
+        } else {
+                ldlm_lock_addref_internal_nolock(lock, match);
+        }
+
+        *data->lmd_mode = match;
+        data->lmd_lock = lock;
+
+        return INTERVAL_ITER_STOP;
+}
+
+static unsigned int itree_overlap_cb(struct interval_node *in, void *args)
+{
+        struct ldlm_interval *node = to_ldlm_interval(in);
+        struct lock_match_data *data = args;
+        struct ldlm_lock *lock;
+        int rc;
+
+        list_for_each_entry(lock, &node->li_group, l_sl_policy) {
+                rc = lock_matches(lock, data);
+                if (rc == INTERVAL_ITER_STOP)
+                        return INTERVAL_ITER_STOP;
+        }
+        return INTERVAL_ITER_CONT;
+}
+
+/**
+ * Search for a lock with given parameters in interval trees.
+ *
+ * \param res   search for a lock in this resource
+ * \param data  parameters
+ *
+ * \retval      a referenced lock or NULL.
+ */
+static struct ldlm_lock *search_itree(struct ldlm_resource *res,
+                                      struct lock_match_data *data)
+{
+        struct interval_node_extent ext = {
+                .start  = data->lmd_policy->l_extent.start,
+                .end    = data->lmd_policy->l_extent.end
+        };
+        int idx;
+
+        for (idx = 0; idx < LCK_MODE_NUM; idx++) {
+                struct ldlm_interval_tree *tree = &res->lr_itree[idx];
 
-                if (!unref && LDLM_HAVE_MASK(lock, GONE))
+                if (!tree->lit_root)
                         continue;
 
-                if ((flags & LDLM_FL_LOCAL_ONLY) && !ldlm_is_local(lock))
+                if (!(tree->lit_mode & *data->lmd_mode))
                         continue;
 
-                if (flags & LDLM_FL_TEST_LOCK) {
-                        LDLM_LOCK_GET(lock);
-                        ldlm_lock_touch_in_lru(lock);
-                } else {
-                        ldlm_lock_addref_internal_nolock(lock, match);
-                }
-                *mode = match;
-                return lock;
+                interval_search(tree->lit_root, &ext,
+                                itree_overlap_cb, data);
         }
+        return data->lmd_lock;
+}
 
+/**
+ * Search for a lock with given properties in a queue.
+ *
+ * \param queue search for a lock in this queue
+ * \param data  parameters
+ *
+ * \retval      a referenced lock or NULL.
+ */
+static struct ldlm_lock *search_queue(struct list_head *queue,
+                                      struct lock_match_data *data)
+{
+        struct ldlm_lock *lock;
+        int rc;
+
+        list_for_each_entry(lock, queue, l_res_link) {
+                rc = lock_matches(lock, data);
+                if (rc == INTERVAL_ITER_STOP)
+                        return data->lmd_lock;
+        }
         return NULL;
 }
 
@@ -1147,7 +1224,6 @@ void ldlm_lock_fail_match_locked(struct ldlm_lock *lock)
                 wake_up_all(&lock->l_waitq);
         }
 }
-EXPORT_SYMBOL(ldlm_lock_fail_match_locked);
 
 /**
  * Mark lock as "matchable" by OST.
@@ -1208,35 +1284,45 @@ EXPORT_SYMBOL(ldlm_lock_allow_match);
 enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags,
                                const struct ldlm_res_id *res_id,
                                enum ldlm_type type,
-                               ldlm_policy_data_t *policy,
+                               union ldlm_policy_data *policy,
                                enum ldlm_mode mode,
                                struct lustre_handle *lockh, int unref)
 {
+        struct lock_match_data data = {
+                .lmd_old        = NULL,
+                .lmd_lock       = NULL,
+                .lmd_mode       = &mode,
+                .lmd_policy     = policy,
+                .lmd_flags      = flags,
+                .lmd_unref      = unref,
+        };
         struct ldlm_resource *res;
-        struct ldlm_lock *lock, *old_lock = NULL;
+        struct ldlm_lock *lock;
         int rc = 0;
 
         if (!ns) {
-                old_lock = ldlm_handle2lock(lockh);
-                LASSERT(old_lock);
+                data.lmd_old = ldlm_handle2lock(lockh);
+                LASSERT(data.lmd_old);
 
-                ns = ldlm_lock_to_ns(old_lock);
-                res_id = &old_lock->l_resource->lr_name;
-                type = old_lock->l_resource->lr_type;
-                mode = old_lock->l_req_mode;
+                ns = ldlm_lock_to_ns(data.lmd_old);
+                res_id = &data.lmd_old->l_resource->lr_name;
+                type = data.lmd_old->l_resource->lr_type;
+                *data.lmd_mode = data.lmd_old->l_req_mode;
         }
 
         res = ldlm_resource_get(ns, NULL, res_id, type, 0);
         if (IS_ERR(res)) {
-                LASSERT(!old_lock);
+                LASSERT(!data.lmd_old);
                 return 0;
         }
 
         LDLM_RESOURCE_ADDREF(res);
         lock_res(res);
 
-        lock = search_queue(&res->lr_granted, &mode, policy, old_lock,
-                            flags, unref);
+        if (res->lr_type == LDLM_EXTENT)
+                lock = search_itree(res, &data);
+        else
+                lock = search_queue(&res->lr_granted, &data);
         if (lock) {
                 rc = 1;
                 goto out;
@@ -1245,14 +1331,12 @@ enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags,
                 rc = 0;
                 goto out;
         }
-        lock = search_queue(&res->lr_waiting, &mode, policy, old_lock,
-                            flags, unref);
+        lock = search_queue(&res->lr_waiting, &data);
         if (lock) {
                 rc = 1;
                 goto out;
         }
-
- out:
+out:
         unlock_res(res);
         LDLM_RESOURCE_DELREF(res);
         ldlm_resource_putref(res);
@@ -1324,8 +1408,8 @@ enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags,
                                   (type == LDLM_PLAIN || type == LDLM_IBITS) ?
                                         res_id->name[3] : policy->l_extent.end);
         }
-        if (old_lock)
-                LDLM_LOCK_PUT(old_lock);
+        if (data.lmd_old)
+                LDLM_LOCK_PUT(data.lmd_old);
 
         return rc ? mode : 0;
 }
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
index fde697ebaadc..12647af5a336 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
@@ -511,23 +511,6 @@ static inline void ldlm_callback_errmsg(struct ptlrpc_request *req,
                 CWARN("Send reply failed, maybe cause bug 21636.\n");
 }
 
-static int ldlm_handle_qc_callback(struct ptlrpc_request *req)
-{
-        struct obd_quotactl *oqctl;
-        struct client_obd *cli = &req->rq_export->exp_obd->u.cli;
-
-        oqctl = req_capsule_client_get(&req->rq_pill, &RMF_OBD_QUOTACTL);
-        if (!oqctl) {
-                CERROR("Can't unpack obd_quotactl\n");
-                return -EPROTO;
-        }
-
-        oqctl->qc_stat = ptlrpc_status_ntoh(oqctl->qc_stat);
-
-        cli->cl_qchk_stat = oqctl->qc_stat;
-        return 0;
-}
-
 /* TODO: handle requests in a similar way as MDT: see mdt_handle_common() */
 static int ldlm_callback_handler(struct ptlrpc_request *req)
 {
@@ -577,13 +560,6 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)
                 rc = ldlm_handle_setinfo(req);
                 ldlm_callback_reply(req, rc);
                 return 0;
-        case OBD_QC_CALLBACK:
-                req_capsule_set(&req->rq_pill, &RQF_QC_CALLBACK);
-                if (OBD_FAIL_CHECK(OBD_FAIL_OBD_QC_CALLBACK_NET))
-                        return 0;
-                rc = ldlm_handle_qc_callback(req);
-                ldlm_callback_reply(req, rc);
-                return 0;
         default:
                 CERROR("unknown opcode %u\n",
                        lustre_msg_get_opc(req->rq_reqmsg));
@@ -858,7 +834,6 @@ int ldlm_get_ref(void)
 
         return rc;
 }
-EXPORT_SYMBOL(ldlm_get_ref);
 
 void ldlm_put_ref(void)
 {
@@ -875,7 +850,6 @@ void ldlm_put_ref(void)
         }
         mutex_unlock(&ldlm_ref_mutex);
 }
-EXPORT_SYMBOL(ldlm_put_ref);
 
 static ssize_t cancel_unused_locks_before_replay_show(struct kobject *kobj,
                                                       struct attribute *attr,
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_plain.c b/drivers/staging/lustre/lustre/ldlm/ldlm_plain.c
index 0aed39c46154..862ea0a1dc97 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_plain.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_plain.c
@@ -54,14 +54,14 @@
 
 #include "ldlm_internal.h"
 
-void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                     ldlm_policy_data_t *lpolicy)
+void ldlm_plain_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,
+                                     union ldlm_policy_data *lpolicy)
 {
         /* No policy for plain locks */
 }
 
-void ldlm_plain_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,
-                                     ldlm_wire_policy_data_t *wpolicy)
+void ldlm_plain_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
+                                     union ldlm_wire_policy_data *wpolicy)
 {
         /* No policy for plain locks */
 }
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
index 9a1136e32dfc..8dfb3c8e6b7a 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
@@ -293,7 +293,7 @@ static int ldlm_cli_pool_recalc(struct ldlm_pool *pl)
          * take into account pl->pl_recalc_time here.
          */
         ret = ldlm_cancel_lru(container_of(pl, struct ldlm_namespace, ns_pool),
-                              0, LCF_ASYNC, LDLM_CANCEL_LRUR);
+                              0, LCF_ASYNC, LDLM_LRU_FLAG_LRUR);
 
 out:
         spin_lock(&pl->pl_lock);
@@ -339,7 +339,7 @@ static int ldlm_cli_pool_shrink(struct ldlm_pool *pl,
         if (nr == 0)
                 return (unused / 100) * sysctl_vfs_cache_pressure;
         else
-                return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_CANCEL_SHRINK);
+                return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK);
 }
 
 static const struct ldlm_pool_ops ldlm_cli_pool_ops = {
@@ -356,10 +356,10 @@ static int ldlm_pool_recalc(struct ldlm_pool *pl)
         u32 recalc_interval_sec;
         int count;
 
-        recalc_interval_sec = ktime_get_seconds() - pl->pl_recalc_time;
+        recalc_interval_sec = ktime_get_real_seconds() - pl->pl_recalc_time;
         if (recalc_interval_sec > 0) {
                 spin_lock(&pl->pl_lock);
-                recalc_interval_sec = ktime_get_seconds() - pl->pl_recalc_time;
+                recalc_interval_sec = ktime_get_real_seconds() - pl->pl_recalc_time;
 
                 if (recalc_interval_sec > 0) {
                         /*
@@ -382,7 +382,7 @@ static int ldlm_pool_recalc(struct ldlm_pool *pl)
                                     count);
         }
 
-        recalc_interval_sec = pl->pl_recalc_time - ktime_get_seconds() +
+        recalc_interval_sec = pl->pl_recalc_time - ktime_get_real_seconds() +
                               pl->pl_recalc_period;
         if (recalc_interval_sec <= 0) {
                 /* DEBUG: should be re-removed after LU-4536 is fixed */
@@ -651,13 +651,13 @@ static void ldlm_pool_debugfs_fini(struct ldlm_pool *pl)
 }
 
 int ldlm_pool_init(struct ldlm_pool *pl, struct ldlm_namespace *ns,
-                   int idx, ldlm_side_t client)
+                   int idx, enum ldlm_side client)
 {
         int rc;
 
         spin_lock_init(&pl->pl_lock);
         atomic_set(&pl->pl_granted, 0);
-        pl->pl_recalc_time = ktime_get_seconds();
+        pl->pl_recalc_time = ktime_get_real_seconds();
         atomic_set(&pl->pl_lock_volume_factor, 1);
 
         atomic_set(&pl->pl_grant_rate, 0);
@@ -684,7 +684,6 @@ int ldlm_pool_init(struct ldlm_pool *pl, struct ldlm_namespace *ns,
 
         return rc;
 }
-EXPORT_SYMBOL(ldlm_pool_init);
 
 void ldlm_pool_fini(struct ldlm_pool *pl)
 {
@@ -698,7 +697,6 @@ void ldlm_pool_fini(struct ldlm_pool *pl)
          */
         POISON(pl, 0x5a, sizeof(*pl));
 }
-EXPORT_SYMBOL(ldlm_pool_fini);
 
 /**
  * Add new taken ldlm lock \a lock into pool \a pl accounting.
@@ -724,7 +722,6 @@ void ldlm_pool_add(struct ldlm_pool *pl, struct ldlm_lock *lock)
          * with too long call paths.
          */
 }
-EXPORT_SYMBOL(ldlm_pool_add);
 
 /**
  * Remove ldlm lock \a lock from pool \a pl accounting.
@@ -743,7 +740,6 @@ void ldlm_pool_del(struct ldlm_pool *pl, struct ldlm_lock *lock)
 
         lprocfs_counter_incr(pl->pl_stats, LDLM_POOL_CANCEL_STAT);
 }
-EXPORT_SYMBOL(ldlm_pool_del);
 
 /**
  * Returns current \a pl SLV.
@@ -792,13 +788,12 @@ static struct completion ldlm_pools_comp;
  * count locks from all namespaces (if possible). Returns number of
  * cached locks.
  */
-static unsigned long ldlm_pools_count(ldlm_side_t client, gfp_t gfp_mask)
+static unsigned long ldlm_pools_count(enum ldlm_side client, gfp_t gfp_mask)
 {
         unsigned long total = 0;
         int nr_ns;
         struct ldlm_namespace *ns;
         struct ldlm_namespace *ns_old = NULL; /* loop detection */
-        void *cookie;
 
         if (client == LDLM_NAMESPACE_CLIENT && !(gfp_mask & __GFP_FS))
                 return 0;
@@ -806,8 +801,6 @@ static unsigned long ldlm_pools_count(ldlm_side_t client, gfp_t gfp_mask)
         CDEBUG(D_DLMTRACE, "Request to count %s locks from all pools\n",
                client == LDLM_NAMESPACE_CLIENT ? "client" : "server");
 
-        cookie = cl_env_reenter();
-
         /*
          * Find out how many resources we may release.
          */
@@ -816,7 +809,6 @@ static unsigned long ldlm_pools_count(ldlm_side_t client, gfp_t gfp_mask)
                 mutex_lock(ldlm_namespace_lock(client));
                 if (list_empty(ldlm_namespace_list(client))) {
                         mutex_unlock(ldlm_namespace_lock(client));
-                        cl_env_reexit(cookie);
                         return 0;
                 }
                 ns = ldlm_namespace_first_locked(client);
@@ -842,22 +834,19 @@ static unsigned long ldlm_pools_count(ldlm_side_t client, gfp_t gfp_mask)
                 ldlm_namespace_put(ns);
         }
 
-        cl_env_reexit(cookie);
         return total;
 }
 
-static unsigned long ldlm_pools_scan(ldlm_side_t client, int nr, gfp_t gfp_mask)
+static unsigned long ldlm_pools_scan(enum ldlm_side client, int nr,
+                                     gfp_t gfp_mask)
 {
         unsigned long freed = 0;
         int tmp, nr_ns;
         struct ldlm_namespace *ns;
-        void *cookie;
 
         if (client == LDLM_NAMESPACE_CLIENT && !(gfp_mask & __GFP_FS))
                 return -1;
 
-        cookie = cl_env_reenter();
-
         /*
          * Shrink at least ldlm_namespace_nr_read(client) namespaces.
          */
@@ -887,7 +876,6 @@ static unsigned long ldlm_pools_scan(ldlm_side_t client, int nr, gfp_t gfp_mask)
                 freed += ldlm_pool_shrink(&ns->ns_pool, cancel, gfp_mask);
                 ldlm_namespace_put(ns);
         }
-        cl_env_reexit(cookie);
         /*
          * we only decrease the SLV in server pools shrinker, return
          * SHRINK_STOP to kernel to avoid needless loop. LU-1128
@@ -908,7 +896,7 @@ static unsigned long ldlm_pools_cli_scan(struct shrinker *s,
                                sc->gfp_mask);
 }
 
-static int ldlm_pools_recalc(ldlm_side_t client)
+static int ldlm_pools_recalc(enum ldlm_side client)
 {
         struct ldlm_namespace *ns;
         struct ldlm_namespace *ns_old = NULL;
@@ -1095,7 +1083,6 @@ int ldlm_pools_init(void)
 
         return rc;
 }
-EXPORT_SYMBOL(ldlm_pools_init);
 
 void ldlm_pools_fini(void)
 {
@@ -1104,4 +1091,3 @@ void ldlm_pools_fini(void)
 
         ldlm_pools_thread_stop();
 }
-EXPORT_SYMBOL(ldlm_pools_fini);
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
index 35ba6f14d95f..c1f8693f94a5 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
@@ -93,11 +93,7 @@ static int ldlm_expired_completion_wait(void *data)
         if (!lock->l_conn_export) {
                 static unsigned long next_dump, last_dump;
 
-                LCONSOLE_WARN("lock timed out (enqueued at %lld, %llds ago)\n",
-                              (s64)lock->l_last_activity,
-                              (s64)(ktime_get_real_seconds() -
-                                    lock->l_last_activity));
-                LDLM_DEBUG(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));
@@ -475,12 +471,7 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req,
                                    "client-side enqueue, new policy data");
         }
 
-        if ((*flags) & LDLM_FL_AST_SENT ||
-            /* Cancel extent locks as soon as possible on a liblustre client,
-             * because it cannot handle asynchronous ASTs robustly (see
-             * bug 7311).
-             */
-            (LIBLUSTRE_CLIENT && type == LDLM_EXTENT)) {
+        if ((*flags) & LDLM_FL_AST_SENT) {
                 lock_res_and_lock(lock);
                 lock->l_flags |= LDLM_FL_CBPENDING |  LDLM_FL_BL_AST;
                 unlock_res_and_lock(lock);
@@ -602,7 +593,7 @@ int ldlm_prep_elc_req(struct obd_export *exp, struct ptlrpc_request *req,
                 avail = ldlm_capsule_handles_avail(pill, RCL_CLIENT, canceloff);
 
                 flags = ns_connect_lru_resize(ns) ?
-                        LDLM_CANCEL_LRUR_NO_WAIT : LDLM_CANCEL_AGED;
+                        LDLM_LRU_FLAG_LRUR_NO_WAIT : LDLM_LRU_FLAG_AGED;
                 to_free = !ns_connect_lru_resize(ns) &&
                           opc == LDLM_ENQUEUE ? 1 : 0;
 
@@ -657,6 +648,27 @@ int ldlm_prep_enqueue_req(struct obd_export *exp, struct ptlrpc_request *req,
 }
 EXPORT_SYMBOL(ldlm_prep_enqueue_req);
 
+static struct ptlrpc_request *ldlm_enqueue_pack(struct obd_export *exp,
+                                                int lvb_len)
+{
+        struct ptlrpc_request *req;
+        int rc;
+
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_LDLM_ENQUEUE);
+        if (!req)
+                return ERR_PTR(-ENOMEM);
+
+        rc = ldlm_prep_enqueue_req(exp, req, NULL, 0);
+        if (rc) {
+                ptlrpc_request_free(req);
+                return ERR_PTR(rc);
+        }
+
+        req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_SERVER, lvb_len);
+        ptlrpc_request_set_replen(req);
+        return req;
+}
+
 /**
  * Client-side lock enqueue.
  *
@@ -670,7 +682,7 @@ EXPORT_SYMBOL(ldlm_prep_enqueue_req);
 int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp,
                      struct ldlm_enqueue_info *einfo,
                      const struct ldlm_res_id *res_id,
-                     ldlm_policy_data_t const *policy, __u64 *flags,
+                     union ldlm_policy_data const *policy, __u64 *flags,
                      void *lvb, __u32 lvb_len, enum lvb_type lvb_type,
                      struct lustre_handle *lockh, int async)
 {
@@ -727,17 +739,14 @@ int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp,
         lock->l_last_activity = ktime_get_real_seconds();
 
         /* lock not sent to server yet */
-
         if (!reqp || !*reqp) {
-                req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp),
-                                                &RQF_LDLM_ENQUEUE,
-                                                LUSTRE_DLM_VERSION,
-                                                LDLM_ENQUEUE);
-                if (!req) {
+                req = ldlm_enqueue_pack(exp, lvb_len);
+                if (IS_ERR(req)) {
                         failed_lock_cleanup(ns, lock, einfo->ei_mode);
                         LDLM_LOCK_RELEASE(lock);
-                        return -ENOMEM;
+                        return PTR_ERR(req);
                 }
+
                 req_passed_in = 0;
                 if (reqp)
                         *reqp = req;
@@ -757,24 +766,6 @@ int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp,
         body->lock_flags = ldlm_flags_to_wire(*flags);
         body->lock_handle[0] = *lockh;
 
-        /* Continue as normal. */
-        if (!req_passed_in) {
-                if (lvb_len > 0)
-                        req_capsule_extend(&req->rq_pill,
-                                           &RQF_LDLM_ENQUEUE_LVB);
-                req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_SERVER,
-                                     lvb_len);
-                ptlrpc_request_set_replen(req);
-        }
-
-        /*
-         * Liblustre client doesn't get extent locks, except for O_APPEND case
-         * where [0, OBD_OBJECT_EOF] lock is taken, or truncate, where
-         * [i_size, OBD_OBJECT_EOF] lock is taken.
-         */
-        LASSERT(ergo(LIBLUSTRE_CLIENT, einfo->ei_type != LDLM_EXTENT ||
-                     policy->l_extent.end == OBD_OBJECT_EOF));
-
         if (async) {
                 LASSERT(reqp);
                 return 0;
@@ -1022,7 +1013,6 @@ int ldlm_cli_update_pool(struct ptlrpc_request *req)
 
         return 0;
 }
-EXPORT_SYMBOL(ldlm_cli_update_pool);
 
 /**
  * Client side lock cancel.
@@ -1067,7 +1057,7 @@ int ldlm_cli_cancel(const struct lustre_handle *lockh,
 
                 ns = ldlm_lock_to_ns(lock);
                 flags = ns_connect_lru_resize(ns) ?
-                        LDLM_CANCEL_LRUR : LDLM_CANCEL_AGED;
+                        LDLM_LRU_FLAG_LRUR : LDLM_LRU_FLAG_AGED;
                 count += ldlm_cancel_lru_local(ns, &cancels, 0, avail - 1,
                                                LCF_BL_AST, flags);
         }
@@ -1125,7 +1115,6 @@ int ldlm_cli_cancel_list_local(struct list_head *cancels, int count,
 
         return count;
 }
-EXPORT_SYMBOL(ldlm_cli_cancel_list_local);
 
 /**
  * Cancel as many locks as possible w/o sending any RPCs (e.g. to write back
@@ -1184,6 +1173,14 @@ static enum ldlm_policy_res ldlm_cancel_lrur_policy(struct ldlm_namespace *ns,
         if (count && added >= count)
                 return LDLM_POLICY_KEEP_LOCK;
 
+        /*
+         * Despite of the LV, It doesn't make sense to keep the lock which
+         * is unused for ns_max_age time.
+         */
+        if (cfs_time_after(cfs_time_current(),
+                           cfs_time_add(lock->l_last_used, ns->ns_max_age)))
+                return LDLM_POLICY_CANCEL_LOCK;
+
         slv = ldlm_pool_get_slv(pl);
         lvf = ldlm_pool_get_lvf(pl);
         la = cfs_duration_sec(cfs_time_sub(cur, lock->l_last_used));
@@ -1287,21 +1284,21 @@ typedef enum ldlm_policy_res (*ldlm_cancel_lru_policy_t)(
 static ldlm_cancel_lru_policy_t
 ldlm_cancel_lru_policy(struct ldlm_namespace *ns, int flags)
 {
-        if (flags & LDLM_CANCEL_NO_WAIT)
+        if (flags & LDLM_LRU_FLAG_NO_WAIT)
                 return ldlm_cancel_no_wait_policy;
 
         if (ns_connect_lru_resize(ns)) {
-                if (flags & LDLM_CANCEL_SHRINK)
+                if (flags & LDLM_LRU_FLAG_SHRINK)
                         /* We kill passed number of old locks. */
                         return ldlm_cancel_passed_policy;
-                else if (flags & LDLM_CANCEL_LRUR)
+                else if (flags & LDLM_LRU_FLAG_LRUR)
                         return ldlm_cancel_lrur_policy;
-                else if (flags & LDLM_CANCEL_PASSED)
+                else if (flags & LDLM_LRU_FLAG_PASSED)
                         return ldlm_cancel_passed_policy;
-                else if (flags & LDLM_CANCEL_LRUR_NO_WAIT)
+                else if (flags & LDLM_LRU_FLAG_LRUR_NO_WAIT)
                         return ldlm_cancel_lrur_no_wait_policy;
         } else {
-                if (flags & LDLM_CANCEL_AGED)
+                if (flags & LDLM_LRU_FLAG_AGED)
                         return ldlm_cancel_aged_policy;
         }
 
@@ -1325,21 +1322,21 @@ ldlm_cancel_lru_policy(struct ldlm_namespace *ns, int flags)
  *
  * Calling policies for enabled LRU resize:
  * ----------------------------------------
- * flags & LDLM_CANCEL_LRUR - use LRU resize policy (SLV from server) to
- *                          cancel not more than \a count locks;
+ * flags & LDLM_LRU_FLAG_LRUR   - use LRU resize policy (SLV from server) to
+ *                                cancel not more than \a count locks;
  *
- * flags & LDLM_CANCEL_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_CANCEL_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_CANCEL_AGED - cancel \a count locks according to "aged policy".
+ * flags & LDLM_LRU_FLAG_AGED   - cancel \a count locks according to "aged policy".
  *
- * flags & LDLM_CANCEL_NO_WAIT - cancel as many unused locks as possible
- *                             (typically before replaying locks) w/o
- *                             sending any RPCs or waiting for any
- *                             outstanding RPC to complete.
+ * flags & LDLM_LRU_FLAG_NO_WAIT - cancel as many unused locks as possible
+ *                                 (typically before replaying locks) w/o
+ *                                 sending any RPCs or waiting for any
+ *                                 outstanding RPC to complete.
  */
 static int ldlm_prepare_lru_list(struct ldlm_namespace *ns,
                                  struct list_head *cancels, int count, int max,
@@ -1348,7 +1345,7 @@ 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_CANCEL_NO_WAIT | LDLM_CANCEL_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;
@@ -1531,7 +1528,7 @@ int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr,
  */
 int ldlm_cancel_resource_local(struct ldlm_resource *res,
                                struct list_head *cancels,
-                               ldlm_policy_data_t *policy,
+                               union ldlm_policy_data *policy,
                                enum ldlm_mode mode, __u64 lock_flags,
                                enum ldlm_cancel_flags cancel_flags,
                                void *opaque)
@@ -1648,7 +1645,7 @@ EXPORT_SYMBOL(ldlm_cli_cancel_list);
  */
 int ldlm_cli_cancel_unused_resource(struct ldlm_namespace *ns,
                                     const struct ldlm_res_id *res_id,
-                                    ldlm_policy_data_t *policy,
+                                    union ldlm_policy_data *policy,
                                     enum ldlm_mode mode,
                                     enum ldlm_cancel_flags flags,
                                     void *opaque)
@@ -1723,7 +1720,7 @@ int ldlm_cli_cancel_unused(struct ldlm_namespace *ns,
                                                        opaque);
         } else {
                 cfs_hash_for_each_nolock(ns->ns_rs_hash,
-                                         ldlm_cli_hash_cancel_unused, &arg);
+                                         ldlm_cli_hash_cancel_unused, &arg, 0);
                 return ELDLM_OK;
         }
 }
@@ -1796,7 +1793,7 @@ static void ldlm_namespace_foreach(struct ldlm_namespace *ns,
         };
 
         cfs_hash_for_each_nolock(ns->ns_rs_hash,
-                                 ldlm_res_iter_helper, &helper);
+                                 ldlm_res_iter_helper, &helper, 0);
 }
 
 /* non-blocking function to manipulate a lock whose cb_data is being put away.
@@ -1840,7 +1837,7 @@ static int ldlm_chain_lock_for_replay(struct ldlm_lock *lock, void *closure)
          * bug 17614: locks being actively cancelled. Get a reference
          * on a lock so that it does not disappear under us (e.g. due to cancel)
          */
-        if (!(lock->l_flags & (LDLM_FL_FAILED | LDLM_FL_CANCELING))) {
+        if (!(lock->l_flags & (LDLM_FL_FAILED | LDLM_FL_BL_DONE))) {
                 list_add(&lock->l_pending_chain, list);
                 LDLM_LOCK_GET(lock);
         }
@@ -1909,7 +1906,7 @@ static int replay_one_lock(struct obd_import *imp, struct ldlm_lock *lock)
         int flags;
 
         /* Bug 11974: Do not replay a lock which is actively being canceled */
-        if (ldlm_is_canceling(lock)) {
+        if (ldlm_is_bl_done(lock)) {
                 LDLM_DEBUG(lock, "Not replaying canceled lock:");
                 return 0;
         }
@@ -2003,11 +2000,11 @@ static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns)
                ldlm_ns_name(ns), ns->ns_nr_unused);
 
         /* We don't need to care whether or not LRU resize is enabled
-         * because the LDLM_CANCEL_NO_WAIT policy doesn't use the
+         * because the LDLM_LRU_FLAG_NO_WAIT policy doesn't use the
          * count parameter
          */
         canceled = ldlm_cancel_lru_local(ns, &cancels, ns->ns_nr_unused, 0,
-                                         LCF_LOCAL, LDLM_CANCEL_NO_WAIT);
+                                         LCF_LOCAL, LDLM_LRU_FLAG_NO_WAIT);
 
         CDEBUG(D_DLMTRACE, "Canceled %d unused locks from namespace %s\n",
                canceled, ldlm_ns_name(ns));
@@ -2048,4 +2045,3 @@ int ldlm_replay_locks(struct obd_import *imp)
 
         return rc;
 }
-EXPORT_SYMBOL(ldlm_replay_locks);
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
index a09c25aea698..b22f5bae7201 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
@@ -226,7 +226,7 @@ static ssize_t lru_size_store(struct kobject *kobj, struct attribute *attr,
 
                         /* Try to cancel all @ns_nr_unused locks. */
                         canceled = ldlm_cancel_lru(ns, unused, 0,
-                                                   LDLM_CANCEL_PASSED);
+                                                   LDLM_LRU_FLAG_PASSED);
                         if (canceled < unused) {
                                 CDEBUG(D_DLMTRACE,
                                        "not all requested locks are canceled, requested: %d, canceled: %d\n",
@@ -237,7 +237,7 @@ static ssize_t lru_size_store(struct kobject *kobj, struct attribute *attr,
                 } else {
                         tmp = ns->ns_max_unused;
                         ns->ns_max_unused = 0;
-                        ldlm_cancel_lru(ns, 0, 0, LDLM_CANCEL_PASSED);
+                        ldlm_cancel_lru(ns, 0, 0, LDLM_LRU_FLAG_PASSED);
                         ns->ns_max_unused = tmp;
                 }
                 return count;
@@ -262,7 +262,7 @@ static ssize_t lru_size_store(struct kobject *kobj, struct attribute *attr,
                        "changing namespace %s unused locks from %u to %u\n",
                        ldlm_ns_name(ns), ns->ns_nr_unused,
                        (unsigned int)tmp);
-                ldlm_cancel_lru(ns, tmp, LCF_ASYNC, LDLM_CANCEL_PASSED);
+                ldlm_cancel_lru(ns, tmp, LCF_ASYNC, LDLM_LRU_FLAG_PASSED);
 
                 if (!lru_resize) {
                         CDEBUG(D_DLMTRACE,
@@ -276,7 +276,7 @@ static ssize_t lru_size_store(struct kobject *kobj, struct attribute *attr,
                        ldlm_ns_name(ns), ns->ns_max_unused,
                        (unsigned int)tmp);
                 ns->ns_max_unused = (unsigned int)tmp;
-                ldlm_cancel_lru(ns, 0, LCF_ASYNC, LDLM_CANCEL_PASSED);
+                ldlm_cancel_lru(ns, 0, LCF_ASYNC, LDLM_LRU_FLAG_PASSED);
 
                 /* Make sure that LRU resize was originally supported before
                  * turning it on here.
@@ -445,8 +445,8 @@ static struct ldlm_resource *ldlm_resource_getref(struct ldlm_resource *res)
         return res;
 }
 
-static unsigned ldlm_res_hop_hash(struct cfs_hash *hs,
-                                  const void *key, unsigned mask)
+static unsigned int ldlm_res_hop_hash(struct cfs_hash *hs,
+                                      const void *key, unsigned int mask)
 {
         const struct ldlm_res_id     *id  = key;
         unsigned int            val = 0;
@@ -457,8 +457,8 @@ static unsigned ldlm_res_hop_hash(struct cfs_hash *hs,
         return val & mask;
 }
 
-static unsigned ldlm_res_hop_fid_hash(struct cfs_hash *hs,
-                                      const void *key, unsigned mask)
+static unsigned int ldlm_res_hop_fid_hash(struct cfs_hash *hs,
+                                          const void *key, unsigned int mask)
 {
         const struct ldlm_res_id *id = key;
         struct lu_fid       fid;
@@ -612,7 +612,7 @@ static struct ldlm_ns_hash_def ldlm_ns_hash_defs[] = {
 
 /** Register \a ns in the list of namespaces */
 static void ldlm_namespace_register(struct ldlm_namespace *ns,
-                                    ldlm_side_t client)
+                                    enum ldlm_side client)
 {
         mutex_lock(ldlm_namespace_lock(client));
         LASSERT(list_empty(&ns->ns_list_chain));
@@ -625,7 +625,7 @@ static void ldlm_namespace_register(struct ldlm_namespace *ns,
  * Create and initialize new empty namespace.
  */
 struct ldlm_namespace *ldlm_namespace_new(struct obd_device *obd, char *name,
-                                          ldlm_side_t client,
+                                          enum ldlm_side client,
                                           enum ldlm_appetite apt,
                                           enum ldlm_ns_type ns_type)
 {
@@ -855,8 +855,10 @@ int ldlm_namespace_cleanup(struct ldlm_namespace *ns, __u64 flags)
                 return ELDLM_OK;
         }
 
-        cfs_hash_for_each_nolock(ns->ns_rs_hash, ldlm_resource_clean, &flags);
-        cfs_hash_for_each_nolock(ns->ns_rs_hash, ldlm_resource_complain, NULL);
+        cfs_hash_for_each_nolock(ns->ns_rs_hash, ldlm_resource_clean,
+                                 &flags, 0);
+        cfs_hash_for_each_nolock(ns->ns_rs_hash, ldlm_resource_complain,
+                                 NULL, 0);
         return ELDLM_OK;
 }
 EXPORT_SYMBOL(ldlm_namespace_cleanup);
@@ -952,7 +954,7 @@ void ldlm_namespace_free_prior(struct ldlm_namespace *ns,
 
 /** Unregister \a ns from the list of namespaces. */
 static void ldlm_namespace_unregister(struct ldlm_namespace *ns,
-                                      ldlm_side_t client)
+                                      enum ldlm_side client)
 {
         mutex_lock(ldlm_namespace_lock(client));
         LASSERT(!list_empty(&ns->ns_list_chain));
@@ -999,7 +1001,6 @@ void ldlm_namespace_get(struct ldlm_namespace *ns)
 {
         atomic_inc(&ns->ns_bref);
 }
-EXPORT_SYMBOL(ldlm_namespace_get);
 
 /* This is only for callers that care about refcount */
 static int ldlm_namespace_get_return(struct ldlm_namespace *ns)
@@ -1014,11 +1015,10 @@ void ldlm_namespace_put(struct ldlm_namespace *ns)
                 spin_unlock(&ns->ns_lock);
         }
 }
-EXPORT_SYMBOL(ldlm_namespace_put);
 
 /** Should be called with ldlm_namespace_lock(client) taken. */
 void ldlm_namespace_move_to_active_locked(struct ldlm_namespace *ns,
-                                          ldlm_side_t client)
+                                          enum ldlm_side client)
 {
         LASSERT(!list_empty(&ns->ns_list_chain));
         LASSERT(mutex_is_locked(ldlm_namespace_lock(client)));
@@ -1027,7 +1027,7 @@ void ldlm_namespace_move_to_active_locked(struct ldlm_namespace *ns,
 
 /** Should be called with ldlm_namespace_lock(client) taken. */
 void ldlm_namespace_move_to_inactive_locked(struct ldlm_namespace *ns,
-                                            ldlm_side_t client)
+                                            enum ldlm_side client)
 {
         LASSERT(!list_empty(&ns->ns_list_chain));
         LASSERT(mutex_is_locked(ldlm_namespace_lock(client)));
@@ -1035,7 +1035,7 @@ void ldlm_namespace_move_to_inactive_locked(struct ldlm_namespace *ns,
 }
 
 /** Should be called with ldlm_namespace_lock(client) taken. */
-struct ldlm_namespace *ldlm_namespace_first_locked(ldlm_side_t client)
+struct ldlm_namespace *ldlm_namespace_first_locked(enum ldlm_side client)
 {
         LASSERT(mutex_is_locked(ldlm_namespace_lock(client)));
         LASSERT(!list_empty(ldlm_namespace_list(client)));
@@ -1305,7 +1305,7 @@ void ldlm_res2desc(struct ldlm_resource *res, struct ldlm_resource_desc *desc)
  * Print information about all locks in all namespaces on this node to debug
  * log.
  */
-void ldlm_dump_all_namespaces(ldlm_side_t client, int level)
+void ldlm_dump_all_namespaces(enum ldlm_side client, int level)
 {
         struct list_head *tmp;
 
@@ -1323,7 +1323,6 @@ void ldlm_dump_all_namespaces(ldlm_side_t client, int level)
 
         mutex_unlock(ldlm_namespace_lock(client));
 }
-EXPORT_SYMBOL(ldlm_dump_all_namespaces);
 
 static int ldlm_res_hash_dump(struct cfs_hash *hs, struct cfs_hash_bd *bd,
                               struct hlist_node *hnode, void *arg)
@@ -1355,12 +1354,11 @@ void ldlm_namespace_dump(int level, struct ldlm_namespace *ns)
 
         cfs_hash_for_each_nolock(ns->ns_rs_hash,
                                  ldlm_res_hash_dump,
-                                 (void *)(unsigned long)level);
+                                 (void *)(unsigned long)level, 0);
         spin_lock(&ns->ns_lock);
         ns->ns_next_dump = cfs_time_shift(10);
         spin_unlock(&ns->ns_lock);
 }
-EXPORT_SYMBOL(ldlm_namespace_dump);
 
 /**
  * Print information about all locks in this resource to debug log.
diff --git a/drivers/staging/lustre/lustre/llite/Makefile b/drivers/staging/lustre/lustre/llite/Makefile
index 1ac0940bd8df..322d4fa63f5d 100644
--- a/drivers/staging/lustre/lustre/llite/Makefile
+++ b/drivers/staging/lustre/lustre/llite/Makefile
@@ -1,7 +1,7 @@
 obj-$(CONFIG_LUSTRE_FS) += lustre.o
-lustre-y := dcache.o dir.o file.o llite_close.o llite_lib.o llite_nfs.o \
-            rw.o namei.o symlink.o llite_mmap.o range_lock.o \
-            xattr.o xattr_cache.o rw26.o super25.o statahead.o \
-            glimpse.o lcommon_cl.o lcommon_misc.o \
-            vvp_dev.o vvp_page.o vvp_lock.o vvp_io.o vvp_object.o vvp_req.o \
+lustre-y := dcache.o dir.o file.o llite_lib.o llite_nfs.o \
+            rw.o rw26.o namei.o symlink.o llite_mmap.o range_lock.o \
+            xattr.o xattr_cache.o xattr_security.o \
+            super25.o statahead.o glimpse.o lcommon_cl.o lcommon_misc.o \
+            vvp_dev.o vvp_page.o vvp_lock.o vvp_io.o vvp_object.o \
             lproc_llite.o
diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
index 7f32a539d260..ea5d247a3f70 100644
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@ -51,6 +51,8 @@
 #include "../include/lustre_dlm.h"
 #include "../include/lustre_fid.h"
 #include "../include/lustre_kernelcomm.h"
+#include "../include/lustre_swab.h"
+
 #include "llite_internal.h"
 
 /*
@@ -410,6 +412,8 @@ static int ll_dir_setdirstripe(struct inode *parent, struct lmv_user_md *lump,
         struct ptlrpc_request *request = NULL;
         struct md_op_data *op_data;
         struct ll_sb_info *sbi = ll_i2sbi(parent);
+        struct inode *inode = NULL;
+        struct dentry dentry;
         int err;
 
         if (unlikely(lump->lum_magic != LMV_USER_MAGIC))
@@ -419,6 +423,10 @@ static int ll_dir_setdirstripe(struct inode *parent, struct lmv_user_md *lump,
                PFID(ll_inode2fid(parent)), parent, dirname,
                (int)lump->lum_stripe_offset, lump->lum_stripe_count);
 
+        if (lump->lum_stripe_count > 1 &&
+            !(exp_connect_flags(sbi->ll_md_exp) & OBD_CONNECT_DIR_STRIPE))
+                return -EINVAL;
+
         if (lump->lum_magic != cpu_to_le32(LMV_USER_MAGIC))
                 lustre_swab_lmv_user_md(lump);
 
@@ -439,8 +447,17 @@ static int ll_dir_setdirstripe(struct inode *parent, struct lmv_user_md *lump,
                         from_kgid(&init_user_ns, current_fsgid()),
                         cfs_curproc_cap_pack(), 0, &request);
         ll_finish_md_op_data(op_data);
+
+        err = ll_prep_inode(&inode, request, parent->i_sb, NULL);
         if (err)
                 goto err_exit;
+
+        memset(&dentry, 0, sizeof(dentry));
+        dentry.d_inode = inode;
+
+        err = ll_init_security(&dentry, inode, parent);
+        iput(inode);
+
 err_exit:
         ptlrpc_req_finished(request);
         return err;
@@ -501,8 +518,7 @@ int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump,
                 return PTR_ERR(op_data);
 
         /* swabbing is done in lov_setstripe() on server side */
-        rc = md_setattr(sbi->ll_md_exp, op_data, lump, lum_size,
-                        NULL, 0, &req, NULL);
+        rc = md_setattr(sbi->ll_md_exp, op_data, lump, lum_size, &req);
         ll_finish_md_op_data(op_data);
         ptlrpc_req_finished(req);
         if (rc) {
@@ -682,7 +698,7 @@ static int ll_ioc_copy_start(struct super_block *sb, struct hsm_copy *copy)
 {
         struct ll_sb_info               *sbi = ll_s2sbi(sb);
         struct hsm_progress_kernel       hpk;
-        int                              rc;
+        int rc2, rc = 0;
 
         /* Forge a hsm_progress based on data from copy. */
         hpk.hpk_fid = copy->hc_hai.hai_fid;
@@ -732,10 +748,10 @@ progress:
         /* On error, the request should be considered as completed */
         if (hpk.hpk_errval > 0)
                 hpk.hpk_flags |= HP_FLAG_COMPLETED;
-        rc = obd_iocontrol(LL_IOC_HSM_PROGRESS, sbi->ll_md_exp, sizeof(hpk),
-                           &hpk, NULL);
+        rc2 = obd_iocontrol(LL_IOC_HSM_PROGRESS, sbi->ll_md_exp, sizeof(hpk),
+                            &hpk, NULL);
 
-        return rc;
+        return rc ? rc : rc2;
 }
 
 /**
@@ -757,7 +773,7 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy)
 {
         struct ll_sb_info               *sbi = ll_s2sbi(sb);
         struct hsm_progress_kernel       hpk;
-        int                              rc;
+        int rc2, rc = 0;
 
         /* If you modify the logic here, also check llapi_hsm_copy_end(). */
         /* Take care: copy->hc_hai.hai_action, len, gid and data are not
@@ -823,18 +839,18 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy)
                          * when the file will not be modified for some tunable
                          * time
                          */
-                        /* we do not notify caller */
                         hpk.hpk_flags &= ~HP_FLAG_RETRY;
+                        rc = -EBUSY;
                         /* hpk_errval must be >= 0 */
-                        hpk.hpk_errval = EBUSY;
+                        hpk.hpk_errval = -rc;
                 }
         }
 
 progress:
-        rc = obd_iocontrol(LL_IOC_HSM_PROGRESS, sbi->ll_md_exp, sizeof(hpk),
-                           &hpk, NULL);
+        rc2 = obd_iocontrol(LL_IOC_HSM_PROGRESS, sbi->ll_md_exp, sizeof(hpk),
+                            &hpk, NULL);
 
-        return rc;
+        return rc ? rc : rc2;
 }
 
 static int copy_and_ioctl(int cmd, struct obd_export *exp,
@@ -862,10 +878,6 @@ static int quotactl_ioctl(struct ll_sb_info *sbi, struct if_quotactl *qctl)
         int rc = 0;
 
         switch (cmd) {
-        case LUSTRE_Q_INVALIDATE:
-        case LUSTRE_Q_FINVALIDATE:
-        case Q_QUOTAON:
-        case Q_QUOTAOFF:
         case Q_SETQUOTA:
         case Q_SETINFO:
                 if (!capable(CFS_CAP_SYS_ADMIN))
@@ -930,10 +942,6 @@ static int quotactl_ioctl(struct ll_sb_info *sbi, struct if_quotactl *qctl)
                 QCTL_COPY(oqctl, qctl);
                 rc = obd_quotactl(sbi->ll_md_exp, oqctl);
                 if (rc) {
-                        if (rc != -EALREADY && cmd == Q_QUOTAON) {
-                                oqctl->qc_cmd = Q_QUOTAOFF;
-                                obd_quotactl(sbi->ll_md_exp, oqctl);
-                        }
                         kfree(oqctl);
                         return rc;
                 }
@@ -1077,7 +1085,7 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         goto out_free;
                 }
 
-                rc = ll_get_fid_by_name(inode, filename, namelen, NULL);
+                rc = ll_get_fid_by_name(inode, filename, namelen, NULL, NULL);
                 if (rc < 0) {
                         CERROR("%s: lookup %.*s failed: rc = %d\n",
                                ll_get_fsname(inode->i_sb, NULL, 0), namelen,
@@ -1189,6 +1197,7 @@ lmv_out_free:
                 struct lmv_user_md *tmp = NULL;
                 union lmv_mds_md *lmm = NULL;
                 u64 valid = 0;
+                int max_stripe_count;
                 int stripe_count;
                 int mdt_index;
                 int lum_size;
@@ -1200,6 +1209,7 @@ lmv_out_free:
                 if (copy_from_user(&lum, ulmv, sizeof(*ulmv)))
                         return -EFAULT;
 
+                max_stripe_count = lum.lum_stripe_count;
                 /*
                  * lum_magic will indicate which stripe the ioctl will like
                  * to get, LMV_MAGIC_V1 is for normal LMV stripe, LMV_USER_MAGIC
@@ -1219,9 +1229,6 @@ lmv_out_free:
 
                 /* Get default LMV EA */
                 if (lum.lum_magic == LMV_USER_MAGIC) {
-                        if (rc)
-                                goto finish_req;
-
                         if (lmmsize > sizeof(*ulmv)) {
                                 rc = -EINVAL;
                                 goto finish_req;
@@ -1234,6 +1241,16 @@ lmv_out_free:
                 }
 
                 stripe_count = lmv_mds_md_stripe_count_get(lmm);
+                if (max_stripe_count < stripe_count) {
+                        lum.lum_stripe_count = stripe_count;
+                        if (copy_to_user(ulmv, &lum, sizeof(lum))) {
+                                rc = -EFAULT;
+                                goto finish_req;
+                        }
+                        rc = -E2BIG;
+                        goto finish_req;
+                }
+
                 lum_size = lmv_user_md_size(stripe_count, LMV_MAGIC_V1);
                 tmp = kzalloc(lum_size, GFP_NOFS);
                 if (!tmp) {
@@ -1370,134 +1387,6 @@ out_req:
                         ll_putname(filename);
                 return rc;
         }
-        case IOC_LOV_GETINFO: {
-                struct lov_user_mds_data __user *lumd;
-                struct lov_stripe_md *lsm;
-                struct lov_user_md __user *lum;
-                struct lov_mds_md *lmm;
-                int lmmsize;
-                lstat_t st;
-
-                lumd = (struct lov_user_mds_data __user *)arg;
-                lum = &lumd->lmd_lmm;
-
-                rc = ll_get_max_mdsize(sbi, &lmmsize);
-                if (rc)
-                        return rc;
-
-                lmm = libcfs_kvzalloc(lmmsize, GFP_NOFS);
-                if (!lmm)
-                        return -ENOMEM;
-                if (copy_from_user(lmm, lum, lmmsize)) {
-                        rc = -EFAULT;
-                        goto free_lmm;
-                }
-
-                switch (lmm->lmm_magic) {
-                case LOV_USER_MAGIC_V1:
-                        if (cpu_to_le32(LOV_USER_MAGIC_V1) == LOV_USER_MAGIC_V1)
-                                break;
-                        /* swab objects first so that stripes num will be sane */
-                        lustre_swab_lov_user_md_objects(
-                                ((struct lov_user_md_v1 *)lmm)->lmm_objects,
-                                ((struct lov_user_md_v1 *)lmm)->lmm_stripe_count);
-                        lustre_swab_lov_user_md_v1((struct lov_user_md_v1 *)lmm);
-                        break;
-                case LOV_USER_MAGIC_V3:
-                        if (cpu_to_le32(LOV_USER_MAGIC_V3) == LOV_USER_MAGIC_V3)
-                                break;
-                        /* swab objects first so that stripes num will be sane */
-                        lustre_swab_lov_user_md_objects(
-                                ((struct lov_user_md_v3 *)lmm)->lmm_objects,
-                                ((struct lov_user_md_v3 *)lmm)->lmm_stripe_count);
-                        lustre_swab_lov_user_md_v3((struct lov_user_md_v3 *)lmm);
-                        break;
-                default:
-                        rc = -EINVAL;
-                        goto free_lmm;
-                }
-
-                rc = obd_unpackmd(sbi->ll_dt_exp, &lsm, lmm, lmmsize);
-                if (rc < 0) {
-                        rc = -ENOMEM;
-                        goto free_lmm;
-                }
-
-                /* Perform glimpse_size operation. */
-                memset(&st, 0, sizeof(st));
-
-                rc = ll_glimpse_ioctl(sbi, lsm, &st);
-                if (rc)
-                        goto free_lsm;
-
-                if (copy_to_user(&lumd->lmd_st, &st, sizeof(st))) {
-                        rc = -EFAULT;
-                        goto free_lsm;
-                }
-
-free_lsm:
-                obd_free_memmd(sbi->ll_dt_exp, &lsm);
-free_lmm:
-                kvfree(lmm);
-                return rc;
-        }
-        case OBD_IOC_QUOTACHECK: {
-                struct obd_quotactl *oqctl;
-                int error = 0;
-
-                if (!capable(CFS_CAP_SYS_ADMIN))
-                        return -EPERM;
-
-                oqctl = kzalloc(sizeof(*oqctl), GFP_NOFS);
-                if (!oqctl)
-                        return -ENOMEM;
-                oqctl->qc_type = arg;
-                rc = obd_quotacheck(sbi->ll_md_exp, oqctl);
-                if (rc < 0) {
-                        CDEBUG(D_INFO, "md_quotacheck failed: rc %d\n", rc);
-                        error = rc;
-                }
-
-                rc = obd_quotacheck(sbi->ll_dt_exp, oqctl);
-                if (rc < 0)
-                        CDEBUG(D_INFO, "obd_quotacheck failed: rc %d\n", rc);
-
-                kfree(oqctl);
-                return error ?: rc;
-        }
-        case OBD_IOC_POLL_QUOTACHECK: {
-                struct if_quotacheck *check;
-
-                if (!capable(CFS_CAP_SYS_ADMIN))
-                        return -EPERM;
-
-                check = kzalloc(sizeof(*check), GFP_NOFS);
-                if (!check)
-                        return -ENOMEM;
-
-                rc = obd_iocontrol(cmd, sbi->ll_md_exp, 0, (void *)check,
-                                   NULL);
-                if (rc) {
-                        CDEBUG(D_QUOTA, "mdc ioctl %d failed: %d\n", cmd, rc);
-                        if (copy_to_user((void __user *)arg, check,
-                                         sizeof(*check)))
-                                CDEBUG(D_QUOTA, "copy_to_user failed\n");
-                        goto out_poll;
-                }
-
-                rc = obd_iocontrol(cmd, sbi->ll_dt_exp, 0, (void *)check,
-                                   NULL);
-                if (rc) {
-                        CDEBUG(D_QUOTA, "osc ioctl %d failed: %d\n", cmd, rc);
-                        if (copy_to_user((void __user *)arg, check,
-                                         sizeof(*check)))
-                                CDEBUG(D_QUOTA, "copy_to_user failed\n");
-                        goto out_poll;
-                }
-out_poll:
-                kfree(check);
-                return rc;
-        }
         case OBD_IOC_QUOTACTL: {
                 struct if_quotactl *qctl;
 
@@ -1536,7 +1425,7 @@ out_quotactl:
                 exp = count ? sbi->ll_md_exp : sbi->ll_dt_exp;
                 vallen = sizeof(count);
                 rc = obd_get_info(NULL, exp, sizeof(KEY_TGT_COUNT),
-                                  KEY_TGT_COUNT, &vallen, &count, NULL);
+                                  KEY_TGT_COUNT, &vallen, &count);
                 if (rc) {
                         CERROR("get target count failed: %d\n", rc);
                         return rc;
diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index e1d784bae064..f634c11216e6 100644
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -44,6 +44,7 @@
 #include <linux/mount.h>
 #include "../include/lustre/ll_fiemap.h"
 #include "../include/lustre/lustre_ioctl.h"
+#include "../include/lustre_swab.h"
 
 #include "../include/cl_object.h"
 #include "llite_internal.h"
@@ -75,60 +76,56 @@ static void ll_file_data_put(struct ll_file_data *fd)
                 kmem_cache_free(ll_file_data_slab, fd);
 }
 
-void ll_pack_inode2opdata(struct inode *inode, struct md_op_data *op_data,
-                          struct lustre_handle *fh)
+/**
+ * Packs all the attributes into @op_data for the CLOSE rpc.
+ */
+static void ll_prepare_close(struct inode *inode, struct md_op_data *op_data,
+                             struct obd_client_handle *och)
 {
-        op_data->op_fid1 = ll_i2info(inode)->lli_fid;
+        struct ll_inode_info *lli = ll_i2info(inode);
+
+        ll_prep_md_op_data(op_data, inode, NULL, NULL,
+                           0, 0, LUSTRE_OPC_ANY, NULL);
+
         op_data->op_attr.ia_mode = inode->i_mode;
         op_data->op_attr.ia_atime = inode->i_atime;
         op_data->op_attr.ia_mtime = inode->i_mtime;
         op_data->op_attr.ia_ctime = inode->i_ctime;
         op_data->op_attr.ia_size = i_size_read(inode);
+        op_data->op_attr.ia_valid |= ATTR_MODE | ATTR_ATIME | ATTR_ATIME_SET |
+                                     ATTR_MTIME | ATTR_MTIME_SET |
+                                     ATTR_CTIME | ATTR_CTIME_SET;
         op_data->op_attr_blocks = inode->i_blocks;
         op_data->op_attr_flags = ll_inode_to_ext_flags(inode->i_flags);
-        op_data->op_ioepoch = ll_i2info(inode)->lli_ioepoch;
-        if (fh)
-                op_data->op_handle = *fh;
+        op_data->op_handle = och->och_fh;
 
-        if (ll_i2info(inode)->lli_flags & LLIF_DATA_MODIFIED)
+        /*
+         * For HSM: if inode data has been modified, pack it so that
+         * MDT can set data dirty flag in the archive.
+         */
+        if (och->och_flags & FMODE_WRITE &&
+            test_and_clear_bit(LLIF_DATA_MODIFIED, &lli->lli_flags))
                 op_data->op_bias |= MDS_DATA_MODIFIED;
 }
 
 /**
- * Closes the IO epoch and packs all the attributes into @op_data for
- * the CLOSE rpc.
+ * Perform a close, possibly with a bias.
+ * The meaning of "data" depends on the value of "bias".
+ *
+ * If \a bias is MDS_HSM_RELEASE then \a data is a pointer to the data version.
+ * If \a bias is MDS_CLOSE_LAYOUT_SWAP then \a data is a pointer to the inode to
+ * swap layouts with.
  */
-static void ll_prepare_close(struct inode *inode, struct md_op_data *op_data,
-                             struct obd_client_handle *och)
-{
-        op_data->op_attr.ia_valid = ATTR_MODE | ATTR_ATIME | ATTR_ATIME_SET |
-                                        ATTR_MTIME | ATTR_MTIME_SET |
-                                        ATTR_CTIME | ATTR_CTIME_SET;
-
-        if (!(och->och_flags & FMODE_WRITE))
-                goto out;
-
-        if (!exp_connect_som(ll_i2mdexp(inode)) || !S_ISREG(inode->i_mode))
-                op_data->op_attr.ia_valid |= ATTR_SIZE | ATTR_BLOCKS;
-        else
-                ll_ioepoch_close(inode, op_data, &och, 0);
-
-out:
-        ll_pack_inode2opdata(inode, op_data, &och->och_fh);
-        ll_prep_md_op_data(op_data, inode, NULL, NULL,
-                           0, 0, LUSTRE_OPC_ANY, NULL);
-}
-
 static int ll_close_inode_openhandle(struct obd_export *md_exp,
-                                     struct inode *inode,
                                      struct obd_client_handle *och,
-                                     const __u64 *data_version)
+                                     struct inode *inode,
+                                     enum mds_op_bias bias,
+                                     void *data)
 {
         struct obd_export *exp = ll_i2mdexp(inode);
         struct md_op_data *op_data;
         struct ptlrpc_request *req = NULL;
         struct obd_device *obd = class_exp2obd(exp);
-        int epoch_close = 1;
         int rc;
 
         if (!obd) {
@@ -150,65 +147,51 @@ static int ll_close_inode_openhandle(struct obd_export *md_exp,
         }
 
         ll_prepare_close(inode, op_data, och);
-        if (data_version) {
-                /* Pass in data_version implies release. */
+        switch (bias) {
+        case MDS_CLOSE_LAYOUT_SWAP:
+                LASSERT(data);
+                op_data->op_bias |= MDS_CLOSE_LAYOUT_SWAP;
+                op_data->op_data_version = 0;
+                op_data->op_lease_handle = och->och_lease_handle;
+                op_data->op_fid2 = *ll_inode2fid(data);
+                break;
+
+        case MDS_HSM_RELEASE:
+                LASSERT(data);
                 op_data->op_bias |= MDS_HSM_RELEASE;
-                op_data->op_data_version = *data_version;
+                op_data->op_data_version = *(__u64 *)data;
                 op_data->op_lease_handle = och->och_lease_handle;
                 op_data->op_attr.ia_valid |= ATTR_SIZE | ATTR_BLOCKS;
+                break;
+
+        default:
+                LASSERT(!data);
+                break;
         }
-        epoch_close = op_data->op_flags & MF_EPOCH_CLOSE;
+
         rc = md_close(md_exp, op_data, och->och_mod, &req);
-        if (rc == -EAGAIN) {
-                /* This close must have the epoch closed. */
-                LASSERT(epoch_close);
-                /* MDS has instructed us to obtain Size-on-MDS attribute from
-                 * OSTs and send setattr to back to MDS.
-                 */
-                rc = ll_som_update(inode, op_data);
-                if (rc) {
-                        CERROR("%s: inode "DFID" mdc Size-on-MDS update failed: rc = %d\n",
-                               ll_i2mdexp(inode)->exp_obd->obd_name,
-                               PFID(ll_inode2fid(inode)), rc);
-                        rc = 0;
-                }
-        } else if (rc) {
+        if (rc) {
                 CERROR("%s: inode "DFID" mdc close failed: rc = %d\n",
                        ll_i2mdexp(inode)->exp_obd->obd_name,
                        PFID(ll_inode2fid(inode)), rc);
         }
 
-        /* DATA_MODIFIED flag was successfully sent on close, cancel data
-         * modification flag.
-         */
-        if (rc == 0 && (op_data->op_bias & MDS_DATA_MODIFIED)) {
-                struct ll_inode_info *lli = ll_i2info(inode);
-
-                spin_lock(&lli->lli_lock);
-                lli->lli_flags &= ~LLIF_DATA_MODIFIED;
-                spin_unlock(&lli->lli_lock);
-        }
-
-        if (rc == 0 && op_data->op_bias & MDS_HSM_RELEASE) {
+        if (op_data->op_bias & (MDS_HSM_RELEASE | MDS_CLOSE_LAYOUT_SWAP) &&
+            !rc) {
                 struct mdt_body *body;
 
                 body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
-                if (!(body->mbo_valid & OBD_MD_FLRELEASED))
+                if (!(body->mbo_valid & OBD_MD_CLOSE_INTENT_EXECED))
                         rc = -EBUSY;
         }
 
         ll_finish_md_op_data(op_data);
 
 out:
-        if (exp_connect_som(exp) && !epoch_close &&
-            S_ISREG(inode->i_mode) && (och->och_flags & FMODE_WRITE)) {
-                ll_queue_done_writing(inode, LLIF_DONE_WRITING);
-        } else {
-                md_clear_open_replay_data(md_exp, och);
-                /* Free @och if it is not waiting for DONE_WRITING. */
-                och->och_fh.cookie = DEAD_HANDLE_MAGIC;
-                kfree(och);
-        }
+        md_clear_open_replay_data(md_exp, och);
+        och->och_fh.cookie = DEAD_HANDLE_MAGIC;
+        kfree(och);
+
         if (req) /* This is close request */
                 ptlrpc_req_finished(req);
         return rc;
@@ -252,7 +235,7 @@ int ll_md_real_close(struct inode *inode, fmode_t fmode)
                  * be closed.
                  */
                 rc = ll_close_inode_openhandle(ll_i2sbi(inode)->ll_md_exp,
-                                               inode, och, NULL);
+                                               och, inode, 0, NULL);
         }
 
         return rc;
@@ -266,7 +249,9 @@ static int ll_md_close(struct obd_export *md_exp, struct inode *inode,
         int lockmode;
         __u64 flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_TEST_LOCK;
         struct lustre_handle lockh;
-        ldlm_policy_data_t policy = {.l_inodebits = {MDS_INODELOCK_OPEN} };
+        union ldlm_policy_data policy = {
+                .l_inodebits = { MDS_INODELOCK_OPEN }
+        };
         int rc = 0;
 
         /* clear group lock, if present */
@@ -288,7 +273,8 @@ static int ll_md_close(struct obd_export *md_exp, struct inode *inode,
         }
 
         if (fd->fd_och) {
-                rc = ll_close_inode_openhandle(md_exp, inode, fd->fd_och, NULL);
+                rc = ll_close_inode_openhandle(md_exp, fd->fd_och, inode, 0,
+                                               NULL);
                 fd->fd_och = NULL;
                 goto out;
         }
@@ -437,20 +423,6 @@ out:
         return rc;
 }
 
-/**
- * Assign an obtained @ioepoch to client's inode. No lock is needed, MDS does
- * not believe attributes if a few ioepoch holders exist. Attributes for
- * previous ioepoch if new one is opened are also skipped by MDS.
- */
-void ll_ioepoch_open(struct ll_inode_info *lli, __u64 ioepoch)
-{
-        if (ioepoch && lli->lli_ioepoch != ioepoch) {
-                lli->lli_ioepoch = ioepoch;
-                CDEBUG(D_INODE, "Epoch %llu opened on "DFID"\n",
-                       ioepoch, PFID(&lli->lli_fid));
-        }
-}
-
 static int ll_och_fill(struct obd_export *md_exp, struct lookup_intent *it,
                        struct obd_client_handle *och)
 {
@@ -470,23 +442,17 @@ static int ll_local_open(struct file *file, struct lookup_intent *it,
                          struct ll_file_data *fd, struct obd_client_handle *och)
 {
         struct inode *inode = file_inode(file);
-        struct ll_inode_info *lli = ll_i2info(inode);
 
         LASSERT(!LUSTRE_FPRIVATE(file));
 
         LASSERT(fd);
 
         if (och) {
-                struct mdt_body *body;
                 int rc;
 
                 rc = ll_och_fill(ll_i2sbi(inode)->ll_md_exp, it, och);
                 if (rc != 0)
                         return rc;
-
-                body = req_capsule_server_get(&it->it_request->rq_pill,
-                                              &RMF_MDT_BODY);
-                ll_ioepoch_open(lli, body->mbo_ioepoch);
         }
 
         LUSTRE_FPRIVATE(file) = fd;
@@ -677,12 +643,6 @@ restart:
         if (!S_ISREG(inode->i_mode))
                 goto out_och_free;
 
-        if (!lli->lli_has_smd &&
-            (cl_is_lov_delay_create(file->f_flags) ||
-             (file->f_mode & FMODE_WRITE) == 0)) {
-                CDEBUG(D_INODE, "object creation was delayed\n");
-                goto out_och_free;
-        }
         cl_lov_delay_create_clear(&file->f_flags);
         goto out_och_free;
 
@@ -867,7 +827,7 @@ out_close:
                 it.it_lock_mode = 0;
                 och->och_lease_handle.cookie = 0ULL;
         }
-        rc2 = ll_close_inode_openhandle(sbi->ll_md_exp, inode, och, NULL);
+        rc2 = ll_close_inode_openhandle(sbi->ll_md_exp, och, inode, 0, NULL);
         if (rc2 < 0)
                 CERROR("%s: error closing file "DFID": %d\n",
                        ll_get_fsname(inode->i_sb, NULL, 0),
@@ -881,6 +841,69 @@ out:
 }
 
 /**
+ * Check whether a layout swap can be done between two inodes.
+ *
+ * \param[in] inode1  First inode to check
+ * \param[in] inode2  Second inode to check
+ *
+ * \retval 0 on success, layout swap can be performed between both inodes
+ * \retval negative error code if requirements are not met
+ */
+static int ll_check_swap_layouts_validity(struct inode *inode1,
+                                          struct inode *inode2)
+{
+        if (!S_ISREG(inode1->i_mode) || !S_ISREG(inode2->i_mode))
+                return -EINVAL;
+
+        if (inode_permission(inode1, MAY_WRITE) ||
+            inode_permission(inode2, MAY_WRITE))
+                return -EPERM;
+
+        if (inode1->i_sb != inode2->i_sb)
+                return -EXDEV;
+
+        return 0;
+}
+
+static int ll_swap_layouts_close(struct obd_client_handle *och,
+                                 struct inode *inode, struct inode *inode2)
+{
+        const struct lu_fid *fid1 = ll_inode2fid(inode);
+        const struct lu_fid *fid2;
+        int rc;
+
+        CDEBUG(D_INODE, "%s: biased close of file " DFID "\n",
+               ll_get_fsname(inode->i_sb, NULL, 0), PFID(fid1));
+
+        rc = ll_check_swap_layouts_validity(inode, inode2);
+        if (rc < 0)
+                goto out_free_och;
+
+        /* We now know that inode2 is a lustre inode */
+        fid2 = ll_inode2fid(inode2);
+
+        rc = lu_fid_cmp(fid1, fid2);
+        if (!rc) {
+                rc = -EINVAL;
+                goto out_free_och;
+        }
+
+        /*
+         * Close the file and swap layouts between inode & inode2.
+         * NB: lease lock handle is released in mdc_close_layout_swap_pack()
+         * because we still need it to pack l_remote_handle to MDT.
+         */
+        rc = ll_close_inode_openhandle(ll_i2sbi(inode)->ll_md_exp, och, inode,
+                                       MDS_CLOSE_LAYOUT_SWAP, inode2);
+
+        och = NULL; /* freed in ll_close_inode_openhandle() */
+
+out_free_och:
+        kfree(och);
+        return rc;
+}
+
+/**
  * Release lease and close the file.
  * It will check if the lease has ever broken.
  */
@@ -907,84 +930,7 @@ static int ll_lease_close(struct obd_client_handle *och, struct inode *inode,
                 *lease_broken = cancelled;
 
         return ll_close_inode_openhandle(ll_i2sbi(inode)->ll_md_exp,
-                                         inode, och, NULL);
-}
-
-/* Fills the obdo with the attributes for the lsm */
-static int ll_lsm_getattr(struct lov_stripe_md *lsm, struct obd_export *exp,
-                          struct obdo *obdo, __u64 ioepoch, int dv_flags)
-{
-        struct ptlrpc_request_set *set;
-        struct obd_info     oinfo = { };
-        int                     rc;
-
-        LASSERT(lsm);
-
-        oinfo.oi_md = lsm;
-        oinfo.oi_oa = obdo;
-        oinfo.oi_oa->o_oi = lsm->lsm_oi;
-        oinfo.oi_oa->o_mode = S_IFREG;
-        oinfo.oi_oa->o_ioepoch = ioepoch;
-        oinfo.oi_oa->o_valid = OBD_MD_FLID | OBD_MD_FLTYPE |
-                               OBD_MD_FLSIZE | OBD_MD_FLBLOCKS |
-                               OBD_MD_FLBLKSZ | OBD_MD_FLATIME |
-                               OBD_MD_FLMTIME | OBD_MD_FLCTIME |
-                               OBD_MD_FLGROUP | OBD_MD_FLEPOCH |
-                               OBD_MD_FLDATAVERSION;
-        if (dv_flags & (LL_DV_WR_FLUSH | LL_DV_RD_FLUSH)) {
-                oinfo.oi_oa->o_valid |= OBD_MD_FLFLAGS;
-                oinfo.oi_oa->o_flags |= OBD_FL_SRVLOCK;
-                if (dv_flags & LL_DV_WR_FLUSH)
-                        oinfo.oi_oa->o_flags |= OBD_FL_FLUSH;
-        }
-
-        set = ptlrpc_prep_set();
-        if (!set) {
-                CERROR("cannot allocate ptlrpc set: rc = %d\n", -ENOMEM);
-                rc = -ENOMEM;
-        } else {
-                rc = obd_getattr_async(exp, &oinfo, set);
-                if (rc == 0)
-                        rc = ptlrpc_set_wait(set);
-                ptlrpc_set_destroy(set);
-        }
-        if (rc == 0) {
-                oinfo.oi_oa->o_valid &= (OBD_MD_FLBLOCKS | OBD_MD_FLBLKSZ |
-                                         OBD_MD_FLATIME | OBD_MD_FLMTIME |
-                                         OBD_MD_FLCTIME | OBD_MD_FLSIZE |
-                                         OBD_MD_FLDATAVERSION | OBD_MD_FLFLAGS);
-                if (dv_flags & LL_DV_WR_FLUSH &&
-                    !(oinfo.oi_oa->o_valid & OBD_MD_FLFLAGS &&
-                      oinfo.oi_oa->o_flags & OBD_FL_FLUSH))
-                        return -ENOTSUPP;
-        }
-        return rc;
-}
-
-/**
-  * Performs the getattr on the inode and updates its fields.
-  * If @sync != 0, perform the getattr under the server-side lock.
-  */
-int ll_inode_getattr(struct inode *inode, struct obdo *obdo,
-                     __u64 ioepoch, int sync)
-{
-        struct lov_stripe_md *lsm;
-        int rc;
-
-        lsm = ccc_inode_lsm_get(inode);
-        rc = ll_lsm_getattr(lsm, ll_i2dtexp(inode),
-                            obdo, ioepoch, sync ? LL_DV_RD_FLUSH : 0);
-        if (rc == 0) {
-                struct ost_id *oi = lsm ? &lsm->lsm_oi : &obdo->o_oi;
-
-                obdo_refresh_inode(inode, obdo, obdo->o_valid);
-                CDEBUG(D_INODE, "objid " DOSTID " size %llu, blocks %llu, blksize %lu\n",
-                       POSTID(oi), i_size_read(inode),
-                       (unsigned long long)inode->i_blocks,
-                       1UL << inode->i_blkbits);
-        }
-        ccc_inode_lsm_put(inode, lsm);
-        return rc;
+                                         och, inode, 0, NULL);
 }
 
 int ll_merge_attr(const struct lu_env *env, struct inode *inode)
@@ -1043,23 +989,6 @@ out_size_unlock:
         return rc;
 }
 
-int ll_glimpse_ioctl(struct ll_sb_info *sbi, struct lov_stripe_md *lsm,
-                     lstat_t *st)
-{
-        struct obdo obdo = { 0 };
-        int rc;
-
-        rc = ll_lsm_getattr(lsm, sbi->ll_dt_exp, &obdo, 0, 0);
-        if (rc == 0) {
-                st->st_size   = obdo.o_size;
-                st->st_blocks = obdo.o_blocks;
-                st->st_mtime  = obdo.o_mtime;
-                st->st_atime  = obdo.o_atime;
-                st->st_ctime  = obdo.o_ctime;
-        }
-        return rc;
-}
-
 static bool file_is_noatime(const struct file *file)
 {
         const struct vfsmount *mnt = file->f_path.mnt;
@@ -1117,9 +1046,11 @@ ll_file_io_generic(const struct lu_env *env, struct vvp_io_args *args,
 {
         struct ll_inode_info *lli = ll_i2info(file_inode(file));
         struct ll_file_data  *fd  = LUSTRE_FPRIVATE(file);
+        struct vvp_io *vio = vvp_env_io(env);
         struct range_lock range;
         struct cl_io     *io;
-        ssize_t        result;
+        ssize_t result = 0;
+        int rc = 0;
 
         CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zu\n",
                file, iot, *ppos, count);
@@ -1151,18 +1082,15 @@ restart:
                         CDEBUG(D_VFSTRACE, "Range lock [%llu, %llu]\n",
                                range.rl_node.in_extent.start,
                                range.rl_node.in_extent.end);
-                        result = range_lock(&lli->lli_write_tree,
-                                            &range);
-                        if (result < 0)
+                        rc = range_lock(&lli->lli_write_tree, &range);
+                        if (rc < 0)
                                 goto out;
 
                         range_locked = true;
                 }
-                down_read(&lli->lli_trunc_sem);
                 ll_cl_add(file, env, io);
-                result = cl_io_loop(env, io);
+                rc = cl_io_loop(env, io);
                 ll_cl_remove(file, env);
-                up_read(&lli->lli_trunc_sem);
                 if (range_locked) {
                         CDEBUG(D_VFSTRACE, "Range unlock [%llu, %llu]\n",
                                range.rl_node.in_extent.start,
@@ -1171,24 +1099,26 @@ restart:
                 }
         } else {
                 /* cl_io_rw_init() handled IO */
-                result = io->ci_result;
+                rc = io->ci_result;
         }
 
         if (io->ci_nob > 0) {
                 result = io->ci_nob;
+                count -= io->ci_nob;
                 *ppos = io->u.ci_wr.wr.crw_pos;
+
+                /* prepare IO restart */
+                if (count > 0)
+                        args->u.normal.via_iter = vio->vui_iter;
         }
-        goto out;
 out:
         cl_io_fini(env, io);
-        /* If any bit been read/written (result != 0), we just return
-         * short read/write instead of restart io.
-         */
-        if ((result == 0 || result == -ENODATA) && io->ci_need_restart) {
-                CDEBUG(D_VFSTRACE, "Restart %s on %pD from %lld, count:%zu\n",
+
+        if ((!rc || rc == -ENODATA) && count > 0 && io->ci_need_restart) {
+                CDEBUG(D_VFSTRACE, "%s: restart %s from %lld, count:%zu, result: %zd\n",
+                       file_dentry(file)->d_name.name,
                        iot == CIT_READ ? "read" : "write",
-                       file, *ppos, count);
-                LASSERTF(io->ci_nob == 0, "%zd\n", io->ci_nob);
+                       *ppos, count, result);
                 goto restart;
         }
 
@@ -1201,13 +1131,19 @@ out:
                         ll_stats_ops_tally(ll_i2sbi(file_inode(file)),
                                            LPROC_LL_WRITE_BYTES, result);
                         fd->fd_write_failed = false;
-                } else if (result != -ERESTARTSYS) {
+                } else if (!result && !rc) {
+                        rc = io->ci_result;
+                        if (rc < 0)
+                                fd->fd_write_failed = true;
+                        else
+                                fd->fd_write_failed = false;
+                } else if (rc != -ERESTARTSYS) {
                         fd->fd_write_failed = true;
                 }
         }
         CDEBUG(D_VFSTRACE, "iot: %d, result: %zd\n", iot, result);
 
-        return result;
+        return result > 0 ? result : rc;
 }
 
 static ssize_t ll_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
@@ -1259,37 +1195,22 @@ int ll_lov_setstripe_ea_info(struct inode *inode, struct dentry *dentry,
                              __u64 flags, struct lov_user_md *lum,
                              int lum_size)
 {
-        struct lov_stripe_md *lsm = NULL;
         struct lookup_intent oit = {
                 .it_op = IT_OPEN,
                 .it_flags = flags | MDS_OPEN_BY_FID,
         };
         int rc = 0;
 
-        lsm = ccc_inode_lsm_get(inode);
-        if (lsm) {
-                ccc_inode_lsm_put(inode, lsm);
-                CDEBUG(D_IOCTL, "stripe already exists for inode "DFID"\n",
-                       PFID(ll_inode2fid(inode)));
-                rc = -EEXIST;
-                goto out;
-        }
-
         ll_inode_size_lock(inode);
         rc = ll_intent_file_open(dentry, lum, lum_size, &oit);
         if (rc < 0)
                 goto out_unlock;
-        rc = oit.it_status;
-        if (rc < 0)
-                goto out_unlock;
 
         ll_release_openhandle(inode, &oit);
 
 out_unlock:
         ll_inode_size_unlock(inode);
         ll_intent_release(&oit);
-        ccc_inode_lsm_put(inode, lsm);
-out:
         return rc;
 }
 
@@ -1566,7 +1487,7 @@ int ll_release_openhandle(struct inode *inode, struct lookup_intent *it)
         ll_och_fill(ll_i2sbi(inode)->ll_md_exp, it, och);
 
         rc = ll_close_inode_openhandle(ll_i2sbi(inode)->ll_md_exp,
-                                       inode, och, NULL);
+                                       och, inode, 0, NULL);
 out:
         /* this one is in place of ll_file_open */
         if (it_disposition(it, DISP_ENQ_OPEN_REF)) {
@@ -1579,15 +1500,17 @@ out:
 /**
  * Get size for inode for which FIEMAP mapping is requested.
  * Make the FIEMAP get_info call and returns the result.
+ *
+ * \param fiemap        kernel buffer to hold extens
+ * \param num_bytes     kernel buffer size
  */
-static int ll_do_fiemap(struct inode *inode, struct ll_user_fiemap *fiemap,
+static int ll_do_fiemap(struct inode *inode, struct fiemap *fiemap,
                         size_t num_bytes)
 {
-        struct obd_export *exp = ll_i2dtexp(inode);
-        struct lov_stripe_md *lsm = NULL;
-        struct ll_fiemap_info_key fm_key = { .name = KEY_FIEMAP, };
-        __u32 vallen = num_bytes;
-        int rc;
+        struct ll_fiemap_info_key fmkey = { .lfik_name = KEY_FIEMAP, };
+        struct lu_env *env;
+        int refcheck;
+        int rc = 0;
 
         /* Checks for fiemap flags */
         if (fiemap->fm_flags & ~LUSTRE_FIEMAP_FLAGS_COMPAT) {
@@ -1602,21 +1525,9 @@ static int ll_do_fiemap(struct inode *inode, struct ll_user_fiemap *fiemap,
                         return rc;
         }
 
-        lsm = ccc_inode_lsm_get(inode);
-        if (!lsm)
-                return -ENOENT;
-
-        /* If the stripe_count > 1 and the application does not understand
-         * DEVICE_ORDER flag, then it cannot interpret the extents correctly.
-         */
-        if (lsm->lsm_stripe_count > 1 &&
-            !(fiemap->fm_flags & FIEMAP_FLAG_DEVICE_ORDER)) {
-                rc = -EOPNOTSUPP;
-                goto out;
-        }
-
-        fm_key.oa.o_oi = lsm->lsm_oi;
-        fm_key.oa.o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
+        env = cl_env_get(&refcheck);
+        if (IS_ERR(env))
+                return PTR_ERR(env);
 
         if (i_size_read(inode) == 0) {
                 rc = ll_glimpse_size(inode);
@@ -1624,24 +1535,23 @@ static int ll_do_fiemap(struct inode *inode, struct ll_user_fiemap *fiemap,
                         goto out;
         }
 
-        obdo_from_inode(&fm_key.oa, inode, OBD_MD_FLSIZE);
-        obdo_set_parent_fid(&fm_key.oa, &ll_i2info(inode)->lli_fid);
+        fmkey.lfik_oa.o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
+        obdo_from_inode(&fmkey.lfik_oa, inode, OBD_MD_FLSIZE);
+        obdo_set_parent_fid(&fmkey.lfik_oa, &ll_i2info(inode)->lli_fid);
+
         /* If filesize is 0, then there would be no objects for mapping */
-        if (fm_key.oa.o_size == 0) {
+        if (fmkey.lfik_oa.o_size == 0) {
                 fiemap->fm_mapped_extents = 0;
                 rc = 0;
                 goto out;
         }
 
-        memcpy(&fm_key.fiemap, fiemap, sizeof(*fiemap));
-
-        rc = obd_get_info(NULL, exp, sizeof(fm_key), &fm_key, &vallen,
-                          fiemap, lsm);
-        if (rc)
-                CERROR("obd_get_info failed: rc = %d\n", rc);
+        memcpy(&fmkey.lfik_fiemap, fiemap, sizeof(*fiemap));
 
+        rc = cl_object_fiemap(env, ll_i2info(inode)->lli_clob,
+                              &fmkey, fiemap, &num_bytes);
 out:
-        ccc_inode_lsm_put(inode, lsm);
+        cl_env_put(env, &refcheck);
         return rc;
 }
 
@@ -1689,113 +1599,56 @@ gf_free:
         return rc;
 }
 
-static int ll_ioctl_fiemap(struct inode *inode, unsigned long arg)
-{
-        struct ll_user_fiemap *fiemap_s;
-        size_t num_bytes, ret_bytes;
-        unsigned int extent_count;
-        int rc = 0;
-
-        /* Get the extent count so we can calculate the size of
-         * required fiemap buffer
-         */
-        if (get_user(extent_count,
-                     &((struct ll_user_fiemap __user *)arg)->fm_extent_count))
-                return -EFAULT;
-
-        if (extent_count >=
-            (SIZE_MAX - sizeof(*fiemap_s)) / sizeof(struct ll_fiemap_extent))
-                return -EINVAL;
-        num_bytes = sizeof(*fiemap_s) + (extent_count *
-                                         sizeof(struct ll_fiemap_extent));
-
-        fiemap_s = libcfs_kvzalloc(num_bytes, GFP_NOFS);
-        if (!fiemap_s)
-                return -ENOMEM;
-
-        /* get the fiemap value */
-        if (copy_from_user(fiemap_s, (struct ll_user_fiemap __user *)arg,
-                           sizeof(*fiemap_s))) {
-                rc = -EFAULT;
-                goto error;
-        }
-
-        /* If fm_extent_count is non-zero, read the first extent since
-         * it is used to calculate end_offset and device from previous
-         * fiemap call.
-         */
-        if (extent_count) {
-                if (copy_from_user(&fiemap_s->fm_extents[0],
-                                   (char __user *)arg + sizeof(*fiemap_s),
-                                   sizeof(struct ll_fiemap_extent))) {
-                        rc = -EFAULT;
-                        goto error;
-                }
-        }
-
-        rc = ll_do_fiemap(inode, fiemap_s, num_bytes);
-        if (rc)
-                goto error;
-
-        ret_bytes = sizeof(struct ll_user_fiemap);
-
-        if (extent_count != 0)
-                ret_bytes += (fiemap_s->fm_mapped_extents *
-                                 sizeof(struct ll_fiemap_extent));
-
-        if (copy_to_user((void __user *)arg, fiemap_s, ret_bytes))
-                rc = -EFAULT;
-
-error:
-        kvfree(fiemap_s);
-        return rc;
-}
-
 /*
  * Read the data_version for inode.
  *
  * This value is computed using stripe object version on OST.
  * Version is computed using server side locking.
  *
- * @param sync  if do sync on the OST side;
+ * @param flags if do sync on the OST side;
  *              0: no sync
  *              LL_DV_RD_FLUSH: flush dirty pages, LCK_PR on OSTs
  *              LL_DV_WR_FLUSH: drop all caching pages, LCK_PW on OSTs
  */
 int ll_data_version(struct inode *inode, __u64 *data_version, int flags)
 {
-        struct lov_stripe_md    *lsm = NULL;
-        struct ll_sb_info       *sbi = ll_i2sbi(inode);
-        struct obdo             *obdo = NULL;
-        int                      rc;
+        struct cl_object *obj = ll_i2info(inode)->lli_clob;
+        struct lu_env *env;
+        struct cl_io *io;
+        int refcheck;
+        int result;
 
-        /* If no stripe, we consider version is 0. */
-        lsm = ccc_inode_lsm_get(inode);
-        if (!lsm_has_objects(lsm)) {
+        /* If no file object initialized, we consider its version is 0. */
+        if (!obj) {
                 *data_version = 0;
-                CDEBUG(D_INODE, "No object for inode\n");
-                rc = 0;
-                goto out;
+                return 0;
         }
 
-        obdo = kzalloc(sizeof(*obdo), GFP_NOFS);
-        if (!obdo) {
-                rc = -ENOMEM;
-                goto out;
-        }
+        env = cl_env_get(&refcheck);
+        if (IS_ERR(env))
+                return PTR_ERR(env);
 
-        rc = ll_lsm_getattr(lsm, sbi->ll_dt_exp, obdo, 0, flags);
-        if (rc == 0) {
-                if (!(obdo->o_valid & OBD_MD_FLDATAVERSION))
-                        rc = -EOPNOTSUPP;
-                else
-                        *data_version = obdo->o_data_version;
-        }
+        io = vvp_env_thread_io(env);
+        io->ci_obj = obj;
+        io->u.ci_data_version.dv_data_version = 0;
+        io->u.ci_data_version.dv_flags = flags;
 
-        kfree(obdo);
-out:
-        ccc_inode_lsm_put(inode, lsm);
-        return rc;
+restart:
+        if (!cl_io_init(env, io, CIT_DATA_VERSION, io->ci_obj))
+                result = cl_io_loop(env, io);
+        else
+                result = io->ci_result;
+
+        *data_version = io->u.ci_data_version.dv_data_version;
+
+        cl_io_fini(env, io);
+
+        if (unlikely(io->ci_need_restart))
+                goto restart;
+
+        cl_env_put(env, &refcheck);
+
+        return result;
 }
 
 /*
@@ -1803,11 +1656,11 @@ out:
  */
 int ll_hsm_release(struct inode *inode)
 {
-        struct cl_env_nest nest;
         struct lu_env *env;
         struct obd_client_handle *och = NULL;
         __u64 data_version = 0;
         int rc;
+        int refcheck;
 
         CDEBUG(D_INODE, "%s: Releasing file "DFID".\n",
                ll_get_fsname(inode->i_sb, NULL, 0),
@@ -1824,21 +1677,21 @@ int ll_hsm_release(struct inode *inode)
         if (rc != 0)
                 goto out;
 
-        env = cl_env_nested_get(&nest);
+        env = cl_env_get(&refcheck);
         if (IS_ERR(env)) {
                 rc = PTR_ERR(env);
                 goto out;
         }
 
         ll_merge_attr(env, inode);
-        cl_env_nested_put(&nest, env);
+        cl_env_put(env, &refcheck);
 
         /* Release the file.
          * NB: lease lock handle is released in mdc_hsm_release_pack() because
          * we still need it to pack l_remote_handle to MDT.
          */
-        rc = ll_close_inode_openhandle(ll_i2sbi(inode)->ll_md_exp, inode, och,
-                                       &data_version);
+        rc = ll_close_inode_openhandle(ll_i2sbi(inode)->ll_md_exp, och, inode,
+                                       MDS_HSM_RELEASE, &data_version);
         och = NULL;
 
 out:
@@ -1849,10 +1702,12 @@ out:
 }
 
 struct ll_swap_stack {
-        struct iattr             ia1, ia2;
-        __u64                    dv1, dv2;
-        struct inode            *inode1, *inode2;
-        bool                     check_dv1, check_dv2;
+        u64             dv1;
+        u64             dv2;
+        struct inode   *inode1;
+        struct inode   *inode2;
+        bool            check_dv1;
+        bool            check_dv2;
 };
 
 static int ll_swap_layouts(struct file *file1, struct file *file2,
@@ -1872,21 +1727,9 @@ static int ll_swap_layouts(struct file *file1, struct file *file2,
         llss->inode1 = file_inode(file1);
         llss->inode2 = file_inode(file2);
 
-        if (!S_ISREG(llss->inode2->i_mode)) {
-                rc = -EINVAL;
-                goto free;
-        }
-
-        if (inode_permission(llss->inode1, MAY_WRITE) ||
-            inode_permission(llss->inode2, MAY_WRITE)) {
-                rc = -EPERM;
+        rc = ll_check_swap_layouts_validity(llss->inode1, llss->inode2);
+        if (rc < 0)
                 goto free;
-        }
-
-        if (llss->inode2->i_sb != llss->inode1->i_sb) {
-                rc = -EXDEV;
-                goto free;
-        }
 
         /* we use 2 bool because it is easier to swap than 2 bits */
         if (lsl->sl_flags & SWAP_LAYOUTS_CHECK_DV1)
@@ -1900,10 +1743,8 @@ static int ll_swap_layouts(struct file *file1, struct file *file2,
         llss->dv2 = lsl->sl_dv2;
 
         rc = lu_fid_cmp(ll_inode2fid(llss->inode1), ll_inode2fid(llss->inode2));
-        if (rc == 0) /* same file, done! */ {
-                rc = 0;
+        if (!rc) /* same file, done! */
                 goto free;
-        }
 
         if (rc < 0) { /* sequentialize it */
                 swap(llss->inode1, llss->inode2);
@@ -1925,19 +1766,6 @@ static int ll_swap_layouts(struct file *file1, struct file *file2,
                 }
         }
 
-        /* to be able to restore mtime and atime after swap
-         * we need to first save them
-         */
-        if (lsl->sl_flags &
-            (SWAP_LAYOUTS_KEEP_MTIME | SWAP_LAYOUTS_KEEP_ATIME)) {
-                llss->ia1.ia_mtime = llss->inode1->i_mtime;
-                llss->ia1.ia_atime = llss->inode1->i_atime;
-                llss->ia1.ia_valid = ATTR_MTIME | ATTR_ATIME;
-                llss->ia2.ia_mtime = llss->inode2->i_mtime;
-                llss->ia2.ia_atime = llss->inode2->i_atime;
-                llss->ia2.ia_valid = ATTR_MTIME | ATTR_ATIME;
-        }
-
         /* ultimate check, before swapping the layouts we check if
          * dataversion has changed (if requested)
          */
@@ -1987,39 +1815,6 @@ putgl:
                 ll_put_grouplock(llss->inode1, file1, gid);
         }
 
-        /* rc can be set from obd_iocontrol() or from a GOTO(putgl, ...) */
-        if (rc != 0)
-                goto free;
-
-        /* clear useless flags */
-        if (!(lsl->sl_flags & SWAP_LAYOUTS_KEEP_MTIME)) {
-                llss->ia1.ia_valid &= ~ATTR_MTIME;
-                llss->ia2.ia_valid &= ~ATTR_MTIME;
-        }
-
-        if (!(lsl->sl_flags & SWAP_LAYOUTS_KEEP_ATIME)) {
-                llss->ia1.ia_valid &= ~ATTR_ATIME;
-                llss->ia2.ia_valid &= ~ATTR_ATIME;
-        }
-
-        /* update time if requested */
-        rc = 0;
-        if (llss->ia2.ia_valid != 0) {
-                inode_lock(llss->inode1);
-                rc = ll_setattr(file1->f_path.dentry, &llss->ia2);
-                inode_unlock(llss->inode1);
-        }
-
-        if (llss->ia1.ia_valid != 0) {
-                int rc1;
-
-                inode_lock(llss->inode2);
-                rc1 = ll_setattr(file2->f_path.dentry, &llss->ia1);
-                inode_unlock(llss->inode2);
-                if (rc == 0)
-                        rc = rc1;
-        }
-
 free:
         kfree(llss);
 
@@ -2176,24 +1971,52 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                    sizeof(struct lustre_swap_layouts)))
                         return -EFAULT;
 
-                if ((file->f_flags & O_ACCMODE) == 0) /* O_RDONLY */
+                if ((file->f_flags & O_ACCMODE) == O_RDONLY)
                         return -EPERM;
 
                 file2 = fget(lsl.sl_fd);
                 if (!file2)
                         return -EBADF;
 
-                rc = -EPERM;
-                if ((file2->f_flags & O_ACCMODE) != 0) /* O_WRONLY or O_RDWR */
+                /* O_WRONLY or O_RDWR */
+                if ((file2->f_flags & O_ACCMODE) == O_RDONLY) {
+                        rc = -EPERM;
+                        goto out;
+                }
+
+                if (lsl.sl_flags & SWAP_LAYOUTS_CLOSE) {
+                        struct obd_client_handle *och = NULL;
+                        struct ll_inode_info *lli;
+                        struct inode *inode2;
+
+                        if (lsl.sl_flags != SWAP_LAYOUTS_CLOSE) {
+                                rc = -EINVAL;
+                                goto out;
+                        }
+
+                        lli = ll_i2info(inode);
+                        mutex_lock(&lli->lli_och_mutex);
+                        if (fd->fd_lease_och) {
+                                och = fd->fd_lease_och;
+                                fd->fd_lease_och = NULL;
+                        }
+                        mutex_unlock(&lli->lli_och_mutex);
+                        if (!och) {
+                                rc = -ENOLCK;
+                                goto out;
+                        }
+                        inode2 = file_inode(file2);
+                        rc = ll_swap_layouts_close(och, inode, inode2);
+                } else {
                         rc = ll_swap_layouts(file, file2, &lsl);
+                }
+out:
                 fput(file2);
                 return rc;
         }
         case LL_IOC_LOV_GETSTRIPE:
                 return ll_file_getstripe(inode,
                                          (struct lov_user_md __user *)arg);
-        case FSFILT_IOC_FIEMAP:
-                return ll_ioctl_fiemap(inode, arg);
         case FSFILT_IOC_GETFLAGS:
         case FSFILT_IOC_SETFLAGS:
                 return ll_iocontrol(inode, file, cmd, arg);
@@ -2489,17 +2312,17 @@ static int ll_flush(struct file *file, fl_owner_t id)
 int cl_sync_file_range(struct inode *inode, loff_t start, loff_t end,
                        enum cl_fsync_mode mode, int ignore_layout)
 {
-        struct cl_env_nest nest;
         struct lu_env *env;
         struct cl_io *io;
         struct cl_fsync_io *fio;
         int result;
+        int refcheck;
 
         if (mode != CL_FSYNC_NONE && mode != CL_FSYNC_LOCAL &&
             mode != CL_FSYNC_DISCARD && mode != CL_FSYNC_ALL)
                 return -EINVAL;
 
-        env = cl_env_nested_get(&nest);
+        env = cl_env_get(&refcheck);
         if (IS_ERR(env))
                 return PTR_ERR(env);
 
@@ -2522,7 +2345,7 @@ int cl_sync_file_range(struct inode *inode, loff_t start, loff_t end,
         if (result == 0)
                 result = fio->fi_nr_written;
         cl_io_fini(env, io);
-        cl_env_nested_put(&nest, env);
+        cl_env_put(env, &refcheck);
 
         return result;
 }
@@ -2549,9 +2372,11 @@ int ll_fsync(struct file *file, loff_t start, loff_t end, int datasync)
                 lli->lli_async_rc = 0;
                 if (rc == 0)
                         rc = err;
-                err = lov_read_and_clear_async_rc(lli->lli_clob);
-                if (rc == 0)
-                        rc = err;
+                if (lli->lli_clob) {
+                        err = lov_read_and_clear_async_rc(lli->lli_clob);
+                        if (rc == 0)
+                                rc = err;
+                }
         }
 
         err = md_sync(ll_i2sbi(inode)->ll_md_exp, ll_inode2fid(inode), &req);
@@ -2588,7 +2413,7 @@ ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock)
         };
         struct md_op_data *op_data;
         struct lustre_handle lockh = {0};
-        ldlm_policy_data_t flock = { {0} };
+        union ldlm_policy_data flock = { { 0 } };
         int fl_type = file_lock->fl_type;
         __u64 flags = 0;
         int rc;
@@ -2707,7 +2532,8 @@ ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock)
 }
 
 int ll_get_fid_by_name(struct inode *parent, const char *name,
-                       int namelen, struct lu_fid *fid)
+                       int namelen, struct lu_fid *fid,
+                       struct inode **inode)
 {
         struct md_op_data *op_data = NULL;
         struct ptlrpc_request *req;
@@ -2719,7 +2545,7 @@ int ll_get_fid_by_name(struct inode *parent, const char *name,
         if (IS_ERR(op_data))
                 return PTR_ERR(op_data);
 
-        op_data->op_valid = OBD_MD_FLID;
+        op_data->op_valid = OBD_MD_FLID | OBD_MD_FLTYPE;
         rc = md_getattr_name(ll_i2sbi(parent)->ll_md_exp, op_data, &req);
         ll_finish_md_op_data(op_data);
         if (rc < 0)
@@ -2732,6 +2558,9 @@ int ll_get_fid_by_name(struct inode *parent, const char *name,
         }
         if (fid)
                 *fid = body->mbo_fid1;
+
+        if (inode)
+                rc = ll_prep_inode(inode, req, parent->i_sb, NULL);
 out_req:
         ptlrpc_req_finished(req);
         return rc;
@@ -2741,9 +2570,12 @@ int ll_migrate(struct inode *parent, struct file *file, int mdtidx,
                const char *name, int namelen)
 {
         struct ptlrpc_request *request = NULL;
+        struct obd_client_handle *och = NULL;
         struct inode *child_inode = NULL;
         struct dentry *dchild = NULL;
         struct md_op_data *op_data;
+        struct mdt_body *body;
+        u64 data_version = 0;
         struct qstr qstr;
         int rc;
 
@@ -2762,22 +2594,25 @@ int ll_migrate(struct inode *parent, struct file *file, int mdtidx,
         dchild = d_lookup(file_dentry(file), &qstr);
         if (dchild) {
                 op_data->op_fid3 = *ll_inode2fid(dchild->d_inode);
-                if (dchild->d_inode) {
+                if (dchild->d_inode)
                         child_inode = igrab(dchild->d_inode);
-                        if (child_inode) {
-                                inode_lock(child_inode);
-                                op_data->op_fid3 = *ll_inode2fid(child_inode);
-                                ll_invalidate_aliases(child_inode);
-                        }
-                }
                 dput(dchild);
-        } else {
+        }
+
+        if (!child_inode) {
                 rc = ll_get_fid_by_name(parent, name, namelen,
-                                        &op_data->op_fid3);
+                                        &op_data->op_fid3, &child_inode);
                 if (rc)
                         goto out_free;
         }
 
+        if (!child_inode) {
+                rc = -EINVAL;
+                goto out_free;
+        }
+
+        inode_lock(child_inode);
+        op_data->op_fid3 = *ll_inode2fid(child_inode);
         if (!fid_is_sane(&op_data->op_fid3)) {
                 CERROR("%s: migrate %s, but fid "DFID" is insane\n",
                        ll_get_fsname(parent->i_sb, NULL, 0), name,
@@ -2796,6 +2631,26 @@ int ll_migrate(struct inode *parent, struct file *file, int mdtidx,
                 rc = 0;
                 goto out_free;
         }
+again:
+        if (S_ISREG(child_inode->i_mode)) {
+                och = ll_lease_open(child_inode, NULL, FMODE_WRITE, 0);
+                if (IS_ERR(och)) {
+                        rc = PTR_ERR(och);
+                        och = NULL;
+                        goto out_free;
+                }
+
+                rc = ll_data_version(child_inode, &data_version,
+                                     LL_DV_WR_FLUSH);
+                if (rc)
+                        goto out_free;
+
+                op_data->op_handle = och->och_fh;
+                op_data->op_data = och->och_mod;
+                op_data->op_data_version = data_version;
+                op_data->op_lease_handle = och->och_lease_handle;
+                op_data->op_bias |= MDS_RENAME_MIGRATE;
+        }
 
         op_data->op_mds = mdtidx;
         op_data->op_cli_flags = CLI_MIGRATE;
@@ -2804,10 +2659,32 @@ int ll_migrate(struct inode *parent, struct file *file, int mdtidx,
         if (!rc)
                 ll_update_times(request, parent);
 
-        ptlrpc_req_finished(request);
+        body = req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY);
+        if (!body) {
+                rc = -EPROTO;
+                goto out_free;
+        }
+
+        /*
+         * If the server does release layout lock, then we cleanup
+         * the client och here, otherwise release it in out_free:
+         */
+        if (och && body->mbo_valid & OBD_MD_CLOSE_INTENT_EXECED) {
+                obd_mod_put(och->och_mod);
+                md_clear_open_replay_data(ll_i2sbi(parent)->ll_md_exp, och);
+                och->och_fh.cookie = DEAD_HANDLE_MAGIC;
+                kfree(och);
+                och = NULL;
+        }
 
+        ptlrpc_req_finished(request);
+        /* Try again if the file layout has changed. */
+        if (rc == -EAGAIN && S_ISREG(child_inode->i_mode))
+                goto again;
 out_free:
         if (child_inode) {
+                if (och) /* close the file */
+                        ll_lease_close(och, child_inode, NULL);
                 clear_nlink(child_inode);
                 inode_unlock(child_inode);
                 iput(child_inode);
@@ -2837,7 +2714,7 @@ int ll_have_md_lock(struct inode *inode, __u64 *bits,
                     enum ldlm_mode l_req_mode)
 {
         struct lustre_handle lockh;
-        ldlm_policy_data_t policy;
+        union ldlm_policy_data policy;
         enum ldlm_mode mode = (l_req_mode == LCK_MINMODE) ?
                               (LCK_CR | LCK_CW | LCK_PR | LCK_PW) : l_req_mode;
         struct lu_fid *fid;
@@ -2878,7 +2755,7 @@ enum ldlm_mode ll_take_md_lock(struct inode *inode, __u64 bits,
                                struct lustre_handle *lockh, __u64 flags,
                                enum ldlm_mode mode)
 {
-        ldlm_policy_data_t policy = { .l_inodebits = {bits} };
+        union ldlm_policy_data policy = { .l_inodebits = { bits } };
         struct lu_fid *fid;
 
         fid = &ll_i2info(inode)->lli_fid;
@@ -2893,6 +2770,13 @@ static int ll_inode_revalidate_fini(struct inode *inode, int rc)
         /* Already unlinked. Just update nlink and return success */
         if (rc == -ENOENT) {
                 clear_nlink(inode);
+                /* If it is striped directory, and there is bad stripe
+                 * Let's revalidate the dentry again, instead of returning
+                 * error
+                 */
+                if (S_ISDIR(inode->i_mode) && ll_i2info(inode)->lli_lsm_md)
+                        return 0;
+
                 /* This path cannot be hit for regular files unless in
                  * case of obscure races, so no need to validate size.
                  */
@@ -3040,6 +2924,8 @@ static int ll_inode_revalidate(struct dentry *dentry, __u64 ibits)
                 LTIME_S(inode->i_mtime) = ll_i2info(inode)->lli_mtime;
                 LTIME_S(inode->i_ctime) = ll_i2info(inode)->lli_ctime;
         } else {
+                struct ll_inode_info *lli = ll_i2info(inode);
+
                 /* In case of restore, the MDT has the right size and has
                  * already send it back without granting the layout lock,
                  * inode is up-to-date so glimpse is useless.
@@ -3047,7 +2933,7 @@ static int ll_inode_revalidate(struct dentry *dentry, __u64 ibits)
                  * restore the MDT holds the layout lock so the glimpse will
                  * block up to the end of restore (getattr will block)
                  */
-                if (!(ll_i2info(inode)->lli_flags & LLIF_FILE_RESTORING))
+                if (!test_bit(LLIF_FILE_RESTORING, &lli->lli_flags))
                         rc = ll_glimpse_size(inode);
         }
         return rc;
@@ -3095,13 +2981,12 @@ static int ll_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 {
         int rc;
         size_t num_bytes;
-        struct ll_user_fiemap *fiemap;
+        struct fiemap *fiemap;
         unsigned int extent_count = fieinfo->fi_extents_max;
 
         num_bytes = sizeof(*fiemap) + (extent_count *
-                                       sizeof(struct ll_fiemap_extent));
+                                       sizeof(struct fiemap_extent));
         fiemap = libcfs_kvzalloc(num_bytes, GFP_NOFS);
-
         if (!fiemap)
                 return -ENOMEM;
 
@@ -3109,9 +2994,10 @@ static int ll_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
         fiemap->fm_extent_count = fieinfo->fi_extents_max;
         fiemap->fm_start = start;
         fiemap->fm_length = len;
+
         if (extent_count > 0 &&
             copy_from_user(&fiemap->fm_extents[0], fieinfo->fi_extents_start,
-                           sizeof(struct ll_fiemap_extent)) != 0) {
+                           sizeof(struct fiemap_extent))) {
                 rc = -EFAULT;
                 goto out;
         }
@@ -3123,11 +3009,10 @@ static int ll_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
         if (extent_count > 0 &&
             copy_to_user(fieinfo->fi_extents_start, &fiemap->fm_extents[0],
                          fiemap->fm_mapped_extents *
-                         sizeof(struct ll_fiemap_extent)) != 0) {
+                         sizeof(struct fiemap_extent))) {
                 rc = -EFAULT;
                 goto out;
         }
-
 out:
         kvfree(fiemap);
         return rc;
@@ -3370,35 +3255,50 @@ ll_iocontrol_call(struct inode *inode, struct file *file,
 int ll_layout_conf(struct inode *inode, const struct cl_object_conf *conf)
 {
         struct ll_inode_info *lli = ll_i2info(inode);
-        struct cl_env_nest nest;
+        struct cl_object *obj = lli->lli_clob;
         struct lu_env *env;
-        int result;
+        int rc;
+        int refcheck;
 
-        if (!lli->lli_clob)
+        if (!obj)
                 return 0;
 
-        env = cl_env_nested_get(&nest);
+        env = cl_env_get(&refcheck);
         if (IS_ERR(env))
                 return PTR_ERR(env);
 
-        result = cl_conf_set(env, lli->lli_clob, conf);
-        cl_env_nested_put(&nest, env);
+        rc = cl_conf_set(env, obj, conf);
+        if (rc < 0)
+                goto out;
 
         if (conf->coc_opc == OBJECT_CONF_SET) {
                 struct ldlm_lock *lock = conf->coc_lock;
+                struct cl_layout cl = {
+                        .cl_layout_gen = 0,
+                };
 
                 LASSERT(lock);
                 LASSERT(ldlm_has_layout(lock));
-                if (result == 0) {
-                        /* it can only be allowed to match after layout is
-                         * applied to inode otherwise false layout would be
-                         * seen. Applying layout should happen before dropping
-                         * the intent lock.
-                         */
-                        ldlm_lock_allow_match(lock);
-                }
+
+                /* it can only be allowed to match after layout is
+                 * applied to inode otherwise false layout would be
+                 * seen. Applying layout should happen before dropping
+                 * the intent lock.
+                 */
+                ldlm_lock_allow_match(lock);
+
+                rc = cl_object_layout_get(env, obj, &cl);
+                if (rc < 0)
+                        goto out;
+
+                CDEBUG(D_VFSTRACE, DFID ": layout version change: %u -> %u\n",
+                       PFID(&lli->lli_fid), ll_layout_version_get(lli),
+                       cl.cl_layout_gen);
+                ll_layout_version_set(lli, cl.cl_layout_gen);
         }
-        return result;
+out:
+        cl_env_put(env, &refcheck);
+        return rc;
 }
 
 /* Fetch layout from MDT with getxattr request, if it's not ready yet */
@@ -3477,12 +3377,11 @@ out:
  * in this function.
  */
 static int ll_layout_lock_set(struct lustre_handle *lockh, enum ldlm_mode mode,
-                              struct inode *inode, __u32 *gen, bool reconf)
+                              struct inode *inode)
 {
         struct ll_inode_info *lli = ll_i2info(inode);
         struct ll_sb_info    *sbi = ll_i2sbi(inode);
         struct ldlm_lock *lock;
-        struct lustre_md md = { NULL };
         struct cl_object_conf conf;
         int rc = 0;
         bool lvb_ready;
@@ -3494,8 +3393,8 @@ static int ll_layout_lock_set(struct lustre_handle *lockh, enum ldlm_mode mode,
         LASSERT(lock);
         LASSERT(ldlm_has_layout(lock));
 
-        LDLM_DEBUG(lock, "File "DFID"(%p) being reconfigured: %d",
-                   PFID(&lli->lli_fid), inode, reconf);
+        LDLM_DEBUG(lock, "File " DFID "(%p) being reconfigured",
+                   PFID(&lli->lli_fid), inode);
 
         /* in case this is a caching lock and reinstate with new inode */
         md_set_lock_data(sbi->ll_md_exp, lockh, inode, NULL);
@@ -3506,15 +3405,8 @@ static int ll_layout_lock_set(struct lustre_handle *lockh, enum ldlm_mode mode,
         /* checking lvb_ready is racy but this is okay. The worst case is
          * that multi processes may configure the file on the same time.
          */
-        if (lvb_ready || !reconf) {
-                rc = -ENODATA;
-                if (lvb_ready) {
-                        /* layout_gen must be valid if layout lock is not
-                         * cancelled and stripe has already set
-                         */
-                        *gen = ll_layout_version_get(lli);
-                        rc = 0;
-                }
+        if (lvb_ready) {
+                rc = 0;
                 goto out;
         }
 
@@ -3524,39 +3416,19 @@ static int ll_layout_lock_set(struct lustre_handle *lockh, enum ldlm_mode mode,
 
         /* for layout lock, lmm is returned in lock's lvb.
          * lvb_data is immutable if the lock is held so it's safe to access it
-         * without res lock. See the description in ldlm_lock_decref_internal()
-         * for the condition to free lvb_data of layout lock
-         */
-        if (lock->l_lvb_data) {
-                rc = obd_unpackmd(sbi->ll_dt_exp, &md.lsm,
-                                  lock->l_lvb_data, lock->l_lvb_len);
-                if (rc >= 0) {
-                        *gen = LL_LAYOUT_GEN_EMPTY;
-                        if (md.lsm)
-                                *gen = md.lsm->lsm_layout_gen;
-                        rc = 0;
-                } else {
-                        CERROR("%s: file " DFID " unpackmd error: %d\n",
-                               ll_get_fsname(inode->i_sb, NULL, 0),
-                               PFID(&lli->lli_fid), rc);
-                }
-        }
-        if (rc < 0)
-                goto out;
-
-        /* set layout to file. Unlikely this will fail as old layout was
+         * without res lock.
+         *
+         * set layout to file. Unlikely this will fail as old layout was
          * surely eliminated
          */
         memset(&conf, 0, sizeof(conf));
         conf.coc_opc = OBJECT_CONF_SET;
         conf.coc_inode = inode;
         conf.coc_lock = lock;
-        conf.u.coc_md = &md;
+        conf.u.coc_layout.lb_buf = lock->l_lvb_data;
+        conf.u.coc_layout.lb_len = lock->l_lvb_len;
         rc = ll_layout_conf(inode, &conf);
 
-        if (md.lsm)
-                obd_free_memmd(sbi->ll_dt_exp, &md.lsm);
-
         /* refresh layout failed, need to wait */
         wait_layout = rc == -EBUSY;
 
@@ -3584,20 +3456,7 @@ out:
         return rc;
 }
 
-/**
- * This function checks if there exists a LAYOUT lock on the client side,
- * or enqueues it if it doesn't have one in cache.
- *
- * This function will not hold layout lock so it may be revoked any time after
- * this function returns. Any operations depend on layout should be redone
- * in that case.
- *
- * This function should be called before lov_io_init() to get an uptodate
- * layout version, the caller should save the version number and after IO
- * is finished, this function should be called again to verify that layout
- * is not changed during IO time.
- */
-int ll_layout_refresh(struct inode *inode, __u32 *gen)
+static int ll_layout_refresh_locked(struct inode *inode)
 {
         struct ll_inode_info  *lli = ll_i2info(inode);
         struct ll_sb_info     *sbi = ll_i2sbi(inode);
@@ -3613,17 +3472,6 @@ int ll_layout_refresh(struct inode *inode, __u32 *gen)
         };
         int rc;
 
-        *gen = ll_layout_version_get(lli);
-        if (!(sbi->ll_flags & LL_SBI_LAYOUT_LOCK) || *gen != LL_LAYOUT_GEN_NONE)
-                return 0;
-
-        /* sanity checks */
-        LASSERT(fid_is_sane(ll_inode2fid(inode)));
-        LASSERT(S_ISREG(inode->i_mode));
-
-        /* take layout lock mutex to enqueue layout lock exclusively. */
-        mutex_lock(&lli->lli_layout_mutex);
-
 again:
         /* mostly layout lock is caching on the local side, so try to match
          * it before grabbing layout lock mutex.
@@ -3631,20 +3479,16 @@ again:
         mode = ll_take_md_lock(inode, MDS_INODELOCK_LAYOUT, &lockh, 0,
                                LCK_CR | LCK_CW | LCK_PR | LCK_PW);
         if (mode != 0) { /* hit cached lock */
-                rc = ll_layout_lock_set(&lockh, mode, inode, gen, true);
+                rc = ll_layout_lock_set(&lockh, mode, inode);
                 if (rc == -EAGAIN)
                         goto again;
-
-                mutex_unlock(&lli->lli_layout_mutex);
                 return rc;
         }
 
         op_data = ll_prep_md_op_data(NULL, inode, inode, NULL,
                                      0, 0, LUSTRE_OPC_ANY, NULL);
-        if (IS_ERR(op_data)) {
-                mutex_unlock(&lli->lli_layout_mutex);
+        if (IS_ERR(op_data))
                 return PTR_ERR(op_data);
-        }
 
         /* have to enqueue one */
         memset(&it, 0, sizeof(it));
@@ -3668,10 +3512,50 @@ again:
         if (rc == 0) {
                 /* set lock data in case this is a new lock */
                 ll_set_lock_data(sbi->ll_md_exp, inode, &it, NULL);
-                rc = ll_layout_lock_set(&lockh, mode, inode, gen, true);
+                rc = ll_layout_lock_set(&lockh, mode, inode);
                 if (rc == -EAGAIN)
                         goto again;
         }
+
+        return rc;
+}
+
+/**
+ * This function checks if there exists a LAYOUT lock on the client side,
+ * or enqueues it if it doesn't have one in cache.
+ *
+ * This function will not hold layout lock so it may be revoked any time after
+ * this function returns. Any operations depend on layout should be redone
+ * in that case.
+ *
+ * This function should be called before lov_io_init() to get an uptodate
+ * layout version, the caller should save the version number and after IO
+ * is finished, this function should be called again to verify that layout
+ * is not changed during IO time.
+ */
+int ll_layout_refresh(struct inode *inode, __u32 *gen)
+{
+        struct ll_inode_info *lli = ll_i2info(inode);
+        struct ll_sb_info *sbi = ll_i2sbi(inode);
+        int rc;
+
+        *gen = ll_layout_version_get(lli);
+        if (!(sbi->ll_flags & LL_SBI_LAYOUT_LOCK) || *gen != CL_LAYOUT_GEN_NONE)
+                return 0;
+
+        /* sanity checks */
+        LASSERT(fid_is_sane(ll_inode2fid(inode)));
+        LASSERT(S_ISREG(inode->i_mode));
+
+        /* take layout lock mutex to enqueue layout lock exclusively. */
+        mutex_lock(&lli->lli_layout_mutex);
+
+        rc = ll_layout_refresh_locked(inode);
+        if (rc < 0)
+                goto out;
+
+        *gen = ll_layout_version_get(lli);
+out:
         mutex_unlock(&lli->lli_layout_mutex);
 
         return rc;
diff --git a/drivers/staging/lustre/lustre/llite/glimpse.c b/drivers/staging/lustre/lustre/llite/glimpse.c
index 22507b9c6d69..504498de536e 100644
--- a/drivers/staging/lustre/lustre/llite/glimpse.c
+++ b/drivers/staging/lustre/lustre/llite/glimpse.c
@@ -80,69 +80,60 @@ blkcnt_t dirty_cnt(struct inode *inode)
 int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,
                     struct inode *inode, struct cl_object *clob, int agl)
 {
-        struct ll_inode_info *lli   = ll_i2info(inode);
         const struct lu_fid  *fid   = lu_object_fid(&clob->co_lu);
-        int result;
+        struct cl_lock *lock = vvp_env_lock(env);
+        struct cl_lock_descr *descr = &lock->cll_descr;
+        int result = 0;
+
+        CDEBUG(D_DLMTRACE, "Glimpsing inode " DFID "\n", PFID(fid));
+
+        /* NOTE: this looks like DLM lock request, but it may
+         *       not be one. Due to CEF_ASYNC flag (translated
+         *       to LDLM_FL_HAS_INTENT by osc), this is
+         *       glimpse request, that won't revoke any
+         *       conflicting DLM locks held. Instead,
+         *       ll_glimpse_callback() will be called on each
+         *       client holding a DLM lock against this file,
+         *       and resulting size will be returned for each
+         *       stripe. DLM lock on [0, EOF] is acquired only
+         *       if there were no conflicting locks. If there
+         *       were conflicting locks, enqueuing or waiting
+         *       fails with -ENAVAIL, but valid inode
+         *       attributes are returned anyway.
+         */
+        *descr = whole_file;
+        descr->cld_obj = clob;
+        descr->cld_mode = CLM_READ;
+        descr->cld_enq_flags = CEF_ASYNC | CEF_MUST;
+        if (agl)
+                descr->cld_enq_flags |= CEF_AGL;
+        /*
+         * CEF_ASYNC is used because glimpse sub-locks cannot
+         * deadlock (because they never conflict with other
+         * locks) and, hence, can be enqueued out-of-order.
+         *
+         * CEF_MUST protects glimpse lock from conversion into
+         * a lockless mode.
+         */
+        result = cl_lock_request(env, io, lock);
+        if (result < 0)
+                return result;
 
-        result = 0;
-        if (!(lli->lli_flags & LLIF_MDS_SIZE_LOCK)) {
-                CDEBUG(D_DLMTRACE, "Glimpsing inode " DFID "\n", PFID(fid));
-                if (lli->lli_has_smd) {
-                        struct cl_lock *lock = vvp_env_lock(env);
-                        struct cl_lock_descr *descr = &lock->cll_descr;
-
-                        /* NOTE: this looks like DLM lock request, but it may
-                         *       not be one. Due to CEF_ASYNC flag (translated
-                         *       to LDLM_FL_HAS_INTENT by osc), this is
-                         *       glimpse request, that won't revoke any
-                         *       conflicting DLM locks held. Instead,
-                         *       ll_glimpse_callback() will be called on each
-                         *       client holding a DLM lock against this file,
-                         *       and resulting size will be returned for each
-                         *       stripe. DLM lock on [0, EOF] is acquired only
-                         *       if there were no conflicting locks. If there
-                         *       were conflicting locks, enqueuing or waiting
-                         *       fails with -ENAVAIL, but valid inode
-                         *       attributes are returned anyway.
-                         */
-                        *descr = whole_file;
-                        descr->cld_obj   = clob;
-                        descr->cld_mode  = CLM_READ;
-                        descr->cld_enq_flags = CEF_ASYNC | CEF_MUST;
-                        if (agl)
-                                descr->cld_enq_flags |= CEF_AGL;
+        if (!agl) {
+                ll_merge_attr(env, inode);
+                if (i_size_read(inode) > 0 && !inode->i_blocks) {
                         /*
-                         * CEF_ASYNC is used because glimpse sub-locks cannot
-                         * deadlock (because they never conflict with other
-                         * locks) and, hence, can be enqueued out-of-order.
-                         *
-                         * CEF_MUST protects glimpse lock from conversion into
-                         * a lockless mode.
+                         * LU-417: Add dirty pages block count
+                         * lest i_blocks reports 0, some "cp" or
+                         * "tar" may think it's a completely
+                         * sparse file and skip it.
                          */
-                        result = cl_lock_request(env, io, lock);
-                        if (result < 0)
-                                return result;
-
-                        if (!agl) {
-                                ll_merge_attr(env, inode);
-                                if (i_size_read(inode) > 0 &&
-                                    inode->i_blocks == 0) {
-                                        /*
-                                         * LU-417: Add dirty pages block count
-                                         * lest i_blocks reports 0, some "cp" or
-                                         * "tar" may think it's a completely
-                                         * sparse file and skip it.
-                                         */
-                                        inode->i_blocks = dirty_cnt(inode);
-                                }
-                        }
-                        cl_lock_release(env, lock);
-                } else {
-                        CDEBUG(D_DLMTRACE, "No objects for inode\n");
-                        ll_merge_attr(env, inode);
+                        inode->i_blocks = dirty_cnt(inode);
                 }
         }
 
+        cl_lock_release(env, lock);
+
         return result;
 }
 
@@ -212,39 +203,3 @@ again:
         }
         return result;
 }
-
-int cl_local_size(struct inode *inode)
-{
-        struct lu_env      *env = NULL;
-        struct cl_io        *io  = NULL;
-        struct cl_object        *clob;
-        int                   result;
-        int                   refcheck;
-
-        if (!ll_i2info(inode)->lli_has_smd)
-                return 0;
-
-        result = cl_io_get(inode, &env, &io, &refcheck);
-        if (result <= 0)
-                return result;
-
-        clob = io->ci_obj;
-        result = cl_io_init(env, io, CIT_MISC, clob);
-        if (result > 0) {
-                result = io->ci_result;
-        } else if (result == 0) {
-                struct cl_lock *lock = vvp_env_lock(env);
-
-                lock->cll_descr = whole_file;
-                lock->cll_descr.cld_enq_flags = CEF_PEEK;
-                lock->cll_descr.cld_obj = clob;
-                result = cl_lock_request(env, io, lock);
-                if (result == 0) {
-                        ll_merge_attr(env, inode);
-                        cl_lock_release(env, lock);
-                }
-        }
-        cl_io_fini(env, io);
-        cl_env_put(env, &refcheck);
-        return result;
-}
diff --git a/drivers/staging/lustre/lustre/llite/lcommon_cl.c b/drivers/staging/lustre/lustre/llite/lcommon_cl.c
index 084330d08f7a..dd1cfd8f5213 100644
--- a/drivers/staging/lustre/lustre/llite/lcommon_cl.c
+++ b/drivers/staging/lustre/lustre/llite/lcommon_cl.c
@@ -80,7 +80,8 @@ int cl_inode_fini_refcheck;
  */
 static DEFINE_MUTEX(cl_inode_fini_guard);
 
-int cl_setattr_ost(struct inode *inode, const struct iattr *attr)
+int cl_setattr_ost(struct cl_object *obj, const struct iattr *attr,
+                   unsigned int attr_flags)
 {
         struct lu_env *env;
         struct cl_io  *io;
@@ -92,14 +93,15 @@ int cl_setattr_ost(struct inode *inode, const struct iattr *attr)
                 return PTR_ERR(env);
 
         io = vvp_env_thread_io(env);
-        io->ci_obj = ll_i2info(inode)->lli_clob;
+        io->ci_obj = obj;
 
         io->u.ci_setattr.sa_attr.lvb_atime = LTIME_S(attr->ia_atime);
         io->u.ci_setattr.sa_attr.lvb_mtime = LTIME_S(attr->ia_mtime);
         io->u.ci_setattr.sa_attr.lvb_ctime = LTIME_S(attr->ia_ctime);
         io->u.ci_setattr.sa_attr.lvb_size = attr->ia_size;
+        io->u.ci_setattr.sa_attr_flags = attr_flags;
         io->u.ci_setattr.sa_valid = attr->ia_valid;
-        io->u.ci_setattr.sa_parent_fid = ll_inode2fid(inode);
+        io->u.ci_setattr.sa_parent_fid = lu_object_fid(&obj->co_lu);
 
 again:
         if (cl_io_init(env, io, CIT_SETATTR, io->ci_obj) == 0) {
@@ -148,7 +150,7 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md)
         struct cl_object_conf conf = {
                 .coc_inode = inode,
                 .u = {
-                        .coc_md    = md
+                        .coc_layout = md->layout,
                 }
         };
         int result = 0;
@@ -182,7 +184,6 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md)
                          * locked by I_NEW bit.
                          */
                         lli->lli_clob = clob;
-                        lli->lli_has_smd = lsm_has_objects(md->lsm);
                         lu_object_ref_add(&clob->co_lu, "inode", inode);
                 } else {
                         result = PTR_ERR(clob);
@@ -245,15 +246,11 @@ void cl_inode_fini(struct inode *inode)
         int emergency;
 
         if (clob) {
-                void                *cookie;
-
-                cookie = cl_env_reenter();
                 env = cl_env_get(&refcheck);
                 emergency = IS_ERR(env);
                 if (emergency) {
                         mutex_lock(&cl_inode_fini_guard);
                         LASSERT(cl_inode_fini_env);
-                        cl_env_implant(cl_inode_fini_env, &refcheck);
                         env = cl_inode_fini_env;
                 }
                 /*
@@ -265,13 +262,10 @@ void cl_inode_fini(struct inode *inode)
                 lu_object_ref_del(&clob->co_lu, "inode", inode);
                 cl_object_put_last(env, clob);
                 lli->lli_clob = NULL;
-                if (emergency) {
-                        cl_env_unplant(cl_inode_fini_env, &refcheck);
+                if (emergency)
                         mutex_unlock(&cl_inode_fini_guard);
-                } else {
+                else
                         cl_env_put(env, &refcheck);
-                }
-                cl_env_reexit(cookie);
         }
 }
 
@@ -302,22 +296,3 @@ __u32 cl_fid_build_gen(const struct lu_fid *fid)
         gen = fid_flatten(fid) >> 32;
         return gen;
 }
-
-/* lsm is unreliable after hsm implementation as layout can be changed at
- * any time. This is only to support old, non-clio-ized interfaces. It will
- * cause deadlock if clio operations are called with this extra layout refcount
- * because in case the layout changed during the IO, ll_layout_refresh() will
- * have to wait for the refcount to become zero to destroy the older layout.
- *
- * Notice that the lsm returned by this function may not be valid unless called
- * inside layout lock - MDS_INODELOCK_LAYOUT.
- */
-struct lov_stripe_md *ccc_inode_lsm_get(struct inode *inode)
-{
-        return lov_lsm_get(ll_i2info(inode)->lli_clob);
-}
-
-inline void ccc_inode_lsm_put(struct inode *inode, struct lov_stripe_md *lsm)
-{
-        lov_lsm_put(ll_i2info(inode)->lli_clob, lsm);
-}
diff --git a/drivers/staging/lustre/lustre/llite/lcommon_misc.c b/drivers/staging/lustre/lustre/llite/lcommon_misc.c
index fb346c12dad2..f48660ed350f 100644
--- a/drivers/staging/lustre/lustre/llite/lcommon_misc.c
+++ b/drivers/staging/lustre/lustre/llite/lcommon_misc.c
@@ -47,36 +47,29 @@
  */
 int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp)
 {
-        struct lov_stripe_md lsm = { .lsm_magic = LOV_MAGIC_V3 };
-        __u32 valsize = sizeof(struct lov_desc);
-        int rc, easize, def_easize, cookiesize;
-        struct lov_desc desc;
-        __u16 stripes, def_stripes;
-
-        rc = obd_get_info(NULL, dt_exp, sizeof(KEY_LOVDESC), KEY_LOVDESC,
-                          &valsize, &desc, NULL);
+        u32 val_size, max_easize, def_easize;
+        int rc;
+
+        val_size = sizeof(max_easize);
+        rc = obd_get_info(NULL, dt_exp, sizeof(KEY_MAX_EASIZE), KEY_MAX_EASIZE,
+                          &val_size, &max_easize);
         if (rc)
                 return rc;
 
-        stripes = min_t(__u32, desc.ld_tgt_count, LOV_MAX_STRIPE_COUNT);
-        lsm.lsm_stripe_count = stripes;
-        easize = obd_size_diskmd(dt_exp, &lsm);
-
-        def_stripes = min_t(__u32, desc.ld_default_stripe_count,
-                            LOV_MAX_STRIPE_COUNT);
-        lsm.lsm_stripe_count = def_stripes;
-        def_easize = obd_size_diskmd(dt_exp, &lsm);
-
-        cookiesize = stripes * sizeof(struct llog_cookie);
+        val_size = sizeof(def_easize);
+        rc = obd_get_info(NULL, dt_exp, sizeof(KEY_DEFAULT_EASIZE),
+                          KEY_DEFAULT_EASIZE, &val_size, &def_easize);
+        if (rc)
+                return rc;
 
-        /* default cookiesize is 0 because from 2.4 server doesn't send
+        /*
+         * default cookiesize is 0 because from 2.4 server doesn't send
          * llog cookies to client.
          */
-        CDEBUG(D_HA,
-               "updating def/max_easize: %d/%d def/max_cookiesize: 0/%d\n",
-               def_easize, easize, cookiesize);
+        CDEBUG(D_HA, "updating def/max_easize: %d/%d\n",
+               def_easize, max_easize);
 
-        rc = md_init_ea_size(md_exp, easize, def_easize, cookiesize, 0);
+        rc = md_init_ea_size(md_exp, max_easize, def_easize);
         return rc;
 }
 
@@ -169,13 +162,11 @@ int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock,
                 return rc;
         }
 
-        cg->lg_env  = cl_env_get(&refcheck);
+        cg->lg_env  = env;
         cg->lg_io   = io;
         cg->lg_lock = lock;
         cg->lg_gid  = gid;
-        LASSERT(cg->lg_env == env);
 
-        cl_env_unplant(env, &refcheck);
         return 0;
 }
 
@@ -184,14 +175,10 @@ void cl_put_grouplock(struct ll_grouplock *cg)
         struct lu_env  *env  = cg->lg_env;
         struct cl_io   *io   = cg->lg_io;
         struct cl_lock *lock = cg->lg_lock;
-        int          refcheck;
 
         LASSERT(cg->lg_env);
         LASSERT(cg->lg_gid);
 
-        cl_env_implant(env, &refcheck);
-        cl_env_put(env, &refcheck);
-
         cl_lock_release(env, lock);
         cl_io_fini(env, io);
         cl_env_put(env, NULL);
diff --git a/drivers/staging/lustre/lustre/llite/llite_close.c b/drivers/staging/lustre/lustre/llite/llite_close.c
deleted file mode 100644
index 8644631bf2ba..000000000000
--- a/drivers/staging/lustre/lustre/llite/llite_close.c
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * 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,
- * 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 version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- *
- * Copyright (c) 2011, 2012, Intel Corporation.
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- *
- * lustre/llite/llite_close.c
- *
- * Lustre Lite routines to issue a secondary close after writeback
- */
-
-#include <linux/module.h>
-
-#define DEBUG_SUBSYSTEM S_LLITE
-
-#include "llite_internal.h"
-
-/** records that a write is in flight */
-void vvp_write_pending(struct vvp_object *club, struct vvp_page *page)
-{
-        struct ll_inode_info *lli = ll_i2info(club->vob_inode);
-
-        spin_lock(&lli->lli_lock);
-        lli->lli_flags |= LLIF_SOM_DIRTY;
-        if (page && list_empty(&page->vpg_pending_linkage))
-                list_add(&page->vpg_pending_linkage, &club->vob_pending_list);
-        spin_unlock(&lli->lli_lock);
-}
-
-/** records that a write has completed */
-void vvp_write_complete(struct vvp_object *club, struct vvp_page *page)
-{
-        struct ll_inode_info *lli = ll_i2info(club->vob_inode);
-        int rc = 0;
-
-        spin_lock(&lli->lli_lock);
-        if (page && !list_empty(&page->vpg_pending_linkage)) {
-                list_del_init(&page->vpg_pending_linkage);
-                rc = 1;
-        }
-        spin_unlock(&lli->lli_lock);
-        if (rc)
-                ll_queue_done_writing(club->vob_inode, 0);
-}
-
-/** Queues DONE_WRITING if
- * - done writing is allowed;
- * - inode has no no dirty pages;
- */
-void ll_queue_done_writing(struct inode *inode, unsigned long flags)
-{
-        struct ll_inode_info *lli = ll_i2info(inode);
-        struct vvp_object *club = cl2vvp(ll_i2info(inode)->lli_clob);
-
-        spin_lock(&lli->lli_lock);
-        lli->lli_flags |= flags;
-
-        if ((lli->lli_flags & LLIF_DONE_WRITING) &&
-            list_empty(&club->vob_pending_list)) {
-                struct ll_close_queue *lcq = ll_i2sbi(inode)->ll_lcq;
-
-                if (lli->lli_flags & LLIF_MDS_SIZE_LOCK)
-                        CWARN("%s: file "DFID"(flags %u) Size-on-MDS valid, done writing allowed and no diry pages\n",
-                              ll_get_fsname(inode->i_sb, NULL, 0),
-                              PFID(ll_inode2fid(inode)), lli->lli_flags);
-                /* DONE_WRITING is allowed and inode has no dirty page. */
-                spin_lock(&lcq->lcq_lock);
-
-                LASSERT(list_empty(&lli->lli_close_list));
-                CDEBUG(D_INODE, "adding inode "DFID" to close list\n",
-                       PFID(ll_inode2fid(inode)));
-                list_add_tail(&lli->lli_close_list, &lcq->lcq_head);
-
-                /* Avoid a concurrent insertion into the close thread queue:
-                 * an inode is already in the close thread, open(), write(),
-                 * close() happen, epoch is closed as the inode is marked as
-                 * LLIF_EPOCH_PENDING. When pages are written inode should not
-                 * be inserted into the queue again, clear this flag to avoid
-                 * it.
-                 */
-                lli->lli_flags &= ~LLIF_DONE_WRITING;
-
-                wake_up(&lcq->lcq_waitq);
-                spin_unlock(&lcq->lcq_lock);
-        }
-        spin_unlock(&lli->lli_lock);
-}
-
-/** Pack SOM attributes info @opdata for CLOSE, DONE_WRITING rpc. */
-void ll_done_writing_attr(struct inode *inode, struct md_op_data *op_data)
-{
-        struct ll_inode_info *lli = ll_i2info(inode);
-
-        op_data->op_flags |= MF_SOM_CHANGE;
-        /* Check if Size-on-MDS attributes are valid. */
-        if (lli->lli_flags & LLIF_MDS_SIZE_LOCK)
-                CERROR("%s: inode "DFID"(flags %u) MDS holds lock on Size-on-MDS attributes\n",
-                       ll_get_fsname(inode->i_sb, NULL, 0),
-                       PFID(ll_inode2fid(inode)), lli->lli_flags);
-
-        if (!cl_local_size(inode)) {
-                /* Send Size-on-MDS Attributes if valid. */
-                op_data->op_attr.ia_valid |= ATTR_MTIME_SET | ATTR_CTIME_SET |
-                                ATTR_ATIME_SET | ATTR_SIZE | ATTR_BLOCKS;
-        }
-}
-
-/** Closes ioepoch and packs Size-on-MDS attribute if needed into @op_data. */
-void ll_ioepoch_close(struct inode *inode, struct md_op_data *op_data,
-                      struct obd_client_handle **och, unsigned long flags)
-{
-        struct ll_inode_info *lli = ll_i2info(inode);
-        struct vvp_object *club = cl2vvp(ll_i2info(inode)->lli_clob);
-
-        spin_lock(&lli->lli_lock);
-        if (!(list_empty(&club->vob_pending_list))) {
-                if (!(lli->lli_flags & LLIF_EPOCH_PENDING)) {
-                        LASSERT(*och);
-                        LASSERT(!lli->lli_pending_och);
-                        /* Inode is dirty and there is no pending write done
-                         * request yet, DONE_WRITE is to be sent later.
-                         */
-                        lli->lli_flags |= LLIF_EPOCH_PENDING;
-                        lli->lli_pending_och = *och;
-                        spin_unlock(&lli->lli_lock);
-
-                        inode = igrab(inode);
-                        LASSERT(inode);
-                        goto out;
-                }
-                if (flags & LLIF_DONE_WRITING) {
-                        /* Some pages are still dirty, it is early to send
-                         * DONE_WRITE. Wait until all pages will be flushed
-                         * and try DONE_WRITE again later.
-                         */
-                        LASSERT(!(lli->lli_flags & LLIF_DONE_WRITING));
-                        lli->lli_flags |= LLIF_DONE_WRITING;
-                        spin_unlock(&lli->lli_lock);
-
-                        inode = igrab(inode);
-                        LASSERT(inode);
-                        goto out;
-                }
-        }
-        CDEBUG(D_INODE, "Epoch %llu closed on "DFID"\n",
-               ll_i2info(inode)->lli_ioepoch, PFID(&lli->lli_fid));
-        op_data->op_flags |= MF_EPOCH_CLOSE;
-
-        if (flags & LLIF_DONE_WRITING) {
-                LASSERT(lli->lli_flags & LLIF_SOM_DIRTY);
-                LASSERT(!(lli->lli_flags & LLIF_DONE_WRITING));
-                *och = lli->lli_pending_och;
-                lli->lli_pending_och = NULL;
-                lli->lli_flags &= ~LLIF_EPOCH_PENDING;
-        } else {
-                /* Pack Size-on-MDS inode attributes only if they has changed */
-                if (!(lli->lli_flags & LLIF_SOM_DIRTY)) {
-                        spin_unlock(&lli->lli_lock);
-                        goto out;
-                }
-
-                /* There is a pending DONE_WRITE -- close epoch with no
-                 * attribute change.
-                 */
-                if (lli->lli_flags & LLIF_EPOCH_PENDING) {
-                        spin_unlock(&lli->lli_lock);
-                        goto out;
-                }
-        }
-
-        LASSERT(list_empty(&club->vob_pending_list));
-        lli->lli_flags &= ~LLIF_SOM_DIRTY;
-        spin_unlock(&lli->lli_lock);
-        ll_done_writing_attr(inode, op_data);
-
-out:
-        return;
-}
-
-/**
- * Cliens updates SOM attributes on MDS (including llog cookies):
- * obd_getattr with no lock and md_setattr.
- */
-int ll_som_update(struct inode *inode, struct md_op_data *op_data)
-{
-        struct ll_inode_info *lli = ll_i2info(inode);
-        struct ptlrpc_request *request = NULL;
-        __u32 old_flags;
-        struct obdo *oa;
-        int rc;
-
-        LASSERT(op_data);
-        if (lli->lli_flags & LLIF_MDS_SIZE_LOCK)
-                CERROR("%s: inode "DFID"(flags %u) MDS holds lock on Size-on-MDS attributes\n",
-                       ll_get_fsname(inode->i_sb, NULL, 0),
-                       PFID(ll_inode2fid(inode)), lli->lli_flags);
-
-        oa = kmem_cache_zalloc(obdo_cachep, GFP_NOFS);
-        if (!oa) {
-                CERROR("can't allocate memory for Size-on-MDS update.\n");
-                return -ENOMEM;
-        }
-
-        old_flags = op_data->op_flags;
-        op_data->op_flags = MF_SOM_CHANGE;
-
-        /* If inode is already in another epoch, skip getattr from OSTs. */
-        if (lli->lli_ioepoch == op_data->op_ioepoch) {
-                rc = ll_inode_getattr(inode, oa, op_data->op_ioepoch,
-                                      old_flags & MF_GETATTR_LOCK);
-                if (rc) {
-                        oa->o_valid = 0;
-                        if (rc != -ENOENT)
-                                CERROR("%s: inode_getattr failed - unable to send a Size-on-MDS attribute update for inode "DFID": rc = %d\n",
-                                       ll_get_fsname(inode->i_sb, NULL, 0),
-                                       PFID(ll_inode2fid(inode)), rc);
-                } else {
-                        CDEBUG(D_INODE, "Size-on-MDS update on "DFID"\n",
-                               PFID(&lli->lli_fid));
-                }
-                /* Install attributes into op_data. */
-                md_from_obdo(op_data, oa, oa->o_valid);
-        }
-
-        rc = md_setattr(ll_i2sbi(inode)->ll_md_exp, op_data,
-                        NULL, 0, NULL, 0, &request, NULL);
-        ptlrpc_req_finished(request);
-
-        kmem_cache_free(obdo_cachep, oa);
-        return rc;
-}
-
-/**
- * Closes the ioepoch and packs all the attributes into @op_data for
- * DONE_WRITING rpc.
- */
-static void ll_prepare_done_writing(struct inode *inode,
-                                    struct md_op_data *op_data,
-                                    struct obd_client_handle **och)
-{
-        ll_ioepoch_close(inode, op_data, och, LLIF_DONE_WRITING);
-        /* If there is no @och, we do not do D_W yet. */
-        if (!*och)
-                return;
-
-        ll_pack_inode2opdata(inode, op_data, &(*och)->och_fh);
-        ll_prep_md_op_data(op_data, inode, NULL, NULL,
-                           0, 0, LUSTRE_OPC_ANY, NULL);
-}
-
-/** Send a DONE_WRITING rpc. */
-static void ll_done_writing(struct inode *inode)
-{
-        struct obd_client_handle *och = NULL;
-        struct md_op_data *op_data;
-        int rc;
-
-        LASSERT(exp_connect_som(ll_i2mdexp(inode)));
-
-        op_data = kzalloc(sizeof(*op_data), GFP_NOFS);
-        if (!op_data)
-                return;
-
-        ll_prepare_done_writing(inode, op_data, &och);
-        /* If there is no @och, we do not do D_W yet. */
-        if (!och)
-                goto out;
-
-        rc = md_done_writing(ll_i2sbi(inode)->ll_md_exp, op_data, NULL);
-        if (rc == -EAGAIN)
-                /* MDS has instructed us to obtain Size-on-MDS attribute from
-                 * OSTs and send setattr to back to MDS.
-                 */
-                rc = ll_som_update(inode, op_data);
-        else if (rc) {
-                CERROR("%s: inode "DFID" mdc done_writing failed: rc = %d\n",
-                       ll_get_fsname(inode->i_sb, NULL, 0),
-                       PFID(ll_inode2fid(inode)), rc);
-        }
-out:
-        ll_finish_md_op_data(op_data);
-        if (och) {
-                md_clear_open_replay_data(ll_i2sbi(inode)->ll_md_exp, och);
-                kfree(och);
-        }
-}
-
-static struct ll_inode_info *ll_close_next_lli(struct ll_close_queue *lcq)
-{
-        struct ll_inode_info *lli = NULL;
-
-        spin_lock(&lcq->lcq_lock);
-
-        if (!list_empty(&lcq->lcq_head)) {
-                lli = list_entry(lcq->lcq_head.next, struct ll_inode_info,
-                                 lli_close_list);
-                list_del_init(&lli->lli_close_list);
-        } else if (atomic_read(&lcq->lcq_stop)) {
-                lli = ERR_PTR(-EALREADY);
-        }
-
-        spin_unlock(&lcq->lcq_lock);
-        return lli;
-}
-
-static int ll_close_thread(void *arg)
-{
-        struct ll_close_queue *lcq = arg;
-
-        complete(&lcq->lcq_comp);
-
-        while (1) {
-                struct l_wait_info lwi = { 0 };
-                struct ll_inode_info *lli;
-                struct inode *inode;
-
-                l_wait_event_exclusive(lcq->lcq_waitq,
-                                       (lli = ll_close_next_lli(lcq)) != NULL,
-                                       &lwi);
-                if (IS_ERR(lli))
-                        break;
-
-                inode = ll_info2i(lli);
-                CDEBUG(D_INFO, "done_writing for inode "DFID"\n",
-                       PFID(ll_inode2fid(inode)));
-                ll_done_writing(inode);
-                iput(inode);
-        }
-
-        CDEBUG(D_INFO, "ll_close exiting\n");
-        complete(&lcq->lcq_comp);
-        return 0;
-}
-
-int ll_close_thread_start(struct ll_close_queue **lcq_ret)
-{
-        struct ll_close_queue *lcq;
-        struct task_struct *task;
-
-        if (OBD_FAIL_CHECK(OBD_FAIL_LDLM_CLOSE_THREAD))
-                return -EINTR;
-
-        lcq = kzalloc(sizeof(*lcq), GFP_NOFS);
-        if (!lcq)
-                return -ENOMEM;
-
-        spin_lock_init(&lcq->lcq_lock);
-        INIT_LIST_HEAD(&lcq->lcq_head);
-        init_waitqueue_head(&lcq->lcq_waitq);
-        init_completion(&lcq->lcq_comp);
-
-        task = kthread_run(ll_close_thread, lcq, "ll_close");
-        if (IS_ERR(task)) {
-                kfree(lcq);
-                return PTR_ERR(task);
-        }
-
-        wait_for_completion(&lcq->lcq_comp);
-        *lcq_ret = lcq;
-        return 0;
-}
-
-void ll_close_thread_shutdown(struct ll_close_queue *lcq)
-{
-        init_completion(&lcq->lcq_comp);
-        atomic_inc(&lcq->lcq_stop);
-        wake_up(&lcq->lcq_waitq);
-        wait_for_completion(&lcq->lcq_comp);
-        kfree(lcq);
-}
diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h
index 4bc551279aa4..2f46d475cd7d 100644
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@ -97,31 +97,20 @@ struct ll_grouplock {
         unsigned long    lg_gid;
 };
 
-enum lli_flags {
-        /* MDS has an authority for the Size-on-MDS attributes. */
-        LLIF_MDS_SIZE_LOCK      = (1 << 0),
-        /* Epoch close is postponed. */
-        LLIF_EPOCH_PENDING      = (1 << 1),
-        /* DONE WRITING is allowed. */
-        LLIF_DONE_WRITING       = (1 << 2),
-        /* Sizeon-on-MDS attributes are changed. An attribute update needs to
-         * be sent to MDS.
-         */
-        LLIF_SOM_DIRTY    = (1 << 3),
+enum ll_file_flags {
         /* File data is modified. */
-        LLIF_DATA_MODIFIED      = (1 << 4),
+        LLIF_DATA_MODIFIED      = 0,
         /* File is being restored */
-        LLIF_FILE_RESTORING     = (1 << 5),
+        LLIF_FILE_RESTORING     = 1,
         /* Xattr cache is attached to the file */
-        LLIF_XATTR_CACHE        = (1 << 6),
+        LLIF_XATTR_CACHE        = 2,
 };
 
 struct ll_inode_info {
         __u32                           lli_inode_magic;
-        __u32                           lli_flags;
-        __u64                           lli_ioepoch;
 
         spinlock_t                      lli_lock;
+        unsigned long                   lli_flags;
         struct posix_acl                *lli_posix_acl;
 
         /* identifying fields for both metadata and data stacks. */
@@ -129,14 +118,6 @@ struct ll_inode_info {
         /* master inode fid for stripe directory */
         struct lu_fid              lli_pfid;
 
-        struct list_head              lli_close_list;
-
-        /* handle is to be sent to MDS later on done_writing and setattr.
-         * Open handle data are needed for the recovery to reconstruct
-         * the inode state on the MDS. XXX: recovery is not ready yet.
-         */
-        struct obd_client_handle       *lli_pending_och;
-
         /* We need all three because every inode may be opened in different
          * modes
          */
@@ -204,7 +185,6 @@ struct ll_inode_info {
                 struct {
                         struct mutex                    lli_size_mutex;
                         char                           *lli_symlink_name;
-                        __u64                           lli_maxbytes;
                         /*
                          * struct rw_semaphore {
                          *    signed long       count;     // align d.d_def_acl
@@ -245,7 +225,6 @@ struct ll_inode_info {
          *      In the future, if more members are added only for directory,
          *      some of the following members can be moved into u.f.
          */
-        bool                        lli_has_smd;
         struct cl_object               *lli_clob;
 
         /* mutex to request for layout lock exclusively. */
@@ -282,6 +261,9 @@ int ll_xattr_cache_destroy(struct inode *inode);
 int ll_xattr_cache_get(struct inode *inode, const char *name,
                        char *buffer, size_t size, __u64 valid);
 
+int ll_init_security(struct dentry *dentry, struct inode *inode,
+                     struct inode *dir);
+
 /*
  * Locking to guarantee consistency of non-atomic updates to long long i_size,
  * consistency between file size and KMS.
@@ -400,7 +382,7 @@ enum stats_track_type {
 #define LL_SBI_LOCALFLOCK       0x200 /* Local flocks support by kernel */
 #define LL_SBI_LRU_RESIZE       0x400 /* lru resize support */
 #define LL_SBI_LAZYSTATFS       0x800 /* lazystatfs mount option */
-#define LL_SBI_SOM_PREVIEW     0x1000 /* SOM preview mount option */
+/*      LL_SBI_SOM_PREVIEW     0x1000    SOM preview mount option, obsolete */
 #define LL_SBI_32BIT_API       0x2000 /* generate 32 bit inodes. */
 #define LL_SBI_64BIT_HASH      0x4000 /* support 64-bits dir hash/offset */
 #define LL_SBI_AGL_ENABLED     0x8000 /* enable agl */
@@ -409,6 +391,8 @@ enum stats_track_type {
 #define LL_SBI_USER_FID2PATH  0x40000 /* allow fid2path by unprivileged users */
 #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 */
 
 #define LL_SBI_FLAGS {  \
         "nolck",        \
@@ -432,6 +416,7 @@ enum stats_track_type {
         "user_fid2path",\
         "xattr_cache",  \
         "norootsquash", \
+        "always_ping",  \
 }
 
 /*
@@ -466,10 +451,10 @@ struct ll_sb_info {
 
         int                    ll_flags;
         unsigned int              ll_umounting:1,
-                                  ll_xattr_cache_enabled:1;
-        struct lustre_client_ocd  ll_lco;
+                                  ll_xattr_cache_enabled:1,
+                                  ll_client_common_fill_super_succeeded:1;
 
-        struct ll_close_queue    *ll_lcq;
+        struct lustre_client_ocd  ll_lco;
 
         struct lprocfs_stats     *ll_stats; /* lprocfs stats counter */
 
@@ -630,8 +615,6 @@ struct ll_file_data {
         struct list_head fd_lccs; /* list of ll_cl_context */
 };
 
-struct lov_stripe_md;
-
 extern struct dentry *llite_root;
 extern struct kset *llite_kset;
 
@@ -682,8 +665,6 @@ enum {
         LPROC_LL_WRITE_BYTES,
         LPROC_LL_BRW_READ,
         LPROC_LL_BRW_WRITE,
-        LPROC_LL_OSC_READ,
-        LPROC_LL_OSC_WRITE,
         LPROC_LL_IOCTL,
         LPROC_LL_OPEN,
         LPROC_LL_RELEASE,
@@ -741,9 +722,7 @@ int ll_writepage(struct page *page, struct writeback_control *wbc);
 int ll_writepages(struct address_space *, struct writeback_control *wbc);
 int ll_readpage(struct file *file, struct page *page);
 void ll_readahead_init(struct inode *inode, struct ll_readahead_state *ras);
-int ll_readahead(const struct lu_env *env, struct cl_io *io,
-                 struct cl_page_list *queue, struct ll_readahead_state *ras,
-                 bool hit);
+int vvp_io_write_commit(const struct lu_env *env, struct cl_io *io);
 struct ll_cl_context *ll_cl_find(struct file *file);
 void ll_cl_add(struct file *file, const struct lu_env *env, struct cl_io *io);
 void ll_cl_remove(struct file *file, const struct lu_env *env);
@@ -762,25 +741,14 @@ enum ldlm_mode ll_take_md_lock(struct inode *inode, __u64 bits,
                                enum ldlm_mode mode);
 int ll_file_open(struct inode *inode, struct file *file);
 int ll_file_release(struct inode *inode, struct file *file);
-int ll_glimpse_ioctl(struct ll_sb_info *sbi,
-                     struct lov_stripe_md *lsm, lstat_t *st);
-void ll_ioepoch_open(struct ll_inode_info *lli, __u64 ioepoch);
 int ll_release_openhandle(struct inode *, struct lookup_intent *);
 int ll_md_real_close(struct inode *inode, fmode_t fmode);
-void ll_ioepoch_close(struct inode *inode, struct md_op_data *op_data,
-                      struct obd_client_handle **och, unsigned long flags);
-void ll_done_writing_attr(struct inode *inode, struct md_op_data *op_data);
-int ll_som_update(struct inode *inode, struct md_op_data *op_data);
-int ll_inode_getattr(struct inode *inode, struct obdo *obdo,
-                     __u64 ioepoch, int sync);
-void ll_pack_inode2opdata(struct inode *inode, struct md_op_data *op_data,
-                          struct lustre_handle *fh);
 int ll_getattr(struct vfsmount *mnt, struct dentry *de, struct kstat *stat);
 struct posix_acl *ll_get_acl(struct inode *inode, int type);
 int ll_migrate(struct inode *parent, struct file *file, int mdtidx,
                const char *name, int namelen);
 int ll_get_fid_by_name(struct inode *parent, const char *name,
-                       int namelen, struct lu_fid *fid);
+                       int namelen, struct lu_fid *fid, struct inode **inode);
 int ll_inode_permission(struct inode *inode, int mask);
 
 int ll_lov_setstripe_ea_info(struct inode *inode, struct dentry *dentry,
@@ -818,6 +786,7 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt);
 void ll_put_super(struct super_block *sb);
 void ll_kill_super(struct super_block *sb);
 struct inode *ll_inode_from_resource_lock(struct ldlm_lock *lock);
+void ll_dir_clear_lsm_md(struct inode *inode);
 void ll_clear_inode(struct inode *inode);
 int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import);
 int ll_setattr(struct dentry *de, struct iattr *attr);
@@ -891,18 +860,6 @@ int ll_dir_get_parent_fid(struct inode *dir, struct lu_fid *parent_fid);
 /* llite/symlink.c */
 extern const struct inode_operations ll_fast_symlink_inode_operations;
 
-/* llite/llite_close.c */
-struct ll_close_queue {
-        spinlock_t              lcq_lock;
-        struct list_head                lcq_head;
-        wait_queue_head_t               lcq_waitq;
-        struct completion       lcq_comp;
-        atomic_t                lcq_stop;
-};
-
-void vvp_write_pending(struct vvp_object *club, struct vvp_page *page);
-void vvp_write_complete(struct vvp_object *club, struct vvp_page *page);
-
 /**
  * IO arguments for various VFS I/O interfaces.
  */
@@ -945,15 +902,11 @@ static inline struct vvp_io_args *ll_env_args(const struct lu_env *env)
         return &ll_env_info(env)->lti_args;
 }
 
-void ll_queue_done_writing(struct inode *inode, unsigned long flags);
-void ll_close_thread_shutdown(struct ll_close_queue *lcq);
-int ll_close_thread_start(struct ll_close_queue **lcq_ret);
-
 /* llite/llite_mmap.c */
 
 int ll_teardown_mmaps(struct address_space *mapping, __u64 first, __u64 last);
 int ll_file_mmap(struct file *file, struct vm_area_struct *vma);
-void policy_from_vma(ldlm_policy_data_t *policy, struct vm_area_struct *vma,
+void policy_from_vma(union ldlm_policy_data *policy, struct vm_area_struct *vma,
                      unsigned long addr, size_t count);
 struct vm_area_struct *our_vma(struct mm_struct *mm, unsigned long addr,
                                size_t count);
@@ -1024,9 +977,14 @@ static inline struct lu_fid *ll_inode2fid(struct inode *inode)
         return fid;
 }
 
-static inline __u64 ll_file_maxbytes(struct inode *inode)
+static inline loff_t ll_file_maxbytes(struct inode *inode)
 {
-        return ll_i2info(inode)->lli_maxbytes;
+        struct cl_object *obj = ll_i2info(inode)->lli_clob;
+
+        if (!obj)
+                return MAX_LFS_FILESIZE;
+
+        return min_t(loff_t, cl_object_maxbytes(obj), MAX_LFS_FILESIZE);
 }
 
 /* llite/xattr.c */
@@ -1043,17 +1001,18 @@ extern const struct xattr_handler *ll_xattr_handlers[];
 ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size);
 int ll_xattr_list(struct inode *inode, const char *name, int type,
                   void *buffer, size_t size, __u64 valid);
+const struct xattr_handler *get_xattr_type(const char *name);
 
 /**
  * Common IO arguments for various VFS I/O interfaces.
  */
 int cl_sb_init(struct super_block *sb);
 int cl_sb_fini(struct super_block *sb);
-void ll_io_init(struct cl_io *io, const struct file *file, int write);
 
-void ras_update(struct ll_sb_info *sbi, struct inode *inode,
-                struct ll_readahead_state *ras, unsigned long index,
-                unsigned hit);
+enum ras_update_flags {
+        LL_RAS_HIT  = 0x1,
+        LL_RAS_MMAP = 0x2
+};
 void ll_ra_count_put(struct ll_sb_info *sbi, unsigned long len);
 void ll_ra_stats_inc(struct inode *inode, enum ra_stat which);
 
@@ -1258,15 +1217,6 @@ struct ll_dio_pages {
         int        ldp_nr;
 };
 
-static inline void cl_stats_tally(struct cl_device *dev, enum cl_req_type crt,
-                                  int rc)
-{
-        int opc = (crt == CRT_READ) ? LPROC_LL_OSC_READ :
-                                      LPROC_LL_OSC_WRITE;
-
-        ll_stats_ops_tally(ll_s2sbi(cl2vvp_dev(dev)->vdv_sb), opc, rc);
-}
-
 ssize_t ll_direct_rw_pages(const struct lu_env *env, struct cl_io *io,
                            int rw, struct inode *inode,
                            struct ll_dio_pages *pv);
@@ -1365,11 +1315,6 @@ static inline void d_lustre_revalidate(struct dentry *dentry)
         spin_unlock(&dentry->d_lock);
 }
 
-enum {
-        LL_LAYOUT_GEN_NONE  = ((__u32)-2),      /* layout lock was cancelled */
-        LL_LAYOUT_GEN_EMPTY = ((__u32)-1)       /* for empty layout */
-};
-
 int ll_layout_conf(struct inode *inode, const struct cl_object_conf *conf);
 int ll_layout_refresh(struct inode *inode, __u32 *gen);
 int ll_layout_restore(struct inode *inode, loff_t start, __u64 length);
@@ -1383,14 +1328,14 @@ int ll_page_sync_io(const struct lu_env *env, struct cl_io *io,
 int ll_getparent(struct file *file, struct getparent __user *arg);
 
 /* lcommon_cl.c */
-int cl_setattr_ost(struct inode *inode, const struct iattr *attr);
+int cl_setattr_ost(struct cl_object *obj, const struct iattr *attr,
+                   unsigned int attr_flags);
 
 extern struct lu_env *cl_inode_fini_env;
 extern int cl_inode_fini_refcheck;
 
 int cl_file_inode_init(struct inode *inode, struct lustre_md *md);
 void cl_inode_fini(struct inode *inode);
-int cl_local_size(struct inode *inode);
 
 __u64 cl_fid_build_ino(const struct lu_fid *fid, int api32);
 __u32 cl_fid_build_gen(const struct lu_fid *fid);
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index e5c62f4ce3d8..25f5aed97f63 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -191,10 +191,8 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
                                   OBD_CONNECT_FLOCK_DEAD |
                                   OBD_CONNECT_DISP_STRIPE | OBD_CONNECT_LFSCK |
                                   OBD_CONNECT_OPEN_BY_FID |
-                                  OBD_CONNECT_DIR_STRIPE;
-
-        if (sbi->ll_flags & LL_SBI_SOM_PREVIEW)
-                data->ocd_connect_flags |= OBD_CONNECT_SOM;
+                                  OBD_CONNECT_DIR_STRIPE |
+                                  OBD_CONNECT_BULK_MBITS;
 
         if (sbi->ll_flags & LL_SBI_LRU_RESIZE)
                 data->ocd_connect_flags |= OBD_CONNECT_LRU_RESIZE;
@@ -226,6 +224,10 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
         /* real client */
         data->ocd_connect_flags |= OBD_CONNECT_REAL;
 
+        /* always ping even if server suppress_pings */
+        if (sbi->ll_flags & LL_SBI_ALWAYS_PING)
+                data->ocd_connect_flags &= ~OBD_CONNECT_PINGLESS;
+
         data->ocd_brw_size = MD_MAX_BRW_SIZE;
 
         err = obd_connect(NULL, &sbi->ll_md_exp, obd, &sbi->ll_sb_uuid,
@@ -288,7 +290,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
 
         size = sizeof(*data);
         err = obd_get_info(NULL, sbi->ll_md_exp, sizeof(KEY_CONN_DATA),
-                           KEY_CONN_DATA,  &size, data, NULL);
+                           KEY_CONN_DATA,  &size, data);
         if (err) {
                 CERROR("%s: Get connect data failed: rc = %d\n",
                        sbi->ll_md_exp->exp_obd->obd_name, err);
@@ -355,10 +357,9 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
                                   OBD_CONNECT_64BITHASH | OBD_CONNECT_MAXBYTES |
                                   OBD_CONNECT_EINPROGRESS |
                                   OBD_CONNECT_JOBSTATS | OBD_CONNECT_LVB_TYPE |
-                                  OBD_CONNECT_LAYOUTLOCK | OBD_CONNECT_PINGLESS;
-
-        if (sbi->ll_flags & LL_SBI_SOM_PREVIEW)
-                data->ocd_connect_flags |= OBD_CONNECT_SOM;
+                                  OBD_CONNECT_LAYOUTLOCK |
+                                  OBD_CONNECT_PINGLESS | OBD_CONNECT_LFSCK |
+                                  OBD_CONNECT_BULK_MBITS;
 
         if (!OBD_FAIL_CHECK(OBD_FAIL_OSC_CONNECT_CKSUM)) {
                 /* OBD_CONNECT_CKSUM should always be set, even if checksums are
@@ -376,6 +377,10 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
 
         data->ocd_connect_flags |= OBD_CONNECT_LRU_RESIZE;
 
+        /* always ping even if server suppress_pings */
+        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",
                data->ocd_connect_flags,
                data->ocd_version, data->ocd_grant);
@@ -475,8 +480,6 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
         ptlrpc_req_finished(request);
 
         if (IS_ERR(root)) {
-                if (lmd.lsm)
-                        obd_free_memmd(sbi->ll_dt_exp, &lmd.lsm);
 #ifdef CONFIG_FS_POSIX_ACL
                 if (lmd.posix_acl) {
                         posix_acl_release(lmd.posix_acl);
@@ -488,12 +491,6 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
                 goto out_root;
         }
 
-        err = ll_close_thread_start(&sbi->ll_lcq);
-        if (err) {
-                CERROR("cannot start close thread: rc %d\n", err);
-                goto out_root;
-        }
-
         checksum = sbi->ll_flags & LL_SBI_CHECKSUM;
         err = obd_set_info_async(NULL, sbi->ll_dt_exp, sizeof(KEY_CHECKSUM),
                                  KEY_CHECKSUM, sizeof(checksum), &checksum,
@@ -572,10 +569,18 @@ int ll_get_max_mdsize(struct ll_sb_info *sbi, int *lmmsize)
 {
         int size, rc;
 
-        *lmmsize = obd_size_diskmd(sbi->ll_dt_exp, NULL);
+        size = sizeof(*lmmsize);
+        rc = obd_get_info(NULL, sbi->ll_dt_exp, sizeof(KEY_MAX_EASIZE),
+                          KEY_MAX_EASIZE, &size, lmmsize);
+        if (rc) {
+                CERROR("%s: cannot get max LOV EA size: rc = %d\n",
+                       sbi->ll_dt_exp->exp_obd->obd_name, rc);
+                return rc;
+        }
+
         size = sizeof(int);
         rc = obd_get_info(NULL, sbi->ll_md_exp, sizeof(KEY_MAX_EASIZE),
-                          KEY_MAX_EASIZE, &size, lmmsize, NULL);
+                          KEY_MAX_EASIZE, &size, lmmsize);
         if (rc)
                 CERROR("Get max mdsize error rc %d\n", rc);
 
@@ -599,7 +604,7 @@ int ll_get_default_mdsize(struct ll_sb_info *sbi, int *lmmsize)
 
         size = sizeof(int);
         rc = obd_get_info(NULL, sbi->ll_md_exp, sizeof(KEY_DEFAULT_EASIZE),
-                          KEY_DEFAULT_EASIZE, &size, lmmsize, NULL);
+                          KEY_DEFAULT_EASIZE, &size, lmmsize);
         if (rc)
                 CERROR("Get default mdsize error rc %d\n", rc);
 
@@ -633,8 +638,6 @@ static void client_common_put_super(struct super_block *sb)
 {
         struct ll_sb_info *sbi = ll_s2sbi(sb);
 
-        ll_close_thread_shutdown(sbi->ll_lcq);
-
         cl_sb_fini(sb);
 
         obd_fid_fini(sbi->ll_dt_exp->exp_obd);
@@ -725,6 +728,18 @@ static int ll_options(char *options, int *flags)
                         *flags &= ~tmp;
                         goto next;
                 }
+                tmp = ll_set_opt("context", s1, 1);
+                if (tmp)
+                        goto next;
+                tmp = ll_set_opt("fscontext", s1, 1);
+                if (tmp)
+                        goto next;
+                tmp = ll_set_opt("defcontext", s1, 1);
+                if (tmp)
+                        goto next;
+                tmp = ll_set_opt("rootcontext", s1, 1);
+                if (tmp)
+                        goto next;
                 tmp = ll_set_opt("user_fid2path", s1, LL_SBI_USER_FID2PATH);
                 if (tmp) {
                         *flags |= tmp;
@@ -766,11 +781,6 @@ static int ll_options(char *options, int *flags)
                         *flags &= ~tmp;
                         goto next;
                 }
-                tmp = ll_set_opt("som_preview", s1, LL_SBI_SOM_PREVIEW);
-                if (tmp) {
-                        *flags |= tmp;
-                        goto next;
-                }
                 tmp = ll_set_opt("32bitapi", s1, LL_SBI_32BIT_API);
                 if (tmp) {
                         *flags |= tmp;
@@ -786,6 +796,11 @@ static int ll_options(char *options, int *flags)
                         *flags &= ~tmp;
                         goto next;
                 }
+                tmp = ll_set_opt("always_ping", s1, LL_SBI_ALWAYS_PING);
+                if (tmp) {
+                        *flags |= tmp;
+                        goto next;
+                }
                 LCONSOLE_ERROR_MSG(0x152, "Unknown option '%s', won't mount.\n",
                                    s1);
                 return -EINVAL;
@@ -804,14 +819,10 @@ void ll_lli_init(struct ll_inode_info *lli)
 {
         lli->lli_inode_magic = LLI_INODE_MAGIC;
         lli->lli_flags = 0;
-        lli->lli_ioepoch = 0;
-        lli->lli_maxbytes = MAX_LFS_FILESIZE;
         spin_lock_init(&lli->lli_lock);
         lli->lli_posix_acl = NULL;
         /* Do not set lli_fid, it has been initialized already. */
         fid_zero(&lli->lli_pfid);
-        INIT_LIST_HEAD(&lli->lli_close_list);
-        lli->lli_pending_och = NULL;
         lli->lli_mds_read_och = NULL;
         lli->lli_mds_write_och = NULL;
         lli->lli_mds_exec_och = NULL;
@@ -820,9 +831,8 @@ void ll_lli_init(struct ll_inode_info *lli)
         lli->lli_open_fd_exec_count = 0;
         mutex_init(&lli->lli_och_mutex);
         spin_lock_init(&lli->lli_agl_lock);
-        lli->lli_has_smd = false;
         spin_lock_init(&lli->lli_layout_lock);
-        ll_layout_version_set(lli, LL_LAYOUT_GEN_NONE);
+        ll_layout_version_set(lli, CL_LAYOUT_GEN_NONE);
         lli->lli_clob = NULL;
 
         init_rwsem(&lli->lli_xattrs_list_rwsem);
@@ -941,10 +951,14 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt)
 
         /* connections, registrations, sb setup */
         err = client_common_fill_super(sb, md, dt, mnt);
+        if (!err)
+                sbi->ll_client_common_fill_super_succeeded = 1;
 
 out_free:
         kfree(md);
         kfree(dt);
+        if (lprof)
+                class_put_profile(lprof);
         if (err)
                 ll_put_super(sb);
         else if (sbi->ll_flags & LL_SBI_VERBOSE)
@@ -1002,7 +1016,7 @@ void ll_put_super(struct super_block *sb)
                 }
         }
 
-        if (sbi->ll_lcq) {
+        if (sbi->ll_client_common_fill_super_succeeded) {
                 /* Only if client_common_fill_super succeeded */
                 client_common_put_super(sb);
         }
@@ -1057,7 +1071,7 @@ struct inode *ll_inode_from_resource_lock(struct ldlm_lock *lock)
         return inode;
 }
 
-static void ll_dir_clear_lsm_md(struct inode *inode)
+void ll_dir_clear_lsm_md(struct inode *inode)
 {
         struct ll_inode_info *lli = ll_i2info(inode);
 
@@ -1205,16 +1219,44 @@ static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
 
         /* set the directory layout */
         if (!lli->lli_lsm_md) {
+                struct cl_attr *attr;
+
                 rc = ll_init_lsm_md(inode, md);
                 if (rc)
                         return rc;
 
-                lli->lli_lsm_md = lsm;
                 /*
                  * set lsm_md to NULL, so the following free lustre_md
                  * will not free this lsm
                  */
                 md->lmv = NULL;
+                lli->lli_lsm_md = lsm;
+
+                attr = kzalloc(sizeof(*attr), GFP_NOFS);
+                if (!attr)
+                        return -ENOMEM;
+
+                /* validate the lsm */
+                rc = md_merge_attr(ll_i2mdexp(inode), lsm, attr,
+                                   ll_md_blocking_ast);
+                if (rc) {
+                        kfree(attr);
+                        return rc;
+                }
+
+                if (md->body->mbo_valid & OBD_MD_FLNLINK)
+                        md->body->mbo_nlink = attr->cat_nlink;
+                if (md->body->mbo_valid & OBD_MD_FLSIZE)
+                        md->body->mbo_size = attr->cat_size;
+                if (md->body->mbo_valid & OBD_MD_FLATIME)
+                        md->body->mbo_atime = attr->cat_atime;
+                if (md->body->mbo_valid & OBD_MD_FLCTIME)
+                        md->body->mbo_ctime = attr->cat_ctime;
+                if (md->body->mbo_valid & OBD_MD_FLMTIME)
+                        md->body->mbo_mtime = attr->cat_mtime;
+
+                kfree(attr);
+
                 CDEBUG(D_INODE, "Set lsm %p magic %x to "DFID"\n", lsm,
                        lsm->lsm_md_magic, PFID(ll_inode2fid(inode)));
                 return 0;
@@ -1272,9 +1314,6 @@ void ll_clear_inode(struct inode *inode)
                 LASSERT(lli->lli_opendir_pid == 0);
         }
 
-        spin_lock(&lli->lli_lock);
-        ll_i2info(inode)->lli_flags &= ~LLIF_MDS_SIZE_LOCK;
-        spin_unlock(&lli->lli_lock);
         md_null_inode(sbi->ll_md_exp, ll_inode2fid(inode));
 
         LASSERT(!lli->lli_open_fd_write_count);
@@ -1313,13 +1352,11 @@ void ll_clear_inode(struct inode *inode)
          * cl_object still uses inode lsm.
          */
         cl_inode_fini(inode);
-        lli->lli_has_smd = false;
 }
 
 #define TIMES_SET_FLAGS (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET)
 
-static int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data,
-                         struct md_open_data **mod)
+static int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data)
 {
         struct lustre_md md;
         struct inode *inode = d_inode(dentry);
@@ -1332,8 +1369,7 @@ static int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data,
         if (IS_ERR(op_data))
                 return PTR_ERR(op_data);
 
-        rc = md_setattr(sbi->ll_md_exp, op_data, NULL, 0, NULL, 0,
-                        &request, mod);
+        rc = md_setattr(sbi->ll_md_exp, op_data, NULL, 0, &request);
         if (rc) {
                 ptlrpc_req_finished(request);
                 if (rc == -ENOENT) {
@@ -1369,48 +1405,12 @@ static int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data,
         rc = simple_setattr(dentry, &op_data->op_attr);
         op_data->op_attr.ia_valid = ia_valid;
 
-        /* Extract epoch data if obtained. */
-        op_data->op_handle = md.body->mbo_handle;
-        op_data->op_ioepoch = md.body->mbo_ioepoch;
-
         rc = ll_update_inode(inode, &md);
         ptlrpc_req_finished(request);
 
         return rc;
 }
 
-/* Close IO epoch and send Size-on-MDS attribute update. */
-static int ll_setattr_done_writing(struct inode *inode,
-                                   struct md_op_data *op_data,
-                                   struct md_open_data *mod)
-{
-        struct ll_inode_info *lli = ll_i2info(inode);
-        int rc = 0;
-
-        if (!S_ISREG(inode->i_mode))
-                return 0;
-
-        CDEBUG(D_INODE, "Epoch %llu closed on "DFID" for truncate\n",
-               op_data->op_ioepoch, PFID(&lli->lli_fid));
-
-        op_data->op_flags = MF_EPOCH_CLOSE;
-        ll_done_writing_attr(inode, op_data);
-        ll_pack_inode2opdata(inode, op_data, NULL);
-
-        rc = md_done_writing(ll_i2sbi(inode)->ll_md_exp, op_data, mod);
-        if (rc == -EAGAIN)
-                /* MDS has instructed us to obtain Size-on-MDS attribute
-                 * from OSTs and send setattr to back to MDS.
-                 */
-                rc = ll_som_update(inode, op_data);
-        else if (rc) {
-                CERROR("%s: inode "DFID" mdc truncate failed: rc = %d\n",
-                       ll_i2sbi(inode)->ll_md_exp->exp_obd->obd_name,
-                       PFID(ll_inode2fid(inode)), rc);
-        }
-        return rc;
-}
-
 /* If this inode has objects allocated to it (lsm != NULL), then the OST
  * object(s) determine the file size and mtime.  Otherwise, the MDS will
  * keep these values until such a time that objects are allocated for it.
@@ -1431,9 +1431,8 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
         struct inode *inode = d_inode(dentry);
         struct ll_inode_info *lli = ll_i2info(inode);
         struct md_op_data *op_data = NULL;
-        struct md_open_data *mod = NULL;
         bool file_is_released = false;
-        int rc = 0, rc1 = 0;
+        int rc = 0;
 
         CDEBUG(D_VFSTRACE, "%s: setattr inode "DFID"(%p) from %llu to %llu, valid %x, hsm_import %d\n",
                ll_get_fsname(inode->i_sb, NULL, 0), PFID(&lli->lli_fid), inode,
@@ -1503,14 +1502,33 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
          * but other attributes must be set
          */
         if (S_ISREG(inode->i_mode)) {
-                struct lov_stripe_md *lsm;
+                struct cl_layout cl = {
+                        .cl_is_released = false,
+                };
+                struct lu_env *env;
+                int refcheck;
                 __u32 gen;
 
-                ll_layout_refresh(inode, &gen);
-                lsm = ccc_inode_lsm_get(inode);
-                if (lsm && lsm->lsm_pattern & LOV_PATTERN_F_RELEASED)
-                        file_is_released = true;
-                ccc_inode_lsm_put(inode, lsm);
+                rc = ll_layout_refresh(inode, &gen);
+                if (rc < 0)
+                        goto out;
+
+                /*
+                 * XXX: the only place we need to know the layout type,
+                 * this will be removed by a later patch. -Jinshan
+                 */
+                env = cl_env_get(&refcheck);
+                if (IS_ERR(env)) {
+                        rc = PTR_ERR(env);
+                        goto out;
+                }
+
+                rc = cl_object_layout_get(env, lli->lli_clob, &cl);
+                cl_env_put(env, &refcheck);
+                if (rc < 0)
+                        goto out;
+
+                file_is_released = cl.cl_is_released;
 
                 if (!hsm_import && attr->ia_valid & ATTR_SIZE) {
                         if (file_is_released) {
@@ -1527,32 +1545,16 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
                          * modified, flag it.
                          */
                         attr->ia_valid |= MDS_OPEN_OWNEROVERRIDE;
-                        spin_lock(&lli->lli_lock);
-                        lli->lli_flags |= LLIF_DATA_MODIFIED;
-                        spin_unlock(&lli->lli_lock);
                         op_data->op_bias |= MDS_DATA_MODIFIED;
                 }
         }
 
         memcpy(&op_data->op_attr, attr, sizeof(*attr));
 
-        /* Open epoch for truncate. */
-        if (exp_connect_som(ll_i2mdexp(inode)) && !hsm_import &&
-            (attr->ia_valid & (ATTR_SIZE | ATTR_MTIME | ATTR_MTIME_SET)))
-                op_data->op_flags = MF_EPOCH_OPEN;
-
-        rc = ll_md_setattr(dentry, op_data, &mod);
+        rc = ll_md_setattr(dentry, op_data);
         if (rc)
                 goto out;
 
-        /* RPC to MDT is sent, cancel data modification flag */
-        if (op_data->op_bias & MDS_DATA_MODIFIED) {
-                spin_lock(&lli->lli_lock);
-                lli->lli_flags &= ~LLIF_DATA_MODIFIED;
-                spin_unlock(&lli->lli_lock);
-        }
-
-        ll_ioepoch_open(lli, op_data->op_ioepoch);
         if (!S_ISREG(inode->i_mode) || file_is_released) {
                 rc = 0;
                 goto out;
@@ -1568,19 +1570,11 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
                  * setting times to past, but it is necessary due to possible
                  * time de-synchronization between MDT inode and OST objects
                  */
-                if (attr->ia_valid & ATTR_SIZE)
-                        down_write(&lli->lli_trunc_sem);
-                rc = cl_setattr_ost(inode, attr);
-                if (attr->ia_valid & ATTR_SIZE)
-                        up_write(&lli->lli_trunc_sem);
+                rc = cl_setattr_ost(ll_i2info(inode)->lli_clob, attr, 0);
         }
 out:
-        if (op_data->op_ioepoch) {
-                rc1 = ll_setattr_done_writing(inode, op_data, mod);
-                if (!rc)
-                        rc = rc1;
-        }
-        ll_finish_md_op_data(op_data);
+        if (op_data)
+                ll_finish_md_op_data(op_data);
 
         if (!S_ISDIR(inode->i_mode)) {
                 inode_lock(inode);
@@ -1736,19 +1730,10 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md)
 {
         struct ll_inode_info *lli = ll_i2info(inode);
         struct mdt_body *body = md->body;
-        struct lov_stripe_md *lsm = md->lsm;
         struct ll_sb_info *sbi = ll_i2sbi(inode);
 
-        LASSERT((lsm != NULL) == ((body->mbo_valid & OBD_MD_FLEASIZE) != 0));
-        if (lsm) {
-                if (!lli->lli_has_smd &&
-                    !(sbi->ll_flags & LL_SBI_LAYOUT_LOCK))
-                        cl_file_inode_init(inode, md);
-
-                lli->lli_maxbytes = lsm->lsm_maxbytes;
-                if (lli->lli_maxbytes > MAX_LFS_FILESIZE)
-                        lli->lli_maxbytes = MAX_LFS_FILESIZE;
-        }
+        if (body->mbo_valid & OBD_MD_FLEASIZE)
+                cl_file_inode_init(inode, md);
 
         if (S_ISDIR(inode->i_mode)) {
                 int rc;
@@ -1828,48 +1813,11 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md)
         LASSERT(fid_seq(&lli->lli_fid) != 0);
 
         if (body->mbo_valid & OBD_MD_FLSIZE) {
-                if (exp_connect_som(ll_i2mdexp(inode)) &&
-                    S_ISREG(inode->i_mode)) {
-                        struct lustre_handle lockh;
-                        enum ldlm_mode mode;
-
-                        /* As it is possible a blocking ast has been processed
-                         * by this time, we need to check there is an UPDATE
-                         * lock on the client and set LLIF_MDS_SIZE_LOCK holding
-                         * it.
-                         */
-                        mode = ll_take_md_lock(inode, MDS_INODELOCK_UPDATE,
-                                               &lockh, LDLM_FL_CBPENDING,
-                                               LCK_CR | LCK_CW |
-                                               LCK_PR | LCK_PW);
-                        if (mode) {
-                                if (lli->lli_flags & (LLIF_DONE_WRITING |
-                                                      LLIF_EPOCH_PENDING |
-                                                      LLIF_SOM_DIRTY)) {
-                                        CERROR("%s: inode "DFID" flags %u still has size authority! do not trust the size got from MDS\n",
-                                               sbi->ll_md_exp->exp_obd->obd_name,
-                                               PFID(ll_inode2fid(inode)),
-                                               lli->lli_flags);
-                                } else {
-                                        /* Use old size assignment to avoid
-                                         * deadlock bz14138 & bz14326
-                                         */
-                                        i_size_write(inode, body->mbo_size);
-                                        spin_lock(&lli->lli_lock);
-                                        lli->lli_flags |= LLIF_MDS_SIZE_LOCK;
-                                        spin_unlock(&lli->lli_lock);
-                                }
-                                ldlm_lock_decref(&lockh, mode);
-                        }
-                } else {
-                        /* Use old size assignment to avoid
-                         * deadlock bz14138 & bz14326
-                         */
-                        i_size_write(inode, body->mbo_size);
+                i_size_write(inode, body->mbo_size);
 
-                        CDEBUG(D_VFSTRACE, "inode=%lu, updating i_size %llu\n",
-                               inode->i_ino, (unsigned long long)body->mbo_size);
-                }
+                CDEBUG(D_VFSTRACE, "inode=" DFID ", updating i_size %llu\n",
+                       PFID(ll_inode2fid(inode)),
+                       (unsigned long long)body->mbo_size);
 
                 if (body->mbo_valid & OBD_MD_FLBLOCKS)
                         inode->i_blocks = body->mbo_blocks;
@@ -1877,7 +1825,7 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md)
 
         if (body->mbo_valid & OBD_MD_TSTATE) {
                 if (body->mbo_t_state & MS_RESTORE)
-                        lli->lli_flags |= LLIF_FILE_RESTORING;
+                        set_bit(LLIF_FILE_RESTORING, &lli->lli_flags);
         }
 
         return 0;
@@ -1892,8 +1840,6 @@ int ll_read_inode2(struct inode *inode, void *opaque)
         CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p)\n",
                PFID(&lli->lli_fid), inode);
 
-        LASSERT(!lli->lli_has_smd);
-
         /* Core attributes from the MDS first.  This is a new inode, and
          * the VFS doesn't zero times in the core inode so we have to do
          * it ourselves.  They will be overwritten by either MDS or OST
@@ -1988,9 +1934,9 @@ int ll_iocontrol(struct inode *inode, struct file *file,
                 return put_user(flags, (int __user *)arg);
         }
         case FSFILT_IOC_SETFLAGS: {
-                struct lov_stripe_md *lsm;
-                struct obd_info oinfo = { };
                 struct md_op_data *op_data;
+                struct cl_object *obj;
+                struct iattr *attr;
 
                 if (get_user(flags, (int __user *)arg))
                         return -EFAULT;
@@ -2002,8 +1948,7 @@ int ll_iocontrol(struct inode *inode, struct file *file,
 
                 op_data->op_attr_flags = flags;
                 op_data->op_attr.ia_valid |= ATTR_ATTR_FLAG;
-                rc = md_setattr(sbi->ll_md_exp, op_data,
-                                NULL, 0, NULL, 0, &req, NULL);
+                rc = md_setattr(sbi->ll_md_exp, op_data, NULL, 0, &req);
                 ll_finish_md_op_data(op_data);
                 ptlrpc_req_finished(req);
                 if (rc)
@@ -2011,30 +1956,17 @@ int ll_iocontrol(struct inode *inode, struct file *file,
 
                 inode->i_flags = ll_ext_to_inode_flags(flags);
 
-                lsm = ccc_inode_lsm_get(inode);
-                if (!lsm_has_objects(lsm)) {
-                        ccc_inode_lsm_put(inode, lsm);
+                obj = ll_i2info(inode)->lli_clob;
+                if (!obj)
                         return 0;
-                }
 
-                oinfo.oi_oa = kmem_cache_zalloc(obdo_cachep, GFP_NOFS);
-                if (!oinfo.oi_oa) {
-                        ccc_inode_lsm_put(inode, lsm);
+                attr = kzalloc(sizeof(*attr), GFP_NOFS);
+                if (!attr)
                         return -ENOMEM;
-                }
-                oinfo.oi_md = lsm;
-                oinfo.oi_oa->o_oi = lsm->lsm_oi;
-                oinfo.oi_oa->o_flags = flags;
-                oinfo.oi_oa->o_valid = OBD_MD_FLID | OBD_MD_FLFLAGS |
-                                       OBD_MD_FLGROUP;
-                obdo_set_parent_fid(oinfo.oi_oa, &ll_i2info(inode)->lli_fid);
-                rc = obd_setattr_rqset(sbi->ll_dt_exp, &oinfo, NULL);
-                kmem_cache_free(obdo_cachep, oinfo.oi_oa);
-                ccc_inode_lsm_put(inode, lsm);
-
-                if (rc && rc != -EPERM && rc != -EACCES)
-                        CERROR("osc_setattr_async fails: rc = %d\n", rc);
 
+                attr->ia_valid = ATTR_ATTR_FLAG;
+                rc = cl_setattr_ost(obj, attr, flags);
+                kfree(attr);
                 return rc;
         }
         default:
@@ -2164,7 +2096,6 @@ void ll_open_cleanup(struct super_block *sb, struct ptlrpc_request *open_req)
                 return;
 
         op_data->op_fid1 = body->mbo_fid1;
-        op_data->op_ioepoch = body->mbo_ioepoch;
         op_data->op_handle = body->mbo_handle;
         op_data->op_mod_time = get_seconds();
         md_close(exp, op_data, NULL, &close_req);
@@ -2244,17 +2175,14 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
                         conf.coc_opc = OBJECT_CONF_SET;
                         conf.coc_inode = *inode;
                         conf.coc_lock = lock;
-                        conf.u.coc_md = &md;
+                        conf.u.coc_layout = md.layout;
                         (void)ll_layout_conf(*inode, &conf);
                 }
                 LDLM_LOCK_PUT(lock);
         }
 
 out:
-        if (md.lsm)
-                obd_free_memmd(sbi->ll_dt_exp, &md.lsm);
         md_free_lustre_md(sbi->ll_md_exp, &md);
-
 cleanup:
         if (rc != 0 && it && it->it_op & IT_OPEN)
                 ll_open_cleanup(sb ? sb : (*inode)->i_sb, req);
@@ -2380,8 +2308,9 @@ struct md_op_data *ll_prep_md_op_data(struct md_op_data *op_data,
         op_data->op_default_stripe_offset = -1;
         if (S_ISDIR(i1->i_mode)) {
                 op_data->op_mea1 = ll_i2info(i1)->lli_lsm_md;
-                op_data->op_default_stripe_offset =
-                        ll_i2info(i1)->lli_def_stripe_offset;
+                if (opc == LUSTRE_OPC_MKDIR)
+                        op_data->op_default_stripe_offset =
+                                ll_i2info(i1)->lli_def_stripe_offset;
         }
 
         if (i2) {
@@ -2405,8 +2334,6 @@ struct md_op_data *ll_prep_md_op_data(struct md_op_data *op_data,
         op_data->op_fsuid = from_kuid(&init_user_ns, current_fsuid());
         op_data->op_fsgid = from_kgid(&init_user_ns, current_fsgid());
         op_data->op_cap = cfs_curproc_cap_pack();
-        op_data->op_bias = 0;
-        op_data->op_cli_flags = 0;
         if ((opc == LUSTRE_OPC_CREATE) && name &&
             filename_is_volatile(name, namelen, &op_data->op_mds))
                 op_data->op_bias |= MDS_CREATE_VOLATILE;
@@ -2414,10 +2341,6 @@ struct md_op_data *ll_prep_md_op_data(struct md_op_data *op_data,
                 op_data->op_mds = 0;
         op_data->op_data = data;
 
-        /* When called by ll_setattr_raw, file is i1. */
-        if (ll_i2info(i1)->lli_flags & LLIF_DATA_MODIFIED)
-                op_data->op_bias |= MDS_DATA_MODIFIED;
-
         return op_data;
 }
 
@@ -2451,6 +2374,9 @@ int ll_show_options(struct seq_file *seq, struct dentry *dentry)
         if (sbi->ll_flags & LL_SBI_USER_FID2PATH)
                 seq_puts(seq, ",user_fid2path");
 
+        if (sbi->ll_flags & LL_SBI_ALWAYS_PING)
+                seq_puts(seq, ",always_ping");
+
         return 0;
 }
 
diff --git a/drivers/staging/lustre/lustre/llite/llite_mmap.c b/drivers/staging/lustre/lustre/llite/llite_mmap.c
index 436691814a5e..ee01f20d8b11 100644
--- a/drivers/staging/lustre/lustre/llite/llite_mmap.c
+++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c
@@ -47,7 +47,7 @@
 
 static const struct vm_operations_struct ll_file_vm_ops;
 
-void policy_from_vma(ldlm_policy_data_t *policy,
+void policy_from_vma(union ldlm_policy_data *policy,
                      struct vm_area_struct *vma, unsigned long addr,
                      size_t count)
 {
@@ -80,43 +80,24 @@ struct vm_area_struct *our_vma(struct mm_struct *mm, unsigned long addr,
  * API independent part for page fault initialization.
  * \param vma - virtual memory area addressed to page fault
  * \param env - corespondent lu_env to processing
- * \param nest - nested level
  * \param index - page index corespondent to fault.
  * \parm ra_flags - vma readahead flags.
  *
- * \return allocated and initialized env for fault operation.
- * \retval EINVAL if env can't allocated
- * \return other error codes from cl_io_init.
+ * \return error codes from cl_io_init.
  */
 static struct cl_io *
-ll_fault_io_init(struct vm_area_struct *vma, struct lu_env **env_ret,
-                 struct cl_env_nest *nest, pgoff_t index,
-                 unsigned long *ra_flags)
+ll_fault_io_init(struct lu_env *env, struct vm_area_struct *vma,
+                 pgoff_t index, unsigned long *ra_flags)
 {
         struct file            *file = vma->vm_file;
         struct inode           *inode = file_inode(file);
         struct cl_io           *io;
         struct cl_fault_io     *fio;
-        struct lu_env          *env;
         int                     rc;
 
-        *env_ret = NULL;
         if (ll_file_nolock(file))
                 return ERR_PTR(-EOPNOTSUPP);
 
-        /*
-         * page fault can be called when lustre IO is
-         * already active for the current thread, e.g., when doing read/write
-         * against user level buffer mapped from Lustre buffer. To avoid
-         * stomping on existing context, optionally force an allocation of a new
-         * one.
-         */
-        env = cl_env_nested_get(nest);
-        if (IS_ERR(env))
-                return ERR_PTR(-EINVAL);
-
-        *env_ret = env;
-
 restart:
         io = vvp_env_thread_io(env);
         io->ci_obj = ll_i2info(inode)->lli_clob;
@@ -155,7 +136,6 @@ restart:
                 if (io->ci_need_restart)
                         goto restart;
 
-                cl_env_nested_put(nest, env);
                 io = ERR_PTR(rc);
         }
 
@@ -169,13 +149,17 @@ static int ll_page_mkwrite0(struct vm_area_struct *vma, struct page *vmpage,
         struct lu_env      *env;
         struct cl_io        *io;
         struct vvp_io      *vio;
-        struct cl_env_nest       nest;
         int                   result;
+        int refcheck;
         sigset_t             set;
         struct inode         *inode;
         struct ll_inode_info     *lli;
 
-        io = ll_fault_io_init(vma, &env,  &nest, vmpage->index, NULL);
+        env = cl_env_get(&refcheck);
+        if (IS_ERR(env))
+                return PTR_ERR(env);
+
+        io = ll_fault_io_init(env, vma, vmpage->index, NULL);
         if (IS_ERR(io)) {
                 result = PTR_ERR(io);
                 goto out;
@@ -231,17 +215,14 @@ static int ll_page_mkwrite0(struct vm_area_struct *vma, struct page *vmpage,
                         result = -EAGAIN;
                 }
 
-                if (result == 0) {
-                        spin_lock(&lli->lli_lock);
-                        lli->lli_flags |= LLIF_DATA_MODIFIED;
-                        spin_unlock(&lli->lli_lock);
-                }
+                if (!result)
+                        set_bit(LLIF_DATA_MODIFIED, &lli->lli_flags);
         }
 
 out_io:
         cl_io_fini(env, io);
-        cl_env_nested_put(&nest, env);
 out:
+        cl_env_put(env, &refcheck);
         CDEBUG(D_MMAP, "%s mkwrite with %d\n", current->comm, result);
         LASSERT(ergo(result == 0, PageLocked(vmpage)));
 
@@ -285,13 +266,19 @@ static int ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf)
         struct vvp_io      *vio = NULL;
         struct page          *vmpage;
         unsigned long       ra_flags;
-        struct cl_env_nest       nest;
-        int                   result;
+        int                   result = 0;
         int                   fault_ret = 0;
+        int refcheck;
+
+        env = cl_env_get(&refcheck);
+        if (IS_ERR(env))
+                return PTR_ERR(env);
 
-        io = ll_fault_io_init(vma, &env,  &nest, vmf->pgoff, &ra_flags);
-        if (IS_ERR(io))
-                return to_fault_error(PTR_ERR(io));
+        io = ll_fault_io_init(env, vma, vmf->pgoff, &ra_flags);
+        if (IS_ERR(io)) {
+                result = to_fault_error(PTR_ERR(io));
+                goto out;
+        }
 
         result = io->ci_result;
         if (result == 0) {
@@ -322,14 +309,15 @@ static int ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf)
                 }
         }
         cl_io_fini(env, io);
-        cl_env_nested_put(&nest, env);
 
         vma->vm_flags |= ra_flags;
+
+out:
+        cl_env_put(env, &refcheck);
         if (result != 0 && !(fault_ret & VM_FAULT_RETRY))
                 fault_ret |= to_fault_error(result);
 
-        CDEBUG(D_MMAP, "%s fault %d/%d\n",
-               current->comm, fault_ret, result);
+        CDEBUG(D_MMAP, "%s fault %d/%d\n", current->comm, fault_ret, result);
         return fault_ret;
 }
 
@@ -381,6 +369,7 @@ static int ll_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
         bool retry;
         int result;
 
+        file_update_time(vma->vm_file);
         do {
                 retry = false;
                 result = ll_page_mkwrite0(vma, vmf->page, &retry);
diff --git a/drivers/staging/lustre/lustre/llite/llite_nfs.c b/drivers/staging/lustre/lustre/llite/llite_nfs.c
index 709230571b4b..c63236580b0f 100644
--- a/drivers/staging/lustre/lustre/llite/llite_nfs.c
+++ b/drivers/staging/lustre/lustre/llite/llite_nfs.c
@@ -226,7 +226,7 @@ static int ll_encode_fh(struct inode *inode, __u32 *fh, int *plen,
 
 static int ll_nfs_get_name_filldir(struct dir_context *ctx, const char *name,
                                    int namelen, loff_t hash, u64 ino,
-                                   unsigned type)
+                                   unsigned int type)
 {
         /* It is hack to access lde_fid for comparison with lgd_fid.
          * So the input 'name' must be part of the 'lu_dirent'.
diff --git a/drivers/staging/lustre/lustre/llite/lproc_llite.c b/drivers/staging/lustre/lustre/llite/lproc_llite.c
index 23fda9d98bff..03682c10fc9e 100644
--- a/drivers/staging/lustre/lustre/llite/lproc_llite.c
+++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c
@@ -1060,10 +1060,6 @@ static const struct llite_file_opcode {
                                    "brw_read" },
         { LPROC_LL_BRW_WRITE,      LPROCFS_CNTR_AVGMINMAX | LPROCFS_TYPE_PAGES,
                                    "brw_write" },
-        { LPROC_LL_OSC_READ,       LPROCFS_CNTR_AVGMINMAX | LPROCFS_TYPE_BYTES,
-                                   "osc_read" },
-        { LPROC_LL_OSC_WRITE,      LPROCFS_CNTR_AVGMINMAX | LPROCFS_TYPE_BYTES,
-                                   "osc_write" },
         { LPROC_LL_IOCTL,         LPROCFS_TYPE_REGS, "ioctl" },
         { LPROC_LL_OPEN,           LPROCFS_TYPE_REGS, "open" },
         { LPROC_LL_RELEASE,     LPROCFS_TYPE_REGS, "close" },
diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 180f35e3afd9..9426759aedc9 100644
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -113,13 +113,18 @@ struct inode *ll_iget(struct super_block *sb, ino_t hash,
         if (inode->i_state & I_NEW) {
                 rc = ll_read_inode2(inode, md);
                 if (!rc && S_ISREG(inode->i_mode) &&
-                    !ll_i2info(inode)->lli_clob) {
-                        CDEBUG(D_INODE, "%s: apply lsm %p to inode "DFID"\n",
-                               ll_get_fsname(sb, NULL, 0), md->lsm,
-                               PFID(ll_inode2fid(inode)));
+                    !ll_i2info(inode)->lli_clob)
                         rc = cl_file_inode_init(inode, md);
-                }
+
                 if (rc) {
+                        /*
+                         * Let's clear directory lsm here, otherwise
+                         * make_bad_inode() will reset the inode mode
+                         * to regular, then ll_clear_inode will not
+                         * be able to clear lsm_md
+                         */
+                        if (S_ISDIR(inode->i_mode))
+                                ll_dir_clear_lsm_md(inode);
                         make_bad_inode(inode);
                         unlock_new_inode(inode);
                         iput(inode);
@@ -132,6 +137,8 @@ struct inode *ll_iget(struct super_block *sb, ino_t hash,
                 CDEBUG(D_VFSTRACE, "got inode: "DFID"(%p): rc = %d\n",
                        PFID(&md->body->mbo_fid1), inode, rc);
                 if (rc) {
+                        if (S_ISDIR(inode->i_mode))
+                                ll_dir_clear_lsm_md(inode);
                         iput(inode);
                         inode = ERR_PTR(rc);
                 }
@@ -258,7 +265,9 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
                         struct ll_inode_info *lli = ll_i2info(inode);
 
                         spin_lock(&lli->lli_lock);
-                        lli->lli_flags &= ~LLIF_MDS_SIZE_LOCK;
+                        LTIME_S(inode->i_mtime) = 0;
+                        LTIME_S(inode->i_atime) = 0;
+                        LTIME_S(inode->i_ctime) = 0;
                         spin_unlock(&lli->lli_lock);
                 }
 
@@ -287,11 +296,39 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 
                                 hash = cl_fid_build_ino(&lli->lli_pfid,
                                                         ll_need_32bit_api(ll_i2sbi(inode)));
-
-                                master_inode = ilookup5(inode->i_sb, hash,
-                                                        ll_test_inode_by_fid,
-                                                        (void *)&lli->lli_pfid);
-                                if (master_inode && !IS_ERR(master_inode)) {
+                                /*
+                                 * Do not lookup the inode with ilookup5,
+                                 * otherwise it will cause dead lock,
+                                 *
+                                 * 1. Client1 send chmod req to the MDT0, then
+                                 * on MDT0, it enqueues master and all of its
+                                 * slaves lock, (mdt_attr_set() ->
+                                 * mdt_lock_slaves()), after gets master and
+                                 * stripe0 lock, it will send the enqueue req
+                                 * (for stripe1) to MDT1, then MDT1 finds the
+                                 * lock has been granted to client2. Then MDT1
+                                 * sends blocking ast to client2.
+                                 *
+                                 * 2. At the same time, client2 tries to unlink
+                                 * the striped dir (rm -rf striped_dir), and
+                                 * during lookup, it will hold the master inode
+                                 * of the striped directory, whose inode state
+                                 * is NEW, then tries to revalidate all of its
+                                 * slaves, (ll_prep_inode()->ll_iget()->
+                                 * ll_read_inode2()-> ll_update_inode().). And
+                                 * it will be blocked on the server side because
+                                 * of 1.
+                                 *
+                                 * 3. Then the client get the blocking_ast req,
+                                 * cancel the lock, but being blocked if using
+                                 * ->ilookup5()), because master inode state is
+                                 *  NEW.
+                                 */
+                                master_inode = ilookup5_nowait(inode->i_sb,
+                                                               hash,
+                                                               ll_test_inode_by_fid,
+                                                               (void *)&lli->lli_pfid);
+                                if (master_inode) {
                                         ll_invalidate_negative_children(master_inode);
                                         iput(master_inode);
                                 }
@@ -535,6 +572,10 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
                 }
         }
 
+        if (it->it_op & IT_OPEN && it->it_flags & FMODE_WRITE &&
+            dentry->d_sb->s_flags & MS_RDONLY)
+                return ERR_PTR(-EROFS);
+
         if (it->it_op & IT_CREAT)
                 opc = LUSTRE_OPC_CREATE;
         else
@@ -801,7 +842,8 @@ static int ll_create_it(struct inode *dir, struct dentry *dentry,
                 return PTR_ERR(inode);
 
         d_instantiate(dentry, inode);
-        return 0;
+
+        return ll_init_security(dentry, inode, dir);
 }
 
 void ll_update_times(struct ptlrpc_request *request, struct inode *inode)
@@ -896,6 +938,8 @@ again:
                 goto err_exit;
 
         d_instantiate(dentry, inode);
+
+        err = ll_init_security(dentry, inode, dir);
 err_exit:
         if (request)
                 ptlrpc_req_finished(request);
diff --git a/drivers/staging/lustre/lustre/llite/rw.c b/drivers/staging/lustre/lustre/llite/rw.c
index 76a6836cdf70..f10e092979fe 100644
--- a/drivers/staging/lustre/lustre/llite/rw.c
+++ b/drivers/staging/lustre/lustre/llite/rw.c
@@ -181,90 +181,73 @@ void ll_ras_enter(struct file *f)
         spin_unlock(&ras->ras_lock);
 }
 
-static int cl_read_ahead_page(const struct lu_env *env, struct cl_io *io,
-                              struct cl_page_list *queue, struct cl_page *page,
-                              struct cl_object *clob, pgoff_t *max_index)
+/**
+ * Initiates read-ahead of a page with given index.
+ *
+ * \retval +ve: page was already uptodate so it will be skipped
+ *              from being added;
+ * \retval -ve: page wasn't added to \a queue for error;
+ * \retval   0: page was added into \a queue for read ahead.
+ */
+static int ll_read_ahead_page(const struct lu_env *env, struct cl_io *io,
+                              struct cl_page_list *queue, pgoff_t index)
 {
-        struct page *vmpage = page->cp_vmpage;
+        enum ra_stat which = _NR_RA_STAT; /* keep gcc happy */
+        struct cl_object *clob = io->ci_obj;
+        struct inode *inode = vvp_object_inode(clob);
+        const char *msg = NULL;
+        struct cl_page *page;
         struct vvp_page *vpg;
-        int           rc;
+        struct page *vmpage;
+        int rc = 0;
+
+        vmpage = grab_cache_page_nowait(inode->i_mapping, index);
+        if (!vmpage) {
+                which = RA_STAT_FAILED_GRAB_PAGE;
+                msg = "g_c_p_n failed";
+                rc = -EBUSY;
+                goto out;
+        }
+
+        /* Check if vmpage was truncated or reclaimed */
+        if (vmpage->mapping != inode->i_mapping) {
+                which = RA_STAT_WRONG_GRAB_PAGE;
+                msg = "g_c_p_n returned invalid page";
+                rc = -EBUSY;
+                goto out;
+        }
+
+        page = cl_page_find(env, clob, vmpage->index, vmpage, CPT_CACHEABLE);
+        if (IS_ERR(page)) {
+                which = RA_STAT_FAILED_GRAB_PAGE;
+                msg = "cl_page_find failed";
+                rc = PTR_ERR(page);
+                goto out;
+        }
 
-        rc = 0;
-        cl_page_assume(env, io, page);
         lu_ref_add(&page->cp_reference, "ra", current);
+        cl_page_assume(env, io, page);
         vpg = cl2vvp_page(cl_object_page_slice(clob, page));
         if (!vpg->vpg_defer_uptodate && !PageUptodate(vmpage)) {
-                CDEBUG(D_READA, "page index %lu, max_index: %lu\n",
-                       vvp_index(vpg), *max_index);
-                if (*max_index == 0 || vvp_index(vpg) > *max_index)
-                        rc = cl_page_is_under_lock(env, io, page, max_index);
-                if (rc == 0) {
-                        vpg->vpg_defer_uptodate = 1;
-                        vpg->vpg_ra_used = 0;
-                        cl_page_list_add(queue, page);
-                        rc = 1;
-                } else {
-                        cl_page_discard(env, io, page);
-                        rc = -ENOLCK;
-                }
+                vpg->vpg_defer_uptodate = 1;
+                vpg->vpg_ra_used = 0;
+                cl_page_list_add(queue, page);
         } else {
                 /* skip completed pages */
                 cl_page_unassume(env, io, page);
+                /* This page is already uptodate, returning a positive number
+                 * to tell the callers about this
+                 */
+                rc = 1;
         }
+
         lu_ref_del(&page->cp_reference, "ra", current);
         cl_page_put(env, page);
-        return rc;
-}
-
-/**
- * Initiates read-ahead of a page with given index.
- *
- * \retval     +ve: page was added to \a queue.
- *
- * \retval -ENOLCK: there is no extent lock for this part of a file, stop
- *                read-ahead.
- *
- * \retval  -ve, 0: page wasn't added to \a queue for other reason.
- */
-static int ll_read_ahead_page(const struct lu_env *env, struct cl_io *io,
-                              struct cl_page_list *queue,
-                              pgoff_t index, pgoff_t *max_index)
-{
-        struct cl_object *clob  = io->ci_obj;
-        struct inode     *inode = vvp_object_inode(clob);
-        struct page      *vmpage;
-        struct cl_page   *page;
-        enum ra_stat      which = _NR_RA_STAT; /* keep gcc happy */
-        int            rc    = 0;
-        const char       *msg   = NULL;
-
-        vmpage = grab_cache_page_nowait(inode->i_mapping, index);
+out:
         if (vmpage) {
-                /* Check if vmpage was truncated or reclaimed */
-                if (vmpage->mapping == inode->i_mapping) {
-                        page = cl_page_find(env, clob, vmpage->index,
-                                            vmpage, CPT_CACHEABLE);
-                        if (!IS_ERR(page)) {
-                                rc = cl_read_ahead_page(env, io, queue,
-                                                        page, clob, max_index);
-                                if (rc == -ENOLCK) {
-                                        which = RA_STAT_FAILED_MATCH;
-                                        msg   = "lock match failed";
-                                }
-                        } else {
-                                which = RA_STAT_FAILED_GRAB_PAGE;
-                                msg   = "cl_page_find failed";
-                        }
-                } else {
-                        which = RA_STAT_WRONG_GRAB_PAGE;
-                        msg   = "g_c_p_n returned invalid page";
-                }
-                if (rc != 1)
+                if (rc)
                         unlock_page(vmpage);
                 put_page(vmpage);
-        } else {
-                which = RA_STAT_FAILED_GRAB_PAGE;
-                msg   = "g_c_p_n failed";
         }
         if (msg) {
                 ll_ra_stats_inc(inode, which);
@@ -379,12 +362,12 @@ static int ll_read_ahead_pages(const struct lu_env *env,
                                struct cl_io *io, struct cl_page_list *queue,
                                struct ra_io_arg *ria,
                                unsigned long *reserved_pages,
-                               unsigned long *ra_end)
+                               pgoff_t *ra_end)
 {
+        struct cl_read_ahead ra = { 0 };
         int rc, count = 0;
         bool stride_ria;
         pgoff_t page_idx;
-        pgoff_t max_index = 0;
 
         LASSERT(ria);
         RIA_DEBUG(ria);
@@ -393,14 +376,23 @@ static int ll_read_ahead_pages(const struct lu_env *env,
         for (page_idx = ria->ria_start;
              page_idx <= ria->ria_end && *reserved_pages > 0; page_idx++) {
                 if (ras_inside_ra_window(page_idx, ria)) {
+                        if (!ra.cra_end || ra.cra_end < page_idx) {
+                                cl_read_ahead_release(env, &ra);
+
+                                rc = cl_io_read_ahead(env, io, page_idx, &ra);
+                                if (rc < 0)
+                                        break;
+
+                                LASSERTF(ra.cra_end >= page_idx,
+                                         "object: %p, indcies %lu / %lu\n",
+                                         io->ci_obj, ra.cra_end, page_idx);
+                        }
+
                         /* If the page is inside the read-ahead window*/
-                        rc = ll_read_ahead_page(env, io, queue,
-                                                page_idx, &max_index);
-                        if (rc == 1) {
+                        rc = ll_read_ahead_page(env, io, queue, page_idx);
+                        if (!rc) {
                                 (*reserved_pages)--;
                                 count++;
-                        } else if (rc == -ENOLCK) {
-                                break;
                         }
                 } else if (stride_ria) {
                         /* If it is not in the read-ahead window, and it is
@@ -426,19 +418,21 @@ static int ll_read_ahead_pages(const struct lu_env *env,
                         }
                 }
         }
+        cl_read_ahead_release(env, &ra);
+
         *ra_end = page_idx;
         return count;
 }
 
-int ll_readahead(const struct lu_env *env, struct cl_io *io,
-                 struct cl_page_list *queue, struct ll_readahead_state *ras,
-                 bool hit)
+static int ll_readahead(const struct lu_env *env, struct cl_io *io,
+                        struct cl_page_list *queue,
+                        struct ll_readahead_state *ras, bool hit)
 {
         struct vvp_io *vio = vvp_env_io(env);
         struct ll_thread_info *lti = ll_env_info(env);
         struct cl_attr *attr = vvp_env_thread_attr(env);
-        unsigned long start = 0, end = 0, reserved;
-        unsigned long ra_end, len, mlen = 0;
+        unsigned long len, mlen = 0, reserved;
+        pgoff_t ra_end, start = 0, end = 0;
         struct inode *inode;
         struct ra_io_arg *ria = &lti->lti_ria;
         struct cl_object *clob;
@@ -464,30 +458,25 @@ int ll_readahead(const struct lu_env *env, struct cl_io *io,
 
         spin_lock(&ras->ras_lock);
 
-        /* Enlarge the RA window to encompass the full read */
-        if (vio->vui_ra_valid &&
-            ras->ras_window_start + ras->ras_window_len <
-            vio->vui_ra_start + vio->vui_ra_count) {
-                ras->ras_window_len = vio->vui_ra_start + vio->vui_ra_count -
-                                      ras->ras_window_start;
-        }
+        /**
+         * Note: other thread might rollback the ras_next_readahead,
+         * if it can not get the full size of prepared pages, see the
+         * end of this function. For stride read ahead, it needs to
+         * make sure the offset is no less than ras_stride_offset,
+         * so that stride read ahead can work correctly.
+         */
+        if (stride_io_mode(ras))
+                start = max(ras->ras_next_readahead, ras->ras_stride_offset);
+        else
+                start = ras->ras_next_readahead;
 
-        /* Reserve a part of the read-ahead window that we'll be issuing */
-        if (ras->ras_window_len > 0) {
-                /*
-                 * Note: other thread might rollback the ras_next_readahead,
-                 * if it can not get the full size of prepared pages, see the
-                 * end of this function. For stride read ahead, it needs to
-                 * make sure the offset is no less than ras_stride_offset,
-                 * so that stride read ahead can work correctly.
-                 */
-                if (stride_io_mode(ras))
-                        start = max(ras->ras_next_readahead,
-                                    ras->ras_stride_offset);
-                else
-                        start = ras->ras_next_readahead;
+        if (ras->ras_window_len > 0)
                 end = ras->ras_window_start + ras->ras_window_len - 1;
-        }
+
+        /* Enlarge the RA window to encompass the full read */
+        if (vio->vui_ra_valid &&
+            end < vio->vui_ra_start + vio->vui_ra_count - 1)
+                end = vio->vui_ra_start + vio->vui_ra_count - 1;
 
         if (end != 0) {
                 unsigned long rpc_boundary;
@@ -576,8 +565,8 @@ int ll_readahead(const struct lu_env *env, struct cl_io *io,
          * if the region we failed to issue read-ahead on is still ahead
          * of the app and behind the next index to start read-ahead from
          */
-        CDEBUG(D_READA, "ra_end %lu end %lu stride end %lu\n",
-               ra_end, end, ria->ria_end);
+        CDEBUG(D_READA, "ra_end = %lu end = %lu stride end = %lu pages = %d\n",
+               ra_end, end, ria->ria_end, ret);
 
         if (ra_end != end + 1) {
                 ll_ra_stats_inc(inode, RA_STAT_FAILED_REACH_END);
@@ -609,7 +598,7 @@ static void ras_reset(struct inode *inode, struct ll_readahead_state *ras,
         ras->ras_consecutive_pages = 0;
         ras->ras_window_len = 0;
         ras_set_start(inode, ras, index);
-        ras->ras_next_readahead = max(ras->ras_window_start, index);
+        ras->ras_next_readahead = max(ras->ras_window_start, index + 1);
 
         RAS_CDEBUG(ras);
 }
@@ -738,12 +727,13 @@ static void ras_increase_window(struct inode *inode,
                                           ra->ra_max_pages_per_file);
 }
 
-void ras_update(struct ll_sb_info *sbi, struct inode *inode,
-                struct ll_readahead_state *ras, unsigned long index,
-                unsigned hit)
+static void ras_update(struct ll_sb_info *sbi, struct inode *inode,
+                       struct ll_readahead_state *ras, unsigned long index,
+                       enum ras_update_flags flags)
 {
         struct ll_ra_info *ra = &sbi->ll_ra_info;
         int zero = 0, stride_detect = 0, ra_miss = 0;
+        bool hit = flags & LL_RAS_HIT;
 
         spin_lock(&ras->ras_lock);
 
@@ -773,7 +763,7 @@ void ras_update(struct ll_sb_info *sbi, struct inode *inode,
          * to for subsequent IO.  The mmap case does not increment
          * ras_requests and thus can never trigger this behavior.
          */
-        if (ras->ras_requests == 2 && !ras->ras_request_index) {
+        if (ras->ras_requests >= 2 && !ras->ras_request_index) {
                 __u64 kms_pages;
 
                 kms_pages = (i_size_read(inode) + PAGE_SIZE - 1) >>
@@ -785,8 +775,7 @@ void ras_update(struct ll_sb_info *sbi, struct inode *inode,
                 if (kms_pages &&
                     kms_pages <= ra->ra_max_read_ahead_whole_pages) {
                         ras->ras_window_start = 0;
-                        ras->ras_last_readpage = 0;
-                        ras->ras_next_readahead = 0;
+                        ras->ras_next_readahead = index + 1;
                         ras->ras_window_len = min(ra->ra_max_pages_per_file,
                                 ra->ra_max_read_ahead_whole_pages);
                         goto out_unlock;
@@ -816,13 +805,20 @@ void ras_update(struct ll_sb_info *sbi, struct inode *inode,
                 if (ra_miss) {
                         if (index_in_stride_window(ras, index) &&
                             stride_io_mode(ras)) {
-                                /*If stride-RA hit cache miss, the stride dector
-                                 *will not be reset to avoid the overhead of
-                                 *redetecting read-ahead mode
-                                 */
                                 if (index != ras->ras_last_readpage + 1)
                                         ras->ras_consecutive_pages = 0;
                                 ras_reset(inode, ras, index);
+
+                                /* If stride-RA hit cache miss, the stride
+                                 * detector will not be reset to avoid the
+                                 * overhead of redetecting read-ahead mode,
+                                 * but on the condition that the stride window
+                                 * is still intersect with normal sequential
+                                 * read-ahead window.
+                                 */
+                                if (ras->ras_window_start <
+                                    ras->ras_stride_offset)
+                                        ras_stride_reset(ras);
                                 RAS_CDEBUG(ras);
                         } else {
                                 /* Reset both stride window and normal RA
@@ -867,8 +863,13 @@ void ras_update(struct ll_sb_info *sbi, struct inode *inode,
         /* Trigger RA in the mmap case where ras_consecutive_requests
          * is not incremented and thus can't be used to trigger RA
          */
-        if (!ras->ras_window_len && ras->ras_consecutive_pages == 4) {
-                ras->ras_window_len = RAS_INCREASE_STEP(inode);
+        if (ras->ras_consecutive_pages >= 4 && flags & LL_RAS_MMAP) {
+                ras_increase_window(inode, ras, ra);
+                /*
+                 * reset consecutive pages so that the readahead window can
+                 * grow gradually.
+                 */
+                ras->ras_consecutive_pages = 0;
                 goto out_unlock;
         }
 
@@ -903,17 +904,17 @@ int ll_writepage(struct page *vmpage, struct writeback_control *wbc)
         struct cl_io       *io;
         struct cl_page   *page;
         struct cl_object       *clob;
-        struct cl_env_nest      nest;
         bool redirtied = false;
         bool unlocked = false;
         int result;
+        int refcheck;
 
         LASSERT(PageLocked(vmpage));
         LASSERT(!PageWriteback(vmpage));
 
         LASSERT(ll_i2dtexp(inode));
 
-        env = cl_env_nested_get(&nest);
+        env = cl_env_get(&refcheck);
         if (IS_ERR(env)) {
                 result = PTR_ERR(env);
                 goto out;
@@ -978,7 +979,7 @@ int ll_writepage(struct page *vmpage, struct writeback_control *wbc)
                 }
         }
 
-        cl_env_nested_put(&nest, env);
+        cl_env_put(env, &refcheck);
         goto out;
 
 out:
@@ -1088,6 +1089,63 @@ void ll_cl_remove(struct file *file, const struct lu_env *env)
         write_unlock(&fd->fd_lock);
 }
 
+static int ll_io_read_page(const struct lu_env *env, struct cl_io *io,
+                           struct cl_page *page)
+{
+        struct inode *inode = vvp_object_inode(page->cp_obj);
+        struct ll_file_data *fd = vvp_env_io(env)->vui_fd;
+        struct ll_readahead_state *ras = &fd->fd_ras;
+        struct cl_2queue *queue  = &io->ci_queue;
+        struct ll_sb_info *sbi = ll_i2sbi(inode);
+        struct vvp_page *vpg;
+        int rc = 0;
+
+        vpg = cl2vvp_page(cl_object_page_slice(page->cp_obj, page));
+        if (sbi->ll_ra_info.ra_max_pages_per_file > 0 &&
+            sbi->ll_ra_info.ra_max_pages > 0) {
+                struct vvp_io *vio = vvp_env_io(env);
+                enum ras_update_flags flags = 0;
+
+                if (vpg->vpg_defer_uptodate)
+                        flags |= LL_RAS_HIT;
+                if (!vio->vui_ra_valid)
+                        flags |= LL_RAS_MMAP;
+                ras_update(sbi, inode, ras, vvp_index(vpg), flags);
+        }
+
+        if (vpg->vpg_defer_uptodate) {
+                vpg->vpg_ra_used = 1;
+                cl_page_export(env, page, 1);
+        }
+
+        cl_2queue_init(queue);
+        /*
+         * Add page into the queue even when it is marked uptodate above.
+         * this will unlock it automatically as part of cl_page_list_disown().
+         */
+        cl_page_list_add(&queue->c2_qin, page);
+        if (sbi->ll_ra_info.ra_max_pages_per_file > 0 &&
+            sbi->ll_ra_info.ra_max_pages > 0) {
+                int rc2;
+
+                rc2 = ll_readahead(env, io, &queue->c2_qin, ras,
+                                   vpg->vpg_defer_uptodate);
+                CDEBUG(D_READA, DFID "%d pages read ahead at %lu\n",
+                       PFID(ll_inode2fid(inode)), rc2, vvp_index(vpg));
+        }
+
+        if (queue->c2_qin.pl_nr > 0)
+                rc = cl_io_submit_rw(env, io, CRT_READ, queue);
+
+        /*
+         * Unlock unsent pages in case of error.
+         */
+        cl_page_list_disown(env, io, &queue->c2_qin);
+        cl_2queue_fini(env, queue);
+
+        return rc;
+}
+
 int ll_readpage(struct file *file, struct page *vmpage)
 {
         struct cl_object *clob = ll_i2info(file_inode(file))->lli_clob;
@@ -1111,7 +1169,7 @@ int ll_readpage(struct file *file, struct page *vmpage)
                 LASSERT(page->cp_type == CPT_CACHEABLE);
                 if (likely(!PageUptodate(vmpage))) {
                         cl_page_assume(env, io, page);
-                        result = cl_io_read_page(env, io, page);
+                        result = ll_io_read_page(env, io, page);
                 } else {
                         /* Page from a non-object file. */
                         unlock_page(vmpage);
diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index 26f3a37873a7..21e06e5b514e 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -71,8 +71,6 @@ static void ll_invalidatepage(struct page *vmpage, unsigned int offset,
         struct cl_page   *page;
         struct cl_object *obj;
 
-        int refcheck;
-
         LASSERT(PageLocked(vmpage));
         LASSERT(!PageWriteback(vmpage));
 
@@ -82,28 +80,27 @@ static void ll_invalidatepage(struct page *vmpage, unsigned int offset,
          * happening with locked page too
          */
         if (offset == 0 && length == PAGE_SIZE) {
-                env = cl_env_get(&refcheck);
-                if (!IS_ERR(env)) {
-                        inode = vmpage->mapping->host;
-                        obj = ll_i2info(inode)->lli_clob;
-                        if (obj) {
-                                page = cl_vmpage_page(vmpage, obj);
-                                if (page) {
-                                        cl_page_delete(env, page);
-                                        cl_page_put(env, page);
-                                }
-                        } else {
-                                LASSERT(vmpage->private == 0);
+                /* See the comment in ll_releasepage() */
+                env = cl_env_percpu_get();
+                LASSERT(!IS_ERR(env));
+                inode = vmpage->mapping->host;
+                obj = ll_i2info(inode)->lli_clob;
+                if (obj) {
+                        page = cl_vmpage_page(vmpage, obj);
+                        if (page) {
+                                cl_page_delete(env, page);
+                                cl_page_put(env, page);
                         }
-                        cl_env_put(env, &refcheck);
+                } else {
+                        LASSERT(vmpage->private == 0);
                 }
+                cl_env_percpu_put(env);
         }
 }
 
 static int ll_releasepage(struct page *vmpage, gfp_t gfp_mask)
 {
         struct lu_env     *env;
-        void                    *cookie;
         struct cl_object  *obj;
         struct cl_page    *page;
         struct address_space *mapping;
@@ -129,7 +126,6 @@ static int ll_releasepage(struct page *vmpage, gfp_t gfp_mask)
         if (!page)
                 return 1;
 
-        cookie = cl_env_reenter();
         env = cl_env_percpu_get();
         LASSERT(!IS_ERR(env));
 
@@ -155,7 +151,6 @@ static int ll_releasepage(struct page *vmpage, gfp_t gfp_mask)
         cl_page_put(env, page);
 
         cl_env_percpu_put(env);
-        cl_env_reexit(cookie);
         return result;
 }
 
@@ -340,19 +335,15 @@ static ssize_t ll_direct_IO_26_seg(const struct lu_env *env, struct cl_io *io,
                        PAGE_SIZE) & ~(DT_MAX_BRW_SIZE - 1))
 static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter)
 {
-        struct lu_env *env;
+        struct ll_cl_context *lcc;
+        const struct lu_env *env;
         struct cl_io *io;
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
         loff_t file_offset = iocb->ki_pos;
         ssize_t count = iov_iter_count(iter);
         ssize_t tot_bytes = 0, result = 0;
-        struct ll_inode_info *lli = ll_i2info(inode);
         long size = MAX_DIO_SIZE;
-        int refcheck;
-
-        if (!lli->lli_has_smd)
-                return -EBADF;
 
         /* FIXME: io smaller than PAGE_SIZE is broken on ia64 ??? */
         if ((file_offset & ~PAGE_MASK) || (count & ~PAGE_MASK))
@@ -367,9 +358,13 @@ static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter)
         if (iov_iter_alignment(iter) & ~PAGE_MASK)
                 return -EINVAL;
 
-        env = cl_env_get(&refcheck);
+        lcc = ll_cl_find(file);
+        if (!lcc)
+                return -EIO;
+
+        env = lcc->lcc_env;
         LASSERT(!IS_ERR(env));
-        io = vvp_env_io(env)->vui_cl.cis_io;
+        io = lcc->lcc_io;
         LASSERT(io);
 
         while (iov_iter_count(iter)) {
@@ -426,7 +421,6 @@ out:
                 vio->u.write.vui_written += tot_bytes;
         }
 
-        cl_env_put(env, &refcheck);
         return tot_bytes ? tot_bytes : result;
 }
 
@@ -466,13 +460,13 @@ static int ll_prepare_partial_page(const struct lu_env *env, struct cl_io *io,
 }
 
 static int ll_write_begin(struct file *file, struct address_space *mapping,
-                          loff_t pos, unsigned len, unsigned flags,
+                          loff_t pos, unsigned int len, unsigned int flags,
                           struct page **pagep, void **fsdata)
 {
         struct ll_cl_context *lcc;
-        const struct lu_env  *env;
+        const struct lu_env *env = NULL;
         struct cl_io   *io;
-        struct cl_page *page;
+        struct cl_page *page = NULL;
         struct cl_object *clob = ll_i2info(mapping->host)->lli_clob;
         pgoff_t index = pos >> PAGE_SHIFT;
         struct page *vmpage = NULL;
@@ -484,6 +478,7 @@ static int ll_write_begin(struct file *file, struct address_space *mapping,
 
         lcc = ll_cl_find(file);
         if (!lcc) {
+                io = NULL;
                 result = -EIO;
                 goto out;
         }
@@ -560,6 +555,12 @@ out:
                         unlock_page(vmpage);
                         put_page(vmpage);
                 }
+                if (!IS_ERR_OR_NULL(page)) {
+                        lu_ref_del(&page->cp_reference, "cl_io", io);
+                        cl_page_put(env, page);
+                }
+                if (io)
+                        io->ci_result = result;
         } else {
                 *pagep = vmpage;
                 *fsdata = lcc;
@@ -576,7 +577,7 @@ static int ll_write_end(struct file *file, struct address_space *mapping,
         struct cl_io *io;
         struct vvp_io *vio;
         struct cl_page *page;
-        unsigned from = pos & (PAGE_SIZE - 1);
+        unsigned int from = pos & (PAGE_SIZE - 1);
         bool unplug = false;
         int result = 0;
 
@@ -629,6 +630,8 @@ static int ll_write_end(struct file *file, struct address_space *mapping,
             file->f_flags & O_SYNC || IS_SYNC(file_inode(file)))
                 result = vvp_io_write_commit(env, io);
 
+        if (result < 0)
+                io->ci_result = result;
         return result >= 0 ? copied : result;
 }
 
diff --git a/drivers/staging/lustre/lustre/llite/statahead.c b/drivers/staging/lustre/lustre/llite/statahead.c
index 0677513476ec..4769a2230ae1 100644
--- a/drivers/staging/lustre/lustre/llite/statahead.c
+++ b/drivers/staging/lustre/lustre/llite/statahead.c
@@ -659,8 +659,8 @@ static int ll_statahead_interpret(struct ptlrpc_request *req,
         struct ll_inode_info     *lli = ll_i2info(dir);
         struct ll_statahead_info *sai = lli->lli_sai;
         struct sa_entry *entry = (struct sa_entry *)minfo->mi_cbdata;
+        wait_queue_head_t *waitq = NULL;
         __u64 handle = 0;
-        bool wakeup;
 
         if (it_disposition(it, DISP_LOOKUP_NEG))
                 rc = -ENOENT;
@@ -693,7 +693,8 @@ static int ll_statahead_interpret(struct ptlrpc_request *req,
 
         spin_lock(&lli->lli_sa_lock);
         if (rc) {
-                wakeup = __sa_make_ready(sai, entry, rc);
+                if (__sa_make_ready(sai, entry, rc))
+                        waitq = &sai->sai_waitq;
         } else {
                 entry->se_minfo = minfo;
                 entry->se_req = ptlrpc_request_addref(req);
@@ -704,13 +705,15 @@ static int ll_statahead_interpret(struct ptlrpc_request *req,
                  * with parent's lock held, for example: unlink.
                  */
                 entry->se_handle = handle;
-                wakeup = !sa_has_callback(sai);
+                if (!sa_has_callback(sai))
+                        waitq = &sai->sai_thread.t_ctl_waitq;
+
                 list_add_tail(&entry->se_list, &sai->sai_interim_entries);
         }
         sai->sai_replied++;
 
-        if (wakeup)
-                wake_up(&sai->sai_thread.t_ctl_waitq);
+        if (waitq)
+                wake_up(waitq);
         spin_unlock(&lli->lli_sa_lock);
 
         return rc;
@@ -1397,10 +1400,10 @@ static int revalidate_statahead_dentry(struct inode *dir,
                                        struct dentry **dentryp,
                                        bool unplug)
 {
+        struct ll_inode_info *lli = ll_i2info(dir);
         struct sa_entry *entry = NULL;
         struct l_wait_info lwi = { 0 };
         struct ll_dentry_data *ldd;
-        struct ll_inode_info *lli;
         int rc = 0;
 
         if ((*dentryp)->d_name.name[0] == '.') {
@@ -1446,7 +1449,9 @@ static int revalidate_statahead_dentry(struct inode *dir,
                 sa_handle_callback(sai);
 
         if (!sa_ready(entry)) {
+                spin_lock(&lli->lli_sa_lock);
                 sai->sai_index_wait = entry->se_index;
+                spin_unlock(&lli->lli_sa_lock);
                 lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(30), NULL,
                                        LWI_ON_SIGNAL_NOOP, NULL);
                 rc = l_wait_event(sai->sai_waitq, sa_ready(entry), &lwi);
@@ -1475,6 +1480,7 @@ static int revalidate_statahead_dentry(struct inode *dir,
 
                                 alias = ll_splice_alias(inode, *dentryp);
                                 if (IS_ERR(alias)) {
+                                        ll_intent_release(&it);
                                         rc = PTR_ERR(alias);
                                         goto out_unplug;
                                 }
@@ -1493,6 +1499,7 @@ static int revalidate_statahead_dentry(struct inode *dir,
                                        *dentryp,
                                        PFID(ll_inode2fid((*dentryp)->d_inode)),
                                        PFID(ll_inode2fid(inode)));
+                                ll_intent_release(&it);
                                 rc = -ESTALE;
                                 goto out_unplug;
                         }
@@ -1512,7 +1519,6 @@ out_unplug:
          * dentry_may_statahead().
          */
         ldd = ll_d2d(*dentryp);
-        lli = ll_i2info(dir);
         /* ldd can be NULL if llite lookup failed. */
         if (ldd)
                 ldd->lld_sa_generation = lli->lli_sa_generation;
diff --git a/drivers/staging/lustre/lustre/llite/vvp_dev.c b/drivers/staging/lustre/lustre/llite/vvp_dev.c
index 8aa8ecc09a48..12c129f7e4ad 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_dev.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_dev.c
@@ -55,7 +55,6 @@
 static struct kmem_cache *ll_thread_kmem;
 struct kmem_cache *vvp_lock_kmem;
 struct kmem_cache *vvp_object_kmem;
-struct kmem_cache *vvp_req_kmem;
 static struct kmem_cache *vvp_session_kmem;
 static struct kmem_cache *vvp_thread_kmem;
 
@@ -76,11 +75,6 @@ static struct lu_kmem_descr vvp_caches[] = {
                 .ckd_size  = sizeof(struct vvp_object),
         },
         {
-                .ckd_cache = &vvp_req_kmem,
-                .ckd_name  = "vvp_req_kmem",
-                .ckd_size  = sizeof(struct vvp_req),
-        },
-        {
                 .ckd_cache = &vvp_session_kmem,
                 .ckd_name  = "vvp_session_kmem",
                 .ckd_size  = sizeof(struct vvp_session)
@@ -177,10 +171,6 @@ static const struct lu_device_operations vvp_lu_ops = {
         .ldo_object_alloc      = vvp_object_alloc
 };
 
-static const struct cl_device_operations vvp_cl_ops = {
-        .cdo_req_init = vvp_req_init
-};
-
 static struct lu_device *vvp_device_free(const struct lu_env *env,
                                          struct lu_device *d)
 {
@@ -213,7 +203,6 @@ static struct lu_device *vvp_device_alloc(const struct lu_env *env,
         lud = &vdv->vdv_cl.cd_lu_dev;
         cl_device_init(&vdv->vdv_cl, t);
         vvp2lu_dev(vdv)->ld_ops = &vvp_lu_ops;
-        vdv->vdv_cl.cd_ops = &vvp_cl_ops;
 
         site = kzalloc(sizeof(*site), GFP_NOFS);
         if (site) {
@@ -332,7 +321,6 @@ int cl_sb_init(struct super_block *sb)
                 cl = cl_type_setup(env, NULL, &vvp_device_type,
                                    sbi->ll_dt_exp->exp_obd->obd_lu_dev);
                 if (!IS_ERR(cl)) {
-                        cl2vvp_dev(cl)->vdv_sb = sb;
                         sbi->ll_cl = cl;
                         sbi->ll_site = cl2lu_dev(cl)->ld_site;
                 }
@@ -521,11 +509,10 @@ static void vvp_pgcache_page_show(const struct lu_env *env,
 
         vpg = cl2vvp_page(cl_page_at(page, &vvp_device_type));
         vmpage = vpg->vpg_page;
-        seq_printf(seq, " %5i | %p %p %s %s %s %s | %p "DFID"(%p) %lu %u [",
+        seq_printf(seq, " %5i | %p %p %s %s %s | %p " DFID "(%p) %lu %u [",
                    0 /* gen */,
                    vpg, page,
                    "none",
-                   vpg->vpg_write_queued ? "wq" : "- ",
                    vpg->vpg_defer_uptodate ? "du" : "- ",
                    PageWriteback(vmpage) ? "wb" : "-",
                    vmpage, PFID(ll_inode2fid(vmpage->mapping->host)),
diff --git a/drivers/staging/lustre/lustre/llite/vvp_internal.h b/drivers/staging/lustre/lustre/llite/vvp_internal.h
index 4464ad258387..c60d0414ac25 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_internal.h
+++ b/drivers/staging/lustre/lustre/llite/vvp_internal.h
@@ -42,9 +42,7 @@
 
 enum obd_notify_event;
 struct inode;
-struct lov_stripe_md;
 struct lustre_md;
-struct obd_capa;
 struct obd_device;
 struct obd_export;
 struct page;
@@ -122,7 +120,6 @@ extern struct lu_context_key vvp_thread_key;
 
 extern struct kmem_cache *vvp_lock_kmem;
 extern struct kmem_cache *vvp_object_kmem;
-extern struct kmem_cache *vvp_req_kmem;
 
 struct vvp_thread_info {
         struct cl_lock          vti_lock;
@@ -195,14 +192,6 @@ struct vvp_object {
         struct inode           *vob_inode;
 
         /**
-         * A list of dirty pages pending IO in the cache. Used by
-         * SOM. Protected by ll_inode_info::lli_lock.
-         *
-         * \see vvp_page::vpg_pending_linkage
-         */
-        struct list_head        vob_pending_list;
-
-        /**
          * Number of transient pages.  This is no longer protected by i_sem,
          * and needs to be atomic.  This is not actually used for anything,
          * and can probably be removed.
@@ -235,15 +224,7 @@ struct vvp_object {
 struct vvp_page {
         struct cl_page_slice vpg_cl;
         unsigned int    vpg_defer_uptodate:1,
-                        vpg_ra_used:1,
-                        vpg_write_queued:1;
-        /**
-         * Non-empty iff this page is already counted in
-         * vvp_object::vob_pending_list. This list is only used as a flag,
-         * that is, never iterated through, only checked for list_empty(), but
-         * having a list is useful for debugging.
-         */
-        struct list_head           vpg_pending_linkage;
+                        vpg_ra_used:1;
         /** VM page */
         struct page       *vpg_page;
 };
@@ -260,7 +241,6 @@ static inline pgoff_t vvp_index(struct vvp_page *vvp)
 
 struct vvp_device {
         struct cl_device    vdv_cl;
-        struct super_block *vdv_sb;
         struct cl_device   *vdv_next;
 };
 
@@ -268,10 +248,6 @@ struct vvp_lock {
         struct cl_lock_slice vlk_cl;
 };
 
-struct vvp_req {
-        struct cl_req_slice  vrq_cl;
-};
-
 void *ccc_key_init(const struct lu_context *ctx,
                    struct lu_context_key *key);
 void ccc_key_fini(const struct lu_context *ctx,
@@ -325,21 +301,8 @@ static inline struct vvp_lock *cl2vvp_lock(const struct cl_lock_slice *slice)
 # define CLOBINVRNT(env, clob, expr)                                    \
         ((void)sizeof(env), (void)sizeof(clob), (void)sizeof(!!(expr)))
 
-/**
- * New interfaces to get and put lov_stripe_md from lov layer. This violates
- * layering because lov_stripe_md is supposed to be a private data in lov.
- *
- * NB: If you find you have to use these interfaces for your new code, please
- * think about it again. These interfaces may be removed in the future for
- * better layering.
- */
-struct lov_stripe_md *lov_lsm_get(struct cl_object *clobj);
-void lov_lsm_put(struct cl_object *clobj, struct lov_stripe_md *lsm);
 int lov_read_and_clear_async_rc(struct cl_object *clob);
 
-struct lov_stripe_md *ccc_inode_lsm_get(struct inode *inode);
-void ccc_inode_lsm_put(struct inode *inode, struct lov_stripe_md *lsm);
-
 int vvp_io_init(const struct lu_env *env, struct cl_object *obj,
                 struct cl_io *io);
 int vvp_io_write_commit(const struct lu_env *env, struct cl_io *io);
@@ -347,8 +310,6 @@ int vvp_lock_init(const struct lu_env *env, struct cl_object *obj,
                   struct cl_lock *lock, const struct cl_io *io);
 int vvp_page_init(const struct lu_env *env, struct cl_object *obj,
                   struct cl_page *page, pgoff_t index);
-int vvp_req_init(const struct lu_env *env, struct cl_device *dev,
-                 struct cl_req *req);
 struct lu_object *vvp_object_alloc(const struct lu_env *env,
                                    const struct lu_object_header *hdr,
                                    struct lu_device *dev);
diff --git a/drivers/staging/lustre/lustre/llite/vvp_io.c b/drivers/staging/lustre/lustre/llite/vvp_io.c
index 2b7f182a15e2..0b6d388d8aa4 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_io.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_io.c
@@ -72,9 +72,10 @@ static bool can_populate_pages(const struct lu_env *env, struct cl_io *io,
                 /* don't need lock here to check lli_layout_gen as we have held
                  * extent lock and GROUP lock has to hold to swap layout
                  */
-                if (ll_layout_version_get(lli) != vio->vui_layout_gen) {
+                if (ll_layout_version_get(lli) != vio->vui_layout_gen ||
+                    OBD_FAIL_CHECK_RESET(OBD_FAIL_LLITE_LOST_LAYOUT, 0)) {
                         io->ci_need_restart = 1;
-                        /* this will return application a short read/write */
+                        /* this will cause a short read/write */
                         io->ci_continue = 0;
                         rc = false;
                 }
@@ -328,8 +329,8 @@ static void vvp_io_fini(const struct lu_env *env, const struct cl_io_slice *ios)
                                vio->vui_layout_gen, gen);
                         /* today successful restore is the only possible case */
                         /* restore was done, clear restoring state */
-                        ll_i2info(vvp_object_inode(obj))->lli_flags &=
-                                ~LLIF_FILE_RESTORING;
+                        clear_bit(LLIF_FILE_RESTORING,
+                                  &ll_i2info(inode)->lli_flags);
                 }
         }
 }
@@ -369,7 +370,7 @@ static int vvp_mmap_locks(const struct lu_env *env,
         struct mm_struct       *mm = current->mm;
         struct vm_area_struct  *vma;
         struct cl_lock_descr   *descr = &cti->vti_descr;
-        ldlm_policy_data_t      policy;
+        union ldlm_policy_data policy;
         unsigned long      addr;
         ssize_t          count;
         int              result = 0;
@@ -450,7 +451,8 @@ static void vvp_io_advance(const struct lu_env *env,
         struct vvp_io    *vio = cl2vvp_io(env, ios);
         CLOBINVRNT(env, obj, vvp_object_invariant(obj));
 
-        iov_iter_reexpand(vio->vui_iter, vio->vui_tot_count  -= nob);
+        vio->vui_tot_count -= nob;
+        iov_iter_reexpand(vio->vui_iter, vio->vui_tot_count);
 }
 
 static void vvp_io_update_iov(const struct lu_env *env,
@@ -551,9 +553,16 @@ static int vvp_io_setattr_lock(const struct lu_env *env,
                 if (new_size == 0)
                         enqflags = CEF_DISCARD_DATA;
         } else {
-                if ((io->u.ci_setattr.sa_attr.lvb_mtime >=
-                     io->u.ci_setattr.sa_attr.lvb_ctime) ||
-                    (io->u.ci_setattr.sa_attr.lvb_atime >=
+                unsigned int valid = io->u.ci_setattr.sa_valid;
+
+                if (!(valid & TIMES_SET_FLAGS))
+                        return 0;
+
+                if ((!(valid & ATTR_MTIME) ||
+                     io->u.ci_setattr.sa_attr.lvb_mtime >=
+                     io->u.ci_setattr.sa_attr.lvb_ctime) &&
+                    (!(valid & ATTR_ATIME) ||
+                     io->u.ci_setattr.sa_attr.lvb_atime >=
                      io->u.ci_setattr.sa_attr.lvb_ctime))
                         return 0;
                 new_size = 0;
@@ -580,14 +589,6 @@ static int vvp_do_vmtruncate(struct inode *inode, size_t size)
         return result;
 }
 
-static int vvp_io_setattr_trunc(const struct lu_env *env,
-                                const struct cl_io_slice *ios,
-                                struct inode *inode, loff_t size)
-{
-        inode_dio_wait(inode);
-        return 0;
-}
-
 static int vvp_io_setattr_time(const struct lu_env *env,
                                const struct cl_io_slice *ios)
 {
@@ -618,15 +619,20 @@ static int vvp_io_setattr_start(const struct lu_env *env,
 {
         struct cl_io    *io    = ios->cis_io;
         struct inode    *inode = vvp_object_inode(io->ci_obj);
-        int result = 0;
+        struct ll_inode_info *lli = ll_i2info(inode);
 
-        inode_lock(inode);
-        if (cl_io_is_trunc(io))
-                result = vvp_io_setattr_trunc(env, ios, inode,
-                                        io->u.ci_setattr.sa_attr.lvb_size);
-        if (result == 0)
-                result = vvp_io_setattr_time(env, ios);
-        return result;
+        if (cl_io_is_trunc(io)) {
+                down_write(&lli->lli_trunc_sem);
+                inode_lock(inode);
+                inode_dio_wait(inode);
+        } else {
+                inode_lock(inode);
+        }
+
+        if (io->u.ci_setattr.sa_valid & TIMES_SET_FLAGS)
+                return vvp_io_setattr_time(env, ios);
+
+        return 0;
 }
 
 static void vvp_io_setattr_end(const struct lu_env *env,
@@ -634,14 +640,18 @@ static void vvp_io_setattr_end(const struct lu_env *env,
 {
         struct cl_io *io    = ios->cis_io;
         struct inode *inode = vvp_object_inode(io->ci_obj);
+        struct ll_inode_info *lli = ll_i2info(inode);
 
-        if (cl_io_is_trunc(io))
+        if (cl_io_is_trunc(io)) {
                 /* Truncate in memory pages - they must be clean pages
                  * because osc has already notified to destroy osc_extents.
                  */
                 vvp_do_vmtruncate(inode, io->u.ci_setattr.sa_attr.lvb_size);
-
-        inode_unlock(inode);
+                inode_unlock(inode);
+                up_write(&lli->lli_trunc_sem);
+        } else {
+                inode_unlock(inode);
+        }
 }
 
 static void vvp_io_setattr_fini(const struct lu_env *env,
@@ -657,6 +667,7 @@ static int vvp_io_read_start(const struct lu_env *env,
         struct cl_io      *io    = ios->cis_io;
         struct cl_object  *obj   = io->ci_obj;
         struct inode      *inode = vvp_object_inode(obj);
+        struct ll_inode_info *lli = ll_i2info(inode);
         struct file       *file  = vio->vui_fd->fd_file;
 
         int     result;
@@ -669,6 +680,8 @@ static int vvp_io_read_start(const struct lu_env *env,
 
         CDEBUG(D_VFSTRACE, "read: -> [%lli, %lli)\n", pos, pos + cnt);
 
+        down_read(&lli->lli_trunc_sem);
+
         if (!can_populate_pages(env, io, inode))
                 return 0;
 
@@ -770,16 +783,11 @@ static int vvp_io_commit_sync(const struct lu_env *env, struct cl_io *io,
 static void write_commit_callback(const struct lu_env *env, struct cl_io *io,
                                   struct cl_page *page)
 {
-        struct vvp_page *vpg;
         struct page *vmpage = page->cp_vmpage;
-        struct cl_object *clob = cl_io_top(io)->ci_obj;
 
         SetPageUptodate(vmpage);
         set_page_dirty(vmpage);
 
-        vpg = cl2vvp_page(cl_object_page_slice(clob, page));
-        vvp_write_pending(cl2vvp(clob), vpg);
-
         cl_page_disown(env, io, page);
 
         /* held in ll_cl_init() */
@@ -899,10 +907,13 @@ static int vvp_io_write_start(const struct lu_env *env,
         struct cl_io       *io    = ios->cis_io;
         struct cl_object   *obj   = io->ci_obj;
         struct inode       *inode = vvp_object_inode(obj);
+        struct ll_inode_info *lli = ll_i2info(inode);
         ssize_t result = 0;
         loff_t pos = io->u.ci_wr.wr.crw_pos;
         size_t cnt = io->u.ci_wr.wr.crw_count;
 
+        down_read(&lli->lli_trunc_sem);
+
         if (!can_populate_pages(env, io, inode))
                 return 0;
 
@@ -921,6 +932,20 @@ static int vvp_io_write_start(const struct lu_env *env,
 
         CDEBUG(D_VFSTRACE, "write: [%lli, %lli)\n", pos, pos + (long long)cnt);
 
+        /*
+         * The maximum Lustre file size is variable, based on the OST maximum
+         * object size and number of stripes.  This needs another check in
+         * addition to the VFS checks earlier.
+         */
+        if (pos + cnt > ll_file_maxbytes(inode)) {
+                CDEBUG(D_INODE,
+                       "%s: file " DFID " offset %llu > maxbytes %llu\n",
+                       ll_get_fsname(inode->i_sb, NULL, 0),
+                       PFID(ll_inode2fid(inode)), pos + cnt,
+                       ll_file_maxbytes(inode));
+                return -EFBIG;
+        }
+
         if (!vio->vui_iter) {
                 /* from a temp io in ll_cl_init(). */
                 result = 0;
@@ -957,11 +982,7 @@ static int vvp_io_write_start(const struct lu_env *env,
                 }
         }
         if (result > 0) {
-                struct ll_inode_info *lli = ll_i2info(inode);
-
-                spin_lock(&lli->lli_lock);
-                lli->lli_flags |= LLIF_DATA_MODIFIED;
-                spin_unlock(&lli->lli_lock);
+                set_bit(LLIF_DATA_MODIFIED, &(ll_i2info(inode))->lli_flags);
 
                 if (result < cnt)
                         io->ci_continue = 0;
@@ -972,6 +993,15 @@ static int vvp_io_write_start(const struct lu_env *env,
         return result;
 }
 
+static void vvp_io_rw_end(const struct lu_env *env,
+                          const struct cl_io_slice *ios)
+{
+        struct inode *inode = vvp_object_inode(ios->cis_obj);
+        struct ll_inode_info *lli = ll_i2info(inode);
+
+        up_read(&lli->lli_trunc_sem);
+}
+
 static int vvp_io_kernel_fault(struct vvp_fault_io *cfio)
 {
         struct vm_fault *vmf = cfio->ft_vmf;
@@ -1014,13 +1044,7 @@ static int vvp_io_kernel_fault(struct vvp_fault_io *cfio)
 static void mkwrite_commit_callback(const struct lu_env *env, struct cl_io *io,
                                     struct cl_page *page)
 {
-        struct vvp_page *vpg;
-        struct cl_object *clob = cl_io_top(io)->ci_obj;
-
         set_page_dirty(page->cp_vmpage);
-
-        vpg = cl2vvp_page(cl_object_page_slice(clob, page));
-        vvp_write_pending(cl2vvp(clob), vpg);
 }
 
 static int vvp_io_fault_start(const struct lu_env *env,
@@ -1030,6 +1054,7 @@ static int vvp_io_fault_start(const struct lu_env *env,
         struct cl_io    *io      = ios->cis_io;
         struct cl_object    *obj     = io->ci_obj;
         struct inode        *inode   = vvp_object_inode(obj);
+        struct ll_inode_info *lli = ll_i2info(inode);
         struct cl_fault_io  *fio     = &io->u.ci_fault;
         struct vvp_fault_io *cfio    = &vio->u.fault;
         loff_t         offset;
@@ -1039,11 +1064,7 @@ static int vvp_io_fault_start(const struct lu_env *env,
         loff_t         size;
         pgoff_t              last_index;
 
-        if (fio->ft_executable &&
-            inode->i_mtime.tv_sec != vio->u.fault.ft_mtime)
-                CWARN("binary "DFID
-                      " changed while waiting for the page fault lock\n",
-                      PFID(lu_object_fid(&obj->co_lu)));
+        down_read(&lli->lli_trunc_sem);
 
         /* offset of the last byte on the page */
         offset = cl_offset(obj, fio->ft_index + 1) - 1;
@@ -1192,6 +1213,17 @@ out:
         return result;
 }
 
+static void vvp_io_fault_end(const struct lu_env *env,
+                             const struct cl_io_slice *ios)
+{
+        struct inode *inode = vvp_object_inode(ios->cis_obj);
+        struct ll_inode_info *lli = ll_i2info(inode);
+
+        CLOBINVRNT(env, ios->cis_io->ci_obj,
+                   vvp_object_invariant(ios->cis_io->ci_obj));
+        up_read(&lli->lli_trunc_sem);
+}
+
 static int vvp_io_fsync_start(const struct lu_env *env,
                               const struct cl_io_slice *ios)
 {
@@ -1202,46 +1234,23 @@ static int vvp_io_fsync_start(const struct lu_env *env,
         return 0;
 }
 
-static int vvp_io_read_page(const struct lu_env *env,
-                            const struct cl_io_slice *ios,
-                            const struct cl_page_slice *slice)
+static int vvp_io_read_ahead(const struct lu_env *env,
+                             const struct cl_io_slice *ios,
+                             pgoff_t start, struct cl_read_ahead *ra)
 {
-        struct cl_io          *io     = ios->cis_io;
-        struct vvp_page           *vpg    = cl2vvp_page(slice);
-        struct cl_page      *page   = slice->cpl_page;
-        struct inode              *inode  = vvp_object_inode(slice->cpl_obj);
-        struct ll_sb_info        *sbi    = ll_i2sbi(inode);
-        struct ll_file_data       *fd     = cl2vvp_io(env, ios)->vui_fd;
-        struct ll_readahead_state *ras    = &fd->fd_ras;
-        struct cl_2queue          *queue  = &io->ci_queue;
-
-        if (sbi->ll_ra_info.ra_max_pages_per_file &&
-            sbi->ll_ra_info.ra_max_pages)
-                ras_update(sbi, inode, ras, vvp_index(vpg),
-                           vpg->vpg_defer_uptodate);
-
-        if (vpg->vpg_defer_uptodate) {
-                vpg->vpg_ra_used = 1;
-                cl_page_export(env, page, 1);
-        }
-        /*
-         * Add page into the queue even when it is marked uptodate above.
-         * this will unlock it automatically as part of cl_page_list_disown().
-         */
+        int result = 0;
 
-        cl_page_list_add(&queue->c2_qin, page);
-        if (sbi->ll_ra_info.ra_max_pages_per_file &&
-            sbi->ll_ra_info.ra_max_pages)
-                ll_readahead(env, io, &queue->c2_qin, ras,
-                             vpg->vpg_defer_uptodate);
+        if (ios->cis_io->ci_type == CIT_READ ||
+            ios->cis_io->ci_type == CIT_FAULT) {
+                struct vvp_io *vio = cl2vvp_io(env, ios);
 
-        return 0;
-}
+                if (unlikely(vio->vui_fd->fd_flags & LL_FILE_GROUP_LOCKED)) {
+                        ra->cra_end = CL_PAGE_EOF;
+                        result = 1; /* no need to call down */
+                }
+        }
 
-static void vvp_io_end(const struct lu_env *env, const struct cl_io_slice *ios)
-{
-        CLOBINVRNT(env, ios->cis_io->ci_obj,
-                   vvp_object_invariant(ios->cis_io->ci_obj));
+        return result;
 }
 
 static const struct cl_io_operations vvp_io_ops = {
@@ -1250,6 +1259,7 @@ static const struct cl_io_operations vvp_io_ops = {
                         .cio_fini       = vvp_io_fini,
                         .cio_lock      = vvp_io_read_lock,
                         .cio_start     = vvp_io_read_start,
+                        .cio_end        = vvp_io_rw_end,
                         .cio_advance    = vvp_io_advance,
                 },
                 [CIT_WRITE] = {
@@ -1258,6 +1268,7 @@ static const struct cl_io_operations vvp_io_ops = {
                         .cio_iter_fini = vvp_io_write_iter_fini,
                         .cio_lock      = vvp_io_write_lock,
                         .cio_start     = vvp_io_write_start,
+                        .cio_end        = vvp_io_rw_end,
                         .cio_advance   = vvp_io_advance,
                 },
                 [CIT_SETATTR] = {
@@ -1272,7 +1283,7 @@ static const struct cl_io_operations vvp_io_ops = {
                         .cio_iter_init = vvp_io_fault_iter_init,
                         .cio_lock      = vvp_io_fault_lock,
                         .cio_start     = vvp_io_fault_start,
-                        .cio_end       = vvp_io_end,
+                        .cio_end       = vvp_io_fault_end,
                 },
                 [CIT_FSYNC] = {
                         .cio_start  = vvp_io_fsync_start,
@@ -1282,7 +1293,7 @@ static const struct cl_io_operations vvp_io_ops = {
                         .cio_fini   = vvp_io_fini
                 }
         },
-        .cio_read_page     = vvp_io_read_page,
+        .cio_read_ahead = vvp_io_read_ahead,
 };
 
 int vvp_io_init(const struct lu_env *env, struct cl_object *obj,
diff --git a/drivers/staging/lustre/lustre/llite/vvp_object.c b/drivers/staging/lustre/lustre/llite/vvp_object.c
index b57195d15674..8e18cf86cefc 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_object.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_object.c
@@ -65,8 +65,7 @@ static int vvp_object_print(const struct lu_env *env, void *cookie,
         struct inode     *inode = obj->vob_inode;
         struct ll_inode_info *lli;
 
-        (*p)(env, cookie, "(%s %d %d) inode: %p ",
-             list_empty(&obj->vob_pending_list) ? "-" : "+",
+        (*p)(env, cookie, "(%d %d) inode: %p ",
              atomic_read(&obj->vob_transient_pages),
              atomic_read(&obj->vob_mmap_cnt), inode);
         if (inode) {
@@ -133,7 +132,7 @@ static int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
                 CDEBUG(D_VFSTRACE, DFID ": losing layout lock\n",
                        PFID(&lli->lli_fid));
 
-                ll_layout_version_set(lli, LL_LAYOUT_GEN_NONE);
+                ll_layout_version_set(lli, CL_LAYOUT_GEN_NONE);
 
                 /* Clean up page mmap for this inode.
                  * The reason for us to do this is that if the page has
@@ -146,27 +145,8 @@ static int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
                  */
                 unmap_mapping_range(conf->coc_inode->i_mapping,
                                     0, OBD_OBJECT_EOF, 0);
-
-                return 0;
         }
 
-        if (conf->coc_opc != OBJECT_CONF_SET)
-                return 0;
-
-        if (conf->u.coc_md && conf->u.coc_md->lsm) {
-                CDEBUG(D_VFSTRACE, DFID ": layout version change: %u -> %u\n",
-                       PFID(&lli->lli_fid), lli->lli_layout_gen,
-                       conf->u.coc_md->lsm->lsm_layout_gen);
-
-                lli->lli_has_smd = lsm_has_objects(conf->u.coc_md->lsm);
-                ll_layout_version_set(lli, conf->u.coc_md->lsm->lsm_layout_gen);
-        } else {
-                CDEBUG(D_VFSTRACE, DFID ": layout nuked: %u.\n",
-                       PFID(&lli->lli_fid), lli->lli_layout_gen);
-
-                lli->lli_has_smd = false;
-                ll_layout_version_set(lli, LL_LAYOUT_GEN_EMPTY);
-        }
         return 0;
 }
 
@@ -204,6 +184,26 @@ static int vvp_object_glimpse(const struct lu_env *env,
         return 0;
 }
 
+static void vvp_req_attr_set(const struct lu_env *env, struct cl_object *obj,
+                             struct cl_req_attr *attr)
+{
+        u64 valid_flags = OBD_MD_FLTYPE;
+        struct inode *inode;
+        struct obdo *oa;
+
+        oa = attr->cra_oa;
+        inode = vvp_object_inode(obj);
+
+        if (attr->cra_type == CRT_WRITE)
+                valid_flags |= OBD_MD_FLMTIME | OBD_MD_FLCTIME |
+                               OBD_MD_FLUID | OBD_MD_FLGID;
+        obdo_from_inode(oa, inode, valid_flags & attr->cra_flags);
+        obdo_set_parent_fid(oa, &ll_i2info(inode)->lli_fid);
+        if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_INVALID_PFID))
+                oa->o_parent_oid++;
+        memcpy(attr->cra_jobid, ll_i2info(inode)->lli_jobid, LUSTRE_JOBID_SIZE);
+}
+
 static const struct cl_object_operations vvp_ops = {
         .coo_page_init = vvp_page_init,
         .coo_lock_init = vvp_lock_init,
@@ -212,7 +212,8 @@ static const struct cl_object_operations vvp_ops = {
         .coo_attr_update = vvp_attr_update,
         .coo_conf_set  = vvp_conf_set,
         .coo_prune     = vvp_prune,
-        .coo_glimpse   = vvp_object_glimpse
+        .coo_glimpse            = vvp_object_glimpse,
+        .coo_req_attr_set       = vvp_req_attr_set
 };
 
 static int vvp_object_init0(const struct lu_env *env,
@@ -240,7 +241,6 @@ static int vvp_object_init(const struct lu_env *env, struct lu_object *obj,
                 const struct cl_object_conf *cconf;
 
                 cconf = lu2cl_conf(conf);
-                INIT_LIST_HEAD(&vob->vob_pending_list);
                 lu_object_add(obj, below);
                 result = vvp_object_init0(env, vob, cconf);
         } else {
diff --git a/drivers/staging/lustre/lustre/llite/vvp_page.c b/drivers/staging/lustre/lustre/llite/vvp_page.c
index 046e84d7a158..23d66308ff20 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_page.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_page.c
@@ -162,13 +162,10 @@ static void vvp_page_delete(const struct lu_env *env,
         LASSERT((struct cl_page *)vmpage->private == page);
         LASSERT(inode == vvp_object_inode(obj));
 
-        vvp_write_complete(cl2vvp(obj), cl2vvp_page(slice));
-
         /* Drop the reference count held in vvp_page_init */
         refc = atomic_dec_return(&page->cp_ref);
         LASSERTF(refc >= 1, "page = %p, refc = %d\n", page, refc);
 
-        ClearPageUptodate(vmpage);
         ClearPagePrivate(vmpage);
         vmpage->private = 0;
         /*
@@ -221,8 +218,6 @@ static int vvp_page_prep_write(const struct lu_env *env,
         if (!pg->cp_sync_io)
                 set_page_writeback(vmpage);
 
-        vvp_write_pending(cl2vvp(slice->cpl_obj), cl2vvp_page(slice));
-
         return 0;
 }
 
@@ -287,19 +282,6 @@ static void vvp_page_completion_write(const struct lu_env *env,
 
         CL_PAGE_HEADER(D_PAGE, env, pg, "completing WRITE with %d\n", ioret);
 
-        /*
-         * TODO: Actually it makes sense to add the page into oap pending
-         * list again and so that we don't need to take the page out from
-         * SoM write pending list, if we just meet a recoverable error,
-         * -ENOMEM, etc.
-         * To implement this, we just need to return a non zero value in
-         * ->cpo_completion method. The underlying transfer should be notified
-         * and then re-add the page into pending transfer queue.  -jay
-         */
-
-        vpg->vpg_write_queued = 0;
-        vvp_write_complete(cl2vvp(slice->cpl_obj), vpg);
-
         if (pg->cp_sync_io) {
                 LASSERT(PageLocked(vmpage));
                 LASSERT(!PageWriteback(vmpage));
@@ -341,7 +323,6 @@ static int vvp_page_make_ready(const struct lu_env *env,
                 LASSERT(pg->cp_state == CPS_CACHED);
                 /* This actually clears the dirty bit in the radix tree. */
                 set_page_writeback(vmpage);
-                vvp_write_pending(cl2vvp(slice->cpl_obj), cl2vvp_page(slice));
                 CL_PAGE_HEADER(D_PAGE, env, pg, "readied\n");
         } else if (pg->cp_state == CPS_PAGEOUT) {
                 /* is it possible for osc_flush_async_page() to already
@@ -357,20 +338,6 @@ static int vvp_page_make_ready(const struct lu_env *env,
         return result;
 }
 
-static int vvp_page_is_under_lock(const struct lu_env *env,
-                                  const struct cl_page_slice *slice,
-                                  struct cl_io *io, pgoff_t *max_index)
-{
-        if (io->ci_type == CIT_READ || io->ci_type == CIT_WRITE ||
-            io->ci_type == CIT_FAULT) {
-                struct vvp_io *vio = vvp_env_io(env);
-
-                if (unlikely(vio->vui_fd->fd_flags & LL_FILE_GROUP_LOCKED))
-                        *max_index = CL_PAGE_EOF;
-        }
-        return 0;
-}
-
 static int vvp_page_print(const struct lu_env *env,
                           const struct cl_page_slice *slice,
                           void *cookie, lu_printer_t printer)
@@ -378,9 +345,8 @@ static int vvp_page_print(const struct lu_env *env,
         struct vvp_page *vpg = cl2vvp_page(slice);
         struct page     *vmpage = vpg->vpg_page;
 
-        (*printer)(env, cookie, LUSTRE_VVP_NAME "-page@%p(%d:%d:%d) vm@%p ",
-                   vpg, vpg->vpg_defer_uptodate, vpg->vpg_ra_used,
-                   vpg->vpg_write_queued, vmpage);
+        (*printer)(env, cookie, LUSTRE_VVP_NAME "-page@%p(%d:%d) vm@%p ",
+                   vpg, vpg->vpg_defer_uptodate, vpg->vpg_ra_used, vmpage);
         if (vmpage) {
                 (*printer)(env, cookie, "%lx %d:%d %lx %lu %slru",
                            (long)vmpage->flags, page_count(vmpage),
@@ -416,7 +382,6 @@ static const struct cl_page_operations vvp_page_ops = {
         .cpo_is_vmlocked   = vvp_page_is_vmlocked,
         .cpo_fini         = vvp_page_fini,
         .cpo_print       = vvp_page_print,
-        .cpo_is_under_lock = vvp_page_is_under_lock,
         .io = {
                 [CRT_READ] = {
                         .cpo_prep       = vvp_page_prep_read,
@@ -515,7 +480,6 @@ static const struct cl_page_operations vvp_transient_page_ops = {
         .cpo_fini         = vvp_transient_page_fini,
         .cpo_is_vmlocked   = vvp_transient_page_is_vmlocked,
         .cpo_print       = vvp_page_print,
-        .cpo_is_under_lock      = vvp_page_is_under_lock,
         .io = {
                 [CRT_READ] = {
                         .cpo_prep       = vvp_transient_page_prep,
@@ -539,7 +503,6 @@ int vvp_page_init(const struct lu_env *env, struct cl_object *obj,
         vpg->vpg_page = vmpage;
         get_page(vmpage);
 
-        INIT_LIST_HEAD(&vpg->vpg_pending_linkage);
         if (page->cp_type == CPT_CACHEABLE) {
                 /* in cache, decref in vvp_page_delete */
                 atomic_inc(&page->cp_ref);
diff --git a/drivers/staging/lustre/lustre/llite/vvp_req.c b/drivers/staging/lustre/lustre/llite/vvp_req.c
deleted file mode 100644
index e3f4c790d646..000000000000
--- a/drivers/staging/lustre/lustre/llite/vvp_req.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * 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,
- * 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 version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- *
- * Copyright (c) 2011, 2014, Intel Corporation.
- */
-
-#define DEBUG_SUBSYSTEM S_LLITE
-
-#include "../include/lustre/lustre_idl.h"
-#include "../include/cl_object.h"
-#include "../include/obd.h"
-#include "../include/obd_support.h"
-#include "llite_internal.h"
-#include "vvp_internal.h"
-
-static inline struct vvp_req *cl2vvp_req(const struct cl_req_slice *slice)
-{
-        return container_of0(slice, struct vvp_req, vrq_cl);
-}
-
-/**
- * Implementation of struct cl_req_operations::cro_attr_set() for VVP
- * layer. VVP is responsible for
- *
- *    - o_[mac]time
- *
- *    - o_mode
- *
- *    - o_parent_seq
- *
- *    - o_[ug]id
- *
- *    - o_parent_oid
- *
- *    - o_parent_ver
- *
- *    - o_ioepoch,
- *
- */
-static void vvp_req_attr_set(const struct lu_env *env,
-                             const struct cl_req_slice *slice,
-                             const struct cl_object *obj,
-                             struct cl_req_attr *attr, u64 flags)
-{
-        struct inode *inode;
-        struct obdo  *oa;
-        u32           valid_flags;
-
-        oa = attr->cra_oa;
-        inode = vvp_object_inode(obj);
-        valid_flags = OBD_MD_FLTYPE;
-
-        if (slice->crs_req->crq_type == CRT_WRITE) {
-                if (flags & OBD_MD_FLEPOCH) {
-                        oa->o_valid |= OBD_MD_FLEPOCH;
-                        oa->o_ioepoch = ll_i2info(inode)->lli_ioepoch;
-                        valid_flags |= OBD_MD_FLMTIME | OBD_MD_FLCTIME |
-                                       OBD_MD_FLUID | OBD_MD_FLGID;
-                }
-        }
-        obdo_from_inode(oa, inode, valid_flags & flags);
-        obdo_set_parent_fid(oa, &ll_i2info(inode)->lli_fid);
-        if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_INVALID_PFID))
-                oa->o_parent_oid++;
-        memcpy(attr->cra_jobid, ll_i2info(inode)->lli_jobid,
-               LUSTRE_JOBID_SIZE);
-}
-
-static void vvp_req_completion(const struct lu_env *env,
-                               const struct cl_req_slice *slice, int ioret)
-{
-        struct vvp_req *vrq;
-
-        if (ioret > 0)
-                cl_stats_tally(slice->crs_dev, slice->crs_req->crq_type, ioret);
-
-        vrq = cl2vvp_req(slice);
-        kmem_cache_free(vvp_req_kmem, vrq);
-}
-
-static const struct cl_req_operations vvp_req_ops = {
-        .cro_attr_set   = vvp_req_attr_set,
-        .cro_completion = vvp_req_completion
-};
-
-int vvp_req_init(const struct lu_env *env, struct cl_device *dev,
-                 struct cl_req *req)
-{
-        struct vvp_req *vrq;
-        int result;
-
-        vrq = kmem_cache_zalloc(vvp_req_kmem, GFP_NOFS);
-        if (vrq) {
-                cl_req_slice_add(req, &vrq->vrq_cl, dev, &vvp_req_ops);
-                result = 0;
-        } else {
-                result = -ENOMEM;
-        }
-        return result;
-}
diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index e070adb7a3cc..7a848ebc57c1 100644
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -44,48 +44,39 @@
 
 #include "llite_internal.h"
 
-static
-int get_xattr_type(const char *name)
+const struct xattr_handler *get_xattr_type(const char *name)
 {
-        if (!strcmp(name, XATTR_NAME_POSIX_ACL_ACCESS))
-                return XATTR_ACL_ACCESS_T;
+        int i = 0;
 
-        if (!strcmp(name, XATTR_NAME_POSIX_ACL_DEFAULT))
-                return XATTR_ACL_DEFAULT_T;
+        while (ll_xattr_handlers[i]) {
+                size_t len = strlen(ll_xattr_handlers[i]->prefix);
 
-        if (!strncmp(name, XATTR_USER_PREFIX,
-                     sizeof(XATTR_USER_PREFIX) - 1))
-                return XATTR_USER_T;
-
-        if (!strncmp(name, XATTR_TRUSTED_PREFIX,
-                     sizeof(XATTR_TRUSTED_PREFIX) - 1))
-                return XATTR_TRUSTED_T;
-
-        if (!strncmp(name, XATTR_SECURITY_PREFIX,
-                     sizeof(XATTR_SECURITY_PREFIX) - 1))
-                return XATTR_SECURITY_T;
-
-        if (!strncmp(name, XATTR_LUSTRE_PREFIX,
-                     sizeof(XATTR_LUSTRE_PREFIX) - 1))
-                return XATTR_LUSTRE_T;
-
-        return XATTR_OTHER_T;
+                if (!strncmp(ll_xattr_handlers[i]->prefix, name, len))
+                        return ll_xattr_handlers[i];
+                i++;
+        }
+        return NULL;
 }
 
-static
-int xattr_type_filter(struct ll_sb_info *sbi, int xattr_type)
+static int xattr_type_filter(struct ll_sb_info *sbi,
+                             const struct xattr_handler *handler)
 {
-        if ((xattr_type == XATTR_ACL_ACCESS_T ||
-             xattr_type == XATTR_ACL_DEFAULT_T) &&
+        /* No handler means XATTR_OTHER_T */
+        if (!handler)
+                return -EOPNOTSUPP;
+
+        if ((handler->flags == XATTR_ACL_ACCESS_T ||
+             handler->flags == XATTR_ACL_DEFAULT_T) &&
            !(sbi->ll_flags & LL_SBI_ACL))
                 return -EOPNOTSUPP;
 
-        if (xattr_type == XATTR_USER_T && !(sbi->ll_flags & LL_SBI_USER_XATTR))
+        if (handler->flags == XATTR_USER_T &&
+            !(sbi->ll_flags & LL_SBI_USER_XATTR))
                 return -EOPNOTSUPP;
-        if (xattr_type == XATTR_TRUSTED_T && !capable(CFS_CAP_SYS_ADMIN))
+
+        if (handler->flags == XATTR_TRUSTED_T &&
+            !capable(CFS_CAP_SYS_ADMIN))
                 return -EPERM;
-        if (xattr_type == XATTR_OTHER_T)
-                return -EOPNOTSUPP;
 
         return 0;
 }
@@ -111,7 +102,7 @@ ll_xattr_set_common(const struct xattr_handler *handler,
                 valid = OBD_MD_FLXATTR;
         }
 
-        rc = xattr_type_filter(sbi, handler->flags);
+        rc = xattr_type_filter(sbi, handler);
         if (rc)
                 return rc;
 
@@ -121,8 +112,9 @@ ll_xattr_set_common(const struct xattr_handler *handler,
                 return -EPERM;
 
         /* b10667: ignore lustre special xattr for now */
-        if ((handler->flags == XATTR_TRUSTED_T && !strcmp(name, "lov")) ||
-            (handler->flags == XATTR_LUSTRE_T && !strcmp(name, "lov")))
+        if (!strcmp(name, "hsm") ||
+            ((handler->flags == XATTR_TRUSTED_T && !strcmp(name, "lov")) ||
+             (handler->flags == XATTR_LUSTRE_T && !strcmp(name, "lov"))))
                 return 0;
 
         /* b15587: ignore security.capability xattr for now */
@@ -135,6 +127,11 @@ ll_xattr_set_common(const struct xattr_handler *handler,
             strcmp(name, "selinux") == 0)
                 return -EOPNOTSUPP;
 
+        /*FIXME: enable IMA when the conditions are ready */
+        if (handler->flags == XATTR_SECURITY_T &&
+            (!strcmp(name, "ima") || !strcmp(name, "evm")))
+                return -EOPNOTSUPP;
+
         sprintf(fullname, "%s%s\n", handler->prefix, name);
         rc = md_setxattr(sbi->ll_md_exp, ll_inode2fid(inode),
                          valid, fullname, pv, size, 0, flags,
@@ -151,6 +148,37 @@ ll_xattr_set_common(const struct xattr_handler *handler,
         return 0;
 }
 
+static int get_hsm_state(struct inode *inode, u32 *hus_states)
+{
+        struct md_op_data *op_data;
+        struct hsm_user_state *hus;
+        int rc;
+
+        hus = kzalloc(sizeof(*hus), GFP_NOFS);
+        if (!hus)
+                return -ENOMEM;
+
+        op_data = ll_prep_md_op_data(NULL, inode, NULL, NULL, 0, 0,
+                                     LUSTRE_OPC_ANY, hus);
+        if (!IS_ERR(op_data)) {
+                rc = obd_iocontrol(LL_IOC_HSM_STATE_GET, ll_i2mdexp(inode),
+                                   sizeof(*op_data), op_data, NULL);
+                if (!rc)
+                        *hus_states = hus->hus_states;
+                else
+                        CDEBUG(D_VFSTRACE, "obd_iocontrol failed. rc = %d\n",
+                               rc);
+
+                ll_finish_md_op_data(op_data);
+        } else {
+                rc = PTR_ERR(op_data);
+                CDEBUG(D_VFSTRACE, "Could not prepare the opdata. rc = %d\n",
+                       rc);
+        }
+        kfree(hus);
+        return rc;
+}
+
 static int ll_xattr_set(const struct xattr_handler *handler,
                         struct dentry *dentry, struct inode *inode,
                         const char *name, const void *value, size_t size,
@@ -187,6 +215,31 @@ static int ll_xattr_set(const struct xattr_handler *handler,
                 if (lump && lump->lmm_stripe_offset == 0)
                         lump->lmm_stripe_offset = -1;
 
+                /* Avoid anyone directly setting the RELEASED flag. */
+                if (lump && (lump->lmm_pattern & LOV_PATTERN_F_RELEASED)) {
+                        /* Only if we have a released flag check if the file
+                         * was indeed archived.
+                         */
+                        u32 state = HS_NONE;
+
+                        rc = get_hsm_state(inode, &state);
+                        if (rc)
+                                return rc;
+
+                        if (!(state & HS_ARCHIVED)) {
+                                CDEBUG(D_VFSTRACE,
+                                       "hus_states state = %x, pattern = %x\n",
+                                state, lump->lmm_pattern);
+                                /*
+                                 * Here the state is: real file is not
+                                 * archived but user is requesting to set
+                                 * the RELEASED flag so we mask off the
+                                 * released flag from the request
+                                 */
+                                lump->lmm_pattern ^= LOV_PATTERN_F_RELEASED;
+                        }
+                }
+
                 if (lump && S_ISREG(inode->i_mode)) {
                         __u64 it_flags = FMODE_WRITE;
                         int lum_size;
@@ -225,7 +278,8 @@ ll_xattr_list(struct inode *inode, const char *name, int type, void *buffer,
         void *xdata;
         int rc;
 
-        if (sbi->ll_xattr_cache_enabled && type != XATTR_ACL_ACCESS_T) {
+        if (sbi->ll_xattr_cache_enabled && type != XATTR_ACL_ACCESS_T &&
+            (type != XATTR_SECURITY_T || strcmp(name, "security.selinux"))) {
                 rc = ll_xattr_cache_get(inode, name, buffer, size, valid);
                 if (rc == -EAGAIN)
                         goto getxattr_nocache;
@@ -313,7 +367,7 @@ static int ll_xattr_get_common(const struct xattr_handler *handler,
 
         ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_GETXATTR, 1);
 
-        rc = xattr_type_filter(sbi, handler->flags);
+        rc = xattr_type_filter(sbi, handler);
         if (rc)
                 return rc;
 
@@ -353,80 +407,99 @@ static int ll_xattr_get_common(const struct xattr_handler *handler,
                              OBD_MD_FLXATTR);
 }
 
-static int ll_xattr_get(const struct xattr_handler *handler,
-                        struct dentry *dentry, struct inode *inode,
-                        const char *name, void *buffer, size_t size)
+static ssize_t ll_getxattr_lov(struct inode *inode, void *buf, size_t buf_size)
 {
-        LASSERT(inode);
-        LASSERT(name);
+        ssize_t rc;
 
-        CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p), xattr %s\n",
-               PFID(ll_inode2fid(inode)), inode, name);
+        if (S_ISREG(inode->i_mode)) {
+                struct cl_object *obj = ll_i2info(inode)->lli_clob;
+                struct cl_layout cl = {
+                        .cl_buf.lb_buf = buf,
+                        .cl_buf.lb_len = buf_size,
+                };
+                struct lu_env *env;
+                int refcheck;
+
+                if (!obj)
+                        return -ENODATA;
 
-        if (!strcmp(name, "lov")) {
-                struct lov_stripe_md *lsm;
-                struct lov_user_md *lump;
-                struct lov_mds_md *lmm = NULL;
-                struct ptlrpc_request *request = NULL;
-                int rc = 0, lmmsize = 0;
+                env = cl_env_get(&refcheck);
+                if (IS_ERR(env))
+                        return PTR_ERR(env);
 
-                ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_GETXATTR, 1);
-
-                if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode))
-                        return -ENODATA;
+                rc = cl_object_layout_get(env, obj, &cl);
+                if (rc < 0)
+                        goto out_env;
 
-                lsm = ccc_inode_lsm_get(inode);
-                if (!lsm) {
-                        if (S_ISDIR(inode->i_mode)) {
-                                rc = ll_dir_getstripe(inode, (void **)&lmm,
-                                                      &lmmsize, &request, 0);
-                        } else {
-                                rc = -ENODATA;
-                        }
-                } else {
-                        /* LSM is present already after lookup/getattr call.
-                         * we need to grab layout lock once it is implemented
-                         */
-                        rc = obd_packmd(ll_i2dtexp(inode), &lmm, lsm);
-                        lmmsize = rc;
+                if (!cl.cl_size) {
+                        rc = -ENODATA;
+                        goto out_env;
                 }
-                ccc_inode_lsm_put(inode, lsm);
 
+                rc = cl.cl_size;
+
+                if (!buf_size)
+                        goto out_env;
+
+                LASSERT(buf && rc <= buf_size);
+
+                /*
+                 * Do not return layout gen for getxattr() since
+                 * otherwise it would confuse tar --xattr by
+                 * recognizing layout gen as stripe offset when the
+                 * file is restored. See LU-2809.
+                 */
+                ((struct lov_mds_md *)buf)->lmm_layout_gen = 0;
+out_env:
+                cl_env_put(env, &refcheck);
+
+                return rc;
+        } else if (S_ISDIR(inode->i_mode)) {
+                struct ptlrpc_request *req = NULL;
+                struct lov_mds_md *lmm = NULL;
+                int lmm_size = 0;
+
+                rc = ll_dir_getstripe(inode, (void **)&lmm, &lmm_size,
+                                      &req, 0);
                 if (rc < 0)
-                        goto out;
+                        goto out_req;
 
-                if (size == 0) {
-                        /* used to call ll_get_max_mdsize() forward to get
-                         * the maximum buffer size, while some apps (such as
-                         * rsync 3.0.x) care much about the exact xattr value
-                         * size
-                         */
-                        rc = lmmsize;
-                        goto out;
+                if (!buf_size) {
+                        rc = lmm_size;
+                        goto out_req;
                 }
 
-                if (size < lmmsize) {
-                        CERROR("server bug: replied size %d > %d for %pd (%s)\n",
-                               lmmsize, (int)size, dentry, name);
+                if (buf_size < lmm_size) {
                         rc = -ERANGE;
-                        goto out;
+                        goto out_req;
                 }
 
-                lump = buffer;
-                memcpy(lump, lmm, lmmsize);
-                /* do not return layout gen for getxattr otherwise it would
-                 * confuse tar --xattr by recognizing layout gen as stripe
-                 * offset when the file is restored. See LU-2809.
-                 */
-                lump->lmm_layout_gen = 0;
+                memcpy(buf, lmm, lmm_size);
+                rc = lmm_size;
+out_req:
+                if (req)
+                        ptlrpc_req_finished(req);
 
-                rc = lmmsize;
-out:
-                if (request)
-                        ptlrpc_req_finished(request);
-                else if (lmm)
-                        obd_free_diskmd(ll_i2dtexp(inode), &lmm);
                 return rc;
+        } else {
+                return -ENODATA;
+        }
+}
+
+static int ll_xattr_get(const struct xattr_handler *handler,
+                        struct dentry *dentry, struct inode *inode,
+                        const char *name, void *buffer, size_t size)
+{
+        LASSERT(inode);
+        LASSERT(name);
+
+        CDEBUG(D_VFSTRACE, "VFS Op:inode=" DFID "(%p), xattr %s\n",
+               PFID(ll_inode2fid(inode)), inode, name);
+
+        if (!strcmp(name, "lov")) {
+                ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_GETXATTR, 1);
+
+                return ll_getxattr_lov(inode, buffer, size);
         }
 
         return ll_xattr_get_common(handler, dentry, inode, name, buffer, size);
@@ -435,10 +508,10 @@ out:
 ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size)
 {
         struct inode *inode = d_inode(dentry);
-        int rc = 0, rc2 = 0;
-        struct lov_mds_md *lmm = NULL;
-        struct ptlrpc_request *request = NULL;
-        int lmmsize;
+        struct ll_sb_info *sbi = ll_i2sbi(inode);
+        char *xattr_name;
+        ssize_t rc, rc2;
+        size_t len, rem;
 
         LASSERT(inode);
 
@@ -450,65 +523,48 @@ ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size)
         rc = ll_xattr_list(inode, NULL, XATTR_OTHER_T, buffer, size,
                            OBD_MD_FLXATTRLS);
         if (rc < 0)
-                goto out;
-
-        if (buffer) {
-                struct ll_sb_info *sbi = ll_i2sbi(inode);
-                char *xattr_name = buffer;
-                int xlen, rem = rc;
-
-                while (rem > 0) {
-                        xlen = strnlen(xattr_name, rem - 1) + 1;
-                        rem -= xlen;
-                        if (xattr_type_filter(sbi,
-                                        get_xattr_type(xattr_name)) == 0) {
-                                /* skip OK xattr type
-                                 * leave it in buffer
-                                 */
-                                xattr_name += xlen;
-                                continue;
-                        }
-                        /* move up remaining xattrs in buffer
-                         * removing the xattr that is not OK
-                         */
-                        memmove(xattr_name, xattr_name + xlen, rem);
-                        rc -= xlen;
+                return rc;
+        /*
+         * If we're being called to get the size of the xattr list
+         * (buf_size == 0) then just assume that a lustre.lov xattr
+         * exists.
+         */
+        if (!size)
+                return rc + sizeof(XATTR_LUSTRE_LOV);
+
+        xattr_name = buffer;
+        rem = rc;
+
+        while (rem > 0) {
+                len = strnlen(xattr_name, rem - 1) + 1;
+                rem -= len;
+                if (!xattr_type_filter(sbi, get_xattr_type(xattr_name))) {
+                        /* Skip OK xattr type leave it in buffer */
+                        xattr_name += len;
+                        continue;
                 }
-        }
-        if (S_ISREG(inode->i_mode)) {
-                if (!ll_i2info(inode)->lli_has_smd)
-                        rc2 = -1;
-        } else if (S_ISDIR(inode->i_mode)) {
-                rc2 = ll_dir_getstripe(inode, (void **)&lmm, &lmmsize,
-                                       &request, 0);
+
+                /*
+                 * Move up remaining xattrs in buffer
+                 * removing the xattr that is not OK
+                 */
+                memmove(xattr_name, xattr_name + len, rem);
+                rc -= len;
         }
 
-        if (rc2 < 0) {
-                rc2 = 0;
-                goto out;
-        } else if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)) {
-                const int prefix_len = sizeof(XATTR_LUSTRE_PREFIX) - 1;
-                const size_t name_len   = sizeof("lov") - 1;
-                const size_t total_len  = prefix_len + name_len + 1;
-
-                if (((rc + total_len) > size) && buffer) {
-                        ptlrpc_req_finished(request);
-                        return -ERANGE;
-                }
+        rc2 = ll_getxattr_lov(inode, NULL, 0);
+        if (rc2 == -ENODATA)
+                return rc;
 
-                if (buffer) {
-                        buffer += rc;
-                        memcpy(buffer, XATTR_LUSTRE_PREFIX, prefix_len);
-                        memcpy(buffer + prefix_len, "lov", name_len);
-                        buffer[prefix_len + name_len] = '\0';
-                }
-                rc2 = total_len;
-        }
-out:
-        ptlrpc_req_finished(request);
-        rc = rc + rc2;
+        if (rc2 < 0)
+                return rc2;
 
-        return rc;
+        if (size < rc + sizeof(XATTR_LUSTRE_LOV))
+                return -ERANGE;
+
+        memcpy(buffer + rc, XATTR_LUSTRE_LOV, sizeof(XATTR_LUSTRE_LOV));
+
+        return rc + sizeof(XATTR_LUSTRE_LOV);
 }
 
 static const struct xattr_handler ll_user_xattr_handler = {
diff --git a/drivers/staging/lustre/lustre/llite/xattr_cache.c b/drivers/staging/lustre/lustre/llite/xattr_cache.c
index 50a19a40bd4e..38f75f6aa887 100644
--- a/drivers/staging/lustre/lustre/llite/xattr_cache.c
+++ b/drivers/staging/lustre/lustre/llite/xattr_cache.c
@@ -26,8 +26,8 @@ struct ll_xattr_entry {
                                              */
         char                    *xe_name;   /* xattr name, \0-terminated */
         char                    *xe_value;  /* xattr value */
-        unsigned                xe_namelen; /* strlen(xe_name) + 1 */
-        unsigned                xe_vallen;  /* xattr value length */
+        unsigned int            xe_namelen; /* strlen(xe_name) + 1 */
+        unsigned int            xe_vallen;  /* xattr value length */
 };
 
 static struct kmem_cache *xattr_kmem;
@@ -60,7 +60,7 @@ void ll_xattr_fini(void)
 static void ll_xattr_cache_init(struct ll_inode_info *lli)
 {
         INIT_LIST_HEAD(&lli->lli_xattrs);
-        lli->lli_flags |= LLIF_XATTR_CACHE;
+        set_bit(LLIF_XATTR_CACHE, &lli->lli_flags);
 }
 
 /**
@@ -104,7 +104,7 @@ static int ll_xattr_cache_find(struct list_head *cache,
 static int ll_xattr_cache_add(struct list_head *cache,
                               const char *xattr_name,
                               const char *xattr_val,
-                              unsigned xattr_val_len)
+                              unsigned int xattr_val_len)
 {
         struct ll_xattr_entry *xattr;
 
@@ -216,7 +216,7 @@ static int ll_xattr_cache_list(struct list_head *cache,
  */
 static int ll_xattr_cache_valid(struct ll_inode_info *lli)
 {
-        return !!(lli->lli_flags & LLIF_XATTR_CACHE);
+        return test_bit(LLIF_XATTR_CACHE, &lli->lli_flags);
 }
 
 /**
@@ -233,7 +233,8 @@ static int ll_xattr_cache_destroy_locked(struct ll_inode_info *lli)
 
         while (ll_xattr_cache_del(&lli->lli_xattrs, NULL) == 0)
                 ; /* empty loop */
-        lli->lli_flags &= ~LLIF_XATTR_CACHE;
+
+        clear_bit(LLIF_XATTR_CACHE, &lli->lli_flags);
 
         return 0;
 }
@@ -415,6 +416,10 @@ static int ll_xattr_cache_refill(struct inode *inode, struct lookup_intent *oit)
                         CDEBUG(D_CACHE, "not caching %s\n",
                                XATTR_NAME_ACL_ACCESS);
                         rc = 0;
+                } else if (!strcmp(xdata, "security.selinux")) {
+                        /* Filter out security.selinux, it is cached in slab */
+                        CDEBUG(D_CACHE, "not caching security.selinux\n");
+                        rc = 0;
                 } else {
                         rc = ll_xattr_cache_add(&lli->lli_xattrs, xdata, xval,
                                                 *xsizes);
diff --git a/drivers/staging/lustre/lustre/llite/xattr_security.c b/drivers/staging/lustre/lustre/llite/xattr_security.c
new file mode 100644
index 000000000000..d61d8018001a
--- /dev/null
+++ b/drivers/staging/lustre/lustre/llite/xattr_security.c
@@ -0,0 +1,88 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * 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,
+ * 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 version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see http://www.gnu.org/licenses
+ *
+ * GPL HEADER END
+ */
+
+/*
+ * Copyright (c) 2014 Bull SAS
+ * Author: Sebastien Buisson sebastien.buisson@bull.net
+ */
+
+/*
+ * lustre/llite/xattr_security.c
+ * Handler for storing security labels as extended attributes.
+ */
+#include <linux/security.h>
+#include <linux/xattr.h>
+#include "llite_internal.h"
+
+/**
+ * A helper function for ll_security_inode_init_security()
+ * that takes care of setting xattrs
+ *
+ * Get security context of @inode from @xattr_array,
+ * and put it in 'security.xxx' xattr of dentry
+ * stored in @fs_info.
+ *
+ * \retval 0        success
+ * \retval -ENOMEM  if no memory could be allocated for xattr name
+ * \retval < 0      failure to set xattr
+ */
+static int
+ll_initxattrs(struct inode *inode, const struct xattr *xattr_array,
+              void *fs_info)
+{
+        const struct xattr_handler *handler;
+        struct dentry *dentry = fs_info;
+        const struct xattr *xattr;
+        int err = 0;
+
+        handler = get_xattr_type(XATTR_SECURITY_PREFIX);
+        if (!handler)
+                return -ENXIO;
+
+        for (xattr = xattr_array; xattr->name; xattr++) {
+                err = handler->set(handler, dentry, inode, xattr->name,
+                                   xattr->value, xattr->value_len,
+                                   XATTR_CREATE);
+                if (err < 0)
+                        break;
+        }
+        return err;
+}
+
+/**
+ * Initializes security context
+ *
+ * Get security context of @inode in @dir,
+ * and put it in 'security.xxx' xattr of @dentry.
+ *
+ * \retval 0        success, or SELinux is disabled
+ * \retval -ENOMEM  if no memory could be allocated for xattr name
+ * \retval < 0      failure to get security context or set xattr
+ */
+int
+ll_init_security(struct dentry *dentry, struct inode *inode, struct inode *dir)
+{
+        if (!selinux_is_enabled())
+                return 0;
+
+        return security_inode_init_security(inode, dir, NULL,
+                                            &ll_initxattrs, dentry);
+}
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_intent.c b/drivers/staging/lustre/lustre/lmv/lmv_intent.c
index 9f4e826bb0af..b1071cf5a70c 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_intent.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_intent.c
@@ -223,7 +223,14 @@ int lmv_revalidate_slaves(struct obd_export *exp,
                         LASSERT(body);
 
                         if (unlikely(body->mbo_nlink < 2)) {
-                                CERROR("%s: nlink %d < 2 corrupt stripe %d "DFID":" DFID"\n",
+                                /*
+                                 * If this is bad stripe, most likely due
+                                 * to the race between close(unlink) and
+                                 * getattr, let's return -EONENT, so llite
+                                 * will revalidate the dentry see
+                                 * ll_inode_revalidate_fini()
+                                 */
+                                CDEBUG(D_INODE, "%s: nlink %d < 2 corrupt stripe %d "DFID":" DFID"\n",
                                        obd->obd_name, body->mbo_nlink, i,
                                        PFID(&lsm->lsm_md_oinfo[i].lmo_fid),
                                        PFID(&lsm->lsm_md_oinfo[0].lmo_fid));
@@ -233,7 +240,7 @@ int lmv_revalidate_slaves(struct obd_export *exp,
                                         it.it_lock_mode = 0;
                                 }
 
-                                rc = -EIO;
+                                rc = -ENOENT;
                                 goto cleanup;
                         }
 
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_internal.h b/drivers/staging/lustre/lustre/lmv/lmv_internal.h
index 52b03745ac19..12731a17e263 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_internal.h
+++ b/drivers/staging/lustre/lustre/lmv/lmv_internal.h
@@ -54,9 +54,6 @@ int __lmv_fid_alloc(struct lmv_obd *lmv, struct lu_fid *fid, u32 mds);
 int lmv_fid_alloc(const struct lu_env *env, struct obd_export *exp,
                   struct lu_fid *fid, struct md_op_data *op_data);
 
-int lmv_unpack_md(struct obd_export *exp, struct lmv_stripe_md **lsmp,
-                  const union lmv_mds_md *lmm, int stripe_count);
-
 int lmv_revalidate_slaves(struct obd_export *exp,
                           const struct lmv_stripe_md *lsm,
                           ldlm_blocking_callback cb_blocking,
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index 7dbb2b946acf..f124f6c05ea4 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -62,6 +62,7 @@ static void lmv_activate_target(struct lmv_obd *lmv,
 
         tgt->ltd_active = activate;
         lmv->desc.ld_active_tgt_count += (activate ? 1 : -1);
+        tgt->ltd_exp->exp_obd->obd_inactive = !activate;
 }
 
 /**
@@ -245,8 +246,7 @@ static int lmv_connect(const struct lu_env *env,
         return rc;
 }
 
-static int lmv_init_ea_size(struct obd_export *exp, u32 easize, u32 def_easize,
-                            u32 cookiesize, u32 def_cookiesize)
+static int lmv_init_ea_size(struct obd_export *exp, u32 easize, u32 def_easize)
 {
         struct obd_device   *obd = exp->exp_obd;
         struct lmv_obd      *lmv = &obd->u.lmv;
@@ -262,14 +262,7 @@ static int lmv_init_ea_size(struct obd_export *exp, u32 easize, u32 def_easize,
                 lmv->max_def_easize = def_easize;
                 change = 1;
         }
-        if (lmv->max_cookiesize < cookiesize) {
-                lmv->max_cookiesize = cookiesize;
-                change = 1;
-        }
-        if (lmv->max_def_cookiesize < def_cookiesize) {
-                lmv->max_def_cookiesize = def_cookiesize;
-                change = 1;
-        }
+
         if (change == 0)
                 return 0;
 
@@ -284,8 +277,7 @@ static int lmv_init_ea_size(struct obd_export *exp, u32 easize, u32 def_easize,
                         continue;
                 }
 
-                rc = md_init_ea_size(tgt->ltd_exp, easize, def_easize,
-                                     cookiesize, def_cookiesize);
+                rc = md_init_ea_size(tgt->ltd_exp, easize, def_easize);
                 if (rc) {
                         CERROR("%s: obd_init_ea_size() failed on MDT target %d: rc = %d\n",
                                obd->obd_name, i, rc);
@@ -368,8 +360,7 @@ static int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
         tgt->ltd_exp = mdc_exp;
         lmv->desc.ld_active_tgt_count++;
 
-        md_init_ea_size(tgt->ltd_exp, lmv->max_easize, lmv->max_def_easize,
-                        lmv->max_cookiesize, lmv->max_def_cookiesize);
+        md_init_ea_size(tgt->ltd_exp, lmv->max_easize, lmv->max_def_easize);
 
         CDEBUG(D_CONFIG, "Connected to %s(%s) successfully (%d)\n",
                mdc_obd->obd_name, mdc_obd->obd_uuid.uuid,
@@ -396,27 +387,23 @@ static int lmv_add_target(struct obd_device *obd, struct obd_uuid *uuidp,
                           __u32 index, int gen)
 {
         struct lmv_obd      *lmv = &obd->u.lmv;
+        struct obd_device *mdc_obd;
         struct lmv_tgt_desc *tgt;
         int orig_tgt_count = 0;
         int               rc = 0;
 
         CDEBUG(D_CONFIG, "Target uuid: %s. index %d\n", uuidp->uuid, index);
 
-        mutex_lock(&lmv->lmv_init_mutex);
-
-        if (lmv->desc.ld_tgt_count == 0) {
-                struct obd_device *mdc_obd;
-
-                mdc_obd = class_find_client_obd(uuidp, LUSTRE_MDC_NAME,
-                                                &obd->obd_uuid);
-                if (!mdc_obd) {
-                        mutex_unlock(&lmv->lmv_init_mutex);
-                        CERROR("%s: Target %s not attached: rc = %d\n",
-                               obd->obd_name, uuidp->uuid, -EINVAL);
-                        return -EINVAL;
-                }
+        mdc_obd = class_find_client_obd(uuidp, LUSTRE_MDC_NAME,
+                                        &obd->obd_uuid);
+        if (!mdc_obd) {
+                CERROR("%s: Target %s not attached: rc = %d\n",
+                       obd->obd_name, uuidp->uuid, -EINVAL);
+                return -EINVAL;
         }
 
+        mutex_lock(&lmv->lmv_init_mutex);
+
         if ((index < lmv->tgts_size) && lmv->tgts[index]) {
                 tgt = lmv->tgts[index];
                 CERROR("%s: UUID %s already assigned at LOV target index %d: rc = %d\n",
@@ -472,22 +459,27 @@ static int lmv_add_target(struct obd_device *obd, struct obd_uuid *uuidp,
                 lmv->desc.ld_tgt_count = index + 1;
         }
 
-        if (lmv->connected) {
-                rc = lmv_connect_mdc(obd, tgt);
-                if (rc) {
-                        spin_lock(&lmv->lmv_lock);
-                        if (lmv->desc.ld_tgt_count == index + 1)
-                                lmv->desc.ld_tgt_count = orig_tgt_count;
-                        memset(tgt, 0, sizeof(*tgt));
-                        spin_unlock(&lmv->lmv_lock);
-                } else {
-                        int easize = sizeof(struct lmv_stripe_md) +
-                                lmv->desc.ld_tgt_count * sizeof(struct lu_fid);
-                        lmv_init_ea_size(obd->obd_self_export, easize, 0, 0, 0);
-                }
+        if (!lmv->connected) {
+                /* lmv_check_connect() will connect this target. */
+                mutex_unlock(&lmv->lmv_init_mutex);
+                return rc;
         }
 
+        /* Otherwise let's connect it ourselves */
         mutex_unlock(&lmv->lmv_init_mutex);
+        rc = lmv_connect_mdc(obd, tgt);
+        if (rc) {
+                spin_lock(&lmv->lmv_lock);
+                if (lmv->desc.ld_tgt_count == index + 1)
+                        lmv->desc.ld_tgt_count = orig_tgt_count;
+                memset(tgt, 0, sizeof(*tgt));
+                spin_unlock(&lmv->lmv_lock);
+        } else {
+                int easize = sizeof(struct lmv_stripe_md) +
+                             lmv->desc.ld_tgt_count * sizeof(struct lu_fid);
+                lmv_init_ea_size(obd->obd_self_export, easize, 0);
+        }
+
         return rc;
 }
 
@@ -538,7 +530,7 @@ int lmv_check_connect(struct obd_device *obd)
         class_export_put(lmv->exp);
         lmv->connected = 1;
         easize = lmv_mds_md_size(lmv->desc.ld_tgt_count, LMV_MAGIC);
-        lmv_init_ea_size(obd->obd_self_export, easize, 0, 0, 0);
+        lmv_init_ea_size(obd->obd_self_export, easize, 0);
         mutex_unlock(&lmv->lmv_init_mutex);
         return 0;
 
@@ -1128,9 +1120,7 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
                         mdc_obd = class_exp2obd(tgt->ltd_exp);
                         mdc_obd->obd_force = obddev->obd_force;
                         err = obd_iocontrol(cmd, tgt->ltd_exp, len, karg, uarg);
-                        if (err == -ENODATA && cmd == OBD_IOC_POLL_QUOTACHECK) {
-                                return err;
-                        } else if (err) {
+                        if (err) {
                                 if (tgt->ltd_active) {
                                         CERROR("error: iocontrol MDC %s on MDTidx %d cmd %x: err = %d\n",
                                                tgt->ltd_uuid.uuid, i, cmd, err);
@@ -1284,7 +1274,6 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
         obd_str2uuid(&lmv->desc.ld_uuid, desc->ld_uuid.uuid);
         lmv->desc.ld_tgt_count = 0;
         lmv->desc.ld_active_tgt_count = 0;
-        lmv->max_cookiesize = 0;
         lmv->max_def_easize = 0;
         lmv->max_easize = 0;
         lmv->lmv_placement = PLACEMENT_CHAR_POLICY;
@@ -1630,27 +1619,28 @@ lmv_locate_mds(struct lmv_obd *lmv, struct md_op_data *op_data,
          * ct_restore().
          */
         if (op_data->op_bias & MDS_CREATE_VOLATILE &&
-            (int)op_data->op_mds != -1 && lsm) {
+            (int)op_data->op_mds != -1) {
                 int i;
 
                 tgt = lmv_get_target(lmv, op_data->op_mds, NULL);
                 if (IS_ERR(tgt))
                         return tgt;
 
-                /* refill the right parent fid */
-                for (i = 0; i < lsm->lsm_md_stripe_count; i++) {
-                        struct lmv_oinfo *oinfo;
+                if (lsm) {
+                        /* refill the right parent fid */
+                        for (i = 0; i < lsm->lsm_md_stripe_count; i++) {
+                                struct lmv_oinfo *oinfo;
 
-                        oinfo = &lsm->lsm_md_oinfo[i];
-                        if (oinfo->lmo_mds == op_data->op_mds) {
-                                *fid = oinfo->lmo_fid;
-                                break;
+                                oinfo = &lsm->lsm_md_oinfo[i];
+                                if (oinfo->lmo_mds == op_data->op_mds) {
+                                        *fid = oinfo->lmo_fid;
+                                        break;
+                                }
                         }
-                }
 
-                /* Hmm, can not find the stripe by mdt_index(op_mds) */
-                if (i == lsm->lsm_md_stripe_count)
-                        tgt = ERR_PTR(-EINVAL);
+                        if (i == lsm->lsm_md_stripe_count)
+                                *fid = lsm->lsm_md_oinfo[0].lmo_fid;
+                }
 
                 return tgt;
         }
@@ -1728,30 +1718,9 @@ static int lmv_create(struct obd_export *exp, struct md_op_data *op_data,
         return rc;
 }
 
-static int lmv_done_writing(struct obd_export *exp,
-                            struct md_op_data *op_data,
-                            struct md_open_data *mod)
-{
-        struct obd_device     *obd = exp->exp_obd;
-        struct lmv_obd  *lmv = &obd->u.lmv;
-        struct lmv_tgt_desc   *tgt;
-        int                 rc;
-
-        rc = lmv_check_connect(obd);
-        if (rc)
-                return rc;
-
-        tgt = lmv_find_target(lmv, &op_data->op_fid1);
-        if (IS_ERR(tgt))
-                return PTR_ERR(tgt);
-
-        rc = md_done_writing(tgt->ltd_exp, op_data, mod);
-        return rc;
-}
-
 static int
 lmv_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
-            const ldlm_policy_data_t *policy,
+            const union ldlm_policy_data *policy,
             struct lookup_intent *it, struct md_op_data *op_data,
             struct lustre_handle *lockh, __u64 extra_lock_flags)
 {
@@ -1847,7 +1816,7 @@ static int lmv_early_cancel(struct obd_export *exp, struct lmv_tgt_desc *tgt,
         struct lu_fid     *fid = md_op_data_fid(op_data, flag);
         struct obd_device      *obd = exp->exp_obd;
         struct lmv_obd   *lmv = &obd->u.lmv;
-        ldlm_policy_data_t      policy = { {0} };
+        union ldlm_policy_data policy = { { 0 } };
         int                  rc = 0;
 
         if (!fid_is_sane(fid))
@@ -1937,7 +1906,10 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data,
 {
         struct obd_device       *obd = exp->exp_obd;
         struct lmv_obd    *lmv = &obd->u.lmv;
+        struct obd_export *target_exp;
         struct lmv_tgt_desc     *src_tgt;
+        struct lmv_tgt_desc *tgt_tgt;
+        struct mdt_body *body;
         int                     rc;
 
         LASSERT(oldlen != 0);
@@ -1977,6 +1949,10 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data,
                 if (rc)
                         return rc;
                 src_tgt = lmv_find_target(lmv, &op_data->op_fid3);
+                if (IS_ERR(src_tgt))
+                        return PTR_ERR(src_tgt);
+
+                target_exp = src_tgt->ltd_exp;
         } else {
                 if (op_data->op_mea1) {
                         struct lmv_stripe_md *lsm = op_data->op_mea1;
@@ -1985,29 +1961,27 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data,
                                                              oldlen,
                                                              &op_data->op_fid1,
                                                              &op_data->op_mds);
-                        if (IS_ERR(src_tgt))
-                                return PTR_ERR(src_tgt);
                 } else {
                         src_tgt = lmv_find_target(lmv, &op_data->op_fid1);
-                        if (IS_ERR(src_tgt))
-                                return PTR_ERR(src_tgt);
-
-                        op_data->op_mds = src_tgt->ltd_idx;
                 }
+                if (IS_ERR(src_tgt))
+                        return PTR_ERR(src_tgt);
 
                 if (op_data->op_mea2) {
                         struct lmv_stripe_md *lsm = op_data->op_mea2;
-                        const struct lmv_oinfo *oinfo;
 
-                        oinfo = lsm_name_to_stripe_info(lsm, new, newlen);
-                        if (IS_ERR(oinfo))
-                                return PTR_ERR(oinfo);
-
-                        op_data->op_fid2 = oinfo->lmo_fid;
+                        tgt_tgt = lmv_locate_target_for_name(lmv, lsm, new,
+                                                             newlen,
+                                                             &op_data->op_fid2,
+                                                             &op_data->op_mds);
+                } else {
+                        tgt_tgt = lmv_find_target(lmv, &op_data->op_fid2);
                 }
+                if (IS_ERR(tgt_tgt))
+                        return PTR_ERR(tgt_tgt);
+
+                target_exp = tgt_tgt->ltd_exp;
         }
-        if (IS_ERR(src_tgt))
-                return PTR_ERR(src_tgt);
 
         /*
          * LOOKUP lock on src child (fid3) should also be cancelled for
@@ -2048,26 +2022,56 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data,
                         return rc;
         }
 
+retry_rename:
         /*
          * Cancel all the locks on tgt child (fid4).
          */
-        if (fid_is_sane(&op_data->op_fid4))
+        if (fid_is_sane(&op_data->op_fid4)) {
+                struct lmv_tgt_desc *tgt;
+
                 rc = lmv_early_cancel(exp, NULL, op_data, src_tgt->ltd_idx,
                                       LCK_EX, MDS_INODELOCK_FULL,
                                       MF_MDC_CANCEL_FID4);
+                if (rc)
+                        return rc;
+
+                tgt = lmv_find_target(lmv, &op_data->op_fid4);
+                if (IS_ERR(tgt))
+                        return PTR_ERR(tgt);
 
-        CDEBUG(D_INODE, DFID":m%d to "DFID"\n", PFID(&op_data->op_fid1),
-               op_data->op_mds, PFID(&op_data->op_fid2));
+                /*
+                 * Since the target child might be destroyed, and it might
+                 * become orphan, and we can only check orphan on the local
+                 * MDT right now, so we send rename request to the MDT where
+                 * target child is located. If target child does not exist,
+                 * then it will send the request to the target parent
+                 */
+                target_exp = tgt->ltd_exp;
+        }
 
-        rc = md_rename(src_tgt->ltd_exp, op_data, old, oldlen,
-                       new, newlen, request);
-        return rc;
+        rc = md_rename(target_exp, op_data, old, oldlen, new, newlen, request);
+        if (rc && rc != -EREMOTE)
+                return rc;
+
+        body = req_capsule_server_get(&(*request)->rq_pill, &RMF_MDT_BODY);
+        if (!body)
+                return -EPROTO;
+
+        /* Not cross-ref case, just get out of here. */
+        if (likely(!(body->mbo_valid & OBD_MD_MDS)))
+                return rc;
+
+        CDEBUG(D_INODE, "%s: try rename to another MDT for " DFID "\n",
+               exp->exp_obd->obd_name, PFID(&body->mbo_fid1));
+
+        op_data->op_fid4 = body->mbo_fid1;
+        ptlrpc_req_finished(*request);
+        *request = NULL;
+        goto retry_rename;
 }
 
 static int lmv_setattr(struct obd_export *exp, struct md_op_data *op_data,
-                       void *ea, size_t ealen, void *ea2, size_t ea2len,
-                       struct ptlrpc_request **request,
-                       struct md_open_data **mod)
+                       void *ea, size_t ealen, struct ptlrpc_request **request)
 {
         struct obd_device       *obd = exp->exp_obd;
         struct lmv_obd    *lmv = &obd->u.lmv;
@@ -2086,10 +2090,7 @@ static int lmv_setattr(struct obd_export *exp, struct md_op_data *op_data,
         if (IS_ERR(tgt))
                 return PTR_ERR(tgt);
 
-        rc = md_setattr(tgt->ltd_exp, op_data, ea, ealen, ea2,
-                        ea2len, request, mod);
-
-        return rc;
+        return md_setattr(tgt->ltd_exp, op_data, ea, ealen, request);
 }
 
 static int lmv_sync(struct obd_export *exp, const struct lu_fid *fid,
@@ -2623,23 +2624,10 @@ try_next_stripe:
         goto retry_unlink;
 }
 
-static int lmv_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
+static int lmv_precleanup(struct obd_device *obd)
 {
-        struct lmv_obd *lmv = &obd->u.lmv;
-
-        switch (stage) {
-        case OBD_CLEANUP_EARLY:
-                /* XXX: here should be calling obd_precleanup() down to
-                 * stack.
-                 */
-                break;
-        case OBD_CLEANUP_EXPORTS:
-                fld_client_debugfs_fini(&lmv->lmv_fld);
-                lprocfs_obd_cleanup(obd);
-                break;
-        default:
-                break;
-        }
+        fld_client_debugfs_fini(&obd->u.lmv.lmv_fld);
+        lprocfs_obd_cleanup(obd);
         return 0;
 }
 
@@ -2654,14 +2642,12 @@ static int lmv_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
  * \param[in]  key      identifier of key to get value for
  * \param[in]  vallen   size of \a val
  * \param[out] val      pointer to storage location for value
- * \param[in]  lsm      optional striping metadata of object
  *
  * \retval 0            on success
  * \retval negative     negated errno on failure
  */
 static int lmv_get_info(const struct lu_env *env, struct obd_export *exp,
-                        __u32 keylen, void *key, __u32 *vallen, void *val,
-                        struct lov_stripe_md *lsm)
+                        __u32 keylen, void *key, __u32 *vallen, void *val)
 {
         struct obd_device       *obd;
         struct lmv_obd    *lmv;
@@ -2693,7 +2679,7 @@ static int lmv_get_info(const struct lu_env *env, struct obd_export *exp,
                                 continue;
 
                         if (!obd_get_info(env, tgt->ltd_exp, keylen, key,
-                                          vallen, val, NULL))
+                                          vallen, val))
                                 return 0;
                 }
                 return -EINVAL;
@@ -2709,7 +2695,7 @@ static int lmv_get_info(const struct lu_env *env, struct obd_export *exp,
                  * desc.
                  */
                 rc = obd_get_info(env, lmv->tgts[0]->ltd_exp, keylen, key,
-                                  vallen, val, NULL);
+                                  vallen, val);
                 if (!rc && KEY_IS(KEY_CONN_DATA))
                         exp->exp_connect_data = *(struct obd_connect_data *)val;
                 return rc;
@@ -2777,90 +2763,6 @@ static int lmv_set_info_async(const struct lu_env *env, struct obd_export *exp,
         return -EINVAL;
 }
 
-static int lmv_pack_md_v1(const struct lmv_stripe_md *lsm,
-                          struct lmv_mds_md_v1 *lmm1)
-{
-        int cplen;
-        int i;
-
-        lmm1->lmv_magic = cpu_to_le32(lsm->lsm_md_magic);
-        lmm1->lmv_stripe_count = cpu_to_le32(lsm->lsm_md_stripe_count);
-        lmm1->lmv_master_mdt_index = cpu_to_le32(lsm->lsm_md_master_mdt_index);
-        lmm1->lmv_hash_type = cpu_to_le32(lsm->lsm_md_hash_type);
-        cplen = strlcpy(lmm1->lmv_pool_name, lsm->lsm_md_pool_name,
-                        sizeof(lmm1->lmv_pool_name));
-        if (cplen >= sizeof(lmm1->lmv_pool_name))
-                return -E2BIG;
-
-        for (i = 0; i < lsm->lsm_md_stripe_count; i++)
-                fid_cpu_to_le(&lmm1->lmv_stripe_fids[i],
-                              &lsm->lsm_md_oinfo[i].lmo_fid);
-        return 0;
-}
-
-static int
-lmv_pack_md(union lmv_mds_md **lmmp, const struct lmv_stripe_md *lsm,
-            int stripe_count)
-{
-        int lmm_size = 0, rc = 0;
-        bool allocated = false;
-
-        LASSERT(lmmp);
-
-        /* Free lmm */
-        if (*lmmp && !lsm) {
-                int stripe_cnt;
-
-                stripe_cnt = lmv_mds_md_stripe_count_get(*lmmp);
-                lmm_size = lmv_mds_md_size(stripe_cnt,
-                                           le32_to_cpu((*lmmp)->lmv_magic));
-                if (!lmm_size)
-                        return -EINVAL;
-                kvfree(*lmmp);
-                *lmmp = NULL;
-                return 0;
-        }
-
-        /* Alloc lmm */
-        if (!*lmmp && !lsm) {
-                lmm_size = lmv_mds_md_size(stripe_count, LMV_MAGIC);
-                LASSERT(lmm_size > 0);
-                *lmmp = libcfs_kvzalloc(lmm_size, GFP_NOFS);
-                if (!*lmmp)
-                        return -ENOMEM;
-                lmv_mds_md_stripe_count_set(*lmmp, stripe_count);
-                (*lmmp)->lmv_magic = cpu_to_le32(LMV_MAGIC);
-                return lmm_size;
-        }
-
-        /* pack lmm */
-        LASSERT(lsm);
-        lmm_size = lmv_mds_md_size(lsm->lsm_md_stripe_count,
-                                   lsm->lsm_md_magic);
-        if (!*lmmp) {
-                *lmmp = libcfs_kvzalloc(lmm_size, GFP_NOFS);
-                if (!*lmmp)
-                        return -ENOMEM;
-                allocated = true;
-        }
-
-        switch (lsm->lsm_md_magic) {
-        case LMV_MAGIC_V1:
-                rc = lmv_pack_md_v1(lsm, &(*lmmp)->lmv_md_v1);
-                break;
-        default:
-                rc = -EINVAL;
-                break;
-        }
-
-        if (rc && allocated) {
-                kvfree(*lmmp);
-                *lmmp = NULL;
-        }
-
-        return lmm_size;
-}
-
 static int lmv_unpack_md_v1(struct obd_export *exp, struct lmv_stripe_md *lsm,
                             const struct lmv_mds_md_v1 *lmm1)
 {
@@ -2903,8 +2805,8 @@ static int lmv_unpack_md_v1(struct obd_export *exp, struct lmv_stripe_md *lsm,
         return rc;
 }
 
-int lmv_unpack_md(struct obd_export *exp, struct lmv_stripe_md **lsmp,
-                  const union lmv_mds_md *lmm, int stripe_count)
+static int lmv_unpackmd(struct obd_export *exp, struct lmv_stripe_md **lsmp,
+                        const union lmv_mds_md *lmm, size_t lmm_size)
 {
         struct lmv_stripe_md *lsm;
         bool allocated = false;
@@ -2933,17 +2835,6 @@ int lmv_unpack_md(struct obd_export *exp, struct lmv_stripe_md **lsmp,
                 return 0;
         }
 
-        /* Alloc memmd */
-        if (!lsm && !lmm) {
-                lsm_size = lmv_stripe_md_size(stripe_count);
-                lsm = libcfs_kvzalloc(lsm_size, GFP_NOFS);
-                if (!lsm)
-                        return -ENOMEM;
-                lsm->lsm_md_stripe_count = stripe_count;
-                *lsmp = lsm;
-                return 0;
-        }
-
         if (le32_to_cpu(lmm->lmv_magic) == LMV_MAGIC_STRIPE)
                 return -EPERM;
 
@@ -2991,38 +2882,17 @@ int lmv_unpack_md(struct obd_export *exp, struct lmv_stripe_md **lsmp,
         }
         return lsm_size;
 }
-EXPORT_SYMBOL(lmv_unpack_md);
 
-static int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
-                        struct lov_mds_md *lmm, int disk_len)
+void lmv_free_memmd(struct lmv_stripe_md *lsm)
 {
-        return lmv_unpack_md(exp, (struct lmv_stripe_md **)lsmp,
-                             (union lmv_mds_md *)lmm, disk_len);
-}
-
-static int lmv_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
-                      struct lov_stripe_md *lsm)
-{
-        const struct lmv_stripe_md *lmv = (struct lmv_stripe_md *)lsm;
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv_obd = &obd->u.lmv;
-        int stripe_count;
-
-        if (!lmmp) {
-                if (lsm)
-                        stripe_count = lmv->lsm_md_stripe_count;
-                else
-                        stripe_count = lmv_obd->desc.ld_tgt_count;
-
-                return lmv_mds_md_size(stripe_count, LMV_MAGIC_V1);
-        }
-
-        return lmv_pack_md((union lmv_mds_md **)lmmp, lmv, 0);
+        lmv_unpackmd(NULL, &lsm, NULL, 0);
 }
+EXPORT_SYMBOL(lmv_free_memmd);
 
 static int lmv_cancel_unused(struct obd_export *exp, const struct lu_fid *fid,
-                             ldlm_policy_data_t *policy, enum ldlm_mode mode,
-                             enum ldlm_cancel_flags flags, void *opaque)
+                             union ldlm_policy_data *policy,
+                             enum ldlm_mode mode, enum ldlm_cancel_flags flags,
+                             void *opaque)
 {
         struct obd_device       *obd = exp->exp_obd;
         struct lmv_obd    *lmv = &obd->u.lmv;
@@ -3064,7 +2934,7 @@ static int lmv_set_lock_data(struct obd_export *exp,
 static enum ldlm_mode lmv_lock_match(struct obd_export *exp, __u64 flags,
                                      const struct lu_fid *fid,
                                      enum ldlm_type type,
-                                     ldlm_policy_data_t *policy,
+                                     union ldlm_policy_data *policy,
                                      enum ldlm_mode mode,
                                      struct lustre_handle *lockh)
 {
@@ -3271,32 +3141,6 @@ static int lmv_quotactl(struct obd_device *unused, struct obd_export *exp,
         return rc;
 }
 
-static int lmv_quotacheck(struct obd_device *unused, struct obd_export *exp,
-                          struct obd_quotactl *oqctl)
-{
-        struct obd_device   *obd = class_exp2obd(exp);
-        struct lmv_obd      *lmv = &obd->u.lmv;
-        struct lmv_tgt_desc *tgt;
-        int rc = 0;
-        u32 i;
-
-        for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
-                int err;
-
-                tgt = lmv->tgts[i];
-                if (!tgt || !tgt->ltd_exp || !tgt->ltd_active) {
-                        CERROR("lmv idx %d inactive\n", i);
-                        return -EIO;
-                }
-
-                err = obd_quotacheck(tgt->ltd_exp, oqctl);
-                if (err && !rc)
-                        rc = err;
-        }
-
-        return rc;
-}
-
 static int lmv_merge_attr(struct obd_export *exp,
                           const struct lmv_stripe_md *lsm,
                           struct cl_attr *attr,
@@ -3349,12 +3193,9 @@ static struct obd_ops lmv_obd_ops = {
         .statfs         = lmv_statfs,
         .get_info       = lmv_get_info,
         .set_info_async = lmv_set_info_async,
-        .packmd         = lmv_packmd,
-        .unpackmd       = lmv_unpackmd,
         .notify         = lmv_notify,
         .get_uuid       = lmv_get_uuid,
         .iocontrol      = lmv_iocontrol,
-        .quotacheck     = lmv_quotacheck,
         .quotactl       = lmv_quotactl
 };
 
@@ -3363,7 +3204,6 @@ static struct md_ops lmv_md_ops = {
         .null_inode             = lmv_null_inode,
         .close                  = lmv_close,
         .create                 = lmv_create,
-        .done_writing           = lmv_done_writing,
         .enqueue                = lmv_enqueue,
         .getattr                = lmv_getattr,
         .getxattr               = lmv_getxattr,
@@ -3388,6 +3228,7 @@ static struct md_ops lmv_md_ops = {
         .intent_getattr_async   = lmv_intent_getattr_async,
         .revalidate_lock        = lmv_revalidate_lock,
         .get_fid_from_lsm       = lmv_get_fid_from_lsm,
+        .unpackmd               = lmv_unpackmd,
 };
 
 static int __init lmv_init(void)
diff --git a/drivers/staging/lustre/lustre/lov/lov_cl_internal.h b/drivers/staging/lustre/lustre/lov/lov_cl_internal.h
index 4d2b7d303fea..c49a34bf10e5 100644
--- a/drivers/staging/lustre/lustre/lov/lov_cl_internal.h
+++ b/drivers/staging/lustre/lustre/lov/lov_cl_internal.h
@@ -217,7 +217,7 @@ struct lov_object {
 
         union lov_layout_state {
                 struct lov_layout_raid0 {
-                        unsigned               lo_nr;
+                        unsigned int           lo_nr;
                         /**
                          * When this is true, lov_object::lo_attr contains
                          * valid up to date attributes for a top-level
@@ -412,7 +412,6 @@ struct lov_io_sub {
         int               sub_refcheck;
         int               sub_refcheck2;
         int               sub_reenter;
-        void            *sub_cookie;
 };
 
 /**
@@ -473,20 +472,6 @@ struct lov_session {
         struct lov_sublock_env ls_subenv;
 };
 
-/**
- * State of transfer for lov.
- */
-struct lov_req {
-        struct cl_req_slice lr_cl;
-};
-
-/**
- * State of transfer for lovsub.
- */
-struct lovsub_req {
-        struct cl_req_slice lsrq_cl;
-};
-
 extern struct lu_device_type lov_device_type;
 extern struct lu_device_type lovsub_device_type;
 
@@ -497,11 +482,9 @@ extern struct kmem_cache *lov_lock_kmem;
 extern struct kmem_cache *lov_object_kmem;
 extern struct kmem_cache *lov_thread_kmem;
 extern struct kmem_cache *lov_session_kmem;
-extern struct kmem_cache *lov_req_kmem;
 
 extern struct kmem_cache *lovsub_lock_kmem;
 extern struct kmem_cache *lovsub_object_kmem;
-extern struct kmem_cache *lovsub_req_kmem;
 
 extern struct kmem_cache *lov_lock_link_kmem;
 
@@ -700,11 +683,6 @@ static inline struct lov_page *cl2lov_page(const struct cl_page_slice *slice)
         return container_of0(slice, struct lov_page, lps_cl);
 }
 
-static inline struct lov_req *cl2lov_req(const struct cl_req_slice *slice)
-{
-        return container_of0(slice, struct lov_req, lr_cl);
-}
-
 static inline struct lovsub_page *
 cl2lovsub_page(const struct cl_page_slice *slice)
 {
@@ -712,11 +690,6 @@ cl2lovsub_page(const struct cl_page_slice *slice)
         return container_of0(slice, struct lovsub_page, lsb_cl);
 }
 
-static inline struct lovsub_req *cl2lovsub_req(const struct cl_req_slice *slice)
-{
-        return container_of0(slice, struct lovsub_req, lsrq_cl);
-}
-
 static inline struct lov_io *cl2lov_io(const struct lu_env *env,
                                        const struct cl_io_slice *ios)
 {
diff --git a/drivers/staging/lustre/lustre/lov/lov_dev.c b/drivers/staging/lustre/lustre/lov/lov_dev.c
index 056ae2ed88e8..7301f6e579a1 100644
--- a/drivers/staging/lustre/lustre/lov/lov_dev.c
+++ b/drivers/staging/lustre/lustre/lov/lov_dev.c
@@ -46,11 +46,9 @@ struct kmem_cache *lov_lock_kmem;
 struct kmem_cache *lov_object_kmem;
 struct kmem_cache *lov_thread_kmem;
 struct kmem_cache *lov_session_kmem;
-struct kmem_cache *lov_req_kmem;
 
 struct kmem_cache *lovsub_lock_kmem;
 struct kmem_cache *lovsub_object_kmem;
-struct kmem_cache *lovsub_req_kmem;
 
 struct kmem_cache *lov_lock_link_kmem;
 
@@ -79,11 +77,6 @@ struct lu_kmem_descr lov_caches[] = {
                 .ckd_size  = sizeof(struct lov_session)
         },
         {
-                .ckd_cache = &lov_req_kmem,
-                .ckd_name  = "lov_req_kmem",
-                .ckd_size  = sizeof(struct lov_req)
-        },
-        {
                 .ckd_cache = &lovsub_lock_kmem,
                 .ckd_name  = "lovsub_lock_kmem",
                 .ckd_size  = sizeof(struct lovsub_lock)
@@ -94,11 +87,6 @@ struct lu_kmem_descr lov_caches[] = {
                 .ckd_size  = sizeof(struct lovsub_object)
         },
         {
-                .ckd_cache = &lovsub_req_kmem,
-                .ckd_name  = "lovsub_req_kmem",
-                .ckd_size  = sizeof(struct lovsub_req)
-        },
-        {
                 .ckd_cache = &lov_lock_link_kmem,
                 .ckd_name  = "lov_lock_link_kmem",
                 .ckd_size  = sizeof(struct lov_lock_link)
@@ -110,25 +98,6 @@ struct lu_kmem_descr lov_caches[] = {
 
 /*****************************************************************************
  *
- * Lov transfer operations.
- *
- */
-
-static void lov_req_completion(const struct lu_env *env,
-                               const struct cl_req_slice *slice, int ioret)
-{
-        struct lov_req *lr;
-
-        lr = cl2lov_req(slice);
-        kmem_cache_free(lov_req_kmem, lr);
-}
-
-static const struct cl_req_operations lov_req_ops = {
-        .cro_completion = lov_req_completion
-};
-
-/*****************************************************************************
- *
  * Lov device and device type functions.
  *
  */
@@ -248,26 +217,6 @@ static int lov_device_init(const struct lu_env *env, struct lu_device *d,
         return rc;
 }
 
-static int lov_req_init(const struct lu_env *env, struct cl_device *dev,
-                        struct cl_req *req)
-{
-        struct lov_req *lr;
-        int result;
-
-        lr = kmem_cache_zalloc(lov_req_kmem, GFP_NOFS);
-        if (lr) {
-                cl_req_slice_add(req, &lr->lr_cl, dev, &lov_req_ops);
-                result = 0;
-        } else {
-                result = -ENOMEM;
-        }
-        return result;
-}
-
-static const struct cl_device_operations lov_cl_ops = {
-        .cdo_req_init = lov_req_init
-};
-
 static void lov_emerg_free(struct lov_device_emerg **emrg, int nr)
 {
         int i;
@@ -478,7 +427,6 @@ static struct lu_device *lov_device_alloc(const struct lu_env *env,
         cl_device_init(&ld->ld_cl, t);
         d = lov2lu_dev(ld);
         d->ld_ops       = &lov_lu_ops;
-        ld->ld_cl.cd_ops = &lov_cl_ops;
 
         mutex_init(&ld->ld_mutex);
         lockdep_set_class(&ld->ld_mutex, &cl_lov_device_mutex_class);
diff --git a/drivers/staging/lustre/lustre/lov/lov_ea.c b/drivers/staging/lustre/lustre/lov/lov_ea.c
index 214c561767e0..ac0bf64c08c1 100644
--- a/drivers/staging/lustre/lustre/lov/lov_ea.c
+++ b/drivers/staging/lustre/lustre/lov/lov_ea.c
@@ -76,18 +76,19 @@ static int lsm_lmm_verify_common(struct lov_mds_md *lmm, int lmm_bytes,
         return 0;
 }
 
-struct lov_stripe_md *lsm_alloc_plain(__u16 stripe_count, int *size)
+struct lov_stripe_md *lsm_alloc_plain(u16 stripe_count)
 {
+        size_t oinfo_ptrs_size, lsm_size;
         struct lov_stripe_md *lsm;
         struct lov_oinfo     *loi;
-        int                i, oinfo_ptrs_size;
+        int i;
 
         LASSERT(stripe_count <= LOV_MAX_STRIPE_COUNT);
 
         oinfo_ptrs_size = sizeof(struct lov_oinfo *) * stripe_count;
-        *size = sizeof(struct lov_stripe_md) + oinfo_ptrs_size;
+        lsm_size = sizeof(*lsm) + oinfo_ptrs_size;
 
-        lsm = libcfs_kvzalloc(*size, GFP_NOFS);
+        lsm = libcfs_kvzalloc(lsm_size, GFP_NOFS);
         if (!lsm)
                 return NULL;
 
@@ -117,9 +118,43 @@ void lsm_free_plain(struct lov_stripe_md *lsm)
         kvfree(lsm);
 }
 
-static void lsm_unpackmd_common(struct lov_stripe_md *lsm,
-                                struct lov_mds_md *lmm)
+/*
+ * Find minimum stripe maxbytes value.  For inactive or
+ * reconnecting targets use LUSTRE_EXT3_STRIPE_MAXBYTES.
+ */
+static loff_t lov_tgt_maxbytes(struct lov_tgt_desc *tgt)
+{
+        loff_t maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES;
+        struct obd_import *imp;
+
+        if (!tgt->ltd_active)
+                return maxbytes;
+
+        imp = tgt->ltd_obd->u.cli.cl_import;
+        if (!imp)
+                return maxbytes;
+
+        spin_lock(&imp->imp_lock);
+        if (imp->imp_state == LUSTRE_IMP_FULL &&
+            (imp->imp_connect_data.ocd_connect_flags & OBD_CONNECT_MAXBYTES) &&
+             imp->imp_connect_data.ocd_maxbytes > 0)
+                maxbytes = imp->imp_connect_data.ocd_maxbytes;
+
+        spin_unlock(&imp->imp_lock);
+
+        return maxbytes;
+}
+
+static int lsm_unpackmd_common(struct lov_obd *lov,
+                               struct lov_stripe_md *lsm,
+                               struct lov_mds_md *lmm,
+                               struct lov_ost_data_v1 *objects)
 {
+        loff_t stripe_maxbytes = LLONG_MAX;
+        unsigned int stripe_count;
+        struct lov_oinfo *loi;
+        unsigned int i;
+
         /*
          * This supposes lov_mds_md_v1/v3 first fields are
          * are the same
@@ -129,11 +164,54 @@ static void lsm_unpackmd_common(struct lov_stripe_md *lsm,
         lsm->lsm_pattern = le32_to_cpu(lmm->lmm_pattern);
         lsm->lsm_layout_gen = le16_to_cpu(lmm->lmm_layout_gen);
         lsm->lsm_pool_name[0] = '\0';
+
+        stripe_count = lsm_is_released(lsm) ? 0 : lsm->lsm_stripe_count;
+
+        for (i = 0; i < stripe_count; i++) {
+                loff_t tgt_bytes;
+
+                loi = lsm->lsm_oinfo[i];
+                ostid_le_to_cpu(&objects[i].l_ost_oi, &loi->loi_oi);
+                loi->loi_ost_idx = le32_to_cpu(objects[i].l_ost_idx);
+                loi->loi_ost_gen = le32_to_cpu(objects[i].l_ost_gen);
+                if (lov_oinfo_is_dummy(loi))
+                        continue;
+
+                if (loi->loi_ost_idx >= lov->desc.ld_tgt_count &&
+                    !lov2obd(lov)->obd_process_conf) {
+                        CERROR("%s: OST index %d more than OST count %d\n",
+                               (char *)lov->desc.ld_uuid.uuid,
+                               loi->loi_ost_idx, lov->desc.ld_tgt_count);
+                        lov_dump_lmm_v1(D_WARNING, lmm);
+                        return -EINVAL;
+                }
+
+                if (!lov->lov_tgts[loi->loi_ost_idx]) {
+                        CERROR("%s: OST index %d missing\n",
+                               (char *)lov->desc.ld_uuid.uuid,
+                               loi->loi_ost_idx);
+                        lov_dump_lmm_v1(D_WARNING, lmm);
+                        continue;
+                }
+
+                tgt_bytes = lov_tgt_maxbytes(lov->lov_tgts[loi->loi_ost_idx]);
+                stripe_maxbytes = min_t(loff_t, stripe_maxbytes, tgt_bytes);
+        }
+
+        if (stripe_maxbytes == LLONG_MAX)
+                stripe_maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES;
+
+        if (!lsm->lsm_stripe_count)
+                lsm->lsm_maxbytes = stripe_maxbytes * lov->desc.ld_tgt_count;
+        else
+                lsm->lsm_maxbytes = stripe_maxbytes * lsm->lsm_stripe_count;
+
+        return 0;
 }
 
 static void
 lsm_stripe_by_index_plain(struct lov_stripe_md *lsm, int *stripeno,
-                          u64 *lov_off, u64 *swidth)
+                          loff_t *lov_off, loff_t *swidth)
 {
         if (swidth)
                 *swidth = (u64)lsm->lsm_stripe_size * lsm->lsm_stripe_count;
@@ -141,36 +219,12 @@ lsm_stripe_by_index_plain(struct lov_stripe_md *lsm, int *stripeno,
 
 static void
 lsm_stripe_by_offset_plain(struct lov_stripe_md *lsm, int *stripeno,
-                           u64 *lov_off, u64 *swidth)
+                           loff_t *lov_off, loff_t *swidth)
 {
         if (swidth)
                 *swidth = (u64)lsm->lsm_stripe_size * lsm->lsm_stripe_count;
 }
 
-/* Find minimum stripe maxbytes value.  For inactive or
- * reconnecting targets use LUSTRE_EXT3_STRIPE_MAXBYTES.
- */
-static void lov_tgt_maxbytes(struct lov_tgt_desc *tgt, __u64 *stripe_maxbytes)
-{
-        struct obd_import *imp = tgt->ltd_obd->u.cli.cl_import;
-
-        if (!imp || !tgt->ltd_active) {
-                *stripe_maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES;
-                return;
-        }
-
-        spin_lock(&imp->imp_lock);
-        if (imp->imp_state == LUSTRE_IMP_FULL &&
-            (imp->imp_connect_data.ocd_connect_flags & OBD_CONNECT_MAXBYTES) &&
-            imp->imp_connect_data.ocd_maxbytes > 0) {
-                if (*stripe_maxbytes > imp->imp_connect_data.ocd_maxbytes)
-                        *stripe_maxbytes = imp->imp_connect_data.ocd_maxbytes;
-        } else {
-                *stripe_maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES;
-        }
-        spin_unlock(&imp->imp_lock);
-}
-
 static int lsm_lmm_verify_v1(struct lov_mds_md_v1 *lmm, int lmm_bytes,
                              __u16 *stripe_count)
 {
@@ -197,45 +251,7 @@ static int lsm_lmm_verify_v1(struct lov_mds_md_v1 *lmm, int lmm_bytes,
 static int lsm_unpackmd_v1(struct lov_obd *lov, struct lov_stripe_md *lsm,
                            struct lov_mds_md_v1 *lmm)
 {
-        struct lov_oinfo *loi;
-        int i;
-        int stripe_count;
-        __u64 stripe_maxbytes = OBD_OBJECT_EOF;
-
-        lsm_unpackmd_common(lsm, lmm);
-
-        stripe_count = lsm_is_released(lsm) ? 0 : lsm->lsm_stripe_count;
-
-        for (i = 0; i < stripe_count; i++) {
-                /* XXX LOV STACKING call down to osc_unpackmd() */
-                loi = lsm->lsm_oinfo[i];
-                ostid_le_to_cpu(&lmm->lmm_objects[i].l_ost_oi, &loi->loi_oi);
-                loi->loi_ost_idx = le32_to_cpu(lmm->lmm_objects[i].l_ost_idx);
-                loi->loi_ost_gen = le32_to_cpu(lmm->lmm_objects[i].l_ost_gen);
-                if (lov_oinfo_is_dummy(loi))
-                        continue;
-
-                if (loi->loi_ost_idx >= lov->desc.ld_tgt_count) {
-                        CERROR("OST index %d more than OST count %d\n",
-                               loi->loi_ost_idx, lov->desc.ld_tgt_count);
-                        lov_dump_lmm_v1(D_WARNING, lmm);
-                        return -EINVAL;
-                }
-                if (!lov->lov_tgts[loi->loi_ost_idx]) {
-                        CERROR("OST index %d missing\n", loi->loi_ost_idx);
-                        lov_dump_lmm_v1(D_WARNING, lmm);
-                        return -EINVAL;
-                }
-                /* calculate the minimum stripe max bytes */
-                lov_tgt_maxbytes(lov->lov_tgts[loi->loi_ost_idx],
-                                 &stripe_maxbytes);
-        }
-
-        lsm->lsm_maxbytes = stripe_maxbytes * lsm->lsm_stripe_count;
-        if (lsm->lsm_stripe_count == 0)
-                lsm->lsm_maxbytes = stripe_maxbytes * lov->desc.ld_tgt_count;
-
-        return 0;
+        return lsm_unpackmd_common(lov, lsm, lmm, lmm->lmm_objects);
 }
 
 const struct lsm_operations lsm_v1_ops = {
@@ -275,55 +291,21 @@ static int lsm_lmm_verify_v3(struct lov_mds_md *lmmv1, int lmm_bytes,
 }
 
 static int lsm_unpackmd_v3(struct lov_obd *lov, struct lov_stripe_md *lsm,
-                           struct lov_mds_md *lmmv1)
+                           struct lov_mds_md *lmm)
 {
-        struct lov_mds_md_v3 *lmm;
-        struct lov_oinfo *loi;
-        int i;
-        int stripe_count;
-        __u64 stripe_maxbytes = OBD_OBJECT_EOF;
-        int cplen = 0;
+        struct lov_mds_md_v3 *lmm_v3 = (struct lov_mds_md_v3 *)lmm;
+        size_t cplen = 0;
+        int rc;
 
-        lmm = (struct lov_mds_md_v3 *)lmmv1;
+        rc = lsm_unpackmd_common(lov, lsm, lmm, lmm_v3->lmm_objects);
+        if (rc)
+                return rc;
 
-        lsm_unpackmd_common(lsm, (struct lov_mds_md_v1 *)lmm);
-
-        stripe_count = lsm_is_released(lsm) ? 0 : lsm->lsm_stripe_count;
-
-        cplen = strlcpy(lsm->lsm_pool_name, lmm->lmm_pool_name,
+        cplen = strlcpy(lsm->lsm_pool_name, lmm_v3->lmm_pool_name,
                         sizeof(lsm->lsm_pool_name));
         if (cplen >= sizeof(lsm->lsm_pool_name))
                 return -E2BIG;
 
-        for (i = 0; i < stripe_count; i++) {
-                /* XXX LOV STACKING call down to osc_unpackmd() */
-                loi = lsm->lsm_oinfo[i];
-                ostid_le_to_cpu(&lmm->lmm_objects[i].l_ost_oi, &loi->loi_oi);
-                loi->loi_ost_idx = le32_to_cpu(lmm->lmm_objects[i].l_ost_idx);
-                loi->loi_ost_gen = le32_to_cpu(lmm->lmm_objects[i].l_ost_gen);
-                if (lov_oinfo_is_dummy(loi))
-                        continue;
-
-                if (loi->loi_ost_idx >= lov->desc.ld_tgt_count) {
-                        CERROR("OST index %d more than OST count %d\n",
-                               loi->loi_ost_idx, lov->desc.ld_tgt_count);
-                        lov_dump_lmm_v3(D_WARNING, lmm);
-                        return -EINVAL;
-                }
-                if (!lov->lov_tgts[loi->loi_ost_idx]) {
-                        CERROR("OST index %d missing\n", loi->loi_ost_idx);
-                        lov_dump_lmm_v3(D_WARNING, lmm);
-                        return -EINVAL;
-                }
-                /* calculate the minimum stripe max bytes */
-                lov_tgt_maxbytes(lov->lov_tgts[loi->loi_ost_idx],
-                                 &stripe_maxbytes);
-        }
-
-        lsm->lsm_maxbytes = stripe_maxbytes * lsm->lsm_stripe_count;
-        if (lsm->lsm_stripe_count == 0)
-                lsm->lsm_maxbytes = stripe_maxbytes * lov->desc.ld_tgt_count;
-
         return 0;
 }
 
diff --git a/drivers/staging/lustre/lustre/lov/lov_internal.h b/drivers/staging/lustre/lustre/lov/lov_internal.h
index 07e5ede3e952..774499c74daa 100644
--- a/drivers/staging/lustre/lustre/lov/lov_internal.h
+++ b/drivers/staging/lustre/lustre/lov/lov_internal.h
@@ -36,6 +36,77 @@
 #include "../include/obd_class.h"
 #include "../include/lustre/lustre_user.h"
 
+/*
+ * If we are unable to get the maximum object size from the OST in
+ * ocd_maxbytes using OBD_CONNECT_MAXBYTES, then we fall back to using
+ * the old maximum object size from ext3.
+ */
+#define LUSTRE_EXT3_STRIPE_MAXBYTES 0x1fffffff000ULL
+
+struct lov_stripe_md {
+        atomic_t        lsm_refc;
+        spinlock_t      lsm_lock;
+        pid_t           lsm_lock_owner; /* debugging */
+
+        /*
+         * maximum possible file size, might change as OSTs status changes,
+         * e.g. disconnected, deactivated
+         */
+        loff_t          lsm_maxbytes;
+        struct ost_id   lsm_oi;
+        u32             lsm_magic;
+        u32             lsm_stripe_size;
+        u32             lsm_pattern; /* RAID0, RAID1, released, ... */
+        u16             lsm_stripe_count;
+        u16             lsm_layout_gen;
+        char            lsm_pool_name[LOV_MAXPOOLNAME + 1];
+        struct lov_oinfo        *lsm_oinfo[0];
+};
+
+static inline bool lsm_is_released(struct lov_stripe_md *lsm)
+{
+        return !!(lsm->lsm_pattern & LOV_PATTERN_F_RELEASED);
+}
+
+static inline bool lsm_has_objects(struct lov_stripe_md *lsm)
+{
+        if (!lsm)
+                return false;
+
+        if (lsm_is_released(lsm))
+                return false;
+
+        return true;
+}
+
+struct lsm_operations {
+        void (*lsm_free)(struct lov_stripe_md *);
+        void (*lsm_stripe_by_index)(struct lov_stripe_md *, int *, loff_t *,
+                                    loff_t *);
+        void (*lsm_stripe_by_offset)(struct lov_stripe_md *, int *, loff_t *,
+                                     loff_t *);
+        int (*lsm_lmm_verify)(struct lov_mds_md *lmm, int lmm_bytes,
+                              u16 *stripe_count);
+        int (*lsm_unpackmd)(struct lov_obd *lov, struct lov_stripe_md *lsm,
+                            struct lov_mds_md *lmm);
+};
+
+extern const struct lsm_operations lsm_v1_ops;
+extern const struct lsm_operations lsm_v3_ops;
+
+static inline const struct lsm_operations *lsm_op_find(int magic)
+{
+        switch (magic) {
+        case LOV_MAGIC_V1:
+                return &lsm_v1_ops;
+        case LOV_MAGIC_V3:
+                return &lsm_v3_ops;
+        default:
+                CERROR("unrecognized lsm_magic %08x\n", magic);
+                return NULL;
+        }
+}
+
 /* lov_do_div64(a, b) returns a % b, and a = a / b.
  * The 32-bit code is LOV-specific due to knowing about stripe limits in
  * order to reduce the divisor to a 32-bit number.  If the divisor is
@@ -110,8 +181,6 @@ struct lov_request_set {
         atomic_t                        set_completes;
         atomic_t                        set_success;
         atomic_t                        set_finish_checked;
-        struct llog_cookie              *set_cookies;
-        int                             set_cookie_sent;
         struct list_head                        set_list;
         wait_queue_head_t                       set_waitq;
 };
@@ -132,8 +201,6 @@ static inline void lov_put_reqset(struct lov_request_set *set)
         (char *)((lv)->lov_tgts[index]->ltd_uuid.uuid)
 
 /* lov_merge.c */
-void lov_merge_attrs(struct obdo *tgt, struct obdo *src, u64 valid,
-                     struct lov_stripe_md *lsm, int stripeno, int *set);
 int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
                       struct ost_lvb *lvb, __u64 *kms_place);
 
@@ -150,17 +217,9 @@ pgoff_t lov_stripe_pgoff(struct lov_stripe_md *lsm, pgoff_t stripe_index,
                          int stripe);
 
 /* lov_request.c */
-int lov_update_common_set(struct lov_request_set *set,
-                          struct lov_request *req, int rc);
 int lov_prep_getattr_set(struct obd_export *exp, struct obd_info *oinfo,
                          struct lov_request_set **reqset);
 int lov_fini_getattr_set(struct lov_request_set *set);
-int lov_prep_setattr_set(struct obd_export *exp, struct obd_info *oinfo,
-                         struct obd_trans_info *oti,
-                         struct lov_request_set **reqset);
-int lov_update_setattr_set(struct lov_request_set *set,
-                           struct lov_request *req, int rc);
-int lov_fini_setattr_set(struct lov_request_set *set);
 int lov_prep_statfs_set(struct obd_device *obd, struct obd_info *oinfo,
                         struct lov_request_set **reqset);
 int lov_fini_statfs(struct obd_device *obd, struct obd_statfs *osfs,
@@ -186,12 +245,10 @@ int lov_del_target(struct obd_device *obd, __u32 index,
                    struct obd_uuid *uuidp, int gen);
 
 /* lov_pack.c */
-int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmm,
-               struct lov_stripe_md *lsm);
-int lov_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
-                 struct lov_mds_md *lmm, int lmm_bytes);
-int lov_alloc_memmd(struct lov_stripe_md **lsmp, __u16 stripe_count,
-                    int pattern, int magic);
+ssize_t lov_lsm_pack(const struct lov_stripe_md *lsm, void *buf,
+                     size_t buf_size);
+struct lov_stripe_md *lov_unpackmd(struct lov_obd *lov, struct lov_mds_md *lmm,
+                                   size_t lmm_size);
 int lov_free_memmd(struct lov_stripe_md **lsmp);
 
 void lov_dump_lmm_v1(int level, struct lov_mds_md_v1 *lmm);
@@ -199,7 +256,7 @@ void lov_dump_lmm_v3(int level, struct lov_mds_md_v3 *lmm);
 void lov_dump_lmm_common(int level, void *lmmp);
 
 /* lov_ea.c */
-struct lov_stripe_md *lsm_alloc_plain(__u16 stripe_count, int *size);
+struct lov_stripe_md *lsm_alloc_plain(u16 stripe_count);
 void lsm_free_plain(struct lov_stripe_md *lsm);
 void dump_lsm(unsigned int level, const struct lov_stripe_md *lsm);
 
@@ -244,4 +301,9 @@ static inline bool lov_oinfo_is_dummy(const struct lov_oinfo *loi)
         return false;
 }
 
+static inline struct obd_device *lov2obd(const struct lov_obd *lov)
+{
+        return container_of0(lov, struct obd_device, u.lov);
+}
+
 #endif
diff --git a/drivers/staging/lustre/lustre/lov/lov_io.c b/drivers/staging/lustre/lustre/lov/lov_io.c
index d10157985ed9..002326c282a7 100644
--- a/drivers/staging/lustre/lustre/lov/lov_io.c
+++ b/drivers/staging/lustre/lustre/lov/lov_io.c
@@ -86,6 +86,8 @@ static void lov_io_sub_inherit(struct cl_io *io, struct lov_io *lio,
         switch (io->ci_type) {
         case CIT_SETATTR: {
                 io->u.ci_setattr.sa_attr = parent->u.ci_setattr.sa_attr;
+                io->u.ci_setattr.sa_attr_flags =
+                                        parent->u.ci_setattr.sa_attr_flags;
                 io->u.ci_setattr.sa_valid = parent->u.ci_setattr.sa_valid;
                 io->u.ci_setattr.sa_stripe_index = stripe;
                 io->u.ci_setattr.sa_parent_fid =
@@ -98,6 +100,12 @@ static void lov_io_sub_inherit(struct cl_io *io, struct lov_io *lio,
                 }
                 break;
         }
+        case CIT_DATA_VERSION: {
+                io->u.ci_data_version.dv_data_version = 0;
+                io->u.ci_data_version.dv_flags =
+                        parent->u.ci_data_version.dv_flags;
+                break;
+        }
         case CIT_FAULT: {
                 struct cl_object *obj = parent->ci_obj;
                 loff_t off = cl_offset(obj, parent->u.ci_fault.ft_index);
@@ -159,12 +167,7 @@ static int lov_io_sub_init(const struct lu_env *env, struct lov_io *lio,
                 sub->sub_env = ld->ld_emrg[stripe]->emrg_env;
                 sub->sub_borrowed = 1;
         } else {
-                void *cookie;
-
-                /* obtain new environment */
-                cookie = cl_env_reenter();
                 sub->sub_env = cl_env_get(&sub->sub_refcheck);
-                cl_env_reexit(cookie);
                 if (IS_ERR(sub->sub_env))
                         result = PTR_ERR(sub->sub_env);
 
@@ -337,6 +340,11 @@ static int lov_io_slice_init(struct lov_io *lio, struct lov_object *obj,
                 lio->lis_endpos = OBD_OBJECT_EOF;
                 break;
 
+        case CIT_DATA_VERSION:
+                lio->lis_pos = 0;
+                lio->lis_endpos = OBD_OBJECT_EOF;
+                break;
+
         case CIT_FAULT: {
                 pgoff_t index = io->u.ci_fault.ft_index;
 
@@ -514,6 +522,24 @@ static int lov_io_end_wrapper(const struct lu_env *env, struct cl_io *io)
         return 0;
 }
 
+static void
+lov_io_data_version_end(const struct lu_env *env, const struct cl_io_slice *ios)
+{
+        struct lov_io *lio = cl2lov_io(env, ios);
+        struct cl_io *parent = lio->lis_cl.cis_io;
+        struct lov_io_sub *sub;
+
+        list_for_each_entry(sub, &lio->lis_active, sub_linkage) {
+                lov_io_end_wrapper(env, sub->sub_io);
+
+                parent->u.ci_data_version.dv_data_version +=
+                        sub->sub_io->u.ci_data_version.dv_data_version;
+
+                if (!parent->ci_result)
+                        parent->ci_result = sub->sub_io->ci_result;
+        }
+}
+
 static int lov_io_iter_fini_wrapper(const struct lu_env *env, struct cl_io *io)
 {
         cl_io_iter_fini(env, io);
@@ -555,6 +581,65 @@ static void lov_io_unlock(const struct lu_env *env,
         LASSERT(rc == 0);
 }
 
+static int lov_io_read_ahead(const struct lu_env *env,
+                             const struct cl_io_slice *ios,
+                             pgoff_t start, struct cl_read_ahead *ra)
+{
+        struct lov_io *lio = cl2lov_io(env, ios);
+        struct lov_object *loo = lio->lis_object;
+        struct cl_object *obj = lov2cl(loo);
+        struct lov_layout_raid0 *r0 = lov_r0(loo);
+        unsigned int pps; /* pages per stripe */
+        struct lov_io_sub *sub;
+        pgoff_t ra_end;
+        loff_t suboff;
+        int stripe;
+        int rc;
+
+        stripe = lov_stripe_number(loo->lo_lsm, cl_offset(obj, start));
+        if (unlikely(!r0->lo_sub[stripe]))
+                return -EIO;
+
+        sub = lov_sub_get(env, lio, stripe);
+        if (IS_ERR(sub))
+                return PTR_ERR(sub);
+
+        lov_stripe_offset(loo->lo_lsm, cl_offset(obj, start), stripe, &suboff);
+        rc = cl_io_read_ahead(sub->sub_env, sub->sub_io,
+                              cl_index(lovsub2cl(r0->lo_sub[stripe]), suboff),
+                              ra);
+        lov_sub_put(sub);
+
+        CDEBUG(D_READA, DFID " cra_end = %lu, stripes = %d, rc = %d\n",
+               PFID(lu_object_fid(lov2lu(loo))), ra->cra_end, r0->lo_nr, rc);
+        if (rc)
+                return rc;
+
+        /**
+         * Adjust the stripe index by layout of raid0. ra->cra_end is
+         * the maximum page index covered by an underlying DLM lock.
+         * This function converts cra_end from stripe level to file
+         * level, and make sure it's not beyond stripe boundary.
+         */
+        if (r0->lo_nr == 1)     /* single stripe file */
+                return 0;
+
+        /* cra_end is stripe level, convert it into file level */
+        ra_end = ra->cra_end;
+        if (ra_end != CL_PAGE_EOF)
+                ra_end = lov_stripe_pgoff(loo->lo_lsm, ra_end, stripe);
+
+        pps = loo->lo_lsm->lsm_stripe_size >> PAGE_SHIFT;
+
+        CDEBUG(D_READA, DFID " max_index = %lu, pps = %u, stripe_size = %u, stripe no = %u, start index = %lu\n",
+               PFID(lu_object_fid(lov2lu(loo))), ra_end, pps,
+               loo->lo_lsm->lsm_stripe_size, stripe, start);
+
+        /* never exceed the end of the stripe */
+        ra->cra_end = min_t(pgoff_t, ra_end, start + pps - start % pps - 1);
+        return 0;
+}
+
 /**
  * lov implementation of cl_operations::cio_submit() method. It takes a list
  * of pages in \a queue, splits it into per-stripe sub-lists, invokes
@@ -779,6 +864,15 @@ static const struct cl_io_operations lov_io_ops = {
                         .cio_start     = lov_io_start,
                         .cio_end       = lov_io_end
                 },
+                [CIT_DATA_VERSION] = {
+                        .cio_fini       = lov_io_fini,
+                        .cio_iter_init  = lov_io_iter_init,
+                        .cio_iter_fini  = lov_io_iter_fini,
+                        .cio_lock       = lov_io_lock,
+                        .cio_unlock     = lov_io_unlock,
+                        .cio_start      = lov_io_start,
+                        .cio_end        = lov_io_data_version_end,
+                },
                 [CIT_FAULT] = {
                         .cio_fini      = lov_io_fini,
                         .cio_iter_init = lov_io_iter_init,
@@ -801,6 +895,7 @@ static const struct cl_io_operations lov_io_ops = {
                         .cio_fini   = lov_io_fini
                 }
         },
+        .cio_read_ahead                 = lov_io_read_ahead,
         .cio_submit                    = lov_io_submit,
         .cio_commit_async              = lov_io_commit_async,
 };
@@ -820,6 +915,13 @@ static void lov_empty_io_fini(const struct lu_env *env,
                 wake_up_all(&lov->lo_waitq);
 }
 
+static int lov_empty_io_submit(const struct lu_env *env,
+                               const struct cl_io_slice *ios,
+                               enum cl_req_type crt, struct cl_2queue *queue)
+{
+        return -EBADF;
+}
+
 static void lov_empty_impossible(const struct lu_env *env,
                                  struct cl_io_slice *ios)
 {
@@ -870,7 +972,7 @@ static const struct cl_io_operations lov_empty_io_ops = {
                         .cio_fini   = lov_empty_io_fini
                 }
         },
-        .cio_submit                    = LOV_EMPTY_IMPOSSIBLE,
+        .cio_submit                     = lov_empty_io_submit,
         .cio_commit_async              = LOV_EMPTY_IMPOSSIBLE
 };
 
@@ -909,6 +1011,7 @@ int lov_io_init_empty(const struct lu_env *env, struct cl_object *obj,
                 break;
         case CIT_FSYNC:
         case CIT_SETATTR:
+        case CIT_DATA_VERSION:
                 result = 1;
                 break;
         case CIT_WRITE:
@@ -944,6 +1047,7 @@ int lov_io_init_released(const struct lu_env *env, struct cl_object *obj,
                 LASSERTF(0, "invalid type %d\n", io->ci_type);
         case CIT_MISC:
         case CIT_FSYNC:
+        case CIT_DATA_VERSION:
                 result = 1;
                 break;
         case CIT_SETATTR:
diff --git a/drivers/staging/lustre/lustre/lov/lov_merge.c b/drivers/staging/lustre/lustre/lov/lov_merge.c
index 674af106b50b..391dfd207177 100644
--- a/drivers/staging/lustre/lustre/lov/lov_merge.c
+++ b/drivers/staging/lustre/lustre/lov/lov_merge.c
@@ -104,53 +104,3 @@ int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
         lvb->lvb_ctime = current_ctime;
         return rc;
 }
-
-void lov_merge_attrs(struct obdo *tgt, struct obdo *src, u64 valid,
-                     struct lov_stripe_md *lsm, int stripeno, int *set)
-{
-        valid &= src->o_valid;
-
-        if (*set) {
-                tgt->o_valid &= valid;
-                if (valid & OBD_MD_FLSIZE) {
-                        /* this handles sparse files properly */
-                        u64 lov_size;
-
-                        lov_size = lov_stripe_size(lsm, src->o_size, stripeno);
-                        if (lov_size > tgt->o_size)
-                                tgt->o_size = lov_size;
-                }
-                if (valid & OBD_MD_FLBLOCKS)
-                        tgt->o_blocks += src->o_blocks;
-                if (valid & OBD_MD_FLBLKSZ)
-                        tgt->o_blksize += src->o_blksize;
-                if (valid & OBD_MD_FLCTIME && tgt->o_ctime < src->o_ctime)
-                        tgt->o_ctime = src->o_ctime;
-                if (valid & OBD_MD_FLMTIME && tgt->o_mtime < src->o_mtime)
-                        tgt->o_mtime = src->o_mtime;
-                if (valid & OBD_MD_FLDATAVERSION)
-                        tgt->o_data_version += src->o_data_version;
-
-                /* handle flags */
-                if (valid & OBD_MD_FLFLAGS)
-                        tgt->o_flags &= src->o_flags;
-                else
-                        tgt->o_flags = 0;
-        } else {
-                memcpy(tgt, src, sizeof(*tgt));
-                tgt->o_oi = lsm->lsm_oi;
-                tgt->o_valid = valid;
-                if (valid & OBD_MD_FLSIZE)
-                        tgt->o_size = lov_stripe_size(lsm, src->o_size,
-                                                      stripeno);
-                tgt->o_flags = 0;
-                if (valid & OBD_MD_FLFLAGS)
-                        tgt->o_flags = src->o_flags;
-        }
-
-        /* data_version needs to be valid on all stripes to be correct! */
-        if (!(valid & OBD_MD_FLDATAVERSION))
-                tgt->o_valid &= ~OBD_MD_FLDATAVERSION;
-
-        *set += 1;
-}
diff --git a/drivers/staging/lustre/lustre/lov/lov_obd.c b/drivers/staging/lustre/lustre/lov/lov_obd.c
index b23016f7ec26..63b064523c6a 100644
--- a/drivers/staging/lustre/lustre/lov/lov_obd.c
+++ b/drivers/staging/lustre/lustre/lov/lov_obd.c
@@ -40,19 +40,20 @@
 #define DEBUG_SUBSYSTEM S_LOV
 #include "../../include/linux/libcfs/libcfs.h"
 
-#include "../include/obd_support.h"
-#include "../include/lustre/lustre_ioctl.h"
-#include "../include/lustre_lib.h"
-#include "../include/lustre_net.h"
 #include "../include/lustre/lustre_idl.h"
+#include "../include/lustre/lustre_ioctl.h"
+
+#include "../include/cl_object.h"
 #include "../include/lustre_dlm.h"
+#include "../include/lustre_fid.h"
+#include "../include/lustre_lib.h"
 #include "../include/lustre_mds.h"
-#include "../include/obd_class.h"
-#include "../include/lprocfs_status.h"
+#include "../include/lustre_net.h"
 #include "../include/lustre_param.h"
-#include "../include/cl_object.h"
-#include "../include/lustre/ll_fiemap.h"
-#include "../include/lustre_fid.h"
+#include "../include/lustre_swab.h"
+#include "../include/lprocfs_status.h"
+#include "../include/obd_class.h"
+#include "../include/obd_support.h"
 
 #include "lov_internal.h"
 
@@ -826,29 +827,6 @@ out:
         return rc;
 }
 
-static int lov_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
-{
-        struct lov_obd *lov = &obd->u.lov;
-
-        switch (stage) {
-        case OBD_CLEANUP_EARLY: {
-                int i;
-
-                for (i = 0; i < lov->desc.ld_tgt_count; i++) {
-                        if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_active)
-                                continue;
-                        obd_precleanup(class_exp2obd(lov->lov_tgts[i]->ltd_exp),
-                                       OBD_CLEANUP_EARLY);
-                }
-                break;
-        }
-        default:
-                break;
-        }
-
-        return 0;
-}
-
 static int lov_cleanup(struct obd_device *obd)
 {
         struct lov_obd *lov = &obd->u.lov;
@@ -972,163 +950,6 @@ out:
         return rc;
 }
 
-#define ASSERT_LSM_MAGIC(lsmp)                                            \
-do {                                                                        \
-        LASSERT((lsmp));                                                \
-        LASSERTF(((lsmp)->lsm_magic == LOV_MAGIC_V1 ||                    \
-                 (lsmp)->lsm_magic == LOV_MAGIC_V3),                        \
-                 "%p->lsm_magic=%x\n", (lsmp), (lsmp)->lsm_magic);            \
-} while (0)
-
-static int lov_getattr_interpret(struct ptlrpc_request_set *rqset,
-                                 void *data, int rc)
-{
-        struct lov_request_set *lovset = (struct lov_request_set *)data;
-        int err;
-
-        /* don't do attribute merge if this async op failed */
-        if (rc)
-                atomic_set(&lovset->set_completes, 0);
-        err = lov_fini_getattr_set(lovset);
-        return rc ? rc : err;
-}
-
-static int lov_getattr_async(struct obd_export *exp, struct obd_info *oinfo,
-                             struct ptlrpc_request_set *rqset)
-{
-        struct lov_request_set *lovset;
-        struct lov_obd *lov;
-        struct lov_request *req;
-        int rc = 0, err;
-
-        LASSERT(oinfo);
-        ASSERT_LSM_MAGIC(oinfo->oi_md);
-
-        if (!exp || !exp->exp_obd)
-                return -ENODEV;
-
-        lov = &exp->exp_obd->u.lov;
-
-        rc = lov_prep_getattr_set(exp, oinfo, &lovset);
-        if (rc)
-                return rc;
-
-        CDEBUG(D_INFO, "objid "DOSTID": %ux%u byte stripes\n",
-               POSTID(&oinfo->oi_md->lsm_oi), oinfo->oi_md->lsm_stripe_count,
-               oinfo->oi_md->lsm_stripe_size);
-
-        list_for_each_entry(req, &lovset->set_list, rq_link) {
-                CDEBUG(D_INFO, "objid " DOSTID "[%d] has subobj " DOSTID " at idx%u\n",
-                       POSTID(&oinfo->oi_oa->o_oi), req->rq_stripe,
-                       POSTID(&req->rq_oi.oi_oa->o_oi), req->rq_idx);
-                rc = obd_getattr_async(lov->lov_tgts[req->rq_idx]->ltd_exp,
-                                       &req->rq_oi, rqset);
-                if (rc) {
-                        CERROR("%s: getattr objid "DOSTID" subobj"
-                               DOSTID" on OST idx %d: rc = %d\n",
-                               exp->exp_obd->obd_name,
-                               POSTID(&oinfo->oi_oa->o_oi),
-                               POSTID(&req->rq_oi.oi_oa->o_oi),
-                               req->rq_idx, rc);
-                        goto out;
-                }
-        }
-
-        if (!list_empty(&rqset->set_requests)) {
-                LASSERT(rc == 0);
-                LASSERT(!rqset->set_interpret);
-                rqset->set_interpret = lov_getattr_interpret;
-                rqset->set_arg = (void *)lovset;
-                return rc;
-        }
-out:
-        if (rc)
-                atomic_set(&lovset->set_completes, 0);
-        err = lov_fini_getattr_set(lovset);
-        return rc ? rc : err;
-}
-
-static int lov_setattr_interpret(struct ptlrpc_request_set *rqset,
-                                 void *data, int rc)
-{
-        struct lov_request_set *lovset = (struct lov_request_set *)data;
-        int err;
-
-        if (rc)
-                atomic_set(&lovset->set_completes, 0);
-        err = lov_fini_setattr_set(lovset);
-        return rc ? rc : err;
-}
-
-/* If @oti is given, the request goes from MDS and responses from OSTs are not
- * needed. Otherwise, a client is waiting for responses.
- */
-static int lov_setattr_async(struct obd_export *exp, struct obd_info *oinfo,
-                             struct obd_trans_info *oti,
-                             struct ptlrpc_request_set *rqset)
-{
-        struct lov_request_set *set;
-        struct lov_request *req;
-        struct lov_obd *lov;
-        int rc = 0;
-
-        LASSERT(oinfo);
-        ASSERT_LSM_MAGIC(oinfo->oi_md);
-        if (oinfo->oi_oa->o_valid & OBD_MD_FLCOOKIE) {
-                LASSERT(oti);
-                LASSERT(oti->oti_logcookies);
-        }
-
-        if (!exp || !exp->exp_obd)
-                return -ENODEV;
-
-        lov = &exp->exp_obd->u.lov;
-        rc = lov_prep_setattr_set(exp, oinfo, oti, &set);
-        if (rc)
-                return rc;
-
-        CDEBUG(D_INFO, "objid "DOSTID": %ux%u byte stripes\n",
-               POSTID(&oinfo->oi_md->lsm_oi),
-               oinfo->oi_md->lsm_stripe_count,
-               oinfo->oi_md->lsm_stripe_size);
-
-        list_for_each_entry(req, &set->set_list, rq_link) {
-                if (oinfo->oi_oa->o_valid & OBD_MD_FLCOOKIE)
-                        oti->oti_logcookies = set->set_cookies + req->rq_stripe;
-
-                CDEBUG(D_INFO, "objid " DOSTID "[%d] has subobj " DOSTID " at idx%u\n",
-                       POSTID(&oinfo->oi_oa->o_oi), req->rq_stripe,
-                       POSTID(&req->rq_oi.oi_oa->o_oi), req->rq_idx);
-
-                rc = obd_setattr_async(lov->lov_tgts[req->rq_idx]->ltd_exp,
-                                       &req->rq_oi, oti, rqset);
-                if (rc) {
-                        CERROR("error: setattr objid "DOSTID" subobj"
-                               DOSTID" on OST idx %d: rc = %d\n",
-                               POSTID(&set->set_oi->oi_oa->o_oi),
-                               POSTID(&req->rq_oi.oi_oa->o_oi),
-                               req->rq_idx, rc);
-                        break;
-                }
-        }
-
-        /* If we are not waiting for responses on async requests, return. */
-        if (rc || !rqset || list_empty(&rqset->set_requests)) {
-                int err;
-
-                if (rc)
-                        atomic_set(&set->set_completes, 0);
-                err = lov_fini_setattr_set(set);
-                return rc ? rc : err;
-        }
-
-        LASSERT(!rqset->set_interpret);
-        rqset->set_interpret = lov_setattr_interpret;
-        rqset->set_arg = (void *)set;
-
-        return 0;
-}
-
 int lov_statfs_interpret(struct ptlrpc_request_set *rqset, void *data, int rc)
 {
         struct lov_request_set *lovset = (struct lov_request_set *)data;
@@ -1183,7 +1004,10 @@ static int lov_statfs(const struct lu_env *env, struct obd_export *exp,
                       struct obd_statfs *osfs, __u64 max_age, __u32 flags)
 {
         struct ptlrpc_request_set *set = NULL;
-        struct obd_info oinfo = { };
+        struct obd_info oinfo = {
+                .oi_osfs = osfs,
+                .oi_flags = flags,
+        };
         int rc = 0;
 
         /* for obdclass we forbid using obd_statfs_rqset, but prefer using async
@@ -1193,8 +1017,6 @@ static int lov_statfs(const struct lu_env *env, struct obd_export *exp,
         if (!set)
                 return -ENOMEM;
 
-        oinfo.oi_osfs = osfs;
-        oinfo.oi_flags = flags;
         rc = lov_statfs_async(exp, &oinfo, max_age, set);
         if (rc == 0)
                 rc = ptlrpc_set_wait(set);
@@ -1235,8 +1057,8 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
 
                 /* copy UUID */
                 if (copy_to_user(data->ioc_pbuf2, obd2cli_tgt(osc_obd),
-                                 min((int)data->ioc_plen2,
-                                     (int)sizeof(struct obd_uuid))))
+                                 min_t(unsigned long, data->ioc_plen2,
+                                       sizeof(struct obd_uuid))))
                         return -EFAULT;
 
                 memcpy(&flags, data->ioc_inlbuf1, sizeof(__u32));
@@ -1249,8 +1071,8 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 if (rc)
                         return rc;
                 if (copy_to_user(data->ioc_pbuf1, &stat_buf,
-                                 min((int)data->ioc_plen1,
-                                     (int)sizeof(stat_buf))))
+                                 min_t(unsigned long, data->ioc_plen1,
+                                       sizeof(stat_buf))))
                         return -EFAULT;
                 break;
         }
@@ -1367,8 +1189,6 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                         osc_obd->obd_force = obddev->obd_force;
                         err = obd_iocontrol(cmd, lov->lov_tgts[i]->ltd_exp,
                                             len, karg, uarg);
-                        if (err == -ENODATA && cmd == OBD_IOC_POLL_QUOTACHECK)
-                                return err;
                         if (err) {
                                 if (lov->lov_tgts[i]->ltd_active) {
                                         CDEBUG(err == -ENOTTY ?
@@ -1391,454 +1211,35 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         return rc;
 }
 
-#define FIEMAP_BUFFER_SIZE 4096
-
-/**
- * Non-zero fe_logical indicates that this is a continuation FIEMAP
- * call. The local end offset and the device are sent in the first
- * fm_extent. This function calculates the stripe number from the index.
- * This function returns a stripe_no on which mapping is to be restarted.
- *
- * This function returns fm_end_offset which is the in-OST offset at which
- * mapping should be restarted. If fm_end_offset=0 is returned then caller
- * will re-calculate proper offset in next stripe.
- * Note that the first extent is passed to lov_get_info via the value field.
- *
- * \param fiemap fiemap request header
- * \param lsm striping information for the file
- * \param fm_start logical start of mapping
- * \param fm_end logical end of mapping
- * \param start_stripe starting stripe will be returned in this
- */
-static u64 fiemap_calc_fm_end_offset(struct ll_user_fiemap *fiemap,
-                                     struct lov_stripe_md *lsm, u64 fm_start,
-                                     u64 fm_end, int *start_stripe)
-{
-        u64 local_end = fiemap->fm_extents[0].fe_logical;
-        u64 lun_start, lun_end;
-        u64 fm_end_offset;
-        int stripe_no = -1, i;
-
-        if (fiemap->fm_extent_count == 0 ||
-            fiemap->fm_extents[0].fe_logical == 0)
-                return 0;
-
-        /* Find out stripe_no from ost_index saved in the fe_device */
-        for (i = 0; i < lsm->lsm_stripe_count; i++) {
-                struct lov_oinfo *oinfo = lsm->lsm_oinfo[i];
-
-                if (lov_oinfo_is_dummy(oinfo))
-                        continue;
-
-                if (oinfo->loi_ost_idx == fiemap->fm_extents[0].fe_device) {
-                        stripe_no = i;
-                        break;
-                }
-        }
-        if (stripe_no == -1)
-                return -EINVAL;
-
-        /* If we have finished mapping on previous device, shift logical
-         * offset to start of next device
-         */
-        if ((lov_stripe_intersects(lsm, stripe_no, fm_start, fm_end,
-                                   &lun_start, &lun_end)) != 0 &&
-                                   local_end < lun_end) {
-                fm_end_offset = local_end;
-                *start_stripe = stripe_no;
-        } else {
-                /* This is a special value to indicate that caller should
-                 * calculate offset in next stripe.
-                 */
-                fm_end_offset = 0;
-                *start_stripe = (stripe_no + 1) % lsm->lsm_stripe_count;
-        }
-
-        return fm_end_offset;
-}
-
-/**
- * We calculate on which OST the mapping will end. If the length of mapping
- * is greater than (stripe_size * stripe_count) then the last_stripe will
- * will be one just before start_stripe. Else we check if the mapping
- * intersects each OST and find last_stripe.
- * This function returns the last_stripe and also sets the stripe_count
- * over which the mapping is spread
- *
- * \param lsm striping information for the file
- * \param fm_start logical start of mapping
- * \param fm_end logical end of mapping
- * \param start_stripe starting stripe of the mapping
- * \param stripe_count the number of stripes across which to map is returned
- *
- * \retval last_stripe return the last stripe of the mapping
- */
-static int fiemap_calc_last_stripe(struct lov_stripe_md *lsm, u64 fm_start,
-                                   u64 fm_end, int start_stripe,
-                                   int *stripe_count)
-{
-        int last_stripe;
-        u64 obd_start, obd_end;
-        int i, j;
-
-        if (fm_end - fm_start > lsm->lsm_stripe_size * lsm->lsm_stripe_count) {
-                last_stripe = start_stripe < 1 ? lsm->lsm_stripe_count - 1 :
-                                                              start_stripe - 1;
-                *stripe_count = lsm->lsm_stripe_count;
-        } else {
-                for (j = 0, i = start_stripe; j < lsm->lsm_stripe_count;
-                     i = (i + 1) % lsm->lsm_stripe_count, j++) {
-                        if ((lov_stripe_intersects(lsm, i, fm_start, fm_end,
-                                                   &obd_start, &obd_end)) == 0)
-                                break;
-                }
-                *stripe_count = j;
-                last_stripe = (start_stripe + j - 1) % lsm->lsm_stripe_count;
-        }
-
-        return last_stripe;
-}
-
-/**
- * Set fe_device and copy extents from local buffer into main return buffer.
- *
- * \param fiemap fiemap request header
- * \param lcl_fm_ext array of local fiemap extents to be copied
- * \param ost_index OST index to be written into the fm_device field for each
-                    extent
- * \param ext_count number of extents to be copied
- * \param current_extent where to start copying in main extent array
- */
-static void fiemap_prepare_and_copy_exts(struct ll_user_fiemap *fiemap,
-                                         struct ll_fiemap_extent *lcl_fm_ext,
-                                         int ost_index, unsigned int ext_count,
-                                         int current_extent)
-{
-        char *to;
-        int ext;
-
-        for (ext = 0; ext < ext_count; ext++) {
-                lcl_fm_ext[ext].fe_device = ost_index;
-                lcl_fm_ext[ext].fe_flags |= FIEMAP_EXTENT_NET;
-        }
-
-        /* Copy fm_extent's from fm_local to return buffer */
-        to = (char *)fiemap + fiemap_count_to_size(current_extent);
-        memcpy(to, lcl_fm_ext, ext_count * sizeof(struct ll_fiemap_extent));
-}
-
-/**
- * Break down the FIEMAP request and send appropriate calls to individual OSTs.
- * This also handles the restarting of FIEMAP calls in case mapping overflows
- * the available number of extents in single call.
- */
-static int lov_fiemap(struct lov_obd *lov, __u32 keylen, void *key,
-                      __u32 *vallen, void *val, struct lov_stripe_md *lsm)
-{
-        struct ll_fiemap_info_key *fm_key = key;
-        struct ll_user_fiemap *fiemap = val;
-        struct ll_user_fiemap *fm_local = NULL;
-        struct ll_fiemap_extent *lcl_fm_ext;
-        int count_local;
-        unsigned int get_num_extents = 0;
-        int ost_index = 0, actual_start_stripe, start_stripe;
-        u64 fm_start, fm_end, fm_length, fm_end_offset;
-        u64 curr_loc;
-        int current_extent = 0, rc = 0, i;
-        /* Whether have we collected enough extents */
-        bool enough = false;
-        int ost_eof = 0; /* EOF for object */
-        int ost_done = 0; /* done with required mapping for this OST? */
-        int last_stripe;
-        int cur_stripe = 0, cur_stripe_wrap = 0, stripe_count;
-        unsigned int buffer_size = FIEMAP_BUFFER_SIZE;
-
-        if (!lsm_has_objects(lsm)) {
-                if (lsm && lsm_is_released(lsm) && (fm_key->fiemap.fm_start <
-                    fm_key->oa.o_size)) {
-                        /*
-                         * released file, return a minimal FIEMAP if
-                         * request fits in file-size.
-                         */
-                        fiemap->fm_mapped_extents = 1;
-                        fiemap->fm_extents[0].fe_logical =
-                                        fm_key->fiemap.fm_start;
-                        if (fm_key->fiemap.fm_start + fm_key->fiemap.fm_length <
-                            fm_key->oa.o_size) {
-                                fiemap->fm_extents[0].fe_length =
-                                        fm_key->fiemap.fm_length;
-                        } else {
-                                fiemap->fm_extents[0].fe_length =
-                                        fm_key->oa.o_size - fm_key->fiemap.fm_start;
-                                fiemap->fm_extents[0].fe_flags |=
-                                                (FIEMAP_EXTENT_UNKNOWN |
-                                                 FIEMAP_EXTENT_LAST);
-                        }
-                }
-                rc = 0;
-                goto out;
-        }
-
-        if (fiemap_count_to_size(fm_key->fiemap.fm_extent_count) < buffer_size)
-                buffer_size = fiemap_count_to_size(fm_key->fiemap.fm_extent_count);
-
-        fm_local = libcfs_kvzalloc(buffer_size, GFP_NOFS);
-        if (!fm_local) {
-                rc = -ENOMEM;
-                goto out;
-        }
-        lcl_fm_ext = &fm_local->fm_extents[0];
-
-        count_local = fiemap_size_to_count(buffer_size);
-
-        memcpy(fiemap, &fm_key->fiemap, sizeof(*fiemap));
-        fm_start = fiemap->fm_start;
-        fm_length = fiemap->fm_length;
-        /* Calculate start stripe, last stripe and length of mapping */
-        start_stripe = lov_stripe_number(lsm, fm_start);
-        actual_start_stripe = start_stripe;
-        fm_end = (fm_length == ~0ULL ? fm_key->oa.o_size :
-                                                fm_start + fm_length - 1);
-        /* If fm_length != ~0ULL but fm_start+fm_length-1 exceeds file size */
-        if (fm_end > fm_key->oa.o_size)
-                fm_end = fm_key->oa.o_size;
-
-        last_stripe = fiemap_calc_last_stripe(lsm, fm_start, fm_end,
-                                              actual_start_stripe,
-                                              &stripe_count);
-
-        fm_end_offset = fiemap_calc_fm_end_offset(fiemap, lsm, fm_start,
-                                                  fm_end, &start_stripe);
-        if (fm_end_offset == -EINVAL) {
-                rc = -EINVAL;
-                goto out;
-        }
-
-        if (fiemap_count_to_size(fiemap->fm_extent_count) > *vallen)
-                fiemap->fm_extent_count = fiemap_size_to_count(*vallen);
-        if (fiemap->fm_extent_count == 0) {
-                get_num_extents = 1;
-                count_local = 0;
-        }
-        /* Check each stripe */
-        for (cur_stripe = start_stripe, i = 0; i < stripe_count;
-             i++, cur_stripe = (cur_stripe + 1) % lsm->lsm_stripe_count) {
-                u64 req_fm_len; /* Stores length of required mapping */
-                u64 len_mapped_single_call;
-                u64 lun_start, lun_end, obd_object_end;
-                unsigned int ext_count;
-
-                cur_stripe_wrap = cur_stripe;
-
-                /* Find out range of mapping on this stripe */
-                if ((lov_stripe_intersects(lsm, cur_stripe, fm_start, fm_end,
-                                           &lun_start, &obd_object_end)) == 0)
-                        continue;
-
-                if (lov_oinfo_is_dummy(lsm->lsm_oinfo[cur_stripe])) {
-                        rc = -EIO;
-                        goto out;
-                }
-
-                /* If this is a continuation FIEMAP call and we are on
-                 * starting stripe then lun_start needs to be set to
-                 * fm_end_offset
-                 */
-                if (fm_end_offset != 0 && cur_stripe == start_stripe)
-                        lun_start = fm_end_offset;
-
-                if (fm_length != ~0ULL) {
-                        /* Handle fm_start + fm_length overflow */
-                        if (fm_start + fm_length < fm_start)
-                                fm_length = ~0ULL - fm_start;
-                        lun_end = lov_size_to_stripe(lsm, fm_start + fm_length,
-                                                     cur_stripe);
-                } else {
-                        lun_end = ~0ULL;
-                }
-
-                if (lun_start == lun_end)
-                        continue;
-
-                req_fm_len = obd_object_end - lun_start;
-                fm_local->fm_length = 0;
-                len_mapped_single_call = 0;
-
-                /* If the output buffer is very large and the objects have many
-                 * extents we may need to loop on a single OST repeatedly
-                 */
-                ost_eof = 0;
-                ost_done = 0;
-                do {
-                        if (get_num_extents == 0) {
-                                /* Don't get too many extents. */
-                                if (current_extent + count_local >
-                                    fiemap->fm_extent_count)
-                                        count_local = fiemap->fm_extent_count -
-                                                                 current_extent;
-                        }
-
-                        lun_start += len_mapped_single_call;
-                        fm_local->fm_length = req_fm_len - len_mapped_single_call;
-                        req_fm_len = fm_local->fm_length;
-                        fm_local->fm_extent_count = enough ? 1 : count_local;
-                        fm_local->fm_mapped_extents = 0;
-                        fm_local->fm_flags = fiemap->fm_flags;
-
-                        fm_key->oa.o_oi = lsm->lsm_oinfo[cur_stripe]->loi_oi;
-                        ost_index = lsm->lsm_oinfo[cur_stripe]->loi_ost_idx;
-
-                        if (ost_index < 0 ||
-                            ost_index >= lov->desc.ld_tgt_count) {
-                                rc = -EINVAL;
-                                goto out;
-                        }
-
-                        /* If OST is inactive, return extent with UNKNOWN flag */
-                        if (!lov->lov_tgts[ost_index]->ltd_active) {
-                                fm_local->fm_flags |= FIEMAP_EXTENT_LAST;
-                                fm_local->fm_mapped_extents = 1;
-
-                                lcl_fm_ext[0].fe_logical = lun_start;
-                                lcl_fm_ext[0].fe_length = obd_object_end -
-                                                                      lun_start;
-                                lcl_fm_ext[0].fe_flags |= FIEMAP_EXTENT_UNKNOWN;
-
-                                goto inactive_tgt;
-                        }
-
-                        fm_local->fm_start = lun_start;
-                        fm_local->fm_flags &= ~FIEMAP_FLAG_DEVICE_ORDER;
-                        memcpy(&fm_key->fiemap, fm_local, sizeof(*fm_local));
-                        *vallen = fiemap_count_to_size(fm_local->fm_extent_count);
-                        rc = obd_get_info(NULL,
-                                          lov->lov_tgts[ost_index]->ltd_exp,
-                                          keylen, key, vallen, fm_local, lsm);
-                        if (rc != 0)
-                                goto out;
-
-inactive_tgt:
-                        ext_count = fm_local->fm_mapped_extents;
-                        if (ext_count == 0) {
-                                ost_done = 1;
-                                /* If last stripe has hole at the end,
-                                 * then we need to return
-                                 */
-                                if (cur_stripe_wrap == last_stripe) {
-                                        fiemap->fm_mapped_extents = 0;
-                                        goto finish;
-                                }
-                                break;
-                        } else if (enough) {
-                                /*
-                                 * We've collected enough extents and there are
-                                 * more extents after it.
-                                 */
-                                goto finish;
-                        }
-
-                        /* If we just need num of extents then go to next device */
-                        if (get_num_extents) {
-                                current_extent += ext_count;
-                                break;
-                        }
-
-                        len_mapped_single_call =
-                                lcl_fm_ext[ext_count - 1].fe_logical -
-                                lun_start + lcl_fm_ext[ext_count - 1].fe_length;
-
-                        /* Have we finished mapping on this device? */
-                        if (req_fm_len <= len_mapped_single_call)
-                                ost_done = 1;
-
-                        /* Clear the EXTENT_LAST flag which can be present on
-                         * last extent
-                         */
-                        if (lcl_fm_ext[ext_count - 1].fe_flags &
-                            FIEMAP_EXTENT_LAST)
-                                lcl_fm_ext[ext_count - 1].fe_flags &=
-                                                            ~FIEMAP_EXTENT_LAST;
-
-                        curr_loc = lov_stripe_size(lsm,
-                                        lcl_fm_ext[ext_count - 1].fe_logical +
-                                        lcl_fm_ext[ext_count - 1].fe_length,
-                                        cur_stripe);
-                        if (curr_loc >= fm_key->oa.o_size)
-                                ost_eof = 1;
-
-                        fiemap_prepare_and_copy_exts(fiemap, lcl_fm_ext,
-                                                     ost_index, ext_count,
-                                                     current_extent);
-
-                        current_extent += ext_count;
-
-                        /* Ran out of available extents? */
-                        if (current_extent >= fiemap->fm_extent_count)
-                                enough = true;
-                } while (ost_done == 0 && ost_eof == 0);
-
-                if (cur_stripe_wrap == last_stripe)
-                        goto finish;
-        }
-
-finish:
-        /* Indicate that we are returning device offsets unless file just has
-         * single stripe
-         */
-        if (lsm->lsm_stripe_count > 1)
-                fiemap->fm_flags |= FIEMAP_FLAG_DEVICE_ORDER;
-
-        if (get_num_extents)
-                goto skip_last_device_calc;
-
-        /* Check if we have reached the last stripe and whether mapping for that
-         * stripe is done.
-         */
-        if (cur_stripe_wrap == last_stripe) {
-                if (ost_done || ost_eof)
-                        fiemap->fm_extents[current_extent - 1].fe_flags |=
-                                                             FIEMAP_EXTENT_LAST;
-        }
-
-skip_last_device_calc:
-        fiemap->fm_mapped_extents = current_extent;
-
-out:
-        kvfree(fm_local);
-        return rc;
-}
-
 static int lov_get_info(const struct lu_env *env, struct obd_export *exp,
-                        __u32 keylen, void *key, __u32 *vallen, void *val,
-                        struct lov_stripe_md *lsm)
+                        __u32 keylen, void *key, __u32 *vallen, void *val)
 {
         struct obd_device *obddev = class_exp2obd(exp);
         struct lov_obd *lov = &obddev->u.lov;
-        int rc;
+        struct lov_desc *ld = &lov->desc;
+        int rc = 0;
 
         if (!vallen || !val)
                 return -EFAULT;
 
         obd_getref(obddev);
 
-        if (KEY_IS(KEY_LOVDESC)) {
-                struct lov_desc *desc_ret = val;
-                *desc_ret = lov->desc;
+        if (KEY_IS(KEY_MAX_EASIZE)) {
+                u32 max_stripe_count = min_t(u32, ld->ld_active_tgt_count,
+                                             LOV_MAX_STRIPE_COUNT);
 
-                rc = 0;
-                goto out;
-        } else if (KEY_IS(KEY_FIEMAP)) {
-                rc = lov_fiemap(lov, keylen, key, vallen, val, lsm);
-                goto out;
+                *((u32 *)val) = lov_mds_md_size(max_stripe_count, LOV_MAGIC_V3);
+        } else if (KEY_IS(KEY_DEFAULT_EASIZE)) {
+                u32 def_stripe_count = min_t(u32, ld->ld_default_stripe_count,
+                                             LOV_MAX_STRIPE_COUNT);
+
+                *((u32 *)val) = lov_mds_md_size(def_stripe_count, LOV_MAGIC_V3);
         } else if (KEY_IS(KEY_TGT_COUNT)) {
                 *((int *)val) = lov->desc.ld_tgt_count;
-                rc = 0;
-                goto out;
+        } else {
+                rc = -EINVAL;
         }
 
-        rc = -EINVAL;
-
-out:
         obd_putref(obddev);
         return rc;
 }
@@ -1926,12 +1327,8 @@ static int lov_quotactl(struct obd_device *obd, struct obd_export *exp,
         __u64           bhardlimit = 0;
         int               i, rc = 0;
 
-        if (oqctl->qc_cmd != LUSTRE_Q_QUOTAON &&
-            oqctl->qc_cmd != LUSTRE_Q_QUOTAOFF &&
-            oqctl->qc_cmd != Q_GETOQUOTA &&
-            oqctl->qc_cmd != Q_INITQUOTA &&
-            oqctl->qc_cmd != LUSTRE_Q_SETQUOTA &&
-            oqctl->qc_cmd != Q_FINVALIDATE) {
+        if (oqctl->qc_cmd != Q_GETOQUOTA &&
+            oqctl->qc_cmd != LUSTRE_Q_SETQUOTA) {
                 CERROR("bad quota opc %x for lov obd\n", oqctl->qc_cmd);
                 return -EFAULT;
         }
@@ -1978,63 +1375,15 @@ static int lov_quotactl(struct obd_device *obd, struct obd_export *exp,
         return rc;
 }
 
-static int lov_quotacheck(struct obd_device *obd, struct obd_export *exp,
-                          struct obd_quotactl *oqctl)
-{
-        struct lov_obd *lov = &obd->u.lov;
-        int          i, rc = 0;
-
-        obd_getref(obd);
-
-        for (i = 0; i < lov->desc.ld_tgt_count; i++) {
-                if (!lov->lov_tgts[i])
-                        continue;
-
-                /* Skip quota check on the administratively disabled OSTs. */
-                if (!lov->lov_tgts[i]->ltd_activate) {
-                        CWARN("lov idx %d was administratively disabled, skip quotacheck on it.\n",
-                              i);
-                        continue;
-                }
-
-                if (!lov->lov_tgts[i]->ltd_active) {
-                        CERROR("lov idx %d inactive\n", i);
-                        rc = -EIO;
-                        goto out;
-                }
-        }
-
-        for (i = 0; i < lov->desc.ld_tgt_count; i++) {
-                int err;
-
-                if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_activate)
-                        continue;
-
-                err = obd_quotacheck(lov->lov_tgts[i]->ltd_exp, oqctl);
-                if (err && !rc)
-                        rc = err;
-        }
-
-out:
-        obd_putref(obd);
-
-        return rc;
-}
-
 static struct obd_ops lov_obd_ops = {
         .owner          = THIS_MODULE,
         .setup          = lov_setup,
-        .precleanup     = lov_precleanup,
         .cleanup        = lov_cleanup,
         /*.process_config       = lov_process_config,*/
         .connect        = lov_connect,
         .disconnect     = lov_disconnect,
         .statfs         = lov_statfs,
         .statfs_async   = lov_statfs_async,
-        .packmd         = lov_packmd,
-        .unpackmd       = lov_unpackmd,
-        .getattr_async  = lov_getattr_async,
-        .setattr_async  = lov_setattr_async,
         .iocontrol      = lov_iocontrol,
         .get_info       = lov_get_info,
         .set_info_async = lov_set_info_async,
@@ -2046,7 +1395,6 @@ static struct obd_ops lov_obd_ops = {
         .getref         = lov_getref,
         .putref         = lov_putref,
         .quotactl       = lov_quotactl,
-        .quotacheck     = lov_quotacheck,
 };
 
 struct kmem_cache *lov_oinfo_slab;
diff --git a/drivers/staging/lustre/lustre/lov/lov_object.c b/drivers/staging/lustre/lustre/lov/lov_object.c
index 52f736338887..76d4256fa828 100644
--- a/drivers/staging/lustre/lustre/lov/lov_object.c
+++ b/drivers/staging/lustre/lustre/lov/lov_object.c
@@ -39,6 +39,11 @@
 
 #include "lov_cl_internal.h"
 
+static inline struct lov_device *lov_object_dev(struct lov_object *obj)
+{
+        return lu2lov_dev(obj->lo_cl.co_lu.lo_dev);
+}
+
 /** \addtogroup lov
  *  @{
  */
@@ -51,7 +56,7 @@
 
 struct lov_layout_operations {
         int (*llo_init)(const struct lu_env *env, struct lov_device *dev,
-                        struct lov_object *lov,
+                        struct lov_object *lov, struct lov_stripe_md *lsm,
                         const struct cl_object_conf *conf,
                         union lov_layout_state *state);
         int (*llo_delete)(const struct lu_env *env, struct lov_object *lov,
@@ -75,12 +80,11 @@ struct lov_layout_operations {
 
 static int lov_layout_wait(const struct lu_env *env, struct lov_object *lov);
 
-void lov_lsm_put(struct cl_object *unused, struct lov_stripe_md *lsm)
+static void lov_lsm_put(struct lov_stripe_md *lsm)
 {
         if (lsm)
                 lov_free_memmd(&lsm);
 }
-EXPORT_SYMBOL(lov_lsm_put);
 
 /*****************************************************************************
  *
@@ -97,17 +101,17 @@ static void lov_install_empty(const struct lu_env *env,
          */
 }
 
-static int lov_init_empty(const struct lu_env *env,
-                          struct lov_device *dev, struct lov_object *lov,
+static int lov_init_empty(const struct lu_env *env, struct lov_device *dev,
+                          struct lov_object *lov, struct lov_stripe_md *lsm,
                           const struct cl_object_conf *conf,
-                          union  lov_layout_state *state)
+                          union lov_layout_state *state)
 {
         return 0;
 }
 
 static void lov_install_raid0(const struct lu_env *env,
                               struct lov_object *lov,
-                              union  lov_layout_state *state)
+                              union lov_layout_state *state)
 {
 }
 
@@ -212,8 +216,8 @@ static int lov_page_slice_fixup(struct lov_object *lov,
         return cl_object_header(stripe)->coh_page_bufsize;
 }
 
-static int lov_init_raid0(const struct lu_env *env,
-                          struct lov_device *dev, struct lov_object *lov,
+static int lov_init_raid0(const struct lu_env *env, struct lov_device *dev,
+                          struct lov_object *lov, struct lov_stripe_md *lsm,
                           const struct cl_object_conf *conf,
                           union  lov_layout_state *state)
 {
@@ -223,7 +227,6 @@ static int lov_init_raid0(const struct lu_env *env,
         struct cl_object        *stripe;
         struct lov_thread_info  *lti     = lov_env_info(env);
         struct cl_object_conf   *subconf = &lti->lti_stripe_conf;
-        struct lov_stripe_md    *lsm     = conf->u.coc_md->lsm;
         struct lu_fid      *ofid    = &lti->lti_fid;
         struct lov_layout_raid0 *r0      = &state->raid0;
 
@@ -298,13 +301,11 @@ out:
         return result;
 }
 
-static int lov_init_released(const struct lu_env *env,
-                             struct lov_device *dev, struct lov_object *lov,
+static int lov_init_released(const struct lu_env *env, struct lov_device *dev,
+                             struct lov_object *lov, struct lov_stripe_md *lsm,
                              const struct cl_object_conf *conf,
                              union  lov_layout_state *state)
 {
-        struct lov_stripe_md *lsm = conf->u.coc_md->lsm;
-
         LASSERT(lsm);
         LASSERT(lsm_is_released(lsm));
         LASSERT(!lov->lo_lsm);
@@ -313,6 +314,40 @@ static int lov_init_released(const struct lu_env *env,
         return 0;
 }
 
+static struct cl_object *lov_find_subobj(const struct lu_env *env,
+                                         struct lov_object *lov,
+                                         struct lov_stripe_md *lsm,
+                                         int stripe_idx)
+{
+        struct lov_device *dev = lu2lov_dev(lov2lu(lov)->lo_dev);
+        struct lov_oinfo *oinfo = lsm->lsm_oinfo[stripe_idx];
+        struct lov_thread_info *lti = lov_env_info(env);
+        struct lu_fid *ofid = &lti->lti_fid;
+        struct cl_device *subdev;
+        struct cl_object *result;
+        int ost_idx;
+        int rc;
+
+        if (lov->lo_type != LLT_RAID0) {
+                result = NULL;
+                goto out;
+        }
+
+        ost_idx = oinfo->loi_ost_idx;
+        rc = ostid_to_fid(ofid, &oinfo->loi_oi, ost_idx);
+        if (rc) {
+                result = NULL;
+                goto out;
+        }
+
+        subdev = lovsub2cl_dev(dev->ld_target[ost_idx]);
+        result = lov_sub_find(env, subdev, ofid, NULL);
+out:
+        if (!result)
+                result = ERR_PTR(-EINVAL);
+        return result;
+}
+
 static int lov_delete_empty(const struct lu_env *env, struct lov_object *lov,
                             union lov_layout_state *state)
 {
@@ -687,31 +722,24 @@ static int lov_layout_wait(const struct lu_env *env, struct lov_object *lov)
 }
 
 static int lov_layout_change(const struct lu_env *unused,
-                             struct lov_object *lov,
+                             struct lov_object *lov, struct lov_stripe_md *lsm,
                              const struct cl_object_conf *conf)
 {
-        int result;
-        enum lov_layout_type llt = LLT_EMPTY;
+        enum lov_layout_type llt = lov_type(lsm);
         union lov_layout_state *state = &lov->u;
         const struct lov_layout_operations *old_ops;
         const struct lov_layout_operations *new_ops;
-
-        void *cookie;
         struct lu_env *env;
         int refcheck;
+        int rc;
 
         LASSERT(0 <= lov->lo_type && lov->lo_type < ARRAY_SIZE(lov_dispatch));
 
-        if (conf->u.coc_md)
-                llt = lov_type(conf->u.coc_md->lsm);
-        LASSERT(0 <= llt && llt < ARRAY_SIZE(lov_dispatch));
-
-        cookie = cl_env_reenter();
         env = cl_env_get(&refcheck);
-        if (IS_ERR(env)) {
-                cl_env_reexit(cookie);
+        if (IS_ERR(env))
                 return PTR_ERR(env);
-        }
+
+        LASSERT(0 <= llt && llt < ARRAY_SIZE(lov_dispatch));
 
         CDEBUG(D_INODE, DFID" from %s to %s\n",
                PFID(lu_object_fid(lov2lu(lov))),
@@ -720,38 +748,37 @@ static int lov_layout_change(const struct lu_env *unused,
         old_ops = &lov_dispatch[lov->lo_type];
         new_ops = &lov_dispatch[llt];
 
-        result = cl_object_prune(env, &lov->lo_cl);
-        if (result != 0)
+        rc = cl_object_prune(env, &lov->lo_cl);
+        if (rc)
+                goto out;
+
+        rc = old_ops->llo_delete(env, lov, &lov->u);
+        if (rc)
                 goto out;
 
-        result = old_ops->llo_delete(env, lov, &lov->u);
-        if (result == 0) {
-                old_ops->llo_fini(env, lov, &lov->u);
+        old_ops->llo_fini(env, lov, &lov->u);
 
-                LASSERT(atomic_read(&lov->lo_active_ios) == 0);
+        LASSERT(!atomic_read(&lov->lo_active_ios));
 
-                lov->lo_type = LLT_EMPTY;
-                /* page bufsize fixup */
-                cl_object_header(&lov->lo_cl)->coh_page_bufsize -=
+        lov->lo_type = LLT_EMPTY;
+
+        /* page bufsize fixup */
+        cl_object_header(&lov->lo_cl)->coh_page_bufsize -=
                         lov_page_slice_fixup(lov, NULL);
 
-                result = new_ops->llo_init(env,
-                                        lu2lov_dev(lov->lo_cl.co_lu.lo_dev),
-                                        lov, conf, state);
-                if (result == 0) {
-                        new_ops->llo_install(env, lov, state);
-                        lov->lo_type = llt;
-                } else {
-                        new_ops->llo_delete(env, lov, state);
-                        new_ops->llo_fini(env, lov, state);
-                        /* this file becomes an EMPTY file. */
-                }
+        rc = new_ops->llo_init(env, lov_object_dev(lov), lov, lsm, conf, state);
+        if (rc) {
+                new_ops->llo_delete(env, lov, state);
+                new_ops->llo_fini(env, lov, state);
+                /* this file becomes an EMPTY file. */
+                goto out;
         }
 
+        new_ops->llo_install(env, lov, state);
+        lov->lo_type = llt;
 out:
         cl_env_put(env, &refcheck);
-        cl_env_reexit(cookie);
-        return result;
+        return rc;
 }
 
 /*****************************************************************************
@@ -762,26 +789,38 @@ out:
 int lov_object_init(const struct lu_env *env, struct lu_object *obj,
                     const struct lu_object_conf *conf)
 {
-        struct lov_device           *dev   = lu2lov_dev(obj->lo_dev);
         struct lov_object           *lov   = lu2lov(obj);
+        struct lov_device *dev = lov_object_dev(lov);
         const struct cl_object_conf  *cconf = lu2cl_conf(conf);
         union  lov_layout_state      *set   = &lov->u;
         const struct lov_layout_operations *ops;
-        int result;
+        struct lov_stripe_md *lsm = NULL;
+        int rc;
 
         init_rwsem(&lov->lo_type_guard);
         atomic_set(&lov->lo_active_ios, 0);
         init_waitqueue_head(&lov->lo_waitq);
-
         cl_object_page_init(lu2cl(obj), sizeof(struct lov_page));
 
+        lov->lo_type = LLT_EMPTY;
+        if (cconf->u.coc_layout.lb_buf) {
+                lsm = lov_unpackmd(dev->ld_lov,
+                                   cconf->u.coc_layout.lb_buf,
+                                   cconf->u.coc_layout.lb_len);
+                if (IS_ERR(lsm))
+                        return PTR_ERR(lsm);
+        }
+
         /* no locking is necessary, as object is being created */
-        lov->lo_type = lov_type(cconf->u.coc_md->lsm);
+        lov->lo_type = lov_type(lsm);
         ops = &lov_dispatch[lov->lo_type];
-        result = ops->llo_init(env, dev, lov, cconf, set);
-        if (result == 0)
+        rc = ops->llo_init(env, dev, lov, lsm, cconf, set);
+        if (!rc)
                 ops->llo_install(env, lov, set);
-        return result;
+
+        lov_lsm_put(lsm);
+
+        return rc;
 }
 
 static int lov_conf_set(const struct lu_env *env, struct cl_object *obj,
@@ -791,6 +830,15 @@ static int lov_conf_set(const struct lu_env *env, struct cl_object *obj,
         struct lov_object       *lov = cl2lov(obj);
         int                      result = 0;
 
+        if (conf->coc_opc == OBJECT_CONF_SET &&
+            conf->u.coc_layout.lb_buf) {
+                lsm = lov_unpackmd(lov_object_dev(lov)->ld_lov,
+                                   conf->u.coc_layout.lb_buf,
+                                   conf->u.coc_layout.lb_len);
+                if (IS_ERR(lsm))
+                        return PTR_ERR(lsm);
+        }
+
         lov_conf_lock(lov);
         if (conf->coc_opc == OBJECT_CONF_INVALIDATE) {
                 lov->lo_layout_invalid = true;
@@ -810,8 +858,6 @@ static int lov_conf_set(const struct lu_env *env, struct cl_object *obj,
 
         LASSERT(conf->coc_opc == OBJECT_CONF_SET);
 
-        if (conf->u.coc_md)
-                lsm = conf->u.coc_md->lsm;
         if ((!lsm && !lov->lo_lsm) ||
             ((lsm && lov->lo_lsm) &&
              (lov->lo_lsm->lsm_layout_gen == lsm->lsm_layout_gen) &&
@@ -829,11 +875,12 @@ static int lov_conf_set(const struct lu_env *env, struct cl_object *obj,
                 goto out;
         }
 
-        result = lov_layout_change(env, lov, conf);
+        result = lov_layout_change(env, lov, lsm, conf);
         lov->lo_layout_invalid = result != 0;
 
 out:
         lov_conf_unlock(lov);
+        lov_lsm_put(lsm);
         CDEBUG(D_INODE, DFID" lo_layout_invalid=%d\n",
                PFID(lu_object_fid(lov2lu(lov))), lov->lo_layout_invalid);
         return result;
@@ -911,6 +958,473 @@ int lov_lock_init(const struct lu_env *env, struct cl_object *obj,
                                     io);
 }
 
+/**
+ * We calculate on which OST the mapping will end. If the length of mapping
+ * is greater than (stripe_size * stripe_count) then the last_stripe will
+ * will be one just before start_stripe. Else we check if the mapping
+ * intersects each OST and find last_stripe.
+ * This function returns the last_stripe and also sets the stripe_count
+ * over which the mapping is spread
+ *
+ * \param lsm [in]              striping information for the file
+ * \param fm_start [in]         logical start of mapping
+ * \param fm_end [in]           logical end of mapping
+ * \param start_stripe [in]     starting stripe of the mapping
+ * \param stripe_count [out]    the number of stripes across which to map is
+ *                              returned
+ *
+ * \retval last_stripe          return the last stripe of the mapping
+ */
+static int fiemap_calc_last_stripe(struct lov_stripe_md *lsm,
+                                   loff_t fm_start, loff_t fm_end,
+                                   int start_stripe, int *stripe_count)
+{
+        int last_stripe;
+        loff_t obd_start;
+        loff_t obd_end;
+        int i, j;
+
+        if (fm_end - fm_start > lsm->lsm_stripe_size * lsm->lsm_stripe_count) {
+                last_stripe = (start_stripe < 1 ? lsm->lsm_stripe_count - 1 :
+                               start_stripe - 1);
+                *stripe_count = lsm->lsm_stripe_count;
+        } else {
+                for (j = 0, i = start_stripe; j < lsm->lsm_stripe_count;
+                     i = (i + 1) % lsm->lsm_stripe_count, j++) {
+                        if (!(lov_stripe_intersects(lsm, i, fm_start, fm_end,
+                                                    &obd_start, &obd_end)))
+                                break;
+                }
+                *stripe_count = j;
+                last_stripe = (start_stripe + j - 1) % lsm->lsm_stripe_count;
+        }
+
+        return last_stripe;
+}
+
+/**
+ * Set fe_device and copy extents from local buffer into main return buffer.
+ *
+ * \param fiemap [out]          fiemap to hold all extents
+ * \param lcl_fm_ext [in]       array of fiemap extents get from OSC layer
+ * \param ost_index [in]        OST index to be written into the fm_device
+ *                              field for each extent
+ * \param ext_count [in]        number of extents to be copied
+ * \param current_extent [in]   where to start copying in the extent array
+ */
+static void fiemap_prepare_and_copy_exts(struct fiemap *fiemap,
+                                         struct fiemap_extent *lcl_fm_ext,
+                                         int ost_index, unsigned int ext_count,
+                                         int current_extent)
+{
+        unsigned int ext;
+        char *to;
+
+        for (ext = 0; ext < ext_count; ext++) {
+                lcl_fm_ext[ext].fe_device = ost_index;
+                lcl_fm_ext[ext].fe_flags |= FIEMAP_EXTENT_NET;
+        }
+
+        /* Copy fm_extent's from fm_local to return buffer */
+        to = (char *)fiemap + fiemap_count_to_size(current_extent);
+        memcpy(to, lcl_fm_ext, ext_count * sizeof(struct fiemap_extent));
+}
+
+#define FIEMAP_BUFFER_SIZE 4096
+
+/**
+ * Non-zero fe_logical indicates that this is a continuation FIEMAP
+ * call. The local end offset and the device are sent in the first
+ * fm_extent. This function calculates the stripe number from the index.
+ * This function returns a stripe_no on which mapping is to be restarted.
+ *
+ * This function returns fm_end_offset which is the in-OST offset at which
+ * mapping should be restarted. If fm_end_offset=0 is returned then caller
+ * will re-calculate proper offset in next stripe.
+ * Note that the first extent is passed to lov_get_info via the value field.
+ *
+ * \param fiemap [in]           fiemap request header
+ * \param lsm [in]              striping information for the file
+ * \param fm_start [in]         logical start of mapping
+ * \param fm_end [in]           logical end of mapping
+ * \param start_stripe [out]    starting stripe will be returned in this
+ */
+static loff_t fiemap_calc_fm_end_offset(struct fiemap *fiemap,
+                                        struct lov_stripe_md *lsm,
+                                        loff_t fm_start, loff_t fm_end,
+                                        int *start_stripe)
+{
+        loff_t local_end = fiemap->fm_extents[0].fe_logical;
+        loff_t lun_start, lun_end;
+        loff_t fm_end_offset;
+        int stripe_no = -1;
+        int i;
+
+        if (!fiemap->fm_extent_count || !fiemap->fm_extents[0].fe_logical)
+                return 0;
+
+        /* Find out stripe_no from ost_index saved in the fe_device */
+        for (i = 0; i < lsm->lsm_stripe_count; i++) {
+                struct lov_oinfo *oinfo = lsm->lsm_oinfo[i];
+
+                if (lov_oinfo_is_dummy(oinfo))
+                        continue;
+
+                if (oinfo->loi_ost_idx == fiemap->fm_extents[0].fe_device) {
+                        stripe_no = i;
+                        break;
+                }
+        }
+
+        if (stripe_no == -1)
+                return -EINVAL;
+
+        /*
+         * If we have finished mapping on previous device, shift logical
+         * offset to start of next device
+         */
+        if (lov_stripe_intersects(lsm, stripe_no, fm_start, fm_end,
+                                  &lun_start, &lun_end) &&
+            local_end < lun_end) {
+                fm_end_offset = local_end;
+                *start_stripe = stripe_no;
+        } else {
+                /* This is a special value to indicate that caller should
+                 * calculate offset in next stripe.
+                 */
+                fm_end_offset = 0;
+                *start_stripe = (stripe_no + 1) % lsm->lsm_stripe_count;
+        }
+
+        return fm_end_offset;
+}
+
+/**
+ * Break down the FIEMAP request and send appropriate calls to individual OSTs.
+ * This also handles the restarting of FIEMAP calls in case mapping overflows
+ * the available number of extents in single call.
+ *
+ * \param env [in]              lustre environment
+ * \param obj [in]              file object
+ * \param fmkey [in]            fiemap request header and other info
+ * \param fiemap [out]          fiemap buffer holding retrived map extents
+ * \param buflen [in/out]       max buffer length of @fiemap, when iterate
+ *                              each OST, it is used to limit max map needed
+ * \retval 0    success
+ * \retval < 0  error
+ */
+static int lov_object_fiemap(const struct lu_env *env, struct cl_object *obj,
+                             struct ll_fiemap_info_key *fmkey,
+                             struct fiemap *fiemap, size_t *buflen)
+{
+        struct lov_obd *lov = lu2lov_dev(obj->co_lu.lo_dev)->ld_lov;
+        unsigned int buffer_size = FIEMAP_BUFFER_SIZE;
+        struct fiemap_extent *lcl_fm_ext;
+        struct cl_object *subobj = NULL;
+        struct fiemap *fm_local = NULL;
+        struct lov_stripe_md *lsm;
+        loff_t fm_start;
+        loff_t fm_end;
+        loff_t fm_length;
+        loff_t fm_end_offset;
+        int count_local;
+        int ost_index = 0;
+        int start_stripe;
+        int current_extent = 0;
+        int rc = 0;
+        int last_stripe;
+        int cur_stripe = 0;
+        int cur_stripe_wrap = 0;
+        int stripe_count;
+        /* Whether have we collected enough extents */
+        bool enough = false;
+        /* EOF for object */
+        bool ost_eof = false;
+        /* done with required mapping for this OST? */
+        bool ost_done = false;
+
+        lsm = lov_lsm_addref(cl2lov(obj));
+        if (!lsm)
+                return -ENODATA;
+
+        /**
+         * If the stripe_count > 1 and the application does not understand
+         * DEVICE_ORDER flag, it cannot interpret the extents correctly.
+         */
+        if (lsm->lsm_stripe_count > 1 &&
+            !(fiemap->fm_flags & FIEMAP_FLAG_DEVICE_ORDER)) {
+                rc = -ENOTSUPP;
+                goto out;
+        }
+
+        if (lsm_is_released(lsm)) {
+                if (fiemap->fm_start < fmkey->lfik_oa.o_size) {
+                        /**
+                         * released file, return a minimal FIEMAP if
+                         * request fits in file-size.
+                         */
+                        fiemap->fm_mapped_extents = 1;
+                        fiemap->fm_extents[0].fe_logical = fiemap->fm_start;
+                        if (fiemap->fm_start + fiemap->fm_length <
+                            fmkey->lfik_oa.o_size)
+                                fiemap->fm_extents[0].fe_length =
+                                         fiemap->fm_length;
+                        else
+                                fiemap->fm_extents[0].fe_length =
+                                        fmkey->lfik_oa.o_size -
+                                        fiemap->fm_start;
+                        fiemap->fm_extents[0].fe_flags |=
+                                FIEMAP_EXTENT_UNKNOWN | FIEMAP_EXTENT_LAST;
+                }
+                rc = 0;
+                goto out;
+        }
+
+        if (fiemap_count_to_size(fiemap->fm_extent_count) < buffer_size)
+                buffer_size = fiemap_count_to_size(fiemap->fm_extent_count);
+
+        fm_local = libcfs_kvzalloc(buffer_size, GFP_NOFS);
+        if (!fm_local) {
+                rc = -ENOMEM;
+                goto out;
+        }
+        lcl_fm_ext = &fm_local->fm_extents[0];
+        count_local = fiemap_size_to_count(buffer_size);
+
+        fm_start = fiemap->fm_start;
+        fm_length = fiemap->fm_length;
+        /* Calculate start stripe, last stripe and length of mapping */
+        start_stripe = lov_stripe_number(lsm, fm_start);
+        fm_end = (fm_length == ~0ULL) ? fmkey->lfik_oa.o_size :
+                                        fm_start + fm_length - 1;
+        /* If fm_length != ~0ULL but fm_start_fm_length-1 exceeds file size */
+        if (fm_end > fmkey->lfik_oa.o_size)
+                fm_end = fmkey->lfik_oa.o_size;
+
+        last_stripe = fiemap_calc_last_stripe(lsm, fm_start, fm_end,
+                                              start_stripe, &stripe_count);
+        fm_end_offset = fiemap_calc_fm_end_offset(fiemap, lsm, fm_start, fm_end,
+                                                  &start_stripe);
+        if (fm_end_offset == -EINVAL) {
+                rc = -EINVAL;
+                goto out;
+        }
+
+        /**
+         * Requested extent count exceeds the fiemap buffer size, shrink our
+         * ambition.
+         */
+        if (fiemap_count_to_size(fiemap->fm_extent_count) > *buflen)
+                fiemap->fm_extent_count = fiemap_size_to_count(*buflen);
+        if (!fiemap->fm_extent_count)
+                count_local = 0;
+
+        /* Check each stripe */
+        for (cur_stripe = start_stripe; stripe_count > 0;
+             --stripe_count,
+             cur_stripe = (cur_stripe + 1) % lsm->lsm_stripe_count) {
+                loff_t req_fm_len; /* Stores length of required mapping */
+                loff_t len_mapped_single_call;
+                loff_t lun_start;
+                loff_t lun_end;
+                loff_t obd_object_end;
+                unsigned int ext_count;
+
+                cur_stripe_wrap = cur_stripe;
+
+                /* Find out range of mapping on this stripe */
+                if (!(lov_stripe_intersects(lsm, cur_stripe, fm_start, fm_end,
+                                            &lun_start, &obd_object_end)))
+                        continue;
+
+                if (lov_oinfo_is_dummy(lsm->lsm_oinfo[cur_stripe])) {
+                        rc = -EIO;
+                        goto out;
+                }
+
+                /*
+                 * If this is a continuation FIEMAP call and we are on
+                 * starting stripe then lun_start needs to be set to
+                 * fm_end_offset
+                 */
+                if (fm_end_offset && cur_stripe == start_stripe)
+                        lun_start = fm_end_offset;
+
+                if (fm_length != ~0ULL) {
+                        /* Handle fm_start + fm_length overflow */
+                        if (fm_start + fm_length < fm_start)
+                                fm_length = ~0ULL - fm_start;
+                        lun_end = lov_size_to_stripe(lsm, fm_start + fm_length,
+                                                     cur_stripe);
+                } else {
+                        lun_end = ~0ULL;
+                }
+
+                if (lun_start == lun_end)
+                        continue;
+
+                req_fm_len = obd_object_end - lun_start;
+                fm_local->fm_length = 0;
+                len_mapped_single_call = 0;
+
+                /* find lobsub object */
+                subobj = lov_find_subobj(env, cl2lov(obj), lsm,
+                                         cur_stripe);
+                if (IS_ERR(subobj)) {
+                        rc = PTR_ERR(subobj);
+                        goto out;
+                }
+                /*
+                 * If the output buffer is very large and the objects have many
+                 * extents we may need to loop on a single OST repeatedly
+                 */
+                ost_eof = false;
+                ost_done = false;
+                do {
+                        if (fiemap->fm_extent_count > 0) {
+                                /* Don't get too many extents. */
+                                if (current_extent + count_local >
+                                    fiemap->fm_extent_count)
+                                        count_local = fiemap->fm_extent_count -
+                                                      current_extent;
+                        }
+
+                        lun_start += len_mapped_single_call;
+                        fm_local->fm_length = req_fm_len -
+                                              len_mapped_single_call;
+                        req_fm_len = fm_local->fm_length;
+                        fm_local->fm_extent_count = enough ? 1 : count_local;
+                        fm_local->fm_mapped_extents = 0;
+                        fm_local->fm_flags = fiemap->fm_flags;
+
+                        ost_index = lsm->lsm_oinfo[cur_stripe]->loi_ost_idx;
+
+                        if (ost_index < 0 ||
+                            ost_index >= lov->desc.ld_tgt_count) {
+                                rc = -EINVAL;
+                                goto obj_put;
+                        }
+                        /*
+                         * If OST is inactive, return extent with UNKNOWN
+                         * flag.
+                         */
+                        if (!lov->lov_tgts[ost_index]->ltd_active) {
+                                fm_local->fm_flags |= FIEMAP_EXTENT_LAST;
+                                fm_local->fm_mapped_extents = 1;
+
+                                lcl_fm_ext[0].fe_logical = lun_start;
+                                lcl_fm_ext[0].fe_length = obd_object_end -
+                                                          lun_start;
+                                lcl_fm_ext[0].fe_flags |= FIEMAP_EXTENT_UNKNOWN;
+
+                                goto inactive_tgt;
+                        }
+
+                        fm_local->fm_start = lun_start;
+                        fm_local->fm_flags &= ~FIEMAP_FLAG_DEVICE_ORDER;
+                        memcpy(&fmkey->lfik_fiemap, fm_local, sizeof(*fm_local));
+                        *buflen = fiemap_count_to_size(fm_local->fm_extent_count);
+
+                        rc = cl_object_fiemap(env, subobj, fmkey, fm_local,
+                                              buflen);
+                        if (rc)
+                                goto obj_put;
+inactive_tgt:
+                        ext_count = fm_local->fm_mapped_extents;
+                        if (!ext_count) {
+                                ost_done = true;
+                                /*
+                                 * If last stripe has hold at the end,
+                                 * we need to return
+                                 */
+                                if (cur_stripe_wrap == last_stripe) {
+                                        fiemap->fm_mapped_extents = 0;
+                                        goto finish;
+                                }
+                                break;
+                        } else if (enough) {
+                                /*
+                                 * We've collected enough extents and there are
+                                 * more extents after it.
+                                 */
+                                goto finish;
+                        }
+
+                        /* If we just need num of extents, got to next device */
+                        if (!fiemap->fm_extent_count) {
+                                current_extent += ext_count;
+                                break;
+                        }
+
+                        /* prepare to copy retrived map extents */
+                        len_mapped_single_call =
+                                lcl_fm_ext[ext_count - 1].fe_logical -
+                                lun_start + lcl_fm_ext[ext_count - 1].fe_length;
+
+                        /* Have we finished mapping on this device? */
+                        if (req_fm_len <= len_mapped_single_call)
+                                ost_done = true;
+
+                        /*
+                         * Clear the EXTENT_LAST flag which can be present on
+                         * the last extent
+                         */
+                        if (lcl_fm_ext[ext_count - 1].fe_flags &
+                            FIEMAP_EXTENT_LAST)
+                                lcl_fm_ext[ext_count - 1].fe_flags &=
+                                        ~FIEMAP_EXTENT_LAST;
+
+                        if (lov_stripe_size(lsm,
+                                            lcl_fm_ext[ext_count - 1].fe_logical +
+                                            lcl_fm_ext[ext_count - 1].fe_length,
+                                            cur_stripe) >= fmkey->lfik_oa.o_size)
+                                ost_eof = true;
+
+                        fiemap_prepare_and_copy_exts(fiemap, lcl_fm_ext,
+                                                     ost_index, ext_count,
+                                                     current_extent);
+                        current_extent += ext_count;
+
+                        /* Ran out of available extents? */
+                        if (current_extent >= fiemap->fm_extent_count)
+                                enough = true;
+                } while (!ost_done && !ost_eof);
+
+                cl_object_put(env, subobj);
+                subobj = NULL;
+
+                if (cur_stripe_wrap == last_stripe)
+                        goto finish;
+        } /* for each stripe */
+finish:
+        /*
+         * Indicate that we are returning device offsets unless file just has
+         * single stripe
+         */
+        if (lsm->lsm_stripe_count > 1)
+                fiemap->fm_flags |= FIEMAP_FLAG_DEVICE_ORDER;
+
+        if (!fiemap->fm_extent_count)
+                goto skip_last_device_calc;
+
+        /*
+         * Check if we have reached the last stripe and whether mapping for that
+         * stripe is done.
+         */
+        if ((cur_stripe_wrap == last_stripe) && (ost_done || ost_eof))
+                fiemap->fm_extents[current_extent - 1].fe_flags |=
+                                                        FIEMAP_EXTENT_LAST;
+skip_last_device_calc:
+        fiemap->fm_mapped_extents = current_extent;
+obj_put:
+        if (subobj)
+                cl_object_put(env, subobj);
+out:
+        kvfree(fm_local);
+        lov_lsm_put(lsm);
+        return rc;
+}
+
 static int lov_object_getstripe(const struct lu_env *env, struct cl_object *obj,
                                 struct lov_user_md __user *lum)
 {
@@ -923,10 +1437,53 @@ static int lov_object_getstripe(const struct lu_env *env, struct cl_object *obj,
                 return -ENODATA;
 
         rc = lov_getstripe(cl2lov(obj), lsm, lum);
-        lov_lsm_put(obj, lsm);
+        lov_lsm_put(lsm);
         return rc;
 }
 
+static int lov_object_layout_get(const struct lu_env *env,
+                                 struct cl_object *obj,
+                                 struct cl_layout *cl)
+{
+        struct lov_object *lov = cl2lov(obj);
+        struct lov_stripe_md *lsm = lov_lsm_addref(lov);
+        struct lu_buf *buf = &cl->cl_buf;
+        ssize_t rc;
+
+        if (!lsm) {
+                cl->cl_size = 0;
+                cl->cl_layout_gen = CL_LAYOUT_GEN_EMPTY;
+                cl->cl_is_released = false;
+
+                return 0;
+        }
+
+        cl->cl_size = lov_mds_md_size(lsm->lsm_stripe_count, lsm->lsm_magic);
+        cl->cl_layout_gen = lsm->lsm_layout_gen;
+        cl->cl_is_released = lsm_is_released(lsm);
+
+        rc = lov_lsm_pack(lsm, buf->lb_buf, buf->lb_len);
+        lov_lsm_put(lsm);
+
+        return rc < 0 ? rc : 0;
+}
+
+static loff_t lov_object_maxbytes(struct cl_object *obj)
+{
+        struct lov_object *lov = cl2lov(obj);
+        struct lov_stripe_md *lsm = lov_lsm_addref(lov);
+        loff_t maxbytes;
+
+        if (!lsm)
+                return LLONG_MAX;
+
+        maxbytes = lsm->lsm_maxbytes;
+
+        lov_lsm_put(lsm);
+
+        return maxbytes;
+}
+
 static const struct cl_object_operations lov_ops = {
         .coo_page_init = lov_page_init,
         .coo_lock_init = lov_lock_init,
@@ -934,7 +1491,10 @@ static const struct cl_object_operations lov_ops = {
         .coo_attr_get  = lov_attr_get,
         .coo_attr_update = lov_attr_update,
         .coo_conf_set  = lov_conf_set,
-        .coo_getstripe = lov_object_getstripe
+        .coo_getstripe = lov_object_getstripe,
+        .coo_layout_get  = lov_object_layout_get,
+        .coo_maxbytes    = lov_object_maxbytes,
+        .coo_fiemap      = lov_object_fiemap,
 };
 
 static const struct lu_object_operations lov_lu_obj_ops = {
@@ -986,22 +1546,6 @@ struct lov_stripe_md *lov_lsm_addref(struct lov_object *lov)
         return lsm;
 }
 
-struct lov_stripe_md *lov_lsm_get(struct cl_object *clobj)
-{
-        struct lu_object *luobj;
-        struct lov_stripe_md *lsm = NULL;
-
-        if (!clobj)
-                return NULL;
-
-        luobj = lu_object_locate(&cl_object_header(clobj)->coh_lu,
-                                 &lov_device_type);
-        if (luobj)
-                lsm = lov_lsm_addref(lu2lov(luobj));
-        return lsm;
-}
-EXPORT_SYMBOL(lov_lsm_get);
-
 int lov_read_and_clear_async_rc(struct cl_object *clob)
 {
         struct lu_object *luobj;
diff --git a/drivers/staging/lustre/lustre/lov/lov_pack.c b/drivers/staging/lustre/lustre/lov/lov_pack.c
index be6e9857ce2a..6c93d180aef7 100644
--- a/drivers/staging/lustre/lustre/lov/lov_pack.c
+++ b/drivers/staging/lustre/lustre/lov/lov_pack.c
@@ -38,14 +38,17 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
+#include "../include/lustre/lustre_idl.h"
+#include "../include/lustre/lustre_user.h"
+
 #include "../include/lustre_net.h"
+#include "../include/lustre_swab.h"
 #include "../include/obd.h"
 #include "../include/obd_class.h"
 #include "../include/obd_support.h"
-#include "../include/lustre/lustre_user.h"
 
-#include "lov_internal.h"
 #include "lov_cl_internal.h"
+#include "lov_internal.h"
 
 void lov_dump_lmm_common(int level, void *lmmp)
 {
@@ -97,120 +100,54 @@ void lov_dump_lmm_v3(int level, struct lov_mds_md_v3 *lmm)
                              le16_to_cpu(lmm->lmm_stripe_count));
 }
 
-/* Pack LOV object metadata for disk storage.  It is packed in LE byte
- * order and is opaque to the networking layer.
+/**
+ * Pack LOV striping metadata for disk storage format (in little
+ * endian byte order).
  *
- * XXX In the future, this will be enhanced to get the EA size from the
- *     underlying OSC device(s) to get their EA sizes so we can stack
- *     LOVs properly.  For now lov_mds_md_size() just assumes one u64
- *     per stripe.
+ * This follows the getxattr() conventions. If \a buf_size is zero
+ * then return the size needed. If \a buf_size is too small then
+ * return -ERANGE. Otherwise return the size of the result.
  */
-int lov_obd_packmd(struct lov_obd *lov, struct lov_mds_md **lmmp,
-                   struct lov_stripe_md *lsm)
+ssize_t lov_lsm_pack(const struct lov_stripe_md *lsm, void *buf,
+                     size_t buf_size)
 {
-        struct lov_mds_md_v1 *lmmv1;
-        struct lov_mds_md_v3 *lmmv3;
-        __u16 stripe_count;
         struct lov_ost_data_v1 *lmm_objects;
-        int lmm_size, lmm_magic;
-        int i;
-        int cplen = 0;
-
-        if (lsm) {
-                lmm_magic = lsm->lsm_magic;
-        } else {
-                if (lmmp && *lmmp)
-                        lmm_magic = le32_to_cpu((*lmmp)->lmm_magic);
-                else
-                        /* lsm == NULL and lmmp == NULL */
-                        lmm_magic = LOV_MAGIC;
-        }
-
-        if ((lmm_magic != LOV_MAGIC_V1) &&
-            (lmm_magic != LOV_MAGIC_V3)) {
-                CERROR("bad mem LOV MAGIC: 0x%08X != 0x%08X nor 0x%08X\n",
-                       lmm_magic, LOV_MAGIC_V1, LOV_MAGIC_V3);
-                return -EINVAL;
-        }
-
-        if (lsm) {
-                /* If we are just sizing the EA, limit the stripe count
-                 * to the actual number of OSTs in this filesystem.
-                 */
-                if (!lmmp) {
-                        stripe_count = lov_get_stripecnt(lov, lmm_magic,
-                                                         lsm->lsm_stripe_count);
-                        lsm->lsm_stripe_count = stripe_count;
-                } else if (!lsm_is_released(lsm)) {
-                        stripe_count = lsm->lsm_stripe_count;
-                } else {
-                        stripe_count = 0;
-                }
-        } else {
-                /*
-                 * To calculate maximum easize by active targets at present,
-                 * which is exactly the maximum easize to be seen by LOV
-                 */
-                stripe_count = lov->desc.ld_active_tgt_count;
-        }
+        struct lov_mds_md_v1 *lmmv1 = buf;
+        struct lov_mds_md_v3 *lmmv3 = buf;
+        size_t lmm_size;
+        unsigned int i;
 
-        /* XXX LOV STACKING call into osc for sizes */
-        lmm_size = lov_mds_md_size(stripe_count, lmm_magic);
-
-        if (!lmmp)
+        lmm_size = lov_mds_md_size(lsm->lsm_stripe_count, lsm->lsm_magic);
+        if (!buf_size)
                 return lmm_size;
 
-        if (*lmmp && !lsm) {
-                stripe_count = le16_to_cpu((*lmmp)->lmm_stripe_count);
-                lmm_size = lov_mds_md_size(stripe_count, lmm_magic);
-                kvfree(*lmmp);
-                *lmmp = NULL;
-                return 0;
-        }
-
-        if (!*lmmp) {
-                *lmmp = libcfs_kvzalloc(lmm_size, GFP_NOFS);
-                if (!*lmmp)
-                        return -ENOMEM;
-        }
-
-        CDEBUG(D_INFO, "lov_packmd: LOV_MAGIC 0x%08X, lmm_size = %d\n",
-               lmm_magic, lmm_size);
-
-        lmmv1 = *lmmp;
-        lmmv3 = (struct lov_mds_md_v3 *)*lmmp;
-        if (lmm_magic == LOV_MAGIC_V3)
-                lmmv3->lmm_magic = cpu_to_le32(LOV_MAGIC_V3);
-        else
-                lmmv1->lmm_magic = cpu_to_le32(LOV_MAGIC_V1);
-
-        if (!lsm)
-                return lmm_size;
+        if (buf_size < lmm_size)
+                return -ERANGE;
 
-        /* lmmv1 and lmmv3 point to the same struct and have the
+        /*
+         * lmmv1 and lmmv3 point to the same struct and have the
          * same first fields
          */
+        lmmv1->lmm_magic = cpu_to_le32(lsm->lsm_magic);
         lmm_oi_cpu_to_le(&lmmv1->lmm_oi, &lsm->lsm_oi);
         lmmv1->lmm_stripe_size = cpu_to_le32(lsm->lsm_stripe_size);
-        lmmv1->lmm_stripe_count = cpu_to_le16(stripe_count);
+        lmmv1->lmm_stripe_count = cpu_to_le16(lsm->lsm_stripe_count);
         lmmv1->lmm_pattern = cpu_to_le32(lsm->lsm_pattern);
         lmmv1->lmm_layout_gen = cpu_to_le16(lsm->lsm_layout_gen);
+
         if (lsm->lsm_magic == LOV_MAGIC_V3) {
-                cplen = strlcpy(lmmv3->lmm_pool_name, lsm->lsm_pool_name,
-                                sizeof(lmmv3->lmm_pool_name));
-                if (cplen >= sizeof(lmmv3->lmm_pool_name))
-                        return -E2BIG;
+                CLASSERT(sizeof(lsm->lsm_pool_name) ==
+                         sizeof(lmmv3->lmm_pool_name));
+                strlcpy(lmmv3->lmm_pool_name, lsm->lsm_pool_name,
+                        sizeof(lmmv3->lmm_pool_name));
                 lmm_objects = lmmv3->lmm_objects;
         } else {
                 lmm_objects = lmmv1->lmm_objects;
         }
 
-        for (i = 0; i < stripe_count; i++) {
+        for (i = 0; i < lsm->lsm_stripe_count; i++) {
                 struct lov_oinfo *loi = lsm->lsm_oinfo[i];
-                /* XXX LOV STACKING call down to osc_packmd() to do packing */
-                LASSERTF(ostid_id(&loi->loi_oi) != 0, "lmm_oi "DOSTID
-                         " stripe %u/%u idx %u\n", POSTID(&lmmv1->lmm_oi),
-                         i, stripe_count, loi->loi_ost_idx);
+
                 ostid_cpu_to_le(&loi->loi_oi, &lmm_objects[i].l_ost_oi);
                 lmm_objects[i].l_ost_gen = cpu_to_le32(loi->loi_ost_gen);
                 lmm_objects[i].l_ost_idx = cpu_to_le32(loi->loi_ost_idx);
@@ -219,15 +156,6 @@ int lov_obd_packmd(struct lov_obd *lov, struct lov_mds_md **lmmp,
         return lmm_size;
 }
 
-int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
-               struct lov_stripe_md *lsm)
-{
-        struct obd_device *obd = class_exp2obd(exp);
-        struct lov_obd *lov = &obd->u.lov;
-
-        return lov_obd_packmd(lov, lmmp, lsm);
-}
-
 /* Find the max stripecount we should use */
 __u16 lov_get_stripecnt(struct lov_obd *lov, __u32 magic, __u16 stripe_count)
 {
@@ -270,34 +198,34 @@ static int lov_verify_lmm(void *lmm, int lmm_bytes, __u16 *stripe_count)
         return rc;
 }
 
-int lov_alloc_memmd(struct lov_stripe_md **lsmp, __u16 stripe_count,
-                    int pattern, int magic)
+struct lov_stripe_md *lov_lsm_alloc(u16 stripe_count, u32 pattern, u32 magic)
 {
-        int i, lsm_size;
+        struct lov_stripe_md *lsm;
+        unsigned int i;
 
-        CDEBUG(D_INFO, "alloc lsm, stripe_count %d\n", stripe_count);
+        CDEBUG(D_INFO, "alloc lsm, stripe_count %u\n", stripe_count);
 
-        *lsmp = lsm_alloc_plain(stripe_count, &lsm_size);
-        if (!*lsmp) {
-                CERROR("can't allocate lsmp stripe_count %d\n", stripe_count);
-                return -ENOMEM;
+        lsm = lsm_alloc_plain(stripe_count);
+        if (!lsm) {
+                CERROR("cannot allocate LSM stripe_count %u\n", stripe_count);
+                return ERR_PTR(-ENOMEM);
         }
 
-        atomic_set(&(*lsmp)->lsm_refc, 1);
-        spin_lock_init(&(*lsmp)->lsm_lock);
-        (*lsmp)->lsm_magic = magic;
-        (*lsmp)->lsm_stripe_count = stripe_count;
-        (*lsmp)->lsm_maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES * stripe_count;
-        (*lsmp)->lsm_pattern = pattern;
-        (*lsmp)->lsm_pool_name[0] = '\0';
-        (*lsmp)->lsm_layout_gen = 0;
+        atomic_set(&lsm->lsm_refc, 1);
+        spin_lock_init(&lsm->lsm_lock);
+        lsm->lsm_magic = magic;
+        lsm->lsm_stripe_count = stripe_count;
+        lsm->lsm_maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES * stripe_count;
+        lsm->lsm_pattern = pattern;
+        lsm->lsm_pool_name[0] = '\0';
+        lsm->lsm_layout_gen = 0;
         if (stripe_count > 0)
-                (*lsmp)->lsm_oinfo[0]->loi_ost_idx = ~0;
+                lsm->lsm_oinfo[0]->loi_ost_idx = ~0;
 
         for (i = 0; i < stripe_count; i++)
-                loi_init((*lsmp)->lsm_oinfo[i]);
+                loi_init(lsm->lsm_oinfo[i]);
 
-        return lsm_size;
+        return lsm;
 }
 
 int lov_free_memmd(struct lov_stripe_md **lsmp)
@@ -317,56 +245,34 @@ int lov_free_memmd(struct lov_stripe_md **lsmp)
 /* Unpack LOV object metadata from disk storage.  It is packed in LE byte
  * order and is opaque to the networking layer.
  */
-int lov_unpackmd(struct obd_export *exp,  struct lov_stripe_md **lsmp,
-                 struct lov_mds_md *lmm, int lmm_bytes)
+struct lov_stripe_md *lov_unpackmd(struct lov_obd *lov, struct lov_mds_md *lmm,
+                                   size_t lmm_size)
 {
-        struct obd_device *obd = class_exp2obd(exp);
-        struct lov_obd *lov = &obd->u.lov;
-        int rc = 0, lsm_size;
-        __u16 stripe_count;
-        __u32 magic;
-        __u32 pattern;
-
-        /* If passed an MDS struct use values from there, otherwise defaults */
-        if (lmm) {
-                rc = lov_verify_lmm(lmm, lmm_bytes, &stripe_count);
-                if (rc)
-                        return rc;
-                magic = le32_to_cpu(lmm->lmm_magic);
-                pattern = le32_to_cpu(lmm->lmm_pattern);
-        } else {
-                magic = LOV_MAGIC;
-                stripe_count = lov_get_stripecnt(lov, magic, 0);
-                pattern = LOV_PATTERN_RAID0;
-        }
+        struct lov_stripe_md *lsm;
+        u16 stripe_count;
+        u32 pattern;
+        u32 magic;
+        int rc;
 
-        /* If we aren't passed an lsmp struct, we just want the size */
-        if (!lsmp) {
-                /* XXX LOV STACKING call into osc for sizes */
-                LBUG();
-                return lov_stripe_md_size(stripe_count);
-        }
-        /* If we are passed an allocated struct but nothing to unpack, free */
-        if (*lsmp && !lmm) {
-                lov_free_memmd(lsmp);
-                return 0;
-        }
+        rc = lov_verify_lmm(lmm, lmm_size, &stripe_count);
+        if (rc)
+                return ERR_PTR(rc);
 
-        lsm_size = lov_alloc_memmd(lsmp, stripe_count, pattern, magic);
-        if (lsm_size < 0)
-                return lsm_size;
+        magic = le32_to_cpu(lmm->lmm_magic);
+        pattern = le32_to_cpu(lmm->lmm_pattern);
 
-        /* If we are passed a pointer but nothing to unpack, we only alloc */
-        if (!lmm)
-                return lsm_size;
+        lsm = lov_lsm_alloc(stripe_count, pattern, magic);
+        if (IS_ERR(lsm))
+                return lsm;
 
-        rc = lsm_op_find(magic)->lsm_unpackmd(lov, *lsmp, lmm);
+        LASSERT(lsm_op_find(magic));
+        rc = lsm_op_find(magic)->lsm_unpackmd(lov, lsm, lmm);
         if (rc) {
-                lov_free_memmd(lsmp);
-                return rc;
+                lov_free_memmd(&lsm);
+                return ERR_PTR(rc);
         }
 
-        return lsm_size;
+        return lsm;
 }
 
 /* Retrieve object striping information.
@@ -378,15 +284,14 @@ int lov_unpackmd(struct obd_export *exp,  struct lov_stripe_md **lsmp,
 int lov_getstripe(struct lov_object *obj, struct lov_stripe_md *lsm,
                   struct lov_user_md __user *lump)
 {
-        /*
-         * XXX huge struct allocated on stack.
-         */
         /* we use lov_user_md_v3 because it is larger than lov_user_md_v1 */
-        struct lov_obd *lov;
         struct lov_user_md_v3 lum;
-        struct lov_mds_md *lmmk = NULL;
-        int rc, lmmk_size, lmm_size;
-        int lum_size;
+        struct lov_mds_md *lmmk;
+        u32 stripe_count;
+        ssize_t lmm_size;
+        size_t lmmk_size;
+        size_t lum_size;
+        int rc;
         mm_segment_t seg;
 
         if (!lsm)
@@ -399,6 +304,18 @@ int lov_getstripe(struct lov_object *obj, struct lov_stripe_md *lsm,
         seg = get_fs();
         set_fs(KERNEL_DS);
 
+        if (lsm->lsm_magic != LOV_MAGIC_V1 && lsm->lsm_magic != LOV_MAGIC_V3) {
+                CERROR("bad LSM MAGIC: 0x%08X != 0x%08X nor 0x%08X\n",
+                       lsm->lsm_magic, LOV_MAGIC_V1, LOV_MAGIC_V3);
+                rc = -EIO;
+                goto out;
+        }
+
+        if (!lsm_is_released(lsm))
+                stripe_count = lsm->lsm_stripe_count;
+        else
+                stripe_count = 0;
+
         /* we only need the header part from user space to get lmm_magic and
          * lmm_stripe_count, (the header part is common to v1 and v3)
          */
@@ -417,32 +334,40 @@ int lov_getstripe(struct lov_object *obj, struct lov_stripe_md *lsm,
         if (lum.lmm_stripe_count &&
             (lum.lmm_stripe_count < lsm->lsm_stripe_count)) {
                 /* Return right size of stripe to user */
-                lum.lmm_stripe_count = lsm->lsm_stripe_count;
+                lum.lmm_stripe_count = stripe_count;
                 rc = copy_to_user(lump, &lum, lum_size);
                 rc = -EOVERFLOW;
                 goto out;
         }
-        lov = lu2lov_dev(obj->lo_cl.co_lu.lo_dev)->ld_lov;
-        rc = lov_obd_packmd(lov, &lmmk, lsm);
-        if (rc < 0)
+        lmmk_size = lov_mds_md_size(stripe_count, lsm->lsm_magic);
+
+
+        lmmk = libcfs_kvzalloc(lmmk_size, GFP_NOFS);
+        if (!lmmk) {
+                rc = -ENOMEM;
                 goto out;
-        lmmk_size = rc;
-        lmm_size = rc;
-        rc = 0;
+        }
+
+        lmm_size = lov_lsm_pack(lsm, lmmk, lmmk_size);
+        if (lmm_size < 0) {
+                rc = lmm_size;
+                goto out_free;
+        }
 
         /* FIXME: Bug 1185 - copy fields properly when structs change */
         /* struct lov_user_md_v3 and struct lov_mds_md_v3 must be the same */
         CLASSERT(sizeof(lum) == sizeof(struct lov_mds_md_v3));
         CLASSERT(sizeof(lum.lmm_objects[0]) == sizeof(lmmk->lmm_objects[0]));
 
-        if ((cpu_to_le32(LOV_MAGIC) != LOV_MAGIC) &&
-            ((lmmk->lmm_magic == cpu_to_le32(LOV_MAGIC_V1)) ||
-            (lmmk->lmm_magic == cpu_to_le32(LOV_MAGIC_V3)))) {
+        if (cpu_to_le32(LOV_MAGIC) != LOV_MAGIC &&
+            (lmmk->lmm_magic == cpu_to_le32(LOV_MAGIC_V1) ||
+             lmmk->lmm_magic == cpu_to_le32(LOV_MAGIC_V3))) {
                 lustre_swab_lov_mds_md(lmmk);
                 lustre_swab_lov_user_md_objects(
                                 (struct lov_user_ost_data *)lmmk->lmm_objects,
                                 lmmk->lmm_stripe_count);
         }
+
         if (lum.lmm_magic == LOV_USER_MAGIC) {
                 /* User request for v1, we need skip lmm_pool_name */
                 if (lmmk->lmm_magic == LOV_MAGIC_V3) {
@@ -474,9 +399,11 @@ int lov_getstripe(struct lov_object *obj, struct lov_stripe_md *lsm,
         ((struct lov_user_md *)lmmk)->lmm_stripe_count = lum.lmm_stripe_count;
         if (copy_to_user(lump, lmmk, lmm_size))
                 rc = -EFAULT;
+        else
+                rc = 0;
 
 out_free:
-        kfree(lmmk);
+        kvfree(lmmk);
 out:
         set_fs(seg);
         return rc;
diff --git a/drivers/staging/lustre/lustre/lov/lov_page.c b/drivers/staging/lustre/lustre/lov/lov_page.c
index 00bfabad78eb..62ceb6dfdfdf 100644
--- a/drivers/staging/lustre/lustre/lov/lov_page.c
+++ b/drivers/staging/lustre/lustre/lov/lov_page.c
@@ -49,51 +49,6 @@
  *
  */
 
-/**
- * Adjust the stripe index by layout of raid0. @max_index is the maximum
- * page index covered by an underlying DLM lock.
- * This function converts max_index from stripe level to file level, and make
- * sure it's not beyond one stripe.
- */
-static int lov_raid0_page_is_under_lock(const struct lu_env *env,
-                                        const struct cl_page_slice *slice,
-                                        struct cl_io *unused,
-                                        pgoff_t *max_index)
-{
-        struct lov_object *loo = cl2lov(slice->cpl_obj);
-        struct lov_layout_raid0 *r0 = lov_r0(loo);
-        pgoff_t index = *max_index;
-        unsigned int pps; /* pages per stripe */
-
-        CDEBUG(D_READA, DFID "*max_index = %lu, nr = %d\n",
-               PFID(lu_object_fid(lov2lu(loo))), index, r0->lo_nr);
-
-        if (index == 0) /* the page is not covered by any lock */
-                return 0;
-
-        if (r0->lo_nr == 1) /* single stripe file */
-                return 0;
-
-        /* max_index is stripe level, convert it into file level */
-        if (index != CL_PAGE_EOF) {
-                int stripeno = lov_page_stripe(slice->cpl_page);
-                *max_index = lov_stripe_pgoff(loo->lo_lsm, index, stripeno);
-        }
-
-        /* calculate the end of current stripe */
-        pps = loo->lo_lsm->lsm_stripe_size >> PAGE_SHIFT;
-        index = slice->cpl_index + pps - slice->cpl_index % pps - 1;
-
-        CDEBUG(D_READA, DFID "*max_index = %lu, index = %lu, pps = %u, stripe_size = %u, stripe no = %u, page index = %lu\n",
-               PFID(lu_object_fid(lov2lu(loo))), *max_index, index, pps,
-               loo->lo_lsm->lsm_stripe_size, lov_page_stripe(slice->cpl_page),
-               slice->cpl_index);
-
-        /* never exceed the end of the stripe */
-        *max_index = min_t(pgoff_t, *max_index, index);
-        return 0;
-}
-
 static int lov_raid0_page_print(const struct lu_env *env,
                                 const struct cl_page_slice *slice,
                                 void *cookie, lu_printer_t printer)
@@ -104,7 +59,6 @@ static int lov_raid0_page_print(const struct lu_env *env,
 }
 
 static const struct cl_page_operations lov_raid0_page_ops = {
-        .cpo_is_under_lock = lov_raid0_page_is_under_lock,
         .cpo_print  = lov_raid0_page_print
 };
 
diff --git a/drivers/staging/lustre/lustre/lov/lov_pool.c b/drivers/staging/lustre/lustre/lov/lov_pool.c
index f8c8a361ef79..7daa8671fdc3 100644
--- a/drivers/staging/lustre/lustre/lov/lov_pool.c
+++ b/drivers/staging/lustre/lustre/lov/lov_pool.c
@@ -81,7 +81,8 @@ static void lov_pool_putref_locked(struct pool_desc *pool)
  * Chapter 6.4.
  * Addison Wesley, 1973
  */
-static __u32 pool_hashfn(struct cfs_hash *hash_body, const void *key, unsigned mask)
+static __u32 pool_hashfn(struct cfs_hash *hash_body, const void *key,
+                         unsigned int mask)
 {
         int i;
         __u32 result;
diff --git a/drivers/staging/lustre/lustre/lov/lov_request.c b/drivers/staging/lustre/lustre/lov/lov_request.c
index 09dcaf484c89..d43cc88ae641 100644
--- a/drivers/staging/lustre/lustre/lov/lov_request.c
+++ b/drivers/staging/lustre/lustre/lov/lov_request.c
@@ -44,7 +44,6 @@ static void lov_init_set(struct lov_request_set *set)
         atomic_set(&set->set_completes, 0);
         atomic_set(&set->set_success, 0);
         atomic_set(&set->set_finish_checked, 0);
-        set->set_cookies = NULL;
         INIT_LIST_HEAD(&set->set_list);
         atomic_set(&set->set_refcount, 1);
         init_waitqueue_head(&set->set_waitq);
@@ -61,8 +60,6 @@ void lov_finish_set(struct lov_request_set *set)
                                                          rq_link);
                 list_del_init(&req->rq_link);
 
-                if (req->rq_oi.oi_oa)
-                        kmem_cache_free(obdo_cachep, req->rq_oi.oi_oa);
                 kfree(req->rq_oi.oi_osfs);
                 kfree(req);
         }
@@ -97,22 +94,6 @@ static void lov_update_set(struct lov_request_set *set,
         wake_up(&set->set_waitq);
 }
 
-int lov_update_common_set(struct lov_request_set *set,
-                          struct lov_request *req, int rc)
-{
-        struct lov_obd *lov = &set->set_exp->exp_obd->u.lov;
-
-        lov_update_set(set, req, rc);
-
-        /* grace error on inactive ost */
-        if (rc && !(lov->lov_tgts[req->rq_idx] &&
-                    lov->lov_tgts[req->rq_idx]->ltd_active))
-                rc = 0;
-
-        /* FIXME in raid1 regime, should return 0 */
-        return rc;
-}
-
 static void lov_set_add_req(struct lov_request *req,
                             struct lov_request_set *set)
 {
@@ -183,279 +164,6 @@ out:
         return rc;
 }
 
-static int common_attr_done(struct lov_request_set *set)
-{
-        struct lov_request *req;
-        struct obdo *tmp_oa;
-        int rc = 0, attrset = 0;
-
-        if (!set->set_oi->oi_oa)
-                return 0;
-
-        if (!atomic_read(&set->set_success))
-                return -EIO;
-
-        tmp_oa = kmem_cache_zalloc(obdo_cachep, GFP_NOFS);
-        if (!tmp_oa) {
-                rc = -ENOMEM;
-                goto out;
-        }
-
-        list_for_each_entry(req, &set->set_list, rq_link) {
-                if (!req->rq_complete || req->rq_rc)
-                        continue;
-                if (req->rq_oi.oi_oa->o_valid == 0)   /* inactive stripe */
-                        continue;
-                lov_merge_attrs(tmp_oa, req->rq_oi.oi_oa,
-                                req->rq_oi.oi_oa->o_valid,
-                                set->set_oi->oi_md, req->rq_stripe, &attrset);
-        }
-        if (!attrset) {
-                CERROR("No stripes had valid attrs\n");
-                rc = -EIO;
-        }
-        if ((set->set_oi->oi_oa->o_valid & OBD_MD_FLEPOCH) &&
-            (set->set_oi->oi_md->lsm_stripe_count != attrset)) {
-                /* When we take attributes of some epoch, we require all the
-                 * ost to be active.
-                 */
-                CERROR("Not all the stripes had valid attrs\n");
-                rc = -EIO;
-                goto out;
-        }
-
-        tmp_oa->o_oi = set->set_oi->oi_oa->o_oi;
-        memcpy(set->set_oi->oi_oa, tmp_oa, sizeof(*set->set_oi->oi_oa));
-out:
-        if (tmp_oa)
-                kmem_cache_free(obdo_cachep, tmp_oa);
-        return rc;
-}
-
-int lov_fini_getattr_set(struct lov_request_set *set)
-{
-        int rc = 0;
-
-        if (!set)
-                return 0;
-        LASSERT(set->set_exp);
-        if (atomic_read(&set->set_completes))
-                rc = common_attr_done(set);
-
-        lov_put_reqset(set);
-
-        return rc;
-}
-
-/* The callback for osc_getattr_async that finalizes a request info when a
- * response is received.
- */
-static int cb_getattr_update(void *cookie, int rc)
-{
-        struct obd_info *oinfo = cookie;
-        struct lov_request *lovreq;
-
-        lovreq = container_of(oinfo, struct lov_request, rq_oi);
-        return lov_update_common_set(lovreq->rq_rqset, lovreq, rc);
-}
-
-int lov_prep_getattr_set(struct obd_export *exp, struct obd_info *oinfo,
-                         struct lov_request_set **reqset)
-{
-        struct lov_request_set *set;
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
-        int rc = 0, i;
-
-        set = kzalloc(sizeof(*set), GFP_NOFS);
-        if (!set)
-                return -ENOMEM;
-        lov_init_set(set);
-
-        set->set_exp = exp;
-        set->set_oi = oinfo;
-
-        for (i = 0; i < oinfo->oi_md->lsm_stripe_count; i++) {
-                struct lov_oinfo *loi;
-                struct lov_request *req;
-
-                loi = oinfo->oi_md->lsm_oinfo[i];
-                if (lov_oinfo_is_dummy(loi))
-                        continue;
-
-                if (!lov_check_and_wait_active(lov, loi->loi_ost_idx)) {
-                        CDEBUG(D_HA, "lov idx %d inactive\n", loi->loi_ost_idx);
-                        if (oinfo->oi_oa->o_valid & OBD_MD_FLEPOCH) {
-                                /* SOM requires all the OSTs to be active. */
-                                rc = -EIO;
-                                goto out_set;
-                        }
-                        continue;
-                }
-
-                req = kzalloc(sizeof(*req), GFP_NOFS);
-                if (!req) {
-                        rc = -ENOMEM;
-                        goto out_set;
-                }
-
-                req->rq_stripe = i;
-                req->rq_idx = loi->loi_ost_idx;
-
-                req->rq_oi.oi_oa = kmem_cache_zalloc(obdo_cachep, GFP_NOFS);
-                if (!req->rq_oi.oi_oa) {
-                        kfree(req);
-                        rc = -ENOMEM;
-                        goto out_set;
-                }
-                memcpy(req->rq_oi.oi_oa, oinfo->oi_oa,
-                       sizeof(*req->rq_oi.oi_oa));
-                req->rq_oi.oi_oa->o_oi = loi->loi_oi;
-                req->rq_oi.oi_cb_up = cb_getattr_update;
-
-                lov_set_add_req(req, set);
-        }
-        if (!set->set_count) {
-                rc = -EIO;
-                goto out_set;
-        }
-        *reqset = set;
-        return rc;
-out_set:
-        lov_fini_getattr_set(set);
-        return rc;
-}
-
-int lov_fini_setattr_set(struct lov_request_set *set)
-{
-        int rc = 0;
-
-        if (!set)
-                return 0;
-        LASSERT(set->set_exp);
-        if (atomic_read(&set->set_completes)) {
-                rc = common_attr_done(set);
-                /* FIXME update qos data here */
-        }
-
-        lov_put_reqset(set);
-        return rc;
-}
-
-int lov_update_setattr_set(struct lov_request_set *set,
-                           struct lov_request *req, int rc)
-{
-        struct lov_obd *lov = &req->rq_rqset->set_exp->exp_obd->u.lov;
-        struct lov_stripe_md *lsm = req->rq_rqset->set_oi->oi_md;
-
-        lov_update_set(set, req, rc);
-
-        /* grace error on inactive ost */
-        if (rc && !(lov->lov_tgts[req->rq_idx] &&
-                    lov->lov_tgts[req->rq_idx]->ltd_active))
-                rc = 0;
-
-        if (rc == 0) {
-                if (req->rq_oi.oi_oa->o_valid & OBD_MD_FLCTIME)
-                        lsm->lsm_oinfo[req->rq_stripe]->loi_lvb.lvb_ctime =
-                                req->rq_oi.oi_oa->o_ctime;
-                if (req->rq_oi.oi_oa->o_valid & OBD_MD_FLMTIME)
-                        lsm->lsm_oinfo[req->rq_stripe]->loi_lvb.lvb_mtime =
-                                req->rq_oi.oi_oa->o_mtime;
-                if (req->rq_oi.oi_oa->o_valid & OBD_MD_FLATIME)
-                        lsm->lsm_oinfo[req->rq_stripe]->loi_lvb.lvb_atime =
-                                req->rq_oi.oi_oa->o_atime;
-        }
-
-        return rc;
-}
-
-/* The callback for osc_setattr_async that finalizes a request info when a
- * response is received.
- */
-static int cb_setattr_update(void *cookie, int rc)
-{
-        struct obd_info *oinfo = cookie;
-        struct lov_request *lovreq;
-
-        lovreq = container_of(oinfo, struct lov_request, rq_oi);
-        return lov_update_setattr_set(lovreq->rq_rqset, lovreq, rc);
-}
-
-int lov_prep_setattr_set(struct obd_export *exp, struct obd_info *oinfo,
-                         struct obd_trans_info *oti,
-                         struct lov_request_set **reqset)
-{
-        struct lov_request_set *set;
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
-        int rc = 0, i;
-
-        set = kzalloc(sizeof(*set), GFP_NOFS);
-        if (!set)
-                return -ENOMEM;
-        lov_init_set(set);
-
-        set->set_exp = exp;
-        set->set_oi = oinfo;
-        if (oti && oinfo->oi_oa->o_valid & OBD_MD_FLCOOKIE)
-                set->set_cookies = oti->oti_logcookies;
-
-        for (i = 0; i < oinfo->oi_md->lsm_stripe_count; i++) {
-                struct lov_oinfo *loi = oinfo->oi_md->lsm_oinfo[i];
-                struct lov_request *req;
-
-                if (lov_oinfo_is_dummy(loi))
-                        continue;
-
-                if (!lov_check_and_wait_active(lov, loi->loi_ost_idx)) {
-                        CDEBUG(D_HA, "lov idx %d inactive\n", loi->loi_ost_idx);
-                        continue;
-                }
-
-                req = kzalloc(sizeof(*req), GFP_NOFS);
-                if (!req) {
-                        rc = -ENOMEM;
-                        goto out_set;
-                }
-                req->rq_stripe = i;
-                req->rq_idx = loi->loi_ost_idx;
-
-                req->rq_oi.oi_oa = kmem_cache_zalloc(obdo_cachep, GFP_NOFS);
-                if (!req->rq_oi.oi_oa) {
-                        kfree(req);
-                        rc = -ENOMEM;
-                        goto out_set;
-                }
-                memcpy(req->rq_oi.oi_oa, oinfo->oi_oa,
-                       sizeof(*req->rq_oi.oi_oa));
-                req->rq_oi.oi_oa->o_oi = loi->loi_oi;
-                req->rq_oi.oi_oa->o_stripe_idx = i;
-                req->rq_oi.oi_cb_up = cb_setattr_update;
-
-                if (oinfo->oi_oa->o_valid & OBD_MD_FLSIZE) {
-                        int off = lov_stripe_offset(oinfo->oi_md,
-                                                    oinfo->oi_oa->o_size, i,
-                                                    &req->rq_oi.oi_oa->o_size);
-
-                        if (off < 0 && req->rq_oi.oi_oa->o_size)
-                                req->rq_oi.oi_oa->o_size--;
-
-                        CDEBUG(D_INODE, "stripe %d has size %llu/%llu\n",
-                               i, req->rq_oi.oi_oa->o_size,
-                               oinfo->oi_oa->o_size);
-                }
-                lov_set_add_req(req, set);
-        }
-        if (!set->set_count) {
-                rc = -EIO;
-                goto out_set;
-        }
-        *reqset = set;
-        return rc;
-out_set:
-        lov_fini_setattr_set(set);
-        return rc;
-}
-
 #define LOV_U64_MAX ((__u64)~0ULL)
 #define LOV_SUM_MAX(tot, add)                                      \
         do {                                                        \
diff --git a/drivers/staging/lustre/lustre/lov/lovsub_dev.c b/drivers/staging/lustre/lustre/lov/lovsub_dev.c
index b519a1940e1e..5d6536f8a4f7 100644
--- a/drivers/staging/lustre/lustre/lov/lovsub_dev.c
+++ b/drivers/staging/lustre/lustre/lov/lovsub_dev.c
@@ -44,46 +44,6 @@
 
 /*****************************************************************************
  *
- * Lovsub transfer operations.
- *
- */
-
-static void lovsub_req_completion(const struct lu_env *env,
-                                  const struct cl_req_slice *slice, int ioret)
-{
-        struct lovsub_req *lsr;
-
-        lsr = cl2lovsub_req(slice);
-        kmem_cache_free(lovsub_req_kmem, lsr);
-}
-
-/**
- * Implementation of struct cl_req_operations::cro_attr_set() for lovsub
- * layer. Lov and lovsub are responsible only for struct obdo::o_stripe_idx
- * field, which is filled there.
- */
-static void lovsub_req_attr_set(const struct lu_env *env,
-                                const struct cl_req_slice *slice,
-                                const struct cl_object *obj,
-                                struct cl_req_attr *attr, u64 flags)
-{
-        struct lovsub_object *subobj;
-
-        subobj = cl2lovsub(obj);
-        /*
-         * There is no OBD_MD_* flag for obdo::o_stripe_idx, so set it
-         * unconditionally. It never changes anyway.
-         */
-        attr->cra_oa->o_stripe_idx = subobj->lso_index;
-}
-
-static const struct cl_req_operations lovsub_req_ops = {
-        .cro_attr_set   = lovsub_req_attr_set,
-        .cro_completion = lovsub_req_completion
-};
-
-/*****************************************************************************
- *
  * Lov-sub device and device type functions.
  *
  */
@@ -137,32 +97,12 @@ static struct lu_device *lovsub_device_free(const struct lu_env *env,
         return next;
 }
 
-static int lovsub_req_init(const struct lu_env *env, struct cl_device *dev,
-                           struct cl_req *req)
-{
-        struct lovsub_req *lsr;
-        int result;
-
-        lsr = kmem_cache_zalloc(lovsub_req_kmem, GFP_NOFS);
-        if (lsr) {
-                cl_req_slice_add(req, &lsr->lsrq_cl, dev, &lovsub_req_ops);
-                result = 0;
-        } else {
-                result = -ENOMEM;
-        }
-        return result;
-}
-
 static const struct lu_device_operations lovsub_lu_ops = {
         .ldo_object_alloc      = lovsub_object_alloc,
         .ldo_process_config    = NULL,
         .ldo_recovery_complete = NULL
 };
 
-static const struct cl_device_operations lovsub_cl_ops = {
-        .cdo_req_init = lovsub_req_init
-};
-
 static struct lu_device *lovsub_device_alloc(const struct lu_env *env,
                                              struct lu_device_type *t,
                                              struct lustre_cfg *cfg)
@@ -178,7 +118,6 @@ static struct lu_device *lovsub_device_alloc(const struct lu_env *env,
                 if (result == 0) {
                         d = lovsub2lu_dev(lsd);
                         d->ld_ops        = &lovsub_lu_ops;
-                        lsd->acid_cl.cd_ops = &lovsub_cl_ops;
                 } else {
                         d = ERR_PTR(result);
                 }
diff --git a/drivers/staging/lustre/lustre/lov/lovsub_object.c b/drivers/staging/lustre/lustre/lov/lovsub_object.c
index a2bac7a3b71b..011296ee16e6 100644
--- a/drivers/staging/lustre/lustre/lov/lovsub_object.c
+++ b/drivers/staging/lustre/lustre/lov/lovsub_object.c
@@ -116,11 +116,31 @@ static int lovsub_object_glimpse(const struct lu_env *env,
         return cl_object_glimpse(env, &los->lso_super->lo_cl, lvb);
 }
 
+/**
+ * Implementation of struct cl_object_operations::coo_req_attr_set() for lovsub
+ * layer. Lov and lovsub are responsible only for struct obdo::o_stripe_idx
+ * field, which is filled there.
+ */
+static void lovsub_req_attr_set(const struct lu_env *env, struct cl_object *obj,
+                                struct cl_req_attr *attr)
+{
+        struct lovsub_object *subobj = cl2lovsub(obj);
+
+        cl_req_attr_set(env, &subobj->lso_super->lo_cl, attr);
+
+        /*
+         * There is no OBD_MD_* flag for obdo::o_stripe_idx, so set it
+         * unconditionally. It never changes anyway.
+         */
+        attr->cra_oa->o_stripe_idx = subobj->lso_index;
+}
+
 static const struct cl_object_operations lovsub_ops = {
         .coo_page_init = lovsub_page_init,
         .coo_lock_init = lovsub_lock_init,
         .coo_attr_update = lovsub_attr_update,
-        .coo_glimpse   = lovsub_object_glimpse
+        .coo_glimpse            = lovsub_object_glimpse,
+        .coo_req_attr_set       = lovsub_req_attr_set
 };
 
 static const struct lu_object_operations lovsub_lu_obj_ops = {
diff --git a/drivers/staging/lustre/lustre/mdc/lproc_mdc.c b/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
index fca9450de57c..9021c465c044 100644
--- a/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
+++ b/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
@@ -36,6 +36,42 @@
 #include "../include/lprocfs_status.h"
 #include "mdc_internal.h"
 
+static ssize_t active_show(struct kobject *kobj, struct attribute *attr,
+                           char *buf)
+{
+        struct obd_device *dev = container_of(kobj, struct obd_device,
+                                              obd_kobj);
+
+        return sprintf(buf, "%u\n", !dev->u.cli.cl_import->imp_deactive);
+}
+
+static ssize_t active_store(struct kobject *kobj, struct attribute *attr,
+                            const char *buffer, size_t count)
+{
+        struct obd_device *dev = container_of(kobj, struct obd_device,
+                                              obd_kobj);
+        unsigned long val;
+        int rc;
+
+        rc = kstrtoul(buffer, 10, &val);
+        if (rc)
+                return rc;
+
+        if (val < 0 || val > 1)
+                return -ERANGE;
+
+        /* opposite senses */
+        if (dev->u.cli.cl_import->imp_deactive == val) {
+                rc = ptlrpc_set_import_active(dev->u.cli.cl_import, val);
+                if (rc)
+                        count = rc;
+        } else {
+                CDEBUG(D_CONFIG, "activate %lu: ignoring repeat request\n", val);
+        }
+        return count;
+}
+LUSTRE_RW_ATTR(active);
+
 static ssize_t max_rpcs_in_flight_show(struct kobject *kobj,
                                        struct attribute *attr,
                                        char *buf)
@@ -73,6 +109,64 @@ static ssize_t max_rpcs_in_flight_store(struct kobject *kobj,
 }
 LUSTRE_RW_ATTR(max_rpcs_in_flight);
 
+static ssize_t max_mod_rpcs_in_flight_show(struct kobject *kobj,
+                                           struct attribute *attr,
+                                           char *buf)
+{
+        struct obd_device *dev = container_of(kobj, struct obd_device,
+                                              obd_kobj);
+        u16 max;
+        int len;
+
+        max = dev->u.cli.cl_max_mod_rpcs_in_flight;
+        len = sprintf(buf, "%hu\n", max);
+
+        return len;
+}
+
+static ssize_t max_mod_rpcs_in_flight_store(struct kobject *kobj,
+                                            struct attribute *attr,
+                                            const char *buffer,
+                                            size_t count)
+{
+        struct obd_device *dev = container_of(kobj, struct obd_device,
+                                              obd_kobj);
+        u16 val;
+        int rc;
+
+        rc = kstrtou16(buffer, 10, &val);
+        if (rc)
+                return rc;
+
+        rc = obd_set_max_mod_rpcs_in_flight(&dev->u.cli, val);
+        if (rc)
+                count = rc;
+
+        return count;
+}
+LUSTRE_RW_ATTR(max_mod_rpcs_in_flight);
+
+static int mdc_rpc_stats_seq_show(struct seq_file *seq, void *v)
+{
+        struct obd_device *dev = seq->private;
+
+        return obd_mod_rpc_stats_seq_show(&dev->u.cli, seq);
+}
+
+static ssize_t mdc_rpc_stats_seq_write(struct file *file,
+                                       const char __user *buf,
+                                       size_t len, loff_t *off)
+{
+        struct seq_file *seq = file->private_data;
+        struct obd_device *dev = seq->private;
+        struct client_obd *cli = &dev->u.cli;
+
+        lprocfs_oh_clear(&cli->cl_mod_rpcs_hist);
+
+        return len;
+}
+LPROC_SEQ_FOPS(mdc_rpc_stats);
+
 LPROC_SEQ_FOPS_WR_ONLY(mdc, ping);
 
 LPROC_SEQ_FOPS_RO_TYPE(mdc, connect_flags);
@@ -112,11 +206,15 @@ static struct lprocfs_vars lprocfs_mdc_obd_vars[] = {
         { "import",             &mdc_import_fops,               NULL, 0 },
         { "state",              &mdc_state_fops,                NULL, 0 },
         { "pinger_recov",       &mdc_pinger_recov_fops,         NULL, 0 },
+        { .name =       "rpc_stats",
+          .fops =       &mdc_rpc_stats_fops             },
         { NULL }
 };
 
 static struct attribute *mdc_attrs[] = {
+        &lustre_attr_active.attr,
         &lustre_attr_max_rpcs_in_flight.attr,
+        &lustre_attr_max_mod_rpcs_in_flight.attr,
         &lustre_attr_max_pages_per_rpc.attr,
         NULL,
 };
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_internal.h b/drivers/staging/lustre/lustre/mdc/mdc_internal.h
index f446c1c2584b..881c6a0676a6 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_internal.h
+++ b/drivers/staging/lustre/lustre/mdc/mdc_internal.h
@@ -46,7 +46,7 @@ void mdc_readdir_pack(struct ptlrpc_request *req, __u64 pgoff, size_t size,
 void mdc_getattr_pack(struct ptlrpc_request *req, __u64 valid, u32 flags,
                       struct md_op_data *data, size_t ea_size);
 void mdc_setattr_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
-                      void *ea, size_t ealen, void *ea2, size_t ea2len);
+                      void *ea, size_t ealen);
 void mdc_create_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
                      const void *data, size_t datalen, umode_t mode, uid_t uid,
                      gid_t gid, cfs_cap_t capability, __u64 rdev);
@@ -75,7 +75,7 @@ int mdc_intent_lock(struct obd_export *exp,
                     __u64 extra_lock_flags);
 
 int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
-                const ldlm_policy_data_t *policy,
+                const union ldlm_policy_data *policy,
                 struct lookup_intent *it, struct md_op_data *op_data,
                 struct lustre_handle *lockh, __u64 extra_lock_flags);
 
@@ -105,12 +105,11 @@ int mdc_rename(struct obd_export *exp, struct md_op_data *op_data,
                const char *new, size_t newlen,
                struct ptlrpc_request **request);
 int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
-                void *ea, size_t ealen, void *ea2, size_t ea2len,
-                struct ptlrpc_request **request, struct md_open_data **mod);
+                void *ea, size_t ealen, struct ptlrpc_request **request);
 int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
                struct ptlrpc_request **request);
 int mdc_cancel_unused(struct obd_export *exp, const struct lu_fid *fid,
-                      ldlm_policy_data_t *policy, enum ldlm_mode mode,
+                      union ldlm_policy_data *policy, enum ldlm_mode mode,
                       enum ldlm_cancel_flags flags, void *opaque);
 
 int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,
@@ -122,7 +121,8 @@ int mdc_intent_getattr_async(struct obd_export *exp,
 
 enum ldlm_mode mdc_lock_match(struct obd_export *exp, __u64 flags,
                               const struct lu_fid *fid, enum ldlm_type type,
-                              ldlm_policy_data_t *policy, enum ldlm_mode mode,
+                              union ldlm_policy_data *policy,
+                              enum ldlm_mode mode,
                               struct lustre_handle *lockh);
 
 static inline int mdc_prep_elc_req(struct obd_export *exp,
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_lib.c b/drivers/staging/lustre/lustre/mdc/mdc_lib.c
index aac7e04873e2..f35e1f9afdef 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_lib.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_lib.c
@@ -139,7 +139,7 @@ void mdc_create_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
         rec->cr_time     = op_data->op_mod_time;
         rec->cr_suppgid1 = op_data->op_suppgids[0];
         rec->cr_suppgid2 = op_data->op_suppgids[1];
-        flags = op_data->op_flags & MF_SOM_LOCAL_FLAGS;
+        flags = 0;
         if (op_data->op_bias & MDS_CREATE_VOLATILE)
                 flags |= MDS_OPEN_VOLATILE;
         set_mrc_cr_flags(rec, flags);
@@ -301,16 +301,16 @@ static void mdc_setattr_pack_rec(struct mdt_rec_setattr *rec,
 static void mdc_ioepoch_pack(struct mdt_ioepoch *epoch,
                              struct md_op_data *op_data)
 {
-        memcpy(&epoch->handle, &op_data->op_handle, sizeof(epoch->handle));
-        epoch->ioepoch = op_data->op_ioepoch;
-        epoch->flags = op_data->op_flags & MF_SOM_LOCAL_FLAGS;
+        epoch->mio_handle = op_data->op_handle;
+        epoch->mio_unused1 = 0;
+        epoch->mio_unused2 = 0;
+        epoch->mio_padding = 0;
 }
 
 void mdc_setattr_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
-                      void *ea, size_t ealen, void *ea2, size_t ea2len)
+                      void *ea, size_t ealen)
 {
         struct mdt_rec_setattr *rec;
-        struct mdt_ioepoch *epoch;
         struct lov_user_md *lum = NULL;
 
         CLASSERT(sizeof(struct mdt_rec_reint) ==
@@ -318,11 +318,6 @@ void mdc_setattr_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
         rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_REINT);
         mdc_setattr_pack_rec(rec, op_data);
 
-        if (op_data->op_flags & (MF_SOM_CHANGE | MF_EPOCH_OPEN)) {
-                epoch = req_capsule_client_get(&req->rq_pill, &RMF_MDT_EPOCH);
-                mdc_ioepoch_pack(epoch, op_data);
-        }
-
         if (ealen == 0)
                 return;
 
@@ -335,12 +330,6 @@ void mdc_setattr_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
         } else {
                 memcpy(lum, ea, ealen);
         }
-
-        if (ea2len == 0)
-                return;
-
-        memcpy(req_capsule_client_get(&req->rq_pill, &RMF_LOGCOOKIES), ea2,
-               ea2len);
 }
 
 void mdc_unlink_pack(struct ptlrpc_request *req, struct md_op_data *op_data)
@@ -387,6 +376,31 @@ void mdc_link_pack(struct ptlrpc_request *req, struct md_op_data *op_data)
         mdc_pack_name(req, &RMF_NAME, op_data->op_name, op_data->op_namelen);
 }
 
+static void mdc_intent_close_pack(struct ptlrpc_request *req,
+                                  struct md_op_data *op_data)
+{
+        enum mds_op_bias bias = op_data->op_bias;
+        struct close_data *data;
+        struct ldlm_lock *lock;
+
+        if (!(bias & (MDS_HSM_RELEASE | MDS_CLOSE_LAYOUT_SWAP |
+                      MDS_RENAME_MIGRATE)))
+                return;
+
+        data = req_capsule_client_get(&req->rq_pill, &RMF_CLOSE_DATA);
+        LASSERT(data);
+
+        lock = ldlm_handle2lock(&op_data->op_lease_handle);
+        if (lock) {
+                data->cd_handle = lock->l_remote_handle;
+                LDLM_LOCK_PUT(lock);
+        }
+        ldlm_cli_cancel(&op_data->op_lease_handle, LCF_LOCAL);
+
+        data->cd_data_version = op_data->op_data_version;
+        data->cd_fid = op_data->op_fid2;
+}
+
 void mdc_rename_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
                      const char *old, size_t oldlen,
                      const char *new, size_t newlen)
@@ -415,6 +429,15 @@ void mdc_rename_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
 
         if (new)
                 mdc_pack_name(req, &RMF_SYMTGT, new, newlen);
+
+        if (op_data->op_cli_flags & CLI_MIGRATE &&
+            op_data->op_bias & MDS_RENAME_MIGRATE) {
+                struct mdt_ioepoch *epoch;
+
+                mdc_intent_close_pack(req, op_data);
+                epoch = req_capsule_client_get(&req->rq_pill, &RMF_MDT_EPOCH);
+                mdc_ioepoch_pack(epoch, op_data);
+        }
 }
 
 void mdc_getattr_pack(struct ptlrpc_request *req, __u64 valid, u32 flags,
@@ -441,27 +464,6 @@ void mdc_getattr_pack(struct ptlrpc_request *req, __u64 valid, u32 flags,
                               op_data->op_namelen);
 }
 
-static void mdc_hsm_release_pack(struct ptlrpc_request *req,
-                                 struct md_op_data *op_data)
-{
-        if (op_data->op_bias & MDS_HSM_RELEASE) {
-                struct close_data *data;
-                struct ldlm_lock *lock;
-
-                data = req_capsule_client_get(&req->rq_pill, &RMF_CLOSE_DATA);
-
-                lock = ldlm_handle2lock(&op_data->op_lease_handle);
-                if (lock) {
-                        data->cd_handle = lock->l_remote_handle;
-                        LDLM_LOCK_PUT(lock);
-                }
-                ldlm_cli_cancel(&op_data->op_lease_handle, LCF_LOCAL);
-
-                data->cd_data_version = op_data->op_data_version;
-                data->cd_fid = op_data->op_fid2;
-        }
-}
-
 void mdc_close_pack(struct ptlrpc_request *req, struct md_op_data *op_data)
 {
         struct mdt_ioepoch *epoch;
@@ -484,5 +486,5 @@ void mdc_close_pack(struct ptlrpc_request *req, struct md_op_data *op_data)
                 rec->sa_valid &= ~MDS_ATTR_ATIME;
 
         mdc_ioepoch_pack(epoch, op_data);
-        mdc_hsm_release_pack(req, op_data);
+        mdc_intent_close_pack(req, op_data);
 }
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
index f1f6c082fa42..54ebb9952d66 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
@@ -38,10 +38,12 @@
 #include "../include/obd.h"
 #include "../include/obd_class.h"
 #include "../include/lustre_dlm.h"
-#include "../include/lustre_fid.h"      /* fid_res_name_eq() */
+#include "../include/lustre_fid.h"
 #include "../include/lustre_mdc.h"
 #include "../include/lustre_net.h"
 #include "../include/lustre_req_layout.h"
+#include "../include/lustre_swab.h"
+
 #include "mdc_internal.h"
 
 struct mdc_getattr_args {
@@ -131,7 +133,8 @@ int mdc_set_lock_data(struct obd_export *exp, const struct lustre_handle *lockh,
 
 enum ldlm_mode mdc_lock_match(struct obd_export *exp, __u64 flags,
                               const struct lu_fid *fid, enum ldlm_type type,
-                              ldlm_policy_data_t *policy, enum ldlm_mode mode,
+                              union ldlm_policy_data *policy,
+                              enum ldlm_mode mode,
                               struct lustre_handle *lockh)
 {
         struct ldlm_res_id res_id;
@@ -147,7 +150,7 @@ enum ldlm_mode mdc_lock_match(struct obd_export *exp, __u64 flags,
 
 int mdc_cancel_unused(struct obd_export *exp,
                       const struct lu_fid *fid,
-                      ldlm_policy_data_t *policy,
+                      union ldlm_policy_data *policy,
                       enum ldlm_mode mode,
                       enum ldlm_cancel_flags flags,
                       void *opaque)
@@ -386,8 +389,6 @@ static struct ptlrpc_request *mdc_intent_unlink_pack(struct obd_export *exp,
 
         req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
                              obddev->u.cli.cl_default_mds_easize);
-        req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER,
-                             obddev->u.cli.cl_default_mds_cookiesize);
         ptlrpc_request_set_replen(req);
         return req;
 }
@@ -688,20 +689,20 @@ static int mdc_finish_enqueue(struct obd_export *exp,
  * we don't know in advance the file type.
  */
 int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
-                const ldlm_policy_data_t *policy,
+                const union ldlm_policy_data *policy,
                 struct lookup_intent *it, struct md_op_data *op_data,
                 struct lustre_handle *lockh, u64 extra_lock_flags)
 {
-        static const ldlm_policy_data_t lookup_policy = {
+        static const union ldlm_policy_data lookup_policy = {
                 .l_inodebits = { MDS_INODELOCK_LOOKUP }
         };
-        static const ldlm_policy_data_t update_policy = {
+        static const union ldlm_policy_data update_policy = {
                 .l_inodebits = { MDS_INODELOCK_UPDATE }
         };
-        static const ldlm_policy_data_t layout_policy = {
+        static const union ldlm_policy_data layout_policy = {
                 .l_inodebits = { MDS_INODELOCK_LAYOUT }
         };
-        static const ldlm_policy_data_t getxattr_policy = {
+        static const union ldlm_policy_data getxattr_policy = {
                 .l_inodebits = { MDS_INODELOCK_XATTR }
         };
         struct obd_device *obddev = class_exp2obd(exp);
@@ -762,27 +763,22 @@ resend:
         if (IS_ERR(req))
                 return PTR_ERR(req);
 
-        if (req && it && it->it_op & IT_CREAT)
-                /* ask ptlrpc not to resend on EINPROGRESS since we have our own
-                 * retry logic
-                 */
-                req->rq_no_retry_einprogress = 1;
-
         if (resends) {
                 req->rq_generation_set = 1;
                 req->rq_import_generation = generation;
                 req->rq_sent = ktime_get_real_seconds() + resends;
         }
 
-        /* It is important to obtain rpc_lock first (if applicable), so that
-         * threads that are serialised with rpc_lock are not polluting our
-         * rpcs in flight counter. We do not do flock request limiting, though
+        /* It is important to obtain modify RPC slot first (if applicable), so
+         * that threads that are waiting for a modify RPC slot are not polluting
+         * our rpcs in flight counter.
+         * We do not do flock request limiting, though
          */
         if (it) {
-                mdc_get_rpc_lock(obddev->u.cli.cl_rpc_lock, it);
+                mdc_get_mod_rpc_slot(req, it);
                 rc = obd_get_request_slot(&obddev->u.cli);
                 if (rc != 0) {
-                        mdc_put_rpc_lock(obddev->u.cli.cl_rpc_lock, it);
+                        mdc_put_mod_rpc_slot(req, it);
                         mdc_clear_replay_flag(req, 0);
                         ptlrpc_req_finished(req);
                         return rc;
@@ -809,7 +805,7 @@ resend:
         }
 
         obd_put_request_slot(&obddev->u.cli);
-        mdc_put_rpc_lock(obddev->u.cli.cl_rpc_lock, it);
+        mdc_put_mod_rpc_slot(req, it);
 
         if (rc < 0) {
                 CDEBUG(D_INFO, "%s: ldlm_cli_enqueue failed: rc = %d\n",
@@ -825,11 +821,12 @@ resend:
         lockrep->lock_policy_res2 =
                 ptlrpc_status_ntoh(lockrep->lock_policy_res2);
 
-        /* Retry the create infinitely when we get -EINPROGRESS from
-         * server. This is required by the new quota design.
+        /*
+         * Retry infinitely when the server returns -EINPROGRESS for the
+         * intent operation, when server returns -EINPROGRESS for acquiring
+         * intent lock, we'll retry in after_reply().
          */
-        if (it->it_op & IT_CREAT &&
-            (int)lockrep->lock_policy_res2 == -EINPROGRESS) {
+        if (it->it_op && (int)lockrep->lock_policy_res2 == -EINPROGRESS) {
                 mdc_clear_replay_flag(req, rc);
                 ptlrpc_req_finished(req);
                 resends++;
@@ -931,7 +928,7 @@ static int mdc_finish_intent_lock(struct obd_export *exp,
          */
         lock = ldlm_handle2lock(lockh);
         if (lock) {
-                ldlm_policy_data_t policy = lock->l_policy_data;
+                union ldlm_policy_data policy = lock->l_policy_data;
 
                 LDLM_DEBUG(lock, "matching against this");
 
@@ -967,7 +964,7 @@ int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,
          */
         struct ldlm_res_id res_id;
         struct lustre_handle lockh;
-        ldlm_policy_data_t policy;
+        union ldlm_policy_data policy;
         enum ldlm_mode mode;
 
         if (it->it_lock_handle) {
@@ -1169,10 +1166,9 @@ int mdc_intent_getattr_async(struct obd_export *exp,
          *     for statahead currently. Consider CMD in future, such two bits
          *     maybe managed by different MDS, should be adjusted then.
          */
-        ldlm_policy_data_t       policy = {
-                                        .l_inodebits = { MDS_INODELOCK_LOOKUP |
-                                                         MDS_INODELOCK_UPDATE }
-                                 };
+        union ldlm_policy_data policy = {
+                .l_inodebits = { MDS_INODELOCK_LOOKUP | MDS_INODELOCK_UPDATE }
+        };
         int                   rc = 0;
         __u64               flags = LDLM_FL_HAS_INTENT;
 
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_reint.c b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
index c921e471fa27..07b168490f09 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_reint.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
@@ -40,17 +40,15 @@
 #include "../include/lustre_fid.h"
 
 /* mdc_setattr does its own semaphore handling */
-static int mdc_reint(struct ptlrpc_request *request,
-                     struct mdc_rpc_lock *rpc_lock,
-                     int level)
+static int mdc_reint(struct ptlrpc_request *request, int level)
 {
         int rc;
 
         request->rq_send_state = level;
 
-        mdc_get_rpc_lock(rpc_lock, NULL);
+        mdc_get_mod_rpc_slot(request, NULL);
         rc = ptlrpc_queue_wait(request);
-        mdc_put_rpc_lock(rpc_lock, NULL);
+        mdc_put_mod_rpc_slot(request, NULL);
         if (rc)
                 CDEBUG(D_INFO, "error in handling %d\n", rc);
         else if (!req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY))
@@ -68,7 +66,7 @@ int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,
                             __u64 bits)
 {
         struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;
-        ldlm_policy_data_t policy = {};
+        union ldlm_policy_data policy = {};
         struct ldlm_res_id res_id;
         struct ldlm_resource *res;
         int count;
@@ -99,13 +97,10 @@ int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,
 }
 
 int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
-                void *ea, size_t ealen, void *ea2, size_t ea2len,
-                struct ptlrpc_request **request, struct md_open_data **mod)
+                void *ea, size_t ealen, struct ptlrpc_request **request)
 {
         LIST_HEAD(cancels);
         struct ptlrpc_request *req;
-        struct mdc_rpc_lock *rpc_lock;
-        struct obd_device *obd = exp->exp_obd;
         int count = 0, rc;
         __u64 bits;
 
@@ -122,12 +117,9 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
                 ldlm_lock_list_put(&cancels, l_bl_ast, count);
                 return -ENOMEM;
         }
-        if ((op_data->op_flags & (MF_SOM_CHANGE | MF_EPOCH_OPEN)) == 0)
-                req_capsule_set_size(&req->rq_pill, &RMF_MDT_EPOCH, RCL_CLIENT,
-                                     0);
+        req_capsule_set_size(&req->rq_pill, &RMF_MDT_EPOCH, RCL_CLIENT, 0);
         req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_CLIENT, ealen);
-        req_capsule_set_size(&req->rq_pill, &RMF_LOGCOOKIES, RCL_CLIENT,
-                             ea2len);
+        req_capsule_set_size(&req->rq_pill, &RMF_LOGCOOKIES, RCL_CLIENT, 0);
 
         rc = mdc_prep_elc_req(exp, req, MDS_REINT, &cancels, count);
         if (rc) {
@@ -135,63 +127,21 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
                 return rc;
         }
 
-        rpc_lock = obd->u.cli.cl_rpc_lock;
-
         if (op_data->op_attr.ia_valid & (ATTR_MTIME | ATTR_CTIME))
                 CDEBUG(D_INODE, "setting mtime %ld, ctime %ld\n",
                        LTIME_S(op_data->op_attr.ia_mtime),
                        LTIME_S(op_data->op_attr.ia_ctime));
-        mdc_setattr_pack(req, op_data, ea, ealen, ea2, ea2len);
+        mdc_setattr_pack(req, op_data, ea, ealen);
 
         ptlrpc_request_set_replen(req);
-        if (mod && (op_data->op_flags & MF_EPOCH_OPEN) &&
-            req->rq_import->imp_replayable) {
-                LASSERT(!*mod);
-
-                *mod = obd_mod_alloc();
-                if (!*mod) {
-                        DEBUG_REQ(D_ERROR, req, "Can't allocate md_open_data");
-                } else {
-                        req->rq_replay = 1;
-                        req->rq_cb_data = *mod;
-                        (*mod)->mod_open_req = req;
-                        req->rq_commit_cb = mdc_commit_open;
-                        (*mod)->mod_is_create = true;
-                        /**
-                         * Take an extra reference on \var mod, it protects \var
-                         * mod from being freed on eviction (commit callback is
-                         * called despite rq_replay flag).
-                         * Will be put on mdc_done_writing().
-                         */
-                        obd_mod_get(*mod);
-                }
-        }
-
-        rc = mdc_reint(req, rpc_lock, LUSTRE_IMP_FULL);
 
-        /* Save the obtained info in the original RPC for the replay case. */
-        if (rc == 0 && (op_data->op_flags & MF_EPOCH_OPEN)) {
-                struct mdt_ioepoch *epoch;
-                struct mdt_body  *body;
+        rc = mdc_reint(req, LUSTRE_IMP_FULL);
 
-                epoch = req_capsule_client_get(&req->rq_pill, &RMF_MDT_EPOCH);
-                body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
-                epoch->handle = body->mbo_handle;
-                epoch->ioepoch = body->mbo_ioepoch;
-                req->rq_replay_cb = mdc_replay_open;
-        /** bug 3633, open may be committed and estale answer is not error */
-        } else if (rc == -ESTALE && (op_data->op_flags & MF_SOM_CHANGE)) {
-                rc = 0;
-        } else if (rc == -ERESTARTSYS) {
+        if (rc == -ERESTARTSYS)
                 rc = 0;
-        }
+
         *request = req;
-        if (rc && req->rq_commit_cb) {
-                /* Put an extra reference on \var mod on error case. */
-                if (mod && *mod)
-                        obd_mod_put(*mod);
-                req->rq_commit_cb(req);
-        }
+
         return rc;
 }
 
@@ -264,7 +214,7 @@ rebuild:
         }
         level = LUSTRE_IMP_FULL;
  resend:
-        rc = mdc_reint(req, exp->exp_obd->u.cli.cl_rpc_lock, level);
+        rc = mdc_reint(req, level);
 
         /* Resend if we were told to. */
         if (rc == -ERESTARTSYS) {
@@ -332,13 +282,11 @@ int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
 
         req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
                              obd->u.cli.cl_default_mds_easize);
-        req_capsule_set_size(&req->rq_pill, &RMF_LOGCOOKIES, RCL_SERVER,
-                             obd->u.cli.cl_default_mds_cookiesize);
         ptlrpc_request_set_replen(req);
 
         *request = req;
 
-        rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL);
+        rc = mdc_reint(req, LUSTRE_IMP_FULL);
         if (rc == -ERESTARTSYS)
                 rc = 0;
         return rc;
@@ -348,7 +296,6 @@ int mdc_link(struct obd_export *exp, struct md_op_data *op_data,
              struct ptlrpc_request **request)
 {
         LIST_HEAD(cancels);
-        struct obd_device *obd = exp->exp_obd;
         struct ptlrpc_request *req;
         int count = 0, rc;
 
@@ -380,7 +327,7 @@ int mdc_link(struct obd_export *exp, struct md_op_data *op_data,
         mdc_link_pack(req, op_data);
         ptlrpc_request_set_replen(req);
 
-        rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL);
+        rc = mdc_reint(req, LUSTRE_IMP_FULL);
         *request = req;
         if (rc == -ERESTARTSYS)
                 rc = 0;
@@ -419,7 +366,8 @@ int mdc_rename(struct obd_export *exp, struct md_op_data *op_data,
                                                  MDS_INODELOCK_FULL);
 
         req = ptlrpc_request_alloc(class_exp2cliimp(exp),
-                                   &RQF_MDS_REINT_RENAME);
+                                   op_data->op_cli_flags & CLI_MIGRATE ?
+                                   &RQF_MDS_REINT_MIGRATE : &RQF_MDS_REINT_RENAME);
         if (!req) {
                 ldlm_lock_list_put(&cancels, l_bl_ast, count);
                 return -ENOMEM;
@@ -435,6 +383,23 @@ int mdc_rename(struct obd_export *exp, struct md_op_data *op_data,
                 return rc;
         }
 
+        if (op_data->op_cli_flags & CLI_MIGRATE && op_data->op_data) {
+                struct md_open_data *mod = op_data->op_data;
+
+                LASSERTF(mod->mod_open_req &&
+                         mod->mod_open_req->rq_type != LI_POISON,
+                         "POISONED open %p!\n", mod->mod_open_req);
+
+                DEBUG_REQ(D_HA, mod->mod_open_req, "matched open");
+                /*
+                 * We no longer want to preserve this open for replay even
+                 * though the open was committed. b=3632, b=3633
+                 */
+                spin_lock(&mod->mod_open_req->rq_lock);
+                mod->mod_open_req->rq_replay = 0;
+                spin_unlock(&mod->mod_open_req->rq_lock);
+        }
+
         if (exp_connect_cancelset(exp) && req)
                 ldlm_cli_cancel_list(&cancels, count, req, 0);
 
@@ -442,11 +407,9 @@ int mdc_rename(struct obd_export *exp, struct md_op_data *op_data,
 
         req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
                              obd->u.cli.cl_default_mds_easize);
-        req_capsule_set_size(&req->rq_pill, &RMF_LOGCOOKIES, RCL_SERVER,
-                             obd->u.cli.cl_default_mds_cookiesize);
         ptlrpc_request_set_replen(req);
 
-        rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL);
+        rc = mdc_reint(req, LUSTRE_IMP_FULL);
         *request = req;
         if (rc == -ERESTARTSYS)
                 rc = 0;
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index f56ea643f9bf..2cfd913f9bc5 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -38,15 +38,18 @@
 # include <linux/init.h>
 # include <linux/utsname.h>
 
+#include "../include/cl_object.h"
+#include "../include/llog_swab.h"
+#include "../include/lprocfs_status.h"
 #include "../include/lustre_acl.h"
+#include "../include/lustre_fid.h"
 #include "../include/lustre/lustre_ioctl.h"
-#include "../include/obd_class.h"
+#include "../include/lustre_kernelcomm.h"
 #include "../include/lustre_lmv.h"
-#include "../include/lustre_fid.h"
-#include "../include/lprocfs_status.h"
-#include "../include/lustre_param.h"
 #include "../include/lustre_log.h"
-#include "../include/lustre_kernelcomm.h"
+#include "../include/lustre_param.h"
+#include "../include/lustre_swab.h"
+#include "../include/obd_class.h"
 
 #include "mdc_internal.h"
 
@@ -327,12 +330,12 @@ static int mdc_xattr_common(struct obd_export *exp,
 
         /* make rpc */
         if (opcode == MDS_REINT)
-                mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
+                mdc_get_mod_rpc_slot(req, NULL);
 
         rc = ptlrpc_queue_wait(req);
 
         if (opcode == MDS_REINT)
-                mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
+                mdc_put_mod_rpc_slot(req, NULL);
 
         if (rc)
                 ptlrpc_req_finished(req);
@@ -420,9 +423,6 @@ static int mdc_get_lustre_md(struct obd_export *exp,
         md->body = req_capsule_server_get(pill, &RMF_MDT_BODY);
 
         if (md->body->mbo_valid & OBD_MD_FLEASIZE) {
-                int lmmsize;
-                struct lov_mds_md *lmm;
-
                 if (!S_ISREG(md->body->mbo_mode)) {
                         CDEBUG(D_INFO,
                                "OBD_MD_FLEASIZE set, should be a regular file, but is not\n");
@@ -436,28 +436,18 @@ static int mdc_get_lustre_md(struct obd_export *exp,
                         rc = -EPROTO;
                         goto out;
                 }
-                lmmsize = md->body->mbo_eadatasize;
-                lmm = req_capsule_server_sized_get(pill, &RMF_MDT_MD, lmmsize);
-                if (!lmm) {
-                        rc = -EPROTO;
-                        goto out;
-                }
-
-                rc = obd_unpackmd(dt_exp, &md->lsm, lmm, lmmsize);
-                if (rc < 0)
-                        goto out;
 
-                if (rc < (typeof(rc))sizeof(*md->lsm)) {
-                        CDEBUG(D_INFO,
-                               "lsm size too small: rc < sizeof (*md->lsm) (%d < %d)\n",
-                               rc, (int)sizeof(*md->lsm));
+                md->layout.lb_len = md->body->mbo_eadatasize;
+                md->layout.lb_buf = req_capsule_server_sized_get(pill,
+                                                                 &RMF_MDT_MD,
+                                                                 md->layout.lb_len);
+                if (!md->layout.lb_buf) {
                         rc = -EPROTO;
                         goto out;
                 }
-
         } else if (md->body->mbo_valid & OBD_MD_FLDIREA) {
-                int lmvsize;
-                struct lov_mds_md *lmv;
+                const union lmv_mds_md *lmv;
+                size_t lmv_size;
 
                 if (!S_ISDIR(md->body->mbo_mode)) {
                         CDEBUG(D_INFO,
@@ -466,22 +456,21 @@ static int mdc_get_lustre_md(struct obd_export *exp,
                         goto out;
                 }
 
-                if (md->body->mbo_eadatasize == 0) {
+                lmv_size = md->body->mbo_eadatasize;
+                if (!lmv_size) {
                         CDEBUG(D_INFO,
                                "OBD_MD_FLDIREA is set, but eadatasize 0\n");
                         return -EPROTO;
                 }
                 if (md->body->mbo_valid & OBD_MD_MEA) {
-                        lmvsize = md->body->mbo_eadatasize;
                         lmv = req_capsule_server_sized_get(pill, &RMF_MDT_MD,
-                                                           lmvsize);
+                                                           lmv_size);
                         if (!lmv) {
                                 rc = -EPROTO;
                                 goto out;
                         }
 
-                        rc = obd_unpackmd(md_exp, (void *)&md->lmv, lmv,
-                                          lmvsize);
+                        rc = md_unpackmd(md_exp, &md->lmv, lmv, lmv_size);
                         if (rc < 0)
                                 goto out;
 
@@ -517,8 +506,6 @@ out:
 #ifdef CONFIG_FS_POSIX_ACL
                 posix_acl_release(md->posix_acl);
 #endif
-                if (md->lsm)
-                        obd_free_memmd(dt_exp, &md->lsm);
         }
         return rc;
 }
@@ -528,10 +515,6 @@ static int mdc_free_lustre_md(struct obd_export *exp, struct lustre_md *md)
         return 0;
 }
 
-/**
- * Handles both OPEN and SETATTR RPCs for OPEN-CLOSE and SETATTR-DONE_WRITING
- * RPC chains.
- */
 void mdc_replay_open(struct ptlrpc_request *req)
 {
         struct md_open_data *mod = req->rq_cb_data;
@@ -565,15 +548,15 @@ void mdc_replay_open(struct ptlrpc_request *req)
                 __u32 opc = lustre_msg_get_opc(close_req->rq_reqmsg);
                 struct mdt_ioepoch *epoch;
 
-                LASSERT(opc == MDS_CLOSE || opc == MDS_DONE_WRITING);
+                LASSERT(opc == MDS_CLOSE);
                 epoch = req_capsule_client_get(&close_req->rq_pill,
                                                &RMF_MDT_EPOCH);
                 LASSERT(epoch);
 
                 if (och)
-                        LASSERT(!memcmp(&old, &epoch->handle, sizeof(old)));
+                        LASSERT(!memcmp(&old, &epoch->mio_handle, sizeof(old)));
                 DEBUG_REQ(D_HA, close_req, "updating close body with new fh");
-                epoch->handle = body->mbo_handle;
+                epoch->mio_handle = body->mbo_handle;
         }
 }
 
@@ -715,22 +698,6 @@ static int mdc_clear_open_replay_data(struct obd_export *exp,
         return 0;
 }
 
-/* Prepares the request for the replay by the given reply */
-static void mdc_close_handle_reply(struct ptlrpc_request *req,
-                                   struct md_op_data *op_data, int rc) {
-        struct mdt_body  *repbody;
-        struct mdt_ioepoch *epoch;
-
-        if (req && rc == -EAGAIN) {
-                repbody = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
-                epoch = req_capsule_client_get(&req->rq_pill, &RMF_MDT_EPOCH);
-
-                epoch->flags |= MF_SOM_AU;
-                if (repbody->mbo_valid & OBD_MD_FLGETATTRLOCK)
-                        op_data->op_flags |= MF_GETATTR_LOCK;
-        }
-}
-
 static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
                      struct md_open_data *mod, struct ptlrpc_request **request)
 {
@@ -740,9 +707,8 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
         int                    rc;
         int                    saved_rc = 0;
 
-        req_fmt = &RQF_MDS_CLOSE;
         if (op_data->op_bias & MDS_HSM_RELEASE) {
-                req_fmt = &RQF_MDS_RELEASE_CLOSE;
+                req_fmt = &RQF_MDS_INTENT_CLOSE;
 
                 /* allocate a FID for volatile file */
                 rc = mdc_fid_alloc(NULL, exp, &op_data->op_fid2, op_data);
@@ -752,6 +718,10 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
                         /* save the errcode and proceed to close */
                         saved_rc = rc;
                 }
+        } else if (op_data->op_bias & MDS_CLOSE_LAYOUT_SWAP) {
+                req_fmt = &RQF_MDS_INTENT_CLOSE;
+        } else {
+                req_fmt = &RQF_MDS_CLOSE;
         }
 
         *request = NULL;
@@ -807,14 +777,12 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
 
         req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
                              obd->u.cli.cl_default_mds_easize);
-        req_capsule_set_size(&req->rq_pill, &RMF_LOGCOOKIES, RCL_SERVER,
-                             obd->u.cli.cl_default_mds_cookiesize);
 
         ptlrpc_request_set_replen(req);
 
-        mdc_get_rpc_lock(obd->u.cli.cl_close_lock, NULL);
+        mdc_get_mod_rpc_slot(req, NULL);
         rc = ptlrpc_queue_wait(req);
-        mdc_put_rpc_lock(obd->u.cli.cl_close_lock, NULL);
+        mdc_put_mod_rpc_slot(req, NULL);
 
         if (!req->rq_repmsg) {
                 CDEBUG(D_RPCTRACE, "request failed to send: %p, %d\n", req,
@@ -857,79 +825,9 @@ out:
                 obd_mod_put(mod);
         }
         *request = req;
-        mdc_close_handle_reply(req, op_data, rc);
         return rc < 0 ? rc : saved_rc;
 }
 
-static int mdc_done_writing(struct obd_export *exp, struct md_op_data *op_data,
-                            struct md_open_data *mod)
-{
-        struct obd_device     *obd = class_exp2obd(exp);
-        struct ptlrpc_request *req;
-        int                 rc;
-
-        req = ptlrpc_request_alloc(class_exp2cliimp(exp),
-                                   &RQF_MDS_DONE_WRITING);
-        if (!req)
-                return -ENOMEM;
-
-        rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, MDS_DONE_WRITING);
-        if (rc) {
-                ptlrpc_request_free(req);
-                return rc;
-        }
-
-        if (mod) {
-                LASSERTF(mod->mod_open_req &&
-                         mod->mod_open_req->rq_type != LI_POISON,
-                         "POISONED setattr %p!\n", mod->mod_open_req);
-
-                mod->mod_close_req = req;
-                DEBUG_REQ(D_HA, mod->mod_open_req, "matched setattr");
-                /* We no longer want to preserve this setattr for replay even
-                 * though the open was committed. b=3632, b=3633
-                 */
-                spin_lock(&mod->mod_open_req->rq_lock);
-                mod->mod_open_req->rq_replay = 0;
-                spin_unlock(&mod->mod_open_req->rq_lock);
-        }
-
-        mdc_close_pack(req, op_data);
-        ptlrpc_request_set_replen(req);
-
-        mdc_get_rpc_lock(obd->u.cli.cl_close_lock, NULL);
-        rc = ptlrpc_queue_wait(req);
-        mdc_put_rpc_lock(obd->u.cli.cl_close_lock, NULL);
-
-        if (rc == -ESTALE) {
-                /**
-                 * it can be allowed error after 3633 if open or setattr were
-                 * committed and server failed before close was sent.
-                 * Let's check if mod exists and return no error in that case
-                 */
-                if (mod) {
-                        if (mod->mod_open_req->rq_committed)
-                                rc = 0;
-                }
-        }
-
-        if (mod) {
-                if (rc != 0)
-                        mod->mod_close_req = NULL;
-                LASSERT(mod->mod_open_req);
-                mdc_free_open(mod);
-
-                /* Since now, mod is accessed through setattr req only,
-                 * thus DW req does not keep a reference on mod anymore.
-                 */
-                obd_mod_put(mod);
-        }
-
-        mdc_close_handle_reply(req, op_data, rc);
-        ptlrpc_req_finished(req);
-        return rc;
-}
-
 static int mdc_getpage(struct obd_export *exp, const struct lu_fid *fid,
                        u64 offset, struct page **pages, int npages,
                        struct ptlrpc_request **request)
@@ -959,8 +857,10 @@ restart_bulk:
         req->rq_request_portal = MDS_READPAGE_PORTAL;
         ptlrpc_at_set_req_timeout(req);
 
-        desc = ptlrpc_prep_bulk_imp(req, npages, 1, BULK_PUT_SINK,
-                                    MDS_BULK_PORTAL);
+        desc = ptlrpc_prep_bulk_imp(req, npages, 1,
+                                    PTLRPC_BULK_PUT_SINK | PTLRPC_BULK_BUF_KIOV,
+                                    MDS_BULK_PORTAL,
+                                    &ptlrpc_bulk_kiov_pin_ops);
         if (!desc) {
                 ptlrpc_request_free(req);
                 return -ENOMEM;
@@ -968,7 +868,7 @@ restart_bulk:
 
         /* NB req now owns desc and will free it when it gets freed */
         for (i = 0; i < npages; i++)
-                ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_SIZE);
+                desc->bd_frag_ops->add_kiov_frag(desc, pages[i], 0, PAGE_SIZE);
 
         mdc_readdir_pack(req, offset, PAGE_SIZE * npages, fid);
 
@@ -1546,7 +1446,7 @@ static int mdc_ioc_fid2path(struct obd_export *exp, struct getinfo_fid2path *gf)
         /* Val is struct getinfo_fid2path result plus path */
         vallen = sizeof(*gf) + gf->gf_pathlen;
 
-        rc = obd_get_info(NULL, exp, keylen, key, &vallen, gf, NULL);
+        rc = obd_get_info(NULL, exp, keylen, key, &vallen, gf);
         if (rc != 0 && rc != -EREMOTE)
                 goto out;
 
@@ -1558,8 +1458,11 @@ static int mdc_ioc_fid2path(struct obd_export *exp, struct getinfo_fid2path *gf)
                 goto out;
         }
 
-        CDEBUG(D_IOCTL, "path get "DFID" from %llu #%d\n%s\n",
-               PFID(&gf->gf_fid), gf->gf_recno, gf->gf_linkno, gf->gf_path);
+        CDEBUG(D_IOCTL, "path got " DFID " from %llu #%d: %s\n",
+               PFID(&gf->gf_fid), gf->gf_recno, gf->gf_linkno,
+               gf->gf_pathlen < 512 ? gf->gf_path :
+               /* only log the last 512 characters of the path */
+               gf->gf_path + gf->gf_pathlen - 512);
 
 out:
         kfree(key);
@@ -1595,7 +1498,9 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp,
 
         ptlrpc_request_set_replen(req);
 
-        rc = mdc_queue_wait(req);
+        mdc_get_mod_rpc_slot(req, NULL);
+        rc = ptlrpc_queue_wait(req);
+        mdc_put_mod_rpc_slot(req, NULL);
 out:
         ptlrpc_req_finished(req);
         return rc;
@@ -1773,7 +1678,9 @@ static int mdc_ioc_hsm_state_set(struct obd_export *exp,
 
         ptlrpc_request_set_replen(req);
 
-        rc = mdc_queue_wait(req);
+        mdc_get_mod_rpc_slot(req, NULL);
+        rc = ptlrpc_queue_wait(req);
+        mdc_put_mod_rpc_slot(req, NULL);
 out:
         ptlrpc_req_finished(req);
         return rc;
@@ -1836,7 +1743,9 @@ static int mdc_ioc_hsm_request(struct obd_export *exp,
 
         ptlrpc_request_set_replen(req);
 
-        rc = mdc_queue_wait(req);
+        mdc_get_mod_rpc_slot(req, NULL);
+        rc = ptlrpc_queue_wait(req);
+        mdc_put_mod_rpc_slot(req, NULL);
 out:
         ptlrpc_req_finished(req);
         return rc;
@@ -1957,10 +1866,8 @@ static int mdc_changelog_send_thread(void *csdata)
 
         /* Send EOF no matter what our result */
         kuch = changelog_kuc_hdr(cs->cs_buf, sizeof(*kuch), cs->cs_flags);
-        if (kuch) {
-                kuch->kuc_msgtype = CL_EOF;
-                libcfs_kkuc_msg_put(cs->cs_fp, kuch);
-        }
+        kuch->kuc_msgtype = CL_EOF;
+        libcfs_kkuc_msg_put(cs->cs_fp, kuch);
 
 out:
         fput(cs->cs_fp);
@@ -2015,52 +1922,6 @@ static int mdc_ioc_changelog_send(struct obd_device *obd,
 static int mdc_ioc_hsm_ct_start(struct obd_export *exp,
                                 struct lustre_kernelcomm *lk);
 
-static int mdc_quotacheck(struct obd_device *unused, struct obd_export *exp,
-                          struct obd_quotactl *oqctl)
-{
-        struct client_obd       *cli = &exp->exp_obd->u.cli;
-        struct ptlrpc_request   *req;
-        struct obd_quotactl     *body;
-        int                   rc;
-
-        req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp),
-                                        &RQF_MDS_QUOTACHECK, LUSTRE_MDS_VERSION,
-                                        MDS_QUOTACHECK);
-        if (!req)
-                return -ENOMEM;
-
-        body = req_capsule_client_get(&req->rq_pill, &RMF_OBD_QUOTACTL);
-        *body = *oqctl;
-
-        ptlrpc_request_set_replen(req);
-
-        /* the next poll will find -ENODATA, that means quotacheck is
-         * going on
-         */
-        cli->cl_qchk_stat = -ENODATA;
-        rc = ptlrpc_queue_wait(req);
-        if (rc)
-                cli->cl_qchk_stat = rc;
-        ptlrpc_req_finished(req);
-        return rc;
-}
-
-static int mdc_quota_poll_check(struct obd_export *exp,
-                                struct if_quotacheck *qchk)
-{
-        struct client_obd *cli = &exp->exp_obd->u.cli;
-        int rc;
-
-        qchk->obd_uuid = cli->cl_target_uuid;
-        memcpy(qchk->obd_type, LUSTRE_MDS_NAME, strlen(LUSTRE_MDS_NAME));
-
-        rc = cli->cl_qchk_stat;
-        /* the client is not the previous one */
-        if (rc == CL_NOT_QUOTACHECKED)
-                rc = -EINTR;
-        return rc;
-}
-
 static int mdc_quotactl(struct obd_device *unused, struct obd_export *exp,
                         struct obd_quotactl *oqctl)
 {
@@ -2215,9 +2076,6 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         case IOC_OSC_SET_ACTIVE:
                 rc = ptlrpc_set_import_active(imp, data->ioc_offset);
                 goto out;
-        case OBD_IOC_POLL_QUOTACHECK:
-                rc = mdc_quota_poll_check(exp, (struct if_quotacheck *)karg);
-                goto out;
         case OBD_IOC_PING_TARGET:
                 rc = ptlrpc_obd_ping(obd);
                 goto out;
@@ -2528,8 +2386,7 @@ static int mdc_set_info_async(const struct lu_env *env,
 }
 
 static int mdc_get_info(const struct lu_env *env, struct obd_export *exp,
-                        __u32 keylen, void *key, __u32 *vallen, void *val,
-                        struct lov_stripe_md *lsm)
+                        __u32 keylen, void *key, __u32 *vallen, void *val)
 {
         int rc = -EINVAL;
 
@@ -2733,29 +2590,17 @@ static void mdc_llog_finish(struct obd_device *obd)
 
 static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg)
 {
-        struct client_obd *cli = &obd->u.cli;
         struct lprocfs_static_vars lvars = { NULL };
         int rc;
 
-        cli->cl_rpc_lock = kzalloc(sizeof(*cli->cl_rpc_lock), GFP_NOFS);
-        if (!cli->cl_rpc_lock)
-                return -ENOMEM;
-        mdc_init_rpc_lock(cli->cl_rpc_lock);
-
         rc = ptlrpcd_addref();
         if (rc < 0)
-                goto err_rpc_lock;
-
-        cli->cl_close_lock = kzalloc(sizeof(*cli->cl_close_lock), GFP_NOFS);
-        if (!cli->cl_close_lock) {
-                rc = -ENOMEM;
-                goto err_ptlrpcd_decref;
-        }
-        mdc_init_rpc_lock(cli->cl_close_lock);
+                return rc;
 
         rc = client_obd_setup(obd, cfg);
         if (rc)
-                goto err_close_lock;
+                goto err_ptlrpcd_decref;
+
         lprocfs_mdc_init_vars(&lvars);
         lprocfs_obd_setup(obd, lvars.obd_vars, lvars.sysfs_vars);
         sptlrpc_lprocfs_cliobd_attach(obd);
@@ -2769,29 +2614,25 @@ static int mdc_setup(struct obd_device *obd, struct lustre_cfg *cfg)
         if (rc) {
                 mdc_cleanup(obd);
                 CERROR("failed to setup llogging subsystems\n");
+                return rc;
         }
 
         return rc;
 
-err_close_lock:
-        kfree(cli->cl_close_lock);
 err_ptlrpcd_decref:
         ptlrpcd_decref();
-err_rpc_lock:
-        kfree(cli->cl_rpc_lock);
         return rc;
 }
 
-/* Initialize the default and maximum LOV EA and cookie sizes.  This allows
+/* Initialize the default and maximum LOV EA sizes. This allows
  * us to make MDS RPCs with large enough reply buffers to hold a default
- * sized EA and cookie without having to calculate this (via a call into the
+ * sized EA without having to calculate this (via a call into the
  * LOV + OSCs) each time we make an RPC.  The maximum size is also tracked
  * but not used to avoid wastefully vmalloc()'ing large reply buffers when
  * a large number of stripes is possible.  If a larger reply buffer is
  * required it will be reallocated in the ptlrpc layer due to overflow.
  */
-static int mdc_init_ea_size(struct obd_export *exp, u32 easize, u32 def_easize,
-                            u32 cookiesize, u32 def_cookiesize)
+static int mdc_init_ea_size(struct obd_export *exp, u32 easize, u32 def_easize)
 {
         struct obd_device *obd = exp->exp_obd;
         struct client_obd *cli = &obd->u.cli;
@@ -2802,42 +2643,24 @@ static int mdc_init_ea_size(struct obd_export *exp, u32 easize, u32 def_easize,
         if (cli->cl_default_mds_easize < def_easize)
                 cli->cl_default_mds_easize = def_easize;
 
-        if (cli->cl_max_mds_cookiesize < cookiesize)
-                cli->cl_max_mds_cookiesize = cookiesize;
-
-        if (cli->cl_default_mds_cookiesize < def_cookiesize)
-                cli->cl_default_mds_cookiesize = def_cookiesize;
-
         return 0;
 }
 
-static int mdc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
+static int mdc_precleanup(struct obd_device *obd)
 {
-        switch (stage) {
-        case OBD_CLEANUP_EARLY:
-                break;
-        case OBD_CLEANUP_EXPORTS:
-                /* Failsafe, ok if racy */
-                if (obd->obd_type->typ_refcnt <= 1)
-                        libcfs_kkuc_group_rem(0, KUC_GRP_HSM);
+        /* Failsafe, ok if racy */
+        if (obd->obd_type->typ_refcnt <= 1)
+                libcfs_kkuc_group_rem(0, KUC_GRP_HSM);
 
-                obd_cleanup_client_import(obd);
-                ptlrpc_lprocfs_unregister_obd(obd);
-                lprocfs_obd_cleanup(obd);
-
-                mdc_llog_finish(obd);
-                break;
-        }
+        obd_cleanup_client_import(obd);
+        ptlrpc_lprocfs_unregister_obd(obd);
+        lprocfs_obd_cleanup(obd);
+        mdc_llog_finish(obd);
         return 0;
 }
 
 static int mdc_cleanup(struct obd_device *obd)
 {
-        struct client_obd *cli = &obd->u.cli;
-
-        kfree(cli->cl_rpc_lock);
-        kfree(cli->cl_close_lock);
-
         ptlrpcd_decref();
 
         return client_obd_cleanup(obd);
@@ -2881,7 +2704,6 @@ static struct obd_ops mdc_obd_ops = {
         .process_config = mdc_process_config,
         .get_uuid       = mdc_get_uuid,
         .quotactl       = mdc_quotactl,
-        .quotacheck     = mdc_quotacheck
 };
 
 static struct md_ops mdc_md_ops = {
@@ -2889,7 +2711,6 @@ static struct md_ops mdc_md_ops = {
         .null_inode             = mdc_null_inode,
         .close                  = mdc_close,
         .create                 = mdc_create,
-        .done_writing           = mdc_done_writing,
         .enqueue                = mdc_enqueue,
         .getattr                = mdc_getattr,
         .getattr_name           = mdc_getattr_name,
diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index 23374cae5133..b9c522a3c7a4 100644
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -38,11 +38,13 @@
 #define D_MGC D_CONFIG /*|D_WARNING*/
 
 #include <linux/module.h>
-#include "../include/obd_class.h"
-#include "../include/lustre_dlm.h"
+
 #include "../include/lprocfs_status.h"
-#include "../include/lustre_log.h"
+#include "../include/lustre_dlm.h"
 #include "../include/lustre_disk.h"
+#include "../include/lustre_log.h"
+#include "../include/lustre_swab.h"
+#include "../include/obd_class.h"
 
 #include "mgc_internal.h"
 
@@ -373,7 +375,7 @@ out_err:
         return rc;
 }
 
-DEFINE_MUTEX(llog_process_lock);
+static DEFINE_MUTEX(llog_process_lock);
 
 /** Stop watching for updates on this log.
  */
@@ -684,35 +686,33 @@ static int mgc_llog_fini(const struct lu_env *env, struct obd_device *obd)
 }
 
 static atomic_t mgc_count = ATOMIC_INIT(0);
-static int mgc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
+static int mgc_precleanup(struct obd_device *obd)
 {
         int rc = 0;
         int temp;
 
-        switch (stage) {
-        case OBD_CLEANUP_EARLY:
-                break;
-        case OBD_CLEANUP_EXPORTS:
-                if (atomic_dec_and_test(&mgc_count)) {
-                        LASSERT(rq_state & RQ_RUNNING);
-                        /* stop requeue thread */
-                        temp = RQ_STOP;
-                } else {
-                        /* wakeup requeue thread to clean our cld */
-                        temp = RQ_NOW | RQ_PRECLEANUP;
-                }
-                spin_lock(&config_list_lock);
-                rq_state |= temp;
-                spin_unlock(&config_list_lock);
-                wake_up(&rq_waitq);
-                if (temp & RQ_STOP)
-                        wait_for_completion(&rq_exit);
-                obd_cleanup_client_import(obd);
-                rc = mgc_llog_fini(NULL, obd);
-                if (rc != 0)
-                        CERROR("failed to cleanup llogging subsystems\n");
-                break;
+        if (atomic_dec_and_test(&mgc_count)) {
+                LASSERT(rq_state & RQ_RUNNING);
+                /* stop requeue thread */
+                temp = RQ_STOP;
+        } else {
+                /* wakeup requeue thread to clean our cld */
+                temp = RQ_NOW | RQ_PRECLEANUP;
         }
+
+        spin_lock(&config_list_lock);
+        rq_state |= temp;
+        spin_unlock(&config_list_lock);
+        wake_up(&rq_waitq);
+
+        if (temp & RQ_STOP)
+                wait_for_completion(&rq_exit);
+        obd_cleanup_client_import(obd);
+
+        rc = mgc_llog_fini(NULL, obd);
+        if (rc)
+                CERROR("failed to cleanup llogging subsystems\n");
+
         return rc;
 }
 
@@ -887,8 +887,8 @@ static int mgc_set_mgs_param(struct obd_export *exp,
 }
 
 /* Take a config lock so we can get cancel notifications */
-static int mgc_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm,
-                       __u32 type, ldlm_policy_data_t *policy, __u32 mode,
+static int mgc_enqueue(struct obd_export *exp, __u32 type,
+                       union ldlm_policy_data *policy, __u32 mode,
                        __u64 *flags, void *bl_cb, void *cp_cb, void *gl_cb,
                        void *data, __u32 lvb_len, void *lvb_swabber,
                        struct lustre_handle *lockh)
@@ -1059,8 +1059,7 @@ static int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp,
 }
 
 static int mgc_get_info(const struct lu_env *env, struct obd_export *exp,
-                        __u32 keylen, void *key, __u32 *vallen, void *val,
-                        struct lov_stripe_md *unused)
+                        __u32 keylen, void *key, __u32 *vallen, void *val)
 {
         int rc = -EINVAL;
 
@@ -1387,15 +1386,17 @@ again:
         body->mcb_units  = nrpages;
 
         /* allocate bulk transfer descriptor */
-        desc = ptlrpc_prep_bulk_imp(req, nrpages, 1, BULK_PUT_SINK,
-                                    MGS_BULK_PORTAL);
+        desc = ptlrpc_prep_bulk_imp(req, nrpages, 1,
+                                    PTLRPC_BULK_PUT_SINK | PTLRPC_BULK_BUF_KIOV,
+                                    MGS_BULK_PORTAL,
+                                    &ptlrpc_bulk_kiov_pin_ops);
         if (!desc) {
                 rc = -ENOMEM;
                 goto out;
         }
 
         for (i = 0; i < nrpages; i++)
-                ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, PAGE_SIZE);
+                desc->bd_frag_ops->add_kiov_frag(desc, pages[i], 0, PAGE_SIZE);
 
         ptlrpc_request_set_replen(req);
         rc = ptlrpc_queue_wait(req);
@@ -1553,14 +1554,52 @@ out_free:
         return rc;
 }
 
-/** Get a config log from the MGS and process it.
- * This func is called for both clients and servers.
- * Copy the log locally before parsing it if appropriate (non-MGS server)
+static bool mgc_import_in_recovery(struct obd_import *imp)
+{
+        bool in_recovery = true;
+
+        spin_lock(&imp->imp_lock);
+        if (imp->imp_state == LUSTRE_IMP_FULL ||
+            imp->imp_state == LUSTRE_IMP_CLOSED)
+                in_recovery = false;
+        spin_unlock(&imp->imp_lock);
+
+        return in_recovery;
+}
+
+/**
+ * Get a configuration log from the MGS and process it.
+ *
+ * This function is called for both clients and servers to process the
+ * configuration log from the MGS.  The MGC enqueues a DLM lock on the
+ * log from the MGS, and if the lock gets revoked the MGC will be notified
+ * by the lock cancellation callback that the config log has changed,
+ * and will enqueue another MGS lock on it, and then continue processing
+ * the new additions to the end of the log.
+ *
+ * Since the MGC import is not replayable, if the import is being evicted
+ * (rcl == -ESHUTDOWN, \see ptlrpc_import_delay_req()), retry to process
+ * the log until recovery is finished or the import is closed.
+ *
+ * Make a local copy of the log before parsing it if appropriate (non-MGS
+ * server) so that the server can start even when the MGS is down.
+ *
+ * There shouldn't be multiple processes running process_log at once --
+ * sounds like badness.  It actually might be fine, as long as they're not
+ * trying to update from the same log simultaneously, in which case we
+ * should use a per-log semaphore instead of cld_lock.
+ *
+ * \param[in] mgc       MGC device by which to fetch the configuration log
+ * \param[in] cld       log processing state (stored in lock callback data)
+ *
+ * \retval              0 on success
+ * \retval              negative errno on failure
  */
 int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld)
 {
         struct lustre_handle lockh = { 0 };
         __u64 flags = LDLM_FL_NO_LRU;
+        bool retry = false;
         int rc = 0, rcl;
 
         LASSERT(cld);
@@ -1570,6 +1609,7 @@ int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld)
          * we're not trying to update from the same log
          * simultaneously (in which case we should use a per-log sem.)
          */
+restart:
         mutex_lock(&cld->cld_lock);
         if (cld->cld_stopping) {
                 mutex_unlock(&cld->cld_lock);
@@ -1582,7 +1622,7 @@ int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld)
                cld->cld_cfg.cfg_instance, cld->cld_cfg.cfg_last_idx + 1);
 
         /* Get the cfg lock on the llog */
-        rcl = mgc_enqueue(mgc->u.cli.cl_mgc_mgsexp, NULL, LDLM_PLAIN, NULL,
+        rcl = mgc_enqueue(mgc->u.cli.cl_mgc_mgsexp, LDLM_PLAIN, NULL,
                           LCK_CR, &flags, NULL, NULL, NULL,
                           cld, 0, NULL, &lockh);
         if (rcl == 0) {
@@ -1593,18 +1633,57 @@ int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld)
         } else {
                 CDEBUG(D_MGC, "Can't get cfg lock: %d\n", rcl);
 
-                /* mark cld_lostlock so that it will requeue
-                 * after MGC becomes available.
-                 */
-                cld->cld_lostlock = 1;
+                if (rcl == -ESHUTDOWN &&
+                    atomic_read(&mgc->u.cli.cl_mgc_refcount) > 0 && !retry) {
+                        int secs = cfs_time_seconds(obd_timeout);
+                        struct obd_import *imp;
+                        struct l_wait_info lwi;
+
+                        mutex_unlock(&cld->cld_lock);
+                        imp = class_exp2cliimp(mgc->u.cli.cl_mgc_mgsexp);
+
+                        /*
+                         * Let's force the pinger, and wait the import to be
+                         * connected, note: since mgc import is non-replayable,
+                         * and even the import state is disconnected, it does
+                         * not mean the "recovery" is stopped, so we will keep
+                         * waitting until timeout or the import state is
+                         * FULL or closed
+                         */
+                        ptlrpc_pinger_force(imp);
+
+                        lwi = LWI_TIMEOUT(secs, NULL, NULL);
+                        l_wait_event(imp->imp_recovery_waitq,
+                                     !mgc_import_in_recovery(imp), &lwi);
+
+                        if (imp->imp_state == LUSTRE_IMP_FULL) {
+                                retry = true;
+                                goto restart;
+                        } else {
+                                mutex_lock(&cld->cld_lock);
+                                cld->cld_lostlock = 1;
+                        }
+                } else {
+                        /* mark cld_lostlock so that it will requeue
+                         * after MGC becomes available.
+                         */
+                        cld->cld_lostlock = 1;
+                }
                 /* Get extra reference, it will be put in requeue thread */
                 config_log_get(cld);
         }
 
         if (cld_is_recover(cld)) {
                 rc = 0; /* this is not a fatal error for recover log */
-                if (rcl == 0)
+                if (!rcl) {
                         rc = mgc_process_recover_log(mgc, cld);
+                        if (rc) {
+                                CERROR("%s: recover log %s failed: rc = %d not fatal.\n",
+                                       mgc->obd_name, cld->cld_logname, rc);
+                                rc = 0;
+                                cld->cld_lostlock = 1;
+                        }
+                }
         } else {
                 rc = mgc_process_cfg_log(mgc, cld, rcl != 0);
         }
diff --git a/drivers/staging/lustre/lustre/obdclass/Makefile b/drivers/staging/lustre/lustre/obdclass/Makefile
index b42e109b30e0..af570c0db15b 100644
--- a/drivers/staging/lustre/lustre/obdclass/Makefile
+++ b/drivers/staging/lustre/lustre/obdclass/Makefile
@@ -1,6 +1,6 @@
 obj-$(CONFIG_LUSTRE_FS) += obdclass.o
 
-obdclass-y := linux/linux-module.o linux/linux-obdo.o linux/linux-sysctl.o \
+obdclass-y := linux/linux-module.o linux/linux-sysctl.o \
               llog.o llog_cat.o llog_obd.o llog_swab.o class_obd.o debug.o \
               genops.o uuid.o lprocfs_status.o lprocfs_counters.o \
               lustre_handles.o lustre_peer.o statfs_pack.o linkea.o \
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_internal.h b/drivers/staging/lustre/lustre/obdclass/cl_internal.h
index e866754a42d5..7b403fbd5f94 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_internal.h
+++ b/drivers/staging/lustre/lustre/obdclass/cl_internal.h
@@ -50,25 +50,6 @@ enum clt_nesting_level {
 };
 
 /**
- * Counters used to check correctness of cl_lock interface usage.
- */
-struct cl_thread_counters {
-        /**
-         * Number of outstanding calls to cl_lock_mutex_get() made by the
-         * current thread. For debugging.
-         */
-        int        ctc_nr_locks_locked;
-        /** List of locked locks. */
-        struct lu_ref ctc_locks_locked;
-        /** Number of outstanding holds on locks. */
-        int        ctc_nr_held;
-        /** Number of outstanding uses on locks. */
-        int        ctc_nr_used;
-        /** Number of held extent locks. */
-        int        ctc_nr_locks_acquired;
-};
-
-/**
  * Thread local state internal for generic cl-code.
  */
 struct cl_thread_info {
@@ -83,10 +64,6 @@ struct cl_thread_info {
          */
         struct cl_lock_descr clt_descr;
         struct cl_page_list  clt_list;
-        /**
-         * Counters for every level of lock nesting.
-         */
-        struct cl_thread_counters clt_counters[CNL_NR];
         /** @} debugging */
 
         /*
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_io.c b/drivers/staging/lustre/lustre/obdclass/cl_io.c
index bc4b7b6b9a20..3f42457b0d7d 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_io.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_io.c
@@ -126,6 +126,7 @@ void cl_io_fini(const struct lu_env *env, struct cl_io *io)
         switch (io->ci_type) {
         case CIT_READ:
         case CIT_WRITE:
+        case CIT_DATA_VERSION:
                 break;
         case CIT_FAULT:
                 break;
@@ -411,7 +412,6 @@ void cl_io_unlock(const struct lu_env *env, struct cl_io *io)
                         scan->cis_iop->op[io->ci_type].cio_unlock(env, scan);
         }
         io->ci_state = CIS_UNLOCKED;
-        LASSERT(!cl_env_info(env)->clt_counters[CNL_TOP].ctc_nr_locks_acquired);
 }
 EXPORT_SYMBOL(cl_io_unlock);
 
@@ -586,67 +586,32 @@ void cl_io_end(const struct lu_env *env, struct cl_io *io)
 }
 EXPORT_SYMBOL(cl_io_end);
 
-static const struct cl_page_slice *
-cl_io_slice_page(const struct cl_io_slice *ios, struct cl_page *page)
-{
-        const struct cl_page_slice *slice;
-
-        slice = cl_page_at(page, ios->cis_obj->co_lu.lo_dev->ld_type);
-        LINVRNT(slice);
-        return slice;
-}
-
 /**
- * Called by read io, when page has to be read from the server.
+ * Called by read io, to decide the readahead extent
  *
- * \see cl_io_operations::cio_read_page()
+ * \see cl_io_operations::cio_read_ahead()
  */
-int cl_io_read_page(const struct lu_env *env, struct cl_io *io,
-                    struct cl_page *page)
+int cl_io_read_ahead(const struct lu_env *env, struct cl_io *io,
+                     pgoff_t start, struct cl_read_ahead *ra)
 {
         const struct cl_io_slice *scan;
-        struct cl_2queue         *queue;
         int                    result = 0;
 
         LINVRNT(io->ci_type == CIT_READ || io->ci_type == CIT_FAULT);
-        LINVRNT(cl_page_is_owned(page, io));
         LINVRNT(io->ci_state == CIS_IO_GOING || io->ci_state == CIS_LOCKED);
         LINVRNT(cl_io_invariant(io));
 
-        queue = &io->ci_queue;
-
-        cl_2queue_init(queue);
-        /*
-         * ->cio_read_page() methods called in the loop below are supposed to
-         * never block waiting for network (the only subtle point is the
-         * creation of new pages for read-ahead that might result in cache
-         * shrinking, but currently only clean pages are shrunk and this
-         * requires no network io).
-         *
-         * Should this ever starts blocking, retry loop would be needed for
-         * "parallel io" (see CLO_REPEAT loops in cl_lock.c).
-         */
         cl_io_for_each(scan, io) {
-                if (scan->cis_iop->cio_read_page) {
-                        const struct cl_page_slice *slice;
+                if (!scan->cis_iop->cio_read_ahead)
+                        continue;
 
-                        slice = cl_io_slice_page(scan, page);
-                        LINVRNT(slice);
-                        result = scan->cis_iop->cio_read_page(env, scan, slice);
-                        if (result != 0)
-                                break;
-                }
+                result = scan->cis_iop->cio_read_ahead(env, scan, start, ra);
+                if (result)
+                        break;
         }
-        if (result == 0 && queue->c2_qin.pl_nr > 0)
-                result = cl_io_submit_rw(env, io, CRT_READ, queue);
-        /*
-         * Unlock unsent pages in case of error.
-         */
-        cl_page_list_disown(env, io, &queue->c2_qin);
-        cl_2queue_fini(env, queue);
-        return result;
+        return result > 0 ? 0 : result;
 }
-EXPORT_SYMBOL(cl_io_read_page);
+EXPORT_SYMBOL(cl_io_read_ahead);
 
 /**
  * Commit a list of contiguous pages into writeback cache.
@@ -1080,235 +1045,18 @@ struct cl_io *cl_io_top(struct cl_io *io)
 EXPORT_SYMBOL(cl_io_top);
 
 /**
- * Adds request slice to the compound request.
- *
- * This is called by cl_device_operations::cdo_req_init() methods to add a
- * per-layer state to the request. New state is added at the end of
- * cl_req::crq_layers list, that is, it is at the bottom of the stack.
- *
- * \see cl_lock_slice_add(), cl_page_slice_add(), cl_io_slice_add()
- */
-void cl_req_slice_add(struct cl_req *req, struct cl_req_slice *slice,
-                      struct cl_device *dev,
-                      const struct cl_req_operations *ops)
-{
-        list_add_tail(&slice->crs_linkage, &req->crq_layers);
-        slice->crs_dev = dev;
-        slice->crs_ops = ops;
-        slice->crs_req = req;
-}
-EXPORT_SYMBOL(cl_req_slice_add);
-
-static void cl_req_free(const struct lu_env *env, struct cl_req *req)
-{
-        unsigned i;
-
-        LASSERT(list_empty(&req->crq_pages));
-        LASSERT(req->crq_nrpages == 0);
-        LINVRNT(list_empty(&req->crq_layers));
-        LINVRNT(equi(req->crq_nrobjs > 0, req->crq_o));
-
-        if (req->crq_o) {
-                for (i = 0; i < req->crq_nrobjs; ++i) {
-                        struct cl_object *obj = req->crq_o[i].ro_obj;
-
-                        if (obj) {
-                                lu_object_ref_del_at(&obj->co_lu,
-                                                     &req->crq_o[i].ro_obj_ref,
-                                                     "cl_req", req);
-                                cl_object_put(env, obj);
-                        }
-                }
-                kfree(req->crq_o);
-        }
-        kfree(req);
-}
-
-static int cl_req_init(const struct lu_env *env, struct cl_req *req,
-                       struct cl_page *page)
-{
-        struct cl_device     *dev;
-        struct cl_page_slice *slice;
-        int result;
-
-        result = 0;
-        list_for_each_entry(slice, &page->cp_layers, cpl_linkage) {
-                dev = lu2cl_dev(slice->cpl_obj->co_lu.lo_dev);
-                if (dev->cd_ops->cdo_req_init) {
-                        result = dev->cd_ops->cdo_req_init(env, dev, req);
-                        if (result != 0)
-                                break;
-                }
-        }
-        return result;
-}
-
-/**
- * Invokes per-request transfer completion call-backs
- * (cl_req_operations::cro_completion()) bottom-to-top.
- */
-void cl_req_completion(const struct lu_env *env, struct cl_req *req, int rc)
-{
-        struct cl_req_slice *slice;
-
-        /*
-         * for the lack of list_for_each_entry_reverse_safe()...
-         */
-        while (!list_empty(&req->crq_layers)) {
-                slice = list_entry(req->crq_layers.prev,
-                                   struct cl_req_slice, crs_linkage);
-                list_del_init(&slice->crs_linkage);
-                if (slice->crs_ops->cro_completion)
-                        slice->crs_ops->cro_completion(env, slice, rc);
-        }
-        cl_req_free(env, req);
-}
-EXPORT_SYMBOL(cl_req_completion);
-
-/**
- * Allocates new transfer request.
- */
-struct cl_req *cl_req_alloc(const struct lu_env *env, struct cl_page *page,
-                            enum cl_req_type crt, int nr_objects)
-{
-        struct cl_req *req;
-
-        LINVRNT(nr_objects > 0);
-
-        req = kzalloc(sizeof(*req), GFP_NOFS);
-        if (req) {
-                int result;
-
-                req->crq_type = crt;
-                INIT_LIST_HEAD(&req->crq_pages);
-                INIT_LIST_HEAD(&req->crq_layers);
-
-                req->crq_o = kcalloc(nr_objects, sizeof(req->crq_o[0]),
-                                     GFP_NOFS);
-                if (req->crq_o) {
-                        req->crq_nrobjs = nr_objects;
-                        result = cl_req_init(env, req, page);
-                } else {
-                        result = -ENOMEM;
-                }
-                if (result != 0) {
-                        cl_req_completion(env, req, result);
-                        req = ERR_PTR(result);
-                }
-        } else {
-                req = ERR_PTR(-ENOMEM);
-        }
-        return req;
-}
-EXPORT_SYMBOL(cl_req_alloc);
-
-/**
- * Adds a page to a request.
- */
-void cl_req_page_add(const struct lu_env *env,
-                     struct cl_req *req, struct cl_page *page)
-{
-        struct cl_object  *obj;
-        struct cl_req_obj *rqo;
-        unsigned int i;
-
-        LASSERT(list_empty(&page->cp_flight));
-        LASSERT(!page->cp_req);
-
-        CL_PAGE_DEBUG(D_PAGE, env, page, "req %p, %d, %u\n",
-                      req, req->crq_type, req->crq_nrpages);
-
-        list_add_tail(&page->cp_flight, &req->crq_pages);
-        ++req->crq_nrpages;
-        page->cp_req = req;
-        obj = cl_object_top(page->cp_obj);
-        for (i = 0, rqo = req->crq_o; obj != rqo->ro_obj; ++i, ++rqo) {
-                if (!rqo->ro_obj) {
-                        rqo->ro_obj = obj;
-                        cl_object_get(obj);
-                        lu_object_ref_add_at(&obj->co_lu, &rqo->ro_obj_ref,
-                                             "cl_req", req);
-                        break;
-                }
-        }
-        LASSERT(i < req->crq_nrobjs);
-}
-EXPORT_SYMBOL(cl_req_page_add);
-
-/**
- * Removes a page from a request.
- */
-void cl_req_page_done(const struct lu_env *env, struct cl_page *page)
-{
-        struct cl_req *req = page->cp_req;
-
-        LASSERT(!list_empty(&page->cp_flight));
-        LASSERT(req->crq_nrpages > 0);
-
-        list_del_init(&page->cp_flight);
-        --req->crq_nrpages;
-        page->cp_req = NULL;
-}
-EXPORT_SYMBOL(cl_req_page_done);
-
-/**
- * Notifies layers that request is about to depart by calling
- * cl_req_operations::cro_prep() top-to-bottom.
- */
-int cl_req_prep(const struct lu_env *env, struct cl_req *req)
-{
-        unsigned int i;
-        int result;
-        const struct cl_req_slice *slice;
-
-        /*
-         * Check that the caller of cl_req_alloc() didn't lie about the number
-         * of objects.
-         */
-        for (i = 0; i < req->crq_nrobjs; ++i)
-                LASSERT(req->crq_o[i].ro_obj);
-
-        result = 0;
-        list_for_each_entry(slice, &req->crq_layers, crs_linkage) {
-                if (slice->crs_ops->cro_prep) {
-                        result = slice->crs_ops->cro_prep(env, slice);
-                        if (result != 0)
-                                break;
-                }
-        }
-        return result;
-}
-EXPORT_SYMBOL(cl_req_prep);
-
-/**
  * Fills in attributes that are passed to server together with transfer. Only
  * attributes from \a flags may be touched. This can be called multiple times
  * for the same request.
  */
-void cl_req_attr_set(const struct lu_env *env, struct cl_req *req,
-                     struct cl_req_attr *attr, u64 flags)
+void cl_req_attr_set(const struct lu_env *env, struct cl_object *obj,
+                     struct cl_req_attr *attr)
 {
-        const struct cl_req_slice *slice;
-        struct cl_page      *page;
-        unsigned int i;
-
-        LASSERT(!list_empty(&req->crq_pages));
-
-        /* Take any page to use as a model. */
-        page = list_entry(req->crq_pages.next, struct cl_page, cp_flight);
-
-        for (i = 0; i < req->crq_nrobjs; ++i) {
-                list_for_each_entry(slice, &req->crq_layers, crs_linkage) {
-                        const struct cl_page_slice *scan;
-                        const struct cl_object     *obj;
-
-                        scan = cl_page_at(page,
-                                          slice->crs_dev->cd_lu_dev.ld_type);
-                        obj = scan->cpl_obj;
-                        if (slice->crs_ops->cro_attr_set)
-                                slice->crs_ops->cro_attr_set(env, slice, obj,
-                                                             attr + i, flags);
-                }
+        struct cl_object *scan;
+
+        cl_object_for_each(scan, obj) {
+                if (scan->co_ops->coo_req_attr_set)
+                        scan->co_ops->coo_req_attr_set(env, scan, attr);
         }
 }
 EXPORT_SYMBOL(cl_req_attr_set);
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_object.c b/drivers/staging/lustre/lustre/obdclass/cl_object.c
index 3199dd4a3b72..f5d4e23c64b7 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_object.c
@@ -335,7 +335,7 @@ int cl_object_getstripe(const struct lu_env *env, struct cl_object *obj,
                 if (obj->co_ops->coo_getstripe) {
                         result = obj->co_ops->coo_getstripe(env, obj, uarg);
                         if (result)
-                        break;
+                                break;
                 }
         }
         return result;
@@ -343,6 +343,67 @@ int cl_object_getstripe(const struct lu_env *env, struct cl_object *obj,
 EXPORT_SYMBOL(cl_object_getstripe);
 
 /**
+ * Get fiemap extents from file object.
+ *
+ * \param env [in]      lustre environment
+ * \param obj [in]      file object
+ * \param key [in]      fiemap request argument
+ * \param fiemap [out]  fiemap extents mapping retrived
+ * \param buflen [in]   max buffer length of @fiemap
+ *
+ * \retval 0    success
+ * \retval < 0  error
+ */
+int cl_object_fiemap(const struct lu_env *env, struct cl_object *obj,
+                     struct ll_fiemap_info_key *key,
+                     struct fiemap *fiemap, size_t *buflen)
+{
+        struct lu_object_header *top;
+        int result = 0;
+
+        top = obj->co_lu.lo_header;
+        list_for_each_entry(obj, &top->loh_layers, co_lu.lo_linkage) {
+                if (obj->co_ops->coo_fiemap) {
+                        result = obj->co_ops->coo_fiemap(env, obj, key, fiemap,
+                                                         buflen);
+                        if (result)
+                                break;
+                }
+        }
+        return result;
+}
+EXPORT_SYMBOL(cl_object_fiemap);
+
+int cl_object_layout_get(const struct lu_env *env, struct cl_object *obj,
+                         struct cl_layout *cl)
+{
+        struct lu_object_header *top = obj->co_lu.lo_header;
+
+        list_for_each_entry(obj, &top->loh_layers, co_lu.lo_linkage) {
+                if (obj->co_ops->coo_layout_get)
+                        return obj->co_ops->coo_layout_get(env, obj, cl);
+        }
+
+        return -EOPNOTSUPP;
+}
+EXPORT_SYMBOL(cl_object_layout_get);
+
+loff_t cl_object_maxbytes(struct cl_object *obj)
+{
+        struct lu_object_header *top = obj->co_lu.lo_header;
+        loff_t maxbytes = LLONG_MAX;
+
+        list_for_each_entry(obj, &top->loh_layers, co_lu.lo_linkage) {
+                if (obj->co_ops->coo_maxbytes)
+                        maxbytes = min_t(loff_t, obj->co_ops->coo_maxbytes(obj),
+                                         maxbytes);
+        }
+
+        return maxbytes;
+}
+EXPORT_SYMBOL(cl_object_maxbytes);
+
+/**
  * Helper function removing all object locks, and marking object for
  * deletion. All object pages must have been deleted at this point.
  *
@@ -483,36 +544,20 @@ EXPORT_SYMBOL(cl_site_stats_print);
  * bz20044, bz22683.
  */
 
-static LIST_HEAD(cl_envs);
-static unsigned int cl_envs_cached_nr;
-static unsigned int cl_envs_cached_max = 128; /* XXX: prototype: arbitrary limit
-                                               * for now.
-                                               */
-static DEFINE_SPINLOCK(cl_envs_guard);
+static unsigned int cl_envs_cached_max = 32; /* XXX: prototype: arbitrary limit
+                                              * for now.
+                                              */
+static struct cl_env_cache {
+        rwlock_t                cec_guard;
+        unsigned int            cec_count;
+        struct list_head        cec_envs;
+} *cl_envs = NULL;
 
 struct cl_env {
         void         *ce_magic;
         struct lu_env     ce_lu;
         struct lu_context ce_ses;
 
-        /**
-         * This allows cl_env to be entered into cl_env_hash which implements
-         * the current thread -> client environment lookup.
-         */
-        struct hlist_node  ce_node;
-        /**
-         * Owner for the current cl_env.
-         *
-         * If LL_TASK_CL_ENV is defined, this point to the owning current,
-         * only for debugging purpose ;
-         * Otherwise hash is used, and this is the key for cfs_hash.
-         * Now current thread pid is stored. Note using thread pointer would
-         * lead to unbalanced hash because of its specific allocation locality
-         * and could be varied for different platforms and OSes, even different
-         * OS versions.
-         */
-        void         *ce_owner;
-
         /*
          * Linkage into global list of all client environments. Used for
          * garbage collection.
@@ -536,122 +581,13 @@ static void cl_env_init0(struct cl_env *cle, void *debug)
 {
         LASSERT(cle->ce_ref == 0);
         LASSERT(cle->ce_magic == &cl_env_init0);
-        LASSERT(!cle->ce_debug && !cle->ce_owner);
+        LASSERT(!cle->ce_debug);
 
         cle->ce_ref = 1;
         cle->ce_debug = debug;
         CL_ENV_INC(busy);
 }
 
-/*
- * The implementation of using hash table to connect cl_env and thread
- */
-
-static struct cfs_hash *cl_env_hash;
-
-static unsigned cl_env_hops_hash(struct cfs_hash *lh,
-                                 const void *key, unsigned mask)
-{
-#if BITS_PER_LONG == 64
-        return cfs_hash_u64_hash((__u64)key, mask);
-#else
-        return cfs_hash_u32_hash((__u32)key, mask);
-#endif
-}
-
-static void *cl_env_hops_obj(struct hlist_node *hn)
-{
-        struct cl_env *cle = hlist_entry(hn, struct cl_env, ce_node);
-
-        LASSERT(cle->ce_magic == &cl_env_init0);
-        return (void *)cle;
-}
-
-static int cl_env_hops_keycmp(const void *key, struct hlist_node *hn)
-{
-        struct cl_env *cle = cl_env_hops_obj(hn);
-
-        LASSERT(cle->ce_owner);
-        return (key == cle->ce_owner);
-}
-
-static void cl_env_hops_noop(struct cfs_hash *hs, struct hlist_node *hn)
-{
-        struct cl_env *cle = hlist_entry(hn, struct cl_env, ce_node);
-
-        LASSERT(cle->ce_magic == &cl_env_init0);
-}
-
-static struct cfs_hash_ops cl_env_hops = {
-        .hs_hash        = cl_env_hops_hash,
-        .hs_key         = cl_env_hops_obj,
-        .hs_keycmp      = cl_env_hops_keycmp,
-        .hs_object      = cl_env_hops_obj,
-        .hs_get         = cl_env_hops_noop,
-        .hs_put_locked  = cl_env_hops_noop,
-};
-
-static inline struct cl_env *cl_env_fetch(void)
-{
-        struct cl_env *cle;
-
-        cle = cfs_hash_lookup(cl_env_hash, (void *)(long)current->pid);
-        LASSERT(ergo(cle, cle->ce_magic == &cl_env_init0));
-        return cle;
-}
-
-static inline void cl_env_attach(struct cl_env *cle)
-{
-        if (cle) {
-                int rc;
-
-                LASSERT(!cle->ce_owner);
-                cle->ce_owner = (void *)(long)current->pid;
-                rc = cfs_hash_add_unique(cl_env_hash, cle->ce_owner,
-                                         &cle->ce_node);
-                LASSERT(rc == 0);
-        }
-}
-
-static inline void cl_env_do_detach(struct cl_env *cle)
-{
-        void *cookie;
-
-        LASSERT(cle->ce_owner == (void *)(long)current->pid);
-        cookie = cfs_hash_del(cl_env_hash, cle->ce_owner,
-                              &cle->ce_node);
-        LASSERT(cookie == cle);
-        cle->ce_owner = NULL;
-}
-
-static int cl_env_store_init(void)
-{
-        cl_env_hash = cfs_hash_create("cl_env",
-                                      HASH_CL_ENV_BITS, HASH_CL_ENV_BITS,
-                                      HASH_CL_ENV_BKT_BITS, 0,
-                                      CFS_HASH_MIN_THETA,
-                                      CFS_HASH_MAX_THETA,
-                                      &cl_env_hops,
-                                      CFS_HASH_RW_BKTLOCK);
-        return cl_env_hash ? 0 : -ENOMEM;
-}
-
-static void cl_env_store_fini(void)
-{
-        cfs_hash_putref(cl_env_hash);
-}
-
-static inline struct cl_env *cl_env_detach(struct cl_env *cle)
-{
-        if (!cle)
-                cle = cl_env_fetch();
-
-        if (cle && cle->ce_owner)
-                cl_env_do_detach(cle);
-
-        return cle;
-}
-
 static struct lu_env *cl_env_new(__u32 ctx_tags, __u32 ses_tags, void *debug)
 {
         struct lu_env *env;
@@ -701,16 +637,20 @@ static struct lu_env *cl_env_obtain(void *debug)
 {
         struct cl_env *cle;
         struct lu_env *env;
+        int cpu = get_cpu();
 
-        spin_lock(&cl_envs_guard);
-        LASSERT(equi(cl_envs_cached_nr == 0, list_empty(&cl_envs)));
-        if (cl_envs_cached_nr > 0) {
+        read_lock(&cl_envs[cpu].cec_guard);
+        LASSERT(equi(cl_envs[cpu].cec_count == 0,
+                     list_empty(&cl_envs[cpu].cec_envs)));
+        if (cl_envs[cpu].cec_count > 0) {
                 int rc;
 
-                cle = container_of(cl_envs.next, struct cl_env, ce_linkage);
+                cle = container_of(cl_envs[cpu].cec_envs.next, struct cl_env,
+                                   ce_linkage);
                 list_del_init(&cle->ce_linkage);
-                cl_envs_cached_nr--;
-                spin_unlock(&cl_envs_guard);
+                cl_envs[cpu].cec_count--;
+                read_unlock(&cl_envs[cpu].cec_guard);
+                put_cpu();
 
                 env = &cle->ce_lu;
                 rc = lu_env_refill(env);
@@ -723,7 +663,8 @@ static struct lu_env *cl_env_obtain(void *debug)
                         env = ERR_PTR(rc);
                 }
         } else {
-                spin_unlock(&cl_envs_guard);
+                read_unlock(&cl_envs[cpu].cec_guard);
+                put_cpu();
                 env = cl_env_new(lu_context_tags_default,
                                  lu_session_tags_default, debug);
         }
@@ -735,27 +676,6 @@ static inline struct cl_env *cl_env_container(struct lu_env *env)
         return container_of(env, struct cl_env, ce_lu);
 }
 
-static struct lu_env *cl_env_peek(int *refcheck)
-{
-        struct lu_env *env;
-        struct cl_env *cle;
-
-        CL_ENV_INC(lookup);
-
-        /* check that we don't go far from untrusted pointer */
-        CLASSERT(offsetof(struct cl_env, ce_magic) == 0);
-
-        env = NULL;
-        cle = cl_env_fetch();
-        if (cle) {
-                CL_ENV_INC(hit);
-                env = &cle->ce_lu;
-                *refcheck = ++cle->ce_ref;
-        }
-        CDEBUG(D_OTHER, "%d@%p\n", cle ? cle->ce_ref : 0, cle);
-        return env;
-}
-
 /**
  * Returns lu_env: if there already is an environment associated with the
  * current thread, it is returned, otherwise, new environment is allocated.
@@ -773,17 +693,13 @@ struct lu_env *cl_env_get(int *refcheck)
 {
         struct lu_env *env;
 
-        env = cl_env_peek(refcheck);
-        if (!env) {
-                env = cl_env_obtain(__builtin_return_address(0));
-                if (!IS_ERR(env)) {
-                        struct cl_env *cle;
+        env = cl_env_obtain(__builtin_return_address(0));
+        if (!IS_ERR(env)) {
+                struct cl_env *cle;
 
-                        cle = cl_env_container(env);
-                        cl_env_attach(cle);
-                        *refcheck = cle->ce_ref;
-                        CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle);
-                }
+                cle = cl_env_container(env);
+                *refcheck = cle->ce_ref;
+                CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle);
         }
         return env;
 }
@@ -798,7 +714,6 @@ struct lu_env *cl_env_alloc(int *refcheck, __u32 tags)
 {
         struct lu_env *env;
 
-        LASSERT(!cl_env_peek(refcheck));
         env = cl_env_new(tags, tags, __builtin_return_address(0));
         if (!IS_ERR(env)) {
                 struct cl_env *cle;
@@ -813,7 +728,6 @@ EXPORT_SYMBOL(cl_env_alloc);
 
 static void cl_env_exit(struct cl_env *cle)
 {
-        LASSERT(!cle->ce_owner);
         lu_context_exit(&cle->ce_lu.le_ctx);
         lu_context_exit(&cle->ce_ses);
 }
@@ -826,20 +740,25 @@ static void cl_env_exit(struct cl_env *cle)
 unsigned int cl_env_cache_purge(unsigned int nr)
 {
         struct cl_env *cle;
+        unsigned int i;
 
-        spin_lock(&cl_envs_guard);
-        for (; !list_empty(&cl_envs) && nr > 0; --nr) {
-                cle = container_of(cl_envs.next, struct cl_env, ce_linkage);
-                list_del_init(&cle->ce_linkage);
-                LASSERT(cl_envs_cached_nr > 0);
-                cl_envs_cached_nr--;
-                spin_unlock(&cl_envs_guard);
+        for_each_possible_cpu(i) {
+                write_lock(&cl_envs[i].cec_guard);
+                for (; !list_empty(&cl_envs[i].cec_envs) && nr > 0; --nr) {
+                        cle = container_of(cl_envs[i].cec_envs.next,
+                                           struct cl_env, ce_linkage);
+                        list_del_init(&cle->ce_linkage);
+                        LASSERT(cl_envs[i].cec_count > 0);
+                        cl_envs[i].cec_count--;
+                        write_unlock(&cl_envs[i].cec_guard);
 
-                cl_env_fini(cle);
-                spin_lock(&cl_envs_guard);
+                        cl_env_fini(cle);
+                        write_lock(&cl_envs[i].cec_guard);
+                }
+                LASSERT(equi(cl_envs[i].cec_count == 0,
+                             list_empty(&cl_envs[i].cec_envs)));
+                write_unlock(&cl_envs[i].cec_guard);
         }
-        LASSERT(equi(cl_envs_cached_nr == 0, list_empty(&cl_envs)));
-        spin_unlock(&cl_envs_guard);
         return nr;
 }
 EXPORT_SYMBOL(cl_env_cache_purge);
@@ -862,8 +781,9 @@ void cl_env_put(struct lu_env *env, int *refcheck)
 
         CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle);
         if (--cle->ce_ref == 0) {
+                int cpu = get_cpu();
+
                 CL_ENV_DEC(busy);
-                cl_env_detach(cle);
                 cle->ce_debug = NULL;
                 cl_env_exit(cle);
                 /*
@@ -872,107 +792,22 @@ void cl_env_put(struct lu_env *env, int *refcheck)
                  * Return environment to the cache only when it was allocated
                  * with the standard tags.
                  */
-                if (cl_envs_cached_nr < cl_envs_cached_max &&
+                if (cl_envs[cpu].cec_count < cl_envs_cached_max &&
                     (env->le_ctx.lc_tags & ~LCT_HAS_EXIT) == LCT_CL_THREAD &&
                     (env->le_ses->lc_tags & ~LCT_HAS_EXIT) == LCT_SESSION) {
-                        spin_lock(&cl_envs_guard);
-                        list_add(&cle->ce_linkage, &cl_envs);
-                        cl_envs_cached_nr++;
-                        spin_unlock(&cl_envs_guard);
+                        read_lock(&cl_envs[cpu].cec_guard);
+                        list_add(&cle->ce_linkage, &cl_envs[cpu].cec_envs);
+                        cl_envs[cpu].cec_count++;
+                        read_unlock(&cl_envs[cpu].cec_guard);
                 } else {
                         cl_env_fini(cle);
                 }
+                put_cpu();
         }
 }
 EXPORT_SYMBOL(cl_env_put);
 
 /**
- * Declares a point of re-entrancy.
- *
- * \see cl_env_reexit()
- */
-void *cl_env_reenter(void)
-{
-        return cl_env_detach(NULL);
-}
-EXPORT_SYMBOL(cl_env_reenter);
-
-/**
- * Exits re-entrancy.
- */
-void cl_env_reexit(void *cookie)
-{
-        cl_env_detach(NULL);
-        cl_env_attach(cookie);
-}
-EXPORT_SYMBOL(cl_env_reexit);
-
-/**
- * Setup user-supplied \a env as a current environment. This is to be used to
- * guaranteed that environment exists even when cl_env_get() fails. It is up
- * to user to ensure proper concurrency control.
- *
- * \see cl_env_unplant()
- */
-void cl_env_implant(struct lu_env *env, int *refcheck)
-{
-        struct cl_env *cle = cl_env_container(env);
-
-        LASSERT(cle->ce_ref > 0);
-
-        cl_env_attach(cle);
-        cl_env_get(refcheck);
-        CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle);
-}
-EXPORT_SYMBOL(cl_env_implant);
-
-/**
- * Detach environment installed earlier by cl_env_implant().
- */
-void cl_env_unplant(struct lu_env *env, int *refcheck)
-{
-        struct cl_env *cle = cl_env_container(env);
-
-        LASSERT(cle->ce_ref > 1);
-
-        CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle);
-
-        cl_env_detach(cle);
-        cl_env_put(env, refcheck);
-}
-EXPORT_SYMBOL(cl_env_unplant);
-
-struct lu_env *cl_env_nested_get(struct cl_env_nest *nest)
-{
-        struct lu_env *env;
-
-        nest->cen_cookie = NULL;
-        env = cl_env_peek(&nest->cen_refcheck);
-        if (env) {
-                if (!cl_io_is_going(env))
-                        return env;
-                cl_env_put(env, &nest->cen_refcheck);
-                nest->cen_cookie = cl_env_reenter();
-        }
-        env = cl_env_get(&nest->cen_refcheck);
-        if (IS_ERR(env)) {
-                cl_env_reexit(nest->cen_cookie);
-                return env;
-        }
-
-        LASSERT(!cl_io_is_going(env));
-        return env;
-}
-EXPORT_SYMBOL(cl_env_nested_get);
-
-void cl_env_nested_put(struct cl_env_nest *nest, struct lu_env *env)
-{
-        cl_env_put(env, &nest->cen_refcheck);
-        cl_env_reexit(nest->cen_cookie);
-}
-EXPORT_SYMBOL(cl_env_nested_put);
-
-/**
  * Converts struct ost_lvb to struct cl_attr.
  *
  * \see cl_attr2lvb
@@ -999,6 +834,10 @@ static int cl_env_percpu_init(void)
         for_each_possible_cpu(i) {
                 struct lu_env *env;
 
+                rwlock_init(&cl_envs[i].cec_guard);
+                INIT_LIST_HEAD(&cl_envs[i].cec_envs);
+                cl_envs[i].cec_count = 0;
+
                 cle = &cl_env_percpu[i];
                 env = &cle->ce_lu;
 
@@ -1066,7 +905,6 @@ void cl_env_percpu_put(struct lu_env *env)
         LASSERT(cle->ce_ref == 0);
 
         CL_ENV_DEC(busy);
-        cl_env_detach(cle);
         cle->ce_debug = NULL;
 
         put_cpu();
@@ -1080,7 +918,6 @@ struct lu_env *cl_env_percpu_get(void)
         cle = &cl_env_percpu[get_cpu()];
         cl_env_init0(cle, __builtin_return_address(0));
 
-        cl_env_attach(cle);
         return &cle->ce_lu;
 }
 EXPORT_SYMBOL(cl_env_percpu_get);
@@ -1144,51 +981,19 @@ LU_KEY_INIT_FINI(cl0, struct cl_thread_info);
 static void *cl_key_init(const struct lu_context *ctx,
                          struct lu_context_key *key)
 {
-        struct cl_thread_info *info;
-
-        info = cl0_key_init(ctx, key);
-        if (!IS_ERR(info)) {
-                size_t i;
-
-                for (i = 0; i < ARRAY_SIZE(info->clt_counters); ++i)
-                        lu_ref_init(&info->clt_counters[i].ctc_locks_locked);
-        }
-        return info;
+        return cl0_key_init(ctx, key);
 }
 
 static void cl_key_fini(const struct lu_context *ctx,
                         struct lu_context_key *key, void *data)
 {
-        struct cl_thread_info *info;
-        size_t i;
-
-        info = data;
-        for (i = 0; i < ARRAY_SIZE(info->clt_counters); ++i)
-                lu_ref_fini(&info->clt_counters[i].ctc_locks_locked);
         cl0_key_fini(ctx, key, data);
 }
 
-static void cl_key_exit(const struct lu_context *ctx,
-                        struct lu_context_key *key, void *data)
-{
-        struct cl_thread_info *info = data;
-        size_t i;
-
-        for (i = 0; i < ARRAY_SIZE(info->clt_counters); ++i) {
-                LASSERT(info->clt_counters[i].ctc_nr_held == 0);
-                LASSERT(info->clt_counters[i].ctc_nr_used == 0);
-                LASSERT(info->clt_counters[i].ctc_nr_locks_acquired == 0);
-                LASSERT(info->clt_counters[i].ctc_nr_locks_locked == 0);
-                lu_ref_fini(&info->clt_counters[i].ctc_locks_locked);
-                lu_ref_init(&info->clt_counters[i].ctc_locks_locked);
-        }
-}
-
 static struct lu_context_key cl_key = {
         .lct_tags = LCT_CL_THREAD,
         .lct_init = cl_key_init,
         .lct_fini = cl_key_fini,
-        .lct_exit = cl_key_exit
 };
 
 static struct lu_kmem_descr cl_object_caches[] = {
@@ -1212,13 +1017,15 @@ int cl_global_init(void)
 {
         int result;
 
-        result = cl_env_store_init();
-        if (result)
-                return result;
+        cl_envs = kzalloc(sizeof(*cl_envs) * num_possible_cpus(), GFP_KERNEL);
+        if (!cl_envs) {
+                result = -ENOMEM;
+                goto out;
+        }
 
         result = lu_kmem_init(cl_object_caches);
         if (result)
-                goto out_store;
+                goto out_envs;
 
         LU_CONTEXT_KEY_INIT(&cl_key);
         result = lu_context_key_register(&cl_key);
@@ -1228,16 +1035,17 @@ int cl_global_init(void)
         result = cl_env_percpu_init();
         if (result)
                 /* no cl_env_percpu_fini on error */
-                goto out_context;
+                goto out_keys;
 
         return 0;
 
-out_context:
+out_keys:
         lu_context_key_degister(&cl_key);
 out_kmem:
         lu_kmem_fini(cl_object_caches);
-out_store:
-        cl_env_store_fini();
+out_envs:
+        kfree(cl_envs);
+out:
         return result;
 }
 
@@ -1249,5 +1057,5 @@ void cl_global_fini(void)
         cl_env_percpu_fini();
         lu_context_key_degister(&cl_key);
         lu_kmem_fini(cl_object_caches);
-        cl_env_store_fini();
+        kfree(cl_envs);
 }
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index 63973ba096da..cd9a40ca4448 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -99,7 +99,6 @@ static void cl_page_free(const struct lu_env *env, struct cl_page *page)
 
         PASSERT(env, page, list_empty(&page->cp_batch));
         PASSERT(env, page, !page->cp_owner);
-        PASSERT(env, page, !page->cp_req);
         PASSERT(env, page, page->cp_state == CPS_FREEING);
 
         while (!list_empty(&page->cp_layers)) {
@@ -150,7 +149,6 @@ struct cl_page *cl_page_alloc(const struct lu_env *env,
                 page->cp_type = type;
                 INIT_LIST_HEAD(&page->cp_layers);
                 INIT_LIST_HEAD(&page->cp_batch);
-                INIT_LIST_HEAD(&page->cp_flight);
                 lu_ref_init(&page->cp_reference);
                 head = o->co_lu.lo_header;
                 list_for_each_entry(o, &head->loh_layers, co_lu.lo_linkage) {
@@ -390,30 +388,6 @@ EXPORT_SYMBOL(cl_page_at);
         __result;                                                      \
 })
 
-#define CL_PAGE_INVOKE_REVERSE(_env, _page, _op, _proto, ...)           \
-({                                                                      \
-        const struct lu_env        *__env  = (_env);                    \
-        struct cl_page             *__page = (_page);                   \
-        const struct cl_page_slice *__scan;                             \
-        int                         __result;                           \
-        ptrdiff_t                   __op   = (_op);                     \
-        int                       (*__method)_proto;                    \
-                                                                        \
-        __result = 0;                                                   \
-        list_for_each_entry_reverse(__scan, &__page->cp_layers,         \
-                                        cpl_linkage) {                  \
-                __method = *(void **)((char *)__scan->cpl_ops +  __op); \
-                if (__method) {                                         \
-                        __result = (*__method)(__env, __scan, ## __VA_ARGS__); \
-                        if (__result != 0)                              \
-                                break;                                  \
-                }                                                       \
-        }                                                               \
-        if (__result > 0)                                               \
-                __result = 0;                                           \
-        __result;                                                       \
-})
-
 #define CL_PAGE_INVOID(_env, _page, _op, _proto, ...)              \
 do {                                                                \
         const struct lu_env     *__env  = (_env);                   \
@@ -552,7 +526,6 @@ static int cl_page_own0(const struct lu_env *env, struct cl_io *io,
                                         io, nonblock);
                 if (result == 0) {
                         PASSERT(env, pg, !pg->cp_owner);
-                        PASSERT(env, pg, !pg->cp_req);
                         pg->cp_owner = cl_io_top(io);
                         cl_page_owner_set(pg);
                         if (pg->cp_state != CPS_FREEING) {
@@ -694,7 +667,7 @@ static void cl_page_delete0(const struct lu_env *env, struct cl_page *pg)
         PASSERT(env, pg, pg->cp_state != CPS_FREEING);
 
         /*
-         * Severe all ways to obtain new pointers to @pg.
+         * Sever all ways to obtain new pointers to @pg.
          */
         cl_page_owner_clear(pg);
 
@@ -845,8 +818,6 @@ void cl_page_completion(const struct lu_env *env,
         struct cl_sync_io *anchor = pg->cp_sync_io;
 
         PASSERT(env, pg, crt < CRT_NR);
-        /* cl_page::cp_req already cleared by the caller (osc_completion()) */
-        PASSERT(env, pg, !pg->cp_req);
         PASSERT(env, pg, pg->cp_state == cl_req_type_state(crt));
 
         CL_PAGE_HEADER(D_TRACE, env, pg, "%d %d\n", crt, ioret);
@@ -860,16 +831,8 @@ void cl_page_completion(const struct lu_env *env,
         if (anchor) {
                 LASSERT(pg->cp_sync_io == anchor);
                 pg->cp_sync_io = NULL;
-        }
-        /*
-         * As page->cp_obj is pinned by a reference from page->cp_req, it is
-         * safe to call cl_page_put() without risking object destruction in a
-         * non-blocking context.
-         */
-        cl_page_put(env, pg);
-
-        if (anchor)
                 cl_sync_io_note(env, anchor, ioret);
+        }
 }
 EXPORT_SYMBOL(cl_page_completion);
 
@@ -927,29 +890,6 @@ int cl_page_flush(const struct lu_env *env, struct cl_io *io,
 EXPORT_SYMBOL(cl_page_flush);
 
 /**
- * Checks whether page is protected by any extent lock is at least required
- * mode.
- *
- * \return the same as in cl_page_operations::cpo_is_under_lock() method.
- * \see cl_page_operations::cpo_is_under_lock()
- */
-int cl_page_is_under_lock(const struct lu_env *env, struct cl_io *io,
-                          struct cl_page *page, pgoff_t *max_index)
-{
-        int rc;
-
-        PINVRNT(env, page, cl_page_invariant(page));
-
-        rc = CL_PAGE_INVOKE_REVERSE(env, page, CL_PAGE_OP(cpo_is_under_lock),
-                                    (const struct lu_env *,
-                                     const struct cl_page_slice *,
-                                      struct cl_io *, pgoff_t *),
-                                    io, max_index);
-        return rc;
-}
-EXPORT_SYMBOL(cl_page_is_under_lock);
-
-/**
  * Tells transfer engine that only part of a page is to be transmitted.
  *
  * \see cl_page_operations::cpo_clip()
@@ -974,10 +914,10 @@ void cl_page_header_print(const struct lu_env *env, void *cookie,
                           lu_printer_t printer, const struct cl_page *pg)
 {
         (*printer)(env, cookie,
-                   "page@%p[%d %p %d %d %p %p]\n",
+                   "page@%p[%d %p %d %d %p]\n",
                    pg, atomic_read(&pg->cp_ref), pg->cp_obj,
                    pg->cp_state, pg->cp_type,
-                   pg->cp_owner, pg->cp_req);
+                   pg->cp_owner);
 }
 EXPORT_SYMBOL(cl_page_header_print);
 
diff --git a/drivers/staging/lustre/lustre/obdclass/genops.c b/drivers/staging/lustre/lustre/obdclass/genops.c
index cf8bb2a2f40b..fa0d38ddccb2 100644
--- a/drivers/staging/lustre/lustre/obdclass/genops.c
+++ b/drivers/staging/lustre/lustre/obdclass/genops.c
@@ -907,6 +907,8 @@ struct obd_import *class_new_import(struct obd_device *obd)
         INIT_LIST_HEAD(&imp->imp_sending_list);
         INIT_LIST_HEAD(&imp->imp_delayed_list);
         INIT_LIST_HEAD(&imp->imp_committed_list);
+        INIT_LIST_HEAD(&imp->imp_unreplied_list);
+        imp->imp_known_replied_xid = 0;
         imp->imp_replay_cursor = &imp->imp_committed_list;
         spin_lock_init(&imp->imp_lock);
         imp->imp_last_success_conn = 0;
@@ -1408,13 +1410,33 @@ EXPORT_SYMBOL(obd_get_max_rpcs_in_flight);
 int obd_set_max_rpcs_in_flight(struct client_obd *cli, __u32 max)
 {
         struct obd_request_slot_waiter *orsw;
+        const char *typ_name;
         __u32 old;
         int diff;
+        int rc;
         int i;
 
         if (max > OBD_MAX_RIF_MAX || max < 1)
                 return -ERANGE;
 
+        typ_name = cli->cl_import->imp_obd->obd_type->typ_name;
+        if (!strcmp(typ_name, LUSTRE_MDC_NAME)) {
+                /*
+                 * adjust max_mod_rpcs_in_flight to ensure it is always
+                 * strictly lower that max_rpcs_in_flight
+                 */
+                if (max < 2) {
+                        CERROR("%s: cannot set max_rpcs_in_flight to 1 because it must be higher than max_mod_rpcs_in_flight value\n",
+                               cli->cl_import->imp_obd->obd_name);
+                        return -ERANGE;
+                }
+                if (max <= cli->cl_max_mod_rpcs_in_flight) {
+                        rc = obd_set_max_mod_rpcs_in_flight(cli, max - 1);
+                        if (rc)
+                                return rc;
+                }
+        }
+
         spin_lock(&cli->cl_loi_list_lock);
         old = cli->cl_max_rpcs_in_flight;
         cli->cl_max_rpcs_in_flight = max;
@@ -1436,3 +1458,209 @@ int obd_set_max_rpcs_in_flight(struct client_obd *cli, __u32 max)
         return 0;
 }
 EXPORT_SYMBOL(obd_set_max_rpcs_in_flight);
+
+int obd_set_max_mod_rpcs_in_flight(struct client_obd *cli, __u16 max)
+{
+        struct obd_connect_data *ocd;
+        u16 maxmodrpcs;
+        u16 prev;
+
+        if (max > OBD_MAX_RIF_MAX || max < 1)
+                return -ERANGE;
+
+        /* cannot exceed or equal max_rpcs_in_flight */
+        if (max >= cli->cl_max_rpcs_in_flight) {
+                CERROR("%s: can't set max_mod_rpcs_in_flight to a value (%hu) higher or equal to max_rpcs_in_flight value (%u)\n",
+                       cli->cl_import->imp_obd->obd_name,
+                       max, cli->cl_max_rpcs_in_flight);
+                return -ERANGE;
+        }
+
+        /* cannot exceed max modify RPCs in flight supported by the server */
+        ocd = &cli->cl_import->imp_connect_data;
+        if (ocd->ocd_connect_flags & OBD_CONNECT_MULTIMODRPCS)
+                maxmodrpcs = ocd->ocd_maxmodrpcs;
+        else
+                maxmodrpcs = 1;
+        if (max > maxmodrpcs) {
+                CERROR("%s: can't set max_mod_rpcs_in_flight to a value (%hu) higher than max_mod_rpcs_per_client value (%hu) returned by the server at connection\n",
+                       cli->cl_import->imp_obd->obd_name,
+                       max, maxmodrpcs);
+                return -ERANGE;
+        }
+
+        spin_lock(&cli->cl_mod_rpcs_lock);
+
+        prev = cli->cl_max_mod_rpcs_in_flight;
+        cli->cl_max_mod_rpcs_in_flight = max;
+
+        /* wakeup waiters if limit has been increased */
+        if (cli->cl_max_mod_rpcs_in_flight > prev)
+                wake_up(&cli->cl_mod_rpcs_waitq);
+
+        spin_unlock(&cli->cl_mod_rpcs_lock);
+
+        return 0;
+}
+EXPORT_SYMBOL(obd_set_max_mod_rpcs_in_flight);
+
+#define pct(a, b) (b ? (a * 100) / b : 0)
+
+int obd_mod_rpc_stats_seq_show(struct client_obd *cli, struct seq_file *seq)
+{
+        unsigned long mod_tot = 0, mod_cum;
+        struct timespec64 now;
+        int i;
+
+        ktime_get_real_ts64(&now);
+
+        spin_lock(&cli->cl_mod_rpcs_lock);
+
+        seq_printf(seq, "snapshot_time:         %llu.%9lu (secs.nsecs)\n",
+                   (s64)now.tv_sec, (unsigned long)now.tv_nsec);
+        seq_printf(seq, "modify_RPCs_in_flight:  %hu\n",
+                   cli->cl_mod_rpcs_in_flight);
+
+        seq_puts(seq, "\n\t\t\tmodify\n");
+        seq_puts(seq, "rpcs in flight        rpcs   %% cum %%\n");
+
+        mod_tot = lprocfs_oh_sum(&cli->cl_mod_rpcs_hist);
+
+        mod_cum = 0;
+        for (i = 0; i < OBD_HIST_MAX; i++) {
+                unsigned long mod = cli->cl_mod_rpcs_hist.oh_buckets[i];
+
+                mod_cum += mod;
+                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu\n",
+                           i, mod, pct(mod, mod_tot),
+                           pct(mod_cum, mod_tot));
+                if (mod_cum == mod_tot)
+                        break;
+        }
+
+        spin_unlock(&cli->cl_mod_rpcs_lock);
+
+        return 0;
+}
+EXPORT_SYMBOL(obd_mod_rpc_stats_seq_show);
+#undef pct
+
+/*
+ * The number of modify RPCs sent in parallel is limited
+ * because the server has a finite number of slots per client to
+ * store request result and ensure reply reconstruction when needed.
+ * On the client, this limit is stored in cl_max_mod_rpcs_in_flight
+ * that takes into account server limit and cl_max_rpcs_in_flight
+ * value.
+ * On the MDC client, to avoid a potential deadlock (see Bugzilla 3462),
+ * one close request is allowed above the maximum.
+ */
+static inline bool obd_mod_rpc_slot_avail_locked(struct client_obd *cli,
+                                                 bool close_req)
+{
+        bool avail;
+
+        /* A slot is available if
+         * - number of modify RPCs in flight is less than the max
+         * - it's a close RPC and no other close request is in flight
+         */
+        avail = cli->cl_mod_rpcs_in_flight < cli->cl_max_mod_rpcs_in_flight ||
+                (close_req && !cli->cl_close_rpcs_in_flight);
+
+        return avail;
+}
+
+static inline bool obd_mod_rpc_slot_avail(struct client_obd *cli,
+                                          bool close_req)
+{
+        bool avail;
+
+        spin_lock(&cli->cl_mod_rpcs_lock);
+        avail = obd_mod_rpc_slot_avail_locked(cli, close_req);
+        spin_unlock(&cli->cl_mod_rpcs_lock);
+        return avail;
+}
+
+/* Get a modify RPC slot from the obd client @cli according
+ * to the kind of operation @opc that is going to be sent
+ * and the intent @it of the operation if it applies.
+ * If the maximum number of modify RPCs in flight is reached
+ * the thread is put to sleep.
+ * Returns the tag to be set in the request message. Tag 0
+ * is reserved for non-modifying requests.
+ */
+u16 obd_get_mod_rpc_slot(struct client_obd *cli, __u32 opc,
+                         struct lookup_intent *it)
+{
+        struct l_wait_info lwi = LWI_INTR(NULL, NULL);
+        bool close_req = false;
+        u16 i, max;
+
+        /* read-only metadata RPCs don't consume a slot on MDT
+         * for reply reconstruction
+         */
+        if (it && (it->it_op == IT_GETATTR || it->it_op == IT_LOOKUP ||
+                   it->it_op == IT_LAYOUT || it->it_op == IT_READDIR))
+                return 0;
+
+        if (opc == MDS_CLOSE)
+                close_req = true;
+
+        do {
+                spin_lock(&cli->cl_mod_rpcs_lock);
+                max = cli->cl_max_mod_rpcs_in_flight;
+                if (obd_mod_rpc_slot_avail_locked(cli, close_req)) {
+                        /* there is a slot available */
+                        cli->cl_mod_rpcs_in_flight++;
+                        if (close_req)
+                                cli->cl_close_rpcs_in_flight++;
+                        lprocfs_oh_tally(&cli->cl_mod_rpcs_hist,
+                                         cli->cl_mod_rpcs_in_flight);
+                        /* find a free tag */
+                        i = find_first_zero_bit(cli->cl_mod_tag_bitmap,
+                                                max + 1);
+                        LASSERT(i < OBD_MAX_RIF_MAX);
+                        LASSERT(!test_and_set_bit(i, cli->cl_mod_tag_bitmap));
+                        spin_unlock(&cli->cl_mod_rpcs_lock);
+                        /* tag 0 is reserved for non-modify RPCs */
+                        return i + 1;
+                }
+                spin_unlock(&cli->cl_mod_rpcs_lock);
+
+                CDEBUG(D_RPCTRACE, "%s: sleeping for a modify RPC slot opc %u, max %hu\n",
+                       cli->cl_import->imp_obd->obd_name, opc, max);
+
+                l_wait_event(cli->cl_mod_rpcs_waitq,
+                             obd_mod_rpc_slot_avail(cli, close_req), &lwi);
+        } while (true);
+}
+EXPORT_SYMBOL(obd_get_mod_rpc_slot);
+
+/*
+ * Put a modify RPC slot from the obd client @cli according
+ * to the kind of operation @opc that has been sent and the
+ * intent @it of the operation if it applies.
+ */
+void obd_put_mod_rpc_slot(struct client_obd *cli, u32 opc,
+                          struct lookup_intent *it, u16 tag)
+{
+        bool close_req = false;
+
+        if (it && (it->it_op == IT_GETATTR || it->it_op == IT_LOOKUP ||
+                   it->it_op == IT_LAYOUT || it->it_op == IT_READDIR))
+                return;
+
+        if (opc == MDS_CLOSE)
+                close_req = true;
+
+        spin_lock(&cli->cl_mod_rpcs_lock);
+        cli->cl_mod_rpcs_in_flight--;
+        if (close_req)
+                cli->cl_close_rpcs_in_flight--;
+        /* release the tag in the bitmap */
+        LASSERT(tag - 1 < OBD_MAX_RIF_MAX);
+        LASSERT(test_and_clear_bit(tag - 1, cli->cl_mod_tag_bitmap) != 0);
+        spin_unlock(&cli->cl_mod_rpcs_lock);
+        wake_up(&cli->cl_mod_rpcs_waitq);
+}
+EXPORT_SYMBOL(obd_put_mod_rpc_slot);
diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
index be09e04b042f..9f5e8299d7e4 100644
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
@@ -217,8 +217,8 @@ static ssize_t pinger_show(struct kobject *kobj, struct attribute *attr,
         return sprintf(buf, "%s\n", "on");
 }
 
-static ssize_t health_show(struct kobject *kobj, struct attribute *attr,
-                           char *buf)
+static ssize_t
+health_check_show(struct kobject *kobj, struct attribute *attr, char *buf)
 {
         bool healthy = true;
         int i;
@@ -311,14 +311,14 @@ EXPORT_SYMBOL_GPL(debugfs_lustre_root);
 
 LUSTRE_RO_ATTR(version);
 LUSTRE_RO_ATTR(pinger);
-LUSTRE_RO_ATTR(health);
+LUSTRE_RO_ATTR(health_check);
 LUSTRE_RW_ATTR(jobid_var);
 LUSTRE_RW_ATTR(jobid_name);
 
 static struct attribute *lustre_attrs[] = {
         &lustre_attr_version.attr,
         &lustre_attr_pinger.attr,
-        &lustre_attr_health.attr,
+        &lustre_attr_health_check.attr,
         &lustre_attr_jobid_name.attr,
         &lustre_attr_jobid_var.attr,
         NULL,
diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c
deleted file mode 100644
index 41b77a30feb3..000000000000
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * 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,
- * 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 version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- *
- * Copyright (c) 2011, 2012, Intel Corporation.
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- *
- * lustre/obdclass/linux/linux-obdo.c
- *
- * Object Devices Class Driver
- * These are the only exported functions, they provide some generic
- * infrastructure for managing object devices
- */
-
-#define DEBUG_SUBSYSTEM S_CLASS
-
-#include <linux/module.h>
-#include "../../include/obd_class.h"
-#include "../../include/lustre/lustre_idl.h"
-
-#include <linux/fs.h>
-
-void obdo_refresh_inode(struct inode *dst, const struct obdo *src, u32 valid)
-{
-        valid &= src->o_valid;
-
-        if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
-                CDEBUG(D_INODE,
-                       "valid %#llx, cur time %lu/%lu, new %llu/%llu\n",
-                       src->o_valid, LTIME_S(dst->i_mtime),
-                       LTIME_S(dst->i_ctime), src->o_mtime, src->o_ctime);
-
-        if (valid & OBD_MD_FLATIME && src->o_atime > LTIME_S(dst->i_atime))
-                LTIME_S(dst->i_atime) = src->o_atime;
-        if (valid & OBD_MD_FLMTIME && src->o_mtime > LTIME_S(dst->i_mtime))
-                LTIME_S(dst->i_mtime) = src->o_mtime;
-        if (valid & OBD_MD_FLCTIME && src->o_ctime > LTIME_S(dst->i_ctime))
-                LTIME_S(dst->i_ctime) = src->o_ctime;
-        if (valid & OBD_MD_FLSIZE)
-                i_size_write(dst, src->o_size);
-        /* optimum IO size */
-        if (valid & OBD_MD_FLBLKSZ && src->o_blksize > (1 << dst->i_blkbits))
-                dst->i_blkbits = ffs(src->o_blksize) - 1;
-
-        if (dst->i_blkbits < PAGE_SHIFT)
-                dst->i_blkbits = PAGE_SHIFT;
-
-        /* allocation of space */
-        if (valid & OBD_MD_FLBLOCKS && src->o_blocks > dst->i_blocks)
-                /*
-                 * XXX shouldn't overflow be checked here like in
-                 * obdo_to_inode().
-                 */
-                dst->i_blocks = src->o_blocks;
-}
-EXPORT_SYMBOL(obdo_refresh_inode);
diff --git a/drivers/staging/lustre/lustre/obdclass/llog.c b/drivers/staging/lustre/lustre/obdclass/llog.c
index 43797f106745..736ea1067c93 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog.c
@@ -43,8 +43,9 @@
 
 #define DEBUG_SUBSYSTEM S_LOG
 
-#include "../include/obd_class.h"
+#include "../include/llog_swab.h"
 #include "../include/lustre_log.h"
+#include "../include/obd_class.h"
 #include "llog_internal.h"
 
 /*
@@ -80,8 +81,7 @@ static void llog_free_handle(struct llog_handle *loghandle)
                 LASSERT(list_empty(&loghandle->u.phd.phd_entry));
         else if (loghandle->lgh_hdr->llh_flags & LLOG_F_IS_CAT)
                 LASSERT(list_empty(&loghandle->u.chd.chd_head));
-        LASSERT(sizeof(*loghandle->lgh_hdr) == LLOG_CHUNK_SIZE);
-        kfree(loghandle->lgh_hdr);
+        kvfree(loghandle->lgh_hdr);
 out:
         kfree(loghandle);
 }
@@ -115,20 +115,29 @@ static int llog_read_header(const struct lu_env *env,
         rc = lop->lop_read_header(env, handle);
         if (rc == LLOG_EEMPTY) {
                 struct llog_log_hdr *llh = handle->lgh_hdr;
+                size_t len;
 
+                /* lrh_len should be initialized in llog_init_handle */
                 handle->lgh_last_idx = 0; /* header is record with index 0 */
                 llh->llh_count = 1;      /* for the header record */
                 llh->llh_hdr.lrh_type = LLOG_HDR_MAGIC;
-                llh->llh_hdr.lrh_len = LLOG_CHUNK_SIZE;
-                llh->llh_tail.lrt_len = LLOG_CHUNK_SIZE;
+                LASSERT(handle->lgh_ctxt->loc_chunk_size >= LLOG_MIN_CHUNK_SIZE);
+                llh->llh_hdr.lrh_len = handle->lgh_ctxt->loc_chunk_size;
                 llh->llh_hdr.lrh_index = 0;
-                llh->llh_tail.lrt_index = 0;
                 llh->llh_timestamp = ktime_get_real_seconds();
                 if (uuid)
                         memcpy(&llh->llh_tgtuuid, uuid,
                                sizeof(llh->llh_tgtuuid));
                 llh->llh_bitmap_offset = offsetof(typeof(*llh), llh_bitmap);
-                ext2_set_bit(0, llh->llh_bitmap);
+                /*
+                 * Since update llog header might also call this function,
+                 * let's reset the bitmap to 0 here
+                 */
+                len = llh->llh_hdr.lrh_len - llh->llh_bitmap_offset;
+                memset(LLOG_HDR_BITMAP(llh), 0, len - sizeof(llh->llh_tail));
+                ext2_set_bit(0, LLOG_HDR_BITMAP(llh));
+                LLOG_HDR_TAIL(llh)->lrt_len = llh->llh_hdr.lrh_len;
+                LLOG_HDR_TAIL(llh)->lrt_index = llh->llh_hdr.lrh_index;
                 rc = 0;
         }
         return rc;
@@ -137,16 +146,19 @@ static int llog_read_header(const struct lu_env *env,
 int llog_init_handle(const struct lu_env *env, struct llog_handle *handle,
                      int flags, struct obd_uuid *uuid)
 {
+        int chunk_size = handle->lgh_ctxt->loc_chunk_size;
         enum llog_flag fmt = flags & LLOG_F_EXT_MASK;
         struct llog_log_hdr     *llh;
         int                      rc;
 
         LASSERT(!handle->lgh_hdr);
 
-        llh = kzalloc(sizeof(*llh), GFP_NOFS);
+        LASSERT(chunk_size >= LLOG_MIN_CHUNK_SIZE);
+        llh = libcfs_kvzalloc(sizeof(*llh), GFP_NOFS);
         if (!llh)
                 return -ENOMEM;
         handle->lgh_hdr = llh;
+        handle->lgh_hdr_size = chunk_size;
         /* first assign flags to use llog_client_ops */
         llh->llh_flags = flags;
         rc = llog_read_header(env, handle, uuid);
@@ -189,6 +201,7 @@ int llog_init_handle(const struct lu_env *env, struct llog_handle *handle,
                 LASSERT(list_empty(&handle->u.chd.chd_head));
                 INIT_LIST_HEAD(&handle->u.chd.chd_head);
                 llh->llh_size = sizeof(struct llog_logid_rec);
+                llh->llh_flags |= LLOG_F_IS_FIXSIZE;
         } else if (!(flags & LLOG_F_IS_PLAIN)) {
                 CERROR("%s: unknown flags: %#x (expected %#x or %#x)\n",
                        handle->lgh_ctxt->loc_obd->obd_name,
@@ -198,7 +211,7 @@ int llog_init_handle(const struct lu_env *env, struct llog_handle *handle,
         llh->llh_flags |= fmt;
 out:
         if (rc) {
-                kfree(llh);
+                kvfree(llh);
                 handle->lgh_hdr = NULL;
         }
         return rc;
@@ -212,15 +225,21 @@ static int llog_process_thread(void *arg)
         struct llog_log_hdr             *llh = loghandle->lgh_hdr;
         struct llog_process_cat_data    *cd  = lpi->lpi_catdata;
         char                            *buf;
-        __u64                            cur_offset = LLOG_CHUNK_SIZE;
-        __u64                            last_offset;
+        u64 cur_offset, tmp_offset;
+        int chunk_size;
         int                              rc = 0, index = 1, last_index;
         int                              saved_index = 0;
         int                              last_called_index = 0;
 
-        LASSERT(llh);
+        if (!llh)
+                return -EINVAL;
+
+        cur_offset = llh->llh_hdr.lrh_len;
+        chunk_size = llh->llh_hdr.lrh_len;
+        /* expect chunk_size to be power of two */
+        LASSERT(is_power_of_2(chunk_size));
 
-        buf = kzalloc(LLOG_CHUNK_SIZE, GFP_NOFS);
+        buf = libcfs_kvzalloc(chunk_size, GFP_NOFS);
         if (!buf) {
                 lpi->lpi_rc = -ENOMEM;
                 return 0;
@@ -233,41 +252,53 @@ static int llog_process_thread(void *arg)
         if (cd && cd->lpcd_last_idx)
                 last_index = cd->lpcd_last_idx;
         else
-                last_index = LLOG_BITMAP_BYTES * 8 - 1;
-
-        /* Record is not in this buffer. */
-        if (index > last_index)
-                goto out;
+                last_index = LLOG_HDR_BITMAP_SIZE(llh) - 1;
 
         while (rc == 0) {
+                unsigned int buf_offset = 0;
                 struct llog_rec_hdr *rec;
+                bool partial_chunk;
+                off_t chunk_offset;
 
                 /* skip records not set in bitmap */
                 while (index <= last_index &&
-                       !ext2_test_bit(index, llh->llh_bitmap))
+                       !ext2_test_bit(index, LLOG_HDR_BITMAP(llh)))
                         ++index;
 
-                LASSERT(index <= last_index + 1);
-                if (index == last_index + 1)
+                if (index > last_index)
                         break;
-repeat:
+
                 CDEBUG(D_OTHER, "index: %d last_index %d\n",
                        index, last_index);
-
+repeat:
                 /* get the buf with our target record; avoid old garbage */
-                memset(buf, 0, LLOG_CHUNK_SIZE);
-                last_offset = cur_offset;
+                memset(buf, 0, chunk_size);
                 rc = llog_next_block(lpi->lpi_env, loghandle, &saved_index,
-                                     index, &cur_offset, buf, LLOG_CHUNK_SIZE);
+                                     index, &cur_offset, buf, chunk_size);
                 if (rc)
                         goto out;
 
+                /*
+                 * NB: after llog_next_block() call the cur_offset is the
+                 * offset of the next block after read one.
+                 * The absolute offset of the current chunk is calculated
+                 * from cur_offset value and stored in chunk_offset variable.
+                 */
+                tmp_offset = cur_offset;
+                if (do_div(tmp_offset, chunk_size)) {
+                        partial_chunk = true;
+                        chunk_offset = cur_offset & ~(chunk_size - 1);
+                } else {
+                        partial_chunk = false;
+                        chunk_offset = cur_offset - chunk_size;
+                }
+
                 /* NB: when rec->lrh_len is accessed it is already swabbed
                  * since it is used at the "end" of the loop and the rec
                  * swabbing is done at the beginning of the loop.
                  */
-                for (rec = (struct llog_rec_hdr *)buf;
-                     (char *)rec < buf + LLOG_CHUNK_SIZE;
+                for (rec = (struct llog_rec_hdr *)(buf + buf_offset);
+                     (char *)rec < buf + chunk_size;
                      rec = llog_rec_hdr_next(rec)) {
                         CDEBUG(D_OTHER, "processing rec 0x%p type %#x\n",
                                rec, rec->lrh_type);
@@ -278,15 +309,29 @@ repeat:
                         CDEBUG(D_OTHER, "after swabbing, type=%#x idx=%d\n",
                                rec->lrh_type, rec->lrh_index);
 
-                        if (rec->lrh_index == 0) {
-                                /* probably another rec just got added? */
-                                rc = 0;
-                                if (index <= loghandle->lgh_last_idx)
-                                        goto repeat;
-                                goto out; /* no more records */
+                        /*
+                         * for partial chunk the end of it is zeroed, check
+                         * for index 0 to distinguish it.
+                         */
+                        if (partial_chunk && !rec->lrh_index) {
+                                /* concurrent llog_add() might add new records
+                                 * while llog_processing, check this is not
+                                 * the case and re-read the current chunk
+                                 * otherwise.
+                                 */
+                                if (index > loghandle->lgh_last_idx) {
+                                        rc = 0;
+                                        goto out;
+                                }
+                                CDEBUG(D_OTHER, "Re-read last llog buffer for new records, index %u, last %u\n",
+                                       index, loghandle->lgh_last_idx);
+                                /* save offset inside buffer for the re-read */
+                                buf_offset = (char *)rec - (char *)buf;
+                                cur_offset = chunk_offset;
+                                goto repeat;
                         }
-                        if (rec->lrh_len == 0 ||
-                            rec->lrh_len > LLOG_CHUNK_SIZE) {
+
+                        if (!rec->lrh_len || rec->lrh_len > chunk_size) {
                                 CWARN("invalid length %d in llog record for index %d/%d\n",
                                       rec->lrh_len,
                                       rec->lrh_index, index);
@@ -300,32 +345,38 @@ repeat:
                                 continue;
                         }
 
+                        if (rec->lrh_index != index) {
+                                CERROR("%s: Invalid record: index %u but expected %u\n",
+                                       loghandle->lgh_ctxt->loc_obd->obd_name,
+                                       rec->lrh_index, index);
+                                rc = -ERANGE;
+                                goto out;
+                        }
+
                         CDEBUG(D_OTHER,
                                "lrh_index: %d lrh_len: %d (%d remains)\n",
                                rec->lrh_index, rec->lrh_len,
-                               (int)(buf + LLOG_CHUNK_SIZE - (char *)rec));
+                               (int)(buf + chunk_size - (char *)rec));
 
                         loghandle->lgh_cur_idx = rec->lrh_index;
                         loghandle->lgh_cur_offset = (char *)rec - (char *)buf +
-                                                    last_offset;
+                                                    chunk_offset;
 
                         /* if set, process the callback on this record */
-                        if (ext2_test_bit(index, llh->llh_bitmap)) {
+                        if (ext2_test_bit(index, LLOG_HDR_BITMAP(llh))) {
                                 rc = lpi->lpi_cb(lpi->lpi_env, loghandle, rec,
                                                  lpi->lpi_cbdata);
                                 last_called_index = index;
                                 if (rc)
                                         goto out;
-                        } else {
-                                CDEBUG(D_OTHER, "Skipped index %d\n", index);
                         }
 
-                        /* next record, still in buffer? */
-                        ++index;
-                        if (index > last_index) {
+                        /* exit if the last index is reached */
+                        if (index >= last_index) {
                                 rc = 0;
                                 goto out;
                         }
+                        index++;
                 }
         }
 
diff --git a/drivers/staging/lustre/lustre/obdclass/llog_obd.c b/drivers/staging/lustre/lustre/obdclass/llog_obd.c
index a4277d684614..8574ad401f66 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog_obd.c
@@ -158,6 +158,7 @@ int llog_setup(const struct lu_env *env, struct obd_device *obd,
         mutex_init(&ctxt->loc_mutex);
         ctxt->loc_exp = class_export_get(disk_obd->obd_self_export);
         ctxt->loc_flags = LLOG_CTXT_FLAG_UNINITIALIZED;
+        ctxt->loc_chunk_size = LLOG_MIN_CHUNK_SIZE;
 
         rc = llog_group_set_ctxt(olg, ctxt, index);
         if (rc) {
diff --git a/drivers/staging/lustre/lustre/obdclass/llog_swab.c b/drivers/staging/lustre/lustre/obdclass/llog_swab.c
index 8c4c1b3f1b45..723c212c6747 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog_swab.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog_swab.c
@@ -38,6 +38,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOG
 
+#include "../include/llog_swab.h"
 #include "../include/lustre_log.h"
 
 static void print_llogd_body(struct llogd_body *d)
@@ -244,7 +245,7 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
                 __swab32s(&llh->llh_flags);
                 __swab32s(&llh->llh_size);
                 __swab32s(&llh->llh_cat_idx);
-                tail = &llh->llh_tail;
+                tail = LLOG_HDR_TAIL(llh);
                 break;
         }
         case LLOG_LOGID_MAGIC:
@@ -290,8 +291,10 @@ static void print_llog_hdr(struct llog_log_hdr *h)
         CDEBUG(D_OTHER, "\tllh_flags: %#x\n", h->llh_flags);
         CDEBUG(D_OTHER, "\tllh_size: %#x\n", h->llh_size);
         CDEBUG(D_OTHER, "\tllh_cat_idx: %#x\n", h->llh_cat_idx);
-        CDEBUG(D_OTHER, "\tllh_tail.lrt_index: %#x\n", h->llh_tail.lrt_index);
-        CDEBUG(D_OTHER, "\tllh_tail.lrt_len: %#x\n", h->llh_tail.lrt_len);
+        CDEBUG(D_OTHER, "\tllh_tail.lrt_index: %#x\n",
+               LLOG_HDR_TAIL(h)->lrt_index);
+        CDEBUG(D_OTHER, "\tllh_tail.lrt_len: %#x\n",
+               LLOG_HDR_TAIL(h)->lrt_len);
 }
 
 void lustre_swab_llog_hdr(struct llog_log_hdr *h)
diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
index 852a5acfefab..2c99717b0aba 100644
--- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
+++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
@@ -100,9 +100,13 @@ static const char * const obd_connect_names[] = {
         "lfsck",
         "unknown",
         "unlink_close",
-        "unknown",
+        "multi_mod_rpcs",
         "dir_stripe",
-        "unknown",
+        "subtree",
+        "lock_ahead",
+        "bulk_mbits",
+        "compact_obdo",
+        "second_flags",
         NULL
 };
 
@@ -127,7 +131,7 @@ EXPORT_SYMBOL(obd_connect_flags2str);
 static void obd_connect_data_seqprint(struct seq_file *m,
                                       struct obd_connect_data *ocd)
 {
-        int flags;
+        u64 flags;
 
         LASSERT(ocd);
         flags = ocd->ocd_connect_flags;
@@ -172,6 +176,9 @@ static void obd_connect_data_seqprint(struct seq_file *m,
         if (flags & OBD_CONNECT_MAXBYTES)
                 seq_printf(m, "       max_object_bytes: %llx\n",
                            ocd->ocd_maxbytes);
+        if (flags & OBD_CONNECT_MULTIMODRPCS)
+                seq_printf(m, "       max_mod_rpcs: %hu\n",
+                           ocd->ocd_maxmodrpcs);
 }
 
 int lprocfs_read_frac_helper(char *buffer, unsigned long count, long val,
@@ -396,10 +403,17 @@ int lprocfs_wr_uint(struct file *file, const char __user *buffer,
         char dummy[MAX_STRING_SIZE + 1], *end;
         unsigned long tmp;
 
-        dummy[MAX_STRING_SIZE] = '\0';
-        if (copy_from_user(dummy, buffer, MAX_STRING_SIZE))
+        if (count >= sizeof(dummy))
+                return -EINVAL;
+
+        if (count == 0)
+                return 0;
+
+        if (copy_from_user(dummy, buffer, count))
                 return -EFAULT;
 
+        dummy[count] = '\0';
+
         tmp = simple_strtoul(dummy, &end, 0);
         if (dummy == end)
                 return -EINVAL;
@@ -1275,7 +1289,8 @@ int ldebugfs_register_stats(struct dentry *parent, const char *name,
 EXPORT_SYMBOL_GPL(ldebugfs_register_stats);
 
 void lprocfs_counter_init(struct lprocfs_stats *stats, int index,
-                          unsigned conf, const char *name, const char *units)
+                          unsigned int conf, const char *name,
+                          const char *units)
 {
         struct lprocfs_counter_header   *header;
         struct lprocfs_counter          *percpu_cntr;
diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c
index 054e567e6c8d..7971562a3efd 100644
--- a/drivers/staging/lustre/lustre/obdclass/lu_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c
@@ -68,6 +68,7 @@ enum {
 
 #define LU_SITE_BITS_MIN        12
 #define LU_SITE_BITS_MAX        24
+#define LU_SITE_BITS_MAX_CL     19
 /**
  * total 256 buckets, we don't want too many buckets because:
  * - consume too much memory
@@ -338,7 +339,7 @@ int lu_site_purge(const struct lu_env *env, struct lu_site *s, int nr)
         struct cfs_hash_bd          bd2;
         struct list_head               dispose;
         int                   did_sth;
-        unsigned int start;
+        unsigned int start = 0;
         int                   count;
         int                   bnr;
         unsigned int i;
@@ -351,7 +352,8 @@ int lu_site_purge(const struct lu_env *env, struct lu_site *s, int nr)
          * Under LRU list lock, scan LRU list and move unreferenced objects to
          * the dispose list, removing them from LRU and hash table.
          */
-        start = s->ls_purge_start;
+        if (nr != ~0)
+                start = s->ls_purge_start;
         bnr = (nr == ~0) ? -1 : nr / (int)CFS_HASH_NBKT(s->ls_obj_hash) + 1;
  again:
         /*
@@ -877,6 +879,9 @@ static unsigned long lu_htable_order(struct lu_device *top)
         unsigned long cache_size;
         unsigned long bits;
 
+        if (!strcmp(top->ld_type->ldt_name, LUSTRE_VVP_NAME))
+                bits_max = LU_SITE_BITS_MAX_CL;
+
         /*
          * Calculate hash table size, assuming that we want reasonable
          * performance when 20% of total memory is occupied by cache of
@@ -909,8 +914,8 @@ static unsigned long lu_htable_order(struct lu_device *top)
         return clamp_t(typeof(bits), bits, LU_SITE_BITS_MIN, bits_max);
 }
 
-static unsigned lu_obj_hop_hash(struct cfs_hash *hs,
-                                const void *key, unsigned mask)
+static unsigned int lu_obj_hop_hash(struct cfs_hash *hs,
+                                    const void *key, unsigned int mask)
 {
         struct lu_fid  *fid = (struct lu_fid *)key;
         __u32      hash;
@@ -1311,6 +1316,7 @@ enum {
 static struct lu_context_key *lu_keys[LU_CONTEXT_KEY_NR] = { NULL, };
 
 static DEFINE_SPINLOCK(lu_keys_guard);
+static atomic_t lu_key_initing_cnt = ATOMIC_INIT(0);
 
 /**
  * Global counter incremented whenever key is registered, unregistered,
@@ -1318,7 +1324,7 @@ static DEFINE_SPINLOCK(lu_keys_guard);
  * lu_context_refill(). No locking is provided, as initialization and shutdown
  * are supposed to be externally serialized.
  */
-static unsigned key_set_version;
+static unsigned int key_set_version;
 
 /**
  * Register new key.
@@ -1385,6 +1391,19 @@ void lu_context_key_degister(struct lu_context_key *key)
         ++key_set_version;
         spin_lock(&lu_keys_guard);
         key_fini(&lu_shrink_env.le_ctx, key->lct_index);
+
+        /**
+         * Wait until all transient contexts referencing this key have
+         * run lu_context_key::lct_fini() method.
+         */
+        while (atomic_read(&key->lct_used) > 1) {
+                spin_unlock(&lu_keys_guard);
+                CDEBUG(D_INFO, "lu_context_key_degister: \"%s\" %p, %d\n",
+                       key->lct_owner ? key->lct_owner->name : "", key,
+                       atomic_read(&key->lct_used));
+                schedule();
+                spin_lock(&lu_keys_guard);
+        }
         if (lu_keys[key->lct_index]) {
                 lu_keys[key->lct_index] = NULL;
                 lu_ref_fini(&key->lct_reference);
@@ -1507,14 +1526,25 @@ void lu_context_key_quiesce(struct lu_context_key *key)
 
         if (!(key->lct_tags & LCT_QUIESCENT)) {
                 /*
-                 * XXX layering violation.
-                 */
-                cl_env_cache_purge(~0);
-                key->lct_tags |= LCT_QUIESCENT;
-                /*
                  * XXX memory barrier has to go here.
                  */
                 spin_lock(&lu_keys_guard);
+                key->lct_tags |= LCT_QUIESCENT;
+
+                /**
+                 * Wait until all lu_context_key::lct_init() methods
+                 * have completed.
+                 */
+                while (atomic_read(&lu_key_initing_cnt) > 0) {
+                        spin_unlock(&lu_keys_guard);
+                        CDEBUG(D_INFO, "lu_context_key_quiesce: \"%s\" %p, %d (%d)\n",
+                               key->lct_owner ? key->lct_owner->name : "",
+                               key, atomic_read(&key->lct_used),
+                        atomic_read(&lu_key_initing_cnt));
+                        schedule();
+                        spin_lock(&lu_keys_guard);
+                }
+
                 list_for_each_entry(ctx, &lu_context_remembered, lc_remember)
                         key_fini(ctx, key->lct_index);
                 spin_unlock(&lu_keys_guard);
@@ -1546,6 +1576,19 @@ static int keys_fill(struct lu_context *ctx)
 {
         unsigned int i;
 
+        /*
+         * A serialisation with lu_context_key_quiesce() is needed, but some
+         * "key->lct_init()" are calling kernel memory allocation routine and
+         * can't be called while holding a spin_lock.
+         * "lu_keys_guard" is held while incrementing "lu_key_initing_cnt"
+         * to ensure the start of the serialisation.
+         * An atomic_t variable is still used, in order not to reacquire the
+         * lock when decrementing the counter.
+         */
+        spin_lock(&lu_keys_guard);
+        atomic_inc(&lu_key_initing_cnt);
+        spin_unlock(&lu_keys_guard);
+
         LINVRNT(ctx->lc_value);
         for (i = 0; i < ARRAY_SIZE(lu_keys); ++i) {
                 struct lu_context_key *key;
@@ -1563,12 +1606,19 @@ static int keys_fill(struct lu_context *ctx)
                         LINVRNT(key->lct_init);
                         LINVRNT(key->lct_index == i);
 
+                        LASSERT(key->lct_owner);
+                        if (!(ctx->lc_tags & LCT_NOREF) &&
+                            !try_module_get(key->lct_owner)) {
+                                /* module is unloading, skip this key */
+                                continue;
+                        }
+
                         value = key->lct_init(ctx, key);
-                        if (IS_ERR(value))
+                        if (unlikely(IS_ERR(value))) {
+                                atomic_dec(&lu_key_initing_cnt);
                                 return PTR_ERR(value);
+                        }
 
-                        if (!(ctx->lc_tags & LCT_NOREF))
-                                try_module_get(key->lct_owner);
                         lu_ref_add_atomic(&key->lct_reference, "ctx", ctx);
                         atomic_inc(&key->lct_used);
                         /*
@@ -1582,6 +1632,7 @@ static int keys_fill(struct lu_context *ctx)
                 }
                 ctx->lc_version = key_set_version;
         }
+        atomic_dec(&lu_key_initing_cnt);
         return 0;
 }
 
@@ -1663,6 +1714,9 @@ void lu_context_exit(struct lu_context *ctx)
         ctx->lc_state = LCS_LEFT;
         if (ctx->lc_tags & LCT_HAS_EXIT && ctx->lc_value) {
                 for (i = 0; i < ARRAY_SIZE(lu_keys); ++i) {
+                        /* could race with key quiescency */
+                        if (ctx->lc_tags & LCT_REMEMBER)
+                                spin_lock(&lu_keys_guard);
                         if (ctx->lc_value[i]) {
                                 struct lu_context_key *key;
 
@@ -1671,6 +1725,8 @@ void lu_context_exit(struct lu_context *ctx)
                                         key->lct_exit(ctx,
                                                       key, ctx->lc_value[i]);
                         }
+                        if (ctx->lc_tags & LCT_REMEMBER)
+                                spin_unlock(&lu_keys_guard);
                 }
         }
 }
@@ -1930,7 +1986,7 @@ int lu_site_stats_print(const struct lu_site *s, struct seq_file *m)
         memset(&stats, 0, sizeof(stats));
         lu_site_stats_get(s->ls_obj_hash, &stats, 1);
 
-        seq_printf(m, "%d/%d %d/%d %d %d %d %d %d %d %d %d\n",
+        seq_printf(m, "%d/%d %d/%ld %d %d %d %d %d %d %d %d\n",
                    stats.lss_busy,
                    stats.lss_total,
                    stats.lss_populated,
diff --git a/drivers/staging/lustre/lustre/obdclass/obd_config.c b/drivers/staging/lustre/lustre/obdclass/obd_config.c
index bbed1b72d52e..9ca84c7d49de 100644
--- a/drivers/staging/lustre/lustre/obdclass/obd_config.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_config.c
@@ -35,12 +35,15 @@
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
-#include "../include/obd_class.h"
+
 #include <linux/string.h>
+
 #include "../include/lustre/lustre_ioctl.h"
-#include "../include/lustre_log.h"
+#include "../include/llog_swab.h"
 #include "../include/lprocfs_status.h"
+#include "../include/lustre_log.h"
 #include "../include/lustre_param.h"
+#include "../include/obd_class.h"
 
 #include "llog_internal.h"
 
@@ -446,7 +449,7 @@ static int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg)
         LASSERT(obd->obd_self_export);
 
         /* Precleanup, we must make sure all exports get destroyed. */
-        err = obd_precleanup(obd, OBD_CLEANUP_EXPORTS);
+        err = obd_precleanup(obd);
         if (err)
                 CERROR("Precleanup %s returned %d\n",
                        obd->obd_name, err);
@@ -585,16 +588,21 @@ static int class_del_conn(struct obd_device *obd, struct lustre_cfg *lcfg)
 }
 
 static LIST_HEAD(lustre_profile_list);
+static DEFINE_SPINLOCK(lustre_profile_list_lock);
 
 struct lustre_profile *class_get_profile(const char *prof)
 {
         struct lustre_profile *lprof;
 
+        spin_lock(&lustre_profile_list_lock);
         list_for_each_entry(lprof, &lustre_profile_list, lp_list) {
                 if (!strcmp(lprof->lp_profile, prof)) {
+                        lprof->lp_refs++;
+                        spin_unlock(&lustre_profile_list_lock);
                         return lprof;
                 }
         }
+        spin_unlock(&lustre_profile_list_lock);
         return NULL;
 }
 EXPORT_SYMBOL(class_get_profile);
@@ -639,7 +647,11 @@ static int class_add_profile(int proflen, char *prof, int osclen, char *osc,
                 }
         }
 
+        spin_lock(&lustre_profile_list_lock);
+        lprof->lp_refs = 1;
+        lprof->lp_list_deleted = false;
         list_add(&lprof->lp_list, &lustre_profile_list);
+        spin_unlock(&lustre_profile_list_lock);
         return err;
 
 free_lp_dt:
@@ -659,27 +671,59 @@ void class_del_profile(const char *prof)
 
         lprof = class_get_profile(prof);
         if (lprof) {
+                spin_lock(&lustre_profile_list_lock);
+                /* because get profile increments the ref counter */
+                lprof->lp_refs--;
                 list_del(&lprof->lp_list);
-                kfree(lprof->lp_profile);
-                kfree(lprof->lp_dt);
-                kfree(lprof->lp_md);
-                kfree(lprof);
+                lprof->lp_list_deleted = true;
+                spin_unlock(&lustre_profile_list_lock);
+
+                class_put_profile(lprof);
         }
 }
 EXPORT_SYMBOL(class_del_profile);
 
+void class_put_profile(struct lustre_profile *lprof)
+{
+        spin_lock(&lustre_profile_list_lock);
+        if (--lprof->lp_refs > 0) {
+                LASSERT(lprof->lp_refs > 0);
+                spin_unlock(&lustre_profile_list_lock);
+                return;
+        }
+        spin_unlock(&lustre_profile_list_lock);
+
+        /* confirm not a negative number */
+        LASSERT(!lprof->lp_refs);
+
+        /*
+         * At least one class_del_profile/profiles must be called
+         * on the target profile or lustre_profile_list will corrupt
+         */
+        LASSERT(lprof->lp_list_deleted);
+        kfree(lprof->lp_profile);
+        kfree(lprof->lp_dt);
+        kfree(lprof->lp_md);
+        kfree(lprof);
+}
+EXPORT_SYMBOL(class_put_profile);
+
 /* COMPAT_146 */
 void class_del_profiles(void)
 {
         struct lustre_profile *lprof, *n;
 
+        spin_lock(&lustre_profile_list_lock);
         list_for_each_entry_safe(lprof, n, &lustre_profile_list, lp_list) {
                 list_del(&lprof->lp_list);
-                kfree(lprof->lp_profile);
-                kfree(lprof->lp_dt);
-                kfree(lprof->lp_md);
-                kfree(lprof);
+                lprof->lp_list_deleted = true;
+                spin_unlock(&lustre_profile_list_lock);
+
+                class_put_profile(lprof);
+
+                spin_lock(&lustre_profile_list_lock);
         }
+        spin_unlock(&lustre_profile_list_lock);
 }
 EXPORT_SYMBOL(class_del_profiles);
 
@@ -1406,8 +1450,8 @@ EXPORT_SYMBOL(class_manual_cleanup);
  * uuid<->export lustre hash operations
  */
 
-static unsigned
-uuid_hash(struct cfs_hash *hs, const void *key, unsigned mask)
+static unsigned int
+uuid_hash(struct cfs_hash *hs, const void *key, unsigned int mask)
 {
         return cfs_hash_djb2_hash(((struct obd_uuid *)key)->uuid,
                                   sizeof(((struct obd_uuid *)key)->uuid), mask);
diff --git a/drivers/staging/lustre/lustre/obdclass/obd_mount.c b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
index 0d3a3b05a637..2283e920d839 100644
--- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
@@ -261,7 +261,7 @@ int lustre_start_mgc(struct super_block *sb)
 
                         rc = obd_get_info(NULL, obd->obd_self_export,
                                           strlen(KEY_CONN_DATA), KEY_CONN_DATA,
-                                          &vallen, data, NULL);
+                                          &vallen, data);
                         LASSERT(rc == 0);
                         has_ir = OCD_HAS_FLAG(data, IMP_RECOV);
                         if (has_ir ^ !(*flags & LMD_FLG_NOIR)) {
@@ -382,7 +382,7 @@ int lustre_start_mgc(struct super_block *sb)
         /* We connect to the MGS at setup, and don't disconnect until cleanup */
         data->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_AT |
                                   OBD_CONNECT_FULL20 | OBD_CONNECT_IMP_RECOV |
-                                  OBD_CONNECT_LVB_TYPE;
+                                  OBD_CONNECT_LVB_TYPE | OBD_CONNECT_BULK_MBITS;
 
 #if OBD_OCD_VERSION(3, 0, 53, 0) > LUSTRE_VERSION_CODE
         data->ocd_connect_flags |= OBD_CONNECT_MNE_SWAB;
@@ -1216,8 +1216,7 @@ static struct file_system_type lustre_fs_type = {
         .name    = "lustre",
         .mount  = lustre_mount,
         .kill_sb      = lustre_kill_super,
-        .fs_flags     = FS_BINARY_MOUNTDATA | FS_REQUIRES_DEV |
-                        FS_RENAME_DOES_D_MOVE,
+        .fs_flags       = FS_REQUIRES_DEV | FS_RENAME_DOES_D_MOVE,
 };
 MODULE_ALIAS_FS("lustre");
 
diff --git a/drivers/staging/lustre/lustre/obdclass/obdo.c b/drivers/staging/lustre/lustre/obdclass/obdo.c
index 79104a66da96..c52b9e07d7dd 100644
--- a/drivers/staging/lustre/lustre/obdclass/obdo.c
+++ b/drivers/staging/lustre/lustre/obdclass/obdo.c
@@ -124,68 +124,3 @@ void obdo_to_ioobj(const struct obdo *oa, struct obd_ioobj *ioobj)
         ioobj->ioo_max_brw = 0;
 }
 EXPORT_SYMBOL(obdo_to_ioobj);
-
-static void iattr_from_obdo(struct iattr *attr, const struct obdo *oa,
-                            u32 valid)
-{
-        valid &= oa->o_valid;
-
-        if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME))
-                CDEBUG(D_INODE, "valid %#llx, new time %llu/%llu\n",
-                       oa->o_valid, oa->o_mtime, oa->o_ctime);
-
-        attr->ia_valid = 0;
-        if (valid & OBD_MD_FLATIME) {
-                LTIME_S(attr->ia_atime) = oa->o_atime;
-                attr->ia_valid |= ATTR_ATIME;
-        }
-        if (valid & OBD_MD_FLMTIME) {
-                LTIME_S(attr->ia_mtime) = oa->o_mtime;
-                attr->ia_valid |= ATTR_MTIME;
-        }
-        if (valid & OBD_MD_FLCTIME) {
-                LTIME_S(attr->ia_ctime) = oa->o_ctime;
-                attr->ia_valid |= ATTR_CTIME;
-        }
-        if (valid & OBD_MD_FLSIZE) {
-                attr->ia_size = oa->o_size;
-                attr->ia_valid |= ATTR_SIZE;
-        }
-#if 0   /* you shouldn't be able to change a file's type with setattr */
-        if (valid & OBD_MD_FLTYPE) {
-                attr->ia_mode = (attr->ia_mode & ~S_IFMT) |
-                                (oa->o_mode & S_IFMT);
-                attr->ia_valid |= ATTR_MODE;
-        }
-#endif
-        if (valid & OBD_MD_FLMODE) {
-                attr->ia_mode = (attr->ia_mode & S_IFMT) |
-                                (oa->o_mode & ~S_IFMT);
-                attr->ia_valid |= ATTR_MODE;
-                if (!in_group_p(make_kgid(&init_user_ns, oa->o_gid)) &&
-                    !capable(CFS_CAP_FSETID))
-                        attr->ia_mode &= ~S_ISGID;
-        }
-        if (valid & OBD_MD_FLUID) {
-                attr->ia_uid = make_kuid(&init_user_ns, oa->o_uid);
-                attr->ia_valid |= ATTR_UID;
-        }
-        if (valid & OBD_MD_FLGID) {
-                attr->ia_gid = make_kgid(&init_user_ns, oa->o_gid);
-                attr->ia_valid |= ATTR_GID;
-        }
-}
-
-void md_from_obdo(struct md_op_data *op_data, const struct obdo *oa, u32 valid)
-{
-        iattr_from_obdo(&op_data->op_attr, oa, valid);
-        if (valid & OBD_MD_FLBLOCKS) {
-                op_data->op_attr_blocks = oa->o_blocks;
-                op_data->op_attr.ia_valid |= ATTR_BLOCKS;
-        }
-        if (valid & OBD_MD_FLFLAGS) {
-                op_data->op_attr_flags = oa->o_flags;
-                op_data->op_attr.ia_valid |= ATTR_ATTR_FLAG;
-        }
-}
-EXPORT_SYMBOL(md_from_obdo);
diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c
index 505582ff4d1e..549076193bde 100644
--- a/drivers/staging/lustre/lustre/obdecho/echo_client.c
+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c
@@ -55,7 +55,7 @@ struct echo_device {
         struct echo_client_obd *ed_ec;
 
         struct cl_site    ed_site_myself;
-        struct cl_site   *ed_site;
+        struct lu_site          *ed_site;
         struct lu_device       *ed_next;
 };
 
@@ -505,9 +505,6 @@ static const struct lu_device_operations echo_device_lu_ops = {
 
 /** @} echo_lu_dev_ops */
 
-static const struct cl_device_operations echo_device_cl_ops = {
-};
-
 /** \defgroup echo_init Setup and teardown
  *
  * Init and fini functions for echo client.
@@ -527,17 +524,19 @@ static int echo_site_init(const struct lu_env *env, struct echo_device *ed)
         }
 
         rc = lu_site_init_finish(&site->cs_lu);
-        if (rc)
+        if (rc) {
+                cl_site_fini(site);
                 return rc;
+        }
 
-        ed->ed_site = site;
+        ed->ed_site = &site->cs_lu;
         return 0;
 }
 
 static void echo_site_fini(const struct lu_env *env, struct echo_device *ed)
 {
         if (ed->ed_site) {
-                cl_site_fini(ed->ed_site);
+                lu_site_fini(ed->ed_site);
                 ed->ed_site = NULL;
         }
 }
@@ -561,16 +560,10 @@ static void echo_thread_key_fini(const struct lu_context *ctx,
         kmem_cache_free(echo_thread_kmem, info);
 }
 
-static void echo_thread_key_exit(const struct lu_context *ctx,
-                                 struct lu_context_key *key, void *data)
-{
-}
-
 static struct lu_context_key echo_thread_key = {
         .lct_tags = LCT_CL_THREAD,
         .lct_init = echo_thread_key_init,
         .lct_fini = echo_thread_key_fini,
-        .lct_exit = echo_thread_key_exit
 };
 
 static void *echo_session_key_init(const struct lu_context *ctx,
@@ -592,16 +585,10 @@ static void echo_session_key_fini(const struct lu_context *ctx,
         kmem_cache_free(echo_session_kmem, session);
 }
 
-static void echo_session_key_exit(const struct lu_context *ctx,
-                                  struct lu_context_key *key, void *data)
-{
-}
-
 static struct lu_context_key echo_session_key = {
         .lct_tags = LCT_SESSION,
         .lct_init = echo_session_key_init,
         .lct_fini = echo_session_key_fini,
-        .lct_exit = echo_session_key_exit
 };
 
 LU_TYPE_INIT_FINI(echo, &echo_thread_key, &echo_session_key);
@@ -630,7 +617,6 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env,
                 goto out_free;
 
         cd->cd_lu_dev.ld_ops = &echo_device_lu_ops;
-        cd->cd_ops = &echo_device_cl_ops;
 
         obd = class_name2obd(lustre_cfg_string(cfg, 0));
         LASSERT(obd);
@@ -674,7 +660,7 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env,
                         goto out_cleanup;
                 }
 
-                next->ld_site = &ed->ed_site->cs_lu;
+                next->ld_site = ed->ed_site;
                 rc = next->ld_type->ldt_ops->ldto_device_init(env, next,
                                                 next->ld_type->ldt_name,
                                                               NULL);
@@ -741,7 +727,7 @@ static struct lu_device *echo_device_free(const struct lu_env *env,
         CDEBUG(D_INFO, "echo device:%p is going to be freed, next = %p\n",
                ed, next);
 
-        lu_site_purge(env, &ed->ed_site->cs_lu, -1);
+        lu_site_purge(env, ed->ed_site, -1);
 
         /* check if there are objects still alive.
          * It shouldn't have any object because lu_site_purge would cleanup
@@ -754,7 +740,7 @@ static struct lu_device *echo_device_free(const struct lu_env *env,
         spin_unlock(&ec->ec_lock);
 
         /* purge again */
-        lu_site_purge(env, &ed->ed_site->cs_lu, -1);
+        lu_site_purge(env, ed->ed_site, -1);
 
         CDEBUG(D_INFO,
                "Waiting for the reference of echo object to be dropped\n");
@@ -766,7 +752,7 @@ static struct lu_device *echo_device_free(const struct lu_env *env,
                 CERROR("echo_client still has objects at cleanup time, wait for 1 second\n");
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(cfs_time_seconds(1));
-                lu_site_purge(env, &ed->ed_site->cs_lu, -1);
+                lu_site_purge(env, ed->ed_site, -1);
                 spin_lock(&ec->ec_lock);
         }
         spin_unlock(&ec->ec_lock);
@@ -780,11 +766,13 @@ static struct lu_device *echo_device_free(const struct lu_env *env,
         while (next)
                 next = next->ld_type->ldt_ops->ldto_device_free(env, next);
 
-        LASSERT(ed->ed_site == lu2cl_site(d->ld_site));
+        LASSERT(ed->ed_site == d->ld_site);
         echo_site_fini(env, ed);
         cl_device_fini(&ed->ed_cl);
         kfree(ed);
 
+        cl_env_cache_purge(~0);
+
         return NULL;
 }
 
@@ -1100,7 +1088,7 @@ out:
 static u64 last_object_id;
 
 static int echo_create_object(const struct lu_env *env, struct echo_device *ed,
-                              struct obdo *oa, struct obd_trans_info *oti)
+                              struct obdo *oa)
 {
         struct echo_object     *eco;
         struct echo_client_obd *ec = ed->ed_ec;
@@ -1117,7 +1105,7 @@ static int echo_create_object(const struct lu_env *env, struct echo_device *ed,
         if (!ostid_id(&oa->o_oi))
                 ostid_set_id(&oa->o_oi, ++last_object_id);
 
-        rc = obd_create(env, ec->ec_exp, oa, oti);
+        rc = obd_create(env, ec->ec_exp, oa);
         if (rc != 0) {
                 CERROR("Cannot create objects: rc = %d\n", rc);
                 goto failed;
@@ -1137,7 +1125,7 @@ static int echo_create_object(const struct lu_env *env, struct echo_device *ed,
 
  failed:
         if (created && rc)
-                obd_destroy(env, ec->ec_exp, oa, oti);
+                obd_destroy(env, ec->ec_exp, oa);
         if (rc)
                 CERROR("create object failed with: rc = %d\n", rc);
         return rc;
@@ -1237,8 +1225,7 @@ static int echo_client_page_debug_check(struct page *page, u64 id,
 
 static int echo_client_kbrw(struct echo_device *ed, int rw, struct obdo *oa,
                             struct echo_object *eco, u64 offset,
-                            u64 count, int async,
-                            struct obd_trans_info *oti)
+                            u64 count, int async)
 {
         u32            npages;
         struct brw_page *pga;
@@ -1332,12 +1319,11 @@ static int echo_client_prep_commit(const struct lu_env *env,
                                    struct obd_export *exp, int rw,
                                    struct obdo *oa, struct echo_object *eco,
                                    u64 offset, u64 count,
-                                   u64 batch, struct obd_trans_info *oti,
-                                   int async)
+                                   u64 batch, int async)
 {
         struct obd_ioobj ioo;
         struct niobuf_local *lnb;
-        struct niobuf_remote *rnb;
+        struct niobuf_remote rnb;
         u64 off;
         u64 npages, tot_pages;
         int i, ret = 0, brw_flags = 0;
@@ -1349,9 +1335,7 @@ static int echo_client_prep_commit(const struct lu_env *env,
         tot_pages = count >> PAGE_SHIFT;
 
         lnb = kcalloc(npages, sizeof(struct niobuf_local), GFP_NOFS);
-        rnb = kcalloc(npages, sizeof(struct niobuf_remote), GFP_NOFS);
-
-        if (!lnb || !rnb) {
+        if (!lnb) {
                 ret = -ENOMEM;
                 goto out;
         }
@@ -1363,26 +1347,22 @@ static int echo_client_prep_commit(const struct lu_env *env,
 
         off = offset;
 
-        for (; tot_pages; tot_pages -= npages) {
+        for (; tot_pages > 0; tot_pages -= npages) {
                 int lpages;
 
                 if (tot_pages < npages)
                         npages = tot_pages;
 
-                for (i = 0; i < npages; i++, off += PAGE_SIZE) {
-                        rnb[i].rnb_offset = off;
-                        rnb[i].rnb_len = PAGE_SIZE;
-                        rnb[i].rnb_flags = brw_flags;
-                }
-
-                ioo.ioo_bufcnt = npages;
+                rnb.rnb_offset = off;
+                rnb.rnb_len = npages * PAGE_SIZE;
+                rnb.rnb_flags = brw_flags;
+                ioo.ioo_bufcnt = 1;
+                off += npages * PAGE_SIZE;
 
                 lpages = npages;
-                ret = obd_preprw(env, rw, exp, oa, 1, &ioo, rnb, &lpages,
-                                 lnb, oti);
+                ret = obd_preprw(env, rw, exp, oa, 1, &ioo, &rnb, &lpages, lnb);
                 if (ret != 0)
                         goto out;
-                LASSERT(lpages == npages);
 
                 for (i = 0; i < lpages; i++) {
                         struct page *page = lnb[i].lnb_page;
@@ -1401,24 +1381,21 @@ static int echo_client_prep_commit(const struct lu_env *env,
 
                         if (rw == OBD_BRW_WRITE)
                                 echo_client_page_debug_setup(page, rw,
-                                                            ostid_id(&oa->o_oi),
-                                                             rnb[i].rnb_offset,
-                                                             rnb[i].rnb_len);
+                                                             ostid_id(&oa->o_oi),
+                                                             lnb[i].lnb_file_offset,
+                                                             lnb[i].lnb_len);
                         else
                                 echo_client_page_debug_check(page,
-                                                            ostid_id(&oa->o_oi),
-                                                             rnb[i].rnb_offset,
-                                                             rnb[i].rnb_len);
+                                                             ostid_id(&oa->o_oi),
+                                                             lnb[i].lnb_file_offset,
+                                                             lnb[i].lnb_len);
                 }
 
-                ret = obd_commitrw(env, rw, exp, oa, 1, &ioo,
-                                   rnb, npages, lnb, oti, ret);
+                ret = obd_commitrw(env, rw, exp, oa, 1, &ioo, &rnb, npages, lnb,
+                                   ret);
                 if (ret != 0)
                         goto out;
 
-                /* Reset oti otherwise it would confuse ldiskfs. */
-                memset(oti, 0, sizeof(*oti));
-
                 /* Reuse env context. */
                 lu_context_exit((struct lu_context *)&env->le_ctx);
                 lu_context_enter((struct lu_context *)&env->le_ctx);
@@ -1426,14 +1403,12 @@ static int echo_client_prep_commit(const struct lu_env *env,
 
 out:
         kfree(lnb);
-        kfree(rnb);
         return ret;
 }
 
 static int echo_client_brw_ioctl(const struct lu_env *env, int rw,
                                  struct obd_export *exp,
-                                 struct obd_ioctl_data *data,
-                                 struct obd_trans_info *dummy_oti)
+                                 struct obd_ioctl_data *data)
 {
         struct obd_device *obd = class_exp2obd(exp);
         struct echo_device *ed = obd2echo_dev(obd);
@@ -1470,15 +1445,13 @@ static int echo_client_brw_ioctl(const struct lu_env *env, int rw,
         case 1:
                 /* fall through */
         case 2:
-                rc = echo_client_kbrw(ed, rw, oa,
-                                      eco, data->ioc_offset,
-                                      data->ioc_count, async, dummy_oti);
+                rc = echo_client_kbrw(ed, rw, oa, eco, data->ioc_offset,
+                                      data->ioc_count, async);
                 break;
         case 3:
-                rc = echo_client_prep_commit(env, ec->ec_exp, rw, oa,
-                                             eco, data->ioc_offset,
-                                             data->ioc_count, data->ioc_plen1,
-                                             dummy_oti, async);
+                rc = echo_client_prep_commit(env, ec->ec_exp, rw, oa, eco,
+                                             data->ioc_offset, data->ioc_count,
+                                             data->ioc_plen1, async);
                 break;
         default:
                 rc = -EINVAL;
@@ -1496,16 +1469,11 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         struct echo_client_obd *ec = ed->ed_ec;
         struct echo_object     *eco;
         struct obd_ioctl_data  *data = karg;
-        struct obd_trans_info   dummy_oti;
         struct lu_env     *env;
-        struct oti_req_ack_lock *ack_lock;
         struct obdo         *oa;
         struct lu_fid      fid;
         int                  rw = OBD_BRW_READ;
         int                  rc = 0;
-        int                  i;
-
-        memset(&dummy_oti, 0, sizeof(dummy_oti));
 
         oa = &data->ioc_obdo1;
         if (!(oa->o_valid & OBD_MD_FLGROUP)) {
@@ -1535,7 +1503,7 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                         goto out;
                 }
 
-                rc = echo_create_object(env, ed, oa, &dummy_oti);
+                rc = echo_create_object(env, ed, oa);
                 goto out;
 
         case OBD_IOC_DESTROY:
@@ -1546,7 +1514,7 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
 
                 rc = echo_get_object(&eco, ed, oa);
                 if (rc == 0) {
-                        rc = obd_destroy(env, ec->ec_exp, oa, &dummy_oti);
+                        rc = obd_destroy(env, ec->ec_exp, oa);
                         if (rc == 0)
                                 eco->eo_deleted = 1;
                         echo_put_object(eco);
@@ -1556,11 +1524,7 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         case OBD_IOC_GETATTR:
                 rc = echo_get_object(&eco, ed, oa);
                 if (rc == 0) {
-                        struct obd_info oinfo = {
-                                .oi_oa = oa,
-                        };
-
-                        rc = obd_getattr(env, ec->ec_exp, &oinfo);
+                        rc = obd_getattr(env, ec->ec_exp, oa);
                         echo_put_object(eco);
                 }
                 goto out;
@@ -1573,11 +1537,7 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
 
                 rc = echo_get_object(&eco, ed, oa);
                 if (rc == 0) {
-                        struct obd_info oinfo = {
-                                .oi_oa = oa,
-                        };
-
-                        rc = obd_setattr(env, ec->ec_exp, &oinfo, NULL);
+                        rc = obd_setattr(env, ec->ec_exp, oa);
                         echo_put_object(eco);
                 }
                 goto out;
@@ -1591,7 +1551,7 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 rw = OBD_BRW_WRITE;
                 /* fall through */
         case OBD_IOC_BRW_READ:
-                rc = echo_client_brw_ioctl(env, rw, exp, data, &dummy_oti);
+                rc = echo_client_brw_ioctl(env, rw, exp, data);
                 goto out;
 
         default:
@@ -1604,14 +1564,6 @@ out:
         lu_env_fini(env);
         kfree(env);
 
-        /* XXX this should be in a helper also called by target_send_reply */
-        for (ack_lock = dummy_oti.oti_ack_locks, i = 0; i < 4;
-             i++, ack_lock++) {
-                if (!ack_lock->mode)
-                        break;
-                ldlm_lock_decref(&ack_lock->lock, ack_lock->mode);
-        }
-
         return rc;
 }
 
diff --git a/drivers/staging/lustre/lustre/osc/lproc_osc.c b/drivers/staging/lustre/lustre/osc/lproc_osc.c
index f0062d44ee03..575b2969ad83 100644
--- a/drivers/staging/lustre/lustre/osc/lproc_osc.c
+++ b/drivers/staging/lustre/lustre/osc/lproc_osc.c
@@ -162,7 +162,7 @@ static ssize_t max_dirty_mb_store(struct kobject *kobj,
         pages_number *= 1 << (20 - PAGE_SHIFT); /* MB -> pages */
 
         if (pages_number <= 0 ||
-            pages_number > OSC_MAX_DIRTY_MB_MAX << (20 - PAGE_SHIFT) ||
+            pages_number >= OSC_MAX_DIRTY_MB_MAX << (20 - PAGE_SHIFT) ||
             pages_number > totalram_pages / 4) /* 1/4 of RAM */
                 return -ERANGE;
 
@@ -183,10 +183,12 @@ static int osc_cached_mb_seq_show(struct seq_file *m, void *v)
 
         seq_printf(m,
                    "used_mb: %ld\n"
-                   "busy_cnt: %ld\n",
+                   "busy_cnt: %ld\n"
+                   "reclaim: %llu\n",
                    (atomic_long_read(&cli->cl_lru_in_list) +
                     atomic_long_read(&cli->cl_lru_busy)) >> shift,
-                   atomic_long_read(&cli->cl_lru_busy));
+                   atomic_long_read(&cli->cl_lru_busy),
+                   cli->cl_lru_reclaim);
 
         return 0;
 }
@@ -585,7 +587,8 @@ static ssize_t max_pages_per_rpc_store(struct kobject *kobj,
         chunk_mask = ~((1 << (cli->cl_chunkbits - PAGE_SHIFT)) - 1);
         /* max_pages_per_rpc must be chunk aligned */
         val = (val + ~chunk_mask) & chunk_mask;
-        if (val == 0 || val > ocd->ocd_brw_size >> PAGE_SHIFT) {
+        if (!val || (ocd->ocd_brw_size &&
+                     val > ocd->ocd_brw_size >> PAGE_SHIFT)) {
                 return -ERANGE;
         }
         spin_lock(&cli->cl_loi_list_lock);
diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c
index 4bbe219add98..b0f030c6c9c9 100644
--- a/drivers/staging/lustre/lustre/osc/osc_cache.c
+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c
@@ -360,6 +360,7 @@ static struct osc_extent *osc_extent_alloc(struct osc_object *obj)
 
         RB_CLEAR_NODE(&ext->oe_node);
         ext->oe_obj = obj;
+        cl_object_get(osc2cl(obj));
         atomic_set(&ext->oe_refc, 1);
         atomic_set(&ext->oe_users, 0);
         INIT_LIST_HEAD(&ext->oe_link);
@@ -398,6 +399,7 @@ static void osc_extent_put(const struct lu_env *env, struct osc_extent *ext)
                         LDLM_LOCK_PUT(ext->oe_dlmlock);
                         ext->oe_dlmlock = NULL;
                 }
+                cl_object_put(env, osc2cl(ext->oe_obj));
                 osc_extent_free(ext);
         }
 }
@@ -959,7 +961,7 @@ static int osc_extent_wait(const struct lu_env *env, struct osc_extent *ext,
         if (rc == -ETIMEDOUT) {
                 OSC_EXTENT_DUMP(D_ERROR, ext,
                                 "%s: wait ext to %u timedout, recovery in progress?\n",
-                                osc_export(obj)->exp_obd->obd_name, state);
+                                cli_name(osc_cli(obj)), state);
 
                 lwi = LWI_INTR(NULL, NULL);
                 rc = l_wait_event(ext->oe_waitq, extent_wait_cb(ext, state),
@@ -977,7 +979,6 @@ static int osc_extent_wait(const struct lu_env *env, struct osc_extent *ext,
 static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index,
                                bool partial)
 {
-        struct cl_env_nest nest;
         struct lu_env *env;
         struct cl_io *io;
         struct osc_object *obj = ext->oe_obj;
@@ -990,6 +991,7 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index,
         int grants = 0;
         int nr_pages = 0;
         int rc = 0;
+        int refcheck;
 
         LASSERT(sanity_check(ext) == 0);
         EASSERT(ext->oe_state == OES_TRUNC, ext);
@@ -999,7 +1001,7 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index,
          * We can't use that env from osc_cache_truncate_start() because
          * it's from lov_io_sub and not fully initialized.
          */
-        env = cl_env_nested_get(&nest);
+        env = cl_env_get(&refcheck);
         io  = &osc_env_info(env)->oti_io;
         io->ci_obj = cl_object_top(osc2cl(obj));
         rc = cl_io_init(env, io, CIT_MISC, io->ci_obj);
@@ -1085,7 +1087,7 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index,
 
 out:
         cl_io_fini(env, io);
-        cl_env_nested_put(&nest, env);
+        cl_env_put(env, &refcheck);
         return rc;
 }
 
@@ -1327,7 +1329,6 @@ static int osc_completion(const struct lu_env *env, struct osc_async_page *oap,
 {
         struct osc_page *opg = oap2osc_page(oap);
         struct cl_page    *page = oap2cl_page(oap);
-        struct osc_object *obj = cl2osc(opg->ops_cl.cpl_obj);
         enum cl_req_type crt;
         int srvlock;
 
@@ -1338,25 +1339,10 @@ static int osc_completion(const struct lu_env *env, struct osc_async_page *oap,
                  "cp_state:%u, cmd:%d\n", page->cp_state, cmd);
         LASSERT(opg->ops_transfer_pinned);
 
-        /*
-         * page->cp_req can be NULL if io submission failed before
-         * cl_req was allocated.
-         */
-        if (page->cp_req)
-                cl_req_page_done(env, page);
-        LASSERT(!page->cp_req);
-
         crt = cmd == OBD_BRW_READ ? CRT_READ : CRT_WRITE;
         /* Clear opg->ops_transfer_pinned before VM lock is released. */
         opg->ops_transfer_pinned = 0;
 
-        spin_lock(&obj->oo_seatbelt);
-        LASSERT(opg->ops_submitter);
-        LASSERT(!list_empty(&opg->ops_inflight));
-        list_del_init(&opg->ops_inflight);
-        opg->ops_submitter = NULL;
-        spin_unlock(&obj->oo_seatbelt);
-
         opg->ops_submit_time = 0;
         srvlock = oap->oap_brw_flags & OBD_BRW_SRVLOCK;
 
@@ -1380,16 +1366,17 @@ static int osc_completion(const struct lu_env *env, struct osc_async_page *oap,
         lu_ref_del(&page->cp_reference, "transfer", page);
 
         cl_page_completion(env, page, crt, rc);
+        cl_page_put(env, page);
 
         return 0;
 }
 
 #define OSC_DUMP_GRANT(lvl, cli, fmt, args...) do {                           \
         struct client_obd *__tmp = (cli);                                     \
-        CDEBUG(lvl, "%s: grant { dirty: %ld/%ld dirty_pages: %ld/%lu "        \
+        CDEBUG(lvl, "%s: grant { dirty: %lu/%lu dirty_pages: %ld/%lu "        \
                "dropped: %ld avail: %ld, reserved: %ld, flight: %d }"         \
                "lru {in list: %ld, left: %ld, waiters: %d }" fmt "\n",        \
-               __tmp->cl_import->imp_obd->obd_name,                           \
+               cli_name(__tmp),                                               \
                __tmp->cl_dirty_pages, __tmp->cl_dirty_max_pages,              \
                atomic_long_read(&obd_dirty_pages), obd_max_dirty_pages,       \
                __tmp->cl_lost_grant, __tmp->cl_avail_grant,                   \
@@ -1627,7 +1614,7 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,
                 osc_io_unplug_async(env, cli, NULL);
 
                 CDEBUG(D_CACHE, "%s: sleeping for cache space @ %p for %p\n",
-                       cli->cl_import->imp_obd->obd_name, &ocw, oap);
+                       cli_name(cli), &ocw, oap);
 
                 rc = l_wait_event(ocw.ocw_waitq, ocw_granted(cli, &ocw), &lwi);
 
@@ -1671,7 +1658,7 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,
                 break;
         default:
                 CDEBUG(D_CACHE, "%s: event for cache space @ %p never arrived due to %d, fall back to sync i/o\n",
-                       cli->cl_import->imp_obd->obd_name, &ocw, rc);
+                       cli_name(cli), &ocw, rc);
                 break;
         }
 out:
@@ -1931,7 +1918,8 @@ static int try_to_add_extent_for_io(struct client_obd *cli,
                 }
 
                 if (tmp->oe_srvlock != ext->oe_srvlock ||
-                    !tmp->oe_grants != !ext->oe_grants)
+                    !tmp->oe_grants != !ext->oe_grants ||
+                    tmp->oe_no_merge || ext->oe_no_merge)
                         return 0;
 
                 /* remove break for strict check */
@@ -2250,14 +2238,9 @@ static int osc_io_unplug0(const struct lu_env *env, struct client_obd *cli,
                 return 0;
 
         if (!async) {
-                /* disable osc_lru_shrink() temporarily to avoid
-                 * potential stack overrun problem. LU-2859
-                 */
-                atomic_inc(&cli->cl_lru_shrinkers);
                 spin_lock(&cli->cl_loi_list_lock);
                 osc_check_rpcs(env, cli);
                 spin_unlock(&cli->cl_loi_list_lock);
-                atomic_dec(&cli->cl_lru_shrinkers);
         } else {
                 CDEBUG(D_CACHE, "Queue writeback work for client %p.\n", cli);
                 LASSERT(cli->cl_writeback_work);
@@ -2479,7 +2462,6 @@ int osc_teardown_async_page(const struct lu_env *env,
                             struct osc_object *obj, struct osc_page *ops)
 {
         struct osc_async_page *oap = &ops->ops_oap;
-        struct osc_extent *ext = NULL;
         int rc = 0;
 
         LASSERT(oap->oap_magic == OAP_MAGIC);
@@ -2487,12 +2469,15 @@ int osc_teardown_async_page(const struct lu_env *env,
         CDEBUG(D_INFO, "teardown oap %p page %p at index %lu.\n",
                oap, ops, osc_index(oap2osc(oap)));
 
-        osc_object_lock(obj);
         if (!list_empty(&oap->oap_rpc_item)) {
                 CDEBUG(D_CACHE, "oap %p is not in cache.\n", oap);
                 rc = -EBUSY;
         } else if (!list_empty(&oap->oap_pending_item)) {
+                struct osc_extent *ext = NULL;
+
+                osc_object_lock(obj);
                 ext = osc_extent_lookup(obj, osc_index(oap2osc(oap)));
+                osc_object_unlock(obj);
                 /* only truncated pages are allowed to be taken out.
                  * See osc_extent_truncate() and osc_cache_truncate_start()
                  * for details.
@@ -2502,10 +2487,9 @@ int osc_teardown_async_page(const struct lu_env *env,
                                         osc_index(oap2osc(oap)));
                         rc = -EBUSY;
                 }
+                if (ext)
+                        osc_extent_put(env, ext);
         }
-        osc_object_unlock(obj);
-        if (ext)
-                osc_extent_put(env, ext);
         return rc;
 }
 
@@ -2666,11 +2650,13 @@ int osc_queue_sync_pages(const struct lu_env *env, struct osc_object *obj,
         struct osc_async_page *oap, *tmp;
         int page_count = 0;
         int mppr = cli->cl_max_pages_per_rpc;
+        bool can_merge = true;
         pgoff_t start = CL_PAGE_EOF;
         pgoff_t end = 0;
 
         list_for_each_entry(oap, list, oap_pending_item) {
-                pgoff_t index = osc_index(oap2osc(oap));
+                struct osc_page *opg = oap2osc_page(oap);
+                pgoff_t index = osc_index(opg);
 
                 if (index > end)
                         end = index;
@@ -2678,6 +2664,9 @@ int osc_queue_sync_pages(const struct lu_env *env, struct osc_object *obj,
                         start = index;
                 ++page_count;
                 mppr <<= (page_count > mppr);
+
+                if (unlikely(opg->ops_from > 0 || opg->ops_to < PAGE_SIZE))
+                        can_merge = false;
         }
 
         ext = osc_extent_alloc(obj);
@@ -2691,6 +2680,7 @@ int osc_queue_sync_pages(const struct lu_env *env, struct osc_object *obj,
 
         ext->oe_rw = !!(cmd & OBD_BRW_READ);
         ext->oe_sync = 1;
+        ext->oe_no_merge = !can_merge;
         ext->oe_urgent = 1;
         ext->oe_start = start;
         ext->oe_end = end;
@@ -3158,7 +3148,8 @@ static int check_and_discard_cb(const struct lu_env *env, struct cl_io *io,
                 struct cl_page *page = ops->ops_cl.cpl_page;
 
                 /* refresh non-overlapped index */
-                tmp = osc_dlmlock_at_pgoff(env, osc, index, 0, 0);
+                tmp = osc_dlmlock_at_pgoff(env, osc, index,
+                                           OSC_DAP_FL_TEST_LOCK);
                 if (tmp) {
                         __u64 end = tmp->l_policy_data.l_extent.end;
                         /* Cache the first-non-overlapped index so as to skip
diff --git a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
index 9c8de15c309c..cce55a9689f0 100644
--- a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
+++ b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
@@ -77,7 +77,6 @@ struct osc_io {
 
         /** write osc_lock for this IO, used by osc_extent_find(). */
         struct osc_lock   *oi_write_osclock;
-        struct obd_info    oi_info;
         struct obdo     oi_oa;
         struct osc_async_cbargs {
                 bool              opc_rpc_sent;
@@ -87,13 +86,6 @@ struct osc_io {
 };
 
 /**
- * State of transfer for osc.
- */
-struct osc_req {
-        struct cl_req_slice    or_cl;
-};
-
-/**
  * State maintained by osc layer for the duration of a system call.
  */
 struct osc_session {
@@ -103,7 +95,7 @@ struct osc_session {
 #define OTI_PVEC_SIZE 256
 struct osc_thread_info {
         struct ldlm_res_id      oti_resname;
-        ldlm_policy_data_t      oti_policy;
+        union ldlm_policy_data  oti_policy;
         struct cl_lock_descr    oti_descr;
         struct cl_attr    oti_attr;
         struct lustre_handle    oti_handle;
@@ -116,6 +108,7 @@ struct osc_thread_info {
         pgoff_t                 oti_next_index;
         pgoff_t                 oti_fn_index; /* first non-overlapped index */
         struct cl_sync_io       oti_anchor;
+        struct cl_req_attr      oti_req_attr;
 };
 
 struct osc_object {
@@ -127,16 +120,6 @@ struct osc_object {
         int             oo_contended;
         unsigned long    oo_contention_time;
         /**
-         * List of pages in transfer.
-         */
-        struct list_head         oo_inflight[CRT_NR];
-        /**
-         * Lock, protecting osc_page::ops_inflight, because a seat-belt is
-         * locked during take-off and landing.
-         */
-        spinlock_t         oo_seatbelt;
-
-        /**
          * used by the osc to keep track of what objects to build into rpcs.
          * Protected by client_obd->cli_loi_list_lock.
          */
@@ -364,15 +347,6 @@ struct osc_page {
          */
         struct list_head              ops_lru;
         /**
-         * Linkage into a per-osc_object list of pages in flight. For
-         * debugging.
-         */
-        struct list_head            ops_inflight;
-        /**
-         * Thread that submitted this page for transfer. For debugging.
-         */
-        struct task_struct      *ops_submitter;
-        /**
          * Submit time - the time when the page is starting RPC. For debugging.
          */
         unsigned long       ops_submit_time;
@@ -382,7 +356,6 @@ extern struct kmem_cache *osc_lock_kmem;
 extern struct kmem_cache *osc_object_kmem;
 extern struct kmem_cache *osc_thread_kmem;
 extern struct kmem_cache *osc_session_kmem;
-extern struct kmem_cache *osc_req_kmem;
 extern struct kmem_cache *osc_extent_kmem;
 
 extern struct lu_device_type osc_device_type;
@@ -396,15 +369,14 @@ int osc_lock_init(const struct lu_env *env,
                   const struct cl_io *io);
 int osc_io_init(const struct lu_env *env,
                 struct cl_object *obj, struct cl_io *io);
-int osc_req_init(const struct lu_env *env, struct cl_device *dev,
-                 struct cl_req *req);
 struct lu_object *osc_object_alloc(const struct lu_env *env,
                                    const struct lu_object_header *hdr,
                                    struct lu_device *dev);
 int osc_page_init(const struct lu_env *env, struct cl_object *obj,
                   struct cl_page *page, pgoff_t ind);
 
-void osc_index2policy(ldlm_policy_data_t *policy, const struct cl_object *obj,
+void osc_index2policy(union ldlm_policy_data *policy,
+                      const struct cl_object *obj,
                       pgoff_t start, pgoff_t end);
 int osc_lvb_print(const struct lu_env *env, void *cookie,
                   lu_printer_t p, const struct ost_lvb *lvb);
@@ -554,6 +526,16 @@ static inline struct osc_page *oap2osc_page(struct osc_async_page *oap)
         return (struct osc_page *)container_of(oap, struct osc_page, ops_oap);
 }
 
+static inline struct osc_page *
+osc_cl_page_osc(struct cl_page *page, struct osc_object *osc)
+{
+        const struct cl_page_slice *slice;
+
+        LASSERT(osc);
+        slice = cl_object_page_slice(&osc->oo_cl, page);
+        return cl2osc_page(slice);
+}
+
 static inline struct osc_lock *cl2osc_lock(const struct cl_lock_slice *slice)
 {
         LINVRNT(osc_is_object(&slice->cls_obj->co_lu));
@@ -615,6 +597,10 @@ struct osc_extent {
                            oe_rw:1,
         /** sync extent, queued by osc_queue_sync_pages() */
                                 oe_sync:1,
+        /** set if this extent has partial, sync pages.
+         * Extents with partial page(s) can't merge with others in RPC
+         */
+                                oe_no_merge:1,
                            oe_srvlock:1,
                            oe_memalloc:1,
         /** an ACTIVE extent is going to be truncated, so when this extent
diff --git a/drivers/staging/lustre/lustre/osc/osc_dev.c b/drivers/staging/lustre/lustre/osc/osc_dev.c
index 83d30c135ba4..c5d62aeaeab5 100644
--- a/drivers/staging/lustre/lustre/osc/osc_dev.c
+++ b/drivers/staging/lustre/lustre/osc/osc_dev.c
@@ -29,7 +29,7 @@
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  *
- * Implementation of cl_device, cl_req for OSC layer.
+ * Implementation of cl_device, for OSC layer.
  *
  *   Author: Nikita Danilov <nikita.danilov@sun.com>
  */
@@ -49,7 +49,6 @@ struct kmem_cache *osc_lock_kmem;
 struct kmem_cache *osc_object_kmem;
 struct kmem_cache *osc_thread_kmem;
 struct kmem_cache *osc_session_kmem;
-struct kmem_cache *osc_req_kmem;
 struct kmem_cache *osc_extent_kmem;
 struct kmem_cache *osc_quota_kmem;
 
@@ -75,11 +74,6 @@ struct lu_kmem_descr osc_caches[] = {
                 .ckd_size  = sizeof(struct osc_session)
         },
         {
-                .ckd_cache = &osc_req_kmem,
-                .ckd_name  = "osc_req_kmem",
-                .ckd_size  = sizeof(struct osc_req)
-        },
-        {
                 .ckd_cache = &osc_extent_kmem,
                 .ckd_name  = "osc_extent_kmem",
                 .ckd_size  = sizeof(struct osc_extent)
@@ -94,8 +88,6 @@ struct lu_kmem_descr osc_caches[] = {
         }
 };
 
-struct lock_class_key osc_ast_guard_class;
-
 /*****************************************************************************
  *
  * Type conversions.
@@ -178,10 +170,6 @@ static const struct lu_device_operations osc_lu_ops = {
         .ldo_recovery_complete = NULL
 };
 
-static const struct cl_device_operations osc_cl_ops = {
-        .cdo_req_init = osc_req_init
-};
-
 static int osc_device_init(const struct lu_env *env, struct lu_device *d,
                            const char *name, struct lu_device *next)
 {
@@ -220,7 +208,6 @@ static struct lu_device *osc_device_alloc(const struct lu_env *env,
         cl_device_init(&od->od_cl, t);
         d = osc2lu_dev(od);
         d->ld_ops = &osc_lu_ops;
-        od->od_cl.cd_ops = &osc_cl_ops;
 
         /* Setup OSC OBD */
         obd = class_name2obd(lustre_cfg_string(cfg, 0));
diff --git a/drivers/staging/lustre/lustre/osc/osc_internal.h b/drivers/staging/lustre/lustre/osc/osc_internal.h
index 67fe0a254991..688783dcc1e4 100644
--- a/drivers/staging/lustre/lustre/osc/osc_internal.h
+++ b/drivers/staging/lustre/lustre/osc/osc_internal.h
@@ -107,26 +107,24 @@ typedef int (*osc_enqueue_upcall_f)(void *cookie, struct lustre_handle *lockh,
                                     int rc);
 
 int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,
-                     __u64 *flags, ldlm_policy_data_t *policy,
+                     __u64 *flags, union ldlm_policy_data *policy,
                      struct ost_lvb *lvb, int kms_valid,
                      osc_enqueue_upcall_f upcall,
                      void *cookie, struct ldlm_enqueue_info *einfo,
                      struct ptlrpc_request_set *rqset, int async, int agl);
-int osc_cancel_base(struct lustre_handle *lockh, __u32 mode);
 
 int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id,
-                   __u32 type, ldlm_policy_data_t *policy, __u32 mode,
+                   __u32 type, union ldlm_policy_data *policy, __u32 mode,
                    __u64 *flags, void *data, struct lustre_handle *lockh,
                    int unref);
 
-int osc_setattr_async_base(struct obd_export *exp, struct obd_info *oinfo,
-                           struct obd_trans_info *oti,
-                           obd_enqueue_update_f upcall, void *cookie,
-                           struct ptlrpc_request_set *rqset);
-int osc_punch_base(struct obd_export *exp, struct obd_info *oinfo,
+int osc_setattr_async(struct obd_export *exp, struct obdo *oa,
+                      obd_enqueue_update_f upcall, void *cookie,
+                      struct ptlrpc_request_set *rqset);
+int osc_punch_base(struct obd_export *exp, struct obdo *oa,
                    obd_enqueue_update_f upcall, void *cookie,
                    struct ptlrpc_request_set *rqset);
-int osc_sync_base(struct obd_export *exp, struct obd_info *oinfo,
+int osc_sync_base(struct osc_object *exp, struct obdo *oa,
                   obd_enqueue_update_f upcall, void *cookie,
                   struct ptlrpc_request_set *rqset);
 
@@ -135,7 +133,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
                   struct list_head *ext_list, int cmd);
 long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli,
                     long target, bool force);
-long osc_lru_reclaim(struct client_obd *cli);
+long osc_lru_reclaim(struct client_obd *cli, unsigned long npages);
 
 unsigned long osc_ldlm_weigh_ast(struct ldlm_lock *dlmlock);
 
@@ -157,6 +155,11 @@ static inline unsigned long rpcs_in_flight(struct client_obd *cli)
         return cli->cl_r_in_flight + cli->cl_w_in_flight;
 }
 
+static inline char *cli_name(struct client_obd *cli)
+{
+        return cli->cl_import->imp_obd->obd_name;
+}
+
 struct osc_device {
         struct cl_device    od_cl;
         struct obd_export  *od_exp;
@@ -192,15 +195,27 @@ int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[],
 int osc_quota_chkdq(struct client_obd *cli, const unsigned int qid[]);
 int osc_quotactl(struct obd_device *unused, struct obd_export *exp,
                  struct obd_quotactl *oqctl);
-int osc_quotacheck(struct obd_device *unused, struct obd_export *exp,
-                   struct obd_quotactl *oqctl);
-int osc_quota_poll_check(struct obd_export *exp, struct if_quotacheck *qchk);
 void osc_inc_unstable_pages(struct ptlrpc_request *req);
 void osc_dec_unstable_pages(struct ptlrpc_request *req);
 bool osc_over_unstable_soft_limit(struct client_obd *cli);
 
+/**
+ * Bit flags for osc_dlm_lock_at_pageoff().
+ */
+enum osc_dap_flags {
+        /**
+         * Just check if the desired lock exists, it won't hold reference
+         * count on lock.
+         */
+        OSC_DAP_FL_TEST_LOCK    = BIT(0),
+        /**
+         * Return the lock even if it is being canceled.
+         */
+        OSC_DAP_FL_CANCELING    = BIT(1),
+};
+
 struct ldlm_lock *osc_dlmlock_at_pgoff(const struct lu_env *env,
                                        struct osc_object *obj, pgoff_t index,
-                                       int pending, int canceling);
+                                       enum osc_dap_flags flags);
 
 #endif /* OSC_INTERNAL_H */
diff --git a/drivers/staging/lustre/lustre/osc/osc_io.c b/drivers/staging/lustre/lustre/osc/osc_io.c
index 8a559cbcdd0c..228a97c098fe 100644
--- a/drivers/staging/lustre/lustre/osc/osc_io.c
+++ b/drivers/staging/lustre/lustre/osc/osc_io.c
@@ -49,12 +49,6 @@
  *
  */
 
-static struct osc_req *cl2osc_req(const struct cl_req_slice *slice)
-{
-        LINVRNT(slice->crs_dev->cd_lu_dev.ld_type == &osc_device_type);
-        return container_of0(slice, struct osc_req, or_cl);
-}
-
 static struct osc_io *cl2osc_io(const struct lu_env *env,
                                 const struct cl_io_slice *slice)
 {
@@ -64,20 +58,6 @@ static struct osc_io *cl2osc_io(const struct lu_env *env,
         return oio;
 }
 
-static struct osc_page *osc_cl_page_osc(struct cl_page *page,
-                                        struct osc_object *osc)
-{
-        const struct cl_page_slice *slice;
-
-        if (osc)
-                slice = cl_object_page_slice(&osc->oo_cl, page);
-        else
-                slice = cl_page_at(page, &osc_device_type);
-        LASSERT(slice);
-
-        return cl2osc_page(slice);
-}
-
 /*****************************************************************************
  *
  * io operations.
@@ -88,6 +68,45 @@ static void osc_io_fini(const struct lu_env *env, const struct cl_io_slice *io)
 {
 }
 
+static void osc_read_ahead_release(const struct lu_env *env, void *cbdata)
+{
+        struct ldlm_lock *dlmlock = cbdata;
+        struct lustre_handle lockh;
+
+        ldlm_lock2handle(dlmlock, &lockh);
+        ldlm_lock_decref(&lockh, LCK_PR);
+        LDLM_LOCK_PUT(dlmlock);
+}
+
+static int osc_io_read_ahead(const struct lu_env *env,
+                             const struct cl_io_slice *ios,
+                             pgoff_t start, struct cl_read_ahead *ra)
+{
+        struct osc_object *osc = cl2osc(ios->cis_obj);
+        struct ldlm_lock *dlmlock;
+        int result = -ENODATA;
+
+        dlmlock = osc_dlmlock_at_pgoff(env, osc, start, 0);
+        if (dlmlock) {
+                LASSERT(dlmlock->l_ast_data == osc);
+                if (dlmlock->l_req_mode != LCK_PR) {
+                        struct lustre_handle lockh;
+
+                        ldlm_lock2handle(dlmlock, &lockh);
+                        ldlm_lock_addref(&lockh, LCK_PR);
+                        ldlm_lock_decref(&lockh, dlmlock->l_req_mode);
+                }
+
+                ra->cra_end = cl_index(osc2cl(osc),
+                                       dlmlock->l_policy_data.l_extent.end);
+                ra->cra_release = osc_read_ahead_release;
+                ra->cra_cbdata = dlmlock;
+                result = 0;
+        }
+
+        return result;
+}
+
 /**
  * An implementation of cl_io_operations::cio_io_submit() method for osc
  * layer. Iterates over pages in the in-queue, prepares each for io by calling
@@ -334,7 +353,7 @@ static int osc_io_rw_iter_init(const struct lu_env *env,
                 npages = max_pages;
 
         c = atomic_long_read(cli->cl_lru_left);
-        if (c < npages && osc_lru_reclaim(cli) > 0)
+        if (c < npages && osc_lru_reclaim(cli, npages) > 0)
                 c = atomic_long_read(cli->cl_lru_left);
         while (c >= npages) {
                 if (c == atomic_long_cmpxchg(cli->cl_lru_left, c, c - npages)) {
@@ -343,6 +362,17 @@ static int osc_io_rw_iter_init(const struct lu_env *env,
                 }
                 c = atomic_long_read(cli->cl_lru_left);
         }
+        if (atomic_long_read(cli->cl_lru_left) < max_pages) {
+                /*
+                 * If there aren't enough pages in the per-OSC LRU then
+                 * wake up the LRU thread to try and clear out space, so
+                 * we don't block if pages are being dirtied quickly.
+                 */
+                CDEBUG(D_CACHE, "%s: queue LRU, left: %lu/%ld.\n",
+                       cli_name(cli), atomic_long_read(cli->cl_lru_left),
+                       max_pages);
+                (void)ptlrpcd_queue_work(cli->cl_lru_work);
+        }
 
         return 0;
 }
@@ -446,7 +476,6 @@ static int osc_io_setattr_start(const struct lu_env *env,
         __u64 size = io->u.ci_setattr.sa_attr.lvb_size;
         unsigned int ia_valid = io->u.ci_setattr.sa_valid;
         int result = 0;
-        struct obd_info oinfo = { };
 
         /* truncate cache dirty pages first */
         if (cl_io_is_trunc(io))
@@ -486,11 +515,19 @@ static int osc_io_setattr_start(const struct lu_env *env,
                 oa->o_oi = loi->loi_oi;
                 obdo_set_parent_fid(oa, io->u.ci_setattr.sa_parent_fid);
                 oa->o_stripe_idx = io->u.ci_setattr.sa_stripe_index;
-                oa->o_mtime = attr->cat_mtime;
-                oa->o_atime = attr->cat_atime;
-                oa->o_ctime = attr->cat_ctime;
-                oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGROUP | OBD_MD_FLATIME |
-                               OBD_MD_FLCTIME | OBD_MD_FLMTIME;
+                oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGROUP;
+                if (ia_valid & ATTR_CTIME) {
+                        oa->o_valid |= OBD_MD_FLCTIME;
+                        oa->o_ctime = attr->cat_ctime;
+                }
+                if (ia_valid & ATTR_ATIME) {
+                        oa->o_valid |= OBD_MD_FLATIME;
+                        oa->o_atime = attr->cat_atime;
+                }
+                if (ia_valid & ATTR_MTIME) {
+                        oa->o_valid |= OBD_MD_FLMTIME;
+                        oa->o_mtime = attr->cat_mtime;
+                }
                 if (ia_valid & ATTR_SIZE) {
                         oa->o_size = size;
                         oa->o_blocks = OBD_OBJECT_EOF;
@@ -503,19 +540,21 @@ static int osc_io_setattr_start(const struct lu_env *env,
                 } else {
                         LASSERT(oio->oi_lockless == 0);
                 }
+                if (ia_valid & ATTR_ATTR_FLAG) {
+                        oa->o_flags = io->u.ci_setattr.sa_attr_flags;
+                        oa->o_valid |= OBD_MD_FLFLAGS;
+                }
 
-                oinfo.oi_oa = oa;
                 init_completion(&cbargs->opc_sync);
 
                 if (ia_valid & ATTR_SIZE)
                         result = osc_punch_base(osc_export(cl2osc(obj)),
-                                                &oinfo, osc_async_upcall,
+                                                oa, osc_async_upcall,
                                                 cbargs, PTLRPCD_SET);
                 else
-                        result = osc_setattr_async_base(osc_export(cl2osc(obj)),
-                                                        &oinfo, NULL,
-                                                        osc_async_upcall,
-                                                        cbargs, PTLRPCD_SET);
+                        result = osc_setattr_async(osc_export(cl2osc(obj)),
+                                                   oa, osc_async_upcall,
+                                                   cbargs, PTLRPCD_SET);
                 cbargs->opc_rpc_sent = result == 0;
         }
         return result;
@@ -557,6 +596,107 @@ static void osc_io_setattr_end(const struct lu_env *env,
         }
 }
 
+struct osc_data_version_args {
+        struct osc_io *dva_oio;
+};
+
+static int
+osc_data_version_interpret(const struct lu_env *env, struct ptlrpc_request *req,
+                           void *arg, int rc)
+{
+        struct osc_data_version_args *dva = arg;
+        struct osc_io *oio = dva->dva_oio;
+        const struct ost_body *body;
+
+        if (rc < 0)
+                goto out;
+
+        body = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);
+        if (!body) {
+                rc = -EPROTO;
+                goto out;
+        }
+
+        lustre_get_wire_obdo(&req->rq_import->imp_connect_data, &oio->oi_oa,
+                             &body->oa);
+out:
+        oio->oi_cbarg.opc_rc = rc;
+        complete(&oio->oi_cbarg.opc_sync);
+
+        return 0;
+}
+
+static int osc_io_data_version_start(const struct lu_env *env,
+                                     const struct cl_io_slice *slice)
+{
+        struct cl_data_version_io *dv = &slice->cis_io->u.ci_data_version;
+        struct osc_io *oio = cl2osc_io(env, slice);
+        struct osc_async_cbargs *cbargs = &oio->oi_cbarg;
+        struct osc_object *obj = cl2osc(slice->cis_obj);
+        struct obd_export *exp = osc_export(obj);
+        struct lov_oinfo *loi = obj->oo_oinfo;
+        struct osc_data_version_args *dva;
+        struct obdo *oa = &oio->oi_oa;
+        struct ptlrpc_request *req;
+        struct ost_body *body;
+        int rc;
+
+        memset(oa, 0, sizeof(*oa));
+        oa->o_oi = loi->loi_oi;
+        oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
+
+        if (dv->dv_flags & (LL_DV_RD_FLUSH | LL_DV_WR_FLUSH)) {
+                oa->o_valid |= OBD_MD_FLFLAGS;
+                oa->o_flags |= OBD_FL_SRVLOCK;
+                if (dv->dv_flags & LL_DV_WR_FLUSH)
+                        oa->o_flags |= OBD_FL_FLUSH;
+        }
+
+        init_completion(&cbargs->opc_sync);
+
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_OST_GETATTR);
+        if (!req)
+                return -ENOMEM;
+
+        rc = ptlrpc_request_pack(req, LUSTRE_OST_VERSION, OST_GETATTR);
+        if (rc < 0) {
+                ptlrpc_request_free(req);
+                return rc;
+        }
+
+        body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
+        lustre_set_wire_obdo(&req->rq_import->imp_connect_data, &body->oa, oa);
+
+        ptlrpc_request_set_replen(req);
+        req->rq_interpret_reply = osc_data_version_interpret;
+        CLASSERT(sizeof(*dva) <= sizeof(req->rq_async_args));
+        dva = ptlrpc_req_async_args(req);
+        dva->dva_oio = oio;
+
+        ptlrpcd_add_req(req);
+
+        return 0;
+}
+
+static void osc_io_data_version_end(const struct lu_env *env,
+                                    const struct cl_io_slice *slice)
+{
+        struct cl_data_version_io *dv = &slice->cis_io->u.ci_data_version;
+        struct osc_io *oio = cl2osc_io(env, slice);
+        struct osc_async_cbargs *cbargs = &oio->oi_cbarg;
+
+        wait_for_completion(&cbargs->opc_sync);
+
+        if (cbargs->opc_rc) {
+                slice->cis_io->ci_result = cbargs->opc_rc;
+        } else if (!(oio->oi_oa.o_valid & OBD_MD_FLDATAVERSION)) {
+                slice->cis_io->ci_result = -EOPNOTSUPP;
+        } else {
+                dv->dv_data_version = oio->oi_oa.o_data_version;
+                slice->cis_io->ci_result = 0;
+        }
+}
+
 static int osc_io_read_start(const struct lu_env *env,
                              const struct cl_io_slice *slice)
 {
@@ -595,7 +735,6 @@ static int osc_fsync_ost(const struct lu_env *env, struct osc_object *obj,
 {
         struct osc_io *oio = osc_env_io(env);
         struct obdo *oa = &oio->oi_oa;
-        struct obd_info *oinfo = &oio->oi_info;
         struct lov_oinfo *loi = obj->oo_oinfo;
         struct osc_async_cbargs *cbargs = &oio->oi_cbarg;
         int rc = 0;
@@ -611,12 +750,9 @@ static int osc_fsync_ost(const struct lu_env *env, struct osc_object *obj,
 
         obdo_set_parent_fid(oa, fio->fi_fid);
 
-        memset(oinfo, 0, sizeof(*oinfo));
-        oinfo->oi_oa = oa;
         init_completion(&cbargs->opc_sync);
 
-        rc = osc_sync_base(osc_export(obj), oinfo, osc_async_upcall, cbargs,
-                           PTLRPCD_SET);
+        rc = osc_sync_base(obj, oa, osc_async_upcall, cbargs, PTLRPCD_SET);
         return rc;
 }
 
@@ -710,6 +846,10 @@ static const struct cl_io_operations osc_io_ops = {
                         .cio_start  = osc_io_setattr_start,
                         .cio_end    = osc_io_setattr_end
                 },
+                [CIT_DATA_VERSION] = {
+                        .cio_start      = osc_io_data_version_start,
+                        .cio_end        = osc_io_data_version_end,
+                },
                 [CIT_FAULT] = {
                         .cio_start  = osc_io_fault_start,
                         .cio_end    = osc_io_end,
@@ -724,6 +864,7 @@ static const struct cl_io_operations osc_io_ops = {
                         .cio_fini   = osc_io_fini
                 }
         },
+        .cio_read_ahead                 = osc_io_read_ahead,
         .cio_submit                 = osc_io_submit,
         .cio_commit_async           = osc_io_commit_async
 };
@@ -734,103 +875,6 @@ static const struct cl_io_operations osc_io_ops = {
  *
  */
 
-static int osc_req_prep(const struct lu_env *env,
-                        const struct cl_req_slice *slice)
-{
-        return 0;
-}
-
-static void osc_req_completion(const struct lu_env *env,
-                               const struct cl_req_slice *slice, int ioret)
-{
-        struct osc_req *or;
-
-        or = cl2osc_req(slice);
-        kmem_cache_free(osc_req_kmem, or);
-}
-
-/**
- * Implementation of struct cl_req_operations::cro_attr_set() for osc
- * layer. osc is responsible for struct obdo::o_id and struct obdo::o_seq
- * fields.
- */
-static void osc_req_attr_set(const struct lu_env *env,
-                             const struct cl_req_slice *slice,
-                             const struct cl_object *obj,
-                             struct cl_req_attr *attr, u64 flags)
-{
-        struct lov_oinfo *oinfo;
-        struct cl_req *clerq;
-        struct cl_page *apage; /* _some_ page in @clerq */
-        struct ldlm_lock *lock;  /* _some_ lock protecting @apage */
-        struct osc_page *opg;
-        struct obdo *oa;
-        struct ost_lvb *lvb;
-
-        oinfo = cl2osc(obj)->oo_oinfo;
-        lvb = &oinfo->loi_lvb;
-        oa = attr->cra_oa;
-
-        if ((flags & OBD_MD_FLMTIME) != 0) {
-                oa->o_mtime = lvb->lvb_mtime;
-                oa->o_valid |= OBD_MD_FLMTIME;
-        }
-        if ((flags & OBD_MD_FLATIME) != 0) {
-                oa->o_atime = lvb->lvb_atime;
-                oa->o_valid |= OBD_MD_FLATIME;
-        }
-        if ((flags & OBD_MD_FLCTIME) != 0) {
-                oa->o_ctime = lvb->lvb_ctime;
-                oa->o_valid |= OBD_MD_FLCTIME;
-        }
-        if (flags & OBD_MD_FLGROUP) {
-                ostid_set_seq(&oa->o_oi, ostid_seq(&oinfo->loi_oi));
-                oa->o_valid |= OBD_MD_FLGROUP;
-        }
-        if (flags & OBD_MD_FLID) {
-                ostid_set_id(&oa->o_oi, ostid_id(&oinfo->loi_oi));
-                oa->o_valid |= OBD_MD_FLID;
-        }
-        if (flags & OBD_MD_FLHANDLE) {
-                clerq = slice->crs_req;
-                LASSERT(!list_empty(&clerq->crq_pages));
-                apage = container_of(clerq->crq_pages.next,
-                                     struct cl_page, cp_flight);
-                opg = osc_cl_page_osc(apage, NULL);
-                lock = osc_dlmlock_at_pgoff(env, cl2osc(obj), osc_index(opg),
-                                            1, 1);
-                if (!lock && !opg->ops_srvlock) {
-                        struct ldlm_resource *res;
-                        struct ldlm_res_id *resname;
-
-                        CL_PAGE_DEBUG(D_ERROR, env, apage, "uncovered page!\n");
-
-                        resname = &osc_env_info(env)->oti_resname;
-                        ostid_build_res_name(&oinfo->loi_oi, resname);
-                        res = ldlm_resource_get(
-                                osc_export(cl2osc(obj))->exp_obd->obd_namespace,
-                                NULL, resname, LDLM_EXTENT, 0);
-                        ldlm_resource_dump(D_ERROR, res);
-
-                        dump_stack();
-                        LBUG();
-                }
-
-                /* check for lockless io. */
-                if (lock) {
-                        oa->o_handle = lock->l_remote_handle;
-                        oa->o_valid |= OBD_MD_FLHANDLE;
-                        LDLM_LOCK_PUT(lock);
-                }
-        }
-}
-
-static const struct cl_req_operations osc_req_ops = {
-        .cro_prep       = osc_req_prep,
-        .cro_attr_set   = osc_req_attr_set,
-        .cro_completion = osc_req_completion
-};
-
 int osc_io_init(const struct lu_env *env,
                 struct cl_object *obj, struct cl_io *io)
 {
@@ -841,20 +885,4 @@ int osc_io_init(const struct lu_env *env,
         return 0;
 }
 
-int osc_req_init(const struct lu_env *env, struct cl_device *dev,
-                 struct cl_req *req)
-{
-        struct osc_req *or;
-        int result;
-
-        or = kmem_cache_zalloc(osc_req_kmem, GFP_NOFS);
-        if (or) {
-                cl_req_slice_add(req, &or->or_cl, dev, &osc_req_ops);
-                result = 0;
-        } else {
-                result = -ENOMEM;
-        }
-        return result;
-}
-
 /** @} osc */
diff --git a/drivers/staging/lustre/lustre/osc/osc_lock.c b/drivers/staging/lustre/lustre/osc/osc_lock.c
index 39a8a5851603..5f799a4c78f9 100644
--- a/drivers/staging/lustre/lustre/osc/osc_lock.c
+++ b/drivers/staging/lustre/lustre/osc/osc_lock.c
@@ -145,7 +145,7 @@ static void osc_lock_fini(const struct lu_env *env,
 
 static void osc_lock_build_policy(const struct lu_env *env,
                                   const struct cl_lock *lock,
-                                  ldlm_policy_data_t *policy)
+                                  union ldlm_policy_data *policy)
 {
         const struct cl_lock_descr *d = &lock->cll_descr;
 
@@ -188,7 +188,7 @@ static void osc_lock_lvb_update(const struct lu_env *env,
         struct cl_object *obj = osc2cl(osc);
         struct lov_oinfo *oinfo = osc->oo_oinfo;
         struct cl_attr *attr = &osc_env_info(env)->oti_attr;
-        unsigned valid;
+        unsigned int valid;
 
         valid = CAT_BLOCKS | CAT_ATIME | CAT_CTIME | CAT_MTIME | CAT_SIZE;
         if (!lvb)
@@ -294,10 +294,10 @@ static int osc_lock_upcall(void *cookie, struct lustre_handle *lockh,
         struct osc_lock *oscl = cookie;
         struct cl_lock_slice *slice = &oscl->ols_cl;
         struct lu_env *env;
-        struct cl_env_nest nest;
         int rc;
+        int refcheck;
 
-        env = cl_env_nested_get(&nest);
+        env = cl_env_get(&refcheck);
         /* should never happen, similar to osc_ldlm_blocking_ast(). */
         LASSERT(!IS_ERR(env));
 
@@ -336,7 +336,7 @@ static int osc_lock_upcall(void *cookie, struct lustre_handle *lockh,
 
         if (oscl->ols_owner)
                 cl_sync_io_note(env, oscl->ols_owner, rc);
-        cl_env_nested_put(&nest, env);
+        cl_env_put(env, &refcheck);
 
         return rc;
 }
@@ -347,9 +347,9 @@ static int osc_lock_upcall_agl(void *cookie, struct lustre_handle *lockh,
         struct osc_object *osc = cookie;
         struct ldlm_lock *dlmlock;
         struct lu_env *env;
-        struct cl_env_nest nest;
+        int refcheck;
 
-        env = cl_env_nested_get(&nest);
+        env = cl_env_get(&refcheck);
         LASSERT(!IS_ERR(env));
 
         if (errcode == ELDLM_LOCK_MATCHED) {
@@ -374,7 +374,7 @@ static int osc_lock_upcall_agl(void *cookie, struct lustre_handle *lockh,
 
 out:
         cl_object_put(env, osc2cl(osc));
-        cl_env_nested_put(&nest, env);
+        cl_env_put(env, &refcheck);
         return ldlm_error2errno(errcode);
 }
 
@@ -382,11 +382,11 @@ static int osc_lock_flush(struct osc_object *obj, pgoff_t start, pgoff_t end,
                           enum cl_lock_mode mode, int discard)
 {
         struct lu_env *env;
-        struct cl_env_nest nest;
+        int refcheck;
         int rc = 0;
         int rc2 = 0;
 
-        env = cl_env_nested_get(&nest);
+        env = cl_env_get(&refcheck);
         if (IS_ERR(env))
                 return PTR_ERR(env);
 
@@ -404,7 +404,7 @@ static int osc_lock_flush(struct osc_object *obj, pgoff_t start, pgoff_t end,
         if (rc == 0 && rc2 < 0)
                 rc = rc2;
 
-        cl_env_nested_put(&nest, env);
+        cl_env_put(env, &refcheck);
         return rc;
 }
 
@@ -536,7 +536,7 @@ static int osc_ldlm_blocking_ast(struct ldlm_lock *dlmlock,
         }
         case LDLM_CB_CANCELING: {
                 struct lu_env *env;
-                struct cl_env_nest nest;
+                int refcheck;
 
                 /*
                  * This can be called in the context of outer IO, e.g.,
@@ -549,14 +549,14 @@ static int osc_ldlm_blocking_ast(struct ldlm_lock *dlmlock,
                  * new environment has to be created to not corrupt outer
                  * context.
                  */
-                env = cl_env_nested_get(&nest);
+                env = cl_env_get(&refcheck);
                 if (IS_ERR(env)) {
                         result = PTR_ERR(env);
                         break;
                 }
 
                 result = osc_dlm_blocking_ast0(env, dlmlock, data, flag);
-                cl_env_nested_put(&nest, env);
+                cl_env_put(env, &refcheck);
                 break;
                 }
         default:
@@ -568,61 +568,63 @@ static int osc_ldlm_blocking_ast(struct ldlm_lock *dlmlock,
 static int osc_ldlm_glimpse_ast(struct ldlm_lock *dlmlock, void *data)
 {
         struct ptlrpc_request *req = data;
-        struct cl_env_nest nest;
         struct lu_env *env;
         struct ost_lvb *lvb;
         struct req_capsule *cap;
+        struct cl_object *obj = NULL;
         int result;
+        int refcheck;
 
         LASSERT(lustre_msg_get_opc(req->rq_reqmsg) == LDLM_GL_CALLBACK);
 
-        env = cl_env_nested_get(&nest);
-        if (!IS_ERR(env)) {
-                struct cl_object *obj = NULL;
+        env = cl_env_get(&refcheck);
+        if (IS_ERR(env)) {
+                result = PTR_ERR(env);
+                goto out;
+        }
 
-                lock_res_and_lock(dlmlock);
-                if (dlmlock->l_ast_data) {
-                        obj = osc2cl(dlmlock->l_ast_data);
-                        cl_object_get(obj);
-                }
-                unlock_res_and_lock(dlmlock);
+        lock_res_and_lock(dlmlock);
+        if (dlmlock->l_ast_data) {
+                obj = osc2cl(dlmlock->l_ast_data);
+                cl_object_get(obj);
+        }
+        unlock_res_and_lock(dlmlock);
 
-                if (obj) {
-                        /* Do not grab the mutex of cl_lock for glimpse.
-                         * See LU-1274 for details.
-                         * BTW, it's okay for cl_lock to be cancelled during
-                         * this period because server can handle this race.
-                         * See ldlm_server_glimpse_ast() for details.
-                         * cl_lock_mutex_get(env, lock);
-                         */
-                        cap = &req->rq_pill;
-                        req_capsule_extend(cap, &RQF_LDLM_GL_CALLBACK);
-                        req_capsule_set_size(cap, &RMF_DLM_LVB, RCL_SERVER,
-                                             sizeof(*lvb));
-                        result = req_capsule_server_pack(cap);
-                        if (result == 0) {
-                                lvb = req_capsule_server_get(cap, &RMF_DLM_LVB);
-                                result = cl_object_glimpse(env, obj, lvb);
-                        }
-                        if (!exp_connect_lvb_type(req->rq_export))
-                                req_capsule_shrink(&req->rq_pill,
-                                                   &RMF_DLM_LVB,
-                                                   sizeof(struct ost_lvb_v1),
-                                                   RCL_SERVER);
-                        cl_object_put(env, obj);
-                } else {
-                        /*
-                         * These errors are normal races, so we don't want to
-                         * fill the console with messages by calling
-                         * ptlrpc_error()
-                         */
-                        lustre_pack_reply(req, 1, NULL, NULL);
-                        result = -ELDLM_NO_LOCK_DATA;
+        if (obj) {
+                /* Do not grab the mutex of cl_lock for glimpse.
+                 * See LU-1274 for details.
+                 * BTW, it's okay for cl_lock to be cancelled during
+                 * this period because server can handle this race.
+                 * See ldlm_server_glimpse_ast() for details.
+                 * cl_lock_mutex_get(env, lock);
+                 */
+                cap = &req->rq_pill;
+                req_capsule_extend(cap, &RQF_LDLM_GL_CALLBACK);
+                req_capsule_set_size(cap, &RMF_DLM_LVB, RCL_SERVER,
+                                     sizeof(*lvb));
+                result = req_capsule_server_pack(cap);
+                if (result == 0) {
+                        lvb = req_capsule_server_get(cap, &RMF_DLM_LVB);
+                        result = cl_object_glimpse(env, obj, lvb);
+                }
+                if (!exp_connect_lvb_type(req->rq_export)) {
+                        req_capsule_shrink(&req->rq_pill, &RMF_DLM_LVB,
+                                           sizeof(struct ost_lvb_v1),
+                                           RCL_SERVER);
                 }
-                cl_env_nested_put(&nest, env);
+                cl_object_put(env, obj);
         } else {
-                result = PTR_ERR(env);
+                /*
+                 * These errors are normal races, so we don't want to
+                 * fill the console with messages by calling
+                 * ptlrpc_error()
+                 */
+                lustre_pack_reply(req, 1, NULL, NULL);
+                result = -ELDLM_NO_LOCK_DATA;
         }
+        cl_env_put(env, &refcheck);
+
+out:
         req->rq_status = result;
         return result;
 }
@@ -677,12 +679,12 @@ static unsigned long osc_lock_weight(const struct lu_env *env,
  */
 unsigned long osc_ldlm_weigh_ast(struct ldlm_lock *dlmlock)
 {
-        struct cl_env_nest       nest;
         struct lu_env           *env;
         struct osc_object       *obj;
         struct osc_lock         *oscl;
         unsigned long            weight;
         bool                     found = false;
+        int refcheck;
 
         might_sleep();
         /*
@@ -692,7 +694,7 @@ unsigned long osc_ldlm_weigh_ast(struct ldlm_lock *dlmlock)
          * the upper context because cl_lock_put don't modify environment
          * variables. But just in case ..
          */
-        env = cl_env_nested_get(&nest);
+        env = cl_env_get(&refcheck);
         if (IS_ERR(env))
                 /* Mostly because lack of memory, do not eliminate this lock */
                 return 1;
@@ -722,7 +724,7 @@ unsigned long osc_ldlm_weigh_ast(struct ldlm_lock *dlmlock)
         weight = osc_lock_weight(env, obj, &dlmlock->l_policy_data.l_extent);
 
 out:
-        cl_env_nested_put(&nest, env);
+        cl_env_put(env, &refcheck);
         return weight;
 }
 
@@ -912,7 +914,7 @@ static int osc_lock_enqueue(const struct lu_env *env,
         struct osc_lock *oscl = cl2osc_lock(slice);
         struct cl_lock *lock = slice->cls_lock;
         struct ldlm_res_id *resname = &info->oti_resname;
-        ldlm_policy_data_t *policy = &info->oti_policy;
+        union ldlm_policy_data *policy = &info->oti_policy;
         osc_enqueue_upcall_f upcall = osc_lock_upcall;
         void *cookie = oscl;
         bool async = false;
@@ -1009,7 +1011,7 @@ static void osc_lock_detach(const struct lu_env *env, struct osc_lock *olck)
 
         if (olck->ols_hold) {
                 olck->ols_hold = 0;
-                osc_cancel_base(&olck->ols_handle, olck->ols_einfo.ei_mode);
+                ldlm_lock_decref(&olck->ols_handle, olck->ols_einfo.ei_mode);
                 olck->ols_handle.cookie = 0ULL;
         }
 
@@ -1180,11 +1182,11 @@ int osc_lock_init(const struct lu_env *env,
  */
 struct ldlm_lock *osc_dlmlock_at_pgoff(const struct lu_env *env,
                                        struct osc_object *obj, pgoff_t index,
-                                       int pending, int canceling)
+                                       enum osc_dap_flags dap_flags)
 {
         struct osc_thread_info *info = osc_env_info(env);
         struct ldlm_res_id *resname = &info->oti_resname;
-        ldlm_policy_data_t *policy  = &info->oti_policy;
+        union ldlm_policy_data *policy = &info->oti_policy;
         struct lustre_handle lockh;
         struct ldlm_lock *lock = NULL;
         enum ldlm_mode mode;
@@ -1194,17 +1196,18 @@ struct ldlm_lock *osc_dlmlock_at_pgoff(const struct lu_env *env,
         osc_index2policy(policy, osc2cl(obj), index, index);
         policy->l_extent.gid = LDLM_GID_ANY;
 
-        flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_TEST_LOCK;
-        if (pending)
-                flags |= LDLM_FL_CBPENDING;
+        flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_CBPENDING;
+        if (dap_flags & OSC_DAP_FL_TEST_LOCK)
+                flags |= LDLM_FL_TEST_LOCK;
+
         /*
          * It is fine to match any group lock since there could be only one
          * with a uniq gid and it conflicts with all other lock modes too
          */
 again:
-        mode = ldlm_lock_match(osc_export(obj)->exp_obd->obd_namespace,
-                               flags, resname, LDLM_EXTENT, policy,
-                               LCK_PR | LCK_PW | LCK_GROUP, &lockh, canceling);
+        mode = osc_match_base(osc_export(obj), resname, LDLM_EXTENT, policy,
+                              LCK_PR | LCK_PW | LCK_GROUP, &flags, obj, &lockh,
+                              dap_flags & OSC_DAP_FL_CANCELING);
         if (mode != 0) {
                 lock = ldlm_handle2lock(&lockh);
                 /* RACE: the lock is cancelled so let's try again */
diff --git a/drivers/staging/lustre/lustre/osc/osc_object.c b/drivers/staging/lustre/lustre/osc/osc_object.c
index aae3a2d4243f..e0c3324857dd 100644
--- a/drivers/staging/lustre/lustre/osc/osc_object.c
+++ b/drivers/staging/lustre/lustre/osc/osc_object.c
@@ -71,13 +71,8 @@ static int osc_object_init(const struct lu_env *env, struct lu_object *obj,
 {
         struct osc_object *osc = lu2osc(obj);
         const struct cl_object_conf *cconf = lu2cl_conf(conf);
-        int i;
 
         osc->oo_oinfo = cconf->u.coc_oinfo;
-        spin_lock_init(&osc->oo_seatbelt);
-        for (i = 0; i < CRT_NR; ++i)
-                INIT_LIST_HEAD(&osc->oo_inflight[i]);
-
         INIT_LIST_HEAD(&osc->oo_ready_item);
         INIT_LIST_HEAD(&osc->oo_hp_ready_item);
         INIT_LIST_HEAD(&osc->oo_write_item);
@@ -103,10 +98,6 @@ static int osc_object_init(const struct lu_env *env, struct lu_object *obj,
 static void osc_object_free(const struct lu_env *env, struct lu_object *obj)
 {
         struct osc_object *osc = lu2osc(obj);
-        int i;
-
-        for (i = 0; i < CRT_NR; ++i)
-                LASSERT(list_empty(&osc->oo_inflight[i]));
 
         LASSERT(list_empty(&osc->oo_ready_item));
         LASSERT(list_empty(&osc->oo_hp_ready_item));
@@ -218,6 +209,94 @@ static int osc_object_prune(const struct lu_env *env, struct cl_object *obj)
         return 0;
 }
 
+static int osc_object_fiemap(const struct lu_env *env, struct cl_object *obj,
+                             struct ll_fiemap_info_key *fmkey,
+                             struct fiemap *fiemap, size_t *buflen)
+{
+        struct obd_export *exp = osc_export(cl2osc(obj));
+        union ldlm_policy_data policy;
+        struct ptlrpc_request *req;
+        struct lustre_handle lockh;
+        struct ldlm_res_id resid;
+        enum ldlm_mode mode = 0;
+        struct fiemap *reply;
+        char *tmp;
+        int rc;
+
+        fmkey->lfik_oa.o_oi = cl2osc(obj)->oo_oinfo->loi_oi;
+        if (!(fmkey->lfik_fiemap.fm_flags & FIEMAP_FLAG_SYNC))
+                goto skip_locking;
+
+        policy.l_extent.start = fmkey->lfik_fiemap.fm_start & PAGE_MASK;
+
+        if (OBD_OBJECT_EOF - fmkey->lfik_fiemap.fm_length <=
+            fmkey->lfik_fiemap.fm_start + PAGE_SIZE - 1)
+                policy.l_extent.end = OBD_OBJECT_EOF;
+        else
+                policy.l_extent.end = (fmkey->lfik_fiemap.fm_start +
+                                       fmkey->lfik_fiemap.fm_length +
+                                       PAGE_SIZE - 1) & PAGE_MASK;
+
+        ostid_build_res_name(&fmkey->lfik_oa.o_oi, &resid);
+        mode = ldlm_lock_match(exp->exp_obd->obd_namespace,
+                               LDLM_FL_BLOCK_GRANTED | LDLM_FL_LVB_READY,
+                               &resid, LDLM_EXTENT, &policy,
+                               LCK_PR | LCK_PW, &lockh, 0);
+        if (mode) { /* lock is cached on client */
+                if (mode != LCK_PR) {
+                        ldlm_lock_addref(&lockh, LCK_PR);
+                        ldlm_lock_decref(&lockh, LCK_PW);
+                }
+        } else { /* no cached lock, needs acquire lock on server side */
+                fmkey->lfik_oa.o_valid |= OBD_MD_FLFLAGS;
+                fmkey->lfik_oa.o_flags |= OBD_FL_SRVLOCK;
+        }
+
+skip_locking:
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp),
+                                   &RQF_OST_GET_INFO_FIEMAP);
+        if (!req) {
+                rc = -ENOMEM;
+                goto drop_lock;
+        }
+
+        req_capsule_set_size(&req->rq_pill, &RMF_FIEMAP_KEY, RCL_CLIENT,
+                             sizeof(*fmkey));
+        req_capsule_set_size(&req->rq_pill, &RMF_FIEMAP_VAL, RCL_CLIENT,
+                             *buflen);
+        req_capsule_set_size(&req->rq_pill, &RMF_FIEMAP_VAL, RCL_SERVER,
+                             *buflen);
+
+        rc = ptlrpc_request_pack(req, LUSTRE_OST_VERSION, OST_GET_INFO);
+        if (rc) {
+                ptlrpc_request_free(req);
+                goto drop_lock;
+        }
+        tmp = req_capsule_client_get(&req->rq_pill, &RMF_FIEMAP_KEY);
+        memcpy(tmp, fmkey, sizeof(*fmkey));
+        tmp = req_capsule_client_get(&req->rq_pill, &RMF_FIEMAP_VAL);
+        memcpy(tmp, fiemap, *buflen);
+        ptlrpc_request_set_replen(req);
+
+        rc = ptlrpc_queue_wait(req);
+        if (rc)
+                goto fini_req;
+
+        reply = req_capsule_server_get(&req->rq_pill, &RMF_FIEMAP_VAL);
+        if (!reply) {
+                rc = -EPROTO;
+                goto fini_req;
+        }
+
+        memcpy(fiemap, reply, *buflen);
+fini_req:
+        ptlrpc_req_finished(req);
+drop_lock:
+        if (mode)
+                ldlm_lock_decref(&lockh, LCK_PR);
+        return rc;
+}
+
 void osc_object_set_contended(struct osc_object *obj)
 {
         obj->oo_contention_time = cfs_time_current();
@@ -256,6 +335,76 @@ int osc_object_is_contended(struct osc_object *obj)
         return 1;
 }
 
+/**
+ * Implementation of struct cl_object_operations::coo_req_attr_set() for osc
+ * layer. osc is responsible for struct obdo::o_id and struct obdo::o_seq
+ * fields.
+ */
+static void osc_req_attr_set(const struct lu_env *env, struct cl_object *obj,
+                             struct cl_req_attr *attr)
+{
+        u64 flags = attr->cra_flags;
+        struct lov_oinfo *oinfo;
+        struct ost_lvb *lvb;
+        struct obdo *oa;
+
+        oinfo = cl2osc(obj)->oo_oinfo;
+        lvb = &oinfo->loi_lvb;
+        oa = attr->cra_oa;
+
+        if (flags & OBD_MD_FLMTIME) {
+                oa->o_mtime = lvb->lvb_mtime;
+                oa->o_valid |= OBD_MD_FLMTIME;
+        }
+        if (flags & OBD_MD_FLATIME) {
+                oa->o_atime = lvb->lvb_atime;
+                oa->o_valid |= OBD_MD_FLATIME;
+        }
+        if (flags & OBD_MD_FLCTIME) {
+                oa->o_ctime = lvb->lvb_ctime;
+                oa->o_valid |= OBD_MD_FLCTIME;
+        }
+        if (flags & OBD_MD_FLGROUP) {
+                ostid_set_seq(&oa->o_oi, ostid_seq(&oinfo->loi_oi));
+                oa->o_valid |= OBD_MD_FLGROUP;
+        }
+        if (flags & OBD_MD_FLID) {
+                ostid_set_id(&oa->o_oi, ostid_id(&oinfo->loi_oi));
+                oa->o_valid |= OBD_MD_FLID;
+        }
+        if (flags & OBD_MD_FLHANDLE) {
+                struct ldlm_lock *lock;
+                struct osc_page *opg;
+
+                opg = osc_cl_page_osc(attr->cra_page, cl2osc(obj));
+                lock = osc_dlmlock_at_pgoff(env, cl2osc(obj), osc_index(opg),
+                                            OSC_DAP_FL_TEST_LOCK | OSC_DAP_FL_CANCELING);
+                if (!lock && !opg->ops_srvlock) {
+                        struct ldlm_resource *res;
+                        struct ldlm_res_id *resname;
+
+                        CL_PAGE_DEBUG(D_ERROR, env, attr->cra_page,
+                                      "uncovered page!\n");
+
+                        resname = &osc_env_info(env)->oti_resname;
+                        ostid_build_res_name(&oinfo->loi_oi, resname);
+                        res = ldlm_resource_get(
+                                osc_export(cl2osc(obj))->exp_obd->obd_namespace,
+                                NULL, resname, LDLM_EXTENT, 0);
+                        ldlm_resource_dump(D_ERROR, res);
+
+                        LBUG();
+                }
+
+                /* check for lockless io. */
+                if (lock) {
+                        oa->o_handle = lock->l_remote_handle;
+                        oa->o_valid |= OBD_MD_FLHANDLE;
+                        LDLM_LOCK_PUT(lock);
+                }
+        }
+}
+
 static const struct cl_object_operations osc_ops = {
         .coo_page_init = osc_page_init,
         .coo_lock_init = osc_lock_init,
@@ -263,7 +412,9 @@ static const struct cl_object_operations osc_ops = {
         .coo_attr_get  = osc_attr_get,
         .coo_attr_update = osc_attr_update,
         .coo_glimpse   = osc_object_glimpse,
-        .coo_prune     = osc_object_prune
+        .coo_prune       = osc_object_prune,
+        .coo_fiemap             = osc_object_fiemap,
+        .coo_req_attr_set       = osc_req_attr_set
 };
 
 static const struct lu_object_operations osc_lu_obj_ops = {
diff --git a/drivers/staging/lustre/lustre/osc/osc_page.c b/drivers/staging/lustre/lustre/osc/osc_page.c
index 2a7a70aa9e80..e356e4af08e1 100644
--- a/drivers/staging/lustre/lustre/osc/osc_page.c
+++ b/drivers/staging/lustre/lustre/osc/osc_page.c
@@ -37,6 +37,7 @@
 
 #define DEBUG_SUBSYSTEM S_OSC
 
+#include <linux/math64.h>
 #include "osc_cl_internal.h"
 
 static void osc_lru_del(struct client_obd *cli, struct osc_page *opg);
@@ -86,11 +87,6 @@ static void osc_page_transfer_add(const struct lu_env *env,
         struct osc_object *obj = cl2osc(opg->ops_cl.cpl_obj);
 
         osc_lru_use(osc_cli(obj), opg);
-
-        spin_lock(&obj->oo_seatbelt);
-        list_add(&opg->ops_inflight, &obj->oo_inflight[crt]);
-        opg->ops_submitter = current;
-        spin_unlock(&obj->oo_seatbelt);
 }
 
 int osc_page_cache_add(const struct lu_env *env,
@@ -109,7 +105,8 @@ int osc_page_cache_add(const struct lu_env *env,
         return result;
 }
 
-void osc_index2policy(ldlm_policy_data_t *policy, const struct cl_object *obj,
+void osc_index2policy(union ldlm_policy_data *policy,
+                      const struct cl_object *obj,
                       pgoff_t start, pgoff_t end)
 {
         memset(policy, 0, sizeof(*policy));
@@ -117,25 +114,6 @@ void osc_index2policy(ldlm_policy_data_t *policy, const struct cl_object *obj,
         policy->l_extent.end = cl_offset(obj, end + 1) - 1;
 }
 
-static int osc_page_is_under_lock(const struct lu_env *env,
-                                  const struct cl_page_slice *slice,
-                                  struct cl_io *unused, pgoff_t *max_index)
-{
-        struct osc_page *opg = cl2osc_page(slice);
-        struct ldlm_lock *dlmlock;
-        int result = -ENODATA;
-
-        dlmlock = osc_dlmlock_at_pgoff(env, cl2osc(slice->cpl_obj),
-                                       osc_index(opg), 1, 0);
-        if (dlmlock) {
-                *max_index = cl_index(slice->cpl_obj,
-                                      dlmlock->l_policy_data.l_extent.end);
-                LDLM_LOCK_PUT(dlmlock);
-                result = 0;
-        }
-        return result;
-}
-
 static const char *osc_list(struct list_head *head)
 {
         return list_empty(head) ? "-" : "+";
@@ -158,7 +136,7 @@ static int osc_page_print(const struct lu_env *env,
         struct osc_object *obj = cl2osc(slice->cpl_obj);
         struct client_obd *cli = &osc_export(obj)->exp_obd->u.cli;
 
-        return (*printer)(env, cookie, LUSTRE_OSC_NAME "-page@%p %lu: 1< %#x %d %u %s %s > 2< %llu %u %u %#x %#x | %p %p %p > 3< %s %p %d %lu %d > 4< %d %d %d %lu %s | %s %s %s %s > 5< %s %s %s %s | %d %s | %d %s %s>\n",
+        return (*printer)(env, cookie, LUSTRE_OSC_NAME "-page@%p %lu: 1< %#x %d %u %s %s > 2< %llu %u %u %#x %#x | %p %p %p > 3< %d %lu %d > 4< %d %d %d %lu %s | %s %s %s %s > 5< %s %s %s %s | %d %s | %d %s %s>\n",
                           opg, osc_index(opg),
                           /* 1 */
                           oap->oap_magic, oap->oap_cmd,
@@ -170,8 +148,7 @@ static int osc_page_print(const struct lu_env *env,
                           oap->oap_async_flags, oap->oap_brw_flags,
                           oap->oap_request, oap->oap_cli, obj,
                           /* 3 */
-                          osc_list(&opg->ops_inflight),
-                          opg->ops_submitter, opg->ops_transfer_pinned,
+                          opg->ops_transfer_pinned,
                           osc_submit_duration(opg), opg->ops_srvlock,
                           /* 4 */
                           cli->cl_r_in_flight, cli->cl_w_in_flight,
@@ -210,14 +187,6 @@ static void osc_page_delete(const struct lu_env *env,
                 LASSERT(0);
         }
 
-        spin_lock(&obj->oo_seatbelt);
-        if (opg->ops_submitter) {
-                LASSERT(!list_empty(&opg->ops_inflight));
-                list_del_init(&opg->ops_inflight);
-                opg->ops_submitter = NULL;
-        }
-        spin_unlock(&obj->oo_seatbelt);
-
         osc_lru_del(osc_cli(obj), opg);
 
         if (slice->cpl_page->cp_type == CPT_CACHEABLE) {
@@ -276,7 +245,6 @@ static int osc_page_flush(const struct lu_env *env,
 static const struct cl_page_operations osc_page_ops = {
         .cpo_print       = osc_page_print,
         .cpo_delete     = osc_page_delete,
-        .cpo_is_under_lock = osc_page_is_under_lock,
         .cpo_clip          = osc_page_clip,
         .cpo_cancel      = osc_page_cancel,
         .cpo_flush        = osc_page_flush
@@ -301,10 +269,6 @@ int osc_page_init(const struct lu_env *env, struct cl_object *obj,
                 cl_page_slice_add(page, &opg->ops_cl, obj, index,
                                   &osc_page_ops);
         }
-        /* ops_inflight and ops_lru are the same field, but it doesn't
-         * hurt to initialize it twice :-)
-         */
-        INIT_LIST_HEAD(&opg->ops_inflight);
         INIT_LIST_HEAD(&opg->ops_lru);
 
         /* reserve an LRU space for this page */
@@ -362,16 +326,27 @@ void osc_page_submit(const struct lu_env *env, struct osc_page *opg,
  * OSC to free slots voluntarily to maintain a reasonable number of free slots
  * at any time.
  */
-
 static DECLARE_WAIT_QUEUE_HEAD(osc_lru_waitq);
-/* LRU pages are freed in batch mode. OSC should at least free this
- * number of pages to avoid running out of LRU budget, and..
+
+/**
+ * LRU pages are freed in batch mode. OSC should at least free this
+ * number of pages to avoid running out of LRU slots.
+ */
+static inline int lru_shrink_min(struct client_obd *cli)
+{
+        return cli->cl_max_pages_per_rpc * 2;
+}
+
+/**
+ * free this number at most otherwise it will take too long time to finish.
  */
-static const int lru_shrink_min = 2 << (20 - PAGE_SHIFT);  /* 2M */
-/* free this number at most otherwise it will take too long time to finish. */
-static const int lru_shrink_max = 8 << (20 - PAGE_SHIFT); /* 8M */
+static inline int lru_shrink_max(struct client_obd *cli)
+{
+        return cli->cl_max_pages_per_rpc * cli->cl_max_rpcs_in_flight;
+}
 
-/* Check if we can free LRU slots from this OSC. If there exists LRU waiters,
+/**
+ * Check if we can free LRU slots from this OSC. If there exists LRU waiters,
  * we should free slots aggressively. In this way, slots are freed in a steady
  * step to maintain fairness among OSCs.
  *
@@ -388,13 +363,20 @@ static int osc_cache_too_much(struct client_obd *cli)
         /* if it's going to run out LRU slots, we should free some, but not
          * too much to maintain fairness among OSCs.
          */
-        if (atomic_long_read(cli->cl_lru_left) < cache->ccc_lru_max >> 4) {
+        if (atomic_long_read(cli->cl_lru_left) < cache->ccc_lru_max >> 2) {
                 if (pages >= budget)
-                        return lru_shrink_max;
+                        return lru_shrink_max(cli);
                 else if (pages >= budget / 2)
-                        return lru_shrink_min;
-        } else if (pages >= budget * 2) {
-                return lru_shrink_min;
+                        return lru_shrink_min(cli);
+        } else {
+                time64_t duration = ktime_get_real_seconds();
+
+                /* knock out pages by duration of no IO activity */
+                duration -= cli->cl_lru_last_used;
+                duration >>= 6; /* approximately 1 minute */
+                if (duration > 0 &&
+                    pages >= div64_s64((s64)budget, duration))
+                        return lru_shrink_min(cli);
         }
         return 0;
 }
@@ -402,11 +384,21 @@ static int osc_cache_too_much(struct client_obd *cli)
 int lru_queue_work(const struct lu_env *env, void *data)
 {
         struct client_obd *cli = data;
+        int count;
 
-        CDEBUG(D_CACHE, "Run LRU work for client obd %p.\n", cli);
+        CDEBUG(D_CACHE, "%s: run LRU work for client obd\n", cli_name(cli));
 
-        if (osc_cache_too_much(cli))
-                osc_lru_shrink(env, cli, lru_shrink_max, true);
+        count = osc_cache_too_much(cli);
+        if (count > 0) {
+                int rc = osc_lru_shrink(env, cli, count, false);
+
+                CDEBUG(D_CACHE, "%s: shrank %d/%d pages from client obd\n",
+                       cli_name(cli), rc, count);
+                if (rc >= count) {
+                        CDEBUG(D_CACHE, "%s: queue again\n", cli_name(cli));
+                        ptlrpcd_queue_work(cli->cl_lru_work);
+                }
+        }
 
         return 0;
 }
@@ -433,10 +425,10 @@ void osc_lru_add_batch(struct client_obd *cli, struct list_head *plist)
                 list_splice_tail(&lru, &cli->cl_lru_list);
                 atomic_long_sub(npages, &cli->cl_lru_busy);
                 atomic_long_add(npages, &cli->cl_lru_in_list);
+                cli->cl_lru_last_used = ktime_get_real_seconds();
                 spin_unlock(&cli->cl_lru_list_lock);
 
-                /* XXX: May set force to be true for better performance */
-                if (osc_cache_too_much(cli))
+                if (waitqueue_active(&osc_lru_waitq))
                         (void)ptlrpcd_queue_work(cli->cl_lru_work);
         }
 }
@@ -469,8 +461,10 @@ static void osc_lru_del(struct client_obd *cli, struct osc_page *opg)
                  * this osc occupies too many LRU pages and kernel is
                  * stealing one of them.
                  */
-                if (!memory_pressure_get())
+                if (osc_cache_too_much(cli)) {
+                        CDEBUG(D_CACHE, "%s: queue LRU work\n", cli_name(cli));
                         (void)ptlrpcd_queue_work(cli->cl_lru_work);
+                }
                 wake_up(&osc_lru_waitq);
         } else {
                 LASSERT(list_empty(&opg->ops_lru));
@@ -502,6 +496,7 @@ static void discard_pagevec(const struct lu_env *env, struct cl_io *io,
                 struct cl_page *page = pvec[i];
 
                 LASSERT(cl_page_is_owned(page, io));
+                cl_page_delete(env, page);
                 cl_page_discard(env, io, page);
                 cl_page_disown(env, io, page);
                 cl_page_put(env, page);
@@ -542,7 +537,6 @@ long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli,
         struct cl_object *clobj = NULL;
         struct cl_page **pvec;
         struct osc_page *opg;
-        struct osc_page *temp;
         int maxscan = 0;
         long count = 0;
         int index = 0;
@@ -552,6 +546,8 @@ long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli,
         if (atomic_long_read(&cli->cl_lru_in_list) == 0 || target <= 0)
                 return 0;
 
+        CDEBUG(D_CACHE, "%s: shrinkers: %d, force: %d\n",
+               cli_name(cli), atomic_read(&cli->cl_lru_shrinkers), force);
         if (!force) {
                 if (atomic_read(&cli->cl_lru_shrinkers) > 0)
                         return -EBUSY;
@@ -568,14 +564,21 @@ long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli,
         io = &osc_env_info(env)->oti_io;
 
         spin_lock(&cli->cl_lru_list_lock);
+        if (force)
+                cli->cl_lru_reclaim++;
         maxscan = min(target << 1, atomic_long_read(&cli->cl_lru_in_list));
-        list_for_each_entry_safe(opg, temp, &cli->cl_lru_list, ops_lru) {
+        while (!list_empty(&cli->cl_lru_list)) {
                 struct cl_page *page;
                 bool will_free = false;
 
+                if (!force && atomic_read(&cli->cl_lru_shrinkers) > 1)
+                        break;
+
                 if (--maxscan < 0)
                         break;
 
+                opg = list_entry(cli->cl_lru_list.next, struct osc_page,
+                                 ops_lru);
                 page = opg->ops_cl.cpl_page;
                 if (lru_page_busy(cli, page)) {
                         list_move_tail(&opg->ops_lru, &cli->cl_lru_list);
@@ -662,34 +665,43 @@ long osc_lru_shrink(const struct lu_env *env, struct client_obd *cli,
         return count > 0 ? count : rc;
 }
 
-long osc_lru_reclaim(struct client_obd *cli)
+/**
+ * Reclaim LRU pages by an IO thread. The caller wants to reclaim at least
+ * \@npages of LRU slots. For performance consideration, it's better to drop
+ * LRU pages in batch. Therefore, the actual number is adjusted at least
+ * max_pages_per_rpc.
+ */
+long osc_lru_reclaim(struct client_obd *cli, unsigned long npages)
 {
-        struct cl_env_nest nest;
         struct lu_env *env;
         struct cl_client_cache *cache = cli->cl_cache;
         int max_scans;
+        int refcheck;
         long rc = 0;
 
         LASSERT(cache);
 
-        env = cl_env_nested_get(&nest);
+        env = cl_env_get(&refcheck);
         if (IS_ERR(env))
                 return 0;
 
-        rc = osc_lru_shrink(env, cli, osc_cache_too_much(cli), false);
-        if (rc != 0) {
-                if (rc == -EBUSY)
-                        rc = 0;
-
-                CDEBUG(D_CACHE, "%s: Free %ld pages from own LRU: %p.\n",
-                       cli->cl_import->imp_obd->obd_name, rc, cli);
+        npages = max_t(int, npages, cli->cl_max_pages_per_rpc);
+        CDEBUG(D_CACHE, "%s: start to reclaim %ld pages from LRU\n",
+               cli_name(cli), npages);
+        rc = osc_lru_shrink(env, cli, npages, true);
+        if (rc >= npages) {
+                CDEBUG(D_CACHE, "%s: reclaimed %ld/%ld pages from LRU\n",
+                       cli_name(cli), rc, npages);
+                if (osc_cache_too_much(cli) > 0)
+                        ptlrpcd_queue_work(cli->cl_lru_work);
                 goto out;
+        } else if (rc > 0) {
+                npages -= rc;
         }
 
-        CDEBUG(D_CACHE, "%s: cli %p no free slots, pages: %ld, busy: %ld.\n",
-               cli->cl_import->imp_obd->obd_name, cli,
-               atomic_long_read(&cli->cl_lru_in_list),
-               atomic_long_read(&cli->cl_lru_busy));
+        CDEBUG(D_CACHE, "%s: cli %p no free slots, pages: %ld/%ld, want: %ld\n",
+               cli_name(cli), cli, atomic_long_read(&cli->cl_lru_in_list),
+               atomic_long_read(&cli->cl_lru_busy), npages);
 
         /* Reclaim LRU slots from other client_obd as it can't free enough
          * from its own. This should rarely happen.
@@ -706,7 +718,7 @@ long osc_lru_reclaim(struct client_obd *cli)
                                  cl_lru_osc);
 
                 CDEBUG(D_CACHE, "%s: cli %p LRU pages: %ld, busy: %ld.\n",
-                       cli->cl_import->imp_obd->obd_name, cli,
+                       cli_name(cli), cli,
                        atomic_long_read(&cli->cl_lru_in_list),
                        atomic_long_read(&cli->cl_lru_busy));
 
@@ -714,19 +726,20 @@ long osc_lru_reclaim(struct client_obd *cli)
                 if (osc_cache_too_much(cli) > 0) {
                         spin_unlock(&cache->ccc_lru_lock);
 
-                        rc = osc_lru_shrink(env, cli, osc_cache_too_much(cli),
-                                            true);
+                        rc = osc_lru_shrink(env, cli, npages, true);
                         spin_lock(&cache->ccc_lru_lock);
-                        if (rc != 0)
+                        if (rc >= npages)
                                 break;
+                        if (rc > 0)
+                                npages -= rc;
                 }
         }
         spin_unlock(&cache->ccc_lru_lock);
 
 out:
-        cl_env_nested_put(&nest, env);
+        cl_env_put(env, &refcheck);
         CDEBUG(D_CACHE, "%s: cli %p freed %ld pages.\n",
-               cli->cl_import->imp_obd->obd_name, cli, rc);
+               cli_name(cli), cli, rc);
         return rc;
 }
 
@@ -756,7 +769,7 @@ static int osc_lru_reserve(const struct lu_env *env, struct osc_object *obj,
         LASSERT(atomic_long_read(cli->cl_lru_left) >= 0);
         while (!atomic_long_add_unless(cli->cl_lru_left, -1, 0)) {
                 /* run out of LRU spaces, try to drop some by itself */
-                rc = osc_lru_reclaim(cli);
+                rc = osc_lru_reclaim(cli, 1);
                 if (rc < 0)
                         break;
                 if (rc > 0)
@@ -796,8 +809,10 @@ static inline void unstable_page_accounting(struct ptlrpc_bulk_desc *desc,
         int count = 0;
         int i;
 
+        LASSERT(ptlrpc_is_bulk_desc_kiov(desc->bd_type));
+
         for (i = 0; i < page_count; i++) {
-                pg_data_t *pgdat = page_pgdat(desc->bd_iov[i].bv_page);
+                pg_data_t *pgdat = page_pgdat(BD_GET_KIOV(desc, i).bv_page);
 
                 if (likely(pgdat == last)) {
                         ++count;
@@ -857,7 +872,7 @@ void osc_dec_unstable_pages(struct ptlrpc_request *req)
         if (!unstable_count)
                 wake_up_all(&cli->cl_cache->ccc_unstable_waitq);
 
-        if (osc_cache_too_much(cli))
+        if (waitqueue_active(&osc_lru_waitq))
                 (void)ptlrpcd_queue_work(cli->cl_lru_work);
 }
 
@@ -913,8 +928,7 @@ bool osc_over_unstable_soft_limit(struct client_obd *cli)
 
         CDEBUG(D_CACHE,
                "%s: cli: %p unstable pages: %lu, osc unstable pages: %lu\n",
-               cli->cl_import->imp_obd->obd_name, cli,
-               unstable_nr, osc_unstable_count);
+               cli_name(cli), cli, unstable_nr, osc_unstable_count);
 
         /*
          * If the LRU slots are in shortage - 25% remaining AND this OSC
diff --git a/drivers/staging/lustre/lustre/osc/osc_quota.c b/drivers/staging/lustre/lustre/osc/osc_quota.c
index 194d8ede40a2..fed4da63ee45 100644
--- a/drivers/staging/lustre/lustre/osc/osc_quota.c
+++ b/drivers/staging/lustre/lustre/osc/osc_quota.c
@@ -106,7 +106,7 @@ int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[],
                         }
 
                         CDEBUG(D_QUOTA, "%s: setdq to insert for %s %d (%d)\n",
-                               cli->cl_import->imp_obd->obd_name,
+                               cli_name(cli),
                                type == USRQUOTA ? "user" : "group",
                                qid[type], rc);
                 } else {
@@ -122,7 +122,7 @@ int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[],
                                 kmem_cache_free(osc_quota_kmem, oqi);
 
                         CDEBUG(D_QUOTA, "%s: setdq to remove for %s %d (%p)\n",
-                               cli->cl_import->imp_obd->obd_name,
+                               cli_name(cli),
                                type == USRQUOTA ? "user" : "group",
                                qid[type], oqi);
                 }
@@ -134,8 +134,8 @@ int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[],
 /*
  * Hash operations for uid/gid <-> osc_quota_info
  */
-static unsigned
-oqi_hashfn(struct cfs_hash *hs, const void *key, unsigned mask)
+static unsigned int
+oqi_hashfn(struct cfs_hash *hs, const void *key, unsigned int mask)
 {
         return cfs_hash_u32_hash(*((__u32 *)key), mask);
 }
@@ -281,47 +281,3 @@ int osc_quotactl(struct obd_device *unused, struct obd_export *exp,
 
         return rc;
 }
-
-int osc_quotacheck(struct obd_device *unused, struct obd_export *exp,
-                   struct obd_quotactl *oqctl)
-{
-        struct client_obd *cli = &exp->exp_obd->u.cli;
-        struct ptlrpc_request *req;
-        struct obd_quotactl *body;
-        int rc;
-
-        req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp),
-                                        &RQF_OST_QUOTACHECK, LUSTRE_OST_VERSION,
-                                        OST_QUOTACHECK);
-        if (!req)
-                return -ENOMEM;
-
-        body = req_capsule_client_get(&req->rq_pill, &RMF_OBD_QUOTACTL);
-        *body = *oqctl;
-
-        ptlrpc_request_set_replen(req);
-
-        /* the next poll will find -ENODATA, that means quotacheck is going on
-         */
-        cli->cl_qchk_stat = -ENODATA;
-        rc = ptlrpc_queue_wait(req);
-        if (rc)
-                cli->cl_qchk_stat = rc;
-        ptlrpc_req_finished(req);
-        return rc;
-}
-
-int osc_quota_poll_check(struct obd_export *exp, struct if_quotacheck *qchk)
-{
-        struct client_obd *cli = &exp->exp_obd->u.cli;
-        int rc;
-
-        qchk->obd_uuid = cli->cl_target_uuid;
-        memcpy(qchk->obd_type, LUSTRE_OST_NAME, strlen(LUSTRE_OST_NAME));
-
-        rc = cli->cl_qchk_stat;
-        /* the client is not the previous one */
-        if (rc == CL_NOT_QUOTACHECKED)
-                rc = -EINTR;
-        return rc;
-}
diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c
index 749781f022e2..7143564ae7e7 100644
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@ -68,7 +68,6 @@ struct osc_brw_async_args {
         struct client_obd *aa_cli;
         struct list_head         aa_oaps;
         struct list_head         aa_exts;
-        struct cl_req     *aa_clerq;
 };
 
 struct osc_async_args {
@@ -82,7 +81,8 @@ struct osc_setattr_args {
 };
 
 struct osc_fsync_args {
-        struct obd_info     *fa_oi;
+        struct osc_object       *fa_obj;
+        struct obdo             *fa_oa;
         obd_enqueue_update_f fa_upcall;
         void            *fa_cookie;
 };
@@ -103,140 +103,19 @@ static void osc_release_ppga(struct brw_page **ppga, u32 count);
 static int brw_interpret(const struct lu_env *env,
                          struct ptlrpc_request *req, void *data, int rc);
 
-/* Unpack OSC object metadata from disk storage (LE byte order). */
-static int osc_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
-                        struct lov_mds_md *lmm, int lmm_bytes)
-{
-        int lsm_size;
-        struct obd_import *imp = class_exp2cliimp(exp);
-
-        if (lmm) {
-                if (lmm_bytes < sizeof(*lmm)) {
-                        CERROR("%s: lov_mds_md too small: %d, need %d\n",
-                               exp->exp_obd->obd_name, lmm_bytes,
-                               (int)sizeof(*lmm));
-                        return -EINVAL;
-                }
-                /* XXX LOV_MAGIC etc check? */
-
-                if (unlikely(ostid_id(&lmm->lmm_oi) == 0)) {
-                        CERROR("%s: zero lmm_object_id: rc = %d\n",
-                               exp->exp_obd->obd_name, -EINVAL);
-                        return -EINVAL;
-                }
-        }
-
-        lsm_size = lov_stripe_md_size(1);
-        if (!lsmp)
-                return lsm_size;
-
-        if (*lsmp && !lmm) {
-                kfree((*lsmp)->lsm_oinfo[0]);
-                kfree(*lsmp);
-                *lsmp = NULL;
-                return 0;
-        }
-
-        if (!*lsmp) {
-                *lsmp = kzalloc(lsm_size, GFP_NOFS);
-                if (unlikely(!*lsmp))
-                        return -ENOMEM;
-                (*lsmp)->lsm_oinfo[0] = kzalloc(sizeof(struct lov_oinfo),
-                                                GFP_NOFS);
-                if (unlikely(!(*lsmp)->lsm_oinfo[0])) {
-                        kfree(*lsmp);
-                        return -ENOMEM;
-                }
-                loi_init((*lsmp)->lsm_oinfo[0]);
-        } else if (unlikely(ostid_id(&(*lsmp)->lsm_oi) == 0)) {
-                return -EBADF;
-        }
-
-        if (lmm)
-                /* XXX zero *lsmp? */
-                ostid_le_to_cpu(&lmm->lmm_oi, &(*lsmp)->lsm_oi);
-
-        if (imp &&
-            (imp->imp_connect_data.ocd_connect_flags & OBD_CONNECT_MAXBYTES))
-                (*lsmp)->lsm_maxbytes = imp->imp_connect_data.ocd_maxbytes;
-        else
-                (*lsmp)->lsm_maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES;
-
-        return lsm_size;
-}
-
 static inline void osc_pack_req_body(struct ptlrpc_request *req,
-                                     struct obd_info *oinfo)
+                                     struct obdo *oa)
 {
         struct ost_body *body;
 
         body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
         LASSERT(body);
 
-        lustre_set_wire_obdo(&req->rq_import->imp_connect_data, &body->oa,
-                             oinfo->oi_oa);
-}
-
-static int osc_getattr_interpret(const struct lu_env *env,
-                                 struct ptlrpc_request *req,
-                                 struct osc_async_args *aa, int rc)
-{
-        struct ost_body *body;
-
-        if (rc != 0)
-                goto out;
-
-        body = req_capsule_server_get(&req->rq_pill, &RMF_OST_BODY);
-        if (body) {
-                CDEBUG(D_INODE, "mode: %o\n", body->oa.o_mode);
-                lustre_get_wire_obdo(&req->rq_import->imp_connect_data,
-                                     aa->aa_oi->oi_oa, &body->oa);
-
-                /* This should really be sent by the OST */
-                aa->aa_oi->oi_oa->o_blksize = DT_MAX_BRW_SIZE;
-                aa->aa_oi->oi_oa->o_valid |= OBD_MD_FLBLKSZ;
-        } else {
-                CDEBUG(D_INFO, "can't unpack ost_body\n");
-                rc = -EPROTO;
-                aa->aa_oi->oi_oa->o_valid = 0;
-        }
-out:
-        rc = aa->aa_oi->oi_cb_up(aa->aa_oi, rc);
-        return rc;
-}
-
-static int osc_getattr_async(struct obd_export *exp, struct obd_info *oinfo,
-                             struct ptlrpc_request_set *set)
-{
-        struct ptlrpc_request *req;
-        struct osc_async_args *aa;
-        int rc;
-
-        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_OST_GETATTR);
-        if (!req)
-                return -ENOMEM;
-
-        rc = ptlrpc_request_pack(req, LUSTRE_OST_VERSION, OST_GETATTR);
-        if (rc) {
-                ptlrpc_request_free(req);
-                return rc;
-        }
-
-        osc_pack_req_body(req, oinfo);
-
-        ptlrpc_request_set_replen(req);
-        req->rq_interpret_reply = (ptlrpc_interpterer_t)osc_getattr_interpret;
-
-        CLASSERT(sizeof(*aa) <= sizeof(req->rq_async_args));
-        aa = ptlrpc_req_async_args(req);
-        aa->aa_oi = oinfo;
-
-        ptlrpc_set_add_req(set, req);
-        return 0;
+        lustre_set_wire_obdo(&req->rq_import->imp_connect_data, &body->oa, oa);
 }
 
 static int osc_getattr(const struct lu_env *env, struct obd_export *exp,
-                       struct obd_info *oinfo)
+                       struct obdo *oa)
 {
         struct ptlrpc_request *req;
         struct ost_body *body;
@@ -252,7 +131,7 @@ static int osc_getattr(const struct lu_env *env, struct obd_export *exp,
                 return rc;
         }
 
-        osc_pack_req_body(req, oinfo);
+        osc_pack_req_body(req, oa);
 
         ptlrpc_request_set_replen(req);
 
@@ -267,11 +146,11 @@ static int osc_getattr(const struct lu_env *env, struct obd_export *exp,
         }
 
         CDEBUG(D_INODE, "mode: %o\n", body->oa.o_mode);
-        lustre_get_wire_obdo(&req->rq_import->imp_connect_data, oinfo->oi_oa,
+        lustre_get_wire_obdo(&req->rq_import->imp_connect_data, oa,
                              &body->oa);
 
-        oinfo->oi_oa->o_blksize = cli_brw_size(exp->exp_obd);
-        oinfo->oi_oa->o_valid |= OBD_MD_FLBLKSZ;
+        oa->o_blksize = cli_brw_size(exp->exp_obd);
+        oa->o_valid |= OBD_MD_FLBLKSZ;
 
  out:
         ptlrpc_req_finished(req);
@@ -279,13 +158,13 @@ static int osc_getattr(const struct lu_env *env, struct obd_export *exp,
 }
 
 static int osc_setattr(const struct lu_env *env, struct obd_export *exp,
-                       struct obd_info *oinfo, struct obd_trans_info *oti)
+                       struct obdo *oa)
 {
         struct ptlrpc_request *req;
         struct ost_body *body;
         int rc;
 
-        LASSERT(oinfo->oi_oa->o_valid & OBD_MD_FLGROUP);
+        LASSERT(oa->o_valid & OBD_MD_FLGROUP);
 
         req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_OST_SETATTR);
         if (!req)
@@ -297,7 +176,7 @@ static int osc_setattr(const struct lu_env *env, struct obd_export *exp,
                 return rc;
         }
 
-        osc_pack_req_body(req, oinfo);
+        osc_pack_req_body(req, oa);
 
         ptlrpc_request_set_replen(req);
 
@@ -311,7 +190,7 @@ static int osc_setattr(const struct lu_env *env, struct obd_export *exp,
                 goto out;
         }
 
-        lustre_get_wire_obdo(&req->rq_import->imp_connect_data, oinfo->oi_oa,
+        lustre_get_wire_obdo(&req->rq_import->imp_connect_data, oa,
                              &body->oa);
 
 out:
@@ -341,10 +220,9 @@ out:
         return rc;
 }
 
-int osc_setattr_async_base(struct obd_export *exp, struct obd_info *oinfo,
-                           struct obd_trans_info *oti,
-                           obd_enqueue_update_f upcall, void *cookie,
-                           struct ptlrpc_request_set *rqset)
+int osc_setattr_async(struct obd_export *exp, struct obdo *oa,
+                      obd_enqueue_update_f upcall, void *cookie,
+                      struct ptlrpc_request_set *rqset)
 {
         struct ptlrpc_request *req;
         struct osc_setattr_args *sa;
@@ -360,10 +238,7 @@ int osc_setattr_async_base(struct obd_export *exp, struct obd_info *oinfo,
                 return rc;
         }
 
-        if (oti && oinfo->oi_oa->o_valid & OBD_MD_FLCOOKIE)
-                oinfo->oi_oa->o_lcookie = *oti->oti_logcookies;
-
-        osc_pack_req_body(req, oinfo);
+        osc_pack_req_body(req, oa);
 
         ptlrpc_request_set_replen(req);
 
@@ -377,7 +252,7 @@ int osc_setattr_async_base(struct obd_export *exp, struct obd_info *oinfo,
 
                 CLASSERT(sizeof(*sa) <= sizeof(req->rq_async_args));
                 sa = ptlrpc_req_async_args(req);
-                sa->sa_oa = oinfo->oi_oa;
+                sa->sa_oa = oa;
                 sa->sa_upcall = upcall;
                 sa->sa_cookie = cookie;
 
@@ -390,16 +265,8 @@ int osc_setattr_async_base(struct obd_export *exp, struct obd_info *oinfo,
         return 0;
 }
 
-static int osc_setattr_async(struct obd_export *exp, struct obd_info *oinfo,
-                             struct obd_trans_info *oti,
-                             struct ptlrpc_request_set *rqset)
-{
-        return osc_setattr_async_base(exp, oinfo, oti,
-                                      oinfo->oi_cb_up, oinfo, rqset);
-}
-
 static int osc_create(const struct lu_env *env, struct obd_export *exp,
-                      struct obdo *oa, struct obd_trans_info *oti)
+                      struct obdo *oa)
 {
         struct ptlrpc_request *req;
         struct ost_body *body;
@@ -428,15 +295,6 @@ static int osc_create(const struct lu_env *env, struct obd_export *exp,
 
         ptlrpc_request_set_replen(req);
 
-        if ((oa->o_valid & OBD_MD_FLFLAGS) &&
-            oa->o_flags == OBD_FL_DELORPHAN) {
-                DEBUG_REQ(D_HA, req,
-                          "delorphan from OST integration");
-                /* Don't resend the delorphan req */
-                req->rq_no_resend = 1;
-                req->rq_no_delay = 1;
-        }
-
         rc = ptlrpc_queue_wait(req);
         if (rc)
                 goto out_req;
@@ -453,12 +311,6 @@ static int osc_create(const struct lu_env *env, struct obd_export *exp,
         oa->o_blksize = cli_brw_size(exp->exp_obd);
         oa->o_valid |= OBD_MD_FLBLKSZ;
 
-        if (oti && oa->o_valid & OBD_MD_FLCOOKIE) {
-                if (!oti->oti_logcookies)
-                        oti->oti_logcookies = &oti->oti_onecookie;
-                *oti->oti_logcookies = oa->o_lcookie;
-        }
-
         CDEBUG(D_HA, "transno: %lld\n",
                lustre_msg_get_transno(req->rq_repmsg));
 out_req:
@@ -467,7 +319,7 @@ out:
         return rc;
 }
 
-int osc_punch_base(struct obd_export *exp, struct obd_info *oinfo,
+int osc_punch_base(struct obd_export *exp, struct obdo *oa,
                    obd_enqueue_update_f upcall, void *cookie,
                    struct ptlrpc_request_set *rqset)
 {
@@ -491,14 +343,14 @@ int osc_punch_base(struct obd_export *exp, struct obd_info *oinfo,
         body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
         LASSERT(body);
         lustre_set_wire_obdo(&req->rq_import->imp_connect_data, &body->oa,
-                             oinfo->oi_oa);
+                             oa);
 
         ptlrpc_request_set_replen(req);
 
         req->rq_interpret_reply = (ptlrpc_interpterer_t)osc_setattr_interpret;
         CLASSERT(sizeof(*sa) <= sizeof(req->rq_async_args));
         sa = ptlrpc_req_async_args(req);
-        sa->sa_oa = oinfo->oi_oa;
+        sa->sa_oa = oa;
         sa->sa_upcall = upcall;
         sa->sa_cookie = cookie;
         if (rqset == PTLRPCD_SET)
@@ -513,8 +365,11 @@ static int osc_sync_interpret(const struct lu_env *env,
                               struct ptlrpc_request *req,
                               void *arg, int rc)
 {
+        struct cl_attr *attr = &osc_env_info(env)->oti_attr;
         struct osc_fsync_args *fa = arg;
+        unsigned long valid = 0;
         struct ost_body *body;
+        struct cl_object *obj;
 
         if (rc)
                 goto out;
@@ -526,16 +381,30 @@ static int osc_sync_interpret(const struct lu_env *env,
                 goto out;
         }
 
-        *fa->fa_oi->oi_oa = body->oa;
+        *fa->fa_oa = body->oa;
+        obj = osc2cl(fa->fa_obj);
+
+        /* Update osc object's blocks attribute */
+        cl_object_attr_lock(obj);
+        if (body->oa.o_valid & OBD_MD_FLBLOCKS) {
+                attr->cat_blocks = body->oa.o_blocks;
+                valid |= CAT_BLOCKS;
+        }
+
+        if (valid)
+                cl_object_attr_update(env, obj, attr, valid);
+        cl_object_attr_unlock(obj);
+
 out:
         rc = fa->fa_upcall(fa->fa_cookie, rc);
         return rc;
 }
 
-int osc_sync_base(struct obd_export *exp, struct obd_info *oinfo,
+int osc_sync_base(struct osc_object *obj, struct obdo *oa,
                   obd_enqueue_update_f upcall, void *cookie,
                   struct ptlrpc_request_set *rqset)
 {
+        struct obd_export *exp = osc_export(obj);
         struct ptlrpc_request *req;
         struct ost_body *body;
         struct osc_fsync_args *fa;
@@ -555,14 +424,15 @@ int osc_sync_base(struct obd_export *exp, struct obd_info *oinfo,
         body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
         LASSERT(body);
         lustre_set_wire_obdo(&req->rq_import->imp_connect_data, &body->oa,
-                             oinfo->oi_oa);
+                             oa);
 
         ptlrpc_request_set_replen(req);
         req->rq_interpret_reply = osc_sync_interpret;
 
         CLASSERT(sizeof(*fa) <= sizeof(req->rq_async_args));
         fa = ptlrpc_req_async_args(req);
-        fa->fa_oi = oinfo;
+        fa->fa_obj = obj;
+        fa->fa_oa = oa;
         fa->fa_upcall = upcall;
         fa->fa_cookie = cookie;
 
@@ -639,19 +509,8 @@ static int osc_can_send_destroy(struct client_obd *cli)
         return 0;
 }
 
-/* Destroy requests can be async always on the client, and we don't even really
- * care about the return code since the client cannot do anything at all about
- * a destroy failure.
- * When the MDS is unlinking a filename, it saves the file objects into a
- * recovery llog, and these object records are cancelled when the OST reports
- * they were destroyed and sync'd to disk (i.e. transaction committed).
- * If the client dies, or the OST is down when the object should be destroyed,
- * the records are not cancelled, and when the OST reconnects to the MDS next,
- * it will retrieve the llog unlink logs and then sends the log cancellation
- * cookies to the MDS after committing destroy transactions.
- */
 static int osc_destroy(const struct lu_env *env, struct obd_export *exp,
-                       struct obdo *oa, struct obd_trans_info *oti)
+                       struct obdo *oa)
 {
         struct client_obd *cli = &exp->exp_obd->u.cli;
         struct ptlrpc_request *req;
@@ -683,32 +542,22 @@ static int osc_destroy(const struct lu_env *env, struct obd_export *exp,
         req->rq_request_portal = OST_IO_PORTAL; /* bug 7198 */
         ptlrpc_at_set_req_timeout(req);
 
-        if (oti && oa->o_valid & OBD_MD_FLCOOKIE)
-                oa->o_lcookie = *oti->oti_logcookies;
         body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
         LASSERT(body);
         lustre_set_wire_obdo(&req->rq_import->imp_connect_data, &body->oa, oa);
 
         ptlrpc_request_set_replen(req);
 
-        /* If osc_destroy is for destroying the unlink orphan,
-         * sent from MDT to OST, which should not be blocked here,
-         * because the process might be triggered by ptlrpcd, and
-         * it is not good to block ptlrpcd thread (b=16006
-         **/
-        if (!(oa->o_flags & OBD_FL_DELORPHAN)) {
-                req->rq_interpret_reply = osc_destroy_interpret;
-                if (!osc_can_send_destroy(cli)) {
-                        struct l_wait_info lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP,
-                                                          NULL);
-
-                        /*
-                         * Wait until the number of on-going destroy RPCs drops
-                         * under max_rpc_in_flight
-                         */
-                        l_wait_event_exclusive(cli->cl_destroy_waitq,
-                                               osc_can_send_destroy(cli), &lwi);
-                }
+        req->rq_interpret_reply = osc_destroy_interpret;
+        if (!osc_can_send_destroy(cli)) {
+                struct l_wait_info lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL);
+
+                /*
+                 * Wait until the number of on-going destroy RPCs drops
+                 * under max_rpc_in_flight
+                 */
+                l_wait_event_exclusive(cli->cl_destroy_waitq,
+                                       osc_can_send_destroy(cli), &lwi);
         }
 
         /* Do not wait for response */
@@ -734,14 +583,13 @@ static void osc_announce_cached(struct client_obd *cli, struct obdo *oa,
                 oa->o_undirty = 0;
         } else if (unlikely(atomic_long_read(&obd_dirty_pages) -
                             atomic_long_read(&obd_dirty_transit_pages) >
-                            (obd_max_dirty_pages + 1))) {
+                            (long)(obd_max_dirty_pages + 1))) {
                 /* The atomic_read() allowing the atomic_inc() are
                  * not covered by a lock thus they may safely race and trip
                  * this CERROR() unless we add in a small fudge factor (+1).
                  */
-                CERROR("%s: dirty %ld + %ld > system dirty_max %lu\n",
-                       cli->cl_import->imp_obd->obd_name,
-                       atomic_long_read(&obd_dirty_pages),
+                CERROR("%s: dirty %ld + %ld > system dirty_max %ld\n",
+                       cli_name(cli), atomic_long_read(&obd_dirty_pages),
                        atomic_long_read(&obd_dirty_transit_pages),
                        obd_max_dirty_pages);
                 oa->o_undirty = 0;
@@ -936,12 +784,10 @@ static int osc_add_shrink_grant(struct client_obd *client)
                                        osc_grant_shrink_grant_cb, NULL,
                                        &client->cl_grant_shrink_list);
         if (rc) {
-                CERROR("add grant client %s error %d\n",
-                       client->cl_import->imp_obd->obd_name, rc);
+                CERROR("add grant client %s error %d\n", cli_name(client), rc);
                 return rc;
         }
-        CDEBUG(D_CACHE, "add grant client %s\n",
-               client->cl_import->imp_obd->obd_name);
+        CDEBUG(D_CACHE, "add grant client %s\n", cli_name(client));
         osc_update_next_shrink(client);
         return 0;
 }
@@ -970,23 +816,13 @@ static void osc_init_grant(struct client_obd *cli, struct obd_connect_data *ocd)
                 cli->cl_avail_grant = ocd->ocd_grant -
                                       (cli->cl_dirty_pages << PAGE_SHIFT);
 
-        if (cli->cl_avail_grant < 0) {
-                CWARN("%s: available grant < 0: avail/ocd/dirty %ld/%u/%ld\n",
-                      cli->cl_import->imp_obd->obd_name, cli->cl_avail_grant,
-                      ocd->ocd_grant, cli->cl_dirty_pages << PAGE_SHIFT);
-                /* workaround for servers which do not have the patch from
-                 * LU-2679
-                 */
-                cli->cl_avail_grant = ocd->ocd_grant;
-        }
-
         /* determine the appropriate chunk size used by osc_extent. */
         cli->cl_chunkbits = max_t(int, PAGE_SHIFT, ocd->ocd_blocksize);
         spin_unlock(&cli->cl_loi_list_lock);
 
         CDEBUG(D_CACHE, "%s, setting cl_avail_grant: %ld cl_lost_grant: %ld chunk bits: %d\n",
-               cli->cl_import->imp_obd->obd_name,
-               cli->cl_avail_grant, cli->cl_lost_grant, cli->cl_chunkbits);
+               cli_name(cli), cli->cl_avail_grant, cli->cl_lost_grant,
+               cli->cl_chunkbits);
 
         if (ocd->ocd_connect_flags & OBD_CONNECT_GRANT_SHRINK &&
             list_empty(&cli->cl_grant_shrink_list))
@@ -1072,9 +908,9 @@ static int check_write_rcs(struct ptlrpc_request *req,
 static inline int can_merge_pages(struct brw_page *p1, struct brw_page *p2)
 {
         if (p1->flag != p2->flag) {
-                unsigned mask = ~(OBD_BRW_FROM_GRANT | OBD_BRW_NOCACHE |
-                                  OBD_BRW_SYNC | OBD_BRW_ASYNC |
-                                  OBD_BRW_NOQUOTA | OBD_BRW_SOFT_SYNC);
+                unsigned int mask = ~(OBD_BRW_FROM_GRANT | OBD_BRW_NOCACHE |
+                                      OBD_BRW_SYNC | OBD_BRW_ASYNC |
+                                      OBD_BRW_NOQUOTA | OBD_BRW_SOFT_SYNC);
 
                 /* warn if we try to combine flags that we don't know to be
                  * safe to combine
@@ -1097,7 +933,6 @@ static u32 osc_checksum_bulk(int nob, u32 pg_count,
         int i = 0;
         struct cfs_crypto_hash_desc *hdesc;
         unsigned int bufsize;
-        int err;
         unsigned char cfs_alg = cksum_obd2cfs(cksum_type);
 
         LASSERT(pg_count > 0);
@@ -1139,7 +974,7 @@ static u32 osc_checksum_bulk(int nob, u32 pg_count,
         }
 
         bufsize = sizeof(cksum);
-        err = cfs_crypto_hash_final(hdesc, (unsigned char *)&cksum, &bufsize);
+        cfs_crypto_hash_final(hdesc, (unsigned char *)&cksum, &bufsize);
 
         /* For sending we only compute the wrong checksum instead
          * of corrupting the data so it is still correct on a redo
@@ -1151,8 +986,7 @@ static u32 osc_checksum_bulk(int nob, u32 pg_count,
 }
 
 static int osc_brw_prep_request(int cmd, struct client_obd *cli,
-                                struct obdo *oa,
-                                struct lov_stripe_md *lsm, u32 page_count,
+                                struct obdo *oa, u32 page_count,
                                 struct brw_page **pga,
                                 struct ptlrpc_request **reqp,
                                 int reserve,
@@ -1210,8 +1044,9 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli,
 
         desc = ptlrpc_prep_bulk_imp(req, page_count,
                 cli->cl_import->imp_connect_data.ocd_brw_size >> LNET_MTU_BITS,
-                opc == OST_WRITE ? BULK_GET_SOURCE : BULK_PUT_SINK,
-                OST_BULK_PORTAL);
+                (opc == OST_WRITE ? PTLRPC_BULK_GET_SOURCE :
+                 PTLRPC_BULK_PUT_SINK) | PTLRPC_BULK_BUF_KIOV, OST_BULK_PORTAL,
+                 &ptlrpc_bulk_kiov_pin_ops);
 
         if (!desc) {
                 rc = -ENOMEM;
@@ -1259,7 +1094,7 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli,
                 LASSERT((pga[0]->flag & OBD_BRW_SRVLOCK) ==
                         (pg->flag & OBD_BRW_SRVLOCK));
 
-                ptlrpc_prep_bulk_page_pin(desc, pg->pg, poff, pg->count);
+                desc->bd_frag_ops->add_kiov_frag(desc, pg->pg, poff, pg->count);
                 requested_nob += pg->count;
 
                 if (i > 0 && can_merge_pages(pg_prev, pg)) {
@@ -1569,7 +1404,6 @@ static int osc_brw_redo_request(struct ptlrpc_request *request,
         rc = osc_brw_prep_request(lustre_msg_get_opc(request->rq_reqmsg) ==
                                         OST_WRITE ? OBD_BRW_WRITE : OBD_BRW_READ,
                                   aa->aa_cli, aa->aa_oa,
-                                  NULL /* lsm unused by osc currently */,
                                   aa->aa_page_count, aa->aa_ppga,
                                   &new_req, 0, 1);
         if (rc)
@@ -1764,8 +1598,6 @@ static int brw_interpret(const struct lu_env *env,
         LASSERT(list_empty(&aa->aa_exts));
         LASSERT(list_empty(&aa->aa_oaps));
 
-        cl_req_completion(env, aa->aa_clerq, rc < 0 ? rc :
-                          req->rq_bulk->bd_nob_transferred);
         osc_release_ppga(aa->aa_ppga, aa->aa_page_count);
         ptlrpc_lprocfs_brw(req, req->rq_bulk->bd_nob_transferred);
 
@@ -1818,9 +1650,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
         struct osc_brw_async_args *aa = NULL;
         struct obdo *oa = NULL;
         struct osc_async_page *oap;
-        struct osc_async_page *tmp;
-        struct cl_req *clerq = NULL;
-        enum cl_req_type crt = (cmd & OBD_BRW_WRITE) ? CRT_WRITE : CRT_READ;
+        struct osc_object *obj = NULL;
         struct cl_req_attr *crattr = NULL;
         u64 starting_offset = OBD_OBJECT_EOF;
         u64 ending_offset = 0;
@@ -1828,6 +1658,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
         int mem_tight = 0;
         int page_count = 0;
         bool soft_sync = false;
+        bool interrupted = false;
         int i;
         int rc;
         struct ost_body *body;
@@ -1839,32 +1670,15 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
         list_for_each_entry(ext, ext_list, oe_link) {
                 LASSERT(ext->oe_state == OES_RPC);
                 mem_tight |= ext->oe_memalloc;
-                list_for_each_entry(oap, &ext->oe_pages, oap_pending_item) {
-                        ++page_count;
-                        list_add_tail(&oap->oap_rpc_item, &rpc_list);
-                        if (starting_offset > oap->oap_obj_off)
-                                starting_offset = oap->oap_obj_off;
-                        else
-                                LASSERT(oap->oap_page_off == 0);
-                        if (ending_offset < oap->oap_obj_off + oap->oap_count)
-                                ending_offset = oap->oap_obj_off +
-                                                oap->oap_count;
-                        else
-                                LASSERT(oap->oap_page_off + oap->oap_count ==
-                                        PAGE_SIZE);
-                }
+                page_count += ext->oe_nr_pages;
+                if (!obj)
+                        obj = ext->oe_obj;
         }
 
         soft_sync = osc_over_unstable_soft_limit(cli);
         if (mem_tight)
                 mpflag = cfs_memory_pressure_get_and_set();
 
-        crattr = kzalloc(sizeof(*crattr), GFP_NOFS);
-        if (!crattr) {
-                rc = -ENOMEM;
-                goto out;
-        }
-
         pga = kcalloc(page_count, sizeof(*pga), GFP_NOFS);
         if (!pga) {
                 rc = -ENOMEM;
@@ -1878,44 +1692,46 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
         }
 
         i = 0;
-        list_for_each_entry(oap, &rpc_list, oap_rpc_item) {
-                struct cl_page *page = oap2cl_page(oap);
-
-                if (!clerq) {
-                        clerq = cl_req_alloc(env, page, crt,
-                                             1 /* only 1-object rpcs for now */);
-                        if (IS_ERR(clerq)) {
-                                rc = PTR_ERR(clerq);
-                                goto out;
-                        }
+        list_for_each_entry(ext, ext_list, oe_link) {
+                list_for_each_entry(oap, &ext->oe_pages, oap_pending_item) {
+                        if (mem_tight)
+                                oap->oap_brw_flags |= OBD_BRW_MEMALLOC;
+                        if (soft_sync)
+                                oap->oap_brw_flags |= OBD_BRW_SOFT_SYNC;
+                        pga[i] = &oap->oap_brw_page;
+                        pga[i]->off = oap->oap_obj_off + oap->oap_page_off;
+                        i++;
+
+                        list_add_tail(&oap->oap_rpc_item, &rpc_list);
+                        if (starting_offset == OBD_OBJECT_EOF ||
+                            starting_offset > oap->oap_obj_off)
+                                starting_offset = oap->oap_obj_off;
+                        else
+                                LASSERT(!oap->oap_page_off);
+                        if (ending_offset < oap->oap_obj_off + oap->oap_count)
+                                ending_offset = oap->oap_obj_off +
+                                                oap->oap_count;
+                        else
+                                LASSERT(oap->oap_page_off + oap->oap_count ==
+                                        PAGE_SIZE);
+                        if (oap->oap_interrupted)
+                                interrupted = true;
                 }
-                if (mem_tight)
-                        oap->oap_brw_flags |= OBD_BRW_MEMALLOC;
-                if (soft_sync)
-                        oap->oap_brw_flags |= OBD_BRW_SOFT_SYNC;
-                pga[i] = &oap->oap_brw_page;
-                pga[i]->off = oap->oap_obj_off + oap->oap_page_off;
-                CDEBUG(0, "put page %p index %lu oap %p flg %x to pga\n",
-                       pga[i]->pg, oap->oap_page->index, oap,
-                       pga[i]->flag);
-                i++;
-                cl_req_page_add(env, clerq, page);
         }
 
-        /* always get the data for the obdo for the rpc */
-        LASSERT(clerq);
-        crattr->cra_oa = oa;
-        cl_req_attr_set(env, clerq, crattr, ~0ULL);
+        /* first page in the list */
+        oap = list_entry(rpc_list.next, typeof(*oap), oap_rpc_item);
 
-        rc = cl_req_prep(env, clerq);
-        if (rc != 0) {
-                CERROR("cl_req_prep failed: %d\n", rc);
-                goto out;
-        }
+        crattr = &osc_env_info(env)->oti_req_attr;
+        memset(crattr, 0, sizeof(*crattr));
+        crattr->cra_type = (cmd & OBD_BRW_WRITE) ? CRT_WRITE : CRT_READ;
+        crattr->cra_flags = ~0ULL;
+        crattr->cra_page = oap2cl_page(oap);
+        crattr->cra_oa = oa;
+        cl_req_attr_set(env, osc2cl(obj), crattr);
 
         sort_brw_pages(pga, page_count);
-        rc = osc_brw_prep_request(cmd, cli, oa, NULL, page_count,
-                                  pga, &req, 1, 0);
+        rc = osc_brw_prep_request(cmd, cli, oa, page_count, pga, &req, 1, 0);
         if (rc != 0) {
                 CERROR("prep_req failed: %d\n", rc);
                 goto out;
@@ -1924,8 +1740,10 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
         req->rq_commit_cb = brw_commit;
         req->rq_interpret_reply = brw_interpret;
 
-        if (mem_tight != 0)
-                req->rq_memalloc = 1;
+        req->rq_memalloc = mem_tight != 0;
+        oap->oap_request = ptlrpc_request_addref(req);
+        if (interrupted && !req->rq_intr)
+                ptlrpc_mark_interrupted(req);
 
         /* Need to update the timestamps after the request is built in case
          * we race with setattr (locally or in queue at OST).  If OST gets
@@ -1935,9 +1753,8 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
          */
         body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
         crattr->cra_oa = &body->oa;
-        cl_req_attr_set(env, clerq, crattr,
-                        OBD_MD_FLMTIME | OBD_MD_FLCTIME | OBD_MD_FLATIME);
-
+        crattr->cra_flags = OBD_MD_FLMTIME | OBD_MD_FLCTIME | OBD_MD_FLATIME;
+        cl_req_attr_set(env, osc2cl(obj), crattr);
         lustre_msg_set_jobid(req->rq_reqmsg, crattr->cra_jobid);
 
         CLASSERT(sizeof(*aa) <= sizeof(req->rq_async_args));
@@ -1946,24 +1763,6 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
         list_splice_init(&rpc_list, &aa->aa_oaps);
         INIT_LIST_HEAD(&aa->aa_exts);
         list_splice_init(ext_list, &aa->aa_exts);
-        aa->aa_clerq = clerq;
-
-        /* queued sync pages can be torn down while the pages
-         * were between the pending list and the rpc
-         */
-        tmp = NULL;
-        list_for_each_entry(oap, &aa->aa_oaps, oap_rpc_item) {
-                /* only one oap gets a request reference */
-                if (!tmp)
-                        tmp = oap;
-                if (oap->oap_interrupted && !req->rq_intr) {
-                        CDEBUG(D_INODE, "oap %p in req %p interrupted\n",
-                               oap, req);
-                        ptlrpc_mark_interrupted(req);
-                }
-        }
-        if (tmp)
-                tmp->oap_request = ptlrpc_request_addref(req);
 
         spin_lock(&cli->cl_loi_list_lock);
         starting_offset >>= PAGE_SHIFT;
@@ -1985,6 +1784,7 @@ int osc_build_rpc(const struct lu_env *env, struct client_obd *cli,
         DEBUG_REQ(D_INODE, req, "%d pages, aa %p. now %ur/%dw in flight",
                   page_count, aa, cli->cl_r_in_flight,
                   cli->cl_w_in_flight);
+        OBD_FAIL_TIMEOUT(OBD_FAIL_OSC_DELAY_IO, cfs_fail_val);
 
         ptlrpcd_add_req(req);
         rc = 0;
@@ -1993,8 +1793,6 @@ out:
         if (mem_tight != 0)
                 cfs_memory_pressure_restore(mpflag);
 
-        kfree(crattr);
-
         if (rc != 0) {
                 LASSERT(!req);
 
@@ -2010,22 +1808,15 @@ out:
                         list_del_init(&ext->oe_link);
                         osc_extent_finish(env, ext, 0, rc);
                 }
-                if (clerq && !IS_ERR(clerq))
-                        cl_req_completion(env, clerq, rc);
         }
         return rc;
 }
 
-static int osc_set_lock_data_with_check(struct ldlm_lock *lock,
-                                        struct ldlm_enqueue_info *einfo)
+static int osc_set_lock_data(struct ldlm_lock *lock, void *data)
 {
-        void *data = einfo->ei_cbdata;
         int set = 0;
 
-        LASSERT(lock->l_blocking_ast == einfo->ei_cb_bl);
-        LASSERT(lock->l_resource->lr_type == einfo->ei_type);
-        LASSERT(lock->l_completion_ast == einfo->ei_cb_cp);
-        LASSERT(lock->l_glimpse_ast == einfo->ei_cb_gl);
+        LASSERT(lock);
 
         lock_res_and_lock(lock);
 
@@ -2039,21 +1830,6 @@ static int osc_set_lock_data_with_check(struct ldlm_lock *lock,
         return set;
 }
 
-static int osc_set_data_with_check(struct lustre_handle *lockh,
-                                   struct ldlm_enqueue_info *einfo)
-{
-        struct ldlm_lock *lock = ldlm_handle2lock(lockh);
-        int set = 0;
-
-        if (lock) {
-                set = osc_set_lock_data_with_check(lock, einfo);
-                LDLM_LOCK_PUT(lock);
-        } else
-                CERROR("lockh %p, data %p - client evicted?\n",
-                       lockh, einfo->ei_cbdata);
-        return set;
-}
-
 static int osc_enqueue_fini(struct ptlrpc_request *req,
                             osc_enqueue_upcall_f upcall, void *cookie,
                             struct lustre_handle *lockh, enum ldlm_mode mode,
@@ -2153,7 +1929,7 @@ struct ptlrpc_request_set *PTLRPCD_SET = (void *)1;
  * release locks just after they are obtained.
  */
 int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,
-                     __u64 *flags, ldlm_policy_data_t *policy,
+                     __u64 *flags, union ldlm_policy_data *policy,
                      struct ost_lvb *lvb, int kms_valid,
                      osc_enqueue_upcall_f upcall, void *cookie,
                      struct ldlm_enqueue_info *einfo,
@@ -2219,7 +1995,7 @@ int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,
                         ldlm_lock_decref(&lockh, mode);
                         LDLM_LOCK_PUT(matched);
                         return -ECANCELED;
-                } else if (osc_set_lock_data_with_check(matched, einfo)) {
+                } else if (osc_set_lock_data(matched, einfo->ei_cbdata)) {
                         *flags |= LDLM_FL_LVB_READY;
                         /* We already have a lock, and it's referenced. */
                         (*upcall)(cookie, &lockh, ELDLM_LOCK_MATCHED);
@@ -2304,7 +2080,7 @@ no_match:
 }
 
 int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id,
-                   __u32 type, ldlm_policy_data_t *policy, __u32 mode,
+                   __u32 type, union ldlm_policy_data *policy, __u32 mode,
                    __u64 *flags, void *data, struct lustre_handle *lockh,
                    int unref)
 {
@@ -2331,31 +2107,20 @@ int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id,
                 rc |= LCK_PW;
         rc = ldlm_lock_match(obd->obd_namespace, lflags,
                              res_id, type, policy, rc, lockh, unref);
-        if (rc) {
-                if (data) {
-                        if (!osc_set_data_with_check(lockh, data)) {
-                                if (!(lflags & LDLM_FL_TEST_LOCK))
-                                        ldlm_lock_decref(lockh, rc);
-                                return 0;
-                        }
-                }
-                if (!(lflags & LDLM_FL_TEST_LOCK) && mode != rc) {
-                        ldlm_lock_addref(lockh, LCK_PR);
-                        ldlm_lock_decref(lockh, LCK_PW);
-                }
+        if (!rc || lflags & LDLM_FL_TEST_LOCK)
                 return rc;
-        }
-        return rc;
-}
 
-int osc_cancel_base(struct lustre_handle *lockh, __u32 mode)
-{
-        if (unlikely(mode == LCK_GROUP))
-                ldlm_lock_decref_and_cancel(lockh, mode);
-        else
-                ldlm_lock_decref(lockh, mode);
+        if (data) {
+                struct ldlm_lock *lock = ldlm_handle2lock(lockh);
 
-        return 0;
+                LASSERT(lock);
+                if (!osc_set_lock_data(lock, data)) {
+                        ldlm_lock_decref(lockh, rc);
+                        rc = 0;
+                }
+                LDLM_LOCK_PUT(lock);
+        }
+        return rc;
 }
 
 static int osc_statfs_interpret(const struct lu_env *env,
@@ -2526,9 +2291,6 @@ static int osc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 err = ptlrpc_set_import_active(obd->u.cli.cl_import,
                                                data->ioc_offset);
                 goto out;
-        case OBD_IOC_POLL_QUOTACHECK:
-                err = osc_quota_poll_check(exp, karg);
-                goto out;
         case OBD_IOC_PING_TARGET:
                 err = ptlrpc_obd_ping(obd);
                 goto out;
@@ -2543,103 +2305,6 @@ out:
         return err;
 }
 
-static int osc_get_info(const struct lu_env *env, struct obd_export *exp,
-                        u32 keylen, void *key, __u32 *vallen, void *val,
-                        struct lov_stripe_md *lsm)
-{
-        if (!vallen || !val)
-                return -EFAULT;
-
-        if (KEY_IS(KEY_FIEMAP)) {
-                struct ll_fiemap_info_key *fm_key = key;
-                struct ldlm_res_id res_id;
-                ldlm_policy_data_t policy;
-                struct lustre_handle lockh;
-                enum ldlm_mode mode = 0;
-                struct ptlrpc_request *req;
-                struct ll_user_fiemap *reply;
-                char *tmp;
-                int rc;
-
-                if (!(fm_key->fiemap.fm_flags & FIEMAP_FLAG_SYNC))
-                        goto skip_locking;
-
-                policy.l_extent.start = fm_key->fiemap.fm_start &
-                                                PAGE_MASK;
-
-                if (OBD_OBJECT_EOF - fm_key->fiemap.fm_length <=
-                    fm_key->fiemap.fm_start + PAGE_SIZE - 1)
-                        policy.l_extent.end = OBD_OBJECT_EOF;
-                else
-                        policy.l_extent.end = (fm_key->fiemap.fm_start +
-                                fm_key->fiemap.fm_length +
-                                PAGE_SIZE - 1) & PAGE_MASK;
-
-                ostid_build_res_name(&fm_key->oa.o_oi, &res_id);
-                mode = ldlm_lock_match(exp->exp_obd->obd_namespace,
-                                       LDLM_FL_BLOCK_GRANTED |
-                                       LDLM_FL_LVB_READY,
-                                       &res_id, LDLM_EXTENT, &policy,
-                                       LCK_PR | LCK_PW, &lockh, 0);
-                if (mode) { /* lock is cached on client */
-                        if (mode != LCK_PR) {
-                                ldlm_lock_addref(&lockh, LCK_PR);
-                                ldlm_lock_decref(&lockh, LCK_PW);
-                        }
-                } else { /* no cached lock, needs acquire lock on server side */
-                        fm_key->oa.o_valid |= OBD_MD_FLFLAGS;
-                        fm_key->oa.o_flags |= OBD_FL_SRVLOCK;
-                }
-
-skip_locking:
-                req = ptlrpc_request_alloc(class_exp2cliimp(exp),
-                                           &RQF_OST_GET_INFO_FIEMAP);
-                if (!req) {
-                        rc = -ENOMEM;
-                        goto drop_lock;
-                }
-
-                req_capsule_set_size(&req->rq_pill, &RMF_FIEMAP_KEY,
-                                     RCL_CLIENT, keylen);
-                req_capsule_set_size(&req->rq_pill, &RMF_FIEMAP_VAL,
-                                     RCL_CLIENT, *vallen);
-                req_capsule_set_size(&req->rq_pill, &RMF_FIEMAP_VAL,
-                                     RCL_SERVER, *vallen);
-
-                rc = ptlrpc_request_pack(req, LUSTRE_OST_VERSION, OST_GET_INFO);
-                if (rc) {
-                        ptlrpc_request_free(req);
-                        goto drop_lock;
-                }
-
-                tmp = req_capsule_client_get(&req->rq_pill, &RMF_FIEMAP_KEY);
-                memcpy(tmp, key, keylen);
-                tmp = req_capsule_client_get(&req->rq_pill, &RMF_FIEMAP_VAL);
-                memcpy(tmp, val, *vallen);
-
-                ptlrpc_request_set_replen(req);
-                rc = ptlrpc_queue_wait(req);
-                if (rc)
-                        goto fini_req;
-
-                reply = req_capsule_server_get(&req->rq_pill, &RMF_FIEMAP_VAL);
-                if (!reply) {
-                        rc = -EPROTO;
-                        goto fini_req;
-                }
-
-                memcpy(val, reply, *vallen);
-fini_req:
-                ptlrpc_req_finished(req);
-drop_lock:
-                if (mode)
-                        ldlm_lock_decref(&lockh, LCK_PR);
-                return rc;
-        }
-
-        return -EINVAL;
-}
-
 static int osc_set_info_async(const struct lu_env *env, struct obd_export *exp,
                               u32 keylen, void *key, u32 vallen,
                               void *val, struct ptlrpc_request_set *set)
@@ -2999,47 +2664,33 @@ out_ptlrpcd:
         return rc;
 }
 
-static int osc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
+static int osc_precleanup(struct obd_device *obd)
 {
-        switch (stage) {
-        case OBD_CLEANUP_EARLY: {
-                struct obd_import *imp;
-
-                imp = obd->u.cli.cl_import;
-                CDEBUG(D_HA, "Deactivating import %s\n", obd->obd_name);
-                /* ptlrpc_abort_inflight to stop an mds_lov_synchronize */
-                ptlrpc_deactivate_import(imp);
-                spin_lock(&imp->imp_lock);
-                imp->imp_pingable = 0;
-                spin_unlock(&imp->imp_lock);
-                break;
+        struct client_obd *cli = &obd->u.cli;
+
+        /* LU-464
+         * for echo client, export may be on zombie list, wait for
+         * zombie thread to cull it, because cli.cl_import will be
+         * cleared in client_disconnect_export():
+         *   class_export_destroy() -> obd_cleanup() ->
+         *   echo_device_free() -> echo_client_cleanup() ->
+         *   obd_disconnect() -> osc_disconnect() ->
+         *   client_disconnect_export()
+         */
+        obd_zombie_barrier();
+        if (cli->cl_writeback_work) {
+                ptlrpcd_destroy_work(cli->cl_writeback_work);
+                cli->cl_writeback_work = NULL;
         }
-        case OBD_CLEANUP_EXPORTS: {
-                struct client_obd *cli = &obd->u.cli;
-                /* LU-464
-                 * for echo client, export may be on zombie list, wait for
-                 * zombie thread to cull it, because cli.cl_import will be
-                 * cleared in client_disconnect_export():
-                 *   class_export_destroy() -> obd_cleanup() ->
-                 *   echo_device_free() -> echo_client_cleanup() ->
-                 *   obd_disconnect() -> osc_disconnect() ->
-                 *   client_disconnect_export()
-                 */
-                obd_zombie_barrier();
-                if (cli->cl_writeback_work) {
-                        ptlrpcd_destroy_work(cli->cl_writeback_work);
-                        cli->cl_writeback_work = NULL;
-                }
-                if (cli->cl_lru_work) {
-                        ptlrpcd_destroy_work(cli->cl_lru_work);
-                        cli->cl_lru_work = NULL;
-                }
-                obd_cleanup_client_import(obd);
-                ptlrpc_lprocfs_unregister_obd(obd);
-                lprocfs_obd_cleanup(obd);
-                break;
-                }
+
+        if (cli->cl_lru_work) {
+                ptlrpcd_destroy_work(cli->cl_lru_work);
+                cli->cl_lru_work = NULL;
         }
+
+        obd_cleanup_client_import(obd);
+        ptlrpc_lprocfs_unregister_obd(obd);
+        lprocfs_obd_cleanup(obd);
         return 0;
 }
 
@@ -3104,24 +2755,18 @@ static struct obd_ops osc_obd_ops = {
         .disconnect     = osc_disconnect,
         .statfs         = osc_statfs,
         .statfs_async   = osc_statfs_async,
-        .unpackmd       = osc_unpackmd,
         .create         = osc_create,
         .destroy        = osc_destroy,
         .getattr        = osc_getattr,
-        .getattr_async  = osc_getattr_async,
         .setattr        = osc_setattr,
-        .setattr_async  = osc_setattr_async,
         .iocontrol      = osc_iocontrol,
-        .get_info       = osc_get_info,
         .set_info_async = osc_set_info_async,
         .import_event   = osc_import_event,
         .process_config = osc_process_config,
         .quotactl       = osc_quotactl,
-        .quotacheck     = osc_quotacheck,
 };
 
 extern struct lu_kmem_descr osc_caches[];
-extern struct lock_class_key osc_ast_guard_class;
 
 static int __init osc_init(void)
 {
diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c b/drivers/staging/lustre/lustre/ptlrpc/client.c
index 8c51d51a678b..804741362bc0 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/client.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/client.c
@@ -43,6 +43,18 @@
 
 #include "ptlrpc_internal.h"
 
+const struct ptlrpc_bulk_frag_ops ptlrpc_bulk_kiov_pin_ops = {
+        .add_kiov_frag  = ptlrpc_prep_bulk_page_pin,
+        .release_frags  = ptlrpc_release_bulk_page_pin,
+};
+EXPORT_SYMBOL(ptlrpc_bulk_kiov_pin_ops);
+
+const struct ptlrpc_bulk_frag_ops ptlrpc_bulk_kiov_nopin_ops = {
+        .add_kiov_frag  = ptlrpc_prep_bulk_page_nopin,
+        .release_frags  = NULL,
+};
+EXPORT_SYMBOL(ptlrpc_bulk_kiov_nopin_ops);
+
 static int ptlrpc_send_new_req(struct ptlrpc_request *req);
 static int ptlrpcd_check_work(struct ptlrpc_request *req);
 static int ptlrpc_unregister_reply(struct ptlrpc_request *request, int async);
@@ -95,24 +107,43 @@ struct ptlrpc_connection *ptlrpc_uuid_to_connection(struct obd_uuid *uuid)
  * Allocate and initialize new bulk descriptor on the sender.
  * Returns pointer to the descriptor or NULL on error.
  */
-struct ptlrpc_bulk_desc *ptlrpc_new_bulk(unsigned npages, unsigned max_brw,
-                                         unsigned type, unsigned portal)
+struct ptlrpc_bulk_desc *ptlrpc_new_bulk(unsigned int nfrags,
+                                         unsigned int max_brw,
+                                         enum ptlrpc_bulk_op_type type,
+                                         unsigned int portal,
+                                         const struct ptlrpc_bulk_frag_ops *ops)
 {
         struct ptlrpc_bulk_desc *desc;
         int i;
 
-        desc = kzalloc(offsetof(struct ptlrpc_bulk_desc, bd_iov[npages]),
-                       GFP_NOFS);
+        /* ensure that only one of KIOV or IOVEC is set but not both */
+        LASSERT((ptlrpc_is_bulk_desc_kiov(type) && ops->add_kiov_frag) ||
+                (ptlrpc_is_bulk_desc_kvec(type) && ops->add_iov_frag));
+
+        desc = kzalloc(sizeof(*desc), GFP_NOFS);
         if (!desc)
                 return NULL;
 
+        if (type & PTLRPC_BULK_BUF_KIOV) {
+                GET_KIOV(desc) = kcalloc(nfrags, sizeof(*GET_KIOV(desc)),
+                                         GFP_NOFS);
+                if (!GET_KIOV(desc))
+                        goto free_desc;
+        } else {
+                GET_KVEC(desc) = kcalloc(nfrags, sizeof(*GET_KVEC(desc)),
+                                         GFP_NOFS);
+                if (!GET_KVEC(desc))
+                        goto free_desc;
+        }
+
         spin_lock_init(&desc->bd_lock);
         init_waitqueue_head(&desc->bd_waitq);
-        desc->bd_max_iov = npages;
+        desc->bd_max_iov = nfrags;
         desc->bd_iov_count = 0;
         desc->bd_portal = portal;
         desc->bd_type = type;
         desc->bd_md_count = 0;
+        desc->bd_frag_ops = (struct ptlrpc_bulk_frag_ops *)ops;
         LASSERT(max_brw > 0);
         desc->bd_md_max_brw = min(max_brw, PTLRPC_BULK_OPS_COUNT);
         /*
@@ -123,24 +154,31 @@ struct ptlrpc_bulk_desc *ptlrpc_new_bulk(unsigned npages, unsigned max_brw,
                 LNetInvalidateHandle(&desc->bd_mds[i]);
 
         return desc;
+free_desc:
+        kfree(desc);
+        return NULL;
 }
 
 /**
  * Prepare bulk descriptor for specified outgoing request \a req that
- * can fit \a npages * pages. \a type is bulk type. \a portal is where
+ * can fit \a nfrags * pages. \a type is bulk type. \a portal is where
  * the bulk to be sent. Used on client-side.
  * Returns pointer to newly allocated initialized bulk descriptor or NULL on
  * error.
  */
 struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_imp(struct ptlrpc_request *req,
-                                              unsigned npages, unsigned max_brw,
-                                              unsigned type, unsigned portal)
+                                              unsigned int nfrags,
+                                              unsigned int max_brw,
+                                              unsigned int type,
+                                              unsigned int portal,
+                                              const struct ptlrpc_bulk_frag_ops *ops)
 {
         struct obd_import *imp = req->rq_import;
         struct ptlrpc_bulk_desc *desc;
 
-        LASSERT(type == BULK_PUT_SINK || type == BULK_GET_SOURCE);
-        desc = ptlrpc_new_bulk(npages, max_brw, type, portal);
+        LASSERT(ptlrpc_is_bulk_op_passive(type));
+
+        desc = ptlrpc_new_bulk(nfrags, max_brw, type, portal, ops);
         if (!desc)
                 return NULL;
 
@@ -158,56 +196,82 @@ struct ptlrpc_bulk_desc *ptlrpc_prep_bulk_imp(struct ptlrpc_request *req,
 }
 EXPORT_SYMBOL(ptlrpc_prep_bulk_imp);
 
-/**
- * Add a page \a page to the bulk descriptor \a desc.
- * Data to transfer in the page starts at offset \a pageoffset and
- * amount of data to transfer from the page is \a len
- */
 void __ptlrpc_prep_bulk_page(struct ptlrpc_bulk_desc *desc,
                              struct page *page, int pageoffset, int len, int pin)
 {
+        struct bio_vec *kiov;
+
         LASSERT(desc->bd_iov_count < desc->bd_max_iov);
         LASSERT(page);
         LASSERT(pageoffset >= 0);
         LASSERT(len > 0);
         LASSERT(pageoffset + len <= PAGE_SIZE);
+        LASSERT(ptlrpc_is_bulk_desc_kiov(desc->bd_type));
+
+        kiov = &BD_GET_KIOV(desc, desc->bd_iov_count);
 
         desc->bd_nob += len;
 
         if (pin)
                 get_page(page);
 
-        ptlrpc_add_bulk_page(desc, page, pageoffset, len);
+        kiov->bv_page = page;
+        kiov->bv_offset = pageoffset;
+        kiov->bv_len = len;
+
+        desc->bd_iov_count++;
 }
 EXPORT_SYMBOL(__ptlrpc_prep_bulk_page);
 
-/**
- * Uninitialize and free bulk descriptor \a desc.
- * Works on bulk descriptors both from server and client side.
- */
-void __ptlrpc_free_bulk(struct ptlrpc_bulk_desc *desc, int unpin)
+int ptlrpc_prep_bulk_frag(struct ptlrpc_bulk_desc *desc,
+                          void *frag, int len)
 {
-        int i;
+        struct kvec *iovec;
+
+        LASSERT(desc->bd_iov_count < desc->bd_max_iov);
+        LASSERT(frag);
+        LASSERT(len > 0);
+        LASSERT(ptlrpc_is_bulk_desc_kvec(desc->bd_type));
 
+        iovec = &BD_GET_KVEC(desc, desc->bd_iov_count);
+
+        desc->bd_nob += len;
+
+        iovec->iov_base = frag;
+        iovec->iov_len = len;
+
+        desc->bd_iov_count++;
+
+        return desc->bd_nob;
+}
+EXPORT_SYMBOL(ptlrpc_prep_bulk_frag);
+
+void ptlrpc_free_bulk(struct ptlrpc_bulk_desc *desc)
+{
         LASSERT(desc->bd_iov_count != LI_POISON); /* not freed already */
         LASSERT(desc->bd_md_count == 0);         /* network hands off */
         LASSERT((desc->bd_export != NULL) ^ (desc->bd_import != NULL));
+        LASSERT(desc->bd_frag_ops);
 
-        sptlrpc_enc_pool_put_pages(desc);
+        if (ptlrpc_is_bulk_desc_kiov(desc->bd_type))
+                sptlrpc_enc_pool_put_pages(desc);
 
         if (desc->bd_export)
                 class_export_put(desc->bd_export);
         else
                 class_import_put(desc->bd_import);
 
-        if (unpin) {
-                for (i = 0; i < desc->bd_iov_count; i++)
-                        put_page(desc->bd_iov[i].bv_page);
-        }
+        if (desc->bd_frag_ops->release_frags)
+                desc->bd_frag_ops->release_frags(desc);
+
+        if (ptlrpc_is_bulk_desc_kiov(desc->bd_type))
+                kfree(GET_KIOV(desc));
+        else
+                kfree(GET_KVEC(desc));
 
         kfree(desc);
 }
-EXPORT_SYMBOL(__ptlrpc_free_bulk);
+EXPORT_SYMBOL(ptlrpc_free_bulk);
 
 /**
  * Set server timelimit for this req, i.e. how long are we willing to wait
@@ -589,6 +653,42 @@ static void __ptlrpc_free_req_to_pool(struct ptlrpc_request *request)
         spin_unlock(&pool->prp_lock);
 }
 
+void ptlrpc_add_unreplied(struct ptlrpc_request *req)
+{
+        struct obd_import       *imp = req->rq_import;
+        struct list_head        *tmp;
+        struct ptlrpc_request   *iter;
+
+        assert_spin_locked(&imp->imp_lock);
+        LASSERT(list_empty(&req->rq_unreplied_list));
+
+        /* unreplied list is sorted by xid in ascending order */
+        list_for_each_prev(tmp, &imp->imp_unreplied_list) {
+                iter = list_entry(tmp, struct ptlrpc_request,
+                                  rq_unreplied_list);
+
+                LASSERT(req->rq_xid != iter->rq_xid);
+                if (req->rq_xid < iter->rq_xid)
+                        continue;
+                list_add(&req->rq_unreplied_list, &iter->rq_unreplied_list);
+                return;
+        }
+        list_add(&req->rq_unreplied_list, &imp->imp_unreplied_list);
+}
+
+void ptlrpc_assign_next_xid_nolock(struct ptlrpc_request *req)
+{
+        req->rq_xid = ptlrpc_next_xid();
+        ptlrpc_add_unreplied(req);
+}
+
+static inline void ptlrpc_assign_next_xid(struct ptlrpc_request *req)
+{
+        spin_lock(&req->rq_import->imp_lock);
+        ptlrpc_assign_next_xid_nolock(req);
+        spin_unlock(&req->rq_import->imp_lock);
+}
+
 int ptlrpc_request_bufs_pack(struct ptlrpc_request *request,
                              __u32 version, int opcode, char **bufs,
                              struct ptlrpc_cli_ctx *ctx)
@@ -637,8 +737,8 @@ int ptlrpc_request_bufs_pack(struct ptlrpc_request *request,
 
         ptlrpc_at_set_req_timeout(request);
 
-        request->rq_xid = ptlrpc_next_xid();
         lustre_msg_set_opc(request->rq_reqmsg, opcode);
+        ptlrpc_assign_next_xid(request);
 
         /* Let's setup deadline for req/reply/bulk unlink for opcode. */
         if (cfs_fail_val == opcode) {
@@ -1129,7 +1229,9 @@ static int ptlrpc_check_status(struct ptlrpc_request *req)
                 lnet_nid_t nid = imp->imp_connection->c_peer.nid;
                 __u32 opc = lustre_msg_get_opc(req->rq_reqmsg);
 
-                if (ptlrpc_console_allow(req))
+                /* -EAGAIN is normal when using POSIX flocks */
+                if (ptlrpc_console_allow(req) &&
+                    !(opc == LDLM_ENQUEUE && err == -EAGAIN))
                         LCONSOLE_ERROR_MSG(0x011, "%s: operation %s to node %s failed: rc = %d\n",
                                            imp->imp_obd->obd_name,
                                            ll_opcode2str(opc),
@@ -1166,6 +1268,24 @@ static void ptlrpc_save_versions(struct ptlrpc_request *req)
                versions[0], versions[1]);
 }
 
+__u64 ptlrpc_known_replied_xid(struct obd_import *imp)
+{
+        struct ptlrpc_request *req;
+
+        assert_spin_locked(&imp->imp_lock);
+        if (list_empty(&imp->imp_unreplied_list))
+                return 0;
+
+        req = list_entry(imp->imp_unreplied_list.next, struct ptlrpc_request,
+                         rq_unreplied_list);
+        LASSERTF(req->rq_xid >= 1, "XID:%llu\n", req->rq_xid);
+
+        if (imp->imp_known_replied_xid < req->rq_xid - 1)
+                imp->imp_known_replied_xid = req->rq_xid - 1;
+
+        return req->rq_xid - 1;
+}
+
 /**
  * Callback function called when client receives RPC reply for \a req.
  * Returns 0 on success or error code.
@@ -1180,6 +1300,7 @@ static int after_reply(struct ptlrpc_request *req)
         int rc;
         struct timespec64 work_start;
         long timediff;
+        u64 committed;
 
         LASSERT(obd);
         /* repbuf must be unlinked */
@@ -1206,6 +1327,10 @@ static int after_reply(struct ptlrpc_request *req)
                 return 0;
         }
 
+        ktime_get_real_ts64(&work_start);
+        timediff = (work_start.tv_sec - req->rq_sent_tv.tv_sec) * USEC_PER_SEC +
+                   (work_start.tv_nsec - req->rq_sent_tv.tv_nsec) /
+                                                                 NSEC_PER_USEC;
         /*
          * NB Until this point, the whole of the incoming message,
          * including buflens, status etc is in the sender's byte order.
@@ -1235,13 +1360,6 @@ static int after_reply(struct ptlrpc_request *req)
                 spin_unlock(&req->rq_lock);
                 req->rq_nr_resend++;
 
-                /* allocate new xid to avoid reply reconstruction */
-                if (!req->rq_bulk) {
-                        /* new xid is already allocated for bulk in ptlrpc_check_set() */
-                        req->rq_xid = ptlrpc_next_xid();
-                        DEBUG_REQ(D_RPCTRACE, req, "Allocating new xid for resend on EINPROGRESS");
-                }
-
                 /* Readjust the timeout for current conditions */
                 ptlrpc_at_set_req_timeout(req);
                 /*
@@ -1255,13 +1373,14 @@ static int after_reply(struct ptlrpc_request *req)
                 else
                         req->rq_sent = now + req->rq_nr_resend;
 
+                /* Resend for EINPROGRESS will use a new XID */
+                spin_lock(&imp->imp_lock);
+                list_del_init(&req->rq_unreplied_list);
+                spin_unlock(&imp->imp_lock);
+
                 return 0;
         }
 
-        ktime_get_real_ts64(&work_start);
-        timediff = (work_start.tv_sec - req->rq_sent_tv.tv_sec) * USEC_PER_SEC +
-                   (work_start.tv_nsec - req->rq_sent_tv.tv_nsec) /
-                                                                 NSEC_PER_USEC;
         if (obd->obd_svc_stats) {
                 lprocfs_counter_add(obd->obd_svc_stats, PTLRPC_REQWAIT_CNTR,
                                     timediff);
@@ -1338,10 +1457,9 @@ static int after_reply(struct ptlrpc_request *req)
                 }
 
                 /* Replay-enabled imports return commit-status information. */
-                if (lustre_msg_get_last_committed(req->rq_repmsg)) {
-                        imp->imp_peer_committed_transno =
-                                lustre_msg_get_last_committed(req->rq_repmsg);
-                }
+                committed = lustre_msg_get_last_committed(req->rq_repmsg);
+                if (likely(committed > imp->imp_peer_committed_transno))
+                        imp->imp_peer_committed_transno = committed;
 
                 ptlrpc_free_committed(imp);
 
@@ -1373,9 +1491,17 @@ static int after_reply(struct ptlrpc_request *req)
 static int ptlrpc_send_new_req(struct ptlrpc_request *req)
 {
         struct obd_import *imp = req->rq_import;
+        u64 min_xid = 0;
         int rc;
 
         LASSERT(req->rq_phase == RQ_PHASE_NEW);
+
+        /* do not try to go further if there is not enough memory in enc_pool */
+        if (req->rq_sent && req->rq_bulk)
+                if (req->rq_bulk->bd_iov_count > get_free_pages_in_pool() &&
+                    pool_is_at_full_capacity())
+                        return -ENOMEM;
+
         if (req->rq_sent && (req->rq_sent > ktime_get_real_seconds()) &&
             (!req->rq_generation_set ||
              req->rq_import_generation == imp->imp_generation))
@@ -1385,6 +1511,9 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req)
 
         spin_lock(&imp->imp_lock);
 
+        LASSERT(req->rq_xid);
+        LASSERT(!list_empty(&req->rq_unreplied_list));
+
         if (!req->rq_generation_set)
                 req->rq_import_generation = imp->imp_generation;
 
@@ -1414,8 +1543,25 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req)
         LASSERT(list_empty(&req->rq_list));
         list_add_tail(&req->rq_list, &imp->imp_sending_list);
         atomic_inc(&req->rq_import->imp_inflight);
+
+        /* find the known replied XID from the unreplied list, CONNECT
+         * and DISCONNECT requests are skipped to make the sanity check
+         * on server side happy. see process_req_last_xid().
+         *
+         * For CONNECT: Because replay requests have lower XID, it'll
+         * break the sanity check if CONNECT bump the exp_last_xid on
+         * server.
+         *
+         * For DISCONNECT: Since client will abort inflight RPC before
+         * sending DISCONNECT, DISCONNECT may carry an XID which higher
+         * than the inflight RPC.
+         */
+        if (!ptlrpc_req_is_connect(req) && !ptlrpc_req_is_disconnect(req))
+                min_xid = ptlrpc_known_replied_xid(imp);
         spin_unlock(&imp->imp_lock);
 
+        lustre_msg_set_last_xid(req->rq_reqmsg, min_xid);
+
         lustre_msg_set_status(req->rq_reqmsg, current_pid());
 
         rc = sptlrpc_req_refresh_ctx(req, -1);
@@ -1438,6 +1584,16 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req)
                lustre_msg_get_opc(req->rq_reqmsg));
 
         rc = ptl_send_rpc(req, 0);
+        if (rc == -ENOMEM) {
+                spin_lock(&imp->imp_lock);
+                if (!list_empty(&req->rq_list)) {
+                        list_del_init(&req->rq_list);
+                        atomic_dec(&req->rq_import->imp_inflight);
+                }
+                spin_unlock(&imp->imp_lock);
+                ptlrpc_rqphase_move(req, RQ_PHASE_NEW);
+                return rc;
+        }
         if (rc) {
                 DEBUG_REQ(D_HA, req, "send failed (%d); expect timeout", rc);
                 spin_lock(&req->rq_lock);
@@ -1688,18 +1844,9 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set)
                                         spin_lock(&req->rq_lock);
                                         req->rq_resend = 1;
                                         spin_unlock(&req->rq_lock);
-                                        if (req->rq_bulk) {
-                                                __u64 old_xid;
-
-                                                if (!ptlrpc_unregister_bulk(req, 1))
-                                                        continue;
-
-                                                /* ensure previous bulk fails */
-                                                old_xid = req->rq_xid;
-                                                req->rq_xid = ptlrpc_next_xid();
-                                                CDEBUG(D_HA, "resend bulk old x%llu new x%llu\n",
-                                                       old_xid, req->rq_xid);
-                                        }
+                                        if (req->rq_bulk &&
+                                            !ptlrpc_unregister_bulk(req, 1))
+                                                continue;
                                 }
                                 /*
                                  * rq_wait_ctx is only touched by ptlrpcd,
@@ -1727,6 +1874,14 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set)
                                 }
 
                                 rc = ptl_send_rpc(req, 0);
+                                if (rc == -ENOMEM) {
+                                        spin_lock(&imp->imp_lock);
+                                        if (!list_empty(&req->rq_list))
+                                                list_del_init(&req->rq_list);
+                                        spin_unlock(&imp->imp_lock);
+                                        ptlrpc_rqphase_move(req, RQ_PHASE_NEW);
+                                        continue;
+                                }
                                 if (rc) {
                                         DEBUG_REQ(D_HA, req,
                                                   "send failed: rc = %d", rc);
@@ -1850,6 +2005,7 @@ interpret:
                         list_del_init(&req->rq_list);
                         atomic_dec(&imp->imp_inflight);
                 }
+                list_del_init(&req->rq_unreplied_list);
                 spin_unlock(&imp->imp_lock);
 
                 atomic_dec(&set->set_remaining);
@@ -2247,6 +2403,7 @@ static void __ptlrpc_free_req(struct ptlrpc_request *request, int locked)
                 if (!locked)
                         spin_lock(&request->rq_import->imp_lock);
                 list_del_init(&request->rq_replay_list);
+                list_del_init(&request->rq_unreplied_list);
                 if (!locked)
                         spin_unlock(&request->rq_import->imp_lock);
         }
@@ -2266,7 +2423,7 @@ static void __ptlrpc_free_req(struct ptlrpc_request *request, int locked)
                 request->rq_import = NULL;
         }
         if (request->rq_bulk)
-                ptlrpc_free_bulk_pin(request->rq_bulk);
+                ptlrpc_free_bulk(request->rq_bulk);
 
         if (request->rq_reqbuf || request->rq_clrbuf)
                 sptlrpc_cli_free_reqbuf(request);
@@ -2542,14 +2699,6 @@ void ptlrpc_resend_req(struct ptlrpc_request *req)
         req->rq_resend = 1;
         req->rq_net_err = 0;
         req->rq_timedout = 0;
-        if (req->rq_bulk) {
-                __u64 old_xid = req->rq_xid;
-
-                /* ensure previous bulk fails */
-                req->rq_xid = ptlrpc_next_xid();
-                CDEBUG(D_HA, "resend bulk old x%llu new x%llu\n",
-                       old_xid, req->rq_xid);
-        }
         ptlrpc_client_wake_req(req);
         spin_unlock(&req->rq_lock);
 }
@@ -2592,6 +2741,10 @@ void ptlrpc_retain_replayable_request(struct ptlrpc_request *req,
 
         lustre_msg_add_flags(req->rq_reqmsg, MSG_REPLAY);
 
+        spin_lock(&req->rq_lock);
+        req->rq_resend = 0;
+        spin_unlock(&req->rq_lock);
+
         LASSERT(imp->imp_replayable);
         /* Balanced in ptlrpc_free_committed, usually. */
         ptlrpc_request_addref(req);
@@ -2667,8 +2820,15 @@ static int ptlrpc_replay_interpret(const struct lu_env *env,
 
         atomic_dec(&imp->imp_replay_inflight);
 
-        if (!ptlrpc_client_replied(req)) {
-                CERROR("request replay timed out, restarting recovery\n");
+        /*
+         * Note: if it is bulk replay (MDS-MDS replay), then even if
+         * server got the request, but bulk transfer timeout, let's
+         * replay the bulk req again
+         */
+        if (!ptlrpc_client_replied(req) ||
+            (req->rq_bulk &&
+             lustre_msg_get_status(req->rq_repmsg) == -ETIMEDOUT)) {
+                DEBUG_REQ(D_ERROR, req, "request replay timed out.\n");
                 rc = -ETIMEDOUT;
                 goto out;
         }
@@ -2939,6 +3099,48 @@ __u64 ptlrpc_next_xid(void)
 }
 
 /**
+ * If request has a new allocated XID (new request or EINPROGRESS resend),
+ * use this XID as matchbits of bulk, otherwise allocate a new matchbits for
+ * request to ensure previous bulk fails and avoid problems with lost replies
+ * and therefore several transfers landing into the same buffer from different
+ * sending attempts.
+ */
+void ptlrpc_set_bulk_mbits(struct ptlrpc_request *req)
+{
+        struct ptlrpc_bulk_desc *bd = req->rq_bulk;
+
+        LASSERT(bd);
+
+        if (!req->rq_resend) {
+                /* this request has a new xid, just use it as bulk matchbits */
+                req->rq_mbits = req->rq_xid;
+
+        } else { /* needs to generate a new matchbits for resend */
+                u64 old_mbits = req->rq_mbits;
+
+                if ((bd->bd_import->imp_connect_data.ocd_connect_flags &
+                     OBD_CONNECT_BULK_MBITS)) {
+                        req->rq_mbits = ptlrpc_next_xid();
+                } else {
+                        /* old version transfers rq_xid to peer as matchbits */
+                        req->rq_mbits = ptlrpc_next_xid();
+                        req->rq_xid = req->rq_mbits;
+                }
+
+                CDEBUG(D_HA, "resend bulk old x%llu new x%llu\n",
+                       old_mbits, req->rq_mbits);
+        }
+
+        /*
+         * For multi-bulk RPCs, rq_mbits is the last mbits needed for bulks so
+         * that server can infer the number of bulks that were prepared,
+         * see LU-1431
+         */
+        req->rq_mbits += ((bd->bd_iov_count + LNET_MAX_IOV - 1) /
+                          LNET_MAX_IOV) - 1;
+}
+
+/**
  * Get a glimpse at what next xid value might have been.
  * Returns possible next xid.
  */
diff --git a/drivers/staging/lustre/lustre/ptlrpc/connection.c b/drivers/staging/lustre/lustre/ptlrpc/connection.c
index 7b020d60c9e5..6c7c8b68a909 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/connection.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/connection.c
@@ -152,8 +152,8 @@ void ptlrpc_connection_fini(void)
 /*
  * Hash operations for net_peer<->connection
  */
-static unsigned
-conn_hashfn(struct cfs_hash *hs, const void *key, unsigned mask)
+static unsigned int
+conn_hashfn(struct cfs_hash *hs, const void *key, unsigned int mask)
 {
         return cfs_hash_djb2_hash(key, sizeof(lnet_process_id_t), mask);
 }
diff --git a/drivers/staging/lustre/lustre/ptlrpc/events.c b/drivers/staging/lustre/lustre/ptlrpc/events.c
index 283dfb296d35..49f3e6368415 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/events.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/events.c
@@ -182,9 +182,9 @@ void client_bulk_callback(lnet_event_t *ev)
         struct ptlrpc_bulk_desc *desc = cbid->cbid_arg;
         struct ptlrpc_request *req;
 
-        LASSERT((desc->bd_type == BULK_PUT_SINK &&
+        LASSERT((ptlrpc_is_bulk_put_sink(desc->bd_type) &&
                  ev->type == LNET_EVENT_PUT) ||
-                (desc->bd_type == BULK_GET_SOURCE &&
+                (ptlrpc_is_bulk_get_source(desc->bd_type) &&
                  ev->type == LNET_EVENT_GET) ||
                 ev->type == LNET_EVENT_UNLINK);
         LASSERT(ev->unlinked);
diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c
index a23d0a05b574..e8280194001c 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/import.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/import.c
@@ -396,7 +396,7 @@ void ptlrpc_activate_import(struct obd_import *imp)
 }
 EXPORT_SYMBOL(ptlrpc_activate_import);
 
-static void ptlrpc_pinger_force(struct obd_import *imp)
+void ptlrpc_pinger_force(struct obd_import *imp)
 {
         CDEBUG(D_HA, "%s: waking up pinger s:%s\n", obd2cli_tgt(imp->imp_obd),
                ptlrpc_import_state_name(imp->imp_state));
@@ -408,6 +408,7 @@ static void ptlrpc_pinger_force(struct obd_import *imp)
         if (imp->imp_state != LUSTRE_IMP_CONNECTING)
                 ptlrpc_pinger_wake_up();
 }
+EXPORT_SYMBOL(ptlrpc_pinger_force);
 
 void ptlrpc_fail_import(struct obd_import *imp, __u32 conn_cnt)
 {
@@ -621,7 +622,8 @@ int ptlrpc_connect_import(struct obd_import *imp)
                 spin_unlock(&imp->imp_lock);
                 CERROR("already connected\n");
                 return 0;
-        } else if (imp->imp_state == LUSTRE_IMP_CONNECTING) {
+        } else if (imp->imp_state == LUSTRE_IMP_CONNECTING ||
+                   imp->imp_connected) {
                 spin_unlock(&imp->imp_lock);
                 CERROR("already connecting\n");
                 return -EALREADY;
@@ -691,8 +693,6 @@ int ptlrpc_connect_import(struct obd_import *imp)
         request->rq_timeout = INITIAL_CONNECT_TIMEOUT;
         lustre_msg_set_timeout(request->rq_reqmsg, request->rq_timeout);
 
-        lustre_msg_add_op_flags(request->rq_reqmsg, MSG_CONNECT_NEXT_VER);
-
         request->rq_no_resend = 1;
         request->rq_no_delay = 1;
         request->rq_send_state = LUSTRE_IMP_CONNECTING;
@@ -859,6 +859,17 @@ static int ptlrpc_connect_set_flags(struct obd_import *imp,
         client_adjust_max_dirty(cli);
 
         /*
+         * Update client max modify RPCs in flight with value returned
+         * by the server
+         */
+        if (ocd->ocd_connect_flags & OBD_CONNECT_MULTIMODRPCS)
+                cli->cl_max_mod_rpcs_in_flight = min(
+                                        cli->cl_max_mod_rpcs_in_flight,
+                                        ocd->ocd_maxmodrpcs);
+        else
+                cli->cl_max_mod_rpcs_in_flight = 1;
+
+        /*
          * Reset ns_connect_flags only for initial connect. It might be
          * changed in while using FS and if we reset it in reconnect
          * this leads to losing user settings done before such as
@@ -873,8 +884,7 @@ static int ptlrpc_connect_set_flags(struct obd_import *imp,
                         ocd->ocd_connect_flags;
         }
 
-        if ((ocd->ocd_connect_flags & OBD_CONNECT_AT) &&
-            (imp->imp_msg_magic == LUSTRE_MSG_MAGIC_V2))
+        if (ocd->ocd_connect_flags & OBD_CONNECT_AT)
                 /*
                  * We need a per-message support flag, because
                  * a. we don't know if the incoming connect reply
@@ -889,16 +899,45 @@ static int ptlrpc_connect_set_flags(struct obd_import *imp,
         else
                 imp->imp_msghdr_flags &= ~MSGHDR_AT_SUPPORT;
 
-        if ((ocd->ocd_connect_flags & OBD_CONNECT_FULL20) &&
-            (imp->imp_msg_magic == LUSTRE_MSG_MAGIC_V2))
-                imp->imp_msghdr_flags |= MSGHDR_CKSUM_INCOMPAT18;
-        else
-                imp->imp_msghdr_flags &= ~MSGHDR_CKSUM_INCOMPAT18;
+        imp->imp_msghdr_flags |= MSGHDR_CKSUM_INCOMPAT18;
 
         return 0;
 }
 
 /**
+ * Add all replay requests back to unreplied list before start replay,
+ * so that we can make sure the known replied XID is always increased
+ * only even if when replaying requests.
+ */
+static void ptlrpc_prepare_replay(struct obd_import *imp)
+{
+        struct ptlrpc_request *req;
+
+        if (imp->imp_state != LUSTRE_IMP_REPLAY ||
+            imp->imp_resend_replay)
+                return;
+
+        /*
+         * If the server was restart during repaly, the requests may
+         * have been added to the unreplied list in former replay.
+         */
+        spin_lock(&imp->imp_lock);
+
+        list_for_each_entry(req, &imp->imp_committed_list, rq_replay_list) {
+                if (list_empty(&req->rq_unreplied_list))
+                        ptlrpc_add_unreplied(req);
+        }
+
+        list_for_each_entry(req, &imp->imp_replay_list, rq_replay_list) {
+                if (list_empty(&req->rq_unreplied_list))
+                        ptlrpc_add_unreplied(req);
+        }
+
+        imp->imp_known_replied_xid = ptlrpc_known_replied_xid(imp);
+        spin_unlock(&imp->imp_lock);
+}
+
+/**
  * interpret_reply callback for connect RPCs.
  * Looks into returned status of connect operation and decides
  * what to do with the import - i.e enter recovery, promote it to
@@ -933,6 +972,13 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
                 ptlrpc_maybe_ping_import_soon(imp);
                 goto out;
         }
+
+        /*
+         * LU-7558: indicate that we are interpretting connect reply,
+         * pltrpc_connect_import() will not try to reconnect until
+         * interpret will finish.
+         */
+        imp->imp_connected = 1;
         spin_unlock(&imp->imp_lock);
 
         LASSERT(imp->imp_conn_current);
@@ -967,6 +1013,16 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
 
         spin_unlock(&imp->imp_lock);
 
+        if (!exp) {
+                /* This could happen if export is cleaned during the
+                 * connect attempt
+                 */
+                CERROR("%s: missing export after connect\n",
+                       imp->imp_obd->obd_name);
+                rc = -ENODEV;
+                goto out;
+        }
+
         /* check that server granted subset of flags we asked for. */
         if ((ocd->ocd_connect_flags & imp->imp_connect_flags_orig) !=
             ocd->ocd_connect_flags) {
@@ -977,15 +1033,6 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
                 goto out;
         }
 
-        if (!exp) {
-                /* This could happen if export is cleaned during the
-                 * connect attempt
-                 */
-                CERROR("%s: missing export after connect\n",
-                       imp->imp_obd->obd_name);
-                rc = -ENODEV;
-                goto out;
-        }
         old_connect_flags = exp_connect_flags(exp);
         exp->exp_connect_data = *ocd;
         imp->imp_obd->obd_self_export->exp_connect_data = *ocd;
@@ -1124,6 +1171,7 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
                 imp->imp_remote_handle =
                                 *lustre_msg_get_handle(request->rq_repmsg);
                 imp->imp_last_replay_transno = 0;
+                imp->imp_replay_cursor = &imp->imp_committed_list;
                 IMPORT_SET_STATE(imp, LUSTRE_IMP_REPLAY);
         } else {
                 DEBUG_REQ(D_HA, request, "%s: evicting (reconnect/recover flags not set: %x)",
@@ -1147,18 +1195,25 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
         }
 
 finish:
+        ptlrpc_prepare_replay(imp);
         rc = ptlrpc_import_recovery_state_machine(imp);
         if (rc == -ENOTCONN) {
                 CDEBUG(D_HA, "evicted/aborted by %s@%s during recovery; invalidating and reconnecting\n",
                        obd2cli_tgt(imp->imp_obd),
                        imp->imp_connection->c_remote_uuid.uuid);
                 ptlrpc_connect_import(imp);
+                spin_lock(&imp->imp_lock);
+                imp->imp_connected = 0;
                 imp->imp_connect_tried = 1;
+                spin_unlock(&imp->imp_lock);
                 return 0;
         }
 
 out:
+        spin_lock(&imp->imp_lock);
+        imp->imp_connected = 0;
         imp->imp_connect_tried = 1;
+        spin_unlock(&imp->imp_lock);
 
         if (rc != 0) {
                 IMPORT_SET_STATE(imp, LUSTRE_IMP_DISCON);
diff --git a/drivers/staging/lustre/lustre/ptlrpc/layout.c b/drivers/staging/lustre/lustre/ptlrpc/layout.c
index 839ef3e80c1a..99d7c667df28 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/layout.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/layout.c
@@ -48,14 +48,14 @@
 
 #include <linux/module.h>
 
-/* LUSTRE_VERSION_CODE */
-#include "../include/lustre_ver.h"
-
-#include "../include/obd_support.h"
-/* lustre_swab_mdt_body */
 #include "../include/lustre/lustre_idl.h"
-/* obd2cli_tgt() (required by DEBUG_REQ()) */
+
+#include "../include/llog_swab.h"
+#include "../include/lustre_debug.h"
+#include "../include/lustre_swab.h"
+#include "../include/lustre_ver.h"
 #include "../include/obd.h"
+#include "../include/obd_support.h"
 
 /* __REQ_LAYOUT_USER__ */
 #endif
@@ -121,7 +121,7 @@ static const struct req_msg_field *mdt_close_client[] = {
         &RMF_CAPA1
 };
 
-static const struct req_msg_field *mdt_release_close_client[] = {
+static const struct req_msg_field *mdt_intent_close_client[] = {
         &RMF_PTLRPC_BODY,
         &RMF_MDT_EPOCH,
         &RMF_REC_REINT,
@@ -257,6 +257,18 @@ static const struct req_msg_field *mds_reint_rename_client[] = {
         &RMF_DLM_REQ
 };
 
+static const struct req_msg_field *mds_reint_migrate_client[] = {
+        &RMF_PTLRPC_BODY,
+        &RMF_REC_REINT,
+        &RMF_CAPA1,
+        &RMF_CAPA2,
+        &RMF_NAME,
+        &RMF_SYMTGT,
+        &RMF_DLM_REQ,
+        &RMF_MDT_EPOCH,
+        &RMF_CLOSE_DATA
+};
+
 static const struct req_msg_field *mds_last_unlink_server[] = {
         &RMF_PTLRPC_BODY,
         &RMF_MDT_BODY,
@@ -666,10 +678,9 @@ static struct req_format *req_formats[] = {
         &RQF_MDS_GETXATTR,
         &RQF_MDS_SYNC,
         &RQF_MDS_CLOSE,
-        &RQF_MDS_RELEASE_CLOSE,
+        &RQF_MDS_INTENT_CLOSE,
         &RQF_MDS_READPAGE,
         &RQF_MDS_WRITEPAGE,
-        &RQF_MDS_DONE_WRITING,
         &RQF_MDS_REINT,
         &RQF_MDS_REINT_CREATE,
         &RQF_MDS_REINT_CREATE_ACL,
@@ -679,9 +690,9 @@ static struct req_format *req_formats[] = {
         &RQF_MDS_REINT_UNLINK,
         &RQF_MDS_REINT_LINK,
         &RQF_MDS_REINT_RENAME,
+        &RQF_MDS_REINT_MIGRATE,
         &RQF_MDS_REINT_SETATTR,
         &RQF_MDS_REINT_SETXATTR,
-        &RQF_MDS_QUOTACHECK,
         &RQF_MDS_QUOTACTL,
         &RQF_MDS_HSM_PROGRESS,
         &RQF_MDS_HSM_CT_REGISTER,
@@ -691,10 +702,8 @@ static struct req_format *req_formats[] = {
         &RQF_MDS_HSM_ACTION,
         &RQF_MDS_HSM_REQUEST,
         &RQF_MDS_SWAP_LAYOUTS,
-        &RQF_QC_CALLBACK,
         &RQF_OST_CONNECT,
         &RQF_OST_DISCONNECT,
-        &RQF_OST_QUOTACHECK,
         &RQF_OST_QUOTACTL,
         &RQF_OST_GETATTR,
         &RQF_OST_SETATTR,
@@ -1180,14 +1189,6 @@ struct req_format RQF_LOG_CANCEL =
         DEFINE_REQ_FMT0("OBD_LOG_CANCEL", log_cancel_client, empty);
 EXPORT_SYMBOL(RQF_LOG_CANCEL);
 
-struct req_format RQF_MDS_QUOTACHECK =
-        DEFINE_REQ_FMT0("MDS_QUOTACHECK", quotactl_only, empty);
-EXPORT_SYMBOL(RQF_MDS_QUOTACHECK);
-
-struct req_format RQF_OST_QUOTACHECK =
-        DEFINE_REQ_FMT0("OST_QUOTACHECK", quotactl_only, empty);
-EXPORT_SYMBOL(RQF_OST_QUOTACHECK);
-
 struct req_format RQF_MDS_QUOTACTL =
         DEFINE_REQ_FMT0("MDS_QUOTACTL", quotactl_only, quotactl_only);
 EXPORT_SYMBOL(RQF_MDS_QUOTACTL);
@@ -1196,10 +1197,6 @@ struct req_format RQF_OST_QUOTACTL =
         DEFINE_REQ_FMT0("OST_QUOTACTL", quotactl_only, quotactl_only);
 EXPORT_SYMBOL(RQF_OST_QUOTACTL);
 
-struct req_format RQF_QC_CALLBACK =
-        DEFINE_REQ_FMT0("QC_CALLBACK", quotactl_only, empty);
-EXPORT_SYMBOL(RQF_QC_CALLBACK);
-
 struct req_format RQF_MDS_GETSTATUS =
         DEFINE_REQ_FMT0("MDS_GETSTATUS", mdt_body_only, mdt_body_capa);
 EXPORT_SYMBOL(RQF_MDS_GETSTATUS);
@@ -1270,6 +1267,11 @@ struct req_format RQF_MDS_REINT_RENAME =
                         mds_last_unlink_server);
 EXPORT_SYMBOL(RQF_MDS_REINT_RENAME);
 
+struct req_format RQF_MDS_REINT_MIGRATE =
+        DEFINE_REQ_FMT0("MDS_REINT_MIGRATE", mds_reint_migrate_client,
+                        mds_last_unlink_server);
+EXPORT_SYMBOL(RQF_MDS_REINT_MIGRATE);
+
 struct req_format RQF_MDS_REINT_SETATTR =
         DEFINE_REQ_FMT0("MDS_REINT_SETATTR",
                         mds_reint_setattr_client, mds_setattr_server);
@@ -1381,15 +1383,10 @@ struct req_format RQF_MDS_CLOSE =
                         mdt_close_client, mds_last_unlink_server);
 EXPORT_SYMBOL(RQF_MDS_CLOSE);
 
-struct req_format RQF_MDS_RELEASE_CLOSE =
+struct req_format RQF_MDS_INTENT_CLOSE =
         DEFINE_REQ_FMT0("MDS_CLOSE",
-                        mdt_release_close_client, mds_last_unlink_server);
-EXPORT_SYMBOL(RQF_MDS_RELEASE_CLOSE);
-
-struct req_format RQF_MDS_DONE_WRITING =
-        DEFINE_REQ_FMT0("MDS_DONE_WRITING",
-                        mdt_close_client, mdt_body_only);
-EXPORT_SYMBOL(RQF_MDS_DONE_WRITING);
+                        mdt_intent_close_client, mds_last_unlink_server);
+EXPORT_SYMBOL(RQF_MDS_INTENT_CLOSE);
 
 struct req_format RQF_MDS_READPAGE =
         DEFINE_REQ_FMT0("MDS_READPAGE",
@@ -1874,13 +1871,14 @@ static void *__req_capsule_get(struct req_capsule *pill,
         getter = (field->rmf_flags & RMF_F_STRING) ?
                 (typeof(getter))lustre_msg_string : lustre_msg_buf;
 
-        if (field->rmf_flags & RMF_F_STRUCT_ARRAY) {
+        if (field->rmf_flags & (RMF_F_STRUCT_ARRAY | RMF_F_NO_SIZE_CHECK)) {
                 /*
                  * We've already asserted that field->rmf_size > 0 in
                  * req_layout_init().
                  */
                 len = lustre_msg_buflen(msg, offset);
-                if ((len % field->rmf_size) != 0) {
+                if (!(field->rmf_flags & RMF_F_NO_SIZE_CHECK) &&
+                    (len % field->rmf_size)) {
                         CERROR("%s: array field size mismatch %d modulo %u != 0 (%d)\n",
                                field->rmf_name, len, field->rmf_size, loc);
                         return NULL;
diff --git a/drivers/staging/lustre/lustre/ptlrpc/llog_client.c b/drivers/staging/lustre/lustre/ptlrpc/llog_client.c
index 0f55c01feba8..110d9f505787 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/llog_client.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/llog_client.c
@@ -287,8 +287,13 @@ static int llog_client_read_header(const struct lu_env *env,
                 goto out;
         }
 
-        memcpy(handle->lgh_hdr, hdr, sizeof(*hdr));
-        handle->lgh_last_idx = handle->lgh_hdr->llh_tail.lrt_index;
+        if (handle->lgh_hdr_size < hdr->llh_hdr.lrh_len) {
+                rc = -EFAULT;
+                goto out;
+        }
+
+        memcpy(handle->lgh_hdr, hdr, hdr->llh_hdr.lrh_len);
+        handle->lgh_last_idx = LLOG_HDR_TAIL(handle->lgh_hdr)->lrt_index;
 
         /* sanity checks */
         llh_hdr = &handle->lgh_hdr->llh_hdr;
@@ -296,9 +301,14 @@ static int llog_client_read_header(const struct lu_env *env,
                 CERROR("bad log header magic: %#x (expecting %#x)\n",
                        llh_hdr->lrh_type, LLOG_HDR_MAGIC);
                 rc = -EIO;
-        } else if (llh_hdr->lrh_len != LLOG_CHUNK_SIZE) {
-                CERROR("incorrectly sized log header: %#x (expecting %#x)\n",
-                       llh_hdr->lrh_len, LLOG_CHUNK_SIZE);
+        } else if (llh_hdr->lrh_len !=
+                   LLOG_HDR_TAIL(handle->lgh_hdr)->lrt_len ||
+                   (llh_hdr->lrh_len & (llh_hdr->lrh_len - 1)) ||
+                   llh_hdr->lrh_len < LLOG_MIN_CHUNK_SIZE ||
+                   llh_hdr->lrh_len > handle->lgh_hdr_size) {
+                CERROR("incorrectly sized log header: %#x (expecting %#x) (power of two > 8192)\n",
+                       llh_hdr->lrh_len,
+                       LLOG_HDR_TAIL(handle->lgh_hdr)->lrt_len);
                 CERROR("you may need to re-run lconf --write_conf.\n");
                 rc = -EIO;
         }
diff --git a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
index 9bad57d65db4..f87478180013 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
@@ -479,8 +479,8 @@ static int ptlrpc_lprocfs_nrs_seq_show(struct seq_file *m, void *n)
         struct ptlrpc_nrs_policy *policy;
         struct ptlrpc_nrs_pol_info *infos;
         struct ptlrpc_nrs_pol_info tmp;
-        unsigned num_pols;
-        unsigned pol_idx = 0;
+        unsigned int num_pols;
+        unsigned int pol_idx = 0;
         bool hp = false;
         int i;
         int rc = 0;
diff --git a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
index 9c937398a085..da1209e40f03 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
@@ -114,7 +114,7 @@ static int ptlrpc_register_bulk(struct ptlrpc_request *req)
         int rc2;
         int posted_md;
         int total_md;
-        __u64 xid;
+        u64 mbits;
         lnet_handle_me_t me_h;
         lnet_md_t md;
 
@@ -127,8 +127,7 @@ static int ptlrpc_register_bulk(struct ptlrpc_request *req)
         LASSERT(desc->bd_md_max_brw <= PTLRPC_BULK_OPS_COUNT);
         LASSERT(desc->bd_iov_count <= PTLRPC_MAX_BRW_PAGES);
         LASSERT(desc->bd_req);
-        LASSERT(desc->bd_type == BULK_PUT_SINK ||
-                desc->bd_type == BULK_GET_SOURCE);
+        LASSERT(ptlrpc_is_bulk_op_passive(desc->bd_type));
 
         /* cleanup the state of the bulk for it will be reused */
         if (req->rq_resend || req->rq_send_state == LUSTRE_IMP_REPLAY)
@@ -143,40 +142,37 @@ static int ptlrpc_register_bulk(struct ptlrpc_request *req)
         LASSERT(desc->bd_cbid.cbid_fn == client_bulk_callback);
         LASSERT(desc->bd_cbid.cbid_arg == desc);
 
-        /* An XID is only used for a single request from the client.
-         * For retried bulk transfers, a new XID will be allocated in
-         * in ptlrpc_check_set() if it needs to be resent, so it is not
-         * using the same RDMA match bits after an error.
-         *
-         * For multi-bulk RPCs, rq_xid is the last XID needed for bulks. The
-         * first bulk XID is power-of-two aligned before rq_xid. LU-1431
-         */
-        xid = req->rq_xid & ~((__u64)desc->bd_md_max_brw - 1);
+        total_md = (desc->bd_iov_count + LNET_MAX_IOV - 1) / LNET_MAX_IOV;
+        /* rq_mbits is matchbits of the final bulk */
+        mbits = req->rq_mbits - total_md + 1;
+
+        LASSERTF(mbits == (req->rq_mbits & PTLRPC_BULK_OPS_MASK),
+                 "first mbits = x%llu, last mbits = x%llu\n",
+                 mbits, req->rq_mbits);
         LASSERTF(!(desc->bd_registered &&
                    req->rq_send_state != LUSTRE_IMP_REPLAY) ||
-                 xid != desc->bd_last_xid,
-                 "registered: %d  rq_xid: %llu bd_last_xid: %llu\n",
-                 desc->bd_registered, xid, desc->bd_last_xid);
+                 mbits != desc->bd_last_mbits,
+                 "registered: %d  rq_mbits: %llu bd_last_mbits: %llu\n",
+                 desc->bd_registered, mbits, desc->bd_last_mbits);
 
-        total_md = (desc->bd_iov_count + LNET_MAX_IOV - 1) / LNET_MAX_IOV;
         desc->bd_registered = 1;
-        desc->bd_last_xid = xid;
+        desc->bd_last_mbits = mbits;
         desc->bd_md_count = total_md;
         md.user_ptr = &desc->bd_cbid;
         md.eq_handle = ptlrpc_eq_h;
         md.threshold = 1;                      /* PUT or GET */
 
-        for (posted_md = 0; posted_md < total_md; posted_md++, xid++) {
+        for (posted_md = 0; posted_md < total_md; posted_md++, mbits++) {
                 md.options = PTLRPC_MD_OPTIONS |
-                             ((desc->bd_type == BULK_GET_SOURCE) ?
+                             (ptlrpc_is_bulk_op_get(desc->bd_type) ?
                               LNET_MD_OP_GET : LNET_MD_OP_PUT);
                 ptlrpc_fill_bulk_md(&md, desc, posted_md);
 
-                rc = LNetMEAttach(desc->bd_portal, peer, xid, 0,
+                rc = LNetMEAttach(desc->bd_portal, peer, mbits, 0,
                                   LNET_UNLINK, LNET_INS_AFTER, &me_h);
                 if (rc != 0) {
                         CERROR("%s: LNetMEAttach failed x%llu/%d: rc = %d\n",
-                               desc->bd_import->imp_obd->obd_name, xid,
+                               desc->bd_import->imp_obd->obd_name, mbits,
                                posted_md, rc);
                         break;
                 }
@@ -186,7 +182,7 @@ static int ptlrpc_register_bulk(struct ptlrpc_request *req)
                                   &desc->bd_mds[posted_md]);
                 if (rc != 0) {
                         CERROR("%s: LNetMDAttach failed x%llu/%d: rc = %d\n",
-                               desc->bd_import->imp_obd->obd_name, xid,
+                               desc->bd_import->imp_obd->obd_name, mbits,
                                posted_md, rc);
                         rc2 = LNetMEUnlink(me_h);
                         LASSERT(rc2 == 0);
@@ -205,27 +201,19 @@ static int ptlrpc_register_bulk(struct ptlrpc_request *req)
                 return -ENOMEM;
         }
 
-        /* Set rq_xid to matchbits of the final bulk so that server can
-         * infer the number of bulks that were prepared
-         */
-        req->rq_xid = --xid;
-        LASSERTF(desc->bd_last_xid == (req->rq_xid & PTLRPC_BULK_OPS_MASK),
-                 "bd_last_xid = x%llu, rq_xid = x%llu\n",
-                 desc->bd_last_xid, req->rq_xid);
-
         spin_lock(&desc->bd_lock);
-        /* Holler if peer manages to touch buffers before he knows the xid */
+        /* Holler if peer manages to touch buffers before he knows the mbits */
         if (desc->bd_md_count != total_md)
                 CWARN("%s: Peer %s touched %d buffers while I registered\n",
                       desc->bd_import->imp_obd->obd_name, libcfs_id2str(peer),
                       total_md - desc->bd_md_count);
         spin_unlock(&desc->bd_lock);
 
-        CDEBUG(D_NET, "Setup %u bulk %s buffers: %u pages %u bytes, xid x%#llx-%#llx, portal %u\n",
+        CDEBUG(D_NET, "Setup %u bulk %s buffers: %u pages %u bytes, mbits x%#llx-%#llx, portal %u\n",
                desc->bd_md_count,
-               desc->bd_type == BULK_GET_SOURCE ? "get-source" : "put-sink",
+               ptlrpc_is_bulk_op_get(desc->bd_type) ? "get-source" : "put-sink",
                desc->bd_iov_count, desc->bd_nob,
-               desc->bd_last_xid, req->rq_xid, desc->bd_portal);
+               desc->bd_last_mbits, req->rq_mbits, desc->bd_portal);
 
         return 0;
 }
@@ -521,6 +509,39 @@ int ptl_send_rpc(struct ptlrpc_request *request, int noreply)
         lustre_msg_set_conn_cnt(request->rq_reqmsg, imp->imp_conn_cnt);
         lustre_msghdr_set_flags(request->rq_reqmsg, imp->imp_msghdr_flags);
 
+        /*
+         * If it's the first time to resend the request for EINPROGRESS,
+         * we need to allocate a new XID (see after_reply()), it's different
+         * from the resend for reply timeout.
+         */
+        if (request->rq_nr_resend && list_empty(&request->rq_unreplied_list)) {
+                __u64 min_xid = 0;
+                /*
+                 * resend for EINPROGRESS, allocate new xid to avoid reply
+                 * reconstruction
+                 */
+                spin_lock(&imp->imp_lock);
+                ptlrpc_assign_next_xid_nolock(request);
+                request->rq_mbits = request->rq_xid;
+                min_xid = ptlrpc_known_replied_xid(imp);
+                spin_unlock(&imp->imp_lock);
+
+                lustre_msg_set_last_xid(request->rq_reqmsg, min_xid);
+                DEBUG_REQ(D_RPCTRACE, request, "Allocating new xid for resend on EINPROGRESS");
+        } else if (request->rq_bulk) {
+                ptlrpc_set_bulk_mbits(request);
+                lustre_msg_set_mbits(request->rq_reqmsg, request->rq_mbits);
+        }
+
+        if (list_empty(&request->rq_unreplied_list) ||
+            request->rq_xid <= imp->imp_known_replied_xid) {
+                DEBUG_REQ(D_ERROR, request,
+                          "xid: %llu, replied: %llu, list_empty:%d\n",
+                          request->rq_xid, imp->imp_known_replied_xid,
+                          list_empty(&request->rq_unreplied_list));
+                LBUG();
+        }
+
         /**
          * For enabled AT all request should have AT_SUPPORT in the
          * FULL import state when OBD_CONNECT_AT is set
@@ -537,8 +558,15 @@ int ptl_send_rpc(struct ptlrpc_request *request, int noreply)
                 mpflag = cfs_memory_pressure_get_and_set();
 
         rc = sptlrpc_cli_wrap_request(request);
-        if (rc)
+        if (rc) {
+                /*
+                 * set rq_sent so that this request is treated
+                 * as a delayed send in the upper layers
+                 */
+                if (rc == -ENOMEM)
+                        request->rq_sent = ktime_get_seconds();
                 goto out;
+        }
 
         /* bulk register should be done after wrap_request() */
         if (request->rq_bulk) {
diff --git a/drivers/staging/lustre/lustre/ptlrpc/nrs.c b/drivers/staging/lustre/lustre/ptlrpc/nrs.c
index d88faf61e740..7b6ffb195834 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/nrs.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/nrs.c
@@ -82,16 +82,9 @@ static int nrs_policy_ctl_locked(struct ptlrpc_nrs_policy *policy,
 
 static void nrs_policy_stop0(struct ptlrpc_nrs_policy *policy)
 {
-        struct ptlrpc_nrs *nrs = policy->pol_nrs;
-
-        if (policy->pol_desc->pd_ops->op_policy_stop) {
-                spin_unlock(&nrs->nrs_lock);
-
+        if (policy->pol_desc->pd_ops->op_policy_stop)
                 policy->pol_desc->pd_ops->op_policy_stop(policy);
 
-                spin_lock(&nrs->nrs_lock);
-        }
-
         LASSERT(list_empty(&policy->pol_list_queued));
         LASSERT(policy->pol_req_queued == 0 &&
                 policy->pol_req_started == 0);
@@ -619,6 +612,12 @@ static int nrs_policy_ctl(struct ptlrpc_nrs *nrs, char *name,
                 goto out;
         }
 
+        if (policy->pol_state != NRS_POL_STATE_STARTED &&
+            policy->pol_state != NRS_POL_STATE_STOPPED) {
+                rc = -EAGAIN;
+                goto out;
+        }
+
         switch (opc) {
                 /**
                  * Unknown opcode, pass it down to the policy-specific control
diff --git a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
index 871768511e8c..13f00b7cbbe5 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
@@ -42,11 +42,14 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 
-#include "../include/obd_support.h"
-#include "../include/obd_class.h"
+#include "../include/lustre/ll_fiemap.h"
+
+#include "../include/llog_swab.h"
 #include "../include/lustre_net.h"
+#include "../include/lustre_swab.h"
 #include "../include/obd_cksum.h"
-#include "../include/lustre/ll_fiemap.h"
+#include "../include/obd_support.h"
+#include "../include/obd_class.h"
 
 #include "ptlrpc_internal.h"
 
@@ -942,6 +945,25 @@ __u32 lustre_msg_get_opc(struct lustre_msg *msg)
 }
 EXPORT_SYMBOL(lustre_msg_get_opc);
 
+__u16 lustre_msg_get_tag(struct lustre_msg *msg)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg);
+
+                if (!pb) {
+                        CERROR("invalid msg %p: no ptlrpc body!\n", msg);
+                        return 0;
+                }
+                return pb->pb_tag;
+        }
+        default:
+                CERROR("incorrect message magic: %08x\n", msg->lm_magic);
+                return 0;
+        }
+}
+EXPORT_SYMBOL(lustre_msg_get_tag);
+
 __u64 lustre_msg_get_last_committed(struct lustre_msg *msg)
 {
         switch (msg->lm_magic) {
@@ -1236,6 +1258,37 @@ void lustre_msg_set_opc(struct lustre_msg *msg, __u32 opc)
         }
 }
 
+void lustre_msg_set_last_xid(struct lustre_msg *msg, u64 last_xid)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg);
+
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_last_xid = last_xid;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
+}
+
+void lustre_msg_set_tag(struct lustre_msg *msg, __u16 tag)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg);
+
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_tag = tag;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
+}
+EXPORT_SYMBOL(lustre_msg_set_tag);
+
 void lustre_msg_set_versions(struct lustre_msg *msg, __u64 *versions)
 {
         switch (msg->lm_magic) {
@@ -1373,6 +1426,21 @@ void lustre_msg_set_cksum(struct lustre_msg *msg, __u32 cksum)
         }
 }
 
+void lustre_msg_set_mbits(struct lustre_msg *msg, __u64 mbits)
+{
+        switch (msg->lm_magic) {
+        case LUSTRE_MSG_MAGIC_V2: {
+                struct ptlrpc_body *pb = lustre_msg_ptlrpc_body(msg);
+
+                LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
+                pb->pb_mbits = mbits;
+                return;
+        }
+        default:
+                LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
+        }
+}
+
 void ptlrpc_request_set_replen(struct ptlrpc_request *req)
 {
         int count = req_capsule_filled_sizes(&req->rq_pill, RCL_SERVER);
@@ -1442,7 +1510,7 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *b)
         __swab32s(&b->pb_opc);
         __swab32s(&b->pb_status);
         __swab64s(&b->pb_last_xid);
-        __swab64s(&b->pb_last_seen);
+        __swab16s(&b->pb_tag);
         __swab64s(&b->pb_last_committed);
         __swab64s(&b->pb_transno);
         __swab32s(&b->pb_flags);
@@ -1456,7 +1524,12 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *b)
         __swab64s(&b->pb_pre_versions[1]);
         __swab64s(&b->pb_pre_versions[2]);
         __swab64s(&b->pb_pre_versions[3]);
-        CLASSERT(offsetof(typeof(*b), pb_padding) != 0);
+        __swab64s(&b->pb_mbits);
+        CLASSERT(offsetof(typeof(*b), pb_padding0) != 0);
+        CLASSERT(offsetof(typeof(*b), pb_padding1) != 0);
+        CLASSERT(offsetof(typeof(*b), pb_padding64_0) != 0);
+        CLASSERT(offsetof(typeof(*b), pb_padding64_1) != 0);
+        CLASSERT(offsetof(typeof(*b), pb_padding64_2) != 0);
         /* While we need to maintain compatibility between
          * clients and servers without ptlrpc_body_v2 (< 2.3)
          * do not swab any fields beyond pb_jobid, as we are
@@ -1492,8 +1565,12 @@ void lustre_swab_connect(struct obd_connect_data *ocd)
                 __swab32s(&ocd->ocd_max_easize);
         if (ocd->ocd_connect_flags & OBD_CONNECT_MAXBYTES)
                 __swab64s(&ocd->ocd_maxbytes);
+        if (ocd->ocd_connect_flags & OBD_CONNECT_MULTIMODRPCS)
+                __swab16s(&ocd->ocd_maxmodrpcs);
+        CLASSERT(offsetof(typeof(*ocd), padding0));
         CLASSERT(offsetof(typeof(*ocd), padding1) != 0);
-        CLASSERT(offsetof(typeof(*ocd), padding2) != 0);
+        if (ocd->ocd_connect_flags & OBD_CONNECT_FLAGS2)
+                __swab64s(&ocd->ocd_connect_flags2);
         CLASSERT(offsetof(typeof(*ocd), padding3) != 0);
         CLASSERT(offsetof(typeof(*ocd), padding4) != 0);
         CLASSERT(offsetof(typeof(*ocd), padding5) != 0);
@@ -1666,7 +1743,7 @@ void lustre_swab_mdt_body(struct mdt_body *b)
         __swab32s(&b->mbo_eadatasize);
         __swab32s(&b->mbo_aclsize);
         __swab32s(&b->mbo_max_mdsize);
-        __swab32s(&b->mbo_max_cookiesize);
+        CLASSERT(offsetof(typeof(*b), mbo_unused3));
         __swab32s(&b->mbo_uid_h);
         __swab32s(&b->mbo_gid_h);
         CLASSERT(offsetof(typeof(*b), mbo_padding_5) != 0);
@@ -1675,9 +1752,10 @@ void lustre_swab_mdt_body(struct mdt_body *b)
 void lustre_swab_mdt_ioepoch(struct mdt_ioepoch *b)
 {
         /* handle is opaque */
-         __swab64s(&b->ioepoch);
-         __swab32s(&b->flags);
-         CLASSERT(offsetof(typeof(*b), padding) != 0);
+        /* mio_handle is opaque */
+        CLASSERT(offsetof(typeof(*b), mio_unused1));
+        CLASSERT(offsetof(typeof(*b), mio_unused2));
+        CLASSERT(offsetof(typeof(*b), mio_padding));
 }
 
 void lustre_swab_mgs_target_info(struct mgs_target_info *mti)
@@ -1772,7 +1850,7 @@ void lustre_swab_fid2path(struct getinfo_fid2path *gf)
 }
 EXPORT_SYMBOL(lustre_swab_fid2path);
 
-static void lustre_swab_fiemap_extent(struct ll_fiemap_extent *fm_extent)
+static void lustre_swab_fiemap_extent(struct fiemap_extent *fm_extent)
 {
         __swab64s(&fm_extent->fe_logical);
         __swab64s(&fm_extent->fe_physical);
@@ -1781,7 +1859,7 @@ static void lustre_swab_fiemap_extent(struct ll_fiemap_extent *fm_extent)
         __swab32s(&fm_extent->fe_device);
 }
 
-void lustre_swab_fiemap(struct ll_user_fiemap *fiemap)
+void lustre_swab_fiemap(struct fiemap *fiemap)
 {
         __u32 i;
 
@@ -1938,7 +2016,7 @@ static void lustre_swab_ldlm_res_id(struct ldlm_res_id *id)
                 __swab64s(&id->name[i]);
 }
 
-static void lustre_swab_ldlm_policy_data(ldlm_wire_policy_data_t *d)
+static void lustre_swab_ldlm_policy_data(union ldlm_wire_policy_data *d)
 {
         /* the lock data is a union and the first two fields are always an
          * extent so it's ok to process an LDLM_EXTENT and LDLM_FLOCK lock
@@ -2062,8 +2140,6 @@ static void dump_obdo(struct obdo *oa)
         if (valid & OBD_MD_FLHANDLE)
                 CDEBUG(D_RPCTRACE, "obdo: o_handle = %lld\n",
                        oa->o_handle.cookie);
-        if (valid & OBD_MD_FLCOOKIE)
-                CDEBUG(D_RPCTRACE, "obdo: o_lcookie = (llog_cookie dumping not yet implemented)\n");
 }
 
 void dump_ost_body(struct ost_body *ob)
diff --git a/drivers/staging/lustre/lustre/ptlrpc/pers.c b/drivers/staging/lustre/lustre/ptlrpc/pers.c
index 5b9fb11c0b6b..94e9fa85d774 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/pers.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/pers.c
@@ -43,6 +43,8 @@
 void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc,
                          int mdidx)
 {
+        int offset = mdidx * LNET_MAX_IOV;
+
         CLASSERT(PTLRPC_MAX_BRW_PAGES < LI_POISON);
 
         LASSERT(mdidx < desc->bd_md_max_brw);
@@ -50,23 +52,20 @@ void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc,
         LASSERT(!(md->options & (LNET_MD_IOVEC | LNET_MD_KIOV |
                                  LNET_MD_PHYS)));
 
-        md->options |= LNET_MD_KIOV;
         md->length = max(0, desc->bd_iov_count - mdidx * LNET_MAX_IOV);
         md->length = min_t(unsigned int, LNET_MAX_IOV, md->length);
-        if (desc->bd_enc_iov)
-                md->start = &desc->bd_enc_iov[mdidx * LNET_MAX_IOV];
-        else
-                md->start = &desc->bd_iov[mdidx * LNET_MAX_IOV];
-}
-
-void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page,
-                          int pageoffset, int len)
-{
-        lnet_kiov_t *kiov = &desc->bd_iov[desc->bd_iov_count];
-
-        kiov->bv_page = page;
-        kiov->bv_offset = pageoffset;
-        kiov->bv_len = len;
 
-        desc->bd_iov_count++;
+        if (ptlrpc_is_bulk_desc_kiov(desc->bd_type)) {
+                md->options |= LNET_MD_KIOV;
+                if (GET_ENC_KIOV(desc))
+                        md->start = &BD_GET_ENC_KIOV(desc, offset);
+                else
+                        md->start = &BD_GET_KIOV(desc, offset);
+        } else {
+                md->options |= LNET_MD_IOVEC;
+                if (GET_ENC_KVEC(desc))
+                        md->start = &BD_GET_ENC_KVEC(desc, offset);
+                else
+                        md->start = &BD_GET_KVEC(desc, offset);
+        }
 }
diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
index f14d193287da..e0f859ca6223 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
+++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
@@ -55,8 +55,11 @@ int ptlrpcd_start(struct ptlrpcd_ctl *pc);
 /* client.c */
 void ptlrpc_at_adj_net_latency(struct ptlrpc_request *req,
                                unsigned int service_time);
-struct ptlrpc_bulk_desc *ptlrpc_new_bulk(unsigned npages, unsigned max_brw,
-                                         unsigned type, unsigned portal);
+struct ptlrpc_bulk_desc *ptlrpc_new_bulk(unsigned int nfrags,
+                                         unsigned int max_brw,
+                                         enum ptlrpc_bulk_op_type type,
+                                         unsigned int portal,
+                                         const struct ptlrpc_bulk_frag_ops *ops);
 int ptlrpc_request_cache_init(void);
 void ptlrpc_request_cache_fini(void);
 struct ptlrpc_request *ptlrpc_request_cache_alloc(gfp_t flags);
@@ -67,6 +70,10 @@ void ptlrpc_set_add_new_req(struct ptlrpcd_ctl *pc,
 int ptlrpc_expired_set(void *data);
 int ptlrpc_set_next_timeout(struct ptlrpc_request_set *);
 void ptlrpc_resend_req(struct ptlrpc_request *request);
+void ptlrpc_set_bulk_mbits(struct ptlrpc_request *req);
+void ptlrpc_assign_next_xid_nolock(struct ptlrpc_request *req);
+__u64 ptlrpc_known_replied_xid(struct obd_import *imp);
+void ptlrpc_add_unreplied(struct ptlrpc_request *req);
 
 /* events.c */
 int ptlrpc_init_portals(void);
@@ -226,8 +233,6 @@ int ptlrpc_expire_one_request(struct ptlrpc_request *req, int async_unlink);
 /* pers.c */
 void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc,
                          int mdcnt);
-void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page,
-                          int pageoffset, int len);
 
 /* pack_generic.c */
 struct ptlrpc_reply_state *
@@ -322,6 +327,7 @@ static inline void ptlrpc_cli_req_init(struct ptlrpc_request *req)
 
         INIT_LIST_HEAD(&cr->cr_set_chain);
         INIT_LIST_HEAD(&cr->cr_ctx_chain);
+        INIT_LIST_HEAD(&cr->cr_unreplied_list);
         init_waitqueue_head(&cr->cr_reply_waitq);
         init_waitqueue_head(&cr->cr_set_waitq);
 }
@@ -338,4 +344,24 @@ static inline void ptlrpc_srv_req_init(struct ptlrpc_request *req)
         INIT_LIST_HEAD(&sr->sr_hist_list);
 }
 
+static inline bool ptlrpc_req_is_connect(struct ptlrpc_request *req)
+{
+        if (lustre_msg_get_opc(req->rq_reqmsg) == MDS_CONNECT ||
+            lustre_msg_get_opc(req->rq_reqmsg) == OST_CONNECT ||
+            lustre_msg_get_opc(req->rq_reqmsg) == MGS_CONNECT)
+                return true;
+        else
+                return false;
+}
+
+static inline bool ptlrpc_req_is_disconnect(struct ptlrpc_request *req)
+{
+        if (lustre_msg_get_opc(req->rq_reqmsg) == MDS_DISCONNECT ||
+            lustre_msg_get_opc(req->rq_reqmsg) == OST_DISCONNECT ||
+            lustre_msg_get_opc(req->rq_reqmsg) == MGS_DISCONNECT)
+                return true;
+        else
+                return false;
+}
+
 #endif /* PTLRPC_INTERNAL_H */
diff --git a/drivers/staging/lustre/lustre/ptlrpc/recover.c b/drivers/staging/lustre/lustre/ptlrpc/recover.c
index 405faf0dc9fc..c00449036884 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/recover.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/recover.c
@@ -111,7 +111,9 @@ int ptlrpc_replay_next(struct obd_import *imp, int *inflight)
                          * all of it's requests being replayed, it's safe to
                          * use a cursor to accelerate the search
                          */
-                        imp->imp_replay_cursor = imp->imp_replay_cursor->next;
+                        if (!imp->imp_resend_replay ||
+                            imp->imp_replay_cursor == &imp->imp_committed_list)
+                                imp->imp_replay_cursor = imp->imp_replay_cursor->next;
 
                         while (imp->imp_replay_cursor !=
                                &imp->imp_committed_list) {
@@ -155,10 +157,24 @@ int ptlrpc_replay_next(struct obd_import *imp, int *inflight)
                 lustre_msg_add_flags(req->rq_reqmsg, MSG_RESENT);
 
         spin_lock(&imp->imp_lock);
+        /* The resend replay request may have been removed from the
+         * unreplied list.
+         */
+        if (req && imp->imp_resend_replay &&
+            list_empty(&req->rq_unreplied_list)) {
+                ptlrpc_add_unreplied(req);
+                imp->imp_known_replied_xid = ptlrpc_known_replied_xid(imp);
+        }
+
         imp->imp_resend_replay = 0;
         spin_unlock(&imp->imp_lock);
 
         if (req) {
+                /* The request should have been added back in unreplied list
+                 * by ptlrpc_prepare_replay().
+                 */
+                LASSERT(!list_empty(&req->rq_unreplied_list));
+
                 rc = ptlrpc_replay_req(req);
                 if (rc) {
                         CERROR("recovery replay error %d for req %llu\n",
@@ -194,7 +210,13 @@ int ptlrpc_resend(struct obd_import *imp)
                 LASSERTF((long)req > PAGE_SIZE && req != LP_POISON,
                          "req %p bad\n", req);
                 LASSERTF(req->rq_type != LI_POISON, "req %p freed\n", req);
-                if (!ptlrpc_no_resend(req))
+
+                /*
+                 * If the request is allowed to be sent during replay and it
+                 * is not timeout yet, then it does not need to be resent.
+                 */
+                if (!ptlrpc_no_resend(req) &&
+                    (req->rq_timedout || !req->rq_allow_replay))
                         ptlrpc_resend_req(req);
         }
         spin_unlock(&imp->imp_lock);
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec.c b/drivers/staging/lustre/lustre/ptlrpc/sec.c
index a7416cd9ac71..e860df7c45a2 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec.c
@@ -379,7 +379,7 @@ int sptlrpc_req_get_ctx(struct ptlrpc_request *req)
 
         if (!req->rq_cli_ctx) {
                 CERROR("req %p: fail to get context\n", req);
-                return -ENOMEM;
+                return -ECONNREFUSED;
         }
 
         return 0;
@@ -515,6 +515,13 @@ static int sptlrpc_req_replace_dead_ctx(struct ptlrpc_request *req)
 
                 set_current_state(TASK_INTERRUPTIBLE);
                 schedule_timeout(msecs_to_jiffies(MSEC_PER_SEC));
+        } else if (unlikely(!test_bit(PTLRPC_CTX_UPTODATE_BIT, &newctx->cc_flags))) {
+                /*
+                 * new ctx not up to date yet
+                 */
+                CDEBUG(D_SEC,
+                       "ctx (%p, fl %lx) doesn't switch, not up to date yet\n",
+                       newctx, newctx->cc_flags);
         } else {
                 /*
                  * it's possible newctx == oldctx if we're switching
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
index b2cc5ea6cb93..2fe9085e2034 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
@@ -108,6 +108,7 @@ static struct ptlrpc_enc_page_pool {
         unsigned long    epp_st_lowfree;        /* lowest free pages reached */
         unsigned int     epp_st_max_wqlen;      /* highest waitqueue length */
         unsigned long       epp_st_max_wait;       /* in jiffies */
+        unsigned long    epp_st_outofmem;       /* # of out of mem requests */
         /*
          * pointers to pools
          */
@@ -139,7 +140,8 @@ int sptlrpc_proc_enc_pool_seq_show(struct seq_file *m, void *v)
                    "cache missing:         %lu\n"
                    "low free mark:         %lu\n"
                    "max waitqueue depth:     %u\n"
-                   "max wait time:         %ld/%lu\n",
+                   "max wait time:         %ld/%lu\n"
+                   "out of mem:          %lu\n",
                    totalram_pages,
                    PAGES_PER_POOL,
                    page_pools.epp_max_pages,
@@ -158,7 +160,8 @@ int sptlrpc_proc_enc_pool_seq_show(struct seq_file *m, void *v)
                    page_pools.epp_st_lowfree,
                    page_pools.epp_st_max_wqlen,
                    page_pools.epp_st_max_wait,
-                   msecs_to_jiffies(MSEC_PER_SEC));
+                   msecs_to_jiffies(MSEC_PER_SEC),
+                   page_pools.epp_st_outofmem);
 
         spin_unlock(&page_pools.epp_lock);
 
@@ -306,12 +309,30 @@ static inline void enc_pools_wakeup(void)
         }
 }
 
+/*
+ * Export the number of free pages in the pool
+ */
+int get_free_pages_in_pool(void)
+{
+        return page_pools.epp_free_pages;
+}
+
+/*
+ * Let outside world know if enc_pool full capacity is reached
+ */
+int pool_is_at_full_capacity(void)
+{
+        return (page_pools.epp_total_pages == page_pools.epp_max_pages);
+}
+
 void sptlrpc_enc_pool_put_pages(struct ptlrpc_bulk_desc *desc)
 {
         int p_idx, g_idx;
         int i;
 
-        if (!desc->bd_enc_iov)
+        LASSERT(ptlrpc_is_bulk_desc_kiov(desc->bd_type));
+
+        if (!GET_ENC_KIOV(desc))
                 return;
 
         LASSERT(desc->bd_iov_count > 0);
@@ -326,12 +347,12 @@ void sptlrpc_enc_pool_put_pages(struct ptlrpc_bulk_desc *desc)
         LASSERT(page_pools.epp_pools[p_idx]);
 
         for (i = 0; i < desc->bd_iov_count; i++) {
-                LASSERT(desc->bd_enc_iov[i].bv_page);
+                LASSERT(BD_GET_ENC_KIOV(desc, i).bv_page);
                 LASSERT(g_idx != 0 || page_pools.epp_pools[p_idx]);
                 LASSERT(!page_pools.epp_pools[p_idx][g_idx]);
 
                 page_pools.epp_pools[p_idx][g_idx] =
-                                        desc->bd_enc_iov[i].bv_page;
+                        BD_GET_ENC_KIOV(desc, i).bv_page;
 
                 if (++g_idx == PAGES_PER_POOL) {
                         p_idx++;
@@ -345,8 +366,8 @@ void sptlrpc_enc_pool_put_pages(struct ptlrpc_bulk_desc *desc)
 
         spin_unlock(&page_pools.epp_lock);
 
-        kfree(desc->bd_enc_iov);
-        desc->bd_enc_iov = NULL;
+        kfree(GET_ENC_KIOV(desc));
+        GET_ENC_KIOV(desc) = NULL;
 }
 
 static inline void enc_pools_alloc(void)
@@ -404,6 +425,7 @@ int sptlrpc_enc_pool_init(void)
         page_pools.epp_st_lowfree = 0;
         page_pools.epp_st_max_wqlen = 0;
         page_pools.epp_st_max_wait = 0;
+        page_pools.epp_st_outofmem = 0;
 
         enc_pools_alloc();
         if (!page_pools.epp_pools)
@@ -431,13 +453,14 @@ void sptlrpc_enc_pool_fini(void)
 
         if (page_pools.epp_st_access > 0) {
                 CDEBUG(D_SEC,
-                       "max pages %lu, grows %u, grow fails %u, shrinks %u, access %lu, missing %lu, max qlen %u, max wait %ld/%ld\n",
+                       "max pages %lu, grows %u, grow fails %u, shrinks %u, access %lu, missing %lu, max qlen %u, max wait %ld/%ld, out of mem %lu\n",
                        page_pools.epp_st_max_pages, page_pools.epp_st_grows,
                        page_pools.epp_st_grow_fails,
                        page_pools.epp_st_shrinks, page_pools.epp_st_access,
                        page_pools.epp_st_missings, page_pools.epp_st_max_wqlen,
                        page_pools.epp_st_max_wait,
-                       msecs_to_jiffies(MSEC_PER_SEC));
+                       msecs_to_jiffies(MSEC_PER_SEC),
+                       page_pools.epp_st_outofmem);
         }
 }
 
@@ -520,10 +543,11 @@ int sptlrpc_get_bulk_checksum(struct ptlrpc_bulk_desc *desc, __u8 alg,
         hashsize = cfs_crypto_hash_digestsize(cfs_hash_alg_id[alg]);
 
         for (i = 0; i < desc->bd_iov_count; i++) {
-                cfs_crypto_hash_update_page(hdesc, desc->bd_iov[i].bv_page,
-                                            desc->bd_iov[i].bv_offset &
+                cfs_crypto_hash_update_page(hdesc,
+                                            BD_GET_KIOV(desc, i).bv_page,
+                                            BD_GET_KIOV(desc, i).bv_offset &
                                             ~PAGE_MASK,
-                                            desc->bd_iov[i].bv_len);
+                                            BD_GET_KIOV(desc, i).bv_len);
         }
 
         if (hashsize > buflen) {
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c b/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c
index cd305bcb334a..c5e7a2309fce 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c
@@ -153,14 +153,16 @@ static void corrupt_bulk_data(struct ptlrpc_bulk_desc *desc)
         char *ptr;
         unsigned int off, i;
 
+        LASSERT(ptlrpc_is_bulk_desc_kiov(desc->bd_type));
+
         for (i = 0; i < desc->bd_iov_count; i++) {
-                if (desc->bd_iov[i].bv_len == 0)
+                if (!BD_GET_KIOV(desc, i).bv_len)
                         continue;
 
-                ptr = kmap(desc->bd_iov[i].bv_page);
-                off = desc->bd_iov[i].bv_offset & ~PAGE_MASK;
+                ptr = kmap(BD_GET_KIOV(desc, i).bv_page);
+                off = BD_GET_KIOV(desc, i).bv_offset & ~PAGE_MASK;
                 ptr[off] ^= 0x1;
-                kunmap(desc->bd_iov[i].bv_page);
+                kunmap(BD_GET_KIOV(desc, i).bv_page);
                 return;
         }
 }
@@ -352,11 +354,11 @@ int plain_cli_unwrap_bulk(struct ptlrpc_cli_ctx *ctx,
 
         /* fix the actual data size */
         for (i = 0, nob = 0; i < desc->bd_iov_count; i++) {
-                if (desc->bd_iov[i].bv_len + nob > desc->bd_nob_transferred) {
-                        desc->bd_iov[i].bv_len =
-                                desc->bd_nob_transferred - nob;
-                }
-                nob += desc->bd_iov[i].bv_len;
+                struct bio_vec bv_desc = BD_GET_KIOV(desc, i);
+
+                if (bv_desc.bv_len + nob > desc->bd_nob_transferred)
+                        bv_desc.bv_len = desc->bd_nob_transferred - nob;
+                nob += bv_desc.bv_len;
         }
 
         rc = plain_verify_bulk_csum(desc, req->rq_flvr.u_bulk.hash.hash_alg,
diff --git a/drivers/staging/lustre/lustre/ptlrpc/service.c b/drivers/staging/lustre/lustre/ptlrpc/service.c
index 72f39308eebb..70c70558e177 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/service.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/service.c
@@ -343,9 +343,9 @@ ptlrpc_server_nthreads_check(struct ptlrpc_service *svc,
                              struct ptlrpc_service_conf *conf)
 {
         struct ptlrpc_service_thr_conf *tc = &conf->psc_thr;
-        unsigned init;
-        unsigned total;
-        unsigned nthrs;
+        unsigned int init;
+        unsigned int total;
+        unsigned int nthrs;
         int weight;
 
         /*
@@ -2541,8 +2541,9 @@ int ptlrpc_hr_init(void)
 
                 hrp->hrp_nthrs = cfs_cpt_weight(ptlrpc_hr.hr_cpt_table, i);
                 hrp->hrp_nthrs /= weight;
+                if (hrp->hrp_nthrs == 0)
+                        hrp->hrp_nthrs = 1;
 
-                LASSERT(hrp->hrp_nthrs > 0);
                 hrp->hrp_thrs =
                         kzalloc_node(hrp->hrp_nthrs * sizeof(*hrt), GFP_NOFS,
                                      cfs_cpt_spread_node(ptlrpc_hr.hr_cpt_table,
diff --git a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
index b05b1f935e4c..a04e36cf6dd4 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
@@ -195,49 +195,29 @@ void lustre_assert_wire_constants(void)
         LASSERTF(REINT_MAX == 10, "found %lld\n",
                  (long long)REINT_MAX);
         LASSERTF(DISP_IT_EXECD == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)DISP_IT_EXECD);
+                 (unsigned int)DISP_IT_EXECD);
         LASSERTF(DISP_LOOKUP_EXECD == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)DISP_LOOKUP_EXECD);
+                 (unsigned int)DISP_LOOKUP_EXECD);
         LASSERTF(DISP_LOOKUP_NEG == 0x00000004UL, "found 0x%.8xUL\n",
-                 (unsigned)DISP_LOOKUP_NEG);
+                 (unsigned int)DISP_LOOKUP_NEG);
         LASSERTF(DISP_LOOKUP_POS == 0x00000008UL, "found 0x%.8xUL\n",
-                 (unsigned)DISP_LOOKUP_POS);
+                 (unsigned int)DISP_LOOKUP_POS);
         LASSERTF(DISP_OPEN_CREATE == 0x00000010UL, "found 0x%.8xUL\n",
-                 (unsigned)DISP_OPEN_CREATE);
+                 (unsigned int)DISP_OPEN_CREATE);
         LASSERTF(DISP_OPEN_OPEN == 0x00000020UL, "found 0x%.8xUL\n",
-                 (unsigned)DISP_OPEN_OPEN);
+                 (unsigned int)DISP_OPEN_OPEN);
         LASSERTF(DISP_ENQ_COMPLETE == 0x00400000UL, "found 0x%.8xUL\n",
-                 (unsigned)DISP_ENQ_COMPLETE);
+                 (unsigned int)DISP_ENQ_COMPLETE);
         LASSERTF(DISP_ENQ_OPEN_REF == 0x00800000UL, "found 0x%.8xUL\n",
-                 (unsigned)DISP_ENQ_OPEN_REF);
+                 (unsigned int)DISP_ENQ_OPEN_REF);
         LASSERTF(DISP_ENQ_CREATE_REF == 0x01000000UL, "found 0x%.8xUL\n",
-                 (unsigned)DISP_ENQ_CREATE_REF);
+                 (unsigned int)DISP_ENQ_CREATE_REF);
         LASSERTF(DISP_OPEN_LOCK == 0x02000000UL, "found 0x%.8xUL\n",
-                 (unsigned)DISP_OPEN_LOCK);
+                 (unsigned int)DISP_OPEN_LOCK);
         LASSERTF(MDS_STATUS_CONN == 1, "found %lld\n",
                  (long long)MDS_STATUS_CONN);
         LASSERTF(MDS_STATUS_LOV == 2, "found %lld\n",
                  (long long)MDS_STATUS_LOV);
-        LASSERTF(LUSTRE_BFLAG_UNCOMMITTED_WRITES == 1, "found %lld\n",
-                 (long long)LUSTRE_BFLAG_UNCOMMITTED_WRITES);
-        LASSERTF(MF_SOM_CHANGE == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)MF_SOM_CHANGE);
-        LASSERTF(MF_EPOCH_OPEN == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)MF_EPOCH_OPEN);
-        LASSERTF(MF_EPOCH_CLOSE == 0x00000004UL, "found 0x%.8xUL\n",
-                 (unsigned)MF_EPOCH_CLOSE);
-        LASSERTF(MF_MDC_CANCEL_FID1 == 0x00000008UL, "found 0x%.8xUL\n",
-                 (unsigned)MF_MDC_CANCEL_FID1);
-        LASSERTF(MF_MDC_CANCEL_FID2 == 0x00000010UL, "found 0x%.8xUL\n",
-                 (unsigned)MF_MDC_CANCEL_FID2);
-        LASSERTF(MF_MDC_CANCEL_FID3 == 0x00000020UL, "found 0x%.8xUL\n",
-                 (unsigned)MF_MDC_CANCEL_FID3);
-        LASSERTF(MF_MDC_CANCEL_FID4 == 0x00000040UL, "found 0x%.8xUL\n",
-                 (unsigned)MF_MDC_CANCEL_FID4);
-        LASSERTF(MF_SOM_AU == 0x00000080UL, "found 0x%.8xUL\n",
-                 (unsigned)MF_SOM_AU);
-        LASSERTF(MF_GETATTR_LOCK == 0x00000100UL, "found 0x%.8xUL\n",
-                 (unsigned)MF_GETATTR_LOCK);
         LASSERTF(MDS_ATTR_MODE == 0x0000000000000001ULL, "found 0x%.16llxULL\n",
                  (long long)MDS_ATTR_MODE);
         LASSERTF(MDS_ATTR_UID == 0x0000000000000002ULL, "found 0x%.16llxULL\n",
@@ -420,15 +400,13 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct lustre_mdt_attrs *)0)->lma_self_fid) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct lustre_mdt_attrs *)0)->lma_self_fid));
         LASSERTF(LMAI_RELEASED == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)LMAI_RELEASED);
+                 (unsigned int)LMAI_RELEASED);
         LASSERTF(LMAC_HSM == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)LMAC_HSM);
-        LASSERTF(LMAC_SOM == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)LMAC_SOM);
+                 (unsigned int)LMAC_HSM);
         LASSERTF(LMAC_NOT_IN_OI == 0x00000004UL, "found 0x%.8xUL\n",
-                 (unsigned)LMAC_NOT_IN_OI);
+                 (unsigned int)LMAC_NOT_IN_OI);
         LASSERTF(LMAC_FID_ON_OST == 0x00000008UL, "found 0x%.8xUL\n",
-                 (unsigned)LMAC_FID_ON_OST);
+                 (unsigned int)LMAC_FID_ON_OST);
 
         /* Checks for struct ost_id */
         LASSERTF((int)sizeof(struct ost_id) == 16, "found %lld\n",
@@ -478,11 +456,11 @@ void lustre_assert_wire_constants(void)
         LASSERTF(FID_SEQ_LOV_DEFAULT == 0xffffffffffffffffULL, "found 0x%.16llxULL\n",
                  (long long)FID_SEQ_LOV_DEFAULT);
         LASSERTF(FID_OID_SPECIAL_BFL == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)FID_OID_SPECIAL_BFL);
+                 (unsigned int)FID_OID_SPECIAL_BFL);
         LASSERTF(FID_OID_DOT_LUSTRE == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)FID_OID_DOT_LUSTRE);
+                 (unsigned int)FID_OID_DOT_LUSTRE);
         LASSERTF(FID_OID_DOT_LUSTRE_OBF == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)FID_OID_DOT_LUSTRE_OBF);
+                 (unsigned int)FID_OID_DOT_LUSTRE_OBF);
 
         /* Checks for struct lu_dirent */
         LASSERTF((int)sizeof(struct lu_dirent) == 32, "found %lld\n",
@@ -512,11 +490,11 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct lu_dirent *)0)->lde_name[0]) == 1, "found %lld\n",
                  (long long)(int)sizeof(((struct lu_dirent *)0)->lde_name[0]));
         LASSERTF(LUDA_FID == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)LUDA_FID);
+                 (unsigned int)LUDA_FID);
         LASSERTF(LUDA_TYPE == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)LUDA_TYPE);
+                 (unsigned int)LUDA_TYPE);
         LASSERTF(LUDA_64BITHASH == 0x00000004UL, "found 0x%.8xUL\n",
-                 (unsigned)LUDA_64BITHASH);
+                 (unsigned int)LUDA_64BITHASH);
 
         /* Checks for struct luda_type */
         LASSERTF((int)sizeof(struct luda_type) == 2, "found %lld\n",
@@ -635,10 +613,18 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_xid));
         LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_seen) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_seen));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_tag) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_tag));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_tag) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_tag));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding0) == 34, "found %lld\n",
+                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding0));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding0) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding0));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding1) == 36, "found %lld\n",
+                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding1));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding1) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding1));
         LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_committed) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body_v3, pb_last_committed));
         LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed) == 8, "found %lld\n",
@@ -680,10 +666,22 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct ptlrpc_body_v3, pb_pre_versions));
         LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions) == 32, "found %lld\n",
                  (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding) == 120, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding) == 32, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_mbits) == 120, "found %lld\n",
+                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_mbits));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_mbits) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_mbits));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding64_0) == 128, "found %lld\n",
+                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding64_0));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_0) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_0));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding64_1) == 136, "found %lld\n",
+                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding64_1));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_1) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_1));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding64_2) == 144, "found %lld\n",
+                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding64_2));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_2) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_2));
         CLASSERT(LUSTRE_JOBID_SIZE == 32);
         LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_jobid) == 152, "found %lld\n",
                  (long long)(int)offsetof(struct ptlrpc_body_v3, pb_jobid));
@@ -713,10 +711,18 @@ void lustre_assert_wire_constants(void)
                  (int)offsetof(struct ptlrpc_body_v3, pb_last_xid), (int)offsetof(struct ptlrpc_body_v2, pb_last_xid));
         LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_last_xid), "%d != %d\n",
                  (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_last_xid));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_seen) == (int)offsetof(struct ptlrpc_body_v2, pb_last_seen), "%d != %d\n",
-                 (int)offsetof(struct ptlrpc_body_v3, pb_last_seen), (int)offsetof(struct ptlrpc_body_v2, pb_last_seen));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_last_seen), "%d != %d\n",
-                 (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_last_seen));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_tag) == (int)offsetof(struct ptlrpc_body_v2, pb_tag), "%d != %d\n",
+                 (int)offsetof(struct ptlrpc_body_v3, pb_tag), (int)offsetof(struct ptlrpc_body_v2, pb_tag));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_tag) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_tag), "%d != %d\n",
+                 (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_tag), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_tag));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding0) == (int)offsetof(struct ptlrpc_body_v2, pb_padding0), "%d != %d\n",
+                 (int)offsetof(struct ptlrpc_body_v3, pb_padding0), (int)offsetof(struct ptlrpc_body_v2, pb_padding0));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding0) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding0), "%d != %d\n",
+                 (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding0), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding0));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding1) == (int)offsetof(struct ptlrpc_body_v2, pb_padding1), "%d != %d\n",
+                 (int)offsetof(struct ptlrpc_body_v3, pb_padding1), (int)offsetof(struct ptlrpc_body_v2, pb_padding1));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding1) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding1), "%d != %d\n",
+                 (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding1), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding1));
         LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_committed) == (int)offsetof(struct ptlrpc_body_v2, pb_last_committed), "%d != %d\n",
                  (int)offsetof(struct ptlrpc_body_v3, pb_last_committed), (int)offsetof(struct ptlrpc_body_v2, pb_last_committed));
         LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_last_committed), "%d != %d\n",
@@ -757,10 +763,22 @@ void lustre_assert_wire_constants(void)
                  (int)offsetof(struct ptlrpc_body_v3, pb_pre_versions), (int)offsetof(struct ptlrpc_body_v2, pb_pre_versions));
         LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_pre_versions), "%d != %d\n",
                  (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_pre_versions));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding) == (int)offsetof(struct ptlrpc_body_v2, pb_padding), "%d != %d\n",
-                 (int)offsetof(struct ptlrpc_body_v3, pb_padding), (int)offsetof(struct ptlrpc_body_v2, pb_padding));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding), "%d != %d\n",
-                 (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_mbits) == (int)offsetof(struct ptlrpc_body_v2, pb_mbits), "%d != %d\n",
+                 (int)offsetof(struct ptlrpc_body_v3, pb_mbits), (int)offsetof(struct ptlrpc_body_v2, pb_mbits));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_mbits) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_mbits), "%d != %d\n",
+                 (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_mbits), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_mbits));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding64_0) == (int)offsetof(struct ptlrpc_body_v2, pb_padding64_0), "%d != %d\n",
+                 (int)offsetof(struct ptlrpc_body_v3, pb_padding64_0), (int)offsetof(struct ptlrpc_body_v2, pb_padding64_0));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_0) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding64_0), "%d != %d\n",
+                 (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_0), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding64_0));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding64_1) == (int)offsetof(struct ptlrpc_body_v2, pb_padding64_1), "%d != %d\n",
+                 (int)offsetof(struct ptlrpc_body_v3, pb_padding64_1), (int)offsetof(struct ptlrpc_body_v2, pb_padding64_1));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_1) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding64_1), "%d != %d\n",
+                 (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_1), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding64_1));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding64_2) == (int)offsetof(struct ptlrpc_body_v2, pb_padding64_2), "%d != %d\n",
+                 (int)offsetof(struct ptlrpc_body_v3, pb_padding64_2), (int)offsetof(struct ptlrpc_body_v2, pb_padding64_2));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_2) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding64_2), "%d != %d\n",
+                 (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_2), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding64_2));
         LASSERTF(MSG_PTLRPC_BODY_OFF == 0, "found %lld\n",
                  (long long)MSG_PTLRPC_BODY_OFF);
         LASSERTF(REQ_REC_OFF == 1, "found %lld\n",
@@ -802,41 +820,41 @@ void lustre_assert_wire_constants(void)
         LASSERTF(MSGHDR_CKSUM_INCOMPAT18 == 2, "found %lld\n",
                  (long long)MSGHDR_CKSUM_INCOMPAT18);
         LASSERTF(MSG_OP_FLAG_MASK == 0xffff0000UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_OP_FLAG_MASK);
+                 (unsigned int)MSG_OP_FLAG_MASK);
         LASSERTF(MSG_OP_FLAG_SHIFT == 16, "found %lld\n",
                  (long long)MSG_OP_FLAG_SHIFT);
         LASSERTF(MSG_GEN_FLAG_MASK == 0x0000ffffUL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_GEN_FLAG_MASK);
+                 (unsigned int)MSG_GEN_FLAG_MASK);
         LASSERTF(MSG_LAST_REPLAY == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_LAST_REPLAY);
+                 (unsigned int)MSG_LAST_REPLAY);
         LASSERTF(MSG_RESENT == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_RESENT);
+                 (unsigned int)MSG_RESENT);
         LASSERTF(MSG_REPLAY == 0x00000004UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_REPLAY);
+                 (unsigned int)MSG_REPLAY);
         LASSERTF(MSG_DELAY_REPLAY == 0x00000010UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_DELAY_REPLAY);
+                 (unsigned int)MSG_DELAY_REPLAY);
         LASSERTF(MSG_VERSION_REPLAY == 0x00000020UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_VERSION_REPLAY);
+                 (unsigned int)MSG_VERSION_REPLAY);
         LASSERTF(MSG_REQ_REPLAY_DONE == 0x00000040UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_REQ_REPLAY_DONE);
+                 (unsigned int)MSG_REQ_REPLAY_DONE);
         LASSERTF(MSG_LOCK_REPLAY_DONE == 0x00000080UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_LOCK_REPLAY_DONE);
+                 (unsigned int)MSG_LOCK_REPLAY_DONE);
         LASSERTF(MSG_CONNECT_RECOVERING == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_CONNECT_RECOVERING);
+                 (unsigned int)MSG_CONNECT_RECOVERING);
         LASSERTF(MSG_CONNECT_RECONNECT == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_CONNECT_RECONNECT);
+                 (unsigned int)MSG_CONNECT_RECONNECT);
         LASSERTF(MSG_CONNECT_REPLAYABLE == 0x00000004UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_CONNECT_REPLAYABLE);
+                 (unsigned int)MSG_CONNECT_REPLAYABLE);
         LASSERTF(MSG_CONNECT_LIBCLIENT == 0x00000010UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_CONNECT_LIBCLIENT);
+                 (unsigned int)MSG_CONNECT_LIBCLIENT);
         LASSERTF(MSG_CONNECT_INITIAL == 0x00000020UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_CONNECT_INITIAL);
+                 (unsigned int)MSG_CONNECT_INITIAL);
         LASSERTF(MSG_CONNECT_ASYNC == 0x00000040UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_CONNECT_ASYNC);
+                 (unsigned int)MSG_CONNECT_ASYNC);
         LASSERTF(MSG_CONNECT_NEXT_VER == 0x00000080UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_CONNECT_NEXT_VER);
+                 (unsigned int)MSG_CONNECT_NEXT_VER);
         LASSERTF(MSG_CONNECT_TRANSNO == 0x00000100UL, "found 0x%.8xUL\n",
-                 (unsigned)MSG_CONNECT_TRANSNO);
+                 (unsigned int)MSG_CONNECT_TRANSNO);
 
         /* Checks for struct obd_connect_data */
         LASSERTF((int)sizeof(struct obd_connect_data) == 192, "found %lld\n",
@@ -905,14 +923,22 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct obd_connect_data, ocd_maxbytes));
         LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_maxbytes) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_maxbytes));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding1) == 72, "found %lld\n",
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_maxmodrpcs) == 72, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, ocd_maxmodrpcs));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_maxmodrpcs) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_maxmodrpcs));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding0) == 74, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, padding0));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding0) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding0));
+        LASSERTF((int)offsetof(struct obd_connect_data, padding1) == 76, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, padding1));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding1) == 8, "found %lld\n",
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding1) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->padding1));
-        LASSERTF((int)offsetof(struct obd_connect_data, padding2) == 80, "found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, padding2));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding2) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->padding2));
+        LASSERTF((int)offsetof(struct obd_connect_data, ocd_connect_flags2) == 80, "found %lld\n",
+                 (long long)(int)offsetof(struct obd_connect_data, ocd_connect_flags2));
+        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_connect_flags2) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_connect_flags2));
         LASSERTF((int)offsetof(struct obd_connect_data, padding3) == 88, "found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, padding3));
         LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding3) == 8, "found %lld\n",
@@ -1075,14 +1101,24 @@ void lustre_assert_wire_constants(void)
                  OBD_CONNECT_LFSCK);
         LASSERTF(OBD_CONNECT_UNLINK_CLOSE == 0x100000000000000ULL, "found 0x%.16llxULL\n",
                  OBD_CONNECT_UNLINK_CLOSE);
+        LASSERTF(OBD_CONNECT_MULTIMODRPCS == 0x200000000000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_MULTIMODRPCS);
         LASSERTF(OBD_CONNECT_DIR_STRIPE == 0x400000000000000ULL, "found 0x%.16llxULL\n",
                  OBD_CONNECT_DIR_STRIPE);
+        LASSERTF(OBD_CONNECT_SUBTREE == 0x800000000000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_SUBTREE);
+        LASSERTF(OBD_CONNECT_LOCK_AHEAD == 0x1000000000000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_LOCK_AHEAD);
+        LASSERTF(OBD_CONNECT_OBDOPACK == 0x4000000000000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_OBDOPACK);
+        LASSERTF(OBD_CONNECT_FLAGS2 == 0x8000000000000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_FLAGS2);
         LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)OBD_CKSUM_CRC32);
+                 (unsigned int)OBD_CKSUM_CRC32);
         LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)OBD_CKSUM_ADLER);
+                 (unsigned int)OBD_CKSUM_ADLER);
         LASSERTF(OBD_CKSUM_CRC32C == 0x00000004UL, "found 0x%.8xUL\n",
-                 (unsigned)OBD_CKSUM_CRC32C);
+                 (unsigned int)OBD_CKSUM_CRC32C);
 
         /* Checks for struct obdo */
         LASSERTF((int)sizeof(struct obdo) == 208, "found %lld\n",
@@ -1239,8 +1275,6 @@ void lustre_assert_wire_constants(void)
                  OBD_MD_FLCKSUM);
         LASSERTF(OBD_MD_FLQOS == (0x00200000ULL), "found 0x%.16llxULL\n",
                  OBD_MD_FLQOS);
-        LASSERTF(OBD_MD_FLCOOKIE == (0x00800000ULL), "found 0x%.16llxULL\n",
-                 OBD_MD_FLCOOKIE);
         LASSERTF(OBD_MD_FLGROUP == (0x01000000ULL), "found 0x%.16llxULL\n",
                  OBD_MD_FLGROUP);
         LASSERTF(OBD_MD_FLFID == (0x02000000ULL), "found 0x%.16llxULL\n",
@@ -1394,13 +1428,13 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_objects[0]));
         CLASSERT(LOV_MAGIC_V3 == (0x0BD30000 | 0x0BD0));
         LASSERTF(LOV_PATTERN_RAID0 == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)LOV_PATTERN_RAID0);
+                 (unsigned int)LOV_PATTERN_RAID0);
         LASSERTF(LOV_PATTERN_RAID1 == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)LOV_PATTERN_RAID1);
+                 (unsigned int)LOV_PATTERN_RAID1);
         LASSERTF(LOV_PATTERN_FIRST == 0x00000100UL, "found 0x%.8xUL\n",
-                 (unsigned)LOV_PATTERN_FIRST);
+                 (unsigned int)LOV_PATTERN_FIRST);
         LASSERTF(LOV_PATTERN_CMOBD == 0x00000200UL, "found 0x%.8xUL\n",
-                 (unsigned)LOV_PATTERN_CMOBD);
+                 (unsigned int)LOV_PATTERN_CMOBD);
 
         /* Checks for struct lmv_mds_md_v1 */
         LASSERTF((int)sizeof(struct lmv_mds_md_v1) == 56, "found %lld\n",
@@ -1542,6 +1576,8 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct obd_ioobj, ioo_bufcnt));
         LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_bufcnt) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_bufcnt));
+        LASSERTF(IOOBJ_MAX_BRW_BITS == 16, "found %lld\n",
+                 (long long)IOOBJ_MAX_BRW_BITS);
 
         /* Checks for union lquota_id */
         LASSERTF((int)sizeof(union lquota_id) == 16, "found %lld\n",
@@ -1817,10 +1853,10 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct mdt_body, mbo_max_mdsize));
         LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_max_mdsize) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct mdt_body *)0)->mbo_max_mdsize));
-        LASSERTF((int)offsetof(struct mdt_body, mbo_max_cookiesize) == 160, "found %lld\n",
-                 (long long)(int)offsetof(struct mdt_body, mbo_max_cookiesize));
-        LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_max_cookiesize) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mdt_body *)0)->mbo_max_cookiesize));
+        LASSERTF((int)offsetof(struct mdt_body, mbo_unused3) == 160, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_body, mbo_unused3));
+        LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_unused3) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_body *)0)->mbo_unused3));
         LASSERTF((int)offsetof(struct mdt_body, mbo_uid_h) == 164, "found %lld\n",
                  (long long)(int)offsetof(struct mdt_body, mbo_uid_h));
         LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_uid_h) == 4, "found %lld\n",
@@ -1857,12 +1893,6 @@ void lustre_assert_wire_constants(void)
                  MDS_FMODE_CLOSED);
         LASSERTF(MDS_FMODE_EXEC == 000000000004UL, "found 0%.11oUL\n",
                  MDS_FMODE_EXEC);
-        LASSERTF(MDS_FMODE_EPOCH == 000001000000UL, "found 0%.11oUL\n",
-                 MDS_FMODE_EPOCH);
-        LASSERTF(MDS_FMODE_TRUNC == 000002000000UL, "found 0%.11oUL\n",
-                 MDS_FMODE_TRUNC);
-        LASSERTF(MDS_FMODE_SOM == 000004000000UL, "found 0%.11oUL\n",
-                 MDS_FMODE_SOM);
         LASSERTF(MDS_OPEN_CREATED == 000000000010UL, "found 0%.11oUL\n",
                  MDS_OPEN_CREATED);
         LASSERTF(MDS_OPEN_CROSS == 000000000020UL, "found 0%.11oUL\n",
@@ -1905,10 +1935,20 @@ void lustre_assert_wire_constants(void)
                  LUSTRE_IMMUTABLE_FL);
         LASSERTF(LUSTRE_APPEND_FL == 0x00000020, "found 0x%.8x\n",
                  LUSTRE_APPEND_FL);
+        LASSERTF(LUSTRE_NODUMP_FL == 0x00000040, "found 0x%.8x\n",
+                 LUSTRE_NODUMP_FL);
         LASSERTF(LUSTRE_NOATIME_FL == 0x00000080, "found 0x%.8x\n",
                  LUSTRE_NOATIME_FL);
+        LASSERTF(LUSTRE_INDEX_FL == 0x00001000, "found 0x%.8x\n",
+                 LUSTRE_INDEX_FL);
         LASSERTF(LUSTRE_DIRSYNC_FL == 0x00010000, "found 0x%.8x\n",
                  LUSTRE_DIRSYNC_FL);
+        LASSERTF(LUSTRE_TOPDIR_FL == 0x00020000, "found 0x%.8x\n",
+                 LUSTRE_TOPDIR_FL);
+        LASSERTF(LUSTRE_DIRECTIO_FL == 0x00100000, "found 0x%.8x\n",
+                 LUSTRE_DIRECTIO_FL);
+        LASSERTF(LUSTRE_INLINE_DATA_FL == 0x10000000, "found 0x%.8x\n",
+                 LUSTRE_INLINE_DATA_FL);
         LASSERTF(MDS_INODELOCK_LOOKUP == 0x000001, "found 0x%.8x\n",
                  MDS_INODELOCK_LOOKUP);
         LASSERTF(MDS_INODELOCK_UPDATE == 0x000002, "found 0x%.8x\n",
@@ -1921,22 +1961,22 @@ void lustre_assert_wire_constants(void)
         /* Checks for struct mdt_ioepoch */
         LASSERTF((int)sizeof(struct mdt_ioepoch) == 24, "found %lld\n",
                  (long long)(int)sizeof(struct mdt_ioepoch));
-        LASSERTF((int)offsetof(struct mdt_ioepoch, handle) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct mdt_ioepoch, handle));
-        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->handle) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->handle));
-        LASSERTF((int)offsetof(struct mdt_ioepoch, ioepoch) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct mdt_ioepoch, ioepoch));
-        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->ioepoch) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->ioepoch));
-        LASSERTF((int)offsetof(struct mdt_ioepoch, flags) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct mdt_ioepoch, flags));
-        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->flags));
-        LASSERTF((int)offsetof(struct mdt_ioepoch, padding) == 20, "found %lld\n",
-                 (long long)(int)offsetof(struct mdt_ioepoch, padding));
-        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->padding));
+        LASSERTF((int)offsetof(struct mdt_ioepoch, mio_handle) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_ioepoch, mio_handle));
+        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->mio_handle) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->mio_handle));
+        LASSERTF((int)offsetof(struct mdt_ioepoch, mio_unused1) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_ioepoch, mio_unused1));
+        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->mio_unused1) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->mio_unused1));
+        LASSERTF((int)offsetof(struct mdt_ioepoch, mio_unused2) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_ioepoch, mio_unused2));
+        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->mio_unused2) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->mio_unused2));
+        LASSERTF((int)offsetof(struct mdt_ioepoch, mio_padding) == 20, "found %lld\n",
+                 (long long)(int)offsetof(struct mdt_ioepoch, mio_padding));
+        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->mio_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct mdt_ioepoch *)0)->mio_padding));
 
         /* Checks for struct mdt_rec_setattr */
         LASSERTF((int)sizeof(struct mdt_rec_setattr) == 136, "found %lld\n",
@@ -3520,21 +3560,21 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx));
 
-        /* Checks for struct ll_fiemap_info_key */
+        /* Checks for struct fiemap_info_key */
         LASSERTF((int)sizeof(struct ll_fiemap_info_key) == 248, "found %lld\n",
                  (long long)(int)sizeof(struct ll_fiemap_info_key));
-        LASSERTF((int)offsetof(struct ll_fiemap_info_key, name[8]) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_info_key, name[8]));
-        LASSERTF((int)sizeof(((struct ll_fiemap_info_key *)0)->name[8]) == 1, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_info_key *)0)->name[8]));
-        LASSERTF((int)offsetof(struct ll_fiemap_info_key, oa) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_info_key, oa));
-        LASSERTF((int)sizeof(((struct ll_fiemap_info_key *)0)->oa) == 208, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_info_key *)0)->oa));
-        LASSERTF((int)offsetof(struct ll_fiemap_info_key, fiemap) == 216, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_info_key, fiemap));
-        LASSERTF((int)sizeof(((struct ll_fiemap_info_key *)0)->fiemap) == 32, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_info_key *)0)->fiemap));
+        LASSERTF((int)offsetof(struct ll_fiemap_info_key, lfik_name[8]) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct ll_fiemap_info_key, lfik_name[8]));
+        LASSERTF((int)sizeof(((struct ll_fiemap_info_key *)0)->lfik_name[8]) == 1, "found %lld\n",
+                 (long long)(int)sizeof(((struct ll_fiemap_info_key *)0)->lfik_name[8]));
+        LASSERTF((int)offsetof(struct ll_fiemap_info_key, lfik_oa) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct ll_fiemap_info_key, lfik_oa));
+        LASSERTF((int)sizeof(((struct ll_fiemap_info_key *)0)->lfik_oa) == 208, "found %lld\n",
+                 (long long)(int)sizeof(((struct ll_fiemap_info_key *)0)->lfik_oa));
+        LASSERTF((int)offsetof(struct ll_fiemap_info_key, lfik_fiemap) == 216, "found %lld\n",
+                 (long long)(int)offsetof(struct ll_fiemap_info_key, lfik_fiemap));
+        LASSERTF((int)sizeof(((struct ll_fiemap_info_key *)0)->lfik_fiemap) == 32, "found %lld\n",
+                 (long long)(int)sizeof(((struct ll_fiemap_info_key *)0)->lfik_fiemap));
 
         /* Checks for struct mgs_target_info */
         LASSERTF((int)sizeof(struct mgs_target_info) == 4544, "found %lld\n",
@@ -3670,64 +3710,64 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]) == 1, "found %lld\n",
                  (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]));
 
-        /* Checks for struct ll_user_fiemap */
-        LASSERTF((int)sizeof(struct ll_user_fiemap) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct ll_user_fiemap));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_start) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_start));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_start) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_start));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_length) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_length));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_length) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_length));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_flags) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_flags));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_flags));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_mapped_extents) == 20, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_mapped_extents));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_mapped_extents) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_mapped_extents));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_extent_count) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_extent_count));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_extent_count) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_extent_count));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_reserved) == 28, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_reserved));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_reserved) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_reserved));
-        LASSERTF((int)offsetof(struct ll_user_fiemap, fm_extents) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_user_fiemap, fm_extents));
-        LASSERTF((int)sizeof(((struct ll_user_fiemap *)0)->fm_extents) == 0, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_user_fiemap *)0)->fm_extents));
+        /* Checks for struct fiemap */
+        LASSERTF((int)sizeof(struct fiemap) == 32, "found %lld\n",
+                 (long long)(int)sizeof(struct fiemap));
+        LASSERTF((int)offsetof(struct fiemap, fm_start) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap, fm_start));
+        LASSERTF((int)sizeof(((struct fiemap *)0)->fm_start) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap *)0)->fm_start));
+        LASSERTF((int)offsetof(struct fiemap, fm_length) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap, fm_length));
+        LASSERTF((int)sizeof(((struct fiemap *)0)->fm_length) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap *)0)->fm_length));
+        LASSERTF((int)offsetof(struct fiemap, fm_flags) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap, fm_flags));
+        LASSERTF((int)sizeof(((struct fiemap *)0)->fm_flags) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap *)0)->fm_flags));
+        LASSERTF((int)offsetof(struct fiemap, fm_mapped_extents) == 20, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap, fm_mapped_extents));
+        LASSERTF((int)sizeof(((struct fiemap *)0)->fm_mapped_extents) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap *)0)->fm_mapped_extents));
+        LASSERTF((int)offsetof(struct fiemap, fm_extent_count) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap, fm_extent_count));
+        LASSERTF((int)sizeof(((struct fiemap *)0)->fm_extent_count) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap *)0)->fm_extent_count));
+        LASSERTF((int)offsetof(struct fiemap, fm_reserved) == 28, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap, fm_reserved));
+        LASSERTF((int)sizeof(((struct fiemap *)0)->fm_reserved) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap *)0)->fm_reserved));
+        LASSERTF((int)offsetof(struct fiemap, fm_extents) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap, fm_extents));
+        LASSERTF((int)sizeof(((struct fiemap *)0)->fm_extents) == 0, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap *)0)->fm_extents));
         CLASSERT(FIEMAP_FLAG_SYNC == 0x00000001);
         CLASSERT(FIEMAP_FLAG_XATTR == 0x00000002);
         CLASSERT(FIEMAP_FLAG_DEVICE_ORDER == 0x40000000);
 
-        /* Checks for struct ll_fiemap_extent */
-        LASSERTF((int)sizeof(struct ll_fiemap_extent) == 56, "found %lld\n",
-                 (long long)(int)sizeof(struct ll_fiemap_extent));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_logical) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_logical));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_logical) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_logical));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_physical) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_physical));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_physical) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_physical));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_length) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_length));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_length) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_length));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_flags) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_flags));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags));
-        LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_device) == 44, "found %lld\n",
-                 (long long)(int)offsetof(struct ll_fiemap_extent, fe_device));
-        LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_device) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_device));
+        /* Checks for struct fiemap_extent */
+        LASSERTF((int)sizeof(struct fiemap_extent) == 56, "found %lld\n",
+                 (long long)(int)sizeof(struct fiemap_extent));
+        LASSERTF((int)offsetof(struct fiemap_extent, fe_logical) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap_extent, fe_logical));
+        LASSERTF((int)sizeof(((struct fiemap_extent *)0)->fe_logical) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap_extent *)0)->fe_logical));
+        LASSERTF((int)offsetof(struct fiemap_extent, fe_physical) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap_extent, fe_physical));
+        LASSERTF((int)sizeof(((struct fiemap_extent *)0)->fe_physical) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap_extent *)0)->fe_physical));
+        LASSERTF((int)offsetof(struct fiemap_extent, fe_length) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap_extent, fe_length));
+        LASSERTF((int)sizeof(((struct fiemap_extent *)0)->fe_length) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap_extent *)0)->fe_length));
+        LASSERTF((int)offsetof(struct fiemap_extent, fe_flags) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap_extent, fe_flags));
+        LASSERTF((int)sizeof(((struct fiemap_extent *)0)->fe_flags) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap_extent *)0)->fe_flags));
+        LASSERTF((int)offsetof(struct fiemap_extent, fe_reserved[0]) == 44, "found %lld\n",
+                 (long long)(int)offsetof(struct fiemap_extent, fe_reserved[0]));
+        LASSERTF((int)sizeof(((struct fiemap_extent *)0)->fe_reserved[0]) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct fiemap_extent *)0)->fe_reserved[0]));
         CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
         CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
         CLASSERT(FIEMAP_EXTENT_DELALLOC == 0x00000004);
@@ -4093,9 +4133,9 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct hsm_request *)0)->hr_data_len) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct hsm_request *)0)->hr_data_len));
         LASSERTF(HSM_FORCE_ACTION == 0x00000001UL, "found 0x%.8xUL\n",
-                 (unsigned)HSM_FORCE_ACTION);
+                 (unsigned int)HSM_FORCE_ACTION);
         LASSERTF(HSM_GHOST_COPY == 0x00000002UL, "found 0x%.8xUL\n",
-                 (unsigned)HSM_GHOST_COPY);
+                 (unsigned int)HSM_GHOST_COPY);
 
         /* Checks for struct hsm_user_request */
         LASSERTF((int)sizeof(struct hsm_user_request) == 24, "found %lld\n",
diff --git a/drivers/staging/lustre/sysfs-fs-lustre b/drivers/staging/lustre/sysfs-fs-lustre
index 20206ba965af..8691c6543a9c 100644
--- a/drivers/staging/lustre/sysfs-fs-lustre
+++ b/drivers/staging/lustre/sysfs-fs-lustre
@@ -11,7 +11,7 @@ Description:
                 Shows if the lustre module has pinger support.
                 "on" means yes and "off" means no.
 
-What:           /sys/fs/lustre/health
+What:           /sys/fs/lustre/health_check
 Date:           May 2015
 Contact:        "Oleg Drokin" <oleg.drokin@intel.com>
 Description:
diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 4d9bd02ede47..c5116c058cea 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -2542,7 +2542,7 @@ static int bcm2048_vidioc_s_hw_freq_seek(struct file *file, void *priv,
         return err;
 }
 
-static struct v4l2_ioctl_ops bcm2048_ioctl_ops = {
+static const struct v4l2_ioctl_ops bcm2048_ioctl_ops = {
         .vidioc_querycap        = bcm2048_vidioc_querycap,
         .vidioc_g_input         = bcm2048_vidioc_g_input,
         .vidioc_s_input         = bcm2048_vidioc_s_input,
diff --git a/drivers/staging/media/cxd2099/cxd2099.c b/drivers/staging/media/cxd2099/cxd2099.c
index fedeb3c3549e..c72c3f09f175 100644
--- a/drivers/staging/media/cxd2099/cxd2099.c
+++ b/drivers/staging/media/cxd2099/cxd2099.c
@@ -336,7 +336,8 @@ static int init(struct cxd *ci)
                         break;
 #endif
                 /* TOSTRT = 8, Mode B (gated clock), falling Edge,
-                 * Serial, POL=HIGH, MSB */
+                 * Serial, POL=HIGH, MSB
+                 */
                 status = write_reg(ci, 0x0A, 0xA7);
                 if (status < 0)
                         break;
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 8be9f854510f..c34bf4621767 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -1143,8 +1143,8 @@ static int vpfe_buffer_prepare(struct vb2_buffer *vb)
         /* Initialize buffer */
         vb2_set_plane_payload(vb, 0, video->fmt.fmt.pix.sizeimage);
         if (vb2_plane_vaddr(vb, 0) &&
-                vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
-                        return -EINVAL;
+            vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
+                return -EINVAL;
 
         addr = vb2_dma_contig_plane_dma_addr(vb, 0);
         /* Make sure user addresses are aligned to 32 bytes */
diff --git a/drivers/staging/media/lirc/lirc_sasem.c b/drivers/staging/media/lirc/lirc_sasem.c
index 4678ae10b030..920c4a1290f4 100644
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@ -103,7 +103,8 @@ struct sasem_context {
 
         struct tx_t {
                 unsigned char data_buf[SASEM_DATA_BUF_SZ]; /* user data
-                                                            * buffer */
+                                                            * buffer
+                                                            */
                 struct completion finished;  /* wait for write to finish  */
                 atomic_t busy;               /* write in progress */
                 int status;                  /* status of tx completion */
@@ -295,7 +296,8 @@ static int vfd_close(struct inode *inode, struct file *file)
                 if (!context->dev_present && !context->ir_isopen) {
                         /* Device disconnected before close and IR port is
                          * not open. If IR port is open, context will be
-                         * deleted by ir_close. */
+                         * deleted by ir_close.
+                         */
                         mutex_unlock(&context->ctx_lock);
                         delete_context(context);
                         return retval;
@@ -397,7 +399,8 @@ static ssize_t vfd_write(struct file *file, const char __user *buf,
 
         /* Nine 8 byte packets to be sent */
         /* NOTE: "\x07\x01\0\0\0\0\0\0" or "\x0c\0\0\0\0\0\0\0"
-         *       will clear the VFD */
+         *       will clear the VFD
+         */
         for (i = 0; i < 9; i++) {
                 switch (i) {
                 case 0:
diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
index 3551aed589c0..34aac3e2eb87 100644
--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
@@ -1157,8 +1157,8 @@ static ssize_t write(struct file *filep, const char __user *buf, size_t n,
 
                 /* Send the code */
                 if (ret == 0) {
-                        ret = send_code(tx, (unsigned)command >> 16,
-                                            (unsigned)command & 0xFFFF);
+                        ret = send_code(tx, (unsigned int)command >> 16,
+                                            (unsigned int)command & 0xFFFF);
                         if (ret == -EPROTO) {
                                 mutex_unlock(&ir->ir_lock);
                                 mutex_unlock(&tx->client_lock);
diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c
index aaca39d751a5..f71d5f2f179f 100644
--- a/drivers/staging/media/omap4iss/iss_csi2.c
+++ b/drivers/staging/media/omap4iss/iss_csi2.c
@@ -224,7 +224,7 @@ static u16 csi2_ctx_map_format(struct iss_csi2_device *csi2)
                 fmtidx = 3;
                 break;
         default:
-                WARN(1, KERN_ERR "CSI2: pixel format %08x unsupported!\n",
+                WARN(1, "CSI2: pixel format %08x unsupported!\n",
                      fmt->code);
                 return 0;
         }
diff --git a/drivers/staging/media/s5p-cec/s5p_cec.c b/drivers/staging/media/s5p-cec/s5p_cec.c
index 1780a08b73c9..aef962b6af31 100644
--- a/drivers/staging/media/s5p-cec/s5p_cec.c
+++ b/drivers/staging/media/s5p-cec/s5p_cec.c
@@ -22,7 +22,6 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/timer.h>
-#include <linux/version.h>
 #include <linux/workqueue.h>
 #include <media/cec.h>
 
diff --git a/drivers/staging/media/st-cec/stih-cec.c b/drivers/staging/media/st-cec/stih-cec.c
index 214344866a6b..b22394ac4ec4 100644
--- a/drivers/staging/media/st-cec/stih-cec.c
+++ b/drivers/staging/media/st-cec/stih-cec.c
@@ -108,11 +108,11 @@
 
 /* Constants for CEC_BIT_TOUT_THRESH register */
 #define CEC_SBIT_TOUT_47MS BIT(1)
-#define CEC_SBIT_TOUT_48MS BIT(0) | BIT(1)
+#define CEC_SBIT_TOUT_48MS (BIT(0) | BIT(1))
 #define CEC_SBIT_TOUT_50MS BIT(2)
 #define CEC_DBIT_TOUT_27MS BIT(0)
 #define CEC_DBIT_TOUT_28MS BIT(1)
-#define CEC_DBIT_TOUT_29MS BIT(0) | BIT(1)
+#define CEC_DBIT_TOUT_29MS (BIT(0) | BIT(1))
 
 /* Constants for CEC_BIT_PULSE_THRESH register */
 #define CEC_BIT_LPULSE_03MS BIT(1)
diff --git a/drivers/staging/most/aim-network/networking.c b/drivers/staging/most/aim-network/networking.c
index 4659a6450c04..ce1764cba5f0 100644
--- a/drivers/staging/most/aim-network/networking.c
+++ b/drivers/staging/most/aim-network/networking.c
@@ -67,10 +67,10 @@ struct net_dev_context {
         struct most_interface *iface;
         bool channels_opened;
         bool is_mamac;
-        unsigned char link_stat;
         struct net_device *dev;
         struct net_dev_channel rx;
         struct net_dev_channel tx;
+        struct completion mac_compl;
         struct list_head list;
 };
 
@@ -181,6 +181,7 @@ static int most_nd_set_mac_address(struct net_device *dev, void *p)
 static int most_nd_open(struct net_device *dev)
 {
         struct net_dev_context *nd = dev->ml_priv;
+        long ret;
 
         netdev_info(dev, "open net device\n");
 
@@ -202,16 +203,30 @@ static int most_nd_open(struct net_device *dev)
                 return -EBUSY;
         }
 
-        nd->channels_opened = true;
-
-        if (nd->is_mamac) {
-                nd->link_stat = 1;
-                netif_wake_queue(dev);
-        } else {
+        if (!is_valid_ether_addr(dev->dev_addr)) {
                 nd->iface->request_netinfo(nd->iface, nd->tx.ch_id);
+                ret = wait_for_completion_interruptible_timeout(
+                              &nd->mac_compl, msecs_to_jiffies(5000));
+                if (!ret) {
+                        netdev_err(dev, "mac timeout\n");
+                        ret = -EBUSY;
+                        goto err;
+                }
+
+                if (ret < 0) {
+                        netdev_warn(dev, "mac waiting interrupted\n");
+                        goto err;
+                }
         }
 
+        nd->channels_opened = true;
+        netif_wake_queue(dev);
         return 0;
+
+err:
+        most_stop_channel(nd->iface, nd->tx.ch_id, &aim);
+        most_stop_channel(nd->iface, nd->rx.ch_id, &aim);
+        return ret;
 }
 
 static int most_nd_stop(struct net_device *dev)
@@ -277,7 +292,6 @@ static const struct net_device_ops most_nd_ops = {
 
 static void most_nd_setup(struct net_device *dev)
 {
-        netdev_info(dev, "setup net device\n");
         ether_setup(dev);
         dev->netdev_ops = &most_nd_ops;
 }
@@ -332,6 +346,7 @@ static int aim_probe_channel(struct most_interface *iface, int channel_idx,
                 if (!nd)
                         return -ENOMEM;
 
+                init_completion(&nd->mac_compl);
                 nd->iface = iface;
 
                 spin_lock_irqsave(&list_lock, flags);
@@ -548,8 +563,7 @@ void most_deliver_netinfo(struct most_interface *iface,
 {
         struct net_dev_context *nd;
         struct net_device *dev;
-
-        pr_info("Received netinfo from %s\n", iface->description);
+        const u8 *m = mac_addr;
 
         nd = get_net_dev_context(iface);
         if (!nd)
@@ -559,15 +573,16 @@ void most_deliver_netinfo(struct most_interface *iface,
         if (!dev)
                 return;
 
-        if (mac_addr)
-                ether_addr_copy(dev->dev_addr, mac_addr);
-
-        if (nd->link_stat != link_stat) {
-                nd->link_stat = link_stat;
-                if (nd->link_stat)
-                        netif_wake_queue(dev);
-                else
-                        netif_stop_queue(dev);
+        if (m && is_valid_ether_addr(m)) {
+                if (!is_valid_ether_addr(dev->dev_addr)) {
+                        netdev_info(dev, "set mac %02x-%02x-%02x-%02x-%02x-%02x\n",
+                                    m[0], m[1], m[2], m[3], m[4], m[5]);
+                        ether_addr_copy(dev->dev_addr, m);
+                        complete(&nd->mac_compl);
+                } else if (!ether_addr_equal(dev->dev_addr, m)) {
+                        netdev_warn(dev, "reject mac %02x-%02x-%02x-%02x-%02x-%02x\n",
+                                    m[0], m[1], m[2], m[3], m[4], m[5]);
+                }
         }
 }
 EXPORT_SYMBOL(most_deliver_netinfo);
diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.c b/drivers/staging/most/hdm-dim2/dim2_hdm.c
index 78b2c3dd9bb3..35aee9fbbf02 100644
--- a/drivers/staging/most/hdm-dim2/dim2_hdm.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hdm.c
@@ -306,14 +306,11 @@ static int deliver_netinfo_thread(void *data)
 static void retrieve_netinfo(struct dim2_hdm *dev, struct mbo *mbo)
 {
         u8 *data = mbo->virt_address;
-        u8 *mac = dev->mac_addrs;
 
         pr_info("Node Address: 0x%03x\n", (u16)data[16] << 8 | data[17]);
         dev->link_state = data[18];
         pr_info("NIState: %d\n", dev->link_state);
-        memcpy(mac, data + 19, 6);
-        pr_info("MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n",
-                mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+        memcpy(dev->mac_addrs, data + 19, 6);
         dev->deliver_netinfo++;
         wake_up_interruptible(&dev->netinfo_waitq);
 }
diff --git a/drivers/staging/most/hdm-usb/hdm_usb.c b/drivers/staging/most/hdm-usb/hdm_usb.c
index 26c9adb29308..d6db0bd65be0 100644
--- a/drivers/staging/most/hdm-usb/hdm_usb.c
+++ b/drivers/staging/most/hdm-usb/hdm_usb.c
@@ -97,9 +97,7 @@ struct clear_hold_work {
  * @cap: channel capabilities
  * @conf: channel configuration
  * @dci: direct communication interface of hardware
- * @hw_addr: MAC address of hardware
  * @ep_address: endpoint address table
- * @link_stat: link status of hardware
  * @description: device description
  * @suffix: suffix for channel name
  * @channel_lock: synchronize channel access
@@ -117,9 +115,7 @@ struct most_dev {
         struct most_channel_capability *cap;
         struct most_channel_config *conf;
         struct most_dci_obj *dci;
-        u8 hw_addr[6];
         u8 *ep_address;
-        u16 link_stat;
         char description[MAX_STRING_LEN];
         char suffix[MAX_NUM_ENDPOINTS][MAX_SUFFIX_LEN];
         spinlock_t channel_lock[MAX_NUM_ENDPOINTS]; /* sync channel access */
@@ -186,28 +182,9 @@ static inline int drci_wr_reg(struct usb_device *dev, u16 reg, u16 data)
                                5 * HZ);
 }
 
-/**
- * free_anchored_buffers - free device's anchored items
- * @mdev: the device
- * @channel: channel ID
- * @status: status of MBO termination
- */
-static void free_anchored_buffers(struct most_dev *mdev, unsigned int channel,
-                                  enum mbo_status_flags status)
+static inline int start_sync_ep(struct usb_device *usb_dev, u16 ep)
 {
-        struct mbo *mbo;
-        struct urb *urb;
-
-        while ((urb = usb_get_from_anchor(&mdev->busy_urbs[channel]))) {
-                mbo = urb->context;
-                usb_kill_urb(urb);
-                if (mbo && mbo->complete) {
-                        mbo->status = status;
-                        mbo->processed_length = 0;
-                        mbo->complete(mbo);
-                }
-                usb_free_urb(urb);
-        }
+        return drci_wr_reg(usb_dev, DRCI_REG_BASE + DRCI_COMMAND + ep * 16, 1);
 }
 
 /**
@@ -278,7 +255,7 @@ static int hdm_poison_channel(struct most_interface *iface, int channel)
         cancel_work_sync(&mdev->clear_work[channel].ws);
 
         mutex_lock(&mdev->io_mutex);
-        free_anchored_buffers(mdev, channel, MBO_E_CLOSE);
+        usb_kill_anchored_urbs(&mdev->busy_urbs[channel]);
         if (mdev->padding_active[channel])
                 mdev->padding_active[channel] = false;
 
@@ -377,33 +354,27 @@ static void hdm_write_completion(struct urb *urb)
         unsigned long flags;
 
         spin_lock_irqsave(lock, flags);
-        if (urb->status == -ENOENT || urb->status == -ECONNRESET ||
-            !mdev->is_channel_healthy[channel]) {
-                spin_unlock_irqrestore(lock, flags);
-                return;
-        }
 
-        if (unlikely(urb->status && urb->status != -ESHUTDOWN)) {
-                mbo->processed_length = 0;
+        mbo->processed_length = 0;
+        mbo->status = MBO_E_INVAL;
+        if (likely(mdev->is_channel_healthy[channel])) {
                 switch (urb->status) {
+                case 0:
+                case -ESHUTDOWN:
+                        mbo->processed_length = urb->actual_length;
+                        mbo->status = MBO_SUCCESS;
+                        break;
                 case -EPIPE:
                         dev_warn(dev, "Broken OUT pipe detected\n");
                         mdev->is_channel_healthy[channel] = false;
-                        spin_unlock_irqrestore(lock, flags);
                         mdev->clear_work[channel].pipe = urb->pipe;
                         schedule_work(&mdev->clear_work[channel].ws);
-                        return;
+                        break;
                 case -ENODEV:
                 case -EPROTO:
                         mbo->status = MBO_E_CLOSE;
                         break;
-                default:
-                        mbo->status = MBO_E_INVAL;
-                        break;
                 }
-        } else {
-                mbo->status = MBO_SUCCESS;
-                mbo->processed_length = urb->actual_length;
         }
 
         spin_unlock_irqrestore(lock, flags);
@@ -531,40 +502,35 @@ static void hdm_read_completion(struct urb *urb)
         unsigned long flags;
 
         spin_lock_irqsave(lock, flags);
-        if (urb->status == -ENOENT || urb->status == -ECONNRESET ||
-            !mdev->is_channel_healthy[channel]) {
-                spin_unlock_irqrestore(lock, flags);
-                return;
-        }
 
-        if (unlikely(urb->status && urb->status != -ESHUTDOWN)) {
-                mbo->processed_length = 0;
+        mbo->processed_length = 0;
+        mbo->status = MBO_E_INVAL;
+        if (likely(mdev->is_channel_healthy[channel])) {
                 switch (urb->status) {
+                case 0:
+                case -ESHUTDOWN:
+                        mbo->processed_length = urb->actual_length;
+                        mbo->status = MBO_SUCCESS;
+                        if (mdev->padding_active[channel] &&
+                            hdm_remove_padding(mdev, channel, mbo)) {
+                                mbo->processed_length = 0;
+                                mbo->status = MBO_E_INVAL;
+                        }
+                        break;
                 case -EPIPE:
                         dev_warn(dev, "Broken IN pipe detected\n");
                         mdev->is_channel_healthy[channel] = false;
-                        spin_unlock_irqrestore(lock, flags);
                         mdev->clear_work[channel].pipe = urb->pipe;
                         schedule_work(&mdev->clear_work[channel].ws);
-                        return;
+                        break;
                 case -ENODEV:
                 case -EPROTO:
                         mbo->status = MBO_E_CLOSE;
                         break;
                 case -EOVERFLOW:
                         dev_warn(dev, "Babble on IN pipe detected\n");
-                default:
-                        mbo->status = MBO_E_INVAL;
                         break;
                 }
-        } else {
-                mbo->processed_length = urb->actual_length;
-                mbo->status = MBO_SUCCESS;
-                if (mdev->padding_active[channel] &&
-                    hdm_remove_padding(mdev, channel, mbo)) {
-                        mbo->processed_length = 0;
-                        mbo->status = MBO_E_INVAL;
-                }
         }
 
         spin_unlock_irqrestore(lock, flags);
@@ -668,6 +634,15 @@ _error:
  * @iface: interface
  * @channel: channel ID
  * @conf: structure that holds the configuration information
+ *
+ * The attached network interface controller (NIC) supports a padding mode
+ * to avoid short packets on USB, hence increasing the performance due to a
+ * lower interrupt load. This mode is default for synchronous data and can
+ * be switched on for isochronous data. In case padding is active the
+ * driver needs to know the frame size of the payload in order to calculate
+ * the number of bytes it needs to pad when transmitting or to cut off when
+ * receiving data.
+ *
  */
 static int hdm_configure_channel(struct most_interface *iface, int channel,
                                  struct most_channel_config *conf)
@@ -701,6 +676,11 @@ static int hdm_configure_channel(struct most_interface *iface, int channel,
             !(conf->data_type == MOST_CH_ISOC &&
               conf->packets_per_xact != 0xFF)) {
                 mdev->padding_active[channel] = false;
+                /*
+                 * Since the NIC's padding mode is not going to be
+                 * used, we can skip the frame size calculations and
+                 * move directly on to exit.
+                 */
                 goto exit;
         }
 
@@ -734,56 +714,12 @@ static int hdm_configure_channel(struct most_interface *iface, int channel,
                           - conf->buffer_size;
 exit:
         mdev->conf[channel] = *conf;
-        return 0;
-}
+        if (conf->data_type == MOST_CH_ASYNC) {
+                u16 ep = mdev->ep_address[channel];
 
-/**
- * hdm_update_netinfo - retrieve latest networking information
- * @mdev: device interface
- *
- * This triggers the USB vendor requests to read the hardware address and
- * the current link status of the attached device.
- */
-static int hdm_update_netinfo(struct most_dev *mdev)
-{
-        struct usb_device *usb_device = mdev->usb_device;
-        struct device *dev = &usb_device->dev;
-        u16 hi, mi, lo, link;
-
-        if (!is_valid_ether_addr(mdev->hw_addr)) {
-                if (drci_rd_reg(usb_device, DRCI_REG_HW_ADDR_HI, &hi) < 0) {
-                        dev_err(dev, "Vendor request \"hw_addr_hi\" failed\n");
-                        return -EFAULT;
-                }
-
-                if (drci_rd_reg(usb_device, DRCI_REG_HW_ADDR_MI, &mi) < 0) {
-                        dev_err(dev, "Vendor request \"hw_addr_mid\" failed\n");
-                        return -EFAULT;
-                }
-
-                if (drci_rd_reg(usb_device, DRCI_REG_HW_ADDR_LO, &lo) < 0) {
-                        dev_err(dev, "Vendor request \"hw_addr_low\" failed\n");
-                        return -EFAULT;
-                }
-
-                mutex_lock(&mdev->io_mutex);
-                mdev->hw_addr[0] = hi >> 8;
-                mdev->hw_addr[1] = hi;
-                mdev->hw_addr[2] = mi >> 8;
-                mdev->hw_addr[3] = mi;
-                mdev->hw_addr[4] = lo >> 8;
-                mdev->hw_addr[5] = lo;
-                mutex_unlock(&mdev->io_mutex);
-        }
-
-        if (drci_rd_reg(usb_device, DRCI_REG_NI_STATE, &link) < 0) {
-                dev_err(dev, "Vendor request \"link status\" failed\n");
-                return -EFAULT;
+                if (start_sync_ep(mdev->usb_device, ep) < 0)
+                        dev_warn(dev, "sync for ep%02x failed", ep);
         }
-
-        mutex_lock(&mdev->io_mutex);
-        mdev->link_stat = link;
-        mutex_unlock(&mdev->io_mutex);
         return 0;
 }
 
@@ -807,7 +743,7 @@ static void hdm_request_netinfo(struct most_interface *iface, int channel)
 }
 
 /**
- * link_stat_timer_handler - add work to link_stat work queue
+ * link_stat_timer_handler - schedule work obtaining mac address and link status
  * @data: pointer to USB device instance
  *
  * The handler runs in interrupt context. That's why we need to defer the
@@ -823,33 +759,47 @@ static void link_stat_timer_handler(unsigned long data)
 }
 
 /**
- * wq_netinfo - work queue function
+ * wq_netinfo - work queue function to deliver latest networking information
  * @wq_obj: object that holds data for our deferred work to do
  *
  * This retrieves the network interface status of the USB INIC
- * and compares it with the current status. If the status has
- * changed, it updates the status of the core.
  */
 static void wq_netinfo(struct work_struct *wq_obj)
 {
         struct most_dev *mdev = to_mdev_from_work(wq_obj);
-        int i, prev_link_stat = mdev->link_stat;
-        u8 prev_hw_addr[6];
+        struct usb_device *usb_device = mdev->usb_device;
+        struct device *dev = &usb_device->dev;
+        u16 hi, mi, lo, link;
+        u8 hw_addr[6];
 
-        for (i = 0; i < 6; i++)
-                prev_hw_addr[i] = mdev->hw_addr[i];
+        if (drci_rd_reg(usb_device, DRCI_REG_HW_ADDR_HI, &hi) < 0) {
+                dev_err(dev, "Vendor request 'hw_addr_hi' failed\n");
+                return;
+        }
+
+        if (drci_rd_reg(usb_device, DRCI_REG_HW_ADDR_MI, &mi) < 0) {
+                dev_err(dev, "Vendor request 'hw_addr_mid' failed\n");
+                return;
+        }
 
-        if (hdm_update_netinfo(mdev) < 0)
+        if (drci_rd_reg(usb_device, DRCI_REG_HW_ADDR_LO, &lo) < 0) {
+                dev_err(dev, "Vendor request 'hw_addr_low' failed\n");
+                return;
+        }
+
+        if (drci_rd_reg(usb_device, DRCI_REG_NI_STATE, &link) < 0) {
+                dev_err(dev, "Vendor request 'link status' failed\n");
                 return;
-        if (prev_link_stat != mdev->link_stat ||
-            prev_hw_addr[0] != mdev->hw_addr[0] ||
-            prev_hw_addr[1] != mdev->hw_addr[1] ||
-            prev_hw_addr[2] != mdev->hw_addr[2] ||
-            prev_hw_addr[3] != mdev->hw_addr[3] ||
-            prev_hw_addr[4] != mdev->hw_addr[4] ||
-            prev_hw_addr[5] != mdev->hw_addr[5])
-                most_deliver_netinfo(&mdev->iface, mdev->link_stat,
-                                     &mdev->hw_addr[0]);
+        }
+
+        hw_addr[0] = hi >> 8;
+        hw_addr[1] = hi;
+        hw_addr[2] = mi >> 8;
+        hw_addr[3] = mi;
+        hw_addr[4] = lo >> 8;
+        hw_addr[5] = lo;
+
+        most_deliver_netinfo(&mdev->iface, link, hw_addr);
 }
 
 /**
@@ -867,7 +817,7 @@ static void wq_clear_halt(struct work_struct *wq_obj)
 
         mutex_lock(&mdev->io_mutex);
         most_stop_enqueue(&mdev->iface, channel);
-        free_anchored_buffers(mdev, channel, MBO_E_INVAL);
+        usb_kill_anchored_urbs(&mdev->busy_urbs[channel]);
         if (usb_clear_halt(mdev->usb_device, pipe))
                 dev_warn(&mdev->usb_device->dev, "Failed to reset endpoint.\n");
 
@@ -1053,6 +1003,7 @@ static ssize_t store_value(struct most_dci_obj *dci_obj,
         u16 val;
         u16 reg_addr;
         const char *name = attr->attr.name;
+        struct usb_device *usb_dev = dci_obj->usb_device;
         int err = kstrtou16(buf, 16, &val);
 
         if (err)
@@ -1063,18 +1014,15 @@ static ssize_t store_value(struct most_dci_obj *dci_obj,
                 return count;
         }
 
-        if (!strcmp(name, "arb_value")) {
-                reg_addr = dci_obj->reg_addr;
-        } else if (!strcmp(name, "sync_ep")) {
-                u16 ep = val;
-
-                reg_addr = DRCI_REG_BASE + DRCI_COMMAND + ep * 16;
-                val = 1;
-        } else if (get_static_reg_addr(ro_regs, name, &reg_addr)) {
+        if (!strcmp(name, "arb_value"))
+                err = drci_wr_reg(usb_dev, dci_obj->reg_addr, val);
+        else if (!strcmp(name, "sync_ep"))
+                err = start_sync_ep(usb_dev, val);
+        else if (!get_static_reg_addr(ro_regs, name, &reg_addr))
+                err = drci_wr_reg(usb_dev, reg_addr, val);
+        else
                 return -EFAULT;
-        }
 
-        err = drci_wr_reg(dci_obj->usb_device, reg_addr, val);
         if (err < 0)
                 return err;
 
@@ -1186,7 +1134,6 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
         struct most_channel_capability *tmp_cap;
         struct usb_endpoint_descriptor *ep_desc;
         int ret = 0;
-        int err;
 
         if (!mdev)
                 goto exit_ENOMEM;
@@ -1262,13 +1209,6 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
                 tmp_cap++;
                 init_usb_anchor(&mdev->busy_urbs[i]);
                 spin_lock_init(&mdev->channel_lock[i]);
-                err = drci_wr_reg(usb_dev,
-                                  DRCI_REG_BASE + DRCI_COMMAND +
-                                  ep_desc->bEndpointAddress * 16,
-                                  1);
-                if (err < 0)
-                        dev_warn(dev, "DCI Sync for EP %02x failed",
-                                 ep_desc->bEndpointAddress);
         }
         dev_notice(dev, "claimed gadget: Vendor=%4.4x ProdID=%4.4x Bus=%02x Device=%02x\n",
                    le16_to_cpu(usb_dev->descriptor.idVendor),
diff --git a/drivers/staging/most/mostcore/core.c b/drivers/staging/most/mostcore/core.c
index 329109c0024f..191404bc5906 100644
--- a/drivers/staging/most/mostcore/core.c
+++ b/drivers/staging/most/mostcore/core.c
@@ -342,7 +342,7 @@ static ssize_t show_channel_starving(struct most_c_obj *c,
 }
 
 #define create_show_channel_attribute(val) \
-        static MOST_CHNL_ATTR(val, S_IRUGO, show_##val, NULL)
+        static MOST_CHNL_ATTR(val, 0444, show_##val, NULL)
 
 create_show_channel_attribute(available_directions);
 create_show_channel_attribute(available_datatypes);
@@ -494,9 +494,7 @@ static ssize_t store_set_packets_per_xact(struct most_c_obj *c,
 }
 
 #define create_channel_attribute(value) \
-        static MOST_CHNL_ATTR(value, S_IRUGO | S_IWUSR, \
-                              show_##value, \
-                              store_##value)
+        static MOST_CHNL_ATTR(value, 0644, show_##value, store_##value)
 
 create_channel_attribute(set_buffer_size);
 create_channel_attribute(set_number_of_buffers);
@@ -690,7 +688,7 @@ static ssize_t show_interface(struct most_inst_obj *instance_obj,
 }
 
 #define create_inst_attribute(value) \
-        static MOST_INST_ATTR(value, S_IRUGO, show_##value, NULL)
+        static MOST_INST_ATTR(value, 0444, show_##value, NULL)
 
 create_inst_attribute(description);
 create_inst_attribute(interface);
@@ -763,8 +761,6 @@ struct most_aim_obj {
         struct kobject kobj;
         struct list_head list;
         struct most_aim *driver;
-        char add_link[STRING_SIZE];
-        char remove_link[STRING_SIZE];
 };
 
 #define to_aim_obj(d) container_of(d, struct most_aim_obj, kobj)
@@ -851,7 +847,7 @@ static void most_aim_release(struct kobject *kobj)
         kfree(aim_obj);
 }
 
-static ssize_t show_add_link(struct most_aim_obj *aim_obj,
+static ssize_t add_link_show(struct most_aim_obj *aim_obj,
                              struct most_aim_attribute *attr,
                              char *buf)
 {
@@ -885,16 +881,16 @@ static ssize_t show_add_link(struct most_aim_obj *aim_obj,
  *
  * Examples:
  *
- * Input: "mdev0:ch0@ep_81:my_channel\n" or
- *        "mdev0:ch0@ep_81:my_channel"
+ * Input: "mdev0:ch6:my_channel\n" or
+ *        "mdev0:ch6:my_channel"
  *
- * Output: *a -> "mdev0", *b -> "ch0@ep_81", *c -> "my_channel"
+ * Output: *a -> "mdev0", *b -> "ch6", *c -> "my_channel"
  *
- * Input: "mdev0:ch0@ep_81\n"
- * Output: *a -> "mdev0", *b -> "ch0@ep_81", *c -> ""
+ * Input: "mdev1:ep81\n"
+ * Output: *a -> "mdev1", *b -> "ep81", *c -> ""
  *
- * Input: "mdev0:ch0@ep_81"
- * Output: *a -> "mdev0", *b -> "ch0@ep_81", *c == NULL
+ * Input: "mdev1:ep81"
+ * Output: *a -> "mdev1", *b -> "ep81", *c == NULL
  */
 static int split_string(char *buf, char **a, char **b, char **c)
 {
@@ -962,13 +958,13 @@ most_c_obj *get_channel_by_name(char *mdev, char *mdev_ch)
  * Searches for a pair of device and channel and probes the AIM
  *
  * Example:
- * (1) echo -n -e "mdev0:ch0@ep_81:my_rxchannel\n" >add_link
- * (2) echo -n -e "mdev0:ch0@ep_81\n" >add_link
+ * (1) echo "mdev0:ch6:my_rxchannel" >add_link
+ * (2) echo "mdev1:ep81" >add_link
  *
  * (1) would create the device node /dev/my_rxchannel
- * (2) would create the device node /dev/mdev0-ch0@ep_81
+ * (2) would create the device node /dev/mdev1-ep81
  */
-static ssize_t store_add_link(struct most_aim_obj *aim_obj,
+static ssize_t add_link_store(struct most_aim_obj *aim_obj,
                               struct most_aim_attribute *attr,
                               const char *buf,
                               size_t len)
@@ -984,7 +980,6 @@ static ssize_t store_add_link(struct most_aim_obj *aim_obj,
         size_t max_len = min_t(size_t, len + 1, STRING_SIZE);
 
         strlcpy(buffer, buf, max_len);
-        strlcpy(aim_obj->add_link, buf, max_len);
 
         ret = split_string(buffer, &mdev, &mdev_ch, &mdev_devnod);
         if (ret)
@@ -1019,14 +1014,7 @@ static ssize_t store_add_link(struct most_aim_obj *aim_obj,
 }
 
 static struct most_aim_attribute most_aim_attr_add_link =
-        __ATTR(add_link, S_IRUGO | S_IWUSR, show_add_link, store_add_link);
-
-static ssize_t show_remove_link(struct most_aim_obj *aim_obj,
-                                struct most_aim_attribute *attr,
-                                char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%s\n", aim_obj->remove_link);
-}
+        __ATTR_RW(add_link);
 
 /**
  * store_remove_link - store function for remove_link attribute
@@ -1036,9 +1024,9 @@ static ssize_t show_remove_link(struct most_aim_obj *aim_obj,
  * @len: buffer length
  *
  * Example:
- * echo -n -e "mdev0:ch0@ep_81\n" >remove_link
+ * echo "mdev0:ep81" >remove_link
  */
-static ssize_t store_remove_link(struct most_aim_obj *aim_obj,
+static ssize_t remove_link_store(struct most_aim_obj *aim_obj,
                                  struct most_aim_attribute *attr,
                                  const char *buf,
                                  size_t len)
@@ -1051,7 +1039,6 @@ static ssize_t store_remove_link(struct most_aim_obj *aim_obj,
         size_t max_len = min_t(size_t, len + 1, STRING_SIZE);
 
         strlcpy(buffer, buf, max_len);
-        strlcpy(aim_obj->remove_link, buf, max_len);
         ret = split_string(buffer, &mdev, &mdev_ch, NULL);
         if (ret)
                 return ret;
@@ -1070,8 +1057,7 @@ static ssize_t store_remove_link(struct most_aim_obj *aim_obj,
 }
 
 static struct most_aim_attribute most_aim_attr_remove_link =
-        __ATTR(remove_link, S_IRUGO | S_IWUSR, show_remove_link,
-               store_remove_link);
+        __ATTR_WO(remove_link);
 
 static struct attribute *most_aim_def_attrs[] = {
         &most_aim_attr_add_link.attr,
@@ -1761,9 +1747,6 @@ struct kobject *most_register_interface(struct most_interface *iface)
 
                 if (!name_suffix)
                         snprintf(channel_name, STRING_SIZE, "ch%d", i);
-                else if (name_suffix[0] == '@')
-                        snprintf(channel_name, STRING_SIZE, "ch%d%s", i,
-                                 name_suffix);
                 else
                         snprintf(channel_name, STRING_SIZE, "%s", name_suffix);
 
diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
index 552a7dcbf50b..fb0928a4fb97 100644
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -172,29 +172,31 @@ static struct phy_device *xlr_get_phydev(struct xlr_net_priv *priv)
 /*
  * Ethtool operation
  */
-static int xlr_get_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)
+static int xlr_get_link_ksettings(struct net_device *ndev,
+                                  struct ethtool_link_ksettings *ecmd)
 {
         struct xlr_net_priv *priv = netdev_priv(ndev);
         struct phy_device *phydev = xlr_get_phydev(priv);
 
         if (!phydev)
                 return -ENODEV;
-        return phy_ethtool_gset(phydev, ecmd);
+        return phy_ethtool_ksettings_get(phydev, ecmd);
 }
 
-static int xlr_set_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)
+static int xlr_set_link_ksettings(struct net_device *ndev,
+                                  const struct ethtool_link_ksettings *ecmd)
 {
         struct xlr_net_priv *priv = netdev_priv(ndev);
         struct phy_device *phydev = xlr_get_phydev(priv);
 
         if (!phydev)
                 return -ENODEV;
-        return phy_ethtool_sset(phydev, ecmd);
+        return phy_ethtool_ksettings_set(phydev, ecmd);
 }
 
 static const struct ethtool_ops xlr_ethtool_ops = {
-        .get_settings = xlr_get_settings,
-        .set_settings = xlr_set_settings,
+        .get_link_ksettings = xlr_get_link_ksettings,
+        .set_link_ksettings = xlr_set_link_ksettings,
 };
 
 /*
@@ -1005,10 +1007,8 @@ static int xlr_net_probe(struct platform_device *pdev)
          */
         adapter = (struct xlr_adapter *)
                 devm_kzalloc(&pdev->dev, sizeof(*adapter), GFP_KERNEL);
-        if (!adapter) {
-                err = -ENOMEM;
-                return err;
-        }
+        if (!adapter)
+                return -ENOMEM;
 
         /*
          * XLR and XLS have 1 and 2 NAE controller respectively
diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index f1f4788dbd86..36109cec8706 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -308,7 +308,7 @@ u8 rtw_sitesurvey_cmd(struct adapter  *padapter, struct ndis_802_11_ssid *ssid,
                 mod_timer(&pmlmepriv->scan_to_timer,
                           jiffies + msecs_to_jiffies(SCANNING_TIMEOUT));
 
-                rtw_led_control(padapter, LED_CTL_SITE_SURVEY);
+                LedControl8188eu(padapter, LED_CTL_SITE_SURVEY);
 
                 pmlmepriv->scan_interval = SCAN_INTERVAL;/*  30*2 sec = 60sec */
         } else {
@@ -335,7 +335,7 @@ u8 rtw_createbss_cmd(struct adapter  *padapter)
         u8      res = _SUCCESS;
 
 
-        rtw_led_control(padapter, LED_CTL_START_TO_LINK);
+        LedControl8188eu(padapter, LED_CTL_START_TO_LINK);
 
         if (pmlmepriv->assoc_ssid.SsidLength == 0)
                 RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for Any SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));
@@ -379,7 +379,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
         struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
 
 
-        rtw_led_control(padapter, LED_CTL_START_TO_LINK);
+        LedControl8188eu(padapter, LED_CTL_START_TO_LINK);
 
         if (pmlmepriv->assoc_ssid.SsidLength == 0)
                 RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+Join cmd: Any SSid\n"));
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index 14461cf34037..c1478cff5854 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -30,7 +30,7 @@ void BlinkTimerCallback(unsigned long data)
         if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped))
                 return;
 
-        schedule_work(&(pLed->BlinkWorkItem));
+        schedule_work(&pLed->BlinkWorkItem);
 }
 
 /*  */
@@ -60,7 +60,6 @@ void ResetLedStatus(struct LED_871x *pLed)
 
         pLed->bLedNoLinkBlinkInProgress = false;
         pLed->bLedLinkBlinkInProgress = false;
-        pLed->bLedStartToLinkBlinkInProgress = false;
         pLed->bLedScanBlinkInProgress = false;
 }
 
@@ -72,10 +71,10 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed)
 
         ResetLedStatus(pLed);
 
-        setup_timer(&(pLed->BlinkTimer), BlinkTimerCallback,
+        setup_timer(&pLed->BlinkTimer, BlinkTimerCallback,
                     (unsigned long)pLed);
 
-        INIT_WORK(&(pLed->BlinkWorkItem), BlinkWorkItemCallback);
+        INIT_WORK(&pLed->BlinkWorkItem, BlinkWorkItemCallback);
 }
 
 
@@ -85,8 +84,8 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed)
 /*  */
 void DeInitLed871x(struct LED_871x *pLed)
 {
-        cancel_work_sync(&(pLed->BlinkWorkItem));
-        del_timer_sync(&(pLed->BlinkTimer));
+        cancel_work_sync(&pLed->BlinkWorkItem);
+        del_timer_sync(&pLed->BlinkTimer);
         ResetLedStatus(pLed);
 }
 
@@ -99,7 +98,7 @@ void DeInitLed871x(struct LED_871x *pLed)
 static void SwLedBlink1(struct LED_871x *pLed)
 {
         struct adapter *padapter = pLed->padapter;
-        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
         u8 bStopBlinking = false;
 
         /*  Change LED according to BlinkingLedState specified. */
@@ -247,9 +246,9 @@ static void SwLedBlink1(struct LED_871x *pLed)
  /* ALPHA, added by chiyoko, 20090106 */
 static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAction)
 {
-        struct led_priv *ledpriv = &(padapter->ledpriv);
-        struct LED_871x *pLed = &(ledpriv->SwLed0);
-        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+        struct led_priv *ledpriv = &padapter->ledpriv;
+        struct LED_871x *pLed = &ledpriv->SwLed0;
+        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
         switch (LedAction) {
         case LED_CTL_POWER_ON:
@@ -259,11 +258,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
                         if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedLinkBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                 pLed->bLedLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
 
@@ -282,11 +281,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
                         if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedNoLinkBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         pLed->bLedLinkBlinkInProgress = true;
@@ -306,15 +305,15 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
                         if (IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedNoLinkBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedLinkBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                  pLed->bLedLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         pLed->bLedScanBlinkInProgress = true;
@@ -326,7 +325,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
                                 pLed->BlinkingLedState = RTW_LED_ON;
                         mod_timer(&pLed->BlinkTimer, jiffies +
                                   msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));
-                 }
+                }
                 break;
         case LED_CTL_TX:
         case LED_CTL_RX:
@@ -334,11 +333,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
                         if (pLed->CurrLedState == LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedNoLinkBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedLinkBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                 pLed->bLedLinkBlinkInProgress = false;
                         }
                         pLed->bLedBlinkInProgress = true;
@@ -354,21 +353,21 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
                 break;
         case LED_CTL_START_WPS: /* wait until xinpin finish */
         case LED_CTL_START_WPS_BOTTON:
-                 if (!pLed->bLedWPSBlinkInProgress) {
+                if (!pLed->bLedWPSBlinkInProgress) {
                         if (pLed->bLedNoLinkBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedLinkBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                  pLed->bLedLinkBlinkInProgress = false;
                         }
                         if (pLed->bLedBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                 pLed->bLedBlinkInProgress = false;
                         }
                         if (pLed->bLedScanBlinkInProgress) {
-                                del_timer_sync(&(pLed->BlinkTimer));
+                                del_timer_sync(&pLed->BlinkTimer);
                                 pLed->bLedScanBlinkInProgress = false;
                         }
                         pLed->bLedWPSBlinkInProgress = true;
@@ -379,27 +378,27 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
                                 pLed->BlinkingLedState = RTW_LED_ON;
                         mod_timer(&pLed->BlinkTimer, jiffies +
                                   msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));
-                 }
+                }
                 break;
         case LED_CTL_STOP_WPS:
                 if (pLed->bLedNoLinkBlinkInProgress) {
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer_sync(&pLed->BlinkTimer);
                         pLed->bLedNoLinkBlinkInProgress = false;
                 }
                 if (pLed->bLedLinkBlinkInProgress) {
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer_sync(&pLed->BlinkTimer);
                          pLed->bLedLinkBlinkInProgress = false;
                 }
                 if (pLed->bLedBlinkInProgress) {
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer_sync(&pLed->BlinkTimer);
                         pLed->bLedBlinkInProgress = false;
                 }
                 if (pLed->bLedScanBlinkInProgress) {
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer_sync(&pLed->BlinkTimer);
                         pLed->bLedScanBlinkInProgress = false;
                 }
                 if (pLed->bLedWPSBlinkInProgress)
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer_sync(&pLed->BlinkTimer);
                 else
                         pLed->bLedWPSBlinkInProgress = true;
                 pLed->CurrLedState = LED_BLINK_WPS_STOP;
@@ -415,7 +414,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
                 break;
         case LED_CTL_STOP_WPS_FAIL:
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer_sync(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 pLed->bLedNoLinkBlinkInProgress = true;
@@ -431,23 +430,23 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
                 pLed->CurrLedState = RTW_LED_OFF;
                 pLed->BlinkingLedState = RTW_LED_OFF;
                 if (pLed->bLedNoLinkBlinkInProgress) {
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer_sync(&pLed->BlinkTimer);
                         pLed->bLedNoLinkBlinkInProgress = false;
                 }
                 if (pLed->bLedLinkBlinkInProgress) {
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer_sync(&pLed->BlinkTimer);
                         pLed->bLedLinkBlinkInProgress = false;
                 }
                 if (pLed->bLedBlinkInProgress) {
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer_sync(&pLed->BlinkTimer);
                         pLed->bLedBlinkInProgress = false;
                 }
                 if (pLed->bLedWPSBlinkInProgress) {
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer_sync(&pLed->BlinkTimer);
                         pLed->bLedWPSBlinkInProgress = false;
                 }
                 if (pLed->bLedScanBlinkInProgress) {
-                        del_timer_sync(&(pLed->BlinkTimer));
+                        del_timer_sync(&pLed->BlinkTimer);
                         pLed->bLedScanBlinkInProgress = false;
                 }
                 SwLedOff(padapter, pLed);
@@ -475,15 +474,10 @@ void BlinkHandler(struct LED_871x *pLed)
 
 void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedAction)
 {
-        struct led_priv *ledpriv = &(padapter->ledpriv);
-
         if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped) ||
            (!padapter->hw_init_completed))
                 return;
 
-        if (!ledpriv->bRegUseLed)
-                return;
-
         if ((padapter->pwrctrlpriv.rf_pwrstate != rf_on &&
              padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) &&
             (LedAction == LED_CTL_TX || LedAction == LED_CTL_RX ||
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index ee2dcd05010f..032f783b0d83 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -801,7 +801,7 @@ void rtw_indicate_connect(struct adapter *padapter)
         if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) {
                 set_fwstate(pmlmepriv, _FW_LINKED);
 
-                rtw_led_control(padapter, LED_CTL_LINK);
+                LedControl8188eu(padapter, LED_CTL_LINK);
 
                 rtw_os_indicate_connect(padapter);
         }
@@ -833,7 +833,7 @@ void rtw_indicate_disconnect(struct adapter *padapter)
                 rtw_os_indicate_disconnect(padapter);
 
                 _clr_fwstate_(pmlmepriv, _FW_LINKED);
-                rtw_led_control(padapter, LED_CTL_NO_LINK);
+                LedControl8188eu(padapter, LED_CTL_NO_LINK);
                 rtw_clear_scan_deny(padapter);
         }
 
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index fb13df586441..d9c114776cab 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -133,7 +133,9 @@ static struct rt_channel_plan_map	RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
         {0x03}, /* 0x41, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN_2G */
 };
 
-static struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03}; /* use the combination for max channel numbers */
+static const struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {
+        0x03
+}; /* use the combination for max channel numbers */
 
 /*
  * Search the @param channel_num in given @param channel_set
@@ -667,10 +669,10 @@ static int issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pss
         get_rate_set(padapter, bssrate, &bssrate_len);
 
         if (bssrate_len > 8) {
-                pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen));
-                pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));
+                pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, 8, bssrate, &(pattrib->pktlen));
+                pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));
         } else {
-                pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen));
+                pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &(pattrib->pktlen));
         }
 
         /* add wps_ie for wps2.0 */
@@ -999,7 +1001,7 @@ static void issue_asocrsp(struct adapter *padapter, unsigned short status,
         }
 
         if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_REALTEK)
-                pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6 , REALTEK_96B_IE, &(pattrib->pktlen));
+                pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6, REALTEK_96B_IE, &(pattrib->pktlen));
 
         /* add WPS IE ie for wps 2.0 */
         if (pmlmepriv->wps_assoc_resp_ie && pmlmepriv->wps_assoc_resp_ie_len > 0) {
@@ -1120,10 +1122,10 @@ static void issue_assocreq(struct adapter *padapter)
 
 
         if (bssrate_len > 8) {
-                pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen));
-                pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));
+                pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, 8, bssrate, &(pattrib->pktlen));
+                pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));
         } else {
-                pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen));
+                pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &(pattrib->pktlen));
         }
 
         /* RSN */
@@ -1165,7 +1167,7 @@ static void issue_assocreq(struct adapter *padapter)
                                 memcpy(&pmlmeinfo->HT_caps.mcs, MCS_rate_2R, 16);
                                 break;
                         }
-                        pframe = rtw_set_ie(pframe, _HT_CAPABILITY_IE_, ie_len , (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen));
+                        pframe = rtw_set_ie(pframe, _HT_CAPABILITY_IE_, ie_len, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen));
                 }
         }
 
@@ -1194,7 +1196,7 @@ static void issue_assocreq(struct adapter *padapter)
         }
 
         if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_REALTEK)
-                pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6 , REALTEK_96B_IE, &(pattrib->pktlen));
+                pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 6, REALTEK_96B_IE, &(pattrib->pktlen));
 
         pattrib->last_txcmdsz = pattrib->pktlen;
         dump_mgntframe(padapter, pmgntframe);
@@ -2644,7 +2646,7 @@ static unsigned int OnBeacon(struct adapter *padapter,
                                 ret = rtw_check_bcn_info(padapter, pframe, len);
                                 if (!ret) {
                                                 DBG_88E_LEVEL(_drv_info_, "ap has changed, disconnect now\n ");
-                                                receive_disconnect(padapter, pmlmeinfo->network.MacAddress , 65535);
+                                                receive_disconnect(padapter, pmlmeinfo->network.MacAddress, 65535);
                                                 return _SUCCESS;
                                 }
                                 /* update WMM, ERP in the beacon */
@@ -2802,7 +2804,7 @@ static unsigned int OnAuth(struct adapter *padapter,
                         /* checking for challenging txt... */
                         DBG_88E("checking for challenging txt...\n");
 
-                        p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_ , _CHLGETXT_IE_, (int *)&ie_len,
+                        p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, _CHLGETXT_IE_, (int *)&ie_len,
                                         len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);
 
                         if ((p == NULL) || (ie_len <= 0)) {
@@ -3046,7 +3048,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
                 memcpy(supportRate, p+2, ie_len);
                 supportRateNum = ie_len;
 
-                p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _EXT_SUPPORTEDRATES_IE_ , &ie_len,
+                p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _EXT_SUPPORTEDRATES_IE_, &ie_len,
                                 pkt_len - WLAN_HDR_A3_LEN - ie_offset);
                 if (p !=  NULL) {
                         if (supportRateNum <= sizeof(supportRate)) {
@@ -3146,7 +3148,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
                         if (pmlmepriv->wps_beacon_ie) {
                                 u8 selected_registrar = 0;
 
-                                rtw_get_wps_attr_content(pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len, WPS_ATTR_SELECTED_REGISTRAR , &selected_registrar, NULL);
+                                rtw_get_wps_attr_content(pmlmepriv->wps_beacon_ie, pmlmepriv->wps_beacon_ie_len, WPS_ATTR_SELECTED_REGISTRAR, &selected_registrar, NULL);
 
                                 if (!selected_registrar) {
                                         DBG_88E("selected_registrar is false , or AP is not ready to do WPS\n");
@@ -3511,7 +3513,7 @@ static unsigned int OnDeAuth(struct adapter *padapter,
                 DBG_88E_LEVEL(_drv_always_, "sta recv deauth reason code(%d) sta:%pM\n",
                               reason, GetAddr3Ptr(pframe));
 
-                receive_disconnect(padapter, GetAddr3Ptr(pframe) , reason);
+                receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
         }
         pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
         return _SUCCESS;
diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
index 0b70fe7d3b72..4032121a06f3 100644
--- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
@@ -56,7 +56,7 @@ static int rtw_hw_suspend(struct adapter *padapter)
                 if (check_fwstate(pmlmepriv, _FW_LINKED)) {
                         _clr_fwstate_(pmlmepriv, _FW_LINKED);
 
-                        rtw_led_control(padapter, LED_CTL_NO_LINK);
+                        LedControl8188eu(padapter, LED_CTL_NO_LINK);
 
                         rtw_os_indicate_disconnect(padapter);
 
@@ -94,7 +94,7 @@ static int rtw_hw_resume(struct adapter *padapter)
         pwrpriv->bips_processing = true;
         rtw_reset_drv_sw(padapter);
 
-        if (pm_netdev_open(pnetdev, false) != 0) {
+        if (ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev)) != _SUCCESS) {
                 mutex_unlock(&pwrpriv->mutex_lock);
                 goto error_exit;
         }
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index b87cbbbee054..3e6edb63d36b 100644
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -66,16 +66,12 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
 
         precvpriv->adapter = padapter;
 
-        precvpriv->free_recvframe_cnt = NR_RECVFRAME;
-
         precvpriv->pallocated_frame_buf = vzalloc(NR_RECVFRAME * sizeof(struct recv_frame) + RXFRAME_ALIGN_SZ);
 
         if (!precvpriv->pallocated_frame_buf)
                 return _FAIL;
 
-        precvpriv->precv_frame_buf = PTR_ALIGN(precvpriv->pallocated_frame_buf, RXFRAME_ALIGN_SZ);
-
-        precvframe = (struct recv_frame *)precvpriv->precv_frame_buf;
+        precvframe = PTR_ALIGN(precvpriv->pallocated_frame_buf, RXFRAME_ALIGN_SZ);
 
         for (i = 0; i < NR_RECVFRAME; i++) {
                 INIT_LIST_HEAD(&(precvframe->list));
@@ -83,15 +79,12 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
                 list_add_tail(&(precvframe->list),
                                      &(precvpriv->free_recv_queue.queue));
 
-                rtw_os_recv_resource_alloc(precvframe);
-
+                precvframe->pkt = NULL;
                 precvframe->len = 0;
 
                 precvframe->adapter = padapter;
                 precvframe++;
         }
-        precvpriv->rx_pending_cnt = 1;
-
         res = rtw_hal_init_recv_priv(padapter);
 
         setup_timer(&precvpriv->signal_stat_timer,
@@ -120,20 +113,11 @@ void _rtw_free_recv_priv(struct recv_priv *precvpriv)
 struct recv_frame *_rtw_alloc_recvframe(struct __queue *pfree_recv_queue)
 {
         struct recv_frame *hdr;
-        struct adapter *padapter;
-        struct recv_priv *precvpriv;
 
         hdr = list_first_entry_or_null(&pfree_recv_queue->queue,
                                        struct recv_frame, list);
-        if (hdr) {
+        if (hdr)
                 list_del_init(&hdr->list);
-                padapter = hdr->adapter;
-                if (padapter) {
-                        precvpriv = &padapter->recvpriv;
-                        if (pfree_recv_queue == &precvpriv->free_recv_queue)
-                                precvpriv->free_recvframe_cnt--;
-                }
-        }
 
         return hdr;
 }
@@ -154,13 +138,8 @@ struct recv_frame *rtw_alloc_recvframe(struct __queue *pfree_recv_queue)
 int rtw_free_recvframe(struct recv_frame *precvframe,
                        struct __queue *pfree_recv_queue)
 {
-        struct adapter *padapter;
-        struct recv_priv *precvpriv;
-
         if (!precvframe)
                 return _FAIL;
-        padapter = precvframe->adapter;
-        precvpriv = &padapter->recvpriv;
         if (precvframe->pkt) {
                 dev_kfree_skb_any(precvframe->pkt);/* free skb by driver */
                 precvframe->pkt = NULL;
@@ -174,29 +153,16 @@ int rtw_free_recvframe(struct recv_frame *precvframe,
 
         list_add_tail(&(precvframe->list), get_list_head(pfree_recv_queue));
 
-        if (padapter != NULL) {
-                if (pfree_recv_queue == &precvpriv->free_recv_queue)
-                                precvpriv->free_recvframe_cnt++;
-        }
-
-      spin_unlock_bh(&pfree_recv_queue->lock);
+        spin_unlock_bh(&pfree_recv_queue->lock);
 
         return _SUCCESS;
 }
 
 int _rtw_enqueue_recvframe(struct recv_frame *precvframe, struct __queue *queue)
 {
-        struct adapter *padapter = precvframe->adapter;
-        struct recv_priv *precvpriv = &padapter->recvpriv;
-
         list_del_init(&(precvframe->list));
         list_add_tail(&(precvframe->list), get_list_head(queue));
 
-        if (padapter != NULL) {
-                if (queue == &precvpriv->free_recv_queue)
-                        precvpriv->free_recvframe_cnt++;
-        }
-
         return _SUCCESS;
 }
 
@@ -1294,7 +1260,7 @@ static int validate_recv_frame(struct adapter *adapter,
                 retval = _FAIL; /*  only data frame return _SUCCESS */
                 break;
         case WIFI_DATA_TYPE: /* data */
-                rtw_led_control(adapter, LED_CTL_RX);
+                LedControl8188eu(adapter, LED_CTL_RX);
                 pattrib->qos = (subtype & BIT(7)) ? 1 : 0;
                 retval = validate_recv_data_frame(adapter, precv_frame);
                 if (retval == _FAIL) {
@@ -1989,7 +1955,7 @@ static int recv_func_posthandle(struct adapter *padapter,
         struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
 
         /*  DATA FRAME */
-        rtw_led_control(padapter, LED_CTL_RX);
+        LedControl8188eu(padapter, LED_CTL_RX);
 
         prframe = decryptor(padapter, prframe);
         if (prframe == NULL) {
diff --git a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
index a71e25294add..941d1a069d20 100644
--- a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
@@ -310,7 +310,6 @@ u32	rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)
         /* for A-MPDU Rx reordering buffer control, cancel reordering_ctrl_timer */
         for (i = 0; i < 16; i++) {
                 struct list_head *phead, *plist;
-                struct recv_frame *prhdr;
                 struct recv_frame *prframe;
                 struct __queue *ppending_recvframe_queue;
                 struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
@@ -327,8 +326,7 @@ u32	rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)
                 plist = phead->next;
 
                 while (!list_empty(phead)) {
-                        prhdr = container_of(plist, struct recv_frame, list);
-                        prframe = (struct recv_frame *)prhdr;
+                        prframe = container_of(plist, struct recv_frame, list);
 
                         plist = plist->next;
 
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index 0f8b8e0bffdf..b60b126b860e 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -220,7 +220,6 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)
         struct adapter *padapter = pxmitpriv->adapter;
         struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf;
         struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
-        u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
         u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;
 
         if (pxmitpriv->pxmit_frame_buf == NULL)
@@ -233,7 +232,7 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)
         }
 
         for (i = 0; i < NR_XMITBUFF; i++) {
-                rtw_os_xmit_resource_free(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));
+                rtw_os_xmit_resource_free(pxmitbuf);
                 pxmitbuf++;
         }
 
@@ -243,7 +242,7 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)
         /*  free xmit extension buff */
         pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf;
         for (i = 0; i < num_xmit_extbuf; i++) {
-                rtw_os_xmit_resource_free(padapter, pxmitbuf, (max_xmit_extbuf_size + XMITBUF_ALIGN_SZ));
+                rtw_os_xmit_resource_free(pxmitbuf);
                 pxmitbuf++;
         }
 
@@ -1064,7 +1063,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
 
                 frg_inx++;
 
-                if (bmcst || rtw_endofpktfile(&pktfile)) {
+                if (bmcst || pktfile.pkt_len == 0) {
                         pattrib->nr_frags = frg_inx;
 
                         pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len + ((pattrib->nr_frags == 1) ? llc_sz : 0) +
@@ -1677,7 +1676,7 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
         }
         pxmitframe->pkt = *ppkt;
 
-        rtw_led_control(padapter, LED_CTL_TX);
+        LedControl8188eu(padapter, LED_CTL_TX);
 
         pxmitframe->attrib.qsel = pxmitframe->attrib.priority;
 
diff --git a/drivers/staging/rtl8188eu/hal/odm.c b/drivers/staging/rtl8188eu/hal/odm.c
index d983a8029f4c..16476e735011 100644
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -991,7 +991,6 @@ void odm_TXPowerTrackingThermalMeterInit(struct odm_dm_struct *pDM_Odm)
 {
         pDM_Odm->RFCalibrateInfo.bTXPowerTracking = true;
         pDM_Odm->RFCalibrateInfo.TXPowercount = 0;
-        pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit = false;
         if (*(pDM_Odm->mp_mode) != 1)
                 pDM_Odm->RFCalibrateInfo.TxPowerTrackControl = true;
         MSG_88E("pDM_Odm TxPowerTrackControl = %d\n", pDM_Odm->RFCalibrateInfo.TxPowerTrackControl);
diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index 5192ef70bcfc..35c91e06cc47 100644
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -40,12 +40,11 @@ static u32 cal_bit_shift(u32 bitmask)
 
 u32 phy_query_bb_reg(struct adapter *adapt, u32 regaddr, u32 bitmask)
 {
-        u32 return_value = 0, original_value, bit_shift;
+        u32 original_value, bit_shift;
 
         original_value = usb_read32(adapt, regaddr);
         bit_shift = cal_bit_shift(bitmask);
-        return_value = (original_value & bitmask) >> bit_shift;
-        return return_value;
+        return (original_value & bitmask) >> bit_shift;
 }
 
 void phy_set_bb_reg(struct adapter *adapt, u32 regaddr, u32 bitmask, u32 data)
@@ -119,12 +118,11 @@ static void rf_serial_write(struct adapter *adapt,
 u32 rtw_hal_read_rfreg(struct adapter *adapt, enum rf_radio_path rf_path,
                      u32 reg_addr, u32 bit_mask)
 {
-        u32 original_value, readback_value, bit_shift;
+        u32 original_value, bit_shift;
 
         original_value = rf_serial_read(adapt, rf_path, reg_addr);
         bit_shift =  cal_bit_shift(bit_mask);
-        readback_value = (original_value & bit_mask) >> bit_shift;
-        return readback_value;
+        return (original_value & bit_mask) >> bit_shift;
 }
 
 void phy_set_rf_reg(struct adapter *adapt, enum rf_radio_path rf_path,
@@ -210,13 +208,6 @@ static void phy_set_bw_mode_callback(struct adapter *adapt)
         u8 reg_bw_opmode;
         u8 reg_prsr_rsc;
 
-        if (hal_data->rf_chip == RF_PSEUDO_11N)
-                return;
-
-        /*  There is no 40MHz mode in RF_8225. */
-        if (hal_data->rf_chip == RF_8225)
-                return;
-
         if (adapt->bDriverStopped)
                 return;
 
@@ -265,8 +256,7 @@ static void phy_set_bw_mode_callback(struct adapter *adapt)
         }
 
         /* Set RF related register */
-        if (hal_data->rf_chip == RF_6052)
-                rtl88eu_phy_rf6052_set_bandwidth(adapt, hal_data->CurrentChannelBW);
+        rtl88eu_phy_rf6052_set_bandwidth(adapt, hal_data->CurrentChannelBW);
 }
 
 void rtw_hal_set_bwmode(struct adapter *adapt, enum ht_channel_width bandwidth,
@@ -286,7 +276,6 @@ void rtw_hal_set_bwmode(struct adapter *adapt, enum ht_channel_width bandwidth,
 
 static void phy_sw_chnl_callback(struct adapter *adapt, u8 channel)
 {
-        u8 rf_path;
         u32 param1, param2;
         struct hal_data_8188e *hal_data = adapt->HalData;
 
@@ -294,12 +283,10 @@ static void phy_sw_chnl_callback(struct adapter *adapt, u8 channel)
 
         param1 = RF_CHNLBW;
         param2 = channel;
-        for (rf_path = 0; rf_path < hal_data->NumTotalRFPath; rf_path++) {
-                hal_data->RfRegChnlVal[rf_path] = (hal_data->RfRegChnlVal[rf_path] &
-                                                  0xfffffc00) | param2;
-                phy_set_rf_reg(adapt, (enum rf_radio_path)rf_path, param1,
-                               bRFRegOffsetMask, hal_data->RfRegChnlVal[rf_path]);
-        }
+        hal_data->RfRegChnlVal[0] = (hal_data->RfRegChnlVal[0] &
+                                          0xfffffc00) | param2;
+        phy_set_rf_reg(adapt, 0, param1,
+                       bRFRegOffsetMask, hal_data->RfRegChnlVal[0]);
 }
 
 void rtw_hal_set_chan(struct adapter *adapt, u8 channel)
@@ -307,9 +294,6 @@ void rtw_hal_set_chan(struct adapter *adapt, u8 channel)
         struct hal_data_8188e *hal_data = adapt->HalData;
         u8 tmpchannel = hal_data->CurrentChannel;
 
-        if (hal_data->rf_chip == RF_PSEUDO_11N)
-                return;
-
         if (channel == 0)
                 channel = 1;
 
@@ -407,9 +391,8 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
         s8 ofdm_index[2], cck_index = 0;
         s8 ofdm_index_old[2] = {0, 0}, cck_index_old = 0;
         u32 i = 0, j = 0;
-        bool is2t = false;
 
-        u8 ofdm_min_index = 6, rf; /* OFDM BB Swing should be less than +3.0dB */
+        u8 ofdm_min_index = 6; /* OFDM BB Swing should be less than +3.0dB */
         s8 ofdm_index_mapping[2][index_mapping_NUM_88E] = {
                 /* 2.4G, decrease power */
                 {0, 0, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11},
@@ -427,18 +410,12 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
         dm_txpwr_track_setpwr(dm_odm);
 
         dm_odm->RFCalibrateInfo.TXPowerTrackingCallbackCnt++;
-        dm_odm->RFCalibrateInfo.bTXPowerTrackingInit = true;
 
         dm_odm->RFCalibrateInfo.RegA24 = 0x090e1317;
 
         thermal_val = (u8)rtw_hal_read_rfreg(adapt, RF_PATH_A,
                                            RF_T_METER_88E, 0xfc00);
 
-        if (is2t)
-                rf = 2;
-        else
-                rf = 1;
-
         if (thermal_val) {
                 /* Query OFDM path A default setting */
                 ele_d = phy_query_bb_reg(adapt, rOFDM0_XATxIQImbalance, bMaskDWord)&bMaskOFDM_D;
@@ -450,17 +427,6 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
                         }
                 }
 
-                /* Query OFDM path B default setting */
-                if (is2t) {
-                        ele_d = phy_query_bb_reg(adapt, rOFDM0_XBTxIQImbalance, bMaskDWord)&bMaskOFDM_D;
-                        for (i = 0; i < OFDM_TABLE_SIZE_92D; i++) {
-                                if (ele_d == (OFDMSwingTable[i]&bMaskOFDM_D)) {
-                                        ofdm_index_old[1] = (u8)i;
-                                        break;
-                                }
-                        }
-                }
-
                 /* Query CCK default setting From 0xa24 */
                 temp_cck = dm_odm->RFCalibrateInfo.RegA24;
 
@@ -479,8 +445,7 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
                         dm_odm->RFCalibrateInfo.ThermalValue_LCK = thermal_val;
                         dm_odm->RFCalibrateInfo.ThermalValue_IQK = thermal_val;
 
-                        for (i = 0; i < rf; i++)
-                                dm_odm->RFCalibrateInfo.OFDM_index[i] = ofdm_index_old[i];
+                        dm_odm->RFCalibrateInfo.OFDM_index[0] = ofdm_index_old[0];
                         dm_odm->RFCalibrateInfo.CCK_index = cck_index_old;
                 }
 
@@ -539,13 +504,11 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
                                 offset = index_mapping_NUM_88E-1;
 
                         /* Updating ofdm_index values with new OFDM / CCK offset */
-                        for (i = 0; i < rf; i++) {
-                                ofdm_index[i] = dm_odm->RFCalibrateInfo.OFDM_index[i] + ofdm_index_mapping[j][offset];
-                                if (ofdm_index[i] > OFDM_TABLE_SIZE_92D-1)
-                                        ofdm_index[i] = OFDM_TABLE_SIZE_92D-1;
-                                else if (ofdm_index[i] < ofdm_min_index)
-                                        ofdm_index[i] = ofdm_min_index;
-                        }
+                        ofdm_index[0] = dm_odm->RFCalibrateInfo.OFDM_index[0] + ofdm_index_mapping[j][offset];
+                        if (ofdm_index[0] > OFDM_TABLE_SIZE_92D-1)
+                                ofdm_index[0] = OFDM_TABLE_SIZE_92D-1;
+                        else if (ofdm_index[0] < ofdm_min_index)
+                                ofdm_index[0] = ofdm_min_index;
 
                         cck_index = dm_odm->RFCalibrateInfo.CCK_index + ofdm_index_mapping[j][offset];
                         if (cck_index > CCK_TABLE_SIZE-1)
diff --git a/drivers/staging/rtl8188eu/hal/rf.c b/drivers/staging/rtl8188eu/hal/rf.c
index 2f3edf0f850a..8f8c9de6a9bc 100644
--- a/drivers/staging/rtl8188eu/hal/rf.c
+++ b/drivers/staging/rtl8188eu/hal/rf.c
@@ -61,8 +61,6 @@ void rtl88eu_phy_rf6052_set_cck_txpower(struct adapter *adapt, u8 *powerlevel)
                                       (powerlevel[idx1]<<8) |
                                       (powerlevel[idx1]<<16) |
                                       (powerlevel[idx1]<<24);
-                        if (tx_agc[idx1] > 0x20 && hal_data->ExternalPA)
-                                tx_agc[idx1] = 0x20;
                 }
         } else {
                 if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level1) {
@@ -139,17 +137,15 @@ static void getpowerbase88e(struct adapter *adapt, u8 *pwr_level_ofdm,
                              (powerbase0<<8) | powerbase0;
                 *(ofdmbase+i) = powerbase0;
         }
-        for (i = 0; i < adapt->HalData->NumTotalRFPath; i++) {
-                /* Check HT20 to HT40 diff */
-                if (adapt->HalData->CurrentChannelBW == HT_CHANNEL_WIDTH_20)
-                        powerlevel[i] = pwr_level_bw20[i];
-                else
-                        powerlevel[i] = pwr_level_bw40[i];
-                powerbase1 = powerlevel[i];
-                powerbase1 = (powerbase1<<24) | (powerbase1<<16) |
-                             (powerbase1<<8) | powerbase1;
-                *(mcs_base+i) = powerbase1;
-        }
+        /* Check HT20 to HT40 diff */
+        if (adapt->HalData->CurrentChannelBW == HT_CHANNEL_WIDTH_20)
+                powerlevel[0] = pwr_level_bw20[0];
+        else
+                powerlevel[0] = pwr_level_bw40[0];
+        powerbase1 = powerlevel[0];
+        powerbase1 = (powerbase1<<24) | (powerbase1<<16) |
+                     (powerbase1<<8) | powerbase1;
+        *mcs_base = powerbase1;
 }
 static void get_rx_power_val_by_reg(struct adapter *adapt, u8 channel,
                                     u8 index, u32 *powerbase0, u32 *powerbase1,
diff --git a/drivers/staging/rtl8188eu/hal/rf_cfg.c b/drivers/staging/rtl8188eu/hal/rf_cfg.c
index dde64417e66a..9712d7b74345 100644
--- a/drivers/staging/rtl8188eu/hal/rf_cfg.c
+++ b/drivers/staging/rtl8188eu/hal/rf_cfg.c
@@ -230,79 +230,33 @@ static bool rf6052_conf_para(struct adapter *adapt)
 {
         struct hal_data_8188e *hal_data = adapt->HalData;
         u32 u4val = 0;
-        u8 rfpath;
         bool rtstatus = true;
         struct bb_reg_def *pphyreg;
 
-        for (rfpath = 0; rfpath < hal_data->NumTotalRFPath; rfpath++) {
-                pphyreg = &hal_data->PHYRegDef[rfpath];
+        pphyreg = &hal_data->PHYRegDef[RF90_PATH_A];
+        u4val = phy_query_bb_reg(adapt, pphyreg->rfintfs, BRFSI_RFENV);
 
-                switch (rfpath) {
-                case RF90_PATH_A:
-                case RF90_PATH_C:
-                        u4val = phy_query_bb_reg(adapt, pphyreg->rfintfs,
-                                                 BRFSI_RFENV);
-                        break;
-                case RF90_PATH_B:
-                case RF90_PATH_D:
-                        u4val = phy_query_bb_reg(adapt, pphyreg->rfintfs,
-                                                 BRFSI_RFENV << 16);
-                        break;
-                }
+        phy_set_bb_reg(adapt, pphyreg->rfintfe, BRFSI_RFENV << 16, 0x1);
+        udelay(1);
 
-                phy_set_bb_reg(adapt, pphyreg->rfintfe, BRFSI_RFENV << 16, 0x1);
-                udelay(1);
+        phy_set_bb_reg(adapt, pphyreg->rfintfo, BRFSI_RFENV, 0x1);
+        udelay(1);
 
-                phy_set_bb_reg(adapt, pphyreg->rfintfo, BRFSI_RFENV, 0x1);
-                udelay(1);
+        phy_set_bb_reg(adapt, pphyreg->rfHSSIPara2, B3WIREADDREAALENGTH, 0x0);
+        udelay(1);
 
-                phy_set_bb_reg(adapt, pphyreg->rfHSSIPara2,
-                              B3WIREADDREAALENGTH, 0x0);
-                udelay(1);
+        phy_set_bb_reg(adapt, pphyreg->rfHSSIPara2, B3WIREDATALENGTH, 0x0);
+        udelay(1);
 
-                phy_set_bb_reg(adapt, pphyreg->rfHSSIPara2,
-                               B3WIREDATALENGTH, 0x0);
-                udelay(1);
+        rtstatus = rtl88e_phy_config_rf_with_headerfile(adapt);
 
-                switch (rfpath) {
-                case RF90_PATH_A:
-                        rtstatus = rtl88e_phy_config_rf_with_headerfile(adapt);
-                        break;
-                case RF90_PATH_B:
-                        rtstatus = rtl88e_phy_config_rf_with_headerfile(adapt);
-                        break;
-                case RF90_PATH_C:
-                        break;
-                case RF90_PATH_D:
-                        break;
-                }
-
-                switch (rfpath) {
-                case RF90_PATH_A:
-                case RF90_PATH_C:
-                        phy_set_bb_reg(adapt, pphyreg->rfintfs,
-                                       BRFSI_RFENV, u4val);
-                        break;
-                case RF90_PATH_B:
-                case RF90_PATH_D:
-                        phy_set_bb_reg(adapt, pphyreg->rfintfs,
-                                       BRFSI_RFENV << 16, u4val);
-                        break;
-                }
-
-                if (!rtstatus)
-                        return false;
-        }
+        phy_set_bb_reg(adapt, pphyreg->rfintfs, BRFSI_RFENV, u4val);
 
         return rtstatus;
 }
 
 static bool rtl88e_phy_rf6052_config(struct adapter *adapt)
 {
-        struct hal_data_8188e *hal_data = adapt->HalData;
-
-        hal_data->NumTotalRFPath = 1;
-
         return rf6052_conf_para(adapt);
 }
 
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 385bc2f56f2f..0ce7db723a5d 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -135,7 +135,6 @@ void rtw_hal_read_chip_version(struct adapter *padapter)
         dump_chip_info(ChipVersion);
 
         pHalData->VersionID = ChipVersion;
-        pHalData->NumTotalRFPath = 1;
 }
 
 void rtw_hal_set_odm_var(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)
@@ -470,7 +469,7 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
 {
         struct hal_data_8188e *pHalData = padapter->HalData;
         struct txpowerinfo24g pwrInfo24G;
-        u8 rfPath, ch, group;
+        u8 ch, group;
         u8 bIn24G, TxCount;
 
         Hal_ReadPowerValueFromPROM_8188E(&pwrInfo24G, PROMContent, AutoLoadFail);
@@ -478,34 +477,32 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
         if (!AutoLoadFail)
                 pHalData->bTXPowerDataReadFromEEPORM = true;
 
-        for (rfPath = 0; rfPath < pHalData->NumTotalRFPath; rfPath++) {
-                for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {
-                        bIn24G = Hal_GetChnlGroup88E(ch, &group);
-                        if (bIn24G) {
-                                pHalData->Index24G_CCK_Base[rfPath][ch] = pwrInfo24G.IndexCCK_Base[rfPath][group];
-                                if (ch == 14)
-                                        pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][4];
-                                else
-                                        pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][group];
-                        }
-                        if (bIn24G) {
-                                DBG_88E("======= Path %d, Channel %d =======\n", rfPath, ch);
-                                DBG_88E("Index24G_CCK_Base[%d][%d] = 0x%x\n", rfPath, ch , pHalData->Index24G_CCK_Base[rfPath][ch]);
-                                DBG_88E("Index24G_BW40_Base[%d][%d] = 0x%x\n", rfPath, ch , pHalData->Index24G_BW40_Base[rfPath][ch]);
-                        }
+        for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {
+                bIn24G = Hal_GetChnlGroup88E(ch, &group);
+                if (bIn24G) {
+                        pHalData->Index24G_CCK_Base[0][ch] = pwrInfo24G.IndexCCK_Base[0][group];
+                        if (ch == 14)
+                                pHalData->Index24G_BW40_Base[0][ch] = pwrInfo24G.IndexBW40_Base[0][4];
+                        else
+                                pHalData->Index24G_BW40_Base[0][ch] = pwrInfo24G.IndexBW40_Base[0][group];
                 }
-                for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
-                        pHalData->CCK_24G_Diff[rfPath][TxCount] = pwrInfo24G.CCK_Diff[rfPath][TxCount];
-                        pHalData->OFDM_24G_Diff[rfPath][TxCount] = pwrInfo24G.OFDM_Diff[rfPath][TxCount];
-                        pHalData->BW20_24G_Diff[rfPath][TxCount] = pwrInfo24G.BW20_Diff[rfPath][TxCount];
-                        pHalData->BW40_24G_Diff[rfPath][TxCount] = pwrInfo24G.BW40_Diff[rfPath][TxCount];
-                        DBG_88E("======= TxCount %d =======\n", TxCount);
-                        DBG_88E("CCK_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->CCK_24G_Diff[rfPath][TxCount]);
-                        DBG_88E("OFDM_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->OFDM_24G_Diff[rfPath][TxCount]);
-                        DBG_88E("BW20_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->BW20_24G_Diff[rfPath][TxCount]);
-                        DBG_88E("BW40_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->BW40_24G_Diff[rfPath][TxCount]);
+                if (bIn24G) {
+                        DBG_88E("======= Path %d, Channel %d =======\n", 0, ch);
+                        DBG_88E("Index24G_CCK_Base[%d][%d] = 0x%x\n", 0, ch, pHalData->Index24G_CCK_Base[0][ch]);
+                        DBG_88E("Index24G_BW40_Base[%d][%d] = 0x%x\n", 0, ch, pHalData->Index24G_BW40_Base[0][ch]);
                 }
         }
+        for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
+                pHalData->CCK_24G_Diff[0][TxCount] = pwrInfo24G.CCK_Diff[0][TxCount];
+                pHalData->OFDM_24G_Diff[0][TxCount] = pwrInfo24G.OFDM_Diff[0][TxCount];
+                pHalData->BW20_24G_Diff[0][TxCount] = pwrInfo24G.BW20_Diff[0][TxCount];
+                pHalData->BW40_24G_Diff[0][TxCount] = pwrInfo24G.BW40_Diff[0][TxCount];
+                DBG_88E("======= TxCount %d =======\n", TxCount);
+                DBG_88E("CCK_24G_Diff[%d][%d] = %d\n", 0, TxCount, pHalData->CCK_24G_Diff[0][TxCount]);
+                DBG_88E("OFDM_24G_Diff[%d][%d] = %d\n", 0, TxCount, pHalData->OFDM_24G_Diff[0][TxCount]);
+                DBG_88E("BW20_24G_Diff[%d][%d] = %d\n", 0, TxCount, pHalData->BW20_24G_Diff[0][TxCount]);
+                DBG_88E("BW40_24G_Diff[%d][%d] = %d\n", 0, TxCount, pHalData->BW40_24G_Diff[0][TxCount]);
+        }
 
         /*  2010/10/19 MH Add Regulator recognize for CU. */
         if (!AutoLoadFail) {
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
index 780666a755ee..12879afb992e 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
@@ -46,16 +46,12 @@ void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)
 
         LedCfg = usb_read8(padapter, REG_LEDCFG2);/* 0x4E */
 
-        if (padapter->HalData->bLedOpenDrain) {
-                        /*  Open-drain arrangement for controlling the LED) */
-                LedCfg &= 0x90; /*  Set to software control. */
-                usb_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3)));
-                LedCfg = usb_read8(padapter, REG_MAC_PINMUX_CFG);
-                LedCfg &= 0xFE;
-                usb_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg);
-        } else {
-                usb_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3) | BIT(5) | BIT(6)));
-        }
+        /*  Open-drain arrangement for controlling the LED) */
+        LedCfg &= 0x90; /*  Set to software control. */
+        usb_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3)));
+        LedCfg = usb_read8(padapter, REG_MAC_PINMUX_CFG);
+        LedCfg &= 0xFE;
+        usb_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg);
 exit:
         pLed->bLedOn = false;
 }
@@ -69,10 +65,6 @@ void rtw_hal_sw_led_init(struct adapter *padapter)
 {
         struct led_priv *pledpriv = &(padapter->ledpriv);
 
-        pledpriv->bRegUseLed = true;
-        pledpriv->LedControlHandler = LedControl8188eu;
-        padapter->HalData->bLedOpenDrain = true;
-
         InitLed871x(padapter, &(pledpriv->SwLed0));
 }
 
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
index d0495a16ff79..0fc093eb7a77 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
@@ -37,19 +37,15 @@ int	rtw_hal_init_recv_priv(struct adapter *padapter)
         /* init recv_buf */
         _rtw_init_queue(&precvpriv->free_recv_buf_queue);
 
-        precvpriv->pallocated_recv_buf =
+        precvpriv->precv_buf =
                 kcalloc(NR_RECVBUFF, sizeof(struct recv_buf), GFP_KERNEL);
-        if (!precvpriv->pallocated_recv_buf) {
+        if (!precvpriv->precv_buf) {
                 res = _FAIL;
                 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
                                 ("alloc recv_buf fail!\n"));
                 goto exit;
         }
-
-        precvpriv->precv_buf = precvpriv->pallocated_recv_buf;
-
-
-        precvbuf = (struct recv_buf *)precvpriv->precv_buf;
+        precvbuf = precvpriv->precv_buf;
 
         for (i = 0; i < NR_RECVBUFF; i++) {
                 res = rtw_os_recvbuf_resource_alloc(padapter, precvbuf);
@@ -58,27 +54,18 @@ int	rtw_hal_init_recv_priv(struct adapter *padapter)
                 precvbuf->adapter = padapter;
                 precvbuf++;
         }
-        precvpriv->free_recv_buf_queue_cnt = NR_RECVBUFF;
         skb_queue_head_init(&precvpriv->rx_skb_queue);
         {
                 int i;
-                size_t tmpaddr = 0;
-                size_t alignm = 0;
                 struct sk_buff *pskb = NULL;
 
                 skb_queue_head_init(&precvpriv->free_recv_skb_queue);
 
                 for (i = 0; i < NR_PREALLOC_RECV_SKB; i++) {
                         pskb = __netdev_alloc_skb(padapter->pnetdev,
-                                        MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ,
-                                        GFP_KERNEL);
+                                        MAX_RECVBUF_SZ, GFP_KERNEL);
                         if (pskb) {
                                 kmemleak_not_leak(pskb);
-                                pskb->dev = padapter->pnetdev;
-                                tmpaddr = (size_t)pskb->data;
-                                alignm = tmpaddr & (RECVBUFF_ALIGN_SZ-1);
-                                skb_reserve(pskb, (RECVBUFF_ALIGN_SZ - alignm));
-
                                 skb_queue_tail(&precvpriv->free_recv_skb_queue,
                                                 pskb);
                         }
@@ -95,14 +82,14 @@ void rtw_hal_free_recv_priv(struct adapter *padapter)
         struct recv_buf *precvbuf;
         struct recv_priv        *precvpriv = &padapter->recvpriv;
 
-        precvbuf = (struct recv_buf *)precvpriv->precv_buf;
+        precvbuf = precvpriv->precv_buf;
 
         for (i = 0; i < NR_RECVBUFF; i++) {
                 usb_free_urb(precvbuf->purb);
                 precvbuf++;
         }
 
-        kfree(precvpriv->pallocated_recv_buf);
+        kfree(precvpriv->precv_buf);
 
         if (skb_queue_len(&precvpriv->rx_skb_queue))
                 DBG_88E(KERN_WARNING "rx_skb_queue not empty\n");
diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 7692ca495ee5..3675edb61942 100644
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -562,9 +562,6 @@ static void InitUsbAggregationSetting(struct adapter *Adapter)
 
         /*  Rx aggregation setting */
         usb_AggSettingRxUpdate(Adapter);
-
-        /*  201/12/10 MH Add for USB agg mode dynamic switch. */
-        Adapter->HalData->UsbRxHighSpeedMode = false;
 }
 
 static void _InitBeaconParameters(struct adapter *Adapter)
@@ -604,11 +601,6 @@ static void _BBTurnOnBlock(struct adapter *Adapter)
         phy_set_bb_reg(Adapter, rFPGA0_RFMOD, bOFDMEn, 0x1);
 }
 
-enum {
-        Antenna_Lfet = 1,
-        Antenna_Right = 2,
-};
-
 static void _InitAntenna_Selection(struct adapter *Adapter)
 {
         struct hal_data_8188e *haldata = Adapter->HalData;
@@ -994,19 +986,16 @@ u32 rtw_hal_inirp_init(struct adapter *Adapter)
         RT_TRACE(_module_hci_hal_init_c_, _drv_info_,
                  ("===> usb_inirp_init\n"));
 
-        precvpriv->ff_hwaddr = RECV_BULK_IN_ADDR;
-
         /* issue Rx irp to receive data */
-        precvbuf = (struct recv_buf *)precvpriv->precv_buf;
+        precvbuf = precvpriv->precv_buf;
         for (i = 0; i < NR_RECVBUFF; i++) {
-                if (usb_read_port(Adapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf) == false) {
+                if (usb_read_port(Adapter, RECV_BULK_IN_ADDR, precvbuf) == false) {
                         RT_TRACE(_module_hci_hal_init_c_, _drv_err_, ("usb_rx_init: usb_read_port error\n"));
                         status = _FAIL;
                         goto exit;
                 }
 
                 precvbuf++;
-                precvpriv->free_recv_buf_queue_cnt--;
         }
 
 exit:
@@ -1107,18 +1096,12 @@ static void _ReadPROMContent(
         readAdapterInfo_8188EU(Adapter);
 }
 
-static void _ReadRFType(struct adapter *Adapter)
-{
-        Adapter->HalData->rf_chip = RF_6052;
-}
-
 void rtw_hal_read_chip_info(struct adapter *Adapter)
 {
         unsigned long start = jiffies;
 
         MSG_88E("====> %s\n", __func__);
 
-        _ReadRFType(Adapter);/* rf_chip -> _InitRFType() */
         _ReadPROMContent(Adapter);
 
         MSG_88E("<==== %s in %d ms\n", __func__,
diff --git a/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h b/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h
index 0976a761b280..550ad62e7064 100644
--- a/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h
+++ b/drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h
@@ -99,17 +99,6 @@ enum phy_rate_tx_offset_area {
         RA_OFFSET_HT_CCK,
 };
 
-/* BB/RF related */
-enum RF_TYPE_8190P {
-        RF_TYPE_MIN,            /*  0 */
-        RF_8225 = 1,            /*  1 11b/g RF for verification only */
-        RF_8256 = 2,            /*  2 11b/g/n */
-        RF_8258 = 3,            /*  3 11a/b/g/n RF */
-        RF_6052 = 4,            /*  4 11b/g/n RF */
-        /*  TODO: We should remove this psudo PHY RF after we get new RF. */
-        RF_PSEUDO_11N = 5,      /*  5, It is a temporality RF. */
-};
-
 struct bb_reg_def {
         u32 rfintfs;            /*  set software control: */
                                 /*      0x870~0x877[8 bytes] */
diff --git a/drivers/staging/rtl8188eu/include/drv_types.h b/drivers/staging/rtl8188eu/include/drv_types.h
index 32326fd1dd24..e86419e525d8 100644
--- a/drivers/staging/rtl8188eu/include/drv_types.h
+++ b/drivers/staging/rtl8188eu/include/drv_types.h
@@ -156,8 +156,6 @@ struct adapter {
         u8      hw_init_completed;
 
         void *cmdThread;
-        void (*intf_start)(struct adapter *adapter);
-        void (*intf_stop)(struct adapter *adapter);
         struct  net_device *pnetdev;
         struct  net_device *pmondev;
 
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index fa032b0c12ff..e1114a95d442 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -190,6 +190,7 @@ void rtw_hal_set_odm_var(struct adapter *padapter,
 
 u32     rtw_hal_inirp_init(struct adapter *padapter);
 void    rtw_hal_inirp_deinit(struct adapter *padapter);
+void usb_intf_stop(struct adapter *padapter);
 
 s32     rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
 s32     rtw_hal_mgnt_xmit(struct adapter *padapter,
diff --git a/drivers/staging/rtl8188eu/include/odm.h b/drivers/staging/rtl8188eu/include/odm.h
index 805f52e108b2..4fb3bb07ceaa 100644
--- a/drivers/staging/rtl8188eu/include/odm.h
+++ b/drivers/staging/rtl8188eu/include/odm.h
@@ -80,11 +80,6 @@
 #define DM_DIG_FA_TH2_LPS               30 /*  30 lps */
 #define RSSI_OFFSET_DIG                 0x05;
 
-/* ANT Test */
-#define ANTTESTALL              0x00    /* Ant A or B will be Testing */
-#define ANTTESTA                0x01    /* Ant A will be Testing */
-#define ANTTESTB                0x02    /* Ant B will be testing */
-
 struct rtw_dig {
         u8              Dig_Enable_Flag;
         u8              Dig_Ext_Port_Stage;
@@ -590,7 +585,6 @@ struct odm_rf_cal {
         s32     RegEBC;
 
         u8      TXPowercount;
-        bool    bTXPowerTrackingInit;
         bool    bTXPowerTracking;
         u8      TxPowerTrackControl; /* for mp mode, turn off txpwrtracking
                                       * as default */
diff --git a/drivers/staging/rtl8188eu/include/osdep_intf.h b/drivers/staging/rtl8188eu/include/osdep_intf.h
index dbd7dc4f87dd..97d3d8504184 100644
--- a/drivers/staging/rtl8188eu/include/osdep_intf.h
+++ b/drivers/staging/rtl8188eu/include/osdep_intf.h
@@ -35,7 +35,8 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname);
 struct net_device *rtw_init_netdev(struct adapter *padapter);
 u16 rtw_recv_select_queue(struct sk_buff *skb);
 
-int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
+int netdev_open(struct net_device *pnetdev);
+int ips_netdrv_open(struct adapter *padapter);
 void rtw_ips_dev_unload(struct adapter *padapter);
 int rtw_ips_pwr_up(struct adapter *padapter);
 void rtw_ips_pwr_down(struct adapter *padapter);
diff --git a/drivers/staging/rtl8188eu/include/recv_osdep.h b/drivers/staging/rtl8188eu/include/recv_osdep.h
index 7550d58f6b5b..9b43a1314bd5 100644
--- a/drivers/staging/rtl8188eu/include/recv_osdep.h
+++ b/drivers/staging/rtl8188eu/include/recv_osdep.h
@@ -29,8 +29,6 @@ int rtw_recv_indicatepkt(struct adapter *adapter,
 
 void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup);
 
-void rtw_os_recv_resource_alloc(struct recv_frame *recvfr);
-
 int rtw_os_recvbuf_resource_alloc(struct adapter *adapt, struct recv_buf *buf);
 
 void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl);
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
index 7c81e3f3d12e..9330361da4ad 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_hal.h
@@ -200,10 +200,6 @@ struct hal_data_8188e {
 
         u16     BasicRateSet;
 
-        /* rf_ctrl */
-        u8      rf_chip;
-        u8      NumTotalRFPath;
-
         u8      BoardType;
 
         /*  EEPROM setting. */
@@ -265,14 +261,6 @@ struct hal_data_8188e {
         u32     CCKTxPowerLevelOriginalOffset;
 
         u8      CrystalCap;
-        u32     AntennaTxPath;                  /*  Antenna path Tx */
-        u32     AntennaRxPath;                  /*  Antenna path Rx */
-        u8      BluetoothCoexist;
-        u8      ExternalPA;
-
-        u8      bLedOpenDrain; /* Open-drain support for controlling the LED.*/
-
-        u8      b1x1RecvCombine;        /*  for 1T1R receive combining */
 
         u32     AcParam_BE; /* Original parameter for BE, use for EDCA turbo. */
 
@@ -316,14 +304,6 @@ struct hal_data_8188e {
         u8      OutEpQueueSel;
         u8      OutEpNumber;
 
-        /*  Add for USB aggreation mode dynamic shceme. */
-        bool            UsbRxHighSpeedMode;
-
-        /*  2010/11/22 MH Add for slim combo debug mode selective. */
-        /*  This is used for fix the drawback of CU TSMC-A/UMC-A cut.
-         * HW auto suspend ability. Close BT clock. */
-        bool            SlimComboDbg;
-
         u16     EfuseUsedBytes;
 
         /*  Auto FSM to Turn On, include clock, isolation, power control
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_recv.h b/drivers/staging/rtl8188eu/include/rtl8188e_recv.h
index 80832a5f0732..0d8bf51c72a9 100644
--- a/drivers/staging/rtl8188eu/include/rtl8188e_recv.h
+++ b/drivers/staging/rtl8188eu/include/rtl8188e_recv.h
@@ -51,9 +51,7 @@ enum rx_packet_type {
 };
 
 #define INTERRUPT_MSG_FORMAT_LEN 60
-void rtl8188eu_recv_hdl(struct adapter *padapter, struct recv_buf *precvbuf);
 void rtl8188eu_recv_tasklet(void *priv);
-void rtl8188e_query_rx_phy_status(struct recv_frame *fr, struct phy_stat *phy);
 void rtl8188e_process_phy_info(struct adapter *padapter,
                                struct recv_frame *prframe);
 void update_recvframe_phyinfo_88e(struct recv_frame *fra, struct phy_stat *phy);
diff --git a/drivers/staging/rtl8188eu/include/rtw_led.h b/drivers/staging/rtl8188eu/include/rtw_led.h
index f2054ef70358..607d1ba56a46 100644
--- a/drivers/staging/rtl8188eu/include/rtw_led.h
+++ b/drivers/staging/rtl8188eu/include/rtw_led.h
@@ -70,12 +70,9 @@ struct LED_871x {
 
         struct timer_list BlinkTimer; /*  Timer object for led blinking. */
 
-        u8 bSWLedCtrl;
-
         /*  ALPHA, added by chiyoko, 20090106 */
         u8 bLedNoLinkBlinkInProgress;
         u8 bLedLinkBlinkInProgress;
-        u8 bLedStartToLinkBlinkInProgress;
         u8 bLedScanBlinkInProgress;
         struct work_struct BlinkWorkItem; /* Workitem used by BlinkTimer to
                                            * manipulate H/W to blink LED. */
@@ -91,18 +88,9 @@ void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE	LedAction);
 struct led_priv {
         /* add for led control */
         struct LED_871x                 SwLed0;
-        u8      bRegUseLed;
-        void (*LedControlHandler)(struct adapter *padapter,
-                                  enum LED_CTL_MODE LedAction);
         /* add for led control */
 };
 
-#define rtw_led_control(adapt, action) \
-        do { \
-                if ((adapt)->ledpriv.LedControlHandler) \
-                        (adapt)->ledpriv.LedControlHandler((adapt), (action)); \
-        } while (0)
-
 void BlinkTimerCallback(unsigned long data);
 void BlinkWorkItemCallback(struct work_struct *work);
 
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme.h b/drivers/staging/rtl8188eu/include/rtw_mlme.h
index 9434b869c5e9..18fb7e7b2273 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme.h
@@ -504,7 +504,7 @@ void rtw_scan_abort(struct adapter *adapter);
 int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie,
                         uint in_len);
 int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie,
-                        uint in_len, uint initial_out_len);
+                        uint in_len, uint initial_out_len);
 void rtw_init_registrypriv_dev_network(struct adapter *adapter);
 
 void rtw_update_registrypriv_dev_network(struct adapter *adapter);
diff --git a/drivers/staging/rtl8188eu/include/rtw_recv.h b/drivers/staging/rtl8188eu/include/rtw_recv.h
index 49d973881a04..052af7b891da 100644
--- a/drivers/staging/rtl8188eu/include/rtw_recv.h
+++ b/drivers/staging/rtl8188eu/include/rtw_recv.h
@@ -139,8 +139,6 @@ struct rx_pkt_attrib {
 #define SN_EQUAL(a, b)  (a == b)
 #define REORDER_WAIT_TIME       (50) /*  (ms) */
 
-#define RECVBUFF_ALIGN_SZ 8
-
 #define RXDESC_SIZE     24
 #define RXDESC_OFFSET RXDESC_SIZE
 
@@ -166,9 +164,7 @@ struct recv_priv {
         struct __queue free_recv_queue;
         struct __queue recv_pending_queue;
         struct __queue uc_swdec_pending_queue;
-        u8 *pallocated_frame_buf;
-        u8 *precv_frame_buf;
-        uint free_recvframe_cnt;
+        void *pallocated_frame_buf;
         struct adapter  *adapter;
         u32     bIsAnyNonBEPkts;
         u64     rx_bytes;
@@ -176,17 +172,12 @@ struct recv_priv {
         u64     rx_drop;
         u64     last_rx_bytes;
 
-        uint    ff_hwaddr;
-        u8      rx_pending_cnt;
-
         struct tasklet_struct irq_prepare_beacon_tasklet;
         struct tasklet_struct recv_tasklet;
         struct sk_buff_head free_recv_skb_queue;
         struct sk_buff_head rx_skb_queue;
-        u8 *pallocated_recv_buf;
-        u8 *precv_buf;    /*  4 alignment */
+        struct recv_buf *precv_buf;    /*  4 alignment */
         struct __queue free_recv_buf_queue;
-        u32     free_recv_buf_queue_cnt;
         /* For display the phy informatiom */
         u8 is_signal_dbg;       /*  for debug */
         u8 signal_strength_dbg; /*  for debug */
diff --git a/drivers/staging/rtl8188eu/include/usb_ops_linux.h b/drivers/staging/rtl8188eu/include/usb_ops_linux.h
index 78d9b6e035bf..fb586365d2e5 100644
--- a/drivers/staging/rtl8188eu/include/usb_ops_linux.h
+++ b/drivers/staging/rtl8188eu/include/usb_ops_linux.h
@@ -53,7 +53,7 @@ u8 usb_read8(struct adapter *adapter, u32 addr);
 u16 usb_read16(struct adapter *adapter, u32 addr);
 u32 usb_read32(struct adapter *adapter, u32 addr);
 
-u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
+u32 usb_read_port(struct adapter *adapter, u32 addr, struct recv_buf *precvbuf);
 void usb_read_port_cancel(struct adapter *adapter);
 
 int usb_write8(struct adapter *adapter, u32 addr, u8 val);
diff --git a/drivers/staging/rtl8188eu/include/xmit_osdep.h b/drivers/staging/rtl8188eu/include/xmit_osdep.h
index f96ca6af934d..959ef4b3066c 100644
--- a/drivers/staging/rtl8188eu/include/xmit_osdep.h
+++ b/drivers/staging/rtl8188eu/include/xmit_osdep.h
@@ -41,13 +41,11 @@ void rtw_os_xmit_schedule(struct adapter *padapter);
 
 int rtw_os_xmit_resource_alloc(struct adapter *padapter,
                                struct xmit_buf *pxmitbuf, u32 alloc_sz);
-void rtw_os_xmit_resource_free(struct adapter *padapter,
-                               struct xmit_buf *pxmitbuf, u32 free_sz);
+void rtw_os_xmit_resource_free(struct xmit_buf *pxmitbuf);
 
 uint rtw_remainder_len(struct pkt_file *pfile);
 void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile);
 uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen);
-int rtw_endofpktfile(struct pkt_file *pfile);
 
 void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt);
 void rtw_os_xmit_complete(struct adapter *padapter,
diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index 40691f1ec507..8fc3fadf065f 100644
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -144,7 +144,6 @@ static bool rtw_monitor_enable;
 module_param_named(monitor_enable, rtw_monitor_enable, bool, 0444);
 MODULE_PARM_DESC(monitor_enable, "Enable monitor inferface (default: false)");
 
-static int netdev_open(struct net_device *pnetdev);
 static int netdev_close(struct net_device *pnetdev);
 
 static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
@@ -596,10 +595,9 @@ static int _netdev_open(struct net_device *pnetdev)
                         pr_info("can't init mlme_ext_priv\n");
                         goto netdev_open_error;
                 }
-                if (padapter->intf_start)
-                        padapter->intf_start(padapter);
+                rtw_hal_inirp_init(padapter);
 
-                rtw_led_control(padapter, LED_CTL_NO_LINK);
+                LedControl8188eu(padapter, LED_CTL_NO_LINK);
 
                 padapter->bup = true;
         }
@@ -630,7 +628,7 @@ netdev_open_error:
         return -1;
 }
 
-static int netdev_open(struct net_device *pnetdev)
+int netdev_open(struct net_device *pnetdev)
 {
         int ret;
         struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
@@ -642,7 +640,7 @@ static int netdev_open(struct net_device *pnetdev)
         return ret;
 }
 
-static int  ips_netdrv_open(struct adapter *padapter)
+int  ips_netdrv_open(struct adapter *padapter)
 {
         int status = _SUCCESS;
 
@@ -658,8 +656,7 @@ static int  ips_netdrv_open(struct adapter *padapter)
                 goto netdev_open_error;
         }
 
-        if (padapter->intf_start)
-                padapter->intf_start(padapter);
+        rtw_hal_inirp_init(padapter);
 
         rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv);
         mod_timer(&padapter->mlmepriv.dynamic_chk_timer,
@@ -684,7 +681,7 @@ int rtw_ips_pwr_up(struct adapter *padapter)
 
         result = ips_netdrv_open(padapter);
 
-        rtw_led_control(padapter, LED_CTL_NO_LINK);
+        LedControl8188eu(padapter, LED_CTL_NO_LINK);
 
         DBG_88E("<===  rtw_ips_pwr_up.............. in %dms\n",
                 jiffies_to_msecs(jiffies - start_time));
@@ -699,7 +696,7 @@ void rtw_ips_pwr_down(struct adapter *padapter)
 
         padapter->net_closed = true;
 
-        rtw_led_control(padapter, LED_CTL_POWER_OFF);
+        LedControl8188eu(padapter, LED_CTL_POWER_OFF);
 
         rtw_ips_dev_unload(padapter);
         DBG_88E("<=== rtw_ips_pwr_down..................... in %dms\n",
@@ -712,25 +709,13 @@ void rtw_ips_dev_unload(struct adapter *padapter)
 
         rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, NULL);
 
-        if (padapter->intf_stop)
-                padapter->intf_stop(padapter);
+        usb_intf_stop(padapter);
 
         /* s5. */
         if (!padapter->bSurpriseRemoved)
                 rtw_hal_deinit(padapter);
 }
 
-int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
-{
-        int status;
-
-        if (bnormal)
-                status = netdev_open(pnetdev);
-        else
-                status =  (_SUCCESS == ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev))) ? (0) : (-1);
-        return status;
-}
-
 static int netdev_close(struct net_device *pnetdev)
 {
         struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
@@ -763,7 +748,7 @@ static int netdev_close(struct net_device *pnetdev)
                 /* s2-4. */
                 rtw_free_network_queue(padapter, true);
                 /*  Close LED */
-                rtw_led_control(padapter, LED_CTL_POWER_OFF);
+                LedControl8188eu(padapter, LED_CTL_POWER_OFF);
         }
 
         RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-88eu_drv - drv_close\n"));
diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index 7cd2655f27fe..6ff836f481da 100644
--- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -12,8 +12,6 @@
  * more details.
  *
  ******************************************************************************/
-
-
 #define _OSDEP_SERVICE_C_
 
 #include <osdep_service.h>
@@ -24,9 +22,10 @@
 #include <rtw_ioctl_set.h>
 
 /*
-* Translate the OS dependent @param error_code to OS independent RTW_STATUS_CODE
-* @return: one of RTW_STATUS_CODE
-*/
+ * Translate the OS dependent @param error_code to OS independent
+ * RTW_STATUS_CODE
+ * @return: one of RTW_STATUS_CODE
+ */
 inline int RTW_STATUS_CODE(int error_code)
 {
         if (error_code >= 0)
@@ -43,22 +42,20 @@ void *rtw_malloc2d(int h, int w, int size)
 {
         int j;
 
-        void **a = kzalloc(h*sizeof(void *) + h*w*size, GFP_KERNEL);
-        if (!a) {
-                pr_info("%s: alloc memory fail!\n", __func__);
-                return NULL;
-        }
+        void **a = kzalloc(h * sizeof(void *) + h * w * size, GFP_KERNEL);
+        if (!a)
+                goto out;
 
         for (j = 0; j < h; j++)
-                a[j] = ((char *)(a+h)) + j*w*size;
-
+                a[j] = ((char *)(a + h)) + j * w * size;
+out:
         return a;
 }
 
-void    _rtw_init_queue(struct __queue *pqueue)
+void _rtw_init_queue(struct __queue *pqueue)
 {
-        INIT_LIST_HEAD(&(pqueue->queue));
-        spin_lock_init(&(pqueue->lock));
+        INIT_LIST_HEAD(&pqueue->queue);
+        spin_lock_init(&pqueue->lock);
 }
 
 struct net_device *rtw_alloc_etherdev_with_old_priv(void *old_priv)
diff --git a/drivers/staging/rtl8188eu/os_dep/recv_linux.c b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
index 103cdb4ed073..b85824ec5354 100644
--- a/drivers/staging/rtl8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
@@ -21,12 +21,6 @@
 #include <osdep_intf.h>
 #include <usb_ops_linux.h>
 
-/* alloc os related resource in struct recv_frame */
-void rtw_os_recv_resource_alloc(struct recv_frame *precvframe)
-{
-        precvframe->pkt = NULL;
-}
-
 /* alloc os related resource in struct recv_buf */
 int rtw_os_recvbuf_resource_alloc(struct adapter *padapter,
                                   struct recv_buf *precvbuf)
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 68e1e6bbe87f..c6316ffa64d3 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -141,16 +141,7 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
 
 }
 
-static void usb_intf_start(struct adapter *padapter)
-{
-        RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_start\n"));
-
-        rtw_hal_inirp_init(padapter);
-
-        RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-usb_intf_start\n"));
-}
-
-static void usb_intf_stop(struct adapter *padapter)
+void usb_intf_stop(struct adapter *padapter)
 {
         RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+usb_intf_stop\n"));
 
@@ -183,8 +174,7 @@ static void rtw_dev_unload(struct adapter *padapter)
                 if (padapter->xmitpriv.ack_tx)
                         rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
                 /* s3. */
-                if (padapter->intf_stop)
-                        padapter->intf_stop(padapter);
+                usb_intf_stop(padapter);
                 /* s4. */
                 if (!padapter->pwrctrlpriv.bInternalAutoSuspend)
                         rtw_stop_drv_threads(padapter);
@@ -294,7 +284,7 @@ static int rtw_resume_process(struct adapter *padapter)
         pwrpriv->bkeepfwalive = false;
 
         pr_debug("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);
-        if (pm_netdev_open(pnetdev, true) != 0) {
+        if (netdev_open(pnetdev) != 0) {
                 mutex_unlock(&pwrpriv->mutex_lock);
                 goto exit;
         }
@@ -366,9 +356,6 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
         if (!padapter->HalData)
                 DBG_88E("cant not alloc memory for HAL DATA\n");
 
-        padapter->intf_start = &usb_intf_start;
-        padapter->intf_stop = &usb_intf_stop;
-
         /* step read_chip_version */
         rtw_hal_read_chip_version(padapter);
 
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index d0d591501b73..e2dbe1b4afd3 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -167,27 +167,26 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)
                 }
                 if (pattrib->pkt_rpt_type == NORMAL_RX) { /* Normal rx packet */
                         if (pattrib->physt)
-                                update_recvframe_phyinfo_88e(precvframe, (struct phy_stat *)pphy_status);
+                                update_recvframe_phyinfo_88e(precvframe, pphy_status);
                         if (rtw_recv_entry(precvframe) != _SUCCESS) {
                                 RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
                                         ("recvbuf2recvframe: rtw_recv_entry(precvframe) != _SUCCESS\n"));
                         }
-                } else {
-                        /* enqueue recvframe to txrtp queue */
-                        if (pattrib->pkt_rpt_type == TX_REPORT1) {
-                                /* CCX-TXRPT ack for xmit mgmt frames. */
-                                handle_txrpt_ccx_88e(adapt, precvframe->rx_data);
-                        } else if (pattrib->pkt_rpt_type == TX_REPORT2) {
-                                ODM_RA_TxRPT2Handle_8188E(
-                                                        &haldata->odmpriv,
-                                                        precvframe->rx_data,
-                                                        pattrib->pkt_len,
-                                                        pattrib->MacIDValidEntry[0],
-                                                        pattrib->MacIDValidEntry[1]
-                                                        );
-                        } else if (pattrib->pkt_rpt_type == HIS_REPORT) {
-                                interrupt_handler_8188eu(adapt, pattrib->pkt_len, precvframe->rx_data);
-                        }
+                } else if (pattrib->pkt_rpt_type == TX_REPORT1) {
+                        /* CCX-TXRPT ack for xmit mgmt frames. */
+                        handle_txrpt_ccx_88e(adapt, precvframe->rx_data);
+                        rtw_free_recvframe(precvframe, pfree_recv_queue);
+                } else if (pattrib->pkt_rpt_type == TX_REPORT2) {
+                        ODM_RA_TxRPT2Handle_8188E(
+                                                &haldata->odmpriv,
+                                                precvframe->rx_data,
+                                                pattrib->pkt_len,
+                                                pattrib->MacIDValidEntry[0],
+                                                pattrib->MacIDValidEntry[1]
+                                                );
+                        rtw_free_recvframe(precvframe, pfree_recv_queue);
+                } else if (pattrib->pkt_rpt_type == HIS_REPORT) {
+                        interrupt_handler_8188eu(adapt, pattrib->pkt_len, precvframe->rx_data);
                         rtw_free_recvframe(precvframe, pfree_recv_queue);
                 }
                 pkt_cnt--;
@@ -253,7 +252,7 @@ static int usbctrl_vendorreq(struct adapter *adapt, u8 request, u16 value, u16 i
         /*  Acquire IO memory for vendorreq */
         pIo_buf = kmalloc(MAX_USB_IO_CTL_SIZE, GFP_ATOMIC);
 
-        if (pIo_buf == NULL) {
+        if (!pIo_buf) {
                 DBG_88E("[%s] pIo_buf == NULL\n", __func__);
                 status = -ENOMEM;
                 goto release_mutex;
@@ -384,8 +383,6 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
 
         RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete!!!\n"));
 
-        precvpriv->rx_pending_cnt--;
-
         if (adapt->bSurpriseRemoved || adapt->bDriverStopped || adapt->bReadPortCancel) {
                 RT_TRACE(_module_hci_ops_os_c_, _drv_err_,
                          ("usb_read_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n",
@@ -403,7 +400,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
                         RT_TRACE(_module_hci_ops_os_c_, _drv_err_,
                                  ("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n"));
                         precvbuf->reuse = true;
-                        usb_read_port(adapt, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
+                        usb_read_port(adapt, RECV_BULK_IN_ADDR, precvbuf);
                         DBG_88E("%s()-%d: RX Warning!\n", __func__, __LINE__);
                 } else {
                         skb_put(precvbuf->pskb, purb->actual_length);
@@ -414,7 +411,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
 
                         precvbuf->pskb = NULL;
                         precvbuf->reuse = false;
-                        usb_read_port(adapt, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
+                        usb_read_port(adapt, RECV_BULK_IN_ADDR, precvbuf);
                 }
         } else {
                 RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete : purb->status(%d) != 0\n", purb->status));
@@ -437,7 +434,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
                 case -EOVERFLOW:
                         adapt->HalData->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL;
                         precvbuf->reuse = true;
-                        usb_read_port(adapt, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
+                        usb_read_port(adapt, RECV_BULK_IN_ADDR, precvbuf);
                         break;
                 case -EINPROGRESS:
                         DBG_88E("ERROR: URB IS IN PROGRESS!\n");
@@ -448,17 +445,14 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
         }
 }
 
-u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *rmem)
+u32 usb_read_port(struct adapter *adapter, u32 addr, struct recv_buf *precvbuf)
 {
         struct urb *purb = NULL;
-        struct recv_buf *precvbuf = (struct recv_buf *)rmem;
         struct dvobj_priv       *pdvobj = adapter_to_dvobj(adapter);
         struct recv_priv        *precvpriv = &adapter->recvpriv;
         struct usb_device       *pusbd = pdvobj->pusbdev;
         int err;
         unsigned int pipe;
-        size_t tmpaddr = 0;
-        size_t alignment = 0;
         u32 ret = _SUCCESS;
 
 
@@ -483,22 +477,16 @@ u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *rmem)
 
         /* re-assign for linux based on skb */
         if ((!precvbuf->reuse) || (precvbuf->pskb == NULL)) {
-                precvbuf->pskb = netdev_alloc_skb(adapter->pnetdev, MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ);
+                precvbuf->pskb = netdev_alloc_skb(adapter->pnetdev, MAX_RECVBUF_SZ);
                 if (precvbuf->pskb == NULL) {
                         RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("init_recvbuf(): alloc_skb fail!\n"));
                         DBG_88E("#### usb_read_port() alloc_skb fail!#####\n");
                         return _FAIL;
                 }
-
-                tmpaddr = (size_t)precvbuf->pskb->data;
-                alignment = tmpaddr & (RECVBUFF_ALIGN_SZ-1);
-                skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment));
         } else { /* reuse skb */
                 precvbuf->reuse = false;
         }
 
-        precvpriv->rx_pending_cnt++;
-
         purb = precvbuf->purb;
 
         /* translate DMA FIFO addr to pipehandle */
@@ -528,7 +516,7 @@ void rtw_hal_inirp_deinit(struct adapter *padapter)
         int i;
         struct recv_buf *precvbuf;
 
-        precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;
+        precvbuf = padapter->recvpriv.precv_buf;
 
         DBG_88E("%s\n", __func__);
 
diff --git a/drivers/staging/rtl8188eu/os_dep/xmit_linux.c b/drivers/staging/rtl8188eu/os_dep/xmit_linux.c
index 4b1b04e00715..e097c619ed1b 100644
--- a/drivers/staging/rtl8188eu/os_dep/xmit_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/xmit_linux.c
@@ -59,11 +59,6 @@ uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen)
         return len;
 }
 
-int rtw_endofpktfile(struct pkt_file *pfile)
-{
-        return pfile->pkt_len == 0;
-}
-
 int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 alloc_sz)
 {
         int i;
@@ -85,8 +80,7 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb
         return _SUCCESS;
 }
 
-void rtw_os_xmit_resource_free(struct adapter *padapter,
-                               struct xmit_buf *pxmitbuf, u32 free_sz)
+void rtw_os_xmit_resource_free(struct xmit_buf *pxmitbuf)
 {
         int i;
 
diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/dot11d.c
index 25725b158eca..017fe04ebe2d 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -11,7 +11,7 @@
  *
  * Contact Information:
  * wlanfae <wlanfae@realtek.com>
-******************************************************************************/
+ ******************************************************************************/
 #include "dot11d.h"
 
 struct channel_list {
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
index f9003a28cae2..757ffd4f2f89 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
@@ -49,7 +49,7 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u32 type, const void *data,
                 else
                         skb = dev_alloc_skb(frag_length + 4);
 
-                if (skb == NULL) {
+                if (!skb) {
                         rt_status = false;
                         goto Failed;
                 }
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
index 9aaa85526eb8..bbe399010be1 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
@@ -202,7 +202,5 @@ bool rtl92e_init_fw(struct net_device *dev)
 
 download_firmware_fail:
         netdev_err(dev, "%s: Failed to initialize firmware.\n", __func__);
-        rt_status = false;
-        return rt_status;
-
+        return false;
 }
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 5f53fbd565ef..8a9172aa8178 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -367,7 +367,7 @@ static void _rtl92e_update_cap(struct net_device *dev, u16 cap)
         }
 }
 
-static struct rtllib_qos_parameters def_qos_parameters = {
+static const struct rtllib_qos_parameters def_qos_parameters = {
         {cpu_to_le16(3), cpu_to_le16(3), cpu_to_le16(3), cpu_to_le16(3)},
         {cpu_to_le16(7), cpu_to_le16(7), cpu_to_le16(7), cpu_to_le16(7)},
         {2, 2, 2, 2},
diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c
index c7fd1b1653d6..20260af49ee7 100644
--- a/drivers/staging/rtl8192e/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c
@@ -11,7 +11,7 @@
  *
  * Contact Information:
  * wlanfae <wlanfae@realtek.com>
-******************************************************************************/
+ ******************************************************************************/
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
 #include <linux/etherdevice.h>
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index dd9c0c868361..cded0f43cd33 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -11,7 +11,7 @@
  *
  * Contact Information:
  * wlanfae <wlanfae@realtek.com>
-******************************************************************************/
+ ******************************************************************************/
 #include "rtllib.h"
 #include "rtl819x_HT.h"
 u8 MCS_FILTER_ALL[16] = {
diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index a966a8e490ab..48bbd9e8a52f 100644
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -11,7 +11,7 @@
  *
  * Contact Information:
  * wlanfae <wlanfae@realtek.com>
-******************************************************************************/
+ ******************************************************************************/
 #include "rtllib.h"
 #include <linux/etherdevice.h>
 #include "rtl819x_TS.h"
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index c743182b933e..e5ba7d1a809f 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -130,7 +130,7 @@ rtllib_frag_cache_get(struct rtllib_device *ieee,
                                     ETH_ALEN /* WDS */ +
                                     /* QOS Control */
                                     (RTLLIB_QOS_HAS_SEQ(fc) ? 2 : 0));
-                if (skb == NULL)
+                if (!skb)
                         return NULL;
 
                 entry = &ieee->frag_cache[tid][ieee->frag_next_idx[tid]];
@@ -986,7 +986,7 @@ static void rtllib_rx_extract_addr(struct rtllib_device *ieee,
                 ether_addr_copy(src, hdr->addr4);
                 ether_addr_copy(bssid, ieee->current_network.bssid);
                 break;
-        case 0:
+        default:
                 ether_addr_copy(dst, hdr->addr1);
                 ether_addr_copy(src, hdr->addr2);
                 ether_addr_copy(bssid, hdr->addr3);
@@ -1201,6 +1201,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
         if (crypt && !(fc & RTLLIB_FCTL_WEP) &&
             rtllib_is_eapol_frame(ieee, skb, hdrlen)) {
                 struct eapol *eap = (struct eapol *)(skb->data + 24);
+
                 netdev_dbg(ieee->dev, "RX: IEEE 802.1X EAPOL frame: %s\n",
                            eap_get_type(eap->type));
         }
@@ -1430,7 +1431,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
         /* skb: hdr + (possible reassembled) full plaintext payload */
         payload = skb->data + hdrlen;
         rxb = kmalloc(sizeof(struct rtllib_rxb), GFP_ATOMIC);
-        if (rxb == NULL)
+        if (!rxb)
                 goto rx_dropped;
 
         /* to parse amsdu packets */
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index da74dc49b95e..1430ba27b049 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -1524,6 +1524,7 @@ static void rtllib_associate_complete_wq(void *data)
                                      struct rtllib_device,
                                      associate_complete_wq);
         struct rt_pwr_save_ctrl *pPSC = &(ieee->PowerSaveControl);
+
         netdev_info(ieee->dev, "Associated successfully\n");
         if (!ieee->is_silent_reset) {
                 netdev_info(ieee->dev, "normal associate\n");
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
index 6fa96d57d316..e68850897adf 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c
@@ -553,7 +553,7 @@ static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr)
                 memcpy(hdr, hdr11->addr3, ETH_ALEN); /* DA */
                 memcpy(hdr + ETH_ALEN, hdr11->addr4, ETH_ALEN); /* SA */
                 break;
-        case 0:
+        default:
                 memcpy(hdr, hdr11->addr1, ETH_ALEN); /* DA */
                 memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */
                 break;
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index 89cbc077a48d..82f654305414 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -129,7 +129,7 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee,
                                     8 /* WEP */ +
                                     ETH_ALEN /* WDS */ +
                                     (IEEE80211_QOS_HAS_SEQ(fc)?2:0) /* QOS Control */);
-                if (skb == NULL)
+                if (!skb)
                         return NULL;
 
                 entry = &ieee->frag_cache[tid][ieee->frag_next_idx[tid]];
@@ -1079,7 +1079,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                 memcpy(src, hdr->addr4, ETH_ALEN);
                 memcpy(bssid, ieee->current_network.bssid, ETH_ALEN);
                 break;
-        case 0:
+        default:
                 memcpy(dst, hdr->addr1, ETH_ALEN);
                 memcpy(src, hdr->addr2, ETH_ALEN);
                 memcpy(bssid, hdr->addr3, ETH_ALEN);
diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index c9ea50daffff..b8a170978434 100644
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -63,15 +63,6 @@ static inline u32 end_of_queue_search(struct list_head *head,
         return (head == plist);
 }
 
-static inline void sleep_schedulable(int ms)
-{
-        u32 delta;
-
-        delta = msecs_to_jiffies(ms);/*(ms)*/
-        set_current_state(TASK_INTERRUPTIBLE);
-        schedule_timeout(delta);
-}
-
 static inline void flush_signals_thread(void)
 {
         if (signal_pending(current))
diff --git a/drivers/staging/rtl8712/rtl8712_hal.h b/drivers/staging/rtl8712/rtl8712_hal.h
index 57d5d2db3c77..84456bb560ef 100644
--- a/drivers/staging/rtl8712/rtl8712_hal.h
+++ b/drivers/staging/rtl8712/rtl8712_hal.h
@@ -68,14 +68,14 @@ struct fw_priv {   /*8-bytes alignment required*/
         unsigned char signature_0;  /*0x12: CE product, 0x92: IT product*/
         unsigned char signature_1;  /*0x87: CE product, 0x81: IT product*/
         unsigned char hci_sel; /*0x81: PCI-AP, 01:PCIe, 02: 92S-U, 0x82: USB-AP,
-                            * 0x12: 72S-U, 03:SDIO
-                            */
+                                * 0x12: 72S-U, 03:SDIO
+                                */
         unsigned char chip_version; /*the same value as register value*/
         unsigned char customer_ID_0; /*customer  ID low byte*/
         unsigned char customer_ID_1; /*customer  ID high byte*/
         unsigned char rf_config;  /*0x11:  1T1R, 0x12: 1T2R, 0x92: 1T2R turbo,
-                             * 0x22: 2T2R
-                             */
+                                   * 0x22: 2T2R
+                                   */
         unsigned char usb_ep_num;  /* 4: 4EP, 6: 6EP, 11: 11EP*/
         /*--- long word 1 ----*/
         unsigned char regulatory_class_0; /*regulatory class bit map 0*/
@@ -99,8 +99,8 @@ struct fw_priv {   /*8-bytes alignment required*/
         unsigned char qos_en;    /*1: QoS enable*/
         unsigned char bw_40MHz_en;   /*1: 40MHz BW enable*/
         unsigned char AMSDU2AMPDU_en;   /*1: 4181 convert AMSDU to AMPDU,
-                                   * 0: disable
-                                   */
+                                         * 0: disable
+                                         */
         unsigned char AMPDU_en;   /*1: 11n AMPDU enable*/
         unsigned char rate_control_offload; /*1: FW offloads,0: driver handles*/
         unsigned char aggregation_offload;  /*1: FW offloads,0: driver handles*/
diff --git a/drivers/staging/rtl8712/rtl8712_led.c b/drivers/staging/rtl8712/rtl8712_led.c
index a8e237e480c9..317aeeed38e8 100644
--- a/drivers/staging/rtl8712/rtl8712_led.c
+++ b/drivers/staging/rtl8712/rtl8712_led.c
@@ -355,7 +355,7 @@ static void SwLedBlink1(struct LED_871x *pLed)
                         }
                         pLed->bLedScanBlinkInProgress = false;
                 } else {
-                         if (pLed->bLedOn)
+                        if (pLed->bLedOn)
                                 pLed->BlinkingLedState = LED_STATE_OFF;
                         else
                                 pLed->BlinkingLedState = LED_STATE_ON;
@@ -390,7 +390,7 @@ static void SwLedBlink1(struct LED_871x *pLed)
                         pLed->BlinkTimes = 0;
                         pLed->bLedBlinkInProgress = false;
                 } else {
-                         if (pLed->bLedOn)
+                        if (pLed->bLedOn)
                                 pLed->BlinkingLedState = LED_STATE_OFF;
                         else
                                 pLed->BlinkingLedState = LED_STATE_ON;
@@ -460,7 +460,7 @@ static void SwLedBlink2(struct LED_871x *pLed)
                         }
                         pLed->bLedScanBlinkInProgress = false;
                 } else {
-                         if (pLed->bLedOn)
+                        if (pLed->bLedOn)
                                 pLed->BlinkingLedState = LED_STATE_OFF;
                         else
                                 pLed->BlinkingLedState = LED_STATE_ON;
@@ -667,7 +667,7 @@ static void SwLedBlink4(struct LED_871x *pLed)
                                   msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));
                         pLed->bLedBlinkInProgress = false;
                 } else {
-                         if (pLed->bLedOn)
+                        if (pLed->bLedOn)
                                 pLed->BlinkingLedState = LED_STATE_OFF;
                         else
                                 pLed->BlinkingLedState = LED_STATE_ON;
@@ -764,7 +764,7 @@ static void SwLedBlink5(struct LED_871x *pLed)
                                           msecs_to_jiffies(LED_BLINK_FASTER_INTERVAL_ALPHA));
                         pLed->bLedBlinkInProgress = false;
                 } else {
-                         if (pLed->bLedOn)
+                        if (pLed->bLedOn)
                                 pLed->BlinkingLedState = LED_STATE_OFF;
                         else
                                 pLed->BlinkingLedState = LED_STATE_ON;
@@ -946,7 +946,7 @@ static void SwLedControlMode1(struct _adapter *padapter,
                 if (psitesurveyctrl->traffic_busy &&
                     check_fwstate(pmlmepriv, _FW_LINKED))
                         ; /* dummy branch */
-                 else if (!pLed->bLedScanBlinkInProgress) {
+                else if (!pLed->bLedScanBlinkInProgress) {
                         if (IS_LED_WPS_BLINKING(pLed))
                                 return;
                         if (pLed->bLedNoLinkBlinkInProgress) {
@@ -970,7 +970,7 @@ static void SwLedControlMode1(struct _adapter *padapter,
                                 pLed->BlinkingLedState = LED_STATE_ON;
                         mod_timer(&pLed->BlinkTimer, jiffies +
                                   msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));
-                 }
+                }
                 break;
         case LED_CTL_TX:
         case LED_CTL_RX:
@@ -1000,7 +1000,7 @@ static void SwLedControlMode1(struct _adapter *padapter,
 
         case LED_CTL_START_WPS: /*wait until xinpin finish */
         case LED_CTL_START_WPS_BOTTON:
-                 if (!pLed->bLedWPSBlinkInProgress) {
+                if (!pLed->bLedWPSBlinkInProgress) {
                         if (pLed->bLedNoLinkBlinkInProgress) {
                                 del_timer(&pLed->BlinkTimer);
                                 pLed->bLedNoLinkBlinkInProgress = false;
@@ -1113,9 +1113,9 @@ static void SwLedControlMode2(struct _adapter *padapter,
 
         switch (LedAction) {
         case LED_CTL_SITE_SURVEY:
-                 if (pmlmepriv->sitesurveyctrl.traffic_busy)
+                if (pmlmepriv->sitesurveyctrl.traffic_busy)
                         ; /* dummy branch */
-                 else if (!pLed->bLedScanBlinkInProgress) {
+                else if (!pLed->bLedScanBlinkInProgress) {
                         if (IS_LED_WPS_BLINKING(pLed))
                                 return;
 
@@ -1132,7 +1132,7 @@ static void SwLedControlMode2(struct _adapter *padapter,
                                 pLed->BlinkingLedState = LED_STATE_ON;
                         mod_timer(&pLed->BlinkTimer, jiffies +
                                   msecs_to_jiffies(LED_BLINK_SCAN_INTERVAL_ALPHA));
-                 }
+                }
                 break;
 
         case LED_CTL_TX:
@@ -1186,7 +1186,7 @@ static void SwLedControlMode2(struct _adapter *padapter,
                         pLed->BlinkingLedState = LED_STATE_ON;
                         mod_timer(&pLed->BlinkTimer,
                                   jiffies + msecs_to_jiffies(0));
-                 }
+                }
                 break;
 
         case LED_CTL_STOP_WPS:
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index b7ee5e63af33..04638f1e4e88 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -72,8 +72,11 @@ static sint _init_cmd_priv(struct cmd_priv *pcmdpriv)
                             ((addr_t)(pcmdpriv->cmd_allocated_buf) &
                             (CMDBUFF_ALIGN_SZ - 1));
         pcmdpriv->rsp_allocated_buf = kmalloc(MAX_RSPSZ + 4, GFP_ATOMIC);
-        if (!pcmdpriv->rsp_allocated_buf)
+        if (!pcmdpriv->rsp_allocated_buf) {
+                kfree(pcmdpriv->cmd_allocated_buf);
+                pcmdpriv->cmd_allocated_buf = NULL;
                 return _FAIL;
+        }
         pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf  +  4 -
                             ((addr_t)(pcmdpriv->rsp_allocated_buf) & 3);
         pcmdpriv->cmd_issued_cnt = 0;
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 475e7904fe45..590acb5aea3d 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -588,9 +588,9 @@ static int r871x_set_wpa_ie(struct _adapter *padapter, char *pie,
                                         netdev_info(padapter->pnetdev, "r8712u: SET WPS_IE, wps_phase==true\n");
                                         cnt += buf[cnt + 1] + 2;
                                         break;
-                                } else {
-                                        cnt += buf[cnt + 1] + 2;
                                 }
+
+                                cnt += buf[cnt + 1] + 2;
                         }
                 }
         }
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.c b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
index 0aaf2aab6dd0..01a150446f5a 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_set.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
@@ -139,9 +139,10 @@ u8 r8712_set_802_11_bssid(struct _adapter *padapter, u8 *bssid)
                 if (!memcmp(&pmlmepriv->cur_network.network.MacAddress, bssid,
                     ETH_ALEN)) {
                         if (!check_fwstate(pmlmepriv, WIFI_STATION_STATE))
-                                goto _Abort_Set_BSSID; /* driver is in
-                                                * WIFI_ADHOC_MASTER_STATE
-                                                */
+                                /* driver is in
+                                 * WIFI_ADHOC_MASTER_STATE
+                                 */
+                                goto _Abort_Set_BSSID;
                 } else {
                         r8712_disassoc_cmd(padapter);
                         if (check_fwstate(pmlmepriv, _FW_LINKED))
@@ -203,9 +204,10 @@ void r8712_set_802_11_ssid(struct _adapter *padapter,
                                                             WIFI_ADHOC_STATE);
                                         }
                                 } else {
-                                        goto _Abort_Set_SSID; /* driver is in
-                                                * WIFI_ADHOC_MASTER_STATE
-                                                */
+                                        /* driver is in
+                                         * WIFI_ADHOC_MASTER_STATE
+                                         */
+                                        goto _Abort_Set_SSID;
                                 }
                         }
                 } else {
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c1feef3da26c..35cbdc71cad4 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -137,11 +137,10 @@ static void free_network_nolock(struct mlme_priv *pmlmepriv,
 }
 
 
-/*
-        return the wlan_network with the matching addr
-        Shall be called under atomic context...
-        to avoid possible racing condition...
-*/
+/* return the wlan_network with the matching addr
+ * Shall be called under atomic context...
+ * to avoid possible racing condition...
+ */
 static struct wlan_network *_r8712_find_network(struct  __queue *scanned_queue,
                                          u8 *addr)
 {
@@ -239,11 +238,10 @@ void r8712_free_network_queue(struct _adapter *dev)
 }
 
 /*
-        return the wlan_network with the matching addr
-
-        Shall be called under atomic context...
-        to avoid possible racing condition...
-*/
+ * return the wlan_network with the matching addr
+ * Shall be called under atomic context...
+ * to avoid possible racing condition...
+ */
 static struct wlan_network *r8712_find_network(struct  __queue *scanned_queue,
                                                u8 *addr)
 {
@@ -369,9 +367,7 @@ static void update_current_network(struct _adapter *adapter,
         }
 }
 
-/*
-Caller must hold pmlmepriv->lock first.
-*/
+/* Caller must hold pmlmepriv->lock first */
 static void update_scanned_network(struct _adapter *adapter,
                             struct wlan_bssid_ex *target)
 {
@@ -651,8 +647,8 @@ void r8712_free_assoc_resources(struct _adapter *adapter)
 }
 
 /*
-*r8712_indicate_connect: the caller has to lock pmlmepriv->lock
-*/
+ * r8712_indicate_connect: the caller has to lock pmlmepriv->lock
+ */
 void r8712_indicate_connect(struct _adapter *padapter)
 {
         struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -668,8 +664,8 @@ void r8712_indicate_connect(struct _adapter *padapter)
 
 
 /*
-*r8712_ind_disconnect: the caller has to lock pmlmepriv->lock
-*/
+ * r8712_ind_disconnect: the caller has to lock pmlmepriv->lock
+ */
 void r8712_ind_disconnect(struct _adapter *padapter)
 {
         struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -1347,8 +1343,8 @@ static int SecIsInPMKIDList(struct _adapter *Adapter, u8 *bssid)
                    (!memcmp(psecuritypriv->PMKIDList[i].Bssid,
                             bssid, ETH_ALEN)))
                         break;
-                else
-                        i++;
+                i++;
+
         } while (i < NUM_PMKID_CACHE);
 
         if (i == NUM_PMKID_CACHE) {
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.h b/drivers/staging/rtl8712/rtl871x_mlme.h
index ddaaab058b2f..53a23234c598 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.h
+++ b/drivers/staging/rtl8712/rtl871x_mlme.h
@@ -162,24 +162,6 @@ static inline void clr_fwstate(struct mlme_priv *pmlmepriv, sint state)
         spin_unlock_irqrestore(&pmlmepriv->lock, irqL);
 }
 
-static inline void up_scanned_network(struct mlme_priv *pmlmepriv)
-{
-        unsigned long irqL;
-
-        spin_lock_irqsave(&pmlmepriv->lock, irqL);
-        pmlmepriv->num_of_scanned++;
-        spin_unlock_irqrestore(&pmlmepriv->lock, irqL);
-}
-
-static inline void down_scanned_network(struct mlme_priv *pmlmepriv)
-{
-        unsigned long irqL;
-
-        spin_lock_irqsave(&pmlmepriv->lock, irqL);
-        pmlmepriv->num_of_scanned--;
-        spin_unlock_irqrestore(&pmlmepriv->lock, irqL);
-}
-
 static inline void set_scanned_network_val(struct mlme_priv *pmlmepriv,
                                              sint val)
 {
diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.c b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
index d464c136dd98..e42fc1404c35 100644
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.c
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
@@ -190,19 +190,15 @@ void r8712_init_pwrctrl_priv(struct _adapter *padapter)
 }
 
 /*
-Caller: r8712_cmd_thread
-
-Check if the fw_pwrstate is okay for issuing cmd.
-If not (cpwm should be is less than P2 state), then the sub-routine
-will raise the cpwm to be greater than or equal to P2.
-
-Calling Context: Passive
-
-Return Value:
-
-_SUCCESS: r8712_cmd_thread can issue cmds to firmware afterwards.
-_FAIL: r8712_cmd_thread can not do anything.
-*/
+ * Caller: r8712_cmd_thread
+ * Check if the fw_pwrstate is okay for issuing cmd.
+ * If not (cpwm should be is less than P2 state), then the sub-routine
+ * will raise the cpwm to be greater than or equal to P2.
+ * Calling Context: Passive
+ * Return Value:
+ * _SUCCESS: r8712_cmd_thread can issue cmds to firmware afterwards.
+ * _FAIL: r8712_cmd_thread can not do anything.
+ */
 sint r8712_register_cmd_alive(struct _adapter *padapter)
 {
         uint res = _SUCCESS;
@@ -219,13 +215,11 @@ sint r8712_register_cmd_alive(struct _adapter *padapter)
 }
 
 /*
-Caller: ISR
-
-If ISR's txdone,
-No more pkts for TX,
-Then driver shall call this fun. to power down firmware again.
-*/
-
+ * Caller: ISR
+ * If ISR's txdone,
+ * No more pkts for TX,
+ * Then driver shall call this fun. to power down firmware again.
+ */
 void r8712_unregister_cmd_alive(struct _adapter *padapter)
 {
         struct pwrctrl_priv *pwrctrl = &padapter->pwrctrlpriv;
diff --git a/drivers/staging/rtl8712/rtl871x_recv.c b/drivers/staging/rtl8712/rtl871x_recv.c
index cbd2e51ba42b..35c721a50598 100644
--- a/drivers/staging/rtl8712/rtl871x_recv.c
+++ b/drivers/staging/rtl8712/rtl871x_recv.c
@@ -125,13 +125,10 @@ union recv_frame *r8712_alloc_recvframe(struct __queue *pfree_recv_queue)
 }
 
 /*
-caller : defrag; recvframe_chk_defrag in recv_thread  (passive)
-pframequeue: defrag_queue : will be accessed in recv_thread  (passive)
-
-using spin_lock to protect
-
-*/
-
+ * caller : defrag; recvframe_chk_defrag in recv_thread  (passive)
+ * pframequeue: defrag_queue : will be accessed in recv_thread  (passive)
+ * using spin_lock to protect
+ */
 void r8712_free_recvframe_queue(struct  __queue *pframequeue,
                                 struct  __queue *pfree_recv_queue)
 {
@@ -405,7 +402,7 @@ static sint ap2sta_data_frame(struct _adapter *adapter,
                 }
 
                 /* filter packets that SA is myself or multicast or broadcast */
-               if (!memcmp(myhwaddr, pattrib->src, ETH_ALEN))
+                if (!memcmp(myhwaddr, pattrib->src, ETH_ALEN))
                         return _FAIL;
 
                 /* da should be for me */
diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c
index 09242425dad4..a7f04a4b089d 100644
--- a/drivers/staging/rtl8712/rtl871x_security.c
+++ b/drivers/staging/rtl8712/rtl871x_security.c
@@ -159,8 +159,8 @@ static u32 getcrc32(u8 *buf, u32 len)
 }
 
 /*
-        Need to consider the fragment  situation
-*/
+ * Need to consider the fragment situation
+ */
 void r8712_wep_encrypt(struct _adapter *padapter, u8 *pxmitframe)
 {       /* exclude ICV */
         unsigned char   crc[4];
@@ -467,22 +467,22 @@ static const unsigned short Sbox1[2][256] = {/* Sbox for hash (can be in ROM) */
 };
 
 /*
-**********************************************************************
-* Routine: Phase 1 -- generate P1K, given TA, TK, IV32
-*
-* Inputs:
-*     tk[]      = temporal key                         [128 bits]
-*     ta[]      = transmitter's MAC address            [ 48 bits]
-*     iv32      = upper 32 bits of IV                  [ 32 bits]
-* Output:
-*     p1k[]     = Phase 1 key                          [ 80 bits]
-*
-* Note:
-*     This function only needs to be called every 2**16 packets,
-*     although in theory it could be called every packet.
-*
-**********************************************************************
-*/
+ **********************************************************************
+ * Routine: Phase 1 -- generate P1K, given TA, TK, IV32
+ *
+ * Inputs:
+ *     tk[]      = temporal key                         [128 bits]
+ *     ta[]      = transmitter's MAC address            [ 48 bits]
+ *     iv32      = upper 32 bits of IV                  [ 32 bits]
+ * Output:
+ *     p1k[]     = Phase 1 key                          [ 80 bits]
+ *
+ * Note:
+ *     This function only needs to be called every 2**16 packets,
+ *     although in theory it could be called every packet.
+ *
+ **********************************************************************
+ */
 static void phase1(u16 *p1k, const u8 *tk, const u8 *ta, u32 iv32)
 {
         sint  i;
@@ -506,28 +506,28 @@ static void phase1(u16 *p1k, const u8 *tk, const u8 *ta, u32 iv32)
 }
 
 /*
-**********************************************************************
-* Routine: Phase 2 -- generate RC4KEY, given TK, P1K, IV16
-*
-* Inputs:
-*     tk[]      = Temporal key                         [128 bits]
-*     p1k[]     = Phase 1 output key                   [ 80 bits]
-*     iv16      = low 16 bits of IV counter            [ 16 bits]
-* Output:
-*     rc4key[]  = the key used to encrypt the packet   [128 bits]
-*
-* Note:
-*     The value {TA,IV32,IV16} for Phase1/Phase2 must be unique
-*     across all packets using the same key TK value. Then, for a
-*     given value of TK[], this TKIP48 construction guarantees that
-*     the final RC4KEY value is unique across all packets.
-*
-* Suggested implementation optimization: if PPK[] is "overlaid"
-*     appropriately on RC4KEY[], there is no need for the final
-*     for loop below that copies the PPK[] result into RC4KEY[].
-*
-**********************************************************************
-*/
+ **********************************************************************
+ * Routine: Phase 2 -- generate RC4KEY, given TK, P1K, IV16
+ *
+ * Inputs:
+ *     tk[]      = Temporal key                         [128 bits]
+ *     p1k[]     = Phase 1 output key                   [ 80 bits]
+ *     iv16      = low 16 bits of IV counter            [ 16 bits]
+ * Output:
+ *     rc4key[]  = the key used to encrypt the packet   [128 bits]
+ *
+ * Note:
+ *     The value {TA,IV32,IV16} for Phase1/Phase2 must be unique
+ *     across all packets using the same key TK value. Then, for a
+ *     given value of TK[], this TKIP48 construction guarantees that
+ *     the final RC4KEY value is unique across all packets.
+ *
+ * Suggested implementation optimization: if PPK[] is "overlaid"
+ *     appropriately on RC4KEY[], there is no need for the final
+ *     for loop below that copies the PPK[] result into RC4KEY[].
+ *
+ **********************************************************************
+ */
 static void phase2(u8 *rc4key, const u8 *tk, const u16 *p1k, u16 iv16)
 {
         sint  i;
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
index be38364c8a7c..4ab82ba9bb3f 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -71,8 +71,8 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
         memset((unsigned char *)pxmitpriv, 0, sizeof(struct xmit_priv));
         spin_lock_init(&pxmitpriv->lock);
         /*
-        Please insert all the queue initialization using _init_queue below
-        */
+         *Please insert all the queue initialization using _init_queue below
+         */
         pxmitpriv->adapter = padapter;
         _init_queue(&pxmitpriv->be_pending);
         _init_queue(&pxmitpriv->bk_pending);
@@ -83,10 +83,10 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
         _init_queue(&pxmitpriv->apsd_queue);
         _init_queue(&pxmitpriv->free_xmit_queue);
         /*
-        Please allocate memory with the sz = (struct xmit_frame) * NR_XMITFRAME,
-        and initialize free_xmit_frame below.
-        Please also apply  free_txobj to link_up all the xmit_frames...
-        */
+         * Please allocate memory with the sz = (struct xmit_frame) * NR_XMITFRAME,
+         * and initialize free_xmit_frame below.
+         * Please also apply  free_txobj to link_up all the xmit_frames...
+         */
         pxmitpriv->pallocated_frame_buf = kmalloc(NR_XMITFRAME * sizeof(struct xmit_frame) + 4,
                                                   GFP_ATOMIC);
         if (!pxmitpriv->pallocated_frame_buf) {
@@ -109,8 +109,8 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
         }
         pxmitpriv->free_xmitframe_cnt = NR_XMITFRAME;
         /*
-                init xmit hw_txqueue
-        */
+         * init xmit hw_txqueue
+         */
         _r8712_init_hw_txqueue(&pxmitpriv->be_txqueue, BE_QUEUE_INX);
         _r8712_init_hw_txqueue(&pxmitpriv->bk_txqueue, BK_QUEUE_INX);
         _r8712_init_hw_txqueue(&pxmitpriv->vi_txqueue, VI_QUEUE_INX);
@@ -128,8 +128,11 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
         _init_queue(&pxmitpriv->pending_xmitbuf_queue);
         pxmitpriv->pallocated_xmitbuf = kmalloc(NR_XMITBUFF * sizeof(struct xmit_buf) + 4,
                                                 GFP_ATOMIC);
-        if (!pxmitpriv->pallocated_xmitbuf)
+        if (!pxmitpriv->pallocated_xmitbuf) {
+                kfree(pxmitpriv->pallocated_frame_buf);
+                pxmitpriv->pallocated_frame_buf = NULL;
                 return _FAIL;
+        }
         pxmitpriv->pxmitbuf = pxmitpriv->pallocated_xmitbuf + 4 -
                               ((addr_t)(pxmitpriv->pallocated_xmitbuf) & 3);
         pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
@@ -777,24 +780,23 @@ int r8712_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
 }
 
 /*
-Calling context:
-1. OS_TXENTRY
-2. RXENTRY (rx_thread or RX_ISR/RX_CallBack)
-
-If we turn on USE_RXTHREAD, then, no need for critical section.
-Otherwise, we must use _enter/_exit critical to protect free_xmit_queue...
-
-Must be very very cautious...
-
-*/
-
+ * Calling context:
+ * 1. OS_TXENTRY
+ * 2. RXENTRY (rx_thread or RX_ISR/RX_CallBack)
+ *
+ * If we turn on USE_RXTHREAD, then, no need for critical section.
+ * Otherwise, we must use _enter/_exit critical to protect free_xmit_queue...
+ *
+ * Must be very very cautious...
+ *
+ */
 struct xmit_frame *r8712_alloc_xmitframe(struct xmit_priv *pxmitpriv)
 {
         /*
-                Please remember to use all the osdep_service api,
-                and lock/unlock or _enter/_exit critical to protect
-                pfree_xmit_queue
-        */
+         * Please remember to use all the osdep_service api,
+         * and lock/unlock or _enter/_exit critical to protect
+         * pfree_xmit_queue
+         */
         unsigned long irqL;
         struct xmit_frame *pxframe;
         struct  __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.h b/drivers/staging/rtl8712/rtl871x_xmit.h
index d899d0c6d3a6..40927277f498 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.h
+++ b/drivers/staging/rtl8712/rtl871x_xmit.h
@@ -261,12 +261,6 @@ struct	xmit_priv {
         uint free_xmitbuf_cnt;
 };
 
-static inline struct  __queue *get_free_xmit_queue(
-                                struct xmit_priv *pxmitpriv)
-{
-        return &(pxmitpriv->free_xmit_queue);
-}
-
 int r8712_free_xmitbuf(struct xmit_priv *pxmitpriv,
                        struct xmit_buf *pxmitbuf);
 struct xmit_buf *r8712_alloc_xmitbuf(struct xmit_priv *pxmitpriv);
diff --git a/drivers/staging/rts5208/ms.c b/drivers/staging/rts5208/ms.c
index f27df0b4cb44..28d56c5d1449 100644
--- a/drivers/staging/rts5208/ms.c
+++ b/drivers/staging/rts5208/ms.c
@@ -432,31 +432,36 @@ static int ms_pull_ctl_disable(struct rtsx_chip *chip)
 
         if (CHECK_PID(chip, 0x5208)) {
                 retval = rtsx_write_register(chip, CARD_PULL_CTL1, 0xFF,
-                                             MS_D1_PD | MS_D2_PD | MS_CLK_PD | MS_D6_PD);
+                                             MS_D1_PD | MS_D2_PD | MS_CLK_PD |
+                                             MS_D6_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL2, 0xFF,
-                                             MS_D3_PD | MS_D0_PD | MS_BS_PD | XD_D4_PD);
+                                             MS_D3_PD | MS_D0_PD | MS_BS_PD |
+                                             XD_D4_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL3, 0xFF,
-                                             MS_D7_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
+                                             MS_D7_PD | XD_CE_PD | XD_CLE_PD |
+                                             XD_CD_PU);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL4, 0xFF,
-                                             XD_RDY_PD | SD_D3_PD | SD_D2_PD | XD_ALE_PD);
+                                             XD_RDY_PD | SD_D3_PD | SD_D2_PD |
+                                             XD_ALE_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL5, 0xFF,
-                                             MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
+                                             MS_INS_PU | SD_WP_PD | SD_CD_PU |
+                                             SD_CMD_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
@@ -507,17 +512,17 @@ static int ms_pull_ctl_enable(struct rtsx_chip *chip)
 
         if (CHECK_PID(chip, 0x5208)) {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF,
-                        MS_D1_PD | MS_D2_PD | MS_CLK_NP | MS_D6_PD);
+                             MS_D1_PD | MS_D2_PD | MS_CLK_NP | MS_D6_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF,
-                        MS_D3_PD | MS_D0_PD | MS_BS_NP | XD_D4_PD);
+                             MS_D3_PD | MS_D0_PD | MS_BS_NP | XD_D4_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF,
-                        MS_D7_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
+                             MS_D7_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF,
-                        XD_RDY_PD | SD_D3_PD | SD_D2_PD | XD_ALE_PD);
+                             XD_RDY_PD | SD_D3_PD | SD_D2_PD | XD_ALE_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL5, 0xFF,
-                        MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
+                             MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL6, 0xFF,
-                        MS_D5_PD | MS_D4_PD);
+                             MS_D5_PD | MS_D4_PD);
         } else if (CHECK_PID(chip, 0x5288)) {
                 if (CHECK_BARO_PKG(chip, QFN)) {
                         rtsx_add_cmd(chip, WRITE_REG_CMD,
@@ -616,14 +621,20 @@ static int ms_prepare_reset(struct rtsx_chip *chip)
 
         if (chip->asic_code) {
                 retval = rtsx_write_register(chip, MS_CFG, 0xFF,
-                                             SAMPLE_TIME_RISING | PUSH_TIME_DEFAULT | NO_EXTEND_TOGGLE | MS_BUS_WIDTH_1);
+                                             SAMPLE_TIME_RISING |
+                                             PUSH_TIME_DEFAULT |
+                                             NO_EXTEND_TOGGLE |
+                                             MS_BUS_WIDTH_1);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
         } else {
                 retval = rtsx_write_register(chip, MS_CFG, 0xFF,
-                                             SAMPLE_TIME_FALLING | PUSH_TIME_DEFAULT | NO_EXTEND_TOGGLE | MS_BUS_WIDTH_1);
+                                             SAMPLE_TIME_FALLING |
+                                             PUSH_TIME_DEFAULT |
+                                             NO_EXTEND_TOGGLE |
+                                             MS_BUS_WIDTH_1);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
@@ -665,7 +676,7 @@ static int ms_identify_media_type(struct rtsx_chip *chip, int switch_8bit_bus)
 
         for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
                 retval = ms_transfer_tpc(chip, MS_TM_READ_BYTES, READ_REG,
-                                        6, NO_WAIT_INT);
+                                         6, NO_WAIT_INT);
                 if (retval == STATUS_SUCCESS)
                         break;
         }
@@ -765,7 +776,7 @@ static int ms_confirm_cpu_startup(struct rtsx_chip *chip)
 
                 for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
                         retval = ms_read_bytes(chip, GET_INT, 1,
-                                        NO_WAIT_INT, &val, 1);
+                                               NO_WAIT_INT, &val, 1);
                         if (retval == STATUS_SUCCESS)
                                 break;
                 }
@@ -794,9 +805,9 @@ static int ms_confirm_cpu_startup(struct rtsx_chip *chip)
         }
 
         if (val & INT_REG_ERR) {
-                if (val & INT_REG_CMDNK)
+                if (val & INT_REG_CMDNK) {
                         chip->card_wp |= (MS_CARD);
-                else {
+                } else {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
                 }
@@ -861,7 +872,7 @@ static int ms_switch_8bit_bus(struct rtsx_chip *chip)
 
         for (i = 0; i < MS_MAX_RETRY_COUNT; i++) {
                 retval = ms_transfer_tpc(chip, MS_TM_READ_BYTES, GET_INT,
-                                        1, NO_WAIT_INT);
+                                         1, NO_WAIT_INT);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -1061,8 +1072,8 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)
                         return STATUS_FAIL;
                 }
                 retval = ms_transfer_data(chip, MS_TM_AUTO_READ,
-                                        PRO_READ_LONG_DATA, 0x40, WAIT_INT,
-                                        0, 0, buf, 64 * 512);
+                                          PRO_READ_LONG_DATA, 0x40, WAIT_INT,
+                                          0, 0, buf, 64 * 512);
                 if (retval == STATUS_SUCCESS)
                         break;
 
@@ -1087,7 +1098,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)
                         break;
 
                 retval = ms_transfer_tpc(chip, MS_TM_NORMAL_READ,
-                                        PRO_READ_LONG_DATA, 0, WAIT_INT);
+                                         PRO_READ_LONG_DATA, 0, WAIT_INT);
                 if (retval != STATUS_SUCCESS) {
                         kfree(buf);
                         rtsx_trace(chip);
@@ -1121,7 +1132,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)
 
 #ifdef SUPPORT_MSXC
                 if ((buf[cur_addr_off + 8] == 0x10) ||
-                        (buf[cur_addr_off + 8] == 0x13)) {
+                    (buf[cur_addr_off + 8] == 0x13)) {
 #else
                 if (buf[cur_addr_off + 8] == 0x10) {
 #endif
@@ -1264,7 +1275,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)
 
         if (device_type != 0x00) {
                 if ((device_type == 0x01) || (device_type == 0x02) ||
-                                (device_type == 0x03)) {
+                    (device_type == 0x03)) {
                         chip->card_wp |= MS_CARD;
                 } else {
                         rtsx_trace(chip);
@@ -1298,7 +1309,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)
 
 #ifdef SUPPORT_MAGIC_GATE
 static int mg_set_tpc_para_sub(struct rtsx_chip *chip,
-                        int type, u8 mg_entry_num);
+                               int type, u8 mg_entry_num);
 #endif
 
 static int reset_ms_pro(struct rtsx_chip *chip)
@@ -1317,7 +1328,7 @@ static int reset_ms_pro(struct rtsx_chip *chip)
 #endif
 
 #ifdef XC_POWERCLASS
-Retry:
+retry:
 #endif
         retval = ms_pro_reset_flow(chip, 1);
         if (retval != STATUS_SUCCESS) {
@@ -1365,10 +1376,10 @@ Retry:
                                 change_power_class = power_class_mode;
                         if (change_power_class) {
                                 retval = msxc_change_power(chip,
-                                                        change_power_class);
+                                                           change_power_class);
                                 if (retval != STATUS_SUCCESS) {
                                         change_power_class--;
-                                        goto Retry;
+                                        goto retry;
                                 }
                         }
                 }
@@ -1418,14 +1429,14 @@ static int ms_read_status_reg(struct rtsx_chip *chip)
 }
 
 static int ms_read_extra_data(struct rtsx_chip *chip,
-                u16 block_addr, u8 page_num, u8 *buf, int buf_len)
+                              u16 block_addr, u8 page_num, u8 *buf, int buf_len)
 {
         struct ms_info *ms_card = &chip->ms_card;
         int retval, i;
         u8 val, data[10];
 
         retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                SystemParm, 6);
+                                    SystemParm, 6);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -1488,7 +1499,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip,
                         }
 
                         retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
-                                                MS_EXTRA_SIZE, SystemParm, 6);
+                                                    MS_EXTRA_SIZE, SystemParm,
+                                                    6);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
@@ -1497,7 +1509,7 @@ static int ms_read_extra_data(struct rtsx_chip *chip,
         }
 
         retval = ms_read_bytes(chip, READ_REG, MS_EXTRA_SIZE, NO_WAIT_INT,
-                        data, MS_EXTRA_SIZE);
+                               data, MS_EXTRA_SIZE);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -1512,8 +1524,8 @@ static int ms_read_extra_data(struct rtsx_chip *chip,
         return STATUS_SUCCESS;
 }
 
-static int ms_write_extra_data(struct rtsx_chip *chip,
-                u16 block_addr, u8 page_num, u8 *buf, int buf_len)
+static int ms_write_extra_data(struct rtsx_chip *chip, u16 block_addr,
+                               u8 page_num, u8 *buf, int buf_len)
 {
         struct ms_info *ms_card = &chip->ms_card;
         int retval, i;
@@ -1525,7 +1537,7 @@ static int ms_write_extra_data(struct rtsx_chip *chip,
         }
 
         retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                SystemParm, 6 + MS_EXTRA_SIZE);
+                                    SystemParm, 6 + MS_EXTRA_SIZE);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -1588,7 +1600,7 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num)
         u8 val, data[6];
 
         retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                SystemParm, 6);
+                                    SystemParm, 6);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -1651,7 +1663,7 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num)
         }
 
         retval = ms_transfer_tpc(chip, MS_TM_NORMAL_READ, READ_PAGE_DATA,
-                                0, NO_WAIT_INT);
+                                 0, NO_WAIT_INT);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -1678,7 +1690,7 @@ static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk)
         }
 
         retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                SystemParm, 7);
+                                    SystemParm, 7);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -1742,7 +1754,7 @@ static int ms_erase_block(struct rtsx_chip *chip, u16 phy_blk)
         u8 val, data[6];
 
         retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                SystemParm, 6);
+                                    SystemParm, 6);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -1844,7 +1856,7 @@ static int ms_init_page(struct rtsx_chip *chip, u16 phy_blk, u16 log_blk,
                 }
 
                 retval = ms_write_extra_data(chip, phy_blk, i,
-                                        extra, MS_EXTRA_SIZE);
+                                             extra, MS_EXTRA_SIZE);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -1855,7 +1867,7 @@ static int ms_init_page(struct rtsx_chip *chip, u16 phy_blk, u16 log_blk,
 }
 
 static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
-                u16 log_blk, u8 start_page, u8 end_page)
+                        u16 log_blk, u8 start_page, u8 end_page)
 {
         struct ms_info *ms_card = &chip->ms_card;
         bool uncorrect_flag = false;
@@ -1915,7 +1927,7 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
                 ms_read_extra_data(chip, old_blk, i, extra, MS_EXTRA_SIZE);
 
                 retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
-                                        MS_EXTRA_SIZE, SystemParm, 6);
+                                            MS_EXTRA_SIZE, SystemParm, 6);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -1971,9 +1983,9 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
                                 }
 
                                 retval = ms_transfer_tpc(chip,
-                                                        MS_TM_NORMAL_READ,
-                                                        READ_PAGE_DATA,
-                                                        0, NO_WAIT_INT);
+                                                         MS_TM_NORMAL_READ,
+                                                         READ_PAGE_DATA,
+                                                         0, NO_WAIT_INT);
                                 if (retval != STATUS_SUCCESS) {
                                         rtsx_trace(chip);
                                         return STATUS_FAIL;
@@ -1981,20 +1993,24 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
 
                                 if (uncorrect_flag) {
                                         ms_set_page_status(log_blk, setPS_NG,
-                                                        extra, MS_EXTRA_SIZE);
+                                                           extra,
+                                                           MS_EXTRA_SIZE);
                                         if (i == 0)
                                                 extra[0] &= 0xEF;
 
                                         ms_write_extra_data(chip, old_blk, i,
-                                                        extra, MS_EXTRA_SIZE);
+                                                            extra,
+                                                            MS_EXTRA_SIZE);
                                         dev_dbg(rtsx_dev(chip), "page %d : extra[0] = 0x%x\n",
                                                 i, extra[0]);
                                         MS_SET_BAD_BLOCK_FLG(ms_card);
 
                                         ms_set_page_status(log_blk, setPS_Error,
-                                                        extra, MS_EXTRA_SIZE);
+                                                           extra,
+                                                           MS_EXTRA_SIZE);
                                         ms_write_extra_data(chip, new_blk, i,
-                                                        extra, MS_EXTRA_SIZE);
+                                                            extra,
+                                                            MS_EXTRA_SIZE);
                                         continue;
                                 }
 
@@ -2021,8 +2037,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
                         }
                 }
 
-                retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
-                                MS_EXTRA_SIZE, SystemParm, (6 + MS_EXTRA_SIZE));
+                retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
+                                            SystemParm, (6 + MS_EXTRA_SIZE));
 
                 ms_set_err_code(chip, MS_NO_ERROR);
 
@@ -2085,7 +2101,8 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
 
                 if (i == 0) {
                         retval = ms_set_rw_reg_addr(chip, OverwriteFlag,
-                                                MS_EXTRA_SIZE, SystemParm, 7);
+                                                    MS_EXTRA_SIZE, SystemParm,
+                                                    7);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
@@ -2121,7 +2138,7 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
 
                         ms_set_err_code(chip, MS_NO_ERROR);
                         retval = ms_read_bytes(chip, GET_INT, 1,
-                                        NO_WAIT_INT, &val, 1);
+                                               NO_WAIT_INT, &val, 1);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
@@ -2361,7 +2378,7 @@ RE_SEARCH:
                 }
 
                 retval = ms_transfer_tpc(chip, MS_TM_WRITE_BYTES, WRITE_REG, 1,
-                                        NO_WAIT_INT);
+                                         NO_WAIT_INT);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -2369,7 +2386,9 @@ RE_SEARCH:
 
                 retval = rtsx_write_register(chip, MS_CFG,
                                              0x58 | MS_NO_CHECK_INT,
-                                             MS_BUS_WIDTH_4 | PUSH_TIME_ODD | MS_NO_CHECK_INT);
+                                             MS_BUS_WIDTH_4 |
+                                             PUSH_TIME_ODD |
+                                             MS_NO_CHECK_INT);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
@@ -2474,7 +2493,7 @@ static u16 ms_get_l2p_tbl(struct rtsx_chip *chip, int seg_no, u16 log_off)
 }
 
 static void ms_set_l2p_tbl(struct rtsx_chip *chip,
-                        int seg_no, u16 log_off, u16 phy_blk)
+                           int seg_no, u16 log_off, u16 phy_blk)
 {
         struct ms_info *ms_card = &chip->ms_card;
         struct zone_entry *segment;
@@ -2530,7 +2549,7 @@ static const unsigned short ms_start_idx[] = {0, 494, 990, 1486, 1982, 2478,
                                               7934};
 
 static int ms_arbitrate_l2p(struct rtsx_chip *chip, u16 phy_blk,
-                        u16 log_off, u8 us1, u8 us2)
+                            u16 log_off, u8 us1, u8 us2)
 {
         struct ms_info *ms_card = &chip->ms_card;
         struct zone_entry *segment;
@@ -2627,7 +2646,8 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)
 
         disable_cnt = segment->disable_count;
 
-        segment->get_index = segment->set_index = 0;
+        segment->get_index = 0;
+        segment->set_index = 0;
         segment->unused_blk_cnt = 0;
 
         for (phy_blk = start; phy_blk < end; phy_blk++) {
@@ -2646,7 +2666,7 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)
                 }
 
                 retval = ms_read_extra_data(chip, phy_blk, 0,
-                                        extra, MS_EXTRA_SIZE);
+                                            extra, MS_EXTRA_SIZE);
                 if (retval != STATUS_SUCCESS) {
                         dev_dbg(rtsx_dev(chip), "read extra data fail\n");
                         ms_set_bad_block(chip, phy_blk);
@@ -2685,7 +2705,7 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)
                 }
 
                 if ((log_blk < ms_start_idx[seg_no]) ||
-                                (log_blk >= ms_start_idx[seg_no + 1])) {
+                    (log_blk >= ms_start_idx[seg_no + 1])) {
                         if (!(chip->card_wp & MS_CARD)) {
                                 retval = ms_erase_block(chip, phy_blk);
                                 if (retval != STATUS_SUCCESS)
@@ -2705,7 +2725,7 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)
                 us1 = extra[0] & 0x10;
                 tmp_blk = segment->l2p_table[idx];
                 retval = ms_read_extra_data(chip, tmp_blk, 0,
-                                        extra, MS_EXTRA_SIZE);
+                                            extra, MS_EXTRA_SIZE);
                 if (retval != STATUS_SUCCESS)
                         continue;
                 us2 = extra[0] & 0x10;
@@ -2774,7 +2794,8 @@ static int ms_build_l2p_tbl(struct rtsx_chip *chip, int seg_no)
 
                                 phy_blk = ms_get_unused_block(chip, 0);
                                 retval = ms_copy_page(chip, tmp_blk, phy_blk,
-                                                log_blk, 0, ms_card->page_off + 1);
+                                                      log_blk, 0,
+                                                      ms_card->page_off + 1);
                                 if (retval != STATUS_SUCCESS) {
                                         rtsx_trace(chip);
                                         return STATUS_FAIL;
@@ -2861,7 +2882,7 @@ int reset_ms_card(struct rtsx_chip *chip)
 }
 
 static int mspro_set_rw_cmd(struct rtsx_chip *chip,
-                        u32 start_sec, u16 sec_cnt, u8 cmd)
+                            u32 start_sec, u16 sec_cnt, u8 cmd)
 {
         int retval, i;
         u8 data[8];
@@ -2932,8 +2953,8 @@ static inline int ms_auto_tune_clock(struct rtsx_chip *chip)
 }
 
 static int mspro_rw_multi_sector(struct scsi_cmnd *srb,
-                                struct rtsx_chip *chip, u32 start_sector,
-                                u16 sector_cnt)
+                                 struct rtsx_chip *chip, u32 start_sector,
+                                 u16 sector_cnt)
 {
         struct ms_info *ms_card = &chip->ms_card;
         bool mode_2k = false;
@@ -2992,12 +3013,13 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb,
         }
 
         if (ms_card->seq_mode) {
-                if ((ms_card->pre_dir != srb->sc_data_direction)
-                                || ((ms_card->pre_sec_addr + ms_card->pre_sec_cnt) != start_sector)
-                                || (mode_2k && (ms_card->seq_mode & MODE_512_SEQ))
-                                || (!mode_2k && (ms_card->seq_mode & MODE_2K_SEQ))
-                                || !(val & MS_INT_BREQ)
-                                || ((ms_card->total_sec_cnt + sector_cnt) > 0xFE00)) {
+                if ((ms_card->pre_dir != srb->sc_data_direction) ||
+                    ((ms_card->pre_sec_addr + ms_card->pre_sec_cnt) !=
+                     start_sector) ||
+                    (mode_2k && (ms_card->seq_mode & MODE_512_SEQ)) ||
+                    (!mode_2k && (ms_card->seq_mode & MODE_2K_SEQ)) ||
+                    !(val & MS_INT_BREQ) ||
+                    ((ms_card->total_sec_cnt + sector_cnt) > 0xFE00)) {
                         ms_card->seq_mode = 0;
                         ms_card->total_sec_cnt = 0;
                         if (val & MS_INT_BREQ) {
@@ -3007,7 +3029,8 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb,
                                         return STATUS_FAIL;
                                 }
 
-                                rtsx_write_register(chip, RBCTL, RB_FLUSH, RB_FLUSH);
+                                rtsx_write_register(chip, RBCTL, RB_FLUSH,
+                                                    RB_FLUSH);
                         }
                 }
         }
@@ -3038,8 +3061,8 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb,
         }
 
         retval = ms_transfer_data(chip, trans_mode, rw_tpc, sector_cnt,
-                                WAIT_INT, mode_2k, scsi_sg_count(srb),
-                                scsi_sglist(srb), scsi_bufflen(srb));
+                                  WAIT_INT, mode_2k, scsi_sg_count(srb),
+                                  scsi_sglist(srb), scsi_bufflen(srb));
         if (retval != STATUS_SUCCESS) {
                 ms_card->seq_mode = 0;
                 rtsx_read_register(chip, MS_TRANS_CFG, &val);
@@ -3076,7 +3099,7 @@ static int mspro_rw_multi_sector(struct scsi_cmnd *srb,
 }
 
 static int mspro_read_format_progress(struct rtsx_chip *chip,
-                                const int short_data_len)
+                                      const int short_data_len)
 {
         struct ms_info *ms_card = &chip->ms_card;
         int retval, i;
@@ -3102,7 +3125,8 @@ static int mspro_read_format_progress(struct rtsx_chip *chip,
         }
 
         if (!(tmp & MS_INT_BREQ)) {
-                if ((tmp & (MS_INT_CED | MS_INT_BREQ | MS_INT_CMDNK | MS_INT_ERR)) == MS_INT_CED) {
+                if ((tmp & (MS_INT_CED | MS_INT_BREQ | MS_INT_CMDNK |
+                            MS_INT_ERR)) == MS_INT_CED) {
                         ms_card->format_status = FORMAT_SUCCESS;
                         return STATUS_SUCCESS;
                 }
@@ -3117,7 +3141,7 @@ static int mspro_read_format_progress(struct rtsx_chip *chip,
                 cnt = (u8)short_data_len;
 
         retval = rtsx_write_register(chip, MS_CFG, MS_NO_CHECK_INT,
-                                MS_NO_CHECK_INT);
+                                     MS_NO_CHECK_INT);
         if (retval != STATUS_SUCCESS) {
                 ms_card->format_status = FORMAT_FAIL;
                 rtsx_trace(chip);
@@ -3125,7 +3149,7 @@ static int mspro_read_format_progress(struct rtsx_chip *chip,
         }
 
         retval = ms_read_bytes(chip, PRO_READ_SHORT_DATA, cnt, WAIT_INT,
-                        data, 8);
+                               data, 8);
         if (retval != STATUS_SUCCESS) {
                 ms_card->format_status = FORMAT_FAIL;
                 rtsx_trace(chip);
@@ -3204,7 +3228,7 @@ void mspro_polling_format_status(struct rtsx_chip *chip)
         int i;
 
         if (ms_card->pro_under_formatting &&
-                (rtsx_get_stat(chip) != RTSX_STAT_SS)) {
+            (rtsx_get_stat(chip) != RTSX_STAT_SS)) {
                 rtsx_set_stat(chip, RTSX_STAT_RUN);
 
                 for (i = 0; i < 65535; i++) {
@@ -3216,7 +3240,7 @@ void mspro_polling_format_status(struct rtsx_chip *chip)
 }
 
 int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip,
-                int short_data_len, bool quick_format)
+                 int short_data_len, bool quick_format)
 {
         struct ms_info *ms_card = &chip->ms_card;
         int retval, i;
@@ -3305,9 +3329,9 @@ int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip,
 }
 
 static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
-                                u16 log_blk, u8 start_page, u8 end_page,
-                                u8 *buf, unsigned int *index,
-                                unsigned int *offset)
+                                  u16 log_blk, u8 start_page, u8 end_page,
+                                  u8 *buf, unsigned int *index,
+                                  unsigned int *offset)
 {
         struct ms_info *ms_card = &chip->ms_card;
         int retval, i;
@@ -3315,7 +3339,7 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
         u8 *ptr;
 
         retval = ms_read_extra_data(chip, phy_blk, start_page,
-                                extra, MS_EXTRA_SIZE);
+                                    extra, MS_EXTRA_SIZE);
         if (retval == STATUS_SUCCESS) {
                 if ((extra[1] & 0x30) != 0x30) {
                         ms_set_err_code(chip, MS_FLASH_READ_ERROR);
@@ -3325,7 +3349,7 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
         }
 
         retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                SystemParm, 6);
+                                    SystemParm, 6);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -3389,11 +3413,17 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
                                 if (retval != STATUS_SUCCESS) {
                                         if (!(chip->card_wp & MS_CARD)) {
                                                 reset_ms(chip);
-                                                ms_set_page_status(log_blk, setPS_NG, extra, MS_EXTRA_SIZE);
-                                                ms_write_extra_data(chip, phy_blk,
-                                                                page_addr, extra, MS_EXTRA_SIZE);
+                                                ms_set_page_status
+                                                        (log_blk, setPS_NG,
+                                                         extra,
+                                                         MS_EXTRA_SIZE);
+                                                ms_write_extra_data
+                                                        (chip, phy_blk,
+                                                         page_addr, extra,
+                                                         MS_EXTRA_SIZE);
                                         }
-                                        ms_set_err_code(chip, MS_FLASH_READ_ERROR);
+                                        ms_set_err_code(chip,
+                                                        MS_FLASH_READ_ERROR);
                                         rtsx_trace(chip);
                                         return STATUS_FAIL;
                                 }
@@ -3420,7 +3450,7 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
                         }
 
                         retval = ms_read_bytes(chip, GET_INT, 1, NO_WAIT_INT,
-                                        &val, 1);
+                                               &val, 1);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
@@ -3441,23 +3471,24 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TPC, 0xFF, READ_PAGE_DATA);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG,
-                        0xFF, trans_cfg);
+                             0xFF, trans_cfg);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE,
-                        0x01, RING_BUFFER);
+                             0x01, RING_BUFFER);
 
                 trans_dma_enable(DMA_FROM_DEVICE, chip, 512, DMA_512);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
-                                MS_TRANSFER_START |  MS_TM_NORMAL_READ);
+                             MS_TRANSFER_START |  MS_TM_NORMAL_READ);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER,
-                        MS_TRANSFER_END, MS_TRANSFER_END);
+                             MS_TRANSFER_END, MS_TRANSFER_END);
 
                 rtsx_send_cmd_no_wait(chip);
 
-                retval = rtsx_transfer_data_partial(chip, MS_CARD, ptr,
-                                                512, scsi_sg_count(chip->srb),
-                                                index, offset, DMA_FROM_DEVICE,
-                                                chip->ms_timeout);
+                retval = rtsx_transfer_data_partial(chip, MS_CARD, ptr, 512,
+                                                    scsi_sg_count(chip->srb),
+                                                    index, offset,
+                                                    DMA_FROM_DEVICE,
+                                                    chip->ms_timeout);
                 if (retval < 0) {
                         if (retval == -ETIMEDOUT) {
                                 ms_set_err_code(chip, MS_TO_ERROR);
@@ -3489,7 +3520,7 @@ static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
 }
 
 static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
-                                u16 new_blk, u16 log_blk, u8 start_page,
+                                   u16 new_blk, u16 log_blk, u8 start_page,
                                 u8 end_page, u8 *buf, unsigned int *index,
                                 unsigned int *offset)
 {
@@ -3500,7 +3531,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
 
         if (!start_page) {
                 retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                        SystemParm, 7);
+                                            SystemParm, 7);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -3534,7 +3565,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
 
                 ms_set_err_code(chip, MS_NO_ERROR);
                 retval = ms_transfer_tpc(chip, MS_TM_READ_BYTES, GET_INT, 1,
-                                        NO_WAIT_INT);
+                                         NO_WAIT_INT);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -3542,7 +3573,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
         }
 
         retval = ms_set_rw_reg_addr(chip, OverwriteFlag, MS_EXTRA_SIZE,
-                                SystemParm, (6 + MS_EXTRA_SIZE));
+                                    SystemParm, (6 + MS_EXTRA_SIZE));
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -3630,25 +3661,26 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
                 rtsx_init_cmd(chip);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TPC,
-                        0xFF, WRITE_PAGE_DATA);
+                             0xFF, WRITE_PAGE_DATA);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG,
-                        0xFF, WAIT_INT);
+                             0xFF, WAIT_INT);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE,
-                        0x01, RING_BUFFER);
+                             0x01, RING_BUFFER);
 
                 trans_dma_enable(DMA_TO_DEVICE, chip, 512, DMA_512);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
-                                MS_TRANSFER_START |  MS_TM_NORMAL_WRITE);
+                             MS_TRANSFER_START |  MS_TM_NORMAL_WRITE);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER,
-                        MS_TRANSFER_END, MS_TRANSFER_END);
+                             MS_TRANSFER_END, MS_TRANSFER_END);
 
                 rtsx_send_cmd_no_wait(chip);
 
-                retval = rtsx_transfer_data_partial(chip, MS_CARD, ptr,
-                                                512, scsi_sg_count(chip->srb),
-                                                index, offset, DMA_TO_DEVICE,
-                                                chip->ms_timeout);
+                retval = rtsx_transfer_data_partial(chip, MS_CARD, ptr, 512,
+                                                    scsi_sg_count(chip->srb),
+                                                    index, offset,
+                                                    DMA_TO_DEVICE,
+                                                    chip->ms_timeout);
                 if (retval < 0) {
                         ms_set_err_code(chip, MS_TO_ERROR);
                         rtsx_clear_ms_error(chip);
@@ -3677,7 +3709,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
                         if (page_addr == (end_page - 1)) {
                                 if (!(val & INT_REG_CED)) {
                                         retval = ms_send_cmd(chip, BLOCK_END,
-                                                        WAIT_INT);
+                                                             WAIT_INT);
                                         if (retval != STATUS_SUCCESS) {
                                                 rtsx_trace(chip);
                                                 return STATUS_FAIL;
@@ -3685,7 +3717,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
                                 }
 
                                 retval = ms_read_bytes(chip, GET_INT, 1,
-                                                NO_WAIT_INT, &val, 1);
+                                                       NO_WAIT_INT, &val, 1);
                                 if (retval != STATUS_SUCCESS) {
                                         rtsx_trace(chip);
                                         return STATUS_FAIL;
@@ -3693,7 +3725,7 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
                         }
 
                         if ((page_addr == (end_page - 1)) ||
-                                (page_addr == ms_card->page_off)) {
+                            (page_addr == ms_card->page_off)) {
                                 if (!(val & INT_REG_CED)) {
                                         ms_set_err_code(chip,
                                                         MS_FLASH_WRITE_ERROR);
@@ -3711,13 +3743,13 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
 }
 
 static int ms_finish_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
-                u16 log_blk, u8 page_off)
+                           u16 log_blk, u8 page_off)
 {
         struct ms_info *ms_card = &chip->ms_card;
         int retval, seg_no;
 
         retval = ms_copy_page(chip, old_blk, new_blk, log_blk,
-                        page_off, ms_card->page_off + 1);
+                              page_off, ms_card->page_off + 1);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -3740,13 +3772,13 @@ static int ms_finish_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
 }
 
 static int ms_prepare_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
-                u16 log_blk, u8 start_page)
+                            u16 log_blk, u8 start_page)
 {
         int retval;
 
         if (start_page) {
                 retval = ms_copy_page(chip, old_blk, new_blk, log_blk,
-                                0, start_page);
+                                      0, start_page);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -3772,7 +3804,7 @@ int ms_delay_write(struct rtsx_chip *chip)
 
                 delay_write->delay_write_flag = 0;
                 retval = ms_finish_write(chip,
-                                        delay_write->old_phyblock,
+                                         delay_write->old_phyblock,
                                         delay_write->new_phyblock,
                                         delay_write->logblock,
                                         delay_write->pageoff);
@@ -3790,13 +3822,13 @@ static inline void ms_rw_fail(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
         if (srb->sc_data_direction == DMA_FROM_DEVICE)
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                               SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
         else
                 set_sense_type(chip, SCSI_LUN(srb), SENSE_TYPE_MEDIA_WRITE_ERR);
 }
 
 static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
-                        u32 start_sector, u16 sector_cnt)
+                              u32 start_sector, u16 sector_cnt)
 {
         struct ms_info *ms_card = &chip->ms_card;
         unsigned int lun = SCSI_LUN(srb);
@@ -3843,16 +3875,17 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
         if (srb->sc_data_direction == DMA_TO_DEVICE) {
 #ifdef MS_DELAY_WRITE
                 if (delay_write->delay_write_flag &&
-                                (delay_write->logblock == log_blk) &&
-                                (start_page > delay_write->pageoff)) {
+                    (delay_write->logblock == log_blk) &&
+                    (start_page > delay_write->pageoff)) {
                         delay_write->delay_write_flag = 0;
                         retval = ms_copy_page(chip,
-                                delay_write->old_phyblock,
-                                delay_write->new_phyblock, log_blk,
-                                delay_write->pageoff, start_page);
+                                              delay_write->old_phyblock,
+                                              delay_write->new_phyblock,
+                                              log_blk,
+                                              delay_write->pageoff, start_page);
                         if (retval != STATUS_SUCCESS) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
@@ -3868,32 +3901,35 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                         retval = ms_delay_write(chip);
                         if (retval != STATUS_SUCCESS) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
 #endif
-                        old_blk = ms_get_l2p_tbl(chip, seg_no,
-                                                log_blk - ms_start_idx[seg_no]);
+                        old_blk = ms_get_l2p_tbl
+                                        (chip, seg_no,
+                                         log_blk - ms_start_idx[seg_no]);
                         new_blk  = ms_get_unused_block(chip, seg_no);
                         if ((old_blk == 0xFFFF) || (new_blk == 0xFFFF)) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
 
                         retval = ms_prepare_write(chip, old_blk, new_blk,
-                                                log_blk, start_page);
+                                                  log_blk, start_page);
                         if (retval != STATUS_SUCCESS) {
-                                if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                                        set_sense_type(chip, lun,
+                                if (detect_card_cd(chip, MS_CARD) !=
+                                    STATUS_SUCCESS) {
+                                        set_sense_type
+                                                (chip, lun,
                                                 SENSE_TYPE_MEDIA_NOT_PRESENT);
                                         rtsx_trace(chip);
                                         return STATUS_FAIL;
                                 }
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
@@ -3906,21 +3942,21 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                 if (retval != STATUS_SUCCESS) {
                         if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_NOT_PRESENT);
+                                               SENSE_TYPE_MEDIA_NOT_PRESENT);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                       SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         rtsx_trace(chip);
                         return STATUS_FAIL;
                 }
 #endif
                 old_blk = ms_get_l2p_tbl(chip, seg_no,
-                                        log_blk - ms_start_idx[seg_no]);
+                                         log_blk - ms_start_idx[seg_no]);
                 if (old_blk == 0xFFFF) {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                       SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         rtsx_trace(chip);
                         return STATUS_FAIL;
                 }
@@ -3942,19 +3978,21 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
 
                 if (srb->sc_data_direction == DMA_FROM_DEVICE) {
                         retval = ms_read_multiple_pages(chip,
-                                old_blk, log_blk, start_page, end_page,
-                                ptr, &index, &offset);
+                                                        old_blk, log_blk,
+                                                        start_page, end_page,
+                                                        ptr, &index, &offset);
                 } else {
-                        retval = ms_write_multiple_pages(chip, old_blk,
-                                new_blk, log_blk, start_page, end_page,
-                                ptr, &index, &offset);
+                        retval = ms_write_multiple_pages(chip, old_blk, new_blk,
+                                                         log_blk, start_page,
+                                                         end_page, ptr, &index,
+                                                         &offset);
                 }
 
                 if (retval != STATUS_SUCCESS) {
                         toggle_gpio(chip, 1);
                         if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_NOT_PRESENT);
+                                               SENSE_TYPE_MEDIA_NOT_PRESENT);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
@@ -3970,8 +4008,8 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                                         ms_set_unused_block(chip, old_blk);
 
                                 ms_set_l2p_tbl(chip, seg_no,
-                                        log_blk - ms_start_idx[seg_no],
-                                        new_blk);
+                                               log_blk - ms_start_idx[seg_no],
+                                               new_blk);
                         }
                 }
 
@@ -3995,14 +4033,14 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                         if (retval != STATUS_SUCCESS) {
                                 chip->card_fail |= MS_CARD;
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_NOT_PRESENT);
+                                               SENSE_TYPE_MEDIA_NOT_PRESENT);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
                 }
 
                 old_blk = ms_get_l2p_tbl(chip, seg_no,
-                                        log_blk - ms_start_idx[seg_no]);
+                                         log_blk - ms_start_idx[seg_no]);
                 if (old_blk == 0xFFFF) {
                         ms_rw_fail(srb, chip);
                         rtsx_trace(chip);
@@ -4034,10 +4072,12 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                         delay_write->pageoff = end_page;
 #else
                         retval = ms_finish_write(chip, old_blk, new_blk,
-                                                log_blk, end_page);
+                                                 log_blk, end_page);
                         if (retval != STATUS_SUCCESS) {
-                                if (detect_card_cd(chip, MS_CARD) != STATUS_SUCCESS) {
-                                        set_sense_type(chip, lun,
+                                if (detect_card_cd(chip, MS_CARD) !=
+                                    STATUS_SUCCESS) {
+                                        set_sense_type
+                                                (chip, lun,
                                                 SENSE_TYPE_MEDIA_NOT_PRESENT);
                                         rtsx_trace(chip);
                                         return STATUS_FAIL;
@@ -4057,17 +4097,17 @@ static int ms_rw_multi_sector(struct scsi_cmnd *srb, struct rtsx_chip *chip,
 }
 
 int ms_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
-        u32 start_sector, u16 sector_cnt)
+          u32 start_sector, u16 sector_cnt)
 {
         struct ms_info *ms_card = &chip->ms_card;
         int retval;
 
         if (CHK_MSPRO(ms_card))
                 retval = mspro_rw_multi_sector(srb, chip, start_sector,
-                                        sector_cnt);
+                                               sector_cnt);
         else
                 retval = ms_rw_multi_sector(srb, chip, start_sector,
-                                        sector_cnt);
+                                            sector_cnt);
 
         return retval;
 }
@@ -4189,7 +4229,7 @@ static int mg_send_ex_cmd(struct rtsx_chip *chip, u8 cmd, u8 entry_num)
 }
 
 static int mg_set_tpc_para_sub(struct rtsx_chip *chip, int type,
-                        u8 mg_entry_num)
+                               u8 mg_entry_num)
 {
         int retval;
         u8 buf[6];
@@ -4306,7 +4346,7 @@ int mg_get_local_EKB(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         }
 
         retval = ms_transfer_data(chip, MS_TM_AUTO_READ, PRO_READ_LONG_DATA,
-                                3, WAIT_INT, 0, 0, buf + 4, 1536);
+                                  3, WAIT_INT, 0, 0, buf + 4, 1536);
         if (retval != STATUS_SUCCESS) {
                 set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 rtsx_clear_ms_error(chip);
@@ -4354,7 +4394,7 @@ int mg_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         }
 
         retval = ms_read_bytes(chip, PRO_READ_SHORT_DATA, 32, WAIT_INT,
-                        buf, 32);
+                               buf, 32);
         if (retval != STATUS_SUCCESS) {
                 set_sense_type(chip, lun, SENSE_TYPE_MG_INCOMPATIBLE_MEDIUM);
                 rtsx_trace(chip);
@@ -4437,7 +4477,7 @@ int mg_get_rsp_chg(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         }
 
         retval = ms_read_bytes(chip, PRO_READ_SHORT_DATA, 32, WAIT_INT,
-                        buf1, 32);
+                               buf1, 32);
         if (retval != STATUS_SUCCESS) {
                 set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_AUTHEN);
                 rtsx_trace(chip);
@@ -4560,7 +4600,7 @@ int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         }
 
         retval = ms_transfer_data(chip, MS_TM_AUTO_READ, PRO_READ_LONG_DATA,
-                                2, WAIT_INT, 0, 0, buf + 4, 1024);
+                                  2, WAIT_INT, 0, 0, buf + 4, 1024);
         if (retval != STATUS_SUCCESS) {
                 set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 rtsx_clear_ms_error(chip);
@@ -4615,11 +4655,12 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         if (retval != STATUS_SUCCESS) {
                 if (ms_card->mg_auth == 0) {
                         if ((buf[5] & 0xC0) != 0)
-                                set_sense_type(chip, lun,
+                                set_sense_type
+                                        (chip, lun,
                                         SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
                         else
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MG_WRITE_ERR);
+                                               SENSE_TYPE_MG_WRITE_ERR);
                 } else {
                         set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
                 }
@@ -4634,17 +4675,17 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 rtsx_init_cmd(chip);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TPC,
-                        0xFF, PRO_WRITE_LONG_DATA);
+                             0xFF, PRO_WRITE_LONG_DATA);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, WAIT_INT);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE,
-                        0x01, RING_BUFFER);
+                             0x01, RING_BUFFER);
 
                 trans_dma_enable(DMA_TO_DEVICE, chip, 512, DMA_512);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF,
-                                MS_TRANSFER_START |  MS_TM_NORMAL_WRITE);
+                             MS_TRANSFER_START |  MS_TM_NORMAL_WRITE);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER,
-                        MS_TRANSFER_END, MS_TRANSFER_END);
+                             MS_TRANSFER_END, MS_TRANSFER_END);
 
                 rtsx_send_cmd_no_wait(chip);
 
@@ -4654,13 +4695,15 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                         rtsx_clear_ms_error(chip);
                         if (ms_card->mg_auth == 0) {
                                 if ((buf[5] & 0xC0) != 0)
-                                        set_sense_type(chip, lun, SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
+                                        set_sense_type
+                                            (chip, lun,
+                                             SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
                                 else
                                         set_sense_type(chip, lun,
-                                                SENSE_TYPE_MG_WRITE_ERR);
+                                                       SENSE_TYPE_MG_WRITE_ERR);
                         } else {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MG_WRITE_ERR);
+                                               SENSE_TYPE_MG_WRITE_ERR);
                         }
                         retval = STATUS_FAIL;
                         rtsx_trace(chip);
@@ -4669,16 +4712,17 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         }
 #else
         retval = ms_transfer_data(chip, MS_TM_AUTO_WRITE, PRO_WRITE_LONG_DATA,
-                                2, WAIT_INT, 0, 0, buf + 4, 1024);
+                                  2, WAIT_INT, 0, 0, buf + 4, 1024);
         if ((retval != STATUS_SUCCESS) || check_ms_err(chip)) {
                 rtsx_clear_ms_error(chip);
                 if (ms_card->mg_auth == 0) {
                         if ((buf[5] & 0xC0) != 0)
-                                set_sense_type(chip, lun,
-                                        SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
+                                set_sense_type
+                                    (chip, lun,
+                                     SENSE_TYPE_MG_KEY_FAIL_NOT_ESTAB);
                         else
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MG_WRITE_ERR);
+                                               SENSE_TYPE_MG_WRITE_ERR);
                 } else {
                         set_sense_type(chip, lun, SENSE_TYPE_MG_WRITE_ERR);
                 }
@@ -4706,11 +4750,12 @@ void ms_cleanup_work(struct rtsx_chip *chip)
                 }
                 if (CHK_MSHG(ms_card)) {
                         rtsx_write_register(chip, MS_CFG,
-                                MS_2K_SECTOR_MODE, 0x00);
+                                            MS_2K_SECTOR_MODE, 0x00);
                 }
         }
 #ifdef MS_DELAY_WRITE
-        else if ((!CHK_MSPRO(ms_card)) && ms_card->delay_write.delay_write_flag) {
+        else if ((!CHK_MSPRO(ms_card)) &&
+                 ms_card->delay_write.delay_write_flag) {
                 dev_dbg(rtsx_dev(chip), "MS: delay write\n");
                 ms_delay_write(chip);
                 ms_card->cleanup_counter = 0;
diff --git a/drivers/staging/rts5208/ms.h b/drivers/staging/rts5208/ms.h
index d7686399df97..71f98cc03eed 100644
--- a/drivers/staging/rts5208/ms.h
+++ b/drivers/staging/rts5208/ms.h
@@ -202,9 +202,9 @@ void mspro_polling_format_status(struct rtsx_chip *chip);
 void mspro_stop_seq_mode(struct rtsx_chip *chip);
 int reset_ms_card(struct rtsx_chip *chip);
 int ms_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
-        u32 start_sector, u16 sector_cnt);
+          u32 start_sector, u16 sector_cnt);
 int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip,
-                int short_data_len, bool quick_format);
+                 int short_data_len, bool quick_format);
 void ms_free_l2p_tbl(struct rtsx_chip *chip);
 void ms_cleanup_work(struct rtsx_chip *chip);
 int ms_power_off_card3v3(struct rtsx_chip *chip);
diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index 5d65a5cdc748..68d75d0d5efd 100644
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -107,8 +107,10 @@ static int slave_configure(struct scsi_device *sdev)
          * the actual value or the modified one, depending on where the
          * data comes from.
          */
-        if (sdev->scsi_level < SCSI_2)
-                sdev->scsi_level = sdev->sdev_target->scsi_level = SCSI_2;
+        if (sdev->scsi_level < SCSI_2) {
+                sdev->scsi_level = SCSI_2;
+                sdev->sdev_target->scsi_level = SCSI_2;
+        }
 
         return 0;
 }
@@ -120,12 +122,15 @@ static int slave_configure(struct scsi_device *sdev)
 /* we use this macro to help us write into the buffer */
 #undef SPRINTF
 #define SPRINTF(args...) \
-        do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)
+        do { \
+                if (pos < buffer + length) \
+                        pos += sprintf(pos, ## args); \
+        } while (0)
 
 /* queue a command */
 /* This is always called with scsi_lock(host) held */
 static int queuecommand_lck(struct scsi_cmnd *srb,
-                        void (*done)(struct scsi_cmnd *))
+                            void (*done)(struct scsi_cmnd *))
 {
         struct rtsx_dev *dev = host_to_rtsx(srb->device->host);
         struct rtsx_chip *chip = dev->chip;
@@ -313,7 +318,7 @@ static int rtsx_suspend(struct pci_dev *pci, pm_message_t state)
                 return 0;
 
         /* lock the device pointers */
-        mutex_lock(&(dev->dev_mutex));
+        mutex_lock(&dev->dev_mutex);
 
         chip = dev->chip;
 
@@ -349,7 +354,7 @@ static int rtsx_resume(struct pci_dev *pci)
         chip = dev->chip;
 
         /* lock the device pointers */
-        mutex_lock(&(dev->dev_mutex));
+        mutex_lock(&dev->dev_mutex);
 
         pci_set_power_state(pci, PCI_D0);
         pci_restore_state(pci);
@@ -418,7 +423,7 @@ static int rtsx_control_thread(void *__dev)
                         break;
 
                 /* lock the device pointers */
-                mutex_lock(&(dev->dev_mutex));
+                mutex_lock(&dev->dev_mutex);
 
                 /* if the device has disconnected, we are free to exit */
                 if (rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT)) {
@@ -433,7 +438,7 @@ static int rtsx_control_thread(void *__dev)
                 /* has the command aborted ? */
                 if (rtsx_chk_stat(chip, RTSX_STAT_ABORT)) {
                         chip->srb->result = DID_ABORT << 16;
-                        goto SkipForAbort;
+                        goto skip_for_abort;
                 }
 
                 scsi_unlock(host);
@@ -480,12 +485,12 @@ static int rtsx_control_thread(void *__dev)
                 else if (chip->srb->result != DID_ABORT << 16) {
                         chip->srb->scsi_done(chip->srb);
                 } else {
-SkipForAbort:
+skip_for_abort:
                         dev_err(&dev->pci->dev, "scsi command aborted\n");
                 }
 
                 if (rtsx_chk_stat(chip, RTSX_STAT_ABORT)) {
-                        complete(&(dev->notify));
+                        complete(&dev->notify);
 
                         rtsx_set_stat(chip, RTSX_STAT_IDLE);
                 }
@@ -519,9 +524,9 @@ static int rtsx_polling_thread(void *__dev)
 {
         struct rtsx_dev *dev = __dev;
         struct rtsx_chip *chip = dev->chip;
-        struct sd_info *sd_card = &(chip->sd_card);
-        struct xd_info *xd_card = &(chip->xd_card);
-        struct ms_info *ms_card = &(chip->ms_card);
+        struct sd_info *sd_card = &chip->sd_card;
+        struct xd_info *xd_card = &chip->xd_card;
+        struct ms_info *ms_card = &chip->ms_card;
 
         sd_card->cleanup_counter = 0;
         xd_card->cleanup_counter = 0;
@@ -531,12 +536,11 @@ static int rtsx_polling_thread(void *__dev)
         wait_timeout((delay_use + 5) * 1000);
 
         for (;;) {
-
                 set_current_state(TASK_INTERRUPTIBLE);
                 schedule_timeout(msecs_to_jiffies(POLLING_INTERVAL));
 
                 /* lock the device pointers */
-                mutex_lock(&(dev->dev_mutex));
+                mutex_lock(&dev->dev_mutex);
 
                 /* if the device has disconnected, we are free to exit */
                 if (rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT)) {
@@ -550,7 +554,7 @@ static int rtsx_polling_thread(void *__dev)
                 mspro_polling_format_status(chip);
 
                 /* lock the device pointers */
-                mutex_lock(&(dev->dev_mutex));
+                mutex_lock(&dev->dev_mutex);
 
                 rtsx_polling_func(chip);
 
@@ -597,7 +601,7 @@ static irqreturn_t rtsx_interrupt(int irq, void *dev_id)
                         dev->trans_result = TRANS_RESULT_FAIL;
                         if (dev->done)
                                 complete(dev->done);
-                        goto Exit;
+                        goto exit;
                 }
         }
 
@@ -619,7 +623,7 @@ static irqreturn_t rtsx_interrupt(int irq, void *dev_id)
                 }
         }
 
-Exit:
+exit:
         spin_unlock(&dev->reg_lock);
         return IRQ_HANDLED;
 }
@@ -724,9 +728,10 @@ static int rtsx_scan_thread(void *__dev)
                 dev_info(&dev->pci->dev,
                          "%s: waiting for device to settle before scanning\n",
                          CR_DRIVER_NAME);
-                wait_event_interruptible_timeout(dev->delay_wait,
-                                rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT),
-                                delay_use * HZ);
+                wait_event_interruptible_timeout
+                        (dev->delay_wait,
+                         rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT),
+                         delay_use * HZ);
         }
 
         /* If the device is still connected, perform the scanning */
@@ -844,7 +849,7 @@ static void rtsx_init_options(struct rtsx_chip *chip)
 }
 
 static int rtsx_probe(struct pci_dev *pci,
-                                const struct pci_device_id *pci_id)
+                      const struct pci_device_id *pci_id)
 {
         struct Scsi_Host *host;
         struct rtsx_dev *dev;
@@ -879,18 +884,18 @@ static int rtsx_probe(struct pci_dev *pci,
         dev = host_to_rtsx(host);
         memset(dev, 0, sizeof(struct rtsx_dev));
 
-        dev->chip = kzalloc(sizeof(struct rtsx_chip), GFP_KERNEL);
+        dev->chip = kzalloc(sizeof(*dev->chip), GFP_KERNEL);
         if (!dev->chip) {
                 err = -ENOMEM;
                 goto errout;
         }
 
         spin_lock_init(&dev->reg_lock);
-        mutex_init(&(dev->dev_mutex));
+        mutex_init(&dev->dev_mutex);
         init_completion(&dev->cmnd_ready);
         init_completion(&dev->control_exit);
         init_completion(&dev->polling_exit);
-        init_completion(&(dev->notify));
+        init_completion(&dev->notify);
         init_completion(&dev->scanning_done);
         init_waitqueue_head(&dev->delay_wait);
 
diff --git a/drivers/staging/rts5208/rtsx.h b/drivers/staging/rts5208/rtsx.h
index e725b10ed087..575e5734f2a5 100644
--- a/drivers/staging/rts5208/rtsx.h
+++ b/drivers/staging/rts5208/rtsx.h
@@ -149,7 +149,7 @@ static inline void get_current_time(u8 *timeval_buf, int buf_len)
 
         getnstimeofday64(&ts64);
 
-        tv_usec = ts64.tv_nsec/NSEC_PER_USEC;
+        tv_usec = ts64.tv_nsec / NSEC_PER_USEC;
 
         timeval_buf[0] = (u8)(ts64.tv_sec >> 24);
         timeval_buf[1] = (u8)(ts64.tv_sec >> 16);
diff --git a/drivers/staging/rts5208/rtsx_card.c b/drivers/staging/rts5208/rtsx_card.c
index 97717744962d..a6b7bffc6714 100644
--- a/drivers/staging/rts5208/rtsx_card.c
+++ b/drivers/staging/rts5208/rtsx_card.c
@@ -33,11 +33,11 @@
 
 void do_remaining_work(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
 #ifdef XD_DELAY_WRITE
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
 #endif
-        struct ms_info *ms_card = &(chip->ms_card);
+        struct ms_info *ms_card = &chip->ms_card;
 
         if (chip->card_ready & SD_CARD) {
                 if (sd_card->seq_mode) {
@@ -100,9 +100,9 @@ void try_to_switch_sdio_ctrl(struct rtsx_chip *chip)
         if ((reg1 & 0xC0) && (reg2 & 0xC0)) {
                 chip->sd_int = 1;
                 rtsx_write_register(chip, SDIO_CTRL, 0xFF,
-                                SDIO_BUS_CTRL | SDIO_CD_CTRL);
+                                    SDIO_BUS_CTRL | SDIO_CD_CTRL);
                 rtsx_write_register(chip, PWR_GATE_CTRL,
-                                LDO3318_PWR_MASK, LDO_ON);
+                                    LDO3318_PWR_MASK, LDO_ON);
         }
 }
 
@@ -133,7 +133,7 @@ void dynamic_configure_sdio_aspm(struct rtsx_chip *chip)
                 if (!chip->sdio_aspm) {
                         dev_dbg(rtsx_dev(chip), "SDIO enter ASPM!\n");
                         rtsx_write_register(chip, ASPM_FORCE_CTL, 0xFC,
-                                        0x30 | (chip->aspm_level[1] << 2));
+                                            0x30 | (chip->aspm_level[1] << 2));
                         chip->sdio_aspm = 1;
                 }
         } else {
@@ -154,7 +154,7 @@ void do_reset_sd_card(struct rtsx_chip *chip)
                 chip->sd_reset_counter, chip->card2lun[SD_CARD]);
 
         if (chip->card2lun[SD_CARD] >= MAX_ALLOWED_LUN_CNT) {
-                clear_bit(SD_NR, &(chip->need_reset));
+                clear_bit(SD_NR, &chip->need_reset);
                 chip->sd_reset_counter = 0;
                 chip->sd_show_cnt = 0;
                 return;
@@ -169,7 +169,7 @@ void do_reset_sd_card(struct rtsx_chip *chip)
         if (chip->need_release & SD_CARD)
                 return;
         if (retval == STATUS_SUCCESS) {
-                clear_bit(SD_NR, &(chip->need_reset));
+                clear_bit(SD_NR, &chip->need_reset);
                 chip->sd_reset_counter = 0;
                 chip->sd_show_cnt = 0;
                 chip->card_ready |= SD_CARD;
@@ -177,7 +177,7 @@ void do_reset_sd_card(struct rtsx_chip *chip)
                 chip->rw_card[chip->card2lun[SD_CARD]] = sd_rw;
         } else {
                 if (chip->sd_io || (chip->sd_reset_counter >= MAX_RESET_CNT)) {
-                        clear_bit(SD_NR, &(chip->need_reset));
+                        clear_bit(SD_NR, &chip->need_reset);
                         chip->sd_reset_counter = 0;
                         chip->sd_show_cnt = 0;
                 } else {
@@ -208,7 +208,7 @@ void do_reset_xd_card(struct rtsx_chip *chip)
                 chip->xd_reset_counter, chip->card2lun[XD_CARD]);
 
         if (chip->card2lun[XD_CARD] >= MAX_ALLOWED_LUN_CNT) {
-                clear_bit(XD_NR, &(chip->need_reset));
+                clear_bit(XD_NR, &chip->need_reset);
                 chip->xd_reset_counter = 0;
                 chip->xd_show_cnt = 0;
                 return;
@@ -223,14 +223,14 @@ void do_reset_xd_card(struct rtsx_chip *chip)
         if (chip->need_release & XD_CARD)
                 return;
         if (retval == STATUS_SUCCESS) {
-                clear_bit(XD_NR, &(chip->need_reset));
+                clear_bit(XD_NR, &chip->need_reset);
                 chip->xd_reset_counter = 0;
                 chip->card_ready |= XD_CARD;
                 chip->card_fail &= ~XD_CARD;
                 chip->rw_card[chip->card2lun[XD_CARD]] = xd_rw;
         } else {
                 if (chip->xd_reset_counter >= MAX_RESET_CNT) {
-                        clear_bit(XD_NR, &(chip->need_reset));
+                        clear_bit(XD_NR, &chip->need_reset);
                         chip->xd_reset_counter = 0;
                         chip->xd_show_cnt = 0;
                 } else {
@@ -256,7 +256,7 @@ void do_reset_ms_card(struct rtsx_chip *chip)
                 chip->ms_reset_counter, chip->card2lun[MS_CARD]);
 
         if (chip->card2lun[MS_CARD] >= MAX_ALLOWED_LUN_CNT) {
-                clear_bit(MS_NR, &(chip->need_reset));
+                clear_bit(MS_NR, &chip->need_reset);
                 chip->ms_reset_counter = 0;
                 chip->ms_show_cnt = 0;
                 return;
@@ -271,14 +271,14 @@ void do_reset_ms_card(struct rtsx_chip *chip)
         if (chip->need_release & MS_CARD)
                 return;
         if (retval == STATUS_SUCCESS) {
-                clear_bit(MS_NR, &(chip->need_reset));
+                clear_bit(MS_NR, &chip->need_reset);
                 chip->ms_reset_counter = 0;
                 chip->card_ready |= MS_CARD;
                 chip->card_fail &= ~MS_CARD;
                 chip->rw_card[chip->card2lun[MS_CARD]] = ms_rw;
         } else {
                 if (chip->ms_reset_counter >= MAX_RESET_CNT) {
-                        clear_bit(MS_NR, &(chip->need_reset));
+                        clear_bit(MS_NR, &chip->need_reset);
                         chip->ms_reset_counter = 0;
                         chip->ms_show_cnt = 0;
                 } else {
@@ -300,7 +300,7 @@ static void release_sdio(struct rtsx_chip *chip)
 {
         if (chip->sd_io) {
                 rtsx_write_register(chip, CARD_STOP, SD_STOP | SD_CLR_ERR,
-                                SD_STOP | SD_CLR_ERR);
+                                    SD_STOP | SD_CLR_ERR);
 
                 if (chip->chip_insert_with_sdio) {
                         chip->chip_insert_with_sdio = 0;
@@ -369,7 +369,7 @@ void rtsx_reset_cards(struct rtsx_chip *chip)
         rtsx_disable_aspm(chip);
 
         if ((chip->need_reset & SD_CARD) && chip->chip_insert_with_sdio)
-                clear_bit(SD_NR, &(chip->need_reset));
+                clear_bit(SD_NR, &chip->need_reset);
 
         if (chip->need_reset & XD_CARD) {
                 chip->card_exist |= XD_CARD;
@@ -381,8 +381,8 @@ void rtsx_reset_cards(struct rtsx_chip *chip)
         }
         if (CHECK_PID(chip, 0x5288) && CHECK_BARO_PKG(chip, QFN)) {
                 if (chip->card_exist & XD_CARD) {
-                        clear_bit(SD_NR, &(chip->need_reset));
-                        clear_bit(MS_NR, &(chip->need_reset));
+                        clear_bit(SD_NR, &chip->need_reset);
+                        clear_bit(MS_NR, &chip->need_reset);
                 }
         }
         if (chip->need_reset & SD_CARD) {
@@ -449,7 +449,7 @@ void rtsx_reinit_cards(struct rtsx_chip *chip, int reset_chip)
 
 #ifdef DISABLE_CARD_INT
 void card_cd_debounce(struct rtsx_chip *chip, unsigned long *need_reset,
-                unsigned long *need_release)
+                      unsigned long *need_release)
 {
         u8 release_map = 0, reset_map = 0;
 
@@ -502,13 +502,13 @@ void card_cd_debounce(struct rtsx_chip *chip, unsigned long *need_reset,
 
                 reset_map = 0;
                 if (!(chip->card_exist & XD_CARD) &&
-                                (xd_cnt > (DEBOUNCE_CNT-1)))
+                    (xd_cnt > (DEBOUNCE_CNT - 1)))
                         reset_map |= XD_CARD;
                 if (!(chip->card_exist & SD_CARD) &&
-                                (sd_cnt > (DEBOUNCE_CNT-1)))
+                    (sd_cnt > (DEBOUNCE_CNT - 1)))
                         reset_map |= SD_CARD;
                 if (!(chip->card_exist & MS_CARD) &&
-                                (ms_cnt > (DEBOUNCE_CNT-1)))
+                    (ms_cnt > (DEBOUNCE_CNT - 1)))
                         reset_map |= MS_CARD;
         }
 
@@ -531,23 +531,23 @@ void rtsx_init_cards(struct rtsx_chip *chip)
         }
 
 #ifdef DISABLE_CARD_INT
-        card_cd_debounce(chip, &(chip->need_reset), &(chip->need_release));
+        card_cd_debounce(chip, &chip->need_reset, &chip->need_release);
 #endif
 
         if (chip->need_release) {
                 if (CHECK_PID(chip, 0x5288) && CHECK_BARO_PKG(chip, QFN)) {
                         if (chip->int_reg & XD_EXIST) {
-                                clear_bit(SD_NR, &(chip->need_release));
-                                clear_bit(MS_NR, &(chip->need_release));
+                                clear_bit(SD_NR, &chip->need_release);
+                                clear_bit(MS_NR, &chip->need_release);
                         }
                 }
 
                 if (!(chip->card_exist & SD_CARD) && !chip->sd_io)
-                        clear_bit(SD_NR, &(chip->need_release));
+                        clear_bit(SD_NR, &chip->need_release);
                 if (!(chip->card_exist & XD_CARD))
-                        clear_bit(XD_NR, &(chip->need_release));
+                        clear_bit(XD_NR, &chip->need_release);
                 if (!(chip->card_exist & MS_CARD))
-                        clear_bit(MS_NR, &(chip->need_release));
+                        clear_bit(MS_NR, &chip->need_release);
 
                 dev_dbg(rtsx_dev(chip), "chip->need_release = 0x%x\n",
                         (unsigned int)(chip->need_release));
@@ -556,8 +556,10 @@ void rtsx_init_cards(struct rtsx_chip *chip)
                 if (chip->need_release) {
                         if (chip->ocp_stat & (CARD_OC_NOW | CARD_OC_EVER))
                                 rtsx_write_register(chip, OCPCLR,
-                                                CARD_OC_INT_CLR | CARD_OC_CLR,
-                                                CARD_OC_INT_CLR | CARD_OC_CLR);
+                                                    CARD_OC_INT_CLR |
+                                                    CARD_OC_CLR,
+                                                    CARD_OC_INT_CLR |
+                                                    CARD_OC_CLR);
                         chip->ocp_stat = 0;
                 }
 #endif
@@ -567,7 +569,7 @@ void rtsx_init_cards(struct rtsx_chip *chip)
                 }
 
                 if (chip->need_release & SD_CARD) {
-                        clear_bit(SD_NR, &(chip->need_release));
+                        clear_bit(SD_NR, &chip->need_release);
                         chip->card_exist &= ~SD_CARD;
                         chip->card_ejected &= ~SD_CARD;
                         chip->card_fail &= ~SD_CARD;
@@ -580,7 +582,7 @@ void rtsx_init_cards(struct rtsx_chip *chip)
                 }
 
                 if (chip->need_release & XD_CARD) {
-                        clear_bit(XD_NR, &(chip->need_release));
+                        clear_bit(XD_NR, &chip->need_release);
                         chip->card_exist &= ~XD_CARD;
                         chip->card_ejected &= ~XD_CARD;
                         chip->card_fail &= ~XD_CARD;
@@ -590,13 +592,13 @@ void rtsx_init_cards(struct rtsx_chip *chip)
                         release_xd_card(chip);
 
                         if (CHECK_PID(chip, 0x5288) &&
-                                        CHECK_BARO_PKG(chip, QFN))
+                            CHECK_BARO_PKG(chip, QFN))
                                 rtsx_write_register(chip, HOST_SLEEP_STATE,
-                                                0xC0, 0xC0);
+                                                    0xC0, 0xC0);
                 }
 
                 if (chip->need_release & MS_CARD) {
-                        clear_bit(MS_NR, &(chip->need_release));
+                        clear_bit(MS_NR, &chip->need_release);
                         chip->card_exist &= ~MS_CARD;
                         chip->card_ejected &= ~MS_CARD;
                         chip->card_fail &= ~MS_CARD;
@@ -650,7 +652,7 @@ int switch_ssc_clock(struct rtsx_chip *chip, int clk)
                 return STATUS_FAIL;
         }
 
-        mcu_cnt = (u8)(125/clk + 3);
+        mcu_cnt = (u8)(125 / clk + 3);
         if (mcu_cnt > 7)
                 mcu_cnt = 7;
 
@@ -681,9 +683,9 @@ int switch_ssc_clock(struct rtsx_chip *chip, int clk)
         rtsx_add_cmd(chip, WRITE_REG_CMD, SSC_CTL1, SSC_RSTB, SSC_RSTB);
         if (sd_vpclk_phase_reset) {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL,
-                        PHASE_NOT_RESET, 0);
+                             PHASE_NOT_RESET, 0);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SD_VPCLK0_CTL,
-                        PHASE_NOT_RESET, PHASE_NOT_RESET);
+                             PHASE_NOT_RESET, PHASE_NOT_RESET);
         }
 
         retval = rtsx_send_cmd(chip, 0, WAIT_TIME);
@@ -850,7 +852,7 @@ int switch_normal_clock(struct rtsx_chip *chip, int clk)
 }
 
 void trans_dma_enable(enum dma_data_direction dir, struct rtsx_chip *chip,
-                u32 byte_cnt, u8 pack_size)
+                      u32 byte_cnt, u8 pack_size)
 {
         if (pack_size > DMA_1024)
                 pack_size = DMA_512;
@@ -864,11 +866,11 @@ void trans_dma_enable(enum dma_data_direction dir, struct rtsx_chip *chip,
 
         if (dir == DMA_FROM_DEVICE) {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL,
-                        0x03 | DMA_PACK_SIZE_MASK,
+                             0x03 | DMA_PACK_SIZE_MASK,
                              DMA_DIR_FROM_CARD | DMA_EN | pack_size);
         } else {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, DMACTL,
-                        0x03 | DMA_PACK_SIZE_MASK,
+                             0x03 | DMA_PACK_SIZE_MASK,
                              DMA_DIR_TO_CARD | DMA_EN | pack_size);
         }
 
@@ -978,13 +980,13 @@ int card_power_off(struct rtsx_chip *chip, u8 card)
 }
 
 int card_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
-        u32 sec_addr, u16 sec_cnt)
+            u32 sec_addr, u16 sec_cnt)
 {
         int retval;
         unsigned int lun = SCSI_LUN(srb);
         int i;
 
-        if (chip->rw_card[lun] == NULL) {
+        if (!chip->rw_card[lun]) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
         }
@@ -1115,7 +1117,7 @@ void turn_on_led(struct rtsx_chip *chip, u8 gpio)
 {
         if (CHECK_PID(chip, 0x5288))
                 rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio),
-                                (u8)(1 << gpio));
+                                    (u8)(1 << gpio));
         else
                 rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), 0);
 }
@@ -1126,7 +1128,7 @@ void turn_off_led(struct rtsx_chip *chip, u8 gpio)
                 rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio), 0);
         else
                 rtsx_write_register(chip, CARD_GPIO, (u8)(1 << gpio),
-                                (u8)(1 << gpio));
+                                    (u8)(1 << gpio));
 }
 
 int detect_card_cd(struct rtsx_chip *chip, int card)
diff --git a/drivers/staging/rts5208/rtsx_card.h b/drivers/staging/rts5208/rtsx_card.h
index 56df9a431d6d..aa37705bae39 100644
--- a/drivers/staging/rts5208/rtsx_card.h
+++ b/drivers/staging/rts5208/rtsx_card.h
@@ -1011,9 +1011,9 @@ int switch_normal_clock(struct rtsx_chip *chip, int clk);
 int enable_card_clock(struct rtsx_chip *chip, u8 card);
 int disable_card_clock(struct rtsx_chip *chip, u8 card);
 int card_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
-        u32 sec_addr, u16 sec_cnt);
+            u32 sec_addr, u16 sec_cnt);
 void trans_dma_enable(enum dma_data_direction dir,
-                struct rtsx_chip *chip, u32 byte_cnt, u8 pack_size);
+                      struct rtsx_chip *chip, u32 byte_cnt, u8 pack_size);
 void toggle_gpio(struct rtsx_chip *chip, u8 gpio);
 void turn_on_led(struct rtsx_chip *chip, u8 gpio);
 void turn_off_led(struct rtsx_chip *chip, u8 gpio);
@@ -1030,10 +1030,10 @@ u8 get_lun_card(struct rtsx_chip *chip, unsigned int lun);
 static inline u32 get_card_size(struct rtsx_chip *chip, unsigned int lun)
 {
 #ifdef SUPPORT_SD_LOCK
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
 
         if ((get_lun_card(chip, lun) == SD_CARD) &&
-                (sd_card->sd_lock_status & SD_LOCKED))
+            (sd_card->sd_lock_status & SD_LOCKED))
                 return 0;
 
         return chip->capacity[lun];
@@ -1073,25 +1073,25 @@ static inline int card_power_off_all(struct rtsx_chip *chip)
 static inline void rtsx_clear_xd_error(struct rtsx_chip *chip)
 {
         rtsx_write_register(chip, CARD_STOP, XD_STOP | XD_CLR_ERR,
-                        XD_STOP | XD_CLR_ERR);
+                            XD_STOP | XD_CLR_ERR);
 }
 
 static inline void rtsx_clear_sd_error(struct rtsx_chip *chip)
 {
         rtsx_write_register(chip, CARD_STOP, SD_STOP | SD_CLR_ERR,
-                        SD_STOP | SD_CLR_ERR);
+                            SD_STOP | SD_CLR_ERR);
 }
 
 static inline void rtsx_clear_ms_error(struct rtsx_chip *chip)
 {
         rtsx_write_register(chip, CARD_STOP, MS_STOP | MS_CLR_ERR,
-                        MS_STOP | MS_CLR_ERR);
+                            MS_STOP | MS_CLR_ERR);
 }
 
 static inline void rtsx_clear_spi_error(struct rtsx_chip *chip)
 {
         rtsx_write_register(chip, CARD_STOP, SPI_STOP | SPI_CLR_ERR,
-                        SPI_STOP | SPI_CLR_ERR);
+                            SPI_STOP | SPI_CLR_ERR);
 }
 
 #ifdef SUPPORT_SDIO_ASPM
diff --git a/drivers/staging/rts5208/rtsx_chip.c b/drivers/staging/rts5208/rtsx_chip.c
index a10dd6220a7b..3511157a2c78 100644
--- a/drivers/staging/rts5208/rtsx_chip.c
+++ b/drivers/staging/rts5208/rtsx_chip.c
@@ -114,7 +114,8 @@ static int rtsx_pre_handle_sdio_old(struct rtsx_chip *chip)
                 if (chip->asic_code) {
                         retval = rtsx_write_register(chip, CARD_PULL_CTL5,
                                                      0xFF,
-                                                     MS_INS_PU | SD_WP_PU | SD_CD_PU | SD_CMD_PU);
+                                                     MS_INS_PU | SD_WP_PU |
+                                                     SD_CD_PU | SD_CMD_PU);
                         if (retval) {
                                 rtsx_trace(chip);
                                 return retval;
@@ -240,10 +241,10 @@ static int rtsx_pre_handle_sdio_new(struct rtsx_chip *chip)
                                         return STATUS_FAIL;
                                 }
                         } else {
-                                retval = rtsx_write_register(chip,
-                                                             FPGA_PULL_CTL,
-                                                             FPGA_SD_PULL_CTL_BIT | 0x20,
-                                                             0);
+                                retval = rtsx_write_register
+                                                (chip, FPGA_PULL_CTL,
+                                                 FPGA_SD_PULL_CTL_BIT | 0x20,
+                                                 0);
                                 if (retval) {
                                         rtsx_trace(chip);
                                         return retval;
@@ -713,7 +714,8 @@ nextcard:
 
         if (chip->ft2_fast_mode) {
                 retval = rtsx_write_register(chip, CARD_PWR_CTL, 0xFF,
-                                             MS_PARTIAL_POWER_ON | SD_PARTIAL_POWER_ON);
+                                             MS_PARTIAL_POWER_ON |
+                                             SD_PARTIAL_POWER_ON);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
@@ -1567,7 +1569,8 @@ int rtsx_write_cfg_dw(struct rtsx_chip *chip, u8 func_no, u16 addr, u32 mask,
                 }
 
                 retval = rtsx_write_register(chip, CFGRWCTL, 0xFF,
-                                             0x80 | mode | ((func_no & 0x03) << 4));
+                                             0x80 | mode |
+                                             ((func_no & 0x03) << 4));
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
diff --git a/drivers/staging/rts5208/rtsx_chip.h b/drivers/staging/rts5208/rtsx_chip.h
index f36642817c6e..4f6e3c1c4621 100644
--- a/drivers/staging/rts5208/rtsx_chip.h
+++ b/drivers/staging/rts5208/rtsx_chip.h
@@ -130,16 +130,20 @@
 #define PRDCT_REV_LEN           4               /* Product LOT Length       */
 
 /* Dynamic flag definitions: used in set_bit() etc. */
-#define RTSX_FLIDX_TRANS_ACTIVE         18  /* 0x00040000 transfer is active     */
-#define RTSX_FLIDX_ABORTING             20  /* 0x00100000 abort is in progress   */
-#define RTSX_FLIDX_DISCONNECTING        21  /* 0x00200000 disconnect in progress */
+/* 0x00040000 transfer is active */
+#define RTSX_FLIDX_TRANS_ACTIVE         18
+/* 0x00100000 abort is in progress */
+#define RTSX_FLIDX_ABORTING             20
+/* 0x00200000 disconnect in progress */
+#define RTSX_FLIDX_DISCONNECTING        21
 
 #define ABORTING_OR_DISCONNECTING       ((1UL << US_FLIDX_ABORTING) | \
                                          (1UL << US_FLIDX_DISCONNECTING))
 
-#define RTSX_FLIDX_RESETTING            22  /* 0x00400000 device reset in progress */
-#define RTSX_FLIDX_TIMED_OUT            23  /* 0x00800000 SCSI midlayer timed out  */
-
+/* 0x00400000 device reset in progress */
+#define RTSX_FLIDX_RESETTING            22
+/* 0x00800000 SCSI midlayer timed out  */
+#define RTSX_FLIDX_TIMED_OUT            23
 #define DRCT_ACCESS_DEV         0x00    /* Direct Access Device      */
 #define RMB_DISC                0x80    /* The Device is Removable   */
 #define ANSI_SCSI2              0x02    /* Based on ANSI-SCSI2       */
@@ -285,23 +289,24 @@ struct sense_data_t {
 
 #define CARD_INT                (XD_INT | MS_INT | SD_INT)
 #define NEED_COMPLETE_INT       (DATA_DONE_INT | TRANS_OK_INT | TRANS_FAIL_INT)
-#define RTSX_INT                (CMD_DONE_INT | NEED_COMPLETE_INT | CARD_INT | GPIO0_INT | OC_INT)
+#define RTSX_INT                (CMD_DONE_INT | NEED_COMPLETE_INT | CARD_INT | \
+                                 GPIO0_INT | OC_INT)
 
 #define CARD_EXIST              (XD_EXIST | MS_EXIST | SD_EXIST)
 
 /* Bus interrupt enable register */
-#define CMD_DONE_INT_EN         (1 << 31)
-#define DATA_DONE_INT_EN        (1 << 30)
-#define TRANS_OK_INT_EN         (1 << 29)
-#define TRANS_FAIL_INT_EN       (1 << 28)
-#define XD_INT_EN               (1 << 27)
-#define MS_INT_EN               (1 << 26)
-#define SD_INT_EN               (1 << 25)
-#define GPIO0_INT_EN            (1 << 24)
-#define OC_INT_EN               (1 << 23)
+#define CMD_DONE_INT_EN         BIT(31)
+#define DATA_DONE_INT_EN        BIT(30)
+#define TRANS_OK_INT_EN         BIT(29)
+#define TRANS_FAIL_INT_EN       BIT(28)
+#define XD_INT_EN               BIT(27)
+#define MS_INT_EN               BIT(26)
+#define SD_INT_EN               BIT(25)
+#define GPIO0_INT_EN            BIT(24)
+#define OC_INT_EN               BIT(23)
 #define DELINK_INT_EN           GPIO0_INT_EN
-#define MS_OC_INT_EN            (1 << 23)
-#define SD_OC_INT_EN            (1 << 22)
+#define MS_OC_INT_EN            BIT(23)
+#define SD_OC_INT_EN            BIT(22)
 
 #define READ_REG_CMD            0
 #define WRITE_REG_CMD           1
@@ -318,10 +323,10 @@ struct sense_data_t {
 #define MS_NR           3
 #define XD_NR           4
 #define SPI_NR          7
-#define SD_CARD         (1 << SD_NR)
-#define MS_CARD         (1 << MS_NR)
-#define XD_CARD         (1 << XD_NR)
-#define SPI_CARD        (1 << SPI_NR)
+#define SD_CARD         BIT(SD_NR)
+#define MS_CARD         BIT(MS_NR)
+#define XD_CARD         BIT(XD_NR)
+#define SPI_CARD        BIT(SPI_NR)
 
 #define MAX_ALLOWED_LUN_CNT     8
 
@@ -393,14 +398,23 @@ struct zone_entry {
 
 /* SD card */
 #define CHK_SD(sd_card)                 (((sd_card)->sd_type & 0xFF) == TYPE_SD)
-#define CHK_SD_HS(sd_card)              (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_HS))
-#define CHK_SD_SDR50(sd_card)           (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_SDR50))
-#define CHK_SD_DDR50(sd_card)           (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_DDR50))
-#define CHK_SD_SDR104(sd_card)          (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_SDR104))
-#define CHK_SD_HCXC(sd_card)            (CHK_SD(sd_card) && ((sd_card)->sd_type & SD_HCXC))
-#define CHK_SD_HC(sd_card)              (CHK_SD_HCXC(sd_card) && ((sd_card)->capacity <= 0x4000000))
-#define CHK_SD_XC(sd_card)              (CHK_SD_HCXC(sd_card) && ((sd_card)->capacity > 0x4000000))
-#define CHK_SD30_SPEED(sd_card)         (CHK_SD_SDR50(sd_card) || CHK_SD_DDR50(sd_card) || CHK_SD_SDR104(sd_card))
+#define CHK_SD_HS(sd_card)              (CHK_SD(sd_card) && \
+                                         ((sd_card)->sd_type & SD_HS))
+#define CHK_SD_SDR50(sd_card)           (CHK_SD(sd_card) && \
+                                         ((sd_card)->sd_type & SD_SDR50))
+#define CHK_SD_DDR50(sd_card)           (CHK_SD(sd_card) && \
+                                         ((sd_card)->sd_type & SD_DDR50))
+#define CHK_SD_SDR104(sd_card)          (CHK_SD(sd_card) && \
+                                         ((sd_card)->sd_type & SD_SDR104))
+#define CHK_SD_HCXC(sd_card)            (CHK_SD(sd_card) && \
+                                         ((sd_card)->sd_type & SD_HCXC))
+#define CHK_SD_HC(sd_card)              (CHK_SD_HCXC(sd_card) && \
+                                         ((sd_card)->capacity <= 0x4000000))
+#define CHK_SD_XC(sd_card)              (CHK_SD_HCXC(sd_card) && \
+                                         ((sd_card)->capacity > 0x4000000))
+#define CHK_SD30_SPEED(sd_card)         (CHK_SD_SDR50(sd_card) || \
+                                         CHK_SD_DDR50(sd_card) || \
+                                         CHK_SD_SDR104(sd_card))
 
 #define SET_SD(sd_card)                 ((sd_card)->sd_type = TYPE_SD)
 #define SET_SD_HS(sd_card)              ((sd_card)->sd_type |= SD_HS)
@@ -416,13 +430,20 @@ struct zone_entry {
 #define CLR_SD_HCXC(sd_card)            ((sd_card)->sd_type &= ~SD_HCXC)
 
 /* MMC card */
-#define CHK_MMC(sd_card)                (((sd_card)->sd_type & 0xFF) == TYPE_MMC)
-#define CHK_MMC_26M(sd_card)            (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_26M))
-#define CHK_MMC_52M(sd_card)            (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_52M))
-#define CHK_MMC_4BIT(sd_card)           (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_4BIT))
-#define CHK_MMC_8BIT(sd_card)           (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_8BIT))
-#define CHK_MMC_SECTOR_MODE(sd_card)    (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_SECTOR_MODE))
-#define CHK_MMC_DDR52(sd_card)          (CHK_MMC(sd_card) && ((sd_card)->sd_type & MMC_DDR52))
+#define CHK_MMC(sd_card)                (((sd_card)->sd_type & 0xFF) == \
+                                         TYPE_MMC)
+#define CHK_MMC_26M(sd_card)            (CHK_MMC(sd_card) && \
+                                         ((sd_card)->sd_type & MMC_26M))
+#define CHK_MMC_52M(sd_card)            (CHK_MMC(sd_card) && \
+                                         ((sd_card)->sd_type & MMC_52M))
+#define CHK_MMC_4BIT(sd_card)           (CHK_MMC(sd_card) && \
+                                         ((sd_card)->sd_type & MMC_4BIT))
+#define CHK_MMC_8BIT(sd_card)           (CHK_MMC(sd_card) && \
+                                         ((sd_card)->sd_type & MMC_8BIT))
+#define CHK_MMC_SECTOR_MODE(sd_card)    (CHK_MMC(sd_card) && \
+                                         ((sd_card)->sd_type & MMC_SECTOR_MODE))
+#define CHK_MMC_DDR52(sd_card)          (CHK_MMC(sd_card) && \
+                                         ((sd_card)->sd_type & MMC_DDR52))
 
 #define SET_MMC(sd_card)                ((sd_card)->sd_type = TYPE_MMC)
 #define SET_MMC_26M(sd_card)            ((sd_card)->sd_type |= MMC_26M)
@@ -439,7 +460,8 @@ struct zone_entry {
 #define CLR_MMC_SECTOR_MODE(sd_card)    ((sd_card)->sd_type &= ~MMC_SECTOR_MODE)
 #define CLR_MMC_DDR52(sd_card)          ((sd_card)->sd_type &= ~MMC_DDR52)
 
-#define CHK_MMC_HS(sd_card)             (CHK_MMC_52M(sd_card) && CHK_MMC_26M(sd_card))
+#define CHK_MMC_HS(sd_card)             (CHK_MMC_52M(sd_card) && \
+                                         CHK_MMC_26M(sd_card))
 #define CLR_MMC_HS(sd_card)                     \
 do {                                            \
         CLR_MMC_DDR52(sd_card);                 \
@@ -450,12 +472,18 @@ do {						\
 #define SD_SUPPORT_CLASS_TEN            0x01
 #define SD_SUPPORT_1V8                  0x02
 
-#define SD_SET_CLASS_TEN(sd_card)       ((sd_card)->sd_setting |= SD_SUPPORT_CLASS_TEN)
-#define SD_CHK_CLASS_TEN(sd_card)       ((sd_card)->sd_setting & SD_SUPPORT_CLASS_TEN)
-#define SD_CLR_CLASS_TEN(sd_card)       ((sd_card)->sd_setting &= ~SD_SUPPORT_CLASS_TEN)
-#define SD_SET_1V8(sd_card)             ((sd_card)->sd_setting |= SD_SUPPORT_1V8)
-#define SD_CHK_1V8(sd_card)             ((sd_card)->sd_setting & SD_SUPPORT_1V8)
-#define SD_CLR_1V8(sd_card)             ((sd_card)->sd_setting &= ~SD_SUPPORT_1V8)
+#define SD_SET_CLASS_TEN(sd_card)       ((sd_card)->sd_setting |= \
+                                         SD_SUPPORT_CLASS_TEN)
+#define SD_CHK_CLASS_TEN(sd_card)       ((sd_card)->sd_setting & \
+                                         SD_SUPPORT_CLASS_TEN)
+#define SD_CLR_CLASS_TEN(sd_card)       ((sd_card)->sd_setting &= \
+                                         ~SD_SUPPORT_CLASS_TEN)
+#define SD_SET_1V8(sd_card)             ((sd_card)->sd_setting |= \
+                                         SD_SUPPORT_1V8)
+#define SD_CHK_1V8(sd_card)             ((sd_card)->sd_setting & \
+                                         SD_SUPPORT_1V8)
+#define SD_CLR_1V8(sd_card)             ((sd_card)->sd_setting &= \
+                                         ~SD_SUPPORT_1V8)
 
 struct sd_info {
         u16 sd_type;
@@ -544,9 +572,12 @@ struct xd_info {
 #define HG8BIT                  (MS_HG | MS_8BIT)
 
 #define CHK_MSPRO(ms_card)      (((ms_card)->ms_type & 0xFF) == TYPE_MSPRO)
-#define CHK_HG8BIT(ms_card)     (CHK_MSPRO(ms_card) && (((ms_card)->ms_type & HG8BIT) == HG8BIT))
-#define CHK_MSXC(ms_card)       (CHK_MSPRO(ms_card) && ((ms_card)->ms_type & MS_XC))
-#define CHK_MSHG(ms_card)       (CHK_MSPRO(ms_card) && ((ms_card)->ms_type & MS_HG))
+#define CHK_HG8BIT(ms_card)     (CHK_MSPRO(ms_card) && \
+                                 (((ms_card)->ms_type & HG8BIT) == HG8BIT))
+#define CHK_MSXC(ms_card)       (CHK_MSPRO(ms_card) && \
+                                 ((ms_card)->ms_type & MS_XC))
+#define CHK_MSHG(ms_card)       (CHK_MSPRO(ms_card) && \
+                                 ((ms_card)->ms_type & MS_HG))
 
 #define CHK_MS8BIT(ms_card)     (((ms_card)->ms_type & MS_8BIT))
 #define CHK_MS4BIT(ms_card)     (((ms_card)->ms_type & MS_4BIT))
@@ -679,8 +710,10 @@ struct trace_msg_t {
 #define CLR_SDIO_EXIST(chip)            ((chip)->sdio_func_exist &= ~SDIO_EXIST)
 
 #define CHK_SDIO_IGNORED(chip)          ((chip)->sdio_func_exist & SDIO_IGNORED)
-#define SET_SDIO_IGNORED(chip)          ((chip)->sdio_func_exist |= SDIO_IGNORED)
-#define CLR_SDIO_IGNORED(chip)          ((chip)->sdio_func_exist &= ~SDIO_IGNORED)
+#define SET_SDIO_IGNORED(chip)          ((chip)->sdio_func_exist |= \
+                                         SDIO_IGNORED)
+#define CLR_SDIO_IGNORED(chip)          ((chip)->sdio_func_exist &= \
+                                         ~SDIO_IGNORED)
 
 struct rtsx_chip {
         struct rtsx_dev *rtsx;
@@ -957,12 +990,12 @@ void rtsx_stop_cmd(struct rtsx_chip *chip, int card);
 int rtsx_write_register(struct rtsx_chip *chip, u16 addr, u8 mask, u8 data);
 int rtsx_read_register(struct rtsx_chip *chip, u16 addr, u8 *data);
 int rtsx_write_cfg_dw(struct rtsx_chip *chip,
-                u8 func_no, u16 addr, u32 mask, u32 val);
+                      u8 func_no, u16 addr, u32 mask, u32 val);
 int rtsx_read_cfg_dw(struct rtsx_chip *chip, u8 func_no, u16 addr, u32 *val);
 int rtsx_write_cfg_seq(struct rtsx_chip *chip,
-                u8 func, u16 addr, u8 *buf, int len);
+                       u8 func, u16 addr, u8 *buf, int len);
 int rtsx_read_cfg_seq(struct rtsx_chip *chip,
-                u8 func, u16 addr, u8 *buf, int len);
+                      u8 func, u16 addr, u8 *buf, int len);
 int rtsx_write_phy_register(struct rtsx_chip *chip, u8 addr, u16 val);
 int rtsx_read_phy_register(struct rtsx_chip *chip, u8 addr, u16 *val);
 int rtsx_read_efuse(struct rtsx_chip *chip, u8 addr, u8 *val);
diff --git a/drivers/staging/rts5208/rtsx_scsi.c b/drivers/staging/rts5208/rtsx_scsi.c
index becb4bba166c..a95c5de1aa00 100644
--- a/drivers/staging/rts5208/rtsx_scsi.c
+++ b/drivers/staging/rts5208/rtsx_scsi.c
@@ -354,7 +354,7 @@ void set_sense_type(struct rtsx_chip *chip, unsigned int lun, int sense_type)
 
         case SENSE_TYPE_MEDIA_INVALID_CMD_FIELD:
                 set_sense_data(chip, lun, CUR_ERR, ILGAL_REQ, 0,
-                                ASC_INVLD_CDB, ASCQ_INVLD_CDB, CDB_ILLEGAL, 1);
+                               ASC_INVLD_CDB, ASCQ_INVLD_CDB, CDB_ILLEGAL, 1);
                 break;
 
         case SENSE_TYPE_FORMAT_IN_PROGRESS:
@@ -397,10 +397,10 @@ void set_sense_type(struct rtsx_chip *chip, unsigned int lun, int sense_type)
 }
 
 void set_sense_data(struct rtsx_chip *chip, unsigned int lun, u8 err_code,
-                u8 sense_key, u32 info, u8 asc, u8 ascq, u8 sns_key_info0,
+                    u8 sense_key, u32 info, u8 asc, u8 ascq, u8 sns_key_info0,
                 u16 sns_key_info1)
 {
-        struct sense_data_t *sense = &(chip->sense_buffer[lun]);
+        struct sense_data_t *sense = &chip->sense_buffer[lun];
 
         sense->err_code = err_code;
         sense->sense_key = sense_key;
@@ -436,7 +436,7 @@ static int test_unit_ready(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
 #ifdef SUPPORT_SD_LOCK
         if (get_lun_card(chip, SCSI_LUN(srb)) == SD_CARD) {
-                struct sd_info *sd_card = &(chip->sd_card);
+                struct sd_info *sd_card = &chip->sd_card;
 
                 if (sd_card->sd_lock_notify) {
                         sd_card->sd_lock_notify = 0;
@@ -444,7 +444,7 @@ static int test_unit_ready(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                         return TRANSPORT_FAILED;
                 } else if (sd_card->sd_lock_status & SD_LOCKED) {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_READ_FORBIDDEN);
+                                       SENSE_TYPE_MEDIA_READ_FORBIDDEN);
                         return TRANSPORT_FAILED;
                 }
         }
@@ -514,7 +514,7 @@ static int inquiry(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
 #ifdef SUPPORT_MAGIC_GATE
         if ((chip->mspro_formatter_enable) &&
-                        (chip->lun2card[lun] & MS_CARD))
+            (chip->lun2card[lun] & MS_CARD))
 #else
         if (chip->mspro_formatter_enable)
 #endif
@@ -603,7 +603,7 @@ static int allow_medium_removal(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         if (prevent) {
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                               SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -615,13 +615,13 @@ static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
         struct sense_data_t *sense;
         unsigned int lun = SCSI_LUN(srb);
-        struct ms_info *ms_card = &(chip->ms_card);
+        struct ms_info *ms_card = &chip->ms_card;
         unsigned char *tmp, *buf;
 
-        sense = &(chip->sense_buffer[lun]);
+        sense = &chip->sense_buffer[lun];
 
         if ((get_lun_card(chip, lun) == MS_CARD) &&
-                ms_card->pro_under_formatting) {
+            ms_card->pro_under_formatting) {
                 if (ms_card->format_status == FORMAT_SUCCESS) {
                         set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
                         ms_card->pro_under_formatting = 0;
@@ -629,7 +629,7 @@ static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 } else if (ms_card->format_status == FORMAT_IN_PROGRESS) {
                         /* Logical Unit Not Ready Format in Progress */
                         set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x04, 0x04,
-                                        0, (u16)(ms_card->progress));
+                                       0, (u16)(ms_card->progress));
                 } else {
                         /* Format Command Failed */
                         set_sense_type(chip, lun, SENSE_TYPE_FORMAT_CMD_FAILED);
@@ -659,9 +659,9 @@ static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 }
 
 static void ms_mode_sense(struct rtsx_chip *chip, u8 cmd,
-                int lun, u8 *buf, int buf_len)
+                          int lun, u8 *buf, int buf_len)
 {
-        struct ms_info *ms_card = &(chip->ms_card);
+        struct ms_info *ms_card = &chip->ms_card;
         int sys_info_offset;
         int data_size = buf_len;
         bool support_format = false;
@@ -754,10 +754,10 @@ static void ms_mode_sense(struct rtsx_chip *chip, u8 cmd,
 static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
         unsigned int lun = SCSI_LUN(srb);
-        unsigned int dataSize;
+        unsigned int data_size;
         int status;
         bool pro_formatter_flag;
-        unsigned char pageCode, *buf;
+        unsigned char page_code, *buf;
         u8 card = get_lun_card(chip, lun);
 
 #ifndef SUPPORT_MAGIC_GATE
@@ -770,11 +770,11 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 #endif
 
         pro_formatter_flag = false;
-        dataSize = 8;
+        data_size = 8;
 #ifdef SUPPORT_MAGIC_GATE
         if ((chip->lun2card[lun] & MS_CARD)) {
                 if (!card || (card == MS_CARD)) {
-                        dataSize = 108;
+                        data_size = 108;
                         if (chip->mspro_formatter_enable)
                                 pro_formatter_flag = true;
                 }
@@ -783,28 +783,28 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         if (card == MS_CARD) {
                 if (chip->mspro_formatter_enable) {
                         pro_formatter_flag = true;
-                        dataSize = 108;
+                        data_size = 108;
                 }
         }
 #endif
 
-        buf = kmalloc(dataSize, GFP_KERNEL);
+        buf = kmalloc(data_size, GFP_KERNEL);
         if (!buf) {
                 rtsx_trace(chip);
                 return TRANSPORT_ERROR;
         }
 
-        pageCode = srb->cmnd[2] & 0x3f;
+        page_code = srb->cmnd[2] & 0x3f;
 
-        if ((pageCode == 0x3F) || (pageCode == 0x1C) ||
-                (pageCode == 0x00) ||
-                (pro_formatter_flag && (pageCode == 0x20))) {
+        if ((page_code == 0x3F) || (page_code == 0x1C) ||
+            (page_code == 0x00) ||
+                (pro_formatter_flag && (page_code == 0x20))) {
                 if (srb->cmnd[0] == MODE_SENSE) {
-                        if ((pageCode == 0x3F) || (pageCode == 0x20)) {
+                        if ((page_code == 0x3F) || (page_code == 0x20)) {
                                 ms_mode_sense(chip, srb->cmnd[0],
-                                              lun, buf, dataSize);
+                                              lun, buf, data_size);
                         } else {
-                                dataSize = 4;
+                                data_size = 4;
                                 buf[0] = 0x03;
                                 buf[1] = 0x00;
                                 if (check_card_wp(chip, lun))
@@ -815,11 +815,11 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                                 buf[3] = 0x00;
                         }
                 } else {
-                        if ((pageCode == 0x3F) || (pageCode == 0x20)) {
+                        if ((page_code == 0x3F) || (page_code == 0x20)) {
                                 ms_mode_sense(chip, srb->cmnd[0],
-                                              lun, buf, dataSize);
+                                              lun, buf, data_size);
                         } else {
-                                dataSize = 8;
+                                data_size = 8;
                                 buf[0] = 0x00;
                                 buf[1] = 0x06;
                                 buf[2] = 0x00;
@@ -842,7 +842,7 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         if (status == TRANSPORT_GOOD) {
                 unsigned int len = min_t(unsigned int, scsi_bufflen(srb),
-                                        dataSize);
+                                        data_size);
                 rtsx_stor_set_xfer_buf(buf, len, srb);
                 scsi_set_resid(srb, scsi_bufflen(srb) - len);
         }
@@ -854,7 +854,7 @@ static int mode_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
 #ifdef SUPPORT_SD_LOCK
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
 #endif
         unsigned int lun = SCSI_LUN(srb);
         int retval;
@@ -896,7 +896,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 if (sd_card->sd_lock_status & SD_LOCKED) {
                         dev_dbg(rtsx_dev(chip), "SD card locked!\n");
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_READ_FORBIDDEN);
+                                       SENSE_TYPE_MEDIA_READ_FORBIDDEN);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -932,7 +932,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)
          * need to judge start_sec at first
          */
         if ((start_sec > get_card_size(chip, lun)) ||
-                        ((start_sec + sec_cnt) > get_card_size(chip, lun))) {
+            ((start_sec + sec_cnt) > get_card_size(chip, lun))) {
                 set_sense_type(chip, lun, SENSE_TYPE_MEDIA_LBA_OVER_RANGE);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
@@ -947,7 +947,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 dev_dbg(rtsx_dev(chip), "read/write fail three times in succession\n");
                 if (srb->sc_data_direction == DMA_FROM_DEVICE)
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                       SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 else
                         set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR);
 
@@ -959,7 +959,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 if (check_card_wp(chip, lun)) {
                         dev_dbg(rtsx_dev(chip), "Write protected card!\n");
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_WRITE_PROTECT);
+                                       SENSE_TYPE_MEDIA_WRITE_PROTECT);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -973,15 +973,16 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 } else {
                         chip->rw_fail_cnt[lun]++;
                         if (srb->sc_data_direction == DMA_FROM_DEVICE)
-                                set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                set_sense_type
+                                        (chip, lun,
+                                         SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         else
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                 }
                 retval = TRANSPORT_FAILED;
                 rtsx_trace(chip);
-                goto Exit;
+                goto exit;
         } else {
                 chip->rw_fail_cnt[lun] = 0;
                 retval = TRANSPORT_GOOD;
@@ -989,7 +990,7 @@ static int read_write(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         scsi_set_resid(srb, 0);
 
-Exit:
+exit:
         return retval;
 }
 
@@ -1025,8 +1026,8 @@ static int read_format_capacity(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         /* Capacity List Length */
         if ((buf_len > 12) && chip->mspro_formatter_enable &&
-                        (chip->lun2card[lun] & MS_CARD) &&
-                        (!card || (card == MS_CARD))) {
+            (chip->lun2card[lun] & MS_CARD) &&
+            (!card || (card == MS_CARD))) {
                 buf[i++] = 0x10;
                 desc_cnt = 2;
         } else {
@@ -1143,7 +1144,7 @@ static int read_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         if (retval != STATUS_SUCCESS) {
                 vfree(buf);
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                               SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -1153,7 +1154,7 @@ static int read_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                       SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -1195,7 +1196,7 @@ static int write_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 retval = spi_erase_eeprom_chip(chip);
                 if (retval != STATUS_SUCCESS) {
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_WRITE_ERR);
+                                       SENSE_TYPE_MEDIA_WRITE_ERR);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -1216,7 +1217,7 @@ static int write_eeprom(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                         if (retval != STATUS_SUCCESS) {
                                 vfree(buf);
                                 set_sense_type(chip, SCSI_LUN(srb),
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return TRANSPORT_FAILED;
                         }
@@ -1247,7 +1248,7 @@ static int read_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         if (addr < 0xFC00) {
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                               SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -1271,7 +1272,7 @@ static int read_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                       SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -1305,7 +1306,7 @@ static int write_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         if (addr < 0xFC00) {
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                               SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -1333,7 +1334,7 @@ static int write_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_WRITE_ERR);
+                                       SENSE_TYPE_MEDIA_WRITE_ERR);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -1346,7 +1347,7 @@ static int write_mem(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
 static int get_sd_csd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         unsigned int lun = SCSI_LUN(srb);
 
         if (!check_card_ready(chip, lun)) {
@@ -1399,7 +1400,7 @@ static int trace_msg_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         if ((scsi_bufflen(srb) < buf_len) || !scsi_sglist(srb)) {
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                               SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -1522,9 +1523,9 @@ static int set_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         if (srb->cmnd[3] == 1) {
                 /* Variable Clock */
-                struct xd_info *xd_card = &(chip->xd_card);
-                struct sd_info *sd_card = &(chip->sd_card);
-                struct ms_info *ms_card = &(chip->ms_card);
+                struct xd_info *xd_card = &chip->xd_card;
+                struct sd_info *sd_card = &chip->sd_card;
+                struct ms_info *ms_card = &chip->ms_card;
 
                 switch (srb->cmnd[4]) {
                 case XD_CARD:
@@ -1541,7 +1542,7 @@ static int set_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 default:
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                                       SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -1556,7 +1557,7 @@ static int set_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                         rtsx_disable_aspm(chip);
 
                         if (chip->ss_en &&
-                                (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
+                            (rtsx_get_stat(chip) == RTSX_STAT_SS)) {
                                 rtsx_exit_ss(chip);
                                 wait_timeout(100);
                         }
@@ -1565,7 +1566,7 @@ static int set_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                         retval = rtsx_force_power_on(chip, SSC_PDCTL);
                         if (retval != STATUS_SUCCESS) {
                                 set_sense_type(chip, SCSI_LUN(srb),
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return TRANSPORT_FAILED;
                         }
@@ -1586,9 +1587,9 @@ static int get_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         unsigned int lun = SCSI_LUN(srb);
 
         if (srb->cmnd[3] == 1) {
-                struct xd_info *xd_card = &(chip->xd_card);
-                struct sd_info *sd_card = &(chip->sd_card);
-                struct ms_info *ms_card = &(chip->ms_card);
+                struct xd_info *xd_card = &chip->xd_card;
+                struct sd_info *sd_card = &chip->sd_card;
+                struct ms_info *ms_card = &chip->ms_card;
                 u8 tmp;
 
                 switch (srb->cmnd[4]) {
@@ -1606,7 +1607,7 @@ static int get_variable(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 default:
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                                       SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -1648,14 +1649,15 @@ static int dma_access_ring_buffer(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 dev_dbg(rtsx_dev(chip), "Write to device\n");
 
         retval = rtsx_transfer_data(chip, 0, scsi_sglist(srb), len,
-                        scsi_sg_count(srb), srb->sc_data_direction, 1000);
+                                    scsi_sg_count(srb), srb->sc_data_direction,
+                                    1000);
         if (retval < 0) {
                 if (srb->sc_data_direction == DMA_FROM_DEVICE)
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                       SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 else
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_WRITE_ERR);
+                                       SENSE_TYPE_MEDIA_WRITE_ERR);
 
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
@@ -1667,8 +1669,8 @@ static int dma_access_ring_buffer(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
 static int get_dev_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
-        struct ms_info *ms_card = &(chip->ms_card);
+        struct sd_info *sd_card = &chip->sd_card;
+        struct ms_info *ms_card = &chip->ms_card;
         int buf_len;
         unsigned int lun = SCSI_LUN(srb);
         u8 card = get_lun_card(chip, lun);
@@ -1699,8 +1701,8 @@ static int get_dev_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
 #ifdef SUPPORT_OCP
         status[8] = 0;
-        if (CHECK_LUN_MODE(chip,
-                SD_MS_2LUN) && (chip->lun2card[lun] == MS_CARD)) {
+        if (CHECK_LUN_MODE(chip, SD_MS_2LUN) &&
+            (chip->lun2card[lun] == MS_CARD)) {
                 oc_now_mask = MS_OC_NOW;
                 oc_ever_mask = MS_OC_EVER;
         } else {
@@ -1804,7 +1806,7 @@ static int set_chip_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         if (!CHECK_PID(chip, 0x5208)) {
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                               SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -1884,7 +1886,7 @@ static int rw_mem_cmd_buf(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 cmd_type = srb->cmnd[4];
                 if (cmd_type > 2) {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                                       SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -1903,7 +1905,7 @@ static int rw_mem_cmd_buf(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 value = *(rtsx_get_cmd_data(chip) + idx);
                 if (scsi_bufflen(srb) < 1) {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                                       SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -1971,7 +1973,7 @@ static int read_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                       SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -1980,8 +1982,9 @@ static int read_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                         retval = rtsx_read_phy_register(chip, addr + i, &val);
                         if (retval != STATUS_SUCCESS) {
                                 vfree(buf);
-                                set_sense_type(chip, SCSI_LUN(srb),
-                                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                set_sense_type
+                                        (chip, SCSI_LUN(srb),
+                                         SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                                 rtsx_trace(chip);
                                 return TRANSPORT_FAILED;
                         }
@@ -2039,7 +2042,7 @@ static int write_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_WRITE_ERR);
+                                       SENSE_TYPE_MEDIA_WRITE_ERR);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -2050,7 +2053,7 @@ static int write_phy_register(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                         if (retval != STATUS_SUCCESS) {
                                 vfree(buf);
                                 set_sense_type(chip, SCSI_LUN(srb),
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return TRANSPORT_FAILED;
                         }
@@ -2090,7 +2093,7 @@ static int erase_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 retval = spi_erase_eeprom_chip(chip);
                 if (retval != STATUS_SUCCESS) {
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_WRITE_ERR);
+                                       SENSE_TYPE_MEDIA_WRITE_ERR);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -2098,13 +2101,13 @@ static int erase_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 retval = spi_erase_eeprom_byte(chip, addr);
                 if (retval != STATUS_SUCCESS) {
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_WRITE_ERR);
+                                       SENSE_TYPE_MEDIA_WRITE_ERR);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
         } else {
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                               SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -2139,7 +2142,7 @@ static int read_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         if (retval != STATUS_SUCCESS) {
                 vfree(buf);
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                               SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -2149,7 +2152,7 @@ static int read_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                       SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -2204,7 +2207,7 @@ static int write_eeprom2(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_WRITE_ERR);
+                                       SENSE_TYPE_MEDIA_WRITE_ERR);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -2242,7 +2245,7 @@ static int read_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         if (retval != STATUS_SUCCESS) {
                 vfree(buf);
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                               SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -2252,7 +2255,7 @@ static int read_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                       SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -2311,7 +2314,7 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 }
 
                 retval = rtsx_write_register(chip, PWR_GATE_CTRL,
-                                        LDO3318_PWR_MASK, LDO_OFF);
+                                             LDO3318_PWR_MASK, LDO_OFF);
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
                         rtsx_trace(chip);
@@ -2321,7 +2324,7 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 wait_timeout(600);
 
                 retval = rtsx_write_phy_register(chip, 0x08,
-                                                0x4C00 | chip->phy_voltage);
+                                                 0x4C00 | chip->phy_voltage);
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
                         rtsx_trace(chip);
@@ -2329,7 +2332,7 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 }
 
                 retval = rtsx_write_register(chip, PWR_GATE_CTRL,
-                                        LDO3318_PWR_MASK, LDO_ON);
+                                             LDO3318_PWR_MASK, LDO_ON);
                 if (retval != STATUS_SUCCESS) {
                         vfree(buf);
                         rtsx_trace(chip);
@@ -2352,14 +2355,14 @@ static int write_efuse(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 retval = rtsx_write_efuse(chip, addr + i, buf[i]);
                 if (retval != STATUS_SUCCESS) {
                         set_sense_type(chip, SCSI_LUN(srb),
-                                SENSE_TYPE_MEDIA_WRITE_ERR);
+                                       SENSE_TYPE_MEDIA_WRITE_ERR);
                         result = TRANSPORT_FAILED;
                         rtsx_trace(chip);
-                        goto Exit;
+                        goto exit;
                 }
         }
 
-Exit:
+exit:
         vfree(buf);
 
         retval = card_power_off(chip, SPI_CARD);
@@ -2370,7 +2373,7 @@ Exit:
 
         if (chip->asic_code) {
                 retval = rtsx_write_register(chip, PWR_GATE_CTRL,
-                                        LDO3318_PWR_MASK, LDO_OFF);
+                                             LDO3318_PWR_MASK, LDO_OFF);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return TRANSPORT_ERROR;
@@ -2385,7 +2388,7 @@ Exit:
                 }
 
                 retval = rtsx_write_register(chip, PWR_GATE_CTRL,
-                                        LDO3318_PWR_MASK, LDO_ON);
+                                             LDO3318_PWR_MASK, LDO_ON);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return TRANSPORT_ERROR;
@@ -2425,7 +2428,7 @@ static int read_cfg_byte(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         if (func > func_max) {
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                               SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -2439,7 +2442,7 @@ static int read_cfg_byte(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         retval = rtsx_read_cfg_seq(chip, func, addr, buf, len);
         if (retval != STATUS_SUCCESS) {
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                               SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                 vfree(buf);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
@@ -2484,7 +2487,7 @@ static int write_cfg_byte(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         if (func > func_max) {
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                               SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -2593,7 +2596,7 @@ static int app_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         default:
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                               SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -2670,7 +2673,7 @@ static int read_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         if (get_lun_card(chip, lun) == XD_CARD) {
                 rtsx_status[13] = 0x40;
         } else if (get_lun_card(chip, lun) == SD_CARD) {
-                struct sd_info *sd_card = &(chip->sd_card);
+                struct sd_info *sd_card = &chip->sd_card;
 
                 rtsx_status[13] = 0x20;
                 if (CHK_SD(sd_card)) {
@@ -2686,7 +2689,7 @@ static int read_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                                 rtsx_status[13] |= 0x04;
                 }
         } else if (get_lun_card(chip, lun) == MS_CARD) {
-                struct ms_info *ms_card = &(chip->ms_card);
+                struct ms_info *ms_card = &chip->ms_card;
 
                 if (CHK_MSPRO(ms_card)) {
                         rtsx_status[13] = 0x38;
@@ -2881,7 +2884,7 @@ static int vendor_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         default:
                 set_sense_type(chip, SCSI_LUN(srb),
-                        SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                               SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
@@ -2895,14 +2898,15 @@ void led_shine(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         unsigned int lun = SCSI_LUN(srb);
         u16 sec_cnt;
 
-        if ((srb->cmnd[0] == READ_10) || (srb->cmnd[0] == WRITE_10))
+        if ((srb->cmnd[0] == READ_10) || (srb->cmnd[0] == WRITE_10)) {
                 sec_cnt = ((u16)(srb->cmnd[7]) << 8) | srb->cmnd[8];
-        else if ((srb->cmnd[0] == READ_6) || (srb->cmnd[0] == WRITE_6)) {
+        } else if ((srb->cmnd[0] == READ_6) || (srb->cmnd[0] == WRITE_6)) {
                 sec_cnt = srb->cmnd[4];
                 if (sec_cnt == 0)
                         sec_cnt = 256;
-        } else
+        } else {
                 return;
+        }
 
         if (chip->rw_cap[lun] >= GPIO_TOGGLE_THRESHOLD) {
                 toggle_gpio(chip, LED_GPIO);
@@ -2915,7 +2919,7 @@ void led_shine(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
 static int ms_format_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct ms_info *ms_card = &(chip->ms_card);
+        struct ms_info *ms_card = &chip->ms_card;
         unsigned int lun = SCSI_LUN(srb);
         bool quick_format;
         int retval;
@@ -2927,7 +2931,7 @@ static int ms_format_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         }
 
         if ((srb->cmnd[3] != 0x4D) || (srb->cmnd[4] != 0x47) ||
-                (srb->cmnd[5] != 0x66) || (srb->cmnd[6] != 0x6D) ||
+            (srb->cmnd[5] != 0x66) || (srb->cmnd[6] != 0x6D) ||
                 (srb->cmnd[7] != 0x74)) {
                 set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
@@ -2941,7 +2945,7 @@ static int ms_format_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 wait_timeout(100);
 
                 if (!check_card_ready(chip, lun) ||
-                                (get_card_size(chip, lun) == 0)) {
+                    (get_card_size(chip, lun) == 0)) {
                         set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
@@ -2986,7 +2990,7 @@ static int ms_format_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 #ifdef SUPPORT_PCGL_1P18
 static int get_ms_information(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct ms_info *ms_card = &(chip->ms_card);
+        struct ms_info *ms_card = &chip->ms_card;
         unsigned int lun = SCSI_LUN(srb);
         u8 dev_info_id, data_len;
         u8 *buf;
@@ -3005,8 +3009,8 @@ static int get_ms_information(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         }
 
         if ((srb->cmnd[2] != 0xB0) || (srb->cmnd[4] != 0x4D) ||
-                (srb->cmnd[5] != 0x53) || (srb->cmnd[6] != 0x49) ||
-                (srb->cmnd[7] != 0x44)) {
+            (srb->cmnd[5] != 0x53) || (srb->cmnd[6] != 0x49) ||
+            (srb->cmnd[7] != 0x44)) {
                 set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
@@ -3014,17 +3018,20 @@ static int get_ms_information(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         dev_info_id = srb->cmnd[3];
         if ((CHK_MSXC(ms_card) && (dev_info_id == 0x10)) ||
-                        (!CHK_MSXC(ms_card) && (dev_info_id == 0x13)) ||
-                        !CHK_MSPRO(ms_card)) {
+            (!CHK_MSXC(ms_card) && (dev_info_id == 0x13)) ||
+            !CHK_MSPRO(ms_card)) {
                 set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
         }
 
-        if (dev_info_id == 0x15)
-                buf_len = data_len = 0x3A;
-        else
-                buf_len = data_len = 0x6A;
+        if (dev_info_id == 0x15) {
+                buf_len = 0x3A;
+                data_len = 0x3A;
+        } else {
+                buf_len = 0x6A;
+                data_len = 0x6A;
+        }
 
         buf = kmalloc(buf_len, GFP_KERNEL);
         if (!buf) {
@@ -3100,7 +3107,7 @@ static int ms_sp_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 }
 
 #ifdef SUPPORT_CPRM
-static int sd_extention_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
+static int sd_extension_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
         unsigned int lun = SCSI_LUN(srb);
         int result;
@@ -3164,7 +3171,7 @@ static int sd_extention_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 #ifdef SUPPORT_MAGIC_GATE
 static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct ms_info *ms_card = &(chip->ms_card);
+        struct ms_info *ms_card = &chip->ms_card;
         unsigned int lun = SCSI_LUN(srb);
         int retval;
         u8 key_format;
@@ -3208,8 +3215,8 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         switch (key_format) {
         case KF_GET_LOC_EKB:
                 if ((scsi_bufflen(srb) == 0x41C) &&
-                        (srb->cmnd[8] == 0x04) &&
-                        (srb->cmnd[9] == 0x1C)) {
+                    (srb->cmnd[8] == 0x04) &&
+                    (srb->cmnd[9] == 0x1C)) {
                         retval = mg_get_local_EKB(srb, chip);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
@@ -3218,7 +3225,7 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 } else {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                                       SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -3226,8 +3233,8 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         case KF_RSP_CHG:
                 if ((scsi_bufflen(srb) == 0x24) &&
-                        (srb->cmnd[8] == 0x00) &&
-                        (srb->cmnd[9] == 0x24)) {
+                    (srb->cmnd[8] == 0x00) &&
+                    (srb->cmnd[9] == 0x24)) {
                         retval = mg_get_rsp_chg(srb, chip);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
@@ -3236,7 +3243,7 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 } else {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                                       SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -3245,12 +3252,12 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         case KF_GET_ICV:
                 ms_card->mg_entry_num = srb->cmnd[5];
                 if ((scsi_bufflen(srb) == 0x404) &&
-                        (srb->cmnd[8] == 0x04) &&
-                        (srb->cmnd[9] == 0x04) &&
-                        (srb->cmnd[2] == 0x00) &&
-                        (srb->cmnd[3] == 0x00) &&
-                        (srb->cmnd[4] == 0x00) &&
-                        (srb->cmnd[5] < 32)) {
+                    (srb->cmnd[8] == 0x04) &&
+                    (srb->cmnd[9] == 0x04) &&
+                    (srb->cmnd[2] == 0x00) &&
+                    (srb->cmnd[3] == 0x00) &&
+                    (srb->cmnd[4] == 0x00) &&
+                    (srb->cmnd[5] < 32)) {
                         retval = mg_get_ICV(srb, chip);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
@@ -3259,7 +3266,7 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 } else {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                                       SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -3277,7 +3284,7 @@ static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
 static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct ms_info *ms_card = &(chip->ms_card);
+        struct ms_info *ms_card = &chip->ms_card;
         unsigned int lun = SCSI_LUN(srb);
         int retval;
         u8 key_format;
@@ -3326,8 +3333,8 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         switch (key_format) {
         case KF_SET_LEAF_ID:
                 if ((scsi_bufflen(srb) == 0x0C) &&
-                        (srb->cmnd[8] == 0x00) &&
-                        (srb->cmnd[9] == 0x0C)) {
+                    (srb->cmnd[8] == 0x00) &&
+                    (srb->cmnd[9] == 0x0C)) {
                         retval = mg_set_leaf_id(srb, chip);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
@@ -3336,7 +3343,7 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 } else {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                                       SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -3344,8 +3351,8 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         case KF_CHG_HOST:
                 if ((scsi_bufflen(srb) == 0x0C) &&
-                        (srb->cmnd[8] == 0x00) &&
-                        (srb->cmnd[9] == 0x0C)) {
+                    (srb->cmnd[8] == 0x00) &&
+                    (srb->cmnd[9] == 0x0C)) {
                         retval = mg_chg(srb, chip);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
@@ -3354,7 +3361,7 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 } else {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                                       SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -3362,8 +3369,8 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         case KF_RSP_HOST:
                 if ((scsi_bufflen(srb) == 0x0C) &&
-                        (srb->cmnd[8] == 0x00) &&
-                        (srb->cmnd[9] == 0x0C)) {
+                    (srb->cmnd[8] == 0x00) &&
+                    (srb->cmnd[9] == 0x0C)) {
                         retval = mg_rsp(srb, chip);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
@@ -3372,7 +3379,7 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 } else {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                                       SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -3381,12 +3388,12 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         case KF_SET_ICV:
                 ms_card->mg_entry_num = srb->cmnd[5];
                 if ((scsi_bufflen(srb) == 0x404) &&
-                        (srb->cmnd[8] == 0x04) &&
-                        (srb->cmnd[9] == 0x04) &&
-                        (srb->cmnd[2] == 0x00) &&
-                        (srb->cmnd[3] == 0x00) &&
-                        (srb->cmnd[4] == 0x00) &&
-                        (srb->cmnd[5] < 32)) {
+                    (srb->cmnd[8] == 0x04) &&
+                    (srb->cmnd[9] == 0x04) &&
+                    (srb->cmnd[2] == 0x00) &&
+                    (srb->cmnd[3] == 0x00) &&
+                    (srb->cmnd[4] == 0x00) &&
+                    (srb->cmnd[5] < 32)) {
                         retval = mg_set_ICV(srb, chip);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
@@ -3395,7 +3402,7 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 } else {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
+                                       SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -3415,9 +3422,9 @@ static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 int rtsx_scsi_handler(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
 #ifdef SUPPORT_SD_LOCK
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
 #endif
-        struct ms_info *ms_card = &(chip->ms_card);
+        struct ms_info *ms_card = &chip->ms_card;
         unsigned int lun = SCSI_LUN(srb);
         int result;
 
@@ -3427,9 +3434,9 @@ int rtsx_scsi_handler(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                  * REQUEST_SENSE and rs_ppstatus
                  */
                 if (!((srb->cmnd[0] == VENDOR_CMND) &&
-                                (srb->cmnd[1] == SCSI_APP_CMD) &&
-                                (srb->cmnd[2] == GET_DEV_STATUS)) &&
-                                (srb->cmnd[0] != REQUEST_SENSE)) {
+                      (srb->cmnd[1] == SCSI_APP_CMD) &&
+                      (srb->cmnd[2] == GET_DEV_STATUS)) &&
+                      (srb->cmnd[0] != REQUEST_SENSE)) {
                         /* Logical Unit Not Ready Format in Progress */
                         set_sense_data(chip, lun, CUR_ERR,
                                        0x02, 0, 0x04, 0x04, 0, 0);
@@ -3440,12 +3447,12 @@ int rtsx_scsi_handler(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 #endif
 
         if ((get_lun_card(chip, lun) == MS_CARD) &&
-                        (ms_card->format_status == FORMAT_IN_PROGRESS)) {
+            (ms_card->format_status == FORMAT_IN_PROGRESS)) {
                 if ((srb->cmnd[0] != REQUEST_SENSE) &&
-                        (srb->cmnd[0] != INQUIRY)) {
+                    (srb->cmnd[0] != INQUIRY)) {
                         /* Logical Unit Not Ready Format in Progress */
                         set_sense_data(chip, lun, CUR_ERR, 0x02, 0, 0x04, 0x04,
-                                        0, (u16)(ms_card->progress));
+                                       0, (u16)(ms_card->progress));
                         rtsx_trace(chip);
                         return TRANSPORT_FAILED;
                 }
@@ -3510,7 +3517,7 @@ int rtsx_scsi_handler(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         case SD_EXECUTE_WRITE:
         case SD_GET_RSP:
         case SD_HW_RST:
-                result = sd_extention_cmnd(srb, chip);
+                result = sd_extension_cmnd(srb, chip);
                 break;
 #endif
 
diff --git a/drivers/staging/rts5208/rtsx_scsi.h b/drivers/staging/rts5208/rtsx_scsi.h
index 03dd76d6c859..30f3724848fe 100644
--- a/drivers/staging/rts5208/rtsx_scsi.h
+++ b/drivers/staging/rts5208/rtsx_scsi.h
@@ -136,8 +136,8 @@
 void scsi_show_command(struct rtsx_chip *chip);
 void set_sense_type(struct rtsx_chip *chip, unsigned int lun, int sense_type);
 void set_sense_data(struct rtsx_chip *chip, unsigned int lun, u8 err_code,
-                u8 sense_key, u32 info, u8 asc, u8 ascq,
-                u8 sns_key_info0, u16 sns_key_info1);
+                    u8 sense_key, u32 info, u8 asc, u8 ascq,
+                    u8 sns_key_info0, u16 sns_key_info1);
 int rtsx_scsi_handler(struct scsi_cmnd *srb, struct rtsx_chip *chip);
 
 #endif   /* __REALTEK_RTSX_SCSI_H */
diff --git a/drivers/staging/rts5208/rtsx_sys.h b/drivers/staging/rts5208/rtsx_sys.h
index f49bed9ec76a..817700c0d794 100644
--- a/drivers/staging/rts5208/rtsx_sys.h
+++ b/drivers/staging/rts5208/rtsx_sys.h
@@ -32,9 +32,9 @@ static inline void rtsx_exclusive_enter_ss(struct rtsx_chip *chip)
 {
         struct rtsx_dev *dev = chip->rtsx;
 
-        spin_lock(&(dev->reg_lock));
+        spin_lock(&dev->reg_lock);
         rtsx_enter_ss(chip);
-        spin_unlock(&(dev->reg_lock));
+        spin_unlock(&dev->reg_lock);
 }
 
 static inline void rtsx_reset_detected_cards(struct rtsx_chip *chip, int flag)
diff --git a/drivers/staging/rts5208/rtsx_transport.h b/drivers/staging/rts5208/rtsx_transport.h
index 479137398c3d..99740c33f2fb 100644
--- a/drivers/staging/rts5208/rtsx_transport.h
+++ b/drivers/staging/rts5208/rtsx_transport.h
@@ -30,18 +30,21 @@
 #define WAIT_TIME       2000
 
 unsigned int rtsx_stor_access_xfer_buf(unsigned char *buffer,
-        unsigned int buflen, struct scsi_cmnd *srb, unsigned int *index,
-        unsigned int *offset, enum xfer_buf_dir dir);
-void rtsx_stor_set_xfer_buf(unsigned char *buffer,
-        unsigned int buflen, struct scsi_cmnd *srb);
-void rtsx_stor_get_xfer_buf(unsigned char *buffer,
-        unsigned int buflen, struct scsi_cmnd *srb);
+                                       unsigned int buflen,
+                                       struct scsi_cmnd *srb,
+                                       unsigned int *index,
+                                       unsigned int *offset,
+                                       enum xfer_buf_dir dir);
+void rtsx_stor_set_xfer_buf(unsigned char *buffer, unsigned int buflen,
+                            struct scsi_cmnd *srb);
+void rtsx_stor_get_xfer_buf(unsigned char *buffer, unsigned int buflen,
+                            struct scsi_cmnd *srb);
 void rtsx_invoke_transport(struct scsi_cmnd *srb, struct rtsx_chip *chip);
 
 #define rtsx_init_cmd(chip)                     ((chip)->ci = 0)
 
-void rtsx_add_cmd(struct rtsx_chip *chip,
-                u8 cmd_type, u16 reg_addr, u8 mask, u8 data);
+void rtsx_add_cmd(struct rtsx_chip *chip, u8 cmd_type, u16 reg_addr, u8 mask,
+                  u8 data);
 void rtsx_send_cmd_no_wait(struct rtsx_chip *chip);
 int rtsx_send_cmd(struct rtsx_chip *chip, u8 card, int timeout);
 
@@ -55,11 +58,12 @@ static inline u8 *rtsx_get_cmd_data(struct rtsx_chip *chip)
 }
 
 int rtsx_transfer_data(struct rtsx_chip *chip, u8 card, void *buf, size_t len,
-                int use_sg, enum dma_data_direction dma_dir, int timeout);
+                       int use_sg, enum dma_data_direction dma_dir,
+                       int timeout);
 
-int rtsx_transfer_data_partial(struct rtsx_chip *chip, u8 card,
-                        void *buf, size_t len,
-                        int use_sg, unsigned int *index, unsigned int *offset,
-                        enum dma_data_direction dma_dir, int timeout);
+int rtsx_transfer_data_partial(struct rtsx_chip *chip, u8 card, void *buf,
+                               size_t len, int use_sg, unsigned int *index,
+                               unsigned int *offset,
+                               enum dma_data_direction dma_dir, int timeout);
 
 #endif   /* __REALTEK_RTSX_TRANSPORT_H */
diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
index b0bbb36f8988..bdd35b611f27 100644
--- a/drivers/staging/rts5208/sd.c
+++ b/drivers/staging/rts5208/sd.c
@@ -56,21 +56,21 @@ static u16 REG_SD_DCMPS1_CTL;
 
 static inline void sd_set_err_code(struct rtsx_chip *chip, u8 err_code)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
 
         sd_card->err_code |= err_code;
 }
 
 static inline void sd_clr_err_code(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
 
         sd_card->err_code = 0;
 }
 
 static inline int sd_check_err_code(struct rtsx_chip *chip, u8 err_code)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
 
         return sd_card->err_code & err_code;
 }
@@ -124,9 +124,9 @@ static int sd_check_data0_status(struct rtsx_chip *chip)
 }
 
 static int sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,
-                u32 arg, u8 rsp_type, u8 *rsp, int rsp_len)
+                               u32 arg, u8 rsp_type, u8 *rsp, int rsp_len)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         int timeout = 100;
         u16 reg_addr;
@@ -153,11 +153,12 @@ RTY_SEND_CMD:
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF, rsp_type);
         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE,
-                        0x01, PINGPONG_BUFFER);
+                     0x01, PINGPONG_BUFFER);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER,
-                        0xFF, SD_TM_CMD_RSP | SD_TRANSFER_START);
+                     0xFF, SD_TM_CMD_RSP | SD_TRANSFER_START);
         rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER,
-                SD_TRANSFER_END | SD_STAT_IDLE, SD_TRANSFER_END | SD_STAT_IDLE);
+                     SD_TRANSFER_END | SD_STAT_IDLE, SD_TRANSFER_END |
+                     SD_STAT_IDLE);
 
         if (rsp_type == SD_RSP_TYPE_R2) {
                 for (reg_addr = PPBUF_BASE2; reg_addr < PPBUF_BASE2 + 16;
@@ -238,7 +239,7 @@ RTY_SEND_CMD:
 
         if ((rsp_type == SD_RSP_TYPE_R1) || (rsp_type == SD_RSP_TYPE_R1b)) {
                 if ((cmd_idx != SEND_RELATIVE_ADDR) &&
-                        (cmd_idx != SEND_IF_COND)) {
+                    (cmd_idx != SEND_IF_COND)) {
                         if (cmd_idx != STOP_TRANSMISSION) {
                                 if (ptr[1] & 0x80) {
                                         rtsx_trace(chip);
@@ -285,7 +286,7 @@ static int sd_read_data(struct rtsx_chip *chip,
                         u16 blk_cnt, u8 bus_width, u8 *buf, int buf_len,
                         int timeout)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         int i;
 
@@ -308,27 +309,27 @@ static int sd_read_data(struct rtsx_chip *chip,
                                      0xFF, cmd[i]);
         }
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF,
-                (u8)byte_cnt);
+                     (u8)byte_cnt);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF,
-                (u8)(byte_cnt >> 8));
+                     (u8)(byte_cnt >> 8));
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF,
-                (u8)blk_cnt);
+                     (u8)blk_cnt);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF,
-                (u8)(blk_cnt >> 8));
+                     (u8)(blk_cnt >> 8));
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1, 0x03, bus_width);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF,
-                SD_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END|
-                SD_CHECK_CRC7 | SD_RSP_LEN_6);
+                     SD_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
+                     SD_CHECK_CRC7 | SD_RSP_LEN_6);
         if (trans_mode != SD_TM_AUTO_TUNING)
                 rtsx_add_cmd(chip, WRITE_REG_CMD,
-                        CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
+                             CARD_DATA_SOURCE, 0x01, PINGPONG_BUFFER);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
-                trans_mode | SD_TRANSFER_START);
+                     trans_mode | SD_TRANSFER_START);
         rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END,
-                SD_TRANSFER_END);
+                     SD_TRANSFER_END);
 
         retval = rtsx_send_cmd(chip, SD_CARD, timeout);
         if (retval < 0) {
@@ -353,10 +354,10 @@ static int sd_read_data(struct rtsx_chip *chip,
 }
 
 static int sd_write_data(struct rtsx_chip *chip, u8 trans_mode,
-                u8 *cmd, int cmd_len, u16 byte_cnt, u16 blk_cnt, u8 bus_width,
-                u8 *buf, int buf_len, int timeout)
+                         u8 *cmd, int cmd_len, u16 byte_cnt, u16 blk_cnt,
+                         u8 bus_width, u8 *buf, int buf_len, int timeout)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         int i;
 
@@ -389,30 +390,30 @@ static int sd_write_data(struct rtsx_chip *chip, u8 trans_mode,
                 }
         }
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF,
-                (u8)byte_cnt);
+                     (u8)byte_cnt);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF,
-                (u8)(byte_cnt >> 8));
+                     (u8)(byte_cnt >> 8));
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF,
-                (u8)blk_cnt);
+                     (u8)blk_cnt);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF,
-                (u8)(blk_cnt >> 8));
+                     (u8)(blk_cnt >> 8));
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1, 0x03, bus_width);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF,
-                SD_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
-                SD_CHECK_CRC7 | SD_RSP_LEN_6);
+                     SD_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
+                     SD_CHECK_CRC7 | SD_RSP_LEN_6);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
-                trans_mode | SD_TRANSFER_START);
+                     trans_mode | SD_TRANSFER_START);
         rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END,
-                SD_TRANSFER_END);
+                     SD_TRANSFER_END);
 
         retval = rtsx_send_cmd(chip, SD_CARD, timeout);
         if (retval < 0) {
                 if (retval == -ETIMEDOUT) {
-                        sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
+                        sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
+                                            SD_RSP_TYPE_R1, NULL, 0);
                 }
 
                 rtsx_trace(chip);
@@ -424,7 +425,7 @@ static int sd_write_data(struct rtsx_chip *chip, u8 trans_mode,
 
 static int sd_check_csd(struct rtsx_chip *chip, char check_wp)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         int i;
         u8 csd_ver, trans_speed;
@@ -438,7 +439,7 @@ static int sd_check_csd(struct rtsx_chip *chip, char check_wp)
                 }
 
                 retval = sd_send_cmd_get_rsp(chip, SEND_CSD, sd_card->sd_addr,
-                                        SD_RSP_TYPE_R2, rsp, 16);
+                                             SD_RSP_TYPE_R2, rsp, 16);
                 if (retval == STATUS_SUCCESS)
                         break;
         }
@@ -534,7 +535,7 @@ static int sd_check_csd(struct rtsx_chip *chip, char check_wp)
 static int sd_set_sample_push_timing(struct rtsx_chip *chip)
 {
         int retval;
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         u8 val = 0;
 
         if ((chip->sd_ctl & SD_PUSH_POINT_CTL_MASK) == SD_PUSH_POINT_DELAY)
@@ -573,7 +574,7 @@ static int sd_set_sample_push_timing(struct rtsx_chip *chip)
 
 static void sd_choose_proper_clock(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
 
         if (CHK_SD_SDR104(sd_card)) {
                 if (chip->asic_code)
@@ -637,7 +638,7 @@ static int sd_set_clock_divider(struct rtsx_chip *chip, u8 clk_div)
 
 static int sd_set_init_para(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
 
         retval = sd_set_sample_push_timing(chip);
@@ -659,7 +660,7 @@ static int sd_set_init_para(struct rtsx_chip *chip)
 
 int sd_select_card(struct rtsx_chip *chip, int select)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         u8 cmd_idx, cmd_type;
         u32 addr;
@@ -686,12 +687,12 @@ int sd_select_card(struct rtsx_chip *chip, int select)
 #ifdef SUPPORT_SD_LOCK
 static int sd_update_lock_status(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         u8 rsp[5];
 
         retval = sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                                SD_RSP_TYPE_R1, rsp, 5);
+                                     SD_RSP_TYPE_R1, rsp, 5);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -715,23 +716,23 @@ static int sd_update_lock_status(struct rtsx_chip *chip)
 #endif
 
 static int sd_wait_state_data_ready(struct rtsx_chip *chip, u8 state,
-                                u8 data_ready, int polling_cnt)
+                                    u8 data_ready, int polling_cnt)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval, i;
         u8 rsp[5];
 
         for (i = 0; i < polling_cnt; i++) {
                 retval = sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                        sd_card->sd_addr, SD_RSP_TYPE_R1, rsp,
-                                        5);
+                                             sd_card->sd_addr, SD_RSP_TYPE_R1,
+                                             rsp, 5);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
                 }
 
                 if (((rsp[3] & 0x1E) == state) &&
-                        ((rsp[3] & 0x01) == data_ready))
+                    ((rsp[3] & 0x01) == data_ready))
                         return STATUS_SUCCESS;
         }
 
@@ -746,8 +747,8 @@ static int sd_change_bank_voltage(struct rtsx_chip *chip, u8 voltage)
         if (voltage == SD_IO_3V3) {
                 if (chip->asic_code) {
                         retval = rtsx_write_phy_register(chip, 0x08,
-                                                        0x4FC0 |
-                                                        chip->phy_voltage);
+                                                         0x4FC0 |
+                                                         chip->phy_voltage);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
@@ -763,8 +764,8 @@ static int sd_change_bank_voltage(struct rtsx_chip *chip, u8 voltage)
         } else if (voltage == SD_IO_1V8) {
                 if (chip->asic_code) {
                         retval = rtsx_write_phy_register(chip, 0x08,
-                                                        0x4C40 |
-                                                        chip->phy_voltage);
+                                                         0x4C40 |
+                                                         chip->phy_voltage);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
@@ -800,7 +801,7 @@ static int sd_voltage_switch(struct rtsx_chip *chip)
         }
 
         retval = sd_send_cmd_get_rsp(chip, VOLTAGE_SWITCH, 0, SD_RSP_TYPE_R1,
-                                NULL, 0);
+                                     NULL, 0);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -851,8 +852,8 @@ static int sd_voltage_switch(struct rtsx_chip *chip)
                         (SD_CMD_STATUS | SD_DAT3_STATUS | SD_DAT2_STATUS |
                                 SD_DAT1_STATUS | SD_DAT0_STATUS)) {
                 dev_dbg(rtsx_dev(chip), "SD_BUS_STAT: 0x%x\n", stat);
-                rtsx_write_register(chip, SD_BUS_STAT,
-                                SD_CLK_TOGGLE_EN | SD_CLK_FORCE_STOP, 0);
+                rtsx_write_register(chip, SD_BUS_STAT, SD_CLK_TOGGLE_EN |
+                                    SD_CLK_FORCE_STOP, 0);
                 rtsx_write_register(chip, CARD_CLK_EN, 0xFF, 0);
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -903,7 +904,7 @@ static int sd_reset_dcm(struct rtsx_chip *chip, u8 tune_dir)
 
 static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         u16 SD_VP_CTL, SD_DCMPS_CTL;
         u8 val;
         int retval;
@@ -968,7 +969,9 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir)
                         }
                         udelay(50);
                         retval = rtsx_write_register(chip, SD_VP_CTL, 0xFF,
-                                                     PHASE_CHANGE | PHASE_NOT_RESET | sample_point);
+                                                     PHASE_CHANGE |
+                                                     PHASE_NOT_RESET |
+                                                     sample_point);
                         if (retval) {
                                 rtsx_trace(chip);
                                 return retval;
@@ -982,7 +985,8 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir)
                         }
                         udelay(50);
                         retval = rtsx_write_register(chip, SD_VP_CTL, 0xFF,
-                                                     PHASE_NOT_RESET | sample_point);
+                                                     PHASE_NOT_RESET |
+                                                     sample_point);
                         if (retval) {
                                 rtsx_trace(chip);
                                 return retval;
@@ -992,24 +996,24 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir)
 
                 rtsx_init_cmd(chip);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SD_DCMPS_CTL, DCMPS_CHANGE,
-                        DCMPS_CHANGE);
+                             DCMPS_CHANGE);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, SD_DCMPS_CTL,
-                        DCMPS_CHANGE_DONE, DCMPS_CHANGE_DONE);
+                             DCMPS_CHANGE_DONE, DCMPS_CHANGE_DONE);
                 retval = rtsx_send_cmd(chip, SD_CARD, 100);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto Fail;
+                        goto fail;
                 }
 
                 val = *rtsx_get_cmd_data(chip);
                 if (val & DCMPS_ERROR) {
                         rtsx_trace(chip);
-                        goto Fail;
+                        goto fail;
                 }
 
                 if ((val & DCMPS_CURRENT_PHASE) != sample_point) {
                         rtsx_trace(chip);
-                        goto Fail;
+                        goto fail;
                 }
 
                 retval = rtsx_write_register(chip, SD_DCMPS_CTL,
@@ -1045,7 +1049,7 @@ static int sd_change_phase(struct rtsx_chip *chip, u8 sample_point, u8 tune_dir)
 
         return STATUS_SUCCESS;
 
-Fail:
+fail:
         rtsx_read_register(chip, SD_VP_CTL, &val);
         dev_dbg(rtsx_dev(chip), "SD_VP_CTL: 0x%x\n", val);
         rtsx_read_register(chip, SD_DCMPS_CTL, &val);
@@ -1060,12 +1064,12 @@ Fail:
 
 static int sd_check_spec(struct rtsx_chip *chip, u8 bus_width)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         u8 cmd[5], buf[8];
 
         retval = sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr,
-                                SD_RSP_TYPE_R1, NULL, 0);
+                                     SD_RSP_TYPE_R1, NULL, 0);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -1078,7 +1082,7 @@ static int sd_check_spec(struct rtsx_chip *chip, u8 bus_width)
         cmd[4] = 0;
 
         retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd, 5, 8, 1, bus_width,
-                        buf, 8, 250);
+                              buf, 8, 250);
         if (retval != STATUS_SUCCESS) {
                 rtsx_clear_sd_error(chip);
                 rtsx_trace(chip);
@@ -1096,7 +1100,7 @@ static int sd_check_spec(struct rtsx_chip *chip, u8 bus_width)
 }
 
 static int sd_query_switch_result(struct rtsx_chip *chip, u8 func_group,
-                                u8 func_to_switch, u8 *buf, int buf_len)
+                                  u8 func_to_switch, u8 *buf, int buf_len)
 {
         u8 support_mask = 0, query_switch = 0, switch_busy = 0;
         int support_offset = 0, query_switch_offset = 0, check_busy_offset = 0;
@@ -1198,7 +1202,7 @@ static int sd_query_switch_result(struct rtsx_chip *chip, u8 func_group,
 
         if (func_group == SD_FUNC_GROUP_1) {
                 if (!(buf[support_offset] & support_mask) ||
-                        ((buf[query_switch_offset] & 0x0F) != query_switch)) {
+                    ((buf[query_switch_offset] & 0x0F) != query_switch)) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
                 }
@@ -1206,7 +1210,7 @@ static int sd_query_switch_result(struct rtsx_chip *chip, u8 func_group,
 
         /* Check 'Busy Status' */
         if ((buf[DATA_STRUCTURE_VER_OFFSET] == 0x01) &&
-                    ((buf[check_busy_offset] & switch_busy) == switch_busy)) {
+            ((buf[check_busy_offset] & switch_busy) == switch_busy)) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
         }
@@ -1214,10 +1218,10 @@ static int sd_query_switch_result(struct rtsx_chip *chip, u8 func_group,
         return STATUS_SUCCESS;
 }
 
-static int sd_check_switch_mode(struct rtsx_chip *chip, u8 mode,
-                u8 func_group, u8 func_to_switch, u8 bus_width)
+static int sd_check_switch_mode(struct rtsx_chip *chip, u8 mode, u8 func_group,
+                                u8 func_to_switch, u8 bus_width)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         u8 cmd[5], buf[64];
 
@@ -1247,7 +1251,7 @@ static int sd_check_switch_mode(struct rtsx_chip *chip, u8 mode,
         }
 
         retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd, 5, 64, 1, bus_width,
-                        buf, 64, 250);
+                              buf, 64, 250);
         if (retval != STATUS_SUCCESS) {
                 rtsx_clear_sd_error(chip);
                 rtsx_trace(chip);
@@ -1326,7 +1330,7 @@ static u8 downgrade_switch_mode(u8 func_group, u8 func_to_switch)
 }
 
 static int sd_check_switch(struct rtsx_chip *chip,
-                u8 func_group, u8 func_to_switch, u8 bus_width)
+                           u8 func_group, u8 func_to_switch, u8 bus_width)
 {
         int retval;
         int i;
@@ -1340,12 +1344,14 @@ static int sd_check_switch(struct rtsx_chip *chip,
                 }
 
                 retval = sd_check_switch_mode(chip, SD_CHECK_MODE, func_group,
-                                func_to_switch, bus_width);
+                                              func_to_switch, bus_width);
                 if (retval == STATUS_SUCCESS) {
                         u8 stat;
 
                         retval = sd_check_switch_mode(chip, SD_SWITCH_MODE,
-                                        func_group, func_to_switch, bus_width);
+                                                      func_group,
+                                                      func_to_switch,
+                                                      bus_width);
                         if (retval == STATUS_SUCCESS) {
                                 switch_good = true;
                                 break;
@@ -1364,7 +1370,7 @@ static int sd_check_switch(struct rtsx_chip *chip,
                 }
 
                 func_to_switch = downgrade_switch_mode(func_group,
-                                                func_to_switch);
+                                                       func_to_switch);
 
                 wait_timeout(20);
         }
@@ -1379,14 +1385,14 @@ static int sd_check_switch(struct rtsx_chip *chip,
 
 static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         int i;
         u8 func_to_switch = 0;
 
         /* Get supported functions */
-        retval = sd_check_switch_mode(chip, SD_CHECK_MODE,
-                        NO_ARGUMENT, NO_ARGUMENT, bus_width);
+        retval = sd_check_switch_mode(chip, SD_CHECK_MODE, NO_ARGUMENT,
+                                      NO_ARGUMENT, bus_width);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -1396,24 +1402,24 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)
 
         /* Function Group 1: Access Mode */
         for (i = 0; i < 4; i++) {
-                switch ((u8)(chip->sd_speed_prior >> (i*8))) {
+                switch ((u8)(chip->sd_speed_prior >> (i * 8))) {
                 case SDR104_SUPPORT:
-                        if ((sd_card->func_group1_mask & SDR104_SUPPORT_MASK)
-                                        && chip->sdr104_en) {
+                        if ((sd_card->func_group1_mask & SDR104_SUPPORT_MASK) &&
+                            chip->sdr104_en) {
                                 func_to_switch = SDR104_SUPPORT;
                         }
                         break;
 
                 case DDR50_SUPPORT:
-                        if ((sd_card->func_group1_mask & DDR50_SUPPORT_MASK)
-                                        && chip->ddr50_en) {
+                        if ((sd_card->func_group1_mask & DDR50_SUPPORT_MASK) &&
+                            chip->ddr50_en) {
                                 func_to_switch = DDR50_SUPPORT;
                         }
                         break;
 
                 case SDR50_SUPPORT:
-                        if ((sd_card->func_group1_mask & SDR50_SUPPORT_MASK)
-                                        && chip->sdr50_en) {
+                        if ((sd_card->func_group1_mask & SDR50_SUPPORT_MASK) &&
+                            chip->sdr50_en) {
                                 func_to_switch = SDR50_SUPPORT;
                         }
                         break;
@@ -1430,7 +1436,6 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)
 
                 if (func_to_switch)
                         break;
-
         }
         dev_dbg(rtsx_dev(chip), "SD_FUNC_GROUP_1: func_to_switch = 0x%02x",
                 func_to_switch);
@@ -1446,7 +1451,7 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)
 
         if (func_to_switch) {
                 retval = sd_check_switch(chip, SD_FUNC_GROUP_1, func_to_switch,
-                                        bus_width);
+                                         bus_width);
                 if (retval != STATUS_SUCCESS) {
                         if (func_to_switch == SDR104_SUPPORT) {
                                 sd_card->sd_switch_fail = SDR104_SUPPORT_MASK;
@@ -1496,7 +1501,7 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)
         func_to_switch = 0xFF;
 
         for (i = 0; i < 4; i++) {
-                switch ((u8)(chip->sd_current_prior >> (i*8))) {
+                switch ((u8)(chip->sd_current_prior >> (i * 8))) {
                 case CURRENT_LIMIT_800:
                         if (sd_card->func_group4_mask & CURRENT_LIMIT_800_MASK)
                                 func_to_switch = CURRENT_LIMIT_800;
@@ -1534,7 +1539,7 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)
 
         if (func_to_switch <= CURRENT_LIMIT_800) {
                 retval = sd_check_switch(chip, SD_FUNC_GROUP_4, func_to_switch,
-                                        bus_width);
+                                         bus_width);
                 if (retval != STATUS_SUCCESS) {
                         if (sd_check_err_code(chip, SD_NO_CARD)) {
                                 rtsx_trace(chip);
@@ -1596,8 +1601,8 @@ static int sd_sdr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
         cmd[3] = 0;
         cmd[4] = 0;
 
-        retval = sd_read_data(chip, SD_TM_AUTO_TUNING,
-                        cmd, 5, 0x40, 1, SD_BUS_WIDTH_4, NULL, 0, 100);
+        retval = sd_read_data(chip, SD_TM_AUTO_TUNING, cmd, 5, 0x40, 1,
+                              SD_BUS_WIDTH_4, NULL, 0, 100);
         if (retval != STATUS_SUCCESS) {
                 (void)sd_wait_data_idle(chip);
 
@@ -1611,7 +1616,7 @@ static int sd_sdr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
 
 static int sd_ddr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         u8 cmd[5];
 
@@ -1624,7 +1629,7 @@ static int sd_ddr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
         dev_dbg(rtsx_dev(chip), "sd ddr tuning rx\n");
 
         retval = sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr,
-                                SD_RSP_TYPE_R1, NULL, 0);
+                                     SD_RSP_TYPE_R1, NULL, 0);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -1636,8 +1641,8 @@ static int sd_ddr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
         cmd[3] = 0;
         cmd[4] = 0;
 
-        retval = sd_read_data(chip, SD_TM_NORMAL_READ,
-                        cmd, 5, 64, 1, SD_BUS_WIDTH_4, NULL, 0, 100);
+        retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd, 5, 64, 1,
+                              SD_BUS_WIDTH_4, NULL, 0, 100);
         if (retval != STATUS_SUCCESS) {
                 (void)sd_wait_data_idle(chip);
 
@@ -1651,7 +1656,7 @@ static int sd_ddr_tuning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
 
 static int mmc_ddr_tunning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         u8 cmd[5], bus_width;
 
@@ -1676,8 +1681,8 @@ static int mmc_ddr_tunning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
         cmd[3] = 0;
         cmd[4] = 0;
 
-        retval = sd_read_data(chip, SD_TM_NORMAL_READ,
-                        cmd, 5, 0x200, 1, bus_width, NULL, 0, 100);
+        retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd, 5, 0x200, 1,
+                              bus_width, NULL, 0, 100);
         if (retval != STATUS_SUCCESS) {
                 (void)sd_wait_data_idle(chip);
 
@@ -1691,7 +1696,7 @@ static int mmc_ddr_tunning_rx_cmd(struct rtsx_chip *chip, u8 sample_point)
 
 static int sd_sdr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
 
         retval = sd_change_phase(chip, sample_point, TUNE_TX);
@@ -1708,11 +1713,11 @@ static int sd_sdr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point)
         }
 
         retval = sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                SD_RSP_TYPE_R1, NULL, 0);
+                                     SD_RSP_TYPE_R1, NULL, 0);
         if (retval != STATUS_SUCCESS) {
                 if (sd_check_err_code(chip, SD_RSP_TIMEOUT)) {
                         rtsx_write_register(chip, SD_CFG3,
-                                        SD_RSP_80CLK_TIMEOUT_EN, 0);
+                                            SD_RSP_80CLK_TIMEOUT_EN, 0);
                         rtsx_trace(chip);
                         return STATUS_FAIL;
                 }
@@ -1730,7 +1735,7 @@ static int sd_sdr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point)
 
 static int sd_ddr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         u8 cmd[5], bus_width;
 
@@ -1770,8 +1775,8 @@ static int sd_ddr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point)
         cmd[3] = 0;
         cmd[4] = 0;
 
-        retval = sd_write_data(chip, SD_TM_AUTO_WRITE_2,
-                        cmd, 5, 16, 1, bus_width, sd_card->raw_csd, 16, 100);
+        retval = sd_write_data(chip, SD_TM_AUTO_WRITE_2, cmd, 5, 16, 1,
+                               bus_width, sd_card->raw_csd, 16, 100);
         if (retval != STATUS_SUCCESS) {
                 rtsx_clear_sd_error(chip);
                 rtsx_write_register(chip, SD_CFG3, SD_RSP_80CLK_TIMEOUT_EN, 0);
@@ -1787,7 +1792,7 @@ static int sd_ddr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point)
         }
 
         sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr, SD_RSP_TYPE_R1,
-                        NULL, 0);
+                            NULL, 0);
 
         return STATUS_SUCCESS;
 }
@@ -1795,7 +1800,7 @@ static int sd_ddr_tuning_tx_cmd(struct rtsx_chip *chip, u8 sample_point)
 static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map,
                                 u8 tune_dir)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         struct timing_phase_path path[MAX_PHASE + 1];
         int i, j, cont_path_cnt;
         bool new_block;
@@ -1808,7 +1813,7 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map,
                 else
                         final_phase = (u8)chip->sd_default_tx_phase;
 
-                goto Search_Finish;
+                goto search_finish;
         }
 
         cont_path_cnt = 0;
@@ -1839,7 +1844,7 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map,
 
         if (cont_path_cnt == 0) {
                 dev_dbg(rtsx_dev(chip), "No continuous phase path\n");
-                goto Search_Finish;
+                goto search_finish;
         } else {
                 int idx = cont_path_cnt - 1;
 
@@ -1848,7 +1853,7 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map,
         }
 
         if ((path[0].start == 0) &&
-                (path[cont_path_cnt - 1].end == MAX_PHASE)) {
+            (path[cont_path_cnt - 1].end == MAX_PHASE)) {
                 path[0].start = path[cont_path_cnt - 1].start - MAX_PHASE - 1;
                 path[0].len += path[cont_path_cnt - 1].len;
                 path[0].mid = path[0].start + path[0].len / 2;
@@ -1906,14 +1911,14 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map,
                 }
         }
 
-Search_Finish:
+search_finish:
         dev_dbg(rtsx_dev(chip), "Final chosen phase: %d\n", final_phase);
         return final_phase;
 }
 
 static int sd_tuning_rx(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         int i, j;
         u32 raw_phase_map[3], phase_map;
@@ -1974,7 +1979,7 @@ static int sd_tuning_rx(struct rtsx_chip *chip)
 
 static int sd_ddr_pre_tuning_tx(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         int i;
         u32 phase_map;
@@ -1992,7 +1997,7 @@ static int sd_ddr_pre_tuning_tx(struct rtsx_chip *chip)
                 if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
                         sd_set_err_code(chip, SD_NO_CARD);
                         rtsx_write_register(chip, SD_CFG3,
-                                                SD_RSP_80CLK_TIMEOUT_EN, 0);
+                                            SD_RSP_80CLK_TIMEOUT_EN, 0);
                         rtsx_trace(chip);
                         return STATUS_FAIL;
                 }
@@ -2002,10 +2007,10 @@ static int sd_ddr_pre_tuning_tx(struct rtsx_chip *chip)
                         continue;
 
                 retval = sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                        sd_card->sd_addr, SD_RSP_TYPE_R1, NULL,
-                                        0);
+                                             sd_card->sd_addr, SD_RSP_TYPE_R1,
+                                             NULL, 0);
                 if ((retval == STATUS_SUCCESS) ||
-                        !sd_check_err_code(chip, SD_RSP_TIMEOUT))
+                    !sd_check_err_code(chip, SD_RSP_TIMEOUT))
                         phase_map |= 1 << i;
         }
 
@@ -2039,7 +2044,7 @@ static int sd_ddr_pre_tuning_tx(struct rtsx_chip *chip)
 
 static int sd_tuning_tx(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         int i, j;
         u32 raw_phase_map[3], phase_map;
@@ -2131,7 +2136,7 @@ static int sd_ddr_tuning(struct rtsx_chip *chip)
                 }
         } else {
                 retval = sd_change_phase(chip, (u8)chip->sd_ddr_tx_phase,
-                                        TUNE_TX);
+                                         TUNE_TX);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -2167,7 +2172,7 @@ static int mmc_ddr_tuning(struct rtsx_chip *chip)
                 }
         } else {
                 retval = sd_change_phase(chip, (u8)chip->mmc_ddr_tx_phase,
-                                        TUNE_TX);
+                                         TUNE_TX);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -2193,7 +2198,7 @@ static int mmc_ddr_tuning(struct rtsx_chip *chip)
 
 int sd_switch_clock(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         int re_tuning = 0;
 
@@ -2231,7 +2236,7 @@ int sd_switch_clock(struct rtsx_chip *chip)
 
 static int sd_prepare_reset(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
 
         if (chip->asic_code)
@@ -2286,31 +2291,36 @@ static int sd_pull_ctl_disable(struct rtsx_chip *chip)
 
         if (CHECK_PID(chip, 0x5208)) {
                 retval = rtsx_write_register(chip, CARD_PULL_CTL1, 0xFF,
-                                             XD_D3_PD | SD_D7_PD | SD_CLK_PD | SD_D5_PD);
+                                             XD_D3_PD | SD_D7_PD | SD_CLK_PD |
+                                             SD_D5_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL2, 0xFF,
-                                             SD_D6_PD | SD_D0_PD | SD_D1_PD | XD_D5_PD);
+                                             SD_D6_PD | SD_D0_PD | SD_D1_PD |
+                                             XD_D5_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL3, 0xFF,
-                                             SD_D4_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
+                                             SD_D4_PD | XD_CE_PD | XD_CLE_PD |
+                                             XD_CD_PU);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL4, 0xFF,
-                                             XD_RDY_PD | SD_D3_PD | SD_D2_PD | XD_ALE_PD);
+                                             XD_RDY_PD | SD_D3_PD | SD_D2_PD |
+                                             XD_ALE_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL5, 0xFF,
-                                             MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
+                                             MS_INS_PU | SD_WP_PD | SD_CD_PU |
+                                             SD_CMD_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
@@ -2361,27 +2371,27 @@ int sd_pull_ctl_enable(struct rtsx_chip *chip)
 
         if (CHECK_PID(chip, 0x5208)) {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF,
-                        XD_D3_PD | SD_DAT7_PU | SD_CLK_NP | SD_D5_PU);
+                             XD_D3_PD | SD_DAT7_PU | SD_CLK_NP | SD_D5_PU);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF,
-                        SD_D6_PU | SD_D0_PU | SD_D1_PU | XD_D5_PD);
+                             SD_D6_PU | SD_D0_PU | SD_D1_PU | XD_D5_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF,
-                        SD_D4_PU | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
+                             SD_D4_PU | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF,
-                        XD_RDY_PD | SD_D3_PU | SD_D2_PU | XD_ALE_PD);
+                             XD_RDY_PD | SD_D3_PU | SD_D2_PU | XD_ALE_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL5, 0xFF,
-                        MS_INS_PU | SD_WP_PU | SD_CD_PU | SD_CMD_PU);
+                             MS_INS_PU | SD_WP_PU | SD_CD_PU | SD_CMD_PU);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL6, 0xFF,
-                        MS_D5_PD | MS_D4_PD);
+                             MS_D5_PD | MS_D4_PD);
         } else if (CHECK_PID(chip, 0x5288)) {
                 if (CHECK_BARO_PKG(chip, QFN)) {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF,
-                                0xA8);
+                                     0xA8);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF,
-                                0x5A);
+                                     0x5A);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF,
-                                0x95);
+                                     0x95);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF,
-                                0xAA);
+                                     0xAA);
                 }
         }
 
@@ -2478,7 +2488,7 @@ static int sd_dummy_clock(struct rtsx_chip *chip)
 
 static int sd_read_lba0(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         u8 cmd[5], bus_width;
 
@@ -2499,8 +2509,8 @@ static int sd_read_lba0(struct rtsx_chip *chip)
                         bus_width = SD_BUS_WIDTH_1;
         }
 
-        retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd,
-                5, 512, 1, bus_width, NULL, 0, 100);
+        retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd, 5, 512, 1,
+                              bus_width, NULL, 0, 100);
         if (retval != STATUS_SUCCESS) {
                 rtsx_clear_sd_error(chip);
                 rtsx_trace(chip);
@@ -2512,14 +2522,14 @@ static int sd_read_lba0(struct rtsx_chip *chip)
 
 static int sd_check_wp_state(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         u32 val;
         u16 sd_card_type;
         u8 cmd[5], buf[64];
 
-        retval = sd_send_cmd_get_rsp(chip, APP_CMD,
-                        sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
+        retval = sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr,
+                                     SD_RSP_TYPE_R1, NULL, 0);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -2532,12 +2542,12 @@ static int sd_check_wp_state(struct rtsx_chip *chip)
         cmd[4] = 0;
 
         retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd, 5, 64, 1,
-                        SD_BUS_WIDTH_4, buf, 64, 250);
+                              SD_BUS_WIDTH_4, buf, 64, 250);
         if (retval != STATUS_SUCCESS) {
                 rtsx_clear_sd_error(chip);
 
                 sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                                SD_RSP_TYPE_R1, NULL, 0);
+                                    SD_RSP_TYPE_R1, NULL, 0);
                 rtsx_trace(chip);
                 return STATUS_FAIL;
         }
@@ -2562,7 +2572,7 @@ static int sd_check_wp_state(struct rtsx_chip *chip)
 
 static int reset_sd(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         bool hi_cap_flow = false;
         int retval, i = 0, j = 0, k = 0;
         bool sd_dont_switch = false;
@@ -2575,7 +2585,7 @@ static int reset_sd(struct rtsx_chip *chip)
 
         SET_SD(sd_card);
 
-Switch_Fail:
+switch_fail:
 
         i = 0;
         j = 0;
@@ -2589,11 +2599,11 @@ Switch_Fail:
 
         retval = sd_prepare_reset(chip);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         retval = sd_dummy_clock(chip);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         if (CHK_SDIO_EXIST(chip) && !CHK_SDIO_IGNORED(chip) && try_sdio) {
                 int rty_cnt = 0;
@@ -2601,11 +2611,11 @@ Switch_Fail:
                 for (; rty_cnt < chip->sdio_retry_cnt; rty_cnt++) {
                         if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
                                 sd_set_err_code(chip, SD_NO_CARD);
-                                goto Status_Fail;
+                                goto status_fail;
                         }
 
                         retval = sd_send_cmd_get_rsp(chip, IO_SEND_OP_COND, 0,
-                                                SD_RSP_TYPE_R4, rsp, 5);
+                                                     SD_RSP_TYPE_R4, rsp, 5);
                         if (retval == STATUS_SUCCESS) {
                                 int func_num = (rsp[1] >> 4) & 0x07;
 
@@ -2613,7 +2623,7 @@ Switch_Fail:
                                         dev_dbg(rtsx_dev(chip), "SD_IO card (Function number: %d)!\n",
                                                 func_num);
                                         chip->sd_io = 1;
-                                        goto Status_Fail;
+                                        goto status_fail;
                                 }
 
                                 break;
@@ -2630,14 +2640,14 @@ Switch_Fail:
         /* Start Initialization Process of SD Card */
 RTY_SD_RST:
         retval = sd_send_cmd_get_rsp(chip, GO_IDLE_STATE, 0, SD_RSP_TYPE_R0,
-                                NULL, 0);
+                                     NULL, 0);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         wait_timeout(20);
 
         retval = sd_send_cmd_get_rsp(chip, SEND_IF_COND, 0x000001AA,
-                                SD_RSP_TYPE_R7, rsp, 5);
+                                     SD_RSP_TYPE_R7, rsp, 5);
         if (retval == STATUS_SUCCESS) {
                 if ((rsp[4] == 0xAA) && ((rsp[3] & 0x0f) == 0x01)) {
                         hi_cap_flow = true;
@@ -2649,37 +2659,37 @@ RTY_SD_RST:
                 voltage = SUPPORT_VOLTAGE;
 
                 retval = sd_send_cmd_get_rsp(chip, GO_IDLE_STATE, 0,
-                                        SD_RSP_TYPE_R0, NULL, 0);
+                                             SD_RSP_TYPE_R0, NULL, 0);
                 if (retval != STATUS_SUCCESS)
-                        goto Status_Fail;
+                        goto status_fail;
 
                 wait_timeout(20);
         }
 
         do {
                 retval = sd_send_cmd_get_rsp(chip, APP_CMD, 0, SD_RSP_TYPE_R1,
-                                        NULL, 0);
+                                             NULL, 0);
                 if (retval != STATUS_SUCCESS) {
                         if (detect_card_cd(chip, SD_CARD) != STATUS_SUCCESS) {
                                 sd_set_err_code(chip, SD_NO_CARD);
-                                goto Status_Fail;
+                                goto status_fail;
                         }
 
                         j++;
                         if (j < 3)
                                 goto RTY_SD_RST;
                         else
-                                goto Status_Fail;
+                                goto status_fail;
                 }
 
                 retval = sd_send_cmd_get_rsp(chip, SD_APP_OP_COND, voltage,
-                                        SD_RSP_TYPE_R3, rsp, 5);
+                                             SD_RSP_TYPE_R3, rsp, 5);
                 if (retval != STATUS_SUCCESS) {
                         k++;
                         if (k < 3)
                                 goto RTY_SD_RST;
                         else
-                                goto Status_Fail;
+                                goto status_fail;
                 }
 
                 i++;
@@ -2687,7 +2697,7 @@ RTY_SD_RST:
         } while (!(rsp[1] & 0x80) && (i < 255));
 
         if (i == 255)
-                goto Status_Fail;
+                goto status_fail;
 
         if (hi_cap_flow) {
                 if (rsp[1] & 0x40)
@@ -2705,19 +2715,19 @@ RTY_SD_RST:
         if (support_1v8) {
                 retval = sd_voltage_switch(chip);
                 if (retval != STATUS_SUCCESS)
-                        goto Status_Fail;
+                        goto status_fail;
         }
 
         retval = sd_send_cmd_get_rsp(chip, ALL_SEND_CID, 0, SD_RSP_TYPE_R2,
-                                NULL, 0);
+                                     NULL, 0);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         for (i = 0; i < 3; i++) {
                 retval = sd_send_cmd_get_rsp(chip, SEND_RELATIVE_ADDR, 0,
-                                        SD_RSP_TYPE_R6, rsp, 5);
+                                             SD_RSP_TYPE_R6, rsp, 5);
                 if (retval != STATUS_SUCCESS)
-                        goto Status_Fail;
+                        goto status_fail;
 
                 sd_card->sd_addr = (u32)rsp[1] << 24;
                 sd_card->sd_addr += (u32)rsp[2] << 16;
@@ -2728,17 +2738,17 @@ RTY_SD_RST:
 
         retval = sd_check_csd(chip, 1);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         retval = sd_select_card(chip, 1);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
 #ifdef SUPPORT_SD_LOCK
 SD_UNLOCK_ENTRY:
         retval = sd_update_lock_status(chip);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         if (sd_card->sd_lock_status & SD_LOCKED) {
                 sd_card->sd_lock_status |= (SD_LOCK_1BIT_MODE | SD_PWD_EXIST);
@@ -2749,25 +2759,25 @@ SD_UNLOCK_ENTRY:
 #endif
 
         retval = sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr,
-                                SD_RSP_TYPE_R1, NULL, 0);
+                                     SD_RSP_TYPE_R1, NULL, 0);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         retval = sd_send_cmd_get_rsp(chip, SET_CLR_CARD_DETECT, 0,
-                                SD_RSP_TYPE_R1, NULL, 0);
+                                     SD_RSP_TYPE_R1, NULL, 0);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         if (support_1v8) {
                 retval = sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr,
-                                        SD_RSP_TYPE_R1, NULL, 0);
+                                             SD_RSP_TYPE_R1, NULL, 0);
                 if (retval != STATUS_SUCCESS)
-                        goto Status_Fail;
+                        goto status_fail;
 
                 retval = sd_send_cmd_get_rsp(chip, SET_BUS_WIDTH, 2,
-                                        SD_RSP_TYPE_R1, NULL, 0);
+                                             SD_RSP_TYPE_R1, NULL, 0);
                 if (retval != STATUS_SUCCESS)
-                        goto Status_Fail;
+                        goto status_fail;
 
                 switch_bus_width = SD_BUS_WIDTH_4;
         } else {
@@ -2775,13 +2785,13 @@ SD_UNLOCK_ENTRY:
         }
 
         retval = sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, 0x200, SD_RSP_TYPE_R1,
-                                NULL, 0);
+                                     NULL, 0);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         retval = sd_set_clock_divider(chip, SD_CLK_DIVIDE_0);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         if (!(sd_card->raw_csd[4] & 0x40))
                 sd_dont_switch = true;
@@ -2804,7 +2814,7 @@ SD_UNLOCK_ENTRY:
                                 sd_dont_switch = true;
                                 try_sdio = false;
 
-                                goto Switch_Fail;
+                                goto switch_fail;
                         }
                 } else {
                         if (support_1v8) {
@@ -2812,21 +2822,21 @@ SD_UNLOCK_ENTRY:
                                 sd_dont_switch = true;
                                 try_sdio = false;
 
-                                goto Switch_Fail;
+                                goto switch_fail;
                         }
                 }
         }
 
         if (!support_1v8) {
                 retval = sd_send_cmd_get_rsp(chip, APP_CMD, sd_card->sd_addr,
-                                        SD_RSP_TYPE_R1, NULL, 0);
+                                             SD_RSP_TYPE_R1, NULL, 0);
                 if (retval != STATUS_SUCCESS)
-                        goto Status_Fail;
+                        goto status_fail;
 
                 retval = sd_send_cmd_get_rsp(chip, SET_BUS_WIDTH, 2,
-                                        SD_RSP_TYPE_R1, NULL, 0);
+                                             SD_RSP_TYPE_R1, NULL, 0);
                 if (retval != STATUS_SUCCESS)
-                        goto Status_Fail;
+                        goto status_fail;
         }
 
 #ifdef SUPPORT_SD_LOCK
@@ -2845,7 +2855,7 @@ SD_UNLOCK_ENTRY:
 
                 retval = sd_set_init_para(chip);
                 if (retval != STATUS_SUCCESS)
-                        goto Status_Fail;
+                        goto status_fail;
 
                 if (CHK_SD_DDR50(sd_card))
                         retval = sd_ddr_tuning(chip);
@@ -2854,20 +2864,20 @@ SD_UNLOCK_ENTRY:
 
                 if (retval != STATUS_SUCCESS) {
                         if (sd20_mode) {
-                                goto Status_Fail;
+                                goto status_fail;
                         } else {
                                 retval = sd_init_power(chip);
                                 if (retval != STATUS_SUCCESS)
-                                        goto Status_Fail;
+                                        goto status_fail;
 
                                 try_sdio = false;
                                 sd20_mode = true;
-                                goto Switch_Fail;
+                                goto switch_fail;
                         }
                 }
 
                 sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                                SD_RSP_TYPE_R1, NULL, 0);
+                                    SD_RSP_TYPE_R1, NULL, 0);
 
                 if (CHK_SD_DDR50(sd_card)) {
                         retval = sd_wait_state_data_ready(chip, 0x08, 1, 1000);
@@ -2879,15 +2889,15 @@ SD_UNLOCK_ENTRY:
                         retval = sd_read_lba0(chip);
                         if (retval != STATUS_SUCCESS) {
                                 if (sd20_mode) {
-                                        goto Status_Fail;
+                                        goto status_fail;
                                 } else {
                                         retval = sd_init_power(chip);
                                         if (retval != STATUS_SUCCESS)
-                                                goto Status_Fail;
+                                                goto status_fail;
 
                                         try_sdio = false;
                                         sd20_mode = true;
-                                        goto Switch_Fail;
+                                        goto switch_fail;
                                 }
                         }
                 }
@@ -2895,7 +2905,7 @@ SD_UNLOCK_ENTRY:
 
         retval = sd_check_wp_state(chip);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         chip->card_bus_width[chip->card2lun[SD_CARD]] = 4;
 
@@ -2918,21 +2928,21 @@ SD_UNLOCK_ENTRY:
 
         return STATUS_SUCCESS;
 
-Status_Fail:
+status_fail:
         rtsx_trace(chip);
         return STATUS_FAIL;
 }
 
 static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         u8 buf[8] = {0}, bus_width, *ptr;
         u16 byte_cnt;
         int len;
 
         retval = sd_send_cmd_get_rsp(chip, BUSTEST_W, 0, SD_RSP_TYPE_R1, NULL,
-                                0);
+                                     0);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return SWITCH_FAIL;
@@ -2957,8 +2967,8 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
                 return SWITCH_ERR;
         }
 
-        retval = sd_write_data(chip, SD_TM_AUTO_WRITE_3,
-                        NULL, 0, byte_cnt, 1, bus_width, buf, len, 100);
+        retval = sd_write_data(chip, SD_TM_AUTO_WRITE_3, NULL, 0, byte_cnt, 1,
+                               bus_width, buf, len, 100);
         if (retval != STATUS_SUCCESS) {
                 rtsx_clear_sd_error(chip);
                 rtsx_write_register(chip, REG_SD_CFG3, 0x02, 0);
@@ -2980,23 +2990,23 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
 
         if (width == MMC_8BIT_BUS)
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L,
-                        0xFF, 0x08);
+                             0xFF, 0x08);
         else
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L,
-                        0xFF, 0x04);
+                             0xFF, 0x04);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF, 1);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF, 0);
 
-        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF,
-                SD_CALCULATE_CRC7 | SD_NO_CHECK_CRC16 | SD_NO_WAIT_BUSY_END|
-                SD_CHECK_CRC7 | SD_RSP_LEN_6);
+        rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF, SD_CALCULATE_CRC7 |
+                     SD_NO_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
+                     SD_CHECK_CRC7 | SD_RSP_LEN_6);
         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01,
-                PINGPONG_BUFFER);
+                     PINGPONG_BUFFER);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
-                SD_TM_NORMAL_READ | SD_TRANSFER_START);
+                     SD_TM_NORMAL_READ | SD_TRANSFER_START);
         rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END,
-                SD_TRANSFER_END);
+                     SD_TRANSFER_END);
 
         rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2, 0, 0);
         if (width == MMC_8BIT_BUS)
@@ -3024,9 +3034,9 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
                                 arg = 0x03B70200;
 
                         retval = sd_send_cmd_get_rsp(chip, SWITCH, arg,
-                                                SD_RSP_TYPE_R1b, rsp, 5);
+                                                     SD_RSP_TYPE_R1b, rsp, 5);
                         if ((retval == STATUS_SUCCESS) &&
-                                !(rsp[4] & MMC_SWITCH_ERR))
+                            !(rsp[4] & MMC_SWITCH_ERR))
                                 return SWITCH_SUCCESS;
                 }
         } else {
@@ -3041,9 +3051,9 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
                                 arg = 0x03B70100;
 
                         retval = sd_send_cmd_get_rsp(chip, SWITCH, arg,
-                                                SD_RSP_TYPE_R1b, rsp, 5);
+                                                     SD_RSP_TYPE_R1b, rsp, 5);
                         if ((retval == STATUS_SUCCESS) &&
-                                !(rsp[4] & MMC_SWITCH_ERR))
+                            !(rsp[4] & MMC_SWITCH_ERR))
                                 return SWITCH_SUCCESS;
                 }
         }
@@ -3054,7 +3064,7 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
 
 static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
         u8 *ptr, card_type, card_type_mask = 0;
 
@@ -3065,7 +3075,7 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)
         rtsx_init_cmd(chip);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD0, 0xFF,
-                0x40 | SEND_EXT_CSD);
+                     0x40 | SEND_EXT_CSD);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD1, 0xFF, 0);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD2, 0xFF, 0);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD3, 0xFF, 0);
@@ -3077,14 +3087,14 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF, 0);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF,
-                SD_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END|
-                SD_CHECK_CRC7 | SD_RSP_LEN_6);
+                     SD_CALCULATE_CRC7 | SD_CHECK_CRC16 | SD_NO_WAIT_BUSY_END |
+                     SD_CHECK_CRC7 | SD_RSP_LEN_6);
         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01,
-                PINGPONG_BUFFER);
+                     PINGPONG_BUFFER);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
-                SD_TM_NORMAL_READ | SD_TRANSFER_START);
+                     SD_TM_NORMAL_READ | SD_TRANSFER_START);
         rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END,
-                SD_TRANSFER_END);
+                     SD_TRANSFER_END);
 
         rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + 196, 0xFF, 0);
         rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + 212, 0xFF, 0);
@@ -3097,7 +3107,7 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)
                 if (retval == -ETIMEDOUT) {
                         rtsx_clear_sd_error(chip);
                         sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                                        SD_RSP_TYPE_R1, NULL, 0);
+                                            SD_RSP_TYPE_R1, NULL, 0);
                 }
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -3106,7 +3116,7 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)
         ptr = rtsx_get_cmd_data(chip);
         if (ptr[0] & SD_TRANSFER_ERR) {
                 sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                                SD_RSP_TYPE_R1, NULL, 0);
+                                    SD_RSP_TYPE_R1, NULL, 0);
                 rtsx_trace(chip);
                 return STATUS_FAIL;
         }
@@ -3132,8 +3142,8 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)
                         SET_MMC_26M(sd_card);
                 }
 
-                retval = sd_send_cmd_get_rsp(chip, SWITCH,
-                                0x03B90100, SD_RSP_TYPE_R1b, rsp, 5);
+                retval = sd_send_cmd_get_rsp(chip, SWITCH, 0x03B90100,
+                                             SD_RSP_TYPE_R1b, rsp, 5);
                 if ((retval != STATUS_SUCCESS) || (rsp[4] & MMC_SWITCH_ERR))
                         CLR_MMC_HS(sd_card);
         }
@@ -3178,7 +3188,7 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)
 
 static int reset_mmc(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval, i = 0, j = 0, k = 0;
         bool switch_ddr = true;
         u8 rsp[16];
@@ -3190,7 +3200,7 @@ static int reset_mmc(struct rtsx_chip *chip)
                 goto MMC_UNLOCK_ENTRY;
 #endif
 
-Switch_Fail:
+switch_fail:
         retval = sd_prepare_reset(chip);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
@@ -3201,7 +3211,7 @@ Switch_Fail:
 
 RTY_MMC_RST:
         retval = sd_send_cmd_get_rsp(chip, GO_IDLE_STATE, 0, SD_RSP_TYPE_R0,
-                                NULL, 0);
+                                     NULL, 0);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -3215,11 +3225,11 @@ RTY_MMC_RST:
                 }
 
                 retval = sd_send_cmd_get_rsp(chip, SEND_OP_COND,
-                                        (SUPPORT_VOLTAGE | 0x40000000),
-                                        SD_RSP_TYPE_R3, rsp, 5);
+                                             (SUPPORT_VOLTAGE | 0x40000000),
+                                             SD_RSP_TYPE_R3, rsp, 5);
                 if (retval != STATUS_SUCCESS) {
                         if (sd_check_err_code(chip, SD_BUSY) ||
-                                sd_check_err_code(chip, SD_TO_ERR)) {
+                            sd_check_err_code(chip, SD_TO_ERR)) {
                                 k++;
                                 if (k < 20) {
                                         sd_clr_err_code(chip);
@@ -3255,7 +3265,7 @@ RTY_MMC_RST:
                 CLR_MMC_SECTOR_MODE(sd_card);
 
         retval = sd_send_cmd_get_rsp(chip, ALL_SEND_CID, 0, SD_RSP_TYPE_R2,
-                                NULL, 0);
+                                     NULL, 0);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -3263,7 +3273,7 @@ RTY_MMC_RST:
 
         sd_card->sd_addr = 0x00100000;
         retval = sd_send_cmd_get_rsp(chip, SET_RELATIVE_ADDR, sd_card->sd_addr,
-                                SD_RSP_TYPE_R6, rsp, 5);
+                                     SD_RSP_TYPE_R6, rsp, 5);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -3284,7 +3294,7 @@ RTY_MMC_RST:
         }
 
         retval = sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, 0x200, SD_RSP_TYPE_R1,
-                                NULL, 0);
+                                     NULL, 0);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
                 return STATUS_FAIL;
@@ -3319,7 +3329,7 @@ MMC_UNLOCK_ENTRY:
                                 }
                                 sd_card->mmc_dont_switch_bus = 1;
                                 rtsx_trace(chip);
-                                goto Switch_Fail;
+                                goto switch_fail;
                         }
                 }
 
@@ -3345,7 +3355,7 @@ MMC_UNLOCK_ENTRY:
 
                                 switch_ddr = false;
                                 rtsx_trace(chip);
-                                goto Switch_Fail;
+                                goto switch_fail;
                         }
 
                         retval = sd_wait_state_data_ready(chip, 0x08, 1, 1000);
@@ -3360,7 +3370,7 @@ MMC_UNLOCK_ENTRY:
 
                                         switch_ddr = false;
                                         rtsx_trace(chip);
-                                        goto Switch_Fail;
+                                        goto switch_fail;
                                 }
                         }
                 }
@@ -3392,7 +3402,7 @@ MMC_UNLOCK_ENTRY:
 
 int reset_sd_card(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
 
         sd_init_reg_addr(chip);
@@ -3407,7 +3417,7 @@ int reset_sd_card(struct rtsx_chip *chip)
         }
 
         if (chip->ignore_sd && CHK_SDIO_EXIST(chip) &&
-                !CHK_SDIO_IGNORED(chip)) {
+            !CHK_SDIO_IGNORED(chip)) {
                 if (chip->asic_code) {
                         retval = sd_pull_ctl_enable(chip);
                         if (retval != STATUS_SUCCESS) {
@@ -3416,7 +3426,8 @@ int reset_sd_card(struct rtsx_chip *chip)
                         }
                 } else {
                         retval = rtsx_write_register(chip, FPGA_PULL_CTL,
-                                                FPGA_SD_PULL_CTL_BIT | 0x20, 0);
+                                                     FPGA_SD_PULL_CTL_BIT |
+                                                     0x20, 0);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
@@ -3505,7 +3516,7 @@ int reset_sd_card(struct rtsx_chip *chip)
 
 static int reset_mmc_only(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
 
         sd_card->sd_type = 0;
@@ -3574,7 +3585,7 @@ static int reset_mmc_only(struct rtsx_chip *chip)
 
 static int wait_data_buf_ready(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int i, retval;
 
         for (i = 0; i < WAIT_DATA_READY_RTY_CNT; i++) {
@@ -3587,7 +3598,8 @@ static int wait_data_buf_ready(struct rtsx_chip *chip)
                 sd_card->sd_data_buf_ready = 0;
 
                 retval = sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                sd_card->sd_addr, SD_RSP_TYPE_R1, NULL, 0);
+                                             sd_card->sd_addr, SD_RSP_TYPE_R1,
+                                             NULL, 0);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -3607,7 +3619,7 @@ static int wait_data_buf_ready(struct rtsx_chip *chip)
 
 void sd_stop_seq_mode(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
 
         if (sd_card->seq_mode) {
@@ -3616,7 +3628,7 @@ void sd_stop_seq_mode(struct rtsx_chip *chip)
                         return;
 
                 retval = sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION, 0,
-                                SD_RSP_TYPE_R1b, NULL, 0);
+                                             SD_RSP_TYPE_R1b, NULL, 0);
                 if (retval != STATUS_SUCCESS)
                         sd_set_err_code(chip, SD_STS_ERR);
 
@@ -3632,7 +3644,7 @@ void sd_stop_seq_mode(struct rtsx_chip *chip)
 
 static inline int sd_auto_tune_clock(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
 
         if (chip->asic_code) {
@@ -3679,9 +3691,9 @@ static inline int sd_auto_tune_clock(struct rtsx_chip *chip)
 }
 
 int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
-        u16 sector_cnt)
+          u16 sector_cnt)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         u32 data_addr;
         u8 cfg2;
         int retval;
@@ -3730,20 +3742,20 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
         }
 
         if (sd_card->seq_mode &&
-                ((sd_card->pre_dir != srb->sc_data_direction) ||
-                        ((sd_card->pre_sec_addr + sd_card->pre_sec_cnt) !=
-                                start_sector))) {
-                if ((sd_card->pre_sec_cnt < 0x80)
-                                && (sd_card->pre_dir == DMA_FROM_DEVICE)
-                                && !CHK_SD30_SPEED(sd_card)
-                                && !CHK_SD_HS(sd_card)
-                                && !CHK_MMC_HS(sd_card)) {
+            ((sd_card->pre_dir != srb->sc_data_direction) ||
+            ((sd_card->pre_sec_addr + sd_card->pre_sec_cnt) !=
+            start_sector))) {
+                if ((sd_card->pre_sec_cnt < 0x80) &&
+                    (sd_card->pre_dir == DMA_FROM_DEVICE) &&
+                    !CHK_SD30_SPEED(sd_card) &&
+                    !CHK_SD_HS(sd_card) &&
+                    !CHK_MMC_HS(sd_card)) {
                         sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                                        SD_RSP_TYPE_R1, NULL, 0);
+                                            SD_RSP_TYPE_R1, NULL, 0);
                 }
 
-                retval = sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION,
-                                0, SD_RSP_TYPE_R1b, NULL, 0);
+                retval = sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION, 0,
+                                             SD_RSP_TYPE_R1b, NULL, 0);
                 if (retval != STATUS_SUCCESS) {
                         chip->rw_need_retry = 1;
                         sd_set_err_code(chip, SD_STS_ERR);
@@ -3760,12 +3772,12 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
                         goto RW_FAIL;
                 }
 
-                if ((sd_card->pre_sec_cnt < 0x80)
-                                && !CHK_SD30_SPEED(sd_card)
-                                && !CHK_SD_HS(sd_card)
-                                && !CHK_MMC_HS(sd_card)) {
+                if ((sd_card->pre_sec_cnt < 0x80) &&
+                    !CHK_SD30_SPEED(sd_card) &&
+                    !CHK_SD_HS(sd_card) &&
+                    !CHK_MMC_HS(sd_card)) {
                         sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
-                                        SD_RSP_TYPE_R1, NULL, 0);
+                                            SD_RSP_TYPE_R1, NULL, 0);
                 }
         }
 
@@ -3774,30 +3786,30 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF, 0x00);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF, 0x02);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF,
-                (u8)sector_cnt);
+                     (u8)sector_cnt);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF,
-                (u8)(sector_cnt >> 8));
+                     (u8)(sector_cnt >> 8));
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
 
         if (CHK_MMC_8BIT(sd_card))
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1,
-                        0x03, SD_BUS_WIDTH_8);
+                             0x03, SD_BUS_WIDTH_8);
         else if (CHK_MMC_4BIT(sd_card) || CHK_SD(sd_card))
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1,
-                        0x03, SD_BUS_WIDTH_4);
+                             0x03, SD_BUS_WIDTH_4);
         else
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1,
-                        0x03, SD_BUS_WIDTH_1);
+                             0x03, SD_BUS_WIDTH_1);
 
         if (sd_card->seq_mode) {
-                cfg2 = SD_NO_CALCULATE_CRC7 | SD_CHECK_CRC16|
+                cfg2 = SD_NO_CALCULATE_CRC7 | SD_CHECK_CRC16 |
                         SD_NO_WAIT_BUSY_END | SD_NO_CHECK_CRC7 |
                         SD_RSP_LEN_0;
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF, cfg2);
 
                 trans_dma_enable(srb->sc_data_direction, chip, sector_cnt * 512,
-                                DMA_512);
+                                 DMA_512);
 
                 if (srb->sc_data_direction == DMA_FROM_DEVICE) {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
@@ -3808,7 +3820,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
                 }
 
                 rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER,
-                        SD_TRANSFER_END, SD_TRANSFER_END);
+                             SD_TRANSFER_END, SD_TRANSFER_END);
 
                 rtsx_send_cmd_no_wait(chip);
         } else {
@@ -3818,22 +3830,22 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
                         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD0, 0xFF,
                                      0x40 | READ_MULTIPLE_BLOCK);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD1, 0xFF,
-                                (u8)(data_addr >> 24));
+                                     (u8)(data_addr >> 24));
                         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD2, 0xFF,
-                                (u8)(data_addr >> 16));
+                                     (u8)(data_addr >> 16));
                         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD3, 0xFF,
-                                (u8)(data_addr >> 8));
+                                     (u8)(data_addr >> 8));
                         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD4, 0xFF,
-                                (u8)data_addr);
+                                     (u8)data_addr);
 
                         cfg2 = SD_CALCULATE_CRC7 | SD_CHECK_CRC16 |
                                 SD_NO_WAIT_BUSY_END | SD_CHECK_CRC7 |
                                 SD_RSP_LEN_6;
                         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF,
-                                cfg2);
+                                     cfg2);
 
                         trans_dma_enable(srb->sc_data_direction, chip,
-                                        sector_cnt * 512, DMA_512);
+                                         sector_cnt * 512, DMA_512);
 
                         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
                                      SD_TM_AUTO_READ_2 | SD_TRANSFER_START);
@@ -3861,7 +3873,8 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
                         }
 
                         retval = sd_send_cmd_get_rsp(chip, WRITE_MULTIPLE_BLOCK,
-                                        data_addr, SD_RSP_TYPE_R1, NULL, 0);
+                                                     data_addr, SD_RSP_TYPE_R1,
+                                                     NULL, 0);
                         if (retval != STATUS_SUCCESS) {
                                 chip->rw_need_retry = 1;
                                 rtsx_trace(chip);
@@ -3874,10 +3887,10 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
                                 SD_NO_WAIT_BUSY_END |
                                 SD_NO_CHECK_CRC7 | SD_RSP_LEN_0;
                         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF,
-                                cfg2);
+                                     cfg2);
 
                         trans_dma_enable(srb->sc_data_direction, chip,
-                                        sector_cnt * 512, DMA_512);
+                                         sector_cnt * 512, DMA_512);
 
                         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
                                      SD_TM_AUTO_WRITE_3 | SD_TRANSFER_START);
@@ -3891,7 +3904,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
         }
 
         retval = rtsx_transfer_data(chip, SD_CARD, scsi_sglist(srb),
-                                scsi_bufflen(srb), scsi_sg_count(srb),
+                                    scsi_bufflen(srb), scsi_sg_count(srb),
                                 srb->sc_data_direction, chip->sd_timeout);
         if (retval < 0) {
                 u8 stat = 0;
@@ -3916,7 +3929,7 @@ int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip, u32 start_sector,
                 chip->rw_need_retry = 1;
 
                 retval = sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION, 0,
-                                        SD_RSP_TYPE_R1b, NULL, 0);
+                                             SD_RSP_TYPE_R1b, NULL, 0);
                 if (retval != STATUS_SUCCESS) {
                         sd_set_err_code(chip, SD_STS_ERR);
                         rtsx_trace(chip);
@@ -3984,8 +3997,9 @@ int soft_reset_sd_card(struct rtsx_chip *chip)
         return reset_sd(chip);
 }
 
-int ext_sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,
-                u32 arg, u8 rsp_type, u8 *rsp, int rsp_len, bool special_check)
+int ext_sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx, u32 arg,
+                            u8 rsp_type, u8 *rsp, int rsp_len,
+                            bool special_check)
 {
         int retval;
         int timeout = 100;
@@ -4011,11 +4025,11 @@ RTY_SEND_CMD:
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF, rsp_type);
         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE,
-                        0x01, PINGPONG_BUFFER);
+                     0x01, PINGPONG_BUFFER);
         rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER,
-                        0xFF, SD_TM_CMD_RSP | SD_TRANSFER_START);
+                     0xFF, SD_TM_CMD_RSP | SD_TRANSFER_START);
         rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER, SD_TRANSFER_END,
-                SD_TRANSFER_END);
+                     SD_TRANSFER_END);
 
         if (rsp_type == SD_RSP_TYPE_R2) {
                 for (reg_addr = PPBUF_BASE2; reg_addr < PPBUF_BASE2 + 16;
@@ -4084,7 +4098,7 @@ RTY_SEND_CMD:
         }
 
         if ((cmd_idx == SELECT_CARD) || (cmd_idx == APP_CMD) ||
-                (cmd_idx == SEND_STATUS) || (cmd_idx == STOP_TRANSMISSION)) {
+            (cmd_idx == SEND_STATUS) || (cmd_idx == STOP_TRANSMISSION)) {
                 if ((cmd_idx != STOP_TRANSMISSION) && !special_check) {
                         if (ptr[1] & 0x80) {
                                 rtsx_trace(chip);
@@ -4172,7 +4186,7 @@ int ext_sd_get_rsp(struct rtsx_chip *chip, int len, u8 *rsp, u8 rsp_type)
 
 int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         unsigned int lun = SCSI_LUN(srb);
         int len;
         u8 buf[18] = {
@@ -4206,9 +4220,9 @@ int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         }
 
         if ((srb->cmnd[2] != 0x53) || (srb->cmnd[3] != 0x44) ||
-                (srb->cmnd[4] != 0x20) || (srb->cmnd[5] != 0x43) ||
-                (srb->cmnd[6] != 0x61) || (srb->cmnd[7] != 0x72) ||
-                (srb->cmnd[8] != 0x64)) {
+            (srb->cmnd[4] != 0x20) || (srb->cmnd[5] != 0x43) ||
+            (srb->cmnd[6] != 0x61) || (srb->cmnd[7] != 0x72) ||
+            (srb->cmnd[8] != 0x64)) {
                 set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
@@ -4245,7 +4259,7 @@ int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 }
 
 static inline int get_rsp_type(struct scsi_cmnd *srb, u8 *rsp_type,
-                        int *rsp_len)
+                               int *rsp_len)
 {
         if (!rsp_type || !rsp_len)
                 return STATUS_FAIL;
@@ -4285,7 +4299,7 @@ static inline int get_rsp_type(struct scsi_cmnd *srb, u8 *rsp_type,
 
 int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         unsigned int lun = SCSI_LUN(srb);
         int retval, rsp_len;
         u8 cmd_idx, rsp_type;
@@ -4339,7 +4353,7 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         if ((sd_card->sd_lock_status & SD_LOCK_1BIT_MODE) == 0) {
                 if (CHK_MMC_8BIT(sd_card)) {
                         retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03,
-                                                SD_BUS_WIDTH_8);
+                                                     SD_BUS_WIDTH_8);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
                                 return TRANSPORT_FAILED;
@@ -4347,7 +4361,7 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 } else if (CHK_SD(sd_card) || CHK_MMC_4BIT(sd_card)) {
                         retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03,
-                                                SD_BUS_WIDTH_4);
+                                                     SD_BUS_WIDTH_4);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
                                 return TRANSPORT_FAILED;
@@ -4366,32 +4380,33 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 retval = sd_select_card(chip, 0);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Cmd_Failed;
+                        goto sd_execute_cmd_failed;
                 }
         }
 
         if (acmd) {
                 retval = ext_sd_send_cmd_get_rsp(chip, APP_CMD,
-                                                sd_card->sd_addr,
-                                                SD_RSP_TYPE_R1, NULL, 0, false);
+                                                 sd_card->sd_addr,
+                                                 SD_RSP_TYPE_R1, NULL, 0,
+                                                 false);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Cmd_Failed;
+                        goto sd_execute_cmd_failed;
                 }
         }
 
         retval = ext_sd_send_cmd_get_rsp(chip, cmd_idx, arg, rsp_type,
-                        sd_card->rsp, rsp_len, false);
+                                         sd_card->rsp, rsp_len, false);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
-                goto SD_Execute_Cmd_Failed;
+                goto sd_execute_cmd_failed;
         }
 
         if (standby) {
                 retval = sd_select_card(chip, 1);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Cmd_Failed;
+                        goto sd_execute_cmd_failed;
                 }
         }
 
@@ -4399,14 +4414,14 @@ int sd_execute_no_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         retval = sd_update_lock_status(chip);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
-                goto SD_Execute_Cmd_Failed;
+                goto sd_execute_cmd_failed;
         }
 #endif
 
         scsi_set_resid(srb, 0);
         return TRANSPORT_GOOD;
 
-SD_Execute_Cmd_Failed:
+sd_execute_cmd_failed:
         sd_card->pre_cmd_err = 1;
         set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
         release_sd_card(chip);
@@ -4420,7 +4435,7 @@ SD_Execute_Cmd_Failed:
 
 int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         unsigned int lun = SCSI_LUN(srb);
         int retval, rsp_len, i;
         bool read_err = false, cmd13_checkbit = false;
@@ -4492,10 +4507,11 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         if (data_len < 512) {
                 retval = ext_sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, data_len,
-                                SD_RSP_TYPE_R1, NULL, 0, false);
+                                                 SD_RSP_TYPE_R1, NULL, 0,
+                                                 false);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Read_Cmd_Failed;
+                        goto sd_execute_read_cmd_failed;
                 }
         }
 
@@ -4503,17 +4519,18 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 retval = sd_select_card(chip, 0);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Read_Cmd_Failed;
+                        goto sd_execute_read_cmd_failed;
                 }
         }
 
         if (acmd) {
                 retval = ext_sd_send_cmd_get_rsp(chip, APP_CMD,
-                                                sd_card->sd_addr,
-                                                SD_RSP_TYPE_R1, NULL, 0, false);
+                                                 sd_card->sd_addr,
+                                                 SD_RSP_TYPE_R1, NULL, 0,
+                                                 false);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Read_Cmd_Failed;
+                        goto sd_execute_read_cmd_failed;
                 }
         }
 
@@ -4539,13 +4556,13 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 }
 
                 retval = sd_read_data(chip, SD_TM_NORMAL_READ, cmd, 5, byte_cnt,
-                                       blk_cnt, bus_width, buf, data_len, 2000);
+                                      blk_cnt, bus_width, buf, data_len, 2000);
                 if (retval != STATUS_SUCCESS) {
                         read_err = true;
                         kfree(buf);
                         rtsx_clear_sd_error(chip);
                         rtsx_trace(chip);
-                        goto SD_Execute_Read_Cmd_Failed;
+                        goto sd_execute_read_cmd_failed;
                 }
 
                 min_len = min(data_len, scsi_bufflen(srb));
@@ -4558,24 +4575,24 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 trans_dma_enable(DMA_FROM_DEVICE, chip, data_len, DMA_512);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF,
-                        0x02);
+                             0x02);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF,
-                        0x00);
+                             0x00);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H,
-                                0xFF, (srb->cmnd[7] & 0xFE) >> 1);
+                             0xFF, (srb->cmnd[7] & 0xFE) >> 1);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L,
-                                0xFF, (u8)((data_len & 0x0001FE00) >> 9));
+                             0xFF, (u8)((data_len & 0x0001FE00) >> 9));
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD0, 0xFF,
-                        0x40 | cmd_idx);
+                             0x40 | cmd_idx);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD1, 0xFF,
-                        srb->cmnd[3]);
+                             srb->cmnd[3]);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD2, 0xFF,
-                        srb->cmnd[4]);
+                             srb->cmnd[4]);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD3, 0xFF,
-                        srb->cmnd[5]);
+                             srb->cmnd[5]);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CMD4, 0xFF,
-                        srb->cmnd[6]);
+                             srb->cmnd[6]);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG1, 0x03, bus_width);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_CFG2, 0xFF, rsp_type);
@@ -4583,66 +4600,69 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER,
                              0xFF, SD_TM_AUTO_READ_2 | SD_TRANSFER_START);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER,
-                        SD_TRANSFER_END, SD_TRANSFER_END);
+                             SD_TRANSFER_END, SD_TRANSFER_END);
 
                 rtsx_send_cmd_no_wait(chip);
 
                 retval = rtsx_transfer_data(chip, SD_CARD, scsi_sglist(srb),
-                                        scsi_bufflen(srb), scsi_sg_count(srb),
-                                        DMA_FROM_DEVICE, 10000);
+                                            scsi_bufflen(srb),
+                                            scsi_sg_count(srb),
+                                            DMA_FROM_DEVICE, 10000);
                 if (retval < 0) {
                         read_err = true;
                         rtsx_clear_sd_error(chip);
                         rtsx_trace(chip);
-                        goto SD_Execute_Read_Cmd_Failed;
+                        goto sd_execute_read_cmd_failed;
                 }
 
         } else {
                 rtsx_trace(chip);
-                goto SD_Execute_Read_Cmd_Failed;
+                goto sd_execute_read_cmd_failed;
         }
 
         retval = ext_sd_get_rsp(chip, rsp_len, sd_card->rsp, rsp_type);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
-                goto SD_Execute_Read_Cmd_Failed;
+                goto sd_execute_read_cmd_failed;
         }
 
         if (standby) {
                 retval = sd_select_card(chip, 1);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Read_Cmd_Failed;
+                        goto sd_execute_read_cmd_failed;
                 }
         }
 
         if (send_cmd12) {
-                retval = ext_sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION,
-                                0, SD_RSP_TYPE_R1b, NULL, 0, false);
+                retval = ext_sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION, 0,
+                                                 SD_RSP_TYPE_R1b, NULL, 0,
+                                                 false);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Read_Cmd_Failed;
+                        goto sd_execute_read_cmd_failed;
                 }
         }
 
         if (data_len < 512) {
                 retval = ext_sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, 0x200,
-                                SD_RSP_TYPE_R1, NULL, 0, false);
+                                                 SD_RSP_TYPE_R1, NULL, 0,
+                                                 false);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Read_Cmd_Failed;
+                        goto sd_execute_read_cmd_failed;
                 }
 
                 retval = rtsx_write_register(chip, SD_BYTE_CNT_H, 0xFF, 0x02);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Read_Cmd_Failed;
+                        goto sd_execute_read_cmd_failed;
                 }
 
                 retval = rtsx_write_register(chip, SD_BYTE_CNT_L, 0xFF, 0x00);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Read_Cmd_Failed;
+                        goto sd_execute_read_cmd_failed;
                 }
         }
 
@@ -4651,7 +4671,7 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         for (i = 0; i < 3; i++) {
                 retval = ext_sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                                sd_card->sd_addr,
+                                                 sd_card->sd_addr,
                                                 SD_RSP_TYPE_R1, NULL, 0,
                                                 cmd13_checkbit);
                 if (retval == STATUS_SUCCESS)
@@ -4659,13 +4679,13 @@ int sd_execute_read_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         }
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
-                goto SD_Execute_Read_Cmd_Failed;
+                goto sd_execute_read_cmd_failed;
         }
 
         scsi_set_resid(srb, 0);
         return TRANSPORT_GOOD;
 
-SD_Execute_Read_Cmd_Failed:
+sd_execute_read_cmd_failed:
         sd_card->pre_cmd_err = 1;
         set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
         if (read_err)
@@ -4682,7 +4702,7 @@ SD_Execute_Read_Cmd_Failed:
 
 int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         unsigned int lun = SCSI_LUN(srb);
         int retval, rsp_len, i;
         bool write_err = false, cmd13_checkbit = false;
@@ -4754,7 +4774,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         if ((sd_card->sd_lock_status & SD_LOCK_1BIT_MODE) == 0) {
                 if (CHK_MMC_8BIT(sd_card)) {
                         retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03,
-                                                SD_BUS_WIDTH_8);
+                                                     SD_BUS_WIDTH_8);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
                                 return TRANSPORT_FAILED;
@@ -4762,7 +4782,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 } else if (CHK_SD(sd_card) || CHK_MMC_4BIT(sd_card)) {
                         retval = rtsx_write_register(chip, REG_SD_CFG1, 0x03,
-                                                SD_BUS_WIDTH_4);
+                                                     SD_BUS_WIDTH_4);
                         if (retval != STATUS_SUCCESS) {
                                 rtsx_trace(chip);
                                 return TRANSPORT_FAILED;
@@ -4779,10 +4799,11 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         if (data_len < 512) {
                 retval = ext_sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, data_len,
-                                SD_RSP_TYPE_R1, NULL, 0, false);
+                                                 SD_RSP_TYPE_R1, NULL, 0,
+                                                 false);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Write_Cmd_Failed;
+                        goto sd_execute_write_cmd_failed;
                 }
         }
 
@@ -4790,25 +4811,26 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 retval = sd_select_card(chip, 0);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Write_Cmd_Failed;
+                        goto sd_execute_write_cmd_failed;
                 }
         }
 
         if (acmd) {
                 retval = ext_sd_send_cmd_get_rsp(chip, APP_CMD,
-                                                sd_card->sd_addr,
-                                                SD_RSP_TYPE_R1, NULL, 0, false);
+                                                 sd_card->sd_addr,
+                                                 SD_RSP_TYPE_R1, NULL, 0,
+                                                 false);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Write_Cmd_Failed;
+                        goto sd_execute_write_cmd_failed;
                 }
         }
 
         retval = ext_sd_send_cmd_get_rsp(chip, cmd_idx, arg, rsp_type,
-                        sd_card->rsp, rsp_len, false);
+                                         sd_card->rsp, rsp_len, false);
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
-                goto SD_Execute_Write_Cmd_Failed;
+                goto sd_execute_write_cmd_failed;
         }
 
         if (data_len <= 512) {
@@ -4832,37 +4854,37 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                         rtsx_init_cmd(chip);
                         for (i = 0; i < 256; i++) {
                                 rtsx_add_cmd(chip, WRITE_REG_CMD,
-                                                PPBUF_BASE2 + i, 0xFF, buf[i]);
+                                             PPBUF_BASE2 + i, 0xFF, buf[i]);
                         }
                         retval = rtsx_send_cmd(chip, 0, 250);
                         if (retval != STATUS_SUCCESS) {
                                 kfree(buf);
                                 rtsx_trace(chip);
-                                goto SD_Execute_Write_Cmd_Failed;
+                                goto sd_execute_write_cmd_failed;
                         }
 
                         rtsx_init_cmd(chip);
                         for (i = 256; i < data_len; i++) {
                                 rtsx_add_cmd(chip, WRITE_REG_CMD,
-                                                PPBUF_BASE2 + i, 0xFF, buf[i]);
+                                             PPBUF_BASE2 + i, 0xFF, buf[i]);
                         }
                         retval = rtsx_send_cmd(chip, 0, 250);
                         if (retval != STATUS_SUCCESS) {
                                 kfree(buf);
                                 rtsx_trace(chip);
-                                goto SD_Execute_Write_Cmd_Failed;
+                                goto sd_execute_write_cmd_failed;
                         }
                 } else {
                         rtsx_init_cmd(chip);
                         for (i = 0; i < data_len; i++) {
                                 rtsx_add_cmd(chip, WRITE_REG_CMD,
-                                                PPBUF_BASE2 + i, 0xFF, buf[i]);
+                                             PPBUF_BASE2 + i, 0xFF, buf[i]);
                         }
                         retval = rtsx_send_cmd(chip, 0, 250);
                         if (retval != STATUS_SUCCESS) {
                                 kfree(buf);
                                 rtsx_trace(chip);
-                                goto SD_Execute_Write_Cmd_Failed;
+                                goto sd_execute_write_cmd_failed;
                         }
                 }
 
@@ -4871,20 +4893,20 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 rtsx_init_cmd(chip);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF,
-                        srb->cmnd[8] & 0x03);
+                             srb->cmnd[8] & 0x03);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF,
-                        srb->cmnd[9]);
+                             srb->cmnd[9]);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H, 0xFF,
-                        0x00);
+                             0x00);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L, 0xFF,
-                        0x01);
+                             0x01);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01,
-                        PINGPONG_BUFFER);
+                             PINGPONG_BUFFER);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
                              SD_TM_AUTO_WRITE_3 | SD_TRANSFER_START);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER,
-                        SD_TRANSFER_END, SD_TRANSFER_END);
+                             SD_TRANSFER_END, SD_TRANSFER_END);
 
                 retval = rtsx_send_cmd(chip, SD_CARD, 250);
         } else if (!(data_len & 0x1FF)) {
@@ -4893,35 +4915,36 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 trans_dma_enable(DMA_TO_DEVICE, chip, data_len, DMA_512);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_H, 0xFF,
-                        0x02);
+                             0x02);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BYTE_CNT_L, 0xFF,
-                        0x00);
+                             0x00);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_H,
-                                0xFF, (srb->cmnd[7] & 0xFE) >> 1);
+                             0xFF, (srb->cmnd[7] & 0xFE) >> 1);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_BLOCK_CNT_L,
-                                0xFF, (u8)((data_len & 0x0001FE00) >> 9));
+                             0xFF, (u8)((data_len & 0x0001FE00) >> 9));
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, REG_SD_TRANSFER, 0xFF,
-                        SD_TM_AUTO_WRITE_3 | SD_TRANSFER_START);
+                             SD_TM_AUTO_WRITE_3 | SD_TRANSFER_START);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, REG_SD_TRANSFER,
-                        SD_TRANSFER_END, SD_TRANSFER_END);
+                             SD_TRANSFER_END, SD_TRANSFER_END);
 
                 rtsx_send_cmd_no_wait(chip);
 
                 retval = rtsx_transfer_data(chip, SD_CARD, scsi_sglist(srb),
-                                        scsi_bufflen(srb), scsi_sg_count(srb),
-                                        DMA_TO_DEVICE, 10000);
+                                            scsi_bufflen(srb),
+                                            scsi_sg_count(srb),
+                                            DMA_TO_DEVICE, 10000);
 
         } else {
                 rtsx_trace(chip);
-                goto SD_Execute_Write_Cmd_Failed;
+                goto sd_execute_write_cmd_failed;
         }
 
         if (retval < 0) {
                 write_err = true;
                 rtsx_clear_sd_error(chip);
                 rtsx_trace(chip);
-                goto SD_Execute_Write_Cmd_Failed;
+                goto sd_execute_write_cmd_failed;
         }
 
 #ifdef SUPPORT_SD_LOCK
@@ -4949,37 +4972,39 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 retval = sd_select_card(chip, 1);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Write_Cmd_Failed;
+                        goto sd_execute_write_cmd_failed;
                 }
         }
 
         if (send_cmd12) {
-                retval = ext_sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION,
-                                0, SD_RSP_TYPE_R1b, NULL, 0, false);
+                retval = ext_sd_send_cmd_get_rsp(chip, STOP_TRANSMISSION, 0,
+                                                 SD_RSP_TYPE_R1b, NULL, 0,
+                                                 false);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Write_Cmd_Failed;
+                        goto sd_execute_write_cmd_failed;
                 }
         }
 
         if (data_len < 512) {
                 retval = ext_sd_send_cmd_get_rsp(chip, SET_BLOCKLEN, 0x200,
-                                SD_RSP_TYPE_R1, NULL, 0, false);
+                                                 SD_RSP_TYPE_R1, NULL, 0,
+                                                 false);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Write_Cmd_Failed;
+                        goto sd_execute_write_cmd_failed;
                 }
 
                 retval = rtsx_write_register(chip, SD_BYTE_CNT_H, 0xFF, 0x02);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Write_Cmd_Failed;
+                        goto sd_execute_write_cmd_failed;
                 }
 
                 rtsx_write_register(chip, SD_BYTE_CNT_L, 0xFF, 0x00);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
-                        goto SD_Execute_Write_Cmd_Failed;
+                        goto sd_execute_write_cmd_failed;
                 }
         }
 
@@ -4988,15 +5013,15 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
         for (i = 0; i < 3; i++) {
                 retval = ext_sd_send_cmd_get_rsp(chip, SEND_STATUS,
-                                                sd_card->sd_addr,
-                                                SD_RSP_TYPE_R1, NULL, 0,
-                                                cmd13_checkbit);
+                                                 sd_card->sd_addr,
+                                                 SD_RSP_TYPE_R1, NULL, 0,
+                                                 cmd13_checkbit);
                 if (retval == STATUS_SUCCESS)
                         break;
         }
         if (retval != STATUS_SUCCESS) {
                 rtsx_trace(chip);
-                goto SD_Execute_Write_Cmd_Failed;
+                goto sd_execute_write_cmd_failed;
         }
 
 #ifdef SUPPORT_SD_LOCK
@@ -5024,7 +5049,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                                                 if (retval != STATUS_SUCCESS) {
                                                         sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | SD_SDR_RST);
                                                         rtsx_trace(chip);
-                                                        goto SD_Execute_Write_Cmd_Failed;
+                                                        goto sd_execute_write_cmd_failed;
                                                 }
                                         }
 
@@ -5045,7 +5070,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         scsi_set_resid(srb, 0);
         return TRANSPORT_GOOD;
 
-SD_Execute_Write_Cmd_Failed:
+sd_execute_write_cmd_failed:
         sd_card->pre_cmd_err = 1;
         set_sense_type(chip, lun, SENSE_TYPE_NO_SENSE);
         if (write_err)
@@ -5062,7 +5087,7 @@ SD_Execute_Write_Cmd_Failed:
 
 int sd_get_cmd_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         unsigned int lun = SCSI_LUN(srb);
         int count;
         u16 data_len;
@@ -5104,7 +5129,7 @@ int sd_get_cmd_rsp(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
 int sd_hw_rst(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         unsigned int lun = SCSI_LUN(srb);
         int retval;
 
@@ -5122,9 +5147,9 @@ int sd_hw_rst(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         }
 
         if ((srb->cmnd[2] != 0x53) || (srb->cmnd[3] != 0x44) ||
-                (srb->cmnd[4] != 0x20) || (srb->cmnd[5] != 0x43) ||
-                (srb->cmnd[6] != 0x61) || (srb->cmnd[7] != 0x72) ||
-                (srb->cmnd[8] != 0x64)) {
+            (srb->cmnd[4] != 0x20) || (srb->cmnd[5] != 0x43) ||
+            (srb->cmnd[6] != 0x61) || (srb->cmnd[7] != 0x72) ||
+            (srb->cmnd[8] != 0x64)) {
                 set_sense_type(chip, lun, SENSE_TYPE_MEDIA_INVALID_CMD_FIELD);
                 rtsx_trace(chip);
                 return TRANSPORT_FAILED;
@@ -5174,7 +5199,7 @@ int sd_hw_rst(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
 void sd_cleanup_work(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
 
         if (sd_card->seq_mode) {
                 dev_dbg(rtsx_dev(chip), "SD: stop transmission\n");
@@ -5230,7 +5255,7 @@ int sd_power_off_card3v3(struct rtsx_chip *chip)
 
 int release_sd_card(struct rtsx_chip *chip)
 {
-        struct sd_info *sd_card = &(chip->sd_card);
+        struct sd_info *sd_card = &chip->sd_card;
         int retval;
 
         chip->card_ready &= ~SD_CARD;
diff --git a/drivers/staging/rts5208/sd.h b/drivers/staging/rts5208/sd.h
index 60b79280fb5f..55764e16b93a 100644
--- a/drivers/staging/rts5208/sd.h
+++ b/drivers/staging/rts5208/sd.h
@@ -280,14 +280,15 @@ int reset_sd_card(struct rtsx_chip *chip);
 int sd_switch_clock(struct rtsx_chip *chip);
 void sd_stop_seq_mode(struct rtsx_chip *chip);
 int sd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
-        u32 start_sector, u16 sector_cnt);
+          u32 start_sector, u16 sector_cnt);
 void sd_cleanup_work(struct rtsx_chip *chip);
 int sd_power_off_card3v3(struct rtsx_chip *chip);
 int release_sd_card(struct rtsx_chip *chip);
 #ifdef SUPPORT_CPRM
 int soft_reset_sd_card(struct rtsx_chip *chip);
 int ext_sd_send_cmd_get_rsp(struct rtsx_chip *chip, u8 cmd_idx,
-                u32 arg, u8 rsp_type, u8 *rsp, int rsp_len, bool special_check);
+                            u32 arg, u8 rsp_type, u8 *rsp, int rsp_len,
+                            bool special_check);
 int ext_sd_get_rsp(struct rtsx_chip *chip, int len, u8 *rsp, u8 rsp_type);
 
 int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rtsx_chip *chip);
diff --git a/drivers/staging/rts5208/spi.c b/drivers/staging/rts5208/spi.c
index 13c539c83838..8b8cd955dfeb 100644
--- a/drivers/staging/rts5208/spi.c
+++ b/drivers/staging/rts5208/spi.c
@@ -29,7 +29,7 @@
 
 static inline void spi_set_err_code(struct rtsx_chip *chip, u8 err_code)
 {
-        struct spi_info *spi = &(chip->spi);
+        struct spi_info *spi = &chip->spi;
 
         spi->err_code = err_code;
 }
@@ -57,7 +57,7 @@ static int spi_init(struct rtsx_chip *chip)
 
 static int spi_set_init_para(struct rtsx_chip *chip)
 {
-        struct spi_info *spi = &(chip->spi);
+        struct spi_info *spi = &chip->spi;
         int retval;
 
         retval = rtsx_write_register(chip, SPI_CLK_DIVIDER1, 0xFF,
@@ -117,9 +117,9 @@ static int sf_polling_status(struct rtsx_chip *chip, int msec)
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, SPI_RDSR);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                SPI_TRANSFER0_START | SPI_POLLING_MODE0);
+                     SPI_TRANSFER0_START | SPI_POLLING_MODE0);
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 
         retval = rtsx_send_cmd(chip, 0, msec);
         if (retval < 0) {
@@ -134,7 +134,7 @@ static int sf_polling_status(struct rtsx_chip *chip, int msec)
 
 static int sf_enable_write(struct rtsx_chip *chip, u8 ins)
 {
-        struct spi_info *spi = &(chip->spi);
+        struct spi_info *spi = &chip->spi;
         int retval;
 
         if (!spi->write_en)
@@ -144,11 +144,11 @@ static int sf_enable_write(struct rtsx_chip *chip, u8 ins)
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, ins);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF,
-                SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
+                     SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                SPI_TRANSFER0_START | SPI_C_MODE0);
+                     SPI_TRANSFER0_START | SPI_C_MODE0);
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 
         retval = rtsx_send_cmd(chip, 0, 100);
         if (retval < 0) {
@@ -163,7 +163,7 @@ static int sf_enable_write(struct rtsx_chip *chip, u8 ins)
 
 static int sf_disable_write(struct rtsx_chip *chip, u8 ins)
 {
-        struct spi_info *spi = &(chip->spi);
+        struct spi_info *spi = &chip->spi;
         int retval;
 
         if (!spi->write_en)
@@ -173,11 +173,11 @@ static int sf_disable_write(struct rtsx_chip *chip, u8 ins)
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, ins);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF,
-                SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
+                     SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                SPI_TRANSFER0_START | SPI_C_MODE0);
+                     SPI_TRANSFER0_START | SPI_C_MODE0);
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 
         retval = rtsx_send_cmd(chip, 0, 100);
         if (retval < 0) {
@@ -191,27 +191,27 @@ static int sf_disable_write(struct rtsx_chip *chip, u8 ins)
 }
 
 static void sf_program(struct rtsx_chip *chip, u8 ins, u8 addr_mode, u32 addr,
-                u16 len)
+                       u16 len)
 {
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, ins);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF,
-                SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
+                     SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH0, 0xFF, (u8)len);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH1, 0xFF, (u8)(len >> 8));
         if (addr_mode) {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR0, 0xFF, (u8)addr);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF,
-                        (u8)(addr >> 8));
+                             (u8)(addr >> 8));
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF,
-                        (u8)(addr >> 16));
+                             (u8)(addr >> 16));
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                        SPI_TRANSFER0_START | SPI_CADO_MODE0);
+                             SPI_TRANSFER0_START | SPI_CADO_MODE0);
         } else {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                        SPI_TRANSFER0_START | SPI_CDO_MODE0);
+                             SPI_TRANSFER0_START | SPI_CDO_MODE0);
         }
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 }
 
 static int sf_erase(struct rtsx_chip *chip, u8 ins, u8 addr_mode, u32 addr)
@@ -222,21 +222,21 @@ static int sf_erase(struct rtsx_chip *chip, u8 ins, u8 addr_mode, u32 addr)
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, ins);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF,
-                SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
+                     SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
         if (addr_mode) {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR0, 0xFF, (u8)addr);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF,
-                        (u8)(addr >> 8));
+                             (u8)(addr >> 8));
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF,
-                        (u8)(addr >> 16));
+                             (u8)(addr >> 16));
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                        SPI_TRANSFER0_START | SPI_CA_MODE0);
+                             SPI_TRANSFER0_START | SPI_CA_MODE0);
         } else {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                        SPI_TRANSFER0_START | SPI_C_MODE0);
+                             SPI_TRANSFER0_START | SPI_C_MODE0);
         }
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 
         retval = rtsx_send_cmd(chip, 0, 100);
         if (retval < 0) {
@@ -322,9 +322,9 @@ static int spi_eeprom_program_enable(struct rtsx_chip *chip)
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, 0x86);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, 0x13);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                SPI_TRANSFER0_START | SPI_CA_MODE0);
+                     SPI_TRANSFER0_START | SPI_CA_MODE0);
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 
         retval = rtsx_send_cmd(chip, 0, 100);
         if (retval < 0) {
@@ -358,9 +358,9 @@ int spi_erase_eeprom_chip(struct rtsx_chip *chip)
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, 0x12);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, 0x84);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                SPI_TRANSFER0_START | SPI_CA_MODE0);
+                     SPI_TRANSFER0_START | SPI_CA_MODE0);
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 
         retval = rtsx_send_cmd(chip, 0, 100);
         if (retval < 0) {
@@ -402,9 +402,9 @@ int spi_erase_eeprom_byte(struct rtsx_chip *chip, u16 addr)
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF, (u8)(addr >> 8));
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, 0x46);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                SPI_TRANSFER0_START | SPI_CA_MODE0);
+                     SPI_TRANSFER0_START | SPI_CA_MODE0);
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 
         retval = rtsx_send_cmd(chip, 0, 100);
         if (retval < 0) {
@@ -442,9 +442,9 @@ int spi_read_eeprom(struct rtsx_chip *chip, u16 addr, u8 *val)
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, 0x46);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH0, 0xFF, 1);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                SPI_TRANSFER0_START | SPI_CADI_MODE0);
+                     SPI_TRANSFER0_START | SPI_CADI_MODE0);
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 
         retval = rtsx_send_cmd(chip, 0, 100);
         if (retval < 0) {
@@ -497,9 +497,9 @@ int spi_write_eeprom(struct rtsx_chip *chip, u16 addr, u8 val)
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF, (u8)(addr >> 8));
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF, 0x4E);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                SPI_TRANSFER0_START | SPI_CA_MODE0);
+                     SPI_TRANSFER0_START | SPI_CA_MODE0);
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 
         retval = rtsx_send_cmd(chip, 0, 100);
         if (retval < 0) {
@@ -518,12 +518,12 @@ int spi_write_eeprom(struct rtsx_chip *chip, u16 addr, u8 val)
 
 int spi_get_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct spi_info *spi = &(chip->spi);
+        struct spi_info *spi = &chip->spi;
 
         dev_dbg(rtsx_dev(chip), "spi_get_status: err_code = 0x%x\n",
                 spi->err_code);
-        rtsx_stor_set_xfer_buf(&(spi->err_code),
-                        min_t(int, scsi_bufflen(srb), 1), srb);
+        rtsx_stor_set_xfer_buf(&spi->err_code,
+                               min_t(int, scsi_bufflen(srb), 1), srb);
         scsi_set_resid(srb, scsi_bufflen(srb) - 1);
 
         return STATUS_SUCCESS;
@@ -531,7 +531,7 @@ int spi_get_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
 int spi_set_parameter(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 {
-        struct spi_info *spi = &(chip->spi);
+        struct spi_info *spi = &chip->spi;
 
         spi_set_err_code(chip, SPI_NO_ERR);
 
@@ -574,37 +574,37 @@ int spi_read_flash_id(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         rtsx_init_cmd(chip);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01,
-                PINGPONG_BUFFER);
+                     PINGPONG_BUFFER);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, srb->cmnd[3]);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF, srb->cmnd[4]);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF, srb->cmnd[5]);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR0, 0xFF, srb->cmnd[6]);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF,
-                SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
+                     SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH1, 0xFF, srb->cmnd[7]);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH0, 0xFF, srb->cmnd[8]);
 
         if (len == 0) {
                 if (srb->cmnd[9]) {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0,
-                                      0xFF, SPI_TRANSFER0_START | SPI_CA_MODE0);
+                                     0xFF, SPI_TRANSFER0_START | SPI_CA_MODE0);
                 } else {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0,
-                                      0xFF, SPI_TRANSFER0_START | SPI_C_MODE0);
+                                     0xFF, SPI_TRANSFER0_START | SPI_C_MODE0);
                 }
         } else {
                 if (srb->cmnd[9]) {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                                SPI_TRANSFER0_START | SPI_CADI_MODE0);
+                                     SPI_TRANSFER0_START | SPI_CADI_MODE0);
                 } else {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                                SPI_TRANSFER0_START | SPI_CDI_MODE0);
+                                     SPI_TRANSFER0_START | SPI_CDI_MODE0);
                 }
         }
 
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 
         retval = rtsx_send_cmd(chip, 0, 100);
         if (retval < 0) {
@@ -682,38 +682,38 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 if (slow_read) {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR0, 0xFF,
-                                (u8)addr);
+                                     (u8)addr);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF,
-                                (u8)(addr >> 8));
+                                     (u8)(addr >> 8));
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF,
-                                (u8)(addr >> 16));
+                                     (u8)(addr >> 16));
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF,
-                                SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
+                                     SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
                 } else {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR1, 0xFF,
-                                (u8)addr);
+                                     (u8)addr);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR2, 0xFF,
-                                (u8)(addr >> 8));
+                                     (u8)(addr >> 8));
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_ADDR3, 0xFF,
-                                (u8)(addr >> 16));
+                                     (u8)(addr >> 16));
                         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF,
-                                SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_32);
+                                     SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_32);
                 }
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH1, 0xFF,
-                        (u8)(pagelen >> 8));
+                             (u8)(pagelen >> 8));
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH0, 0xFF,
-                        (u8)pagelen);
+                             (u8)pagelen);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                        SPI_TRANSFER0_START | SPI_CADI_MODE0);
+                             SPI_TRANSFER0_START | SPI_CADI_MODE0);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0,
-                        SPI_TRANSFER0_END, SPI_TRANSFER0_END);
+                             SPI_TRANSFER0_END, SPI_TRANSFER0_END);
 
                 rtsx_send_cmd_no_wait(chip);
 
                 retval = rtsx_transfer_data(chip, 0, buf, pagelen, 0,
-                                        DMA_FROM_DEVICE, 10000);
+                                            DMA_FROM_DEVICE, 10000);
                 if (retval < 0) {
                         kfree(buf);
                         rtsx_clear_spi_error(chip);
@@ -723,7 +723,7 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                 }
 
                 rtsx_stor_access_xfer_buf(buf, pagelen, srb, &index, &offset,
-                                        TO_XFER_BUF);
+                                          TO_XFER_BUF);
 
                 addr += pagelen;
                 len -= pagelen;
@@ -775,14 +775,14 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                         }
 
                         rtsx_stor_access_xfer_buf(buf, 1, srb, &index, &offset,
-                                                FROM_XFER_BUF);
+                                                  FROM_XFER_BUF);
 
                         rtsx_init_cmd(chip);
 
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE,
-                                0x01, PINGPONG_BUFFER);
+                                     0x01, PINGPONG_BUFFER);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, PPBUF_BASE2, 0xFF,
-                                buf[0]);
+                                     buf[0]);
                         sf_program(chip, ins, 1, addr, 1);
 
                         retval = rtsx_send_cmd(chip, 0, 100);
@@ -824,14 +824,14 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
 
                 while (len) {
                         rtsx_stor_access_xfer_buf(buf, 1, srb, &index, &offset,
-                                                FROM_XFER_BUF);
+                                                  FROM_XFER_BUF);
 
                         rtsx_init_cmd(chip);
 
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE,
-                                0x01, PINGPONG_BUFFER);
+                                     0x01, PINGPONG_BUFFER);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, PPBUF_BASE2, 0xFF,
-                                buf[0]);
+                                     buf[0]);
                         if (first_byte) {
                                 sf_program(chip, ins, 1, addr, 1);
                                 first_byte = 0;
@@ -899,10 +899,10 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
                         rtsx_send_cmd_no_wait(chip);
 
                         rtsx_stor_access_xfer_buf(buf, pagelen, srb, &index,
-                                                &offset, FROM_XFER_BUF);
+                                                  &offset, FROM_XFER_BUF);
 
                         retval = rtsx_transfer_data(chip, 0, buf, pagelen, 0,
-                                                DMA_TO_DEVICE, 100);
+                                                    DMA_TO_DEVICE, 100);
                         if (retval < 0) {
                                 kfree(buf);
                                 rtsx_clear_spi_error(chip);
@@ -1010,18 +1010,18 @@ int spi_write_flash_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
         rtsx_init_cmd(chip);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01,
-                PINGPONG_BUFFER);
+                     PINGPONG_BUFFER);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_COMMAND, 0xFF, ins);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_CA_NUMBER, 0xFF,
-                SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
+                     SPI_COMMAND_BIT_8 | SPI_ADDRESS_BIT_24);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH1, 0xFF, 0);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_LENGTH0, 0xFF, 1);
         rtsx_add_cmd(chip, WRITE_REG_CMD, PPBUF_BASE2, 0xFF, status);
         rtsx_add_cmd(chip, WRITE_REG_CMD, SPI_TRANSFER0, 0xFF,
-                SPI_TRANSFER0_START | SPI_CDO_MODE0);
+                     SPI_TRANSFER0_START | SPI_CDO_MODE0);
         rtsx_add_cmd(chip, CHECK_REG_CMD, SPI_TRANSFER0, SPI_TRANSFER0_END,
-                SPI_TRANSFER0_END);
+                     SPI_TRANSFER0_END);
 
         retval = rtsx_send_cmd(chip, 0, 100);
         if (retval != STATUS_SUCCESS) {
diff --git a/drivers/staging/rts5208/xd.c b/drivers/staging/rts5208/xd.c
index 1de02bb98839..85aba05acbc1 100644
--- a/drivers/staging/rts5208/xd.c
+++ b/drivers/staging/rts5208/xd.c
@@ -37,21 +37,21 @@ static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk, u16 logoff,
 
 static inline void xd_set_err_code(struct rtsx_chip *chip, u8 err_code)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
 
         xd_card->err_code = err_code;
 }
 
 static inline int xd_check_err_code(struct rtsx_chip *chip, u8 err_code)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
 
         return (xd_card->err_code == err_code);
 }
 
 static int xd_set_init_para(struct rtsx_chip *chip)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         int retval;
 
         if (chip->asic_code)
@@ -70,7 +70,7 @@ static int xd_set_init_para(struct rtsx_chip *chip)
 
 static int xd_switch_clock(struct rtsx_chip *chip)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         int retval;
 
         retval = select_card(chip, XD_CARD);
@@ -97,9 +97,9 @@ static int xd_read_id(struct rtsx_chip *chip, u8 id_cmd, u8 *id_buf, u8 buf_len)
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_DAT, 0xFF, id_cmd);
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
-                XD_TRANSFER_START | XD_READ_ID);
+                     XD_TRANSFER_START | XD_READ_ID);
         rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END,
-                XD_TRANSFER_END);
+                     XD_TRANSFER_END);
 
         for (i = 0; i < 4; i++)
                 rtsx_add_cmd(chip, READ_REG_CMD, (u16)(XD_ADDRESS1 + i), 0, 0);
@@ -122,28 +122,30 @@ static int xd_read_id(struct rtsx_chip *chip, u8 id_cmd, u8 *id_buf, u8 buf_len)
 
 static void xd_assign_phy_addr(struct rtsx_chip *chip, u32 addr, u8 mode)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
 
         switch (mode) {
         case XD_RW_ADDR:
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS0, 0xFF, 0);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS1, 0xFF, (u8)addr);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS2,
-                        0xFF, (u8)(addr >> 8));
+                             0xFF, (u8)(addr >> 8));
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS3,
-                        0xFF, (u8)(addr >> 16));
+                             0xFF, (u8)(addr >> 16));
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CFG, 0xFF,
-                        xd_card->addr_cycle | XD_CALC_ECC | XD_BA_NO_TRANSFORM);
+                             xd_card->addr_cycle |
+                             XD_CALC_ECC |
+                             XD_BA_NO_TRANSFORM);
                 break;
 
         case XD_ERASE_ADDR:
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS0, 0xFF, (u8)addr);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS1,
-                        0xFF, (u8)(addr >> 8));
+                             0xFF, (u8)(addr >> 8));
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_ADDRESS2,
-                        0xFF, (u8)(addr >> 16));
+                             0xFF, (u8)(addr >> 16));
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CFG, 0xFF,
-                        (xd_card->addr_cycle - 1) | XD_CALC_ECC |
+                             (xd_card->addr_cycle - 1) | XD_CALC_ECC |
                         XD_BA_NO_TRANSFORM);
                 break;
 
@@ -153,7 +155,7 @@ static void xd_assign_phy_addr(struct rtsx_chip *chip, u32 addr, u8 mode)
 }
 
 static int xd_read_redundant(struct rtsx_chip *chip, u32 page_addr,
-                        u8 *buf, int buf_len)
+                             u8 *buf, int buf_len)
 {
         int retval, i;
 
@@ -162,16 +164,16 @@ static int xd_read_redundant(struct rtsx_chip *chip, u32 page_addr,
         xd_assign_phy_addr(chip, page_addr, XD_RW_ADDR);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER,
-                0xFF, XD_TRANSFER_START | XD_READ_REDUNDANT);
+                     0xFF, XD_TRANSFER_START | XD_READ_REDUNDANT);
         rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                XD_TRANSFER_END, XD_TRANSFER_END);
+                     XD_TRANSFER_END, XD_TRANSFER_END);
 
         for (i = 0; i < 6; i++)
                 rtsx_add_cmd(chip, READ_REG_CMD, (u16)(XD_PAGE_STATUS + i),
-                        0, 0);
+                             0, 0);
         for (i = 0; i < 4; i++)
                 rtsx_add_cmd(chip, READ_REG_CMD, (u16)(XD_RESERVED0 + i),
-                        0, 0);
+                             0, 0);
         rtsx_add_cmd(chip, READ_REG_CMD, XD_PARITY, 0, 0);
 
         retval = rtsx_send_cmd(chip, XD_CARD, 500);
@@ -192,7 +194,7 @@ static int xd_read_redundant(struct rtsx_chip *chip, u32 page_addr,
 }
 
 static int xd_read_data_from_ppb(struct rtsx_chip *chip, int offset,
-                                u8 *buf, int buf_len)
+                                 u8 *buf, int buf_len)
 {
         int retval, i;
 
@@ -205,7 +207,7 @@ static int xd_read_data_from_ppb(struct rtsx_chip *chip, int offset,
 
         for (i = 0; i < buf_len; i++)
                 rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + offset + i,
-                        0, 0);
+                             0, 0);
 
         retval = rtsx_send_cmd(chip, 0, 250);
         if (retval < 0) {
@@ -220,7 +222,7 @@ static int xd_read_data_from_ppb(struct rtsx_chip *chip, int offset,
 }
 
 static int xd_read_cis(struct rtsx_chip *chip, u32 page_addr, u8 *buf,
-                int buf_len)
+                       int buf_len)
 {
         int retval;
         u8 reg;
@@ -235,15 +237,15 @@ static int xd_read_cis(struct rtsx_chip *chip, u32 page_addr, u8 *buf,
         xd_assign_phy_addr(chip, page_addr, XD_RW_ADDR);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE,
-                0x01, PINGPONG_BUFFER);
+                     0x01, PINGPONG_BUFFER);
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF, 1);
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CHK_DATA_STATUS,
-                XD_AUTO_CHK_DATA_STATUS, XD_AUTO_CHK_DATA_STATUS);
+                     XD_AUTO_CHK_DATA_STATUS, XD_AUTO_CHK_DATA_STATUS);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
-                XD_TRANSFER_START | XD_READ_PAGES);
+                     XD_TRANSFER_START | XD_READ_PAGES);
         rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER, XD_TRANSFER_END,
-                XD_TRANSFER_END);
+                     XD_TRANSFER_END);
 
         retval = rtsx_send_cmd(chip, XD_CARD, 250);
         if (retval == -ETIMEDOUT) {
@@ -347,27 +349,27 @@ static void xd_fill_pull_ctl_disable(struct rtsx_chip *chip)
 {
         if (CHECK_PID(chip, 0x5208)) {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF,
-                        XD_D3_PD | XD_D2_PD | XD_D1_PD | XD_D0_PD);
+                             XD_D3_PD | XD_D2_PD | XD_D1_PD | XD_D0_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF,
-                        XD_D7_PD | XD_D6_PD | XD_D5_PD | XD_D4_PD);
+                             XD_D7_PD | XD_D6_PD | XD_D5_PD | XD_D4_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF,
-                        XD_WP_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
+                             XD_WP_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF,
-                        XD_RDY_PD | XD_WE_PD | XD_RE_PD | XD_ALE_PD);
+                             XD_RDY_PD | XD_WE_PD | XD_RE_PD | XD_ALE_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL5, 0xFF,
-                        MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
+                             MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL6, 0xFF,
-                        MS_D5_PD | MS_D4_PD);
+                             MS_D5_PD | MS_D4_PD);
         } else if (CHECK_PID(chip, 0x5288)) {
                 if (CHECK_BARO_PKG(chip, QFN)) {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1,
-                                0xFF, 0x55);
+                                     0xFF, 0x55);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2,
-                                0xFF, 0x55);
+                                     0xFF, 0x55);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3,
-                                0xFF, 0x4B);
+                                     0xFF, 0x4B);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4,
-                                0xFF, 0x69);
+                                     0xFF, 0x69);
                 }
         }
 }
@@ -386,27 +388,27 @@ static void xd_fill_pull_ctl_enable(struct rtsx_chip *chip)
 {
         if (CHECK_PID(chip, 0x5208)) {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1, 0xFF,
-                        XD_D3_PD | XD_D2_PD | XD_D1_PD | XD_D0_PD);
+                             XD_D3_PD | XD_D2_PD | XD_D1_PD | XD_D0_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2, 0xFF,
-                        XD_D7_PD | XD_D6_PD | XD_D5_PD | XD_D4_PD);
+                             XD_D7_PD | XD_D6_PD | XD_D5_PD | XD_D4_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3, 0xFF,
-                        XD_WP_PD | XD_CE_PU | XD_CLE_PD | XD_CD_PU);
+                             XD_WP_PD | XD_CE_PU | XD_CLE_PD | XD_CD_PU);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4, 0xFF,
-                        XD_RDY_PU | XD_WE_PU | XD_RE_PU | XD_ALE_PD);
+                             XD_RDY_PU | XD_WE_PU | XD_RE_PU | XD_ALE_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL5, 0xFF,
-                        MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
+                             MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL6, 0xFF,
-                        MS_D5_PD | MS_D4_PD);
+                             MS_D5_PD | MS_D4_PD);
         } else if (CHECK_PID(chip, 0x5288)) {
                 if (CHECK_BARO_PKG(chip, QFN)) {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL1,
-                                0xFF, 0x55);
+                                     0xFF, 0x55);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL2,
-                                0xFF, 0x55);
+                                     0xFF, 0x55);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL3,
-                                0xFF, 0x53);
+                                     0xFF, 0x53);
                         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_PULL_CTL4,
-                                0xFF, 0xA9);
+                                     0xFF, 0xA9);
                 }
         }
 }
@@ -417,31 +419,46 @@ static int xd_pull_ctl_disable(struct rtsx_chip *chip)
 
         if (CHECK_PID(chip, 0x5208)) {
                 retval = rtsx_write_register(chip, CARD_PULL_CTL1, 0xFF,
-                                             XD_D3_PD | XD_D2_PD | XD_D1_PD | XD_D0_PD);
+                                             XD_D3_PD |
+                                             XD_D2_PD |
+                                             XD_D1_PD |
+                                             XD_D0_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL2, 0xFF,
-                                             XD_D7_PD | XD_D6_PD | XD_D5_PD | XD_D4_PD);
+                                             XD_D7_PD |
+                                             XD_D6_PD |
+                                             XD_D5_PD |
+                                             XD_D4_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL3, 0xFF,
-                                             XD_WP_PD | XD_CE_PD | XD_CLE_PD | XD_CD_PU);
+                                             XD_WP_PD |
+                                             XD_CE_PD |
+                                             XD_CLE_PD |
+                                             XD_CD_PU);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL4, 0xFF,
-                                             XD_RDY_PD | XD_WE_PD | XD_RE_PD | XD_ALE_PD);
+                                             XD_RDY_PD |
+                                             XD_WE_PD |
+                                             XD_RE_PD |
+                                             XD_ALE_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
                 }
                 retval = rtsx_write_register(chip, CARD_PULL_CTL5, 0xFF,
-                                             MS_INS_PU | SD_WP_PD | SD_CD_PU | SD_CMD_PD);
+                                             MS_INS_PU |
+                                             SD_WP_PD |
+                                             SD_CD_PU |
+                                             SD_CMD_PD);
                 if (retval) {
                         rtsx_trace(chip);
                         return retval;
@@ -486,7 +503,7 @@ static int xd_pull_ctl_disable(struct rtsx_chip *chip)
 
 static int reset_xd(struct rtsx_chip *chip)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         int retval, i, j;
         u8 *ptr, id_buf[4], redunt[11];
 
@@ -499,7 +516,7 @@ static int reset_xd(struct rtsx_chip *chip)
         rtsx_init_cmd(chip);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CHK_DATA_STATUS, 0xFF,
-                XD_PGSTS_NOT_FF);
+                     XD_PGSTS_NOT_FF);
         if (chip->asic_code) {
                 if (!CHECK_PID(chip, 0x5288))
                         xd_fill_pull_ctl_disable(chip);
@@ -507,12 +524,13 @@ static int reset_xd(struct rtsx_chip *chip)
                         xd_fill_pull_ctl_stage1_barossa(chip);
         } else {
                 rtsx_add_cmd(chip, WRITE_REG_CMD, FPGA_PULL_CTL, 0xFF,
-                        (FPGA_XD_PULL_CTL_EN1 & FPGA_XD_PULL_CTL_EN3) | 0x20);
+                             (FPGA_XD_PULL_CTL_EN1 & FPGA_XD_PULL_CTL_EN3) |
+                             0x20);
         }
 
         if (!chip->ft2_fast_mode)
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_INIT,
-                        XD_NO_AUTO_PWR_OFF, 0);
+                             XD_NO_AUTO_PWR_OFF, 0);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_OE, XD_OUTPUT_EN, 0);
 
@@ -537,8 +555,9 @@ static int reset_xd(struct rtsx_chip *chip)
                         xd_fill_pull_ctl_enable(chip);
                 } else {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, FPGA_PULL_CTL, 0xFF,
-                                (FPGA_XD_PULL_CTL_EN1 & FPGA_XD_PULL_CTL_EN2) |
-                                0x20);
+                                     (FPGA_XD_PULL_CTL_EN1 &
+                                      FPGA_XD_PULL_CTL_EN2) |
+                                     0x20);
                 }
 
                 retval = rtsx_send_cmd(chip, XD_CARD, 100);
@@ -571,8 +590,9 @@ static int reset_xd(struct rtsx_chip *chip)
                         xd_fill_pull_ctl_enable(chip);
                 } else {
                         rtsx_add_cmd(chip, WRITE_REG_CMD, FPGA_PULL_CTL, 0xFF,
-                                (FPGA_XD_PULL_CTL_EN1 & FPGA_XD_PULL_CTL_EN2) |
-                                0x20);
+                                     (FPGA_XD_PULL_CTL_EN1 &
+                                      FPGA_XD_PULL_CTL_EN2) |
+                                     0x20);
                 }
         }
 
@@ -599,16 +619,17 @@ static int reset_xd(struct rtsx_chip *chip)
                 rtsx_init_cmd(chip);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_DTCTL, 0xFF,
-                        XD_TIME_SETUP_STEP * 3 +
-                        XD_TIME_RW_STEP * (2 + i) + XD_TIME_RWN_STEP * i);
+                             XD_TIME_SETUP_STEP * 3 +
+                             XD_TIME_RW_STEP * (2 + i) + XD_TIME_RWN_STEP * i);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CATCTL, 0xFF,
-                        XD_TIME_SETUP_STEP * 3 + XD_TIME_RW_STEP * (4 + i) +
-                        XD_TIME_RWN_STEP * (3 + i));
+                             XD_TIME_SETUP_STEP * 3 +
+                             XD_TIME_RW_STEP * (4 + i) +
+                             XD_TIME_RWN_STEP * (3 + i));
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
-                        XD_TRANSFER_START | XD_RESET);
+                             XD_TRANSFER_START | XD_RESET);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                        XD_TRANSFER_END, XD_TRANSFER_END);
+                             XD_TRANSFER_END, XD_TRANSFER_END);
 
                 rtsx_add_cmd(chip, READ_REG_CMD, XD_DAT, 0, 0);
                 rtsx_add_cmd(chip, READ_REG_CMD, XD_CTL, 0, 0);
@@ -625,7 +646,7 @@ static int reset_xd(struct rtsx_chip *chip)
                         ptr[0], ptr[1]);
 
                 if (((ptr[0] & READY_FLAG) != READY_STATE) ||
-                        !(ptr[1] & XD_RDY))
+                    !(ptr[1] & XD_RDY))
                         continue;
 
                 retval = xd_read_id(chip, READ_ID, id_buf, 4);
@@ -773,7 +794,7 @@ static int reset_xd(struct rtsx_chip *chip)
                 if (redunt[PAGE_STATUS] != XD_GPG) {
                         for (j = 1; j <= 8; j++) {
                                 retval = xd_read_redundant(chip, page_addr + j,
-                                                        redunt, 11);
+                                                           redunt, 11);
                                 if (retval == STATUS_SUCCESS) {
                                         if (redunt[PAGE_STATUS] == XD_GPG)
                                                 break;
@@ -786,7 +807,7 @@ static int reset_xd(struct rtsx_chip *chip)
 
                 /* Check CIS data */
                 if ((redunt[BLOCK_STATUS] == XD_GBLK) &&
-                        (redunt[PARITY] & XD_BA1_ALL0)) {
+                    (redunt[PARITY] & XD_BA1_ALL0)) {
                         u8 buf[10];
 
                         page_addr += j;
@@ -798,11 +819,11 @@ static int reset_xd(struct rtsx_chip *chip)
                         }
 
                         if ((buf[0] == 0x01) && (buf[1] == 0x03) &&
-                                (buf[2] == 0xD9)
-                                        && (buf[3] == 0x01) && (buf[4] == 0xFF)
-                                        && (buf[5] == 0x18) && (buf[6] == 0x02)
-                                        && (buf[7] == 0xDF) && (buf[8] == 0x01)
-                                        && (buf[9] == 0x20)) {
+                            (buf[2] == 0xD9) &&
+                            (buf[3] == 0x01) && (buf[4] == 0xFF) &&
+                            (buf[5] == 0x18) && (buf[6] == 0x02) &&
+                            (buf[7] == 0xDF) && (buf[8] == 0x01) &&
+                            (buf[9] == 0x20)) {
                                 xd_card->cis_block = (u16)i;
                         }
                 }
@@ -861,7 +882,7 @@ static u16 xd_load_log_block_addr(u8 *redunt)
 
 static int xd_init_l2p_tbl(struct rtsx_chip *chip)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         int size, i;
 
         dev_dbg(rtsx_dev(chip), "xd_init_l2p_tbl: zone_cnt = %d\n",
@@ -910,7 +931,7 @@ static inline void free_zone(struct zone_entry *zone)
 
 static void xd_set_unused_block(struct rtsx_chip *chip, u32 phy_blk)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         struct zone_entry *zone;
         int zone_no;
 
@@ -920,15 +941,15 @@ static void xd_set_unused_block(struct rtsx_chip *chip, u32 phy_blk)
                         zone_no, xd_card->zone_cnt);
                 return;
         }
-        zone = &(xd_card->zone[zone_no]);
+        zone = &xd_card->zone[zone_no];
 
-        if (zone->free_table == NULL) {
+        if (!zone->free_table) {
                 if (xd_build_l2p_tbl(chip, zone_no) != STATUS_SUCCESS)
                         return;
         }
 
-        if ((zone->set_index >= XD_FREE_TABLE_CNT)
-                        || (zone->set_index < 0)) {
+        if ((zone->set_index >= XD_FREE_TABLE_CNT) ||
+            (zone->set_index < 0)) {
                 free_zone(zone);
                 dev_dbg(rtsx_dev(chip), "Set unused block fail, invalid set_index\n");
                 return;
@@ -945,7 +966,7 @@ static void xd_set_unused_block(struct rtsx_chip *chip, u32 phy_blk)
 
 static u32 xd_get_unused_block(struct rtsx_chip *chip, int zone_no)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         struct zone_entry *zone;
         u32 phy_blk;
 
@@ -954,10 +975,10 @@ static u32 xd_get_unused_block(struct rtsx_chip *chip, int zone_no)
                         zone_no, xd_card->zone_cnt);
                 return BLK_NOT_FOUND;
         }
-        zone = &(xd_card->zone[zone_no]);
+        zone = &xd_card->zone[zone_no];
 
         if ((zone->unused_blk_cnt == 0) ||
-                (zone->set_index == zone->get_index)) {
+            (zone->set_index == zone->get_index)) {
                 free_zone(zone);
                 dev_dbg(rtsx_dev(chip), "Get unused block fail, no unused block available\n");
                 return BLK_NOT_FOUND;
@@ -982,22 +1003,22 @@ static u32 xd_get_unused_block(struct rtsx_chip *chip, int zone_no)
 }
 
 static void xd_set_l2p_tbl(struct rtsx_chip *chip,
-                        int zone_no, u16 log_off, u16 phy_off)
+                           int zone_no, u16 log_off, u16 phy_off)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         struct zone_entry *zone;
 
-        zone = &(xd_card->zone[zone_no]);
+        zone = &xd_card->zone[zone_no];
         zone->l2p_table[log_off] = phy_off;
 }
 
 static u32 xd_get_l2p_tbl(struct rtsx_chip *chip, int zone_no, u16 log_off)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         struct zone_entry *zone;
         int retval;
 
-        zone = &(xd_card->zone[zone_no]);
+        zone = &xd_card->zone[zone_no];
         if (zone->l2p_table[log_off] == 0xFFFF) {
                 u32 phy_blk = 0;
                 int i;
@@ -1023,7 +1044,7 @@ static u32 xd_get_l2p_tbl(struct rtsx_chip *chip, int zone_no, u16 log_off)
                         }
 
                         retval = xd_init_page(chip, phy_blk, log_off,
-                                        0, xd_card->page_off + 1);
+                                              0, xd_card->page_off + 1);
                         if (retval == STATUS_SUCCESS)
                                 break;
                 }
@@ -1041,7 +1062,7 @@ static u32 xd_get_l2p_tbl(struct rtsx_chip *chip, int zone_no, u16 log_off)
 
 int reset_xd_card(struct rtsx_chip *chip)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         int retval;
 
         memset(xd_card, 0, sizeof(struct xd_info));
@@ -1077,7 +1098,7 @@ int reset_xd_card(struct rtsx_chip *chip)
 
 static int xd_mark_bad_block(struct rtsx_chip *chip, u32 phy_blk)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         int retval;
         u32 page_addr;
         u8 reg = 0;
@@ -1107,12 +1128,12 @@ static int xd_mark_bad_block(struct rtsx_chip *chip, u32 phy_blk)
         xd_assign_phy_addr(chip, page_addr, XD_RW_ADDR);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF,
-                xd_card->page_off + 1);
+                     xd_card->page_off + 1);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
-                XD_TRANSFER_START | XD_WRITE_REDUNDANT);
+                     XD_TRANSFER_START | XD_WRITE_REDUNDANT);
         rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                XD_TRANSFER_END, XD_TRANSFER_END);
+                     XD_TRANSFER_END, XD_TRANSFER_END);
 
         retval = rtsx_send_cmd(chip, XD_CARD, 500);
         if (retval < 0) {
@@ -1132,7 +1153,7 @@ static int xd_mark_bad_block(struct rtsx_chip *chip, u32 phy_blk)
 static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk,
                         u16 logoff, u8 start_page, u8 end_page)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         int retval;
         u32 page_addr;
         u8 reg = 0;
@@ -1153,7 +1174,7 @@ static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk,
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_STATUS, 0xFF, 0xFF);
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_STATUS, 0xFF, 0xFF);
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR1_H,
-                0xFF, (u8)(logoff >> 8));
+                     0xFF, (u8)(logoff >> 8));
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR1_L, 0xFF, (u8)logoff);
 
         page_addr = (phy_blk << xd_card->block_shift) + start_page;
@@ -1161,15 +1182,15 @@ static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk,
         xd_assign_phy_addr(chip, page_addr, XD_RW_ADDR);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CFG,
-                XD_BA_TRANSFORM, XD_BA_TRANSFORM);
+                     XD_BA_TRANSFORM, XD_BA_TRANSFORM);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT,
-                0xFF, (end_page - start_page));
+                     0xFF, (end_page - start_page));
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER,
-                0xFF, XD_TRANSFER_START | XD_WRITE_REDUNDANT);
+                     0xFF, XD_TRANSFER_START | XD_WRITE_REDUNDANT);
         rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                XD_TRANSFER_END, XD_TRANSFER_END);
+                     XD_TRANSFER_END, XD_TRANSFER_END);
 
         retval = rtsx_send_cmd(chip, XD_CARD, 500);
         if (retval < 0) {
@@ -1191,7 +1212,7 @@ static int xd_init_page(struct rtsx_chip *chip, u32 phy_blk,
 static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk,
                         u8 start_page, u8 end_page)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         u32 old_page, new_page;
         u8 i, reg = 0;
         int retval;
@@ -1235,11 +1256,11 @@ static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk,
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF, 1);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CHK_DATA_STATUS,
-                        XD_AUTO_CHK_DATA_STATUS, 0);
+                             XD_AUTO_CHK_DATA_STATUS, 0);
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
-                        XD_TRANSFER_START | XD_READ_PAGES);
+                             XD_TRANSFER_START | XD_READ_PAGES);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                        XD_TRANSFER_END, XD_TRANSFER_END);
+                             XD_TRANSFER_END, XD_TRANSFER_END);
 
                 retval = rtsx_send_cmd(chip, XD_CARD, 500);
                 if (retval < 0) {
@@ -1250,22 +1271,24 @@ static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk,
                                 wait_timeout(100);
 
                                 if (detect_card_cd(chip,
-                                        XD_CARD) != STATUS_SUCCESS) {
+                                                   XD_CARD) != STATUS_SUCCESS) {
                                         xd_set_err_code(chip, XD_NO_CARD);
                                         rtsx_trace(chip);
                                         return STATUS_FAIL;
                                 }
 
                                 if (((reg & (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE)) ==
-                                                (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE))
-                                        || ((reg & (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE)) ==
+                                                (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE)) ||
+                                        ((reg & (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE)) ==
                                                 (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE))) {
                                         rtsx_write_register(chip,
-                                                        XD_PAGE_STATUS, 0xFF,
-                                                        XD_BPG);
+                                                            XD_PAGE_STATUS,
+                                                            0xFF,
+                                                            XD_BPG);
                                         rtsx_write_register(chip,
-                                                        XD_BLOCK_STATUS, 0xFF,
-                                                        XD_GBLK);
+                                                            XD_BLOCK_STATUS,
+                                                            0xFF,
+                                                            XD_GBLK);
                                         XD_SET_BAD_OLDBLK(xd_card);
                                         dev_dbg(rtsx_dev(chip), "old block 0x%x ecc error\n",
                                                 old_blk);
@@ -1287,7 +1310,7 @@ static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk,
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
                              XD_TRANSFER_START | XD_WRITE_PAGES);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                        XD_TRANSFER_END, XD_TRANSFER_END);
+                             XD_TRANSFER_END, XD_TRANSFER_END);
 
                 retval = rtsx_send_cmd(chip, XD_CARD, 300);
                 if (retval < 0) {
@@ -1320,9 +1343,9 @@ static int xd_reset_cmd(struct rtsx_chip *chip)
         rtsx_init_cmd(chip);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER,
-                0xFF, XD_TRANSFER_START | XD_RESET);
+                     0xFF, XD_TRANSFER_START | XD_RESET);
         rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                XD_TRANSFER_END, XD_TRANSFER_END);
+                     XD_TRANSFER_END, XD_TRANSFER_END);
         rtsx_add_cmd(chip, READ_REG_CMD, XD_DAT, 0, 0);
         rtsx_add_cmd(chip, READ_REG_CMD, XD_CTL, 0, 0);
 
@@ -1342,7 +1365,7 @@ static int xd_reset_cmd(struct rtsx_chip *chip)
 
 static int xd_erase_block(struct rtsx_chip *chip, u32 phy_blk)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         u32 page_addr;
         u8 reg = 0, *ptr;
         int i, retval;
@@ -1360,9 +1383,9 @@ static int xd_erase_block(struct rtsx_chip *chip, u32 phy_blk)
                 xd_assign_phy_addr(chip, page_addr, XD_ERASE_ADDR);
 
                 rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
-                        XD_TRANSFER_START | XD_ERASE);
+                             XD_TRANSFER_START | XD_ERASE);
                 rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                        XD_TRANSFER_END, XD_TRANSFER_END);
+                             XD_TRANSFER_END, XD_TRANSFER_END);
                 rtsx_add_cmd(chip, READ_REG_CMD, XD_DAT, 0, 0);
 
                 retval = rtsx_send_cmd(chip, XD_CARD, 250);
@@ -1403,7 +1426,7 @@ static int xd_erase_block(struct rtsx_chip *chip, u32 phy_blk)
 
 static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         struct zone_entry *zone;
         int retval;
         u32 start, end, i;
@@ -1413,7 +1436,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)
 
         dev_dbg(rtsx_dev(chip), "xd_build_l2p_tbl: %d\n", zone_no);
 
-        if (xd_card->zone == NULL) {
+        if (!xd_card->zone) {
                 retval = xd_init_l2p_tbl(chip);
                 if (retval != STATUS_SUCCESS)
                         return retval;
@@ -1425,22 +1448,22 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)
                 return STATUS_SUCCESS;
         }
 
-        zone = &(xd_card->zone[zone_no]);
+        zone = &xd_card->zone[zone_no];
 
-        if (zone->l2p_table == NULL) {
+        if (!zone->l2p_table) {
                 zone->l2p_table = vmalloc(2000);
                 if (!zone->l2p_table) {
                         rtsx_trace(chip);
-                        goto Build_Fail;
+                        goto build_fail;
                 }
         }
         memset((u8 *)(zone->l2p_table), 0xff, 2000);
 
-        if (zone->free_table == NULL) {
+        if (!zone->free_table) {
                 zone->free_table = vmalloc(XD_FREE_TABLE_CNT * 2);
                 if (!zone->free_table) {
                         rtsx_trace(chip);
-                        goto Build_Fail;
+                        goto build_fail;
                 }
         }
         memset((u8 *)(zone->free_table), 0xff, XD_FREE_TABLE_CNT * 2);
@@ -1466,7 +1489,8 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)
         dev_dbg(rtsx_dev(chip), "start block 0x%x, end block 0x%x\n",
                 start, end);
 
-        zone->set_index = zone->get_index = 0;
+        zone->set_index = 0;
+        zone->get_index = 0;
         zone->unused_blk_cnt = 0;
 
         for (i = start; i < end; i++) {
@@ -1490,7 +1514,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)
 
                 cur_fst_page_logoff = xd_load_log_block_addr(redunt);
                 if ((cur_fst_page_logoff == 0xFFFF) ||
-                        (cur_fst_page_logoff > max_logoff)) {
+                    (cur_fst_page_logoff > max_logoff)) {
                         retval = xd_erase_block(chip, i);
                         if (retval == STATUS_SUCCESS)
                                 xd_set_unused_block(chip, i);
@@ -1498,7 +1522,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)
                 }
 
                 if ((zone_no == 0) && (cur_fst_page_logoff == 0) &&
-                        (redunt[PAGE_STATUS] != XD_GPG))
+                    (redunt[PAGE_STATUS] != XD_GPG))
                         XD_SET_MBR_FAIL(xd_card);
 
                 if (zone->l2p_table[cur_fst_page_logoff] == 0xFFFF) {
@@ -1524,7 +1548,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)
 
                         for (m = 0; m < 3; m++) {
                                 retval = xd_read_redundant(chip, page_addr,
-                                                        redunt, 11);
+                                                           redunt, 11);
                                 if (retval == STATUS_SUCCESS)
                                         break;
                         }
@@ -1581,7 +1605,7 @@ static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)
 
         return STATUS_SUCCESS;
 
-Build_Fail:
+build_fail:
         vfree(zone->l2p_table);
         zone->l2p_table = NULL;
         vfree(zone->free_table);
@@ -1598,9 +1622,9 @@ static int xd_send_cmd(struct rtsx_chip *chip, u8 cmd)
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_DAT, 0xFF, cmd);
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
-                XD_TRANSFER_START | XD_SET_CMD);
+                     XD_TRANSFER_START | XD_SET_CMD);
         rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                XD_TRANSFER_END, XD_TRANSFER_END);
+                     XD_TRANSFER_END, XD_TRANSFER_END);
 
         retval = rtsx_send_cmd(chip, XD_CARD, 200);
         if (retval < 0) {
@@ -1612,18 +1636,18 @@ static int xd_send_cmd(struct rtsx_chip *chip, u8 cmd)
 }
 
 static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk,
-                                u32 log_blk, u8 start_page, u8 end_page,
-                                u8 *buf, unsigned int *index,
-                                unsigned int *offset)
+                                  u32 log_blk, u8 start_page, u8 end_page,
+                                  u8 *buf, unsigned int *index,
+                                  unsigned int *offset)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         u32 page_addr, new_blk;
         u16 log_off;
         u8 reg_val, page_cnt;
         int zone_no, retval, i;
 
         if (start_page > end_page)
-                goto Status_Fail;
+                goto status_fail;
 
         page_cnt = end_page - start_page;
         zone_no = (int)(log_blk / 1000);
@@ -1639,7 +1663,7 @@ static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk,
 
                         if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
                                 xd_set_err_code(chip, XD_NO_CARD);
-                                goto Status_Fail;
+                                goto status_fail;
                         }
                 }
         }
@@ -1653,37 +1677,38 @@ static int xd_read_multiple_pages(struct rtsx_chip *chip, u32 phy_blk,
         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF, page_cnt);
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CHK_DATA_STATUS,
-                        XD_AUTO_CHK_DATA_STATUS, XD_AUTO_CHK_DATA_STATUS);
+                     XD_AUTO_CHK_DATA_STATUS, XD_AUTO_CHK_DATA_STATUS);
 
         trans_dma_enable(chip->srb->sc_data_direction, chip,
-                        page_cnt * 512, DMA_512);
+                         page_cnt * 512, DMA_512);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER, 0xFF,
-                XD_TRANSFER_START | XD_READ_PAGES);
+                     XD_TRANSFER_START | XD_READ_PAGES);
         rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                XD_TRANSFER_END | XD_PPB_EMPTY, XD_TRANSFER_END | XD_PPB_EMPTY);
+                     XD_TRANSFER_END | XD_PPB_EMPTY,
+                     XD_TRANSFER_END | XD_PPB_EMPTY);
 
         rtsx_send_cmd_no_wait(chip);
 
         retval = rtsx_transfer_data_partial(chip, XD_CARD, buf, page_cnt * 512,
-                                        scsi_sg_count(chip->srb),
-                                        index, offset, DMA_FROM_DEVICE,
-                                        chip->xd_timeout);
+                                            scsi_sg_count(chip->srb),
+                                            index, offset, DMA_FROM_DEVICE,
+                                            chip->xd_timeout);
         if (retval < 0) {
                 rtsx_clear_xd_error(chip);
 
                 if (retval == -ETIMEDOUT) {
                         xd_set_err_code(chip, XD_TO_ERROR);
-                        goto Status_Fail;
+                        goto status_fail;
                 } else {
                         rtsx_trace(chip);
-                        goto Fail;
+                        goto fail;
                 }
         }
 
         return STATUS_SUCCESS;
 
-Fail:
+fail:
         retval = rtsx_read_register(chip, XD_PAGE_STATUS, &reg_val);
         if (retval) {
                 rtsx_trace(chip);
@@ -1699,15 +1724,15 @@ Fail:
                 return retval;
         }
 
-        if (((reg_val & (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE))
-                                == (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE))
-                || ((reg_val & (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE))
-                        == (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE))) {
+        if (((reg_val & (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE)) ==
+                                (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE)) ||
+                ((reg_val & (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE)) ==
+                        (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE))) {
                 wait_timeout(100);
 
                 if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
                         xd_set_err_code(chip, XD_NO_CARD);
-                        goto Status_Fail;
+                        goto status_fail;
                 }
 
                 xd_set_err_code(chip, XD_ECC_ERROR);
@@ -1715,11 +1740,11 @@ Fail:
                 new_blk = xd_get_unused_block(chip, zone_no);
                 if (new_blk == NO_NEW_BLK) {
                         XD_CLR_BAD_OLDBLK(xd_card);
-                        goto Status_Fail;
+                        goto status_fail;
                 }
 
                 retval = xd_copy_page(chip, phy_blk, new_blk, 0,
-                                xd_card->page_off + 1);
+                                      xd_card->page_off + 1);
                 if (retval != STATUS_SUCCESS) {
                         if (!XD_CHK_BAD_NEWBLK(xd_card)) {
                                 retval = xd_erase_block(chip, new_blk);
@@ -1729,7 +1754,7 @@ Fail:
                                 XD_CLR_BAD_NEWBLK(xd_card);
                         }
                         XD_CLR_BAD_OLDBLK(xd_card);
-                        goto Status_Fail;
+                        goto status_fail;
                 }
                 xd_set_l2p_tbl(chip, zone_no, log_off, (u16)(new_blk & 0x3FF));
                 xd_erase_block(chip, phy_blk);
@@ -1737,15 +1762,15 @@ Fail:
                 XD_CLR_BAD_OLDBLK(xd_card);
         }
 
-Status_Fail:
+status_fail:
         rtsx_trace(chip);
         return STATUS_FAIL;
 }
 
 static int xd_finish_write(struct rtsx_chip *chip,
-                u32 old_blk, u32 new_blk, u32 log_blk, u8 page_off)
+                           u32 old_blk, u32 new_blk, u32 log_blk, u8 page_off)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         int retval, zone_no;
         u16 log_off;
 
@@ -1762,7 +1787,7 @@ static int xd_finish_write(struct rtsx_chip *chip,
 
         if (old_blk == BLK_NOT_FOUND) {
                 retval = xd_init_page(chip, new_blk, log_off,
-                                page_off, xd_card->page_off + 1);
+                                      page_off, xd_card->page_off + 1);
                 if (retval != STATUS_SUCCESS) {
                         retval = xd_erase_block(chip, new_blk);
                         if (retval == STATUS_SUCCESS)
@@ -1772,7 +1797,7 @@ static int xd_finish_write(struct rtsx_chip *chip,
                 }
         } else {
                 retval = xd_copy_page(chip, old_blk, new_blk,
-                                page_off, xd_card->page_off + 1);
+                                      page_off, xd_card->page_off + 1);
                 if (retval != STATUS_SUCCESS) {
                         if (!XD_CHK_BAD_NEWBLK(xd_card)) {
                                 retval = xd_erase_block(chip, new_blk);
@@ -1804,7 +1829,7 @@ static int xd_finish_write(struct rtsx_chip *chip,
 }
 
 static int xd_prepare_write(struct rtsx_chip *chip,
-                u32 old_blk, u32 new_blk, u32 log_blk, u8 page_off)
+                            u32 old_blk, u32 new_blk, u32 log_blk, u8 page_off)
 {
         int retval;
 
@@ -1823,11 +1848,11 @@ static int xd_prepare_write(struct rtsx_chip *chip,
 }
 
 static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,
-                                u32 new_blk, u32 log_blk, u8 start_page,
-                                u8 end_page, u8 *buf, unsigned int *index,
-                                unsigned int *offset)
+                                   u32 new_blk, u32 log_blk, u8 start_page,
+                                   u8 end_page, u8 *buf, unsigned int *index,
+                                   unsigned int *offset)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         u32 page_addr;
         int zone_no, retval;
         u16 log_off;
@@ -1837,7 +1862,7 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,
                 __func__, old_blk, new_blk, log_blk);
 
         if (start_page > end_page)
-                goto Status_Fail;
+                goto status_fail;
 
         page_cnt = end_page - start_page;
         zone_no = (int)(log_blk / 1000);
@@ -1847,12 +1872,12 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,
 
         retval = xd_send_cmd(chip, READ1_1);
         if (retval != STATUS_SUCCESS)
-                goto Status_Fail;
+                goto status_fail;
 
         rtsx_init_cmd(chip);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR1_H,
-                0xFF, (u8)(log_off >> 8));
+                     0xFF, (u8)(log_off >> 8));
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_ADDR1_L, 0xFF, (u8)log_off);
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_BLOCK_STATUS, 0xFF, XD_GBLK);
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_STATUS, 0xFF, XD_GPG);
@@ -1860,32 +1885,32 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,
         xd_assign_phy_addr(chip, page_addr, XD_RW_ADDR);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_CFG, XD_BA_TRANSFORM,
-                XD_BA_TRANSFORM);
+                     XD_BA_TRANSFORM);
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_PAGE_CNT, 0xFF, page_cnt);
         rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, 0x01, RING_BUFFER);
 
         trans_dma_enable(chip->srb->sc_data_direction, chip,
-                        page_cnt * 512, DMA_512);
+                         page_cnt * 512, DMA_512);
 
         rtsx_add_cmd(chip, WRITE_REG_CMD, XD_TRANSFER,
-                0xFF, XD_TRANSFER_START | XD_WRITE_PAGES);
+                     0xFF, XD_TRANSFER_START | XD_WRITE_PAGES);
         rtsx_add_cmd(chip, CHECK_REG_CMD, XD_TRANSFER,
-                XD_TRANSFER_END, XD_TRANSFER_END);
+                     XD_TRANSFER_END, XD_TRANSFER_END);
 
         rtsx_send_cmd_no_wait(chip);
 
         retval = rtsx_transfer_data_partial(chip, XD_CARD, buf, page_cnt * 512,
-                                        scsi_sg_count(chip->srb),
-                        index, offset, DMA_TO_DEVICE, chip->xd_timeout);
+                                            scsi_sg_count(chip->srb),
+                                            index, offset, DMA_TO_DEVICE, chip->xd_timeout);
         if (retval < 0) {
                 rtsx_clear_xd_error(chip);
 
                 if (retval == -ETIMEDOUT) {
                         xd_set_err_code(chip, XD_TO_ERROR);
-                        goto Status_Fail;
+                        goto status_fail;
                 } else {
                         rtsx_trace(chip);
-                        goto Fail;
+                        goto fail;
                 }
         }
 
@@ -1911,7 +1936,7 @@ static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,
 
         return STATUS_SUCCESS;
 
-Fail:
+fail:
         retval = rtsx_read_register(chip, XD_DAT, &reg_val);
         if (retval) {
                 rtsx_trace(chip);
@@ -1922,7 +1947,7 @@ Fail:
                 xd_mark_bad_block(chip, new_blk);
         }
 
-Status_Fail:
+status_fail:
         rtsx_trace(chip);
         return STATUS_FAIL;
 }
@@ -1930,8 +1955,8 @@ Status_Fail:
 #ifdef XD_DELAY_WRITE
 int xd_delay_write(struct rtsx_chip *chip)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
-        struct xd_delay_write_tag *delay_write = &(xd_card->delay_write);
+        struct xd_info *xd_card = &chip->xd_card;
+        struct xd_delay_write_tag *delay_write = &xd_card->delay_write;
         int retval;
 
         if (delay_write->delay_write_flag) {
@@ -1944,9 +1969,10 @@ int xd_delay_write(struct rtsx_chip *chip)
 
                 delay_write->delay_write_flag = 0;
                 retval = xd_finish_write(chip,
-                                delay_write->old_phyblock,
-                                        delay_write->new_phyblock,
-                                delay_write->logblock, delay_write->pageoff);
+                                         delay_write->old_phyblock,
+                                         delay_write->new_phyblock,
+                                         delay_write->logblock,
+                                         delay_write->pageoff);
                 if (retval != STATUS_SUCCESS) {
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -1958,12 +1984,12 @@ int xd_delay_write(struct rtsx_chip *chip)
 #endif
 
 int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
-        u32 start_sector, u16 sector_cnt)
+          u32 start_sector, u16 sector_cnt)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         unsigned int lun = SCSI_LUN(srb);
 #ifdef XD_DELAY_WRITE
-        struct xd_delay_write_tag *delay_write = &(xd_card->delay_write);
+        struct xd_delay_write_tag *delay_write = &xd_card->delay_write;
 #endif
         int retval, zone_no;
         unsigned int index = 0, offset = 0;
@@ -2012,17 +2038,18 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
         if (srb->sc_data_direction == DMA_TO_DEVICE) {
 #ifdef XD_DELAY_WRITE
                 if (delay_write->delay_write_flag &&
-                                (delay_write->logblock == log_blk) &&
-                                (start_page > delay_write->pageoff)) {
+                    (delay_write->logblock == log_blk) &&
+                    (start_page > delay_write->pageoff)) {
                         delay_write->delay_write_flag = 0;
                         if (delay_write->old_phyblock != BLK_NOT_FOUND) {
                                 retval = xd_copy_page(chip,
-                                        delay_write->old_phyblock,
-                                        delay_write->new_phyblock,
-                                        delay_write->pageoff, start_page);
+                                                      delay_write->old_phyblock,
+                                                      delay_write->new_phyblock,
+                                                      delay_write->pageoff,
+                                                      start_page);
                                 if (retval != STATUS_SUCCESS) {
                                         set_sense_type(chip, lun,
-                                                SENSE_TYPE_MEDIA_WRITE_ERR);
+                                                       SENSE_TYPE_MEDIA_WRITE_ERR);
                                         rtsx_trace(chip);
                                         return STATUS_FAIL;
                                 }
@@ -2039,7 +2066,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                         retval = xd_delay_write(chip);
                         if (retval != STATUS_SUCCESS) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
@@ -2047,25 +2074,25 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                         old_blk = xd_get_l2p_tbl(chip, zone_no, log_off);
                         new_blk  = xd_get_unused_block(chip, zone_no);
                         if ((old_blk == BLK_NOT_FOUND) ||
-                                (new_blk == BLK_NOT_FOUND)) {
+                            (new_blk == BLK_NOT_FOUND)) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
 
                         retval = xd_prepare_write(chip, old_blk, new_blk,
-                                                log_blk, start_page);
+                                                  log_blk, start_page);
                         if (retval != STATUS_SUCCESS) {
                                 if (detect_card_cd(chip, XD_CARD) !=
                                         STATUS_SUCCESS) {
                                         set_sense_type(chip, lun,
-                                                SENSE_TYPE_MEDIA_NOT_PRESENT);
+                                                       SENSE_TYPE_MEDIA_NOT_PRESENT);
                                         rtsx_trace(chip);
                                         return STATUS_FAIL;
                                 }
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
@@ -2078,12 +2105,12 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                 if (retval != STATUS_SUCCESS) {
                         if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_NOT_PRESENT);
+                                               SENSE_TYPE_MEDIA_NOT_PRESENT);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                       SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         rtsx_trace(chip);
                         return STATUS_FAIL;
                 }
@@ -2092,7 +2119,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                 old_blk = xd_get_l2p_tbl(chip, zone_no, log_off);
                 if (old_blk == BLK_NOT_FOUND) {
                         set_sense_type(chip, lun,
-                                SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                       SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         rtsx_trace(chip);
                         return STATUS_FAIL;
                 }
@@ -2116,22 +2143,22 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                 page_cnt = end_page - start_page;
                 if (srb->sc_data_direction == DMA_FROM_DEVICE) {
                         retval = xd_read_multiple_pages(chip, old_blk, log_blk,
-                                        start_page, end_page, ptr,
-                                                        &index, &offset);
+                                                        start_page, end_page,
+                                                        ptr, &index, &offset);
                         if (retval != STATUS_SUCCESS) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                               SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
                 } else {
                         retval = xd_write_multiple_pages(chip, old_blk,
-                                                        new_blk, log_blk,
-                                        start_page, end_page, ptr,
-                                                        &index, &offset);
+                                                         new_blk, log_blk,
+                                                         start_page, end_page,
+                                                         ptr, &index, &offset);
                         if (retval != STATUS_SUCCESS) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
@@ -2153,7 +2180,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                         if (retval != STATUS_SUCCESS) {
                                 chip->card_fail |= XD_CARD;
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_NOT_PRESENT);
+                                               SENSE_TYPE_MEDIA_NOT_PRESENT);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
@@ -2163,10 +2190,10 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                 if (old_blk == BLK_NOT_FOUND) {
                         if (srb->sc_data_direction == DMA_FROM_DEVICE)
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
+                                               SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR);
                         else
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
 
                         rtsx_trace(chip);
                         return STATUS_FAIL;
@@ -2176,7 +2203,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                         new_blk = xd_get_unused_block(chip, zone_no);
                         if (new_blk == BLK_NOT_FOUND) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_WRITE_ERR);
+                                               SENSE_TYPE_MEDIA_WRITE_ERR);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
@@ -2186,7 +2213,7 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
         }
 
         if ((srb->sc_data_direction == DMA_TO_DEVICE) &&
-                        (end_page != (xd_card->page_off + 1))) {
+            (end_page != (xd_card->page_off + 1))) {
 #ifdef XD_DELAY_WRITE
                 delay_write->delay_write_flag = 1;
                 delay_write->old_phyblock = old_blk;
@@ -2202,11 +2229,11 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
                 }
 
                 retval = xd_finish_write(chip, old_blk, new_blk,
-                                        log_blk, end_page);
+                                         log_blk, end_page);
                 if (retval != STATUS_SUCCESS) {
                         if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
                                 set_sense_type(chip, lun,
-                                        SENSE_TYPE_MEDIA_NOT_PRESENT);
+                                               SENSE_TYPE_MEDIA_NOT_PRESENT);
                                 rtsx_trace(chip);
                                 return STATUS_FAIL;
                         }
@@ -2224,10 +2251,10 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
 
 void xd_free_l2p_tbl(struct rtsx_chip *chip)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         int i = 0;
 
-        if (xd_card->zone != NULL) {
+        if (xd_card->zone) {
                 for (i = 0; i < xd_card->zone_cnt; i++) {
                         vfree(xd_card->zone[i].l2p_table);
                         xd_card->zone[i].l2p_table = NULL;
@@ -2242,7 +2269,7 @@ void xd_free_l2p_tbl(struct rtsx_chip *chip)
 void xd_cleanup_work(struct rtsx_chip *chip)
 {
 #ifdef XD_DELAY_WRITE
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
 
         if (xd_card->delay_write.delay_write_flag) {
                 dev_dbg(rtsx_dev(chip), "xD: delay write\n");
@@ -2297,7 +2324,7 @@ int xd_power_off_card3v3(struct rtsx_chip *chip)
 
 int release_xd_card(struct rtsx_chip *chip)
 {
-        struct xd_info *xd_card = &(chip->xd_card);
+        struct xd_info *xd_card = &chip->xd_card;
         int retval;
 
         chip->card_ready &= ~XD_CARD;
diff --git a/drivers/staging/rts5208/xd.h b/drivers/staging/rts5208/xd.h
index 938138c50bb5..d5f10880efb7 100644
--- a/drivers/staging/rts5208/xd.h
+++ b/drivers/staging/rts5208/xd.h
@@ -179,7 +179,7 @@ int reset_xd_card(struct rtsx_chip *chip);
 int xd_delay_write(struct rtsx_chip *chip);
 #endif
 int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
-        u32 start_sector, u16 sector_cnt);
+          u32 start_sector, u16 sector_cnt);
 void xd_free_l2p_tbl(struct rtsx_chip *chip);
 void xd_cleanup_work(struct rtsx_chip *chip);
 int xd_power_off_card3v3(struct rtsx_chip *chip);
diff --git a/drivers/staging/skein/skein_api.c b/drivers/staging/skein/skein_api.c
index cab26e736111..c6526b6fbfb4 100644
--- a/drivers/staging/skein/skein_api.c
+++ b/drivers/staging/skein/skein_api.c
@@ -98,19 +98,16 @@ int skein_mac_init(struct skein_ctx *ctx, const u8 *key, size_t key_len,
         switch (ctx->skein_size) {
         case SKEIN_256:
                 ret = skein_256_init_ext(&ctx->m.s256, hash_bit_len,
-                                         tree_info,
-                                         (const u8 *)key, key_len);
+                                         tree_info, key, key_len);
 
                 break;
         case SKEIN_512:
                 ret = skein_512_init_ext(&ctx->m.s512, hash_bit_len,
-                                         tree_info,
-                                         (const u8 *)key, key_len);
+                                         tree_info, key, key_len);
                 break;
         case SKEIN_1024:
                 ret = skein_1024_init_ext(&ctx->m.s1024, hash_bit_len,
-                                          tree_info,
-                                          (const u8 *)key, key_len);
+                                          tree_info, key, key_len);
 
                 break;
         }
@@ -152,16 +149,13 @@ int skein_update(struct skein_ctx *ctx, const u8 *msg,
 
         switch (ctx->skein_size) {
         case SKEIN_256:
-                ret = skein_256_update(&ctx->m.s256, (const u8 *)msg,
-                                       msg_byte_cnt);
+                ret = skein_256_update(&ctx->m.s256, msg, msg_byte_cnt);
                 break;
         case SKEIN_512:
-                ret = skein_512_update(&ctx->m.s512, (const u8 *)msg,
-                                       msg_byte_cnt);
+                ret = skein_512_update(&ctx->m.s512, msg, msg_byte_cnt);
                 break;
         case SKEIN_1024:
-                ret = skein_1024_update(&ctx->m.s1024, (const u8 *)msg,
-                                        msg_byte_cnt);
+                ret = skein_1024_update(&ctx->m.s1024, msg, msg_byte_cnt);
                 break;
         }
         return ret;
@@ -211,7 +205,7 @@ int skein_update_bits(struct skein_ctx *ctx, const u8 *msg,
         /* partial byte bit mask */
         mask = (u8)(1u << (7 - (msg_bit_cnt & 7)));
         /* apply bit padding on final byte (in the buffer) */
-        up[length - 1]  = (u8)((up[length - 1] & (0 - mask)) | mask);
+        up[length - 1]  = (up[length - 1] & (0 - mask)) | mask;
 
         return SKEIN_SUCCESS;
 }
@@ -224,13 +218,13 @@ int skein_final(struct skein_ctx *ctx, u8 *hash)
 
         switch (ctx->skein_size) {
         case SKEIN_256:
-                ret = skein_256_final(&ctx->m.s256, (u8 *)hash);
+                ret = skein_256_final(&ctx->m.s256, hash);
                 break;
         case SKEIN_512:
-                ret = skein_512_final(&ctx->m.s512, (u8 *)hash);
+                ret = skein_512_final(&ctx->m.s512, hash);
                 break;
         case SKEIN_1024:
-                ret = skein_1024_final(&ctx->m.s1024, (u8 *)hash);
+                ret = skein_1024_final(&ctx->m.s1024, hash);
                 break;
         }
         return ret;
diff --git a/drivers/staging/skein/threefish_block.c b/drivers/staging/skein/threefish_block.c
index a95563fad071..50640656c10d 100644
--- a/drivers/staging/skein/threefish_block.c
+++ b/drivers/staging/skein/threefish_block.c
@@ -64,7 +64,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 += b1;
         b1 = rol64(b1, 32) ^ b2;
 
-
         b1 += k3 + t2;
         b0 += b1 + k2;
         b1 = rol64(b1, 14) ^ b0;
@@ -117,7 +116,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 += b1;
         b1 = rol64(b1, 32) ^ b2;
 
-
         b1 += k0 + t1;
         b0 += b1 + k4;
         b1 = rol64(b1, 14) ^ b0;
@@ -170,7 +168,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 += b1;
         b1 = rol64(b1, 32) ^ b2;
 
-
         b1 += k2 + t0;
         b0 += b1 + k1;
         b1 = rol64(b1, 14) ^ b0;
@@ -223,7 +220,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 += b1;
         b1 = rol64(b1, 32) ^ b2;
 
-
         b1 += k4 + t2;
         b0 += b1 + k3;
         b1 = rol64(b1, 14) ^ b0;
@@ -276,7 +272,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 += b1;
         b1 = rol64(b1, 32) ^ b2;
 
-
         b1 += k1 + t1;
         b0 += b1 + k0;
         b1 = rol64(b1, 14) ^ b0;
@@ -329,7 +324,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 += b1;
         b1 = rol64(b1, 32) ^ b2;
 
-
         b1 += k3 + t0;
         b0 += b1 + k2;
         b1 = rol64(b1, 14) ^ b0;
@@ -382,7 +376,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 += b1;
         b1 = rol64(b1, 32) ^ b2;
 
-
         b1 += k0 + t2;
         b0 += b1 + k4;
         b1 = rol64(b1, 14) ^ b0;
@@ -435,7 +428,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 += b1;
         b1 = rol64(b1, 32) ^ b2;
 
-
         b1 += k2 + t1;
         b0 += b1 + k1;
         b1 = rol64(b1, 14) ^ b0;
@@ -579,7 +571,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 -= b3 + k3 + t2;
         b3 -= k4 + 16;
 
-
         tmp = b3 ^ b0;
         b3 = ror64(tmp, 32);
         b0 -= b3;
@@ -648,7 +639,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 -= b3 + k1 + t0;
         b3 -= k2 + 14;
 
-
         tmp = b3 ^ b0;
         b3 = ror64(tmp, 32);
         b0 -= b3;
@@ -717,7 +707,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 -= b3 + k4 + t1;
         b3 -= k0 + 12;
 
-
         tmp = b3 ^ b0;
         b3 = ror64(tmp, 32);
         b0 -= b3;
@@ -786,7 +775,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 -= b3 + k2 + t2;
         b3 -= k3 + 10;
 
-
         tmp = b3 ^ b0;
         b3 = ror64(tmp, 32);
         b0 -= b3;
@@ -855,7 +843,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 -= b3 + k0 + t0;
         b3 -= k1 + 8;
 
-
         tmp = b3 ^ b0;
         b3 = ror64(tmp, 32);
         b0 -= b3;
@@ -924,7 +911,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 -= b3 + k3 + t1;
         b3 -= k4 + 6;
 
-
         tmp = b3 ^ b0;
         b3 = ror64(tmp, 32);
         b0 -= b3;
@@ -993,7 +979,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 -= b3 + k1 + t2;
         b3 -= k2 + 4;
 
-
         tmp = b3 ^ b0;
         b3 = ror64(tmp, 32);
         b0 -= b3;
@@ -1062,7 +1047,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
         b2 -= b3 + k4 + t0;
         b3 -= k0 + 2;
 
-
         tmp = b3 ^ b0;
         b3 = ror64(tmp, 32);
         b0 -= b3;
diff --git a/drivers/staging/slicoss/Kconfig b/drivers/staging/slicoss/Kconfig
deleted file mode 100644
index 5c2a15b42dfe..000000000000
--- a/drivers/staging/slicoss/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-config SLICOSS
-        tristate "Alacritech Gigabit IS-NIC support"
-        depends on PCI && X86 && NET
-        default n
-        help
-          This driver supports Alacritech's IS-NIC gigabit ethernet cards.
-
-          This includes the following devices:
-            Mojave cards (single port PCI Gigabit) both copper and fiber
-            Oasis cards (single and dual port PCI-x Gigabit) copper and fiber
-            Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber
-
-          To compile this driver as a module, choose M here: the module
-          will be called slicoss.
diff --git a/drivers/staging/slicoss/Makefile b/drivers/staging/slicoss/Makefile
deleted file mode 100644
index 7bc9e9b9d3ab..000000000000
--- a/drivers/staging/slicoss/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_SLICOSS) += slicoss.o
diff --git a/drivers/staging/slicoss/README b/drivers/staging/slicoss/README
deleted file mode 100644
index 4fa50e73ce86..000000000000
--- a/drivers/staging/slicoss/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This driver is supposed to support:
-
-        Mojave cards (single port PCI Gigabit) both copper and fiber
-        Oasis cards (single and dual port PCI-x Gigabit) copper and fiber
-        Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber
-
-The driver was actually tested on Oasis and Kalahari cards.
diff --git a/drivers/staging/slicoss/TODO b/drivers/staging/slicoss/TODO
deleted file mode 100644
index 9019729b7be6..000000000000
--- a/drivers/staging/slicoss/TODO
+++ /dev/null
@@ -1,36 +0,0 @@
-TODO:
-        - move firmware loading to request_firmware()
-        - remove direct memory access of structures
-        - any remaining sparse and checkpatch.pl warnings
-
-        - use net_device_ops
-        - use dev->stats rather than adapter->stats
-        - don't cast netdev_priv it is already void
-        - GET RID OF MACROS
-        - work on all architectures
-           - without CONFIG_X86_64 confusion
-           - do 64 bit correctly
-           - don't depend on order of union
-        - get rid of ASSERT(), use BUG() instead but only where necessary
-          looks like most aren't really useful
-        - no new SIOCDEVPRIVATE ioctl allowed
-        - don't use module_param for configuring interrupt mitigation
-          use ethtool instead
-        - reorder code to elminate use of forward declarations
-        - don't keep private linked list of drivers.
-        - use PCI_DEVICE()
-        - do ethtool correctly using ethtool_ops
-        - NAPI?
-        - wasted overhead of extra stats
-        - state variables for things that are
-          easily available and shouldn't be kept in card structure, cardnum, ...
-          slotnumber, events, ...
-        - volatile == bad design => bad code
-        - locking too fine grained, not designed just throw more locks
-          at problem
-
-Please send patches to:
-        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-and Cc: Lior Dotan <liodot@gmail.com> and Christopher Harrer
-<charrer@alacritech.com> as well as they are also able to test out any
-changes.
diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h
deleted file mode 100644
index 420546d43002..000000000000
--- a/drivers/staging/slicoss/slic.h
+++ /dev/null
@@ -1,573 +0,0 @@
-/**************************************************************************
- *
- * Copyright (c) 2000-2002 Alacritech, Inc.  All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- *    copyright notice, this list of conditions and the following
- *    disclaimer in the documentation and/or other materials provided
- *    with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation
- * are those of the authors and should not be interpreted as representing
- * official policies, either expressed or implied, of Alacritech, Inc.
- *
- **************************************************************************/
-
-/*
- * FILENAME: slic.h
- *
- * This is the base set of header definitions for the SLICOSS driver.
- */
-#ifndef __SLIC_DRIVER_H__
-#define __SLIC_DRIVER_H__
-
-/* firmware stuff */
-#define OASIS_UCODE_VERS_STRING "1.2"
-#define OASIS_UCODE_VERS_DATE   "2006/03/27 15:10:37"
-#define OASIS_UCODE_HOSTIF_ID   3
-
-#define MOJAVE_UCODE_VERS_STRING        "1.2"
-#define MOJAVE_UCODE_VERS_DATE          "2006/03/27 15:12:22"
-#define MOJAVE_UCODE_HOSTIF_ID          3
-
-#define GB_RCVUCODE_VERS_STRING "1.2"
-#define GB_RCVUCODE_VERS_DATE   "2006/03/27 15:12:15"
-static u32 OasisRcvUCodeLen = 512;
-static u32 GBRcvUCodeLen = 512;
-#define SECTION_SIZE 65536
-
-#define SLIC_RSPQ_PAGES_GB        10
-#define SLIC_RSPQ_BUFSINPAGE      (PAGE_SIZE / SLIC_RSPBUF_SIZE)
-
-struct slic_rspqueue {
-        u32             offset;
-        u32             pageindex;
-        u32             num_pages;
-        struct slic_rspbuf *rspbuf;
-        u32 *vaddr[SLIC_RSPQ_PAGES_GB];
-        dma_addr_t          paddr[SLIC_RSPQ_PAGES_GB];
-};
-
-#define SLIC_RCVQ_EXPANSION         1
-#define SLIC_RCVQ_ENTRIES           (256 * SLIC_RCVQ_EXPANSION)
-#define SLIC_RCVQ_MINENTRIES        (SLIC_RCVQ_ENTRIES / 2)
-#define SLIC_RCVQ_MAX_PROCESS_ISR   ((SLIC_RCVQ_ENTRIES * 4))
-#define SLIC_RCVQ_RCVBUFSIZE        2048
-#define SLIC_RCVQ_FILLENTRIES       (16 * SLIC_RCVQ_EXPANSION)
-#define SLIC_RCVQ_FILLTHRESH        (SLIC_RCVQ_ENTRIES - SLIC_RCVQ_FILLENTRIES)
-
-struct slic_rcvqueue {
-        struct sk_buff    *head;
-        struct sk_buff    *tail;
-        u32            count;
-        u32            size;
-        u32            errors;
-};
-
-struct slic_rcvbuf_info {
-        u32     id;
-        u32     starttime;
-        u32     stoptime;
-        u32     slicworld;
-        u32     lasttime;
-        u32     lastid;
-};
-
-/*
- * SLIC Handle structure.  Used to restrict handle values to
- * 32 bits by using an index rather than an address.
- * Simplifies ucode in 64-bit systems
- */
-struct slic_handle_word {
-        union {
-                struct {
-                        ushort      index;
-                        ushort      bottombits; /* to denote num bufs to card */
-                }  parts;
-                u32         whole;
-        }  handle;
-};
-
-struct slic_handle {
-        struct slic_handle_word  token;  /* token passed between host and card*/
-        ushort                      type;
-        void *address;    /* actual address of the object*/
-        ushort                      offset;
-        struct slic_handle       *other_handle;
-        struct slic_handle       *next;
-};
-
-#define SLIC_HANDLE_FREE        0x0000
-#define SLIC_HANDLE_DATA        0x0001
-#define SLIC_HANDLE_CMD         0x0002
-#define SLIC_HANDLE_CONTEXT     0x0003
-#define SLIC_HANDLE_TEAM        0x0004
-
-#define handle_index        handle.parts.index
-#define handle_bottom       handle.parts.bottombits
-#define handle_token        handle.whole
-
-#define SLIC_HOSTCMD_SIZE    512
-
-struct slic_hostcmd {
-        struct slic_host64_cmd  cmd64;
-        u32                    type;
-        struct sk_buff            *skb;
-        u32                    paddrl;
-        u32                    paddrh;
-        u32                    busy;
-        u32                    cmdsize;
-        ushort                     numbufs;
-        struct slic_handle    *pslic_handle;/* handle associated with command */
-        struct slic_hostcmd    *next;
-        struct slic_hostcmd    *next_all;
-};
-
-#define SLIC_CMDQ_CMDSINPAGE    (PAGE_SIZE / SLIC_HOSTCMD_SIZE)
-#define SLIC_CMD_DUMB            3
-#define SLIC_CMDQ_INITCMDS       256
-#define SLIC_CMDQ_MAXCMDS        256
-#define SLIC_CMDQ_MAXOUTSTAND    SLIC_CMDQ_MAXCMDS
-#define SLIC_CMDQ_MAXPAGES       (SLIC_CMDQ_MAXCMDS / SLIC_CMDQ_CMDSINPAGE)
-#define SLIC_CMDQ_INITPAGES      (SLIC_CMDQ_INITCMDS / SLIC_CMDQ_CMDSINPAGE)
-
-struct slic_cmdqmem {
-        int pagecnt;
-        u32 *pages[SLIC_CMDQ_MAXPAGES];
-        dma_addr_t dma_pages[SLIC_CMDQ_MAXPAGES];
-};
-
-struct slic_cmdqueue {
-        struct slic_hostcmd *head;
-        struct slic_hostcmd *tail;
-        int count;
-        spinlock_t lock;
-};
-
-#define SLIC_MAX_CARDS              32
-#define SLIC_MAX_PORTS              4        /* Max # of ports per card   */
-
-struct mcast_address {
-        unsigned char address[6];
-        struct mcast_address *next;
-};
-
-#define CARD_DOWN        0x00000000
-#define CARD_UP          0x00000001
-#define CARD_FAIL        0x00000002
-#define CARD_DIAG        0x00000003
-#define CARD_SLEEP       0x00000004
-
-#define ADAPT_DOWN             0x00
-#define ADAPT_UP               0x01
-#define ADAPT_FAIL             0x02
-#define ADAPT_RESET            0x03
-#define ADAPT_SLEEP            0x04
-
-#define ADAPT_FLAGS_BOOTTIME            0x0001
-#define ADAPT_FLAGS_IS64BIT             0x0002
-#define ADAPT_FLAGS_PENDINGLINKDOWN     0x0004
-#define ADAPT_FLAGS_FIBERMEDIA          0x0008
-#define ADAPT_FLAGS_LOCKS_ALLOCED       0x0010
-#define ADAPT_FLAGS_INT_REGISTERED      0x0020
-#define ADAPT_FLAGS_LOAD_TIMER_SET      0x0040
-#define ADAPT_FLAGS_STATS_TIMER_SET     0x0080
-#define ADAPT_FLAGS_RESET_TIMER_SET     0x0100
-
-#define LINK_DOWN              0x00
-#define LINK_CONFIG            0x01
-#define LINK_UP                0x02
-
-#define LINK_10MB              0x00
-#define LINK_100MB             0x01
-#define LINK_AUTOSPEED         0x02
-#define LINK_1000MB            0x03
-#define LINK_10000MB           0x04
-
-#define LINK_HALFD             0x00
-#define LINK_FULLD             0x01
-#define LINK_AUTOD             0x02
-
-#define MAC_DIRECTED     0x00000001
-#define MAC_BCAST        0x00000002
-#define MAC_MCAST        0x00000004
-#define MAC_PROMISC      0x00000008
-#define MAC_LOOPBACK     0x00000010
-#define MAC_ALLMCAST     0x00000020
-
-#define SLIC_DUPLEX(x)    ((x == LINK_FULLD) ? "FDX" : "HDX")
-#define SLIC_SPEED(x)     ((x == LINK_100MB) ? "100Mb" : ((x == LINK_1000MB) ?\
-                                "1000Mb" : " 10Mb"))
-#define SLIC_LINKSTATE(x) ((x == LINK_DOWN) ? "Down" : "Up  ")
-#define SLIC_ADAPTER_STATE(x) ((x == ADAPT_UP) ? "UP" : "Down")
-#define SLIC_CARD_STATE(x)    ((x == CARD_UP) ? "UP" : "Down")
-
-struct slic_iface_stats {
-        /*
-         * Stats
-         */
-        u64        xmt_bytes;
-        u64        xmt_ucast;
-        u64        xmt_mcast;
-        u64        xmt_bcast;
-        u64        xmt_errors;
-        u64        xmt_discards;
-        u64        xmit_collisions;
-        u64        xmit_excess_xmit_collisions;
-        u64        rcv_bytes;
-        u64        rcv_ucast;
-        u64        rcv_mcast;
-        u64        rcv_bcast;
-        u64        rcv_errors;
-        u64        rcv_discards;
-};
-
-struct sliccp_stats {
-        u64        xmit_tcp_segs;
-        u64        xmit_tcp_bytes;
-        u64        rcv_tcp_segs;
-        u64        rcv_tcp_bytes;
-};
-
-struct slicnet_stats {
-        struct sliccp_stats        tcp;
-        struct slic_iface_stats      iface;
-};
-
-#define SLIC_LOADTIMER_PERIOD     1
-#define SLIC_INTAGG_DEFAULT       200
-#define SLIC_LOAD_0               0
-#define SLIC_INTAGG_0             0
-#define SLIC_LOAD_1               8000
-#define SLIC_LOAD_2               10000
-#define SLIC_LOAD_3               12000
-#define SLIC_LOAD_4               14000
-#define SLIC_LOAD_5               16000
-#define SLIC_INTAGG_1             50
-#define SLIC_INTAGG_2             100
-#define SLIC_INTAGG_3             150
-#define SLIC_INTAGG_4             200
-#define SLIC_INTAGG_5             250
-#define SLIC_LOAD_1GB             3000
-#define SLIC_LOAD_2GB             6000
-#define SLIC_LOAD_3GB             12000
-#define SLIC_LOAD_4GB             24000
-#define SLIC_LOAD_5GB             48000
-#define SLIC_INTAGG_1GB           50
-#define SLIC_INTAGG_2GB           75
-#define SLIC_INTAGG_3GB           100
-#define SLIC_INTAGG_4GB           100
-#define SLIC_INTAGG_5GB           100
-
-struct ether_header {
-        unsigned char    ether_dhost[6];
-        unsigned char    ether_shost[6];
-        ushort   ether_type;
-};
-
-struct sliccard {
-        uint              busnumber;
-        uint              slotnumber;
-        uint              state;
-        uint              cardnum;
-        uint              card_size;
-        uint              adapters_activated;
-        uint              adapters_allocated;
-        uint              adapters_sleeping;
-        uint              gennumber;
-        u32           events;
-        u32           loadlevel_current;
-        u32           load;
-        uint              reset_in_progress;
-        u32           pingstatus;
-        u32           bad_pingstatus;
-        struct timer_list loadtimer;
-        u32           loadtimerset;
-        uint              config_set;
-        struct slic_config  config;
-        struct adapter  *master;
-        struct adapter  *adapter[SLIC_MAX_PORTS];
-        struct sliccard *next;
-        u32             error_interrupts;
-        u32             error_rmiss_interrupts;
-        u32             rcv_interrupts;
-        u32             xmit_interrupts;
-        u32             num_isrs;
-        u32             false_interrupts;
-        u32             max_isr_rcvs;
-        u32             max_isr_xmits;
-        u32             rcv_interrupt_yields;
-        u32             tx_packets;
-        u32             debug_ix;
-        ushort              reg_type[32];
-        ushort              reg_offset[32];
-        u32             reg_value[32];
-        u32             reg_valueh[32];
-};
-
-#define NUM_CFG_SPACES      2
-#define NUM_CFG_REGS        64
-#define NUM_CFG_REG_ULONGS  (NUM_CFG_REGS / sizeof(u32))
-
-struct physcard {
-        struct adapter  *adapter[SLIC_MAX_PORTS];
-        struct physcard *next;
-        uint                adapters_allocd;
-
-/*
- * the following is not currently needed
- *      u32              bridge_busnum;
- *      u32              bridge_cfg[NUM_CFG_SPACES][NUM_CFG_REG_ULONGS];
- */
-};
-
-struct base_driver {
-        spinlock_t       driver_lock;
-        u32              num_slic_cards;
-        u32              num_slic_ports;
-        u32              num_slic_ports_active;
-        u32              dynamic_intagg;
-        struct sliccard  *slic_card;
-        struct physcard  *phys_card;
-        uint                 cardnuminuse[SLIC_MAX_CARDS];
-};
-
-struct slic_stats {
-        /* xmit stats */
-        u64 xmit_tcp_bytes;
-        u64 xmit_tcp_segs;
-        u64 xmit_bytes;
-        u64 xmit_collisions;
-        u64 xmit_unicasts;
-        u64 xmit_other_error;
-        u64 xmit_excess_collisions;
-        /* rcv stats */
-        u64 rcv_tcp_bytes;
-        u64 rcv_tcp_segs;
-        u64 rcv_bytes;
-        u64 rcv_unicasts;
-        u64 rcv_other_error;
-        u64 rcv_drops;
-};
-
-struct slic_shmem_data {
-        u32 isr;
-        u32 lnkstatus;
-        struct slic_stats stats;
-};
-
-struct slic_shmemory {
-        dma_addr_t isr_phaddr;
-        dma_addr_t lnkstatus_phaddr;
-        dma_addr_t stats_phaddr;
-        struct slic_shmem_data __iomem *shmem_data;
-};
-
-struct slic_upr {
-        uint               adapter;
-        u32            upr_request;
-        u32            upr_data;
-        u32            upr_data_h;
-        u32            upr_buffer;
-        u32            upr_buffer_h;
-        struct slic_upr *next;
-};
-
-struct slic_ifevents {
-        uint        oflow802;
-        uint        uflow802;
-        uint        Tprtoflow;
-        uint        rcvearly;
-        uint        Bufov;
-        uint        Carre;
-        uint        Longe;
-        uint        Invp;
-        uint        Crc;
-        uint        Drbl;
-        uint        Code;
-        uint        IpHlen;
-        uint        IpLen;
-        uint        IpCsum;
-        uint        TpCsum;
-        uint        TpHlen;
-};
-
-struct adapter {
-        void *ifp;
-        struct sliccard *card;
-        uint                port;
-        struct physcard *physcard;
-        uint                physport;
-        uint                cardindex;
-        uint                card_size;
-        uint                chipid;
-        struct net_device  *netdev;
-        spinlock_t          adapter_lock;
-        spinlock_t          reset_lock;
-        struct pci_dev     *pcidev;
-        uint                busnumber;
-        uint                slotnumber;
-        uint                functionnumber;
-        ushort              vendid;
-        ushort              devid;
-        ushort              subsysid;
-        u32             irq;
-        u32             drambase;
-        u32             dramlength;
-        uint                queues_initialized;
-        uint                allocated;
-        uint                activated;
-        u32             intrregistered;
-        uint                isp_initialized;
-        uint                gennumber;
-        struct slic_shmemory shmem;
-        dma_addr_t          phys_shmem;
-        void __iomem *regs;
-        unsigned char               state;
-        unsigned char               linkstate;
-        unsigned char               linkspeed;
-        unsigned char               linkduplex;
-        uint                flags;
-        unsigned char               macaddr[6];
-        unsigned char               currmacaddr[6];
-        u32             macopts;
-        ushort              devflags_prev;
-        u64             mcastmask;
-        struct mcast_address   *mcastaddrs;
-        struct slic_upr   *upr_list;
-        uint                upr_busy;
-        struct timer_list   pingtimer;
-        u32             pingtimerset;
-        struct timer_list   loadtimer;
-        u32             loadtimerset;
-        spinlock_t               upr_lock;
-        spinlock_t               bit64reglock;
-        struct slic_rspqueue     rspqueue;
-        struct slic_rcvqueue     rcvqueue;
-        struct slic_cmdqueue     cmdq_free;
-        struct slic_cmdqueue     cmdq_done;
-        struct slic_cmdqueue     cmdq_all;
-        struct slic_cmdqmem      cmdqmem;
-        /*
-         * SLIC Handles
-         */
-        /* Object handles*/
-        struct slic_handle slic_handles[SLIC_CMDQ_MAXCMDS + 1];
-        /* Free object handles*/
-        struct slic_handle *pfree_slic_handles;
-        /* Object handle list lock*/
-        spinlock_t          handle_lock;
-        ushort              slic_handle_ix;
-
-        u32             xmitq_full;
-        u32             all_reg_writes;
-        u32             icr_reg_writes;
-        u32             isr_reg_writes;
-        u32             error_interrupts;
-        u32             error_rmiss_interrupts;
-        u32             rx_errors;
-        u32             rcv_drops;
-        u32             rcv_interrupts;
-        u32             xmit_interrupts;
-        u32             linkevent_interrupts;
-        u32             upr_interrupts;
-        u32             num_isrs;
-        u32             false_interrupts;
-        u32             tx_packets;
-        u32             xmit_completes;
-        u32             tx_drops;
-        u32             rcv_broadcasts;
-        u32             rcv_multicasts;
-        u32             rcv_unicasts;
-        u32             max_isr_rcvs;
-        u32             max_isr_xmits;
-        u32             rcv_interrupt_yields;
-        u32             intagg_period;
-        u32             intagg_delay;
-        u32             dynamic_intagg;
-        struct inicpm_state    *inicpm_info;
-        void *pinicpm_info;
-        struct slic_ifevents  if_events;
-        struct slic_stats        inicstats_prev;
-        struct slicnet_stats     slic_stats;
-};
-
-static inline u32 slic_read32(struct adapter *adapter, unsigned int reg)
-{
-        return ioread32(adapter->regs + reg);
-}
-
-static inline void slic_write32(struct adapter *adapter, unsigned int reg,
-                                u32 val)
-{
-        iowrite32(val, adapter->regs + reg);
-}
-
-static inline void slic_write64(struct adapter *adapter, unsigned int reg,
-                                u32 val, u32 hiaddr)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&adapter->bit64reglock, flags);
-        slic_write32(adapter, SLIC_REG_ADDR_UPPER, hiaddr);
-        slic_write32(adapter, reg, val);
-        mmiowb();
-        spin_unlock_irqrestore(&adapter->bit64reglock, flags);
-}
-
-static inline void slic_flush_write(struct adapter *adapter)
-{
-        ioread32(adapter->regs + SLIC_REG_HOSTID);
-}
-
-#define UPDATE_STATS(largestat, newstat, oldstat)                        \
-{                                                                        \
-        if ((newstat) < (oldstat))                                       \
-                (largestat) += ((newstat) + (0xFFFFFFFF - oldstat + 1)); \
-        else                                                             \
-                (largestat) += ((newstat) - (oldstat));                  \
-}
-
-#define UPDATE_STATS_GB(largestat, newstat, oldstat)                     \
-{                                                                        \
-        (largestat) += ((newstat) - (oldstat));                          \
-}
-
-#if BITS_PER_LONG == 64
-#define   SLIC_GET_ADDR_LOW(_addr)  (u32)((u64)(_addr) & \
-        0x00000000FFFFFFFF)
-#define   SLIC_GET_ADDR_HIGH(_addr)  (u32)(((u64)(_addr) >> 32) & \
-        0x00000000FFFFFFFF)
-#elif BITS_PER_LONG == 32
-#define   SLIC_GET_ADDR_LOW(_addr)   (u32)(_addr)
-#define   SLIC_GET_ADDR_HIGH(_addr)  (u32)0
-#else
-#error BITS_PER_LONG must be 32 or 64
-#endif
-
-#define FLUSH           true
-#define DONT_FLUSH      false
-
-#define SIOCSLICSETINTAGG        (SIOCDEVPRIVATE + 10)
-
-#endif /*  __SLIC_DRIVER_H__ */
diff --git a/drivers/staging/slicoss/slichw.h b/drivers/staging/slicoss/slichw.h
deleted file mode 100644
index 49cb91aa02bb..000000000000
--- a/drivers/staging/slicoss/slichw.h
+++ /dev/null
@@ -1,652 +0,0 @@
-/**************************************************************************
- *
- * Copyright (c) 2000-2002 Alacritech, Inc.  All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- *    copyright notice, this list of conditions and the following
- *    disclaimer in the documentation and/or other materials provided
- *    with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation
- * are those of the authors and should not be interpreted as representing
- * official policies, either expressed or implied, of Alacritech, Inc.
- *
- **************************************************************************/
-
-/*
- * FILENAME: slichw.h
- *
- * This header file contains definitions that are common to our hardware.
- */
-#ifndef __SLICHW_H__
-#define __SLICHW_H__
-
-#define PCI_VENDOR_ID_ALACRITECH        0x139A
-#define SLIC_1GB_DEVICE_ID              0x0005
-#define SLIC_2GB_DEVICE_ID              0x0007  /* Oasis Device ID */
-
-#define SLIC_1GB_CICADA_SUBSYS_ID       0x0008
-
-#define SLIC_NBR_MACS           4
-
-#define SLIC_RCVBUF_SIZE        2048
-#define SLIC_RCVBUF_HEADSIZE    34
-#define SLIC_RCVBUF_TAILSIZE    0
-#define SLIC_RCVBUF_DATASIZE    (SLIC_RCVBUF_SIZE -             \
-                                 (SLIC_RCVBUF_HEADSIZE +        \
-                                  SLIC_RCVBUF_TAILSIZE))
-
-#define VGBSTAT_XPERR           0x40000000
-#define VGBSTAT_XERRSHFT        25
-#define VGBSTAT_XCSERR          0x23
-#define VGBSTAT_XUFLOW          0x22
-#define VGBSTAT_XHLEN           0x20
-#define VGBSTAT_NETERR          0x01000000
-#define VGBSTAT_NERRSHFT        16
-#define VGBSTAT_NERRMSK         0x1ff
-#define VGBSTAT_NCSERR          0x103
-#define VGBSTAT_NUFLOW          0x102
-#define VGBSTAT_NHLEN           0x100
-#define VGBSTAT_LNKERR          0x00000080
-#define VGBSTAT_LERRMSK         0xff
-#define VGBSTAT_LDEARLY         0x86
-#define VGBSTAT_LBOFLO          0x85
-#define VGBSTAT_LCODERR         0x84
-#define VGBSTAT_LDBLNBL         0x83
-#define VGBSTAT_LCRCERR         0x82
-#define VGBSTAT_LOFLO           0x81
-#define VGBSTAT_LUFLO           0x80
-#define IRHDDR_FLEN_MSK         0x0000ffff
-#define IRHDDR_SVALID           0x80000000
-#define IRHDDR_ERR              0x10000000
-#define VRHSTAT_802OE           0x80000000
-#define VRHSTAT_TPOFLO          0x10000000
-#define VRHSTATB_802UE          0x80000000
-#define VRHSTATB_RCVE           0x40000000
-#define VRHSTATB_BUFF           0x20000000
-#define VRHSTATB_CARRE          0x08000000
-#define VRHSTATB_LONGE          0x02000000
-#define VRHSTATB_PREA           0x01000000
-#define VRHSTATB_CRC            0x00800000
-#define VRHSTATB_DRBL           0x00400000
-#define VRHSTATB_CODE           0x00200000
-#define VRHSTATB_TPCSUM         0x00100000
-#define VRHSTATB_TPHLEN         0x00080000
-#define VRHSTATB_IPCSUM         0x00040000
-#define VRHSTATB_IPLERR         0x00020000
-#define VRHSTATB_IPHERR         0x00010000
-#define SLIC_MAX64_BCNT         23
-#define SLIC_MAX32_BCNT         26
-#define IHCMD_XMT_REQ           0x01
-#define IHFLG_IFSHFT            2
-#define SLIC_RSPBUF_SIZE        32
-
-#define SLIC_RESET_MAGIC        0xDEAD
-#define ICR_INT_OFF             0
-#define ICR_INT_ON              1
-#define ICR_INT_MASK            2
-
-#define ISR_ERR                 0x80000000
-#define ISR_RCV                 0x40000000
-#define ISR_CMD                 0x20000000
-#define ISR_IO                  0x60000000
-#define ISR_UPC                 0x10000000
-#define ISR_LEVENT              0x08000000
-#define ISR_RMISS               0x02000000
-#define ISR_UPCERR              0x01000000
-#define ISR_XDROP               0x00800000
-#define ISR_UPCBSY              0x00020000
-#define ISR_EVMSK               0xffff0000
-#define ISR_PINGMASK            0x00700000
-#define ISR_PINGDSMASK          0x00710000
-#define ISR_UPCMASK             0x11000000
-#define SLIC_WCS_START          0x80000000
-#define SLIC_WCS_COMPARE        0x40000000
-#define SLIC_RCVWCS_BEGIN       0x40000000
-#define SLIC_RCVWCS_FINISH      0x80000000
-#define SLIC_PM_MAXPATTERNS     6
-#define SLIC_PM_PATTERNSIZE     128
-#define SLIC_PMCAPS_WAKEONLAN   0x00000001
-#define MIICR_REG_PCR           0x00000000
-#define MIICR_REG_4             0x00040000
-#define MIICR_REG_9             0x00090000
-#define MIICR_REG_16            0x00100000
-#define PCR_RESET               0x8000
-#define PCR_POWERDOWN           0x0800
-#define PCR_SPEED_100           0x2000
-#define PCR_SPEED_1000          0x0040
-#define PCR_AUTONEG             0x1000
-#define PCR_AUTONEG_RST         0x0200
-#define PCR_DUPLEX_FULL         0x0100
-#define PSR_LINKUP              0x0004
-
-#define PAR_ADV100FD            0x0100
-#define PAR_ADV100HD            0x0080
-#define PAR_ADV10FD             0x0040
-#define PAR_ADV10HD             0x0020
-#define PAR_ASYMPAUSE           0x0C00
-#define PAR_802_3               0x0001
-
-#define PAR_ADV1000XFD          0x0020
-#define PAR_ADV1000XHD          0x0040
-#define PAR_ASYMPAUSE_FIBER     0x0180
-
-#define PGC_ADV1000FD           0x0200
-#define PGC_ADV1000HD           0x0100
-#define SEEQ_LINKFAIL           0x4000
-#define SEEQ_SPEED              0x0080
-#define SEEQ_DUPLEX             0x0040
-#define TDK_DUPLEX              0x0800
-#define TDK_SPEED               0x0400
-#define MRV_REG16_XOVERON       0x0068
-#define MRV_REG16_XOVEROFF      0x0008
-#define MRV_SPEED_1000          0x8000
-#define MRV_SPEED_100           0x4000
-#define MRV_SPEED_10            0x0000
-#define MRV_FULLDUPLEX          0x2000
-#define MRV_LINKUP              0x0400
-
-#define GIG_LINKUP              0x0001
-#define GIG_FULLDUPLEX          0x0002
-#define GIG_SPEED_MASK          0x000C
-#define GIG_SPEED_1000          0x0008
-#define GIG_SPEED_100           0x0004
-#define GIG_SPEED_10            0x0000
-
-#define MCR_RESET               0x80000000
-#define MCR_CRCEN               0x40000000
-#define MCR_FULLD               0x10000000
-#define MCR_PAD                 0x02000000
-#define MCR_RETRYLATE           0x01000000
-#define MCR_BOL_SHIFT           21
-#define MCR_IPG1_SHIFT          14
-#define MCR_IPG2_SHIFT          7
-#define MCR_IPG3_SHIFT          0
-#define GMCR_RESET              0x80000000
-#define GMCR_GBIT               0x20000000
-#define GMCR_FULLD              0x10000000
-#define GMCR_GAPBB_SHIFT        14
-#define GMCR_GAPR1_SHIFT        7
-#define GMCR_GAPR2_SHIFT        0
-#define GMCR_GAPBB_1000         0x60
-#define GMCR_GAPR1_1000         0x2C
-#define GMCR_GAPR2_1000         0x40
-#define GMCR_GAPBB_100          0x70
-#define GMCR_GAPR1_100          0x2C
-#define GMCR_GAPR2_100          0x40
-#define XCR_RESET               0x80000000
-#define XCR_XMTEN               0x40000000
-#define XCR_PAUSEEN             0x20000000
-#define XCR_LOADRNG             0x10000000
-#define RCR_RESET               0x80000000
-#define RCR_RCVEN               0x40000000
-#define RCR_RCVALL              0x20000000
-#define RCR_RCVBAD              0x10000000
-#define RCR_CTLEN               0x08000000
-#define RCR_ADDRAEN             0x02000000
-#define GXCR_RESET              0x80000000
-#define GXCR_XMTEN              0x40000000
-#define GXCR_PAUSEEN            0x20000000
-#define GRCR_RESET              0x80000000
-#define GRCR_RCVEN              0x40000000
-#define GRCR_RCVALL             0x20000000
-#define GRCR_RCVBAD             0x10000000
-#define GRCR_CTLEN              0x08000000
-#define GRCR_ADDRAEN            0x02000000
-#define GRCR_HASHSIZE_SHIFT     17
-#define GRCR_HASHSIZE           14
-
-#define SLIC_EEPROM_ID          0xA5A5
-#define SLIC_SRAM_SIZE2GB       (64 * 1024)
-#define SLIC_SRAM_SIZE1GB       (32 * 1024)
-#define SLIC_HOSTID_DEFAULT     0xFFFF          /* uninitialized hostid */
-#define SLIC_NBR_MACS           4
-
-struct slic_rcvbuf {
-        u8 pad1[6];
-        u16 pad2;
-        u32 pad3;
-        u32 pad4;
-        u32 buffer;
-        u32 length;
-        u32 status;
-        u32 pad5;
-        u16 pad6;
-        u8 data[SLIC_RCVBUF_DATASIZE];
-};
-
-struct slic_hddr_wds {
-        union {
-                struct {
-                        u32 frame_status;
-                        u32 frame_status_b;
-                        u32 time_stamp;
-                        u32 checksum;
-                } hdrs_14port;
-                struct {
-                        u32 frame_status;
-                        u16 ByteCnt;
-                        u16 TpChksum;
-                        u16 CtxHash;
-                        u16 MacHash;
-                        u32 BufLnk;
-                } hdrs_gbit;
-        } u0;
-};
-
-#define frame_status14          u0.hdrs_14port.frame_status
-#define frame_status_b14        u0.hdrs_14port.frame_status_b
-#define frame_statusGB          u0.hdrs_gbit.frame_status
-
-struct slic_host64sg {
-        u32 paddrl;
-        u32 paddrh;
-        u32 length;
-};
-
-struct slic_host64_cmd {
-        u32 hosthandle;
-        u32 RSVD;
-        u8 command;
-        u8 flags;
-        union {
-                u16 rsv1;
-                u16 rsv2;
-        } u0;
-        union {
-                struct {
-                        u32 totlen;
-                        struct slic_host64sg bufs[SLIC_MAX64_BCNT];
-                } slic_buffers;
-        } u;
-};
-
-struct slic_rspbuf {
-        u32 hosthandle;
-        u32 pad0;
-        u32 pad1;
-        u32 status;
-        u32 pad2[4];
-};
-
-/* Reset Register */
-#define SLIC_REG_RESET          0x0000
-/* Interrupt Control Register */
-#define SLIC_REG_ICR            0x0008
-/* Interrupt status pointer */
-#define SLIC_REG_ISP            0x0010
-/* Interrupt status */
-#define SLIC_REG_ISR            0x0018
-/*
- * Header buffer address reg
- * 31-8 - phy addr of set of contiguous hdr buffers
- *  7-0 - number of buffers passed
- * Buffers are 256 bytes long on 256-byte boundaries.
- */
-#define SLIC_REG_HBAR           0x0020
-/*
- * Data buffer handle & address reg
- * 4 sets of registers; Buffers are 2K bytes long 2 per 4K page.
- */
-#define SLIC_REG_DBAR           0x0028
-/*
- * Xmt Cmd buf addr regs.
- * 1 per XMT interface
- * 31-5 - phy addr of host command buffer
- *  4-0 - length of cmd in multiples of 32 bytes
- * Buffers are 32 bytes up to 512 bytes long
- */
-#define SLIC_REG_CBAR           0x0030
-/* Write control store */
-#define SLIC_REG_WCS            0x0034
-/*
- * Response buffer address reg.
- * 31-8 - phy addr of set of contiguous response buffers
- * 7-0 - number of buffers passed
- * Buffers are 32 bytes long on 32-byte boundaries.
- */
-#define SLIC_REG_RBAR           0x0038
-/* Read statistics (UPR) */
-#define SLIC_REG_RSTAT          0x0040
-/* Read link status */
-#define SLIC_REG_LSTAT          0x0048
-/* Write Mac Config */
-#define SLIC_REG_WMCFG          0x0050
-/* Write phy register */
-#define SLIC_REG_WPHY           0x0058
-/* Rcv Cmd buf addr reg */
-#define SLIC_REG_RCBAR          0x0060
-/* Read SLIC Config*/
-#define SLIC_REG_RCONFIG        0x0068
-/* Interrupt aggregation time */
-#define SLIC_REG_INTAGG         0x0070
-/* Write XMIT config reg */
-#define SLIC_REG_WXCFG          0x0078
-/* Write RCV config reg */
-#define SLIC_REG_WRCFG          0x0080
-/* Write rcv addr a low */
-#define SLIC_REG_WRADDRAL       0x0088
-/* Write rcv addr a high */
-#define SLIC_REG_WRADDRAH       0x0090
-/* Write rcv addr b low */
-#define SLIC_REG_WRADDRBL       0x0098
-/* Write rcv addr b high */
-#define SLIC_REG_WRADDRBH       0x00a0
-/* Low bits of mcast mask */
-#define SLIC_REG_MCASTLOW       0x00a8
-/* High bits of mcast mask */
-#define SLIC_REG_MCASTHIGH      0x00b0
-/* Ping the card */
-#define SLIC_REG_PING           0x00b8
-/* Dump command */
-#define SLIC_REG_DUMP_CMD       0x00c0
-/* Dump data pointer */
-#define SLIC_REG_DUMP_DATA      0x00c8
-/* Read card's pci_status register */
-#define SLIC_REG_PCISTATUS      0x00d0
-/* Write hostid field */
-#define SLIC_REG_WRHOSTID       0x00d8
-/* Put card in a low power state */
-#define SLIC_REG_LOW_POWER      0x00e0
-/* Force slic into quiescent state  before soft reset */
-#define SLIC_REG_QUIESCE        0x00e8
-/* Reset interface queues */
-#define SLIC_REG_RESET_IFACE    0x00f0
-/*
- * Register is only written when it has changed.
- * Bits 63-32 for host i/f addrs.
- */
-#define SLIC_REG_ADDR_UPPER     0x00f8
-/* 64 bit Header buffer address reg */
-#define SLIC_REG_HBAR64         0x0100
-/* 64 bit Data buffer handle & address reg */
-#define SLIC_REG_DBAR64         0x0108
-/* 64 bit Xmt Cmd buf addr regs. */
-#define SLIC_REG_CBAR64         0x0110
-/* 64 bit Response buffer address reg.*/
-#define SLIC_REG_RBAR64         0x0118
-/* 64 bit Rcv Cmd buf addr reg*/
-#define SLIC_REG_RCBAR64        0x0120
-/* Read statistics (64 bit UPR) */
-#define SLIC_REG_RSTAT64        0x0128
-/* Download Gigabit RCV sequencer ucode */
-#define SLIC_REG_RCV_WCS        0x0130
-/* Write VlanId field */
-#define SLIC_REG_WRVLANID       0x0138
-/* Read Transformer info */
-#define SLIC_REG_READ_XF_INFO   0x0140
-/* Write Transformer info */
-#define SLIC_REG_WRITE_XF_INFO  0x0148
-/* Write card ticks per second */
-#define SLIC_REG_TICKS_PER_SEC  0x0170
-
-#define SLIC_REG_HOSTID         0x1554
-
-enum UPR_REQUEST {
-        SLIC_UPR_STATS,
-        SLIC_UPR_RLSR,
-        SLIC_UPR_WCFG,
-        SLIC_UPR_RCONFIG,
-        SLIC_UPR_RPHY,
-        SLIC_UPR_ENLB,
-        SLIC_UPR_ENCT,
-        SLIC_UPR_PDWN,
-        SLIC_UPR_PING,
-        SLIC_UPR_DUMP,
-};
-
-struct inicpm_wakepattern {
-        u32 patternlength;
-        u8 pattern[SLIC_PM_PATTERNSIZE];
-        u8 mask[SLIC_PM_PATTERNSIZE];
-};
-
-struct inicpm_state {
-        u32 powercaps;
-        u32 powerstate;
-        u32 wake_linkstatus;
-        u32 wake_magicpacket;
-        u32 wake_framepattern;
-        struct inicpm_wakepattern wakepattern[SLIC_PM_MAXPATTERNS];
-};
-
-struct slicpm_packet_pattern {
-        u32 priority;
-        u32 reserved;
-        u32 masksize;
-        u32 patternoffset;
-        u32 patternsize;
-        u32 patternflags;
-};
-
-enum slicpm_power_state {
-        slicpm_state_unspecified = 0,
-        slicpm_state_d0,
-        slicpm_state_d1,
-        slicpm_state_d2,
-        slicpm_state_d3,
-        slicpm_state_maximum
-};
-
-struct slicpm_wakeup_capabilities {
-        enum slicpm_power_state min_magic_packet_wakeup;
-        enum slicpm_power_state min_pattern_wakeup;
-        enum slicpm_power_state min_link_change_wakeup;
-};
-
-struct slic_pnp_capabilities {
-        u32 flags;
-        struct slicpm_wakeup_capabilities wakeup_capabilities;
-};
-
-struct slic_config_mac {
-        u8 macaddrA[6];
-};
-
-#define ATK_FRU_FORMAT          0x00
-#define VENDOR1_FRU_FORMAT      0x01
-#define VENDOR2_FRU_FORMAT      0x02
-#define VENDOR3_FRU_FORMAT      0x03
-#define VENDOR4_FRU_FORMAT      0x04
-#define NO_FRU_FORMAT           0xFF
-
-struct atk_fru {
-        u8 assembly[6];
-        u8 revision[2];
-        u8 serial[14];
-        u8 pad[3];
-};
-
-struct vendor1_fru {
-        u8 commodity;
-        u8 assembly[4];
-        u8 revision[2];
-        u8 supplier[2];
-        u8 date[2];
-        u8 sequence[3];
-        u8 pad[13];
-};
-
-struct vendor2_fru {
-        u8 part[8];
-        u8 supplier[5];
-        u8 date[3];
-        u8 sequence[4];
-        u8 pad[7];
-};
-
-struct vendor3_fru {
-        u8 assembly[6];
-        u8 revision[2];
-        u8 serial[14];
-        u8 pad[3];
-};
-
-struct vendor4_fru {
-        u8 number[8];
-        u8 part[8];
-        u8 version[8];
-        u8 pad[3];
-};
-
-union oemfru {
-        struct vendor1_fru vendor1_fru;
-        struct vendor2_fru vendor2_fru;
-        struct vendor3_fru vendor3_fru;
-        struct vendor4_fru vendor4_fru;
-};
-
-/*
- * SLIC EEPROM structure for Mojave
- */
-struct slic_eeprom {
-        u16 Id;                 /* 00 EEPROM/FLASH Magic code 'A5A5'*/
-        u16 EecodeSize;         /* 01 Size of EEPROM Codes (bytes * 4)*/
-        u16 FlashSize;          /* 02 Flash size */
-        u16 EepromSize;         /* 03 EEPROM Size */
-        u16 VendorId;           /* 04 Vendor ID */
-        u16 DeviceId;           /* 05 Device ID */
-        u8 RevisionId;          /* 06 Revision ID */
-        u8 ClassCode[3];        /* 07 Class Code */
-        u8 DbgIntPin;           /* 08 Debug Interrupt pin */
-        u8 NetIntPin0;          /*    Network Interrupt Pin */
-        u8 MinGrant;            /* 09 Minimum grant */
-        u8 MaxLat;              /*    Maximum Latency */
-        u16 PciStatus;          /* 10 PCI Status */
-        u16 SubSysVId;          /* 11 Subsystem Vendor Id */
-        u16 SubSysId;           /* 12 Subsystem ID */
-        u16 DbgDevId;           /* 13 Debug Device Id */
-        u16 DramRomFn;          /* 14 Dram/Rom function */
-        u16 DSize2Pci;          /* 15 DRAM size to PCI (bytes * 64K) */
-        u16 RSize2Pci;          /* 16 ROM extension size to PCI (bytes * 4k) */
-        u8 NetIntPin1;          /* 17 Network Interface Pin 1
-                                 *  (simba/leone only)
-                                 */
-        u8 NetIntPin2;          /* Network Interface Pin 2 (simba/leone only)*/
-        union {
-                u8 NetIntPin3;  /* 18 Network Interface Pin 3 (simba only) */
-                u8 FreeTime;    /* FreeTime setting (leone/mojave only) */
-        } u1;
-        u8 TBIctl;              /* 10-bit interface control (Mojave only) */
-        u16 DramSize;           /* 19 DRAM size (bytes * 64k) */
-        union {
-                struct {
-                        /* Mac Interface Specific portions */
-                        struct slic_config_mac  MacInfo[SLIC_NBR_MACS];
-                } mac;                          /* MAC access for all boards */
-                struct {
-                        /* use above struct for MAC access */
-                        struct slic_config_mac  pad[SLIC_NBR_MACS - 1];
-                        u16 DeviceId2;  /* Device ID for 2nd PCI function */
-                        u8 IntPin2;     /* Interrupt pin for 2nd PCI function */
-                        u8 ClassCode2[3]; /* Class Code for 2nd PCI function */
-                } mojave;       /* 2nd function access for gigabit board */
-        } u2;
-        u16 CfgByte6;           /* Config Byte 6 */
-        u16 PMECapab;           /* Power Mgment capabilities */
-        u16 NwClkCtrls;         /* NetworkClockControls */
-        u8 FruFormat;           /* Alacritech FRU format type */
-        struct atk_fru  AtkFru; /* Alacritech FRU information */
-        u8 OemFruFormat;        /* optional OEM FRU format type */
-        union oemfru OemFru;    /* optional OEM FRU information */
-        u8      Pad[4];         /* Pad to 128 bytes - includes 2 cksum bytes
-                                 * (if OEM FRU info exists) and two unusable
-                                 * bytes at the end
-                                 */
-};
-
-/* SLIC EEPROM structure for Oasis */
-struct oslic_eeprom {
-        u16 Id;                 /* 00 EEPROM/FLASH Magic code 'A5A5' */
-        u16 EecodeSize;         /* 01 Size of EEPROM Codes (bytes * 4)*/
-        u16 FlashConfig0;       /* 02 Flash Config for SPI device 0 */
-        u16 FlashConfig1;       /* 03 Flash Config for SPI device 1 */
-        u16 VendorId;           /* 04 Vendor ID */
-        u16 DeviceId;           /* 05 Device ID (function 0) */
-        u8 RevisionId;          /* 06 Revision ID */
-        u8 ClassCode[3];        /* 07 Class Code for PCI function 0 */
-        u8 IntPin1;             /* 08 Interrupt pin for PCI function 1*/
-        u8 ClassCode2[3];       /* 09 Class Code for PCI function 1 */
-        u8 IntPin2;             /* 10 Interrupt pin for PCI function 2*/
-        u8 IntPin0;             /*    Interrupt pin for PCI function 0*/
-        u8 MinGrant;            /* 11 Minimum grant */
-        u8 MaxLat;              /*    Maximum Latency */
-        u16 SubSysVId;          /* 12 Subsystem Vendor Id */
-        u16 SubSysId;           /* 13 Subsystem ID */
-        u16 FlashSize;          /* 14 Flash size (bytes / 4K) */
-        u16 DSize2Pci;          /* 15 DRAM size to PCI (bytes / 64K) */
-        u16 RSize2Pci;          /* 16 Flash (ROM extension) size to PCI
-                                 *      (bytes / 4K)
-                                 */
-        u16 DeviceId1;          /* 17 Device Id (function 1) */
-        u16 DeviceId2;          /* 18 Device Id (function 2) */
-        u16 CfgByte6;           /* 19 Device Status Config Bytes 6-7 */
-        u16 PMECapab;           /* 20 Power Mgment capabilities */
-        u8 MSICapab;            /* 21 MSI capabilities */
-        u8 ClockDivider;        /*    Clock divider */
-        u16 PciStatusLow;       /* 22 PCI Status bits 15:0 */
-        u16 PciStatusHigh;      /* 23 PCI Status bits 31:16 */
-        u16 DramConfigLow;      /* 24 DRAM Configuration bits 15:0 */
-        u16 DramConfigHigh;     /* 25 DRAM Configuration bits 31:16 */
-        u16 DramSize;           /* 26 DRAM size (bytes / 64K) */
-        u16 GpioTbiCtl;         /* 27 GPIO/TBI controls for functions 1/0 */
-        u16 EepromSize;         /* 28 EEPROM Size */
-        struct slic_config_mac MacInfo[2];      /* 29 MAC addresses (2 ports) */
-        u8 FruFormat;           /* 35 Alacritech FRU format type */
-        struct atk_fru  AtkFru; /* Alacritech FRU information */
-        u8 OemFruFormat;        /* optional OEM FRU format type */
-        union oemfru OemFru;    /* optional OEM FRU information */
-        u8 Pad[4];              /* Pad to 128 bytes - includes 2 checksum bytes
-                                 * (if OEM FRU info exists) and two unusable
-                                 * bytes at the end
-                                 */
-};
-
-#define MAX_EECODE_SIZE sizeof(struct slic_eeprom)
-#define MIN_EECODE_SIZE 0x62    /* code size without optional OEM FRU stuff */
-
-/*
- * SLIC CONFIG structure
- *
- * This structure lives in the CARD structure and is valid for all board types.
- * It is filled in from the appropriate EEPROM structure by
- * SlicGetConfigData()
- */
-struct slic_config {
-        bool EepromValid;       /* Valid EEPROM flag (checksum good?) */
-        u16 DramSize;           /* DRAM size (bytes / 64K) */
-        struct slic_config_mac MacInfo[SLIC_NBR_MACS]; /* MAC addresses */
-        u8 FruFormat;           /* Alacritech FRU format type */
-        struct atk_fru  AtkFru; /* Alacritech FRU information */
-        u8 OemFruFormat;        /* optional OEM FRU format type */
-        union {
-                struct vendor1_fru vendor1_fru;
-                struct vendor2_fru vendor2_fru;
-                struct vendor3_fru vendor3_fru;
-                struct vendor4_fru vendor4_fru;
-        } OemFru;
-};
-
-#pragma pack()
-
-#endif
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
deleted file mode 100644
index 2802b900f8ee..000000000000
--- a/drivers/staging/slicoss/slicoss.c
+++ /dev/null
@@ -1,3131 +0,0 @@
-/**************************************************************************
- *
- * Copyright  2000-2006 Alacritech, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- *    copyright notice, this list of conditions and the following
- *    disclaimer in the documentation and/or other materials provided
- *    with the distribution.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation
- * are those of the authors and should not be interpreted as representing
- * official policies, either expressed or implied, of Alacritech, Inc.
- *
- **************************************************************************/
-
-/*
- * FILENAME: slicoss.c
- *
- * The SLICOSS driver for Alacritech's IS-NIC products.
- *
- * This driver is supposed to support:
- *
- *      Mojave cards (single port PCI Gigabit) both copper and fiber
- *      Oasis cards (single and dual port PCI-x Gigabit) copper and fiber
- *      Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber
- *
- * The driver was actually tested on Oasis and Kalahari cards.
- *
- *
- * NOTE: This is the standard, non-accelerated version of Alacritech's
- *       IS-NIC driver.
- */
-
-#define KLUDGE_FOR_4GB_BOUNDARY         1
-#define DEBUG_MICROCODE                 1
-#define DBG                             1
-#define SLIC_INTERRUPT_PROCESS_LIMIT    1
-#define SLIC_OFFLOAD_IP_CHECKSUM        1
-#define STATS_TIMER_INTERVAL            2
-#define PING_TIMER_INTERVAL             1
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/timer.h>
-#include <linux/pci.h>
-#include <linux/spinlock.h>
-#include <linux/init.h>
-#include <linux/bitops.h>
-#include <linux/io.h>
-#include <linux/netdevice.h>
-#include <linux/crc32.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/delay.h>
-#include <linux/seq_file.h>
-#include <linux/kthread.h>
-#include <linux/module.h>
-
-#include <linux/firmware.h>
-#include <linux/types.h>
-#include <linux/dma-mapping.h>
-#include <linux/mii.h>
-#include <linux/if_vlan.h>
-#include <asm/unaligned.h>
-
-#include <linux/ethtool.h>
-#include <linux/uaccess.h>
-#include "slichw.h"
-#include "slic.h"
-
-static uint slic_first_init = 1;
-static char *slic_banner = "Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)";
-
-static char *slic_proc_version = "2.0.351  2006/07/14 12:26:00";
-
-static struct base_driver slic_global = { {}, 0, 0, 0, 1, NULL, NULL };
-#define DEFAULT_INTAGG_DELAY 100
-static unsigned int rcv_count;
-
-#define DRV_NAME          "slicoss"
-#define DRV_VERSION       "2.0.1"
-#define DRV_AUTHOR        "Alacritech, Inc. Engineering"
-#define DRV_DESCRIPTION   "Alacritech SLIC Techonology(tm) "\
-                "Non-Accelerated Driver"
-#define DRV_COPYRIGHT     "Copyright  2000-2006 Alacritech, Inc. "\
-                "All rights reserved."
-#define PFX                DRV_NAME " "
-
-MODULE_AUTHOR(DRV_AUTHOR);
-MODULE_DESCRIPTION(DRV_DESCRIPTION);
-MODULE_LICENSE("Dual BSD/GPL");
-
-static const struct pci_device_id slic_pci_tbl[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_ALACRITECH, SLIC_1GB_DEVICE_ID) },
-        { PCI_DEVICE(PCI_VENDOR_ID_ALACRITECH, SLIC_2GB_DEVICE_ID) },
-        { 0 }
-};
-
-static const struct ethtool_ops slic_ethtool_ops;
-
-MODULE_DEVICE_TABLE(pci, slic_pci_tbl);
-
-static void slic_mcast_set_bit(struct adapter *adapter, char *address)
-{
-        unsigned char crcpoly;
-
-        /* Get the CRC polynomial for the mac address */
-        /*
-         * we use bits 1-8 (lsb), bitwise reversed,
-         * msb (= lsb bit 0 before bitrev) is automatically discarded
-         */
-        crcpoly = ether_crc(ETH_ALEN, address) >> 23;
-
-        /*
-         * We only have space on the SLIC for 64 entries.  Lop
-         * off the top two bits. (2^6 = 64)
-         */
-        crcpoly &= 0x3F;
-
-        /* OR in the new bit into our 64 bit mask. */
-        adapter->mcastmask |= (u64)1 << crcpoly;
-}
-
-static void slic_mcast_set_mask(struct adapter *adapter)
-{
-        if (adapter->macopts & (MAC_ALLMCAST | MAC_PROMISC)) {
-                /*
-                 * Turn on all multicast addresses. We have to do this for
-                 * promiscuous mode as well as ALLMCAST mode.  It saves the
-                 * Microcode from having to keep state about the MAC
-                 * configuration.
-                 */
-                slic_write32(adapter, SLIC_REG_MCASTLOW, 0xFFFFFFFF);
-                slic_write32(adapter, SLIC_REG_MCASTHIGH, 0xFFFFFFFF);
-        } else {
-                /*
-                 * Commit our multicast mast to the SLIC by writing to the
-                 * multicast address mask registers
-                 */
-                slic_write32(adapter, SLIC_REG_MCASTLOW,
-                             (u32)(adapter->mcastmask & 0xFFFFFFFF));
-                slic_write32(adapter, SLIC_REG_MCASTHIGH,
-                             (u32)((adapter->mcastmask >> 32) & 0xFFFFFFFF));
-        }
-}
-
-static void slic_timer_ping(ulong dev)
-{
-        struct adapter *adapter;
-        struct sliccard *card;
-
-        adapter = netdev_priv((struct net_device *)dev);
-        card = adapter->card;
-
-        adapter->pingtimer.expires = jiffies + (PING_TIMER_INTERVAL * HZ);
-        add_timer(&adapter->pingtimer);
-}
-
-/*
- *  slic_link_config
- *
- *  Write phy control to configure link duplex/speed
- *
- */
-static void slic_link_config(struct adapter *adapter,
-                      u32 linkspeed, u32 linkduplex)
-{
-        u32 speed;
-        u32 duplex;
-        u32 phy_config;
-        u32 phy_advreg;
-        u32 phy_gctlreg;
-
-        if (adapter->state != ADAPT_UP)
-                return;
-
-        if (linkspeed > LINK_1000MB)
-                linkspeed = LINK_AUTOSPEED;
-        if (linkduplex > LINK_AUTOD)
-                linkduplex = LINK_AUTOD;
-
-        if ((linkspeed == LINK_AUTOSPEED) || (linkspeed == LINK_1000MB)) {
-                if (adapter->flags & ADAPT_FLAGS_FIBERMEDIA) {
-                        /*
-                         * We've got a fiber gigabit interface, and register
-                         *  4 is different in fiber mode than in copper mode
-                         */
-
-                        /* advertise FD only @1000 Mb */
-                        phy_advreg = (MIICR_REG_4 | (PAR_ADV1000XFD));
-                        /* enable PAUSE frames        */
-                        phy_advreg |= PAR_ASYMPAUSE_FIBER;
-                        slic_write32(adapter, SLIC_REG_WPHY, phy_advreg);
-
-                        if (linkspeed == LINK_AUTOSPEED) {
-                                /* reset phy, enable auto-neg  */
-                                phy_config =
-                                    (MIICR_REG_PCR |
-                                     (PCR_RESET | PCR_AUTONEG |
-                                      PCR_AUTONEG_RST));
-                                slic_write32(adapter, SLIC_REG_WPHY,
-                                             phy_config);
-                        } else {        /* forced 1000 Mb FD*/
-                                /*
-                                 * power down phy to break link
-                                 * this may not work)
-                                 */
-                                phy_config = (MIICR_REG_PCR | PCR_POWERDOWN);
-                                slic_write32(adapter, SLIC_REG_WPHY,
-                                             phy_config);
-                                slic_flush_write(adapter);
-                                /*
-                                 * wait, Marvell says 1 sec,
-                                 * try to get away with 10 ms
-                                 */
-                                mdelay(10);
-
-                                /*
-                                 * disable auto-neg, set speed/duplex,
-                                 * soft reset phy, powerup
-                                 */
-                                phy_config =
-                                    (MIICR_REG_PCR |
-                                     (PCR_RESET | PCR_SPEED_1000 |
-                                      PCR_DUPLEX_FULL));
-                                slic_write32(adapter, SLIC_REG_WPHY,
-                                             phy_config);
-                        }
-                } else {        /* copper gigabit */
-
-                        /*
-                         * Auto-Negotiate or 1000 Mb must be auto negotiated
-                         * We've got a copper gigabit interface, and
-                         * register 4 is different in copper mode than
-                         * in fiber mode
-                         */
-                        if (linkspeed == LINK_AUTOSPEED) {
-                                /* advertise 10/100 Mb modes   */
-                                phy_advreg =
-                                    (MIICR_REG_4 |
-                                     (PAR_ADV100FD | PAR_ADV100HD | PAR_ADV10FD
-                                      | PAR_ADV10HD));
-                        } else {
-                        /*
-                         * linkspeed == LINK_1000MB -
-                         * don't advertise 10/100 Mb modes
-                         */
-                                phy_advreg = MIICR_REG_4;
-                        }
-                        /* enable PAUSE frames  */
-                        phy_advreg |= PAR_ASYMPAUSE;
-                        /* required by the Cicada PHY  */
-                        phy_advreg |= PAR_802_3;
-                        slic_write32(adapter, SLIC_REG_WPHY, phy_advreg);
-                        /* advertise FD only @1000 Mb  */
-                        phy_gctlreg = (MIICR_REG_9 | (PGC_ADV1000FD));
-                        slic_write32(adapter, SLIC_REG_WPHY, phy_gctlreg);
-
-                        if (adapter->subsysid != SLIC_1GB_CICADA_SUBSYS_ID) {
-                                /*
-                                 * if a Marvell PHY
-                                 * enable auto crossover
-                                 */
-                                phy_config =
-                                    (MIICR_REG_16 | (MRV_REG16_XOVERON));
-                                slic_write32(adapter, SLIC_REG_WPHY,
-                                             phy_config);
-
-                                /* reset phy, enable auto-neg  */
-                                phy_config =
-                                    (MIICR_REG_PCR |
-                                     (PCR_RESET | PCR_AUTONEG |
-                                      PCR_AUTONEG_RST));
-                                slic_write32(adapter, SLIC_REG_WPHY,
-                                             phy_config);
-                        } else {        /* it's a Cicada PHY  */
-                                /* enable and restart auto-neg (don't reset)  */
-                                phy_config =
-                                    (MIICR_REG_PCR |
-                                     (PCR_AUTONEG | PCR_AUTONEG_RST));
-                                slic_write32(adapter, SLIC_REG_WPHY,
-                                             phy_config);
-                        }
-                }
-        } else {
-                /* Forced 10/100  */
-                if (linkspeed == LINK_10MB)
-                        speed = 0;
-                else
-                        speed = PCR_SPEED_100;
-                if (linkduplex == LINK_HALFD)
-                        duplex = 0;
-                else
-                        duplex = PCR_DUPLEX_FULL;
-
-                if (adapter->subsysid != SLIC_1GB_CICADA_SUBSYS_ID) {
-                        /*
-                         * if a Marvell PHY
-                         * disable auto crossover
-                         */
-                        phy_config = (MIICR_REG_16 | (MRV_REG16_XOVEROFF));
-                        slic_write32(adapter, SLIC_REG_WPHY, phy_config);
-                }
-
-                /* power down phy to break link (this may not work)  */
-                phy_config = (MIICR_REG_PCR | (PCR_POWERDOWN | speed | duplex));
-                slic_write32(adapter, SLIC_REG_WPHY, phy_config);
-                slic_flush_write(adapter);
-                /* wait, Marvell says 1 sec, try to get away with 10 ms */
-                mdelay(10);
-
-                if (adapter->subsysid != SLIC_1GB_CICADA_SUBSYS_ID) {
-                        /*
-                         * if a Marvell PHY
-                         * disable auto-neg, set speed,
-                         * soft reset phy, powerup
-                         */
-                        phy_config =
-                            (MIICR_REG_PCR | (PCR_RESET | speed | duplex));
-                        slic_write32(adapter, SLIC_REG_WPHY, phy_config);
-                } else {        /* it's a Cicada PHY  */
-                        /* disable auto-neg, set speed, powerup  */
-                        phy_config = (MIICR_REG_PCR | (speed | duplex));
-                        slic_write32(adapter, SLIC_REG_WPHY, phy_config);
-                }
-        }
-}
-
-static int slic_card_download_gbrcv(struct adapter *adapter)
-{
-        const struct firmware *fw;
-        const char *file = "";
-        int ret;
-        u32 codeaddr;
-        u32 instruction;
-        int index = 0;
-        u32 rcvucodelen = 0;
-
-        switch (adapter->devid) {
-        case SLIC_2GB_DEVICE_ID:
-                file = "slicoss/oasisrcvucode.sys";
-                break;
-        case SLIC_1GB_DEVICE_ID:
-                file = "slicoss/gbrcvucode.sys";
-                break;
-        default:
-                return -ENOENT;
-        }
-
-        ret = request_firmware(&fw, file, &adapter->pcidev->dev);
-        if (ret) {
-                dev_err(&adapter->pcidev->dev,
-                        "Failed to load firmware %s\n", file);
-                return ret;
-        }
-
-        rcvucodelen = *(u32 *)(fw->data + index);
-        index += 4;
-        switch (adapter->devid) {
-        case SLIC_2GB_DEVICE_ID:
-                if (rcvucodelen != OasisRcvUCodeLen) {
-                        release_firmware(fw);
-                        return -EINVAL;
-                }
-                break;
-        case SLIC_1GB_DEVICE_ID:
-                if (rcvucodelen != GBRcvUCodeLen) {
-                        release_firmware(fw);
-                        return -EINVAL;
-                }
-                break;
-        }
-        /* start download */
-        slic_write32(adapter, SLIC_REG_RCV_WCS, SLIC_RCVWCS_BEGIN);
-        /* download the rcv sequencer ucode */
-        for (codeaddr = 0; codeaddr < rcvucodelen; codeaddr++) {
-                /* write out instruction address */
-                slic_write32(adapter, SLIC_REG_RCV_WCS, codeaddr);
-
-                instruction = *(u32 *)(fw->data + index);
-                index += 4;
-                /* write out the instruction data low addr */
-                slic_write32(adapter, SLIC_REG_RCV_WCS, instruction);
-
-                instruction = *(u8 *)(fw->data + index);
-                index++;
-                /* write out the instruction data high addr */
-                slic_write32(adapter, SLIC_REG_RCV_WCS, instruction);
-        }
-
-        /* download finished */
-        release_firmware(fw);
-        slic_write32(adapter, SLIC_REG_RCV_WCS, SLIC_RCVWCS_FINISH);
-        slic_flush_write(adapter);
-
-        return 0;
-}
-
-MODULE_FIRMWARE("slicoss/oasisrcvucode.sys");
-MODULE_FIRMWARE("slicoss/gbrcvucode.sys");
-
-static int slic_card_download(struct adapter *adapter)
-{
-        const struct firmware *fw;
-        const char *file = "";
-        int ret;
-        u32 section;
-        int thissectionsize;
-        int codeaddr;
-        u32 instruction;
-        u32 baseaddress;
-        u32 i;
-        u32 numsects = 0;
-        u32 sectsize[3];
-        u32 sectstart[3];
-        int ucode_start, index = 0;
-
-        switch (adapter->devid) {
-        case SLIC_2GB_DEVICE_ID:
-                file = "slicoss/oasisdownload.sys";
-                break;
-        case SLIC_1GB_DEVICE_ID:
-                file = "slicoss/gbdownload.sys";
-                break;
-        default:
-                return -ENOENT;
-        }
-        ret = request_firmware(&fw, file, &adapter->pcidev->dev);
-        if (ret) {
-                dev_err(&adapter->pcidev->dev,
-                        "Failed to load firmware %s\n", file);
-                return ret;
-        }
-        numsects = *(u32 *)(fw->data + index);
-        index += 4;
-        for (i = 0; i < numsects; i++) {
-                sectsize[i] = *(u32 *)(fw->data + index);
-                index += 4;
-        }
-        for (i = 0; i < numsects; i++) {
-                sectstart[i] = *(u32 *)(fw->data + index);
-                index += 4;
-        }
-        ucode_start = index;
-        instruction = *(u32 *)(fw->data + index);
-        index += 4;
-        for (section = 0; section < numsects; section++) {
-                baseaddress = sectstart[section];
-                thissectionsize = sectsize[section] >> 3;
-
-                for (codeaddr = 0; codeaddr < thissectionsize; codeaddr++) {
-                        /* Write out instruction address */
-                        slic_write32(adapter, SLIC_REG_WCS,
-                                     baseaddress + codeaddr);
-                        /* Write out instruction to low addr */
-                        slic_write32(adapter, SLIC_REG_WCS,
-                                     instruction);
-                        instruction = *(u32 *)(fw->data + index);
-                        index += 4;
-
-                        /* Write out instruction to high addr */
-                        slic_write32(adapter, SLIC_REG_WCS,
-                                     instruction);
-                        instruction = *(u32 *)(fw->data + index);
-                        index += 4;
-                }
-        }
-        index = ucode_start;
-        for (section = 0; section < numsects; section++) {
-                instruction = *(u32 *)(fw->data + index);
-                baseaddress = sectstart[section];
-                if (baseaddress < 0x8000)
-                        continue;
-                thissectionsize = sectsize[section] >> 3;
-
-                for (codeaddr = 0; codeaddr < thissectionsize; codeaddr++) {
-                        /* Write out instruction address */
-                        slic_write32(adapter, SLIC_REG_WCS,
-                                     SLIC_WCS_COMPARE | (baseaddress +
-                                                         codeaddr));
-                        /* Write out instruction to low addr */
-                        slic_write32(adapter, SLIC_REG_WCS, instruction);
-                        instruction = *(u32 *)(fw->data + index);
-                        index += 4;
-                        /* Write out instruction to high addr */
-                        slic_write32(adapter, SLIC_REG_WCS, instruction);
-                        instruction = *(u32 *)(fw->data + index);
-                        index += 4;
-                }
-        }
-        release_firmware(fw);
-        /* Everything OK, kick off the card */
-        mdelay(10);
-
-        slic_write32(adapter, SLIC_REG_WCS, SLIC_WCS_START);
-        slic_flush_write(adapter);
-        /*
-         * stall for 20 ms, long enough for ucode to init card
-         * and reach mainloop
-         */
-        mdelay(20);
-
-        return 0;
-}
-
-MODULE_FIRMWARE("slicoss/oasisdownload.sys");
-MODULE_FIRMWARE("slicoss/gbdownload.sys");
-
-static void slic_adapter_set_hwaddr(struct adapter *adapter)
-{
-        struct sliccard *card = adapter->card;
-
-        if ((adapter->card) && (card->config_set)) {
-                memcpy(adapter->macaddr,
-                       card->config.MacInfo[adapter->functionnumber].macaddrA,
-                       sizeof(struct slic_config_mac));
-                if (is_zero_ether_addr(adapter->currmacaddr))
-                        memcpy(adapter->currmacaddr, adapter->macaddr,
-                               ETH_ALEN);
-                if (adapter->netdev)
-                        memcpy(adapter->netdev->dev_addr, adapter->currmacaddr,
-                               ETH_ALEN);
-        }
-}
-
-static void slic_intagg_set(struct adapter *adapter, u32 value)
-{
-        slic_write32(adapter, SLIC_REG_INTAGG, value);
-        adapter->card->loadlevel_current = value;
-}
-
-static void slic_soft_reset(struct adapter *adapter)
-{
-        if (adapter->card->state == CARD_UP) {
-                slic_write32(adapter, SLIC_REG_QUIESCE, 0);
-                slic_flush_write(adapter);
-                mdelay(1);
-        }
-
-        slic_write32(adapter, SLIC_REG_RESET, SLIC_RESET_MAGIC);
-        slic_flush_write(adapter);
-
-        mdelay(1);
-}
-
-static void slic_mac_address_config(struct adapter *adapter)
-{
-        u32 value;
-        u32 value2;
-
-        value = ntohl(*(__be32 *)&adapter->currmacaddr[2]);
-        slic_write32(adapter, SLIC_REG_WRADDRAL, value);
-        slic_write32(adapter, SLIC_REG_WRADDRBL, value);
-
-        value2 = (u32)((adapter->currmacaddr[0] << 8 |
-                             adapter->currmacaddr[1]) & 0xFFFF);
-
-        slic_write32(adapter, SLIC_REG_WRADDRAH, value2);
-        slic_write32(adapter, SLIC_REG_WRADDRBH, value2);
-
-        /*
-         * Write our multicast mask out to the card.  This is done
-         * here in addition to the slic_mcast_addr_set routine
-         * because ALL_MCAST may have been enabled or disabled
-         */
-        slic_mcast_set_mask(adapter);
-}
-
-static void slic_mac_config(struct adapter *adapter)
-{
-        u32 value;
-
-        /* Setup GMAC gaps */
-        if (adapter->linkspeed == LINK_1000MB) {
-                value = ((GMCR_GAPBB_1000 << GMCR_GAPBB_SHIFT) |
-                         (GMCR_GAPR1_1000 << GMCR_GAPR1_SHIFT) |
-                         (GMCR_GAPR2_1000 << GMCR_GAPR2_SHIFT));
-        } else {
-                value = ((GMCR_GAPBB_100 << GMCR_GAPBB_SHIFT) |
-                         (GMCR_GAPR1_100 << GMCR_GAPR1_SHIFT) |
-                         (GMCR_GAPR2_100 << GMCR_GAPR2_SHIFT));
-        }
-
-        /* enable GMII */
-        if (adapter->linkspeed == LINK_1000MB)
-                value |= GMCR_GBIT;
-
-        /* enable fullduplex */
-        if ((adapter->linkduplex == LINK_FULLD)
-            || (adapter->macopts & MAC_LOOPBACK)) {
-                value |= GMCR_FULLD;
-        }
-
-        /* write mac config */
-        slic_write32(adapter, SLIC_REG_WMCFG, value);
-
-        /* setup mac addresses */
-        slic_mac_address_config(adapter);
-}
-
-static void slic_config_set(struct adapter *adapter, bool linkchange)
-{
-        u32 value;
-        u32 RcrReset;
-
-        if (linkchange) {
-                /* Setup MAC */
-                slic_mac_config(adapter);
-                RcrReset = GRCR_RESET;
-        } else {
-                slic_mac_address_config(adapter);
-                RcrReset = 0;
-        }
-
-        if (adapter->linkduplex == LINK_FULLD) {
-                /* setup xmtcfg */
-                value = (GXCR_RESET |   /* Always reset     */
-                         GXCR_XMTEN |   /* Enable transmit  */
-                         GXCR_PAUSEEN); /* Enable pause     */
-
-                slic_write32(adapter, SLIC_REG_WXCFG, value);
-
-                /* Setup rcvcfg last */
-                value = (RcrReset |     /* Reset, if linkchange */
-                         GRCR_CTLEN |   /* Enable CTL frames    */
-                         GRCR_ADDRAEN | /* Address A enable     */
-                         GRCR_RCVBAD |  /* Rcv bad frames       */
-                         (GRCR_HASHSIZE << GRCR_HASHSIZE_SHIFT));
-        } else {
-                /* setup xmtcfg */
-                value = (GXCR_RESET |   /* Always reset     */
-                         GXCR_XMTEN);   /* Enable transmit  */
-
-                slic_write32(adapter, SLIC_REG_WXCFG, value);
-
-                /* Setup rcvcfg last */
-                value = (RcrReset |     /* Reset, if linkchange */
-                         GRCR_ADDRAEN | /* Address A enable     */
-                         GRCR_RCVBAD |  /* Rcv bad frames       */
-                         (GRCR_HASHSIZE << GRCR_HASHSIZE_SHIFT));
-        }
-
-        if (adapter->state != ADAPT_DOWN) {
-                /* Only enable receive if we are restarting or running */
-                value |= GRCR_RCVEN;
-        }
-
-        if (adapter->macopts & MAC_PROMISC)
-                value |= GRCR_RCVALL;
-
-        slic_write32(adapter, SLIC_REG_WRCFG, value);
-}
-
-/*
- *  Turn off RCV and XMT, power down PHY
- */
-static void slic_config_clear(struct adapter *adapter)
-{
-        u32 value;
-        u32 phy_config;
-
-        /* Setup xmtcfg */
-        value = (GXCR_RESET |   /* Always reset */
-                 GXCR_PAUSEEN); /* Enable pause */
-
-        slic_write32(adapter, SLIC_REG_WXCFG, value);
-
-        value = (GRCR_RESET |   /* Always reset      */
-                 GRCR_CTLEN |   /* Enable CTL frames */
-                 GRCR_ADDRAEN | /* Address A enable  */
-                 (GRCR_HASHSIZE << GRCR_HASHSIZE_SHIFT));
-
-        slic_write32(adapter, SLIC_REG_WRCFG, value);
-
-        /* power down phy */
-        phy_config = (MIICR_REG_PCR | (PCR_POWERDOWN));
-        slic_write32(adapter, SLIC_REG_WPHY, phy_config);
-}
-
-static bool slic_mac_filter(struct adapter *adapter,
-                        struct ether_header *ether_frame)
-{
-        struct net_device *netdev = adapter->netdev;
-        u32 opts = adapter->macopts;
-
-        if (opts & MAC_PROMISC)
-                return true;
-
-        if (is_broadcast_ether_addr(ether_frame->ether_dhost)) {
-                if (opts & MAC_BCAST) {
-                        adapter->rcv_broadcasts++;
-                        return true;
-                }
-
-                return false;
-        }
-
-        if (is_multicast_ether_addr(ether_frame->ether_dhost)) {
-                if (opts & MAC_ALLMCAST) {
-                        adapter->rcv_multicasts++;
-                        netdev->stats.multicast++;
-                        return true;
-                }
-                if (opts & MAC_MCAST) {
-                        struct mcast_address *mcaddr = adapter->mcastaddrs;
-
-                        while (mcaddr) {
-                                if (ether_addr_equal(mcaddr->address,
-                                                     ether_frame->ether_dhost)) {
-                                        adapter->rcv_multicasts++;
-                                        netdev->stats.multicast++;
-                                        return true;
-                                }
-                                mcaddr = mcaddr->next;
-                        }
-
-                        return false;
-                }
-
-                return false;
-        }
-        if (opts & MAC_DIRECTED) {
-                adapter->rcv_unicasts++;
-                return true;
-        }
-        return false;
-}
-
-static int slic_mac_set_address(struct net_device *dev, void *ptr)
-{
-        struct adapter *adapter = netdev_priv(dev);
-        struct sockaddr *addr = ptr;
-
-        if (netif_running(dev))
-                return -EBUSY;
-        if (!adapter)
-                return -EBUSY;
-
-        if (!is_valid_ether_addr(addr->sa_data))
-                return -EINVAL;
-
-        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-        memcpy(adapter->currmacaddr, addr->sa_data, dev->addr_len);
-
-        slic_config_set(adapter, true);
-        return 0;
-}
-
-static void slic_timer_load_check(ulong cardaddr)
-{
-        struct sliccard *card = (struct sliccard *)cardaddr;
-        struct adapter *adapter = card->master;
-        u32 load = card->events;
-        u32 level = 0;
-
-        if ((adapter) && (adapter->state == ADAPT_UP) &&
-            (card->state == CARD_UP) && (slic_global.dynamic_intagg)) {
-                if (adapter->devid == SLIC_1GB_DEVICE_ID) {
-                        if (adapter->linkspeed == LINK_1000MB)
-                                level = 100;
-                        else {
-                                if (load > SLIC_LOAD_5)
-                                        level = SLIC_INTAGG_5;
-                                else if (load > SLIC_LOAD_4)
-                                        level = SLIC_INTAGG_4;
-                                else if (load > SLIC_LOAD_3)
-                                        level = SLIC_INTAGG_3;
-                                else if (load > SLIC_LOAD_2)
-                                        level = SLIC_INTAGG_2;
-                                else if (load > SLIC_LOAD_1)
-                                        level = SLIC_INTAGG_1;
-                                else
-                                        level = SLIC_INTAGG_0;
-                        }
-                        if (card->loadlevel_current != level) {
-                                card->loadlevel_current = level;
-                                slic_write32(adapter, SLIC_REG_INTAGG, level);
-                        }
-                } else {
-                        if (load > SLIC_LOAD_5)
-                                level = SLIC_INTAGG_5;
-                        else if (load > SLIC_LOAD_4)
-                                level = SLIC_INTAGG_4;
-                        else if (load > SLIC_LOAD_3)
-                                level = SLIC_INTAGG_3;
-                        else if (load > SLIC_LOAD_2)
-                                level = SLIC_INTAGG_2;
-                        else if (load > SLIC_LOAD_1)
-                                level = SLIC_INTAGG_1;
-                        else
-                                level = SLIC_INTAGG_0;
-                        if (card->loadlevel_current != level) {
-                                card->loadlevel_current = level;
-                                slic_write32(adapter, SLIC_REG_INTAGG, level);
-                        }
-                }
-        }
-        card->events = 0;
-        card->loadtimer.expires = jiffies + (SLIC_LOADTIMER_PERIOD * HZ);
-        add_timer(&card->loadtimer);
-}
-
-static int slic_upr_queue_request(struct adapter *adapter,
-                           u32 upr_request,
-                           u32 upr_data,
-                           u32 upr_data_h,
-                           u32 upr_buffer, u32 upr_buffer_h)
-{
-        struct slic_upr *upr;
-        struct slic_upr *uprqueue;
-
-        upr = kmalloc(sizeof(*upr), GFP_ATOMIC);
-        if (!upr)
-                return -ENOMEM;
-
-        upr->adapter = adapter->port;
-        upr->upr_request = upr_request;
-        upr->upr_data = upr_data;
-        upr->upr_buffer = upr_buffer;
-        upr->upr_data_h = upr_data_h;
-        upr->upr_buffer_h = upr_buffer_h;
-        upr->next = NULL;
-        if (adapter->upr_list) {
-                uprqueue = adapter->upr_list;
-
-                while (uprqueue->next)
-                        uprqueue = uprqueue->next;
-                uprqueue->next = upr;
-        } else {
-                adapter->upr_list = upr;
-        }
-        return 0;
-}
-
-static void slic_upr_start(struct adapter *adapter)
-{
-        struct slic_upr *upr;
-
-        upr = adapter->upr_list;
-        if (!upr)
-                return;
-        if (adapter->upr_busy)
-                return;
-        adapter->upr_busy = 1;
-
-        switch (upr->upr_request) {
-        case SLIC_UPR_STATS:
-                if (upr->upr_data_h == 0) {
-                        slic_write32(adapter, SLIC_REG_RSTAT, upr->upr_data);
-                } else {
-                        slic_write64(adapter, SLIC_REG_RSTAT64, upr->upr_data,
-                                     upr->upr_data_h);
-                }
-                break;
-
-        case SLIC_UPR_RLSR:
-                slic_write64(adapter, SLIC_REG_LSTAT, upr->upr_data,
-                             upr->upr_data_h);
-                break;
-
-        case SLIC_UPR_RCONFIG:
-                slic_write64(adapter, SLIC_REG_RCONFIG, upr->upr_data,
-                             upr->upr_data_h);
-                break;
-        case SLIC_UPR_PING:
-                slic_write32(adapter, SLIC_REG_PING, 1);
-                break;
-        }
-        slic_flush_write(adapter);
-}
-
-static int slic_upr_request(struct adapter *adapter,
-                     u32 upr_request,
-                     u32 upr_data,
-                     u32 upr_data_h,
-                     u32 upr_buffer, u32 upr_buffer_h)
-{
-        unsigned long flags;
-        int rc;
-
-        spin_lock_irqsave(&adapter->upr_lock, flags);
-        rc = slic_upr_queue_request(adapter,
-                                        upr_request,
-                                        upr_data,
-                                        upr_data_h, upr_buffer, upr_buffer_h);
-        if (rc)
-                goto err_unlock_irq;
-
-        slic_upr_start(adapter);
-err_unlock_irq:
-        spin_unlock_irqrestore(&adapter->upr_lock, flags);
-        return rc;
-}
-
-static void slic_link_upr_complete(struct adapter *adapter, u32 isr)
-{
-        struct slic_shmemory *sm = &adapter->shmem;
-        struct slic_shmem_data *sm_data = sm->shmem_data;
-        u32 lst = sm_data->lnkstatus;
-        uint linkup;
-        unsigned char linkspeed;
-        unsigned char linkduplex;
-
-        if ((isr & ISR_UPCERR) || (isr & ISR_UPCBSY)) {
-                dma_addr_t phaddr = sm->lnkstatus_phaddr;
-
-                slic_upr_queue_request(adapter, SLIC_UPR_RLSR,
-                                       cpu_to_le32(lower_32_bits(phaddr)),
-                                       cpu_to_le32(upper_32_bits(phaddr)),
-                                       0, 0);
-                return;
-        }
-        if (adapter->state != ADAPT_UP)
-                return;
-
-        linkup = lst & GIG_LINKUP ? LINK_UP : LINK_DOWN;
-        if (lst & GIG_SPEED_1000)
-                linkspeed = LINK_1000MB;
-        else if (lst & GIG_SPEED_100)
-                linkspeed = LINK_100MB;
-        else
-                linkspeed = LINK_10MB;
-
-        if (lst & GIG_FULLDUPLEX)
-                linkduplex = LINK_FULLD;
-        else
-                linkduplex = LINK_HALFD;
-
-        if ((adapter->linkstate == LINK_DOWN) && (linkup == LINK_DOWN))
-                return;
-
-        /* link up event, but nothing has changed */
-        if ((adapter->linkstate == LINK_UP) &&
-            (linkup == LINK_UP) &&
-            (adapter->linkspeed == linkspeed) &&
-            (adapter->linkduplex == linkduplex))
-                return;
-
-        /* link has changed at this point */
-
-        /* link has gone from up to down */
-        if (linkup == LINK_DOWN) {
-                adapter->linkstate = LINK_DOWN;
-                netif_carrier_off(adapter->netdev);
-                return;
-        }
-
-        /* link has gone from down to up */
-        adapter->linkspeed = linkspeed;
-        adapter->linkduplex = linkduplex;
-
-        if (adapter->linkstate != LINK_UP) {
-                /* setup the mac */
-                slic_config_set(adapter, true);
-                adapter->linkstate = LINK_UP;
-                netif_carrier_on(adapter->netdev);
-        }
-}
-
-static void slic_upr_request_complete(struct adapter *adapter, u32 isr)
-{
-        struct sliccard *card = adapter->card;
-        struct slic_upr *upr;
-        unsigned long flags;
-
-        spin_lock_irqsave(&adapter->upr_lock, flags);
-        upr = adapter->upr_list;
-        if (!upr) {
-                spin_unlock_irqrestore(&adapter->upr_lock, flags);
-                return;
-        }
-        adapter->upr_list = upr->next;
-        upr->next = NULL;
-        adapter->upr_busy = 0;
-        switch (upr->upr_request) {
-        case SLIC_UPR_STATS: {
-                struct slic_shmemory *sm = &adapter->shmem;
-                struct slic_shmem_data *sm_data = sm->shmem_data;
-                struct slic_stats *stats = &sm_data->stats;
-                struct slic_stats *old = &adapter->inicstats_prev;
-                struct slicnet_stats *stst = &adapter->slic_stats;
-
-                if (isr & ISR_UPCERR) {
-                        dev_err(&adapter->netdev->dev,
-                                "SLIC_UPR_STATS command failed isr[%x]\n", isr);
-                        break;
-                }
-
-                UPDATE_STATS_GB(stst->tcp.xmit_tcp_segs, stats->xmit_tcp_segs,
-                                old->xmit_tcp_segs);
-
-                UPDATE_STATS_GB(stst->tcp.xmit_tcp_bytes, stats->xmit_tcp_bytes,
-                                old->xmit_tcp_bytes);
-
-                UPDATE_STATS_GB(stst->tcp.rcv_tcp_segs, stats->rcv_tcp_segs,
-                                old->rcv_tcp_segs);
-
-                UPDATE_STATS_GB(stst->tcp.rcv_tcp_bytes, stats->rcv_tcp_bytes,
-                                old->rcv_tcp_bytes);
-
-                UPDATE_STATS_GB(stst->iface.xmt_bytes, stats->xmit_bytes,
-                                old->xmit_bytes);
-
-                UPDATE_STATS_GB(stst->iface.xmt_ucast, stats->xmit_unicasts,
-                                old->xmit_unicasts);
-
-                UPDATE_STATS_GB(stst->iface.rcv_bytes, stats->rcv_bytes,
-                                old->rcv_bytes);
-
-                UPDATE_STATS_GB(stst->iface.rcv_ucast, stats->rcv_unicasts,
-                                old->rcv_unicasts);
-
-                UPDATE_STATS_GB(stst->iface.xmt_errors, stats->xmit_collisions,
-                                old->xmit_collisions);
-
-                UPDATE_STATS_GB(stst->iface.xmt_errors,
-                                stats->xmit_excess_collisions,
-                                old->xmit_excess_collisions);
-
-                UPDATE_STATS_GB(stst->iface.xmt_errors, stats->xmit_other_error,
-                                old->xmit_other_error);
-
-                UPDATE_STATS_GB(stst->iface.rcv_errors, stats->rcv_other_error,
-                                old->rcv_other_error);
-
-                UPDATE_STATS_GB(stst->iface.rcv_discards, stats->rcv_drops,
-                                old->rcv_drops);
-
-                if (stats->rcv_drops > old->rcv_drops)
-                        adapter->rcv_drops += (stats->rcv_drops -
-                                               old->rcv_drops);
-                memcpy_fromio(old, stats, sizeof(*stats));
-                break;
-        }
-        case SLIC_UPR_RLSR:
-                slic_link_upr_complete(adapter, isr);
-                break;
-        case SLIC_UPR_RCONFIG:
-                break;
-        case SLIC_UPR_PING:
-                card->pingstatus |= (isr & ISR_PINGDSMASK);
-                break;
-        }
-        kfree(upr);
-        slic_upr_start(adapter);
-        spin_unlock_irqrestore(&adapter->upr_lock, flags);
-}
-
-static int slic_config_get(struct adapter *adapter, u32 config, u32 config_h)
-{
-        return slic_upr_request(adapter, SLIC_UPR_RCONFIG, config, config_h,
-                                0, 0);
-}
-
-/*
- * Compute a checksum of the EEPROM according to RFC 1071.
- */
-static u16 slic_eeprom_cksum(void *eeprom, unsigned int len)
-{
-        u16 *wp = eeprom;
-        u32 checksum = 0;
-
-        while (len > 1) {
-                checksum += *(wp++);
-                len -= 2;
-        }
-
-        if (len > 0)
-                checksum += *(u8 *)wp;
-
-        while (checksum >> 16)
-                checksum = (checksum & 0xFFFF) + ((checksum >> 16) & 0xFFFF);
-
-        return ~checksum;
-}
-
-static void slic_rspqueue_free(struct adapter *adapter)
-{
-        int i;
-        struct slic_rspqueue *rspq = &adapter->rspqueue;
-
-        for (i = 0; i < rspq->num_pages; i++) {
-                if (rspq->vaddr[i]) {
-                        pci_free_consistent(adapter->pcidev, PAGE_SIZE,
-                                            rspq->vaddr[i], rspq->paddr[i]);
-                }
-                rspq->vaddr[i] = NULL;
-                rspq->paddr[i] = 0;
-        }
-        rspq->offset = 0;
-        rspq->pageindex = 0;
-        rspq->rspbuf = NULL;
-}
-
-static int slic_rspqueue_init(struct adapter *adapter)
-{
-        int i;
-        struct slic_rspqueue *rspq = &adapter->rspqueue;
-        u32 paddrh = 0;
-
-        memset(rspq, 0, sizeof(struct slic_rspqueue));
-
-        rspq->num_pages = SLIC_RSPQ_PAGES_GB;
-
-        for (i = 0; i < rspq->num_pages; i++) {
-                rspq->vaddr[i] = pci_zalloc_consistent(adapter->pcidev,
-                                                       PAGE_SIZE,
-                                                       &rspq->paddr[i]);
-                if (!rspq->vaddr[i]) {
-                        dev_err(&adapter->pcidev->dev,
-                                "pci_alloc_consistent failed\n");
-                        slic_rspqueue_free(adapter);
-                        return -ENOMEM;
-                }
-
-                if (paddrh == 0) {
-                        slic_write32(adapter, SLIC_REG_RBAR,
-                                     rspq->paddr[i] | SLIC_RSPQ_BUFSINPAGE);
-                } else {
-                        slic_write64(adapter, SLIC_REG_RBAR64,
-                                     rspq->paddr[i] | SLIC_RSPQ_BUFSINPAGE,
-                                     paddrh);
-                }
-        }
-        rspq->offset = 0;
-        rspq->pageindex = 0;
-        rspq->rspbuf = (struct slic_rspbuf *)rspq->vaddr[0];
-        return 0;
-}
-
-static struct slic_rspbuf *slic_rspqueue_getnext(struct adapter *adapter)
-{
-        struct slic_rspqueue *rspq = &adapter->rspqueue;
-        struct slic_rspbuf *buf;
-
-        if (!(rspq->rspbuf->status))
-                return NULL;
-
-        buf = rspq->rspbuf;
-        if (++rspq->offset < SLIC_RSPQ_BUFSINPAGE) {
-                rspq->rspbuf++;
-        } else {
-                slic_write64(adapter, SLIC_REG_RBAR64,
-                             rspq->paddr[rspq->pageindex] |
-                             SLIC_RSPQ_BUFSINPAGE, 0);
-                rspq->pageindex = (rspq->pageindex + 1) % rspq->num_pages;
-                rspq->offset = 0;
-                rspq->rspbuf = (struct slic_rspbuf *)
-                                                rspq->vaddr[rspq->pageindex];
-        }
-
-        return buf;
-}
-
-static void slic_cmdqmem_free(struct adapter *adapter)
-{
-        struct slic_cmdqmem *cmdqmem = &adapter->cmdqmem;
-        int i;
-
-        for (i = 0; i < SLIC_CMDQ_MAXPAGES; i++) {
-                if (cmdqmem->pages[i]) {
-                        pci_free_consistent(adapter->pcidev,
-                                            PAGE_SIZE,
-                                            (void *)cmdqmem->pages[i],
-                                            cmdqmem->dma_pages[i]);
-                }
-        }
-        memset(cmdqmem, 0, sizeof(struct slic_cmdqmem));
-}
-
-static u32 *slic_cmdqmem_addpage(struct adapter *adapter)
-{
-        struct slic_cmdqmem *cmdqmem = &adapter->cmdqmem;
-        u32 *pageaddr;
-
-        if (cmdqmem->pagecnt >= SLIC_CMDQ_MAXPAGES)
-                return NULL;
-        pageaddr = pci_alloc_consistent(adapter->pcidev,
-                                        PAGE_SIZE,
-                                        &cmdqmem->dma_pages[cmdqmem->pagecnt]);
-        if (!pageaddr)
-                return NULL;
-
-        cmdqmem->pages[cmdqmem->pagecnt] = pageaddr;
-        cmdqmem->pagecnt++;
-        return pageaddr;
-}
-
-static void slic_cmdq_free(struct adapter *adapter)
-{
-        struct slic_hostcmd *cmd;
-
-        cmd = adapter->cmdq_all.head;
-        while (cmd) {
-                if (cmd->busy) {
-                        struct sk_buff *tempskb;
-
-                        tempskb = cmd->skb;
-                        if (tempskb) {
-                                cmd->skb = NULL;
-                                dev_kfree_skb_irq(tempskb);
-                        }
-                }
-                cmd = cmd->next_all;
-        }
-        memset(&adapter->cmdq_all, 0, sizeof(struct slic_cmdqueue));
-        memset(&adapter->cmdq_free, 0, sizeof(struct slic_cmdqueue));
-        memset(&adapter->cmdq_done, 0, sizeof(struct slic_cmdqueue));
-        slic_cmdqmem_free(adapter);
-}
-
-static void slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page)
-{
-        struct slic_hostcmd *cmd;
-        struct slic_hostcmd *prev;
-        struct slic_hostcmd *tail;
-        struct slic_cmdqueue *cmdq;
-        int cmdcnt;
-        void *cmdaddr;
-        ulong phys_addr;
-        u32 phys_addrl;
-        u32 phys_addrh;
-        struct slic_handle *pslic_handle;
-        unsigned long flags;
-
-        cmdaddr = page;
-        cmd = cmdaddr;
-        cmdcnt = 0;
-
-        phys_addr = virt_to_bus((void *)page);
-        phys_addrl = SLIC_GET_ADDR_LOW(phys_addr);
-        phys_addrh = SLIC_GET_ADDR_HIGH(phys_addr);
-
-        prev = NULL;
-        tail = cmd;
-        while ((cmdcnt < SLIC_CMDQ_CMDSINPAGE) &&
-               (adapter->slic_handle_ix < 256)) {
-                /* Allocate and initialize a SLIC_HANDLE for this command */
-                spin_lock_irqsave(&adapter->handle_lock, flags);
-                pslic_handle  =  adapter->pfree_slic_handles;
-                adapter->pfree_slic_handles = pslic_handle->next;
-                spin_unlock_irqrestore(&adapter->handle_lock, flags);
-                pslic_handle->type = SLIC_HANDLE_CMD;
-                pslic_handle->address = (void *)cmd;
-                pslic_handle->offset = (ushort)adapter->slic_handle_ix++;
-                pslic_handle->other_handle = NULL;
-                pslic_handle->next = NULL;
-
-                cmd->pslic_handle = pslic_handle;
-                cmd->cmd64.hosthandle = pslic_handle->token.handle_token;
-                cmd->busy = false;
-                cmd->paddrl = phys_addrl;
-                cmd->paddrh = phys_addrh;
-                cmd->next_all = prev;
-                cmd->next = prev;
-                prev = cmd;
-                phys_addrl += SLIC_HOSTCMD_SIZE;
-                cmdaddr += SLIC_HOSTCMD_SIZE;
-
-                cmd = cmdaddr;
-                cmdcnt++;
-        }
-
-        cmdq = &adapter->cmdq_all;
-        cmdq->count += cmdcnt;  /*  SLIC_CMDQ_CMDSINPAGE;   mooktodo */
-        tail->next_all = cmdq->head;
-        cmdq->head = prev;
-        cmdq = &adapter->cmdq_free;
-        spin_lock_irqsave(&cmdq->lock, flags);
-        cmdq->count += cmdcnt;  /*  SLIC_CMDQ_CMDSINPAGE;   mooktodo */
-        tail->next = cmdq->head;
-        cmdq->head = prev;
-        spin_unlock_irqrestore(&cmdq->lock, flags);
-}
-
-static int slic_cmdq_init(struct adapter *adapter)
-{
-        int i;
-        u32 *pageaddr;
-
-        memset(&adapter->cmdq_all, 0, sizeof(struct slic_cmdqueue));
-        memset(&adapter->cmdq_free, 0, sizeof(struct slic_cmdqueue));
-        memset(&adapter->cmdq_done, 0, sizeof(struct slic_cmdqueue));
-        spin_lock_init(&adapter->cmdq_all.lock);
-        spin_lock_init(&adapter->cmdq_free.lock);
-        spin_lock_init(&adapter->cmdq_done.lock);
-        memset(&adapter->cmdqmem, 0, sizeof(struct slic_cmdqmem));
-        adapter->slic_handle_ix = 1;
-        for (i = 0; i < SLIC_CMDQ_INITPAGES; i++) {
-                pageaddr = slic_cmdqmem_addpage(adapter);
-                if (!pageaddr) {
-                        slic_cmdq_free(adapter);
-                        return -ENOMEM;
-                }
-                slic_cmdq_addcmdpage(adapter, pageaddr);
-        }
-        adapter->slic_handle_ix = 1;
-
-        return 0;
-}
-
-static void slic_cmdq_reset(struct adapter *adapter)
-{
-        struct slic_hostcmd *hcmd;
-        struct sk_buff *skb;
-        u32 outstanding;
-        unsigned long flags;
-
-        spin_lock_irqsave(&adapter->cmdq_free.lock, flags);
-        spin_lock(&adapter->cmdq_done.lock);
-        outstanding = adapter->cmdq_all.count - adapter->cmdq_done.count;
-        outstanding -= adapter->cmdq_free.count;
-        hcmd = adapter->cmdq_all.head;
-        while (hcmd) {
-                if (hcmd->busy) {
-                        skb = hcmd->skb;
-                        hcmd->busy = 0;
-                        hcmd->skb = NULL;
-                        dev_kfree_skb_irq(skb);
-                }
-                hcmd = hcmd->next_all;
-        }
-        adapter->cmdq_free.count = 0;
-        adapter->cmdq_free.head = NULL;
-        adapter->cmdq_free.tail = NULL;
-        adapter->cmdq_done.count = 0;
-        adapter->cmdq_done.head = NULL;
-        adapter->cmdq_done.tail = NULL;
-        adapter->cmdq_free.head = adapter->cmdq_all.head;
-        hcmd = adapter->cmdq_all.head;
-        while (hcmd) {
-                adapter->cmdq_free.count++;
-                hcmd->next = hcmd->next_all;
-                hcmd = hcmd->next_all;
-        }
-        if (adapter->cmdq_free.count != adapter->cmdq_all.count) {
-                dev_err(&adapter->netdev->dev,
-                        "free_count %d != all count %d\n",
-                        adapter->cmdq_free.count, adapter->cmdq_all.count);
-        }
-        spin_unlock(&adapter->cmdq_done.lock);
-        spin_unlock_irqrestore(&adapter->cmdq_free.lock, flags);
-}
-
-static void slic_cmdq_getdone(struct adapter *adapter)
-{
-        struct slic_cmdqueue *done_cmdq = &adapter->cmdq_done;
-        struct slic_cmdqueue *free_cmdq = &adapter->cmdq_free;
-        unsigned long flags;
-
-        spin_lock_irqsave(&done_cmdq->lock, flags);
-
-        free_cmdq->head = done_cmdq->head;
-        free_cmdq->count = done_cmdq->count;
-        done_cmdq->head = NULL;
-        done_cmdq->tail = NULL;
-        done_cmdq->count = 0;
-        spin_unlock_irqrestore(&done_cmdq->lock, flags);
-}
-
-static struct slic_hostcmd *slic_cmdq_getfree(struct adapter *adapter)
-{
-        struct slic_cmdqueue *cmdq = &adapter->cmdq_free;
-        struct slic_hostcmd *cmd = NULL;
-        unsigned long flags;
-
-lock_and_retry:
-        spin_lock_irqsave(&cmdq->lock, flags);
-retry:
-        cmd = cmdq->head;
-        if (cmd) {
-                cmdq->head = cmd->next;
-                cmdq->count--;
-                spin_unlock_irqrestore(&cmdq->lock, flags);
-        } else {
-                slic_cmdq_getdone(adapter);
-                cmd = cmdq->head;
-                if (cmd) {
-                        goto retry;
-                } else {
-                        u32 *pageaddr;
-
-                        spin_unlock_irqrestore(&cmdq->lock, flags);
-                        pageaddr = slic_cmdqmem_addpage(adapter);
-                        if (pageaddr) {
-                                slic_cmdq_addcmdpage(adapter, pageaddr);
-                                goto lock_and_retry;
-                        }
-                }
-        }
-        return cmd;
-}
-
-static void slic_cmdq_putdone_irq(struct adapter *adapter,
-                                struct slic_hostcmd *cmd)
-{
-        struct slic_cmdqueue *cmdq = &adapter->cmdq_done;
-
-        spin_lock(&cmdq->lock);
-        cmd->busy = 0;
-        cmd->next = cmdq->head;
-        cmdq->head = cmd;
-        cmdq->count++;
-        if ((adapter->xmitq_full) && (cmdq->count > 10))
-                netif_wake_queue(adapter->netdev);
-        spin_unlock(&cmdq->lock);
-}
-
-static int slic_rcvqueue_fill(struct adapter *adapter)
-{
-        void *paddr;
-        u32 paddrl;
-        u32 paddrh;
-        struct slic_rcvqueue *rcvq = &adapter->rcvqueue;
-        int i = 0;
-        struct device *dev = &adapter->netdev->dev;
-
-        while (i < SLIC_RCVQ_FILLENTRIES) {
-                struct slic_rcvbuf *rcvbuf;
-                struct sk_buff *skb;
-#ifdef KLUDGE_FOR_4GB_BOUNDARY
-retry_rcvqfill:
-#endif
-                skb = alloc_skb(SLIC_RCVQ_RCVBUFSIZE, GFP_ATOMIC);
-                if (skb) {
-                        paddr = (void *)(unsigned long)
-                                pci_map_single(adapter->pcidev,
-                                               skb->data,
-                                               SLIC_RCVQ_RCVBUFSIZE,
-                                               PCI_DMA_FROMDEVICE);
-                        paddrl = SLIC_GET_ADDR_LOW(paddr);
-                        paddrh = SLIC_GET_ADDR_HIGH(paddr);
-
-                        skb->len = SLIC_RCVBUF_HEADSIZE;
-                        rcvbuf = (struct slic_rcvbuf *)skb->head;
-                        rcvbuf->status = 0;
-                        skb->next = NULL;
-#ifdef KLUDGE_FOR_4GB_BOUNDARY
-                        if (paddrl == 0) {
-                                dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
-                                        __func__);
-                                dev_err(dev, "skb[%p] PROBLEM\n", skb);
-                                dev_err(dev, "         skbdata[%p]\n",
-                                                skb->data);
-                                dev_err(dev, "         skblen[%x]\n", skb->len);
-                                dev_err(dev, "         paddr[%p]\n", paddr);
-                                dev_err(dev, "         paddrl[%x]\n", paddrl);
-                                dev_err(dev, "         paddrh[%x]\n", paddrh);
-                                dev_err(dev, "         rcvq->head[%p]\n",
-                                                rcvq->head);
-                                dev_err(dev, "         rcvq->tail[%p]\n",
-                                                rcvq->tail);
-                                dev_err(dev, "         rcvq->count[%x]\n",
-                                                rcvq->count);
-                                dev_err(dev, "SKIP THIS SKB!!!!!!!!\n");
-                                goto retry_rcvqfill;
-                        }
-#else
-                        if (paddrl == 0) {
-                                dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
-                                        __func__);
-                                dev_err(dev, "skb[%p] PROBLEM\n", skb);
-                                dev_err(dev, "         skbdata[%p]\n",
-                                                skb->data);
-                                dev_err(dev, "         skblen[%x]\n", skb->len);
-                                dev_err(dev, "         paddr[%p]\n", paddr);
-                                dev_err(dev, "         paddrl[%x]\n", paddrl);
-                                dev_err(dev, "         paddrh[%x]\n", paddrh);
-                                dev_err(dev, "         rcvq->head[%p]\n",
-                                                rcvq->head);
-                                dev_err(dev, "         rcvq->tail[%p]\n",
-                                                rcvq->tail);
-                                dev_err(dev, "         rcvq->count[%x]\n",
-                                                rcvq->count);
-                                dev_err(dev, "GIVE TO CARD ANYWAY\n");
-                        }
-#endif
-                        if (paddrh == 0) {
-                                slic_write32(adapter, SLIC_REG_HBAR,
-                                             (u32)paddrl);
-                        } else {
-                                slic_write64(adapter, SLIC_REG_HBAR64, paddrl,
-                                             paddrh);
-                        }
-                        if (rcvq->head)
-                                rcvq->tail->next = skb;
-                        else
-                                rcvq->head = skb;
-                        rcvq->tail = skb;
-                        rcvq->count++;
-                        i++;
-                } else {
-                        dev_err(&adapter->netdev->dev,
-                                "slic_rcvqueue_fill could only get [%d] skbuffs\n",
-                                i);
-                        break;
-                }
-        }
-        return i;
-}
-
-static void slic_rcvqueue_free(struct adapter *adapter)
-{
-        struct slic_rcvqueue *rcvq = &adapter->rcvqueue;
-        struct sk_buff *skb;
-
-        while (rcvq->head) {
-                skb = rcvq->head;
-                rcvq->head = rcvq->head->next;
-                dev_kfree_skb(skb);
-        }
-        rcvq->tail = NULL;
-        rcvq->head = NULL;
-        rcvq->count = 0;
-}
-
-static int slic_rcvqueue_init(struct adapter *adapter)
-{
-        int i, count;
-        struct slic_rcvqueue *rcvq = &adapter->rcvqueue;
-
-        rcvq->tail = NULL;
-        rcvq->head = NULL;
-        rcvq->size = SLIC_RCVQ_ENTRIES;
-        rcvq->errors = 0;
-        rcvq->count = 0;
-        i = SLIC_RCVQ_ENTRIES / SLIC_RCVQ_FILLENTRIES;
-        count = 0;
-        while (i) {
-                count += slic_rcvqueue_fill(adapter);
-                i--;
-        }
-        if (rcvq->count < SLIC_RCVQ_MINENTRIES) {
-                slic_rcvqueue_free(adapter);
-                return -ENOMEM;
-        }
-        return 0;
-}
-
-static struct sk_buff *slic_rcvqueue_getnext(struct adapter *adapter)
-{
-        struct slic_rcvqueue *rcvq = &adapter->rcvqueue;
-        struct sk_buff *skb;
-        struct slic_rcvbuf *rcvbuf;
-        int count;
-
-        if (rcvq->count) {
-                skb = rcvq->head;
-                rcvbuf = (struct slic_rcvbuf *)skb->head;
-
-                if (rcvbuf->status & IRHDDR_SVALID) {
-                        rcvq->head = rcvq->head->next;
-                        skb->next = NULL;
-                        rcvq->count--;
-                } else {
-                        skb = NULL;
-                }
-        } else {
-                dev_err(&adapter->netdev->dev,
-                        "RcvQ Empty!! rcvq[%p] count[%x]\n", rcvq, rcvq->count);
-                skb = NULL;
-        }
-        while (rcvq->count < SLIC_RCVQ_FILLTHRESH) {
-                count = slic_rcvqueue_fill(adapter);
-                if (!count)
-                        break;
-        }
-        if (skb)
-                rcvq->errors = 0;
-        return skb;
-}
-
-static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)
-{
-        struct slic_rcvqueue *rcvq = &adapter->rcvqueue;
-        void *paddr;
-        u32 paddrl;
-        u32 paddrh;
-        struct slic_rcvbuf *rcvbuf = (struct slic_rcvbuf *)skb->head;
-        struct device *dev;
-
-        paddr = (void *)(unsigned long)
-                pci_map_single(adapter->pcidev, skb->head,
-                               SLIC_RCVQ_RCVBUFSIZE, PCI_DMA_FROMDEVICE);
-        rcvbuf->status = 0;
-        skb->next = NULL;
-
-        paddrl = SLIC_GET_ADDR_LOW(paddr);
-        paddrh = SLIC_GET_ADDR_HIGH(paddr);
-
-        if (paddrl == 0) {
-                dev = &adapter->netdev->dev;
-                dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
-                        __func__);
-                dev_err(dev, "skb[%p] PROBLEM\n", skb);
-                dev_err(dev, "         skbdata[%p]\n", skb->data);
-                dev_err(dev, "         skblen[%x]\n", skb->len);
-                dev_err(dev, "         paddr[%p]\n", paddr);
-                dev_err(dev, "         paddrl[%x]\n", paddrl);
-                dev_err(dev, "         paddrh[%x]\n", paddrh);
-                dev_err(dev, "         rcvq->head[%p]\n", rcvq->head);
-                dev_err(dev, "         rcvq->tail[%p]\n", rcvq->tail);
-                dev_err(dev, "         rcvq->count[%x]\n", rcvq->count);
-        }
-        if (paddrh == 0)
-                slic_write32(adapter, SLIC_REG_HBAR, (u32)paddrl);
-        else
-                slic_write64(adapter, SLIC_REG_HBAR64, paddrl, paddrh);
-        if (rcvq->head)
-                rcvq->tail->next = skb;
-        else
-                rcvq->head = skb;
-        rcvq->tail = skb;
-        rcvq->count++;
-        return rcvq->count;
-}
-
-/*
- * slic_link_event_handler -
- *
- * Initiate a link configuration sequence.  The link configuration begins
- * by issuing a READ_LINK_STATUS command to the Utility Processor on the
- * SLIC.  Since the command finishes asynchronously, the slic_upr_comlete
- * routine will follow it up witha UP configuration write command, which
- * will also complete asynchronously.
- *
- */
-static int slic_link_event_handler(struct adapter *adapter)
-{
-        int status;
-        struct slic_shmemory *sm = &adapter->shmem;
-        dma_addr_t phaddr = sm->lnkstatus_phaddr;
-
-        if (adapter->state != ADAPT_UP) {
-                /* Adapter is not operational.  Ignore.  */
-                return -ENODEV;
-        }
-        /* no 4GB wrap guaranteed */
-        status = slic_upr_request(adapter, SLIC_UPR_RLSR,
-                                  cpu_to_le32(lower_32_bits(phaddr)),
-                                  cpu_to_le32(upper_32_bits(phaddr)), 0, 0);
-        return status;
-}
-
-static void slic_init_cleanup(struct adapter *adapter)
-{
-        if (adapter->intrregistered) {
-                adapter->intrregistered = 0;
-                free_irq(adapter->netdev->irq, adapter->netdev);
-        }
-
-        if (adapter->shmem.shmem_data) {
-                struct slic_shmemory *sm = &adapter->shmem;
-                struct slic_shmem_data *sm_data = sm->shmem_data;
-
-                pci_free_consistent(adapter->pcidev, sizeof(*sm_data), sm_data,
-                                    sm->isr_phaddr);
-        }
-
-        if (adapter->pingtimerset) {
-                adapter->pingtimerset = 0;
-                del_timer(&adapter->pingtimer);
-        }
-
-        slic_rspqueue_free(adapter);
-        slic_cmdq_free(adapter);
-        slic_rcvqueue_free(adapter);
-}
-
-/*
- *  Allocate a mcast_address structure to hold the multicast address.
- *  Link it in.
- */
-static int slic_mcast_add_list(struct adapter *adapter, char *address)
-{
-        struct mcast_address *mcaddr, *mlist;
-
-        /* Check to see if it already exists */
-        mlist = adapter->mcastaddrs;
-        while (mlist) {
-                if (ether_addr_equal(mlist->address, address))
-                        return 0;
-                mlist = mlist->next;
-        }
-
-        /* Doesn't already exist.  Allocate a structure to hold it */
-        mcaddr = kmalloc(sizeof(*mcaddr), GFP_ATOMIC);
-        if (!mcaddr)
-                return 1;
-
-        ether_addr_copy(mcaddr->address, address);
-
-        mcaddr->next = adapter->mcastaddrs;
-        adapter->mcastaddrs = mcaddr;
-
-        return 0;
-}
-
-static void slic_mcast_set_list(struct net_device *dev)
-{
-        struct adapter *adapter = netdev_priv(dev);
-        int status = 0;
-        char *addresses;
-        struct netdev_hw_addr *ha;
-
-        netdev_for_each_mc_addr(ha, dev) {
-                addresses = (char *)&ha->addr;
-                status = slic_mcast_add_list(adapter, addresses);
-                if (status != 0)
-                        break;
-                slic_mcast_set_bit(adapter, addresses);
-        }
-
-        if (adapter->devflags_prev != dev->flags) {
-                adapter->macopts = MAC_DIRECTED;
-                if (dev->flags) {
-                        if (dev->flags & IFF_BROADCAST)
-                                adapter->macopts |= MAC_BCAST;
-                        if (dev->flags & IFF_PROMISC)
-                                adapter->macopts |= MAC_PROMISC;
-                        if (dev->flags & IFF_ALLMULTI)
-                                adapter->macopts |= MAC_ALLMCAST;
-                        if (dev->flags & IFF_MULTICAST)
-                                adapter->macopts |= MAC_MCAST;
-                }
-                adapter->devflags_prev = dev->flags;
-                slic_config_set(adapter, true);
-        } else {
-                if (status == 0)
-                        slic_mcast_set_mask(adapter);
-        }
-}
-
-#define  XMIT_FAIL_LINK_STATE               1
-#define  XMIT_FAIL_ZERO_LENGTH              2
-#define  XMIT_FAIL_HOSTCMD_FAIL             3
-
-static void slic_xmit_build_request(struct adapter *adapter,
-                             struct slic_hostcmd *hcmd, struct sk_buff *skb)
-{
-        struct slic_host64_cmd *ihcmd;
-        ulong phys_addr;
-
-        ihcmd = &hcmd->cmd64;
-
-        ihcmd->flags = adapter->port << IHFLG_IFSHFT;
-        ihcmd->command = IHCMD_XMT_REQ;
-        ihcmd->u.slic_buffers.totlen = skb->len;
-        phys_addr = pci_map_single(adapter->pcidev, skb->data, skb->len,
-                        PCI_DMA_TODEVICE);
-        if (pci_dma_mapping_error(adapter->pcidev, phys_addr)) {
-                kfree_skb(skb);
-                dev_err(&adapter->pcidev->dev, "DMA mapping error\n");
-                return;
-        }
-        ihcmd->u.slic_buffers.bufs[0].paddrl = SLIC_GET_ADDR_LOW(phys_addr);
-        ihcmd->u.slic_buffers.bufs[0].paddrh = SLIC_GET_ADDR_HIGH(phys_addr);
-        ihcmd->u.slic_buffers.bufs[0].length = skb->len;
-#if BITS_PER_LONG == 64
-        hcmd->cmdsize = (u32)((((u64)&ihcmd->u.slic_buffers.bufs[1] -
-                                     (u64)hcmd) + 31) >> 5);
-#else
-        hcmd->cmdsize = (((u32)&ihcmd->u.slic_buffers.bufs[1] -
-                                       (u32)hcmd) + 31) >> 5;
-#endif
-}
-
-static void slic_xmit_fail(struct adapter *adapter,
-                    struct sk_buff *skb,
-                    void *cmd, u32 skbtype, u32 status)
-{
-        if (adapter->xmitq_full)
-                netif_stop_queue(adapter->netdev);
-        if ((!cmd) && (status <= XMIT_FAIL_HOSTCMD_FAIL)) {
-                switch (status) {
-                case XMIT_FAIL_LINK_STATE:
-                        dev_err(&adapter->netdev->dev,
-                                "reject xmit skb[%p: %x] linkstate[%s] adapter[%s:%d] card[%s:%d]\n",
-                                skb, skb->pkt_type,
-                                SLIC_LINKSTATE(adapter->linkstate),
-                                SLIC_ADAPTER_STATE(adapter->state),
-                                adapter->state,
-                                SLIC_CARD_STATE(adapter->card->state),
-                                adapter->card->state);
-                        break;
-                case XMIT_FAIL_ZERO_LENGTH:
-                        dev_err(&adapter->netdev->dev,
-                                "xmit_start skb->len == 0 skb[%p] type[%x]\n",
-                                skb, skb->pkt_type);
-                        break;
-                case XMIT_FAIL_HOSTCMD_FAIL:
-                        dev_err(&adapter->netdev->dev,
-                                "xmit_start skb[%p] type[%x] No host commands available\n",
-                                skb, skb->pkt_type);
-                        break;
-                }
-        }
-        dev_kfree_skb(skb);
-        adapter->netdev->stats.tx_dropped++;
-}
-
-static void slic_rcv_handle_error(struct adapter *adapter,
-                                        struct slic_rcvbuf *rcvbuf)
-{
-        struct slic_hddr_wds *hdr = (struct slic_hddr_wds *)rcvbuf->data;
-        struct net_device *netdev = adapter->netdev;
-
-        if (adapter->devid != SLIC_1GB_DEVICE_ID) {
-                if (hdr->frame_status14 & VRHSTAT_802OE)
-                        adapter->if_events.oflow802++;
-                if (hdr->frame_status14 & VRHSTAT_TPOFLO)
-                        adapter->if_events.Tprtoflow++;
-                if (hdr->frame_status_b14 & VRHSTATB_802UE)
-                        adapter->if_events.uflow802++;
-                if (hdr->frame_status_b14 & VRHSTATB_RCVE) {
-                        adapter->if_events.rcvearly++;
-                        netdev->stats.rx_fifo_errors++;
-                }
-                if (hdr->frame_status_b14 & VRHSTATB_BUFF) {
-                        adapter->if_events.Bufov++;
-                        netdev->stats.rx_over_errors++;
-                }
-                if (hdr->frame_status_b14 & VRHSTATB_CARRE) {
-                        adapter->if_events.Carre++;
-                        netdev->stats.tx_carrier_errors++;
-                }
-                if (hdr->frame_status_b14 & VRHSTATB_LONGE)
-                        adapter->if_events.Longe++;
-                if (hdr->frame_status_b14 & VRHSTATB_PREA)
-                        adapter->if_events.Invp++;
-                if (hdr->frame_status_b14 & VRHSTATB_CRC) {
-                        adapter->if_events.Crc++;
-                        netdev->stats.rx_crc_errors++;
-                }
-                if (hdr->frame_status_b14 & VRHSTATB_DRBL)
-                        adapter->if_events.Drbl++;
-                if (hdr->frame_status_b14 & VRHSTATB_CODE)
-                        adapter->if_events.Code++;
-                if (hdr->frame_status_b14 & VRHSTATB_TPCSUM)
-                        adapter->if_events.TpCsum++;
-                if (hdr->frame_status_b14 & VRHSTATB_TPHLEN)
-                        adapter->if_events.TpHlen++;
-                if (hdr->frame_status_b14 & VRHSTATB_IPCSUM)
-                        adapter->if_events.IpCsum++;
-                if (hdr->frame_status_b14 & VRHSTATB_IPLERR)
-                        adapter->if_events.IpLen++;
-                if (hdr->frame_status_b14 & VRHSTATB_IPHERR)
-                        adapter->if_events.IpHlen++;
-        } else {
-                if (hdr->frame_statusGB & VGBSTAT_XPERR) {
-                        u32 xerr = hdr->frame_statusGB >> VGBSTAT_XERRSHFT;
-
-                        if (xerr == VGBSTAT_XCSERR)
-                                adapter->if_events.TpCsum++;
-                        if (xerr == VGBSTAT_XUFLOW)
-                                adapter->if_events.Tprtoflow++;
-                        if (xerr == VGBSTAT_XHLEN)
-                                adapter->if_events.TpHlen++;
-                }
-                if (hdr->frame_statusGB & VGBSTAT_NETERR) {
-                        u32 nerr =
-                            (hdr->
-                             frame_statusGB >> VGBSTAT_NERRSHFT) &
-                            VGBSTAT_NERRMSK;
-                        if (nerr == VGBSTAT_NCSERR)
-                                adapter->if_events.IpCsum++;
-                        if (nerr == VGBSTAT_NUFLOW)
-                                adapter->if_events.IpLen++;
-                        if (nerr == VGBSTAT_NHLEN)
-                                adapter->if_events.IpHlen++;
-                }
-                if (hdr->frame_statusGB & VGBSTAT_LNKERR) {
-                        u32 lerr = hdr->frame_statusGB & VGBSTAT_LERRMSK;
-
-                        if (lerr == VGBSTAT_LDEARLY)
-                                adapter->if_events.rcvearly++;
-                        if (lerr == VGBSTAT_LBOFLO)
-                                adapter->if_events.Bufov++;
-                        if (lerr == VGBSTAT_LCODERR)
-                                adapter->if_events.Code++;
-                        if (lerr == VGBSTAT_LDBLNBL)
-                                adapter->if_events.Drbl++;
-                        if (lerr == VGBSTAT_LCRCERR)
-                                adapter->if_events.Crc++;
-                        if (lerr == VGBSTAT_LOFLO)
-                                adapter->if_events.oflow802++;
-                        if (lerr == VGBSTAT_LUFLO)
-                                adapter->if_events.uflow802++;
-                }
-        }
-}
-
-#define TCP_OFFLOAD_FRAME_PUSHFLAG  0x10000000
-#define M_FAST_PATH                 0x0040
-
-static void slic_rcv_handler(struct adapter *adapter)
-{
-        struct net_device *netdev = adapter->netdev;
-        struct sk_buff *skb;
-        struct slic_rcvbuf *rcvbuf;
-        u32 frames = 0;
-
-        while ((skb = slic_rcvqueue_getnext(adapter))) {
-                u32 rx_bytes;
-
-                rcvbuf = (struct slic_rcvbuf *)skb->head;
-                adapter->card->events++;
-                if (rcvbuf->status & IRHDDR_ERR) {
-                        adapter->rx_errors++;
-                        slic_rcv_handle_error(adapter, rcvbuf);
-                        slic_rcvqueue_reinsert(adapter, skb);
-                        continue;
-                }
-
-                if (!slic_mac_filter(adapter, (struct ether_header *)
-                                        rcvbuf->data)) {
-                        slic_rcvqueue_reinsert(adapter, skb);
-                        continue;
-                }
-                skb_pull(skb, SLIC_RCVBUF_HEADSIZE);
-                rx_bytes = (rcvbuf->length & IRHDDR_FLEN_MSK);
-                skb_put(skb, rx_bytes);
-                netdev->stats.rx_packets++;
-                netdev->stats.rx_bytes += rx_bytes;
-#if SLIC_OFFLOAD_IP_CHECKSUM
-                skb->ip_summed = CHECKSUM_UNNECESSARY;
-#endif
-
-                skb->dev = adapter->netdev;
-                skb->protocol = eth_type_trans(skb, skb->dev);
-                netif_rx(skb);
-
-                ++frames;
-#if SLIC_INTERRUPT_PROCESS_LIMIT
-                if (frames >= SLIC_RCVQ_MAX_PROCESS_ISR) {
-                        adapter->rcv_interrupt_yields++;
-                        break;
-                }
-#endif
-        }
-        adapter->max_isr_rcvs = max(adapter->max_isr_rcvs, frames);
-}
-
-static void slic_xmit_complete(struct adapter *adapter)
-{
-        struct slic_hostcmd *hcmd;
-        struct slic_rspbuf *rspbuf;
-        u32 frames = 0;
-        struct slic_handle_word slic_handle_word;
-
-        do {
-                rspbuf = slic_rspqueue_getnext(adapter);
-                if (!rspbuf)
-                        break;
-                adapter->xmit_completes++;
-                adapter->card->events++;
-                /*
-                 * Get the complete host command buffer
-                 */
-                slic_handle_word.handle_token = rspbuf->hosthandle;
-                hcmd =
-                        adapter->slic_handles[slic_handle_word.handle_index].
-                                                                        address;
-/*      hcmd = (struct slic_hostcmd *) rspbuf->hosthandle; */
-                if (hcmd->type == SLIC_CMD_DUMB) {
-                        if (hcmd->skb)
-                                dev_kfree_skb_irq(hcmd->skb);
-                        slic_cmdq_putdone_irq(adapter, hcmd);
-                }
-                rspbuf->status = 0;
-                rspbuf->hosthandle = 0;
-                frames++;
-        } while (1);
-        adapter->max_isr_xmits = max(adapter->max_isr_xmits, frames);
-}
-
-static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,
-                        struct net_device *dev)
-{
-        if (isr & ~ISR_IO) {
-                if (isr & ISR_ERR) {
-                        adapter->error_interrupts++;
-                        if (isr & ISR_RMISS) {
-                                int count;
-                                int pre_count;
-                                int errors;
-
-                                struct slic_rcvqueue *rcvq =
-                                        &adapter->rcvqueue;
-
-                                adapter->error_rmiss_interrupts++;
-
-                                if (!rcvq->errors)
-                                        rcv_count = rcvq->count;
-                                pre_count = rcvq->count;
-                                errors = rcvq->errors;
-
-                                while (rcvq->count < SLIC_RCVQ_FILLTHRESH) {
-                                        count = slic_rcvqueue_fill(adapter);
-                                        if (!count)
-                                                break;
-                                }
-                        } else if (isr & ISR_XDROP) {
-                                dev_err(&dev->dev,
-                                                "isr & ISR_ERR [%x] ISR_XDROP\n",
-                                                isr);
-                        } else {
-                                dev_err(&dev->dev,
-                                                "isr & ISR_ERR [%x]\n",
-                                                isr);
-                        }
-                }
-
-                if (isr & ISR_LEVENT) {
-                        adapter->linkevent_interrupts++;
-                        if (slic_link_event_handler(adapter))
-                                adapter->linkevent_interrupts--;
-                }
-
-                if ((isr & ISR_UPC) || (isr & ISR_UPCERR) ||
-                    (isr & ISR_UPCBSY)) {
-                        adapter->upr_interrupts++;
-                        slic_upr_request_complete(adapter, isr);
-                }
-        }
-
-        if (isr & ISR_RCV) {
-                adapter->rcv_interrupts++;
-                slic_rcv_handler(adapter);
-        }
-
-        if (isr & ISR_CMD) {
-                adapter->xmit_interrupts++;
-                slic_xmit_complete(adapter);
-        }
-}
-
-static irqreturn_t slic_interrupt(int irq, void *dev_id)
-{
-        struct net_device *dev = dev_id;
-        struct adapter *adapter = netdev_priv(dev);
-        struct slic_shmemory *sm = &adapter->shmem;
-        struct slic_shmem_data *sm_data = sm->shmem_data;
-        u32 isr;
-
-        if (sm_data->isr) {
-                slic_write32(adapter, SLIC_REG_ICR, ICR_INT_MASK);
-                slic_flush_write(adapter);
-
-                isr = sm_data->isr;
-                sm_data->isr = 0;
-                adapter->num_isrs++;
-                switch (adapter->card->state) {
-                case CARD_UP:
-                        slic_interrupt_card_up(isr, adapter, dev);
-                        break;
-
-                case CARD_DOWN:
-                        if ((isr & ISR_UPC) ||
-                            (isr & ISR_UPCERR) || (isr & ISR_UPCBSY)) {
-                                adapter->upr_interrupts++;
-                                slic_upr_request_complete(adapter, isr);
-                        }
-                        break;
-                }
-
-                adapter->all_reg_writes += 2;
-                adapter->isr_reg_writes++;
-                slic_write32(adapter, SLIC_REG_ISR, 0);
-        } else {
-                adapter->false_interrupts++;
-        }
-        return IRQ_HANDLED;
-}
-
-#define NORMAL_ETHFRAME     0
-
-static netdev_tx_t slic_xmit_start(struct sk_buff *skb, struct net_device *dev)
-{
-        struct sliccard *card;
-        struct adapter *adapter = netdev_priv(dev);
-        struct slic_hostcmd *hcmd = NULL;
-        u32 status = 0;
-        void *offloadcmd = NULL;
-
-        card = adapter->card;
-        if ((adapter->linkstate != LINK_UP) ||
-            (adapter->state != ADAPT_UP) || (card->state != CARD_UP)) {
-                status = XMIT_FAIL_LINK_STATE;
-                goto xmit_fail;
-
-        } else if (skb->len == 0) {
-                status = XMIT_FAIL_ZERO_LENGTH;
-                goto xmit_fail;
-        }
-
-        hcmd = slic_cmdq_getfree(adapter);
-        if (!hcmd) {
-                adapter->xmitq_full = 1;
-                status = XMIT_FAIL_HOSTCMD_FAIL;
-                goto xmit_fail;
-        }
-        hcmd->skb = skb;
-        hcmd->busy = 1;
-        hcmd->type = SLIC_CMD_DUMB;
-        slic_xmit_build_request(adapter, hcmd, skb);
-        dev->stats.tx_packets++;
-        dev->stats.tx_bytes += skb->len;
-
-#ifdef DEBUG_DUMP
-        if (adapter->kill_card) {
-                struct slic_host64_cmd ihcmd;
-
-                ihcmd = &hcmd->cmd64;
-
-                ihcmd->flags |= 0x40;
-                adapter->kill_card = 0; /* only do this once */
-        }
-#endif
-        if (hcmd->paddrh == 0) {
-                slic_write32(adapter, SLIC_REG_CBAR, (hcmd->paddrl |
-                                                      hcmd->cmdsize));
-        } else {
-                slic_write64(adapter, SLIC_REG_CBAR64,
-                             hcmd->paddrl | hcmd->cmdsize, hcmd->paddrh);
-        }
-xmit_done:
-        return NETDEV_TX_OK;
-xmit_fail:
-        slic_xmit_fail(adapter, skb, offloadcmd, NORMAL_ETHFRAME, status);
-        goto xmit_done;
-}
-
-static void slic_adapter_freeresources(struct adapter *adapter)
-{
-        slic_init_cleanup(adapter);
-        adapter->error_interrupts = 0;
-        adapter->rcv_interrupts = 0;
-        adapter->xmit_interrupts = 0;
-        adapter->linkevent_interrupts = 0;
-        adapter->upr_interrupts = 0;
-        adapter->num_isrs = 0;
-        adapter->xmit_completes = 0;
-        adapter->rcv_broadcasts = 0;
-        adapter->rcv_multicasts = 0;
-        adapter->rcv_unicasts = 0;
-}
-
-static int slic_adapter_allocresources(struct adapter *adapter,
-                                       unsigned long *flags)
-{
-        if (!adapter->intrregistered) {
-                int retval;
-
-                spin_unlock_irqrestore(&slic_global.driver_lock, *flags);
-
-                retval = request_irq(adapter->netdev->irq,
-                                     &slic_interrupt,
-                                     IRQF_SHARED,
-                                     adapter->netdev->name, adapter->netdev);
-
-                spin_lock_irqsave(&slic_global.driver_lock, *flags);
-
-                if (retval) {
-                        dev_err(&adapter->netdev->dev,
-                                "request_irq (%s) FAILED [%x]\n",
-                                adapter->netdev->name, retval);
-                        return retval;
-                }
-                adapter->intrregistered = 1;
-        }
-        return 0;
-}
-
-/*
- *  slic_if_init
- *
- *  Perform initialization of our slic interface.
- *
- */
-static int slic_if_init(struct adapter *adapter, unsigned long *flags)
-{
-        struct sliccard *card = adapter->card;
-        struct net_device *dev = adapter->netdev;
-        struct slic_shmemory *sm = &adapter->shmem;
-        struct slic_shmem_data *sm_data = sm->shmem_data;
-        int rc;
-
-        /* adapter should be down at this point */
-        if (adapter->state != ADAPT_DOWN) {
-                dev_err(&dev->dev, "%s: adapter->state != ADAPT_DOWN\n",
-                        __func__);
-                rc = -EIO;
-                goto err;
-        }
-
-        adapter->devflags_prev = dev->flags;
-        adapter->macopts = MAC_DIRECTED;
-        if (dev->flags) {
-                if (dev->flags & IFF_BROADCAST)
-                        adapter->macopts |= MAC_BCAST;
-                if (dev->flags & IFF_PROMISC)
-                        adapter->macopts |= MAC_PROMISC;
-                if (dev->flags & IFF_ALLMULTI)
-                        adapter->macopts |= MAC_ALLMCAST;
-                if (dev->flags & IFF_MULTICAST)
-                        adapter->macopts |= MAC_MCAST;
-        }
-        rc = slic_adapter_allocresources(adapter, flags);
-        if (rc) {
-                dev_err(&dev->dev, "slic_adapter_allocresources FAILED %x\n",
-                        rc);
-                slic_adapter_freeresources(adapter);
-                goto err;
-        }
-
-        if (!adapter->queues_initialized) {
-                rc = slic_rspqueue_init(adapter);
-                if (rc)
-                        goto err;
-                rc = slic_cmdq_init(adapter);
-                if (rc)
-                        goto err;
-                rc = slic_rcvqueue_init(adapter);
-                if (rc)
-                        goto err;
-                adapter->queues_initialized = 1;
-        }
-
-        slic_write32(adapter, SLIC_REG_ICR, ICR_INT_OFF);
-        slic_flush_write(adapter);
-        mdelay(1);
-
-        if (!adapter->isp_initialized) {
-                unsigned long flags;
-
-                spin_lock_irqsave(&adapter->bit64reglock, flags);
-                slic_write32(adapter, SLIC_REG_ADDR_UPPER,
-                             cpu_to_le32(upper_32_bits(sm->isr_phaddr)));
-                slic_write32(adapter, SLIC_REG_ISP,
-                             cpu_to_le32(lower_32_bits(sm->isr_phaddr)));
-                spin_unlock_irqrestore(&adapter->bit64reglock, flags);
-
-                adapter->isp_initialized = 1;
-        }
-
-        adapter->state = ADAPT_UP;
-        if (!card->loadtimerset) {
-                setup_timer(&card->loadtimer, &slic_timer_load_check,
-                            (ulong)card);
-                card->loadtimer.expires =
-                    jiffies + (SLIC_LOADTIMER_PERIOD * HZ);
-                add_timer(&card->loadtimer);
-
-                card->loadtimerset = 1;
-        }
-
-        if (!adapter->pingtimerset) {
-                setup_timer(&adapter->pingtimer, &slic_timer_ping, (ulong)dev);
-                adapter->pingtimer.expires =
-                    jiffies + (PING_TIMER_INTERVAL * HZ);
-                add_timer(&adapter->pingtimer);
-                adapter->pingtimerset = 1;
-                adapter->card->pingstatus = ISR_PINGMASK;
-        }
-
-        /*
-         *    clear any pending events, then enable interrupts
-         */
-        sm_data->isr = 0;
-        slic_write32(adapter, SLIC_REG_ISR, 0);
-        slic_write32(adapter, SLIC_REG_ICR, ICR_INT_ON);
-
-        slic_link_config(adapter, LINK_AUTOSPEED, LINK_AUTOD);
-        slic_flush_write(adapter);
-
-        rc = slic_link_event_handler(adapter);
-        if (rc) {
-                /* disable interrupts then clear pending events */
-                slic_write32(adapter, SLIC_REG_ICR, ICR_INT_OFF);
-                slic_write32(adapter, SLIC_REG_ISR, 0);
-                slic_flush_write(adapter);
-
-                if (adapter->pingtimerset) {
-                        del_timer(&adapter->pingtimer);
-                        adapter->pingtimerset = 0;
-                }
-                if (card->loadtimerset) {
-                        del_timer(&card->loadtimer);
-                        card->loadtimerset = 0;
-                }
-                adapter->state = ADAPT_DOWN;
-                slic_adapter_freeresources(adapter);
-        }
-
-err:
-        return rc;
-}
-
-static int slic_entry_open(struct net_device *dev)
-{
-        struct adapter *adapter = netdev_priv(dev);
-        struct sliccard *card = adapter->card;
-        unsigned long flags;
-        int status;
-
-        netif_carrier_off(dev);
-
-        spin_lock_irqsave(&slic_global.driver_lock, flags);
-        if (!adapter->activated) {
-                card->adapters_activated++;
-                slic_global.num_slic_ports_active++;
-                adapter->activated = 1;
-        }
-        status = slic_if_init(adapter, &flags);
-
-        if (status != 0) {
-                if (adapter->activated) {
-                        card->adapters_activated--;
-                        slic_global.num_slic_ports_active--;
-                        adapter->activated = 0;
-                }
-                goto spin_unlock;
-        }
-        if (!card->master)
-                card->master = adapter;
-
-spin_unlock:
-        spin_unlock_irqrestore(&slic_global.driver_lock, flags);
-
-        netif_start_queue(adapter->netdev);
-
-        return status;
-}
-
-static void slic_card_cleanup(struct sliccard *card)
-{
-        if (card->loadtimerset) {
-                card->loadtimerset = 0;
-                del_timer_sync(&card->loadtimer);
-        }
-
-        kfree(card);
-}
-
-static void slic_entry_remove(struct pci_dev *pcidev)
-{
-        struct net_device *dev = pci_get_drvdata(pcidev);
-        struct adapter *adapter = netdev_priv(dev);
-        struct sliccard *card;
-        struct mcast_address *mcaddr, *mlist;
-
-        unregister_netdev(dev);
-
-        slic_adapter_freeresources(adapter);
-        iounmap(adapter->regs);
-
-        /* free multicast addresses */
-        mlist = adapter->mcastaddrs;
-        while (mlist) {
-                mcaddr = mlist;
-                mlist = mlist->next;
-                kfree(mcaddr);
-        }
-        card = adapter->card;
-        card->adapters_allocated--;
-        adapter->allocated = 0;
-        if (!card->adapters_allocated) {
-                struct sliccard *curr_card = slic_global.slic_card;
-
-                if (curr_card == card) {
-                        slic_global.slic_card = card->next;
-                } else {
-                        while (curr_card->next != card)
-                                curr_card = curr_card->next;
-                        curr_card->next = card->next;
-                }
-                slic_global.num_slic_cards--;
-                slic_card_cleanup(card);
-        }
-        free_netdev(dev);
-        pci_release_regions(pcidev);
-        pci_disable_device(pcidev);
-}
-
-static int slic_entry_halt(struct net_device *dev)
-{
-        struct adapter *adapter = netdev_priv(dev);
-        struct sliccard *card = adapter->card;
-        unsigned long flags;
-
-        spin_lock_irqsave(&slic_global.driver_lock, flags);
-        netif_stop_queue(adapter->netdev);
-        adapter->state = ADAPT_DOWN;
-        adapter->linkstate = LINK_DOWN;
-        adapter->upr_list = NULL;
-        adapter->upr_busy = 0;
-        adapter->devflags_prev = 0;
-        slic_write32(adapter, SLIC_REG_ICR, ICR_INT_OFF);
-        adapter->all_reg_writes++;
-        adapter->icr_reg_writes++;
-        slic_config_clear(adapter);
-        if (adapter->activated) {
-                card->adapters_activated--;
-                slic_global.num_slic_ports_active--;
-                adapter->activated = 0;
-        }
-#ifdef AUTOMATIC_RESET
-        slic_write32(adapter, SLIC_REG_RESET_IFACE, 0);
-#endif
-        slic_flush_write(adapter);
-
-        /*
-         *  Reset the adapter's cmd queues
-         */
-        slic_cmdq_reset(adapter);
-
-#ifdef AUTOMATIC_RESET
-        if (!card->adapters_activated)
-                slic_card_init(card, adapter);
-#endif
-
-        spin_unlock_irqrestore(&slic_global.driver_lock, flags);
-
-        netif_carrier_off(dev);
-
-        return 0;
-}
-
-static struct net_device_stats *slic_get_stats(struct net_device *dev)
-{
-        struct adapter *adapter = netdev_priv(dev);
-
-        dev->stats.collisions = adapter->slic_stats.iface.xmit_collisions;
-        dev->stats.rx_errors = adapter->slic_stats.iface.rcv_errors;
-        dev->stats.tx_errors = adapter->slic_stats.iface.xmt_errors;
-        dev->stats.rx_missed_errors = adapter->slic_stats.iface.rcv_discards;
-        dev->stats.tx_heartbeat_errors = 0;
-        dev->stats.tx_aborted_errors = 0;
-        dev->stats.tx_window_errors = 0;
-        dev->stats.tx_fifo_errors = 0;
-        dev->stats.rx_frame_errors = 0;
-        dev->stats.rx_length_errors = 0;
-
-        return &dev->stats;
-}
-
-static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-        struct adapter *adapter = netdev_priv(dev);
-        struct ethtool_cmd edata;
-        struct ethtool_cmd ecmd;
-        u32 data[7];
-        u32 intagg;
-
-        switch (cmd) {
-        case SIOCSLICSETINTAGG:
-                if (copy_from_user(data, rq->ifr_data, 28))
-                        return -EFAULT;
-                intagg = data[0];
-                dev_err(&dev->dev, "set interrupt aggregation to %d\n",
-                        intagg);
-                slic_intagg_set(adapter, intagg);
-                return 0;
-
-        case SIOCETHTOOL:
-                if (copy_from_user(&ecmd, rq->ifr_data, sizeof(ecmd)))
-                        return -EFAULT;
-
-                if (ecmd.cmd == ETHTOOL_GSET) {
-                        memset(&edata, 0, sizeof(edata));
-                        edata.supported = (SUPPORTED_10baseT_Half |
-                                           SUPPORTED_10baseT_Full |
-                                           SUPPORTED_100baseT_Half |
-                                           SUPPORTED_100baseT_Full |
-                                           SUPPORTED_Autoneg | SUPPORTED_MII);
-                        edata.port = PORT_MII;
-                        edata.transceiver = XCVR_INTERNAL;
-                        edata.phy_address = 0;
-                        if (adapter->linkspeed == LINK_100MB)
-                                edata.speed = SPEED_100;
-                        else if (adapter->linkspeed == LINK_10MB)
-                                edata.speed = SPEED_10;
-                        else
-                                edata.speed = 0;
-
-                        if (adapter->linkduplex == LINK_FULLD)
-                                edata.duplex = DUPLEX_FULL;
-                        else
-                                edata.duplex = DUPLEX_HALF;
-
-                        edata.autoneg = AUTONEG_ENABLE;
-                        edata.maxtxpkt = 1;
-                        edata.maxrxpkt = 1;
-                        if (copy_to_user(rq->ifr_data, &edata, sizeof(edata)))
-                                return -EFAULT;
-
-                } else if (ecmd.cmd == ETHTOOL_SSET) {
-                        if (!capable(CAP_NET_ADMIN))
-                                return -EPERM;
-
-                        if (adapter->linkspeed == LINK_100MB)
-                                edata.speed = SPEED_100;
-                        else if (adapter->linkspeed == LINK_10MB)
-                                edata.speed = SPEED_10;
-                        else
-                                edata.speed = 0;
-
-                        if (adapter->linkduplex == LINK_FULLD)
-                                edata.duplex = DUPLEX_FULL;
-                        else
-                                edata.duplex = DUPLEX_HALF;
-
-                        edata.autoneg = AUTONEG_ENABLE;
-                        edata.maxtxpkt = 1;
-                        edata.maxrxpkt = 1;
-                        if ((ecmd.speed != edata.speed) ||
-                            (ecmd.duplex != edata.duplex)) {
-                                u32 speed;
-                                u32 duplex;
-
-                                if (ecmd.speed == SPEED_10)
-                                        speed = 0;
-                                else
-                                        speed = PCR_SPEED_100;
-                                if (ecmd.duplex == DUPLEX_FULL)
-                                        duplex = PCR_DUPLEX_FULL;
-                                else
-                                        duplex = 0;
-                                slic_link_config(adapter, speed, duplex);
-                                if (slic_link_event_handler(adapter))
-                                        return -EFAULT;
-                        }
-                }
-                return 0;
-        default:
-                return -EOPNOTSUPP;
-        }
-}
-
-static void slic_config_pci(struct pci_dev *pcidev)
-{
-        u16 pci_command;
-        u16 new_command;
-
-        pci_read_config_word(pcidev, PCI_COMMAND, &pci_command);
-
-        new_command = pci_command | PCI_COMMAND_MASTER
-            | PCI_COMMAND_MEMORY
-            | PCI_COMMAND_INVALIDATE
-            | PCI_COMMAND_PARITY | PCI_COMMAND_SERR | PCI_COMMAND_FAST_BACK;
-        if (pci_command != new_command)
-                pci_write_config_word(pcidev, PCI_COMMAND, new_command);
-}
-
-static int slic_card_init(struct sliccard *card, struct adapter *adapter)
-{
-        struct slic_shmemory *sm = &adapter->shmem;
-        struct slic_shmem_data *sm_data = sm->shmem_data;
-        struct slic_eeprom *peeprom;
-        struct oslic_eeprom *pOeeprom;
-        dma_addr_t phys_config;
-        u32 phys_configh;
-        u32 phys_configl;
-        u32 i = 0;
-        int status;
-        uint macaddrs = card->card_size;
-        ushort eecodesize;
-        ushort dramsize;
-        ushort ee_chksum;
-        ushort calc_chksum;
-        struct slic_config_mac *pmac;
-        unsigned char fruformat;
-        unsigned char oemfruformat;
-        struct atk_fru *patkfru;
-        union oemfru *poemfru;
-        unsigned long flags;
-
-        /* Reset everything except PCI configuration space */
-        slic_soft_reset(adapter);
-
-        /* Download the microcode */
-        status = slic_card_download(adapter);
-        if (status)
-                return status;
-
-        if (!card->config_set) {
-                peeprom = pci_alloc_consistent(adapter->pcidev,
-                                               sizeof(struct slic_eeprom),
-                                               &phys_config);
-
-                if (!peeprom) {
-                        dev_err(&adapter->pcidev->dev,
-                                "Failed to allocate DMA memory for EEPROM.\n");
-                        return -ENOMEM;
-                }
-
-                phys_configl = SLIC_GET_ADDR_LOW(phys_config);
-                phys_configh = SLIC_GET_ADDR_HIGH(phys_config);
-
-                memset(peeprom, 0, sizeof(struct slic_eeprom));
-
-                slic_write32(adapter, SLIC_REG_ICR, ICR_INT_OFF);
-                slic_flush_write(adapter);
-                mdelay(1);
-
-                spin_lock_irqsave(&adapter->bit64reglock, flags);
-                slic_write32(adapter, SLIC_REG_ADDR_UPPER,
-                             cpu_to_le32(upper_32_bits(sm->isr_phaddr)));
-                slic_write32(adapter, SLIC_REG_ISP,
-                             cpu_to_le32(lower_32_bits(sm->isr_phaddr)));
-                spin_unlock_irqrestore(&adapter->bit64reglock, flags);
-
-                status = slic_config_get(adapter, phys_configl, phys_configh);
-                if (status) {
-                        dev_err(&adapter->pcidev->dev,
-                                "Failed to fetch config data from device.\n");
-                        goto card_init_err;
-                }
-
-                for (;;) {
-                        if (sm_data->isr) {
-                                if (sm_data->isr & ISR_UPC) {
-                                        sm_data->isr = 0;
-                                        slic_write64(adapter, SLIC_REG_ISP, 0,
-                                                     0);
-                                        slic_write32(adapter, SLIC_REG_ISR, 0);
-                                        slic_flush_write(adapter);
-
-                                        slic_upr_request_complete(adapter, 0);
-                                        break;
-                                }
-
-                                sm_data->isr = 0;
-                                slic_write32(adapter, SLIC_REG_ISR, 0);
-                                slic_flush_write(adapter);
-                        } else {
-                                mdelay(1);
-                                i++;
-                                if (i > 5000) {
-                                        dev_err(&adapter->pcidev->dev,
-                                                "Fetch of config data timed out.\n");
-                                        slic_write64(adapter, SLIC_REG_ISP,
-                                                     0, 0);
-                                        slic_flush_write(adapter);
-
-                                        status = -EINVAL;
-                                        goto card_init_err;
-                                }
-                        }
-                }
-
-                switch (adapter->devid) {
-                /* Oasis card */
-                case SLIC_2GB_DEVICE_ID:
-                        /* extract EEPROM data and pointers to EEPROM data */
-                        pOeeprom = (struct oslic_eeprom *)peeprom;
-                        eecodesize = pOeeprom->EecodeSize;
-                        dramsize = pOeeprom->DramSize;
-                        pmac = pOeeprom->MacInfo;
-                        fruformat = pOeeprom->FruFormat;
-                        patkfru = &pOeeprom->AtkFru;
-                        oemfruformat = pOeeprom->OemFruFormat;
-                        poemfru = &pOeeprom->OemFru;
-                        macaddrs = 2;
-                        /*
-                         * Minor kludge for Oasis card
-                         * get 2 MAC addresses from the
-                         * EEPROM to ensure that function 1
-                         * gets the Port 1 MAC address
-                         */
-                        break;
-                default:
-                        /* extract EEPROM data and pointers to EEPROM data */
-                        eecodesize = peeprom->EecodeSize;
-                        dramsize = peeprom->DramSize;
-                        pmac = peeprom->u2.mac.MacInfo;
-                        fruformat = peeprom->FruFormat;
-                        patkfru = &peeprom->AtkFru;
-                        oemfruformat = peeprom->OemFruFormat;
-                        poemfru = &peeprom->OemFru;
-                        break;
-                }
-
-                card->config.EepromValid = false;
-
-                /*  see if the EEPROM is valid by checking it's checksum */
-                if ((eecodesize <= MAX_EECODE_SIZE) &&
-                    (eecodesize >= MIN_EECODE_SIZE)) {
-                        ee_chksum =
-                            *(u16 *)((char *)peeprom + (eecodesize - 2));
-                        /*
-                         *  calculate the EEPROM checksum
-                         */
-                        calc_chksum = slic_eeprom_cksum(peeprom,
-                                                        eecodesize - 2);
-                        /*
-                         *  if the ucdoe chksum flag bit worked,
-                         *  we wouldn't need this
-                         */
-                        if (ee_chksum == calc_chksum)
-                                card->config.EepromValid = true;
-                }
-                /*  copy in the DRAM size */
-                card->config.DramSize = dramsize;
-
-                /*  copy in the MAC address(es) */
-                for (i = 0; i < macaddrs; i++) {
-                        memcpy(&card->config.MacInfo[i],
-                               &pmac[i], sizeof(struct slic_config_mac));
-                }
-
-                /*  copy the Alacritech FRU information */
-                card->config.FruFormat = fruformat;
-                memcpy(&card->config.AtkFru, patkfru,
-                                                sizeof(struct atk_fru));
-
-                pci_free_consistent(adapter->pcidev,
-                                    sizeof(struct slic_eeprom),
-                                    peeprom, phys_config);
-
-                if (!card->config.EepromValid) {
-                        slic_write64(adapter, SLIC_REG_ISP, 0, 0);
-                        slic_flush_write(adapter);
-                        dev_err(&adapter->pcidev->dev, "EEPROM invalid.\n");
-                        return -EINVAL;
-                }
-
-                card->config_set = 1;
-        }
-
-        status = slic_card_download_gbrcv(adapter);
-        if (status)
-                return status;
-
-        if (slic_global.dynamic_intagg)
-                slic_intagg_set(adapter, 0);
-        else
-                slic_intagg_set(adapter, adapter->intagg_delay);
-
-        /*
-         *  Initialize ping status to "ok"
-         */
-        card->pingstatus = ISR_PINGMASK;
-
-        /*
-         * Lastly, mark our card state as up and return success
-         */
-        card->state = CARD_UP;
-        card->reset_in_progress = 0;
-
-        return 0;
-
-card_init_err:
-        pci_free_consistent(adapter->pcidev, sizeof(struct slic_eeprom),
-                            peeprom, phys_config);
-        return status;
-}
-
-static int slic_get_coalesce(struct net_device *dev,
-                             struct ethtool_coalesce *coalesce)
-{
-        struct adapter *adapter = netdev_priv(dev);
-
-        adapter->intagg_delay = coalesce->rx_coalesce_usecs;
-        adapter->dynamic_intagg = coalesce->use_adaptive_rx_coalesce;
-        return 0;
-}
-
-static int slic_set_coalesce(struct net_device *dev,
-                             struct ethtool_coalesce *coalesce)
-{
-        struct adapter *adapter = netdev_priv(dev);
-
-        coalesce->rx_coalesce_usecs = adapter->intagg_delay;
-        coalesce->use_adaptive_rx_coalesce = adapter->dynamic_intagg;
-        return 0;
-}
-
-static void slic_init_driver(void)
-{
-        if (slic_first_init) {
-                slic_first_init = 0;
-                spin_lock_init(&slic_global.driver_lock);
-        }
-}
-
-static int slic_init_adapter(struct net_device *netdev,
-                             struct pci_dev *pcidev,
-                             const struct pci_device_id *pci_tbl_entry,
-                             void __iomem *memaddr, int chip_idx)
-{
-        ushort index;
-        struct slic_handle *pslic_handle;
-        struct adapter *adapter = netdev_priv(netdev);
-        struct slic_shmemory *sm = &adapter->shmem;
-        struct slic_shmem_data *sm_data;
-        dma_addr_t phaddr;
-
-/*      adapter->pcidev = pcidev;*/
-        adapter->vendid = pci_tbl_entry->vendor;
-        adapter->devid = pci_tbl_entry->device;
-        adapter->subsysid = pci_tbl_entry->subdevice;
-        adapter->busnumber = pcidev->bus->number;
-        adapter->slotnumber = ((pcidev->devfn >> 3) & 0x1F);
-        adapter->functionnumber = (pcidev->devfn & 0x7);
-        adapter->regs = memaddr;
-        adapter->irq = pcidev->irq;
-        adapter->chipid = chip_idx;
-        adapter->port = 0;
-        adapter->cardindex = adapter->port;
-        spin_lock_init(&adapter->upr_lock);
-        spin_lock_init(&adapter->bit64reglock);
-        spin_lock_init(&adapter->adapter_lock);
-        spin_lock_init(&adapter->reset_lock);
-        spin_lock_init(&adapter->handle_lock);
-
-        adapter->card_size = 1;
-        /*
-         * Initialize slic_handle array
-         */
-        /*
-         * Start with 1.  0 is an invalid host handle.
-         */
-        for (index = 1, pslic_handle = &adapter->slic_handles[1];
-             index < SLIC_CMDQ_MAXCMDS; index++, pslic_handle++) {
-                pslic_handle->token.handle_index = index;
-                pslic_handle->type = SLIC_HANDLE_FREE;
-                pslic_handle->next = adapter->pfree_slic_handles;
-                adapter->pfree_slic_handles = pslic_handle;
-        }
-        sm_data = pci_zalloc_consistent(adapter->pcidev, sizeof(*sm_data),
-                                        &phaddr);
-        if (!sm_data)
-                return -ENOMEM;
-
-        sm->shmem_data = sm_data;
-        sm->isr_phaddr = phaddr;
-        sm->lnkstatus_phaddr = phaddr + offsetof(struct slic_shmem_data,
-                                                 lnkstatus);
-        sm->stats_phaddr = phaddr + offsetof(struct slic_shmem_data, stats);
-
-        return 0;
-}
-
-static const struct net_device_ops slic_netdev_ops = {
-        .ndo_open               = slic_entry_open,
-        .ndo_stop               = slic_entry_halt,
-        .ndo_start_xmit         = slic_xmit_start,
-        .ndo_do_ioctl           = slic_ioctl,
-        .ndo_set_mac_address    = slic_mac_set_address,
-        .ndo_get_stats          = slic_get_stats,
-        .ndo_set_rx_mode        = slic_mcast_set_list,
-        .ndo_validate_addr      = eth_validate_addr,
-};
-
-static u32 slic_card_locate(struct adapter *adapter)
-{
-        struct sliccard *card = slic_global.slic_card;
-        struct physcard *physcard = slic_global.phys_card;
-        ushort card_hostid;
-        uint i;
-
-        card_hostid = slic_read32(adapter, SLIC_REG_HOSTID);
-
-        /* Initialize a new card structure if need be */
-        if (card_hostid == SLIC_HOSTID_DEFAULT) {
-                card = kzalloc(sizeof(*card), GFP_KERNEL);
-                if (!card)
-                        return -ENOMEM;
-
-                card->next = slic_global.slic_card;
-                slic_global.slic_card = card;
-                card->busnumber = adapter->busnumber;
-                card->slotnumber = adapter->slotnumber;
-
-                /* Find an available cardnum */
-                for (i = 0; i < SLIC_MAX_CARDS; i++) {
-                        if (slic_global.cardnuminuse[i] == 0) {
-                                slic_global.cardnuminuse[i] = 1;
-                                card->cardnum = i;
-                                break;
-                        }
-                }
-                slic_global.num_slic_cards++;
-        } else {
-                /* Card exists, find the card this adapter belongs to */
-                while (card) {
-                        if (card->cardnum == card_hostid)
-                                break;
-                        card = card->next;
-                }
-        }
-
-        if (!card)
-                return -ENXIO;
-        /* Put the adapter in the card's adapter list */
-        if (!card->adapter[adapter->port]) {
-                card->adapter[adapter->port] = adapter;
-                adapter->card = card;
-        }
-
-        card->card_size = 1;    /* one port per *logical* card */
-
-        while (physcard) {
-                for (i = 0; i < SLIC_MAX_PORTS; i++) {
-                        if (physcard->adapter[i])
-                                break;
-                }
-                if (i == SLIC_MAX_PORTS)
-                        break;
-
-                if (physcard->adapter[i]->slotnumber == adapter->slotnumber)
-                        break;
-                physcard = physcard->next;
-        }
-        if (!physcard) {
-                /* no structure allocated for this physical card yet */
-                physcard = kzalloc(sizeof(*physcard), GFP_ATOMIC);
-                if (!physcard) {
-                        if (card_hostid == SLIC_HOSTID_DEFAULT)
-                                kfree(card);
-                        return -ENOMEM;
-                }
-
-                physcard->next = slic_global.phys_card;
-                slic_global.phys_card = physcard;
-                physcard->adapters_allocd = 1;
-        } else {
-                physcard->adapters_allocd++;
-        }
-        /* Note - this is ZERO relative */
-        adapter->physport = physcard->adapters_allocd - 1;
-
-        physcard->adapter[adapter->physport] = adapter;
-        adapter->physcard = physcard;
-
-        return 0;
-}
-
-static int slic_entry_probe(struct pci_dev *pcidev,
-                               const struct pci_device_id *pci_tbl_entry)
-{
-        static int cards_found;
-        static int did_version;
-        int err = -ENODEV;
-        struct net_device *netdev;
-        struct adapter *adapter;
-        void __iomem *memmapped_ioaddr = NULL;
-        ulong mmio_start = 0;
-        ulong mmio_len = 0;
-        struct sliccard *card = NULL;
-        int pci_using_dac = 0;
-
-        err = pci_enable_device(pcidev);
-
-        if (err)
-                return err;
-
-        if (did_version++ == 0) {
-                dev_info(&pcidev->dev, "%s\n", slic_banner);
-                dev_info(&pcidev->dev, "%s\n", slic_proc_version);
-        }
-
-        if (!pci_set_dma_mask(pcidev, DMA_BIT_MASK(64))) {
-                pci_using_dac = 1;
-                err = pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(64));
-                if (err) {
-                        dev_err(&pcidev->dev, "unable to obtain 64-bit DMA for consistent allocations\n");
-                        goto err_out_disable_pci;
-                }
-        } else {
-                err = pci_set_dma_mask(pcidev, DMA_BIT_MASK(32));
-                if (err) {
-                        dev_err(&pcidev->dev, "no usable DMA configuration\n");
-                        goto err_out_disable_pci;
-                }
-                pci_using_dac = 0;
-                pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(32));
-        }
-
-        err = pci_request_regions(pcidev, DRV_NAME);
-        if (err) {
-                dev_err(&pcidev->dev, "can't obtain PCI resources\n");
-                goto err_out_disable_pci;
-        }
-
-        pci_set_master(pcidev);
-
-        netdev = alloc_etherdev(sizeof(struct adapter));
-        if (!netdev) {
-                err = -ENOMEM;
-                goto err_out_exit_slic_probe;
-        }
-
-        netdev->ethtool_ops = &slic_ethtool_ops;
-        SET_NETDEV_DEV(netdev, &pcidev->dev);
-
-        pci_set_drvdata(pcidev, netdev);
-        adapter = netdev_priv(netdev);
-        adapter->netdev = netdev;
-        adapter->pcidev = pcidev;
-        slic_global.dynamic_intagg = adapter->dynamic_intagg;
-        if (pci_using_dac)
-                netdev->features |= NETIF_F_HIGHDMA;
-
-        mmio_start = pci_resource_start(pcidev, 0);
-        mmio_len = pci_resource_len(pcidev, 0);
-
-        memmapped_ioaddr = ioremap_nocache(mmio_start, mmio_len);
-        if (!memmapped_ioaddr) {
-                dev_err(&pcidev->dev, "cannot remap MMIO region %lx @ %lx\n",
-                        mmio_len, mmio_start);
-                err = -ENOMEM;
-                goto err_out_free_netdev;
-        }
-
-        slic_config_pci(pcidev);
-
-        slic_init_driver();
-
-        err = slic_init_adapter(netdev, pcidev, pci_tbl_entry, memmapped_ioaddr,
-                                cards_found);
-        if (err) {
-                dev_err(&pcidev->dev, "failed to init adapter: %i\n", err);
-                goto err_out_unmap;
-        }
-
-        err = slic_card_locate(adapter);
-        if (err) {
-                dev_err(&pcidev->dev, "cannot locate card\n");
-                goto err_clean_init;
-        }
-
-        card = adapter->card;
-
-        if (!adapter->allocated) {
-                card->adapters_allocated++;
-                adapter->allocated = 1;
-        }
-
-        err = slic_card_init(card, adapter);
-        if (err)
-                goto err_clean_init;
-
-        slic_adapter_set_hwaddr(adapter);
-
-        netdev->base_addr = (unsigned long)memmapped_ioaddr;
-        netdev->irq = adapter->irq;
-        netdev->netdev_ops = &slic_netdev_ops;
-
-        netif_carrier_off(netdev);
-
-        strcpy(netdev->name, "eth%d");
-        err = register_netdev(netdev);
-        if (err) {
-                dev_err(&pcidev->dev, "Cannot register net device, aborting.\n");
-                goto err_clean_init;
-        }
-
-        cards_found++;
-
-        return 0;
-
-err_clean_init:
-        slic_init_cleanup(adapter);
-err_out_unmap:
-        iounmap(memmapped_ioaddr);
-err_out_free_netdev:
-        free_netdev(netdev);
-err_out_exit_slic_probe:
-        pci_release_regions(pcidev);
-err_out_disable_pci:
-        pci_disable_device(pcidev);
-        return err;
-}
-
-static struct pci_driver slic_driver = {
-        .name = DRV_NAME,
-        .id_table = slic_pci_tbl,
-        .probe = slic_entry_probe,
-        .remove = slic_entry_remove,
-};
-
-static int __init slic_module_init(void)
-{
-        slic_init_driver();
-
-        return pci_register_driver(&slic_driver);
-}
-
-static void __exit slic_module_cleanup(void)
-{
-        pci_unregister_driver(&slic_driver);
-}
-
-static const struct ethtool_ops slic_ethtool_ops = {
-        .get_coalesce = slic_get_coalesce,
-        .set_coalesce = slic_set_coalesce
-};
-
-module_init(slic_module_init);
-module_exit(slic_module_cleanup);
diff --git a/drivers/staging/sm750fb/Makefile b/drivers/staging/sm750fb/Makefile
index dcce3f487ed5..4d781f78b95c 100644
--- a/drivers/staging/sm750fb/Makefile
+++ b/drivers/staging/sm750fb/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_FB_SM750)  += sm750fb.o
 
 sm750fb-objs            := sm750.o sm750_hw.o sm750_accel.o sm750_cursor.o ddk750_chip.o ddk750_power.o ddk750_mode.o
-sm750fb-objs            += ddk750_display.o ddk750_help.o ddk750_swi2c.o ddk750_sii164.o ddk750_dvi.o ddk750_hwi2c.o
+sm750fb-objs            += ddk750_display.o ddk750_swi2c.o ddk750_sii164.o ddk750_dvi.o ddk750_hwi2c.o
diff --git a/drivers/staging/sm750fb/ddk750.h b/drivers/staging/sm750fb/ddk750.h
index 2c10a08ed964..734010324a8f 100644
--- a/drivers/staging/sm750fb/ddk750.h
+++ b/drivers/staging/sm750fb/ddk750.h
@@ -1,22 +1,21 @@
+/*
+ *         Copyright (c) 2007 by Silicon Motion, Inc. (SMI)
+ *
+ *  All rights are reserved. Reproduction or in part is prohibited
+ *  without the written consent of the copyright owner.
+ *
+ *  RegSC.h --- SM718 SDK
+ *  This file contains the definitions for the System Configuration registers.
+ */
+
 #ifndef DDK750_H__
 #define DDK750_H__
-/*******************************************************************
-*
-*         Copyright (c) 2007 by Silicon Motion, Inc. (SMI)
-*
-*  All rights are reserved. Reproduction or in part is prohibited
-*  without the written consent of the copyright owner.
-*
-*  RegSC.h --- SM718 SDK
-*  This file contains the definitions for the System Configuration registers.
-*
-*******************************************************************/
+
 #include "ddk750_reg.h"
 #include "ddk750_mode.h"
 #include "ddk750_chip.h"
 #include "ddk750_display.h"
 #include "ddk750_power.h"
-#include "ddk750_help.h"
 #ifdef USE_HW_I2C
 #include "ddk750_hwi2c.h"
 #endif
diff --git a/drivers/staging/sm750fb/ddk750_chip.c b/drivers/staging/sm750fb/ddk750_chip.c
index 839d6730bde9..f59ce5c0867d 100644
--- a/drivers/staging/sm750fb/ddk750_chip.c
+++ b/drivers/staging/sm750fb/ddk750_chip.c
@@ -1,33 +1,32 @@
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 
-#include "ddk750_help.h"
 #include "ddk750_reg.h"
 #include "ddk750_chip.h"
 #include "ddk750_power.h"
 
 #define MHz(x) ((x) * 1000000)
 
+static logical_chip_type_t chip;
+
 logical_chip_type_t sm750_get_chip_type(void)
 {
-        unsigned short physicalID;
-        char physicalRev;
-        logical_chip_type_t chip;
-
-        physicalID = devId750; /* either 0x718 or 0x750 */
-        physicalRev = revId750;
+        return chip;
+}
 
-        if (physicalID == 0x718)
+void sm750_set_chip_type(unsigned short devId, u8 revId)
+{
+        if (devId == 0x718)
                 chip = SM718;
-        else if (physicalID == 0x750) {
+        else if (devId == 0x750) {
                 chip = SM750;
                 /* SM750 and SM750LE are different in their revision ID only. */
-                if (physicalRev == SM750LE_REVISION_ID)
+                if (revId == SM750LE_REVISION_ID) {
                         chip = SM750LE;
+                        pr_info("found sm750le\n");
+                }
         } else
                 chip = SM_UNKNOWN;
-
-        return chip;
 }
 
 static unsigned int get_mxclk_freq(void)
@@ -52,9 +51,9 @@ static unsigned int get_mxclk_freq(void)
  *
  * Input: Frequency to be set.
  */
-static void setChipClock(unsigned int frequency)
+static void set_chip_clock(unsigned int frequency)
 {
-        pll_value_t pll;
+        struct pll_value pll;
         unsigned int ulActualMxClk;
 
         /* Cheok_0509: For SM750LE, the chip clock is fixed. Nothing to set. */
@@ -63,29 +62,31 @@ static void setChipClock(unsigned int frequency)
 
         if (frequency) {
                 /*
-                * Set up PLL, a structure to hold the value to be set in clocks.
-                */
+                 * Set up PLL structure to hold the value to be set in clocks.
+                 */
                 pll.inputFreq = DEFAULT_INPUT_CLOCK; /* Defined in CLOCK.H */
                 pll.clockType = MXCLK_PLL;
 
                 /*
-                * Call calcPllValue() to fill the other fields of PLL structure.
-                * Sometime, the chip cannot set up the exact clock
-                * required by the User.
-                * Return value of calcPllValue gives the actual possible clock.
-                */
-                ulActualMxClk = calcPllValue(frequency, &pll);
+                 * Call sm750_calc_pll_value() to fill the other fields of the PLL
+                 * structure. Sometimes, the chip cannot set up the exact
+                 * clock required by the User.
+                 * Return value of sm750_calc_pll_value gives the actual possible
+                 * clock.
+                 */
+                ulActualMxClk = sm750_calc_pll_value(frequency, &pll);
 
                 /* Master Clock Control: MXCLK_PLL */
-                POKE32(MXCLK_PLL_CTRL, formatPllReg(&pll));
+                POKE32(MXCLK_PLL_CTRL, sm750_format_pll_reg(&pll));
         }
 }
 
-static void setMemoryClock(unsigned int frequency)
+static void set_memory_clock(unsigned int frequency)
 {
         unsigned int reg, divisor;
 
-        /* Cheok_0509: For SM750LE, the memory clock is fixed.
+        /*
+         * Cheok_0509: For SM750LE, the memory clock is fixed.
          * Nothing to set.
          */
         if (sm750_get_chip_type() == SM750LE)
@@ -120,7 +121,7 @@ static void setMemoryClock(unsigned int frequency)
                         break;
                 }
 
-                setCurrentGate(reg);
+                sm750_set_current_gate(reg);
         }
 }
 
@@ -132,18 +133,20 @@ static void setMemoryClock(unsigned int frequency)
  * NOTE:
  *      The maximum frequency the engine can run is 168MHz.
  */
-static void setMasterClock(unsigned int frequency)
+static void set_master_clock(unsigned int frequency)
 {
         unsigned int reg, divisor;
 
-        /* Cheok_0509: For SM750LE, the memory clock is fixed.
+        /*
+         * Cheok_0509: For SM750LE, the memory clock is fixed.
          * Nothing to set.
          */
         if (sm750_get_chip_type() == SM750LE)
                 return;
 
         if (frequency) {
-                /* Set the frequency to the maximum frequency
+                /*
+                 * Set the frequency to the maximum frequency
                  * that the SM750 engine can run, which is about 190 MHz.
                  */
                 if (frequency > MHz(190))
@@ -170,11 +173,11 @@ static void setMasterClock(unsigned int frequency)
                         break;
                 }
 
-                setCurrentGate(reg);
+                sm750_set_current_gate(reg);
                 }
 }
 
-unsigned int ddk750_getVMSize(void)
+unsigned int ddk750_get_vm_size(void)
 {
         unsigned int reg;
         unsigned int data;
@@ -206,18 +209,18 @@ unsigned int ddk750_getVMSize(void)
         return data;
 }
 
-int ddk750_initHw(initchip_param_t *pInitParam)
+int ddk750_init_hw(struct initchip_param *pInitParam)
 {
         unsigned int reg;
 
         if (pInitParam->powerMode != 0)
                 pInitParam->powerMode = 0;
-        setPowerMode(pInitParam->powerMode);
+        sm750_set_power_mode(pInitParam->powerMode);
 
         /* Enable display power gate & LOCALMEM power gate*/
         reg = PEEK32(CURRENT_GATE);
         reg |= (CURRENT_GATE_DISPLAY | CURRENT_GATE_LOCALMEM);
-        setCurrentGate(reg);
+        sm750_set_current_gate(reg);
 
         if (sm750_get_chip_type() != SM750LE) {
                 /*      set panel pll and graphic mode via mmio_88 */
@@ -233,16 +236,17 @@ int ddk750_initHw(initchip_param_t *pInitParam)
         }
 
         /* Set the Main Chip Clock */
-        setChipClock(MHz((unsigned int)pInitParam->chipClock));
+        set_chip_clock(MHz((unsigned int)pInitParam->chipClock));
 
         /* Set up memory clock. */
-        setMemoryClock(MHz(pInitParam->memClock));
+        set_memory_clock(MHz(pInitParam->memClock));
 
         /* Set up master clock */
-        setMasterClock(MHz(pInitParam->masterClock));
+        set_master_clock(MHz(pInitParam->masterClock));
 
 
-        /* Reset the memory controller.
+        /*
+         * Reset the memory controller.
          * If the memory controller is not reset in SM750,
          * the system might hang when sw accesses the memory.
          * The memory should be resetted after changing the MXCLK.
@@ -257,7 +261,7 @@ int ddk750_initHw(initchip_param_t *pInitParam)
         }
 
         if (pInitParam->setAllEngOff == 1) {
-                enable2DEngine(0);
+                sm750_enable_2d_engine(0);
 
                 /* Disable Overlay, if a former application left it on */
                 reg = PEEK32(VIDEO_DISPLAY_CTRL);
@@ -280,7 +284,7 @@ int ddk750_initHw(initchip_param_t *pInitParam)
                 POKE32(DMA_ABORT_INTERRUPT, reg);
 
                 /* Disable DMA Power, if a former application left it on */
-                enableDMA(0);
+                sm750_enable_dma(0);
         }
 
         /* We can add more initialization as needed. */
@@ -305,9 +309,10 @@ int ddk750_initHw(initchip_param_t *pInitParam)
  * M = {1,...,255}
  * N = {2,...,15}
  */
-unsigned int calcPllValue(unsigned int request_orig, pll_value_t *pll)
+unsigned int sm750_calc_pll_value(unsigned int request_orig, struct pll_value *pll)
 {
-        /* as sm750 register definition,
+        /*
+         * as sm750 register definition,
          * N located in 2,15 and M located in 1,255
          */
         int N, M, X, d;
@@ -319,7 +324,8 @@ unsigned int calcPllValue(unsigned int request_orig, pll_value_t *pll)
         int max_d = 6;
 
         if (sm750_get_chip_type() == SM750LE) {
-                /* SM750LE don't have
+                /*
+                 * SM750LE don't have
                  * programmable PLL and M/N values to work on.
                  * Just return the requested clock.
                  */
@@ -331,14 +337,16 @@ unsigned int calcPllValue(unsigned int request_orig, pll_value_t *pll)
         request = request_orig / 1000;
         input = pll->inputFreq / 1000;
 
-        /* for MXCLK register,
+        /*
+         * for MXCLK register,
          * no POD provided, so need be treated differently
          */
         if (pll->clockType == MXCLK_PLL)
                 max_d = 3;
 
         for (N = 15; N > 1; N--) {
-                /* RN will not exceed maximum long
+                /*
+                 * RN will not exceed maximum long
                  * if @request <= 285 MHZ (for 32bit cpu)
                  */
                 RN = N * request;
@@ -373,7 +381,7 @@ unsigned int calcPllValue(unsigned int request_orig, pll_value_t *pll)
         return ret;
 }
 
-unsigned int formatPllReg(pll_value_t *pPLL)
+unsigned int sm750_format_pll_reg(struct pll_value *pPLL)
 {
 #ifndef VALIDATION_CHIP
         unsigned int POD = pPLL->POD;
diff --git a/drivers/staging/sm750fb/ddk750_chip.h b/drivers/staging/sm750fb/ddk750_chip.h
index 14357fd1cc6b..e63b8b293816 100644
--- a/drivers/staging/sm750fb/ddk750_chip.h
+++ b/drivers/staging/sm750fb/ddk750_chip.h
@@ -6,6 +6,14 @@
 #endif
 
 #include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/uaccess.h>
+
+/* software control endianness */
+#define PEEK32(addr) readl(addr + mmio750)
+#define POKE32(addr, data) writel(data, addr + mmio750)
+
+extern void __iomem *mmio750;
 
 /* This is all the chips recognized by this library */
 typedef enum _logical_chip_type_t {
@@ -25,7 +33,7 @@ typedef enum _clock_type_t {
 }
 clock_type_t;
 
-typedef struct _pll_value_t {
+struct pll_value {
         clock_type_t clockType;
         unsigned long inputFreq; /* Input clock frequency to the PLL */
 
@@ -34,46 +42,55 @@ typedef struct _pll_value_t {
         unsigned long N;
         unsigned long OD;
         unsigned long POD;
-}
-pll_value_t;
+};
 
 /* input struct to initChipParam() function */
-typedef struct _initchip_param_t {
-        unsigned short powerMode;    /* Use power mode 0 or 1 */
-        unsigned short chipClock;    /**
-                                      * Speed of main chip clock in MHz unit
-                                      * 0 = keep the current clock setting
-                                      * Others = the new main chip clock
-                                      */
-        unsigned short memClock;     /**
-                                      * Speed of memory clock in MHz unit
-                                      * 0 = keep the current clock setting
-                                      * Others = the new memory clock
-                                      */
-        unsigned short masterClock;  /**
-                                      * Speed of master clock in MHz unit
-                                      * 0 = keep the current clock setting
-                                      * Others = the new master clock
-                                      */
-        unsigned short setAllEngOff; /**
-                                      * 0 = leave all engine state untouched.
-                                      * 1 = make sure they are off: 2D, Overlay,
-                                      * video alpha, alpha, hardware cursors
-                                      */
-        unsigned char resetMemory;   /**
-                                      * 0 = Do not reset the memory controller
-                                      * 1 = Reset the memory controller
-                                      */
+struct initchip_param {
+        /* Use power mode 0 or 1 */
+        unsigned short powerMode;
+
+        /*
+         * Speed of main chip clock in MHz unit
+         * 0 = keep the current clock setting
+         * Others = the new main chip clock
+         */
+        unsigned short chipClock;
+
+        /*
+         * Speed of memory clock in MHz unit
+         * 0 = keep the current clock setting
+         * Others = the new memory clock
+         */
+        unsigned short memClock;
+
+        /*
+         * Speed of master clock in MHz unit
+         * 0 = keep the current clock setting
+         * Others = the new master clock
+         */
+        unsigned short masterClock;
+
+        /*
+         * 0 = leave all engine state untouched.
+         * 1 = make sure they are off: 2D, Overlay,
+         * video alpha, alpha, hardware cursors
+         */
+        unsigned short setAllEngOff;
+
+        /*
+         * 0 = Do not reset the memory controller
+         * 1 = Reset the memory controller
+         */
+        unsigned char resetMemory;
 
         /* More initialization parameter can be added if needed */
-}
-initchip_param_t;
+};
 
 logical_chip_type_t sm750_get_chip_type(void);
-unsigned int calcPllValue(unsigned int request, pll_value_t *pll);
-unsigned int formatPllReg(pll_value_t *pPLL);
-void ddk750_set_mmio(void __iomem *, unsigned short, char);
-unsigned int ddk750_getVMSize(void);
-int ddk750_initHw(initchip_param_t *);
+void sm750_set_chip_type(unsigned short devId, u8 revId);
+unsigned int sm750_calc_pll_value(unsigned int request, struct  pll_value *pll);
+unsigned int sm750_format_pll_reg(struct pll_value *pPLL);
+unsigned int ddk750_get_vm_size(void);
+int ddk750_init_hw(struct initchip_param *);
 
 #endif
diff --git a/drivers/staging/sm750fb/ddk750_display.c b/drivers/staging/sm750fb/ddk750_display.c
index 4023c476b9e4..c347803f7e19 100644
--- a/drivers/staging/sm750fb/ddk750_display.c
+++ b/drivers/staging/sm750fb/ddk750_display.c
@@ -1,11 +1,9 @@
 #include "ddk750_reg.h"
-#include "ddk750_help.h"
+#include "ddk750_chip.h"
 #include "ddk750_display.h"
 #include "ddk750_power.h"
 #include "ddk750_dvi.h"
 
-#define primaryWaitVerticalSync(delay) waitNextVerticalSync(0, delay)
-
 static void setDisplayControl(int ctrl, int disp_state)
 {
         /* state != 0 means turn on both timing & plane en_bit */
@@ -61,55 +59,28 @@ static void setDisplayControl(int ctrl, int disp_state)
         }
 }
 
-static void waitNextVerticalSync(int ctrl, int delay)
+static void primary_wait_vertical_sync(int delay)
 {
         unsigned int status;
 
-        if (!ctrl) {
-                /* primary controller */
+        /*
+         * Do not wait when the Primary PLL is off or display control is
+         * already off. This will prevent the software to wait forever.
+         */
+        if (!(PEEK32(PANEL_PLL_CTRL) & PLL_CTRL_POWER) ||
+            !(PEEK32(PANEL_DISPLAY_CTRL) & DISPLAY_CTRL_TIMING))
+                return;
 
-                /*
-                 * Do not wait when the Primary PLL is off or display control is
-                 * already off. This will prevent the software to wait forever.
-                 */
-                if (!(PEEK32(PANEL_PLL_CTRL) & PLL_CTRL_POWER) ||
-                    !(PEEK32(PANEL_DISPLAY_CTRL) & DISPLAY_CTRL_TIMING)) {
-                        return;
-                }
-
-                while (delay-- > 0) {
-                        /* Wait for end of vsync. */
-                        do {
-                                status = PEEK32(SYSTEM_CTRL);
-                        } while (status & SYSTEM_CTRL_PANEL_VSYNC_ACTIVE);
-
-                        /* Wait for start of vsync. */
-                        do {
-                                status = PEEK32(SYSTEM_CTRL);
-                        } while (!(status & SYSTEM_CTRL_PANEL_VSYNC_ACTIVE));
-                }
+        while (delay-- > 0) {
+                /* Wait for end of vsync. */
+                do {
+                        status = PEEK32(SYSTEM_CTRL);
+                } while (status & SYSTEM_CTRL_PANEL_VSYNC_ACTIVE);
 
-        } else {
-                /*
-                 * Do not wait when the Primary PLL is off or display control is
-                 * already off. This will prevent the software to wait forever.
-                 */
-                if (!(PEEK32(CRT_PLL_CTRL) & PLL_CTRL_POWER) ||
-                    !(PEEK32(CRT_DISPLAY_CTRL) & DISPLAY_CTRL_TIMING)) {
-                        return;
-                }
-
-                while (delay-- > 0) {
-                        /* Wait for end of vsync. */
-                        do {
-                                status = PEEK32(SYSTEM_CTRL);
-                        } while (status & SYSTEM_CTRL_PANEL_VSYNC_ACTIVE);
-
-                        /* Wait for start of vsync. */
-                        do {
-                                status = PEEK32(SYSTEM_CTRL);
-                        } while (!(status & SYSTEM_CTRL_PANEL_VSYNC_ACTIVE));
-                }
+                /* Wait for start of vsync. */
+                do {
+                        status = PEEK32(SYSTEM_CTRL);
+                } while (!(status & SYSTEM_CTRL_PANEL_VSYNC_ACTIVE));
         }
 }
 
@@ -121,22 +92,22 @@ static void swPanelPowerSequence(int disp, int delay)
         reg = PEEK32(PANEL_DISPLAY_CTRL);
         reg |= (disp ? PANEL_DISPLAY_CTRL_FPEN : 0);
         POKE32(PANEL_DISPLAY_CTRL, reg);
-        primaryWaitVerticalSync(delay);
+        primary_wait_vertical_sync(delay);
 
         reg = PEEK32(PANEL_DISPLAY_CTRL);
         reg |= (disp ? PANEL_DISPLAY_CTRL_DATA : 0);
         POKE32(PANEL_DISPLAY_CTRL, reg);
-        primaryWaitVerticalSync(delay);
+        primary_wait_vertical_sync(delay);
 
         reg = PEEK32(PANEL_DISPLAY_CTRL);
         reg |= (disp ? PANEL_DISPLAY_CTRL_VBIASEN : 0);
         POKE32(PANEL_DISPLAY_CTRL, reg);
-        primaryWaitVerticalSync(delay);
+        primary_wait_vertical_sync(delay);
 
         reg = PEEK32(PANEL_DISPLAY_CTRL);
         reg |= (disp ? PANEL_DISPLAY_CTRL_FPEN : 0);
         POKE32(PANEL_DISPLAY_CTRL, reg);
-        primaryWaitVerticalSync(delay);
+        primary_wait_vertical_sync(delay);
 }
 
 void ddk750_setLogicalDispOut(disp_output_t output)
@@ -182,5 +153,5 @@ void ddk750_setLogicalDispOut(disp_output_t output)
                 setDAC((output & DAC_MASK) >> DAC_OFFSET);
 
         if (output & DPMS_USAGE)
-                ddk750_setDPMS((output & DPMS_MASK) >> DPMS_OFFSET);
+                ddk750_set_dpms((output & DPMS_MASK) >> DPMS_OFFSET);
 }
diff --git a/drivers/staging/sm750fb/ddk750_display.h b/drivers/staging/sm750fb/ddk750_display.h
index e3fde428c52b..8abca88f089e 100644
--- a/drivers/staging/sm750fb/ddk750_display.h
+++ b/drivers/staging/sm750fb/ddk750_display.h
@@ -1,7 +1,8 @@
 #ifndef DDK750_DISPLAY_H__
 #define DDK750_DISPLAY_H__
 
-/* panel path select
+/*
+ * panel path select
  *      80000[29:28]
  */
 
@@ -12,7 +13,8 @@
 #define PNL_2_SEC       ((2 << PNL_2_OFFSET) | PNL_2_USAGE)
 
 
-/* primary timing & plane enable bit
+/*
+ * primary timing & plane enable bit
  *      1: 80000[8] & 80000[2] on
  *      0: both off
  */
@@ -23,7 +25,8 @@
 #define PRI_TP_OFF ((0x0 << PRI_TP_OFFSET) | PRI_TP_USAGE)
 
 
-/* panel sequency status
+/*
+ * panel sequency status
  *      80000[27:24]
  */
 #define PNL_SEQ_OFFSET 6
@@ -32,7 +35,8 @@
 #define PNL_SEQ_ON (BIT(PNL_SEQ_OFFSET) | PNL_SEQ_USAGE)
 #define PNL_SEQ_OFF ((0 << PNL_SEQ_OFFSET) | PNL_SEQ_USAGE)
 
-/* dual digital output
+/*
+ * dual digital output
  *      80000[19]
  */
 #define DUAL_TFT_OFFSET 8
@@ -41,7 +45,8 @@
 #define DUAL_TFT_ON (BIT(DUAL_TFT_OFFSET) | DUAL_TFT_USAGE)
 #define DUAL_TFT_OFF ((0 << DUAL_TFT_OFFSET) | DUAL_TFT_USAGE)
 
-/* secondary timing & plane enable bit
+/*
+ * secondary timing & plane enable bit
  *      1:80200[8] & 80200[2] on
  *      0: both off
  */
@@ -51,7 +56,8 @@
 #define SEC_TP_ON  ((0x1 << SEC_TP_OFFSET) | SEC_TP_USAGE)
 #define SEC_TP_OFF ((0x0 << SEC_TP_OFFSET) | SEC_TP_USAGE)
 
-/* crt path select
+/*
+ * crt path select
  *      80200[19:18]
  */
 #define CRT_2_OFFSET 2
@@ -61,7 +67,8 @@
 #define CRT_2_SEC ((0x2 << CRT_2_OFFSET) | CRT_2_USAGE)
 
 
-/* DAC affect both DVI and DSUB
+/*
+ * DAC affect both DVI and DSUB
  *      4[20]
  */
 #define DAC_OFFSET 7
@@ -70,7 +77,8 @@
 #define DAC_ON ((0x0 << DAC_OFFSET) | DAC_USAGE)
 #define DAC_OFF ((0x1 << DAC_OFFSET) | DAC_USAGE)
 
-/* DPMS only affect D-SUB head
+/*
+ * DPMS only affect D-SUB head
  *      0[31:30]
  */
 #define DPMS_OFFSET 9
@@ -81,7 +89,8 @@
 
 
 
-/* LCD1 means panel path TFT1  & panel path DVI (so enable DAC)
+/*
+ * LCD1 means panel path TFT1  & panel path DVI (so enable DAC)
  * CRT means crt path DSUB
  */
 typedef enum _disp_output_t {
@@ -89,7 +98,8 @@ typedef enum _disp_output_t {
         do_LCD1_SEC = PNL_2_SEC | SEC_TP_ON | PNL_SEQ_ON | DAC_ON,
         do_LCD2_PRI = CRT_2_PRI | PRI_TP_ON | DUAL_TFT_ON,
         do_LCD2_SEC = CRT_2_SEC | SEC_TP_ON | DUAL_TFT_ON,
-        /* do_DSUB_PRI = CRT_2_PRI | PRI_TP_ON | DPMS_ON|DAC_ON,
+        /*
+         * do_DSUB_PRI = CRT_2_PRI | PRI_TP_ON | DPMS_ON|DAC_ON,
          * do_DSUB_SEC = CRT_2_SEC | SEC_TP_ON | DPMS_ON|DAC_ON,
          */
         do_CRT_PRI = CRT_2_PRI | PRI_TP_ON | DPMS_ON | DAC_ON,
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c b/drivers/staging/sm750fb/ddk750_dvi.c
index 8252f771ef9e..250c2f478778 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -1,6 +1,6 @@
 #define USE_DVICHIP
 #ifdef USE_DVICHIP
-#include "ddk750_help.h"
+#include "ddk750_chip.h"
 #include "ddk750_reg.h"
 #include "ddk750_dvi.h"
 #include "ddk750_sii164.h"
diff --git a/drivers/staging/sm750fb/ddk750_help.c b/drivers/staging/sm750fb/ddk750_help.c
deleted file mode 100644
index 9637dd30d037..000000000000
--- a/drivers/staging/sm750fb/ddk750_help.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "ddk750_help.h"
-
-void __iomem *mmio750;
-char revId750;
-unsigned short devId750;
-
-/* after driver mapped io registers, use this function first */
-void ddk750_set_mmio(void __iomem *addr, unsigned short devId, char revId)
-{
-        mmio750 = addr;
-        devId750 = devId;
-        revId750 = revId;
-        if (revId == 0xfe)
-                printk("found sm750le\n");
-}
-
-
diff --git a/drivers/staging/sm750fb/ddk750_help.h b/drivers/staging/sm750fb/ddk750_help.h
deleted file mode 100644
index 009db9213a73..000000000000
--- a/drivers/staging/sm750fb/ddk750_help.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef DDK750_HELP_H__
-#define DDK750_HELP_H__
-#include "ddk750_chip.h"
-#ifndef USE_INTERNAL_REGISTER_ACCESS
-
-#include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/uaccess.h>
-
-/* software control endianness */
-#define PEEK32(addr) readl(addr + mmio750)
-#define POKE32(addr, data) writel(data, addr + mmio750)
-
-extern void __iomem *mmio750;
-extern char revId750;
-extern unsigned short devId750;
-#else
-/* implement if you want use it*/
-#endif
-
-#endif
diff --git a/drivers/staging/sm750fb/ddk750_hwi2c.c b/drivers/staging/sm750fb/ddk750_hwi2c.c
index d391c127ead7..05d4a73aa1d4 100644
--- a/drivers/staging/sm750fb/ddk750_hwi2c.c
+++ b/drivers/staging/sm750fb/ddk750_hwi2c.c
@@ -1,6 +1,6 @@
 #define USE_HW_I2C
 #ifdef USE_HW_I2C
-#include "ddk750_help.h"
+#include "ddk750_chip.h"
 #include "ddk750_reg.h"
 #include "ddk750_hwi2c.h"
 #include "ddk750_power.h"
@@ -20,10 +20,11 @@ unsigned char bus_speed_mode
         value |= (GPIO_MUX_30 | GPIO_MUX_31);
         POKE32(GPIO_MUX, value);
 
-        /* Enable Hardware I2C power.
+        /*
+         * Enable Hardware I2C power.
          * TODO: Check if we need to enable GPIO power?
          */
-        enableI2C(1);
+        sm750_enable_i2c(1);
 
         /* Enable the I2C Controller and set the bus speed mode */
         value = PEEK32(I2C_CTRL) & ~(I2C_CTRL_MODE | I2C_CTRL_EN);
@@ -44,7 +45,7 @@ void sm750_hw_i2c_close(void)
         POKE32(I2C_CTRL, value);
 
         /* Disable I2C Power */
-        enableI2C(0);
+        sm750_enable_i2c(0);
 
         /* Set GPIO 30 & 31 back as GPIO pins */
         value = PEEK32(GPIO_MUX);
@@ -92,7 +93,8 @@ static unsigned int hw_i2c_write_data(
         /* Set the Device Address */
         POKE32(I2C_SLAVE_ADDRESS, addr & ~0x01);
 
-        /* Write data.
+        /*
+         * Write data.
          * Note:
          *      Only 16 byte can be accessed per i2c start instruction.
          */
@@ -158,7 +160,8 @@ static unsigned int hw_i2c_read_data(
         /* Set the Device Address */
         POKE32(I2C_SLAVE_ADDRESS, addr | 0x01);
 
-        /* Read data and save them to the buffer.
+        /*
+         * Read data and save them to the buffer.
          * Note:
          *      Only 16 byte can be accessed per i2c start instruction.
          */
diff --git a/drivers/staging/sm750fb/ddk750_mode.c b/drivers/staging/sm750fb/ddk750_mode.c
index 05b83646c2d5..4a4b1de97a87 100644
--- a/drivers/staging/sm750fb/ddk750_mode.c
+++ b/drivers/staging/sm750fb/ddk750_mode.c
@@ -1,10 +1,10 @@
 
-#include "ddk750_help.h"
 #include "ddk750_reg.h"
 #include "ddk750_mode.h"
 #include "ddk750_chip.h"
 
-/* SM750LE only:
+/*
+ * SM750LE only:
  * This function takes care extra registers and bit fields required to set
  * up a mode in SM750LE
  *
@@ -19,7 +19,8 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam,
         x = pModeParam->horizontal_display_end;
         y = pModeParam->vertical_display_end;
 
-        /* SM750LE has to set up the top-left and bottom-right
+        /*
+         * SM750LE has to set up the top-left and bottom-right
          * registers as well.
          * Note that normal SM750/SM718 only use those two register for
          * auto-centering mode.
@@ -31,7 +32,8 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam,
                         CRT_AUTO_CENTERING_BR_BOTTOM_MASK) |
                 ((x - 1) & CRT_AUTO_CENTERING_BR_RIGHT_MASK));
 
-        /* Assume common fields in dispControl have been properly set before
+        /*
+         * Assume common fields in dispControl have been properly set before
          * calling this function.
          * This function only sets the extra fields in dispControl.
          */
@@ -72,7 +74,8 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam,
 
 
 /* only timing related registers will be  programed */
-static int programModeRegisters(mode_parameter_t *pModeParam, pll_value_t *pll)
+static int programModeRegisters(mode_parameter_t *pModeParam,
+                                                struct pll_value *pll)
 {
         int ret = 0;
         int cnt = 0;
@@ -80,7 +83,7 @@ static int programModeRegisters(mode_parameter_t *pModeParam, pll_value_t *pll)
 
         if (pll->clockType == SECONDARY_PLL) {
                 /* programe secondary pixel clock */
-                POKE32(CRT_PLL_CTRL, formatPllReg(pll));
+                POKE32(CRT_PLL_CTRL, sm750_format_pll_reg(pll));
                 POKE32(CRT_HORIZONTAL_TOTAL,
                         (((pModeParam->horizontal_total - 1) <<
                                 CRT_HORIZONTAL_TOTAL_TOTAL_SHIFT) &
@@ -130,7 +133,7 @@ static int programModeRegisters(mode_parameter_t *pModeParam, pll_value_t *pll)
         } else if (pll->clockType == PRIMARY_PLL) {
                 unsigned int reserved;
 
-                POKE32(PANEL_PLL_CTRL, formatPllReg(pll));
+                POKE32(PANEL_PLL_CTRL, sm750_format_pll_reg(pll));
 
                 reg = ((pModeParam->horizontal_total - 1) <<
                         PANEL_HORIZONTAL_TOTAL_TOTAL_SHIFT) &
@@ -176,14 +179,14 @@ static int programModeRegisters(mode_parameter_t *pModeParam, pll_value_t *pll)
                           DISPLAY_CTRL_HSYNC_PHASE | DISPLAY_CTRL_TIMING |
                           DISPLAY_CTRL_PLANE);
 
-                /* May a hardware bug or just my test chip (not confirmed).
-                * PANEL_DISPLAY_CTRL register seems requiring few writes
-                * before a value can be successfully written in.
-                * Added some masks to mask out the reserved bits.
-                * Note: This problem happens by design. The hardware will wait for the
-                *       next vertical sync to turn on/off the plane.
-                */
-
+                /*
+                 * May a hardware bug or just my test chip (not confirmed).
+                 * PANEL_DISPLAY_CTRL register seems requiring few writes
+                 * before a value can be successfully written in.
+                 * Added some masks to mask out the reserved bits.
+                 * Note: This problem happens by design. The hardware will wait
+                 *       for the next vertical sync to turn on/off the plane.
+                 */
                 POKE32(PANEL_DISPLAY_CTRL, tmp | reg);
 
                 while ((PEEK32(PANEL_DISPLAY_CTRL) & ~reserved) !=
@@ -201,13 +204,13 @@ static int programModeRegisters(mode_parameter_t *pModeParam, pll_value_t *pll)
 
 int ddk750_setModeTiming(mode_parameter_t *parm, clock_type_t clock)
 {
-        pll_value_t pll;
+        struct pll_value pll;
         unsigned int uiActualPixelClk;
 
         pll.inputFreq = DEFAULT_INPUT_CLOCK;
         pll.clockType = clock;
 
-        uiActualPixelClk = calcPllValue(parm->pixel_clock, &pll);
+        uiActualPixelClk = sm750_calc_pll_value(parm->pixel_clock, &pll);
         if (sm750_get_chip_type() == SM750LE) {
                 /* set graphic mode via IO method */
                 outb_p(0x88, 0x3d4);
diff --git a/drivers/staging/sm750fb/ddk750_power.c b/drivers/staging/sm750fb/ddk750_power.c
index 7cc6169f884e..6167e30e8e01 100644
--- a/drivers/staging/sm750fb/ddk750_power.c
+++ b/drivers/staging/sm750fb/ddk750_power.c
@@ -1,8 +1,8 @@
-#include "ddk750_help.h"
+#include "ddk750_chip.h"
 #include "ddk750_reg.h"
 #include "ddk750_power.h"
 
-void ddk750_setDPMS(DPMS_t state)
+void ddk750_set_dpms(DPMS_t state)
 {
         unsigned int value;
 
@@ -17,7 +17,7 @@ void ddk750_setDPMS(DPMS_t state)
         }
 }
 
-static unsigned int getPowerMode(void)
+static unsigned int get_power_mode(void)
 {
         if (sm750_get_chip_type() == SM750LE)
                 return 0;
@@ -29,26 +29,26 @@ static unsigned int getPowerMode(void)
  * SM50x can operate in one of three modes: 0, 1 or Sleep.
  * On hardware reset, power mode 0 is default.
  */
-void setPowerMode(unsigned int powerMode)
+void sm750_set_power_mode(unsigned int mode)
 {
-        unsigned int control_value = 0;
+        unsigned int ctrl = 0;
 
-        control_value = PEEK32(POWER_MODE_CTRL) & ~POWER_MODE_CTRL_MODE_MASK;
+        ctrl = PEEK32(POWER_MODE_CTRL) & ~POWER_MODE_CTRL_MODE_MASK;
 
         if (sm750_get_chip_type() == SM750LE)
                 return;
 
-        switch (powerMode) {
+        switch (mode) {
         case POWER_MODE_CTRL_MODE_MODE0:
-                control_value |= POWER_MODE_CTRL_MODE_MODE0;
+                ctrl |= POWER_MODE_CTRL_MODE_MODE0;
                 break;
 
         case POWER_MODE_CTRL_MODE_MODE1:
-                control_value |= POWER_MODE_CTRL_MODE_MODE1;
+                ctrl |= POWER_MODE_CTRL_MODE_MODE1;
                 break;
 
         case POWER_MODE_CTRL_MODE_SLEEP:
-                control_value |= POWER_MODE_CTRL_MODE_SLEEP;
+                ctrl |= POWER_MODE_CTRL_MODE_SLEEP;
                 break;
 
         default:
@@ -56,44 +56,28 @@ void setPowerMode(unsigned int powerMode)
         }
 
         /* Set up other fields in Power Control Register */
-        if (powerMode == POWER_MODE_CTRL_MODE_SLEEP) {
-                control_value &= ~POWER_MODE_CTRL_OSC_INPUT;
+        if (mode == POWER_MODE_CTRL_MODE_SLEEP) {
+                ctrl &= ~POWER_MODE_CTRL_OSC_INPUT;
 #ifdef VALIDATION_CHIP
-                control_value &= ~POWER_MODE_CTRL_336CLK;
+                ctrl &= ~POWER_MODE_CTRL_336CLK;
 #endif
         } else {
-                control_value |= POWER_MODE_CTRL_OSC_INPUT;
+                ctrl |= POWER_MODE_CTRL_OSC_INPUT;
 #ifdef VALIDATION_CHIP
-                control_value |= POWER_MODE_CTRL_336CLK;
+                ctrl |= POWER_MODE_CTRL_336CLK;
 #endif
         }
 
         /* Program new power mode. */
-        POKE32(POWER_MODE_CTRL, control_value);
+        POKE32(POWER_MODE_CTRL, ctrl);
 }
 
-void setCurrentGate(unsigned int gate)
+void sm750_set_current_gate(unsigned int gate)
 {
-        unsigned int gate_reg;
-        unsigned int mode;
-
-        /* Get current power mode. */
-        mode = getPowerMode();
-
-        switch (mode) {
-        case POWER_MODE_CTRL_MODE_MODE0:
-                gate_reg = MODE0_GATE;
-                break;
-
-        case POWER_MODE_CTRL_MODE_MODE1:
-                gate_reg = MODE1_GATE;
-                break;
-
-        default:
-                gate_reg = MODE0_GATE;
-                break;
-        }
-        POKE32(gate_reg, gate);
+        if (get_power_mode() == POWER_MODE_CTRL_MODE_MODE1)
+                POKE32(MODE1_GATE, gate);
+        else
+                POKE32(MODE0_GATE, gate);
 }
 
 
@@ -101,7 +85,7 @@ void setCurrentGate(unsigned int gate)
 /*
  * This function enable/disable the 2D engine.
  */
-void enable2DEngine(unsigned int enable)
+void sm750_enable_2d_engine(unsigned int enable)
 {
         u32 gate;
 
@@ -111,10 +95,10 @@ void enable2DEngine(unsigned int enable)
         else
                 gate &= ~(CURRENT_GATE_DE | CURRENT_GATE_CSC);
 
-        setCurrentGate(gate);
+        sm750_set_current_gate(gate);
 }
 
-void enableDMA(unsigned int enable)
+void sm750_enable_dma(unsigned int enable)
 {
         u32 gate;
 
@@ -125,13 +109,13 @@ void enableDMA(unsigned int enable)
         else
                 gate &= ~CURRENT_GATE_DMA;
 
-        setCurrentGate(gate);
+        sm750_set_current_gate(gate);
 }
 
 /*
  * This function enable/disable the GPIO Engine
  */
-void enableGPIO(unsigned int enable)
+void sm750_enable_gpio(unsigned int enable)
 {
         u32 gate;
 
@@ -142,13 +126,13 @@ void enableGPIO(unsigned int enable)
         else
                 gate &= ~CURRENT_GATE_GPIO;
 
-        setCurrentGate(gate);
+        sm750_set_current_gate(gate);
 }
 
 /*
  * This function enable/disable the I2C Engine
  */
-void enableI2C(unsigned int enable)
+void sm750_enable_i2c(unsigned int enable)
 {
         u32 gate;
 
@@ -159,7 +143,7 @@ void enableI2C(unsigned int enable)
         else
                 gate &= ~CURRENT_GATE_I2C;
 
-        setCurrentGate(gate);
+        sm750_set_current_gate(gate);
 }
 
 
diff --git a/drivers/staging/sm750fb/ddk750_power.h b/drivers/staging/sm750fb/ddk750_power.h
index 5963691f9a68..eb088b0d805f 100644
--- a/drivers/staging/sm750fb/ddk750_power.h
+++ b/drivers/staging/sm750fb/ddk750_power.h
@@ -14,37 +14,29 @@ DPMS_t;
                (PEEK32(MISC_CTRL) & ~MISC_CTRL_DAC_POWER_OFF) | (off)); \
 }
 
-void ddk750_setDPMS(DPMS_t);
-
-/*
- * This function sets the current power mode
- */
-void setPowerMode(unsigned int powerMode);
-
-/*
- * This function sets current gate
- */
-void setCurrentGate(unsigned int gate);
+void ddk750_set_dpms(DPMS_t);
+void sm750_set_power_mode(unsigned int powerMode);
+void sm750_set_current_gate(unsigned int gate);
 
 /*
  * This function enable/disable the 2D engine.
  */
-void enable2DEngine(unsigned int enable);
+void sm750_enable_2d_engine(unsigned int enable);
 
 /*
  * This function enable/disable the DMA Engine
  */
-void enableDMA(unsigned int enable);
+void sm750_enable_dma(unsigned int enable);
 
 /*
  * This function enable/disable the GPIO Engine
  */
-void enableGPIO(unsigned int enable);
+void sm750_enable_gpio(unsigned int enable);
 
 /*
  * This function enable/disable the I2C Engine
  */
-void enableI2C(unsigned int enable);
+void sm750_enable_i2c(unsigned int enable);
 
 
 #endif
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c b/drivers/staging/sm750fb/ddk750_sii164.c
index 99a8683e6383..259006ace219 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -173,7 +173,8 @@ long sii164InitChip(
 
                 i2cWriteReg(SII164_I2C_ADDRESS, SII164_CONFIGURATION, config);
 
-                /* De-skew enabled with default 111b value.
+                /*
+                 * De-skew enabled with default 111b value.
                  * This fixes some artifacts problem in some mode on board 2.2.
                  * Somehow this fix does not affect board 2.1.
                  */
diff --git a/drivers/staging/sm750fb/ddk750_swi2c.c b/drivers/staging/sm750fb/ddk750_swi2c.c
index 72a42330e7a1..b8a4e44359af 100644
--- a/drivers/staging/sm750fb/ddk750_swi2c.c
+++ b/drivers/staging/sm750fb/ddk750_swi2c.c
@@ -1,21 +1,20 @@
-/*******************************************************************
-*
-*         Copyright (c) 2007 by Silicon Motion, Inc. (SMI)
-*
-*  All rights are reserved. Reproduction or in part is prohibited
-*  without the written consent of the copyright owner.
-*
-*  swi2c.c --- SM750/SM718 DDK
-*  This file contains the source code for I2C using software
-*  implementation.
-*
-*******************************************************************/
-#include "ddk750_help.h"
+/*
+ *         Copyright (c) 2007 by Silicon Motion, Inc. (SMI)
+ *
+ *  All rights are reserved. Reproduction or in part is prohibited
+ *  without the written consent of the copyright owner.
+ *
+ *  swi2c.c --- SM750/SM718 DDK
+ *  This file contains the source code for I2C using software
+ *  implementation.
+ */
+
+#include "ddk750_chip.h"
 #include "ddk750_reg.h"
 #include "ddk750_swi2c.h"
 #include "ddk750_power.h"
 
-/*******************************************************************
+/*
  * I2C Software Master Driver:
  * ===========================
  * Each i2c cycle is split into 4 sections. Each of these section marks
@@ -51,7 +50,7 @@
  *                            SCL | L |   | H |   |
  *                 ---------------+---+---+---+---+
  *
- ******************************************************************/
+ */
 
 /* GPIO pins used for this I2C. It ranges from 0 to 63. */
 static unsigned char sw_i2c_clk_gpio = DEFAULT_I2C_SCL;
@@ -429,7 +428,7 @@ long sm750_sw_i2c_init(
                PEEK32(sw_i2c_data_gpio_mux_reg) & ~(1 << sw_i2c_data_gpio));
 
         /* Enable GPIO power */
-        enableGPIO(1);
+        sm750_enable_gpio(1);
 
         /* Clear the i2c lines. */
         for (i = 0; i < 9; i++)
diff --git a/drivers/staging/sm750fb/ddk750_swi2c.h b/drivers/staging/sm750fb/ddk750_swi2c.h
index b53629cda095..5a9466efc7bd 100644
--- a/drivers/staging/sm750fb/ddk750_swi2c.h
+++ b/drivers/staging/sm750fb/ddk750_swi2c.h
@@ -1,15 +1,15 @@
-/*******************************************************************
-*
-*         Copyright (c) 2007 by Silicon Motion, Inc. (SMI)
-*
-*  All rights are reserved. Reproduction or in part is prohibited
-*  without the written consent of the copyright owner.
-*
-*  swi2c.h --- SM750/SM718 DDK
-*  This file contains the definitions for i2c using software
-*  implementation.
-*
-*******************************************************************/
+/*
+ *         Copyright (c) 2007 by Silicon Motion, Inc. (SMI)
+ *
+ *  All rights are reserved. Reproduction or in part is prohibited
+ *  without the written consent of the copyright owner.
+ *
+ *  swi2c.h --- SM750/SM718 DDK
+ *  This file contains the definitions for i2c using software
+ *  implementation.
+ *
+ */
+
 #ifndef _SWI2C_H_
 #define _SWI2C_H_
 
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 7d90e250142c..e9632f162f99 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -118,14 +118,14 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor)
                 return -ENXIO;
         }
 
-        hw_cursor_disable(cursor);
+        sm750_hw_cursor_disable(cursor);
         if (fbcursor->set & FB_CUR_SETSIZE)
-                hw_cursor_setSize(cursor,
+                sm750_hw_cursor_setSize(cursor,
                                   fbcursor->image.width,
                                   fbcursor->image.height);
 
         if (fbcursor->set & FB_CUR_SETPOS)
-                hw_cursor_setPos(cursor,
+                sm750_hw_cursor_setPos(cursor,
                                  fbcursor->image.dx - info->var.xoffset,
                                  fbcursor->image.dy - info->var.yoffset);
 
@@ -141,18 +141,18 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor)
                       ((info->cmap.green[fbcursor->image.bg_color] & 0xfc00) >> 5) |
                       ((info->cmap.blue[fbcursor->image.bg_color] & 0xf800) >> 11);
 
-                hw_cursor_setColor(cursor, fg, bg);
+                sm750_hw_cursor_setColor(cursor, fg, bg);
         }
 
         if (fbcursor->set & (FB_CUR_SETSHAPE | FB_CUR_SETIMAGE)) {
-                hw_cursor_setData(cursor,
+                sm750_hw_cursor_setData(cursor,
                                   fbcursor->rop,
                                   fbcursor->image.data,
                                   fbcursor->mask);
         }
 
         if (fbcursor->enable)
-                hw_cursor_enable(cursor);
+                sm750_hw_cursor_enable(cursor);
 
         return 0;
 }
@@ -575,11 +575,11 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var,
         return hw_sm750_crtc_checkMode(crtc, var);
 }
 
-static int lynxfb_ops_setcolreg(unsigned regno,
-                                unsigned red,
-                                unsigned green,
-                                unsigned blue,
-                                unsigned transp,
+static int lynxfb_ops_setcolreg(unsigned int regno,
+                                unsigned int red,
+                                unsigned int green,
+                                unsigned int blue,
+                                unsigned int transp,
                                 struct fb_info *info)
 {
         struct lynxfb_par *par;
@@ -788,7 +788,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
         memset_io(crtc->cursor.vstart, 0, crtc->cursor.size);
         if (!g_hwcursor) {
                 lynxfb_ops.fb_cursor = NULL;
-                hw_cursor_disable(&crtc->cursor);
+                sm750_hw_cursor_disable(&crtc->cursor);
         }
 
         /* set info->fbops, must be set before fb_find_mode */
@@ -947,13 +947,13 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev, char *src)
         g_hwcursor = 3;
 
         if (!src || !*src) {
-                pr_warn("no specific g_option.\n");
+                dev_warn(&sm750_dev->pdev->dev, "no specific g_option.\n");
                 goto NO_PARAM;
         }
 
         while ((opt = strsep(&src, ":")) != NULL && *opt != 0) {
-                pr_info("opt=%s\n", opt);
-                pr_info("src=%s\n", src);
+                dev_info(&sm750_dev->pdev->dev, "opt=%s\n", opt);
+                dev_info(&sm750_dev->pdev->dev, "src=%s\n", src);
 
                 if (!strncmp(opt, "swap", strlen("swap")))
                         swap = 1;
@@ -974,12 +974,12 @@ static void sm750fb_setup(struct sm750_dev *sm750_dev, char *src)
                 else {
                         if (!g_fbmode[0]) {
                                 g_fbmode[0] = opt;
-                                pr_info("find fbmode0 : %s\n", g_fbmode[0]);
+                                dev_info(&sm750_dev->pdev->dev, "find fbmode0 : %s\n", g_fbmode[0]);
                         } else if (!g_fbmode[1]) {
                                 g_fbmode[1] = opt;
-                                pr_info("find fbmode1 : %s\n", g_fbmode[1]);
+                                dev_info(&sm750_dev->pdev->dev, "find fbmode1 : %s\n", g_fbmode[1]);
                         } else {
-                                pr_warn("How many view you wann set?\n");
+                                dev_warn(&sm750_dev->pdev->dev, "How many view you wann set?\n");
                         }
                 }
         }
@@ -1083,10 +1083,10 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
                  * if some chip need specific function,
                  * please hook it in smXXX_set_drv routine
                  */
-                sm750_dev->accel.de_init = hw_de_init;
-                sm750_dev->accel.de_fillrect = hw_fillrect;
-                sm750_dev->accel.de_copyarea = hw_copyarea;
-                sm750_dev->accel.de_imageblit = hw_imageblit;
+                sm750_dev->accel.de_init = sm750_hw_de_init;
+                sm750_dev->accel.de_fillrect = sm750_hw_fillrect;
+                sm750_dev->accel.de_copyarea = sm750_hw_copyarea;
+                sm750_dev->accel.de_imageblit = sm750_hw_imageblit;
         }
 
         /* call chip specific setup routine  */
@@ -1188,7 +1188,7 @@ static int __init lynxfb_setup(char *options)
         return 0;
 }
 
-static struct pci_device_id smi_pci_table[] = {
+static const struct pci_device_id smi_pci_table[] = {
         { PCI_DEVICE(0x126f, 0x0750), },
         {0,}
 };
@@ -1209,7 +1209,6 @@ static struct pci_driver lynxfb_driver = {
 static int __init lynxfb_init(void)
 {
         char *option;
-        int ret;
 
 #ifdef MODULE
         option = g_option;
@@ -1219,8 +1218,7 @@ static int __init lynxfb_init(void)
 #endif
 
         lynxfb_setup(option);
-        ret = pci_register_driver(&lynxfb_driver);
-        return ret;
+        return pci_register_driver(&lynxfb_driver);
 }
 module_init(lynxfb_init);
 
@@ -1245,4 +1243,4 @@ MODULE_PARM_DESC(g_option,
 MODULE_AUTHOR("monk liu <monk.liu@siliconmotion.com>");
 MODULE_AUTHOR("Sudip Mukherjee <sudip@vectorindia.org>");
 MODULE_DESCRIPTION("Frame buffer driver for SM750 chipset");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index ff31c5c9cc6f..28f4b9b4f95f 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -146,14 +146,16 @@ struct lynxfb_crtc {
 struct lynxfb_output {
         int dpms;
         int paths;
-        /* which paths(s) this output stands for,for sm750:
+        /*
+         * which paths(s) this output stands for,for sm750:
          * paths=1:means output for panel paths
          * paths=2:means output for crt paths
          * paths=3:means output for both panel and crt paths
          */
 
         int *channel;
-        /* which channel these outputs linked with,for sm750:
+        /*
+         * which channel these outputs linked with,for sm750:
          * *channel=0 means primary channel
          * *channel=1 means secondary channel
          * output->channel ==> &crtc->channel
diff --git a/drivers/staging/sm750fb/sm750_accel.c b/drivers/staging/sm750fb/sm750_accel.c
index 38adae6b5d83..af0db5789c53 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -32,7 +32,7 @@ static inline void write_dpPort(struct lynx_accel *accel, u32 data)
         writel(data, accel->dpPortBase);
 }
 
-void hw_de_init(struct lynx_accel *accel)
+void sm750_hw_de_init(struct lynx_accel *accel)
 {
         /* setup 2d engine registers */
         u32 reg, clr;
@@ -65,12 +65,13 @@ void hw_de_init(struct lynx_accel *accel)
         write_dpr(accel, DE_CONTROL, read_dpr(accel, DE_CONTROL) & ~clr);
 }
 
-/* set2dformat only be called from setmode functions
+/*
+ * set2dformat only be called from setmode functions
  * but if you need dual framebuffer driver,need call set2dformat
  * every time you use 2d function
  */
 
-void hw_set2dformat(struct lynx_accel *accel, int fmt)
+void sm750_hw_set2dformat(struct lynx_accel *accel, int fmt)
 {
         u32 reg;
 
@@ -82,7 +83,7 @@ void hw_set2dformat(struct lynx_accel *accel, int fmt)
         write_dpr(accel, DE_STRETCH_FORMAT, reg);
 }
 
-int hw_fillrect(struct lynx_accel *accel,
+int sm750_hw_fillrect(struct lynx_accel *accel,
                                 u32 base, u32 pitch, u32 Bpp,
                                 u32 x, u32 y, u32 width, u32 height,
                                 u32 color, u32 rop)
@@ -90,7 +91,8 @@ int hw_fillrect(struct lynx_accel *accel,
         u32 deCtrl;
 
         if (accel->de_wait() != 0) {
-                /* int time wait and always busy,seems hardware
+                /*
+                 * int time wait and always busy,seems hardware
                  * got something error
                  */
                 pr_debug("De engine always busy\n");
@@ -126,7 +128,7 @@ int hw_fillrect(struct lynx_accel *accel,
         return 0;
 }
 
-int hw_copyarea(
+int sm750_hw_copyarea(
 struct lynx_accel *accel,
 unsigned int sBase,  /* Address of source: offset in frame buffer */
 unsigned int sPitch, /* Pitch value of source surface in BYTE */
@@ -213,25 +215,29 @@ unsigned int rop2)   /* ROP value */
                 opSign = (-1);
         }
 
-        /* Note:
+        /*
+         * Note:
          * DE_FOREGROUND are DE_BACKGROUND are don't care.
          * DE_COLOR_COMPARE and DE_COLOR_COMPARE_MAKS
          * are set by set deSetTransparency().
          */
 
-        /* 2D Source Base.
+        /*
+         * 2D Source Base.
          * It is an address offset (128 bit aligned)
          * from the beginning of frame buffer.
          */
         write_dpr(accel, DE_WINDOW_SOURCE_BASE, sBase); /* dpr40 */
 
-        /* 2D Destination Base.
+        /*
+         * 2D Destination Base.
          * It is an address offset (128 bit aligned)
          * from the beginning of frame buffer.
          */
         write_dpr(accel, DE_WINDOW_DESTINATION_BASE, dBase); /* dpr44 */
 
-    /* Program pitch (distance between the 1st points of two adjacent lines).
+    /*
+     * Program pitch (distance between the 1st points of two adjacent lines).
      * Note that input pitch is BYTE value, but the 2D Pitch register uses
      * pixel values. Need Byte to pixel conversion.
      */
@@ -240,7 +246,8 @@ unsigned int rop2)   /* ROP value */
                    DE_PITCH_DESTINATION_MASK) |
                   (sPitch / Bpp & DE_PITCH_SOURCE_MASK)); /* dpr10 */
 
-    /* Screen Window width in Pixels.
+    /*
+     * Screen Window width in Pixels.
      * 2D engine uses this value to calculate the linear address in frame buffer
      * for a given point.
      */
@@ -286,7 +293,7 @@ static unsigned int deGetTransparency(struct lynx_accel *accel)
         return de_ctrl;
 }
 
-int hw_imageblit(struct lynx_accel *accel,
+int sm750_hw_imageblit(struct lynx_accel *accel,
                  const char *pSrcbuf, /* pointer to start of source buffer in system memory */
                  u32 srcDelta,          /* Pitch value (in bytes) of the source buffer, +ive means top down and -ive mean button up */
                  u32 startBit, /* Mono data can start at any bit in a byte, this value should be 0 to 7 */
@@ -316,7 +323,8 @@ int hw_imageblit(struct lynx_accel *accel,
         if (accel->de_wait() != 0)
                 return -1;
 
-        /* 2D Source Base.
+        /*
+         * 2D Source Base.
          * Use 0 for HOST Blt.
          */
         write_dpr(accel, DE_WINDOW_SOURCE_BASE, 0);
@@ -326,16 +334,19 @@ int hw_imageblit(struct lynx_accel *accel,
          * from the beginning of frame buffer.
          */
         write_dpr(accel, DE_WINDOW_DESTINATION_BASE, dBase);
-    /* Program pitch (distance between the 1st points of two adjacent lines).
-     * Note that input pitch is BYTE value, but the 2D Pitch register uses
-     * pixel values. Need Byte to pixel conversion.
-     */
+
+        /*
+         * Program pitch (distance between the 1st points of two adjacent
+         * lines). Note that input pitch is BYTE value, but the 2D Pitch
+         * register uses pixel values. Need Byte to pixel conversion.
+         */
         write_dpr(accel, DE_PITCH,
                   ((dPitch / bytePerPixel << DE_PITCH_DESTINATION_SHIFT) &
                    DE_PITCH_DESTINATION_MASK) |
                   (dPitch / bytePerPixel & DE_PITCH_SOURCE_MASK)); /* dpr10 */
 
-        /* Screen Window width in Pixels.
+        /*
+         * Screen Window width in Pixels.
          * 2D engine uses this value to calculate the linear address
          * in frame buffer for a given point.
          */
@@ -344,7 +355,8 @@ int hw_imageblit(struct lynx_accel *accel,
                    DE_WINDOW_WIDTH_DST_MASK) |
                   (dPitch / bytePerPixel & DE_WINDOW_WIDTH_SRC_MASK));
 
-         /* Note: For 2D Source in Host Write, only X_K1_MONO field is needed,
+         /*
+          * Note: For 2D Source in Host Write, only X_K1_MONO field is needed,
           * and Y_K2 field is not used.
           * For mono bitmap, use startBit for X_K1.
           */
@@ -383,6 +395,6 @@ int hw_imageblit(struct lynx_accel *accel,
                 pSrcbuf += srcDelta;
         }
 
-            return 0;
+        return 0;
 }
 
diff --git a/drivers/staging/sm750fb/sm750_accel.h b/drivers/staging/sm750fb/sm750_accel.h
index d59d005e0add..4b0ff8feb9a0 100644
--- a/drivers/staging/sm750fb/sm750_accel.h
+++ b/drivers/staging/sm750fb/sm750_accel.h
@@ -184,16 +184,16 @@
 #define BOTTOM_TO_TOP 1
 #define RIGHT_TO_LEFT 1
 
-void hw_set2dformat(struct lynx_accel *accel, int fmt);
+void sm750_hw_set2dformat(struct lynx_accel *accel, int fmt);
 
-void hw_de_init(struct lynx_accel *accel);
+void sm750_hw_de_init(struct lynx_accel *accel);
 
-int hw_fillrect(struct lynx_accel *accel,
+int sm750_hw_fillrect(struct lynx_accel *accel,
                                 u32 base, u32 pitch, u32 Bpp,
                                 u32 x, u32 y, u32 width, u32 height,
                                 u32 color, u32 rop);
 
-int hw_copyarea(
+int sm750_hw_copyarea(
 struct lynx_accel *accel,
 unsigned int sBase,  /* Address of source: offset in frame buffer */
 unsigned int sPitch, /* Pitch value of source surface in BYTE */
@@ -208,7 +208,7 @@ unsigned int width,
 unsigned int height, /* width and height of rectangle in pixel value */
 unsigned int rop2);
 
-int hw_imageblit(struct lynx_accel *accel,
+int sm750_hw_imageblit(struct lynx_accel *accel,
                  const char *pSrcbuf, /* pointer to start of source buffer in system memory */
                  u32 srcDelta,          /* Pitch value (in bytes) of the source buffer, +ive means top down and -ive mean button up */
                  u32 startBit, /* Mono data can start at any bit in a byte, this value should be 0 to 7 */
diff --git a/drivers/staging/sm750fb/sm750_cursor.c b/drivers/staging/sm750fb/sm750_cursor.c
index d622d65b6cee..2a13353fc492 100644
--- a/drivers/staging/sm750fb/sm750_cursor.c
+++ b/drivers/staging/sm750fb/sm750_cursor.c
@@ -47,25 +47,25 @@ writel((data), cursor->mmio + (addr))
 
 
 /* hw_cursor_xxx works for voyager,718 and 750 */
-void hw_cursor_enable(struct lynx_cursor *cursor)
+void sm750_hw_cursor_enable(struct lynx_cursor *cursor)
 {
         u32 reg;
 
         reg = (cursor->offset & HWC_ADDRESS_ADDRESS_MASK) | HWC_ADDRESS_ENABLE;
         POKE32(HWC_ADDRESS, reg);
 }
-void hw_cursor_disable(struct lynx_cursor *cursor)
+void sm750_hw_cursor_disable(struct lynx_cursor *cursor)
 {
         POKE32(HWC_ADDRESS, 0);
 }
 
-void hw_cursor_setSize(struct lynx_cursor *cursor,
+void sm750_hw_cursor_setSize(struct lynx_cursor *cursor,
                                                 int w, int h)
 {
         cursor->w = w;
         cursor->h = h;
 }
-void hw_cursor_setPos(struct lynx_cursor *cursor,
+void sm750_hw_cursor_setPos(struct lynx_cursor *cursor,
                                                 int x, int y)
 {
         u32 reg;
@@ -74,7 +74,7 @@ void hw_cursor_setPos(struct lynx_cursor *cursor,
                 (x & HWC_LOCATION_X_MASK));
         POKE32(HWC_LOCATION, reg);
 }
-void hw_cursor_setColor(struct lynx_cursor *cursor,
+void sm750_hw_cursor_setColor(struct lynx_cursor *cursor,
                                                 u32 fg, u32 bg)
 {
         u32 reg = (fg << HWC_COLOR_12_2_RGB565_SHIFT) &
@@ -84,7 +84,7 @@ void hw_cursor_setColor(struct lynx_cursor *cursor,
         POKE32(HWC_COLOR_3, 0xffe0);
 }
 
-void hw_cursor_setData(struct lynx_cursor *cursor,
+void sm750_hw_cursor_setData(struct lynx_cursor *cursor,
                         u16 rop, const u8 *pcol, const u8 *pmsk)
 {
         int i, j, count, pitch, offset;
@@ -138,7 +138,7 @@ void hw_cursor_setData(struct lynx_cursor *cursor,
 }
 
 
-void hw_cursor_setData2(struct lynx_cursor *cursor,
+void sm750_hw_cursor_setData2(struct lynx_cursor *cursor,
                         u16 rop, const u8 *pcol, const u8 *pmsk)
 {
         int i, j, count, pitch, offset;
diff --git a/drivers/staging/sm750fb/sm750_cursor.h b/drivers/staging/sm750fb/sm750_cursor.h
index 6c4fc9b73489..c7b86ae235b4 100644
--- a/drivers/staging/sm750fb/sm750_cursor.h
+++ b/drivers/staging/sm750fb/sm750_cursor.h
@@ -2,16 +2,16 @@
 #define LYNX_CURSOR_H__
 
 /* hw_cursor_xxx works for voyager,718 and 750 */
-void hw_cursor_enable(struct lynx_cursor *cursor);
-void hw_cursor_disable(struct lynx_cursor *cursor);
-void hw_cursor_setSize(struct lynx_cursor *cursor,
+void sm750_hw_cursor_enable(struct lynx_cursor *cursor);
+void sm750_hw_cursor_disable(struct lynx_cursor *cursor);
+void sm750_hw_cursor_setSize(struct lynx_cursor *cursor,
                                                 int w, int h);
-void hw_cursor_setPos(struct lynx_cursor *cursor,
+void sm750_hw_cursor_setPos(struct lynx_cursor *cursor,
                                                 int x, int y);
-void hw_cursor_setColor(struct lynx_cursor *cursor,
+void sm750_hw_cursor_setColor(struct lynx_cursor *cursor,
                                                 u32 fg, u32 bg);
-void hw_cursor_setData(struct lynx_cursor *cursor,
+void sm750_hw_cursor_setData(struct lynx_cursor *cursor,
                         u16 rop, const u8 *data, const u8 *mask);
-void hw_cursor_setData2(struct lynx_cursor *cursor,
+void sm750_hw_cursor_setData2(struct lynx_cursor *cursor,
                         u16 rop, const u8 *data, const u8 *mask);
 #endif
diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c
index 7dd208caa5eb..b6af3b53076b 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -23,6 +23,8 @@
 #include "ddk750.h"
 #include "sm750_accel.h"
 
+void __iomem *mmio750;
+
 int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
 {
         int ret;
@@ -34,7 +36,8 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
 
         pr_info("mmio phyAddr = %lx\n", sm750_dev->vidreg_start);
 
-        /* reserve the vidreg space of smi adaptor
+        /*
+         * reserve the vidreg space of smi adaptor
          * if you do this, you need to add release region code
          * in lynxfb_remove, or memory will not be mapped again
          * successfully
@@ -59,15 +62,17 @@ int hw_sm750_map(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
         sm750_dev->accel.dprBase = sm750_dev->pvReg + DE_BASE_ADDR_TYPE1;
         sm750_dev->accel.dpPortBase = sm750_dev->pvReg + DE_PORT_ADDR_TYPE1;
 
-        ddk750_set_mmio(sm750_dev->pvReg, sm750_dev->devid, sm750_dev->revid);
+        mmio750 = sm750_dev->pvReg;
+        sm750_set_chip_type(sm750_dev->devid, sm750_dev->revid);
 
         sm750_dev->vidmem_start = pci_resource_start(pdev, 0);
-        /* don't use pdev_resource[x].end - resource[x].start to
+        /*
+         * don't use pdev_resource[x].end - resource[x].start to
          * calculate the resource size, it's only the maximum available
          * size but not the actual size, using
-         * @ddk750_getVMSize function can be safe.
+         * @ddk750_get_vm_size function can be safe.
          */
-        sm750_dev->vidmem_size = ddk750_getVMSize();
+        sm750_dev->vidmem_size = ddk750_get_vm_size();
         pr_info("video memory phyAddr = %lx, size = %u bytes\n",
                 sm750_dev->vidmem_start, sm750_dev->vidmem_size);
 
@@ -100,7 +105,7 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
         if (parm->master_clk == 0)
                 parm->master_clk = parm->chip_clk / 3;
 
-        ddk750_initHw((initchip_param_t *)&sm750_dev->initParm);
+        ddk750_init_hw((struct initchip_param *)&sm750_dev->initParm);
         /* for sm718, open pci burst */
         if (sm750_dev->devid == 0x718) {
                 POKE32(SYSTEM_CTRL,
@@ -141,7 +146,8 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
                 }
                 POKE32(PANEL_DISPLAY_CTRL, val);
         } else {
-                /* for 750LE, no DVI chip initialization
+                /*
+                 * for 750LE, no DVI chip initialization
                  * makes Monitor no signal
                  *
                  * Set up GPIO for software I2C to program DVI chip in the
@@ -149,13 +155,15 @@ int hw_sm750_inithw(struct sm750_dev *sm750_dev, struct pci_dev *pdev)
                  */
                 sm750_sw_i2c_init(0, 1);
 
-                /* Customer may NOT use CH7301 DVI chip, which has to be
+                /*
+                 * Customer may NOT use CH7301 DVI chip, which has to be
                  * initialized differently.
                  */
                 if (sm750_sw_i2c_read_reg(0xec, 0x4a) == 0x95) {
-                /* The following register values for CH7301 are from
-                 * Chrontel app note and our experiment.
-                 */
+                        /*
+                         * The following register values for CH7301 are from
+                         * Chrontel app note and our experiment.
+                         */
                         pr_info("yes,CH7301 DVI chip found\n");
                         sm750_sw_i2c_write_reg(0xec, 0x1d, 0x16);
                         sm750_sw_i2c_write_reg(0xec, 0x21, 0x9);
@@ -267,7 +275,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
                         fmt = 2;
                         break;
                 }
-                hw_set2dformat(&sm750_dev->accel, fmt);
+                sm750_hw_set2dformat(&sm750_dev->accel, fmt);
         }
 
         /* set timing */
@@ -308,7 +316,8 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
                        crtc->oScreen & PANEL_FB_ADDRESS_ADDRESS_MASK);
 
                 reg = var->xres * (var->bits_per_pixel >> 3);
-                /* crtc->channel is not equal to par->index on numeric,
+                /*
+                 * crtc->channel is not equal to par->index on numeric,
                  * be aware of that
                  */
                 reg = ALIGN(reg, crtc->line_pad);
@@ -342,7 +351,8 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc,
                 /* not implemented now */
                 POKE32(CRT_FB_ADDRESS, crtc->oScreen);
                 reg = var->xres * (var->bits_per_pixel >> 3);
-                /* crtc->channel is not equal to par->index on numeric,
+                /*
+                 * crtc->channel is not equal to par->index on numeric,
                  * be aware of that
                  */
                 reg = ALIGN(reg, crtc->line_pad) << CRT_FB_WIDTH_WIDTH_SHIFT;
@@ -469,7 +479,7 @@ void hw_sm750_initAccel(struct sm750_dev *sm750_dev)
 {
         u32 reg;
 
-        enable2DEngine(1);
+        sm750_enable_2d_engine(1);
 
         if (sm750_get_chip_type() == SM750LE) {
                 reg = PEEK32(DE_STATE1);
diff --git a/drivers/staging/speakup/TODO b/drivers/staging/speakup/TODO
index 3094799cf6a0..993410c3e531 100644
--- a/drivers/staging/speakup/TODO
+++ b/drivers/staging/speakup/TODO
@@ -42,6 +42,6 @@ We prefer that you contact us on the mailing list; however, if you do
 not want to subscribe to a mailing list, send your email to all of the
 following:
 
-w.d.hubbs@gmail.com, chris@the-brannons.com, kirk@braille.uwo.ca and
+w.d.hubbs@gmail.com, chris@the-brannons.com, kirk@reisers.ca and
 samuel.thibault@ens-lyon.org.
 
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 97ca4ecca8a9..5c192042eeac 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -351,14 +351,14 @@ static void speakup_cut(struct vc_data *vc)
 
         if (!mark_cut_flag) {
                 mark_cut_flag = 1;
-                spk_xs = (u_short) spk_x;
-                spk_ys = (u_short) spk_y;
+                spk_xs = (u_short)spk_x;
+                spk_ys = (u_short)spk_y;
                 spk_sel_cons = vc;
                 synth_printf("%s\n", spk_msg_get(MSG_MARK));
                 return;
         }
-        spk_xe = (u_short) spk_x;
-        spk_ye = (u_short) spk_y;
+        spk_xe = (u_short)spk_x;
+        spk_ye = (u_short)spk_y;
         mark_cut_flag = 0;
         synth_printf("%s\n", spk_msg_get(MSG_CUT));
 
@@ -489,7 +489,7 @@ static void say_char(struct vc_data *vc)
         u_short ch;
 
         spk_old_attr = spk_attr;
-        ch = get_char(vc, (u_short *) spk_pos, &spk_attr);
+        ch = get_char(vc, (u_short *)spk_pos, &spk_attr);
         if (spk_attr != spk_old_attr) {
                 if (spk_attrib_bleep & 1)
                         bleep(spk_y);
@@ -504,7 +504,7 @@ static void say_phonetic_char(struct vc_data *vc)
         u_short ch;
 
         spk_old_attr = spk_attr;
-        ch = get_char(vc, (u_short *) spk_pos, &spk_attr);
+        ch = get_char(vc, (u_short *)spk_pos, &spk_attr);
         if (isascii(ch) && isalpha(ch)) {
                 ch &= 0x1f;
                 synth_printf("%s\n", phonetic[--ch]);
@@ -556,7 +556,7 @@ static u_long get_word(struct vc_data *vc)
         u_char temp;
 
         spk_old_attr = spk_attr;
-        ch = (char)get_char(vc, (u_short *) tmp_pos, &temp);
+        ch = (char)get_char(vc, (u_short *)tmp_pos, &temp);
 
 /* decided to take out the sayword if on a space (mis-information */
         if (spk_say_word_ctl && ch == SPACE) {
@@ -565,26 +565,26 @@ static u_long get_word(struct vc_data *vc)
                 return 0;
         } else if ((tmpx < vc->vc_cols - 2)
                    && (ch == SPACE || ch == 0 || IS_WDLM(ch))
-                   && ((char)get_char(vc, (u_short *) &tmp_pos + 1, &temp) >
+                   && ((char)get_char(vc, (u_short *)&tmp_pos + 1, &temp) >
                        SPACE)) {
                 tmp_pos += 2;
                 tmpx++;
         } else
                 while (tmpx > 0) {
-                        ch = (char)get_char(vc, (u_short *) tmp_pos - 1, &temp);
+                        ch = (char)get_char(vc, (u_short *)tmp_pos - 1, &temp);
                         if ((ch == SPACE || ch == 0 || IS_WDLM(ch))
-                            && ((char)get_char(vc, (u_short *) tmp_pos, &temp) >
+                            && ((char)get_char(vc, (u_short *)tmp_pos, &temp) >
                                 SPACE))
                                 break;
                         tmp_pos -= 2;
                         tmpx--;
                 }
-        attr_ch = get_char(vc, (u_short *) tmp_pos, &spk_attr);
+        attr_ch = get_char(vc, (u_short *)tmp_pos, &spk_attr);
         buf[cnt++] = attr_ch & 0xff;
         while (tmpx < vc->vc_cols - 1) {
                 tmp_pos += 2;
                 tmpx++;
-                ch = (char)get_char(vc, (u_short *) tmp_pos, &temp);
+                ch = (char)get_char(vc, (u_short *)tmp_pos, &temp);
                 if ((ch == SPACE) || ch == 0
                     || (IS_WDLM(buf[cnt - 1]) && (ch > SPACE)))
                         break;
@@ -639,7 +639,7 @@ static void say_prev_word(struct vc_data *vc)
                 } else
                         spk_x--;
                 spk_pos -= 2;
-                ch = (char)get_char(vc, (u_short *) spk_pos, &temp);
+                ch = (char)get_char(vc, (u_short *)spk_pos, &temp);
                 if (ch == SPACE || ch == 0)
                         state = 0;
                 else if (IS_WDLM(ch))
@@ -672,7 +672,7 @@ static void say_next_word(struct vc_data *vc)
                 return;
         }
         while (1) {
-                ch = (char)get_char(vc, (u_short *) spk_pos, &temp);
+                ch = (char)get_char(vc, (u_short *)spk_pos, &temp);
                 if (ch == SPACE || ch == 0)
                         state = 0;
                 else if (IS_WDLM(ch))
@@ -709,7 +709,7 @@ static void spell_word(struct vc_data *vc)
 
         if (!get_word(vc))
                 return;
-        while ((ch = (u_char) *cp)) {
+        while ((ch = (u_char)*cp)) {
                 if (cp != buf)
                         synth_printf(" %s ", delay_str[spk_spell_delay]);
                 if (IS_CHAR(ch, B_CAP)) {
@@ -751,7 +751,7 @@ static int get_line(struct vc_data *vc)
         spk_old_attr = spk_attr;
         spk_attr = get_attributes(vc, (u_short *)spk_pos);
         for (i = 0; i < vc->vc_cols; i++) {
-                buf[i] = (u_char) get_char(vc, (u_short *) tmp, &tmp2);
+                buf[i] = (u_char)get_char(vc, (u_short *)tmp, &tmp2);
                 tmp += 2;
         }
         for (--i; i >= 0; i--)
@@ -816,7 +816,7 @@ static int say_from_to(struct vc_data *vc, u_long from, u_long to,
         spk_old_attr = spk_attr;
         spk_attr = get_attributes(vc, (u_short *)from);
         while (from < to) {
-                buf[i++] = (char)get_char(vc, (u_short *) from, &tmp);
+                buf[i++] = (char)get_char(vc, (u_short *)from, &tmp);
                 from += 2;
                 if (i >= vc->vc_size_row)
                         break;
@@ -892,7 +892,7 @@ static int get_sentence_buf(struct vc_data *vc, int read_punc)
         spk_attr = get_attributes(vc, (u_short *)start);
 
         while (start < end) {
-                sentbuf[bn][i] = (char)get_char(vc, (u_short *) start, &tmp);
+                sentbuf[bn][i] = (char)get_char(vc, (u_short *)start, &tmp);
                 if (i > 0) {
                         if (sentbuf[bn][i] == SPACE && sentbuf[bn][i - 1] == '.'
                             && numsentences[bn] < 9) {
@@ -1040,7 +1040,7 @@ static void say_position(struct vc_data *vc)
 static void say_char_num(struct vc_data *vc)
 {
         u_char tmp;
-        u_short ch = get_char(vc, (u_short *) spk_pos, &tmp);
+        u_short ch = get_char(vc, (u_short *)spk_pos, &tmp);
 
         ch &= 0xff;
         synth_printf(spk_msg_get(MSG_CHAR_INFO), ch, ch);
@@ -1085,7 +1085,7 @@ static void spkup_write(const char *in_buf, int count)
                             (currsentence <= numsentences[bn]))
                                 synth_insert_next_index(currsentence++);
                 }
-                ch = (u_char) *in_buf++;
+                ch = (u_char)*in_buf++;
                 char_type = spk_chartab[ch];
                 if (ch == old_ch && !(char_type & B_NUM)) {
                         if (++rep_count > 2)
@@ -1579,7 +1579,7 @@ static int count_highlight_color(struct vc_data *vc)
         int cc;
         int vc_num = vc->vc_num;
         u16 ch;
-        u16 *start = (u16 *) vc->vc_origin;
+        u16 *start = (u16 *)vc->vc_origin;
 
         for (i = 0; i < 8; i++)
                 speakup_console[vc_num]->ht.bgcount[i] = 0;
diff --git a/drivers/staging/speakup/selection.c b/drivers/staging/speakup/selection.c
index 0149edc1e0ae..aeb2b865615a 100644
--- a/drivers/staging/speakup/selection.c
+++ b/drivers/staging/speakup/selection.c
@@ -137,7 +137,7 @@ static void __speakup_paste_selection(struct work_struct *work)
         struct speakup_paste_work *spw =
                 container_of(work, struct speakup_paste_work, work);
         struct tty_struct *tty = xchg(&spw->tty, NULL);
-        struct vc_data *vc = (struct vc_data *) tty->driver_data;
+        struct vc_data *vc = (struct vc_data *)tty->driver_data;
         int pasted = 0, count;
         struct tty_ldisc *ld;
         DECLARE_WAITQUEUE(wait, current);
diff --git a/drivers/staging/speakup/serialio.c b/drivers/staging/speakup/serialio.c
index c2c435cc3d63..ef89dc1c21c8 100644
--- a/drivers/staging/speakup/serialio.c
+++ b/drivers/staging/speakup/serialio.c
@@ -99,7 +99,7 @@ static irqreturn_t synth_readbuf_handler(int irq, void *dev_id)
         while (inb_p(speakup_info.port_tts + UART_LSR) & UART_LSR_DR) {
 
                 c = inb_p(speakup_info.port_tts+UART_RX);
-                synth->read_buff_add((u_char) c);
+                synth->read_buff_add((u_char)c);
         }
         spin_unlock_irqrestore(&speakup_info.spinlock, flags);
         return IRQ_HANDLED;
@@ -113,7 +113,7 @@ static void start_serial_interrupt(int irq)
                 return;
 
         rv = request_irq(irq, synth_readbuf_handler, IRQF_SHARED,
-                         "serial", (void *) synth_readbuf_handler);
+                         "serial", (void *)synth_readbuf_handler);
 
         if (rv)
                 pr_err("Unable to request Speakup serial I R Q\n");
@@ -141,7 +141,7 @@ void spk_stop_serial_interrupt(void)
         /* Turn off interrupts */
         outb(0, speakup_info.port_tts+UART_IER);
         /* Free IRQ */
-        free_irq(serstate->irq, (void *) synth_readbuf_handler);
+        free_irq(serstate->irq, (void *)synth_readbuf_handler);
 }
 
 int spk_wait_for_xmitr(void)
diff --git a/drivers/staging/speakup/speakup_soft.c b/drivers/staging/speakup/speakup_soft.c
index 6b1d0f538bbd..ed3e4282f41c 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -20,8 +20,8 @@
  */
 
 #include <linux/unistd.h>
-#include <linux/miscdevice.h> /* for misc_register, and SYNTH_MINOR */
-#include <linux/poll.h> /* for poll_wait() */
+#include <linux/miscdevice.h>   /* for misc_register, and SYNTH_MINOR */
+#include <linux/poll.h>         /* for poll_wait() */
 #include <linux/sched.h> /* schedule(), signal_pending(), TASK_INTERRUPTIBLE */
 
 #include "spk_priv.h"
@@ -55,27 +55,26 @@ static struct var_t vars[] = {
         V_LAST_VAR
 };
 
-/*
- * These attributes will appear in /sys/accessibility/speakup/soft.
- */
+/* These attributes will appear in /sys/accessibility/speakup/soft. */
+
 static struct kobj_attribute caps_start_attribute =
-        __ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(caps_start, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute caps_stop_attribute =
-        __ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(caps_stop, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute freq_attribute =
-        __ATTR(freq, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(freq, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute pitch_attribute =
-        __ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(pitch, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute punct_attribute =
-        __ATTR(punct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(punct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute rate_attribute =
-        __ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(rate, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute tone_attribute =
-        __ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(tone, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute voice_attribute =
-        __ATTR(voice, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(voice, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute vol_attribute =
-        __ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(vol, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 
 /*
  * We should uncomment the following definition, when we agree on a
@@ -85,15 +84,15 @@ static struct kobj_attribute vol_attribute =
  */
 
 static struct kobj_attribute delay_time_attribute =
-        __ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(delay_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute direct_attribute =
-        __ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(direct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute full_time_attribute =
-        __ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(full_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute jiffy_delta_attribute =
-        __ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(jiffy_delta, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute trigger_time_attribute =
-        __ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(trigger_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 
 /*
  * Create a group of attributes so that we can create and destroy them all
@@ -162,8 +161,8 @@ static char *get_initstring(void)
         cp = buf;
         var = synth_soft.vars;
         while (var->var_id != MAXVARS) {
-                if (var->var_id != CAPS_START && var->var_id != CAPS_STOP
-                        && var->var_id != DIRECT)
+                if (var->var_id != CAPS_START && var->var_id != CAPS_STOP &&
+                    var->var_id != DIRECT)
                         cp = cp + sprintf(cp, var->u.n.synth_fmt,
                                           var->u.n.value);
                 var++;
@@ -277,8 +276,7 @@ static ssize_t softsynth_write(struct file *fp, const char __user *buf,
         return count;
 }
 
-static unsigned int softsynth_poll(struct file *fp,
-                struct poll_table_struct *wait)
+static unsigned int softsynth_poll(struct file *fp, struct poll_table_struct *wait)
 {
         unsigned long flags;
         int ret = 0;
@@ -310,10 +308,8 @@ static const struct file_operations softsynth_fops = {
         .release = softsynth_close,
 };
 
-
 static int softsynth_probe(struct spk_synth *synth)
 {
-
         if (misc_registered != 0)
                 return 0;
         memset(&synth_device, 0, sizeof(synth_device));
diff --git a/drivers/staging/speakup/speakup_spkout.c b/drivers/staging/speakup/speakup_spkout.c
index e449f2770c1f..586890908826 100644
--- a/drivers/staging/speakup/speakup_spkout.c
+++ b/drivers/staging/speakup/speakup_spkout.c
@@ -1,6 +1,6 @@
 /*
  * originally written by: Kirk Reiser <kirk@braille.uwo.ca>
-* this version considerably modified by David Borowski, david575@rogers.com
+ * this version considerably modified by David Borowski, david575@rogers.com
  *
  * Copyright (C) 1998-99  Kirk Reiser.
  * Copyright (C) 2003 David Borowski.
@@ -40,34 +40,33 @@ static struct var_t vars[] = {
         V_LAST_VAR
 };
 
-/*
- * These attributes will appear in /sys/accessibility/speakup/spkout.
- */
+/* These attributes will appear in /sys/accessibility/speakup/spkout. */
+
 static struct kobj_attribute caps_start_attribute =
-        __ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(caps_start, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute caps_stop_attribute =
-        __ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(caps_stop, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute pitch_attribute =
-        __ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(pitch, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute punct_attribute =
-        __ATTR(punct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(punct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute rate_attribute =
-        __ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(rate, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute tone_attribute =
-        __ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(tone, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute vol_attribute =
-        __ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(vol, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 
 static struct kobj_attribute delay_time_attribute =
-        __ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(delay_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute direct_attribute =
-        __ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(direct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute full_time_attribute =
-        __ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(full_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute jiffy_delta_attribute =
-        __ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(jiffy_delta, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute trigger_time_attribute =
-        __ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(trigger_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 
 /*
  * Create a group of attributes so that we can create and destroy them all
diff --git a/drivers/staging/speakup/speakup_txprt.c b/drivers/staging/speakup/speakup_txprt.c
index fd98d4ffcb3e..b3d2cfd20ac8 100644
--- a/drivers/staging/speakup/speakup_txprt.c
+++ b/drivers/staging/speakup/speakup_txprt.c
@@ -1,6 +1,6 @@
 /*
  * originally written by: Kirk Reiser <kirk@braille.uwo.ca>
-* this version considerably modified by David Borowski, david575@rogers.com
+ * this version considerably modified by David Borowski, david575@rogers.com
  *
  * Copyright (C) 1998-99  Kirk Reiser.
  * Copyright (C) 2003 David Borowski.
@@ -36,32 +36,31 @@ static struct var_t vars[] = {
         V_LAST_VAR
          };
 
-/*
- * These attributes will appear in /sys/accessibility/speakup/txprt.
- */
+/* These attributes will appear in /sys/accessibility/speakup/txprt. */
+
 static struct kobj_attribute caps_start_attribute =
-        __ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(caps_start, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute caps_stop_attribute =
-        __ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(caps_stop, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute pitch_attribute =
-        __ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(pitch, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute rate_attribute =
-        __ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(rate, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute tone_attribute =
-        __ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(tone, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute vol_attribute =
-        __ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(vol, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 
 static struct kobj_attribute delay_time_attribute =
-        __ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(delay_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute direct_attribute =
-        __ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(direct, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute full_time_attribute =
-        __ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(full_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute jiffy_delta_attribute =
-        __ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(jiffy_delta, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 static struct kobj_attribute trigger_time_attribute =
-        __ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
+        __ATTR(trigger_time, S_IWUSR | S_IRUGO, spk_var_show, spk_var_store);
 
 /*
  * Create a group of attributes so that we can create and destroy them all
diff --git a/drivers/staging/speakup/spk_priv_keyinfo.h b/drivers/staging/speakup/spk_priv_keyinfo.h
index 130e9cb0118b..c95b68ebd8e7 100644
--- a/drivers/staging/speakup/spk_priv_keyinfo.h
+++ b/drivers/staging/speakup/spk_priv_keyinfo.h
@@ -23,84 +23,82 @@
 
 #define FIRST_SYNTH_VAR RATE
 /* 0 is reserved for no remap */
-#define SPEAKUP_GOTO 0x01
-#define SPEECH_KILL 0x02
-#define SPEAKUP_QUIET 0x03
-#define SPEAKUP_CUT 0x04
-#define SPEAKUP_PASTE 0x05
-#define SAY_FIRST_CHAR 0x06
-#define SAY_LAST_CHAR 0x07
-#define SAY_CHAR 0x08
-#define SAY_PREV_CHAR 0x09
-#define SAY_NEXT_CHAR 0x0a
-#define SAY_WORD 0x0b
-#define SAY_PREV_WORD 0x0c
-#define SAY_NEXT_WORD 0x0d
-#define SAY_LINE 0x0e
-#define SAY_PREV_LINE 0x0f
-#define SAY_NEXT_LINE 0x10
-#define TOP_EDGE 0x11
-#define BOTTOM_EDGE 0x12
-#define LEFT_EDGE 0x13
-#define RIGHT_EDGE 0x14
-#define SPELL_PHONETIC 0x15
-#define SPELL_WORD 0x16
-#define SAY_SCREEN 0x17
-#define SAY_POSITION 0x18
-#define SAY_ATTRIBUTES 0x19
-#define SPEAKUP_OFF 0x1a
-#define SPEAKUP_PARKED 0x1b
-#define SAY_LINE_INDENT 0x1c
-#define SAY_FROM_TOP 0x1d
-#define SAY_TO_BOTTOM 0x1e
-#define SAY_FROM_LEFT 0x1f
-#define SAY_TO_RIGHT 0x20
-#define SAY_CHAR_NUM 0x21
-#define EDIT_SOME 0x22
-#define EDIT_MOST 0x23
-#define SAY_PHONETIC_CHAR 0x24
-#define EDIT_DELIM 0x25
-#define EDIT_REPEAT 0x26
-#define EDIT_EXNUM 0x27
-#define SET_WIN 0x28
-#define CLEAR_WIN 0x29
-#define ENABLE_WIN 0x2a
-#define SAY_WIN 0x2b
-#define SPK_LOCK 0x2c
-#define SPEAKUP_HELP 0x2d
-#define TOGGLE_CURSORING 0x2e
-#define READ_ALL_DOC 0x2f
-#define SPKUP_MAX_FUNC 0x30 /* one greater than the last func handler */
-
-#define SPK_KEY 0x80
-#define FIRST_EDIT_BITS 0x22
-
+#define SPEAKUP_GOTO            0x01
+#define SPEECH_KILL             0x02
+#define SPEAKUP_QUIET           0x03
+#define SPEAKUP_CUT             0x04
+#define SPEAKUP_PASTE           0x05
+#define SAY_FIRST_CHAR          0x06
+#define SAY_LAST_CHAR           0x07
+#define SAY_CHAR                0x08
+#define SAY_PREV_CHAR           0x09
+#define SAY_NEXT_CHAR           0x0a
+#define SAY_WORD                0x0b
+#define SAY_PREV_WORD           0x0c
+#define SAY_NEXT_WORD           0x0d
+#define SAY_LINE                0x0e
+#define SAY_PREV_LINE           0x0f
+#define SAY_NEXT_LINE           0x10
+#define TOP_EDGE                0x11
+#define BOTTOM_EDGE             0x12
+#define LEFT_EDGE               0x13
+#define RIGHT_EDGE              0x14
+#define SPELL_PHONETIC          0x15
+#define SPELL_WORD              0x16
+#define SAY_SCREEN              0x17
+#define SAY_POSITION            0x18
+#define SAY_ATTRIBUTES          0x19
+#define SPEAKUP_OFF             0x1a
+#define SPEAKUP_PARKED          0x1b
+#define SAY_LINE_INDENT 0x1c
+#define SAY_FROM_TOP            0x1d
+#define SAY_TO_BOTTOM           0x1e
+#define SAY_FROM_LEFT           0x1f
+#define SAY_TO_RIGHT            0x20
+#define SAY_CHAR_NUM            0x21
+#define EDIT_SOME               0x22
+#define EDIT_MOST               0x23
+#define SAY_PHONETIC_CHAR       0x24
+#define EDIT_DELIM              0x25
+#define EDIT_REPEAT             0x26
+#define EDIT_EXNUM              0x27
+#define SET_WIN         0x28
+#define CLEAR_WIN               0x29
+#define ENABLE_WIN              0x2a
+#define SAY_WIN         0x2b
+#define SPK_LOCK                0x2c
+#define SPEAKUP_HELP            0x2d
+#define TOGGLE_CURSORING        0x2e
+#define READ_ALL_DOC            0x2f
+#define SPKUP_MAX_FUNC          0x30 /* one greater than the last func handler */
+#define SPK_KEY         0x80
+#define FIRST_EDIT_BITS 0x22
 #define FIRST_SET_VAR SPELL_DELAY
-#define VAR_START 0x40 /* increase if adding more than 0x3f functions */
+#define VAR_START               0x40 /* increase if adding more than 0x3f functions */
 
 /* keys for setting variables, must be ordered same as the enum for var_ids */
 /* with dec being even and inc being 1 greater */
-#define SPELL_DELAY_DEC (VAR_START+0)
-#define SPELL_DELAY_INC (SPELL_DELAY_DEC+1)
-#define PUNC_LEVEL_DEC (SPELL_DELAY_DEC+2)
-#define PUNC_LEVEL_INC (PUNC_LEVEL_DEC+1)
-#define READING_PUNC_DEC (PUNC_LEVEL_DEC+2)
-#define READING_PUNC_INC (READING_PUNC_DEC+1)
-#define ATTRIB_BLEEP_DEC (READING_PUNC_DEC+2)
-#define ATTRIB_BLEEP_INC (ATTRIB_BLEEP_DEC+1)
-#define BLEEPS_DEC (ATTRIB_BLEEP_DEC+2)
-#define BLEEPS_INC (BLEEPS_DEC+1)
-#define RATE_DEC (BLEEPS_DEC+2)
-#define RATE_INC (RATE_DEC+1)
-#define PITCH_DEC (RATE_DEC+2)
-#define PITCH_INC (PITCH_DEC+1)
-#define VOL_DEC (PITCH_DEC+2)
-#define VOL_INC (VOL_DEC+1)
-#define TONE_DEC (VOL_DEC+2)
-#define TONE_INC (TONE_DEC+1)
-#define PUNCT_DEC (TONE_DEC+2)
-#define PUNCT_INC (PUNCT_DEC+1)
-#define VOICE_DEC (PUNCT_DEC+2)
-#define VOICE_INC (VOICE_DEC+1)
+#define SPELL_DELAY_DEC (VAR_START + 0)
+#define SPELL_DELAY_INC (SPELL_DELAY_DEC + 1)
+#define PUNC_LEVEL_DEC (SPELL_DELAY_DEC + 2)
+#define PUNC_LEVEL_INC (PUNC_LEVEL_DEC + 1)
+#define READING_PUNC_DEC (PUNC_LEVEL_DEC + 2)
+#define READING_PUNC_INC (READING_PUNC_DEC + 1)
+#define ATTRIB_BLEEP_DEC (READING_PUNC_DEC + 2)
+#define ATTRIB_BLEEP_INC (ATTRIB_BLEEP_DEC + 1)
+#define BLEEPS_DEC (ATTRIB_BLEEP_DEC + 2)
+#define BLEEPS_INC (BLEEPS_DEC + 1)
+#define RATE_DEC (BLEEPS_DEC + 2)
+#define RATE_INC (RATE_DEC + 1)
+#define PITCH_DEC (RATE_DEC + 2)
+#define PITCH_INC (PITCH_DEC + 1)
+#define VOL_DEC (PITCH_DEC + 2)
+#define VOL_INC (VOL_DEC + 1)
+#define TONE_DEC (VOL_DEC + 2)
+#define TONE_INC (TONE_DEC + 1)
+#define PUNCT_DEC (TONE_DEC + 2)
+#define PUNCT_INC (PUNCT_DEC + 1)
+#define VOICE_DEC (PUNCT_DEC + 2)
+#define VOICE_INC (VOICE_DEC + 1)
 
 #endif
diff --git a/drivers/staging/speakup/spk_types.h b/drivers/staging/speakup/spk_types.h
index e8ff5d7d6419..b07f6cc4f284 100644
--- a/drivers/staging/speakup/spk_types.h
+++ b/drivers/staging/speakup/spk_types.h
@@ -1,16 +1,14 @@
 #ifndef SPEAKUP_TYPES_H
 #define SPEAKUP_TYPES_H
 
-/*
- * This file includes all of the typedefs and structs used in speakup.
- */
+/* This file includes all of the typedefs and structs used in speakup. */
 
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
 #include <linux/wait.h>         /* for wait_queue */
-#include <linux/init.h> /* for __init */
+#include <linux/init.h>         /* for __init */
 #include <linux/module.h>
 #include <linux/vt_kern.h>
 #include <linux/spinlock.h>
@@ -105,7 +103,7 @@ struct st_var_header {
         enum var_id_t var_id;
         enum var_type_t var_type;
         void *p_val; /* ptr to programs variable to store value */
-        void *data; /* ptr to the vars data */
+        void *data;  /* ptr to the vars data */
 };
 
 struct num_var_t {
@@ -114,8 +112,8 @@ struct num_var_t {
         int low;
         int high;
         short offset, multiplier; /* for fiddling rates etc. */
-        char *out_str; /* if synth needs char representation of number */
-        int value; /* current value */
+        char *out_str;  /* if synth needs char representation of number */
+        int value;      /* current value */
 };
 
 struct punc_var_t {
@@ -169,7 +167,7 @@ struct spk_synth {
         int (*probe)(struct spk_synth *synth);
         void (*release)(void);
         const char *(*synth_immediate)(struct spk_synth *synth,
-                                        const char *buff);
+                                       const char *buff);
         void (*catch_up)(struct spk_synth *synth);
         void (*flush)(struct spk_synth *synth);
         int (*is_alive)(struct spk_synth *synth);
@@ -181,7 +179,7 @@ struct spk_synth {
         struct attribute_group attributes;
 };
 
-/**
+/*
  * module_spk_synth() - Helper macro for registering a speakup driver
  * @__spk_synth: spk_synth struct
  * Helper macro for speakup drivers which do not do anything special in module
diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
index 54b2f3918628..a61c02ba06da 100644
--- a/drivers/staging/speakup/synth.c
+++ b/drivers/staging/speakup/synth.c
@@ -8,7 +8,7 @@
 #include <linux/delay.h>        /* for loops_per_sec */
 #include <linux/kmod.h>
 #include <linux/jiffies.h>
-#include <linux/uaccess.h> /* for copy_from_user */
+#include <linux/uaccess.h>      /* for copy_from_user */
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/kthread.h>
@@ -67,13 +67,14 @@ int spk_serial_synth_probe(struct spk_synth *synth)
                 return -ENODEV;
         }
         pr_info("%s: ttyS%i, Driver Version %s\n",
-                        synth->long_name, synth->ser, synth->version);
+                synth->long_name, synth->ser, synth->version);
         synth->alive = 1;
         return 0;
 }
 EXPORT_SYMBOL_GPL(spk_serial_synth_probe);
 
-/* Main loop of the progression thread: keep eating from the buffer
+/*
+ * Main loop of the progression thread: keep eating from the buffer
  * and push to the serial port, waiting as needed
  *
  * For devices that have a "full" notification mechanism, the driver can
@@ -303,12 +304,11 @@ void spk_get_index_count(int *linecount, int *sentcount)
                 sentence_count = ind % 10;
 
                 if ((ind / 10) <= synth->indexing.currindex)
-                        index_count = synth->indexing.currindex-(ind/10);
+                        index_count = synth->indexing.currindex - (ind / 10);
                 else
                         index_count = synth->indexing.currindex
-                                -synth->indexing.lowindex
-                                + synth->indexing.highindex-(ind/10)+1;
-
+                                - synth->indexing.lowindex
+                                + synth->indexing.highindex - (ind / 10) + 1;
         }
         *sentcount = sentence_count;
         *linecount = index_count;
@@ -406,8 +406,8 @@ static int do_synth_init(struct spk_synth *in_synth)
                 speakup_register_var(var);
         if (!spk_quiet_boot)
                 synth_printf("%s found\n", synth->long_name);
-        if (synth->attributes.name
-        && sysfs_create_group(speakup_kobj, &synth->attributes) < 0)
+        if (synth->attributes.name && sysfs_create_group(speakup_kobj,
+                                                         &synth->attributes) < 0)
                 return -ENOMEM;
         synth_flags = synth->flags;
         wake_up_interruptible_all(&speakup_event);
@@ -476,10 +476,10 @@ void synth_remove(struct spk_synth *in_synth)
                         break;
         }
         for ( ; synths[i] != NULL; i++) /* compress table */
-                synths[i] = synths[i+1];
+                synths[i] = synths[i + 1];
         module_status = 0;
         mutex_unlock(&spk_mutex);
 }
 EXPORT_SYMBOL_GPL(synth_remove);
 
-short spk_punc_masks[] = { 0, SOME, MOST, PUNC, PUNC|B_SYM };
+short spk_punc_masks[] = { 0, SOME, MOST, PUNC, PUNC | B_SYM };
diff --git a/drivers/staging/speakup/thread.c b/drivers/staging/speakup/thread.c
index 90c383ee7c3f..8c64f1ada6e0 100644
--- a/drivers/staging/speakup/thread.c
+++ b/drivers/staging/speakup/thread.c
@@ -27,7 +27,7 @@ int speakup_thread(void *data)
                         our_sound = spk_unprocessed_sound;
                         spk_unprocessed_sound.active = 0;
                         prepare_to_wait(&speakup_event, &wait,
-                                TASK_INTERRUPTIBLE);
+                                        TASK_INTERRUPTIBLE);
                         should_break = kthread_should_stop() ||
                                 our_sound.active ||
                                 (synth && synth->catch_up && synth->alive &&
@@ -47,7 +47,8 @@ int speakup_thread(void *data)
                 if (our_sound.active)
                         kd_mksound(our_sound.freq, our_sound.jiffies);
                 if (synth && synth->catch_up && synth->alive) {
-                        /* It is up to the callee to take the lock, so that it
+                        /*
+                         * It is up to the callee to take the lock, so that it
                          * can sleep whenever it likes
                          */
                         synth->catch_up(synth);
diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c
index 21186e3dc7ad..cc984196020f 100644
--- a/drivers/staging/speakup/varhandlers.c
+++ b/drivers/staging/speakup/varhandlers.c
@@ -237,8 +237,7 @@ int spk_set_num_var(int input, struct st_var_header *var, int how)
         if (!var_data->u.n.out_str)
                 l = sprintf(cp, var_data->u.n.synth_fmt, (int)val);
         else
-                l = sprintf(cp,
-                        var_data->u.n.synth_fmt, var_data->u.n.out_str[val]);
+                l = sprintf(cp, var_data->u.n.synth_fmt, var_data->u.n.out_str[val]);
         synth_printf("%s", cp);
         return 0;
 }
@@ -266,7 +265,8 @@ int spk_set_string_var(const char *page, struct st_var_header *var, int len)
         return 0;
 }
 
-/* spk_set_mask_bits sets or clears the punc/delim/repeat bits,
+/*
+ * spk_set_mask_bits sets or clears the punc/delim/repeat bits,
  * if input is null uses the defaults.
  * values for how: 0 clears bits of chars supplied,
  * 1 clears allk, 2 sets bits for chars
diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h
index 9081b3f8779c..54f490090a59 100644
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -1,20 +1,20 @@
-/* Copyright (C) 2010 - 2013 UNISYS CORPORATION */
+/* Copyright (C) 2010 - 2016 UNISYS CORPORATION */
 /* All rights reserved. */
 #ifndef __IOCHANNEL_H__
 #define __IOCHANNEL_H__
 
 /*
  * Everything needed for IOPart-GuestPart communication is define in
- * this file.  Note: Everything is OS-independent because this file is
+ * this file. Note: Everything is OS-independent because this file is
  * used by Windows, Linux and possible EFI drivers.
  */
 
 /*
  * Communication flow between the IOPart and GuestPart uses the channel headers
- * channel state.  The following states are currently being used:
+ * channel state. The following states are currently being used:
  *       UNINIT(All Zeroes), CHANNEL_ATTACHING, CHANNEL_ATTACHED, CHANNEL_OPENED
  *
- * additional states will be used later.  No locking is needed to switch between
+ * Additional states will be used later. No locking is needed to switch between
  * states due to the following rules:
  *
  *      1.  IOPart is only the only partition allowed to change from UNIT
@@ -39,10 +39,11 @@
 #define ULTRA_VSWITCH_CHANNEL_PROTOCOL_SIGNATURE \
         ULTRA_CHANNEL_PROTOCOL_SIGNATURE
 
-/* Must increment these whenever you insert or delete fields within this channel
- * struct.  Also increment whenever you change the meaning of fields within this
- * channel struct so as to break pre-existing software.  Note that you can
- * usually add fields to the END of the channel struct withOUT needing to
+/*
+ * Must increment these whenever you insert or delete fields within this channel
+ * struct. Also increment whenever you change the meaning of fields within this
+ * channel struct so as to break pre-existing software. Note that you can
+ * usually add fields to the END of the channel struct without needing to
  * increment this.
  */
 #define ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID 2
@@ -70,59 +71,62 @@
 #define MINNUM(a, b) (((a) < (b)) ? (a) : (b))
 #define MAXNUM(a, b) (((a) > (b)) ? (a) : (b))
 
-/* define the two queues per data channel between iopart and ioguestparts */
-/* used by ioguestpart to 'insert' signals to iopart */
+/* Define the two queues per data channel between iopart and ioguestparts. */
+/* Used by ioguestpart to 'insert' signals to iopart. */
 #define IOCHAN_TO_IOPART 0
-/* used by ioguestpart to 'remove' signals from iopart, same previous queue */
+/* Used by ioguestpart to 'remove' signals from iopart, same previous queue. */
 #define IOCHAN_FROM_IOPART 1
 
-/* size of cdb - i.e., scsi cmnd */
+/* Size of cdb - i.e., SCSI cmnd */
 #define MAX_CMND_SIZE 16
 
 #define MAX_SENSE_SIZE 64
 
 #define MAX_PHYS_INFO 64
 
-/* various types of network packets that can be sent in cmdrsp */
+/* Various types of network packets that can be sent in cmdrsp. */
 enum net_types {
-        NET_RCV_POST = 0,       /* submit buffer to hold receiving
+        NET_RCV_POST = 0,       /*
+                                 * Submit buffer to hold receiving
                                  * incoming packet
                                  */
-        /* virtnic -> uisnic */
+        /* visornic -> uisnic */
         NET_RCV,                /* incoming packet received */
         /* uisnic -> virtpci */
         NET_XMIT,               /* for outgoing net packets */
-        /* virtnic -> uisnic */
+        /* visornic -> uisnic */
         NET_XMIT_DONE,          /* outgoing packet xmitted */
         /* uisnic -> virtpci */
         NET_RCV_ENBDIS,         /* enable/disable packet reception */
-        /* virtnic -> uisnic */
+        /* visornic -> uisnic */
         NET_RCV_ENBDIS_ACK,     /* acknowledge enable/disable packet */
                                 /* reception */
-        /* uisnic -> virtnic */
+        /* uisnic -> visornic */
         NET_RCV_PROMISC,        /* enable/disable promiscuous mode */
-        /* virtnic -> uisnic */
-        NET_CONNECT_STATUS,     /* indicate the loss or restoration of a network
+        /* visornic -> uisnic */
+        NET_CONNECT_STATUS,     /*
+                                 * indicate the loss or restoration of a network
                                  * connection
                                  */
-        /* uisnic -> virtnic */
-        NET_MACADDR,            /* indicates the client has requested to update
-                                 * its MAC addr
+        /* uisnic -> visornic */
+        NET_MACADDR,            /*
+                                 * Indicates the client has requested to update
+                                 * it's MAC address
                                  */
-        NET_MACADDR_ACK,        /* MAC address */
+        NET_MACADDR_ACK,        /* MAC address acknowledge */
 
 };
 
-#define         ETH_MIN_DATA_SIZE 46    /* minimum eth data size */
-#define         ETH_MIN_PACKET_SIZE (ETH_HLEN + ETH_MIN_DATA_SIZE)
+#define ETH_MIN_DATA_SIZE 46    /* minimum eth data size */
+#define ETH_MIN_PACKET_SIZE (ETH_HLEN + ETH_MIN_DATA_SIZE)
 
-#define         VISOR_ETH_MAX_MTU 16384 /* maximum data size */
+#define VISOR_ETH_MAX_MTU 16384 /* maximum data size */
 
 #ifndef MAX_MACADDR_LEN
 #define MAX_MACADDR_LEN 6       /* number of bytes in MAC address */
-#endif                          /* MAX_MACADDR_LEN */
+#endif
 
-/* various types of scsi task mgmt commands  */
+/* Various types of scsi task mgmt commands. */
 enum task_mgmt_types {
         TASK_MGMT_ABORT_TASK = 1,
         TASK_MGMT_BUS_RESET,
@@ -130,7 +134,7 @@ enum task_mgmt_types {
         TASK_MGMT_TARGET_RESET,
 };
 
-/* various types of vdisk mgmt commands  */
+/* Various types of vdisk mgmt commands. */
 enum vdisk_mgmt_types {
         VDISK_MGMT_ACQUIRE = 1,
         VDISK_MGMT_RELEASE,
@@ -144,7 +148,7 @@ struct phys_info {
 
 #define MIN_NUMSIGNALS 64
 
-/* structs with pragma pack  */
+/* Structs with pragma pack. */
 
 struct guest_phys_info {
         u64 address;
@@ -154,9 +158,9 @@ struct guest_phys_info {
 #define GPI_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(struct guest_phys_info))
 
 struct uisscsi_dest {
-        u32 channel;            /* channel == bus number */
-        u32 id;                 /* id == target number */
-        u32 lun;                /* lun == logical unit number */
+        u32 channel;    /* channel == bus number */
+        u32 id;         /* id == target number */
+        u32 lun;        /* lun == logical unit number */
 } __packed;
 
 struct vhba_wwnn {
@@ -164,7 +168,8 @@ struct vhba_wwnn {
         u32 wwnn2;
 } __packed;
 
-/* WARNING: Values stired in this structure must contain maximum counts (not
+/*
+ * WARNING: Values stired in this structure must contain maximum counts (not
  * maximum values).
  */
 struct vhba_config_max {/* 20 bytes */
@@ -187,23 +192,24 @@ struct uiscmdrsp_scsi {
                                                          * information for each
                                                          * fragment
                                                          */
-        enum dma_data_direction  data_dir; /* direction of the data, if any */
+        enum dma_data_direction data_dir; /* direction of the data, if any */
         struct uisscsi_dest vdest;      /* identifies the virtual hba, id, */
                                         /* channel, lun to which cmd was sent */
 
-        /* Needed to queue the rsp back to cmd originator */
-        int linuxstat;          /* original Linux status used by linux vdisk */
+        /* Needed to queue the rsp back to cmd originator. */
+        int linuxstat;          /* original Linux status used by Linux vdisk */
         u8 scsistat;            /* the scsi status */
         u8 addlstat;            /* non-scsi status */
 #define ADDL_SEL_TIMEOUT        4
 
-        /* the following fields are need to determine the result of command */
+        /* The following fields are need to determine the result of command. */
          u8 sensebuf[MAX_SENSE_SIZE];   /* sense info in case cmd failed; */
-        /* it holds the sense_data struct; */
-        /* see that struct for details. */
-        void *vdisk; /* pointer to the vdisk to clean up when IO completes. */
+        /* sensebuf holds the sense_data struct; */
+        /* See sense_data struct for more details. */
+        void *vdisk; /* Pointer to the vdisk to clean up when IO completes. */
         int no_disk_result;
-        /* used to return no disk inquiry result
+        /*
+         * Used to return no disk inquiry result
          * when no_disk_result is set to 1,
          * scsi.scsistat is SAM_STAT_GOOD
          * scsi.addlstat is 0
@@ -212,35 +218,44 @@ struct uiscmdrsp_scsi {
          */
 } __packed;
 
-/* Defines to support sending correct inquiry result when no disk is
+/*
+ * Defines to support sending correct inquiry result when no disk is
  * configured.
  */
 
-/* From SCSI SPC2 -
+/*
+ * From SCSI SPC2 -
  *
  * If the target is not capable of supporting a device on this logical unit, the
  * device server shall set this field to 7Fh (PERIPHERAL QUALIFIER set to 011b
  * and PERIPHERAL DEVICE TYPE set to 1Fh).
  *
- *The device server is capable of supporting the specified peripheral device
- *type on this logical unit. However, the physical device is not currently
- *connected to this logical unit.
+ * The device server is capable of supporting the specified peripheral device
+ * type on this logical unit. However, the physical device is not currently
+ * connected to this logical unit.
  */
 
-#define DEV_NOT_CAPABLE 0x7f    /* peripheral qualifier of 0x3  */
-                                /* peripheral type of 0x1f */
-                                /* specifies no device but target present */
+#define DEV_NOT_CAPABLE 0x7f    /*
+                                 * peripheral qualifier of 0x3
+                                 * peripheral type of 0x1f
+                                 * specifies no device but target present
+                                 */
 
-#define DEV_DISK_CAPABLE_NOT_PRESENT 0x20 /* peripheral qualifier of 0x1 */
-    /* peripheral type of 0 - disk */
-    /* specifies device capable, but not present */
+#define DEV_DISK_CAPABLE_NOT_PRESENT 0x20       /* peripheral qualifier of 0x1
+                                                 * peripheral type of 0 - disk
+                                                 * Specifies device capable, but
+                                                 * not present
+                                                 */
 
-#define DEV_HISUPPORT 0x10      /* HiSup = 1; shows support for report luns */
-                                /* must be returned for lun 0. */
+#define DEV_HISUPPORT 0x10      /*
+                                 * HiSup = 1; shows support for report luns
+                                 * must be returned for lun 0.
+                                 */
 
-/* NOTE: Linux code assumes inquiry contains 36 bytes. Without checking length
- * in buf[4] some linux code accesses bytes beyond 5 to retrieve vendor, product
- * & revision.  Yikes! So let us always send back 36 bytes, the minimum for
+/*
+ * NOTE: Linux code assumes inquiry contains 36 bytes. Without checking length
+ * in buf[4] some Linux code accesses bytes beyond 5 to retrieve vendor, product
+ * and revision. Yikes! So let us always send back 36 bytes, the minimum for
  * inquiry result.
  */
 #define NO_DISK_INQUIRY_RESULT_LEN 36
@@ -248,11 +263,12 @@ struct uiscmdrsp_scsi {
 #define MIN_INQUIRY_RESULT_LEN 5 /* 5 bytes minimum for inquiry result */
 
 /* SCSI device version for no disk inquiry result */
-#define SCSI_SPC2_VER 4         /* indicates SCSI SPC2 (SPC3 is 5) */
+#define SCSI_SPC2_VER 4 /* indicates SCSI SPC2 (SPC3 is 5) */
 
-/* Struct & Defines to support sense information. */
+/* Struct and Defines to support sense information. */
 
-/* The following struct is returned in sensebuf field in uiscmdrsp_scsi.  It is
+/*
+ * The following struct is returned in sensebuf field in uiscmdrsp_scsi. It is
  * initialized in exactly the manner that is recommended in Windows (hence the
  * odd values).
  * When set, these fields will have the following values:
@@ -288,7 +304,7 @@ struct net_pkt_xmt {
         struct phys_info frags[MAX_PHYS_INFO];  /* physical page information */
         char ethhdr[ETH_HLEN];  /* the ethernet header  */
         struct {
-                /* these are needed for csum at uisnic end */
+                /* These are needed for csum at uisnic end */
                 u8 valid;       /* 1 = struct is valid - else ignore */
                 u8 hrawoffv;    /* 1 = hwrafoff is valid */
                 u8 nhrawoffv;   /* 1 = nhwrafoff is valid */
@@ -300,7 +316,8 @@ struct net_pkt_xmt {
                 /* nhrawoff points to the start of the NETWORK LAYER HEADER */
         } lincsum;
 
-            /* **** NOTE ****
+            /*
+             * 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
@@ -309,14 +326,15 @@ struct net_pkt_xmt {
 } __packed;
 
 struct net_pkt_xmtdone {
-        u32 xmt_done_result;    /* result of NET_XMIT */
+        u32 xmt_done_result; /* result of NET_XMIT */
 } __packed;
 
-/* RCVPOST_BUF_SIZe must be at most page_size(4096) - cache_line_size (64) The
+/*
+ * RCVPOST_BUF_SIZE must be at most page_size(4096) - cache_line_size (64) The
  * reason is because dev_skb_alloc which is used to generate RCV_POST skbs in
- * virtnic requires that there is "overhead" in the buffer, and pads 16 bytes. I
- * prefer to use 1 full cache line size for "overhead" so that transfers are
- * better.  IOVM requires that a buffer be represented by 1 phys_info structure
+ * visornic requires that there is "overhead" in the buffer, and pads 16 bytes.
+ * Use 1 full cache line size for "overhead" so that transfers are optimized.
+ * IOVM requires that a buffer be represented by 1 phys_info structure
  * which can only cover page_size.
  */
 #define RCVPOST_BUF_SIZE 4032
@@ -324,26 +342,38 @@ struct net_pkt_xmtdone {
         ((VISOR_ETH_MAX_MTU + ETH_HLEN + RCVPOST_BUF_SIZE - 1) \
         / RCVPOST_BUF_SIZE)
 
+/*
+ * rcv buf size must be large enough to include ethernet data len + ethernet
+ * header len - we are choosing 2K because it is guaranteed to be describable.
+ */
 struct net_pkt_rcvpost {
-            /* rcv buf size must be large enough to include ethernet data len +
-             * ethernet header len - we are choosing 2K because it is guaranteed
-             * to be describable
-             */
-            struct phys_info frag;      /* physical page information for the */
-                                        /* single fragment 2K rcv buf */
-            u64 unique_num;
-            /* unique_num ensure that receive posts are returned to */
-            /* the Adapter which we sent them originally. */
+        /* Physical page information for the single fragment 2K rcv buf */
+        struct phys_info frag;
+
+        /*
+         * Ensures that receive posts are returned to the adapter which we sent
+         * them from originally.
+         */
+        u64 unique_num;
+
 } __packed;
 
+/*
+ * The number of rcvbuf that can be chained is based on max mtu and size of each
+ * rcvbuf.
+ */
 struct net_pkt_rcv {
-        /* the number of receive buffers that can be chained  */
-        /* is based on max mtu and size of each rcv buf */
-        u32 rcv_done_len;       /* length of received data */
-        u8 numrcvbufs;          /* number of receive buffers that contain the */
-        /* incoming data; guest end MUST chain these together. */
-        void *rcvbuf[MAX_NET_RCV_CHAIN];        /* list of chained rcvbufs */
-        /* each entry is a receive buffer provided by NET_RCV_POST. */
+        u32 rcv_done_len; /* length of received data */
+
+        /*
+         * numrcvbufs: contain the incoming data; guest side MUST chain these
+         * together.
+         */
+        u8 numrcvbufs;
+
+        void *rcvbuf[MAX_NET_RCV_CHAIN]; /* list of chained rcvbufs */
+
+        /* Each entry is a receive buffer provided by NET_RCV_POST. */
         /* NOTE: first rcvbuf in the chain will also be provided in net.buf. */
         u64 unique_num;
         u32 rcvs_dropped_delta;
@@ -351,12 +381,12 @@ struct net_pkt_rcv {
 
 struct net_pkt_enbdis {
         void *context;
-        u16 enable;             /* 1 = enable, 0 = disable */
+        u16 enable; /* 1 = enable, 0 = disable */
 } __packed;
 
 struct net_pkt_macaddr {
         void *context;
-        u8 macaddr[MAX_MACADDR_LEN];    /* 6 bytes */
+        u8 macaddr[MAX_MACADDR_LEN]; /* 6 bytes */
 } __packed;
 
 /* cmd rsp packet used for VNIC network traffic  */
@@ -377,41 +407,44 @@ struct uiscmdrsp_net {
 } __packed;
 
 struct uiscmdrsp_scsitaskmgmt {
+        /* The type of task. */
         enum task_mgmt_types tasktype;
 
-            /* the type of task */
+        /* The vdisk for which this task mgmt is generated. */
         struct uisscsi_dest vdest;
 
-            /* the vdisk for which this task mgmt is generated */
+        /*
+         * This is a handle that the guest has saved off for its own use.
+         * The handle value is preserved by iopart and returned as in task
+         * mgmt rsp.
+         */
         u64 handle;
 
-            /* This is a handle that the guest has saved off for its own use.
-             * Its value is preserved by iopart & returned as is in the task
-             * mgmt rsp.
-             */
+        /*
+         * For Linux guests, this is a pointer to wait_queue_head that a
+         * thread is waiting on to see if the taskmgmt command has completed.
+         * When the rsp is received by guest, the thread receiving the
+         * response uses this to notify the thread waiting for taskmgmt
+         * command completion. It's value is preserved by iopart and returned
+         * as in the task mgmt rsp.
+         */
         u64 notify_handle;
 
-           /* For linux guests, this is a pointer to wait_queue_head that a
-            * thread is waiting on to see if the taskmgmt command has completed.
-            * When the rsp is received by guest, the thread receiving the
-            * response uses this to notify the thread waiting for taskmgmt
-            * command completion.  Its value is preserved by iopart & returned
-            * as is in the task mgmt rsp.
-            */
+        /*
+         * This is a handle to the location in the guest where the result of
+         * the taskmgmt command (result field) is saved to when the response
+         * is handled. It's value is preserved by iopart and returned as in
+         * the task mgmt rsp.
+         */
         u64 notifyresult_handle;
 
-            /* this is a handle to location in guest where the result of the
-             * taskmgmt command (result field) is to saved off when the response
-             * is handled.  Its value is preserved by iopart & returned as is in
-             * the task mgmt rsp.
-             */
+        /* Result of taskmgmt command - set by IOPart - values are: */
         char result;
 
-            /* result of taskmgmt command - set by IOPart - values are: */
 #define TASK_MGMT_FAILED  0
 } __packed;
 
-/* Used by uissd to send disk add/remove notifications to Guest */
+/* Used by uissd to send disk add/remove notifications to Guest. */
 /* Note that the vHba pointer is not used by the Client/Guest side. */
 struct uiscmdrsp_disknotify {
         u8 add;                 /* 0-remove, 1-add */
@@ -419,49 +452,50 @@ struct uiscmdrsp_disknotify {
         u32 channel, id, lun;   /* SCSI Path of Disk to added or removed */
 } __packed;
 
-/* The following is used by virthba/vSCSI to send the Acquire/Release commands
+/*
+ * The following is used by virthba/vSCSI to send the Acquire/Release commands
  * to the IOVM.
  */
 struct uiscmdrsp_vdiskmgmt {
+        /* The type of task */
         enum vdisk_mgmt_types vdisktype;
 
-            /* the type of task */
+        /* The vdisk for which this task mgmt is generated */
         struct uisscsi_dest vdest;
 
-            /* the vdisk for which this task mgmt is generated */
+        /*
+         * This is a handle that the guest has saved off for its own use. It's
+         * value is preserved by iopart and returned as in the task mgmt rsp.
+         */
         u64 handle;
 
-            /* This is a handle that the guest has saved off for its own use.
-             * Its value is preserved by iopart & returned as is in the task
-             * mgmt rsp.
-             */
+        /*
+         * For Linux guests, this is a pointer to wait_queue_head that a
+         * thread is waiting on to see if the tskmgmt command has completed.
+         * When the rsp is received by guest, the thread receiving the
+         * response uses this to notify the thread waiting for taskmgmt
+         * command completion. It's value is preserved by iopart and returned
+         * as in the task mgmt rsp.
+         */
         u64 notify_handle;
 
-            /* For linux guests, this is a pointer to wait_queue_head that a
-             * thread is waiting on to see if the tskmgmt command has completed.
-             * When the rsp is received by guest, the thread receiving the
-             * response uses this to notify the thread waiting for taskmgmt
-             * command completion.  Its value is preserved by iopart & returned
-             * as is in the task mgmt rsp.
-             */
+        /*
+         * Handle to the location in guest where the result of the
+         * taskmgmt command (result field) is saved to when the response
+         * is handled. It's value is preserved by iopart and returned as in
+         * the task mgmt rsp.
+         */
         u64 notifyresult_handle;
 
-            /* this is a handle to location in guest where the result of the
-             * taskmgmt command (result field) is to saved off when the response
-             * is handled.  Its value is preserved by iopart & returned as is in
-             * the task mgmt rsp.
-             */
+        /* Result of taskmgmt command - set by IOPart - values are: */
         char result;
-
-            /* result of taskmgmt command - set by IOPart - values are: */
-#define VDISK_MGMT_FAILED  0
 } __packed;
 
-/* keeping cmd & rsp info in one structure for now cmd rsp packet for scsi */
+/* Keeping cmd and rsp info in one structure for now cmd rsp packet for SCSI */
 struct uiscmdrsp {
         char cmdtype;
 
-/* describes what type of information is in the struct */
+/* Describes what type of information is in the struct */
 #define CMD_SCSI_TYPE           1
 #define CMD_NET_TYPE            2
 #define CMD_SCSITASKMGMT_TYPE   3
@@ -474,11 +508,11 @@ struct uiscmdrsp {
                 struct uiscmdrsp_disknotify disknotify;
                 struct uiscmdrsp_vdiskmgmt vdiskmgmt;
         };
-        void *private_data;     /* send the response when the cmd is */
-                                /* done (scsi & scsittaskmgmt). */
+        /* Send the response when the cmd is done (scsi and scsittaskmgmt). */
+        void *private_data;
         struct uiscmdrsp *next; /* General Purpose Queue Link */
-        struct uiscmdrsp *activeQ_next; /* Used to track active commands */
-        struct uiscmdrsp *activeQ_prev; /* Used to track active commands */
+        struct uiscmdrsp *activeQ_next; /* Pointer to the nextactive commands */
+        struct uiscmdrsp *activeQ_prev; /* Pointer to the prevactive commands */
 } __packed;
 
 struct iochannel_vhba {
@@ -491,7 +525,8 @@ struct iochannel_vnic {
         u32 mtu;                        /* 4 bytes */
         uuid_le zone_uuid;              /* 16 bytes */
 } __packed;
-/* This is just the header of the IO channel.  It is assumed that directly after
+/*
+ * This is just the header of the IO channel. It is assumed that directly after
  * this header there is a large region of memory which contains the command and
  * response queues as specified in cmd_q and rsp_q SIGNAL_QUEUE_HEADERS.
  */
@@ -505,31 +540,19 @@ struct spar_io_channel_protocol {
         } __packed;
 
 #define MAX_CLIENTSTRING_LEN 1024
-        /* client_string is NULL termimated so holds max -1 bytes */
+        /* client_string is NULL termimated so holds max-1 bytes */
          u8 client_string[MAX_CLIENTSTRING_LEN];
 } __packed;
 
-/* INLINE functions for initializing and accessing I/O data channels */
-#define SIZEOF_PROTOCOL (COVER(sizeof(struct spar_io_channel_protocol), 64))
+/* INLINE functions for initializing and accessing I/O data channels. */
 #define SIZEOF_CMDRSP (COVER(sizeof(struct uiscmdrsp), 64))
 
-#define MIN_IO_CHANNEL_SIZE COVER(SIZEOF_PROTOCOL + \
-                                  2 * MIN_NUMSIGNALS * SIZEOF_CMDRSP, 4096)
-
-/*
- * INLINE function for expanding a guest's pfn-off-size into multiple 4K page
- * pfn-off-size entires.
- */
-
-/* use 4K page sizes when we it comes to passing page information between */
-/* Guest and IOPartition. */
+/* Use 4K page sizes when passing page info between Guest and IOPartition. */
 #define PI_PAGE_SIZE  0x1000
 #define PI_PAGE_MASK  0x0FFF
 
-/* returns next non-zero index on success or zero on failure (i.e. out of
- * room)
- */
-static inline  u16
+/* Returns next non-zero index on success or 0 on failure (i.e. out of room). */
+static inline u16
 add_physinfo_entries(u64 inp_pfn, u16 inp_off, u32 inp_len, u16 index,
                      u16 max_pi_arr_entries, struct phys_info pi_arr[])
 {
@@ -538,7 +561,7 @@ add_physinfo_entries(u64 inp_pfn, u16 inp_off, u32 inp_len, u16 index,
 
         firstlen = PI_PAGE_SIZE - inp_off;
         if (inp_len <= firstlen) {
-                /* the input entry spans only one page - add as is */
+                /* The input entry spans only one page - add as is. */
                 if (index >= max_pi_arr_entries)
                         return 0;
                 pi_arr[index].pi_pfn = inp_pfn;
@@ -547,7 +570,7 @@ add_physinfo_entries(u64 inp_pfn, u16 inp_off, u32 inp_len, u16 index,
                 return index + 1;
         }
 
-        /* this entry spans multiple pages */
+        /* This entry spans multiple pages. */
         for (len = inp_len, i = 0; len;
                 len -= pi_arr[index + i].pi_len, i++) {
                 if (index + i >= max_pi_arr_entries)
@@ -565,4 +588,4 @@ add_physinfo_entries(u64 inp_pfn, u16 inp_off, u32 inp_len, u16 index,
         return index + i;
 }
 
-#endif                          /* __IOCHANNEL_H__ */
+#endif /* __IOCHANNEL_H__ */
diff --git a/drivers/staging/unisys/include/visorbus.h b/drivers/staging/unisys/include/visorbus.h
index 677627c72c4c..03d56f818a86 100644
--- a/drivers/staging/unisys/include/visorbus.h
+++ b/drivers/staging/unisys/include/visorbus.h
@@ -166,6 +166,8 @@ struct visor_device {
         struct controlvm_message_header *pending_msg_hdr;
         void *vbus_hdr_info;
         uuid_le partition_uuid;
+        struct dentry *debugfs_dir;
+        struct dentry *debugfs_client_bus_info;
 };
 
 #define to_visor_device(x) container_of(x, struct visor_device, device)
diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h b/drivers/staging/unisys/visorbus/vbuschannel.h
index e97917522f6a..b0df26155d02 100644
--- a/drivers/staging/unisys/visorbus/vbuschannel.h
+++ b/drivers/staging/unisys/visorbus/vbuschannel.h
@@ -23,6 +23,7 @@
  *  the client devices and client drivers for the server end to see.
  */
 #include <linux/uuid.h>
+#include <linux/ctype.h>
 #include "channel.h"
 
 /* {193b331b-c58f-11da-95a9-00e08161165f} */
@@ -50,12 +51,6 @@ static const uuid_le spar_vbus_channel_protocol_uuid =
                                    SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID, \
                                    SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE)
 
-#define SPAR_VBUS_CHANNEL_OK_SERVER(actual_bytes)    \
-        (spar_check_channel_server(spar_vbus_channel_protocol_uuid,     \
-                                   "vbus",                              \
-                                   sizeof(struct spar_vbus_channel_protocol),\
-                                   actual_bytes))
-
 #pragma pack(push, 1)           /* both GCC and VC now allow this pragma */
 
 /*
@@ -72,199 +67,38 @@ struct ultra_vbus_deviceinfo {
 };
 
 /**
- * vbuschannel_sanitize_buffer() - remove non-printable chars from buffer
- * @p: destination buffer where chars are written to
- * @remain: number of bytes that can be written starting at #p
- * @src: pointer to source buffer
- * @srcmax: number of valid characters at #src
- *
- * Reads chars from the buffer at @src for @srcmax bytes, and writes to
- * the buffer at @p, which is @remain bytes long, ensuring never to
- * overflow the buffer at @p, using the following rules:
- * - printable characters are simply copied from the buffer at @src to the
- *   buffer at @p
- * - intervening streaks of non-printable characters in the buffer at @src
- *   are replaced with a single space in the buffer at @p
- * Note that we pay no attention to '\0'-termination.
- *
- * Pass @p == NULL and @remain == 0 for this special behavior -- In this
- * case, we simply return the number of bytes that WOULD HAVE been written
- * to a buffer at @p, had it been infinitely big.
- *
- * Return: the number of bytes written to @p (or WOULD HAVE been written to
- *         @p, as described in the previous paragraph)
- */
-static inline int
-vbuschannel_sanitize_buffer(char *p, int remain, char *src, int srcmax)
-{
-        int chars = 0;
-        int nonprintable_streak = 0;
-
-        while (srcmax > 0) {
-                if ((*src >= ' ') && (*src < 0x7f)) {
-                        if (nonprintable_streak) {
-                                if (remain > 0) {
-                                        *p = ' ';
-                                        p++;
-                                        remain--;
-                                        chars++;
-                                } else if (!p) {
-                                        chars++;
-                                }
-                                nonprintable_streak = 0;
-                        }
-                        if (remain > 0) {
-                                *p = *src;
-                                p++;
-                                remain--;
-                                chars++;
-                        } else if (!p) {
-                                chars++;
-                        }
-                } else {
-                        nonprintable_streak = 1;
-                }
-                src++;
-                srcmax--;
-        }
-        return chars;
-}
-
-#define VBUSCHANNEL_ADDACHAR(ch, p, remain, chars) \
-        do {                                       \
-                if (remain <= 0)                   \
-                        break;                     \
-                *p = ch;                           \
-                p++;  chars++;  remain--;          \
-        } while (0)
-
-/**
- * vbuschannel_itoa() - convert non-negative int to string
- * @p: destination string
- * @remain: max number of bytes that can be written to @p
- * @num: input int to convert
- *
- * Converts the non-negative value at @num to an ascii decimal string
- * at @p, writing at most @remain bytes.  Note there is NO '\0' termination
- * written to @p.
- *
- * Return: number of bytes written to @p
- *
- */
-static inline int
-vbuschannel_itoa(char *p, int remain, int num)
-{
-        int digits = 0;
-        char s[32];
-        int i;
-
-        if (num == 0) {
-                /* '0' is a special case */
-                if (remain <= 0)
-                        return 0;
-                *p = '0';
-                return 1;
-        }
-        /* form a backwards decimal ascii string in <s> */
-        while (num > 0) {
-                if (digits >= (int)sizeof(s))
-                        return 0;
-                s[digits++] = (num % 10) + '0';
-                num = num / 10;
-        }
-        if (remain < digits) {
-                /* not enough room left at <p> to hold number, so fill with
-                 * '?'
-                 */
-                for (i = 0; i < remain; i++, p++)
-                        *p = '?';
-                return remain;
-        }
-        /* plug in the decimal ascii string representing the number, by */
-        /* reversing the string we just built in <s> */
-        i = digits;
-        while (i > 0) {
-                i--;
-                *p = s[i];
-                p++;
-        }
-        return digits;
-}
-
-/**
- * vbuschannel_devinfo_to_string() - format a struct ultra_vbus_deviceinfo
- *                                   to a printable string
+ * vbuschannel_print_devinfo() - format a struct ultra_vbus_deviceinfo
+ *                               and write it to a seq_file
  * @devinfo: the struct ultra_vbus_deviceinfo to format
- * @p: destination string area
- * @remain: size of destination string area in bytes
+ * @seq: seq_file to write to
  * @devix: the device index to be included in the output data, or -1 if no
  *         device index is to be included
  *
- * Reads @devInfo, and converts its contents to a printable string at @p,
- * writing at most @remain bytes. Note there is NO '\0' termination
- * written to @p.
- *
- * Return: number of bytes written to @p
+ * Reads @devInfo, and writes it in human-readable notation to @seq.
  */
-static inline int
-vbuschannel_devinfo_to_string(struct ultra_vbus_deviceinfo *devinfo,
-                              char *p, int remain, int devix)
+static inline void
+vbuschannel_print_devinfo(struct ultra_vbus_deviceinfo *devinfo,
+                          struct seq_file *seq, int devix)
 {
-        char *psrc;
-        int nsrc, x, i, pad;
-        int chars = 0;
-
-        psrc = &devinfo->devtype[0];
-        nsrc = sizeof(devinfo->devtype);
-        if (vbuschannel_sanitize_buffer(NULL, 0, psrc, nsrc) <= 0)
-                return 0;
-
-        /* emit device index */
-        if (devix >= 0) {
-                VBUSCHANNEL_ADDACHAR('[', p, remain, chars);
-                x = vbuschannel_itoa(p, remain, devix);
-                p += x;
-                remain -= x;
-                chars += x;
-                VBUSCHANNEL_ADDACHAR(']', p, remain, chars);
-        } else {
-                VBUSCHANNEL_ADDACHAR(' ', p, remain, chars);
-                VBUSCHANNEL_ADDACHAR(' ', p, remain, chars);
-                VBUSCHANNEL_ADDACHAR(' ', p, remain, chars);
-        }
-
-        /* emit device type */
-        x = vbuschannel_sanitize_buffer(p, remain, psrc, nsrc);
-        p += x;
-        remain -= x;
-        chars += x;
-        pad = 15 - x;           /* pad device type to be exactly 15 chars */
-        for (i = 0; i < pad; i++)
-                VBUSCHANNEL_ADDACHAR(' ', p, remain, chars);
-        VBUSCHANNEL_ADDACHAR(' ', p, remain, chars);
-
-        /* emit driver name */
-        psrc = &devinfo->drvname[0];
-        nsrc = sizeof(devinfo->drvname);
-        x = vbuschannel_sanitize_buffer(p, remain, psrc, nsrc);
-        p += x;
-        remain -= x;
-        chars += x;
-        pad = 15 - x;           /* pad driver name to be exactly 15 chars */
-        for (i = 0; i < pad; i++)
-                VBUSCHANNEL_ADDACHAR(' ', p, remain, chars);
-        VBUSCHANNEL_ADDACHAR(' ', p, remain, chars);
-
-        /* emit strings */
-        psrc = &devinfo->infostrs[0];
-        nsrc = sizeof(devinfo->infostrs);
-        x = vbuschannel_sanitize_buffer(p, remain, psrc, nsrc);
-        p += x;
-        remain -= x;
-        chars += x;
-        VBUSCHANNEL_ADDACHAR('\n', p, remain, chars);
-
-        return chars;
+        if (!isprint(devinfo->devtype[0]))
+                return; /* uninitialized vbus device entry */
+
+        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.
+         */
+        seq_printf(seq, "%-*.*s ", (int)sizeof(devinfo->devtype),
+                   (int)sizeof(devinfo->devtype), devinfo->devtype);
+        seq_printf(seq, "%-*.*s ", (int)sizeof(devinfo->drvname),
+                   (int)sizeof(devinfo->drvname), devinfo->drvname);
+        seq_printf(seq, "%.*s\n", (int)sizeof(devinfo->infostrs),
+                   devinfo->infostrs);
 }
 
 struct spar_vbus_headerinfo {
@@ -293,11 +127,6 @@ struct spar_vbus_channel_protocol {
         /* describes client device and driver for each device on the bus */
 };
 
-#define VBUS_CH_SIZE_EXACT(MAXDEVICES) \
-        (sizeof(ULTRA_VBUS_CHANNEL_PROTOCOL) + ((MAXDEVICES) * \
-                                                sizeof(ULTRA_VBUS_DEVICEINFO)))
-#define VBUS_CH_SIZE(MAXDEVICES) COVER(VBUS_CH_SIZE_EXACT(MAXDEVICES), 4096)
-
 #pragma pack(pop)
 
 #endif
diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index fec0a54916fe..3457ef338e1e 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -14,6 +14,7 @@
  * details.
  */
 
+#include <linux/debugfs.h>
 #include <linux/uuid.h>
 
 #include "visorbus.h"
@@ -33,6 +34,7 @@ static int visorbus_forcenomatch;
 #define POLLJIFFIES_NORMALCHANNEL     10
 
 static int busreg_rc = -ENODEV; /* stores the result from bus registration */
+static struct dentry *visorbus_debugfs_dir;
 
 /*
  * DEVICE type attributes
@@ -151,6 +153,8 @@ visorbus_release_busdevice(struct device *xdev)
 {
         struct visor_device *dev = dev_get_drvdata(xdev);
 
+        debugfs_remove(dev->debugfs_client_bus_info);
+        debugfs_remove_recursive(dev->debugfs_dir);
         kfree(dev);
 }
 
@@ -186,6 +190,7 @@ static ssize_t physaddr_show(struct device *dev, struct device_attribute *attr,
         return snprintf(buf, PAGE_SIZE, "0x%llx\n",
                         visorchannel_get_physaddr(vdev->visorchannel));
 }
+static DEVICE_ATTR_RO(physaddr);
 
 static ssize_t nbytes_show(struct device *dev, struct device_attribute *attr,
                            char *buf)
@@ -197,6 +202,7 @@ static ssize_t nbytes_show(struct device *dev, struct device_attribute *attr,
         return snprintf(buf, PAGE_SIZE, "0x%lx\n",
                         visorchannel_get_nbytes(vdev->visorchannel));
 }
+static DEVICE_ATTR_RO(nbytes);
 
 static ssize_t clientpartition_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
@@ -208,6 +214,7 @@ static ssize_t clientpartition_show(struct device *dev,
         return snprintf(buf, PAGE_SIZE, "0x%llx\n",
                         visorchannel_get_clientpartition(vdev->visorchannel));
 }
+static DEVICE_ATTR_RO(clientpartition);
 
 static ssize_t typeguid_show(struct device *dev, struct device_attribute *attr,
                              char *buf)
@@ -220,6 +227,7 @@ static ssize_t typeguid_show(struct device *dev, struct device_attribute *attr,
         return snprintf(buf, PAGE_SIZE, "%s\n",
                         visorchannel_id(vdev->visorchannel, typeid));
 }
+static DEVICE_ATTR_RO(typeguid);
 
 static ssize_t zoneguid_show(struct device *dev, struct device_attribute *attr,
                              char *buf)
@@ -232,6 +240,7 @@ static ssize_t zoneguid_show(struct device *dev, struct device_attribute *attr,
         return snprintf(buf, PAGE_SIZE, "%s\n",
                         visorchannel_zoneid(vdev->visorchannel, zoneid));
 }
+static DEVICE_ATTR_RO(zoneguid);
 
 static ssize_t typename_show(struct device *dev, struct device_attribute *attr,
                              char *buf)
@@ -250,12 +259,6 @@ static ssize_t typename_show(struct device *dev, struct device_attribute *attr,
         drv = to_visor_driver(xdrv);
         return snprintf(buf, PAGE_SIZE, "%s\n", drv->channel_types[i - 1].name);
 }
-
-static DEVICE_ATTR_RO(physaddr);
-static DEVICE_ATTR_RO(nbytes);
-static DEVICE_ATTR_RO(clientpartition);
-static DEVICE_ATTR_RO(typeguid);
-static DEVICE_ATTR_RO(zoneguid);
 static DEVICE_ATTR_RO(typename);
 
 static struct attribute *channel_attrs[] = {
@@ -295,6 +298,7 @@ static ssize_t partition_handle_show(struct device *dev,
 
         return snprintf(buf, PAGE_SIZE, "0x%llx\n", handle);
 }
+static DEVICE_ATTR_RO(partition_handle);
 
 static ssize_t partition_guid_show(struct device *dev,
                                    struct device_attribute *attr,
@@ -303,6 +307,7 @@ static ssize_t partition_guid_show(struct device *dev,
 
         return snprintf(buf, PAGE_SIZE, "{%pUb}\n", &vdev->partition_uuid);
 }
+static DEVICE_ATTR_RO(partition_guid);
 
 static ssize_t partition_name_show(struct device *dev,
                                    struct device_attribute *attr,
@@ -311,6 +316,7 @@ static ssize_t partition_name_show(struct device *dev,
 
         return snprintf(buf, PAGE_SIZE, "%s\n", vdev->name);
 }
+static DEVICE_ATTR_RO(partition_name);
 
 static ssize_t channel_addr_show(struct device *dev,
                                  struct device_attribute *attr,
@@ -320,6 +326,7 @@ static ssize_t channel_addr_show(struct device *dev,
 
         return snprintf(buf, PAGE_SIZE, "0x%llx\n", addr);
 }
+static DEVICE_ATTR_RO(channel_addr);
 
 static ssize_t channel_bytes_show(struct device *dev,
                                   struct device_attribute *attr,
@@ -329,6 +336,7 @@ static ssize_t channel_bytes_show(struct device *dev,
 
         return snprintf(buf, PAGE_SIZE, "0x%llx\n", nbytes);
 }
+static DEVICE_ATTR_RO(channel_bytes);
 
 static ssize_t channel_id_show(struct device *dev,
                                struct device_attribute *attr,
@@ -343,77 +351,7 @@ static ssize_t channel_id_show(struct device *dev,
         }
         return len;
 }
-
-static ssize_t client_bus_info_show(struct device *dev,
-                                    struct device_attribute *attr,
-                                    char *buf) {
-        struct visor_device *vdev = to_visor_device(dev);
-        struct visorchannel *channel = vdev->visorchannel;
-
-        int i, shift, remain = PAGE_SIZE;
-        unsigned long off;
-        char *pos = buf;
-        u8 *partition_name;
-        struct ultra_vbus_deviceinfo dev_info;
-
-        partition_name = "";
-        if (channel) {
-                if (vdev->name)
-                        partition_name = vdev->name;
-                shift = snprintf(pos, remain,
-                                 "Client device / client driver info for %s partition (vbus #%u):\n",
-                                 partition_name, vdev->chipset_bus_no);
-                pos += shift;
-                remain -= shift;
-                shift = visorchannel_read(channel,
-                                          offsetof(struct
-                                                   spar_vbus_channel_protocol,
-                                                   chp_info),
-                                          &dev_info, sizeof(dev_info));
-                if (shift >= 0) {
-                        shift = vbuschannel_devinfo_to_string(&dev_info, pos,
-                                                              remain, -1);
-                        pos += shift;
-                        remain -= shift;
-                }
-                shift = visorchannel_read(channel,
-                                          offsetof(struct
-                                                   spar_vbus_channel_protocol,
-                                                   bus_info),
-                                          &dev_info, sizeof(dev_info));
-                if (shift >= 0) {
-                        shift = vbuschannel_devinfo_to_string(&dev_info, pos,
-                                                              remain, -1);
-                        pos += shift;
-                        remain -= shift;
-                }
-                off = offsetof(struct spar_vbus_channel_protocol, dev_info);
-                i = 0;
-                while (off + sizeof(dev_info) <=
-                       visorchannel_get_nbytes(channel)) {
-                        shift = visorchannel_read(channel,
-                                                  off, &dev_info,
-                                                  sizeof(dev_info));
-                        if (shift >= 0) {
-                                shift = vbuschannel_devinfo_to_string
-                                    (&dev_info, pos, remain, i);
-                                pos += shift;
-                                remain -= shift;
-                        }
-                        off += sizeof(dev_info);
-                        i++;
-                }
-        }
-        return PAGE_SIZE - remain;
-}
-
-static DEVICE_ATTR_RO(partition_handle);
-static DEVICE_ATTR_RO(partition_guid);
-static DEVICE_ATTR_RO(partition_name);
-static DEVICE_ATTR_RO(channel_addr);
-static DEVICE_ATTR_RO(channel_bytes);
 static DEVICE_ATTR_RO(channel_id);
-static DEVICE_ATTR_RO(client_bus_info);
 
 static struct attribute *dev_attrs[] = {
                 &dev_attr_partition_handle.attr,
@@ -422,7 +360,6 @@ static struct attribute *dev_attrs[] = {
                 &dev_attr_channel_addr.attr,
                 &dev_attr_channel_bytes.attr,
                 &dev_attr_channel_id.attr,
-                &dev_attr_client_bus_info.attr,
                 NULL
 };
 
@@ -435,6 +372,66 @@ static const struct attribute_group *visorbus_groups[] = {
                 NULL
 };
 
+/*
+ *  BUS debugfs entries
+ *
+ *  define & implement display of debugfs attributes under
+ *  /sys/kernel/debug/visorbus/visorbus<n>.
+ */
+
+static int client_bus_info_debugfs_show(struct seq_file *seq, void *v)
+{
+        struct visor_device *vdev = seq->private;
+        struct visorchannel *channel = vdev->visorchannel;
+
+        int i;
+        unsigned long off;
+        struct ultra_vbus_deviceinfo dev_info;
+
+        if (!channel)
+                return 0;
+
+        seq_printf(seq,
+                   "Client device / client driver info for %s partition (vbus #%u):\n",
+                   ((vdev->name) ? (char *)(vdev->name) : ""),
+                   vdev->chipset_bus_no);
+        if (visorchannel_read(channel,
+                              offsetof(struct spar_vbus_channel_protocol,
+                                       chp_info),
+                              &dev_info, sizeof(dev_info)) >= 0)
+                vbuschannel_print_devinfo(&dev_info, seq, -1);
+        if (visorchannel_read(channel,
+                              offsetof(struct spar_vbus_channel_protocol,
+                                       bus_info),
+                              &dev_info, sizeof(dev_info)) >= 0)
+                vbuschannel_print_devinfo(&dev_info, seq, -1);
+        off = offsetof(struct spar_vbus_channel_protocol, dev_info);
+        i = 0;
+        while (off + sizeof(dev_info) <= visorchannel_get_nbytes(channel)) {
+                if (visorchannel_read(channel, off, &dev_info,
+                                      sizeof(dev_info)) >= 0)
+                        vbuschannel_print_devinfo(&dev_info, seq, i);
+                off += sizeof(dev_info);
+                i++;
+        }
+
+        return 0;
+}
+
+static int client_bus_info_debugfs_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, client_bus_info_debugfs_show,
+                           inode->i_private);
+}
+
+static const struct file_operations client_bus_info_debugfs_fops = {
+        .owner = THIS_MODULE,
+        .open = client_bus_info_debugfs_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+};
+
 static void
 dev_periodic_work(unsigned long __opaque)
 {
@@ -610,8 +607,8 @@ create_visor_device(struct visor_device *dev)
         u32 chipset_bus_no = dev->chipset_bus_no;
         u32 chipset_dev_no = dev->chipset_dev_no;
 
-        POSTCODE_LINUX_4(DEVICE_CREATE_ENTRY_PC, chipset_dev_no, chipset_bus_no,
-                         POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(DEVICE_CREATE_ENTRY_PC, chipset_dev_no, chipset_bus_no,
+                       DIAG_SEVERITY_PRINT);
 
         mutex_init(&dev->visordriver_callback_lock);
         dev->device.bus = &visorbus_type;
@@ -651,8 +648,8 @@ create_visor_device(struct visor_device *dev)
          */
         err = device_add(&dev->device);
         if (err < 0) {
-                POSTCODE_LINUX_3(DEVICE_ADD_PC, chipset_bus_no,
-                                 DIAG_SEVERITY_ERR);
+                POSTCODE_LINUX(DEVICE_ADD_PC, 0, chipset_bus_no,
+                               DIAG_SEVERITY_ERR);
                 goto err_put;
         }
 
@@ -966,9 +963,10 @@ static int
 create_bus_instance(struct visor_device *dev)
 {
         int id = dev->chipset_bus_no;
+        int err;
         struct spar_vbus_headerinfo *hdr_info;
 
-        POSTCODE_LINUX_2(BUS_CREATE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, 0, DIAG_SEVERITY_PRINT);
 
         hdr_info = kzalloc(sizeof(*hdr_info), GFP_KERNEL);
         if (!hdr_info)
@@ -979,11 +977,26 @@ create_bus_instance(struct visor_device *dev)
         dev->device.groups = visorbus_groups;
         dev->device.release = visorbus_release_busdevice;
 
+        dev->debugfs_dir = debugfs_create_dir(dev_name(&dev->device),
+                                              visorbus_debugfs_dir);
+        if (!dev->debugfs_dir) {
+                err = -ENOMEM;
+                goto err_hdr_info;
+        }
+        dev->debugfs_client_bus_info =
+                debugfs_create_file("client_bus_info", S_IRUSR | S_IRGRP,
+                                    dev->debugfs_dir, dev,
+                                    &client_bus_info_debugfs_fops);
+        if (!dev->debugfs_client_bus_info) {
+                err = -ENOMEM;
+                goto err_debugfs_dir;
+        }
+
         if (device_register(&dev->device) < 0) {
-                POSTCODE_LINUX_3(DEVICE_CREATE_FAILURE_PC, id,
-                                 POSTCODE_SEVERITY_ERR);
-                kfree(hdr_info);
-                return -ENODEV;
+                POSTCODE_LINUX(DEVICE_CREATE_FAILURE_PC, 0, id,
+                               DIAG_SEVERITY_ERR);
+                err = -ENODEV;
+                goto err_debugfs_created;
         }
 
         if (get_vbus_header_info(dev->visorchannel, hdr_info) >= 0) {
@@ -998,6 +1011,16 @@ create_bus_instance(struct visor_device *dev)
         list_add_tail(&dev->list_all, &list_all_bus_instances);
         dev_set_drvdata(&dev->device, dev);
         return 0;
+
+err_debugfs_created:
+        debugfs_remove(dev->debugfs_client_bus_info);
+
+err_debugfs_dir:
+        debugfs_remove_recursive(dev->debugfs_dir);
+
+err_hdr_info:
+        kfree(hdr_info);
+        return err;
 }
 
 /**
@@ -1069,16 +1092,16 @@ chipset_bus_create(struct visor_device *dev)
         int rc;
         u32 bus_no = dev->chipset_bus_no;
 
-        POSTCODE_LINUX_3(BUS_CREATE_ENTRY_PC, bus_no, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, bus_no, DIAG_SEVERITY_PRINT);
         rc = create_bus_instance(dev);
-        POSTCODE_LINUX_3(BUS_CREATE_EXIT_PC, bus_no, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(BUS_CREATE_EXIT_PC, 0, bus_no, DIAG_SEVERITY_PRINT);
 
         if (rc < 0)
-                POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(BUS_CREATE_FAILURE_PC, 0, bus_no,
+                               DIAG_SEVERITY_ERR);
         else
-                POSTCODE_LINUX_3(CHIPSET_INIT_SUCCESS_PC, bus_no,
-                                 POSTCODE_SEVERITY_INFO);
+                POSTCODE_LINUX(CHIPSET_INIT_SUCCESS_PC, 0, bus_no,
+                               DIAG_SEVERITY_PRINT);
 
         bus_create_response(dev, rc);
 }
@@ -1097,18 +1120,18 @@ chipset_device_create(struct visor_device *dev_info)
         u32 bus_no = dev_info->chipset_bus_no;
         u32 dev_no = dev_info->chipset_dev_no;
 
-        POSTCODE_LINUX_4(DEVICE_CREATE_ENTRY_PC, dev_no, bus_no,
-                         POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(DEVICE_CREATE_ENTRY_PC, dev_no, bus_no,
+                       DIAG_SEVERITY_PRINT);
 
         rc = create_visor_device(dev_info);
         device_create_response(dev_info, rc);
 
         if (rc < 0)
-                POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
+                               DIAG_SEVERITY_ERR);
         else
-                POSTCODE_LINUX_4(DEVICE_CREATE_SUCCESS_PC, dev_no, bus_no,
-                                 POSTCODE_SEVERITY_INFO);
+                POSTCODE_LINUX(DEVICE_CREATE_SUCCESS_PC, dev_no, bus_no,
+                               DIAG_SEVERITY_PRINT);
 }
 
 void
@@ -1274,12 +1297,17 @@ visorbus_init(void)
 {
         int err;
 
-        POSTCODE_LINUX_3(DRIVER_ENTRY_PC, 0, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(DRIVER_ENTRY_PC, 0, 0, DIAG_SEVERITY_PRINT);
+
+        visorbus_debugfs_dir = debugfs_create_dir("visorbus", NULL);
+        if (!visorbus_debugfs_dir)
+                return -ENOMEM;
+
         bus_device_info_init(&clientbus_driverinfo, "clientbus", "visorbus");
 
         err = create_bus_type();
         if (err < 0) {
-                POSTCODE_LINUX_2(BUS_CREATE_ENTRY_PC, DIAG_SEVERITY_ERR);
+                POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, 0, DIAG_SEVERITY_ERR);
                 goto error;
         }
 
@@ -1288,7 +1316,7 @@ visorbus_init(void)
         return 0;
 
 error:
-        POSTCODE_LINUX_3(CHIPSET_INIT_FAILURE_PC, err, POSTCODE_SEVERITY_ERR);
+        POSTCODE_LINUX(CHIPSET_INIT_FAILURE_PC, 0, err, DIAG_SEVERITY_ERR);
         return err;
 }
 
@@ -1306,6 +1334,7 @@ visorbus_exit(void)
                 remove_bus_instance(dev);
         }
         remove_bus_type();
+        debugfs_remove_recursive(visorbus_debugfs_dir);
 }
 
 module_param_named(forcematch, visorbus_forcematch, int, S_IRUGO);
diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h
index 15403fb52847..49bec1763e33 100644
--- a/drivers/staging/unisys/visorbus/visorbus_private.h
+++ b/drivers/staging/unisys/visorbus/visorbus_private.h
@@ -70,9 +70,9 @@ struct visorchannel *visorchannel_create_with_lock(u64 physaddr,
                                                    gfp_t gfp, uuid_le guid);
 void visorchannel_destroy(struct visorchannel *channel);
 int visorchannel_read(struct visorchannel *channel, ulong offset,
-                      void *local, ulong nbytes);
+                      void *dest, ulong nbytes);
 int visorchannel_write(struct visorchannel *channel, ulong offset,
-                       void *local, ulong nbytes);
+                       void *dest, ulong nbytes);
 u64 visorchannel_get_physaddr(struct visorchannel *channel);
 ulong visorchannel_get_nbytes(struct visorchannel *channel);
 char *visorchannel_id(struct visorchannel *channel, char *s);
diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c
index 300a65dc5c6c..f51a7258bef0 100644
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/staging/unisys/visorbus/visorchannel.c
@@ -23,6 +23,7 @@
 #include <linux/io.h>
 
 #include "visorbus.h"
+#include "visorbus_private.h"
 #include "controlvmchannel.h"
 
 #define MYDRVNAME "visorchannel"
@@ -127,19 +128,19 @@ EXPORT_SYMBOL_GPL(visorchannel_get_uuid);
 
 int
 visorchannel_read(struct visorchannel *channel, ulong offset,
-                  void *local, ulong nbytes)
+                  void *dest, ulong nbytes)
 {
         if (offset + nbytes > channel->nbytes)
                 return -EIO;
 
-        memcpy(local, channel->mapped + offset, nbytes);
+        memcpy(dest, channel->mapped + offset, nbytes);
 
         return 0;
 }
 
 int
 visorchannel_write(struct visorchannel *channel, ulong offset,
-                   void *local, ulong nbytes)
+                   void *dest, ulong nbytes)
 {
         size_t chdr_size = sizeof(struct channel_header);
         size_t copy_size;
@@ -150,10 +151,10 @@ visorchannel_write(struct visorchannel *channel, ulong offset,
         if (offset < chdr_size) {
                 copy_size = min(chdr_size - offset, nbytes);
                 memcpy(((char *)(&channel->chan_hdr)) + offset,
-                       local, copy_size);
+                       dest, copy_size);
         }
 
-        memcpy(channel->mapped + offset, local, nbytes);
+        memcpy(channel->mapped + offset, dest, nbytes);
 
         return 0;
 }
@@ -236,8 +237,9 @@ signalremove_inner(struct visorchannel *channel, u32 queue, void *msg)
         if (error)
                 return error;
 
+        /* No signals to remove; have caller try again. */
         if (sig_hdr.head == sig_hdr.tail)
-                return -EIO;    /* no signals to remove */
+                return -EAGAIN;
 
         sig_hdr.tail = (sig_hdr.tail + 1) % sig_hdr.max_slots;
 
@@ -299,22 +301,30 @@ EXPORT_SYMBOL_GPL(visorchannel_signalremove);
  * Return: boolean indicating whether any messages in the designated
  *         channel/queue are present
  */
+
+static bool
+queue_empty(struct visorchannel *channel, u32 queue)
+{
+        struct signal_queue_header sig_hdr;
+
+        if (sig_read_header(channel, queue, &sig_hdr))
+                return true;
+
+        return (sig_hdr.head == sig_hdr.tail);
+}
+
 bool
 visorchannel_signalempty(struct visorchannel *channel, u32 queue)
 {
-        unsigned long flags = 0;
-        struct signal_queue_header sig_hdr;
-        bool rc = false;
+        bool rc;
+        unsigned long flags;
 
-        if (channel->needs_lock)
-                spin_lock_irqsave(&channel->remove_lock, flags);
+        if (!channel->needs_lock)
+                return queue_empty(channel, queue);
 
-        if (sig_read_header(channel, queue, &sig_hdr))
-                rc = true;
-        if (sig_hdr.head == sig_hdr.tail)
-                rc = true;
-        if (channel->needs_lock)
-                spin_unlock_irqrestore(&channel->remove_lock, flags);
+        spin_lock_irqsave(&channel->remove_lock, flags);
+        rc = queue_empty(channel, queue);
+        spin_unlock_irqrestore(&channel->remove_lock, flags);
 
         return rc;
 }
diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c
index 59871495ea85..d7148c351d3f 100644
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -29,7 +29,7 @@
 #include "visorbus_private.h"
 #include "vmcallinterface.h"
 
-#define CURRENT_FILE_PC VISOR_CHIPSET_PC_visorchipset_main_c
+#define CURRENT_FILE_PC VISOR_BUS_PC_visorchipset_c
 
 #define POLLJIFFIES_CONTROLVMCHANNEL_FAST   1
 #define POLLJIFFIES_CONTROLVMCHANNEL_SLOW 100
@@ -57,7 +57,6 @@ visorchipset_open(struct inode *inode, struct file *file)
 
         if (minor_number)
                 return -ENODEV;
-        file->private_data = NULL;
         return 0;
 }
 
@@ -499,7 +498,7 @@ controlvm_init_response(struct controlvm_message *msg,
         }
 }
 
-static void
+static int
 controlvm_respond_chipset_init(struct controlvm_message_header *msg_hdr,
                                int response,
                                enum ultra_chipset_feature features)
@@ -508,34 +507,33 @@ controlvm_respond_chipset_init(struct controlvm_message_header *msg_hdr,
 
         controlvm_init_response(&outmsg, msg_hdr, response);
         outmsg.cmd.init_chipset.features = features;
-        if (visorchannel_signalinsert(controlvm_channel,
-                                      CONTROLVM_QUEUE_REQUEST, &outmsg)) {
-                return;
-        }
+        return visorchannel_signalinsert(controlvm_channel,
+                                         CONTROLVM_QUEUE_REQUEST, &outmsg);
 }
 
-static void
+static int
 chipset_init(struct controlvm_message *inmsg)
 {
         static int chipset_inited;
         enum ultra_chipset_feature features = 0;
         int rc = CONTROLVM_RESP_SUCCESS;
+        int res = 0;
 
-        POSTCODE_LINUX_2(CHIPSET_INIT_ENTRY_PC, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(CHIPSET_INIT_ENTRY_PC, 0, 0, DIAG_SEVERITY_PRINT);
         if (chipset_inited) {
                 rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
+                res = -EIO;
                 goto out_respond;
         }
         chipset_inited = 1;
-        POSTCODE_LINUX_2(CHIPSET_INIT_EXIT_PC, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(CHIPSET_INIT_EXIT_PC, 0, 0, DIAG_SEVERITY_PRINT);
 
         /*
          * Set features to indicate we support parahotplug (if Command
          * also supports it).
          */
-        features =
-            inmsg->cmd.init_chipset.
-            features & ULTRA_CHIPSET_FEATURE_PARA_HOTPLUG;
+        features = inmsg->cmd.init_chipset.features &
+                   ULTRA_CHIPSET_FEATURE_PARA_HOTPLUG;
 
         /*
          * Set the "reply" bit so Command knows this is a
@@ -545,25 +543,25 @@ chipset_init(struct controlvm_message *inmsg)
 
 out_respond:
         if (inmsg->hdr.flags.response_expected)
-                controlvm_respond_chipset_init(&inmsg->hdr, rc, features);
+                res = controlvm_respond_chipset_init(&inmsg->hdr, rc, features);
+
+        return res;
 }
 
-static void
+static int
 controlvm_respond(struct controlvm_message_header *msg_hdr, int response)
 {
         struct controlvm_message outmsg;
 
         controlvm_init_response(&outmsg, msg_hdr, response);
         if (outmsg.hdr.flags.test_message == 1)
-                return;
+                return -EINVAL;
 
-        if (visorchannel_signalinsert(controlvm_channel,
-                                      CONTROLVM_QUEUE_REQUEST, &outmsg)) {
-                return;
-        }
+        return visorchannel_signalinsert(controlvm_channel,
+                                         CONTROLVM_QUEUE_REQUEST, &outmsg);
 }
 
-static void controlvm_respond_physdev_changestate(
+static int controlvm_respond_physdev_changestate(
                 struct controlvm_message_header *msg_hdr, int response,
                 struct spar_segment_state state)
 {
@@ -572,10 +570,8 @@ static void controlvm_respond_physdev_changestate(
         controlvm_init_response(&outmsg, msg_hdr, response);
         outmsg.cmd.device_change_state.state = state;
         outmsg.cmd.device_change_state.flags.phys_device = 1;
-        if (visorchannel_signalinsert(controlvm_channel,
-                                      CONTROLVM_QUEUE_REQUEST, &outmsg)) {
-                return;
-        }
+        return visorchannel_signalinsert(controlvm_channel,
+                                         CONTROLVM_QUEUE_REQUEST, &outmsg);
 }
 
 enum crash_obj_type {
@@ -583,74 +579,80 @@ enum crash_obj_type {
         CRASH_BUS,
 };
 
-static void
+static int
 save_crash_message(struct controlvm_message *msg, enum crash_obj_type typ)
 {
         u32 local_crash_msg_offset;
         u16 local_crash_msg_count;
+        int err;
 
-        if (visorchannel_read(controlvm_channel,
-                              offsetof(struct spar_controlvm_channel_protocol,
-                                       saved_crash_message_count),
-                              &local_crash_msg_count, sizeof(u16)) < 0) {
-                POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
-                                 POSTCODE_SEVERITY_ERR);
-                return;
+        err = visorchannel_read(controlvm_channel,
+                                offsetof(struct spar_controlvm_channel_protocol,
+                                         saved_crash_message_count),
+                                &local_crash_msg_count, sizeof(u16));
+        if (err) {
+                POSTCODE_LINUX(CRASH_DEV_CTRL_RD_FAILURE_PC, 0, 0,
+                               DIAG_SEVERITY_ERR);
+                return err;
         }
 
         if (local_crash_msg_count != CONTROLVM_CRASHMSG_MAX) {
-                POSTCODE_LINUX_3(CRASH_DEV_COUNT_FAILURE_PC,
-                                 local_crash_msg_count,
-                                 POSTCODE_SEVERITY_ERR);
-                return;
+                POSTCODE_LINUX(CRASH_DEV_COUNT_FAILURE_PC, 0,
+                               local_crash_msg_count,
+                               DIAG_SEVERITY_ERR);
+                return -EIO;
         }
 
-        if (visorchannel_read(controlvm_channel,
-                              offsetof(struct spar_controlvm_channel_protocol,
-                                       saved_crash_message_offset),
-                              &local_crash_msg_offset, sizeof(u32)) < 0) {
-                POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
-                                 POSTCODE_SEVERITY_ERR);
-                return;
+        err = visorchannel_read(controlvm_channel,
+                                offsetof(struct spar_controlvm_channel_protocol,
+                                         saved_crash_message_offset),
+                                &local_crash_msg_offset, sizeof(u32));
+        if (err) {
+                POSTCODE_LINUX(CRASH_DEV_CTRL_RD_FAILURE_PC, 0, 0,
+                               DIAG_SEVERITY_ERR);
+                return err;
         }
 
         if (typ == CRASH_BUS) {
-                if (visorchannel_write(controlvm_channel,
-                                       local_crash_msg_offset,
-                                       msg,
-                                       sizeof(struct controlvm_message)) < 0) {
-                        POSTCODE_LINUX_2(SAVE_MSG_BUS_FAILURE_PC,
-                                         POSTCODE_SEVERITY_ERR);
-                        return;
+                err = visorchannel_write(controlvm_channel,
+                                         local_crash_msg_offset,
+                                         msg,
+                                        sizeof(struct controlvm_message));
+                if (err) {
+                        POSTCODE_LINUX(SAVE_MSG_BUS_FAILURE_PC, 0, 0,
+                                       DIAG_SEVERITY_ERR);
+                        return err;
                 }
         } else {
                 local_crash_msg_offset += sizeof(struct controlvm_message);
-                if (visorchannel_write(controlvm_channel,
-                                       local_crash_msg_offset,
-                                       msg,
-                                       sizeof(struct controlvm_message)) < 0) {
-                        POSTCODE_LINUX_2(SAVE_MSG_DEV_FAILURE_PC,
-                                         POSTCODE_SEVERITY_ERR);
-                        return;
+                err = visorchannel_write(controlvm_channel,
+                                         local_crash_msg_offset,
+                                         msg,
+                                         sizeof(struct controlvm_message));
+                if (err) {
+                        POSTCODE_LINUX(SAVE_MSG_DEV_FAILURE_PC, 0, 0,
+                                       DIAG_SEVERITY_ERR);
+                        return err;
                 }
         }
+        return 0;
 }
 
-static void
+static int
 bus_responder(enum controlvm_id cmd_id,
               struct controlvm_message_header *pending_msg_hdr,
               int response)
 {
         if (!pending_msg_hdr)
-                return;         /* no controlvm response needed */
+                return -EIO;
 
         if (pending_msg_hdr->id != (u32)cmd_id)
-                return;
+                return -EINVAL;
 
-        controlvm_respond(pending_msg_hdr, response);
+        return controlvm_respond(pending_msg_hdr, response);
 }
 
-static void
+static int
 device_changestate_responder(enum controlvm_id cmd_id,
                              struct visor_device *p, int response,
                              struct spar_segment_state response_state)
@@ -660,9 +662,9 @@ device_changestate_responder(enum controlvm_id cmd_id,
         u32 dev_no = p->chipset_dev_no;
 
         if (!p->pending_msg_hdr)
-                return;         /* no controlvm response needed */
+                return -EIO;
         if (p->pending_msg_hdr->id != cmd_id)
-                return;
+                return -EINVAL;
 
         controlvm_init_response(&outmsg, p->pending_msg_hdr, response);
 
@@ -670,175 +672,74 @@ device_changestate_responder(enum controlvm_id cmd_id,
         outmsg.cmd.device_change_state.dev_no = dev_no;
         outmsg.cmd.device_change_state.state = response_state;
 
-        if (visorchannel_signalinsert(controlvm_channel,
-                                      CONTROLVM_QUEUE_REQUEST, &outmsg))
-                return;
+        return visorchannel_signalinsert(controlvm_channel,
+                                         CONTROLVM_QUEUE_REQUEST, &outmsg);
 }
 
-static void
+static int
 device_responder(enum controlvm_id cmd_id,
                  struct controlvm_message_header *pending_msg_hdr,
                  int response)
 {
         if (!pending_msg_hdr)
-                return;         /* no controlvm response needed */
+                return -EIO;
 
         if (pending_msg_hdr->id != (u32)cmd_id)
-                return;
-
-        controlvm_respond(pending_msg_hdr, response);
-}
-
-static void
-bus_epilog(struct visor_device *bus_info,
-           u32 cmd, struct controlvm_message_header *msg_hdr,
-           int response, bool need_response)
-{
-        struct controlvm_message_header *pmsg_hdr = NULL;
-
-        if (!bus_info) {
-                /*
-                 * relying on a valid passed in response code
-                 * be lazy and re-use msg_hdr for this failure, is this ok??
-                 */
-                pmsg_hdr = msg_hdr;
-                goto out_respond;
-        }
-
-        if (bus_info->pending_msg_hdr) {
-                /* only non-NULL if dev is still waiting on a response */
-                response = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;
-                pmsg_hdr = bus_info->pending_msg_hdr;
-                goto out_respond;
-        }
-
-        if (need_response) {
-                pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
-                if (!pmsg_hdr) {
-                        POSTCODE_LINUX_4(MALLOC_FAILURE_PC, cmd,
-                                         bus_info->chipset_bus_no,
-                                         POSTCODE_SEVERITY_ERR);
-                        return;
-                }
-
-                memcpy(pmsg_hdr, msg_hdr,
-                       sizeof(struct controlvm_message_header));
-                bus_info->pending_msg_hdr = pmsg_hdr;
-        }
-
-        if (response == CONTROLVM_RESP_SUCCESS) {
-                switch (cmd) {
-                case CONTROLVM_BUS_CREATE:
-                        chipset_bus_create(bus_info);
-                        break;
-                case CONTROLVM_BUS_DESTROY:
-                        chipset_bus_destroy(bus_info);
-                        break;
-                }
-        }
-
-out_respond:
-        bus_responder(cmd, pmsg_hdr, response);
-}
-
-static void
-device_epilog(struct visor_device *dev_info,
-              struct spar_segment_state state, u32 cmd,
-              struct controlvm_message_header *msg_hdr, int response,
-              bool need_response, bool for_visorbus)
-{
-        struct controlvm_message_header *pmsg_hdr = NULL;
-
-        if (!dev_info) {
-                /*
-                 * relying on a valid passed in response code
-                 * be lazy and re-use msg_hdr for this failure, is this ok??
-                 */
-                pmsg_hdr = msg_hdr;
-                goto out_respond;
-        }
-
-        if (dev_info->pending_msg_hdr) {
-                /* only non-NULL if dev is still waiting on a response */
-                response = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;
-                pmsg_hdr = dev_info->pending_msg_hdr;
-                goto out_respond;
-        }
-
-        if (need_response) {
-                pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
-                if (!pmsg_hdr) {
-                        response = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
-                        goto out_respond;
-                }
-
-                memcpy(pmsg_hdr, msg_hdr,
-                       sizeof(struct controlvm_message_header));
-                dev_info->pending_msg_hdr = pmsg_hdr;
-        }
-
-        if (response >= 0) {
-                switch (cmd) {
-                case CONTROLVM_DEVICE_CREATE:
-                        chipset_device_create(dev_info);
-                        break;
-                case CONTROLVM_DEVICE_CHANGESTATE:
-                        /* ServerReady / ServerRunning / SegmentStateRunning */
-                        if (state.alive == segment_state_running.alive &&
-                            state.operating ==
-                                segment_state_running.operating) {
-                                chipset_device_resume(dev_info);
-                        }
-                        /* ServerNotReady / ServerLost / SegmentStateStandby */
-                        else if (state.alive == segment_state_standby.alive &&
-                                 state.operating ==
-                                 segment_state_standby.operating) {
-                                /*
-                                 * technically this is standby case
-                                 * where server is lost
-                                 */
-                                chipset_device_pause(dev_info);
-                        }
-                        break;
-                case CONTROLVM_DEVICE_DESTROY:
-                        chipset_device_destroy(dev_info);
-                        break;
-                }
-        }
+                return -EINVAL;
 
-out_respond:
-        device_responder(cmd, pmsg_hdr, response);
+        return controlvm_respond(pending_msg_hdr, response);
 }
 
-static void
+static int
 bus_create(struct controlvm_message *inmsg)
 {
         struct controlvm_message_packet *cmd = &inmsg->cmd;
+        struct controlvm_message_header *pmsg_hdr = NULL;
         u32 bus_no = cmd->create_bus.bus_no;
-        int rc = CONTROLVM_RESP_SUCCESS;
         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)) {
-                POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
-                rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
-                goto out_bus_epilog;
+                POSTCODE_LINUX(BUS_CREATE_FAILURE_PC, 0, bus_no,
+                               DIAG_SEVERITY_ERR);
+                err = -EEXIST;
+                goto err_respond;
         }
+
         bus_info = kzalloc(sizeof(*bus_info), GFP_KERNEL);
         if (!bus_info) {
-                POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
-                rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
-                goto out_bus_epilog;
+                POSTCODE_LINUX(BUS_CREATE_FAILURE_PC, 0, bus_no,
+                               DIAG_SEVERITY_ERR);
+                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;
 
-        POSTCODE_LINUX_3(BUS_CREATE_ENTRY_PC, bus_no, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(BUS_CREATE_ENTRY_PC, 0, bus_no, DIAG_SEVERITY_PRINT);
+
+        if (uuid_le_cmp(cmd->create_bus.bus_inst_uuid, spar_siovm_uuid) == 0)
+                save_crash_message(inmsg, CRASH_BUS);
+
+        if (inmsg->hdr.flags.response_expected == 1) {
+                pmsg_hdr = kzalloc(sizeof(*pmsg_hdr),
+                                   GFP_KERNEL);
+                if (!pmsg_hdr) {
+                        POSTCODE_LINUX(MALLOC_FAILURE_PC, cmd,
+                                       bus_info->chipset_bus_no,
+                                       DIAG_SEVERITY_ERR);
+                        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,
                                            cmd->create_bus.channel_bytes,
@@ -846,89 +747,138 @@ bus_create(struct controlvm_message *inmsg)
                                            cmd->create_bus.bus_data_type_uuid);
 
         if (!visorchannel) {
-                POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
-                rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
-                kfree(bus_info);
-                bus_info = NULL;
-                goto out_bus_epilog;
+                POSTCODE_LINUX(BUS_CREATE_FAILURE_PC, 0, bus_no,
+                               DIAG_SEVERITY_ERR);
+                err = -ENOMEM;
+                goto err_free_pending_msg;
         }
         bus_info->visorchannel = visorchannel;
-        if (uuid_le_cmp(cmd->create_bus.bus_inst_uuid, spar_siovm_uuid) == 0)
-                save_crash_message(inmsg, CRASH_BUS);
 
-        POSTCODE_LINUX_3(BUS_CREATE_EXIT_PC, bus_no, POSTCODE_SEVERITY_INFO);
+        /* Response will be handled by chipset_bus_create */
+        chipset_bus_create(bus_info);
+
+        POSTCODE_LINUX(BUS_CREATE_EXIT_PC, 0, bus_no, DIAG_SEVERITY_PRINT);
+        return 0;
+
+err_free_pending_msg:
+        kfree(bus_info->pending_msg_hdr);
+
+err_free_bus_info:
+        kfree(bus_info);
 
-out_bus_epilog:
-        bus_epilog(bus_info, CONTROLVM_BUS_CREATE, &inmsg->hdr,
-                   rc, inmsg->hdr.flags.response_expected == 1);
+err_respond:
+        if (inmsg->hdr.flags.response_expected == 1)
+                bus_responder(inmsg->hdr.id, &inmsg->hdr, err);
+        return err;
 }
 
-static void
+static int
 bus_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 visor_device *bus_info;
-        int rc = CONTROLVM_RESP_SUCCESS;
+        int err;
 
         bus_info = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL);
-        if (!bus_info)
-                rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
-        else if (bus_info->state.created == 0)
-                rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
+        if (!bus_info) {
+                err = -ENODEV;
+                goto err_respond;
+        }
+        if (bus_info->state.created == 0) {
+                err = -ENOENT;
+                goto err_respond;
+        }
+        if (bus_info->pending_msg_hdr) {
+                /* only non-NULL if dev is still waiting on a response */
+                err = -EEXIST;
+                goto err_respond;
+        }
+        if (inmsg->hdr.flags.response_expected == 1) {
+                pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
+                if (!pmsg_hdr) {
+                        POSTCODE_LINUX(MALLOC_FAILURE_PC, cmd,
+                                       bus_info->chipset_bus_no,
+                                       DIAG_SEVERITY_ERR);
+                        err = -ENOMEM;
+                        goto err_respond;
+                }
 
-        bus_epilog(bus_info, CONTROLVM_BUS_DESTROY, &inmsg->hdr,
-                   rc, inmsg->hdr.flags.response_expected == 1);
+                memcpy(pmsg_hdr, &inmsg->hdr,
+                       sizeof(struct controlvm_message_header));
+                bus_info->pending_msg_hdr = pmsg_hdr;
+        }
 
-        /* bus_info is freed as part of the busdevice_release function */
+        /* Response will be handled by chipset_bus_destroy */
+        chipset_bus_destroy(bus_info);
+        return 0;
+
+err_respond:
+        if (inmsg->hdr.flags.response_expected == 1)
+                bus_responder(inmsg->hdr.id, &inmsg->hdr, err);
+        return err;
 }
 
-static void
+static int
 bus_configure(struct controlvm_message *inmsg,
               struct parser_context *parser_ctx)
 {
         struct controlvm_message_packet *cmd = &inmsg->cmd;
         u32 bus_no;
         struct visor_device *bus_info;
-        int rc = CONTROLVM_RESP_SUCCESS;
+        int err = 0;
 
         bus_no = cmd->configure_bus.bus_no;
-        POSTCODE_LINUX_3(BUS_CONFIGURE_ENTRY_PC, bus_no,
-                         POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(BUS_CONFIGURE_ENTRY_PC, 0, bus_no,
+                       DIAG_SEVERITY_PRINT);
 
         bus_info = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL);
         if (!bus_info) {
-                POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
-                rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
+                POSTCODE_LINUX(BUS_CONFIGURE_FAILURE_PC, 0, bus_no,
+                               DIAG_SEVERITY_ERR);
+                err = -EINVAL;
+                goto err_respond;
         } else if (bus_info->state.created == 0) {
-                POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
-                rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
+                POSTCODE_LINUX(BUS_CONFIGURE_FAILURE_PC, 0, bus_no,
+                               DIAG_SEVERITY_ERR);
+                err = -EINVAL;
+                goto err_respond;
         } else if (bus_info->pending_msg_hdr) {
-                POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
-                rc = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;
-        } else {
-                visorchannel_set_clientpartition
-                        (bus_info->visorchannel,
-                         cmd->configure_bus.guest_handle);
-                bus_info->partition_uuid = parser_id_get(parser_ctx);
-                parser_param_start(parser_ctx, PARSERSTRING_NAME);
-                bus_info->name = parser_string_get(parser_ctx);
-
-                POSTCODE_LINUX_3(BUS_CONFIGURE_EXIT_PC, bus_no,
-                                 POSTCODE_SEVERITY_INFO);
+                POSTCODE_LINUX(BUS_CONFIGURE_FAILURE_PC, 0, bus_no,
+                               DIAG_SEVERITY_ERR);
+                err = -EIO;
+                goto err_respond;
         }
-        bus_epilog(bus_info, CONTROLVM_BUS_CONFIGURE, &inmsg->hdr,
-                   rc, inmsg->hdr.flags.response_expected == 1);
+
+        err = visorchannel_set_clientpartition
+                (bus_info->visorchannel,
+                 cmd->configure_bus.guest_handle);
+        if (err)
+                goto err_respond;
+
+        bus_info->partition_uuid = parser_id_get(parser_ctx);
+        parser_param_start(parser_ctx, PARSERSTRING_NAME);
+        bus_info->name = parser_string_get(parser_ctx);
+
+        POSTCODE_LINUX(BUS_CONFIGURE_EXIT_PC, 0, bus_no,
+                       DIAG_SEVERITY_PRINT);
+
+        if (inmsg->hdr.flags.response_expected == 1)
+                bus_responder(inmsg->hdr.id, &inmsg->hdr, err);
+        return 0;
+
+err_respond:
+        if (inmsg->hdr.flags.response_expected == 1)
+                bus_responder(inmsg->hdr.id, &inmsg->hdr, err);
+        return err;
 }
 
 static void
 my_device_create(struct controlvm_message *inmsg)
 {
         struct controlvm_message_packet *cmd = &inmsg->cmd;
+        struct controlvm_message_header *pmsg_hdr = NULL;
         u32 bus_no = cmd->create_device.bus_no;
         u32 dev_no = cmd->create_device.dev_no;
         struct visor_device *dev_info = NULL;
@@ -938,31 +888,31 @@ my_device_create(struct controlvm_message *inmsg)
 
         bus_info = visorbus_get_device_by_id(bus_no, BUS_ROOT_DEVICE, NULL);
         if (!bus_info) {
-                POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
+                               DIAG_SEVERITY_ERR);
                 rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
                 goto out_respond;
         }
 
         if (bus_info->state.created == 0) {
-                POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
+                               DIAG_SEVERITY_ERR);
                 rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
                 goto out_respond;
         }
 
         dev_info = visorbus_get_device_by_id(bus_no, dev_no, NULL);
         if (dev_info && (dev_info->state.created == 1)) {
-                POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
+                               DIAG_SEVERITY_ERR);
                 rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
                 goto out_respond;
         }
 
         dev_info = kzalloc(sizeof(*dev_info), GFP_KERNEL);
         if (!dev_info) {
-                POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
+                               DIAG_SEVERITY_ERR);
                 rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
                 goto out_respond;
         }
@@ -974,8 +924,8 @@ my_device_create(struct controlvm_message *inmsg)
         /* not sure where the best place to set the 'parent' */
         dev_info->device.parent = &bus_info->device;
 
-        POSTCODE_LINUX_4(DEVICE_CREATE_ENTRY_PC, dev_no, bus_no,
-                         POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(DEVICE_CREATE_ENTRY_PC, dev_no, bus_no,
+                       DIAG_SEVERITY_PRINT);
 
         visorchannel =
                visorchannel_create_with_lock(cmd->create_device.channel_addr,
@@ -984,12 +934,10 @@ my_device_create(struct controlvm_message *inmsg)
                                              cmd->create_device.data_type_uuid);
 
         if (!visorchannel) {
-                POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
+                               DIAG_SEVERITY_ERR);
                 rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
-                kfree(dev_info);
-                dev_info = NULL;
-                goto out_respond;
+                goto out_free_dev_info;
         }
         dev_info->visorchannel = visorchannel;
         dev_info->channel_type_guid = cmd->create_device.data_type_uuid;
@@ -997,18 +945,36 @@ my_device_create(struct controlvm_message *inmsg)
                         spar_vhba_channel_protocol_uuid) == 0)
                 save_crash_message(inmsg, CRASH_DEV);
 
-        POSTCODE_LINUX_4(DEVICE_CREATE_EXIT_PC, dev_no, bus_no,
-                         POSTCODE_SEVERITY_INFO);
+        if (inmsg->hdr.flags.response_expected == 1) {
+                pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
+                if (!pmsg_hdr) {
+                        rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
+                        goto out_free_dev_info;
+                }
+
+                memcpy(pmsg_hdr, &inmsg->hdr,
+                       sizeof(struct controlvm_message_header));
+                dev_info->pending_msg_hdr = pmsg_hdr;
+        }
+        /* Chipset_device_create will send response */
+        chipset_device_create(dev_info);
+        POSTCODE_LINUX(DEVICE_CREATE_EXIT_PC, dev_no, bus_no,
+                       DIAG_SEVERITY_PRINT);
+        return;
+
+out_free_dev_info:
+        kfree(dev_info);
+
 out_respond:
-        device_epilog(dev_info, segment_state_running,
-                      CONTROLVM_DEVICE_CREATE, &inmsg->hdr, rc,
-                      inmsg->hdr.flags.response_expected == 1, 1);
+        if (inmsg->hdr.flags.response_expected == 1)
+                device_responder(inmsg->hdr.id, &inmsg->hdr, rc);
 }
 
 static void
 my_device_changestate(struct controlvm_message *inmsg)
 {
         struct controlvm_message_packet *cmd = &inmsg->cmd;
+        struct controlvm_message_header *pmsg_hdr = NULL;
         u32 bus_no = cmd->device_change_state.bus_no;
         u32 dev_no = cmd->device_change_state.dev_no;
         struct spar_segment_state state = cmd->device_change_state.state;
@@ -1017,39 +983,97 @@ my_device_changestate(struct controlvm_message *inmsg)
 
         dev_info = visorbus_get_device_by_id(bus_no, dev_no, NULL);
         if (!dev_info) {
-                POSTCODE_LINUX_4(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no,
+                               DIAG_SEVERITY_ERR);
                 rc = -CONTROLVM_RESP_ERROR_DEVICE_INVALID;
-        } else if (dev_info->state.created == 0) {
-                POSTCODE_LINUX_4(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no,
-                                 POSTCODE_SEVERITY_ERR);
+                goto err_respond;
+        }
+        if (dev_info->state.created == 0) {
+                POSTCODE_LINUX(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no,
+                               DIAG_SEVERITY_ERR);
                 rc = -CONTROLVM_RESP_ERROR_DEVICE_INVALID;
+                goto err_respond;
+        }
+        if (dev_info->pending_msg_hdr) {
+                /* only non-NULL if dev is still waiting on a response */
+                rc = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;
+                goto err_respond;
         }
-        if ((rc >= CONTROLVM_RESP_SUCCESS) && dev_info)
-                device_epilog(dev_info, state,
-                              CONTROLVM_DEVICE_CHANGESTATE, &inmsg->hdr, rc,
-                              inmsg->hdr.flags.response_expected == 1, 1);
+        if (inmsg->hdr.flags.response_expected == 1) {
+                pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
+                if (!pmsg_hdr) {
+                        rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
+                        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 chipset_device_resume */
+                chipset_device_resume(dev_info);
+        /* ServerNotReady / ServerLost / SegmentStateStandby */
+        else if (state.alive == segment_state_standby.alive &&
+                 state.operating == segment_state_standby.operating)
+                /*
+                 * technically this is standby case where server is lost.
+                 * Response will be sent from chipset_device_pause.
+                 */
+                chipset_device_pause(dev_info);
+
+        return;
+
+err_respond:
+        if (inmsg->hdr.flags.response_expected == 1)
+                device_responder(inmsg->hdr.id, &inmsg->hdr, rc);
 }
 
 static void
 my_device_destroy(struct controlvm_message *inmsg)
 {
         struct controlvm_message_packet *cmd = &inmsg->cmd;
+        struct controlvm_message_header *pmsg_hdr = NULL;
         u32 bus_no = cmd->destroy_device.bus_no;
         u32 dev_no = cmd->destroy_device.dev_no;
         struct visor_device *dev_info;
         int rc = CONTROLVM_RESP_SUCCESS;
 
         dev_info = visorbus_get_device_by_id(bus_no, dev_no, NULL);
-        if (!dev_info)
+        if (!dev_info) {
                 rc = -CONTROLVM_RESP_ERROR_DEVICE_INVALID;
-        else if (dev_info->state.created == 0)
+                goto err_respond;
+        }
+        if (dev_info->state.created == 0) {
                 rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
+                goto err_respond;
+        }
 
-        if ((rc >= CONTROLVM_RESP_SUCCESS) && dev_info)
-                device_epilog(dev_info, segment_state_running,
-                              CONTROLVM_DEVICE_DESTROY, &inmsg->hdr, rc,
-                              inmsg->hdr.flags.response_expected == 1, 1);
+        if (dev_info->pending_msg_hdr) {
+                /* only non-NULL if dev is still waiting on a response */
+                rc = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT;
+                goto err_respond;
+        }
+        if (inmsg->hdr.flags.response_expected == 1) {
+                pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
+                if (!pmsg_hdr) {
+                        rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
+                        goto err_respond;
+                }
+
+                memcpy(pmsg_hdr, &inmsg->hdr,
+                       sizeof(struct controlvm_message_header));
+                dev_info->pending_msg_hdr = pmsg_hdr;
+        }
+
+        chipset_device_destroy(dev_info);
+        return;
+
+err_respond:
+        if (inmsg->hdr.flags.response_expected == 1)
+                device_responder(inmsg->hdr.id, &inmsg->hdr, rc);
 }
 
 /**
@@ -1075,7 +1099,6 @@ initialize_controlvm_payload_info(u64 phys_addr, u64 offset, u32 bytes,
         if (!info)
                 return -CONTROLVM_RESP_ERROR_PAYLOAD_INVALID;
 
-        memset(info, 0, sizeof(struct visor_controlvm_payload_info));
         if ((offset == 0) || (bytes == 0))
                 return -CONTROLVM_RESP_ERROR_PAYLOAD_INVALID;
 
@@ -1083,6 +1106,7 @@ initialize_controlvm_payload_info(u64 phys_addr, u64 offset, u32 bytes,
         if (!payload)
                 return -CONTROLVM_RESP_ERROR_IOREMAP_FAILED;
 
+        memset(info, 0, sizeof(struct visor_controlvm_payload_info));
         info->offset = offset;
         info->bytes = bytes;
         info->ptr = payload;
@@ -1111,16 +1135,16 @@ initialize_controlvm_payload(void)
                               offsetof(struct spar_controlvm_channel_protocol,
                                        request_payload_offset),
                               &payload_offset, sizeof(payload_offset)) < 0) {
-                POSTCODE_LINUX_2(CONTROLVM_INIT_FAILURE_PC,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(CONTROLVM_INIT_FAILURE_PC, 0, 0,
+                               DIAG_SEVERITY_ERR);
                 return;
         }
         if (visorchannel_read(controlvm_channel,
                               offsetof(struct spar_controlvm_channel_protocol,
                                        request_payload_bytes),
                               &payload_bytes, sizeof(payload_bytes)) < 0) {
-                POSTCODE_LINUX_2(CONTROLVM_INIT_FAILURE_PC,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(CONTROLVM_INIT_FAILURE_PC, 0, 0,
+                               DIAG_SEVERITY_ERR);
                 return;
         }
         initialize_controlvm_payload_info(phys_addr,
@@ -1317,7 +1341,7 @@ static struct attribute *visorchipset_install_attrs[] = {
         NULL
 };
 
-static struct attribute_group visorchipset_install_group = {
+static const struct attribute_group visorchipset_install_group = {
         .name = "install",
         .attrs = visorchipset_install_attrs
 };
@@ -1540,7 +1564,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
         u32 local_crash_msg_offset;
         u16 local_crash_msg_count;
 
-        POSTCODE_LINUX_2(CRASH_DEV_ENTRY_PC, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(CRASH_DEV_ENTRY_PC, 0, 0, DIAG_SEVERITY_PRINT);
 
         /* send init chipset msg */
         msg.hdr.id = CONTROLVM_CHIPSET_INIT;
@@ -1554,15 +1578,15 @@ setup_crash_devices_work_queue(struct work_struct *work)
                               offsetof(struct spar_controlvm_channel_protocol,
                                        saved_crash_message_count),
                               &local_crash_msg_count, sizeof(u16)) < 0) {
-                POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(CRASH_DEV_CTRL_RD_FAILURE_PC, 0, 0,
+                               DIAG_SEVERITY_ERR);
                 return;
         }
 
         if (local_crash_msg_count != CONTROLVM_CRASHMSG_MAX) {
-                POSTCODE_LINUX_3(CRASH_DEV_COUNT_FAILURE_PC,
-                                 local_crash_msg_count,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(CRASH_DEV_COUNT_FAILURE_PC, 0,
+                               local_crash_msg_count,
+                               DIAG_SEVERITY_ERR);
                 return;
         }
 
@@ -1571,8 +1595,8 @@ setup_crash_devices_work_queue(struct work_struct *work)
                               offsetof(struct spar_controlvm_channel_protocol,
                                        saved_crash_message_offset),
                               &local_crash_msg_offset, sizeof(u32)) < 0) {
-                POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(CRASH_DEV_CTRL_RD_FAILURE_PC, 0, 0,
+                               DIAG_SEVERITY_ERR);
                 return;
         }
 
@@ -1581,8 +1605,8 @@ setup_crash_devices_work_queue(struct work_struct *work)
                               local_crash_msg_offset,
                               &local_crash_bus_msg,
                               sizeof(struct controlvm_message)) < 0) {
-                POSTCODE_LINUX_2(CRASH_DEV_RD_BUS_FAIULRE_PC,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(CRASH_DEV_RD_BUS_FAILURE_PC, 0, 0,
+                               DIAG_SEVERITY_ERR);
                 return;
         }
 
@@ -1592,8 +1616,8 @@ setup_crash_devices_work_queue(struct work_struct *work)
                               sizeof(struct controlvm_message),
                               &local_crash_dev_msg,
                               sizeof(struct controlvm_message)) < 0) {
-                POSTCODE_LINUX_2(CRASH_DEV_RD_DEV_FAIULRE_PC,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(CRASH_DEV_RD_DEV_FAILURE_PC, 0, 0,
+                               DIAG_SEVERITY_ERR);
                 return;
         }
 
@@ -1601,8 +1625,8 @@ setup_crash_devices_work_queue(struct work_struct *work)
         if (local_crash_bus_msg.cmd.create_bus.channel_addr) {
                 bus_create(&local_crash_bus_msg);
         } else {
-                POSTCODE_LINUX_2(CRASH_DEV_BUS_NULL_FAILURE_PC,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(CRASH_DEV_BUS_NULL_FAILURE_PC, 0, 0,
+                               DIAG_SEVERITY_ERR);
                 return;
         }
 
@@ -1610,11 +1634,11 @@ setup_crash_devices_work_queue(struct work_struct *work)
         if (local_crash_dev_msg.cmd.create_device.channel_addr) {
                 my_device_create(&local_crash_dev_msg);
         } else {
-                POSTCODE_LINUX_2(CRASH_DEV_DEV_NULL_FAILURE_PC,
-                                 POSTCODE_SEVERITY_ERR);
+                POSTCODE_LINUX(CRASH_DEV_DEV_NULL_FAILURE_PC, 0, 0,
+                               DIAG_SEVERITY_ERR);
                 return;
         }
-        POSTCODE_LINUX_2(CRASH_DEV_EXIT_PC, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(CRASH_DEV_EXIT_PC, 0, 0, DIAG_SEVERITY_PRINT);
 }
 
 void
@@ -2119,8 +2143,6 @@ visorchipset_init(struct acpi_device *acpi_device)
         if (!addr)
                 goto error;
 
-        memset(&controlvm_payload_info, 0, sizeof(controlvm_payload_info));
-
         controlvm_channel = visorchannel_create_with_lock(addr, 0,
                                                           GFP_KERNEL, uuid);
         if (!controlvm_channel)
@@ -2152,11 +2174,12 @@ visorchipset_init(struct acpi_device *acpi_device)
 
         visorchipset_platform_device.dev.devt = major_dev;
         if (platform_device_register(&visorchipset_platform_device) < 0) {
-                POSTCODE_LINUX_2(DEVICE_REGISTER_FAILURE_PC, DIAG_SEVERITY_ERR);
+                POSTCODE_LINUX(DEVICE_REGISTER_FAILURE_PC, 0, 0,
+                               DIAG_SEVERITY_ERR);
                 err = -ENODEV;
                 goto error_cancel_work;
         }
-        POSTCODE_LINUX_2(CHIPSET_INIT_SUCCESS_PC, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(CHIPSET_INIT_SUCCESS_PC, 0, 0, DIAG_SEVERITY_PRINT);
 
         err = visorbus_init();
         if (err < 0)
@@ -2178,14 +2201,14 @@ error_destroy_channel:
         visorchannel_destroy(controlvm_channel);
 
 error:
-        POSTCODE_LINUX_3(CHIPSET_INIT_FAILURE_PC, err, POSTCODE_SEVERITY_ERR);
+        POSTCODE_LINUX(CHIPSET_INIT_FAILURE_PC, 0, err, DIAG_SEVERITY_ERR);
         return err;
 }
 
 static int
 visorchipset_exit(struct acpi_device *acpi_device)
 {
-        POSTCODE_LINUX_2(DRIVER_EXIT_PC, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(DRIVER_EXIT_PC, 0, 0, DIAG_SEVERITY_PRINT);
 
         visorbus_exit();
 
@@ -2196,7 +2219,7 @@ visorchipset_exit(struct acpi_device *acpi_device)
 
         visorchipset_file_cleanup(visorchipset_platform_device.dev.devt);
         platform_device_unregister(&visorchipset_platform_device);
-        POSTCODE_LINUX_2(DRIVER_EXIT_PC, POSTCODE_SEVERITY_INFO);
+        POSTCODE_LINUX(DRIVER_EXIT_PC, 0, 0, DIAG_SEVERITY_PRINT);
 
         return 0;
 }
diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h
index 86e695d5a441..674a88b657d3 100644
--- a/drivers/staging/unisys/visorbus/vmcallinterface.h
+++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
@@ -92,15 +92,6 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples  */
 #define ISSUE_IO_VMCALL(method, param, result) \
         (result = unisys_vmcall(method, (param) & 0xFFFFFFFF,   \
                                 (param) >> 32))
-#define ISSUE_IO_EXTENDED_VMCALL(method, param1, param2, param3) \
-        unisys_extended_vmcall(method, param1, param2, param3)
-
-    /* The following uses VMCALL_POST_CODE_LOGEVENT interface but is currently
-     * not used much
-     */
-#define ISSUE_IO_VMCALL_POSTCODE_SEVERITY(postcode, severity)           \
-        ISSUE_IO_EXTENDED_VMCALL(VMCALL_POST_CODE_LOGEVENT, severity,   \
-                                 MDS_APPOS, postcode)
 
 /* Structures for IO VMCALLs */
 
@@ -117,118 +108,53 @@ struct vmcall_io_controlvm_addr_params {
 
 /******* INFO ON ISSUE_POSTCODE_LINUX() BELOW *******/
 enum driver_pc {                /* POSTCODE driver identifier tuples */
-        /* visorchipset driver files */
-        VISOR_CHIPSET_PC = 0xA0,
-        VISOR_CHIPSET_PC_controlvm_c = 0xA1,
-        VISOR_CHIPSET_PC_controlvm_cm2 = 0xA2,
-        VISOR_CHIPSET_PC_controlvm_direct_c = 0xA3,
-        VISOR_CHIPSET_PC_file_c = 0xA4,
-        VISOR_CHIPSET_PC_parser_c = 0xA5,
-        VISOR_CHIPSET_PC_testing_c = 0xA6,
-        VISOR_CHIPSET_PC_visorchipset_main_c = 0xA7,
-        VISOR_CHIPSET_PC_visorswitchbus_c = 0xA8,
         /* visorbus driver files */
-        VISOR_BUS_PC = 0xB0,
-        VISOR_BUS_PC_businst_attr_c = 0xB1,
-        VISOR_BUS_PC_channel_attr_c = 0xB2,
-        VISOR_BUS_PC_devmajorminor_attr_c = 0xB3,
-        VISOR_BUS_PC_visorbus_main_c = 0xB4,
-        /* visorclientbus driver files */
-        VISOR_CLIENT_BUS_PC = 0xC0,
-        VISOR_CLIENT_BUS_PC_visorclientbus_main_c = 0xC1,
-        /* virt hba driver files */
-        VIRT_HBA_PC = 0xC2,
-        VIRT_HBA_PC_virthba_c = 0xC3,
-        /* virtpci driver files */
-        VIRT_PCI_PC = 0xC4,
-        VIRT_PCI_PC_virtpci_c = 0xC5,
-        /* virtnic driver files */
-        VIRT_NIC_PC = 0xC6,
-        VIRT_NIC_P_virtnic_c = 0xC7,
-        /* uislib driver files */
-        UISLIB_PC = 0xD0,
-        UISLIB_PC_uislib_c = 0xD1,
-        UISLIB_PC_uisqueue_c = 0xD2,
-        /* 0xD3 RESERVED */
-        UISLIB_PC_uisutils_c = 0xD4,
+        VISOR_BUS_PC = 0xF0,
+        VISOR_BUS_PC_visorbus_main_c = 0xFF,
+        VISOR_BUS_PC_visorchipset_c = 0xFE,
 };
 
 enum event_pc {                 /* POSTCODE event identifier tuples */
-        ATTACH_PORT_ENTRY_PC = 0x001,
-        ATTACH_PORT_FAILURE_PC = 0x002,
-        ATTACH_PORT_SUCCESS_PC = 0x003,
-        BUS_FAILURE_PC = 0x004,
-        BUS_CREATE_ENTRY_PC = 0x005,
-        BUS_CREATE_FAILURE_PC = 0x006,
-        BUS_CREATE_EXIT_PC = 0x007,
-        BUS_CONFIGURE_ENTRY_PC = 0x008,
-        BUS_CONFIGURE_FAILURE_PC = 0x009,
-        BUS_CONFIGURE_EXIT_PC = 0x00A,
-        CHIPSET_INIT_ENTRY_PC = 0x00B,
-        CHIPSET_INIT_SUCCESS_PC = 0x00C,
-        CHIPSET_INIT_FAILURE_PC = 0x00D,
-        CHIPSET_INIT_EXIT_PC = 0x00E,
-        CREATE_WORKQUEUE_PC = 0x00F,
-        CREATE_WORKQUEUE_FAILED_PC = 0x0A0,
-        CONTROLVM_INIT_FAILURE_PC = 0x0A1,
-        DEVICE_CREATE_ENTRY_PC = 0x0A2,
-        DEVICE_CREATE_FAILURE_PC = 0x0A3,
-        DEVICE_CREATE_SUCCESS_PC = 0x0A4,
-        DEVICE_CREATE_EXIT_PC = 0x0A5,
-        DEVICE_ADD_PC = 0x0A6,
-        DEVICE_REGISTER_FAILURE_PC = 0x0A7,
-        DEVICE_CHANGESTATE_ENTRY_PC = 0x0A8,
-        DEVICE_CHANGESTATE_FAILURE_PC = 0x0A9,
-        DEVICE_CHANGESTATE_EXIT_PC = 0x0AA,
-        DRIVER_ENTRY_PC = 0x0AB,
-        DRIVER_EXIT_PC = 0x0AC,
-        MALLOC_FAILURE_PC = 0x0AD,
-        QUEUE_DELAYED_WORK_PC = 0x0AE,
-        /* 0x0B7 RESERVED */
-        VBUS_CHANNEL_ENTRY_PC = 0x0B8,
-        VBUS_CHANNEL_FAILURE_PC = 0x0B9,
-        VBUS_CHANNEL_EXIT_PC = 0x0BA,
-        VHBA_CREATE_ENTRY_PC = 0x0BB,
-        VHBA_CREATE_FAILURE_PC = 0x0BC,
-        VHBA_CREATE_EXIT_PC = 0x0BD,
-        VHBA_CREATE_SUCCESS_PC = 0x0BE,
-        VHBA_COMMAND_HANDLER_PC = 0x0BF,
-        VHBA_PROBE_ENTRY_PC = 0x0C0,
-        VHBA_PROBE_FAILURE_PC = 0x0C1,
-        VHBA_PROBE_EXIT_PC = 0x0C2,
-        VNIC_CREATE_ENTRY_PC = 0x0C3,
-        VNIC_CREATE_FAILURE_PC = 0x0C4,
-        VNIC_CREATE_SUCCESS_PC = 0x0C5,
-        VNIC_PROBE_ENTRY_PC = 0x0C6,
-        VNIC_PROBE_FAILURE_PC = 0x0C7,
-        VNIC_PROBE_EXIT_PC = 0x0C8,
-        VPCI_CREATE_ENTRY_PC = 0x0C9,
-        VPCI_CREATE_FAILURE_PC = 0x0CA,
-        VPCI_CREATE_EXIT_PC = 0x0CB,
-        VPCI_PROBE_ENTRY_PC = 0x0CC,
-        VPCI_PROBE_FAILURE_PC = 0x0CD,
-        VPCI_PROBE_EXIT_PC = 0x0CE,
-        CRASH_DEV_ENTRY_PC = 0x0CF,
-        CRASH_DEV_EXIT_PC = 0x0D0,
-        CRASH_DEV_HADDR_NULL = 0x0D1,
-        CRASH_DEV_CONTROLVM_NULL = 0x0D2,
-        CRASH_DEV_RD_BUS_FAIULRE_PC = 0x0D3,
-        CRASH_DEV_RD_DEV_FAIULRE_PC = 0x0D4,
-        CRASH_DEV_BUS_NULL_FAILURE_PC = 0x0D5,
-        CRASH_DEV_DEV_NULL_FAILURE_PC = 0x0D6,
-        CRASH_DEV_CTRL_RD_FAILURE_PC = 0x0D7,
-        CRASH_DEV_COUNT_FAILURE_PC = 0x0D8,
-        SAVE_MSG_BUS_FAILURE_PC = 0x0D9,
-        SAVE_MSG_DEV_FAILURE_PC = 0x0DA,
-        CALLHOME_INIT_FAILURE_PC = 0x0DB
+        BUS_CREATE_ENTRY_PC = 0x001,
+        BUS_CREATE_FAILURE_PC = 0x002,
+        BUS_CREATE_EXIT_PC = 0x003,
+        BUS_CONFIGURE_ENTRY_PC = 0x004,
+        BUS_CONFIGURE_FAILURE_PC = 0x005,
+        BUS_CONFIGURE_EXIT_PC = 0x006,
+        CHIPSET_INIT_ENTRY_PC = 0x007,
+        CHIPSET_INIT_SUCCESS_PC = 0x008,
+        CHIPSET_INIT_FAILURE_PC = 0x009,
+        CHIPSET_INIT_EXIT_PC = 0x00A,
+        CONTROLVM_INIT_FAILURE_PC = 0x00B,
+        DEVICE_CREATE_ENTRY_PC = 0x00C,
+        DEVICE_CREATE_FAILURE_PC = 0x00D,
+        DEVICE_CREATE_SUCCESS_PC = 0x00E,
+        DEVICE_CREATE_EXIT_PC = 0x00F,
+        DEVICE_ADD_PC = 0x010,
+        DEVICE_REGISTER_FAILURE_PC = 0x011,
+        DEVICE_CHANGESTATE_FAILURE_PC = 0x012,
+        DRIVER_ENTRY_PC = 0x013,
+        DRIVER_EXIT_PC = 0x014,
+        MALLOC_FAILURE_PC = 0x015,
+        CRASH_DEV_ENTRY_PC = 0x016,
+        CRASH_DEV_EXIT_PC = 0x017,
+        CRASH_DEV_RD_BUS_FAILURE_PC = 0x018,
+        CRASH_DEV_RD_DEV_FAILURE_PC = 0x019,
+        CRASH_DEV_BUS_NULL_FAILURE_PC = 0x01A,
+        CRASH_DEV_DEV_NULL_FAILURE_PC = 0x01B,
+        CRASH_DEV_CTRL_RD_FAILURE_PC = 0x01C,
+        CRASH_DEV_COUNT_FAILURE_PC = 0x01D,
+        SAVE_MSG_BUS_FAILURE_PC = 0x01E,
+        SAVE_MSG_DEV_FAILURE_PC = 0x01F,
 };
 
-#define POSTCODE_SEVERITY_ERR DIAG_SEVERITY_ERR
-#define POSTCODE_SEVERITY_WARNING DIAG_SEVERITY_WARNING
-/* TODO-> Info currently doesn't show, so we set info=warning */
-#define POSTCODE_SEVERITY_INFO DIAG_SEVERITY_PRINT
-
-/* example call of POSTCODE_LINUX_2(VISOR_CHIPSET_PC, POSTCODE_SEVERITY_ERR);
+/* Write a 64-bit value to the hypervisor's log file
+ * POSTCODE_LINUX generates a value in the form 0xAABBBCCCDDDDEEEE where
+ *      A is an identifier for the file logging the postcode
+ *      B is an identifier for the event logging the postcode
+ *      C is the line logging the postcode
+ *      D is additional information the caller wants to log
+ *      E is additional information the caller wants to log
  * Please also note that the resulting postcode is in hex, so if you are
  * searching for the __LINE__ number, convert it first to decimal.  The line
  * number combined with driver and type of call, will allow you to track down
@@ -236,35 +162,16 @@ enum event_pc {			/* POSTCODE event identifier tuples */
  * entered/exited from.
  */
 
-/* BASE FUNCTIONS */
-#define POSTCODE_LINUX_A(DRIVER_PC, EVENT_PC, pc32bit, severity)        \
-do {                                                                    \
-        unsigned long long post_code_temp;                              \
-        post_code_temp = (((u64)DRIVER_PC) << 56) | (((u64)EVENT_PC) << 44) | \
-                ((((u64)__LINE__) & 0xFFF) << 32) |                     \
-                (((u64)pc32bit) & 0xFFFFFFFF);                          \
-        ISSUE_IO_VMCALL_POSTCODE_SEVERITY(post_code_temp, severity);    \
-} while (0)
-
-#define POSTCODE_LINUX_B(DRIVER_PC, EVENT_PC, pc16bit1, pc16bit2, severity) \
+#define POSTCODE_LINUX(EVENT_PC, pc16bit1, pc16bit2, severity)          \
 do {                                                                    \
         unsigned long long post_code_temp;                              \
-        post_code_temp = (((u64)DRIVER_PC) << 56) | (((u64)EVENT_PC) << 44) | \
+        post_code_temp = (((u64)CURRENT_FILE_PC) << 56) |               \
+                (((u64)EVENT_PC) << 44) |                               \
                 ((((u64)__LINE__) & 0xFFF) << 32) |                     \
                 ((((u64)pc16bit1) & 0xFFFF) << 16) |                    \
                 (((u64)pc16bit2) & 0xFFFF);                             \
-        ISSUE_IO_VMCALL_POSTCODE_SEVERITY(post_code_temp, severity);    \
+        unisys_extended_vmcall(VMCALL_POST_CODE_LOGEVENT, severity,     \
+                               MDS_APPOS, post_code_temp);              \
 } while (0)
 
-/* MOST COMMON */
-#define POSTCODE_LINUX_2(EVENT_PC, severity)                            \
-        POSTCODE_LINUX_A(CURRENT_FILE_PC, EVENT_PC, 0x0000, severity)
-
-#define POSTCODE_LINUX_3(EVENT_PC, pc32bit, severity)                   \
-        POSTCODE_LINUX_A(CURRENT_FILE_PC, EVENT_PC, pc32bit, severity)
-
-#define POSTCODE_LINUX_4(EVENT_PC, pc16bit1, pc16bit2, severity)        \
-        POSTCODE_LINUX_B(CURRENT_FILE_PC, EVENT_PC, pc16bit1,           \
-                         pc16bit2, severity)
-
 #endif /* __IOMONINTF_H__ */
diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c
index 6f94b646f7c5..949cce680b29 100644
--- a/drivers/staging/unisys/visorinput/visorinput.c
+++ b/drivers/staging/unisys/visorinput/visorinput.c
@@ -409,6 +409,9 @@ devdata_create(struct visor_device *dev, enum visorinput_device_type devtype)
                 if (!devdata->visorinput_dev)
                         goto cleanups_register;
                 break;
+        default:
+                /* No other input devices supported */
+                break;
         }
 
         dev_set_drvdata(&dev->device, devdata);
@@ -653,6 +656,9 @@ visorinput_channel_interrupt(struct visor_device *dev)
                         input_report_rel(visorinput_dev, REL_WHEEL, -1);
                         input_sync(visorinput_dev);
                         break;
+                default:
+                        /* Unsupported input action */
+                        break;
                 }
         }
 }
diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c
index f8a584bf4a77..c1f674f5268c 100644
--- a/drivers/staging/unisys/visornic/visornic_main.c
+++ b/drivers/staging/unisys/visornic/visornic_main.c
@@ -1371,7 +1371,7 @@ static ssize_t info_debugfs_read(struct file *file, char __user *buf,
                                      " num_rcv_bufs = %d\n",
                                      devdata->num_rcv_bufs);
                 str_pos += scnprintf(vbuf + str_pos, len - str_pos,
-                                     " max_oustanding_next_xmits = %lu\n",
+                                     " max_outstanding_next_xmits = %lu\n",
                                     devdata->max_outstanding_net_xmits);
                 str_pos += scnprintf(vbuf + str_pos, len - str_pos,
                                      " upper_threshold_net_xmits = %lu\n",
diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
index 9676fb29075a..e61e4ca064a8 100644
--- a/drivers/staging/vc04_services/Kconfig
+++ b/drivers/staging/vc04_services/Kconfig
@@ -1,9 +1,10 @@
-config BCM2708_VCHIQ
+config BCM2835_VCHIQ
         tristate "Videocore VCHIQ"
-        depends on RASPBERRYPI_FIRMWARE && BROKEN
+        depends on HAS_DMA
+        depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
         default y
         help
                 Kernel to VideoCore communication interface for the
-                BCM2708 family of products.
+                BCM2835 family of products.
                 Defaults to Y when the Broadcom Videocore services
                 are included in the build, N otherwise.
diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
index 90ab4781df2c..1a9e742ee40d 100644
--- a/drivers/staging/vc04_services/Makefile
+++ b/drivers/staging/vc04_services/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_BCM2708_VCHIQ)     += vchiq.o
+obj-$(CONFIG_BCM2835_VCHIQ)     += vchiq.o
 
 vchiq-objs := \
    interface/vchiq_arm/vchiq_core.o  \
diff --git a/drivers/staging/vc04_services/interface/vchi/TODO b/drivers/staging/vc04_services/interface/vchi/TODO
new file mode 100644
index 000000000000..03aa65183b25
--- /dev/null
+++ b/drivers/staging/vc04_services/interface/vchi/TODO
@@ -0,0 +1,50 @@
+1) Port to aarch64
+
+This driver won't be very useful unless we also have it working on
+Raspberry Pi 3.  This requires, at least:
+
+  - Figure out an alternative to the dmac_map_area() hack.
+
+  - Decide what to use instead of dsb().
+
+  - Do something about (int) cast of bulk->data in
+    vchiq_bulk_transfer().
+
+    bulk->data is a bus address going across to the firmware.  We know
+    our bus addresses are <32bit.
+
+2) Write a DT binding doc and get the corresponding DT node merged to
+   bcm2835.
+
+This will let the driver probe when enabled.
+
+3) Import drivers using VCHI.
+
+VCHI is just a tool to let drivers talk to the firmware.  Here are
+some of the ones we want:
+
+  - vc_mem (https://github.com/raspberrypi/linux/blob/rpi-4.4.y/drivers/char/broadcom/vc_mem.c)
+
+  This driver is what the vcdbg userspace program uses to set up its
+  requests to the firmware, which are transmitted across VCHIQ.  vcdbg
+  is really useful for debugging firmware interactions.
+
+  - bcm2835-camera (https://github.com/raspberrypi/linux/tree/rpi-4.4.y/drivers/media/platform/bcm2835)
+
+  This driver will let us get images from the camera using the MMAL
+  protocol over VCHI.
+
+  - VCSM (https://github.com/raspberrypi/linux/tree/rpi-4.4.y/drivers/char/broadcom/vc_sm)
+
+  This driver is used for talking about regions of VC memory across
+  firmware protocols including VCHI.  We'll want to extend this driver
+  to manage these buffers as dmabufs so that we can zero-copy import
+  camera images into vc4 for rendering/display.
+
+4) Garbage-collect unused code
+
+One of the reasons this driver wasn't upstreamed previously was that
+there's a lot code that got built that's probably unnecessary these
+days.  Once we have the set of VCHI-using drivers we want in tree, we
+should be able to do a sweep of the code to see what's left that's
+unused.
diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
index 1b17e98f7379..d6937288210c 100644
--- a/drivers/staging/vc04_services/interface/vchi/vchi.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
@@ -226,25 +226,12 @@ extern int32_t vchi_service_set_option( const VCHI_SERVICE_HANDLE_T handle,
                                         int value);
 
 // Routine to send a message across a service
-extern int32_t vchi_msg_queue( VCHI_SERVICE_HANDLE_T handle,
-                               const void *data,
-                               uint32_t data_size,
-                               VCHI_FLAGS_T flags,
-                               void *msg_handle );
-
-// scatter-gather (vector) and send message
-int32_t vchi_msg_queuev_ex( VCHI_SERVICE_HANDLE_T handle,
-                            VCHI_MSG_VECTOR_EX_T *vector,
-                            uint32_t count,
-                            VCHI_FLAGS_T flags,
-                            void *msg_handle );
-
-// legacy scatter-gather (vector) and send message, only handles pointers
-int32_t vchi_msg_queuev( VCHI_SERVICE_HANDLE_T handle,
-                         VCHI_MSG_VECTOR_T *vector,
-                         uint32_t count,
-                         VCHI_FLAGS_T flags,
-                         void *msg_handle );
+extern int32_t
+        vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle,
+                       ssize_t (*copy_callback)(void *context, void *dest,
+                                                size_t offset, size_t maxsize),
+                       void *context,
+                       uint32_t data_size);
 
 // Routine to receive a msg from a service
 // Dequeue is equivalent to hold, copy into client buffer, release
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h
index ad398bae6ee4..21adf89a9065 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq.h
@@ -37,4 +37,15 @@
 #include "vchiq_if.h"
 #include "vchiq_util.h"
 
+/* Do this so that we can test-build the code on non-rpi systems */
+#if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)
+
+#else
+
+#ifndef dsb
+#define dsb(a)
+#endif
+
+#endif  /* IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE) */
+
 #endif
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 1091b9f1dd07..2b500d85cebc 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
@@ -45,16 +45,8 @@
 #include <asm/pgtable.h>
 #include <soc/bcm2835/raspberrypi-firmware.h>
 
-#define dmac_map_area                   __glue(_CACHE,_dma_map_area)
-#define dmac_unmap_area                 __glue(_CACHE,_dma_unmap_area)
-
-extern void dmac_map_area(const void *, size_t, int);
-extern void dmac_unmap_area(const void *, size_t, int);
-
 #define TOTAL_SLOTS (VCHIQ_SLOT_ZERO_SLOTS + 2 * 32)
 
-#define VCHIQ_ARM_ADDRESS(x) ((void *)((char *)x + g_virt_to_bus_offset))
-
 #include "vchiq_arm.h"
 #include "vchiq_2835.h"
 #include "vchiq_connected.h"
@@ -70,13 +62,25 @@ typedef struct vchiq_2835_state_struct {
    VCHIQ_ARM_STATE_T arm_state;
 } VCHIQ_2835_ARM_STATE_T;
 
+struct vchiq_pagelist_info {
+        PAGELIST_T *pagelist;
+        size_t pagelist_buffer_size;
+        dma_addr_t dma_addr;
+        enum dma_data_direction dma_dir;
+        unsigned int num_pages;
+        unsigned int pages_need_release;
+        struct page **pages;
+        struct scatterlist *scatterlist;
+        unsigned int scatterlist_mapped;
+};
+
 static void __iomem *g_regs;
 static unsigned int g_cache_line_size = sizeof(CACHE_LINE_SIZE);
 static unsigned int g_fragments_size;
 static char *g_fragments_base;
 static char *g_free_fragments;
 static struct semaphore g_free_fragments_sema;
-static unsigned long g_virt_to_bus_offset;
+static struct device *g_dev;
 
 extern int vchiq_arm_log_level;
 
@@ -85,12 +89,13 @@ static DEFINE_SEMAPHORE(g_free_fragments_mutex);
 static irqreturn_t
 vchiq_doorbell_irq(int irq, void *dev_id);
 
-static int
+static struct vchiq_pagelist_info *
 create_pagelist(char __user *buf, size_t count, unsigned short type,
-                struct task_struct *task, PAGELIST_T ** ppagelist);
+                struct task_struct *task);
 
 static void
-free_pagelist(PAGELIST_T *pagelist, int actual);
+free_pagelist(struct vchiq_pagelist_info *pagelistinfo,
+              int actual);
 
 int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
 {
@@ -104,7 +109,14 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
         int slot_mem_size, frag_mem_size;
         int err, irq, i;
 
-        g_virt_to_bus_offset = virt_to_dma(dev, (void *)0);
+        /*
+         * VCHI messages between the CPU and firmware use
+         * 32-bit bus addresses.
+         */
+        err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
+
+        if (err < 0)
+                return err;
 
         (void)of_property_read_u32(dev->of_node, "cache-line-size",
                                    &g_cache_line_size);
@@ -121,7 +133,7 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
                 return -ENOMEM;
         }
 
-        WARN_ON(((int)slot_mem & (PAGE_SIZE - 1)) != 0);
+        WARN_ON(((unsigned long)slot_mem & (PAGE_SIZE - 1)) != 0);
 
         vchiq_slot_zero = vchiq_init_slots(slot_mem, slot_mem_size);
         if (!vchiq_slot_zero)
@@ -173,9 +185,10 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
                 return err ? : -ENXIO;
         }
 
+        g_dev = dev;
         vchiq_log_info(vchiq_arm_log_level,
-                "vchiq_init - done (slots %x, phys %pad)",
-                (unsigned int)vchiq_slot_zero, &slot_phys);
+                "vchiq_init - done (slots %pK, phys %pad)",
+                vchiq_slot_zero, &slot_phys);
 
         vchiq_call_connected_callbacks();
 
@@ -213,47 +226,37 @@ remote_event_signal(REMOTE_EVENT_T *event)
 
         event->fired = 1;
 
-        dsb();         /* data barrier operation */
+        dsb(sy);         /* data barrier operation */
 
         if (event->armed)
                 writel(0, g_regs + BELL2); /* trigger vc interrupt */
 }
 
-int
-vchiq_copy_from_user(void *dst, const void *src, int size)
-{
-        if ((uint32_t)src < TASK_SIZE) {
-                return copy_from_user(dst, src, size);
-        } else {
-                memcpy(dst, src, size);
-                return 0;
-        }
-}
-
 VCHIQ_STATUS_T
 vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk, VCHI_MEM_HANDLE_T memhandle,
         void *offset, int size, int dir)
 {
-        PAGELIST_T *pagelist;
-        int ret;
+        struct vchiq_pagelist_info *pagelistinfo;
 
         WARN_ON(memhandle != VCHI_MEM_HANDLE_INVALID);
 
-        ret = create_pagelist((char __user *)offset, size,
-                        (dir == VCHIQ_BULK_RECEIVE)
-                        ? PAGELIST_READ
-                        : PAGELIST_WRITE,
-                        current,
-                        &pagelist);
-        if (ret != 0)
+        pagelistinfo = create_pagelist((char __user *)offset, size,
+                                       (dir == VCHIQ_BULK_RECEIVE)
+                                       ? PAGELIST_READ
+                                       : PAGELIST_WRITE,
+                                       current);
+
+        if (!pagelistinfo)
                 return VCHIQ_ERROR;
 
         bulk->handle = memhandle;
-        bulk->data = VCHIQ_ARM_ADDRESS(pagelist);
+        bulk->data = (void *)(unsigned long)pagelistinfo->dma_addr;
 
-        /* Store the pagelist address in remote_data, which isn't used by the
-           slave. */
-        bulk->remote_data = pagelist;
+        /*
+         * Store the pagelistinfo address in remote_data,
+         * which isn't used by the slave.
+         */
+        bulk->remote_data = pagelistinfo;
 
         return VCHIQ_SUCCESS;
 }
@@ -262,7 +265,8 @@ void
 vchiq_complete_bulk(VCHIQ_BULK_T *bulk)
 {
         if (bulk && bulk->remote_data && bulk->actual)
-                free_pagelist((PAGELIST_T *)bulk->remote_data, bulk->actual);
+                free_pagelist((struct vchiq_pagelist_info *)bulk->remote_data,
+                              bulk->actual);
 }
 
 void
@@ -350,57 +354,93 @@ vchiq_doorbell_irq(int irq, void *dev_id)
         return ret;
 }
 
+static void
+cleaup_pagelistinfo(struct vchiq_pagelist_info *pagelistinfo)
+{
+        if (pagelistinfo->scatterlist_mapped) {
+                dma_unmap_sg(g_dev, pagelistinfo->scatterlist,
+                             pagelistinfo->num_pages, pagelistinfo->dma_dir);
+        }
+
+        if (pagelistinfo->pages_need_release) {
+                unsigned int i;
+
+                for (i = 0; i < pagelistinfo->num_pages; i++)
+                        put_page(pagelistinfo->pages[i]);
+        }
+
+        dma_free_coherent(g_dev, pagelistinfo->pagelist_buffer_size,
+                          pagelistinfo->pagelist, pagelistinfo->dma_addr);
+}
+
 /* 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.
-
-** N.B. This implementation plays slightly fast and loose with the Linux
-** driver programming rules, e.g. its use of dmac_map_area instead of
-** dma_map_single, but it isn't a multi-platform driver and it benefits
-** from increased speed as a result.
 */
 
-static int
+static struct vchiq_pagelist_info *
 create_pagelist(char __user *buf, size_t count, unsigned short type,
-        struct task_struct *task, PAGELIST_T ** ppagelist)
+                struct task_struct *task)
 {
         PAGELIST_T *pagelist;
+        struct vchiq_pagelist_info *pagelistinfo;
         struct page **pages;
-        unsigned long *addrs;
-        unsigned int num_pages, offset, i;
-        char *addr, *base_addr, *next_addr;
-        int run, addridx, actual_pages;
-        unsigned long *need_release;
-
-        offset = (unsigned int)buf & (PAGE_SIZE - 1);
+        u32 *addrs;
+        unsigned int num_pages, offset, i, k;
+        int actual_pages;
+        size_t pagelist_size;
+        struct scatterlist *scatterlist, *sg;
+        int dma_buffers;
+        dma_addr_t dma_addr;
+
+        offset = ((unsigned int)(unsigned long)buf & (PAGE_SIZE - 1));
         num_pages = (count + offset + PAGE_SIZE - 1) / PAGE_SIZE;
 
-        *ppagelist = NULL;
+        pagelist_size = sizeof(PAGELIST_T) +
+                        (num_pages * sizeof(u32)) +
+                        (num_pages * sizeof(pages[0]) +
+                        (num_pages * sizeof(struct scatterlist))) +
+                        sizeof(struct vchiq_pagelist_info);
 
         /* Allocate enough storage to hold the page pointers and the page
         ** list
         */
-        pagelist = kmalloc(sizeof(PAGELIST_T) +
-                           (num_pages * sizeof(unsigned long)) +
-                           sizeof(unsigned long) +
-                           (num_pages * sizeof(pages[0])),
-                           GFP_KERNEL);
-
-        vchiq_log_trace(vchiq_arm_log_level,
-                "create_pagelist - %x", (unsigned int)pagelist);
+        pagelist = dma_zalloc_coherent(g_dev,
+                                       pagelist_size,
+                                       &dma_addr,
+                                       GFP_KERNEL);
+
+        vchiq_log_trace(vchiq_arm_log_level, "create_pagelist - %pK",
+                        pagelist);
         if (!pagelist)
-                return -ENOMEM;
+                return NULL;
 
-        addrs = pagelist->addrs;
-        need_release = (unsigned long *)(addrs + num_pages);
-        pages = (struct page **)(addrs + num_pages + 1);
+        addrs           = pagelist->addrs;
+        pages           = (struct page **)(addrs + num_pages);
+        scatterlist     = (struct scatterlist *)(pages + num_pages);
+        pagelistinfo    = (struct vchiq_pagelist_info *)
+                          (scatterlist + num_pages);
+
+        pagelist->length = count;
+        pagelist->type = type;
+        pagelist->offset = offset;
+
+        /* Populate the fields of the pagelistinfo structure */
+        pagelistinfo->pagelist = pagelist;
+        pagelistinfo->pagelist_buffer_size = pagelist_size;
+        pagelistinfo->dma_addr = dma_addr;
+        pagelistinfo->dma_dir =  (type == PAGELIST_WRITE) ?
+                                  DMA_TO_DEVICE : DMA_FROM_DEVICE;
+        pagelistinfo->num_pages = num_pages;
+        pagelistinfo->pages_need_release = 0;
+        pagelistinfo->pages = pages;
+        pagelistinfo->scatterlist = scatterlist;
+        pagelistinfo->scatterlist_mapped = 0;
 
         if (is_vmalloc_addr(buf)) {
-                int dir = (type == PAGELIST_WRITE) ?
-                        DMA_TO_DEVICE : DMA_FROM_DEVICE;
                 unsigned long length = count;
                 unsigned int off = offset;
 
@@ -413,14 +453,13 @@ create_pagelist(char __user *buf, size_t count, unsigned short type,
                         if (bytes > length)
                                 bytes = length;
                         pages[actual_pages] = pg;
-                        dmac_map_area(page_address(pg) + off, bytes, dir);
                         length -= bytes;
                         off = 0;
                 }
-                *need_release = 0; /* do not try and release vmalloc pages */
+                /* do not try and release vmalloc pages */
         } else {
                 down_read(&task->mm->mmap_sem);
-                actual_pages = get_user_pages(task, task->mm,
+                actual_pages = get_user_pages(
                                           (unsigned long)buf & ~(PAGE_SIZE - 1),
                                           num_pages,
                                           (type == PAGELIST_READ) ? FOLL_WRITE : 0,
@@ -438,44 +477,59 @@ create_pagelist(char __user *buf, size_t count, unsigned short type,
                         while (actual_pages > 0)
                         {
                                 actual_pages--;
-                                page_cache_release(pages[actual_pages]);
+                                put_page(pages[actual_pages]);
                         }
-                        kfree(pagelist);
-                        if (actual_pages == 0)
-                                actual_pages = -ENOMEM;
-                        return actual_pages;
+                        cleaup_pagelistinfo(pagelistinfo);
+                        return NULL;
                 }
-                *need_release = 1; /* release user pages */
+                 /* release user pages */
+                pagelistinfo->pages_need_release = 1;
         }
 
-        pagelist->length = count;
-        pagelist->type = type;
-        pagelist->offset = offset;
-
-        /* Group the pages into runs of contiguous pages */
-
-        base_addr = VCHIQ_ARM_ADDRESS(page_address(pages[0]));
-        next_addr = base_addr + PAGE_SIZE;
-        addridx = 0;
-        run = 0;
+        /*
+         * Initialize the scatterlist so that the magic cookie
+         *  is filled if debugging is enabled
+         */
+        sg_init_table(scatterlist, num_pages);
+        /* Now set the pages for each scatterlist */
+        for (i = 0; i < num_pages; i++)
+                sg_set_page(scatterlist + i, pages[i], PAGE_SIZE, 0);
+
+        dma_buffers = dma_map_sg(g_dev,
+                                 scatterlist,
+                                 num_pages,
+                                 pagelistinfo->dma_dir);
+
+        if (dma_buffers == 0) {
+                cleaup_pagelistinfo(pagelistinfo);
+                return NULL;
+        }
 
-        for (i = 1; i < num_pages; i++) {
-                addr = VCHIQ_ARM_ADDRESS(page_address(pages[i]));
-                if ((addr == next_addr) && (run < (PAGE_SIZE - 1))) {
-                        next_addr += PAGE_SIZE;
-                        run++;
+        pagelistinfo->scatterlist_mapped = 1;
+
+        /* Combine adjacent blocks for performance */
+        k = 0;
+        for_each_sg(scatterlist, sg, dma_buffers, i) {
+                u32 len = sg_dma_len(sg);
+                u32 addr = sg_dma_address(sg);
+
+                /* Note: addrs is the address + page_count - 1
+                 * The firmware expects the block to be page
+                 * aligned and a multiple of the page size
+                 */
+                WARN_ON(len == 0);
+                WARN_ON(len & ~PAGE_MASK);
+                WARN_ON(addr & ~PAGE_MASK);
+                if (k > 0 &&
+                    ((addrs[k - 1] & PAGE_MASK) |
+                        ((addrs[k - 1] & ~PAGE_MASK) + 1) << PAGE_SHIFT)
+                    == addr) {
+                        addrs[k - 1] += (len >> PAGE_SHIFT);
                 } else {
-                        addrs[addridx] = (unsigned long)base_addr + run;
-                        addridx++;
-                        base_addr = addr;
-                        next_addr = addr + PAGE_SIZE;
-                        run = 0;
+                        addrs[k++] = addr | ((len >> PAGE_SHIFT) - 1);
                 }
         }
 
-        addrs[addridx] = (unsigned long)base_addr + run;
-        addridx++;
-
         /* Partial cache lines (fragments) require special measures */
         if ((type == PAGELIST_READ) &&
                 ((pagelist->offset & (g_cache_line_size - 1)) ||
@@ -484,8 +538,8 @@ create_pagelist(char __user *buf, size_t count, unsigned short type,
                 char *fragments;
 
                 if (down_interruptible(&g_free_fragments_sema) != 0) {
-                        kfree(pagelist);
-                        return -EINTR;
+                        cleaup_pagelistinfo(pagelistinfo);
+                        return NULL;
                 }
 
                 WARN_ON(g_free_fragments == NULL);
@@ -499,29 +553,28 @@ create_pagelist(char __user *buf, size_t count, unsigned short type,
                         (fragments - g_fragments_base) / g_fragments_size;
         }
 
-        dmac_flush_range(pagelist, addrs + num_pages);
-
-        *ppagelist = pagelist;
-
-        return 0;
+        return pagelistinfo;
 }
 
 static void
-free_pagelist(PAGELIST_T *pagelist, int actual)
+free_pagelist(struct vchiq_pagelist_info *pagelistinfo,
+              int actual)
 {
-        unsigned long *need_release;
-        struct page **pages;
-        unsigned int num_pages, i;
-
-        vchiq_log_trace(vchiq_arm_log_level,
-                "free_pagelist - %x, %d", (unsigned int)pagelist, actual);
+        unsigned int i;
+        PAGELIST_T *pagelist   = pagelistinfo->pagelist;
+        struct page **pages    = pagelistinfo->pages;
+        unsigned int num_pages = pagelistinfo->num_pages;
 
-        num_pages =
-                (pagelist->length + pagelist->offset + PAGE_SIZE - 1) /
-                PAGE_SIZE;
+        vchiq_log_trace(vchiq_arm_log_level, "free_pagelist - %pK, %d",
+                        pagelistinfo->pagelist, actual);
 
-        need_release = (unsigned long *)(pagelist->addrs + num_pages);
-        pages = (struct page **)(pagelist->addrs + num_pages + 1);
+        /*
+         * NOTE: dma_unmap_sg must be called before the
+         * cpu can touch any of the data/pages.
+         */
+        dma_unmap_sg(g_dev, pagelistinfo->scatterlist,
+                     pagelistinfo->num_pages, pagelistinfo->dma_dir);
+        pagelistinfo->scatterlist_mapped = 0;
 
         /* Deal with any partial cache lines (fragments) */
         if (pagelist->type >= PAGELIST_READ_WITH_FRAGMENTS) {
@@ -559,27 +612,12 @@ free_pagelist(PAGELIST_T *pagelist, int actual)
                 up(&g_free_fragments_sema);
         }
 
-        if (*need_release) {
-                unsigned int length = pagelist->length;
-                unsigned int offset = pagelist->offset;
-
-                for (i = 0; i < num_pages; i++) {
-                        struct page *pg = pages[i];
-
-                        if (pagelist->type != PAGELIST_WRITE) {
-                                unsigned int bytes = PAGE_SIZE - offset;
-
-                                if (bytes > length)
-                                        bytes = length;
-                                dmac_unmap_area(page_address(pg) + offset,
-                                                bytes, DMA_FROM_DEVICE);
-                                length -= bytes;
-                                offset = 0;
-                                set_page_dirty(pg);
-                        }
-                        page_cache_release(pg);
-                }
+        /* Need to mark all the pages dirty. */
+        if (pagelist->type != PAGELIST_WRITE &&
+            pagelistinfo->pages_need_release) {
+                for (i = 0; i < num_pages; i++)
+                        set_page_dirty(pages[i]);
         }
 
-        kfree(pagelist);
+        cleaup_pagelistinfo(pagelistinfo);
 }
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 7b6cd4d80621..0d987898b4f8 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -190,8 +190,8 @@ static const char *const ioctl_names[] = {
         "CLOSE_DELIVERED"
 };
 
-vchiq_static_assert((sizeof(ioctl_names)/sizeof(ioctl_names[0])) ==
-        (VCHIQ_IOC_MAX + 1));
+vchiq_static_assert(ARRAY_SIZE(ioctl_names) ==
+                    (VCHIQ_IOC_MAX + 1));
 
 static void
 dump_phys_mem(void *virt_addr, uint32_t num_bytes);
@@ -402,6 +402,107 @@ static void close_delivered(USER_SERVICE_T *user_service)
         }
 }
 
+struct vchiq_io_copy_callback_context {
+        VCHIQ_ELEMENT_T *current_element;
+        size_t current_element_offset;
+        unsigned long elements_to_go;
+        size_t current_offset;
+};
+
+static ssize_t
+vchiq_ioc_copy_element_data(
+        void *context,
+        void *dest,
+        size_t offset,
+        size_t maxsize)
+{
+        long res;
+        size_t bytes_this_round;
+        struct vchiq_io_copy_callback_context *copy_context =
+                (struct vchiq_io_copy_callback_context *)context;
+
+        if (offset != copy_context->current_offset)
+                return 0;
+
+        if (!copy_context->elements_to_go)
+                return 0;
+
+        /*
+         * Complex logic here to handle the case of 0 size elements
+         * in the middle of the array of elements.
+         *
+         * Need to skip over these 0 size elements.
+         */
+        while (1) {
+                bytes_this_round = min(copy_context->current_element->size -
+                                       copy_context->current_element_offset,
+                                       maxsize);
+
+                if (bytes_this_round)
+                        break;
+
+                copy_context->elements_to_go--;
+                copy_context->current_element++;
+                copy_context->current_element_offset = 0;
+
+                if (!copy_context->elements_to_go)
+                        return 0;
+        }
+
+        res = copy_from_user(dest,
+                             copy_context->current_element->data +
+                             copy_context->current_element_offset,
+                             bytes_this_round);
+
+        if (res != 0)
+                return -EFAULT;
+
+        copy_context->current_element_offset += bytes_this_round;
+        copy_context->current_offset += bytes_this_round;
+
+        /*
+         * Check if done with current element, and if so advance to the next.
+         */
+        if (copy_context->current_element_offset ==
+            copy_context->current_element->size) {
+                copy_context->elements_to_go--;
+                copy_context->current_element++;
+                copy_context->current_element_offset = 0;
+        }
+
+        return bytes_this_round;
+}
+
+/**************************************************************************
+ *
+ *   vchiq_ioc_queue_message
+ *
+ **************************************************************************/
+static VCHIQ_STATUS_T
+vchiq_ioc_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
+                        VCHIQ_ELEMENT_T *elements,
+                        unsigned long count)
+{
+        struct vchiq_io_copy_callback_context context;
+        unsigned long i;
+        size_t total_size = 0;
+
+        context.current_element = elements;
+        context.current_element_offset = 0;
+        context.elements_to_go = count;
+        context.current_offset = 0;
+
+        for (i = 0; i < count; i++) {
+                if (!elements[i].data && elements[i].size != 0)
+                        return -EFAULT;
+
+                total_size += elements[i].size;
+        }
+
+        return vchiq_queue_message(handle, vchiq_ioc_copy_element_data,
+                                   &context, total_size);
+}
+
 /****************************************************************************
 *
 *   vchiq_ioctl
@@ -418,8 +519,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         DEBUG_INITIALISE(g_state.local)
 
         vchiq_log_trace(vchiq_arm_log_level,
-                 "vchiq_ioctl - instance %x, cmd %s, arg %lx",
-                (unsigned int)instance,
+                "vchiq_ioctl - instance %pK, cmd %s, arg %lx",
+                instance,
                 ((_IOC_TYPE(cmd) == VCHIQ_IOC_MAGIC) &&
                 (_IOC_NR(cmd) <= VCHIQ_IOC_MAX)) ?
                 ioctl_names[_IOC_NR(cmd)] : "<invalid>", arg);
@@ -453,7 +554,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         ret = -EINVAL;
                         break;
                 }
-                rc = mutex_lock_interruptible(&instance->state->mutex);
+                rc = mutex_lock_killable(&instance->state->mutex);
                 if (rc != 0) {
                         vchiq_log_error(vchiq_arm_log_level,
                                 "vchiq: connect: could not lock mutex for "
@@ -651,7 +752,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         VCHIQ_ELEMENT_T elements[MAX_ELEMENTS];
                         if (copy_from_user(elements, args.elements,
                                 args.count * sizeof(VCHIQ_ELEMENT_T)) == 0)
-                                status = vchiq_queue_message
+                                status = vchiq_ioc_queue_message
                                         (args.handle,
                                         elements, args.count);
                         else
@@ -713,8 +814,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 break;
                         }
                         vchiq_log_info(vchiq_arm_log_level,
-                                "found bulk_waiter %x for pid %d",
-                                (unsigned int)waiter, current->pid);
+                                "found bulk_waiter %pK for pid %d", waiter,
+                                current->pid);
                         args.userdata = &waiter->bulk_waiter;
                 }
                 status = vchiq_bulk_transfer
@@ -743,8 +844,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         list_add(&waiter->list, &instance->bulk_waiter_list);
                         mutex_unlock(&instance->bulk_waiter_list_mutex);
                         vchiq_log_info(vchiq_arm_log_level,
-                                "saved bulk_waiter %x for pid %d",
-                                (unsigned int)waiter, current->pid);
+                                "saved bulk_waiter %pK for pid %d",
+                                waiter, current->pid);
 
                         if (copy_to_user((void __user *)
                                 &(((VCHIQ_QUEUE_BULK_TRANSFER_T __user *)
@@ -826,10 +927,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                         if (args.msgbufsize < msglen) {
                                                 vchiq_log_error(
                                                         vchiq_arm_log_level,
-                                                        "header %x: msgbufsize"
-                                                        " %x < msglen %x",
-                                                        (unsigned int)header,
-                                                        args.msgbufsize,
+                                                        "header %pK: msgbufsize %x < msglen %x",
+                                                        header, args.msgbufsize,
                                                         msglen);
                                                 WARN(1, "invalid message "
                                                         "size\n");
@@ -980,9 +1079,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 ret = -EFAULT;
                 } else {
                         vchiq_log_error(vchiq_arm_log_level,
-                                "header %x: bufsize %x < size %x",
-                                (unsigned int)header, args.bufsize,
-                                header->size);
+                                "header %pK: bufsize %x < size %x",
+                                header, args.bufsize, header->size);
                         WARN(1, "invalid size\n");
                         ret = -EMSGSIZE;
                 }
@@ -1284,9 +1382,8 @@ vchiq_release(struct inode *inode, struct file *file)
                                         list);
                                 list_del(pos);
                                 vchiq_log_info(vchiq_arm_log_level,
-                                        "bulk_waiter - cleaned up %x "
-                                        "for pid %d",
-                                        (unsigned int)waiter, waiter->pid);
+                                        "bulk_waiter - cleaned up %pK for pid %d",
+                                        waiter, waiter->pid);
                                 kfree(waiter);
                         }
                 }
@@ -1385,9 +1482,8 @@ vchiq_dump_platform_instances(void *dump_context)
                         instance = service->instance;
                         if (instance && !instance->mark) {
                                 len = snprintf(buf, sizeof(buf),
-                                        "Instance %x: pid %d,%s completions "
-                                                "%d/%d",
-                                        (unsigned int)instance, instance->pid,
+                                        "Instance %pK: pid %d,%s completions %d/%d",
+                                        instance, instance->pid,
                                         instance->connected ? " connected, " :
                                                 "",
                                         instance->completion_insert -
@@ -1415,8 +1511,7 @@ vchiq_dump_platform_service_state(void *dump_context, VCHIQ_SERVICE_T *service)
         char buf[80];
         int len;
 
-        len = snprintf(buf, sizeof(buf), "  instance %x",
-                (unsigned int)service->instance);
+        len = snprintf(buf, sizeof(buf), "  instance %pK", service->instance);
 
         if ((service->base.callback == service_callback) &&
                 user_service->is_vchi) {
@@ -1473,8 +1568,7 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes)
         }
 
         down_read(&current->mm->mmap_sem);
-        rc = get_user_pages(current,      /* task */
-                current->mm,              /* mm */
+        rc = get_user_pages(
                 (unsigned long)virt_addr, /* start */
                 num_pages,                /* len */
                 0,                        /* gup_flags */
@@ -1485,6 +1579,12 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes)
         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;
@@ -1508,11 +1608,13 @@ dump_phys_mem(void *virt_addr, uint32_t num_bytes)
 
                 offset += 16;
         }
+
+out:
         if (page != NULL)
                 kunmap(page);
 
         for (page_idx = 0; page_idx < num_pages; page_idx++)
-                page_cache_release(pages[page_idx]);
+                put_page(pages[page_idx]);
 
         kfree(pages);
 }
@@ -1683,8 +1785,6 @@ exit:
 VCHIQ_STATUS_T
 vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state)
 {
-        VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-
         if (arm_state) {
                 rwlock_init(&arm_state->susp_res_lock);
 
@@ -1712,14 +1812,13 @@ 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;
-                init_timer(&arm_state->suspend_timer);
-                arm_state->suspend_timer.data = (unsigned long)(state);
-                arm_state->suspend_timer.function = suspend_timer_callback;
+                setup_timer(&arm_state->suspend_timer, suspend_timer_callback,
+                            (unsigned long)(state));
 
                 arm_state->first_connect = 0;
 
         }
-        return status;
+        return VCHIQ_SUCCESS;
 }
 
 /*
@@ -2032,20 +2131,20 @@ static void
 output_timeout_error(VCHIQ_STATE_T *state)
 {
         VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
-        char service_err[50] = "";
+        char err[50] = "";
         int vc_use_count = arm_state->videocore_use_count;
         int active_services = state->unused_service;
         int i;
 
         if (!arm_state->videocore_use_count) {
-                snprintf(service_err, 50, " Videocore usecount is 0");
+                snprintf(err, sizeof(err), " Videocore usecount is 0");
                 goto output_msg;
         }
         for (i = 0; i < active_services; i++) {
                 VCHIQ_SERVICE_T *service_ptr = state->services[i];
                 if (service_ptr && service_ptr->service_use_count &&
                         (service_ptr->srvstate != VCHIQ_SRVSTATE_FREE)) {
-                        snprintf(service_err, 50, " %c%c%c%c(%d) service has "
+                        snprintf(err, sizeof(err), " %c%c%c%c(%d) service has "
                                 "use count %d%s", VCHIQ_FOURCC_AS_4CHARS(
                                         service_ptr->base.fourcc),
                                  service_ptr->client_id,
@@ -2059,7 +2158,7 @@ output_timeout_error(VCHIQ_STATE_T *state)
 output_msg:
         vchiq_log_error(vchiq_susp_log_level,
                 "timed out waiting for vc suspend (%d).%s",
-                 arm_state->autosuspend_override, service_err);
+                 arm_state->autosuspend_override, err);
 
 }
 
@@ -2780,7 +2879,7 @@ void vchiq_platform_conn_state_changed(VCHIQ_STATE_T *state,
                                 &vchiq_keepalive_thread_func,
                                 (void *)state,
                                 threadname);
-                        if (arm_state->ka_thread == NULL) {
+                        if (IS_ERR(arm_state->ka_thread)) {
                                 vchiq_log_error(vchiq_susp_log_level,
                                         "vchiq: FATAL: couldn't create thread %s",
                                         threadname);
@@ -2800,28 +2899,27 @@ static int vchiq_probe(struct platform_device *pdev)
         void *ptr_err;
 
         fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0);
-/* Remove comment when booting without Device Tree is no longer supported
         if (!fw_node) {
                 dev_err(&pdev->dev, "Missing firmware node\n");
                 return -ENOENT;
         }
-*/
+
         fw = rpi_firmware_get(fw_node);
+        of_node_put(fw_node);
         if (!fw)
                 return -EPROBE_DEFER;
 
         platform_set_drvdata(pdev, fw);
 
-        /* create debugfs entries */
-        err = vchiq_debugfs_init();
+        err = vchiq_platform_init(pdev, &g_state);
         if (err != 0)
-                goto failed_debugfs_init;
+                goto failed_platform_init;
 
         err = alloc_chrdev_region(&vchiq_devid, VCHIQ_MINOR, 1, DEVICE_NAME);
         if (err != 0) {
                 vchiq_log_error(vchiq_arm_log_level,
                         "Unable to allocate device number");
-                goto failed_alloc_chrdev;
+                goto failed_platform_init;
         }
         cdev_init(&vchiq_cdev, &vchiq_fops);
         vchiq_cdev.owner = THIS_MODULE;
@@ -2844,9 +2942,10 @@ static int vchiq_probe(struct platform_device *pdev)
         if (IS_ERR(ptr_err))
                 goto failed_device_create;
 
-        err = vchiq_platform_init(pdev, &g_state);
+        /* create debugfs entries */
+        err = vchiq_debugfs_init();
         if (err != 0)
-                goto failed_platform_init;
+                goto failed_debugfs_init;
 
         vchiq_log_info(vchiq_arm_log_level,
                 "vchiq: initialised - version %d (min %d), device %d.%d",
@@ -2855,7 +2954,7 @@ static int vchiq_probe(struct platform_device *pdev)
 
         return 0;
 
-failed_platform_init:
+failed_debugfs_init:
         device_destroy(vchiq_class, vchiq_devid);
 failed_device_create:
         class_destroy(vchiq_class);
@@ -2864,15 +2963,14 @@ failed_class_create:
         err = PTR_ERR(ptr_err);
 failed_cdev_add:
         unregister_chrdev_region(vchiq_devid, 1);
-failed_alloc_chrdev:
-        vchiq_debugfs_deinit();
-failed_debugfs_init:
+failed_platform_init:
         vchiq_log_warning(vchiq_arm_log_level, "could not load vchiq");
         return err;
 }
 
 static int vchiq_remove(struct platform_device *pdev)
 {
+        vchiq_debugfs_deinit();
         device_destroy(vchiq_class, vchiq_devid);
         class_destroy(vchiq_class);
         cdev_del(&vchiq_cdev);
@@ -2890,7 +2988,6 @@ MODULE_DEVICE_TABLE(of, vchiq_of_match);
 static struct platform_driver vchiq_driver = {
         .driver = {
                 .name = "bcm2835_vchiq",
-                .owner = THIS_MODULE,
                 .of_match_table = vchiq_of_match,
         },
         .probe = vchiq_probe,
@@ -2899,4 +2996,5 @@ static struct platform_driver vchiq_driver = {
 module_platform_driver(vchiq_driver);
 
 MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Videocore VCHIQ driver");
 MODULE_AUTHOR("Broadcom Corporation");
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
index 5efc62ffb2f5..7ea29665bd0c 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
@@ -72,7 +72,7 @@ void vchiq_add_connected_callback(VCHIQ_CONNECTED_CALLBACK_T callback)
 {
         connected_init();
 
-        if (mutex_lock_interruptible(&g_connected_mutex) != 0)
+        if (mutex_lock_killable(&g_connected_mutex) != 0)
                 return;
 
         if (g_connected)
@@ -107,7 +107,7 @@ void vchiq_call_connected_callbacks(void)
 
         connected_init();
 
-        if (mutex_lock_interruptible(&g_connected_mutex) != 0)
+        if (mutex_lock_killable(&g_connected_mutex) != 0)
                 return;
 
         for (i = 0; i <  g_num_deferred_callbacks; i++)
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 2c98da4307df..028e90bc1cdc 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -296,12 +296,13 @@ lock_service(VCHIQ_SERVICE_T *service)
 void
 unlock_service(VCHIQ_SERVICE_T *service)
 {
-        VCHIQ_STATE_T *state = service->state;
         spin_lock(&service_spinlock);
         BUG_ON(!service || (service->ref_count == 0));
         if (service && service->ref_count) {
                 service->ref_count--;
                 if (!service->ref_count) {
+                        VCHIQ_STATE_T *state = service->state;
+
                         BUG_ON(service->srvstate != VCHIQ_SRVSTATE_FREE);
                         state->services[service->localport] = NULL;
                 } else
@@ -380,9 +381,9 @@ make_service_callback(VCHIQ_SERVICE_T *service, VCHIQ_REASON_T reason,
         VCHIQ_HEADER_T *header, void *bulk_userdata)
 {
         VCHIQ_STATUS_T status;
-        vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %x, %x)",
+        vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %pK, %pK)",
                 service->state->id, service->localport, reason_names[reason],
-                (unsigned int)header, (unsigned int)bulk_userdata);
+                header, bulk_userdata);
         status = service->base.callback(reason, header, service->handle,
                 bulk_userdata);
         if (status == VCHIQ_ERROR) {
@@ -406,28 +407,24 @@ vchiq_set_conn_state(VCHIQ_STATE_T *state, VCHIQ_CONNSTATE_T newstate)
 }
 
 static inline void
-remote_event_create(REMOTE_EVENT_T *event)
+remote_event_create(VCHIQ_STATE_T *state, REMOTE_EVENT_T *event)
 {
         event->armed = 0;
         /* Don't clear the 'fired' flag because it may already have been set
         ** by the other side. */
-        sema_init(event->event, 0);
-}
-
-static inline void
-remote_event_destroy(REMOTE_EVENT_T *event)
-{
-        (void)event;
+        sema_init((struct semaphore *)((char *)state + event->event), 0);
 }
 
 static inline int
-remote_event_wait(REMOTE_EVENT_T *event)
+remote_event_wait(VCHIQ_STATE_T *state, REMOTE_EVENT_T *event)
 {
         if (!event->fired) {
                 event->armed = 1;
-                dsb();
+                dsb(sy);
                 if (!event->fired) {
-                        if (down_interruptible(event->event) != 0) {
+                        if (down_interruptible(
+                                        (struct semaphore *)
+                                        ((char *)state + event->event)) != 0) {
                                 event->armed = 0;
                                 return 0;
                         }
@@ -441,34 +438,34 @@ remote_event_wait(REMOTE_EVENT_T *event)
 }
 
 static inline void
-remote_event_signal_local(REMOTE_EVENT_T *event)
+remote_event_signal_local(VCHIQ_STATE_T *state, REMOTE_EVENT_T *event)
 {
         event->armed = 0;
-        up(event->event);
+        up((struct semaphore *)((char *)state + event->event));
 }
 
 static inline void
-remote_event_poll(REMOTE_EVENT_T *event)
+remote_event_poll(VCHIQ_STATE_T *state, REMOTE_EVENT_T *event)
 {
         if (event->fired && event->armed)
-                remote_event_signal_local(event);
+                remote_event_signal_local(state, event);
 }
 
 void
 remote_event_pollall(VCHIQ_STATE_T *state)
 {
-        remote_event_poll(&state->local->sync_trigger);
-        remote_event_poll(&state->local->sync_release);
-        remote_event_poll(&state->local->trigger);
-        remote_event_poll(&state->local->recycle);
+        remote_event_poll(state, &state->local->sync_trigger);
+        remote_event_poll(state, &state->local->sync_release);
+        remote_event_poll(state, &state->local->trigger);
+        remote_event_poll(state, &state->local->recycle);
 }
 
 /* Round up message sizes so that any space at the end of a slot is always big
 ** enough for a header. This relies on header size being a power of two, which
 ** has been verified earlier by a static assertion. */
 
-static inline unsigned int
-calc_stride(unsigned int size)
+static inline size_t
+calc_stride(size_t size)
 {
         /* Allow room for the header */
         size += sizeof(VCHIQ_HEADER_T);
@@ -541,13 +538,13 @@ request_poll(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, int poll_type)
         wmb();
 
         /* ... and ensure the slot handler runs. */
-        remote_event_signal_local(&state->local->trigger);
+        remote_event_signal_local(state, &state->local->trigger);
 }
 
 /* Called from queue_message, by the slot handler and application threads,
 ** with slot_mutex held */
 static VCHIQ_HEADER_T *
-reserve_space(VCHIQ_STATE_T *state, int space, int is_blocking)
+reserve_space(VCHIQ_STATE_T *state, size_t space, int is_blocking)
 {
         VCHIQ_SHARED_STATE_T *local = state->local;
         int tx_pos = state->local_tx_pos;
@@ -626,8 +623,8 @@ process_free_queue(VCHIQ_STATE_T *state)
                 char *data = (char *)SLOT_DATA_FROM_INDEX(state, slot_index);
                 int data_found = 0;
 
-                vchiq_log_trace(vchiq_core_log_level, "%d: pfq %d=%x %x %x",
-                        state->id, slot_index, (unsigned int)data,
+                vchiq_log_trace(vchiq_core_log_level, "%d: pfq %d=%pK %x %x",
+                        state->id, slot_index, data,
                         local->slot_queue_recycle, slot_queue_available);
 
                 /* Initialise the bitmask for services which have used this
@@ -659,16 +656,10 @@ process_free_queue(VCHIQ_STATE_T *state)
                                         up(&service_quota->quota_event);
                                 else if (count == 0) {
                                         vchiq_log_error(vchiq_core_log_level,
-                                                "service %d "
-                                                "message_use_count=%d "
-                                                "(header %x, msgid %x, "
-                                                "header->msgid %x, "
-                                                "header->size %x)",
+                                                "service %d message_use_count=%d (header %pK, msgid %x, header->msgid %x, header->size %x)",
                                                 port,
-                                                service_quota->
-                                                        message_use_count,
-                                                (unsigned int)header, msgid,
-                                                header->msgid,
+                                                service_quota->message_use_count,
+                                                header, msgid, header->msgid,
                                                 header->size);
                                         WARN(1, "invalid message use count\n");
                                 }
@@ -690,26 +681,16 @@ process_free_queue(VCHIQ_STATE_T *state)
                                                 up(&service_quota->quota_event);
                                                 vchiq_log_trace(
                                                         vchiq_core_log_level,
-                                                        "%d: pfq:%d %x@%x - "
-                                                        "slot_use->%d",
+                                                        "%d: pfq:%d %x@%pK - slot_use->%d",
                                                         state->id, port,
-                                                        header->size,
-                                                        (unsigned int)header,
+                                                        header->size, header,
                                                         count - 1);
                                         } else {
                                                 vchiq_log_error(
                                                         vchiq_core_log_level,
-                                                                "service %d "
-                                                                "slot_use_count"
-                                                                "=%d (header %x"
-                                                                ", msgid %x, "
-                                                                "header->msgid"
-                                                                " %x, header->"
-                                                                "size %x)",
-                                                        port, count,
-                                                        (unsigned int)header,
-                                                        msgid,
-                                                        header->msgid,
+                                                                "service %d slot_use_count=%d (header %pK, msgid %x, header->msgid %x, header->size %x)",
+                                                        port, count, header,
+                                                        msgid, header->msgid,
                                                         header->size);
                                                 WARN(1, "bad slot use count\n");
                                         }
@@ -721,10 +702,9 @@ process_free_queue(VCHIQ_STATE_T *state)
                         pos += calc_stride(header->size);
                         if (pos > VCHIQ_SLOT_SIZE) {
                                 vchiq_log_error(vchiq_core_log_level,
-                                        "pfq - pos %x: header %x, msgid %x, "
-                                        "header->msgid %x, header->size %x",
-                                        pos, (unsigned int)header, msgid,
-                                        header->msgid, header->size);
+                                        "pfq - pos %x: header %pK, msgid %x, header->msgid %x, header->size %x",
+                                        pos, header, msgid, header->msgid,
+                                        header->size);
                                 WARN(1, "invalid slot position\n");
                         }
                 }
@@ -746,18 +726,66 @@ process_free_queue(VCHIQ_STATE_T *state)
         }
 }
 
+static ssize_t
+memcpy_copy_callback(
+        void *context, void *dest,
+        size_t offset, size_t maxsize)
+{
+        void *src = context;
+
+        memcpy(dest + offset, src + offset, maxsize);
+        return maxsize;
+}
+
+static ssize_t
+copy_message_data(
+        ssize_t (*copy_callback)(void *context, void *dest,
+                                 size_t offset, size_t maxsize),
+        void *context,
+        void *dest,
+        size_t size)
+{
+        size_t pos = 0;
+
+        while (pos < size) {
+                ssize_t callback_result;
+                size_t max_bytes = size - pos;
+
+                callback_result =
+                        copy_callback(context, dest + pos,
+                                      pos, max_bytes);
+
+                if (callback_result < 0)
+                        return callback_result;
+
+                if (!callback_result)
+                        return -EIO;
+
+                if (callback_result > max_bytes)
+                        return -EIO;
+
+                pos += callback_result;
+        }
+
+        return size;
+}
+
 /* Called by the slot handler and application threads */
 static VCHIQ_STATUS_T
 queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
-        int msgid, const VCHIQ_ELEMENT_T *elements,
-        int count, int size, int flags)
+        int msgid,
+        ssize_t (*copy_callback)(void *context, void *dest,
+                                 size_t offset, size_t maxsize),
+        void *context,
+        size_t size,
+        int flags)
 {
         VCHIQ_SHARED_STATE_T *local;
         VCHIQ_SERVICE_QUOTA_T *service_quota = NULL;
         VCHIQ_HEADER_T *header;
         int type = VCHIQ_MSG_TYPE(msgid);
 
-        unsigned int stride;
+        size_t stride;
 
         local = state->local;
 
@@ -766,7 +794,7 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
         WARN_ON(!(stride <= VCHIQ_SLOT_SIZE));
 
         if (!(flags & QMFLAGS_NO_MUTEX_LOCK) &&
-                (mutex_lock_interruptible(&state->slot_mutex) != 0))
+                (mutex_lock_killable(&state->slot_mutex) != 0))
                 return VCHIQ_RETRY;
 
         if (type == VCHIQ_MSG_DATA) {
@@ -822,7 +850,7 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
                                 service_quota->slot_quota))) {
                         spin_unlock(&quota_spinlock);
                         vchiq_log_trace(vchiq_core_log_level,
-                                "%d: qm:%d %s,%x - quota stall "
+                                "%d: qm:%d %s,%zx - quota stall "
                                 "(msg %d, slot %d)",
                                 state->id, service->localport,
                                 msg_type_str(type), size,
@@ -835,7 +863,7 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
                                 return VCHIQ_RETRY;
                         if (service->closing)
                                 return VCHIQ_ERROR;
-                        if (mutex_lock_interruptible(&state->slot_mutex) != 0)
+                        if (mutex_lock_killable(&state->slot_mutex) != 0)
                                 return VCHIQ_RETRY;
                         if (service->srvstate != VCHIQ_SRVSTATE_OPEN) {
                                 /* The service has been closed */
@@ -863,43 +891,37 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
         }
 
         if (type == VCHIQ_MSG_DATA) {
-                int i, pos;
+                ssize_t callback_result;
                 int tx_end_index;
                 int slot_use_count;
 
                 vchiq_log_info(vchiq_core_log_level,
-                        "%d: qm %s@%x,%x (%d->%d)",
-                        state->id,
-                        msg_type_str(VCHIQ_MSG_TYPE(msgid)),
-                        (unsigned int)header, size,
-                        VCHIQ_MSG_SRCPORT(msgid),
+                        "%d: qm %s@%pK,%zx (%d->%d)",
+                        state->id, msg_type_str(VCHIQ_MSG_TYPE(msgid)),
+                        header, size, VCHIQ_MSG_SRCPORT(msgid),
                         VCHIQ_MSG_DSTPORT(msgid));
 
                 BUG_ON(!service);
                 BUG_ON((flags & (QMFLAGS_NO_MUTEX_LOCK |
                                  QMFLAGS_NO_MUTEX_UNLOCK)) != 0);
 
-                for (i = 0, pos = 0; i < (unsigned int)count;
-                        pos += elements[i++].size)
-                        if (elements[i].size) {
-                                if (vchiq_copy_from_user
-                                        (header->data + pos, elements[i].data,
-                                        (size_t) elements[i].size) !=
-                                        VCHIQ_SUCCESS) {
-                                        mutex_unlock(&state->slot_mutex);
-                                        VCHIQ_SERVICE_STATS_INC(service,
+                callback_result =
+                        copy_message_data(copy_callback, context,
+                                          header->data, size);
+
+                if (callback_result < 0) {
+                        mutex_unlock(&state->slot_mutex);
+                        VCHIQ_SERVICE_STATS_INC(service,
                                                 error_count);
-                                        return VCHIQ_ERROR;
-                                }
-                                if (i == 0) {
-                                        if (SRVTRACE_ENABLED(service,
-                                                        VCHIQ_LOG_INFO))
-                                                vchiq_log_dump_mem("Sent", 0,
-                                                        header->data + pos,
-                                                        min(64u,
-                                                        elements[0].size));
-                                }
-                        }
+                        return VCHIQ_ERROR;
+                }
+
+                if (SRVTRACE_ENABLED(service,
+                                     VCHIQ_LOG_INFO))
+                        vchiq_log_dump_mem("Sent", 0,
+                                           header->data,
+                                           min((size_t)64,
+                                               (size_t)callback_result));
 
                 spin_lock(&quota_spinlock);
                 service_quota->message_use_count++;
@@ -927,7 +949,7 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
 
                 if (slot_use_count)
                         vchiq_log_trace(vchiq_core_log_level,
-                                "%d: qm:%d %s,%x - slot_use->%d (hdr %p)",
+                                "%d: qm:%d %s,%zx - slot_use->%d (hdr %p)",
                                 state->id, service->localport,
                                 msg_type_str(VCHIQ_MSG_TYPE(msgid)), size,
                                 slot_use_count, header);
@@ -936,15 +958,22 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
                 VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size);
         } else {
                 vchiq_log_info(vchiq_core_log_level,
-                        "%d: qm %s@%x,%x (%d->%d)", state->id,
+                        "%d: qm %s@%pK,%zx (%d->%d)", state->id,
                         msg_type_str(VCHIQ_MSG_TYPE(msgid)),
-                        (unsigned int)header, size,
-                        VCHIQ_MSG_SRCPORT(msgid),
+                        header, size, VCHIQ_MSG_SRCPORT(msgid),
                         VCHIQ_MSG_DSTPORT(msgid));
                 if (size != 0) {
-                        WARN_ON(!((count == 1) && (size == elements[0].size)));
-                        memcpy(header->data, elements[0].data,
-                                elements[0].size);
+                        /* It is assumed for now that this code path
+                         * only happens from calls inside this file.
+                         *
+                         * External callers are through the vchiq_queue_message
+                         * path which always sets the type to be VCHIQ_MSG_DATA
+                         *
+                         * At first glance this appears to be correct but
+                         * more review is needed.
+                         */
+                        copy_message_data(copy_callback, context,
+                                          header->data, size);
                 }
                 VCHIQ_STATS_INC(state, ctrl_tx_count);
         }
@@ -960,7 +989,7 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
                         : VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
 
                 vchiq_log_info(SRVTRACE_LEVEL(service),
-                        "Sent Msg %s(%u) to %c%c%c%c s:%u d:%d len:%d",
+                        "Sent Msg %s(%u) to %c%c%c%c s:%u d:%d len:%zu",
                         msg_type_str(VCHIQ_MSG_TYPE(msgid)),
                         VCHIQ_MSG_TYPE(msgid),
                         VCHIQ_FOURCC_AS_4CHARS(svc_fourcc),
@@ -990,19 +1019,24 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
 /* Called by the slot handler and application threads */
 static VCHIQ_STATUS_T
 queue_message_sync(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
-        int msgid, const VCHIQ_ELEMENT_T *elements,
-        int count, int size, int is_blocking)
+        int msgid,
+        ssize_t (*copy_callback)(void *context, void *dest,
+                                 size_t offset, size_t maxsize),
+        void *context,
+        int size,
+        int is_blocking)
 {
         VCHIQ_SHARED_STATE_T *local;
         VCHIQ_HEADER_T *header;
+        ssize_t callback_result;
 
         local = state->local;
 
         if ((VCHIQ_MSG_TYPE(msgid) != VCHIQ_MSG_RESUME) &&
-                (mutex_lock_interruptible(&state->sync_mutex) != 0))
+                (mutex_lock_killable(&state->sync_mutex) != 0))
                 return VCHIQ_RETRY;
 
-        remote_event_wait(&local->sync_release);
+        remote_event_wait(state, &local->sync_release);
 
         rmb();
 
@@ -1017,52 +1051,34 @@ queue_message_sync(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
                                 state->id, oldmsgid);
         }
 
-        if (service) {
-                int i, pos;
+        vchiq_log_info(vchiq_sync_log_level,
+                       "%d: qms %s@%pK,%x (%d->%d)", state->id,
+                       msg_type_str(VCHIQ_MSG_TYPE(msgid)),
+                       header, size, VCHIQ_MSG_SRCPORT(msgid),
+                       VCHIQ_MSG_DSTPORT(msgid));
 
-                vchiq_log_info(vchiq_sync_log_level,
-                        "%d: qms %s@%x,%x (%d->%d)", state->id,
-                        msg_type_str(VCHIQ_MSG_TYPE(msgid)),
-                        (unsigned int)header, size,
-                        VCHIQ_MSG_SRCPORT(msgid),
-                        VCHIQ_MSG_DSTPORT(msgid));
+        callback_result =
+                copy_message_data(copy_callback, context,
+                                  header->data, size);
 
-                for (i = 0, pos = 0; i < (unsigned int)count;
-                        pos += elements[i++].size)
-                        if (elements[i].size) {
-                                if (vchiq_copy_from_user
-                                        (header->data + pos, elements[i].data,
-                                        (size_t) elements[i].size) !=
-                                        VCHIQ_SUCCESS) {
-                                        mutex_unlock(&state->sync_mutex);
-                                        VCHIQ_SERVICE_STATS_INC(service,
-                                                error_count);
-                                        return VCHIQ_ERROR;
-                                }
-                                if (i == 0) {
-                                        if (vchiq_sync_log_level >=
-                                                VCHIQ_LOG_TRACE)
-                                                vchiq_log_dump_mem("Sent Sync",
-                                                        0, header->data + pos,
-                                                        min(64u,
-                                                        elements[0].size));
-                                }
-                        }
+        if (callback_result < 0) {
+                mutex_unlock(&state->slot_mutex);
+                VCHIQ_SERVICE_STATS_INC(service,
+                                        error_count);
+                return VCHIQ_ERROR;
+        }
+
+        if (service) {
+                if (SRVTRACE_ENABLED(service,
+                                     VCHIQ_LOG_INFO))
+                        vchiq_log_dump_mem("Sent", 0,
+                                           header->data,
+                                           min((size_t)64,
+                                               (size_t)callback_result));
 
                 VCHIQ_SERVICE_STATS_INC(service, ctrl_tx_count);
                 VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size);
         } else {
-                vchiq_log_info(vchiq_sync_log_level,
-                        "%d: qms %s@%x,%x (%d->%d)", state->id,
-                        msg_type_str(VCHIQ_MSG_TYPE(msgid)),
-                        (unsigned int)header, size,
-                        VCHIQ_MSG_SRCPORT(msgid),
-                        VCHIQ_MSG_DSTPORT(msgid));
-                if (size != 0) {
-                        WARN_ON(!((count == 1) && (size == elements[0].size)));
-                        memcpy(header->data, elements[0].data,
-                                elements[0].size);
-                }
                 VCHIQ_STATS_INC(state, ctrl_tx_count);
         }
 
@@ -1175,11 +1191,16 @@ notify_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue,
                                 VCHIQ_MSG_BULK_RX_DONE : VCHIQ_MSG_BULK_TX_DONE;
                         int msgid = VCHIQ_MAKE_MSG(msgtype, service->localport,
                                 service->remoteport);
-                        VCHIQ_ELEMENT_T element = { &bulk->actual, 4 };
                         /* Only reply to non-dummy bulk requests */
                         if (bulk->remote_data) {
-                                status = queue_message(service->state, NULL,
-                                        msgid, &element, 1, 4, 0);
+                                status = queue_message(
+                                                service->state,
+                                                NULL,
+                                                msgid,
+                                                memcpy_copy_callback,
+                                                &bulk->actual,
+                                                4,
+                                                0);
                                 if (status != VCHIQ_SUCCESS)
                                         break;
                         }
@@ -1344,7 +1365,7 @@ resolve_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue)
                 WARN_ON(!((int)(queue->local_insert - queue->process) > 0));
                 WARN_ON(!((int)(queue->remote_insert - queue->process) > 0));
 
-                rc = mutex_lock_interruptible(&state->bulk_transfer_mutex);
+                rc = mutex_lock_killable(&state->bulk_transfer_mutex);
                 if (rc != 0)
                         break;
 
@@ -1356,26 +1377,22 @@ resolve_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue)
                                 "Send Bulk to" : "Recv Bulk from";
                         if (bulk->actual != VCHIQ_BULK_ACTUAL_ABORTED)
                                 vchiq_log_info(SRVTRACE_LEVEL(service),
-                                        "%s %c%c%c%c d:%d len:%d %x<->%x",
+                                        "%s %c%c%c%c d:%d len:%d %pK<->%pK",
                                         header,
                                         VCHIQ_FOURCC_AS_4CHARS(
                                                 service->base.fourcc),
-                                        service->remoteport,
-                                        bulk->size,
-                                        (unsigned int)bulk->data,
-                                        (unsigned int)bulk->remote_data);
+                                        service->remoteport, bulk->size,
+                                        bulk->data, bulk->remote_data);
                         else
                                 vchiq_log_info(SRVTRACE_LEVEL(service),
                                         "%s %c%c%c%c d:%d ABORTED - tx len:%d,"
-                                        " rx len:%d %x<->%x",
+                                        " rx len:%d %pK<->%pK",
                                         header,
                                         VCHIQ_FOURCC_AS_4CHARS(
                                                 service->base.fourcc),
                                         service->remoteport,
-                                        bulk->size,
-                                        bulk->remote_size,
-                                        (unsigned int)bulk->data,
-                                        (unsigned int)bulk->remote_data);
+                                        bulk->size, bulk->remote_size,
+                                        bulk->data, bulk->remote_data);
                 }
 
                 vchiq_complete_bulk(bulk);
@@ -1511,9 +1528,8 @@ parse_open(VCHIQ_STATE_T *state, VCHIQ_HEADER_T *header)
 
                 fourcc = payload->fourcc;
                 vchiq_log_info(vchiq_core_log_level,
-                        "%d: prs OPEN@%x (%d->'%c%c%c%c')",
-                        state->id, (unsigned int)header,
-                        localport,
+                        "%d: prs OPEN@%pK (%d->'%c%c%c%c')",
+                        state->id, header, localport,
                         VCHIQ_FOURCC_AS_4CHARS(fourcc));
 
                 service = get_listening_service(state, fourcc);
@@ -1544,10 +1560,6 @@ parse_open(VCHIQ_STATE_T *state, VCHIQ_HEADER_T *header)
                                 struct vchiq_openack_payload ack_payload = {
                                         service->version
                                 };
-                                VCHIQ_ELEMENT_T body = {
-                                        &ack_payload,
-                                        sizeof(ack_payload)
-                                };
 
                                 if (state->version_common <
                                     VCHIQ_VERSION_SYNCHRONOUS_MODE)
@@ -1557,21 +1569,28 @@ parse_open(VCHIQ_STATE_T *state, VCHIQ_HEADER_T *header)
                                 if (service->sync &&
                                     (state->version_common >=
                                      VCHIQ_VERSION_SYNCHRONOUS_MODE)) {
-                                        if (queue_message_sync(state, NULL,
+                                        if (queue_message_sync(
+                                                state,
+                                                NULL,
                                                 VCHIQ_MAKE_MSG(
                                                         VCHIQ_MSG_OPENACK,
                                                         service->localport,
                                                         remoteport),
-                                                &body, 1, sizeof(ack_payload),
+                                                memcpy_copy_callback,
+                                                &ack_payload,
+                                                sizeof(ack_payload),
                                                 0) == VCHIQ_RETRY)
                                                 goto bail_not_ready;
                                 } else {
-                                        if (queue_message(state, NULL,
-                                                VCHIQ_MAKE_MSG(
+                                        if (queue_message(state,
+                                                        NULL,
+                                                        VCHIQ_MAKE_MSG(
                                                         VCHIQ_MSG_OPENACK,
                                                         service->localport,
                                                         remoteport),
-                                                &body, 1, sizeof(ack_payload),
+                                                memcpy_copy_callback,
+                                                &ack_payload,
+                                                sizeof(ack_payload),
                                                 0) == VCHIQ_RETRY)
                                                 goto bail_not_ready;
                                 }
@@ -1650,7 +1669,7 @@ parse_rx_slots(VCHIQ_STATE_T *state)
 
                 header = (VCHIQ_HEADER_T *)(state->rx_data +
                         (state->rx_pos & VCHIQ_SLOT_MASK));
-                DEBUG_VALUE(PARSE_HEADER, (int)header);
+                DEBUG_VALUE(PARSE_HEADER, (int)(long)header);
                 msgid = header->msgid;
                 DEBUG_VALUE(PARSE_MSGID, msgid);
                 size = header->size;
@@ -1684,21 +1703,18 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                                         remoteport);
                                 if (service)
                                         vchiq_log_warning(vchiq_core_log_level,
-                                                "%d: prs %s@%x (%d->%d) - "
-                                                "found connected service %d",
+                                                "%d: prs %s@%pK (%d->%d) - found connected service %d",
                                                 state->id, msg_type_str(type),
-                                                (unsigned int)header,
-                                                remoteport, localport,
+                                                header, remoteport, localport,
                                                 service->localport);
                         }
 
                         if (!service) {
                                 vchiq_log_error(vchiq_core_log_level,
-                                        "%d: prs %s@%x (%d->%d) - "
-                                        "invalid/closed service %d",
+                                        "%d: prs %s@%pK (%d->%d) - invalid/closed service %d",
                                         state->id, msg_type_str(type),
-                                        (unsigned int)header,
-                                        remoteport, localport, localport);
+                                        header, remoteport, localport,
+                                        localport);
                                 goto skip_message;
                         }
                         break;
@@ -1723,12 +1739,11 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                                         min(64, size));
                 }
 
-                if (((unsigned int)header & VCHIQ_SLOT_MASK) + calc_stride(size)
-                        > VCHIQ_SLOT_SIZE) {
+                if (((unsigned long)header & VCHIQ_SLOT_MASK) +
+                    calc_stride(size) > VCHIQ_SLOT_SIZE) {
                         vchiq_log_error(vchiq_core_log_level,
-                                "header %x (msgid %x) - size %x too big for "
-                                "slot",
-                                (unsigned int)header, (unsigned int)msgid,
+                                "header %pK (msgid %x) - size %x too big for slot",
+                                header, (unsigned int)msgid,
                                 (unsigned int)size);
                         WARN(1, "oversized for slot\n");
                 }
@@ -1747,9 +1762,9 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                                 service->peer_version = payload->version;
                         }
                         vchiq_log_info(vchiq_core_log_level,
-                                "%d: prs OPENACK@%x,%x (%d->%d) v:%d",
-                                state->id, (unsigned int)header, size,
-                                remoteport, localport, service->peer_version);
+                                "%d: prs OPENACK@%pK,%x (%d->%d) v:%d",
+                                state->id, header, size, remoteport, localport,
+                                service->peer_version);
                         if (service->srvstate ==
                                 VCHIQ_SRVSTATE_OPENING) {
                                 service->remoteport = remoteport;
@@ -1765,9 +1780,8 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                         WARN_ON(size != 0); /* There should be no data */
 
                         vchiq_log_info(vchiq_core_log_level,
-                                "%d: prs CLOSE@%x (%d->%d)",
-                                state->id, (unsigned int)header,
-                                remoteport, localport);
+                                "%d: prs CLOSE@%pK (%d->%d)",
+                                state->id, header, remoteport, localport);
 
                         mark_service_closing_internal(service, 1);
 
@@ -1783,9 +1797,8 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                         break;
                 case VCHIQ_MSG_DATA:
                         vchiq_log_info(vchiq_core_log_level,
-                                "%d: prs DATA@%x,%x (%d->%d)",
-                                state->id, (unsigned int)header, size,
-                                remoteport, localport);
+                                "%d: prs DATA@%pK,%x (%d->%d)",
+                                state->id, header, size, remoteport, localport);
 
                         if ((service->remoteport == remoteport)
                                 && (service->srvstate ==
@@ -1808,8 +1821,7 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                         break;
                 case VCHIQ_MSG_CONNECT:
                         vchiq_log_info(vchiq_core_log_level,
-                                "%d: prs CONNECT@%x",
-                                state->id, (unsigned int)header);
+                                "%d: prs CONNECT@%pK", state->id, header);
                         state->version_common = ((VCHIQ_SLOT_ZERO_T *)
                                                  state->slot_data)->version;
                         up(&state->connect);
@@ -1827,7 +1839,7 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                                 int resolved = 0;
 
                                 DEBUG_TRACE(PARSE_LINE);
-                                if (mutex_lock_interruptible(
+                                if (mutex_lock_killable(
                                         &service->bulk_mutex) != 0) {
                                         DEBUG_TRACE(PARSE_LINE);
                                         goto bail_not_ready;
@@ -1838,17 +1850,15 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                                 bulk = &queue->bulks[
                                         BULK_INDEX(queue->remote_insert)];
                                 bulk->remote_data =
-                                        (void *)((int *)header->data)[0];
+                                        (void *)(long)((int *)header->data)[0];
                                 bulk->remote_size = ((int *)header->data)[1];
                                 wmb();
 
                                 vchiq_log_info(vchiq_core_log_level,
-                                        "%d: prs %s@%x (%d->%d) %x@%x",
+                                        "%d: prs %s@%pK (%d->%d) %x@%pK",
                                         state->id, msg_type_str(type),
-                                        (unsigned int)header,
-                                        remoteport, localport,
-                                        bulk->remote_size,
-                                        (unsigned int)bulk->remote_data);
+                                        header, remoteport, localport,
+                                        bulk->remote_size, bulk->remote_data);
 
                                 queue->remote_insert++;
 
@@ -1893,7 +1903,7 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                                         &service->bulk_rx : &service->bulk_tx;
 
                                 DEBUG_TRACE(PARSE_LINE);
-                                if (mutex_lock_interruptible(
+                                if (mutex_lock_killable(
                                         &service->bulk_mutex) != 0) {
                                         DEBUG_TRACE(PARSE_LINE);
                                         goto bail_not_ready;
@@ -1901,11 +1911,10 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                                 if ((int)(queue->remote_insert -
                                         queue->local_insert) >= 0) {
                                         vchiq_log_error(vchiq_core_log_level,
-                                                "%d: prs %s@%x (%d->%d) "
+                                                "%d: prs %s@%pK (%d->%d) "
                                                 "unexpected (ri=%d,li=%d)",
                                                 state->id, msg_type_str(type),
-                                                (unsigned int)header,
-                                                remoteport, localport,
+                                                header, remoteport, localport,
                                                 queue->remote_insert,
                                                 queue->local_insert);
                                         mutex_unlock(&service->bulk_mutex);
@@ -1921,11 +1930,10 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                                 queue->remote_insert++;
 
                                 vchiq_log_info(vchiq_core_log_level,
-                                        "%d: prs %s@%x (%d->%d) %x@%x",
+                                        "%d: prs %s@%pK (%d->%d) %x@%pK",
                                         state->id, msg_type_str(type),
-                                        (unsigned int)header,
-                                        remoteport, localport,
-                                        bulk->actual, (unsigned int)bulk->data);
+                                        header, remoteport, localport,
+                                        bulk->actual, bulk->data);
 
                                 vchiq_log_trace(vchiq_core_log_level,
                                         "%d: prs:%d %cx li=%x ri=%x p=%x",
@@ -1947,14 +1955,14 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                         break;
                 case VCHIQ_MSG_PADDING:
                         vchiq_log_trace(vchiq_core_log_level,
-                                "%d: prs PADDING@%x,%x",
-                                state->id, (unsigned int)header, size);
+                                "%d: prs PADDING@%pK,%x",
+                                state->id, header, size);
                         break;
                 case VCHIQ_MSG_PAUSE:
                         /* If initiated, signal the application thread */
                         vchiq_log_trace(vchiq_core_log_level,
-                                "%d: prs PAUSE@%x,%x",
-                                state->id, (unsigned int)header, size);
+                                "%d: prs PAUSE@%pK,%x",
+                                state->id, header, size);
                         if (state->conn_state == VCHIQ_CONNSTATE_PAUSED) {
                                 vchiq_log_error(vchiq_core_log_level,
                                         "%d: PAUSE received in state PAUSED",
@@ -1977,8 +1985,8 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                         break;
                 case VCHIQ_MSG_RESUME:
                         vchiq_log_trace(vchiq_core_log_level,
-                                "%d: prs RESUME@%x,%x",
-                                state->id, (unsigned int)header, size);
+                                "%d: prs RESUME@%pK,%x",
+                                state->id, header, size);
                         /* Release the slot mutex */
                         mutex_unlock(&state->slot_mutex);
                         if (state->is_master)
@@ -1999,8 +2007,8 @@ parse_rx_slots(VCHIQ_STATE_T *state)
 
                 default:
                         vchiq_log_error(vchiq_core_log_level,
-                                "%d: prs invalid msgid %x@%x,%x",
-                                state->id, msgid, (unsigned int)header, size);
+                                "%d: prs invalid msgid %x@%pK,%x",
+                                state->id, msgid, header, size);
                         WARN(1, "invalid message\n");
                         break;
                 }
@@ -2039,7 +2047,7 @@ slot_handler_func(void *v)
         while (1) {
                 DEBUG_COUNT(SLOT_HANDLER_COUNT);
                 DEBUG_TRACE(SLOT_HANDLER_LINE);
-                remote_event_wait(&local->trigger);
+                remote_event_wait(state, &local->trigger);
 
                 rmb();
 
@@ -2128,7 +2136,7 @@ recycle_func(void *v)
         VCHIQ_SHARED_STATE_T *local = state->local;
 
         while (1) {
-                remote_event_wait(&local->recycle);
+                remote_event_wait(state, &local->recycle);
 
                 process_free_queue(state);
         }
@@ -2151,7 +2159,7 @@ sync_func(void *v)
                 int type;
                 unsigned int localport, remoteport;
 
-                remote_event_wait(&local->sync_trigger);
+                remote_event_wait(state, &local->sync_trigger);
 
                 rmb();
 
@@ -2165,11 +2173,9 @@ sync_func(void *v)
 
                 if (!service) {
                         vchiq_log_error(vchiq_sync_log_level,
-                                "%d: sf %s@%x (%d->%d) - "
-                                "invalid/closed service %d",
+                                "%d: sf %s@%pK (%d->%d) - invalid/closed service %d",
                                 state->id, msg_type_str(type),
-                                (unsigned int)header,
-                                remoteport, localport, localport);
+                                header, remoteport, localport, localport);
                         release_message_sync(state, header);
                         continue;
                 }
@@ -2199,9 +2205,9 @@ sync_func(void *v)
                                 service->peer_version = payload->version;
                         }
                         vchiq_log_info(vchiq_sync_log_level,
-                                "%d: sf OPENACK@%x,%x (%d->%d) v:%d",
-                                state->id, (unsigned int)header, size,
-                                remoteport, localport, service->peer_version);
+                                "%d: sf OPENACK@%pK,%x (%d->%d) v:%d",
+                                state->id, header, size, remoteport, localport,
+                                service->peer_version);
                         if (service->srvstate == VCHIQ_SRVSTATE_OPENING) {
                                 service->remoteport = remoteport;
                                 vchiq_set_service_state(service,
@@ -2214,9 +2220,8 @@ sync_func(void *v)
 
                 case VCHIQ_MSG_DATA:
                         vchiq_log_trace(vchiq_sync_log_level,
-                                "%d: sf DATA@%x,%x (%d->%d)",
-                                state->id, (unsigned int)header, size,
-                                remoteport, localport);
+                                "%d: sf DATA@%pK,%x (%d->%d)",
+                                state->id, header, size, remoteport, localport);
 
                         if ((service->remoteport == remoteport) &&
                                 (service->srvstate ==
@@ -2234,8 +2239,8 @@ sync_func(void *v)
 
                 default:
                         vchiq_log_error(vchiq_sync_log_level,
-                                "%d: sf unexpected msgid %x@%x,%x",
-                                state->id, msgid, (unsigned int)header, size);
+                                "%d: sf unexpected msgid %x@%pK,%x",
+                                state->id, msgid, header, size);
                         release_message_sync(state, header);
                         break;
                 }
@@ -2268,7 +2273,8 @@ get_conn_state_name(VCHIQ_CONNSTATE_T conn_state)
 VCHIQ_SLOT_ZERO_T *
 vchiq_init_slots(void *mem_base, int mem_size)
 {
-        int mem_align = (VCHIQ_SLOT_SIZE - (int)mem_base) & VCHIQ_SLOT_MASK;
+        int mem_align =
+                (int)((VCHIQ_SLOT_SIZE - (long)mem_base) & VCHIQ_SLOT_MASK);
         VCHIQ_SLOT_ZERO_T *slot_zero =
                 (VCHIQ_SLOT_ZERO_T *)((char *)mem_base + mem_align);
         int num_slots = (mem_size - mem_align)/VCHIQ_SLOT_SIZE;
@@ -2316,16 +2322,16 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
         int i;
 
         vchiq_log_warning(vchiq_core_log_level,
-                "%s: slot_zero = 0x%08lx, is_master = %d",
-                __func__, (unsigned long)slot_zero, is_master);
+                "%s: slot_zero = %pK, is_master = %d",
+                __func__, slot_zero, is_master);
 
         /* Check the input configuration */
 
         if (slot_zero->magic != VCHIQ_MAGIC) {
                 vchiq_loud_error_header();
                 vchiq_loud_error("Invalid VCHIQ magic value found.");
-                vchiq_loud_error("slot_zero=%x: magic=%x (expected %x)",
-                        (unsigned int)slot_zero, slot_zero->magic, VCHIQ_MAGIC);
+                vchiq_loud_error("slot_zero=%pK: magic=%x (expected %x)",
+                        slot_zero, slot_zero->magic, VCHIQ_MAGIC);
                 vchiq_loud_error_footer();
                 return VCHIQ_ERROR;
         }
@@ -2333,10 +2339,8 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
         if (slot_zero->version < VCHIQ_VERSION_MIN) {
                 vchiq_loud_error_header();
                 vchiq_loud_error("Incompatible VCHIQ versions found.");
-                vchiq_loud_error("slot_zero=%x: VideoCore version=%d "
-                        "(minimum %d)",
-                        (unsigned int)slot_zero, slot_zero->version,
-                        VCHIQ_VERSION_MIN);
+                vchiq_loud_error("slot_zero=%pK: VideoCore version=%d (minimum %d)",
+                        slot_zero, slot_zero->version, VCHIQ_VERSION_MIN);
                 vchiq_loud_error("Restart with a newer VideoCore image.");
                 vchiq_loud_error_footer();
                 return VCHIQ_ERROR;
@@ -2345,10 +2349,8 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
         if (VCHIQ_VERSION < slot_zero->version_min) {
                 vchiq_loud_error_header();
                 vchiq_loud_error("Incompatible VCHIQ versions found.");
-                vchiq_loud_error("slot_zero=%x: version=%d (VideoCore "
-                        "minimum %d)",
-                        (unsigned int)slot_zero, VCHIQ_VERSION,
-                        slot_zero->version_min);
+                vchiq_loud_error("slot_zero=%pK: version=%d (VideoCore minimum %d)",
+                        slot_zero, VCHIQ_VERSION, slot_zero->version_min);
                 vchiq_loud_error("Restart with a newer kernel.");
                 vchiq_loud_error_footer();
                 return VCHIQ_ERROR;
@@ -2360,26 +2362,20 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
                  (slot_zero->max_slots_per_side != VCHIQ_MAX_SLOTS_PER_SIDE)) {
                 vchiq_loud_error_header();
                 if (slot_zero->slot_zero_size != sizeof(VCHIQ_SLOT_ZERO_T))
-                        vchiq_loud_error("slot_zero=%x: slot_zero_size=%x "
-                                "(expected %x)",
-                                (unsigned int)slot_zero,
-                                slot_zero->slot_zero_size,
-                                sizeof(VCHIQ_SLOT_ZERO_T));
+                        vchiq_loud_error("slot_zero=%pK: slot_zero_size=%d (expected %d)",
+                                slot_zero, slot_zero->slot_zero_size,
+                                (int)sizeof(VCHIQ_SLOT_ZERO_T));
                 if (slot_zero->slot_size != VCHIQ_SLOT_SIZE)
-                        vchiq_loud_error("slot_zero=%x: slot_size=%d "
-                                "(expected %d",
-                                (unsigned int)slot_zero, slot_zero->slot_size,
+                        vchiq_loud_error("slot_zero=%pK: slot_size=%d (expected %d)",
+                                slot_zero, slot_zero->slot_size,
                                 VCHIQ_SLOT_SIZE);
                 if (slot_zero->max_slots != VCHIQ_MAX_SLOTS)
-                        vchiq_loud_error("slot_zero=%x: max_slots=%d "
-                                "(expected %d)",
-                                (unsigned int)slot_zero, slot_zero->max_slots,
+                        vchiq_loud_error("slot_zero=%pK: max_slots=%d (expected %d)",
+                                slot_zero, slot_zero->max_slots,
                                 VCHIQ_MAX_SLOTS);
                 if (slot_zero->max_slots_per_side != VCHIQ_MAX_SLOTS_PER_SIDE)
-                        vchiq_loud_error("slot_zero=%x: max_slots_per_side=%d "
-                                "(expected %d)",
-                                (unsigned int)slot_zero,
-                                slot_zero->max_slots_per_side,
+                        vchiq_loud_error("slot_zero=%pK: max_slots_per_side=%d (expected %d)",
+                                slot_zero, slot_zero->max_slots_per_side,
                                 VCHIQ_MAX_SLOTS_PER_SIDE);
                 vchiq_loud_error_footer();
                 return VCHIQ_ERROR;
@@ -2463,24 +2459,24 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
         state->data_use_count = 0;
         state->data_quota = state->slot_queue_available - 1;
 
-        local->trigger.event = &state->trigger_event;
-        remote_event_create(&local->trigger);
+        local->trigger.event = offsetof(VCHIQ_STATE_T, trigger_event);
+        remote_event_create(state, &local->trigger);
         local->tx_pos = 0;
 
-        local->recycle.event = &state->recycle_event;
-        remote_event_create(&local->recycle);
+        local->recycle.event = offsetof(VCHIQ_STATE_T, recycle_event);
+        remote_event_create(state, &local->recycle);
         local->slot_queue_recycle = state->slot_queue_available;
 
-        local->sync_trigger.event = &state->sync_trigger_event;
-        remote_event_create(&local->sync_trigger);
+        local->sync_trigger.event = offsetof(VCHIQ_STATE_T, sync_trigger_event);
+        remote_event_create(state, &local->sync_trigger);
 
-        local->sync_release.event = &state->sync_release_event;
-        remote_event_create(&local->sync_release);
+        local->sync_release.event = offsetof(VCHIQ_STATE_T, sync_release_event);
+        remote_event_create(state, &local->sync_release);
 
         /* At start-of-day, the slot is empty and available */
         ((VCHIQ_HEADER_T *)SLOT_DATA_FROM_INDEX(state, local->slot_sync))->msgid
                 = VCHIQ_MSGID_PADDING;
-        remote_event_signal_local(&local->sync_release);
+        remote_event_signal_local(state, &local->sync_release);
 
         local->debug[DEBUG_ENTRIES] = DEBUG_MAX;
 
@@ -2494,7 +2490,7 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
                 (void *)state,
                 threadname);
 
-        if (state->slot_handler_thread == NULL) {
+        if (IS_ERR(state->slot_handler_thread)) {
                 vchiq_loud_error_header();
                 vchiq_loud_error("couldn't create thread %s", threadname);
                 vchiq_loud_error_footer();
@@ -2507,7 +2503,7 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
         state->recycle_thread = kthread_create(&recycle_func,
                 (void *)state,
                 threadname);
-        if (state->recycle_thread == NULL) {
+        if (IS_ERR(state->recycle_thread)) {
                 vchiq_loud_error_header();
                 vchiq_loud_error("couldn't create thread %s", threadname);
                 vchiq_loud_error_footer();
@@ -2520,7 +2516,7 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
         state->sync_thread = kthread_create(&sync_func,
                 (void *)state,
                 threadname);
-        if (state->sync_thread == NULL) {
+        if (IS_ERR(state->sync_thread)) {
                 vchiq_loud_error_header();
                 vchiq_loud_error("couldn't create thread %s", threadname);
                 vchiq_loud_error_footer();
@@ -2684,14 +2680,19 @@ vchiq_open_service_internal(VCHIQ_SERVICE_T *service, int client_id)
                 service->version,
                 service->version_min
         };
-        VCHIQ_ELEMENT_T body = { &payload, sizeof(payload) };
         VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
 
         service->client_id = client_id;
         vchiq_use_service_internal(service);
-        status = queue_message(service->state, NULL,
-                VCHIQ_MAKE_MSG(VCHIQ_MSG_OPEN, service->localport, 0),
-                &body, 1, sizeof(payload), QMFLAGS_IS_BLOCKING);
+        status = queue_message(service->state,
+                               NULL,
+                               VCHIQ_MAKE_MSG(VCHIQ_MSG_OPEN,
+                                              service->localport,
+                                              0),
+                               memcpy_copy_callback,
+                               &payload,
+                               sizeof(payload),
+                               QMFLAGS_IS_BLOCKING);
         if (status == VCHIQ_SUCCESS) {
                 /* Wait for the ACK/NAK */
                 if (down_interruptible(&service->remove_event) != 0) {
@@ -2756,20 +2757,16 @@ release_service_messages(VCHIQ_SERVICE_T *service)
                                 if ((port == service->localport) &&
                                         (msgid & VCHIQ_MSGID_CLAIMED)) {
                                         vchiq_log_info(vchiq_core_log_level,
-                                                "  fsi - hdr %x",
-                                                (unsigned int)header);
+                                                "  fsi - hdr %pK", header);
                                         release_slot(state, slot_info, header,
                                                 NULL);
                                 }
                                 pos += calc_stride(header->size);
                                 if (pos > VCHIQ_SLOT_SIZE) {
                                         vchiq_log_error(vchiq_core_log_level,
-                                                "fsi - pos %x: header %x, "
-                                                "msgid %x, header->msgid %x, "
-                                                "header->size %x",
-                                                pos, (unsigned int)header,
-                                                msgid, header->msgid,
-                                                header->size);
+                                                "fsi - pos %x: header %pK, msgid %x, header->msgid %x, header->size %x",
+                                                pos, header, msgid,
+                                                header->msgid, header->size);
                                         WARN(1, "invalid slot position\n");
                                 }
                         }
@@ -2783,7 +2780,7 @@ do_abort_bulks(VCHIQ_SERVICE_T *service)
         VCHIQ_STATUS_T status;
 
         /* Abort any outstanding bulk transfers */
-        if (mutex_lock_interruptible(&service->bulk_mutex) != 0)
+        if (mutex_lock_killable(&service->bulk_mutex) != 0)
                 return 0;
         abort_outstanding_bulks(service, &service->bulk_tx);
         abort_outstanding_bulks(service, &service->bulk_rx);
@@ -3303,7 +3300,7 @@ vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
         queue = (dir == VCHIQ_BULK_TRANSMIT) ?
                 &service->bulk_tx : &service->bulk_rx;
 
-        if (mutex_lock_interruptible(&service->bulk_mutex) != 0) {
+        if (mutex_lock_killable(&service->bulk_mutex) != 0) {
                 status = VCHIQ_RETRY;
                 goto error_exit;
         }
@@ -3317,7 +3314,7 @@ vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
                                 status = VCHIQ_RETRY;
                                 goto error_exit;
                         }
-                        if (mutex_lock_interruptible(&service->bulk_mutex)
+                        if (mutex_lock_killable(&service->bulk_mutex)
                                 != 0) {
                                 status = VCHIQ_RETRY;
                                 goto error_exit;
@@ -3341,14 +3338,13 @@ vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
         wmb();
 
         vchiq_log_info(vchiq_core_log_level,
-                "%d: bt (%d->%d) %cx %x@%x %x",
-                state->id,
-                service->localport, service->remoteport, dir_char,
-                size, (unsigned int)bulk->data, (unsigned int)userdata);
+                "%d: bt (%d->%d) %cx %x@%pK %pK",
+                state->id, service->localport, service->remoteport, dir_char,
+                size, bulk->data, userdata);
 
         /* The slot mutex must be held when the service is being closed, so
            claim it here to ensure that isn't happening */
-        if (mutex_lock_interruptible(&state->slot_mutex) != 0) {
+        if (mutex_lock_killable(&state->slot_mutex) != 0) {
                 status = VCHIQ_RETRY;
                 goto cancel_bulk_error_exit;
         }
@@ -3363,16 +3359,19 @@ vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
                                 (dir == VCHIQ_BULK_TRANSMIT) ?
                                 VCHIQ_POLL_TXNOTIFY : VCHIQ_POLL_RXNOTIFY);
         } else {
-                int payload[2] = { (int)bulk->data, bulk->size };
-                VCHIQ_ELEMENT_T element = { payload, sizeof(payload) };
-
-                status = queue_message(state, NULL,
-                        VCHIQ_MAKE_MSG(dir_msgtype,
-                                service->localport, service->remoteport),
-                        &element, 1, sizeof(payload),
-                        QMFLAGS_IS_BLOCKING |
-                        QMFLAGS_NO_MUTEX_LOCK |
-                        QMFLAGS_NO_MUTEX_UNLOCK);
+                int payload[2] = { (int)(long)bulk->data, bulk->size };
+
+                status = queue_message(state,
+                                       NULL,
+                                       VCHIQ_MAKE_MSG(dir_msgtype,
+                                                      service->localport,
+                                                      service->remoteport),
+                                       memcpy_copy_callback,
+                                       &payload,
+                                       sizeof(payload),
+                                       QMFLAGS_IS_BLOCKING |
+                                       QMFLAGS_NO_MUTEX_LOCK |
+                                       QMFLAGS_NO_MUTEX_UNLOCK);
                 if (status != VCHIQ_SUCCESS) {
                         goto unlock_both_error_exit;
                 }
@@ -3418,26 +3417,22 @@ error_exit:
 
 VCHIQ_STATUS_T
 vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
-        const VCHIQ_ELEMENT_T *elements, unsigned int count)
+                    ssize_t (*copy_callback)(void *context, void *dest,
+                                             size_t offset, size_t maxsize),
+                    void *context,
+                    size_t size)
 {
         VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
         VCHIQ_STATUS_T status = VCHIQ_ERROR;
 
-        unsigned int size = 0;
-        unsigned int i;
-
         if (!service ||
                 (vchiq_check_service(service) != VCHIQ_SUCCESS))
                 goto error_exit;
 
-        for (i = 0; i < (unsigned int)count; i++) {
-                if (elements[i].size) {
-                        if (elements[i].data == NULL) {
-                                VCHIQ_SERVICE_STATS_INC(service, error_count);
-                                goto error_exit;
-                        }
-                        size += elements[i].size;
-                }
+        if (!size) {
+                VCHIQ_SERVICE_STATS_INC(service, error_count);
+                goto error_exit;
+
         }
 
         if (size > VCHIQ_MAX_MSG_SIZE) {
@@ -3451,14 +3446,14 @@ vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
                                 VCHIQ_MAKE_MSG(VCHIQ_MSG_DATA,
                                         service->localport,
                                         service->remoteport),
-                                elements, count, size, 1);
+                                copy_callback, context, size, 1);
                 break;
         case VCHIQ_SRVSTATE_OPENSYNC:
                 status = queue_message_sync(service->state, service,
                                 VCHIQ_MAKE_MSG(VCHIQ_MSG_DATA,
                                         service->localport,
                                         service->remoteport),
-                                elements, count, size, 1);
+                                copy_callback, context, size, 1);
                 break;
         default:
                 status = VCHIQ_ERROR;
@@ -3691,13 +3686,11 @@ vchiq_dump_state(void *dump_context, VCHIQ_STATE_T *state)
         vchiq_dump(dump_context, buf, len + 1);
 
         len = snprintf(buf, sizeof(buf),
-                "  tx_pos=%x(@%x), rx_pos=%x(@%x)",
+                "  tx_pos=%x(@%pK), rx_pos=%x(@%pK)",
                 state->local->tx_pos,
-                (uint32_t)state->tx_data +
-                        (state->local_tx_pos & VCHIQ_SLOT_MASK),
+                state->tx_data + (state->local_tx_pos & VCHIQ_SLOT_MASK),
                 state->rx_pos,
-                (uint32_t)state->rx_data +
-                        (state->rx_pos & VCHIQ_SLOT_MASK));
+                state->rx_data + (state->rx_pos & VCHIQ_SLOT_MASK));
         vchiq_dump(dump_context, buf, len + 1);
 
         len = snprintf(buf, sizeof(buf),
@@ -3747,7 +3740,7 @@ vchiq_dump_service_state(void *dump_context, VCHIQ_SERVICE_T *service)
         char buf[80];
         int len;
 
-        len = snprintf(buf, sizeof(buf), "Service %d: %s (ref %u)",
+        len = snprintf(buf, sizeof(buf), "Service %u: %s (ref %u)",
                 service->localport, srvstate_names[service->srvstate],
                 service->ref_count - 1); /*Don't include the lock just taken*/
 
@@ -3759,7 +3752,7 @@ vchiq_dump_service_state(void *dump_context, VCHIQ_SERVICE_T *service)
                 int tx_pending, rx_pending;
                 if (service->remoteport != VCHIQ_PORT_FREE) {
                         int len2 = snprintf(remoteport, sizeof(remoteport),
-                                "%d", service->remoteport);
+                                "%u", service->remoteport);
                         if (service->public_fourcc != VCHIQ_FOURCC_INVALID)
                                 snprintf(remoteport + len2,
                                         sizeof(remoteport) - len2,
@@ -3888,26 +3881,26 @@ VCHIQ_STATUS_T vchiq_send_remote_use_active(VCHIQ_STATE_T *state)
         return status;
 }
 
-void vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,
-        size_t numBytes)
+void vchiq_log_dump_mem(const char *label, uint32_t addr, const void *void_mem,
+        size_t num_bytes)
 {
-        const uint8_t  *mem = (const uint8_t *)voidMem;
+        const uint8_t  *mem = (const uint8_t *)void_mem;
         size_t          offset;
-        char            lineBuf[100];
+        char            line_buf[100];
         char           *s;
 
-        while (numBytes > 0) {
-                s = lineBuf;
+        while (num_bytes > 0) {
+                s = line_buf;
 
                 for (offset = 0; offset < 16; offset++) {
-                        if (offset < numBytes)
+                        if (offset < num_bytes)
                                 s += snprintf(s, 4, "%02x ", mem[offset]);
                         else
                                 s += snprintf(s, 4, "   ");
                 }
 
                 for (offset = 0; offset < 16; offset++) {
-                        if (offset < numBytes) {
+                        if (offset < num_bytes) {
                                 uint8_t ch = mem[offset];
 
                                 if ((ch < ' ') || (ch > '~'))
@@ -3919,16 +3912,16 @@ void vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,
 
                 if ((label != NULL) && (*label != '\0'))
                         vchiq_log_trace(VCHIQ_LOG_TRACE,
-                                "%s: %08x: %s", label, addr, lineBuf);
+                                "%s: %08x: %s", label, addr, line_buf);
                 else
                         vchiq_log_trace(VCHIQ_LOG_TRACE,
-                                "%08x: %s", addr, lineBuf);
+                                "%08x: %s", addr, line_buf);
 
                 addr += 16;
                 mem += 16;
-                if (numBytes > 16)
-                        numBytes -= 16;
+                if (num_bytes > 16)
+                        num_bytes -= 16;
                 else
-                        numBytes = 0;
+                        num_bytes = 0;
         }
 }
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 9be484c776d0..9e164652548a 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -184,11 +184,11 @@ enum {
 
 #define DEBUG_INITIALISE(local) int *debug_ptr = (local)->debug;
 #define DEBUG_TRACE(d) \
-        do { debug_ptr[DEBUG_ ## d] = __LINE__; dsb(); } while (0)
+        do { debug_ptr[DEBUG_ ## d] = __LINE__; dsb(sy); } while (0)
 #define DEBUG_VALUE(d, v) \
-        do { debug_ptr[DEBUG_ ## d] = (v); dsb(); } while (0)
+        do { debug_ptr[DEBUG_ ## d] = (v); dsb(sy); } while (0)
 #define DEBUG_COUNT(d) \
-        do { debug_ptr[DEBUG_ ## d]++; dsb(); } while (0)
+        do { debug_ptr[DEBUG_ ## d]++; dsb(sy); } while (0)
 
 #else /* VCHIQ_ENABLE_DEBUG */
 
@@ -264,7 +264,8 @@ typedef struct vchiq_bulk_queue_struct {
 typedef struct remote_event_struct {
         int armed;
         int fired;
-        struct semaphore *event;
+        /* Contains offset from the beginning of the VCHIQ_STATE_T structure */
+        u32 event;
 } REMOTE_EVENT_T;
 
 typedef struct opaque_platform_state_t *VCHIQ_PLATFORM_STATE_T;
@@ -633,9 +634,6 @@ vchiq_transfer_bulk(VCHIQ_BULK_T *bulk);
 extern void
 vchiq_complete_bulk(VCHIQ_BULK_T *bulk);
 
-extern VCHIQ_STATUS_T
-vchiq_copy_from_user(void *dst, const void *src, int size);
-
 extern void
 remote_event_signal(REMOTE_EVENT_T *event);
 
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 7e032130d967..f07cd4448ddf 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
@@ -120,7 +120,7 @@ static int debugfs_log_open(struct inode *inode, struct file *file)
         return single_open(file, debugfs_log_show, inode->i_private);
 }
 
-static int debugfs_log_write(struct file *file,
+static ssize_t debugfs_log_write(struct file *file,
         const char __user *buffer,
         size_t count, loff_t *ppos)
 {
@@ -229,7 +229,7 @@ static int debugfs_trace_open(struct inode *inode, struct file *file)
         return single_open(file, debugfs_trace_show, inode->i_private);
 }
 
-static int debugfs_trace_write(struct file *file,
+static ssize_t debugfs_trace_write(struct file *file,
         const char __user *buffer,
         size_t count, loff_t *ppos)
 {
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
index 8067bbe7ce8d..377e8e48bb54 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -141,9 +141,12 @@ extern VCHIQ_STATUS_T vchiq_use_service(VCHIQ_SERVICE_HANDLE_T service);
 extern VCHIQ_STATUS_T vchiq_use_service_no_resume(
         VCHIQ_SERVICE_HANDLE_T service);
 extern VCHIQ_STATUS_T vchiq_release_service(VCHIQ_SERVICE_HANDLE_T service);
-
-extern VCHIQ_STATUS_T vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T service,
-        const VCHIQ_ELEMENT_T *elements, unsigned int count);
+extern VCHIQ_STATUS_T
+vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
+                    ssize_t (*copy_callback)(void *context, void *dest,
+                                             size_t offset, size_t maxsize),
+                    void *context,
+                    size_t size);
 extern void           vchiq_release_message(VCHIQ_SERVICE_HANDLE_T service,
         VCHIQ_HEADER_T *header);
 extern VCHIQ_STATUS_T vchiq_queue_bulk_transmit(VCHIQ_SERVICE_HANDLE_T service,
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
index 25e7011edc50..e93922a87263 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
@@ -70,7 +70,7 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
 *
 ***************************************************************************/
 #define VCHIQ_INIT_RETRIES 10
-VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instanceOut)
+VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
 {
         VCHIQ_STATUS_T status = VCHIQ_ERROR;
         VCHIQ_STATE_T *state;
@@ -108,7 +108,7 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instanceOut)
         mutex_init(&instance->bulk_waiter_list_mutex);
         INIT_LIST_HEAD(&instance->bulk_waiter_list);
 
-        *instanceOut = instance;
+        *instance_out = instance;
 
         status = VCHIQ_SUCCESS;
 
@@ -134,7 +134,7 @@ VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
         vchiq_log_trace(vchiq_core_log_level,
                 "%s(%p) called", __func__, instance);
 
-        if (mutex_lock_interruptible(&state->mutex) != 0)
+        if (mutex_lock_killable(&state->mutex) != 0)
                 return VCHIQ_RETRY;
 
         /* Remove all services */
@@ -155,9 +155,8 @@ VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
                                         list);
                         list_del(pos);
                         vchiq_log_info(vchiq_arm_log_level,
-                                        "bulk_waiter - cleaned up %x "
-                                        "for pid %d",
-                                        (unsigned int)waiter, waiter->pid);
+                                        "bulk_waiter - cleaned up %pK for pid %d",
+                                        waiter, waiter->pid);
                         kfree(waiter);
                 }
                 kfree(instance);
@@ -192,7 +191,7 @@ VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
         vchiq_log_trace(vchiq_core_log_level,
                 "%s(%p) called", __func__, instance);
 
-        if (mutex_lock_interruptible(&state->mutex) != 0) {
+        if (mutex_lock_killable(&state->mutex) != 0) {
                 vchiq_log_trace(vchiq_core_log_level,
                         "%s: call to mutex_lock failed", __func__);
                 status = VCHIQ_RETRY;
@@ -450,8 +449,8 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
                 list_add(&waiter->list, &instance->bulk_waiter_list);
                 mutex_unlock(&instance->bulk_waiter_list_mutex);
                 vchiq_log_info(vchiq_arm_log_level,
-                                "saved bulk_waiter %x for pid %d",
-                                (unsigned int)waiter, current->pid);
+                                "saved bulk_waiter %pK for pid %d",
+                                waiter, current->pid);
         }
 
         return status;
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h
index 335446e05476..778063ba312a 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h
@@ -52,18 +52,4 @@ static inline int __must_check down_interruptible_killable(struct semaphore *sem
 }
 #define down_interruptible down_interruptible_killable
 
-
-static inline int __must_check mutex_lock_interruptible_killable(struct mutex *lock)
-{
-        /* Allow interception of killable signals only. We don't want to be interrupted by harmless signals like SIGALRM */
-        int ret;
-        sigset_t blocked, oldset;
-        siginitsetinv(&blocked, SHUTDOWN_SIGS);
-        sigprocmask(SIG_SETMASK, &blocked, &oldset);
-        ret = mutex_lock_interruptible(lock);
-        sigprocmask(SIG_SETMASK, &oldset, NULL);
-        return ret;
-}
-#define mutex_lock_interruptible mutex_lock_interruptible_killable
-
 #endif
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
index d02e7764bd0d..dd43458f306f 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
@@ -42,13 +42,13 @@
 /* ---- Constants and Types ---------------------------------------------- */
 
 typedef struct {
-         void                   *armSharedMemVirt;
-         dma_addr_t              armSharedMemPhys;
-         size_t                  armSharedMemSize;
+         void                   *arm_shared_mem_virt;
+         dma_addr_t              arm_shared_mem_phys;
+         size_t                  arm_shared_mem_size;
 
-         void                   *vcSharedMemVirt;
-         dma_addr_t              vcSharedMemPhys;
-         size_t                  vcSharedMemSize;
+         void                   *vc_shared_mem_virt;
+         dma_addr_t              vc_shared_mem_phys;
+         size_t                  vc_shared_mem_size;
 } VCHIQ_SHARED_MEM_INFO_T;
 
 /* ---- Variable Externs ------------------------------------------------- */
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
index 54a3ecec69ef..12c304ceb952 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
@@ -43,11 +43,13 @@
 #define PAGELIST_READ_WITH_FRAGMENTS 2
 
 typedef struct pagelist_struct {
-        unsigned long length;
-        unsigned short type;
-        unsigned short offset;
-        unsigned long addrs[1]; /* N.B. 12 LSBs hold the number of following
-                                   pages at consecutive addresses. */
+        u32 length;
+        u16 type;
+        u16 offset;
+        u32 addrs[1];   /* N.B. 12 LSBs hold the number
+                         * of following pages at consecutive
+                         * addresses.
+                         */
 } PAGELIST_T;
 
 typedef struct fragments_struct {
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 8072ff613636..d9771394a041 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -148,10 +148,10 @@ EXPORT_SYMBOL(vchi_msg_remove);
  * Name: vchi_msg_queue
  *
  * Arguments:  VCHI_SERVICE_HANDLE_T handle,
- *             const void *data,
- *             uint32_t data_size,
- *             VCHI_FLAGS_T flags,
- *             void *msg_handle,
+ *             ssize_t (*copy_callback)(void *context, void *dest,
+ *                                      size_t offset, size_t maxsize),
+ *             void *context,
+ *             uint32_t data_size
  *
  * Description: Thin wrapper to queue a message onto a connection
  *
@@ -159,28 +159,29 @@ EXPORT_SYMBOL(vchi_msg_remove);
  *
  ***********************************************************/
 int32_t vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle,
-        const void *data,
-        uint32_t data_size,
-        VCHI_FLAGS_T flags,
-        void *msg_handle)
+        ssize_t (*copy_callback)(void *context, void *dest,
+                                 size_t offset, size_t maxsize),
+        void *context,
+        uint32_t data_size)
 {
         SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-        VCHIQ_ELEMENT_T element = {data, data_size};
         VCHIQ_STATUS_T status;
 
-        (void)msg_handle;
-
-        WARN_ON(flags != VCHI_FLAGS_BLOCK_UNTIL_QUEUED);
+        while (1) {
+                status = vchiq_queue_message(service->handle,
+                                             copy_callback,
+                                             context,
+                                             data_size);
 
-        status = vchiq_queue_message(service->handle, &element, 1);
+                /*
+                 * vchiq_queue_message() may return VCHIQ_RETRY, so we need to
+                 * implement a retry mechanism since this function is supposed
+                 * to block until queued
+                 */
+                if (status != VCHIQ_RETRY)
+                        break;
 
-        /* vchiq_queue_message() may return VCHIQ_RETRY, so we need to
-        ** implement a retry mechanism since this function is supposed
-        ** to block until queued
-        */
-        while (status == VCHIQ_RETRY) {
                 msleep(1);
-                status = vchiq_queue_message(service->handle, &element, 1);
         }
 
         return vchiq_status_to_vchi(status);
@@ -229,17 +230,18 @@ int32_t vchi_bulk_queue_receive(VCHI_SERVICE_HANDLE_T handle,
                 return vchiq_status_to_vchi(VCHIQ_ERROR);
         }
 
-        status = vchiq_bulk_receive(service->handle, data_dst, data_size,
-                bulk_handle, mode);
-
-        /* vchiq_bulk_receive() may return VCHIQ_RETRY, so we need to
-        ** implement a retry mechanism since this function is supposed
-        ** to block until queued
-        */
-        while (status == VCHIQ_RETRY) {
-                msleep(1);
+        while (1) {
                 status = vchiq_bulk_receive(service->handle, data_dst,
                         data_size, bulk_handle, mode);
+                /*
+                 * vchiq_bulk_receive() may return VCHIQ_RETRY, so we need to
+                 * implement a retry mechanism since this function is supposed
+                 * to block until queued
+                 */
+                if (status != VCHIQ_RETRY)
+                        break;
+
+                msleep(1);
         }
 
         return vchiq_status_to_vchi(status);
@@ -289,17 +291,19 @@ int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle,
                 return vchiq_status_to_vchi(VCHIQ_ERROR);
         }
 
-        status = vchiq_bulk_transmit(service->handle, data_src, data_size,
-                bulk_handle, mode);
-
-        /* vchiq_bulk_transmit() may return VCHIQ_RETRY, so we need to
-        ** implement a retry mechanism since this function is supposed
-        ** to block until queued
-        */
-        while (status == VCHIQ_RETRY) {
-                msleep(1);
+        while (1) {
                 status = vchiq_bulk_transmit(service->handle, data_src,
                         data_size, bulk_handle, mode);
+
+                /*
+                 * vchiq_bulk_transmit() may return VCHIQ_RETRY, so we need to
+                 * implement a retry mechanism since this function is supposed
+                 * to block until queued
+                 */
+                if (status != VCHIQ_RETRY)
+                        break;
+
+                msleep(1);
         }
 
         return vchiq_status_to_vchi(status);
@@ -350,44 +354,6 @@ int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle,
 EXPORT_SYMBOL(vchi_msg_dequeue);
 
 /***********************************************************
- * Name: vchi_msg_queuev
- *
- * Arguments:  VCHI_SERVICE_HANDLE_T handle,
- *             VCHI_MSG_VECTOR_T *vector,
- *             uint32_t count,
- *             VCHI_FLAGS_T flags,
- *             void *msg_handle
- *
- * Description: Thin wrapper to queue a message onto a connection
- *
- * Returns: int32_t - success == 0
- *
- ***********************************************************/
-
-vchiq_static_assert(sizeof(VCHI_MSG_VECTOR_T) == sizeof(VCHIQ_ELEMENT_T));
-vchiq_static_assert(offsetof(VCHI_MSG_VECTOR_T, vec_base) ==
-        offsetof(VCHIQ_ELEMENT_T, data));
-vchiq_static_assert(offsetof(VCHI_MSG_VECTOR_T, vec_len) ==
-        offsetof(VCHIQ_ELEMENT_T, size));
-
-int32_t vchi_msg_queuev(VCHI_SERVICE_HANDLE_T handle,
-        VCHI_MSG_VECTOR_T *vector,
-        uint32_t count,
-        VCHI_FLAGS_T flags,
-        void *msg_handle)
-{
-        SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-
-        (void)msg_handle;
-
-        WARN_ON(flags != VCHI_FLAGS_BLOCK_UNTIL_QUEUED);
-
-        return vchiq_status_to_vchi(vchiq_queue_message(service->handle,
-                (const VCHIQ_ELEMENT_T *)vector, count));
-}
-EXPORT_SYMBOL(vchi_msg_queuev);
-
-/***********************************************************
  * Name: vchi_held_msg_release
  *
  * Arguments:  VCHI_HELD_MSG_T *message
@@ -400,8 +366,16 @@ EXPORT_SYMBOL(vchi_msg_queuev);
  ***********************************************************/
 int32_t vchi_held_msg_release(VCHI_HELD_MSG_T *message)
 {
-        vchiq_release_message((VCHIQ_SERVICE_HANDLE_T)message->service,
-                (VCHIQ_HEADER_T *)message->message);
+        /*
+         * Convert the service field pointer back to an
+         * VCHIQ_SERVICE_HANDLE_T which is an int.
+         * This pointer is opaque to everything except
+         * vchi_msg_hold which simply upcasted the int
+         * to a pointer.
+         */
+
+        vchiq_release_message((VCHIQ_SERVICE_HANDLE_T)(long)message->service,
+                              (VCHIQ_HEADER_T *)message->message);
 
         return 0;
 }
@@ -445,8 +419,16 @@ int32_t vchi_msg_hold(VCHI_SERVICE_HANDLE_T handle,
         *data = header->data;
         *msg_size = header->size;
 
+        /*
+         * upcast the VCHIQ_SERVICE_HANDLE_T which is an int
+         * to a pointer and stuff it in the held message.
+         * This pointer is opaque to everything except
+         * vchi_held_msg_release which simply downcasts it back
+         * to an int.
+         */
+
         message_handle->service =
-                (struct opaque_vchi_service_t *)service->handle;
+                (struct opaque_vchi_service_t *)(long)service->handle;
         message_handle->message = header;
 
         return 0;
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c
index 384acb8d2eae..f76f4d790532 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c
@@ -61,8 +61,7 @@ int vchiu_queue_init(VCHIU_QUEUE_T *queue, int size)
 
 void vchiu_queue_delete(VCHIU_QUEUE_T *queue)
 {
-        if (queue->storage != NULL)
-                kfree(queue->storage);
+        kfree(queue->storage);
 }
 
 int vchiu_queue_is_empty(VCHIU_QUEUE_T *queue)
diff --git a/drivers/staging/vme/devices/vme_pio2.h b/drivers/staging/vme/devices/vme_pio2.h
index d5d94c43c074..5577df3199e7 100644
--- a/drivers/staging/vme/devices/vme_pio2.h
+++ b/drivers/staging/vme/devices/vme_pio2.h
@@ -48,8 +48,6 @@ static const int PIO2_REGS_INT_MASK[8] = { PIO2_REGS_INT_MASK0,
                                         PIO2_REGS_INT_MASK6,
                                         PIO2_REGS_INT_MASK7 };
 
-
-
 #define PIO2_REGS_CTRL                  0x18
 #define PIO2_REGS_VME_VECTOR            0x19
 #define PIO2_REGS_CNTR0                 0x20
@@ -63,7 +61,6 @@ static const int PIO2_REGS_INT_MASK[8] = { PIO2_REGS_INT_MASK0,
 
 #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,
@@ -204,8 +201,6 @@ static const int PIO2_CNTR_SC_DEV[6] = { PIO2_CNTR_SC_DEV0, PIO2_CNTR_SC_DEV1,
 
 #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 };
 
@@ -240,10 +235,10 @@ struct pio2_card {
         struct pio2_cntr cntr[6];
 };
 
-int pio2_cntr_reset(struct pio2_card *);
+int pio2_cntr_reset(struct pio2_card *card);
 
-int pio2_gpio_reset(struct pio2_card *);
-int pio2_gpio_init(struct pio2_card *);
-void pio2_gpio_exit(struct pio2_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_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
index 8e66a520266c..20a2d835fdaa 100644
--- a/drivers/staging/vme/devices/vme_pio2_core.c
+++ b/drivers/staging/vme/devices/vme_pio2_core.c
@@ -365,7 +365,7 @@ static int pio2_probe(struct vme_dev *vdev)
                 vec = card->irq_vector | PIO2_VECTOR_CNTR[i];
 
                 retval = vme_irq_request(vdev, card->irq_level, vec,
-                        &pio2_int, card);
+                                         &pio2_int, card);
                 if (retval < 0) {
                         dev_err(&card->vdev->dev,
                                 "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index d84dffb894f4..87aa5174df22 100644
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -661,7 +661,7 @@ err_sysfs:
         }
         class_destroy(vme_user_sysfs_class);
 
-        /* Ensure counter set correcty to unalloc all master windows */
+        /* Ensure counter set correctly to unalloc all master windows */
         i = MASTER_MAX + 1;
 err_master:
         while (i > MASTER_MINOR) {
@@ -671,7 +671,7 @@ err_master:
         }
 
         /*
-         * Ensure counter set correcty to unalloc all slave windows and buffers
+         * Ensure counter set correctly to unalloc all slave windows and buffers
          */
         i = SLAVE_MAX + 1;
 err_slave:
@@ -716,7 +716,7 @@ static int vme_user_remove(struct vme_dev *dev)
         /* Unregister device driver */
         cdev_del(vme_user_cdev);
 
-        /* Unregiser the major and minor device numbers */
+        /* Unregister the major and minor device numbers */
         unregister_chrdev_region(MKDEV(VME_MAJOR, 0), VME_DEVS);
 
         return 0;
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index de503a316e71..44dfa5421374 100644
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -12,11 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *
  * File: baseband.c
  *
  * Purpose: Implement functions to access baseband
@@ -1916,7 +1911,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *      byBBAddr    - address of register in Baseband
  *  Out:
  *      pbyData     - data read
@@ -1927,24 +1922,24 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
 bool BBbReadEmbedded(struct vnt_private *priv,
                      unsigned char byBBAddr, unsigned char *pbyData)
 {
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
         unsigned short ww;
         unsigned char byValue;
 
         /* BB reg offset */
-        VNSvOutPortB(dwIoBase + MAC_REG_BBREGADR, byBBAddr);
+        VNSvOutPortB(iobase + MAC_REG_BBREGADR, byBBAddr);
 
         /* turn on REGR */
-        MACvRegBitsOn(dwIoBase, MAC_REG_BBREGCTL, BBREGCTL_REGR);
+        MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR);
         /* W_MAX_TIMEOUT is the timeout period */
         for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
-                VNSvInPortB(dwIoBase + MAC_REG_BBREGCTL, &byValue);
+                VNSvInPortB(iobase + MAC_REG_BBREGCTL, &byValue);
                 if (byValue & BBREGCTL_DONE)
                         break;
         }
 
         /* get BB data */
-        VNSvInPortB(dwIoBase + MAC_REG_BBREGDATA, pbyData);
+        VNSvInPortB(iobase + MAC_REG_BBREGDATA, pbyData);
 
         if (ww == W_MAX_TIMEOUT) {
                 pr_debug(" DBG_PORT80(0x30)\n");
@@ -1958,7 +1953,7 @@ bool BBbReadEmbedded(struct vnt_private *priv,
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *      byBBAddr    - address of register in Baseband
  *      byData      - data to write
  *  Out:
@@ -1970,20 +1965,20 @@ bool BBbReadEmbedded(struct vnt_private *priv,
 bool BBbWriteEmbedded(struct vnt_private *priv,
                       unsigned char byBBAddr, unsigned char byData)
 {
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
         unsigned short ww;
         unsigned char byValue;
 
         /* BB reg offset */
-        VNSvOutPortB(dwIoBase + MAC_REG_BBREGADR, byBBAddr);
+        VNSvOutPortB(iobase + MAC_REG_BBREGADR, byBBAddr);
         /* set BB data */
-        VNSvOutPortB(dwIoBase + MAC_REG_BBREGDATA, byData);
+        VNSvOutPortB(iobase + MAC_REG_BBREGDATA, byData);
 
         /* turn on BBREGCTL_REGW */
-        MACvRegBitsOn(dwIoBase, MAC_REG_BBREGCTL, BBREGCTL_REGW);
+        MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW);
         /* W_MAX_TIMEOUT is the timeout period */
         for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
-                VNSvInPortB(dwIoBase + MAC_REG_BBREGCTL, &byValue);
+                VNSvInPortB(iobase + MAC_REG_BBREGCTL, &byValue);
                 if (byValue & BBREGCTL_DONE)
                         break;
         }
@@ -2000,7 +1995,7 @@ bool BBbWriteEmbedded(struct vnt_private *priv,
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *      byRevId     - Revision ID
  *      byRFType    - RF type
  *  Out:
@@ -2014,7 +2009,7 @@ bool BBbVT3253Init(struct vnt_private *priv)
 {
         bool bResult = true;
         int        ii;
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
         unsigned char byRFType = priv->byRFType;
         unsigned char byLocalID = priv->byLocalID;
 
@@ -2036,8 +2031,8 @@ bool BBbVT3253Init(struct vnt_private *priv)
                                         byVT3253B0_AGC4_RFMD2959[ii][0],
                                         byVT3253B0_AGC4_RFMD2959[ii][1]);
 
-                        VNSvOutPortD(dwIoBase + MAC_REG_ITRTMSET, 0x23);
-                        MACvRegBitsOn(dwIoBase, MAC_REG_PAPEDELAY, BIT(0));
+                        VNSvOutPortD(iobase + MAC_REG_ITRTMSET, 0x23);
+                        MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0));
                 }
                 priv->abyBBVGA[0] = 0x18;
                 priv->abyBBVGA[1] = 0x0A;
@@ -2076,8 +2071,8 @@ bool BBbVT3253Init(struct vnt_private *priv)
                                 byVT3253B0_AGC[ii][0],
                                 byVT3253B0_AGC[ii][1]);
 
-                VNSvOutPortB(dwIoBase + MAC_REG_ITRTMSET, 0x23);
-                MACvRegBitsOn(dwIoBase, MAC_REG_PAPEDELAY, BIT(0));
+                VNSvOutPortB(iobase + MAC_REG_ITRTMSET, 0x23);
+                MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0));
 
                 priv->abyBBVGA[0] = 0x14;
                 priv->abyBBVGA[1] = 0x0A;
@@ -2098,7 +2093,7 @@ bool BBbVT3253Init(struct vnt_private *priv)
                  * 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted)
                  */
 
-                /*bResult &= BBbWriteEmbedded(dwIoBase,0x09,0x41);*/
+                /*bResult &= BBbWriteEmbedded(iobase,0x09,0x41);*/
 
                 /* Init ANT B select,
                  * RX Config CR10 = 0x28->0x2A,
@@ -2106,7 +2101,7 @@ bool BBbVT3253Init(struct vnt_private *priv)
                  * make the ANT_A, ANT_B inverted)
                  */
 
-                /*bResult &= BBbWriteEmbedded(dwIoBase,0x0a,0x28);*/
+                /*bResult &= BBbWriteEmbedded(iobase,0x0a,0x28);*/
                 /* Select VC1/VC2, CR215 = 0x02->0x06 */
                 bResult &= BBbWriteEmbedded(priv, 0xd7, 0x06);
 
@@ -2154,7 +2149,7 @@ bool BBbVT3253Init(struct vnt_private *priv)
                 priv->ldBmThreshold[2] = 0;
                 priv->ldBmThreshold[3] = 0;
                 /* Fix VT3226 DFC system timing issue */
-                MACvSetRFLE_LatchBase(dwIoBase);
+                MACvSetRFLE_LatchBase(iobase);
                 /* {{ RobertYu: 20050104 */
         } else if (byRFType == RF_AIROHA7230) {
                 for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++)
@@ -2162,16 +2157,15 @@ bool BBbVT3253Init(struct vnt_private *priv)
                                 byVT3253B0_AIROHA2230[ii][0],
                                 byVT3253B0_AIROHA2230[ii][1]);
 
-
                 /* {{ RobertYu:20050223, request by JerryChung */
                 /* Init ANT B select,TX Config CR09 = 0x61->0x45,
                  * 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted)
                  */
-                /*bResult &= BBbWriteEmbedded(dwIoBase,0x09,0x41);*/
+                /*bResult &= BBbWriteEmbedded(iobase,0x09,0x41);*/
                 /* Init ANT B select,RX Config CR10 = 0x28->0x2A,
                  * 0x2A->0x28(VC1/VC2 define, make the ANT_A, ANT_B inverted)
                  */
-                /*bResult &= BBbWriteEmbedded(dwIoBase,0x0a,0x28);*/
+                /*bResult &= BBbWriteEmbedded(iobase,0x0a,0x28);*/
                 /* Select VC1/VC2, CR215 = 0x02->0x06 */
                 bResult &= BBbWriteEmbedded(priv, 0xd7, 0x06);
                 /* }} */
@@ -2259,7 +2253,7 @@ void BBvSetVGAGainOffset(struct vnt_private *priv, unsigned char byData)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *  Out:
  *      none
  *
@@ -2280,7 +2274,7 @@ BBvSoftwareReset(struct vnt_private *priv)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *  Out:
  *      none
  *
@@ -2302,7 +2296,7 @@ BBvPowerSaveModeON(struct vnt_private *priv)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *  Out:
  *      none
  *
diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h
index b4e8c43180ec..8a567c9155b4 100644
--- a/drivers/staging/vt6655/baseband.h
+++ b/drivers/staging/vt6655/baseband.h
@@ -12,11 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *
  * File: baseband.h
  *
  * Purpose: Implement functions to access baseband
@@ -60,12 +55,6 @@
 #define TOP_RATE_2M         0x00200000
 #define TOP_RATE_1M         0x00100000
 
-#define BBvClearFOE(dwIoBase)                           \
-        BBbWriteEmbedded(dwIoBase, 0xB1, 0)
-
-#define BBvSetFOE(dwIoBase)                             \
-        BBbWriteEmbedded(dwIoBase, 0xB1, 0x0C)
-
 unsigned int
 BBuGetFrameTime(
         unsigned char byPreambleType,
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index dbcea4434725..e0c92818ed70 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: card.c
  * Purpose: Provide functions to setup NIC operation mode
  * Functions:
@@ -36,7 +32,7 @@
  *
  * Revision History:
  *      06-10-2003 Bryan YC Fan:  Re-write codes to support VT3253 spec.
- *      08-26-2003 Kyle Hsu:      Modify the defination type of dwIoBase.
+ *      08-26-2003 Kyle Hsu:      Modify the defination type of iobase.
  *      09-01-2003 Bryan YC Fan:  Add vUpdateIFS().
  *
  */
@@ -261,7 +257,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
                 BBbWriteEmbedded(priv, 0x88, 0x02);
                 bySlot = C_SLOT_LONG;
                 bySIFS = C_SIFS_BG;
-                byDIFS = C_SIFS_BG + 2*C_SLOT_LONG;
+                byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;
                 byCWMaxMin = 0xA5;
         } else { /* PK_TYPE_11GA & PK_TYPE_11GB */
                 MACvSetBBType(priv->PortOffset, BB_TYPE_11G);
@@ -289,7 +285,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
                         byDIFS = C_SIFS_BG + 2 * C_SLOT_SHORT;
                 } else {
                         bySlot = C_SLOT_LONG;
-                        byDIFS = C_SIFS_BG + 2*C_SLOT_LONG;
+                        byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;
                 }
 
                 byCWMaxMin = 0xa4;
@@ -528,8 +524,11 @@ CARDvSafeResetTx(
         struct vnt_tx_desc *pCurrTD;
 
         /* initialize TD index */
-        priv->apTailTD[0] = priv->apCurrTD[0] = &(priv->apTD0Rings[0]);
-        priv->apTailTD[1] = priv->apCurrTD[1] = &(priv->apTD1Rings[0]);
+        priv->apTailTD[0] = &(priv->apTD0Rings[0]);
+        priv->apCurrTD[0] = &(priv->apTD0Rings[0]);
+
+        priv->apTailTD[1] = &(priv->apTD1Rings[0]);
+        priv->apCurrTD[1] = &(priv->apTD1Rings[0]);
 
         for (uu = 0; uu < TYPE_MAXTD; uu++)
                 priv->iTDUsed[uu] = 0;
@@ -938,20 +937,20 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)
  */
 bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *pqwCurrTSF)
 {
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
         unsigned short ww;
         unsigned char byData;
 
-        MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD);
+        MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD);
         for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
-                VNSvInPortB(dwIoBase + MAC_REG_TFTCTL, &byData);
+                VNSvInPortB(iobase + MAC_REG_TFTCTL, &byData);
                 if (!(byData & TFTCTL_TSFCNTRRD))
                         break;
         }
         if (ww == W_MAX_TIMEOUT)
                 return false;
-        VNSvInPortD(dwIoBase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF);
-        VNSvInPortD(dwIoBase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF + 1);
+        VNSvInPortD(iobase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF);
+        VNSvInPortD(iobase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF + 1);
 
         return true;
 }
@@ -989,7 +988,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)
  *
  * Parameters:
  *  In:
- *      dwIoBase        - IO Base
+ *      iobase          - IO Base
  *      wBeaconInterval - Beacon Interval
  *  Out:
  *      none
@@ -999,16 +998,16 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)
 void CARDvSetFirstNextTBTT(struct vnt_private *priv,
                            unsigned short wBeaconInterval)
 {
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
         u64 qwNextTBTT = 0;
 
         CARDbGetCurrentTSF(priv, &qwNextTBTT); /* Get Local TSF counter */
 
         qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
         /* Set NextTBTT */
-        VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, (u32)qwNextTBTT);
-        VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32));
-        MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
+        VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwNextTBTT);
+        VNSvOutPortD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32));
+        MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
 }
 
 /*
@@ -1028,12 +1027,12 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv,
 void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF,
                          unsigned short wBeaconInterval)
 {
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
 
         qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval);
         /* Set NextTBTT */
-        VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, (u32)qwTSF);
-        VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >> 32));
-        MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
+        VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwTSF);
+        VNSvOutPortD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >> 32));
+        MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
         pr_debug("Card:Update Next TBTT[%8llx]\n", qwTSF);
 }
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index 0203c7fd91a2..44420b5a445f 100644
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: card.h
  *
  * Purpose: Provide functions to setup NIC operation mode
@@ -50,7 +46,7 @@
 
 #define CB_MAX_CHANNEL_24G      14
 #define CB_MAX_CHANNEL_5G       42
-#define CB_MAX_CHANNEL          (CB_MAX_CHANNEL_24G+CB_MAX_CHANNEL_5G)
+#define CB_MAX_CHANNEL          (CB_MAX_CHANNEL_24G + CB_MAX_CHANNEL_5G)
 
 typedef enum _CARD_PKT_TYPE {
         PKT_TYPE_802_11_BCN,
diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c
index 029a8df4ca1c..ab89956511a0 100644
--- a/drivers/staging/vt6655/channel.c
+++ b/drivers/staging/vt6655/channel.c
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: channel.c
  *
  */
diff --git a/drivers/staging/vt6655/channel.h b/drivers/staging/vt6655/channel.h
index 2d613e7f169c..2621dfabff06 100644
--- a/drivers/staging/vt6655/channel.h
+++ b/drivers/staging/vt6655/channel.h
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: channel.h
  *
  */
diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h
index 2d7f6ae89164..2fee6e759ad8 100644
--- a/drivers/staging/vt6655/desc.h
+++ b/drivers/staging/vt6655/desc.h
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: desc.h
  *
  * Purpose:The header file of descriptor
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 55405e058196..3ae40d846a09 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: device.h
  *
  * Purpose: MAC Data structure
@@ -283,12 +279,12 @@ struct vnt_private {
         unsigned char byOFDMPwrG;
         unsigned char byCurPwr;
         char     byCurPwrdBm;
-        unsigned char abyCCKPwrTbl[CB_MAX_CHANNEL_24G+1];
-        unsigned char abyOFDMPwrTbl[CB_MAX_CHANNEL+1];
-        char    abyCCKDefaultPwr[CB_MAX_CHANNEL_24G+1];
-        char    abyOFDMDefaultPwr[CB_MAX_CHANNEL+1];
-        char    abyRegPwr[CB_MAX_CHANNEL+1];
-        char    abyLocalPwr[CB_MAX_CHANNEL+1];
+        unsigned char abyCCKPwrTbl[CB_MAX_CHANNEL_24G + 1];
+        unsigned char abyOFDMPwrTbl[CB_MAX_CHANNEL + 1];
+        char    abyCCKDefaultPwr[CB_MAX_CHANNEL_24G + 1];
+        char    abyOFDMDefaultPwr[CB_MAX_CHANNEL + 1];
+        char    abyRegPwr[CB_MAX_CHANNEL + 1];
+        char    abyLocalPwr[CB_MAX_CHANNEL + 1];
 
         /* BaseBand Loopback Use */
         unsigned char byBBCR4d;
diff --git a/drivers/staging/vt6655/device_cfg.h b/drivers/staging/vt6655/device_cfg.h
index b4c9547d3138..0298ea923f97 100644
--- a/drivers/staging/vt6655/device_cfg.h
+++ b/drivers/staging/vt6655/device_cfg.h
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: device_cfg.h
  *
  * Purpose: Driver configuration header
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index f109eeac358d..da0f71191009 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: device_main.c
  *
  * Purpose: driver entry for initial, open, close, tx and rx.
@@ -314,7 +310,7 @@ static void device_init_registers(struct vnt_private *priv)
                         SROMbyReadEmbedded(priv->PortOffset,
                                            (unsigned char)(ii + EEP_OFS_CCK_PWR_TBL));
                 if (priv->abyCCKPwrTbl[ii + 1] == 0)
-                        priv->abyCCKPwrTbl[ii+1] = priv->byCCKPwr;
+                        priv->abyCCKPwrTbl[ii + 1] = priv->byCCKPwr;
 
                 priv->abyOFDMPwrTbl[ii + 1] =
                         SROMbyReadEmbedded(priv->PortOffset,
@@ -556,7 +552,7 @@ static void device_init_rd0_ring(struct vnt_private *priv)
                 if (!device_alloc_rx_buf(priv, desc))
                         dev_err(&priv->pcid->dev, "can not alloc rx bufs\n");
 
-                desc->next = &(priv->aRD0Ring[(i+1) % priv->opts.rx_descs0]);
+                desc->next = &(priv->aRD0Ring[(i + 1) % priv->opts.rx_descs0]);
                 desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_rx_desc));
         }
 
@@ -1272,7 +1268,6 @@ static void vnt_remove_interface(struct ieee80211_hw *hw,
         priv->op_mode = NL80211_IFTYPE_UNSPECIFIED;
 }
 
-
 static int vnt_config(struct ieee80211_hw *hw, u32 changed)
 {
         struct vnt_private *priv = hw->priv;
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index 700032e9c477..9b3fa779258a 100644
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: dpc.c
  *
  * Purpose: handle dpc rx functions
diff --git a/drivers/staging/vt6655/dpc.h b/drivers/staging/vt6655/dpc.h
index e80b30816968..6e75fa9c5618 100644
--- a/drivers/staging/vt6655/dpc.h
+++ b/drivers/staging/vt6655/dpc.h
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: dpc.h
  *
  * Purpose:
diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c
index e161d5d9aebb..dad9e292d4da 100644
--- a/drivers/staging/vt6655/key.c
+++ b/drivers/staging/vt6655/key.c
@@ -12,11 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *
  * File: key.c
  *
  * Purpose: Implement functions for 802.11i Key management
diff --git a/drivers/staging/vt6655/key.h b/drivers/staging/vt6655/key.h
index d72719741a56..a5024611af60 100644
--- a/drivers/staging/vt6655/key.h
+++ b/drivers/staging/vt6655/key.h
@@ -12,11 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *
  * File: key.h
  *
  * Purpose: Implement functions for 802.11i Key management
diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index 8e13f7f41415..4aaa99bafcda 100644
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -12,11 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *
  * File: mac.c
  *
  * Purpose:  MAC routines
@@ -147,7 +142,6 @@ void MACvSetShortRetryLimit(struct vnt_private *priv,
         iowrite8(byRetryLimit, io_base + MAC_REG_SRT);
 }
 
-
 /*
  * Description:
  *      Set 802.11 Long Retry Limit
@@ -321,7 +315,7 @@ bool MACbSoftwareReset(struct vnt_private *priv)
  */
 bool MACbSafeSoftwareReset(struct vnt_private *priv)
 {
-        unsigned char abyTmpRegData[MAC_MAX_CONTEXT_SIZE_PAGE0+MAC_MAX_CONTEXT_SIZE_PAGE1];
+        unsigned char abyTmpRegData[MAC_MAX_CONTEXT_SIZE_PAGE0 + MAC_MAX_CONTEXT_SIZE_PAGE1];
         bool bRetVal;
 
         /* PATCH....
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 030f529c339b..33b758cb79d4 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -12,11 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *
  * File: mac.h
  *
  * Purpose: MAC routines
@@ -554,341 +549,341 @@
 
 /*---------------------  Export Macros ------------------------------*/
 
-#define MACvRegBitsOn(dwIoBase, byRegOfs, byBits)                       \
+#define MACvRegBitsOn(iobase, byRegOfs, byBits)                 \
 do {                                                                    \
         unsigned char byData;                                           \
-        VNSvInPortB(dwIoBase + byRegOfs, &byData);                      \
-        VNSvOutPortB(dwIoBase + byRegOfs, byData | (byBits));           \
+        VNSvInPortB(iobase + byRegOfs, &byData);                        \
+        VNSvOutPortB(iobase + byRegOfs, byData | (byBits));             \
 } while (0)
 
-#define MACvWordRegBitsOn(dwIoBase, byRegOfs, wBits)                    \
+#define MACvWordRegBitsOn(iobase, byRegOfs, wBits)                      \
 do {                                                                    \
         unsigned short wData;                                           \
-        VNSvInPortW(dwIoBase + byRegOfs, &wData);                       \
-        VNSvOutPortW(dwIoBase + byRegOfs, wData | (wBits));             \
+        VNSvInPortW(iobase + byRegOfs, &wData);                 \
+        VNSvOutPortW(iobase + byRegOfs, wData | (wBits));               \
 } while (0)
 
-#define MACvDWordRegBitsOn(dwIoBase, byRegOfs, dwBits)                  \
+#define MACvDWordRegBitsOn(iobase, byRegOfs, dwBits)                    \
 do {                                                                    \
         unsigned long dwData;                                           \
-        VNSvInPortD(dwIoBase + byRegOfs, &dwData);                      \
-        VNSvOutPortD(dwIoBase + byRegOfs, dwData | (dwBits));           \
+        VNSvInPortD(iobase + byRegOfs, &dwData);                        \
+        VNSvOutPortD(iobase + byRegOfs, dwData | (dwBits));             \
 } while (0)
 
-#define MACvRegBitsOnEx(dwIoBase, byRegOfs, byMask, byBits)             \
+#define MACvRegBitsOnEx(iobase, byRegOfs, byMask, byBits)               \
 do {                                                                    \
         unsigned char byData;                                           \
-        VNSvInPortB(dwIoBase + byRegOfs, &byData);                      \
+        VNSvInPortB(iobase + byRegOfs, &byData);                        \
         byData &= byMask;                                               \
-        VNSvOutPortB(dwIoBase + byRegOfs, byData | (byBits));           \
+        VNSvOutPortB(iobase + byRegOfs, byData | (byBits));             \
 } while (0)
 
-#define MACvRegBitsOff(dwIoBase, byRegOfs, byBits)                      \
+#define MACvRegBitsOff(iobase, byRegOfs, byBits)                        \
 do {                                                                    \
         unsigned char byData;                                           \
-        VNSvInPortB(dwIoBase + byRegOfs, &byData);                      \
-        VNSvOutPortB(dwIoBase + byRegOfs, byData & ~(byBits));          \
+        VNSvInPortB(iobase + byRegOfs, &byData);                        \
+        VNSvOutPortB(iobase + byRegOfs, byData & ~(byBits));            \
 } while (0)
 
-#define MACvWordRegBitsOff(dwIoBase, byRegOfs, wBits)                   \
+#define MACvWordRegBitsOff(iobase, byRegOfs, wBits)                     \
 do {                                                                    \
         unsigned short wData;                                           \
-        VNSvInPortW(dwIoBase + byRegOfs, &wData);                       \
-        VNSvOutPortW(dwIoBase + byRegOfs, wData & ~(wBits));            \
+        VNSvInPortW(iobase + byRegOfs, &wData);                 \
+        VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits));              \
 } while (0)
 
-#define MACvDWordRegBitsOff(dwIoBase, byRegOfs, dwBits)                 \
+#define MACvDWordRegBitsOff(iobase, byRegOfs, dwBits)                   \
 do {                                                                    \
         unsigned long dwData;                                           \
-        VNSvInPortD(dwIoBase + byRegOfs, &dwData);                      \
-        VNSvOutPortD(dwIoBase + byRegOfs, dwData & ~(dwBits));          \
+        VNSvInPortD(iobase + byRegOfs, &dwData);                        \
+        VNSvOutPortD(iobase + byRegOfs, dwData & ~(dwBits));            \
 } while (0)
 
-#define MACvGetCurrRx0DescAddr(dwIoBase, pdwCurrDescAddr)       \
-        VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR0,               \
+#define MACvGetCurrRx0DescAddr(iobase, pdwCurrDescAddr) \
+        VNSvInPortD(iobase + MAC_REG_RXDMAPTR0,         \
                     (unsigned long *)pdwCurrDescAddr)
 
-#define MACvGetCurrRx1DescAddr(dwIoBase, pdwCurrDescAddr)       \
-        VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR1,               \
+#define MACvGetCurrRx1DescAddr(iobase, pdwCurrDescAddr) \
+        VNSvInPortD(iobase + MAC_REG_RXDMAPTR1,         \
                     (unsigned long *)pdwCurrDescAddr)
 
-#define MACvGetCurrTx0DescAddr(dwIoBase, pdwCurrDescAddr)       \
-        VNSvInPortD(dwIoBase + MAC_REG_TXDMAPTR0,               \
+#define MACvGetCurrTx0DescAddr(iobase, pdwCurrDescAddr) \
+        VNSvInPortD(iobase + MAC_REG_TXDMAPTR0,         \
                     (unsigned long *)pdwCurrDescAddr)
 
-#define MACvGetCurrAC0DescAddr(dwIoBase, pdwCurrDescAddr)       \
-        VNSvInPortD(dwIoBase + MAC_REG_AC0DMAPTR,               \
+#define MACvGetCurrAC0DescAddr(iobase, pdwCurrDescAddr) \
+        VNSvInPortD(iobase + MAC_REG_AC0DMAPTR,         \
                     (unsigned long *)pdwCurrDescAddr)
 
-#define MACvGetCurrSyncDescAddr(dwIoBase, pdwCurrDescAddr)      \
-        VNSvInPortD(dwIoBase + MAC_REG_SYNCDMAPTR,              \
+#define MACvGetCurrSyncDescAddr(iobase, pdwCurrDescAddr)        \
+        VNSvInPortD(iobase + MAC_REG_SYNCDMAPTR,                \
                     (unsigned long *)pdwCurrDescAddr)
 
-#define MACvGetCurrATIMDescAddr(dwIoBase, pdwCurrDescAddr)      \
-        VNSvInPortD(dwIoBase + MAC_REG_ATIMDMAPTR,              \
+#define MACvGetCurrATIMDescAddr(iobase, pdwCurrDescAddr)        \
+        VNSvInPortD(iobase + MAC_REG_ATIMDMAPTR,                \
                     (unsigned long *)pdwCurrDescAddr)
 
 /* set the chip with current BCN tx descriptor address */
-#define MACvSetCurrBCNTxDescAddr(dwIoBase, dwCurrDescAddr)      \
-        VNSvOutPortD(dwIoBase + MAC_REG_BCNDMAPTR,              \
+#define MACvSetCurrBCNTxDescAddr(iobase, dwCurrDescAddr)        \
+        VNSvOutPortD(iobase + MAC_REG_BCNDMAPTR,                \
                      dwCurrDescAddr)
 
 /* set the chip with current BCN length */
-#define MACvSetCurrBCNLength(dwIoBase, wCurrBCNLength)          \
-        VNSvOutPortW(dwIoBase + MAC_REG_BCNDMACTL+2,            \
+#define MACvSetCurrBCNLength(iobase, wCurrBCNLength)            \
+        VNSvOutPortW(iobase + MAC_REG_BCNDMACTL+2,              \
                      wCurrBCNLength)
 
-#define MACvReadBSSIDAddress(dwIoBase, pbyEtherAddr)            \
+#define MACvReadBSSIDAddress(iobase, pbyEtherAddr)              \
 do {                                                            \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1);           \
-        VNSvInPortB(dwIoBase + MAC_REG_BSSID0,                  \
+        VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);             \
+        VNSvInPortB(iobase + MAC_REG_BSSID0,                    \
                     (unsigned char *)pbyEtherAddr);             \
-        VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 1,              \
+        VNSvInPortB(iobase + MAC_REG_BSSID0 + 1,                \
                     pbyEtherAddr + 1);                          \
-        VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 2,              \
+        VNSvInPortB(iobase + MAC_REG_BSSID0 + 2,                \
                     pbyEtherAddr + 2);                          \
-        VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 3,              \
+        VNSvInPortB(iobase + MAC_REG_BSSID0 + 3,                \
                     pbyEtherAddr + 3);                          \
-        VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 4,              \
+        VNSvInPortB(iobase + MAC_REG_BSSID0 + 4,                \
                     pbyEtherAddr + 4);                          \
-        VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 5,              \
+        VNSvInPortB(iobase + MAC_REG_BSSID0 + 5,                \
                     pbyEtherAddr + 5);                          \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0);           \
+        VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0);             \
 } while (0)
 
-#define MACvWriteBSSIDAddress(dwIoBase, pbyEtherAddr)           \
+#define MACvWriteBSSIDAddress(iobase, pbyEtherAddr)             \
 do {                                                            \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1);           \
-        VNSvOutPortB(dwIoBase + MAC_REG_BSSID0,                 \
+        VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);             \
+        VNSvOutPortB(iobase + MAC_REG_BSSID0,                   \
                      *(pbyEtherAddr));                          \
-        VNSvOutPortB(dwIoBase + MAC_REG_BSSID0 + 1,             \
+        VNSvOutPortB(iobase + MAC_REG_BSSID0 + 1,               \
                      *(pbyEtherAddr + 1));                      \
-        VNSvOutPortB(dwIoBase + MAC_REG_BSSID0 + 2,             \
+        VNSvOutPortB(iobase + MAC_REG_BSSID0 + 2,               \
                      *(pbyEtherAddr + 2));                      \
-        VNSvOutPortB(dwIoBase + MAC_REG_BSSID0 + 3,             \
+        VNSvOutPortB(iobase + MAC_REG_BSSID0 + 3,               \
                      *(pbyEtherAddr + 3));                      \
-        VNSvOutPortB(dwIoBase + MAC_REG_BSSID0 + 4,             \
+        VNSvOutPortB(iobase + MAC_REG_BSSID0 + 4,               \
                      *(pbyEtherAddr + 4));                      \
-        VNSvOutPortB(dwIoBase + MAC_REG_BSSID0 + 5,             \
+        VNSvOutPortB(iobase + MAC_REG_BSSID0 + 5,               \
                      *(pbyEtherAddr + 5));                      \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0);           \
+        VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0);             \
 } while (0)
 
-#define MACvReadEtherAddress(dwIoBase, pbyEtherAddr)            \
+#define MACvReadEtherAddress(iobase, pbyEtherAddr)              \
 do {                                                            \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1);           \
-        VNSvInPortB(dwIoBase + MAC_REG_PAR0,                    \
+        VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);             \
+        VNSvInPortB(iobase + MAC_REG_PAR0,                      \
                     (unsigned char *)pbyEtherAddr);             \
-        VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 1,                \
+        VNSvInPortB(iobase + MAC_REG_PAR0 + 1,          \
                     pbyEtherAddr + 1);                          \
-        VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 2,                \
+        VNSvInPortB(iobase + MAC_REG_PAR0 + 2,          \
                     pbyEtherAddr + 2);                          \
-        VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 3,                \
+        VNSvInPortB(iobase + MAC_REG_PAR0 + 3,          \
                     pbyEtherAddr + 3);                          \
-        VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 4,                \
+        VNSvInPortB(iobase + MAC_REG_PAR0 + 4,          \
                     pbyEtherAddr + 4);                          \
-        VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 5,                \
+        VNSvInPortB(iobase + MAC_REG_PAR0 + 5,          \
                     pbyEtherAddr + 5);                          \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0);           \
+        VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0);             \
 } while (0)
 
-#define MACvWriteEtherAddress(dwIoBase, pbyEtherAddr)           \
+#define MACvWriteEtherAddress(iobase, pbyEtherAddr)             \
 do {                                                            \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1);           \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAR0,                   \
+        VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);             \
+        VNSvOutPortB(iobase + MAC_REG_PAR0,                     \
                      *pbyEtherAddr);                            \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAR0 + 1,               \
+        VNSvOutPortB(iobase + MAC_REG_PAR0 + 1,         \
                      *(pbyEtherAddr + 1));                      \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAR0 + 2,               \
+        VNSvOutPortB(iobase + MAC_REG_PAR0 + 2,         \
                      *(pbyEtherAddr + 2));                      \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAR0 + 3,               \
+        VNSvOutPortB(iobase + MAC_REG_PAR0 + 3,         \
                      *(pbyEtherAddr + 3));                      \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAR0 + 4,               \
+        VNSvOutPortB(iobase + MAC_REG_PAR0 + 4,         \
                      *(pbyEtherAddr + 4));                      \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAR0 + 5,               \
+        VNSvOutPortB(iobase + MAC_REG_PAR0 + 5,         \
                      *(pbyEtherAddr + 5));                      \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0);           \
+        VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0);             \
 } while (0)
 
-#define MACvClearISR(dwIoBase)                                          \
-        VNSvOutPortD(dwIoBase + MAC_REG_ISR, IMR_MASK_VALUE)
+#define MACvClearISR(iobase)                                            \
+        VNSvOutPortD(iobase + MAC_REG_ISR, IMR_MASK_VALUE)
 
-#define MACvStart(dwIoBase)                                             \
-        VNSvOutPortB(dwIoBase + MAC_REG_HOSTCR,                         \
+#define MACvStart(iobase)                                               \
+        VNSvOutPortB(iobase + MAC_REG_HOSTCR,                           \
                      (HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON))
 
-#define MACvRx0PerPktMode(dwIoBase)                                     \
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, RX_PERPKT)
+#define MACvRx0PerPktMode(iobase)                                       \
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT)
 
-#define MACvRx0BufferFillMode(dwIoBase)                                 \
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, RX_PERPKTCLR)
+#define MACvRx0BufferFillMode(iobase)                                   \
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKTCLR)
 
-#define MACvRx1PerPktMode(dwIoBase)                                     \
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, RX_PERPKT)
+#define MACvRx1PerPktMode(iobase)                                       \
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT)
 
-#define MACvRx1BufferFillMode(dwIoBase)                                 \
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, RX_PERPKTCLR)
+#define MACvRx1BufferFillMode(iobase)                                   \
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKTCLR)
 
-#define MACvRxOn(dwIoBase)                                              \
-        MACvRegBitsOn(dwIoBase, MAC_REG_HOSTCR, HOSTCR_RXON)
+#define MACvRxOn(iobase)                                                \
+        MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_RXON)
 
-#define MACvReceive0(dwIoBase)                                          \
+#define MACvReceive0(iobase)                                            \
 do {                                                                    \
         unsigned long dwData;                                           \
-        VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL0, &dwData);             \
+        VNSvInPortD(iobase + MAC_REG_RXDMACTL0, &dwData);               \
         if (dwData & DMACTL_RUN)                                        \
-                VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, DMACTL_WAKE); \
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_WAKE); \
         else                                                            \
-                VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, DMACTL_RUN); \
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_RUN); \
 } while (0)
 
-#define MACvReceive1(dwIoBase)                                          \
+#define MACvReceive1(iobase)                                            \
 do {                                                                    \
         unsigned long dwData;                                           \
-        VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL1, &dwData);             \
+        VNSvInPortD(iobase + MAC_REG_RXDMACTL1, &dwData);               \
         if (dwData & DMACTL_RUN)                                        \
-                VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, DMACTL_WAKE); \
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_WAKE); \
         else                                                            \
-                VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, DMACTL_RUN); \
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_RUN); \
 } while (0)
 
-#define MACvTxOn(dwIoBase)                                              \
-        MACvRegBitsOn(dwIoBase, MAC_REG_HOSTCR, HOSTCR_TXON)
+#define MACvTxOn(iobase)                                                \
+        MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_TXON)
 
-#define MACvTransmit0(dwIoBase)                                         \
+#define MACvTransmit0(iobase)                                           \
 do {                                                                    \
         unsigned long dwData;                                           \
-        VNSvInPortD(dwIoBase + MAC_REG_TXDMACTL0, &dwData);             \
+        VNSvInPortD(iobase + MAC_REG_TXDMACTL0, &dwData);               \
         if (dwData & DMACTL_RUN)                                        \
-                VNSvOutPortD(dwIoBase + MAC_REG_TXDMACTL0, DMACTL_WAKE); \
+                VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_WAKE); \
         else                                                            \
-                VNSvOutPortD(dwIoBase + MAC_REG_TXDMACTL0, DMACTL_RUN); \
+                VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_RUN); \
 } while (0)
 
-#define MACvTransmitAC0(dwIoBase)                                       \
+#define MACvTransmitAC0(iobase)                                 \
 do {                                                                    \
         unsigned long dwData;                                           \
-        VNSvInPortD(dwIoBase + MAC_REG_AC0DMACTL, &dwData);             \
+        VNSvInPortD(iobase + MAC_REG_AC0DMACTL, &dwData);               \
         if (dwData & DMACTL_RUN)                                        \
-                VNSvOutPortD(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_WAKE); \
+                VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_WAKE); \
         else                                                            \
-                VNSvOutPortD(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_RUN); \
+                VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_RUN); \
 } while (0)
 
-#define MACvTransmitSYNC(dwIoBase)                                      \
+#define MACvTransmitSYNC(iobase)                                        \
 do {                                                                    \
         unsigned long dwData;                                           \
-        VNSvInPortD(dwIoBase + MAC_REG_SYNCDMACTL, &dwData);            \
+        VNSvInPortD(iobase + MAC_REG_SYNCDMACTL, &dwData);              \
         if (dwData & DMACTL_RUN)                                        \
-                VNSvOutPortD(dwIoBase + MAC_REG_SYNCDMACTL, DMACTL_WAKE); \
+                VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_WAKE); \
         else                                                            \
-                VNSvOutPortD(dwIoBase + MAC_REG_SYNCDMACTL, DMACTL_RUN); \
+                VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_RUN); \
 } while (0)
 
-#define MACvTransmitATIM(dwIoBase)                                      \
+#define MACvTransmitATIM(iobase)                                        \
 do {                                                                    \
         unsigned long dwData;                                           \
-        VNSvInPortD(dwIoBase + MAC_REG_ATIMDMACTL, &dwData);            \
+        VNSvInPortD(iobase + MAC_REG_ATIMDMACTL, &dwData);              \
         if (dwData & DMACTL_RUN)                                        \
-                VNSvOutPortD(dwIoBase + MAC_REG_ATIMDMACTL, DMACTL_WAKE); \
+                VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_WAKE); \
         else                                                            \
-                VNSvOutPortD(dwIoBase + MAC_REG_ATIMDMACTL, DMACTL_RUN); \
+                VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_RUN); \
 } while (0)
 
-#define MACvTransmitBCN(dwIoBase)                                       \
-        VNSvOutPortB(dwIoBase + MAC_REG_BCNDMACTL, BEACON_READY)
+#define MACvTransmitBCN(iobase)                                 \
+        VNSvOutPortB(iobase + MAC_REG_BCNDMACTL, BEACON_READY)
 
-#define MACvClearStckDS(dwIoBase)                                       \
+#define MACvClearStckDS(iobase)                                 \
 do {                                                                    \
         unsigned char byOrgValue;                                       \
-        VNSvInPortB(dwIoBase + MAC_REG_STICKHW, &byOrgValue);           \
+        VNSvInPortB(iobase + MAC_REG_STICKHW, &byOrgValue);             \
         byOrgValue = byOrgValue & 0xFC;                                 \
-        VNSvOutPortB(dwIoBase + MAC_REG_STICKHW, byOrgValue);           \
+        VNSvOutPortB(iobase + MAC_REG_STICKHW, byOrgValue);             \
 } while (0)
 
-#define MACvReadISR(dwIoBase, pdwValue)                         \
-        VNSvInPortD(dwIoBase + MAC_REG_ISR, pdwValue)
+#define MACvReadISR(iobase, pdwValue)                           \
+        VNSvInPortD(iobase + MAC_REG_ISR, pdwValue)
 
-#define MACvWriteISR(dwIoBase, dwValue)                         \
-        VNSvOutPortD(dwIoBase + MAC_REG_ISR, dwValue)
+#define MACvWriteISR(iobase, dwValue)                           \
+        VNSvOutPortD(iobase + MAC_REG_ISR, dwValue)
 
-#define MACvIntEnable(dwIoBase, dwMask)                         \
-        VNSvOutPortD(dwIoBase + MAC_REG_IMR, dwMask)
+#define MACvIntEnable(iobase, dwMask)                           \
+        VNSvOutPortD(iobase + MAC_REG_IMR, dwMask)
 
-#define MACvIntDisable(dwIoBase)                                \
-        VNSvOutPortD(dwIoBase + MAC_REG_IMR, 0)
+#define MACvIntDisable(iobase)                          \
+        VNSvOutPortD(iobase + MAC_REG_IMR, 0)
 
-#define MACvSelectPage0(dwIoBase)                               \
-                VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0)
+#define MACvSelectPage0(iobase)                         \
+                VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0)
 
-#define MACvSelectPage1(dwIoBase)                               \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1)
+#define MACvSelectPage1(iobase)                         \
+        VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1)
 
-#define MACvReadMIBCounter(dwIoBase, pdwCounter)                        \
-        VNSvInPortD(dwIoBase + MAC_REG_MIBCNTR, pdwCounter)
+#define MACvReadMIBCounter(iobase, pdwCounter)                  \
+        VNSvInPortD(iobase + MAC_REG_MIBCNTR, pdwCounter)
 
-#define MACvPwrEvntDisable(dwIoBase)                                    \
-        VNSvOutPortW(dwIoBase + MAC_REG_WAKEUPEN0, 0x0000)
+#define MACvPwrEvntDisable(iobase)                                      \
+        VNSvOutPortW(iobase + MAC_REG_WAKEUPEN0, 0x0000)
 
-#define MACvEnableProtectMD(dwIoBase)                                   \
+#define MACvEnableProtectMD(iobase)                                     \
 do {                                                                    \
         unsigned long dwOrgValue;                                       \
-        VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue);             \
+        VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue);               \
         dwOrgValue = dwOrgValue | EnCFG_ProtectMd;                      \
-        VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue);             \
+        VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue);               \
 } while (0)
 
-#define MACvDisableProtectMD(dwIoBase)                                  \
+#define MACvDisableProtectMD(iobase)                                    \
 do {                                                                    \
         unsigned long dwOrgValue;                                       \
-        VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue);             \
+        VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue);               \
         dwOrgValue = dwOrgValue & ~EnCFG_ProtectMd;                     \
-        VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue);             \
+        VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue);               \
 } while (0)
 
-#define MACvEnableBarkerPreambleMd(dwIoBase)                            \
+#define MACvEnableBarkerPreambleMd(iobase)                              \
 do {                                                                    \
         unsigned long dwOrgValue;                                       \
-        VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue);             \
+        VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue);               \
         dwOrgValue = dwOrgValue | EnCFG_BarkerPream;                    \
-        VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue);             \
+        VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue);               \
 } while (0)
 
-#define MACvDisableBarkerPreambleMd(dwIoBase)                           \
+#define MACvDisableBarkerPreambleMd(iobase)                             \
 do {                                                                    \
         unsigned long dwOrgValue;                                       \
-        VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue);             \
+        VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue);               \
         dwOrgValue = dwOrgValue & ~EnCFG_BarkerPream;                   \
-        VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue);             \
+        VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue);               \
 } while (0)
 
-#define MACvSetBBType(dwIoBase, byTyp)                                  \
+#define MACvSetBBType(iobase, byTyp)                                    \
 do {                                                                    \
         unsigned long dwOrgValue;                                       \
-        VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue);             \
+        VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue);               \
         dwOrgValue = dwOrgValue & ~EnCFG_BBType_MASK;                   \
         dwOrgValue = dwOrgValue | (unsigned long)byTyp;                 \
-        VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue);             \
+        VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue);               \
 } while (0)
 
-#define MACvReadATIMW(dwIoBase, pwCounter)                              \
-        VNSvInPortW(dwIoBase + MAC_REG_AIDATIM, pwCounter)
+#define MACvReadATIMW(iobase, pwCounter)                                \
+        VNSvInPortW(iobase + MAC_REG_AIDATIM, pwCounter)
 
-#define MACvWriteATIMW(dwIoBase, wCounter)                              \
-        VNSvOutPortW(dwIoBase + MAC_REG_AIDATIM, wCounter)
+#define MACvWriteATIMW(iobase, wCounter)                                \
+        VNSvOutPortW(iobase + MAC_REG_AIDATIM, wCounter)
 
-#define MACvWriteCRC16_128(dwIoBase, byRegOfs, wCRC)            \
+#define MACvWriteCRC16_128(iobase, byRegOfs, wCRC)              \
 do {                                                            \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1);           \
-        VNSvOutPortW(dwIoBase + byRegOfs, wCRC);                \
-        VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0);           \
+        VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);             \
+        VNSvOutPortW(iobase + byRegOfs, wCRC);          \
+        VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0);             \
 } while (0)
 
-#define MACvGPIOIn(dwIoBase, pbyValue)                                  \
-        VNSvInPortB(dwIoBase + MAC_REG_GPIOCTL1, pbyValue)
+#define MACvGPIOIn(iobase, pbyValue)                                    \
+        VNSvInPortB(iobase + MAC_REG_GPIOCTL1, pbyValue)
 
-#define MACvSetRFLE_LatchBase(dwIoBase)                                 \
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT)
+#define MACvSetRFLE_LatchBase(iobase)                                 \
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT)
 
 bool MACbIsRegBitsOn(struct vnt_private *, unsigned char byRegOfs,
                      unsigned char byTestBits);
diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c
index 7d6e7464ae51..716d2a80f840 100644
--- a/drivers/staging/vt6655/power.c
+++ b/drivers/staging/vt6655/power.c
@@ -12,11 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *
  * File: power.c
  *
  * Purpose: Handles 802.11 power management  functions
@@ -133,7 +128,6 @@ PSvDisablePowerSaving(
         priv->bPWBitOn = false;
 }
 
-
 /*
  *
  * Routine Description:
diff --git a/drivers/staging/vt6655/power.h b/drivers/staging/vt6655/power.h
index d82dd8d6d68b..dfcb0ca8b448 100644
--- a/drivers/staging/vt6655/power.h
+++ b/drivers/staging/vt6655/power.h
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: power.h
  *
  * Purpose: Handles 802.11 power management  functions
@@ -46,7 +42,6 @@ PSvEnablePowerSaving(
         unsigned short wListenInterval
 );
 
-
 bool
 PSbIsNextTBTTWakeUp(
         struct vnt_private *
diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c
index 447882c7a6be..edf7db9d53b3 100644
--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@@ -12,11 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *
  * File: rf.c
  *
  * Purpose: rf function code
@@ -50,359 +45,362 @@
 #define AL7230_PWR_IDX_LEN    64
 
 static const unsigned long dwAL2230InitTable[CB_AL2230_INIT_SEQ] = {
-        0x03F79000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x03333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x01A00200+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x00FFF300+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0005A400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0F4DC500+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0805B600+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0146C700+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x00068800+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0403B900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x00DBBA00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x00099B00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0BDFFC00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x00000D00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x00580F00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW
+        0x03F79000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x03333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x01A00200 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x00FFF300 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0005A400 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0F4DC500 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0805B600 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0146C700 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x00068800 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0403B900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x00DBBA00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x00099B00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0BDFFC00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x00000D00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x00580F00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW
 };
 
 static const unsigned long dwAL2230ChannelTable0[CB_MAX_CHANNEL] = {
-        0x03F79000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 1, Tf = 2412MHz */
-        0x03F79000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 2, Tf = 2417MHz */
-        0x03E79000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 3, Tf = 2422MHz */
-        0x03E79000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 4, Tf = 2427MHz */
-        0x03F7A000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 5, Tf = 2432MHz */
-        0x03F7A000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 6, Tf = 2437MHz */
-        0x03E7A000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 7, Tf = 2442MHz */
-        0x03E7A000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 8, Tf = 2447MHz */
-        0x03F7B000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 9, Tf = 2452MHz */
-        0x03F7B000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 10, Tf = 2457MHz */
-        0x03E7B000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 11, Tf = 2462MHz */
-        0x03E7B000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 12, Tf = 2467MHz */
-        0x03F7C000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 13, Tf = 2472MHz */
-        0x03E7C000+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW  /* channel = 14, Tf = 2412M */
+        0x03F79000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 1, Tf = 2412MHz */
+        0x03F79000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 2, Tf = 2417MHz */
+        0x03E79000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 3, Tf = 2422MHz */
+        0x03E79000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 4, Tf = 2427MHz */
+        0x03F7A000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 5, Tf = 2432MHz */
+        0x03F7A000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 6, Tf = 2437MHz */
+        0x03E7A000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 7, Tf = 2442MHz */
+        0x03E7A000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 8, Tf = 2447MHz */
+        0x03F7B000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 9, Tf = 2452MHz */
+        0x03F7B000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 10, Tf = 2457MHz */
+        0x03E7B000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 11, Tf = 2462MHz */
+        0x03E7B000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 12, Tf = 2467MHz */
+        0x03F7C000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 13, Tf = 2472MHz */
+        0x03E7C000 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW  /* channel = 14, Tf = 2412M */
 };
 
 static const unsigned long dwAL2230ChannelTable1[CB_MAX_CHANNEL] = {
-        0x03333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 1, Tf = 2412MHz */
-        0x0B333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 2, Tf = 2417MHz */
-        0x03333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 3, Tf = 2422MHz */
-        0x0B333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 4, Tf = 2427MHz */
-        0x03333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 5, Tf = 2432MHz */
-        0x0B333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 6, Tf = 2437MHz */
-        0x03333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 7, Tf = 2442MHz */
-        0x0B333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 8, Tf = 2447MHz */
-        0x03333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 9, Tf = 2452MHz */
-        0x0B333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 10, Tf = 2457MHz */
-        0x03333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 11, Tf = 2462MHz */
-        0x0B333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 12, Tf = 2467MHz */
-        0x03333100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 13, Tf = 2472MHz */
-        0x06666100+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW  /* channel = 14, Tf = 2412M */
+        0x03333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 1, Tf = 2412MHz */
+        0x0B333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 2, Tf = 2417MHz */
+        0x03333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 3, Tf = 2422MHz */
+        0x0B333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 4, Tf = 2427MHz */
+        0x03333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 5, Tf = 2432MHz */
+        0x0B333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 6, Tf = 2437MHz */
+        0x03333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 7, Tf = 2442MHz */
+        0x0B333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 8, Tf = 2447MHz */
+        0x03333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 9, Tf = 2452MHz */
+        0x0B333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 10, Tf = 2457MHz */
+        0x03333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 11, Tf = 2462MHz */
+        0x0B333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 12, Tf = 2467MHz */
+        0x03333100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 13, Tf = 2472MHz */
+        0x06666100 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW  /* channel = 14, Tf = 2412M */
 };
 
 static unsigned long dwAL2230PowerTable[AL2230_PWR_IDX_LEN] = {
-        0x04040900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04041900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04042900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04043900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04044900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04045900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04046900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04047900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04048900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04049900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0404A900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0404B900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0404C900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0404D900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0404E900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0404F900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04050900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04051900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04052900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04053900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04054900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04055900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04056900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04057900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04058900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04059900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0405A900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0405B900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0405C900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0405D900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0405E900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0405F900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04060900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04061900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04062900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04063900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04064900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04065900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04066900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04067900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04068900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04069900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0406A900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0406B900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0406C900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0406D900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0406E900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0406F900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04070900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04071900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04072900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04073900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04074900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04075900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04076900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04077900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04078900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x04079900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0407A900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0407B900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0407C900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0407D900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0407E900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x0407F900+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW
+        0x04040900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04041900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04042900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04043900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04044900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04045900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04046900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04047900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04048900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04049900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0404A900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0404B900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0404C900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0404D900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0404E900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0404F900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04050900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04051900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04052900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04053900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04054900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04055900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04056900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04057900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04058900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04059900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0405A900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0405B900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0405C900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0405D900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0405E900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0405F900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04060900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04061900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04062900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04063900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04064900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04065900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04066900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04067900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04068900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04069900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0406A900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0406B900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0406C900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0406D900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0406E900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0406F900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04070900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04071900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04072900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04073900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04074900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04075900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04076900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04077900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04078900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x04079900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0407A900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0407B900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0407C900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0407D900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0407E900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x0407F900 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW
 };
 
 /* 40MHz reference frequency
  * Need to Pull PLLON(PE3) low when writing channel registers through 3-wire.
  */
 static const unsigned long dwAL7230InitTable[CB_AL7230_INIT_SEQ] = {
-        0x00379000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Channel1 // Need modify for 11a */
-        0x13333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Channel1 // Need modify for 11a */
-        0x841FF200+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11a: 451FE2 */
-        0x3FDFA300+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11a: 5FDFA3 */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* 11b/g    // Need modify for 11a */
+        0x00379000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Channel1 // Need modify for 11a */
+        0x13333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Channel1 // Need modify for 11a */
+        0x841FF200 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11a: 451FE2 */
+        0x3FDFA300 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11a: 5FDFA3 */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* 11b/g    // Need modify for 11a */
         /* RoberYu:20050113, Rev0.47 Regsiter Setting Guide */
-        0x802B5500+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11a: 8D1B55 */
-        0x56AF3600+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW,
-        0xCE020700+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11a: 860207 */
-        0x6EBC0800+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x221BB900+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW,
-        0xE0000A00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11a: E0600A */
-        0x08031B00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* init 0x080B1B00 => 0x080F1B00 for 3 wire control TxGain(D10) */
+        0x802B5500 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11a: 8D1B55 */
+        0x56AF3600 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW,
+        0xCE020700 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11a: 860207 */
+        0x6EBC0800 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x221BB900 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW,
+        0xE0000A00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11a: E0600A */
+        0x08031B00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* init 0x080B1B00 => 0x080F1B00 for 3 wire control TxGain(D10) */
         /* RoberYu:20050113, Rev0.47 Regsiter Setting Guide */
-        0x000A3C00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11a: 00143C */
-        0xFFFFFD00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x00000E00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x1ABA8F00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW  /* Need modify for 11a: 12BACF */
+        0x000A3C00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11a: 00143C */
+        0xFFFFFD00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x00000E00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x1ABA8F00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW  /* Need modify for 11a: 12BACF */
 };
 
 static const unsigned long dwAL7230InitTableAMode[CB_AL7230_INIT_SEQ] = {
-        0x0FF52000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Channel184 // Need modify for 11b/g */
-        0x00000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Channel184 // Need modify for 11b/g */
-        0x451FE200+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11b/g */
-        0x5FDFA300+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11b/g */
-        0x67F78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* 11a    // Need modify for 11b/g */
-        0x853F5500+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11b/g, RoberYu:20050113 */
-        0x56AF3600+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW,
-        0xCE020700+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11b/g */
-        0x6EBC0800+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x221BB900+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW,
-        0xE0600A00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11b/g */
-        0x08031B00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* init 0x080B1B00 => 0x080F1B00 for 3 wire control TxGain(D10) */
-        0x00147C00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* Need modify for 11b/g */
-        0xFFFFFD00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x00000E00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW,
-        0x12BACF00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW  /* Need modify for 11b/g */
+        0x0FF52000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Channel184 // Need modify for 11b/g */
+        0x00000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Channel184 // Need modify for 11b/g */
+        0x451FE200 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11b/g */
+        0x5FDFA300 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11b/g */
+        0x67F78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* 11a    // Need modify for 11b/g */
+        0x853F5500 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11b/g, RoberYu:20050113 */
+        0x56AF3600 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW,
+        0xCE020700 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11b/g */
+        0x6EBC0800 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x221BB900 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW,
+        0xE0600A00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11b/g */
+        0x08031B00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* init 0x080B1B00 => 0x080F1B00 for 3 wire control TxGain(D10) */
+        0x00147C00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* Need modify for 11b/g */
+        0xFFFFFD00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x00000E00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW,
+        0x12BACF00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW  /* Need modify for 11b/g */
 };
 
 static const unsigned long dwAL7230ChannelTable0[CB_MAX_CHANNEL] = {
-        0x00379000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  1, Tf = 2412MHz */
-        0x00379000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  2, Tf = 2417MHz */
-        0x00379000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  3, Tf = 2422MHz */
-        0x00379000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  4, Tf = 2427MHz */
-        0x0037A000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  5, Tf = 2432MHz */
-        0x0037A000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  6, Tf = 2437MHz */
-        0x0037A000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  7, Tf = 2442MHz */
-        0x0037A000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  8, Tf = 2447MHz //RobertYu: 20050218, update for APNode 0.49 */
-        0x0037B000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  9, Tf = 2452MHz //RobertYu: 20050218, update for APNode 0.49 */
-        0x0037B000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 10, Tf = 2457MHz //RobertYu: 20050218, update for APNode 0.49 */
-        0x0037B000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 11, Tf = 2462MHz //RobertYu: 20050218, update for APNode 0.49 */
-        0x0037B000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 12, Tf = 2467MHz //RobertYu: 20050218, update for APNode 0.49 */
-        0x0037C000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 13, Tf = 2472MHz //RobertYu: 20050218, update for APNode 0.49 */
-        0x0037C000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 14, Tf = 2484MHz */
+        0x00379000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  1, Tf = 2412MHz */
+        0x00379000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  2, Tf = 2417MHz */
+        0x00379000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  3, Tf = 2422MHz */
+        0x00379000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  4, Tf = 2427MHz */
+        0x0037A000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  5, Tf = 2432MHz */
+        0x0037A000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  6, Tf = 2437MHz */
+        0x0037A000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  7, Tf = 2442MHz */
+        0x0037A000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  8, Tf = 2447MHz //RobertYu: 20050218, update for APNode 0.49 */
+        0x0037B000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  9, Tf = 2452MHz //RobertYu: 20050218, update for APNode 0.49 */
+        0x0037B000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 10, Tf = 2457MHz //RobertYu: 20050218, update for APNode 0.49 */
+        0x0037B000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 11, Tf = 2462MHz //RobertYu: 20050218, update for APNode 0.49 */
+        0x0037B000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 12, Tf = 2467MHz //RobertYu: 20050218, update for APNode 0.49 */
+        0x0037C000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 13, Tf = 2472MHz //RobertYu: 20050218, update for APNode 0.49 */
+        0x0037C000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 14, Tf = 2484MHz */
 
         /* 4.9G => Ch 183, 184, 185, 187, 188, 189, 192, 196  (Value:15 ~ 22) */
-        0x0FF52000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 183, Tf = 4915MHz (15) */
-        0x0FF52000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 184, Tf = 4920MHz (16) */
-        0x0FF52000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 185, Tf = 4925MHz (17) */
-        0x0FF52000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 187, Tf = 4935MHz (18) */
-        0x0FF52000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 188, Tf = 4940MHz (19) */
-        0x0FF52000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 189, Tf = 4945MHz (20) */
-        0x0FF53000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 192, Tf = 4960MHz (21) */
-        0x0FF53000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 196, Tf = 4980MHz (22) */
+        0x0FF52000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 183, Tf = 4915MHz (15) */
+        0x0FF52000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 184, Tf = 4920MHz (16) */
+        0x0FF52000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 185, Tf = 4925MHz (17) */
+        0x0FF52000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 187, Tf = 4935MHz (18) */
+        0x0FF52000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 188, Tf = 4940MHz (19) */
+        0x0FF52000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 189, Tf = 4945MHz (20) */
+        0x0FF53000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 192, Tf = 4960MHz (21) */
+        0x0FF53000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 196, Tf = 4980MHz (22) */
 
         /* 5G => Ch 7, 8, 9, 11, 12, 16, 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64,
-         * 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165  (Value 23 ~ 56) */
-
-        0x0FF54000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =   7, Tf = 5035MHz (23) */
-        0x0FF54000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =   8, Tf = 5040MHz (24) */
-        0x0FF54000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =   9, Tf = 5045MHz (25) */
-        0x0FF54000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  11, Tf = 5055MHz (26) */
-        0x0FF54000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  12, Tf = 5060MHz (27) */
-        0x0FF55000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  16, Tf = 5080MHz (28) */
-        0x0FF56000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  34, Tf = 5170MHz (29) */
-        0x0FF56000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  36, Tf = 5180MHz (30) */
-        0x0FF57000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  38, Tf = 5190MHz (31) //RobertYu: 20050218, update for APNode 0.49 */
-        0x0FF57000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  40, Tf = 5200MHz (32) */
-        0x0FF57000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  42, Tf = 5210MHz (33) */
-        0x0FF57000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  44, Tf = 5220MHz (34) */
-        0x0FF57000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  46, Tf = 5230MHz (35) */
-        0x0FF57000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  48, Tf = 5240MHz (36) */
-        0x0FF58000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  52, Tf = 5260MHz (37) */
-        0x0FF58000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  56, Tf = 5280MHz (38) */
-        0x0FF58000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  60, Tf = 5300MHz (39) */
-        0x0FF59000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  64, Tf = 5320MHz (40) */
-
-        0x0FF5C000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 100, Tf = 5500MHz (41) */
-        0x0FF5C000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 104, Tf = 5520MHz (42) */
-        0x0FF5C000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 108, Tf = 5540MHz (43) */
-        0x0FF5D000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 112, Tf = 5560MHz (44) */
-        0x0FF5D000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 116, Tf = 5580MHz (45) */
-        0x0FF5D000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 120, Tf = 5600MHz (46) */
-        0x0FF5E000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 124, Tf = 5620MHz (47) */
-        0x0FF5E000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 128, Tf = 5640MHz (48) */
-        0x0FF5E000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 132, Tf = 5660MHz (49) */
-        0x0FF5F000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 136, Tf = 5680MHz (50) */
-        0x0FF5F000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 140, Tf = 5700MHz (51) */
-        0x0FF60000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 149, Tf = 5745MHz (52) */
-        0x0FF60000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 153, Tf = 5765MHz (53) */
-        0x0FF60000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 157, Tf = 5785MHz (54) */
-        0x0FF61000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 161, Tf = 5805MHz (55) */
-        0x0FF61000+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW  /* channel = 165, Tf = 5825MHz (56) */
+         * 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165  (Value 23 ~ 56)
+         */
+
+        0x0FF54000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =   7, Tf = 5035MHz (23) */
+        0x0FF54000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =   8, Tf = 5040MHz (24) */
+        0x0FF54000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =   9, Tf = 5045MHz (25) */
+        0x0FF54000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  11, Tf = 5055MHz (26) */
+        0x0FF54000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  12, Tf = 5060MHz (27) */
+        0x0FF55000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  16, Tf = 5080MHz (28) */
+        0x0FF56000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  34, Tf = 5170MHz (29) */
+        0x0FF56000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  36, Tf = 5180MHz (30) */
+        0x0FF57000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  38, Tf = 5190MHz (31) //RobertYu: 20050218, update for APNode 0.49 */
+        0x0FF57000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  40, Tf = 5200MHz (32) */
+        0x0FF57000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  42, Tf = 5210MHz (33) */
+        0x0FF57000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  44, Tf = 5220MHz (34) */
+        0x0FF57000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  46, Tf = 5230MHz (35) */
+        0x0FF57000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  48, Tf = 5240MHz (36) */
+        0x0FF58000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  52, Tf = 5260MHz (37) */
+        0x0FF58000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  56, Tf = 5280MHz (38) */
+        0x0FF58000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  60, Tf = 5300MHz (39) */
+        0x0FF59000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  64, Tf = 5320MHz (40) */
+
+        0x0FF5C000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 100, Tf = 5500MHz (41) */
+        0x0FF5C000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 104, Tf = 5520MHz (42) */
+        0x0FF5C000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 108, Tf = 5540MHz (43) */
+        0x0FF5D000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 112, Tf = 5560MHz (44) */
+        0x0FF5D000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 116, Tf = 5580MHz (45) */
+        0x0FF5D000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 120, Tf = 5600MHz (46) */
+        0x0FF5E000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 124, Tf = 5620MHz (47) */
+        0x0FF5E000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 128, Tf = 5640MHz (48) */
+        0x0FF5E000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 132, Tf = 5660MHz (49) */
+        0x0FF5F000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 136, Tf = 5680MHz (50) */
+        0x0FF5F000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 140, Tf = 5700MHz (51) */
+        0x0FF60000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 149, Tf = 5745MHz (52) */
+        0x0FF60000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 153, Tf = 5765MHz (53) */
+        0x0FF60000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 157, Tf = 5785MHz (54) */
+        0x0FF61000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 161, Tf = 5805MHz (55) */
+        0x0FF61000 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW  /* channel = 165, Tf = 5825MHz (56) */
 };
 
 static const unsigned long dwAL7230ChannelTable1[CB_MAX_CHANNEL] = {
-        0x13333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  1, Tf = 2412MHz */
-        0x1B333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  2, Tf = 2417MHz */
-        0x03333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  3, Tf = 2422MHz */
-        0x0B333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  4, Tf = 2427MHz */
-        0x13333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  5, Tf = 2432MHz */
-        0x1B333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  6, Tf = 2437MHz */
-        0x03333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  7, Tf = 2442MHz */
-        0x0B333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  8, Tf = 2447MHz */
-        0x13333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  9, Tf = 2452MHz */
-        0x1B333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 10, Tf = 2457MHz */
-        0x03333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 11, Tf = 2462MHz */
-        0x0B333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 12, Tf = 2467MHz */
-        0x13333100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 13, Tf = 2472MHz */
-        0x06666100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 14, Tf = 2484MHz */
+        0x13333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  1, Tf = 2412MHz */
+        0x1B333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  2, Tf = 2417MHz */
+        0x03333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  3, Tf = 2422MHz */
+        0x0B333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  4, Tf = 2427MHz */
+        0x13333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  5, Tf = 2432MHz */
+        0x1B333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  6, Tf = 2437MHz */
+        0x03333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  7, Tf = 2442MHz */
+        0x0B333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  8, Tf = 2447MHz */
+        0x13333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  9, Tf = 2452MHz */
+        0x1B333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 10, Tf = 2457MHz */
+        0x03333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 11, Tf = 2462MHz */
+        0x0B333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 12, Tf = 2467MHz */
+        0x13333100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 13, Tf = 2472MHz */
+        0x06666100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 14, Tf = 2484MHz */
 
         /* 4.9G => Ch 183, 184, 185, 187, 188, 189, 192, 196  (Value:15 ~ 22) */
-        0x1D555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 183, Tf = 4915MHz (15) */
-        0x00000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 184, Tf = 4920MHz (16) */
-        0x02AAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 185, Tf = 4925MHz (17) */
-        0x08000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 187, Tf = 4935MHz (18) */
-        0x0AAAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 188, Tf = 4940MHz (19) */
-        0x0D555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 189, Tf = 4945MHz (20) */
-        0x15555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 192, Tf = 4960MHz (21) */
-        0x00000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 196, Tf = 4980MHz (22) */
+        0x1D555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 183, Tf = 4915MHz (15) */
+        0x00000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 184, Tf = 4920MHz (16) */
+        0x02AAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 185, Tf = 4925MHz (17) */
+        0x08000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 187, Tf = 4935MHz (18) */
+        0x0AAAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 188, Tf = 4940MHz (19) */
+        0x0D555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 189, Tf = 4945MHz (20) */
+        0x15555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 192, Tf = 4960MHz (21) */
+        0x00000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 196, Tf = 4980MHz (22) */
 
         /* 5G => Ch 7, 8, 9, 11, 12, 16, 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64,
-         * 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165  (Value 23 ~ 56) */
-        0x1D555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =   7, Tf = 5035MHz (23) */
-        0x00000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =   8, Tf = 5040MHz (24) */
-        0x02AAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =   9, Tf = 5045MHz (25) */
-        0x08000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  11, Tf = 5055MHz (26) */
-        0x0AAAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  12, Tf = 5060MHz (27) */
-        0x15555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  16, Tf = 5080MHz (28) */
-        0x05555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  34, Tf = 5170MHz (29) */
-        0x0AAAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  36, Tf = 5180MHz (30) */
-        0x10000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  38, Tf = 5190MHz (31) */
-        0x15555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  40, Tf = 5200MHz (32) */
-        0x1AAAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  42, Tf = 5210MHz (33) */
-        0x00000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  44, Tf = 5220MHz (34) */
-        0x05555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  46, Tf = 5230MHz (35) */
-        0x0AAAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  48, Tf = 5240MHz (36) */
-        0x15555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  52, Tf = 5260MHz (37) */
-        0x00000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  56, Tf = 5280MHz (38) */
-        0x0AAAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  60, Tf = 5300MHz (39) */
-        0x15555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  64, Tf = 5320MHz (40) */
-        0x15555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 100, Tf = 5500MHz (41) */
-        0x00000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 104, Tf = 5520MHz (42) */
-        0x0AAAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 108, Tf = 5540MHz (43) */
-        0x15555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 112, Tf = 5560MHz (44) */
-        0x00000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 116, Tf = 5580MHz (45) */
-        0x0AAAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 120, Tf = 5600MHz (46) */
-        0x15555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 124, Tf = 5620MHz (47) */
-        0x00000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 128, Tf = 5640MHz (48) */
-        0x0AAAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 132, Tf = 5660MHz (49) */
-        0x15555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 136, Tf = 5680MHz (50) */
-        0x00000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 140, Tf = 5700MHz (51) */
-        0x18000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 149, Tf = 5745MHz (52) */
-        0x02AAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 153, Tf = 5765MHz (53) */
-        0x0D555100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 157, Tf = 5785MHz (54) */
-        0x18000100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 161, Tf = 5805MHz (55) */
-        0x02AAA100+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW  /* channel = 165, Tf = 5825MHz (56) */
+         * 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165  (Value 23 ~ 56)
+         */
+        0x1D555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =   7, Tf = 5035MHz (23) */
+        0x00000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =   8, Tf = 5040MHz (24) */
+        0x02AAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =   9, Tf = 5045MHz (25) */
+        0x08000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  11, Tf = 5055MHz (26) */
+        0x0AAAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  12, Tf = 5060MHz (27) */
+        0x15555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  16, Tf = 5080MHz (28) */
+        0x05555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  34, Tf = 5170MHz (29) */
+        0x0AAAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  36, Tf = 5180MHz (30) */
+        0x10000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  38, Tf = 5190MHz (31) */
+        0x15555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  40, Tf = 5200MHz (32) */
+        0x1AAAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  42, Tf = 5210MHz (33) */
+        0x00000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  44, Tf = 5220MHz (34) */
+        0x05555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  46, Tf = 5230MHz (35) */
+        0x0AAAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  48, Tf = 5240MHz (36) */
+        0x15555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  52, Tf = 5260MHz (37) */
+        0x00000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  56, Tf = 5280MHz (38) */
+        0x0AAAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  60, Tf = 5300MHz (39) */
+        0x15555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  64, Tf = 5320MHz (40) */
+        0x15555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 100, Tf = 5500MHz (41) */
+        0x00000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 104, Tf = 5520MHz (42) */
+        0x0AAAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 108, Tf = 5540MHz (43) */
+        0x15555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 112, Tf = 5560MHz (44) */
+        0x00000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 116, Tf = 5580MHz (45) */
+        0x0AAAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 120, Tf = 5600MHz (46) */
+        0x15555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 124, Tf = 5620MHz (47) */
+        0x00000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 128, Tf = 5640MHz (48) */
+        0x0AAAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 132, Tf = 5660MHz (49) */
+        0x15555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 136, Tf = 5680MHz (50) */
+        0x00000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 140, Tf = 5700MHz (51) */
+        0x18000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 149, Tf = 5745MHz (52) */
+        0x02AAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 153, Tf = 5765MHz (53) */
+        0x0D555100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 157, Tf = 5785MHz (54) */
+        0x18000100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 161, Tf = 5805MHz (55) */
+        0x02AAA100 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW  /* channel = 165, Tf = 5825MHz (56) */
 };
 
 static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  1, Tf = 2412MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  2, Tf = 2417MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  3, Tf = 2422MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  4, Tf = 2427MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  5, Tf = 2432MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  6, Tf = 2437MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  7, Tf = 2442MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  8, Tf = 2447MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  9, Tf = 2452MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 10, Tf = 2457MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 11, Tf = 2462MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 12, Tf = 2467MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 13, Tf = 2472MHz */
-        0x7FD78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 14, Tf = 2484MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  1, Tf = 2412MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  2, Tf = 2417MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  3, Tf = 2422MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  4, Tf = 2427MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  5, Tf = 2432MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  6, Tf = 2437MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  7, Tf = 2442MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  8, Tf = 2447MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  9, Tf = 2452MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 10, Tf = 2457MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 11, Tf = 2462MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 12, Tf = 2467MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 13, Tf = 2472MHz */
+        0x7FD78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 14, Tf = 2484MHz */
 
         /* 4.9G => Ch 183, 184, 185, 187, 188, 189, 192, 196  (Value:15 ~ 22) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 183, Tf = 4915MHz (15) */
-        0x67D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 184, Tf = 4920MHz (16) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 185, Tf = 4925MHz (17) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 187, Tf = 4935MHz (18) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 188, Tf = 4940MHz (19) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 189, Tf = 4945MHz (20) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 192, Tf = 4960MHz (21) */
-        0x67D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 196, Tf = 4980MHz (22) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 183, Tf = 4915MHz (15) */
+        0x67D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 184, Tf = 4920MHz (16) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 185, Tf = 4925MHz (17) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 187, Tf = 4935MHz (18) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 188, Tf = 4940MHz (19) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 189, Tf = 4945MHz (20) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 192, Tf = 4960MHz (21) */
+        0x67D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 196, Tf = 4980MHz (22) */
 
         /* 5G => Ch 7, 8, 9, 11, 12, 16, 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64,
-         * 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165  (Value 23 ~ 56) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =   7, Tf = 5035MHz (23) */
-        0x67D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =   8, Tf = 5040MHz (24) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =   9, Tf = 5045MHz (25) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  11, Tf = 5055MHz (26) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  12, Tf = 5060MHz (27) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  16, Tf = 5080MHz (28) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  34, Tf = 5170MHz (29) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  36, Tf = 5180MHz (30) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  38, Tf = 5190MHz (31) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  40, Tf = 5200MHz (32) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  42, Tf = 5210MHz (33) */
-        0x67D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  44, Tf = 5220MHz (34) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  46, Tf = 5230MHz (35) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  48, Tf = 5240MHz (36) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  52, Tf = 5260MHz (37) */
-        0x67D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  56, Tf = 5280MHz (38) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  60, Tf = 5300MHz (39) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel =  64, Tf = 5320MHz (40) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 100, Tf = 5500MHz (41) */
-        0x67D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 104, Tf = 5520MHz (42) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 108, Tf = 5540MHz (43) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 112, Tf = 5560MHz (44) */
-        0x67D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 116, Tf = 5580MHz (45) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 120, Tf = 5600MHz (46) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 124, Tf = 5620MHz (47) */
-        0x67D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 128, Tf = 5640MHz (48) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 132, Tf = 5660MHz (49) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 136, Tf = 5680MHz (50) */
-        0x67D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 140, Tf = 5700MHz (51) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 149, Tf = 5745MHz (52) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 153, Tf = 5765MHz (53) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 157, Tf = 5785MHz (54) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW, /* channel = 161, Tf = 5805MHz (55) */
-        0x77D78400+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW  /* channel = 165, Tf = 5825MHz (56) */
+         * 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165  (Value 23 ~ 56)
+         */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =   7, Tf = 5035MHz (23) */
+        0x67D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =   8, Tf = 5040MHz (24) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =   9, Tf = 5045MHz (25) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  11, Tf = 5055MHz (26) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  12, Tf = 5060MHz (27) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  16, Tf = 5080MHz (28) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  34, Tf = 5170MHz (29) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  36, Tf = 5180MHz (30) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  38, Tf = 5190MHz (31) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  40, Tf = 5200MHz (32) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  42, Tf = 5210MHz (33) */
+        0x67D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  44, Tf = 5220MHz (34) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  46, Tf = 5230MHz (35) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  48, Tf = 5240MHz (36) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  52, Tf = 5260MHz (37) */
+        0x67D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  56, Tf = 5280MHz (38) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  60, Tf = 5300MHz (39) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel =  64, Tf = 5320MHz (40) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 100, Tf = 5500MHz (41) */
+        0x67D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 104, Tf = 5520MHz (42) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 108, Tf = 5540MHz (43) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 112, Tf = 5560MHz (44) */
+        0x67D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 116, Tf = 5580MHz (45) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 120, Tf = 5600MHz (46) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 124, Tf = 5620MHz (47) */
+        0x67D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 128, Tf = 5640MHz (48) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 132, Tf = 5660MHz (49) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 136, Tf = 5680MHz (50) */
+        0x67D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 140, Tf = 5700MHz (51) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 149, Tf = 5745MHz (52) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 153, Tf = 5765MHz (53) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 157, Tf = 5785MHz (54) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW, /* channel = 161, Tf = 5805MHz (55) */
+        0x77D78400 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW  /* channel = 165, Tf = 5825MHz (56) */
 };
 
 /*
@@ -410,7 +408,7 @@ static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *  Out:
  *      none
  *
@@ -419,16 +417,16 @@ static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {
  */
 static bool s_bAL7230Init(struct vnt_private *priv)
 {
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
         int     ii;
         bool ret;
 
         ret = true;
 
         /* 3-wire control for normal mode */
-        VNSvOutPortB(dwIoBase + MAC_REG_SOFTPWRCTL, 0);
+        VNSvOutPortB(iobase + MAC_REG_SOFTPWRCTL, 0);
 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI  |
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI  |
                                                          SOFTPWRCTL_TXPEINV));
         BBvPowerSaveModeOFF(priv); /* RobertYu:20050106, have DC value for Calibration */
 
@@ -436,20 +434,20 @@ static bool s_bAL7230Init(struct vnt_private *priv)
                 ret &= IFRFbWriteEmbedded(priv, dwAL7230InitTable[ii]);
 
         /* PLL On */
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
 
         /* Calibration */
         MACvTimer0MicroSDelay(priv, 150);/* 150us */
         /* TXDCOC:active, RCK:disable */
-        ret &= IFRFbWriteEmbedded(priv, (0x9ABA8F00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW));
+        ret &= IFRFbWriteEmbedded(priv, (0x9ABA8F00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW));
         MACvTimer0MicroSDelay(priv, 30);/* 30us */
         /* TXDCOC:disable, RCK:active */
-        ret &= IFRFbWriteEmbedded(priv, (0x3ABA8F00+(BY_AL7230_REG_LEN<<3)+IFREGCTL_REGW));
+        ret &= IFRFbWriteEmbedded(priv, (0x3ABA8F00 + (BY_AL7230_REG_LEN << 3) + IFREGCTL_REGW));
         MACvTimer0MicroSDelay(priv, 30);/* 30us */
         /* TXDCOC:disable, RCK:disable */
         ret &= IFRFbWriteEmbedded(priv, dwAL7230InitTable[CB_AL7230_INIT_SEQ-1]);
 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3    |
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3    |
                                                          SOFTPWRCTL_SWPE2    |
                                                          SOFTPWRCTL_SWPECTI  |
                                                          SOFTPWRCTL_TXPEINV));
@@ -458,7 +456,7 @@ static bool s_bAL7230Init(struct vnt_private *priv)
 
         /* PE1: TX_ON, PE2: RX_ON, PE3: PLLON */
         /* 3-wire control for power saving mode */
-        VNSvOutPortB(dwIoBase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 | PSSIG_WPE2)); /* 1100 0000 */
+        VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 | PSSIG_WPE2)); /* 1100 0000 */
 
         return ret;
 }
@@ -468,26 +466,26 @@ static bool s_bAL7230Init(struct vnt_private *priv)
  */
 static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byChannel)
 {
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
         bool ret;
 
         ret = true;
 
         /* PLLON Off */
-        MACvWordRegBitsOff(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
+        MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
 
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable0[byChannel - 1]);
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable1[byChannel - 1]);
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable2[byChannel - 1]);
 
         /* PLLOn On */
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
 
         /* Set Channel[7] = 0 to tell H/W channel is changing now. */
-        VNSvOutPortB(dwIoBase + MAC_REG_CHANNEL, (byChannel & 0x7F));
+        VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel & 0x7F));
         MACvTimer0MicroSDelay(priv, SWITCH_CHANNEL_DELAY_AL7230);
         /* Set Channel[7] = 1 to tell H/W channel change is done. */
-        VNSvOutPortB(dwIoBase + MAC_REG_CHANNEL, (byChannel | 0x80));
+        VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel | 0x80));
 
         return ret;
 }
@@ -497,7 +495,7 @@ static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byCha
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *      dwData      - data to write
  *  Out:
  *      none
@@ -507,15 +505,15 @@ static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byCha
  */
 bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData)
 {
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
         unsigned short ww;
         unsigned long dwValue;
 
-        VNSvOutPortD(dwIoBase + MAC_REG_IFREGCTL, dwData);
+        VNSvOutPortD(iobase + MAC_REG_IFREGCTL, dwData);
 
         /* W_MAX_TIMEOUT is the timeout period */
         for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
-                VNSvInPortD(dwIoBase + MAC_REG_IFREGCTL, &dwValue);
+                VNSvInPortD(iobase + MAC_REG_IFREGCTL, &dwValue);
                 if (dwValue & IFREGCTL_DONE)
                         break;
         }
@@ -531,7 +529,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *  Out:
  *      none
  *
@@ -540,51 +538,51 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData)
  */
 static bool RFbAL2230Init(struct vnt_private *priv)
 {
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
         int     ii;
         bool ret;
 
         ret = true;
 
         /* 3-wire control for normal mode */
-        VNSvOutPortB(dwIoBase + MAC_REG_SOFTPWRCTL, 0);
+        VNSvOutPortB(iobase + MAC_REG_SOFTPWRCTL, 0);
 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI  |
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI  |
                                                          SOFTPWRCTL_TXPEINV));
         /* PLL  Off */
-        MACvWordRegBitsOff(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
+        MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
 
         /* patch abnormal AL2230 frequency output */
-        IFRFbWriteEmbedded(priv, (0x07168700+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW));
+        IFRFbWriteEmbedded(priv, (0x07168700 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW));
 
         for (ii = 0; ii < CB_AL2230_INIT_SEQ; ii++)
                 ret &= IFRFbWriteEmbedded(priv, dwAL2230InitTable[ii]);
         MACvTimer0MicroSDelay(priv, 30); /* delay 30 us */
 
         /* PLL On */
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
 
         MACvTimer0MicroSDelay(priv, 150);/* 150us */
-        ret &= IFRFbWriteEmbedded(priv, (0x00d80f00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW));
+        ret &= IFRFbWriteEmbedded(priv, (0x00d80f00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW));
         MACvTimer0MicroSDelay(priv, 30);/* 30us */
-        ret &= IFRFbWriteEmbedded(priv, (0x00780f00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW));
+        ret &= IFRFbWriteEmbedded(priv, (0x00780f00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW));
         MACvTimer0MicroSDelay(priv, 30);/* 30us */
         ret &= IFRFbWriteEmbedded(priv, dwAL2230InitTable[CB_AL2230_INIT_SEQ-1]);
 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3    |
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3    |
                                                          SOFTPWRCTL_SWPE2    |
                                                          SOFTPWRCTL_SWPECTI  |
                                                          SOFTPWRCTL_TXPEINV));
 
         /* 3-wire control for power saving mode */
-        VNSvOutPortB(dwIoBase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 | PSSIG_WPE2)); /* 1100 0000 */
+        VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 | PSSIG_WPE2)); /* 1100 0000 */
 
         return ret;
 }
 
 static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned char byChannel)
 {
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
         bool ret;
 
         ret = true;
@@ -593,10 +591,10 @@ static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned char byCha
         ret &= IFRFbWriteEmbedded(priv, dwAL2230ChannelTable1[byChannel - 1]);
 
         /* Set Channel[7] = 0 to tell H/W channel is changing now. */
-        VNSvOutPortB(dwIoBase + MAC_REG_CHANNEL, (byChannel & 0x7F));
+        VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel & 0x7F));
         MACvTimer0MicroSDelay(priv, SWITCH_CHANNEL_DELAY_AL2230);
         /* Set Channel[7] = 1 to tell H/W channel change is done. */
-        VNSvOutPortB(dwIoBase + MAC_REG_CHANNEL, (byChannel | 0x80));
+        VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel | 0x80));
 
         return ret;
 }
@@ -681,7 +679,7 @@ bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType,
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *      uChannel    - channel number
  *      bySleepCnt  - SleepProgSyn count
  *
@@ -691,12 +689,12 @@ bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType,
 bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType,
                          u16 uChannel)
 {
-        void __iomem *dwIoBase = priv->PortOffset;
+        void __iomem *iobase = priv->PortOffset;
         int   ii;
         unsigned char byInitCount = 0;
         unsigned char bySleepCount = 0;
 
-        VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, 0);
+        VNSvOutPortW(iobase + MAC_REG_MISCFFNDEX, 0);
         switch (byRFType) {
         case RF_AIROHA:
         case RF_AL2230S:
@@ -758,7 +756,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType,
  *
  * Parameters:
  *  In:
- *      dwIoBase       - I/O base address
+ *      iobase         - I/O base address
  *      dwRFPowerTable - RF Tx Power Setting
  *  Out:
  *      none
@@ -830,7 +828,7 @@ bool RFbSetPower(
  *
  * Parameters:
  *  In:
- *      dwIoBase       - I/O base address
+ *      iobase         - I/O base address
  *      dwRFPowerTable - RF Tx Power Setting
  *  Out:
  *      none
@@ -855,20 +853,20 @@ bool RFbRawSetPower(
         case RF_AIROHA:
                 ret &= IFRFbWriteEmbedded(priv, dwAL2230PowerTable[byPwr]);
                 if (rate <= RATE_11M)
-                        ret &= IFRFbWriteEmbedded(priv, 0x0001B400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW);
+                        ret &= IFRFbWriteEmbedded(priv, 0x0001B400 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
                 else
-                        ret &= IFRFbWriteEmbedded(priv, 0x0005A400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW);
+                        ret &= IFRFbWriteEmbedded(priv, 0x0005A400 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
 
                 break;
 
         case RF_AL2230S:
                 ret &= IFRFbWriteEmbedded(priv, dwAL2230PowerTable[byPwr]);
                 if (rate <= RATE_11M) {
-                        ret &= IFRFbWriteEmbedded(priv, 0x040C1400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW);
-                        ret &= IFRFbWriteEmbedded(priv, 0x00299B00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW);
+                        ret &= IFRFbWriteEmbedded(priv, 0x040C1400 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
+                        ret &= IFRFbWriteEmbedded(priv, 0x00299B00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
                 } else {
-                        ret &= IFRFbWriteEmbedded(priv, 0x0005A400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW);
-                        ret &= IFRFbWriteEmbedded(priv, 0x00099B00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW);
+                        ret &= IFRFbWriteEmbedded(priv, 0x0005A400 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
+                        ret &= IFRFbWriteEmbedded(priv, 0x00099B00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW);
                 }
 
                 break;
diff --git a/drivers/staging/vt6655/rf.h b/drivers/staging/vt6655/rf.h
index e9c786995506..b6e853784a26 100644
--- a/drivers/staging/vt6655/rf.h
+++ b/drivers/staging/vt6655/rf.h
@@ -12,11 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *
  * File: rf.h
  *
  * Purpose:
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 7e69bc99d60f..3efe19a1b13f 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: rxtx.c
  *
  * Purpose: handle WMAC/802.3/802.11 rx & tx functions
@@ -1086,8 +1082,8 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
         }
 
         /*
-        * Use for AUTO FALL BACK
-        */
+         * Use for AUTO FALL BACK
+         */
         if (fifo_ctl & FIFOCTL_AUTO_FB_0)
                 byFBOption = AUTO_FB_0;
         else if (fifo_ctl & FIFOCTL_AUTO_FB_1)
diff --git a/drivers/staging/vt6655/rxtx.h b/drivers/staging/vt6655/rxtx.h
index 1e30ecb5c63c..89de67115826 100644
--- a/drivers/staging/vt6655/rxtx.h
+++ b/drivers/staging/vt6655/rxtx.h
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: rxtx.h
  *
  * Purpose:
diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c
index ee992772066f..635f271595f6 100644
--- a/drivers/staging/vt6655/srom.c
+++ b/drivers/staging/vt6655/srom.c
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: srom.c
  *
  * Purpose:Implement functions to access eeprom
@@ -64,7 +60,7 @@
  *
  * Parameters:
  *  In:
- *      dwIoBase        - I/O base address
+ *      iobase          - I/O base address
  *      byContntOffset  - address of EEPROM
  *  Out:
  *      none
@@ -72,7 +68,7 @@
  * Return Value: data read
  *
  */
-unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
+unsigned char SROMbyReadEmbedded(void __iomem *iobase,
                                  unsigned char byContntOffset)
 {
         unsigned short wDelay, wNoACK;
@@ -81,18 +77,18 @@ unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
         unsigned char byOrg;
 
         byData = 0xFF;
-        VNSvInPortB(dwIoBase + MAC_REG_I2MCFG, &byOrg);
+        VNSvInPortB(iobase + MAC_REG_I2MCFG, &byOrg);
         /* turn off hardware retry for getting NACK */
-        VNSvOutPortB(dwIoBase + MAC_REG_I2MCFG, (byOrg & (~I2MCFG_NORETRY)));
+        VNSvOutPortB(iobase + MAC_REG_I2MCFG, (byOrg & (~I2MCFG_NORETRY)));
         for (wNoACK = 0; wNoACK < W_MAX_I2CRETRY; wNoACK++) {
-                VNSvOutPortB(dwIoBase + MAC_REG_I2MTGID, EEP_I2C_DEV_ID);
-                VNSvOutPortB(dwIoBase + MAC_REG_I2MTGAD, byContntOffset);
+                VNSvOutPortB(iobase + MAC_REG_I2MTGID, EEP_I2C_DEV_ID);
+                VNSvOutPortB(iobase + MAC_REG_I2MTGAD, byContntOffset);
 
                 /* issue read command */
-                VNSvOutPortB(dwIoBase + MAC_REG_I2MCSR, I2MCSR_EEMR);
+                VNSvOutPortB(iobase + MAC_REG_I2MCSR, I2MCSR_EEMR);
                 /* wait DONE be set */
                 for (wDelay = 0; wDelay < W_MAX_TIMEOUT; wDelay++) {
-                        VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &byWait);
+                        VNSvInPortB(iobase + MAC_REG_I2MCSR, &byWait);
                         if (byWait & (I2MCSR_DONE | I2MCSR_NACK))
                                 break;
                         PCAvDelayByIO(CB_DELAY_LOOP_WAIT);
@@ -102,8 +98,8 @@ unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
                         break;
                 }
         }
-        VNSvInPortB(dwIoBase + MAC_REG_I2MDIPT, &byData);
-        VNSvOutPortB(dwIoBase + MAC_REG_I2MCFG, byOrg);
+        VNSvInPortB(iobase + MAC_REG_I2MDIPT, &byData);
+        VNSvOutPortB(iobase + MAC_REG_I2MCFG, byOrg);
         return byData;
 }
 
@@ -112,20 +108,20 @@ unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
  *
  * Parameters:
  *  In:
- *      dwIoBase        - I/O base address
+ *      iobase          - I/O base address
  *  Out:
  *      pbyEepromRegs   - EEPROM content Buffer
  *
  * Return Value: none
  *
  */
-void SROMvReadAllContents(void __iomem *dwIoBase, unsigned char *pbyEepromRegs)
+void SROMvReadAllContents(void __iomem *iobase, unsigned char *pbyEepromRegs)
 {
         int     ii;
 
         /* ii = Rom Address */
         for (ii = 0; ii < EEP_MAX_CONTEXT_SIZE; ii++) {
-                *pbyEepromRegs = SROMbyReadEmbedded(dwIoBase,
+                *pbyEepromRegs = SROMbyReadEmbedded(iobase,
                                                     (unsigned char)ii);
                 pbyEepromRegs++;
         }
@@ -136,21 +132,21 @@ void SROMvReadAllContents(void __iomem *dwIoBase, unsigned char *pbyEepromRegs)
  *
  * Parameters:
  *  In:
- *      dwIoBase        - I/O base address
+ *      iobase          - I/O base address
  *  Out:
  *      pbyEtherAddress - Ethernet Address buffer
  *
  * Return Value: none
  *
  */
-void SROMvReadEtherAddress(void __iomem *dwIoBase,
+void SROMvReadEtherAddress(void __iomem *iobase,
                            unsigned char *pbyEtherAddress)
 {
         unsigned char ii;
 
         /* ii = Rom Address */
         for (ii = 0; ii < ETH_ALEN; ii++) {
-                *pbyEtherAddress = SROMbyReadEmbedded(dwIoBase, ii);
+                *pbyEtherAddress = SROMbyReadEmbedded(iobase, ii);
                 pbyEtherAddress++;
         }
 }
diff --git a/drivers/staging/vt6655/srom.h b/drivers/staging/vt6655/srom.h
index 531bf0069373..6e03ab6dfa9d 100644
--- a/drivers/staging/vt6655/srom.h
+++ b/drivers/staging/vt6655/srom.h
@@ -12,11 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *
  * File: srom.h
  *
  * Purpose: Implement functions to access eeprom
@@ -90,12 +85,12 @@
 
 /*---------------------  Export Functions  --------------------------*/
 
-unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
+unsigned char SROMbyReadEmbedded(void __iomem *iobase,
                                  unsigned char byContntOffset);
 
-void SROMvReadAllContents(void __iomem *dwIoBase, unsigned char *pbyEepromRegs);
+void SROMvReadAllContents(void __iomem *iobase, unsigned char *pbyEepromRegs);
 
-void SROMvReadEtherAddress(void __iomem *dwIoBase,
+void SROMvReadEtherAddress(void __iomem *iobase,
                            unsigned char *pbyEtherAddress);
 
 #endif /* __EEPROM_H__*/
diff --git a/drivers/staging/vt6655/tmacro.h b/drivers/staging/vt6655/tmacro.h
index 597efefc017f..d6a0563ad55c 100644
--- a/drivers/staging/vt6655/tmacro.h
+++ b/drivers/staging/vt6655/tmacro.h
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: tmacro.h
  *
  * Purpose: define basic common types and macros
diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h
index 85fe0464cfb3..9806b5989014 100644
--- a/drivers/staging/vt6655/upc.h
+++ b/drivers/staging/vt6655/upc.h
@@ -12,10 +12,6 @@
  * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * File: upc.h
  *
  * Purpose: Macros to access device
diff --git a/drivers/staging/vt6656/baseband.h b/drivers/staging/vt6656/baseband.h
index 7cc13874f8f1..fe1c25c64cca 100644
--- a/drivers/staging/vt6656/baseband.h
+++ b/drivers/staging/vt6656/baseband.h
@@ -86,15 +86,15 @@ struct vnt_phy_field {
 unsigned int vnt_get_frame_time(u8 preamble_type, u8 pkt_type,
                                 unsigned int frame_length, u16 tx_rate);
 
-void vnt_get_phy_field(struct vnt_private *, u32 frame_length,
-                       u16 tx_rate, u8 pkt_type, struct vnt_phy_field *);
-
-void vnt_set_short_slot_time(struct vnt_private *);
-void vnt_set_vga_gain_offset(struct vnt_private *, u8);
-void vnt_set_antenna_mode(struct vnt_private *, u8);
-int vnt_vt3184_init(struct vnt_private *);
-void vnt_set_deep_sleep(struct vnt_private *);
-void vnt_exit_deep_sleep(struct vnt_private *);
-void vnt_update_pre_ed_threshold(struct vnt_private *, int scanning);
+void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
+                       u16 tx_rate, u8 pkt_type, struct vnt_phy_field *phy);
+
+void vnt_set_short_slot_time(struct vnt_private *priv);
+void vnt_set_vga_gain_offset(struct vnt_private *priv, u8 data);
+void vnt_set_antenna_mode(struct vnt_private *priv, u8 antenna_mode);
+int vnt_vt3184_init(struct vnt_private *priv);
+void vnt_set_deep_sleep(struct vnt_private *priv);
+void vnt_exit_deep_sleep(struct vnt_private *priv);
+void vnt_update_pre_ed_threshold(struct vnt_private *priv, int scanning);
 
 #endif /* __BASEBAND_H__ */
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 53b469c71dc2..0e5a99375099 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -501,16 +501,7 @@ u8 vnt_get_pkt_type(struct vnt_private *priv)
  */
 u64 vnt_get_tsf_offset(u8 rx_rate, u64 tsf1, u64 tsf2)
 {
-        u64 tsf_offset = 0;
-        u16 rx_bcn_offset;
-
-        rx_bcn_offset = cw_rxbcntsf_off[rx_rate % MAX_RATE];
-
-        tsf2 += (u64)rx_bcn_offset;
-
-        tsf_offset = tsf1 - tsf2;
-
-        return tsf_offset;
+        return tsf1 - tsf2 - (u64)cw_rxbcntsf_off[rx_rate % MAX_RATE];
 }
 
 /*
@@ -610,8 +601,8 @@ u64 vnt_get_next_tbtt(u64 tsf, u16 beacon_interval)
         beacon_int = beacon_interval * 1024;
 
         /* Next TBTT =
-        *       ((local_current_TSF / beacon_interval) + 1) * beacon_interval
-        */
+         *      ((local_current_TSF / beacon_interval) + 1) * beacon_interval
+         */
         if (beacon_int) {
                 do_div(tsf, beacon_int);
                 tsf += 1;
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index eeed16e9124e..611da4929ddc 100644
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -121,7 +121,7 @@ void vnt_mac_set_keyentry(struct vnt_private *priv, u16 key_ctl, u32 entry_idx,
         u16 offset;
 
         offset = MISCFIFO_KEYETRY0;
-        offset += (entry_idx * MISCFIFO_KEYENTRYSIZE);
+        offset += entry_idx * MISCFIFO_KEYENTRYSIZE;
 
         set_key.u.write.key_ctl = cpu_to_le16(key_ctl);
         ether_addr_copy(set_key.u.write.addr, addr);
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 0594828bdabf..50d02d9aa535 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -85,7 +85,7 @@ MODULE_PARM_DESC(tx_buffers, "Number of receive usb tx buffers");
  * Static vars definitions
  */
 
-static struct usb_device_id vt6656_table[] = {
+static const struct usb_device_id vt6656_table[] = {
         {USB_DEVICE(VNT_USB_VENDOR_ID, VNT_USB_PRODUCT_ID)},
         {}
 };
@@ -326,9 +326,9 @@ static int vnt_init_registers(struct vnt_private *priv)
                 priv->current_net_addr);
 
         /*
-        * set BB and packet type at the same time
-        * set Short Slot Time, xIFS, and RSPINF
-        */
+         * set BB and packet type at the same time
+         * set Short Slot Time, xIFS, and RSPINF
+         */
         if (priv->bb_type == BB_TYPE_11A)
                 priv->short_slot_time = true;
         else
diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
index 79a3108719a6..6101a35582b6 100644
--- a/drivers/staging/vt6656/rf.c
+++ b/drivers/staging/vt6656/rf.c
@@ -730,9 +730,9 @@ int vnt_rf_set_txpower(struct vnt_private *priv, u8 power, u32 rate)
                         return false;
 
                 /*
-                * 0x080F1B00 for 3 wire control TxGain(D10)
-                * and 0x31 as TX Gain value
-                */
+                 * 0x080F1B00 for 3 wire control TxGain(D10)
+                 * and 0x31 as TX Gain value
+                 */
                 power_setting = 0x080c0b00 | (power << 12);
 
                 ret &= vnt_rf_write_embedded(priv, power_setting);
@@ -800,8 +800,8 @@ int vnt_rf_set_txpower(struct vnt_private *priv, u8 power, u32 rate)
 /* Convert rssi to dbm */
 void vnt_rf_rssi_to_dbm(struct vnt_private *priv, u8 rssi, long *dbm)
 {
-        u8 idx = (((rssi & 0xc0) >> 6) & 0x03);
-        long b = (rssi & 0x3f);
+        u8 idx = ((rssi & 0xc0) >> 6) & 0x03;
+        long b = rssi & 0x3f;
         long a = 0;
         u8 airoharf[4] = {0, 18, 0, 40};
 
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 4b51c0ac27ac..622994795222 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -224,9 +224,7 @@ static inline u16 get_asoc_status(u8 *data)
         u16 asoc_status;
 
         asoc_status = data[3];
-        asoc_status = (asoc_status << 8) | data[2];
-
-        return asoc_status;
+        return (asoc_status << 8) | data[2];
 }
 
 static inline u16 get_asoc_id(u8 *data)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 6ab7443eabde..b00ea75524e4 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1722,10 +1722,8 @@ _WPAPtk_end_case_:
 
         case PMKSA:
                 pu8keybuf = kmalloc((pstrHostIFkeyAttr->attr.pmkid.numpmkid * PMKSA_KEY_LEN) + 1, GFP_KERNEL);
-                if (!pu8keybuf) {
-                        netdev_err(vif->ndev, "No buffer to send PMKSA Key\n");
+                if (!pu8keybuf)
                         return -ENOMEM;
-                }
 
                 pu8keybuf[0] = pstrHostIFkeyAttr->attr.pmkid.numpmkid;
 
@@ -1932,7 +1930,7 @@ static s32 Handle_Get_InActiveTime(struct wilc_vif *vif,
         wid.val = kmalloc(wid.size, GFP_KERNEL);
 
         stamac = wid.val;
-        memcpy(stamac, strHostIfStaInactiveT->mac, ETH_ALEN);
+        ether_addr_copy(stamac, strHostIfStaInactiveT->mac);
 
         result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1,
                                       wilc_get_vif_idx(vif));
@@ -2168,7 +2166,7 @@ static void Handle_DelStation(struct wilc_vif *vif,
 
         pu8CurrByte = wid.val;
 
-        memcpy(pu8CurrByte, pstrDelStaParam->mac_addr, ETH_ALEN);
+        ether_addr_copy(pu8CurrByte, pstrDelStaParam->mac_addr);
 
         result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1,
                                       wilc_get_vif_idx(vif));
@@ -2322,10 +2320,8 @@ static u32 Handle_ListenStateExpired(struct wilc_vif *vif,
                 wid.size = 2;
                 wid.val = kmalloc(wid.size, GFP_KERNEL);
 
-                if (!wid.val) {
-                        netdev_err(vif->ndev, "Failed to allocate memory\n");
+                if (!wid.val)
                         return -ENOMEM;
-                }
 
                 wid.val[0] = u8remain_on_chan_flag;
                 wid.val[1] = FALSE_FRMWR_CHANNEL;
diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index ddfea29df2a7..f36d3b5a0370 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -367,7 +367,6 @@ extern u8 wilc_connected_ssid[6];
 extern u8 wilc_multicast_mac_addr_list[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];
 
 extern int wilc_connecting;
-extern u8 wilc_initialized;
 extern struct timer_list wilc_during_ip_timer;
 
 #endif
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 6370a5efe343..3775706578b2 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -37,6 +37,8 @@ static void linux_wlan_tx_complete(void *priv, int status);
 static int  mac_init_fn(struct net_device *ndev);
 static struct net_device_stats *mac_stats(struct net_device *dev);
 static int  mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd);
+static int wilc_mac_open(struct net_device *ndev);
+static int wilc_mac_close(struct net_device *ndev);
 static void wilc_set_multicast_list(struct net_device *dev);
 
 bool wilc_enable_ps = true;
@@ -218,17 +220,6 @@ static void deinit_irq(struct net_device *dev)
         }
 }
 
-int wilc_lock_timeout(struct wilc *nic, void *vp, u32 timeout)
-{
-        /* FIXME: replace with mutex_lock or wait_for_completion */
-        int error = -1;
-
-        if (vp)
-                error = down_timeout(vp,
-                                     msecs_to_jiffies(timeout));
-        return error;
-}
-
 void wilc_mac_indicate(struct wilc *wilc, int flag)
 {
         int status;
@@ -269,23 +260,12 @@ static struct net_device *get_if_handler(struct wilc *wilc, u8 *mac_header)
 
 int wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid, u8 mode)
 {
-        int i = 0;
-        int ret = -1;
-        struct wilc_vif *vif;
-        struct wilc *wilc;
-
-        vif = netdev_priv(wilc_netdev);
-        wilc = vif->wilc;
+        struct wilc_vif *vif = netdev_priv(wilc_netdev);
 
-        for (i = 0; i < wilc->vif_num; i++)
-                if (wilc->vif[i]->ndev == wilc_netdev) {
-                        memcpy(wilc->vif[i]->bssid, bssid, 6);
-                        wilc->vif[i]->mode = mode;
-                        ret = 0;
-                        break;
-                }
+        memcpy(vif->bssid, bssid, 6);
+        vif->mode = mode;
 
-        return ret;
+        return 0;
 }
 
 int wilc_wlan_get_num_conn_ifcs(struct wilc *wilc)
@@ -847,7 +827,7 @@ static int mac_init_fn(struct net_device *ndev)
         return 0;
 }
 
-int wilc_mac_open(struct net_device *ndev)
+static int wilc_mac_open(struct net_device *ndev)
 {
         struct wilc_vif *vif;
 
@@ -1038,7 +1018,7 @@ int wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev)
         return 0;
 }
 
-int wilc_mac_close(struct net_device *ndev)
+static int wilc_mac_close(struct net_device *ndev)
 {
         struct wilc_priv *priv;
         struct wilc_vif *vif;
@@ -1212,16 +1192,11 @@ void WILC_WFI_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size)
 
 void wilc_netdev_cleanup(struct wilc *wilc)
 {
-        int i = 0;
-        struct wilc_vif *vif[NUM_CONCURRENT_IFC];
+        int i;
 
-        if (wilc && (wilc->vif[0]->ndev || wilc->vif[1]->ndev)) {
+        if (wilc && (wilc->vif[0]->ndev || wilc->vif[1]->ndev))
                 unregister_inetaddr_notifier(&g_dev_notifier);
 
-                for (i = 0; i < NUM_CONCURRENT_IFC; i++)
-                        vif[i] = netdev_priv(wilc->vif[i]->ndev);
-        }
-
         if (wilc && wilc->firmware) {
                 release_firmware(wilc->firmware);
                 wilc->firmware = NULL;
@@ -1230,7 +1205,7 @@ void wilc_netdev_cleanup(struct wilc *wilc)
         if (wilc && (wilc->vif[0]->ndev || wilc->vif[1]->ndev)) {
                 for (i = 0; i < NUM_CONCURRENT_IFC; i++)
                         if (wilc->vif[i]->ndev)
-                                if (vif[i]->mac_opened)
+                                if (wilc->vif[i]->mac_opened)
                                         wilc_mac_close(wilc->vif[i]->ndev);
 
                 for (i = 0; i < NUM_CONCURRENT_IFC; i++) {
@@ -1278,9 +1253,9 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
 
                 vif->idx = wl->vif_num;
                 vif->wilc = *wilc;
+                vif->ndev = ndev;
                 wl->vif[i] = vif;
-                wl->vif[wl->vif_num]->ndev = ndev;
-                wl->vif_num++;
+                wl->vif_num = i;
                 ndev->netdev_ops = &wilc_netdev_ops;
 
                 {
diff --git a/drivers/staging/wilc1000/wilc_debugfs.c b/drivers/staging/wilc1000/wilc_debugfs.c
index 802bb1d5e207..07260c497db4 100644
--- a/drivers/staging/wilc1000/wilc_debugfs.c
+++ b/drivers/staging/wilc1000/wilc_debugfs.c
@@ -62,16 +62,16 @@ static ssize_t wilc_debug_level_write(struct file *filp, const char __user *buf,
                 return ret;
 
         if (flag > DBG_LEVEL_ALL) {
-                printk("%s, value (0x%08x) is out of range, stay previous flag (0x%08x)\n", __func__, flag, atomic_read(&WILC_DEBUG_LEVEL));
+                pr_info("%s, value (0x%08x) is out of range, stay previous flag (0x%08x)\n", __func__, flag, atomic_read(&WILC_DEBUG_LEVEL));
                 return -EINVAL;
         }
 
         atomic_set(&WILC_DEBUG_LEVEL, (int)flag);
 
         if (flag == 0)
-                printk(KERN_INFO "Debug-level disabled\n");
+                pr_info("Debug-level disabled\n");
         else
-                printk(KERN_INFO "Debug-level enabled\n");
+                pr_info("Debug-level enabled\n");
 
         return count;
 }
diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c
index 39b73fb27398..3ad7cec4662d 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -39,6 +39,7 @@ struct wilc_sdio {
 };
 
 static struct wilc_sdio g_sdio;
+static const struct wilc_hif_func wilc_hif_sdio;
 
 static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data);
 static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data);
@@ -1100,7 +1101,7 @@ static int sdio_sync_ext(struct wilc *wilc, int nint)
  *
  ********************************************/
 
-const struct wilc_hif_func wilc_hif_sdio = {
+static const struct wilc_hif_func wilc_hif_sdio = {
         .hif_init = sdio_init,
         .hif_deinit = sdio_deinit,
         .hif_read_reg = sdio_read_reg,
diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index f08cf6d9e1af..55d53c3a95df 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -30,6 +30,7 @@ struct wilc_spi {
 };
 
 static struct wilc_spi g_spi;
+static const struct wilc_hif_func wilc_hif_spi;
 
 static int wilc_spi_read(struct wilc *wilc, u32, u8 *, u32);
 static int wilc_spi_write(struct wilc *wilc, u32, u8 *, u32);
@@ -858,7 +859,8 @@ static int wilc_spi_init(struct wilc *wilc, bool resume)
         /* the SPI to it's initial value. */
         if (!spi_internal_read(wilc, WILC_SPI_PROTOCOL_OFFSET, &reg)) {
                 /* Read failed. Try with CRC off. This might happen when module
-                 * is removed but chip isn't reset*/
+                 * is removed but chip isn't reset
+                 */
                 g_spi.crc_off = 1;
                 dev_err(&spi->dev, "Failed internal read protocol with CRC on, retrying with CRC off...\n");
                 if (!spi_internal_read(wilc, WILC_SPI_PROTOCOL_OFFSET, &reg)) {
@@ -1133,7 +1135,7 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint)
  *      Global spi HIF function table
  *
  ********************************************/
-const struct wilc_hif_func wilc_hif_spi = {
+static const struct wilc_hif_func wilc_hif_spi = {
         .hif_init = wilc_spi_init,
         .hif_deinit = _wilc_spi_deinit,
         .hif_read_reg = wilc_spi_read_reg,
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 60d8b055bb2f..c1a24f7bc85f 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -90,17 +90,12 @@ static const struct wiphy_wowlan_support wowlan_support = {
 #define IS_MGMT_STATUS_SUCCES                   0x040
 #define GET_PKT_OFFSET(a) (((a) >> 22) & 0x1ff)
 
-extern int wilc_mac_open(struct net_device *ndev);
-extern int wilc_mac_close(struct net_device *ndev);
-
 static struct network_info last_scanned_shadow[MAX_NUM_SCANNED_NETWORKS_SHADOW];
 static u32 last_scanned_cnt;
 struct timer_list wilc_during_ip_timer;
 static struct timer_list hAgingTimer;
 static u8 op_ifcs;
 
-u8 wilc_initialized = 1;
-
 #define CHAN2G(_channel, _freq, _flags) {        \
                 .band             = NL80211_BAND_2GHZ, \
                 .center_freq      = (_freq),             \
@@ -1193,6 +1188,7 @@ static int get_station(struct wiphy *wiphy, struct net_device *dev,
         u32 i = 0;
         u32 associatedsta = ~0;
         u32 inactive_time = 0;
+
         priv = wiphy_priv(wiphy);
         vif = netdev_priv(dev);
 
@@ -1590,28 +1586,25 @@ static int remain_on_channel(struct wiphy *wiphy,
         priv->strRemainOnChanParams.u32ListenDuration = duration;
         priv->strRemainOnChanParams.u32ListenSessionID++;
 
-        s32Error = wilc_remain_on_channel(vif,
+        return wilc_remain_on_channel(vif,
                                 priv->strRemainOnChanParams.u32ListenSessionID,
                                 duration, chan->hw_value,
                                 WILC_WFI_RemainOnChannelExpired,
                                 WILC_WFI_RemainOnChannelReady, (void *)priv);
-
-        return s32Error;
 }
 
 static int cancel_remain_on_channel(struct wiphy *wiphy,
                                     struct wireless_dev *wdev,
                                     u64 cookie)
 {
-        s32 s32Error = 0;
         struct wilc_priv *priv;
         struct wilc_vif *vif;
 
         priv = wiphy_priv(wiphy);
         vif = netdev_priv(priv->dev);
 
-        s32Error = wilc_listen_state_expired(vif, priv->strRemainOnChanParams.u32ListenSessionID);
-        return s32Error;
+        return wilc_listen_state_expired(vif,
+                        priv->strRemainOnChanParams.u32ListenSessionID);
 }
 
 static int mgmt_tx(struct wiphy *wiphy,
@@ -1935,12 +1928,10 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev,
         wilc_wlan_set_bssid(dev, wl->vif[vif->idx]->src_addr, AP_MODE);
         wilc_set_power_mgmt(vif, 0, 0);
 
-        s32Error = wilc_add_beacon(vif, settings->beacon_interval,
+        return wilc_add_beacon(vif, settings->beacon_interval,
                                    settings->dtim_period, beacon->head_len,
                                    (u8 *)beacon->head, beacon->tail_len,
                                    (u8 *)beacon->tail);
-
-        return s32Error;
 }
 
 static int change_beacon(struct wiphy *wiphy, struct net_device *dev,
@@ -1948,16 +1939,13 @@ static int change_beacon(struct wiphy *wiphy, struct net_device *dev,
 {
         struct wilc_priv *priv;
         struct wilc_vif *vif;
-        s32 s32Error = 0;
 
         priv = wiphy_priv(wiphy);
         vif = netdev_priv(priv->dev);
 
-        s32Error = wilc_add_beacon(vif, 0, 0, beacon->head_len,
+        return wilc_add_beacon(vif, 0, 0, beacon->head_len,
                                    (u8 *)beacon->head, beacon->tail_len,
                                    (u8 *)beacon->tail);
-
-        return s32Error;
 }
 
 static int stop_ap(struct wiphy *wiphy, struct net_device *dev)
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index ec6b1674cf38..d431673bc46c 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -225,7 +225,6 @@ int wilc1000_wlan_init(struct net_device *dev, struct wilc_vif *vif);
 
 void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset);
 void wilc_mac_indicate(struct wilc *wilc, int flag);
-int wilc_lock_timeout(struct wilc *wilc, void *, u32 timeout);
 void wilc_netdev_cleanup(struct wilc *wilc);
 int wilc_netdev_init(struct wilc **wilc, struct device *, int io_type, int gpio,
                      const struct wilc_hif_func *ops);
diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index de6c4ddbf45a..11365efcc5d0 100644
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -248,9 +248,6 @@ struct wilc_hif_func {
         void (*disable_interrupt)(struct wilc *nic);
 };
 
-extern const struct wilc_hif_func wilc_hif_spi;
-extern const struct wilc_hif_func wilc_hif_sdio;
-
 /********************************************
  *
  *      Configuration Structure
@@ -297,9 +294,6 @@ void wilc_enable_tcp_ack_filter(bool value);
 int wilc_wlan_get_num_conn_ifcs(struct wilc *);
 int wilc_mac_xmit(struct sk_buff *skb, struct net_device *dev);
 
-int wilc_mac_open(struct net_device *ndev);
-int wilc_mac_close(struct net_device *ndev);
-
 void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size);
 void host_wakeup_notify(struct wilc *wilc);
 void host_sleep_notify(struct wilc *wilc);
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index 182b2d564627..aa0e5a3d4a89 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -323,7 +323,7 @@ static int prism2_scan(struct wiphy *wiphy,
 
         priv->scan_request = request;
 
-        memset(&msg1, 0x00, sizeof(struct p80211msg_dot11req_scan));
+        memset(&msg1, 0x00, sizeof(msg1));
         msg1.msgcode = DIDmsg_dot11req_scan;
         msg1.bsstype.data = P80211ENUM_bsstype_any;
 
@@ -375,13 +375,13 @@ static int prism2_scan(struct wiphy *wiphy,
                 ie_buf[0] = WLAN_EID_SSID;
                 ie_buf[1] = msg2.ssid.data.len;
                 ie_len = ie_buf[1] + 2;
-                memcpy(&ie_buf[2], &(msg2.ssid.data.data), msg2.ssid.data.len);
+                memcpy(&ie_buf[2], &msg2.ssid.data.data, msg2.ssid.data.len);
                 freq = ieee80211_channel_to_frequency(msg2.dschannel.data,
                                                       NL80211_BAND_2GHZ);
                 bss = cfg80211_inform_bss(wiphy,
                         ieee80211_get_channel(wiphy, freq),
                         CFG80211_BSS_FTYPE_UNKNOWN,
-                        (const u8 *)&(msg2.bssid.data.data),
+                        (const u8 *)&msg2.bssid.data.data,
                         msg2.timestamp.data, msg2.capinfo.data,
                         msg2.beaconperiod.data,
                         ie_buf,
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h
index 43c299c3b631..60caf9c37727 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -137,21 +137,11 @@
 #define         HFA384x_DLSTATE_FLASHENABLED            2
 
 /*--- Register Field Masks --------------------------*/
-#define         HFA384x_CMD_AINFO               ((u16)(BIT(14) | BIT(13) \
-                                                        | BIT(12) | BIT(11) \
-                                                        | BIT(10) | BIT(9) \
-                                                        | BIT(8)))
-#define         HFA384x_CMD_MACPORT             ((u16)(BIT(10) | BIT(9) | \
-                                                        BIT(8)))
-#define         HFA384x_CMD_PROGMODE            ((u16)(BIT(9) | BIT(8)))
-#define         HFA384x_CMD_CMDCODE             ((u16)(BIT(5) | BIT(4) | \
-                                                        BIT(3) | BIT(2) | \
-                                                        BIT(1) | BIT(0)))
-
-#define         HFA384x_STATUS_RESULT           ((u16)(BIT(14) | BIT(13) \
-                                                        | BIT(12) | BIT(11) \
-                                                        | BIT(10) | BIT(9) \
-                                                        | BIT(8)))
+#define         HFA384x_CMD_AINFO               ((u16)GENMASK(14, 8))
+#define         HFA384x_CMD_MACPORT             ((u16)GENMASK(10, 8))
+#define         HFA384x_CMD_PROGMODE            ((u16)GENMASK(9, 8))
+#define         HFA384x_CMD_CMDCODE             ((u16)GENMASK(5, 0))
+#define         HFA384x_STATUS_RESULT           ((u16)GENMASK(14, 8))
 
 /*--- Command Code Constants --------------------------*/
 /*--- Controller Commands --------------------------*/
@@ -266,7 +256,7 @@
 #define         HFA384x_RID_DBMCOMMSQUALITY_LEN  \
         ((u16)sizeof(struct hfa384x_dbmcommsquality))
 #define         HFA384x_RID_JOINREQUEST_LEN \
-        ((u16)sizeof(struct hfa384x_JoinRequest_data))
+        ((u16)sizeof(struct hfa384x_join_request_data))
 
 /*--------------------------------------------------------------------
  * Information RIDs:  Modem Information
@@ -286,7 +276,7 @@
 #define         HFA384x_RID_CNFWEPFLAGS         ((u16)0xFC28)
 #define         HFA384x_RID_CNFAUTHENTICATION   ((u16)0xFC2A)
 #define         HFA384x_RID_CNFROAMINGMODE      ((u16)0xFC2D)
-#define         HFA384x_RID_CNFAPBCNint         ((u16)0xFC33)
+#define         HFA384x_RID_CNFAPBCNINT         ((u16)0xFC33)
 #define         HFA384x_RID_CNFDBMADJUST        ((u16)0xFC46)
 #define         HFA384x_RID_CNFWPADATA          ((u16)0xFC48)
 #define         HFA384x_RID_CNFBASICRATES       ((u16)0xFCB3)
@@ -408,27 +398,27 @@ struct hfa384x_caplevel {
 #define HFA384x_CREATEIBSS_JOINCREATEIBSS          0
 
 /*-- Configuration Record: HostScanRequest (data portion only) --*/
-struct hfa384x_HostScanRequest_data {
-        u16 channelList;
-        u16 txRate;
+struct hfa384x_host_scan_request_data {
+        u16 channel_list;
+        u16 tx_rate;
         struct hfa384x_bytestr32 ssid;
 } __packed;
 
 /*-- Configuration Record: JoinRequest (data portion only) --*/
-struct hfa384x_JoinRequest_data {
+struct hfa384x_join_request_data {
         u8 bssid[WLAN_BSSID_LEN];
         u16 channel;
 } __packed;
 
 /*-- Configuration Record: authenticateStation (data portion only) --*/
-struct hfa384x_authenticateStation_data {
+struct hfa384x_authenticate_station_data {
         u8 address[ETH_ALEN];
         u16 status;
         u16 algorithm;
 } __packed;
 
 /*-- Configuration Record: WPAData       (data portion only) --*/
-struct hfa384x_WPAData {
+struct hfa384x_wpa_data {
         u16 datalen;
         u8 data[0];             /* max 80 */
 } __packed;
@@ -455,16 +445,16 @@ struct hfa384x_downloadbuffer {
 
 /*-- Information Record: commsquality --*/
 struct hfa384x_commsquality {
-        u16 CQ_currBSS;
-        u16 ASL_currBSS;
-        u16 ANL_currFC;
+        u16 cq_curr_bss;
+        u16 asl_curr_bss;
+        u16 anl_curr_fc;
 } __packed;
 
 /*-- Information Record: dmbcommsquality --*/
 struct hfa384x_dbmcommsquality {
-        u16 CQdbm_currBSS;
-        u16 ASLdbm_currBSS;
-        u16 ANLdbm_currFC;
+        u16 cq_dbm_curr_bss;
+        u16 asl_dbm_curr_bss;
+        u16 anl_dbm_curr_fc;
 } __packed;
 
 /*--------------------------------------------------------------------
@@ -511,9 +501,8 @@ struct hfa384x_tx_frame {
 #define         HFA384x_TXSTATUS_AGEDERR                ((u16)BIT(1))
 #define         HFA384x_TXSTATUS_RETRYERR               ((u16)BIT(0))
 /*-- Transmit Control Field --*/
-#define         HFA384x_TX_MACPORT                      ((u16)(BIT(10) | \
-                                                          BIT(9) | BIT(8)))
-#define         HFA384x_TX_STRUCTYPE                    ((u16)(BIT(4) | BIT(3)))
+#define         HFA384x_TX_MACPORT                      ((u16)GENMASK(10, 8))
+#define         HFA384x_TX_STRUCTYPE                    ((u16)GENMASK(4, 3))
 #define         HFA384x_TX_TXEX                         ((u16)BIT(2))
 #define         HFA384x_TX_TXOK                         ((u16)BIT(1))
 /*--------------------------------------------------------------------
@@ -571,9 +560,7 @@ struct hfa384x_rx_frame {
  */
 
 /*-- Status Fields --*/
-#define         HFA384x_RXSTATUS_MACPORT                ((u16)(BIT(10) | \
-                                                                BIT(9) | \
-                                                                BIT(8)))
+#define         HFA384x_RXSTATUS_MACPORT                ((u16)GENMASK(10, 8))
 #define         HFA384x_RXSTATUS_FCSERR                 ((u16)BIT(0))
 /*--------------------------------------------------------------------
  * Communication Frames: Test/Get/Set Field Values for Receive Frames
@@ -610,7 +597,7 @@ struct hfa384x_rx_frame {
  */
 
 /*--  Inquiry Frame, Diagnose: Communication Tallies --*/
-struct hfa384x_CommTallies16 {
+struct hfa384x_comm_tallies_16 {
         u16 txunicastframes;
         u16 txmulticastframes;
         u16 txfragments;
@@ -634,7 +621,7 @@ struct hfa384x_CommTallies16 {
         u16 rxmsginbadmsgfrag;
 } __packed;
 
-struct hfa384x_CommTallies32 {
+struct hfa384x_comm_tallies_32 {
         u32 txunicastframes;
         u32 txmulticastframes;
         u32 txfragments;
@@ -659,7 +646,7 @@ struct hfa384x_CommTallies32 {
 } __packed;
 
 /*--  Inquiry Frame, Diagnose: Scan Results & Subfields--*/
-struct hfa384x_ScanResultSub {
+struct hfa384x_scan_result_sub {
         u16 chid;
         u16 anl;
         u16 sl;
@@ -671,14 +658,14 @@ struct hfa384x_ScanResultSub {
         u16 proberesp_rate;
 } __packed;
 
-struct hfa384x_ScanResult {
+struct hfa384x_scan_result {
         u16 rsvd;
         u16 scanreason;
-        struct hfa384x_ScanResultSub result[HFA384x_SCANRESULT_MAX];
+        struct hfa384x_scan_result_sub result[HFA384x_SCANRESULT_MAX];
 } __packed;
 
 /*--  Inquiry Frame, Diagnose: ChInfo Results & Subfields--*/
-struct hfa384x_ChInfoResultSub {
+struct hfa384x_ch_info_result_sub {
         u16 chid;
         u16 anl;
         u16 pnl;
@@ -688,13 +675,13 @@ struct hfa384x_ChInfoResultSub {
 #define HFA384x_CHINFORESULT_BSSACTIVE  BIT(0)
 #define HFA384x_CHINFORESULT_PCFACTIVE  BIT(1)
 
-struct hfa384x_ChInfoResult {
+struct hfa384x_ch_info_result {
         u16 scanchannels;
-        struct hfa384x_ChInfoResultSub result[HFA384x_CHINFORESULT_MAX];
+        struct hfa384x_ch_info_result_sub result[HFA384x_CHINFORESULT_MAX];
 } __packed;
 
 /*--  Inquiry Frame, Diagnose: Host Scan Results & Subfields--*/
-struct hfa384x_HScanResultSub {
+struct hfa384x_hscan_result_sub {
         u16 chid;
         u16 anl;
         u16 sl;
@@ -707,10 +694,10 @@ struct hfa384x_HScanResultSub {
         u16 atim;
 } __packed;
 
-struct hfa384x_HScanResult {
+struct hfa384x_hscan_result {
         u16 nresult;
         u16 rsvd;
-        struct hfa384x_HScanResultSub result[HFA384x_HSCANRESULT_MAX];
+        struct hfa384x_hscan_result_sub result[HFA384x_HSCANRESULT_MAX];
 } __packed;
 
 /*--  Unsolicited Frame, MAC Mgmt: LinkStatus --*/
@@ -723,7 +710,7 @@ struct hfa384x_HScanResult {
 #define HFA384x_LINK_AP_INRANGE         ((u16)5)
 #define HFA384x_LINK_ASSOCFAIL          ((u16)6)
 
-struct hfa384x_LinkStatus {
+struct hfa384x_link_status {
         u16 linkstatus;
 } __packed;
 
@@ -733,7 +720,7 @@ struct hfa384x_LinkStatus {
 #define HFA384x_ASSOCSTATUS_REASSOC     ((u16)2)
 #define HFA384x_ASSOCSTATUS_AUTHFAIL    ((u16)5)
 
-struct hfa384x_AssocStatus {
+struct hfa384x_assoc_status {
         u16 assocstatus;
         u8 sta_addr[ETH_ALEN];
         /* old_ap_addr is only valid if assocstatus == 2 */
@@ -744,37 +731,37 @@ struct hfa384x_AssocStatus {
 
 /*--  Unsolicited Frame, MAC Mgmt: AuthRequest (AP Only) --*/
 
-struct hfa384x_AuthRequest {
+struct hfa384x_auth_request {
         u8 sta_addr[ETH_ALEN];
         u16 algorithm;
 } __packed;
 
 /*--  Unsolicited Frame, MAC Mgmt: PSUserCount (AP Only) --*/
 
-struct hfa384x_PSUserCount {
+struct hfa384x_ps_user_count {
         u16 usercnt;
 } __packed;
 
-struct hfa384x_KeyIDChanged {
+struct hfa384x_key_id_changed {
         u8 sta_addr[ETH_ALEN];
         u16 keyid;
 } __packed;
 
 /*--  Collection of all Inf frames ---------------*/
 union hfa384x_infodata {
-        struct hfa384x_CommTallies16 commtallies16;
-        struct hfa384x_CommTallies32 commtallies32;
-        struct hfa384x_ScanResult scanresult;
-        struct hfa384x_ChInfoResult chinforesult;
-        struct hfa384x_HScanResult hscanresult;
-        struct hfa384x_LinkStatus linkstatus;
-        struct hfa384x_AssocStatus assocstatus;
-        struct hfa384x_AuthRequest authreq;
-        struct hfa384x_PSUserCount psusercnt;
-        struct hfa384x_KeyIDChanged keyidchanged;
-} __packed;
-
-struct hfa384x_InfFrame {
+        struct hfa384x_comm_tallies_16 commtallies16;
+        struct hfa384x_comm_tallies_32 commtallies32;
+        struct hfa384x_scan_result scanresult;
+        struct hfa384x_ch_info_result chinforesult;
+        struct hfa384x_hscan_result hscanresult;
+        struct hfa384x_link_status linkstatus;
+        struct hfa384x_assoc_status assocstatus;
+        struct hfa384x_auth_request authreq;
+        struct hfa384x_ps_user_count psusercnt;
+        struct hfa384x_key_id_changed keyidchanged;
+} __packed;
+
+struct hfa384x_inf_frame {
         u16 framelen;
         u16 infotype;
         union hfa384x_infodata info;
@@ -862,7 +849,7 @@ struct hfa384x_usb_rxfrm {
 
 struct hfa384x_usb_infofrm {
         u16 type;
-        struct hfa384x_InfFrame info;
+        struct hfa384x_inf_frame info;
 } __packed;
 
 struct hfa384x_usb_statusresp {
@@ -1169,7 +1156,6 @@ enum ctlx_state {
         CTLX_REQ_COMPLETE,      /* OUT URB complete */
         CTLX_RESP_COMPLETE      /* IN URB received */
 };
-typedef enum ctlx_state CTLX_STATE;
 
 struct hfa384x_usbctlx;
 struct hfa384x;
@@ -1186,7 +1172,7 @@ struct hfa384x_usbctlx {
         union hfa384x_usbout outbuf;    /* pkt buf for OUT */
         union hfa384x_usbin inbuf;      /* pkt buf for IN(a copy) */
 
-        CTLX_STATE state;       /* Tracks running state */
+        enum ctlx_state state;  /* Tracks running state */
 
         struct completion done;
         volatile int reapable;  /* Food for the reaper task */
@@ -1294,7 +1280,7 @@ struct hfa384x {
         int scanflag;           /* to signal scan complete */
         int join_ap;            /* are we joined to a specific ap */
         int join_retries;       /* number of join retries till we fail */
-        struct hfa384x_JoinRequest_data joinreq;        /* join request saved data */
+        struct hfa384x_join_request_data joinreq;/* join request saved data */
 
         struct wlandevice *wlandev;
         /* Timer to allow for the deferred processing of linkstatus messages */
@@ -1360,17 +1346,17 @@ struct hfa384x {
         struct hfa384x_caplevel cap_act_ap_mfi; /* ap f/w to modem interface */
 
         u32 psusercount;        /* Power save user count. */
-        struct hfa384x_CommTallies32 tallies;   /* Communication tallies. */
+        struct hfa384x_comm_tallies_32 tallies; /* Communication tallies. */
         u8 comment[WLAN_COMMENT_MAX + 1];       /* User comment */
 
         /* Channel Info request results (AP only) */
         struct {
                 atomic_t done;
                 u8 count;
-                struct hfa384x_ChInfoResult results;
+                struct hfa384x_ch_info_result results;
         } channel_info;
 
-        struct hfa384x_InfFrame *scanresults;
+        struct hfa384x_inf_frame *scanresults;
 
         struct prism2sta_authlist authlist;     /* Authenticated station list. */
         unsigned int accessmode;                /* Access mode. */
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 6a107f8a06e2..4fe037aeef12 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -1,114 +1,114 @@
 /* src/prism2/driver/hfa384x_usb.c
-*
-* Functions that talk to the USB variantof the Intersil hfa384x MAC
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-* This file implements functions that correspond to the prism2/hfa384x
-* 802.11 MAC hardware and firmware host interface.
-*
-* The functions can be considered to represent several levels of
-* abstraction.  The lowest level functions are simply C-callable wrappers
-* around the register accesses.  The next higher level represents C-callable
-* prism2 API functions that match the Intersil documentation as closely
-* as is reasonable.  The next higher layer implements common sequences
-* of invocations of the API layer (e.g. write to bap, followed by cmd).
-*
-* Common sequences:
-* hfa384x_drvr_xxx      Highest level abstractions provided by the
-*                       hfa384x code.  They are driver defined wrappers
-*                       for common sequences.  These functions generally
-*                       use the services of the lower levels.
-*
-* hfa384x_drvr_xxxconfig  An example of the drvr level abstraction. These
-*                       functions are wrappers for the RID get/set
-*                       sequence. They call copy_[to|from]_bap() and
-*                       cmd_access(). These functions operate on the
-*                       RIDs and buffers without validation. The caller
-*                       is responsible for that.
-*
-* API wrapper functions:
-* hfa384x_cmd_xxx       functions that provide access to the f/w commands.
-*                       The function arguments correspond to each command
-*                       argument, even command arguments that get packed
-*                       into single registers.  These functions _just_
-*                       issue the command by setting the cmd/parm regs
-*                       & reading the status/resp regs.  Additional
-*                       activities required to fully use a command
-*                       (read/write from/to bap, get/set int status etc.)
-*                       are implemented separately.  Think of these as
-*                       C-callable prism2 commands.
-*
-* Lowest Layer Functions:
-* hfa384x_docmd_xxx     These functions implement the sequence required
-*                       to issue any prism2 command.  Primarily used by the
-*                       hfa384x_cmd_xxx functions.
-*
-* hfa384x_bap_xxx       BAP read/write access functions.
-*                       Note: we usually use BAP0 for non-interrupt context
-*                        and BAP1 for interrupt context.
-*
-* hfa384x_dl_xxx        download related functions.
-*
-* Driver State Issues:
-* Note that there are two pairs of functions that manage the
-* 'initialized' and 'running' states of the hw/MAC combo.  The four
-* functions are create(), destroy(), start(), and stop().  create()
-* sets up the data structures required to support the hfa384x_*
-* functions and destroy() cleans them up.  The start() function gets
-* the actual hardware running and enables the interrupts.  The stop()
-* function shuts the hardware down.  The sequence should be:
-* create()
-* start()
-*  .
-*  .  Do interesting things w/ the hardware
-*  .
-* stop()
-* destroy()
-*
-* Note that destroy() can be called without calling stop() first.
-* --------------------------------------------------------------------
-*/
+ *
+ * Functions that talk to the USB variantof the Intersil hfa384x MAC
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ * This file implements functions that correspond to the prism2/hfa384x
+ * 802.11 MAC hardware and firmware host interface.
+ *
+ * The functions can be considered to represent several levels of
+ * abstraction.  The lowest level functions are simply C-callable wrappers
+ * around the register accesses.  The next higher level represents C-callable
+ * prism2 API functions that match the Intersil documentation as closely
+ * as is reasonable.  The next higher layer implements common sequences
+ * of invocations of the API layer (e.g. write to bap, followed by cmd).
+ *
+ * Common sequences:
+ * hfa384x_drvr_xxx     Highest level abstractions provided by the
+ *                      hfa384x code.  They are driver defined wrappers
+ *                      for common sequences.  These functions generally
+ *                      use the services of the lower levels.
+ *
+ * hfa384x_drvr_xxxconfig  An example of the drvr level abstraction. These
+ *                      functions are wrappers for the RID get/set
+ *                      sequence. They call copy_[to|from]_bap() and
+ *                      cmd_access(). These functions operate on the
+ *                      RIDs and buffers without validation. The caller
+ *                      is responsible for that.
+ *
+ * API wrapper functions:
+ * hfa384x_cmd_xxx      functions that provide access to the f/w commands.
+ *                      The function arguments correspond to each command
+ *                      argument, even command arguments that get packed
+ *                      into single registers.  These functions _just_
+ *                      issue the command by setting the cmd/parm regs
+ *                      & reading the status/resp regs.  Additional
+ *                      activities required to fully use a command
+ *                      (read/write from/to bap, get/set int status etc.)
+ *                      are implemented separately.  Think of these as
+ *                      C-callable prism2 commands.
+ *
+ * Lowest Layer Functions:
+ * hfa384x_docmd_xxx    These functions implement the sequence required
+ *                      to issue any prism2 command.  Primarily used by the
+ *                      hfa384x_cmd_xxx functions.
+ *
+ * hfa384x_bap_xxx      BAP read/write access functions.
+ *                      Note: we usually use BAP0 for non-interrupt context
+ *                       and BAP1 for interrupt context.
+ *
+ * hfa384x_dl_xxx       download related functions.
+ *
+ * Driver State Issues:
+ * Note that there are two pairs of functions that manage the
+ * 'initialized' and 'running' states of the hw/MAC combo.  The four
+ * functions are create(), destroy(), start(), and stop().  create()
+ * sets up the data structures required to support the hfa384x_*
+ * functions and destroy() cleans them up.  The start() function gets
+ * the actual hardware running and enables the interrupts.  The stop()
+ * function shuts the hardware down.  The sequence should be:
+ * create()
+ * start()
+ *  .
+ *  .  Do interesting things w/ the hardware
+ *  .
+ * stop()
+ * destroy()
+ *
+ * Note that destroy() can be called without calling stop() first.
+ * --------------------------------------------------------------------
+ */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -153,8 +153,8 @@ enum cmd_mode {
 static void dbprint_urb(struct urb *urb);
 #endif
 
-static void
-hfa384x_int_rxmonitor(struct wlandevice *wlandev, struct hfa384x_usb_rxfrm *rxfrm);
+static void hfa384x_int_rxmonitor(struct wlandevice *wlandev,
+                                  struct hfa384x_usb_rxfrm *rxfrm);
 
 static void hfa384x_usb_defer(struct work_struct *data);
 
@@ -173,7 +173,8 @@ hfa384x_usbin_txcompl(struct wlandevice *wlandev, union hfa384x_usbin *usbin);
 
 static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb);
 
-static void hfa384x_usbin_info(struct wlandevice *wlandev, union hfa384x_usbin *usbin);
+static void hfa384x_usbin_info(struct wlandevice *wlandev,
+                               union hfa384x_usbin *usbin);
 
 static void hfa384x_usbin_ctlx(struct hfa384x *hw, union hfa384x_usbin *usbin,
                                int urb_status);
@@ -193,9 +194,11 @@ static void hfa384x_usbctlx_completion_task(unsigned long data);
 
 static void hfa384x_usbctlx_reaper_task(unsigned long data);
 
-static int hfa384x_usbctlx_submit(struct hfa384x *hw, struct hfa384x_usbctlx *ctlx);
+static int hfa384x_usbctlx_submit(struct hfa384x *hw,
+                                  struct hfa384x_usbctlx *ctlx);
 
-static void unlocked_usbctlx_complete(struct hfa384x *hw, struct hfa384x_usbctlx *ctlx);
+static void unlocked_usbctlx_complete(struct hfa384x *hw,
+                                      struct hfa384x_usbctlx *ctlx);
 
 struct usbctlx_completor {
         int (*complete)(struct usbctlx_completor *);
@@ -209,7 +212,8 @@ hfa384x_usbctlx_complete_sync(struct hfa384x *hw,
 static int
 unlocked_usbctlx_cancel_async(struct hfa384x *hw, struct hfa384x_usbctlx *ctlx);
 
-static void hfa384x_cb_status(struct hfa384x *hw, const struct hfa384x_usbctlx *ctlx);
+static void hfa384x_cb_status(struct hfa384x *hw,
+                              const struct hfa384x_usbctlx *ctlx);
 
 static int
 usbctlx_get_status(const struct hfa384x_usb_statusresp *cmdresp,
@@ -263,7 +267,7 @@ hfa384x_dowmem(struct hfa384x *hw,
 
 static int hfa384x_isgood_pdrcode(u16 pdrcode);
 
-static inline const char *ctlxstr(CTLX_STATE s)
+static inline const char *ctlxstr(enum ctlx_state s)
 {
         static const char * const ctlx_str[] = {
                 "Initial state",
@@ -307,21 +311,22 @@ void dbprint_urb(struct urb *urb)
 #endif
 
 /*----------------------------------------------------------------
-* submit_rx_urb
-*
-* Listen for input data on the BULK-IN pipe. If the pipe has
-* stalled then schedule it to be reset.
-*
-* Arguments:
-*       hw              device struct
-*       memflags        memory allocation flags
-*
-* Returns:
-*       error code from submission
-*
-* Call context:
-*       Any
-----------------------------------------------------------------*/
+ * submit_rx_urb
+ *
+ * Listen for input data on the BULK-IN pipe. If the pipe has
+ * stalled then schedule it to be reset.
+ *
+ * Arguments:
+ *      hw              device struct
+ *      memflags        memory allocation flags
+ *
+ * Returns:
+ *      error code from submission
+ *
+ * Call context:
+ *      Any
+ *----------------------------------------------------------------
+ */
 static int submit_rx_urb(struct hfa384x *hw, gfp_t memflags)
 {
         struct sk_buff *skb;
@@ -367,23 +372,24 @@ done:
 }
 
 /*----------------------------------------------------------------
-* submit_tx_urb
-*
-* Prepares and submits the URB of transmitted data. If the
-* submission fails then it will schedule the output pipe to
-* be reset.
-*
-* Arguments:
-*       hw              device struct
-*       tx_urb          URB of data for transmission
-*       memflags        memory allocation flags
-*
-* Returns:
-*       error code from submission
-*
-* Call context:
-*       Any
-----------------------------------------------------------------*/
+ * submit_tx_urb
+ *
+ * Prepares and submits the URB of transmitted data. If the
+ * submission fails then it will schedule the output pipe to
+ * be reset.
+ *
+ * Arguments:
+ *      hw              device struct
+ *      tx_urb          URB of data for transmission
+ *      memflags        memory allocation flags
+ *
+ * Returns:
+ *      error code from submission
+ *
+ * Call context:
+ *      Any
+ *----------------------------------------------------------------
+ */
 static int submit_tx_urb(struct hfa384x *hw, struct urb *tx_urb, gfp_t memflags)
 {
         struct net_device *netdev = hw->wlandev->netdev;
@@ -412,21 +418,22 @@ static int submit_tx_urb(struct hfa384x *hw, struct urb *tx_urb, gfp_t memflags)
 }
 
 /*----------------------------------------------------------------
-* hfa394x_usb_defer
-*
-* There are some things that the USB stack cannot do while
-* in interrupt context, so we arrange this function to run
-* in process context.
-*
-* Arguments:
-*       hw      device structure
-*
-* Returns:
-*       nothing
-*
-* Call context:
-*       process (by design)
-----------------------------------------------------------------*/
+ * hfa394x_usb_defer
+ *
+ * There are some things that the USB stack cannot do while
+ * in interrupt context, so we arrange this function to run
+ * in process context.
+ *
+ * Arguments:
+ *      hw      device structure
+ *
+ * Returns:
+ *      nothing
+ *
+ * Call context:
+ *      process (by design)
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usb_defer(struct work_struct *data)
 {
         struct hfa384x *hw = container_of(data, struct hfa384x, usb_work);
@@ -501,29 +508,30 @@ static void hfa384x_usb_defer(struct work_struct *data)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_create
-*
-* Sets up the struct hfa384x data structure for use.  Note this
-* does _not_ initialize the actual hardware, just the data structures
-* we use to keep track of its state.
-*
-* Arguments:
-*       hw              device structure
-*       irq             device irq number
-*       iobase          i/o base address for register access
-*       membase         memory base address for register access
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_create
+ *
+ * Sets up the struct hfa384x data structure for use.  Note this
+ * does _not_ initialize the actual hardware, just the data structures
+ * we use to keep track of its state.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      irq             device irq number
+ *      iobase          i/o base address for register access
+ *      membase         memory base address for register access
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 void hfa384x_create(struct hfa384x *hw, struct usb_device *usb)
 {
-        memset(hw, 0, sizeof(struct hfa384x));
+        memset(hw, 0, sizeof(*hw));
         hw->usb = usb;
 
         /* set up the endpoints */
@@ -571,27 +579,28 @@ void hfa384x_create(struct hfa384x *hw, struct usb_device *usb)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_destroy
-*
-* Partner to hfa384x_create().  This function cleans up the hw
-* structure so that it can be freed by the caller using a simple
-* kfree.  Currently, this function is just a placeholder.  If, at some
-* point in the future, an hw in the 'shutdown' state requires a 'deep'
-* kfree, this is where it should be done.  Note that if this function
-* is called on a _running_ hw structure, the drvr_stop() function is
-* called.
-*
-* Arguments:
-*       hw              device structure
-*
-* Returns:
-*       nothing, this function is not allowed to fail.
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_destroy
+ *
+ * Partner to hfa384x_create().  This function cleans up the hw
+ * structure so that it can be freed by the caller using a simple
+ * kfree.  Currently, this function is just a placeholder.  If, at some
+ * point in the future, an hw in the 'shutdown' state requires a 'deep'
+ * kfree, this is where it should be done.  Note that if this function
+ * is called on a _running_ hw structure, the drvr_stop() function is
+ * called.
+ *
+ * Arguments:
+ *      hw              device structure
+ *
+ * Returns:
+ *      nothing, this function is not allowed to fail.
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 void hfa384x_destroy(struct hfa384x *hw)
 {
         struct sk_buff *skb;
@@ -645,10 +654,11 @@ usbctlx_get_rridresult(const struct hfa384x_usb_rridresp *rridresp,
 }
 
 /*----------------------------------------------------------------
-* Completor object:
-* This completor must be passed to hfa384x_usbctlx_complete_sync()
-* when processing a CTLX that returns a struct hfa384x_cmdresult structure.
-----------------------------------------------------------------*/
+ * Completor object:
+ * This completor must be passed to hfa384x_usbctlx_complete_sync()
+ * when processing a CTLX that returns a struct hfa384x_cmdresult structure.
+ *----------------------------------------------------------------
+ */
 struct usbctlx_cmd_completor {
         struct usbctlx_completor head;
 
@@ -664,24 +674,23 @@ static inline int usbctlx_cmd_completor_fn(struct usbctlx_completor *head)
         return usbctlx_get_status(complete->cmdresp, complete->result);
 }
 
-static inline struct usbctlx_completor *init_cmd_completor(
-                                                struct usbctlx_cmd_completor
-                                                        *completor,
-                                                const struct hfa384x_usb_statusresp
-                                                        *cmdresp,
-                                                struct hfa384x_cmdresult *result)
+static inline struct usbctlx_completor *
+init_cmd_completor(struct usbctlx_cmd_completor *completor,
+                   const struct hfa384x_usb_statusresp *cmdresp,
+                   struct hfa384x_cmdresult *result)
 {
         completor->head.complete = usbctlx_cmd_completor_fn;
         completor->cmdresp = cmdresp;
         completor->result = result;
-        return &(completor->head);
+        return &completor->head;
 }
 
 /*----------------------------------------------------------------
-* Completor object:
-* This completor must be passed to hfa384x_usbctlx_complete_sync()
-* when processing a CTLX that reads a RID.
-----------------------------------------------------------------*/
+ * Completor object:
+ * This completor must be passed to hfa384x_usbctlx_complete_sync()
+ * when processing a CTLX that reads a RID.
+ *----------------------------------------------------------------
+ */
 struct usbctlx_rrid_completor {
         struct usbctlx_completor head;
 
@@ -710,37 +719,38 @@ static int usbctlx_rrid_completor_fn(struct usbctlx_completor *head)
         return 0;
 }
 
-static inline struct usbctlx_completor *init_rrid_completor(
-                                                struct usbctlx_rrid_completor
-                                                        *completor,
-                                                const struct hfa384x_usb_rridresp
-                                                        *rridresp,
-                                                void *riddata,
-                                                unsigned int riddatalen)
+static inline struct usbctlx_completor *
+init_rrid_completor(struct usbctlx_rrid_completor *completor,
+                    const struct hfa384x_usb_rridresp *rridresp,
+                    void *riddata,
+                    unsigned int riddatalen)
 {
         completor->head.complete = usbctlx_rrid_completor_fn;
         completor->rridresp = rridresp;
         completor->riddata = riddata;
         completor->riddatalen = riddatalen;
-        return &(completor->head);
+        return &completor->head;
 }
 
 /*----------------------------------------------------------------
-* Completor object:
-* Interprets the results of a synchronous RID-write
-----------------------------------------------------------------*/
+ * Completor object:
+ * Interprets the results of a synchronous RID-write
+ *----------------------------------------------------------------
+ */
 #define init_wrid_completor  init_cmd_completor
 
 /*----------------------------------------------------------------
-* Completor object:
-* Interprets the results of a synchronous memory-write
-----------------------------------------------------------------*/
+ * Completor object:
+ * Interprets the results of a synchronous memory-write
+ *----------------------------------------------------------------
+ */
 #define init_wmem_completor  init_cmd_completor
 
 /*----------------------------------------------------------------
-* Completor object:
-* Interprets the results of a synchronous memory-read
-----------------------------------------------------------------*/
+ * Completor object:
+ * Interprets the results of a synchronous memory-read
+ *----------------------------------------------------------------
+ */
 struct usbctlx_rmem_completor {
         struct usbctlx_completor head;
 
@@ -759,43 +769,43 @@ static int usbctlx_rmem_completor_fn(struct usbctlx_completor *head)
         return 0;
 }
 
-static inline struct usbctlx_completor *init_rmem_completor(
-                                                struct usbctlx_rmem_completor
-                                                        *completor,
-                                                struct hfa384x_usb_rmemresp
-                                                        *rmemresp,
-                                                void *data,
-                                                unsigned int len)
+static inline struct usbctlx_completor *
+init_rmem_completor(struct usbctlx_rmem_completor *completor,
+                    struct hfa384x_usb_rmemresp *rmemresp,
+                    void *data,
+                    unsigned int len)
 {
         completor->head.complete = usbctlx_rmem_completor_fn;
         completor->rmemresp = rmemresp;
         completor->data = data;
         completor->len = len;
-        return &(completor->head);
+        return &completor->head;
 }
 
 /*----------------------------------------------------------------
-* hfa384x_cb_status
-*
-* Ctlx_complete handler for async CMD type control exchanges.
-* mark the hw struct as such.
-*
-* Note: If the handling is changed here, it should probably be
-*       changed in docmd as well.
-*
-* Arguments:
-*       hw              hw struct
-*       ctlx            completed CTLX
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
-static void hfa384x_cb_status(struct hfa384x *hw, const struct hfa384x_usbctlx *ctlx)
+ * hfa384x_cb_status
+ *
+ * Ctlx_complete handler for async CMD type control exchanges.
+ * mark the hw struct as such.
+ *
+ * Note: If the handling is changed here, it should probably be
+ *       changed in docmd as well.
+ *
+ * Arguments:
+ *      hw              hw struct
+ *      ctlx            completed CTLX
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
+static void hfa384x_cb_status(struct hfa384x *hw,
+                              const struct hfa384x_usbctlx *ctlx)
 {
         if (ctlx->usercb) {
                 struct hfa384x_cmdresult cmdresult;
@@ -812,7 +822,8 @@ static void hfa384x_cb_status(struct hfa384x *hw, const struct hfa384x_usbctlx *
         }
 }
 
-static inline int hfa384x_docmd_wait(struct hfa384x *hw, struct hfa384x_metacmd *cmd)
+static inline int hfa384x_docmd_wait(struct hfa384x *hw,
+                                     struct hfa384x_metacmd *cmd)
 {
         return hfa384x_docmd(hw, DOWAIT, cmd, NULL, NULL, NULL);
 }
@@ -905,24 +916,25 @@ hfa384x_dowmem_async(struct hfa384x *hw,
 }
 
 /*----------------------------------------------------------------
-* hfa384x_cmd_initialize
-*
-* Issues the initialize command and sets the hw->state based
-* on the result.
-*
-* Arguments:
-*       hw              device structure
-*
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_cmd_initialize
+ *
+ * Issues the initialize command and sets the hw->state based
+ * on the result.
+ *
+ * Arguments:
+ *      hw              device structure
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_cmd_initialize(struct hfa384x *hw)
 {
         int result = 0;
@@ -950,25 +962,26 @@ int hfa384x_cmd_initialize(struct hfa384x *hw)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_cmd_disable
-*
-* Issues the disable command to stop communications on one of
-* the MACs 'ports'.
-*
-* Arguments:
-*       hw              device structure
-*       macport         MAC port number (host order)
-*
-* Returns:
-*       0               success
-*       >0              f/w reported failure - f/w status code
-*       <0              driver reported error (timeout|bad arg)
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_cmd_disable
+ *
+ * Issues the disable command to stop communications on one of
+ * the MACs 'ports'.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      macport         MAC port number (host order)
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported failure - f/w status code
+ *      <0              driver reported error (timeout|bad arg)
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_cmd_disable(struct hfa384x *hw, u16 macport)
 {
         struct hfa384x_metacmd cmd;
@@ -983,25 +996,26 @@ int hfa384x_cmd_disable(struct hfa384x *hw, u16 macport)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_cmd_enable
-*
-* Issues the enable command to enable communications on one of
-* the MACs 'ports'.
-*
-* Arguments:
-*       hw              device structure
-*       macport         MAC port number
-*
-* Returns:
-*       0               success
-*       >0              f/w reported failure - f/w status code
-*       <0              driver reported error (timeout|bad arg)
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_cmd_enable
+ *
+ * Issues the enable command to enable communications on one of
+ * the MACs 'ports'.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      macport         MAC port number
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported failure - f/w status code
+ *      <0              driver reported error (timeout|bad arg)
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_cmd_enable(struct hfa384x *hw, u16 macport)
 {
         struct hfa384x_metacmd cmd;
@@ -1016,34 +1030,35 @@ int hfa384x_cmd_enable(struct hfa384x *hw, u16 macport)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_cmd_monitor
-*
-* Enables the 'monitor mode' of the MAC.  Here's the description of
-* monitor mode that I've received thus far:
-*
-*  "The "monitor mode" of operation is that the MAC passes all
-*  frames for which the PLCP checks are correct. All received
-*  MPDUs are passed to the host with MAC Port = 7, with a
-*  receive status of good, FCS error, or undecryptable. Passing
-*  certain MPDUs is a violation of the 802.11 standard, but useful
-*  for a debugging tool."  Normal communication is not possible
-*  while monitor mode is enabled.
-*
-* Arguments:
-*       hw              device structure
-*       enable          a code (0x0b|0x0f) that enables/disables
-*                       monitor mode. (host order)
-*
-* Returns:
-*       0               success
-*       >0              f/w reported failure - f/w status code
-*       <0              driver reported error (timeout|bad arg)
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_cmd_monitor
+ *
+ * Enables the 'monitor mode' of the MAC.  Here's the description of
+ * monitor mode that I've received thus far:
+ *
+ *  "The "monitor mode" of operation is that the MAC passes all
+ *  frames for which the PLCP checks are correct. All received
+ *  MPDUs are passed to the host with MAC Port = 7, with a
+ *  receive status of good, FCS error, or undecryptable. Passing
+ *  certain MPDUs is a violation of the 802.11 standard, but useful
+ *  for a debugging tool."  Normal communication is not possible
+ *  while monitor mode is enabled.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      enable          a code (0x0b|0x0f) that enables/disables
+ *                      monitor mode. (host order)
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported failure - f/w status code
+ *      <0              driver reported error (timeout|bad arg)
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_cmd_monitor(struct hfa384x *hw, u16 enable)
 {
         struct hfa384x_metacmd cmd;
@@ -1058,43 +1073,44 @@ int hfa384x_cmd_monitor(struct hfa384x *hw, u16 enable)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_cmd_download
-*
-* Sets the controls for the MAC controller code/data download
-* process.  The arguments set the mode and address associated
-* with a download.  Note that the aux registers should be enabled
-* prior to setting one of the download enable modes.
-*
-* Arguments:
-*       hw              device structure
-*       mode            0 - Disable programming and begin code exec
-*                       1 - Enable volatile mem programming
-*                       2 - Enable non-volatile mem programming
-*                       3 - Program non-volatile section from NV download
-*                           buffer.
-*                       (host order)
-*       lowaddr
-*       highaddr        For mode 1, sets the high & low order bits of
-*                       the "destination address".  This address will be
-*                       the execution start address when download is
-*                       subsequently disabled.
-*                       For mode 2, sets the high & low order bits of
-*                       the destination in NV ram.
-*                       For modes 0 & 3, should be zero. (host order)
-*                       NOTE: these are CMD format.
-*       codelen         Length of the data to write in mode 2,
-*                       zero otherwise. (host order)
-*
-* Returns:
-*       0               success
-*       >0              f/w reported failure - f/w status code
-*       <0              driver reported error (timeout|bad arg)
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_cmd_download
+ *
+ * Sets the controls for the MAC controller code/data download
+ * process.  The arguments set the mode and address associated
+ * with a download.  Note that the aux registers should be enabled
+ * prior to setting one of the download enable modes.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      mode            0 - Disable programming and begin code exec
+ *                      1 - Enable volatile mem programming
+ *                      2 - Enable non-volatile mem programming
+ *                      3 - Program non-volatile section from NV download
+ *                          buffer.
+ *                      (host order)
+ *      lowaddr
+ *      highaddr        For mode 1, sets the high & low order bits of
+ *                      the "destination address".  This address will be
+ *                      the execution start address when download is
+ *                      subsequently disabled.
+ *                      For mode 2, sets the high & low order bits of
+ *                      the destination in NV ram.
+ *                      For modes 0 & 3, should be zero. (host order)
+ *                      NOTE: these are CMD format.
+ *      codelen         Length of the data to write in mode 2,
+ *                      zero otherwise. (host order)
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported failure - f/w status code
+ *      <0              driver reported error (timeout|bad arg)
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_cmd_download(struct hfa384x *hw, u16 mode, u16 lowaddr,
                          u16 highaddr, u16 codelen)
 {
@@ -1114,29 +1130,31 @@ int hfa384x_cmd_download(struct hfa384x *hw, u16 mode, u16 lowaddr,
 }
 
 /*----------------------------------------------------------------
-* hfa384x_corereset
-*
-* Perform a reset of the hfa38xx MAC core.  We assume that the hw
-* structure is in its "created" state.  That is, it is initialized
-* with proper values.  Note that if a reset is done after the
-* device has been active for awhile, the caller might have to clean
-* up some leftover cruft in the hw structure.
-*
-* Arguments:
-*       hw              device structure
-*       holdtime        how long (in ms) to hold the reset
-*       settletime      how long (in ms) to wait after releasing
-*                       the reset
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
-int hfa384x_corereset(struct hfa384x *hw, int holdtime, int settletime, int genesis)
+ * hfa384x_corereset
+ *
+ * Perform a reset of the hfa38xx MAC core.  We assume that the hw
+ * structure is in its "created" state.  That is, it is initialized
+ * with proper values.  Note that if a reset is done after the
+ * device has been active for awhile, the caller might have to clean
+ * up some leftover cruft in the hw structure.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      holdtime        how long (in ms) to hold the reset
+ *      settletime      how long (in ms) to wait after releasing
+ *                      the reset
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
+int hfa384x_corereset(struct hfa384x *hw, int holdtime,
+                      int settletime, int genesis)
 {
         int result;
 
@@ -1150,29 +1168,30 @@ int hfa384x_corereset(struct hfa384x *hw, int holdtime, int settletime, int gene
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbctlx_complete_sync
-*
-* Waits for a synchronous CTLX object to complete,
-* and then handles the response.
-*
-* Arguments:
-*       hw              device structure
-*       ctlx            CTLX ptr
-*       completor       functor object to decide what to
-*                       do with the CTLX's result.
-*
-* Returns:
-*       0               Success
-*       -ERESTARTSYS    Interrupted by a signal
-*       -EIO            CTLX failed
-*       -ENODEV         Adapter was unplugged
-*       ???             Result from completor
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_usbctlx_complete_sync
+ *
+ * Waits for a synchronous CTLX object to complete,
+ * and then handles the response.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      ctlx            CTLX ptr
+ *      completor       functor object to decide what to
+ *                      do with the CTLX's result.
+ *
+ * Returns:
+ *      0               Success
+ *      -ERESTARTSYS    Interrupted by a signal
+ *      -EIO            CTLX failed
+ *      -ENODEV         Adapter was unplugged
+ *      ???             Result from completor
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 static int hfa384x_usbctlx_complete_sync(struct hfa384x *hw,
                                          struct hfa384x_usbctlx *ctlx,
                                          struct usbctlx_completor *completor)
@@ -1257,37 +1276,38 @@ cleanup:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_docmd
-*
-* Constructs a command CTLX and submits it.
-*
-* NOTE: Any changes to the 'post-submit' code in this function
-*       need to be carried over to hfa384x_cbcmd() since the handling
-*       is virtually identical.
-*
-* Arguments:
-*       hw              device structure
-*       mode            DOWAIT or DOASYNC
-*       cmd             cmd structure.  Includes all arguments and result
-*                       data points.  All in host order. in host order
-*       cmdcb           command-specific callback
-*       usercb          user callback for async calls, NULL for DOWAIT calls
-*       usercb_data     user supplied data pointer for async calls, NULL
-*                       for DOASYNC calls
-*
-* Returns:
-*       0               success
-*       -EIO            CTLX failure
-*       -ERESTARTSYS    Awakened on signal
-*       >0              command indicated error, Status and Resp0-2 are
-*                       in hw structure.
-*
-* Side effects:
-*
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_docmd
+ *
+ * Constructs a command CTLX and submits it.
+ *
+ * NOTE: Any changes to the 'post-submit' code in this function
+ *       need to be carried over to hfa384x_cbcmd() since the handling
+ *       is virtually identical.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      mode            DOWAIT or DOASYNC
+ *       cmd             cmd structure.  Includes all arguments and result
+ *                       data points.  All in host order. in host order
+ *      cmdcb           command-specific callback
+ *      usercb          user callback for async calls, NULL for DOWAIT calls
+ *      usercb_data     user supplied data pointer for async calls, NULL
+ *                      for DOASYNC calls
+ *
+ * Returns:
+ *      0               success
+ *      -EIO            CTLX failure
+ *      -ERESTARTSYS    Awakened on signal
+ *      >0              command indicated error, Status and Resp0-2 are
+ *                      in hw structure.
+ *
+ * Side effects:
+ *
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 static int
 hfa384x_docmd(struct hfa384x *hw,
               enum cmd_mode mode,
@@ -1341,41 +1361,42 @@ done:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_dorrid
-*
-* Constructs a read rid CTLX and issues it.
-*
-* NOTE: Any changes to the 'post-submit' code in this function
-*       need to be carried over to hfa384x_cbrrid() since the handling
-*       is virtually identical.
-*
-* Arguments:
-*       hw              device structure
-*       mode            DOWAIT or DOASYNC
-*       rid             Read RID number (host order)
-*       riddata         Caller supplied buffer that MAC formatted RID.data
-*                       record will be written to for DOWAIT calls. Should
-*                       be NULL for DOASYNC calls.
-*       riddatalen      Buffer length for DOWAIT calls. Zero for DOASYNC calls.
-*       cmdcb           command callback for async calls, NULL for DOWAIT calls
-*       usercb          user callback for async calls, NULL for DOWAIT calls
-*       usercb_data     user supplied data pointer for async calls, NULL
-*                       for DOWAIT calls
-*
-* Returns:
-*       0               success
-*       -EIO            CTLX failure
-*       -ERESTARTSYS    Awakened on signal
-*       -ENODATA        riddatalen != macdatalen
-*       >0              command indicated error, Status and Resp0-2 are
-*                       in hw structure.
-*
-* Side effects:
-*
-* Call context:
-*       interrupt (DOASYNC)
-*       process (DOWAIT or DOASYNC)
-----------------------------------------------------------------*/
+ * hfa384x_dorrid
+ *
+ * Constructs a read rid CTLX and issues it.
+ *
+ * NOTE: Any changes to the 'post-submit' code in this function
+ *       need to be carried over to hfa384x_cbrrid() since the handling
+ *       is virtually identical.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      mode            DOWAIT or DOASYNC
+ *      rid             Read RID number (host order)
+ *      riddata         Caller supplied buffer that MAC formatted RID.data
+ *                      record will be written to for DOWAIT calls. Should
+ *                      be NULL for DOASYNC calls.
+ *      riddatalen      Buffer length for DOWAIT calls. Zero for DOASYNC calls.
+ *      cmdcb           command callback for async calls, NULL for DOWAIT calls
+ *      usercb          user callback for async calls, NULL for DOWAIT calls
+ *      usercb_data     user supplied data pointer for async calls, NULL
+ *                      for DOWAIT calls
+ *
+ * Returns:
+ *      0               success
+ *      -EIO            CTLX failure
+ *      -ERESTARTSYS    Awakened on signal
+ *      -ENODATA        riddatalen != macdatalen
+ *      >0              command indicated error, Status and Resp0-2 are
+ *                      in hw structure.
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt (DOASYNC)
+ *      process (DOWAIT or DOASYNC)
+ *----------------------------------------------------------------
+ */
 static int
 hfa384x_dorrid(struct hfa384x *hw,
                enum cmd_mode mode,
@@ -1426,37 +1447,38 @@ done:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_dowrid
-*
-* Constructs a write rid CTLX and issues it.
-*
-* NOTE: Any changes to the 'post-submit' code in this function
-*       need to be carried over to hfa384x_cbwrid() since the handling
-*       is virtually identical.
-*
-* Arguments:
-*       hw              device structure
-*       enum cmd_mode   DOWAIT or DOASYNC
-*       rid             RID code
-*       riddata         Data portion of RID formatted for MAC
-*       riddatalen      Length of the data portion in bytes
-*       cmdcb           command callback for async calls, NULL for DOWAIT calls
-*       usercb          user callback for async calls, NULL for DOWAIT calls
-*       usercb_data     user supplied data pointer for async calls
-*
-* Returns:
-*       0               success
-*       -ETIMEDOUT      timed out waiting for register ready or
-*                       command completion
-*       >0              command indicated error, Status and Resp0-2 are
-*                       in hw structure.
-*
-* Side effects:
-*
-* Call context:
-*       interrupt (DOASYNC)
-*       process (DOWAIT or DOASYNC)
-----------------------------------------------------------------*/
+ * hfa384x_dowrid
+ *
+ * Constructs a write rid CTLX and issues it.
+ *
+ * NOTE: Any changes to the 'post-submit' code in this function
+ *       need to be carried over to hfa384x_cbwrid() since the handling
+ *       is virtually identical.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      enum cmd_mode   DOWAIT or DOASYNC
+ *      rid             RID code
+ *      riddata         Data portion of RID formatted for MAC
+ *      riddatalen      Length of the data portion in bytes
+ *       cmdcb           command callback for async calls, NULL for DOWAIT calls
+ *      usercb          user callback for async calls, NULL for DOWAIT calls
+ *      usercb_data     user supplied data pointer for async calls
+ *
+ * Returns:
+ *      0               success
+ *      -ETIMEDOUT      timed out waiting for register ready or
+ *                      command completion
+ *      >0              command indicated error, Status and Resp0-2 are
+ *                      in hw structure.
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt (DOASYNC)
+ *      process (DOWAIT or DOASYNC)
+ *----------------------------------------------------------------
+ */
 static int
 hfa384x_dowrid(struct hfa384x *hw,
                enum cmd_mode mode,
@@ -1512,38 +1534,39 @@ done:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_dormem
-*
-* Constructs a readmem CTLX and issues it.
-*
-* NOTE: Any changes to the 'post-submit' code in this function
-*       need to be carried over to hfa384x_cbrmem() since the handling
-*       is virtually identical.
-*
-* Arguments:
-*       hw              device structure
-*       mode            DOWAIT or DOASYNC
-*       page            MAC address space page (CMD format)
-*       offset          MAC address space offset
-*       data            Ptr to data buffer to receive read
-*       len             Length of the data to read (max == 2048)
-*       cmdcb           command callback for async calls, NULL for DOWAIT calls
-*       usercb          user callback for async calls, NULL for DOWAIT calls
-*       usercb_data     user supplied data pointer for async calls
-*
-* Returns:
-*       0               success
-*       -ETIMEDOUT      timed out waiting for register ready or
-*                       command completion
-*       >0              command indicated error, Status and Resp0-2 are
-*                       in hw structure.
-*
-* Side effects:
-*
-* Call context:
-*       interrupt (DOASYNC)
-*       process (DOWAIT or DOASYNC)
-----------------------------------------------------------------*/
+ * hfa384x_dormem
+ *
+ * Constructs a readmem CTLX and issues it.
+ *
+ * NOTE: Any changes to the 'post-submit' code in this function
+ *       need to be carried over to hfa384x_cbrmem() since the handling
+ *       is virtually identical.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      mode            DOWAIT or DOASYNC
+ *      page            MAC address space page (CMD format)
+ *      offset          MAC address space offset
+ *      data            Ptr to data buffer to receive read
+ *      len             Length of the data to read (max == 2048)
+ *      cmdcb           command callback for async calls, NULL for DOWAIT calls
+ *      usercb          user callback for async calls, NULL for DOWAIT calls
+ *      usercb_data     user supplied data pointer for async calls
+ *
+ * Returns:
+ *      0               success
+ *      -ETIMEDOUT      timed out waiting for register ready or
+ *                      command completion
+ *      >0              command indicated error, Status and Resp0-2 are
+ *                      in hw structure.
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt (DOASYNC)
+ *      process (DOWAIT or DOASYNC)
+ *----------------------------------------------------------------
+ */
 static int
 hfa384x_dormem(struct hfa384x *hw,
                enum cmd_mode mode,
@@ -1603,38 +1626,39 @@ done:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_dowmem
-*
-* Constructs a writemem CTLX and issues it.
-*
-* NOTE: Any changes to the 'post-submit' code in this function
-*       need to be carried over to hfa384x_cbwmem() since the handling
-*       is virtually identical.
-*
-* Arguments:
-*       hw              device structure
-*       mode            DOWAIT or DOASYNC
-*       page            MAC address space page (CMD format)
-*       offset          MAC address space offset
-*       data            Ptr to data buffer containing write data
-*       len             Length of the data to read (max == 2048)
-*       cmdcb           command callback for async calls, NULL for DOWAIT calls
-*       usercb          user callback for async calls, NULL for DOWAIT calls
-*       usercb_data     user supplied data pointer for async calls.
-*
-* Returns:
-*       0               success
-*       -ETIMEDOUT      timed out waiting for register ready or
-*                       command completion
-*       >0              command indicated error, Status and Resp0-2 are
-*                       in hw structure.
-*
-* Side effects:
-*
-* Call context:
-*       interrupt (DOWAIT)
-*       process (DOWAIT or DOASYNC)
-----------------------------------------------------------------*/
+ * hfa384x_dowmem
+ *
+ * Constructs a writemem CTLX and issues it.
+ *
+ * NOTE: Any changes to the 'post-submit' code in this function
+ *       need to be carried over to hfa384x_cbwmem() since the handling
+ *       is virtually identical.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      mode            DOWAIT or DOASYNC
+ *      page            MAC address space page (CMD format)
+ *      offset          MAC address space offset
+ *      data            Ptr to data buffer containing write data
+ *      len             Length of the data to read (max == 2048)
+ *      cmdcb           command callback for async calls, NULL for DOWAIT calls
+ *      usercb          user callback for async calls, NULL for DOWAIT calls
+ *      usercb_data     user supplied data pointer for async calls.
+ *
+ * Returns:
+ *      0               success
+ *      -ETIMEDOUT      timed out waiting for register ready or
+ *                      command completion
+ *      >0              command indicated error, Status and Resp0-2 are
+ *                      in hw structure.
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt (DOWAIT)
+ *      process (DOWAIT or DOASYNC)
+ *----------------------------------------------------------------
+ */
 static int
 hfa384x_dowmem(struct hfa384x *hw,
                enum cmd_mode mode,
@@ -1694,27 +1718,28 @@ done:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_disable
-*
-* Issues the disable command to stop communications on one of
-* the MACs 'ports'.  Only macport 0 is valid  for stations.
-* APs may also disable macports 1-6.  Only ports that have been
-* previously enabled may be disabled.
-*
-* Arguments:
-*       hw              device structure
-*       macport         MAC port number (host order)
-*
-* Returns:
-*       0               success
-*       >0              f/w reported failure - f/w status code
-*       <0              driver reported error (timeout|bad arg)
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_drvr_disable
+ *
+ * Issues the disable command to stop communications on one of
+ * the MACs 'ports'.  Only macport 0 is valid  for stations.
+ * APs may also disable macports 1-6.  Only ports that have been
+ * previously enabled may be disabled.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      macport         MAC port number (host order)
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported failure - f/w status code
+ *      <0              driver reported error (timeout|bad arg)
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_disable(struct hfa384x *hw, u16 macport)
 {
         int result = 0;
@@ -1732,27 +1757,28 @@ int hfa384x_drvr_disable(struct hfa384x *hw, u16 macport)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_enable
-*
-* Issues the enable command to enable communications on one of
-* the MACs 'ports'.  Only macport 0 is valid  for stations.
-* APs may also enable macports 1-6.  Only ports that are currently
-* disabled may be enabled.
-*
-* Arguments:
-*       hw              device structure
-*       macport         MAC port number
-*
-* Returns:
-*       0               success
-*       >0              f/w reported failure - f/w status code
-*       <0              driver reported error (timeout|bad arg)
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_drvr_enable
+ *
+ * Issues the enable command to enable communications on one of
+ * the MACs 'ports'.  Only macport 0 is valid  for stations.
+ * APs may also enable macports 1-6.  Only ports that are currently
+ * disabled may be enabled.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      macport         MAC port number
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported failure - f/w status code
+ *      <0              driver reported error (timeout|bad arg)
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_enable(struct hfa384x *hw, u16 macport)
 {
         int result = 0;
@@ -1770,26 +1796,27 @@ int hfa384x_drvr_enable(struct hfa384x *hw, u16 macport)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_flashdl_enable
-*
-* Begins the flash download state.  Checks to see that we're not
-* already in a download state and that a port isn't enabled.
-* Sets the download state and retrieves the flash download
-* buffer location, buffer size, and timeout length.
-*
-* Arguments:
-*       hw              device structure
-*
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_drvr_flashdl_enable
+ *
+ * Begins the flash download state.  Checks to see that we're not
+ * already in a download state and that a port isn't enabled.
+ * Sets the download state and retrieves the flash download
+ * buffer location, buffer size, and timeout length.
+ *
+ * Arguments:
+ *      hw              device structure
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_flashdl_enable(struct hfa384x *hw)
 {
         int result = 0;
@@ -1809,7 +1836,7 @@ int hfa384x_drvr_flashdl_enable(struct hfa384x *hw)
 
         /* Retrieve the buffer loc&size and timeout */
         result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DOWNLOADBUFFER,
-                                        &(hw->bufinfo), sizeof(hw->bufinfo));
+                                        &hw->bufinfo, sizeof(hw->bufinfo));
         if (result)
                 return result;
 
@@ -1817,7 +1844,7 @@ int hfa384x_drvr_flashdl_enable(struct hfa384x *hw)
         hw->bufinfo.offset = le16_to_cpu(hw->bufinfo.offset);
         hw->bufinfo.len = le16_to_cpu(hw->bufinfo.len);
         result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_MAXLOADTIME,
-                                          &(hw->dltimeout));
+                                          &hw->dltimeout);
         if (result)
                 return result;
 
@@ -1831,24 +1858,25 @@ int hfa384x_drvr_flashdl_enable(struct hfa384x *hw)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_flashdl_disable
-*
-* Ends the flash download state.  Note that this will cause the MAC
-* firmware to restart.
-*
-* Arguments:
-*       hw              device structure
-*
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_drvr_flashdl_disable
+ *
+ * Ends the flash download state.  Note that this will cause the MAC
+ * firmware to restart.
+ *
+ * Arguments:
+ *      hw              device structure
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_flashdl_disable(struct hfa384x *hw)
 {
         /* Check that we're already in the download state */
@@ -1866,35 +1894,37 @@ int hfa384x_drvr_flashdl_disable(struct hfa384x *hw)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_flashdl_write
-*
-* Performs a FLASH download of a chunk of data. First checks to see
-* that we're in the FLASH download state, then sets the download
-* mode, uses the aux functions to 1) copy the data to the flash
-* buffer, 2) sets the download 'write flash' mode, 3) readback and
-* compare.  Lather rinse, repeat as many times an necessary to get
-* all the given data into flash.
-* When all data has been written using this function (possibly
-* repeatedly), call drvr_flashdl_disable() to end the download state
-* and restart the MAC.
-*
-* Arguments:
-*       hw              device structure
-*       daddr           Card address to write to. (host order)
-*       buf             Ptr to data to write.
-*       len             Length of data (host order).
-*
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
-int hfa384x_drvr_flashdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len)
+ * hfa384x_drvr_flashdl_write
+ *
+ * Performs a FLASH download of a chunk of data. First checks to see
+ * that we're in the FLASH download state, then sets the download
+ * mode, uses the aux functions to 1) copy the data to the flash
+ * buffer, 2) sets the download 'write flash' mode, 3) readback and
+ * compare.  Lather rinse, repeat as many times an necessary to get
+ * all the given data into flash.
+ * When all data has been written using this function (possibly
+ * repeatedly), call drvr_flashdl_disable() to end the download state
+ * and restart the MAC.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      daddr           Card address to write to. (host order)
+ *      buf             Ptr to data to write.
+ *      len             Length of data (host order).
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
+int hfa384x_drvr_flashdl_write(struct hfa384x *hw, u32 daddr,
+                               void *buf, u32 len)
 {
         int result = 0;
         u32 dlbufaddr;
@@ -2008,30 +2038,31 @@ exit_proc:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_getconfig
-*
-* Performs the sequence necessary to read a config/info item.
-*
-* Arguments:
-*       hw              device structure
-*       rid             config/info record id (host order)
-*       buf             host side record buffer.  Upon return it will
-*                       contain the body portion of the record (minus the
-*                       RID and len).
-*       len             buffer length (in bytes, should match record length)
-*
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*       -ENODATA        length mismatch between argument and retrieved
-*                       record.
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_drvr_getconfig
+ *
+ * Performs the sequence necessary to read a config/info item.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      rid             config/info record id (host order)
+ *      buf             host side record buffer.  Upon return it will
+ *                      contain the body portion of the record (minus the
+ *                      RID and len).
+ *      len             buffer length (in bytes, should match record length)
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *      -ENODATA        length mismatch between argument and retrieved
+ *                      record.
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_getconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len)
 {
         return hfa384x_dorrid_wait(hw, rid, buf, len);
@@ -2059,7 +2090,8 @@ int hfa384x_drvr_getconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len)
  *
  * Call context:
  *       process
- ----------------------------------------------------------------*/
+ *----------------------------------------------------------------
+ */
 int
 hfa384x_drvr_setconfig_async(struct hfa384x *hw,
                              u16 rid,
@@ -2071,23 +2103,24 @@ hfa384x_drvr_setconfig_async(struct hfa384x *hw,
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_ramdl_disable
-*
-* Ends the ram download state.
-*
-* Arguments:
-*       hw              device structure
-*
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_drvr_ramdl_disable
+ *
+ * Ends the ram download state.
+ *
+ * Arguments:
+ *      hw              device structure
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_ramdl_disable(struct hfa384x *hw)
 {
         /* Check that we're already in the download state */
@@ -2105,29 +2138,30 @@ int hfa384x_drvr_ramdl_disable(struct hfa384x *hw)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_ramdl_enable
-*
-* Begins the ram download state.  Checks to see that we're not
-* already in a download state and that a port isn't enabled.
-* Sets the download state and calls cmd_download with the
-* ENABLE_VOLATILE subcommand and the exeaddr argument.
-*
-* Arguments:
-*       hw              device structure
-*       exeaddr         the card execution address that will be
-*                       jumped to when ramdl_disable() is called
-*                       (host order).
-*
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_drvr_ramdl_enable
+ *
+ * Begins the ram download state.  Checks to see that we're not
+ * already in a download state and that a port isn't enabled.
+ * Sets the download state and calls cmd_download with the
+ * ENABLE_VOLATILE subcommand and the exeaddr argument.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      exeaddr         the card execution address that will be
+ *                       jumped to when ramdl_disable() is called
+ *                      (host order).
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_ramdl_enable(struct hfa384x *hw, u32 exeaddr)
 {
         int result = 0;
@@ -2146,7 +2180,8 @@ int hfa384x_drvr_ramdl_enable(struct hfa384x *hw, u32 exeaddr)
 
         /* Check that we're not already in a download state */
         if (hw->dlstate != HFA384x_DLSTATE_DISABLED) {
-                netdev_err(hw->wlandev->netdev, "Download state not disabled.\n");
+                netdev_err(hw->wlandev->netdev,
+                           "Download state not disabled.\n");
                 return -EINVAL;
         }
 
@@ -2171,31 +2206,32 @@ int hfa384x_drvr_ramdl_enable(struct hfa384x *hw, u32 exeaddr)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_ramdl_write
-*
-* Performs a RAM download of a chunk of data. First checks to see
-* that we're in the RAM download state, then uses the [read|write]mem USB
-* commands to 1) copy the data, 2) readback and compare.  The download
-* state is unaffected.  When all data has been written using
-* this function, call drvr_ramdl_disable() to end the download state
-* and restart the MAC.
-*
-* Arguments:
-*       hw              device structure
-*       daddr           Card address to write to. (host order)
-*       buf             Ptr to data to write.
-*       len             Length of data (host order).
-*
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_drvr_ramdl_write
+ *
+ * Performs a RAM download of a chunk of data. First checks to see
+ * that we're in the RAM download state, then uses the [read|write]mem USB
+ * commands to 1) copy the data, 2) readback and compare.  The download
+ * state is unaffected.  When all data has been written using
+ * this function, call drvr_ramdl_disable() to end the download state
+ * and restart the MAC.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      daddr           Card address to write to. (host order)
+ *      buf             Ptr to data to write.
+ *      len             Length of data (host order).
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_ramdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len)
 {
         int result = 0;
@@ -2246,36 +2282,37 @@ int hfa384x_drvr_ramdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_readpda
-*
-* Performs the sequence to read the PDA space.  Note there is no
-* drvr_writepda() function.  Writing a PDA is
-* generally implemented by a calling component via calls to
-* cmd_download and writing to the flash download buffer via the
-* aux regs.
-*
-* Arguments:
-*       hw              device structure
-*       buf             buffer to store PDA in
-*       len             buffer length
-*
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*       -ETIMEDOUT      timeout waiting for the cmd regs to become
-*                       available, or waiting for the control reg
-*                       to indicate the Aux port is enabled.
-*       -ENODATA        the buffer does NOT contain a valid PDA.
-*                       Either the card PDA is bad, or the auxdata
-*                       reads are giving us garbage.
-
-*
-* Side effects:
-*
-* Call context:
-*       process or non-card interrupt.
-----------------------------------------------------------------*/
+ * hfa384x_drvr_readpda
+ *
+ * Performs the sequence to read the PDA space.  Note there is no
+ * drvr_writepda() function.  Writing a PDA is
+ * generally implemented by a calling component via calls to
+ * cmd_download and writing to the flash download buffer via the
+ * aux regs.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      buf             buffer to store PDA in
+ *      len             buffer length
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *      -ETIMEDOUT      timeout waiting for the cmd regs to become
+ *                      available, or waiting for the control reg
+ *                      to indicate the Aux port is enabled.
+ *      -ENODATA        the buffer does NOT contain a valid PDA.
+ *                      Either the card PDA is bad, or the auxdata
+ *                      reads are giving us garbage.
+ *
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process or non-card interrupt.
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len)
 {
         int result = 0;
@@ -2306,7 +2343,7 @@ int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len)
 
                 /* units of bytes */
                 result = hfa384x_dormem_wait(hw, currpage, curroffset, buf,
-                                                len);
+                                             len);
 
                 if (result) {
                         netdev_warn(hw->wlandev->netdev,
@@ -2366,51 +2403,52 @@ int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_setconfig
-*
-* Performs the sequence necessary to write a config/info item.
-*
-* Arguments:
-*       hw              device structure
-*       rid             config/info record id (in host order)
-*       buf             host side record buffer
-*       len             buffer length (in bytes)
-*
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_drvr_setconfig
+ *
+ * Performs the sequence necessary to write a config/info item.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      rid             config/info record id (in host order)
+ *      buf             host side record buffer
+ *      len             buffer length (in bytes)
+ *
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_setconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len)
 {
         return hfa384x_dowrid_wait(hw, rid, buf, len);
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_start
-*
-* Issues the MAC initialize command, sets up some data structures,
-* and enables the interrupts.  After this function completes, the
-* low-level stuff should be ready for any/all commands.
-*
-* Arguments:
-*       hw              device structure
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
-
+ * hfa384x_drvr_start
+ *
+ * Issues the MAC initialize command, sets up some data structures,
+ * and enables the interrupts.  After this function completes, the
+ * low-level stuff should be ready for any/all commands.
+ *
+ * Arguments:
+ *      hw              device structure
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_start(struct hfa384x *hw)
 {
         int result, result1, result2;
@@ -2494,24 +2532,25 @@ done:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_stop
-*
-* Shuts down the MAC to the point where it is safe to unload the
-* driver.  Any subsystem that may be holding a data or function
-* ptr into the driver must be cleared/deinitialized.
-*
-* Arguments:
-*       hw              device structure
-* Returns:
-*       0               success
-*       >0              f/w reported error - f/w status code
-*       <0              driver reported error
-*
-* Side effects:
-*
-* Call context:
-*       process
-----------------------------------------------------------------*/
+ * hfa384x_drvr_stop
+ *
+ * Shuts down the MAC to the point where it is safe to unload the
+ * driver.  Any subsystem that may be holding a data or function
+ * ptr into the driver must be cleared/deinitialized.
+ *
+ * Arguments:
+ *      hw              device structure
+ * Returns:
+ *      0               success
+ *      >0              f/w reported error - f/w status code
+ *      <0              driver reported error
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_stop(struct hfa384x *hw)
 {
         int i;
@@ -2542,26 +2581,27 @@ int hfa384x_drvr_stop(struct hfa384x *hw)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_drvr_txframe
-*
-* Takes a frame from prism2sta and queues it for transmission.
-*
-* Arguments:
-*       hw              device structure
-*       skb             packet buffer struct.  Contains an 802.11
-*                       data frame.
-*       p80211_hdr      points to the 802.11 header for the packet.
-* Returns:
-*       0               Success and more buffs available
-*       1               Success but no more buffs
-*       2               Allocation failure
-*       4               Buffer full or queue busy
-*
-* Side effects:
-*
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
+ * hfa384x_drvr_txframe
+ *
+ * Takes a frame from prism2sta and queues it for transmission.
+ *
+ * Arguments:
+ *      hw              device structure
+ *      skb             packet buffer struct.  Contains an 802.11
+ *                      data frame.
+ *       p80211_hdr      points to the 802.11 header for the packet.
+ * Returns:
+ *      0               Success and more buffs available
+ *      1               Success but no more buffs
+ *      2               Allocation failure
+ *      4               Buffer full or queue busy
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 int hfa384x_drvr_txframe(struct hfa384x *hw, struct sk_buff *skb,
                          union p80211_hdr *p80211_hdr,
                          struct p80211_metawep *p80211_wep)
@@ -2608,7 +2648,7 @@ int hfa384x_drvr_txframe(struct hfa384x *hw, struct sk_buff *skb,
             cpu_to_le16(hw->txbuff.txfrm.desc.tx_control);
 
         /* copy the header over to the txdesc */
-        memcpy(&(hw->txbuff.txfrm.desc.frame_control), p80211_hdr,
+        memcpy(&hw->txbuff.txfrm.desc.frame_control, p80211_hdr,
                sizeof(union p80211_hdr));
 
         /* if we're using host WEP, increase size by IV+ICV */
@@ -2638,9 +2678,9 @@ int hfa384x_drvr_txframe(struct hfa384x *hw, struct sk_buff *skb,
                 memcpy(ptr, p80211_wep->icv, sizeof(p80211_wep->icv));
 
         /* Send the USB packet */
-        usb_fill_bulk_urb(&(hw->tx_urb), hw->usb,
+        usb_fill_bulk_urb(&hw->tx_urb, hw->usb,
                           hw->endp_out,
-                          &(hw->txbuff), ROUNDUP64(usbpktlen),
+                          &hw->txbuff, ROUNDUP64(usbpktlen),
                           hfa384x_usbout_callback, hw->wlandev);
         hw->tx_urb.transfer_flags |= USB_QUEUE_BULK;
 
@@ -2676,18 +2716,19 @@ void hfa384x_tx_timeout(struct wlandevice *wlandev)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbctlx_reaper_task
-*
-* Tasklet to delete dead CTLX objects
-*
-* Arguments:
-*       data    ptr to a struct hfa384x
-*
-* Returns:
-*
-* Call context:
-*       Interrupt
-----------------------------------------------------------------*/
+ * hfa384x_usbctlx_reaper_task
+ *
+ * Tasklet to delete dead CTLX objects
+ *
+ * Arguments:
+ *      data    ptr to a struct hfa384x
+ *
+ * Returns:
+ *
+ * Call context:
+ *      Interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usbctlx_reaper_task(unsigned long data)
 {
         struct hfa384x *hw = (struct hfa384x *)data;
@@ -2708,19 +2749,20 @@ static void hfa384x_usbctlx_reaper_task(unsigned long data)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbctlx_completion_task
-*
-* Tasklet to call completion handlers for returned CTLXs
-*
-* Arguments:
-*       data    ptr to struct hfa384x
-*
-* Returns:
-*       Nothing
-*
-* Call context:
-*       Interrupt
-----------------------------------------------------------------*/
+ * hfa384x_usbctlx_completion_task
+ *
+ * Tasklet to call completion handlers for returned CTLXs
+ *
+ * Arguments:
+ *      data    ptr to struct hfa384x
+ *
+ * Returns:
+ *      Nothing
+ *
+ * Call context:
+ *      Interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usbctlx_completion_task(unsigned long data)
 {
         struct hfa384x *hw = (struct hfa384x *)data;
@@ -2781,22 +2823,23 @@ static void hfa384x_usbctlx_completion_task(unsigned long data)
 }
 
 /*----------------------------------------------------------------
-* unlocked_usbctlx_cancel_async
-*
-* Mark the CTLX dead asynchronously, and ensure that the
-* next command on the queue is run afterwards.
-*
-* Arguments:
-*       hw      ptr to the struct hfa384x structure
-*       ctlx    ptr to a CTLX structure
-*
-* Returns:
-*       0       the CTLX's URB is inactive
-* -EINPROGRESS  the URB is currently being unlinked
-*
-* Call context:
-*       Either process or interrupt, but presumably interrupt
-----------------------------------------------------------------*/
+ * unlocked_usbctlx_cancel_async
+ *
+ * Mark the CTLX dead asynchronously, and ensure that the
+ * next command on the queue is run afterwards.
+ *
+ * Arguments:
+ *      hw      ptr to the struct hfa384x structure
+ *      ctlx    ptr to a CTLX structure
+ *
+ * Returns:
+ *      0       the CTLX's URB is inactive
+ * -EINPROGRESS the URB is currently being unlinked
+ *
+ * Call context:
+ *      Either process or interrupt, but presumably interrupt
+ *----------------------------------------------------------------
+ */
 static int unlocked_usbctlx_cancel_async(struct hfa384x *hw,
                                          struct hfa384x_usbctlx *ctlx)
 {
@@ -2826,28 +2869,30 @@ static int unlocked_usbctlx_cancel_async(struct hfa384x *hw,
 }
 
 /*----------------------------------------------------------------
-* unlocked_usbctlx_complete
-*
-* A CTLX has completed.  It may have been successful, it may not
-* have been. At this point, the CTLX should be quiescent.  The URBs
-* aren't active and the timers should have been stopped.
-*
-* The CTLX is migrated to the "completing" queue, and the completing
-* tasklet is scheduled.
-*
-* Arguments:
-*       hw              ptr to a struct hfa384x structure
-*       ctlx            ptr to a ctlx structure
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       Either, assume interrupt
-----------------------------------------------------------------*/
-static void unlocked_usbctlx_complete(struct hfa384x *hw, struct hfa384x_usbctlx *ctlx)
+ * unlocked_usbctlx_complete
+ *
+ * A CTLX has completed.  It may have been successful, it may not
+ * have been. At this point, the CTLX should be quiescent.  The URBs
+ * aren't active and the timers should have been stopped.
+ *
+ * The CTLX is migrated to the "completing" queue, and the completing
+ * tasklet is scheduled.
+ *
+ * Arguments:
+ *      hw              ptr to a struct hfa384x structure
+ *      ctlx            ptr to a ctlx structure
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      Either, assume interrupt
+ *----------------------------------------------------------------
+ */
+static void unlocked_usbctlx_complete(struct hfa384x *hw,
+                                      struct hfa384x_usbctlx *ctlx)
 {
         /* Timers have been stopped, and ctlx should be in
          * a terminal state. Retire it from the "active"
@@ -2871,21 +2916,22 @@ static void unlocked_usbctlx_complete(struct hfa384x *hw, struct hfa384x_usbctlx
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbctlxq_run
-*
-* Checks to see if the head item is running.  If not, starts it.
-*
-* Arguments:
-*       hw      ptr to struct hfa384x
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       any
-----------------------------------------------------------------*/
+ * hfa384x_usbctlxq_run
+ *
+ * Checks to see if the head item is running.  If not, starts it.
+ *
+ * Arguments:
+ *      hw      ptr to struct hfa384x
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      any
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usbctlxq_run(struct hfa384x *hw)
 {
         unsigned long flags;
@@ -2916,9 +2962,9 @@ static void hfa384x_usbctlxq_run(struct hfa384x *hw)
                 list_move_tail(&head->list, &hw->ctlxq.active);
 
                 /* Fill the out packet */
-                usb_fill_bulk_urb(&(hw->ctlx_urb), hw->usb,
+                usb_fill_bulk_urb(&hw->ctlx_urb, hw->usb,
                                   hw->endp_out,
-                                  &(head->outbuf), ROUNDUP64(head->outbufsize),
+                                  &head->outbuf, ROUNDUP64(head->outbufsize),
                                   hfa384x_ctlxout_callback, hw);
                 hw->ctlx_urb.transfer_flags |= USB_QUEUE_BULK;
 
@@ -2971,26 +3017,27 @@ unlock:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbin_callback
-*
-* Callback for URBs on the BULKIN endpoint.
-*
-* Arguments:
-*       urb             ptr to the completed urb
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
+ * hfa384x_usbin_callback
+ *
+ * Callback for URBs on the BULKIN endpoint.
+ *
+ * Arguments:
+ *      urb             ptr to the completed urb
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usbin_callback(struct urb *urb)
 {
         struct wlandevice *wlandev = urb->context;
         struct hfa384x *hw;
-        union hfa384x_usbin *usbin = (union hfa384x_usbin *)urb->transfer_buffer;
+        union hfa384x_usbin *usbin;
         struct sk_buff *skb = NULL;
         int result;
         int urb_status;
@@ -3010,7 +3057,10 @@ static void hfa384x_usbin_callback(struct urb *urb)
                 goto exit;
 
         skb = hw->rx_urb_skb;
-        BUG_ON(!skb || (skb->data != urb->transfer_buffer));
+        if (!skb || (skb->data != urb->transfer_buffer)) {
+                WARN_ON(1);
+                return;
+        }
 
         hw->rx_urb_skb = NULL;
 
@@ -3089,6 +3139,7 @@ static void hfa384x_usbin_callback(struct urb *urb)
         /* Note: the check of the sw_support field, the type field doesn't
          *       have bit 12 set like the docs suggest.
          */
+        usbin = (union hfa384x_usbin *)urb->transfer_buffer;
         type = le16_to_cpu(usbin->type);
         if (HFA384x_USB_ISRXFRM(type)) {
                 if (action == HANDLE) {
@@ -3147,25 +3198,26 @@ exit:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbin_ctlx
-*
-* We've received a URB containing a Prism2 "response" message.
-* This message needs to be matched up with a CTLX on the active
-* queue and our state updated accordingly.
-*
-* Arguments:
-*       hw              ptr to struct hfa384x
-*       usbin           ptr to USB IN packet
-*       urb_status      status of this Bulk-In URB
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
+ * hfa384x_usbin_ctlx
+ *
+ * We've received a URB containing a Prism2 "response" message.
+ * This message needs to be matched up with a CTLX on the active
+ * queue and our state updated accordingly.
+ *
+ * Arguments:
+ *      hw              ptr to struct hfa384x
+ *      usbin           ptr to USB IN packet
+ *      urb_status      status of this Bulk-In URB
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usbin_ctlx(struct hfa384x *hw, union hfa384x_usbin *usbin,
                                int urb_status)
 {
@@ -3269,22 +3321,23 @@ unlock:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbin_txcompl
-*
-* At this point we have the results of a previous transmit.
-*
-* Arguments:
-*       wlandev         wlan device
-*       usbin           ptr to the usb transfer buffer
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
+ * hfa384x_usbin_txcompl
+ *
+ * At this point we have the results of a previous transmit.
+ *
+ * Arguments:
+ *      wlandev         wlan device
+ *      usbin           ptr to the usb transfer buffer
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usbin_txcompl(struct wlandevice *wlandev,
                                   union hfa384x_usbin *usbin)
 {
@@ -3300,22 +3353,23 @@ static void hfa384x_usbin_txcompl(struct wlandevice *wlandev,
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbin_rx
-*
-* At this point we have a successful received a rx frame packet.
-*
-* Arguments:
-*       wlandev         wlan device
-*       usbin           ptr to the usb transfer buffer
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
+ * hfa384x_usbin_rx
+ *
+ * At this point we have a successful received a rx frame packet.
+ *
+ * Arguments:
+ *      wlandev         wlan device
+ *      usbin           ptr to the usb transfer buffer
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb)
 {
         union hfa384x_usbin *usbin = (union hfa384x_usbin *)skb->data;
@@ -3396,30 +3450,31 @@ static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_int_rxmonitor
-*
-* Helper function for int_rx.  Handles monitor frames.
-* Note that this function allocates space for the FCS and sets it
-* to 0xffffffff.  The hfa384x doesn't give us the FCS value but the
-* higher layers expect it.  0xffffffff is used as a flag to indicate
-* the FCS is bogus.
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       rxfrm           rx descriptor read from card in int_rx
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*       Allocates an skb and passes it up via the PF_PACKET interface.
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
+ * hfa384x_int_rxmonitor
+ *
+ * Helper function for int_rx.  Handles monitor frames.
+ * Note that this function allocates space for the FCS and sets it
+ * to 0xffffffff.  The hfa384x doesn't give us the FCS value but the
+ * higher layers expect it.  0xffffffff is used as a flag to indicate
+ * the FCS is bogus.
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      rxfrm           rx descriptor read from card in int_rx
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *      Allocates an skb and passes it up via the PF_PACKET interface.
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_int_rxmonitor(struct wlandevice *wlandev,
                                   struct hfa384x_usb_rxfrm *rxfrm)
 {
-        struct hfa384x_rx_frame *rxdesc = &(rxfrm->desc);
+        struct hfa384x_rx_frame *rxdesc = &rxfrm->desc;
         unsigned int hdrlen = 0;
         unsigned int datalen = 0;
         unsigned int skblen = 0;
@@ -3474,9 +3529,10 @@ static void hfa384x_int_rxmonitor(struct wlandevice *wlandev,
         }
 
         /* Copy the 802.11 header to the skb
-           (ctl frames may be less than a full header) */
+         * (ctl frames may be less than a full header)
+         */
         datap = skb_put(skb, hdrlen);
-        memcpy(datap, &(rxdesc->frame_control), hdrlen);
+        memcpy(datap, &rxdesc->frame_control, hdrlen);
 
         /* If any, copy the data from the card to the skb */
         if (datalen > 0) {
@@ -3501,22 +3557,23 @@ static void hfa384x_int_rxmonitor(struct wlandevice *wlandev,
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbin_info
-*
-* At this point we have a successful received a Prism2 info frame.
-*
-* Arguments:
-*       wlandev         wlan device
-*       usbin           ptr to the usb transfer buffer
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
+ * hfa384x_usbin_info
+ *
+ * At this point we have a successful received a Prism2 info frame.
+ *
+ * Arguments:
+ *      wlandev         wlan device
+ *      usbin           ptr to the usb transfer buffer
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usbin_info(struct wlandevice *wlandev,
                                union hfa384x_usbin *usbin)
 {
@@ -3526,21 +3583,22 @@ static void hfa384x_usbin_info(struct wlandevice *wlandev,
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbout_callback
-*
-* Callback for URBs on the BULKOUT endpoint.
-*
-* Arguments:
-*       urb             ptr to the completed urb
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
+ * hfa384x_usbout_callback
+ *
+ * Callback for URBs on the BULKOUT endpoint.
+ *
+ * Arguments:
+ *      urb             ptr to the completed urb
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usbout_callback(struct urb *urb)
 {
         struct wlandevice *wlandev = urb->context;
@@ -3601,21 +3659,22 @@ static void hfa384x_usbout_callback(struct urb *urb)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_ctlxout_callback
-*
-* Callback for control data on the BULKOUT endpoint.
-*
-* Arguments:
-*       urb             ptr to the completed urb
-*
-* Returns:
-* nothing
-*
-* Side effects:
-*
-* Call context:
-* interrupt
-----------------------------------------------------------------*/
+ * hfa384x_ctlxout_callback
+ *
+ * Callback for control data on the BULKOUT endpoint.
+ *
+ * Arguments:
+ *      urb             ptr to the completed urb
+ *
+ * Returns:
+ * nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ * interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_ctlxout_callback(struct urb *urb)
 {
         struct hfa384x *hw = urb->context;
@@ -3730,23 +3789,24 @@ delresp:
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbctlx_reqtimerfn
-*
-* Timer response function for CTLX request timeouts.  If this
-* function is called, it means that the callback for the OUT
-* URB containing a Prism2.x XXX_Request was never called.
-*
-* Arguments:
-*       data            a ptr to the struct hfa384x
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
+ * hfa384x_usbctlx_reqtimerfn
+ *
+ * Timer response function for CTLX request timeouts.  If this
+ * function is called, it means that the callback for the OUT
+ * URB containing a Prism2.x XXX_Request was never called.
+ *
+ * Arguments:
+ *      data            a ptr to the struct hfa384x
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usbctlx_reqtimerfn(unsigned long data)
 {
         struct hfa384x *hw = (struct hfa384x *)data;
@@ -3788,23 +3848,24 @@ static void hfa384x_usbctlx_reqtimerfn(unsigned long data)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbctlx_resptimerfn
-*
-* Timer response function for CTLX response timeouts.  If this
-* function is called, it means that the callback for the IN
-* URB containing a Prism2.x XXX_Response was never called.
-*
-* Arguments:
-*       data            a ptr to the struct hfa384x
-*
-* Returns:
-*       nothing
-*
-* Side effects:
-*
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
+ * hfa384x_usbctlx_resptimerfn
+ *
+ * Timer response function for CTLX response timeouts.  If this
+ * function is called, it means that the callback for the IN
+ * URB containing a Prism2.x XXX_Response was never called.
+ *
+ * Arguments:
+ *      data            a ptr to the struct hfa384x
+ *
+ * Returns:
+ *      nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usbctlx_resptimerfn(unsigned long data)
 {
         struct hfa384x *hw = (struct hfa384x *)data;
@@ -3830,20 +3891,21 @@ static void hfa384x_usbctlx_resptimerfn(unsigned long data)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usb_throttlefn
-*
-*
-* Arguments:
-*       data    ptr to hw
-*
-* Returns:
-*       Nothing
-*
-* Side effects:
-*
-* Call context:
-*       Interrupt
-----------------------------------------------------------------*/
+ * hfa384x_usb_throttlefn
+ *
+ *
+ * Arguments:
+ *      data    ptr to hw
+ *
+ * Returns:
+ *      Nothing
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      Interrupt
+ *----------------------------------------------------------------
+ */
 static void hfa384x_usb_throttlefn(unsigned long data)
 {
         struct hfa384x *hw = (struct hfa384x *)data;
@@ -3869,24 +3931,26 @@ static void hfa384x_usb_throttlefn(unsigned long data)
 }
 
 /*----------------------------------------------------------------
-* hfa384x_usbctlx_submit
-*
-* Called from the doxxx functions to submit a CTLX to the queue
-*
-* Arguments:
-*       hw              ptr to the hw struct
-*       ctlx            ctlx structure to enqueue
-*
-* Returns:
-*       -ENODEV if the adapter is unplugged
-*       0
-*
-* Side effects:
-*
-* Call context:
-*       process or interrupt
-----------------------------------------------------------------*/
-static int hfa384x_usbctlx_submit(struct hfa384x *hw, struct hfa384x_usbctlx *ctlx)
+ * hfa384x_usbctlx_submit
+ *
+ * Called from the doxxx functions to submit a CTLX to the queue
+ *
+ * Arguments:
+ *      hw              ptr to the hw struct
+ *      ctlx            ctlx structure to enqueue
+ *
+ * Returns:
+ *      -ENODEV if the adapter is unplugged
+ *      0
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      process or interrupt
+ *----------------------------------------------------------------
+ */
+static int hfa384x_usbctlx_submit(struct hfa384x *hw,
+                                  struct hfa384x_usbctlx *ctlx)
 {
         unsigned long flags;
 
@@ -3906,21 +3970,22 @@ static int hfa384x_usbctlx_submit(struct hfa384x *hw, struct hfa384x_usbctlx *ct
 }
 
 /*----------------------------------------------------------------
-* hfa384x_isgood_pdrcore
-*
-* Quick check of PDR codes.
-*
-* Arguments:
-*       pdrcode         PDR code number (host order)
-*
-* Returns:
-*       zero            not good.
-*       one             is good.
-*
-* Side effects:
-*
-* Call context:
-----------------------------------------------------------------*/
+ * hfa384x_isgood_pdrcore
+ *
+ * Quick check of PDR codes.
+ *
+ * Arguments:
+ *      pdrcode         PDR code number (host order)
+ *
+ * Returns:
+ *      zero            not good.
+ *      one             is good.
+ *
+ * Side effects:
+ *
+ * Call context:
+ *----------------------------------------------------------------
+ */
 static int hfa384x_isgood_pdrcode(u16 pdrcode)
 {
         switch (pdrcode) {
diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index 0247cbc29145..8387e6a3031a 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -1,56 +1,56 @@
 /* src/p80211/p80211conv.c
-*
-* Ether/802.11 conversions and packet buffer routines
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-* This file defines the functions that perform Ethernet to/from
-* 802.11 frame conversions.
-*
-* --------------------------------------------------------------------
-*
-*================================================================
-*/
+ *
+ * Ether/802.11 conversions and packet buffer routines
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ * This file defines the functions that perform Ethernet to/from
+ * 802.11 frame conversions.
+ *
+ * --------------------------------------------------------------------
+ *
+ *================================================================
+ */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -79,31 +79,31 @@ static const u8 oui_rfc1042[] = { 0x00, 0x00, 0x00 };
 static const u8 oui_8021h[] = { 0x00, 0x00, 0xf8 };
 
 /*----------------------------------------------------------------
-* p80211pb_ether_to_80211
-*
-* Uses the contents of the ether frame and the etherconv setting
-* to build the elements of the 802.11 frame.
-*
-* We don't actually set
-* up the frame header here.  That's the MAC's job.  We're only handling
-* conversion of DIXII or 802.3+LLC frames to something that works
-* with 802.11.
-*
-* Note -- 802.11 header is NOT part of the skb.  Likewise, the 802.11
-*         FCS is also not present and will need to be added elsewhere.
-*
-* Arguments:
-*       ethconv         Conversion type to perform
-*       skb             skbuff containing the ether frame
-*       p80211_hdr      802.11 header
-*
-* Returns:
-*       0 on success, non-zero otherwise
-*
-* Call context:
-*       May be called in interrupt or non-interrupt context
-*----------------------------------------------------------------
-*/
+ * p80211pb_ether_to_80211
+ *
+ * Uses the contents of the ether frame and the etherconv setting
+ * to build the elements of the 802.11 frame.
+ *
+ * We don't actually set
+ * up the frame header here.  That's the MAC's job.  We're only handling
+ * conversion of DIXII or 802.3+LLC frames to something that works
+ * with 802.11.
+ *
+ * Note -- 802.11 header is NOT part of the skb.  Likewise, the 802.11
+ *         FCS is also not present and will need to be added elsewhere.
+ *
+ * Arguments:
+ *      ethconv         Conversion type to perform
+ *      skb             skbuff containing the ether frame
+ *       p80211_hdr      802.11 header
+ *
+ * Returns:
+ *      0 on success, non-zero otherwise
+ *
+ * Call context:
+ *      May be called in interrupt or non-interrupt context
+ *----------------------------------------------------------------
+ */
 int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,
                         struct sk_buff *skb, union p80211_hdr *p80211_hdr,
                         struct p80211_metawep *p80211_wep)
@@ -255,25 +255,25 @@ static void orinoco_spy_gather(struct wlandevice *wlandev, char *mac,
 }
 
 /*----------------------------------------------------------------
-* p80211pb_80211_to_ether
-*
-* Uses the contents of a received 802.11 frame and the etherconv
-* setting to build an ether frame.
-*
-* This function extracts the src and dest address from the 802.11
-* frame to use in the construction of the eth frame.
-*
-* Arguments:
-*       ethconv         Conversion type to perform
-*       skb             Packet buffer containing the 802.11 frame
-*
-* Returns:
-*       0 on success, non-zero otherwise
-*
-* Call context:
-*       May be called in interrupt or non-interrupt context
-*----------------------------------------------------------------
-*/
+ * p80211pb_80211_to_ether
+ *
+ * Uses the contents of a received 802.11 frame and the etherconv
+ * setting to build an ether frame.
+ *
+ * This function extracts the src and dest address from the 802.11
+ * frame to use in the construction of the eth frame.
+ *
+ * Arguments:
+ *      ethconv         Conversion type to perform
+ *      skb             Packet buffer containing the 802.11 frame
+ *
+ * Returns:
+ *      0 on success, non-zero otherwise
+ *
+ * Call context:
+ *      May be called in interrupt or non-interrupt context
+ *----------------------------------------------------------------
+ */
 int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,
                         struct sk_buff *skb)
 {
@@ -508,22 +508,22 @@ int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,
 }
 
 /*----------------------------------------------------------------
-* p80211_stt_findproto
-*
-* Searches the 802.1h Selective Translation Table for a given
-* protocol.
-*
-* Arguments:
-*       proto   protocol number (in host order) to search for.
-*
-* Returns:
-*       1 - if the table is empty or a match is found.
-*       0 - if the table is non-empty and a match is not found.
-*
-* Call context:
-*       May be called in interrupt or non-interrupt context
-*----------------------------------------------------------------
-*/
+ * p80211_stt_findproto
+ *
+ * Searches the 802.1h Selective Translation Table for a given
+ * protocol.
+ *
+ * Arguments:
+ *      proto   protocol number (in host order) to search for.
+ *
+ * Returns:
+ *      1 - if the table is empty or a match is found.
+ *      0 - if the table is non-empty and a match is not found.
+ *
+ * Call context:
+ *      May be called in interrupt or non-interrupt context
+ *----------------------------------------------------------------
+ */
 int p80211_stt_findproto(u16 proto)
 {
         /* Always return found for now.  This is the behavior used by the */
@@ -540,21 +540,21 @@ int p80211_stt_findproto(u16 proto)
 }
 
 /*----------------------------------------------------------------
-* p80211skb_rxmeta_detach
-*
-* Disconnects the frmmeta and rxmeta from an skb.
-*
-* Arguments:
-*       wlandev         The wlandev this skb belongs to.
-*       skb             The skb we're attaching to.
-*
-* Returns:
-*       0 on success, non-zero otherwise
-*
-* Call context:
-*       May be called in interrupt or non-interrupt context
-*----------------------------------------------------------------
-*/
+ * p80211skb_rxmeta_detach
+ *
+ * Disconnects the frmmeta and rxmeta from an skb.
+ *
+ * Arguments:
+ *      wlandev         The wlandev this skb belongs to.
+ *      skb             The skb we're attaching to.
+ *
+ * Returns:
+ *      0 on success, non-zero otherwise
+ *
+ * Call context:
+ *      May be called in interrupt or non-interrupt context
+ *----------------------------------------------------------------
+ */
 void p80211skb_rxmeta_detach(struct sk_buff *skb)
 {
         struct p80211_rxmeta *rxmeta;
@@ -584,22 +584,22 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb)
 }
 
 /*----------------------------------------------------------------
-* p80211skb_rxmeta_attach
-*
-* Allocates a p80211rxmeta structure, initializes it, and attaches
-* it to an skb.
-*
-* Arguments:
-*       wlandev         The wlandev this skb belongs to.
-*       skb             The skb we're attaching to.
-*
-* Returns:
-*       0 on success, non-zero otherwise
-*
-* Call context:
-*       May be called in interrupt or non-interrupt context
-*----------------------------------------------------------------
-*/
+ * p80211skb_rxmeta_attach
+ *
+ * Allocates a p80211rxmeta structure, initializes it, and attaches
+ * it to an skb.
+ *
+ * Arguments:
+ *      wlandev         The wlandev this skb belongs to.
+ *      skb             The skb we're attaching to.
+ *
+ * Returns:
+ *      0 on success, non-zero otherwise
+ *
+ * Call context:
+ *      May be called in interrupt or non-interrupt context
+ *----------------------------------------------------------------
+ */
 int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)
 {
         int result = 0;
@@ -615,11 +615,9 @@ int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)
         }
 
         /* Allocate the rxmeta */
-        rxmeta = kzalloc(sizeof(struct p80211_rxmeta), GFP_ATOMIC);
+        rxmeta = kzalloc(sizeof(*rxmeta), GFP_ATOMIC);
 
         if (!rxmeta) {
-                netdev_err(wlandev->netdev,
-                           "%s: Failed to allocate rxmeta.\n", wlandev->name);
                 result = 1;
                 goto exit;
         }
@@ -638,22 +636,22 @@ exit:
 }
 
 /*----------------------------------------------------------------
-* p80211skb_free
-*
-* Frees an entire p80211skb by checking and freeing the meta struct
-* and then freeing the skb.
-*
-* Arguments:
-*       wlandev         The wlandev this skb belongs to.
-*       skb             The skb we're attaching to.
-*
-* Returns:
-*       0 on success, non-zero otherwise
-*
-* Call context:
-*       May be called in interrupt or non-interrupt context
-*----------------------------------------------------------------
-*/
+ * p80211skb_free
+ *
+ * Frees an entire p80211skb by checking and freeing the meta struct
+ * and then freeing the skb.
+ *
+ * Arguments:
+ *      wlandev         The wlandev this skb belongs to.
+ *      skb             The skb we're attaching to.
+ *
+ * Returns:
+ *      0 on success, non-zero otherwise
+ *
+ * Call context:
+ *      May be called in interrupt or non-interrupt context
+ *----------------------------------------------------------------
+ */
 void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb)
 {
         struct p80211_frmmeta *meta;
diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h
index 8c10357bedf0..ed70d98e5cf1 100644
--- a/drivers/staging/wlan-ng/p80211conv.h
+++ b/drivers/staging/wlan-ng/p80211conv.h
@@ -1,54 +1,54 @@
 /* p80211conv.h
-*
-* Ether/802.11 conversions and packet buffer routines
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-* This file declares the functions, types and macros that perform
-* Ethernet to/from 802.11 frame conversions.
-*
-* --------------------------------------------------------------------
-*/
+ *
+ * Ether/802.11 conversions and packet buffer routines
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ * This file declares the functions, types and macros that perform
+ * Ethernet to/from 802.11 frame conversions.
+ *
+ * --------------------------------------------------------------------
+ */
 
 #ifndef _LINUX_P80211CONV_H
 #define _LINUX_P80211CONV_H
diff --git a/drivers/staging/wlan-ng/p80211hdr.h b/drivers/staging/wlan-ng/p80211hdr.h
index 79d9b20b364d..2c44c613a586 100644
--- a/drivers/staging/wlan-ng/p80211hdr.h
+++ b/drivers/staging/wlan-ng/p80211hdr.h
@@ -1,61 +1,61 @@
 /* p80211hdr.h
-*
-* Macros, types, and functions for handling 802.11 MAC headers
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-* This file declares the constants and types used in the interface
-* between a wlan driver and the user mode utilities.
-*
-* Note:
-*  - Constant values are always in HOST byte order.  To assign
-*    values to multi-byte fields they _must_ be converted to
-*    ieee byte order.  To retrieve multi-byte values from incoming
-*    frames, they must be converted to host order.
-*
-* All functions declared here are implemented in p80211.c
-* --------------------------------------------------------------------
-*/
+ *
+ * Macros, types, and functions for handling 802.11 MAC headers
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ * This file declares the constants and types used in the interface
+ * between a wlan driver and the user mode utilities.
+ *
+ * Note:
+ *  - Constant values are always in HOST byte order.  To assign
+ *    values to multi-byte fields they _must_ be converted to
+ *    ieee byte order.  To retrieve multi-byte values from incoming
+ *    frames, they must be converted to host order.
+ *
+ * All functions declared here are implemented in p80211.c
+ * --------------------------------------------------------------------
+ */
 
 #ifndef _P80211HDR_H
 #define _P80211HDR_H
@@ -131,8 +131,8 @@
 /*                        SET_FC_FSTYPE(WLAN_FSTYPE_RTS) );   */
 /*------------------------------------------------------------*/
 
-#define WLAN_GET_FC_FTYPE(n)    ((((u16)(n)) & (BIT(2) | BIT(3))) >> 2)
-#define WLAN_GET_FC_FSTYPE(n)   ((((u16)(n)) & (BIT(4)|BIT(5)|BIT(6)|BIT(7))) >> 4)
+#define WLAN_GET_FC_FTYPE(n)    ((((u16)(n)) & GENMASK(3, 2)) >> 2)
+#define WLAN_GET_FC_FSTYPE(n)   ((((u16)(n)) & GENMASK(7, 4)) >> 4)
 #define WLAN_GET_FC_TODS(n)     ((((u16)(n)) & (BIT(8))) >> 8)
 #define WLAN_GET_FC_FROMDS(n)   ((((u16)(n)) & (BIT(9))) >> 9)
 #define WLAN_GET_FC_ISWEP(n)    ((((u16)(n)) & (BIT(14))) >> 14)
diff --git a/drivers/staging/wlan-ng/p80211ioctl.h b/drivers/staging/wlan-ng/p80211ioctl.h
index 06c5e36649a7..ab6067e65050 100644
--- a/drivers/staging/wlan-ng/p80211ioctl.h
+++ b/drivers/staging/wlan-ng/p80211ioctl.h
@@ -1,64 +1,64 @@
 /* p80211ioctl.h
-*
-* Declares constants and types for the p80211 ioctls
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-*  While this file is called 'ioctl' is purpose goes a little beyond
-*  that.  This file defines the types and contants used to implement
-*  the p80211 request/confirm/indicate interfaces on Linux.  The
-*  request/confirm interface is, in fact, normally implemented as an
-*  ioctl.  The indicate interface on the other hand, is implemented
-*  using the Linux 'netlink' interface.
-*
-*  The reason I say that request/confirm is 'normally' implemented
-*  via ioctl is that we're reserving the right to be able to send
-*  request commands via the netlink interface.  This will be necessary
-*  if we ever need to send request messages when there aren't any
-*  wlan network devices present (i.e. sending a message that only p80211
-*  cares about.
-* --------------------------------------------------------------------
-*/
+ *
+ * Declares constants and types for the p80211 ioctls
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ *  While this file is called 'ioctl' is purpose goes a little beyond
+ *  that.  This file defines the types and contants used to implement
+ *  the p80211 request/confirm/indicate interfaces on Linux.  The
+ *  request/confirm interface is, in fact, normally implemented as an
+ *  ioctl.  The indicate interface on the other hand, is implemented
+ *  using the Linux 'netlink' interface.
+ *
+ *  The reason I say that request/confirm is 'normally' implemented
+ *  via ioctl is that we're reserving the right to be able to send
+ *  request commands via the netlink interface.  This will be necessary
+ *  if we ever need to send request messages when there aren't any
+ *  wlan network devices present (i.e. sending a message that only p80211
+ *  cares about.
+ * --------------------------------------------------------------------
+ */
 
 #ifndef _P80211IOCTL_H
 #define _P80211IOCTL_H
diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h
index b0d3567ca0ad..ea3d9ce222b9 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -1,48 +1,48 @@
 /* This file is GENERATED AUTOMATICALLY.  DO NOT EDIT OR MODIFY.
-* --------------------------------------------------------------------
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*/
+ * --------------------------------------------------------------------
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ */
 
 #ifndef _P80211MKMETADEF_H
 #define _P80211MKMETADEF_H
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h
index 3dd066ac034e..653950fd9843 100644
--- a/drivers/staging/wlan-ng/p80211mgmt.h
+++ b/drivers/staging/wlan-ng/p80211mgmt.h
@@ -1,101 +1,101 @@
 /* p80211mgmt.h
-*
-* Macros, types, and functions to handle 802.11 mgmt frames
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-* This file declares the constants and types used in the interface
-* between a wlan driver and the user mode utilities.
-*
-* Notes:
-*  - Constant values are always in HOST byte order.  To assign
-*    values to multi-byte fields they _must_ be converted to
-*    ieee byte order.  To retrieve multi-byte values from incoming
-*    frames, they must be converted to host order.
-*
-*  - The len member of the frame structure does NOT!!! include
-*    the MAC CRC.  Therefore, the len field on rx'd frames should
-*    have 4 subtracted from it.
-*
-* All functions declared here are implemented in p80211.c
-*
-* The types, macros, and functions defined here are primarily
-* used for encoding and decoding management frames.  They are
-* designed to follow these patterns of use:
-*
-* DECODE:
-* 1) a frame of length len is received into buffer b
-* 2) using the hdr structure and macros, we determine the type
-* 3) an appropriate mgmt frame structure, mf, is allocated and zeroed
-* 4) mf.hdr = b
-*    mf.buf = b
-*    mf.len = len
-* 5) call mgmt_decode( mf )
-* 6) the frame field pointers in mf are now set.  Note that any
-*    multi-byte frame field values accessed using the frame field
-*    pointers are in ieee byte order and will have to be converted
-*    to host order.
-*
-* ENCODE:
-* 1) Library client allocates buffer space for maximum length
-*    frame of the desired type
-* 2) Library client allocates a mgmt frame structure, called mf,
-*    of the desired type
-* 3) Set the following:
-*    mf.type = <desired type>
-*    mf.buf = <allocated buffer address>
-* 4) call mgmt_encode( mf )
-* 5) all of the fixed field pointers and fixed length information element
-*    pointers in mf are now set to their respective locations in the
-*    allocated space (fortunately, all variable length information elements
-*    fall at the end of their respective frames).
-* 5a) The length field is set to include the last of the fixed and fixed
-*     length fields.  It may have to be updated for optional or variable
-*       length information elements.
-* 6) Optional and variable length information elements are special cases
-*    and must be handled individually by the client code.
-* --------------------------------------------------------------------
-*/
+ *
+ * Macros, types, and functions to handle 802.11 mgmt frames
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ * This file declares the constants and types used in the interface
+ * between a wlan driver and the user mode utilities.
+ *
+ * Notes:
+ *  - Constant values are always in HOST byte order.  To assign
+ *    values to multi-byte fields they _must_ be converted to
+ *    ieee byte order.  To retrieve multi-byte values from incoming
+ *    frames, they must be converted to host order.
+ *
+ *  - The len member of the frame structure does NOT!!! include
+ *    the MAC CRC.  Therefore, the len field on rx'd frames should
+ *    have 4 subtracted from it.
+ *
+ * All functions declared here are implemented in p80211.c
+ *
+ * The types, macros, and functions defined here are primarily
+ * used for encoding and decoding management frames.  They are
+ * designed to follow these patterns of use:
+ *
+ * DECODE:
+ * 1) a frame of length len is received into buffer b
+ * 2) using the hdr structure and macros, we determine the type
+ * 3) an appropriate mgmt frame structure, mf, is allocated and zeroed
+ * 4) mf.hdr = b
+ *    mf.buf = b
+ *    mf.len = len
+ * 5) call mgmt_decode( mf )
+ * 6) the frame field pointers in mf are now set.  Note that any
+ *    multi-byte frame field values accessed using the frame field
+ *    pointers are in ieee byte order and will have to be converted
+ *    to host order.
+ *
+ * ENCODE:
+ * 1) Library client allocates buffer space for maximum length
+ *    frame of the desired type
+ * 2) Library client allocates a mgmt frame structure, called mf,
+ *    of the desired type
+ * 3) Set the following:
+ *    mf.type = <desired type>
+ *    mf.buf = <allocated buffer address>
+ * 4) call mgmt_encode( mf )
+ * 5) all of the fixed field pointers and fixed length information element
+ *    pointers in mf are now set to their respective locations in the
+ *    allocated space (fortunately, all variable length information elements
+ *    fall at the end of their respective frames).
+ * 5a) The length field is set to include the last of the fixed and fixed
+ *     length fields.  It may have to be updated for optional or variable
+ *      length information elements.
+ * 6) Optional and variable length information elements are special cases
+ *    and must be handled individually by the client code.
+ * --------------------------------------------------------------------
+ */
 
 #ifndef _P80211MGMT_H
 #define _P80211MGMT_H
diff --git a/drivers/staging/wlan-ng/p80211msg.h b/drivers/staging/wlan-ng/p80211msg.h
index 43d2f971e2cd..40c5cf5997c7 100644
--- a/drivers/staging/wlan-ng/p80211msg.h
+++ b/drivers/staging/wlan-ng/p80211msg.h
@@ -1,49 +1,49 @@
 /* p80211msg.h
-*
-* Macros, constants, types, and funcs for req and ind messages
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*/
+ *
+ * Macros, constants, types, and funcs for req and ind messages
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ */
 
 #ifndef _P80211MSG_H
 #define _P80211MSG_H
diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index 4762d38a720e..73fcf07254fe 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -1,53 +1,53 @@
 /* src/p80211/p80211knetdev.c
-*
-* Linux Kernel net device interface
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-* The functions required for a Linux network device are defined here.
-*
-* --------------------------------------------------------------------
-*/
+ *
+ * Linux Kernel net device interface
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ * The functions required for a Linux network device are defined here.
+ *
+ * --------------------------------------------------------------------
+ */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -112,17 +112,18 @@ module_param(wlan_wext_write, int, 0644);
 MODULE_PARM_DESC(wlan_wext_write, "enable write wireless extensions");
 
 /*----------------------------------------------------------------
-* p80211knetdev_init
-*
-* Init method for a Linux netdevice.  Called in response to
-* register_netdev.
-*
-* Arguments:
-*       none
-*
-* Returns:
-*       nothing
-----------------------------------------------------------------*/
+ * p80211knetdev_init
+ *
+ * Init method for a Linux netdevice.  Called in response to
+ * register_netdev.
+ *
+ * Arguments:
+ *      none
+ *
+ * Returns:
+ *      nothing
+ *----------------------------------------------------------------
+ */
 static int p80211knetdev_init(struct net_device *netdev)
 {
         /* Called in response to register_netdev */
@@ -133,19 +134,20 @@ static int p80211knetdev_init(struct net_device *netdev)
 }
 
 /*----------------------------------------------------------------
-* p80211knetdev_open
-*
-* Linux netdevice open method.  Following a successful call here,
-* the device is supposed to be ready for tx and rx.  In our
-* situation that may not be entirely true due to the state of the
-* MAC below.
-*
-* Arguments:
-*       netdev          Linux network device structure
-*
-* Returns:
-*       zero on success, non-zero otherwise
-----------------------------------------------------------------*/
+ * p80211knetdev_open
+ *
+ * Linux netdevice open method.  Following a successful call here,
+ * the device is supposed to be ready for tx and rx.  In our
+ * situation that may not be entirely true due to the state of the
+ * MAC below.
+ *
+ * Arguments:
+ *      netdev          Linux network device structure
+ *
+ * Returns:
+ *      zero on success, non-zero otherwise
+ *----------------------------------------------------------------
+ */
 static int p80211knetdev_open(struct net_device *netdev)
 {
         int result = 0;         /* success */
@@ -170,17 +172,18 @@ static int p80211knetdev_open(struct net_device *netdev)
 }
 
 /*----------------------------------------------------------------
-* p80211knetdev_stop
-*
-* Linux netdevice stop (close) method.  Following this call,
-* no frames should go up or down through this interface.
-*
-* Arguments:
-*       netdev          Linux network device structure
-*
-* Returns:
-*       zero on success, non-zero otherwise
-----------------------------------------------------------------*/
+ * p80211knetdev_stop
+ *
+ * Linux netdevice stop (close) method.  Following this call,
+ * no frames should go up or down through this interface.
+ *
+ * Arguments:
+ *      netdev          Linux network device structure
+ *
+ * Returns:
+ *      zero on success, non-zero otherwise
+ *----------------------------------------------------------------
+ */
 static int p80211knetdev_stop(struct net_device *netdev)
 {
         int result = 0;
@@ -196,18 +199,19 @@ static int p80211knetdev_stop(struct net_device *netdev)
 }
 
 /*----------------------------------------------------------------
-* p80211netdev_rx
-*
-* Frame receive function called by the mac specific driver.
-*
-* Arguments:
-*       wlandev         WLAN network device structure
-*       skb             skbuff containing a full 802.11 frame.
-* Returns:
-*       nothing
-* Side effects:
-*
-----------------------------------------------------------------*/
+ * p80211netdev_rx
+ *
+ * Frame receive function called by the mac specific driver.
+ *
+ * Arguments:
+ *      wlandev         WLAN network device structure
+ *      skb             skbuff containing a full 802.11 frame.
+ * Returns:
+ *      nothing
+ * Side effects:
+ *
+ *----------------------------------------------------------------
+ */
 void p80211netdev_rx(struct wlandevice *wlandev, struct sk_buff *skb)
 {
         /* Enqueue for post-irq processing */
@@ -227,7 +231,8 @@ void p80211netdev_rx(struct wlandevice *wlandev, struct sk_buff *skb)
  *          CONV_TO_ETHER_FAILED if conversion failed
  *          CONV_TO_ETHER_SKIPPED if frame is ignored
  */
-static int p80211_convert_to_ether(struct wlandevice *wlandev, struct sk_buff *skb)
+static int p80211_convert_to_ether(struct wlandevice *wlandev,
+                                   struct sk_buff *skb)
 {
         struct p80211_hdr_a3 *hdr;
 
@@ -272,7 +277,6 @@ static void p80211netdev_rx_bh(unsigned long arg)
         /* Let's empty our our queue */
         while ((skb = skb_dequeue(&wlandev->nsd_rxq))) {
                 if (wlandev->state == WLAN_DEVICE_OPEN) {
-
                         if (dev->type != ARPHRD_ETHER) {
                                 /* RAW frame; we shouldn't convert it */
                                 /* XXX Append the Prism Header here instead. */
@@ -299,24 +303,25 @@ static void p80211netdev_rx_bh(unsigned long arg)
 }
 
 /*----------------------------------------------------------------
-* p80211knetdev_hard_start_xmit
-*
-* Linux netdevice method for transmitting a frame.
-*
-* Arguments:
-*       skb     Linux sk_buff containing the frame.
-*       netdev  Linux netdevice.
-*
-* Side effects:
-*       If the lower layers report that buffers are full. netdev->tbusy
-*       will be set to prevent higher layers from sending more traffic.
-*
-*       Note: If this function returns non-zero, higher layers retain
-*             ownership of the skb.
-*
-* Returns:
-*       zero on success, non-zero on failure.
-----------------------------------------------------------------*/
+ * p80211knetdev_hard_start_xmit
+ *
+ * Linux netdevice method for transmitting a frame.
+ *
+ * Arguments:
+ *      skb     Linux sk_buff containing the frame.
+ *      netdev  Linux netdevice.
+ *
+ * Side effects:
+ *      If the lower layers report that buffers are full. netdev->tbusy
+ *      will be set to prevent higher layers from sending more traffic.
+ *
+ *      Note: If this function returns non-zero, higher layers retain
+ *            ownership of the skb.
+ *
+ * Returns:
+ *      zero on success, non-zero on failure.
+ *----------------------------------------------------------------
+ */
 static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
                                          struct net_device *netdev)
 {
@@ -336,8 +341,8 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
                 goto failed;
         }
 
-        memset(&p80211_hdr, 0, sizeof(union p80211_hdr));
-        memset(&p80211_wep, 0, sizeof(struct p80211_metawep));
+        memset(&p80211_hdr, 0, sizeof(p80211_hdr));
+        memset(&p80211_wep, 0, sizeof(p80211_wep));
 
         if (netif_queue_stopped(netdev)) {
                 netdev_dbg(netdev, "called when queue stopped.\n");
@@ -375,8 +380,8 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
                         goto failed;
                 }
                 /* move the header over */
-                memcpy(&p80211_hdr, skb->data, sizeof(union p80211_hdr));
-                skb_pull(skb, sizeof(union p80211_hdr));
+                memcpy(&p80211_hdr, skb->data, sizeof(p80211_hdr));
+                skb_pull(skb, sizeof(p80211_hdr));
         } else {
                 if (skb_ether_to_p80211
                     (wlandev, wlandev->ethconv, skb, &p80211_hdr,
@@ -435,17 +440,18 @@ failed:
 }
 
 /*----------------------------------------------------------------
-* p80211knetdev_set_multicast_list
-*
-* Called from higher layers whenever there's a need to set/clear
-* promiscuous mode or rewrite the multicast list.
-*
-* Arguments:
-*       none
-*
-* Returns:
-*       nothing
-----------------------------------------------------------------*/
+ * p80211knetdev_set_multicast_list
+ *
+ * Called from higher layers whenever there's a need to set/clear
+ * promiscuous mode or rewrite the multicast list.
+ *
+ * Arguments:
+ *      none
+ *
+ * Returns:
+ *      nothing
+ *----------------------------------------------------------------
+ */
 static void p80211knetdev_set_multicast_list(struct net_device *dev)
 {
         struct wlandevice *wlandev = dev->ml_priv;
@@ -454,12 +460,12 @@ static void p80211knetdev_set_multicast_list(struct net_device *dev)
 
         if (wlandev->set_multicast_list)
                 wlandev->set_multicast_list(wlandev, dev);
-
 }
 
 #ifdef SIOCETHTOOL
 
-static int p80211netdev_ethtool(struct wlandevice *wlandev, void __user *useraddr)
+static int p80211netdev_ethtool(struct wlandevice *wlandev,
+                                void __user *useraddr)
 {
         u32 ethcmd;
         struct ethtool_drvinfo info;
@@ -505,33 +511,35 @@ static int p80211netdev_ethtool(struct wlandevice *wlandev, void __user *useradd
 #endif
 
 /*----------------------------------------------------------------
-* p80211knetdev_do_ioctl
-*
-* Handle an ioctl call on one of our devices.  Everything Linux
-* ioctl specific is done here.  Then we pass the contents of the
-* ifr->data to the request message handler.
-*
-* Arguments:
-*       dev     Linux kernel netdevice
-*       ifr     Our private ioctl request structure, typed for the
-*               generic struct ifreq so we can use ptr to func
-*               w/o cast.
-*
-* Returns:
-*       zero on success, a negative errno on failure.  Possible values:
-*               -ENETDOWN Device isn't up.
-*               -EBUSY  cmd already in progress
-*               -ETIME  p80211 cmd timed out (MSD may have its own timers)
-*               -EFAULT memory fault copying msg from user buffer
-*               -ENOMEM unable to allocate kernel msg buffer
-*               -ENOSYS bad magic, it the cmd really for us?
-*               -EintR  sleeping on cmd, awakened by signal, cmd cancelled.
-*
-* Call Context:
-*       Process thread (ioctl caller).  TODO: SMP support may require
-*       locks.
-----------------------------------------------------------------*/
-static int p80211knetdev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+ * p80211knetdev_do_ioctl
+ *
+ * Handle an ioctl call on one of our devices.  Everything Linux
+ * ioctl specific is done here.  Then we pass the contents of the
+ * ifr->data to the request message handler.
+ *
+ * Arguments:
+ *      dev     Linux kernel netdevice
+ *      ifr     Our private ioctl request structure, typed for the
+ *              generic struct ifreq so we can use ptr to func
+ *              w/o cast.
+ *
+ * Returns:
+ *      zero on success, a negative errno on failure.  Possible values:
+ *              -ENETDOWN Device isn't up.
+ *              -EBUSY  cmd already in progress
+ *              -ETIME  p80211 cmd timed out (MSD may have its own timers)
+ *              -EFAULT memory fault copying msg from user buffer
+ *              -ENOMEM unable to allocate kernel msg buffer
+ *              -EINVAL bad magic, it the cmd really for us?
+ *              -EintR  sleeping on cmd, awakened by signal, cmd cancelled.
+ *
+ * Call Context:
+ *      Process thread (ioctl caller).  TODO: SMP support may require
+ *      locks.
+ *----------------------------------------------------------------
+ */
+static int p80211knetdev_do_ioctl(struct net_device *dev,
+                                  struct ifreq *ifr, int cmd)
 {
         int result = 0;
         struct p80211ioctl_req *req = (struct p80211ioctl_req *)ifr;
@@ -550,7 +558,7 @@ static int p80211knetdev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int
 
         /* Test the magic, assume ifr is good if it's there */
         if (req->magic != P80211_IOCTL_MAGIC) {
-                result = -ENOSYS;
+                result = -EINVAL;
                 goto bail;
         }
 
@@ -558,7 +566,7 @@ static int p80211knetdev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int
                 result = 0;
                 goto bail;
         } else if (cmd != P80211_IFREQ) {
-                result = -ENOSYS;
+                result = -EINVAL;
                 goto bail;
         }
 
@@ -586,30 +594,31 @@ bail:
 }
 
 /*----------------------------------------------------------------
-* p80211knetdev_set_mac_address
-*
-* Handles the ioctl for changing the MACAddress of a netdevice
-*
-* references: linux/netdevice.h and drivers/net/net_init.c
-*
-* NOTE: [MSM] We only prevent address changes when the netdev is
-* up.  We don't control anything based on dot11 state.  If the
-* address is changed on a STA that's currently associated, you
-* will probably lose the ability to send and receive data frames.
-* Just be aware.  Therefore, this should usually only be done
-* prior to scan/join/auth/assoc.
-*
-* Arguments:
-*       dev     netdevice struct
-*       addr    the new MACAddress (a struct)
-*
-* Returns:
-*       zero on success, a negative errno on failure.  Possible values:
-*               -EBUSY  device is bussy (cmd not possible)
-*               -and errors returned by: p80211req_dorequest(..)
-*
-* by: Collin R. Mulliner <collin@mulliner.org>
-----------------------------------------------------------------*/
+ * p80211knetdev_set_mac_address
+ *
+ * Handles the ioctl for changing the MACAddress of a netdevice
+ *
+ * references: linux/netdevice.h and drivers/net/net_init.c
+ *
+ * NOTE: [MSM] We only prevent address changes when the netdev is
+ * up.  We don't control anything based on dot11 state.  If the
+ * address is changed on a STA that's currently associated, you
+ * will probably lose the ability to send and receive data frames.
+ * Just be aware.  Therefore, this should usually only be done
+ * prior to scan/join/auth/assoc.
+ *
+ * Arguments:
+ *      dev     netdevice struct
+ *      addr    the new MACAddress (a struct)
+ *
+ * Returns:
+ *      zero on success, a negative errno on failure.  Possible values:
+ *              -EBUSY  device is bussy (cmd not possible)
+ *              -and errors returned by: p80211req_dorequest(..)
+ *
+ * by: Collin R. Mulliner <collin@mulliner.org>
+ *----------------------------------------------------------------
+ */
 static int p80211knetdev_set_mac_address(struct net_device *dev, void *addr)
 {
         struct sockaddr *new_addr = addr;
@@ -629,9 +638,9 @@ static int p80211knetdev_set_mac_address(struct net_device *dev, void *addr)
         resultcode = &dot11req.resultcode;
 
         /* Set up a dot11req_mibset */
-        memset(&dot11req, 0, sizeof(struct p80211msg_dot11req_mibset));
+        memset(&dot11req, 0, sizeof(dot11req));
         dot11req.msgcode = DIDmsg_dot11req_mibset;
-        dot11req.msglen = sizeof(struct p80211msg_dot11req_mibset);
+        dot11req.msglen = sizeof(dot11req);
         memcpy(dot11req.devname,
                ((struct wlandevice *)dev->ml_priv)->name, WLAN_DEVNAMELEN_MAX - 1);
 
@@ -682,28 +691,29 @@ static const struct net_device_ops p80211_netdev_ops = {
 };
 
 /*----------------------------------------------------------------
-* wlan_setup
-*
-* Roughly matches the functionality of ether_setup.  Here
-* we set up any members of the wlandevice structure that are common
-* to all devices.  Additionally, we allocate a linux 'struct device'
-* and perform the same setup as ether_setup.
-*
-* Note: It's important that the caller have setup the wlandev->name
-*       ptr prior to calling this function.
-*
-* Arguments:
-*       wlandev         ptr to the wlandev structure for the
-*                       interface.
-*       physdev         ptr to usb device
-* Returns:
-*       zero on success, non-zero otherwise.
-* Call Context:
-*       Should be process thread.  We'll assume it might be
-*       interrupt though.  When we add support for statically
-*       compiled drivers, this function will be called in the
-*       context of the kernel startup code.
-----------------------------------------------------------------*/
+ * wlan_setup
+ *
+ * Roughly matches the functionality of ether_setup.  Here
+ * we set up any members of the wlandevice structure that are common
+ * to all devices.  Additionally, we allocate a linux 'struct device'
+ * and perform the same setup as ether_setup.
+ *
+ * Note: It's important that the caller have setup the wlandev->name
+ *      ptr prior to calling this function.
+ *
+ * Arguments:
+ *      wlandev         ptr to the wlandev structure for the
+ *                      interface.
+ *      physdev         ptr to usb device
+ * Returns:
+ *      zero on success, non-zero otherwise.
+ * Call Context:
+ *      Should be process thread.  We'll assume it might be
+ *      interrupt though.  When we add support for statically
+ *      compiled drivers, this function will be called in the
+ *      context of the kernel startup code.
+ *----------------------------------------------------------------
+ */
 int wlan_setup(struct wlandevice *wlandev, struct device *physdev)
 {
         int result = 0;
@@ -757,24 +767,25 @@ int wlan_setup(struct wlandevice *wlandev, struct device *physdev)
 }
 
 /*----------------------------------------------------------------
-* wlan_unsetup
-*
-* This function is paired with the wlan_setup routine.  It should
-* be called after unregister_wlandev.  Basically, all it does is
-* free the 'struct device' that's associated with the wlandev.
-* We do it here because the 'struct device' isn't allocated
-* explicitly in the driver code, it's done in wlan_setup.  To
-* do the free in the driver might seem like 'magic'.
-*
-* Arguments:
-*       wlandev         ptr to the wlandev structure for the
-*                       interface.
-* Call Context:
-*       Should be process thread.  We'll assume it might be
-*       interrupt though.  When we add support for statically
-*       compiled drivers, this function will be called in the
-*       context of the kernel startup code.
-----------------------------------------------------------------*/
+ * wlan_unsetup
+ *
+ * This function is paired with the wlan_setup routine.  It should
+ * be called after unregister_wlandev.  Basically, all it does is
+ * free the 'struct device' that's associated with the wlandev.
+ * We do it here because the 'struct device' isn't allocated
+ * explicitly in the driver code, it's done in wlan_setup.  To
+ * do the free in the driver might seem like 'magic'.
+ *
+ * Arguments:
+ *      wlandev         ptr to the wlandev structure for the
+ *                      interface.
+ * Call Context:
+ *      Should be process thread.  We'll assume it might be
+ *      interrupt though.  When we add support for statically
+ *      compiled drivers, this function will be called in the
+ *      context of the kernel startup code.
+ *----------------------------------------------------------------
+ */
 void wlan_unsetup(struct wlandevice *wlandev)
 {
         struct wireless_dev *wdev;
@@ -791,46 +802,48 @@ void wlan_unsetup(struct wlandevice *wlandev)
 }
 
 /*----------------------------------------------------------------
-* register_wlandev
-*
-* Roughly matches the functionality of register_netdev.  This function
-* is called after the driver has successfully probed and set up the
-* resources for the device.  It's now ready to become a named device
-* in the Linux system.
-*
-* First we allocate a name for the device (if not already set), then
-* we call the Linux function register_netdevice.
-*
-* Arguments:
-*       wlandev         ptr to the wlandev structure for the
-*                       interface.
-* Returns:
-*       zero on success, non-zero otherwise.
-* Call Context:
-*       Can be either interrupt or not.
-----------------------------------------------------------------*/
+ * register_wlandev
+ *
+ * Roughly matches the functionality of register_netdev.  This function
+ * is called after the driver has successfully probed and set up the
+ * resources for the device.  It's now ready to become a named device
+ * in the Linux system.
+ *
+ * First we allocate a name for the device (if not already set), then
+ * we call the Linux function register_netdevice.
+ *
+ * Arguments:
+ *      wlandev         ptr to the wlandev structure for the
+ *                      interface.
+ * Returns:
+ *      zero on success, non-zero otherwise.
+ * Call Context:
+ *      Can be either interrupt or not.
+ *----------------------------------------------------------------
+ */
 int register_wlandev(struct wlandevice *wlandev)
 {
         return register_netdev(wlandev->netdev);
 }
 
 /*----------------------------------------------------------------
-* unregister_wlandev
-*
-* Roughly matches the functionality of unregister_netdev.  This
-* function is called to remove a named device from the system.
-*
-* First we tell linux that the device should no longer exist.
-* Then we remove it from the list of known wlan devices.
-*
-* Arguments:
-*       wlandev         ptr to the wlandev structure for the
-*                       interface.
-* Returns:
-*       zero on success, non-zero otherwise.
-* Call Context:
-*       Can be either interrupt or not.
-----------------------------------------------------------------*/
+ * unregister_wlandev
+ *
+ * Roughly matches the functionality of unregister_netdev.  This
+ * function is called to remove a named device from the system.
+ *
+ * First we tell linux that the device should no longer exist.
+ * Then we remove it from the list of known wlan devices.
+ *
+ * Arguments:
+ *      wlandev         ptr to the wlandev structure for the
+ *                      interface.
+ * Returns:
+ *      zero on success, non-zero otherwise.
+ * Call Context:
+ *      Can be either interrupt or not.
+ *----------------------------------------------------------------
+ */
 int unregister_wlandev(struct wlandevice *wlandev)
 {
         struct sk_buff *skb;
@@ -845,35 +858,36 @@ int unregister_wlandev(struct wlandevice *wlandev)
 }
 
 /*----------------------------------------------------------------
-* p80211netdev_hwremoved
-*
-* Hardware removed notification. This function should be called
-* immediately after an MSD has detected that the underlying hardware
-* has been yanked out from under us.  The primary things we need
-* to do are:
-*   - Mark the wlandev
-*   - Prevent any further traffic from the knetdev i/f
-*   - Prevent any further requests from mgmt i/f
-*   - If there are any waitq'd mgmt requests or mgmt-frame exchanges,
-*     shut them down.
-*   - Call the MSD hwremoved function.
-*
-* The remainder of the cleanup will be handled by unregister().
-* Our primary goal here is to prevent as much tickling of the MSD
-* as possible since the MSD is already in a 'wounded' state.
-*
-* TODO: As new features are added, this function should be
-*       updated.
-*
-* Arguments:
-*       wlandev         WLAN network device structure
-* Returns:
-*       nothing
-* Side effects:
-*
-* Call context:
-*       Usually interrupt.
-----------------------------------------------------------------*/
+ * p80211netdev_hwremoved
+ *
+ * Hardware removed notification. This function should be called
+ * immediately after an MSD has detected that the underlying hardware
+ * has been yanked out from under us.  The primary things we need
+ * to do are:
+ *   - Mark the wlandev
+ *   - Prevent any further traffic from the knetdev i/f
+ *   - Prevent any further requests from mgmt i/f
+ *   - If there are any waitq'd mgmt requests or mgmt-frame exchanges,
+ *     shut them down.
+ *   - Call the MSD hwremoved function.
+ *
+ * The remainder of the cleanup will be handled by unregister().
+ * Our primary goal here is to prevent as much tickling of the MSD
+ * as possible since the MSD is already in a 'wounded' state.
+ *
+ * TODO: As new features are added, this function should be
+ *       updated.
+ *
+ * Arguments:
+ *      wlandev         WLAN network device structure
+ * Returns:
+ *      nothing
+ * Side effects:
+ *
+ * Call context:
+ *      Usually interrupt.
+ *----------------------------------------------------------------
+ */
 void p80211netdev_hwremoved(struct wlandevice *wlandev)
 {
         wlandev->hwremoved = 1;
@@ -884,26 +898,27 @@ void p80211netdev_hwremoved(struct wlandevice *wlandev)
 }
 
 /*----------------------------------------------------------------
-* p80211_rx_typedrop
-*
-* Classifies the frame, increments the appropriate counter, and
-* returns 0|1|2 indicating whether the driver should handle, ignore, or
-* drop the frame
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       fc              frame control field
-*
-* Returns:
-*       zero if the frame should be handled by the driver,
-*       one if the frame should be ignored
-*       anything else means we drop it.
-*
-* Side effects:
-*
-* Call context:
-*       interrupt
-----------------------------------------------------------------*/
+ * p80211_rx_typedrop
+ *
+ * Classifies the frame, increments the appropriate counter, and
+ * returns 0|1|2 indicating whether the driver should handle, ignore, or
+ * drop the frame
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      fc              frame control field
+ *
+ * Returns:
+ *      zero if the frame should be handled by the driver,
+ *       one if the frame should be ignored
+ *       anything else means we drop it.
+ *
+ * Side effects:
+ *
+ * Call context:
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc)
 {
         u16 ftype;
diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h
index 1e6a774fc7c5..8e0d08298c8b 100644
--- a/drivers/staging/wlan-ng/p80211netdev.h
+++ b/drivers/staging/wlan-ng/p80211netdev.h
@@ -1,54 +1,54 @@
 /* p80211netdev.h
-*
-* WLAN net device structure and functions
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-* This file declares the structure type that represents each wlan
-* interface.
-*
-* --------------------------------------------------------------------
-*/
+ *
+ * WLAN net device structure and functions
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ * This file declares the structure type that represents each wlan
+ * interface.
+ *
+ * --------------------------------------------------------------------
+ */
 
 #ifndef _LINUX_P80211NETDEV_H
 #define _LINUX_P80211NETDEV_H
@@ -143,7 +143,7 @@ extern struct iw_handler_def p80211wext_handler_def;
 #define NUM_WEPKEYS 4
 #define MAX_KEYLEN 32
 
-#define HOSTWEP_DEFAULTKEY_MASK (BIT(1)|BIT(0))
+#define HOSTWEP_DEFAULTKEY_MASK GENMASK(1, 0)
 #define HOSTWEP_SHAREDKEY BIT(3)
 #define HOSTWEP_DECRYPT  BIT(4)
 #define HOSTWEP_ENCRYPT  BIT(5)
diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index d43e85b5d49b..621df98183bf 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -1,54 +1,54 @@
 /* src/p80211/p80211req.c
-*
-* Request/Indication/MacMgmt interface handling functions
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-* This file contains the functions, types, and macros to support the
-* MLME request interface that's implemented via the device ioctls.
-*
-* --------------------------------------------------------------------
-*/
+ *
+ * Request/Indication/MacMgmt interface handling functions
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ * This file contains the functions, types, and macros to support the
+ * MLME request interface that's implemented via the device ioctls.
+ *
+ * --------------------------------------------------------------------
+ */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -72,10 +72,11 @@
 #include "p80211metastruct.h"
 #include "p80211req.h"
 
-static void p80211req_handlemsg(struct wlandevice *wlandev, struct p80211msg *msg);
+static void p80211req_handlemsg(struct wlandevice *wlandev,
+                                struct p80211msg *msg);
 static void p80211req_mibset_mibget(struct wlandevice *wlandev,
-                                   struct p80211msg_dot11req_mibget *mib_msg,
-                                   int isget);
+                                    struct p80211msg_dot11req_mibget *mib_msg,
+                                    int isget);
 
 static void p80211req_handle_action(struct wlandevice *wlandev, u32 *data,
                                     int isget, u32 flag)
@@ -93,21 +94,22 @@ static void p80211req_handle_action(struct wlandevice *wlandev, u32 *data,
 }
 
 /*----------------------------------------------------------------
-* p80211req_dorequest
-*
-* Handles an MLME request/confirm message.
-*
-* Arguments:
-*       wlandev         WLAN device struct
-*       msgbuf          Buffer containing a request message
-*
-* Returns:
-*       0 on success, an errno otherwise
-*
-* Call context:
-*       Potentially blocks the caller, so it's a good idea to
-*       not call this function from an interrupt context.
-----------------------------------------------------------------*/
+ * p80211req_dorequest
+ *
+ * Handles an MLME request/confirm message.
+ *
+ * Arguments:
+ *      wlandev         WLAN device struct
+ *      msgbuf          Buffer containing a request message
+ *
+ * Returns:
+ *      0 on success, an errno otherwise
+ *
+ * Call context:
+ *      Potentially blocks the caller, so it's a good idea to
+ *      not call this function from an interrupt context.
+ *----------------------------------------------------------------
+ */
 int p80211req_dorequest(struct wlandevice *wlandev, u8 *msgbuf)
 {
         struct p80211msg *msg = (struct p80211msg *)msgbuf;
@@ -122,7 +124,7 @@ int p80211req_dorequest(struct wlandevice *wlandev, u8 *msgbuf)
 
         /* Check Permissions */
         if (!capable(CAP_NET_ADMIN) &&
-        (msg->msgcode != DIDmsg_dot11req_mibget)) {
+            (msg->msgcode != DIDmsg_dot11req_mibget)) {
                 netdev_err(wlandev->netdev,
                            "%s: only dot11req_mibget allowed for non-root.\n",
                            wlandev->name);
@@ -130,7 +132,7 @@ int p80211req_dorequest(struct wlandevice *wlandev, u8 *msgbuf)
         }
 
         /* Check for busy status */
-        if (test_and_set_bit(1, &(wlandev->request_pending)))
+        if (test_and_set_bit(1, &wlandev->request_pending))
                 return -EBUSY;
 
         /* Allow p80211 to look at msg and handle if desired. */
@@ -139,35 +141,36 @@ int p80211req_dorequest(struct wlandevice *wlandev, u8 *msgbuf)
         p80211req_handlemsg(wlandev, msg);
 
         /* Pass it down to wlandev via wlandev->mlmerequest */
-        if (wlandev->mlmerequest != NULL)
+        if (wlandev->mlmerequest)
                 wlandev->mlmerequest(wlandev, msg);
 
-        clear_bit(1, &(wlandev->request_pending));
+        clear_bit(1, &wlandev->request_pending);
         return 0;       /* if result==0, msg->status still may contain an err */
 }
 
 /*----------------------------------------------------------------
-* p80211req_handlemsg
-*
-* p80211 message handler.  Primarily looks for messages that
-* belong to p80211 and then dispatches the appropriate response.
-* TODO: we don't do anything yet.  Once the linuxMIB is better
-*       defined we'll need a get/set handler.
-*
-* Arguments:
-*       wlandev         WLAN device struct
-*       msg             message structure
-*
-* Returns:
-*       nothing (any results are set in the status field of the msg)
-*
-* Call context:
-*       Process thread
-----------------------------------------------------------------*/
-static void p80211req_handlemsg(struct wlandevice *wlandev, struct p80211msg *msg)
+ * p80211req_handlemsg
+ *
+ * p80211 message handler.  Primarily looks for messages that
+ * belong to p80211 and then dispatches the appropriate response.
+ * TODO: we don't do anything yet.  Once the linuxMIB is better
+ *      defined we'll need a get/set handler.
+ *
+ * Arguments:
+ *      wlandev         WLAN device struct
+ *      msg             message structure
+ *
+ * Returns:
+ *      nothing (any results are set in the status field of the msg)
+ *
+ * Call context:
+ *      Process thread
+ *----------------------------------------------------------------
+ */
+static void p80211req_handlemsg(struct wlandevice *wlandev,
+                                struct p80211msg *msg)
 {
         switch (msg->msgcode) {
-
         case DIDmsg_lnxreq_hostwep:{
                 struct p80211msg_lnxreq_hostwep *req =
                         (struct p80211msg_lnxreq_hostwep *)msg;
@@ -192,8 +195,8 @@ static void p80211req_handlemsg(struct wlandevice *wlandev, struct p80211msg *ms
 }
 
 static void p80211req_mibset_mibget(struct wlandevice *wlandev,
-                                   struct p80211msg_dot11req_mibget *mib_msg,
-                                   int isget)
+                                    struct p80211msg_dot11req_mibget *mib_msg,
+                                    int isget)
 {
         struct p80211itemd *mibitem = (struct p80211itemd *)mib_msg->mibattribute.data;
         struct p80211pstrd *pstr = (struct p80211pstrd *)mibitem->data;
diff --git a/drivers/staging/wlan-ng/p80211req.h b/drivers/staging/wlan-ng/p80211req.h
index 8d3054c22a05..6c72f59993e0 100644
--- a/drivers/staging/wlan-ng/p80211req.h
+++ b/drivers/staging/wlan-ng/p80211req.h
@@ -1,49 +1,49 @@
 /* p80211req.h
-*
-* Request handling functions
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*/
+ *
+ * Request handling functions
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ */
 
 #ifndef _LINUX_P80211REQ_H
 #define _LINUX_P80211REQ_H
diff --git a/drivers/staging/wlan-ng/p80211wep.c b/drivers/staging/wlan-ng/p80211wep.c
index 23b183738037..6492ffe59085 100644
--- a/drivers/staging/wlan-ng/p80211wep.c
+++ b/drivers/staging/wlan-ng/p80211wep.c
@@ -1,49 +1,49 @@
 /* src/p80211/p80211wep.c
-*
-* WEP encode/decode for P80211.
-*
-* Copyright (C) 2002 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*/
+ *
+ * WEP encode/decode for P80211.
+ *
+ * Copyright (C) 2002 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ */
 
 /*================================================================*/
 /* System Includes */
@@ -52,8 +52,6 @@
 #include <linux/wireless.h>
 #include <linux/random.h>
 #include <linux/kernel.h>
-
-
 #include "p80211hdr.h"
 #include "p80211types.h"
 #include "p80211msg.h"
@@ -125,14 +123,13 @@ int wep_change_key(struct wlandevice *wlandev, int keynum, u8 *key, int keylen)
                 return -1;
         if (keylen >= MAX_KEYLEN)
                 return -1;
-        if (key == NULL)
+        if (!key)
                 return -1;
         if (keynum < 0)
                 return -1;
         if (keynum >= NUM_WEPKEYS)
                 return -1;
 
-
         wlandev->wep_keylens[keynum] = keylen;
         memcpy(wlandev->wep_keys[keynum], key, keylen);
 
@@ -176,7 +173,6 @@ int wep_decrypt(struct wlandevice *wlandev, u8 *buf, u32 len, int key_override,
 
         keylen += 3;            /* add in IV bytes */
 
-
         /* set up the RC4 state */
         for (i = 0; i < 256; i++)
                 s[i] = i;
@@ -217,8 +213,8 @@ int wep_decrypt(struct wlandevice *wlandev, u8 *buf, u32 len, int key_override,
 }
 
 /* encrypts in-place. */
-int wep_encrypt(struct wlandevice *wlandev, u8 *buf, u8 *dst, u32 len, int keynum,
-                u8 *iv, u8 *icv)
+int wep_encrypt(struct wlandevice *wlandev, u8 *buf,
+                u8 *dst, u32 len, int keynum, u8 *iv, u8 *icv)
 {
         u32 i, j, k, crc, keylen;
         u8 s[256], key[64];
diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c
index 96aa21188669..2e349f87e738 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -1,49 +1,49 @@
 /* from src/prism2/download/prism2dl.c
-*
-* utility for downloading prism2 images moved into kernelspace
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*/
+ *
+ * utility for downloading prism2 images moved into kernelspace
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ */
 
 /*================================================================*/
 /* System Includes */
@@ -124,7 +124,7 @@ struct imgchunk {
 
 /* Data records */
 static unsigned int ns3data;
-static struct s3datarec s3data[S3DATA_MAX];
+static struct s3datarec *s3data;
 
 /* Plug records */
 static unsigned int ns3plug;
@@ -161,7 +161,7 @@ static struct hfa384x_caplevel priid;
 /* Local Function Declarations */
 
 static int prism2_fwapply(const struct ihex_binrec *rfptr,
-struct wlandevice *wlandev);
+                          struct wlandevice *wlandev);
 
 static int read_fwfile(const struct ihex_binrec *rfptr);
 
@@ -172,13 +172,15 @@ static int read_cardpda(struct pda *pda, struct wlandevice *wlandev);
 static int mkpdrlist(struct pda *pda);
 
 static int plugimage(struct imgchunk *fchunk, unsigned int nfchunks,
-              struct s3plugrec *s3plug, unsigned int ns3plug, struct pda *pda);
+                     struct s3plugrec *s3plug, unsigned int ns3plug,
+                     struct pda *pda);
 
 static int crcimage(struct imgchunk *fchunk, unsigned int nfchunks,
-             struct s3crcrec *s3crc, unsigned int ns3crc);
+                    struct s3crcrec *s3crc, unsigned int ns3crc);
 
 static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk,
-               unsigned int nfchunks);
+                      unsigned int nfchunks);
+
 static void free_chunks(struct imgchunk *fchunk, unsigned int *nfchunks);
 
 static void free_srecs(void);
@@ -189,30 +191,31 @@ static int validate_identity(void);
 /* Function Definitions */
 
 /*----------------------------------------------------------------
-* prism2_fwtry
-*
-* Try and get firmware into memory
-*
-* Arguments:
-*       udev    usb device structure
-*       wlandev wlan device structure
-*
-* Returns:
-*       0       - success
-*       ~0      - failure
-----------------------------------------------------------------*/
+ * prism2_fwtry
+ *
+ * Try and get firmware into memory
+ *
+ * Arguments:
+ *      udev    usb device structure
+ *      wlandev wlan device structure
+ *
+ * Returns:
+ *      0       - success
+ *      ~0      - failure
+ *----------------------------------------------------------------
+ */
 static int prism2_fwtry(struct usb_device *udev, struct wlandevice *wlandev)
 {
         const struct firmware *fw_entry = NULL;
 
         netdev_info(wlandev->netdev, "prism2_usb: Checking for firmware %s\n",
-               PRISM2_USB_FWFILE);
+                    PRISM2_USB_FWFILE);
         if (request_ihex_firmware(&fw_entry,
                                   PRISM2_USB_FWFILE, &udev->dev) != 0) {
                 netdev_info(wlandev->netdev,
-                       "prism2_usb: Firmware not available, but not essential\n");
+                            "prism2_usb: Firmware not available, but not essential\n");
                 netdev_info(wlandev->netdev,
-                       "prism2_usb: can continue to use card anyway.\n");
+                            "prism2_usb: can continue to use card anyway.\n");
                 return 1;
         }
 
@@ -226,18 +229,19 @@ static int prism2_fwtry(struct usb_device *udev, struct wlandevice *wlandev)
 }
 
 /*----------------------------------------------------------------
-* prism2_fwapply
-*
-* Apply the firmware loaded into memory
-*
-* Arguments:
-*       rfptr   firmware image in kernel memory
-*       wlandev device
-*
-* Returns:
-*       0       - success
-*       ~0      - failure
-----------------------------------------------------------------*/
+ * prism2_fwapply
+ *
+ * Apply the firmware loaded into memory
+ *
+ * Arguments:
+ *      rfptr   firmware image in kernel memory
+ *      wlandev device
+ *
+ * Returns:
+ *      0       - success
+ *      ~0      - failure
+ *----------------------------------------------------------------
+ */
 static int prism2_fwapply(const struct ihex_binrec *rfptr,
                           struct wlandevice *wlandev)
 {
@@ -248,7 +252,12 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr,
 
         /* Initialize the data structures */
         ns3data = 0;
-        memset(s3data, 0, sizeof(s3data));
+        s3data = kcalloc(S3DATA_MAX, sizeof(*s3data), GFP_KERNEL);
+        if (!s3data) {
+                result = -ENOMEM;
+                goto out;
+        }
+
         ns3plug = 0;
         memset(s3plug, 0, sizeof(s3plug));
         ns3crc = 0;
@@ -372,24 +381,25 @@ out:
 }
 
 /*----------------------------------------------------------------
-* crcimage
-*
-* Adds a CRC16 in the two bytes prior to each block identified by
-* an S3 CRC record.  Currently, we don't actually do a CRC we just
-* insert the value 0xC0DE in hfa384x order.
-*
-* Arguments:
-*       fchunk          Array of image chunks
-*       nfchunks        Number of image chunks
-*       s3crc           Array of crc records
-*       ns3crc          Number of crc records
-*
-* Returns:
-*       0       success
-*       ~0      failure
-----------------------------------------------------------------*/
+ * crcimage
+ *
+ * Adds a CRC16 in the two bytes prior to each block identified by
+ * an S3 CRC record.  Currently, we don't actually do a CRC we just
+ * insert the value 0xC0DE in hfa384x order.
+ *
+ * Arguments:
+ *      fchunk          Array of image chunks
+ *      nfchunks        Number of image chunks
+ *      s3crc           Array of crc records
+ *      ns3crc          Number of crc records
+ *
+ * Returns:
+ *      0       success
+ *      ~0      failure
+ *----------------------------------------------------------------
+ */
 static int crcimage(struct imgchunk *fchunk, unsigned int nfchunks,
-             struct s3crcrec *s3crc, unsigned int ns3crc)
+                    struct s3crcrec *s3crc, unsigned int ns3crc)
 {
         int result = 0;
         int i;
@@ -433,22 +443,22 @@ static int crcimage(struct imgchunk *fchunk, unsigned int nfchunks,
                 dest = fchunk[c].data + chunkoff;
                 *dest = 0xde;
                 *(dest + 1) = 0xc0;
-
         }
         return result;
 }
 
 /*----------------------------------------------------------------
-* free_chunks
-*
-* Clears the chunklist data structures in preparation for a new file.
-*
-* Arguments:
-*       none
-*
-* Returns:
-*       nothing
-----------------------------------------------------------------*/
+ * free_chunks
+ *
+ * Clears the chunklist data structures in preparation for a new file.
+ *
+ * Arguments:
+ *      none
+ *
+ * Returns:
+ *      nothing
+ *----------------------------------------------------------------
+ */
 static void free_chunks(struct imgchunk *fchunk, unsigned int *nfchunks)
 {
         int i;
@@ -458,24 +468,24 @@ static void free_chunks(struct imgchunk *fchunk, unsigned int *nfchunks)
 
         *nfchunks = 0;
         memset(fchunk, 0, sizeof(*fchunk));
-
 }
 
 /*----------------------------------------------------------------
-* free_srecs
-*
-* Clears the srec data structures in preparation for a new file.
-*
-* Arguments:
-*       none
-*
-* Returns:
-*       nothing
-----------------------------------------------------------------*/
+ * free_srecs
+ *
+ * Clears the srec data structures in preparation for a new file.
+ *
+ * Arguments:
+ *      none
+ *
+ * Returns:
+ *      nothing
+ *----------------------------------------------------------------
+ */
 static void free_srecs(void)
 {
         ns3data = 0;
-        memset(s3data, 0, sizeof(s3data));
+        kfree(s3data);
         ns3plug = 0;
         memset(s3plug, 0, sizeof(s3plug));
         ns3crc = 0;
@@ -486,19 +496,20 @@ static void free_srecs(void)
 }
 
 /*----------------------------------------------------------------
-* mkimage
-*
-* Scans the currently loaded set of S records for data residing
-* in contiguous memory regions.  Each contiguous region is then
-* made into a 'chunk'.  This function assumes that we're building
-* a new chunk list.  Assumes the s3data items are in sorted order.
-*
-* Arguments:    none
-*
-* Returns:
-*       0       - success
-*       ~0      - failure (probably an errno)
-----------------------------------------------------------------*/
+ * mkimage
+ *
+ * Scans the currently loaded set of S records for data residing
+ * in contiguous memory regions.  Each contiguous region is then
+ * made into a 'chunk'.  This function assumes that we're building
+ * a new chunk list.  Assumes the s3data items are in sorted order.
+ *
+ * Arguments:   none
+ *
+ * Returns:
+ *      0       - success
+ *      ~0      - failure (probably an errno)
+ *----------------------------------------------------------------
+ */
 static int mkimage(struct imgchunk *clist, unsigned int *ccnt)
 {
         int result = 0;
@@ -577,19 +588,20 @@ static int mkimage(struct imgchunk *clist, unsigned int *ccnt)
 }
 
 /*----------------------------------------------------------------
-* mkpdrlist
-*
-* Reads a raw PDA and builds an array of pdrec_t structures.
-*
-* Arguments:
-*       pda     buffer containing raw PDA bytes
-*       pdrec   ptr to an array of pdrec_t's.  Will be filled on exit.
-*       nrec    ptr to a variable that will contain the count of PDRs
-*
-* Returns:
-*       0       - success
-*       ~0      - failure (probably an errno)
-----------------------------------------------------------------*/
+ * mkpdrlist
+ *
+ * Reads a raw PDA and builds an array of pdrec_t structures.
+ *
+ * Arguments:
+ *      pda     buffer containing raw PDA bytes
+ *      pdrec   ptr to an array of pdrec_t's.  Will be filled on exit.
+ *      nrec    ptr to a variable that will contain the count of PDRs
+ *
+ * Returns:
+ *      0       - success
+ *      ~0      - failure (probably an errno)
+ *----------------------------------------------------------------
+ */
 static int mkpdrlist(struct pda *pda)
 {
         u16 *pda16 = (u16 *)pda->buf;
@@ -599,7 +611,7 @@ static int mkpdrlist(struct pda *pda)
         curroff = 0;
         while (curroff < (HFA384x_PDA_LEN_MAX / 2 - 1) &&
                le16_to_cpu(pda16[curroff + 1]) != HFA384x_PDR_END_OF_PDA) {
-                pda->rec[pda->nrec] = (struct hfa384x_pdrec *)&(pda16[curroff]);
+                pda->rec[pda->nrec] = (struct hfa384x_pdrec *)&pda16[curroff];
 
                 if (le16_to_cpu(pda->rec[pda->nrec]->code) ==
                     HFA384x_PDR_NICID) {
@@ -631,37 +643,38 @@ static int mkpdrlist(struct pda *pda)
 
                 (pda->nrec)++;
                 curroff += le16_to_cpu(pda16[curroff]) + 1;
-
         }
         if (curroff >= (HFA384x_PDA_LEN_MAX / 2 - 1)) {
                 pr_err("no end record found or invalid lengths in PDR data, exiting. %x %d\n",
                        curroff, pda->nrec);
                 return 1;
         }
-        pda->rec[pda->nrec] = (struct hfa384x_pdrec *)&(pda16[curroff]);
+        pda->rec[pda->nrec] = (struct hfa384x_pdrec *)&pda16[curroff];
         (pda->nrec)++;
         return 0;
 }
 
 /*----------------------------------------------------------------
-* plugimage
-*
-* Plugs the given image using the given plug records from the given
-* PDA and filename.
-*
-* Arguments:
-*       fchunk          Array of image chunks
-*       nfchunks        Number of image chunks
-*       s3plug          Array of plug records
-*       ns3plug         Number of plug records
-*       pda             Current pda data
-*
-* Returns:
-*       0       success
-*       ~0      failure
-----------------------------------------------------------------*/
+ * plugimage
+ *
+ * Plugs the given image using the given plug records from the given
+ * PDA and filename.
+ *
+ * Arguments:
+ *      fchunk          Array of image chunks
+ *      nfchunks        Number of image chunks
+ *      s3plug          Array of plug records
+ *      ns3plug         Number of plug records
+ *      pda             Current pda data
+ *
+ * Returns:
+ *      0       success
+ *      ~0      failure
+ *----------------------------------------------------------------
+ */
 static int plugimage(struct imgchunk *fchunk, unsigned int nfchunks,
-              struct s3plugrec *s3plug, unsigned int ns3plug, struct pda *pda)
+                     struct s3plugrec *s3plug, unsigned int ns3plug,
+                     struct pda *pda)
 {
         int result = 0;
         int i;                  /* plug index */
@@ -741,31 +754,31 @@ static int plugimage(struct imgchunk *fchunk, unsigned int nfchunks,
                         memset(dest, 0, s3plug[i].len);
                         strncpy(dest, PRISM2_USB_FWFILE, s3plug[i].len - 1);
                 } else {        /* plug a PDR */
-                        memcpy(dest, &(pda->rec[j]->data), s3plug[i].len);
+                        memcpy(dest, &pda->rec[j]->data, s3plug[i].len);
                 }
         }
         return result;
-
 }
 
 /*----------------------------------------------------------------
-* read_cardpda
-*
-* Sends the command for the driver to read the pda from the card
-* named in the device variable.  Upon success, the card pda is
-* stored in the "cardpda" variables.  Note that the pda structure
-* is considered 'well formed' after this function.  That means
-* that the nrecs is valid, the rec array has been set up, and there's
-* a valid PDAEND record in the raw PDA data.
-*
-* Arguments:
-*       pda             pda structure
-*       wlandev         device
-*
-* Returns:
-*       0       - success
-*       ~0      - failure (probably an errno)
-----------------------------------------------------------------*/
+ * read_cardpda
+ *
+ * Sends the command for the driver to read the pda from the card
+ * named in the device variable.  Upon success, the card pda is
+ * stored in the "cardpda" variables.  Note that the pda structure
+ * is considered 'well formed' after this function.  That means
+ * that the nrecs is valid, the rec array has been set up, and there's
+ * a valid PDAEND record in the raw PDA data.
+ *
+ * Arguments:
+ *      pda             pda structure
+ *      wlandev         device
+ *
+ * Returns:
+ *      0       - success
+ *      ~0      - failure (probably an errno)
+ *----------------------------------------------------------------
+ */
 static int read_cardpda(struct pda *pda, struct wlandevice *wlandev)
 {
         int result = 0;
@@ -802,65 +815,66 @@ static int read_cardpda(struct pda *pda, struct wlandevice *wlandev)
 }
 
 /*----------------------------------------------------------------
-* read_fwfile
-*
-* Reads the given fw file which should have been compiled from an srec
-* file. Each record in the fw file will either be a plain data record,
-* a start address record, or other records used for plugging.
-*
-* Note that data records are expected to be sorted into
-* ascending address order in the fw file.
-*
-* Note also that the start address record, originally an S7 record in
-* the srec file, is expected in the fw file to be like a data record but
-* with a certain address to make it identifiable.
-*
-* Here's the SREC format that the fw should have come from:
-* S[37]nnaaaaaaaaddd...dddcc
-*
-*       nn - number of bytes starting with the address field
-* aaaaaaaa - address in readable (or big endian) format
-* dd....dd - 0-245 data bytes (two chars per byte)
-*       cc - checksum
-*
-* The S7 record's (there should be only one) address value gets
-* converted to an S3 record with address of 0xff400000, with the
-* start address being stored as a 4 byte data word. That address is
-* the start execution address used for RAM downloads.
-*
-* The S3 records have a collection of subformats indicated by the
-* value of aaaaaaaa:
-*   0xff000000 - Plug record, data field format:
-*                xxxxxxxxaaaaaaaassssssss
-*                x - PDR code number (little endian)
-*                a - Address in load image to plug (little endian)
-*                s - Length of plug data area (little endian)
-*
-*   0xff100000 - CRC16 generation record, data field format:
-*                aaaaaaaassssssssbbbbbbbb
-*                a - Start address for CRC calculation (little endian)
-*                s - Length of data to  calculate over (little endian)
-*                b - Boolean, true=write crc, false=don't write
-*
-*   0xff200000 - Info record, data field format:
-*                ssssttttdd..dd
-*                s - Size in words (little endian)
-*                t - Info type (little endian), see #defines and
-*                    struct s3inforec for details about types.
-*                d - (s - 1) little endian words giving the contents of
-*                    the given info type.
-*
-*   0xff400000 - Start address record, data field format:
-*                aaaaaaaa
-*                a - Address in load image to plug (little endian)
-*
-* Arguments:
-*       record  firmware image (ihex record structure) in kernel memory
-*
-* Returns:
-*       0       - success
-*       ~0      - failure (probably an errno)
-----------------------------------------------------------------*/
+ * read_fwfile
+ *
+ * Reads the given fw file which should have been compiled from an srec
+ * file. Each record in the fw file will either be a plain data record,
+ * a start address record, or other records used for plugging.
+ *
+ * Note that data records are expected to be sorted into
+ * ascending address order in the fw file.
+ *
+ * Note also that the start address record, originally an S7 record in
+ * the srec file, is expected in the fw file to be like a data record but
+ * with a certain address to make it identifiable.
+ *
+ * Here's the SREC format that the fw should have come from:
+ * S[37]nnaaaaaaaaddd...dddcc
+ *
+ *       nn - number of bytes starting with the address field
+ * aaaaaaaa - address in readable (or big endian) format
+ * dd....dd - 0-245 data bytes (two chars per byte)
+ *       cc - checksum
+ *
+ * The S7 record's (there should be only one) address value gets
+ * converted to an S3 record with address of 0xff400000, with the
+ * start address being stored as a 4 byte data word. That address is
+ * the start execution address used for RAM downloads.
+ *
+ * The S3 records have a collection of subformats indicated by the
+ * value of aaaaaaaa:
+ *   0xff000000 - Plug record, data field format:
+ *                xxxxxxxxaaaaaaaassssssss
+ *                x - PDR code number (little endian)
+ *                a - Address in load image to plug (little endian)
+ *                s - Length of plug data area (little endian)
+ *
+ *   0xff100000 - CRC16 generation record, data field format:
+ *                aaaaaaaassssssssbbbbbbbb
+ *                a - Start address for CRC calculation (little endian)
+ *                s - Length of data to  calculate over (little endian)
+ *                b - Boolean, true=write crc, false=don't write
+ *
+ *   0xff200000 - Info record, data field format:
+ *                ssssttttdd..dd
+ *                s - Size in words (little endian)
+ *                t - Info type (little endian), see #defines and
+ *                    struct s3inforec for details about types.
+ *                d - (s - 1) little endian words giving the contents of
+ *                    the given info type.
+ *
+ *   0xff400000 - Start address record, data field format:
+ *                aaaaaaaa
+ *                a - Address in load image to plug (little endian)
+ *
+ * Arguments:
+ *      record  firmware image (ihex record structure) in kernel memory
+ *
+ * Returns:
+ *      0       - success
+ *      ~0      - failure (probably an errno)
+ *----------------------------------------------------------------
+ */
 static int read_fwfile(const struct ihex_binrec *record)
 {
         int             i;
@@ -872,7 +886,6 @@ static int read_fwfile(const struct ihex_binrec *record)
         pr_debug("Reading fw file ...\n");
 
         while (record) {
-
                 rcnt++;
 
                 len = be16_to_cpu(record->len);
@@ -887,8 +900,8 @@ static int read_fwfile(const struct ihex_binrec *record)
                 case S3ADDR_START:
                         startaddr = *ptr32;
                         pr_debug("  S7 start addr, record=%d addr=0x%08x\n",
-                                      rcnt,
-                                      startaddr);
+                                 rcnt,
+                                 startaddr);
                         break;
                 case S3ADDR_PLUG:
                         s3plug[ns3plug].itemcode = *ptr32;
@@ -896,10 +909,10 @@ static int read_fwfile(const struct ihex_binrec *record)
                         s3plug[ns3plug].len = *(ptr32 + 2);
 
                         pr_debug("  S3 plugrec, record=%d itemcode=0x%08x addr=0x%08x len=%d\n",
-                                      rcnt,
-                                      s3plug[ns3plug].itemcode,
-                                      s3plug[ns3plug].addr,
-                                      s3plug[ns3plug].len);
+                                 rcnt,
+                                 s3plug[ns3plug].itemcode,
+                                 s3plug[ns3plug].addr,
+                                 s3plug[ns3plug].len);
 
                         ns3plug++;
                         if (ns3plug == S3PLUG_MAX) {
@@ -913,10 +926,10 @@ static int read_fwfile(const struct ihex_binrec *record)
                         s3crc[ns3crc].dowrite = *(ptr32 + 2);
 
                         pr_debug("  S3 crcrec, record=%d addr=0x%08x len=%d write=0x%08x\n",
-                                      rcnt,
-                                      s3crc[ns3crc].addr,
-                                      s3crc[ns3crc].len,
-                                      s3crc[ns3crc].dowrite);
+                                 rcnt,
+                                 s3crc[ns3crc].addr,
+                                 s3crc[ns3crc].len,
+                                 s3crc[ns3crc].dowrite);
                         ns3crc++;
                         if (ns3crc == S3CRC_MAX) {
                                 pr_err("S3 crcrec limit reached - aborting\n");
@@ -928,16 +941,16 @@ static int read_fwfile(const struct ihex_binrec *record)
                         s3info[ns3info].type = *(ptr16 + 1);
 
                         pr_debug("  S3 inforec, record=%d len=0x%04x type=0x%04x\n",
-                                      rcnt,
-                                      s3info[ns3info].len,
-                                      s3info[ns3info].type);
+                                 rcnt,
+                                 s3info[ns3info].len,
+                                 s3info[ns3info].type);
                         if (((s3info[ns3info].len - 1) * sizeof(u16)) >
                            sizeof(s3info[ns3info].info)) {
                                 pr_err("S3 inforec length too long - aborting\n");
                                 return 1;
                         }
 
-                        tmpinfo = (u16 *)&(s3info[ns3info].info.version);
+                        tmpinfo = (u16 *)&s3info[ns3info].info.version;
                         pr_debug("            info=");
                         for (i = 0; i < s3info[ns3info].len - 1; i++) {
                                 tmpinfo[i] = *(ptr16 + 2 + i);
@@ -968,22 +981,23 @@ static int read_fwfile(const struct ihex_binrec *record)
 }
 
 /*----------------------------------------------------------------
-* writeimage
-*
-* Takes the chunks, builds p80211 messages and sends them down
-* to the driver for writing to the card.
-*
-* Arguments:
-*       wlandev         device
-*       fchunk          Array of image chunks
-*       nfchunks        Number of image chunks
-*
-* Returns:
-*       0       success
-*       ~0      failure
-----------------------------------------------------------------*/
+ * writeimage
+ *
+ * Takes the chunks, builds p80211 messages and sends them down
+ * to the driver for writing to the card.
+ *
+ * Arguments:
+ *      wlandev         device
+ *      fchunk          Array of image chunks
+ *      nfchunks        Number of image chunks
+ *
+ * Returns:
+ *      0       success
+ *      ~0      failure
+ *----------------------------------------------------------------
+ */
 static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk,
-               unsigned int nfchunks)
+                      unsigned int nfchunks)
 {
         int result = 0;
         struct p80211msg_p2req_ramdl_state *rstmsg;
@@ -1099,7 +1113,6 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk,
                                 result = 1;
                                 goto free_result;
                         }
-
                 }
         }
 
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index 170de1c9eac4..c558ad656c49 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -1,61 +1,61 @@
 /* src/prism2/driver/prism2mgmt.c
-*
-* Management request handler functions.
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-* The functions in this file handle management requests sent from
-* user mode.
-*
-* Most of these functions have two separate blocks of code that are
-* conditional on whether this is a station or an AP.  This is used
-* to separate out the STA and AP responses to these management primitives.
-* It's a choice (good, bad, indifferent?) to have the code in the same
-* place so it's clear that the same primitive is implemented in both
-* cases but has different behavior.
-*
-* --------------------------------------------------------------------
-*/
+ *
+ * Management request handler functions.
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ * The functions in this file handle management requests sent from
+ * user mode.
+ *
+ * Most of these functions have two separate blocks of code that are
+ * conditional on whether this is a station or an AP.  This is used
+ * to separate out the STA and AP responses to these management primitives.
+ * It's a choice (good, bad, indifferent?) to have the code in the same
+ * place so it's clear that the same primitive is implemented in both
+ * cases but has different behavior.
+ *
+ * --------------------------------------------------------------------
+ */
 
 #include <linux/if_arp.h>
 #include <linux/module.h>
@@ -84,35 +84,36 @@
 #include "prism2mgmt.h"
 
 /* Converts 802.11 format rate specifications to prism2 */
-#define p80211rate_to_p2bit(n)  ((((n)&~BIT(7)) == 2) ? BIT(0) :  \
-                                 (((n)&~BIT(7)) == 4) ? BIT(1) : \
-                                 (((n)&~BIT(7)) == 11) ? BIT(2) : \
-                                 (((n)&~BIT(7)) == 22) ? BIT(3) : 0)
+#define p80211rate_to_p2bit(n)  ((((n) & ~BIT(7)) == 2) ? BIT(0) :  \
+                                 (((n) & ~BIT(7)) == 4) ? BIT(1) : \
+                                 (((n) & ~BIT(7)) == 11) ? BIT(2) : \
+                                 (((n) & ~BIT(7)) == 22) ? BIT(3) : 0)
 
 /*----------------------------------------------------------------
-* prism2mgmt_scan
-*
-* Initiate a scan for BSSs.
-*
-* This function corresponds to MLME-scan.request and part of
-* MLME-scan.confirm.  As far as I can tell in the standard, there
-* are no restrictions on when a scan.request may be issued.  We have
-* to handle in whatever state the driver/MAC happen to be.
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       msgp            ptr to msg buffer
-*
-* Returns:
-*       0       success and done
-*       <0      success, but we're waiting for something to finish.
-*       >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*       process thread  (usually)
-*       interrupt
-----------------------------------------------------------------*/
+ * prism2mgmt_scan
+ *
+ * Initiate a scan for BSSs.
+ *
+ * This function corresponds to MLME-scan.request and part of
+ * MLME-scan.confirm.  As far as I can tell in the standard, there
+ * are no restrictions on when a scan.request may be issued.  We have
+ * to handle in whatever state the driver/MAC happen to be.
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      msgp            ptr to msg buffer
+ *
+ * Returns:
+ *      0       success and done
+ *      <0      success, but we're waiting for something to finish.
+ *      >0      an error occurred while handling the message.
+ * Side effects:
+ *
+ * Call context:
+ *      process thread  (usually)
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 int prism2mgmt_scan(struct wlandevice *wlandev, void *msgp)
 {
         int result = 0;
@@ -122,7 +123,7 @@ int prism2mgmt_scan(struct wlandevice *wlandev, void *msgp)
         int i, timeout;
         int istmpenable = 0;
 
-        struct hfa384x_HostScanRequest_data scanreq;
+        struct hfa384x_host_scan_request_data scanreq;
 
         /* gatekeeper check */
         if (HFA384x_FIRMWARE_VERSION(hw->ident_sta_fw.major,
@@ -184,7 +185,7 @@ int prism2mgmt_scan(struct wlandevice *wlandev, void *msgp)
 
         /* set up the txrate to be 2MBPS. Should be fastest basicrate... */
         word = HFA384x_RATEBIT_2;
-        scanreq.txRate = cpu_to_le16(word);
+        scanreq.tx_rate = cpu_to_le16(word);
 
         /* set up the channel list */
         word = 0;
@@ -196,7 +197,7 @@ int prism2mgmt_scan(struct wlandevice *wlandev, void *msgp)
                 /* channel 1 is BIT 0 ... channel 14 is BIT 13 */
                 word |= (1 << (channel - 1));
         }
-        scanreq.channelList = cpu_to_le16(word);
+        scanreq.channel_list = cpu_to_le16(word);
 
         /* set up the ssid, if present. */
         scanreq.ssid.len = cpu_to_le16(msg->ssid.data.len);
@@ -292,7 +293,7 @@ int prism2mgmt_scan(struct wlandevice *wlandev, void *msgp)
 
         result = hfa384x_drvr_setconfig(hw,
                                         HFA384x_RID_HOSTSCAN, &scanreq,
-                                        sizeof(struct hfa384x_HostScanRequest_data));
+                                        sizeof(scanreq));
         if (result) {
                 netdev_err(wlandev->netdev,
                            "setconfig(SCANREQUEST) failed. result=%d\n",
@@ -347,31 +348,32 @@ exit:
 }
 
 /*----------------------------------------------------------------
-* prism2mgmt_scan_results
-*
-* Retrieve the BSS description for one of the BSSs identified in
-* a scan.
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       msgp            ptr to msg buffer
-*
-* Returns:
-*       0       success and done
-*       <0      success, but we're waiting for something to finish.
-*       >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*       process thread  (usually)
-*       interrupt
-----------------------------------------------------------------*/
+ * prism2mgmt_scan_results
+ *
+ * Retrieve the BSS description for one of the BSSs identified in
+ * a scan.
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      msgp            ptr to msg buffer
+ *
+ * Returns:
+ *      0       success and done
+ *      <0      success, but we're waiting for something to finish.
+ *      >0      an error occurred while handling the message.
+ * Side effects:
+ *
+ * Call context:
+ *      process thread  (usually)
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 int prism2mgmt_scan_results(struct wlandevice *wlandev, void *msgp)
 {
         int result = 0;
         struct p80211msg_dot11req_scan_results *req;
         struct hfa384x *hw = wlandev->priv;
-        struct hfa384x_HScanResultSub *item = NULL;
+        struct hfa384x_hscan_result_sub *item = NULL;
 
         int count;
 
@@ -425,8 +427,8 @@ int prism2mgmt_scan_results(struct wlandevice *wlandev, void *msgp)
 #define REQBASICRATE(N) \
         do { \
                 if ((count >= N) && DOT11_RATE5_ISBASIC_GET( \
-                        item->supprates[(N)-1])) { \
-                        req->basicrate ## N .data = item->supprates[(N)-1]; \
+                        item->supprates[(N) - 1])) { \
+                        req->basicrate ## N .data = item->supprates[(N) - 1]; \
                         req->basicrate ## N .status = \
                                 P80211ENUM_msgitem_status_data_ok; \
                 } \
@@ -444,7 +446,7 @@ int prism2mgmt_scan_results(struct wlandevice *wlandev, void *msgp)
 #define REQSUPPRATE(N) \
         do { \
                 if (count >= N) { \
-                        req->supprate ## N .data = item->supprates[(N)-1]; \
+                        req->supprate ## N .data = item->supprates[(N) - 1]; \
                         req->supprate ## N .status = \
                                 P80211ENUM_msgitem_status_data_ok; \
                 } \
@@ -507,24 +509,25 @@ exit:
 }
 
 /*----------------------------------------------------------------
-* prism2mgmt_start
-*
-* Start a BSS.  Any station can do this for IBSS, only AP for ESS.
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       msgp            ptr to msg buffer
-*
-* Returns:
-*       0       success and done
-*       <0      success, but we're waiting for something to finish.
-*       >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*       process thread  (usually)
-*       interrupt
-----------------------------------------------------------------*/
+ * prism2mgmt_start
+ *
+ * Start a BSS.  Any station can do this for IBSS, only AP for ESS.
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      msgp            ptr to msg buffer
+ *
+ * Returns:
+ *      0       success and done
+ *      <0      success, but we're waiting for something to finish.
+ *      >0      an error occurred while handling the message.
+ * Side effects:
+ *
+ * Call context:
+ *      process thread  (usually)
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 int prism2mgmt_start(struct wlandevice *wlandev, void *msgp)
 {
         int result = 0;
@@ -580,7 +583,7 @@ int prism2mgmt_start(struct wlandevice *wlandev, void *msgp)
 
         /* beacon period */
         word = msg->beaconperiod.data;
-        result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAPBCNint, word);
+        result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAPBCNINT, word);
         if (result) {
                 netdev_err(wlandev->netdev,
                            "Failed to set beacon period=%d.\n", word);
@@ -689,23 +692,24 @@ done:
 }
 
 /*----------------------------------------------------------------
-* prism2mgmt_readpda
-*
-* Collect the PDA data and put it in the message.
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       msgp            ptr to msg buffer
-*
-* Returns:
-*       0       success and done
-*       <0      success, but we're waiting for something to finish.
-*       >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*       process thread  (usually)
-----------------------------------------------------------------*/
+ * prism2mgmt_readpda
+ *
+ * Collect the PDA data and put it in the message.
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      msgp            ptr to msg buffer
+ *
+ * Returns:
+ *      0       success and done
+ *      <0      success, but we're waiting for something to finish.
+ *      >0      an error occurred while handling the message.
+ * Side effects:
+ *
+ * Call context:
+ *      process thread  (usually)
+ *----------------------------------------------------------------
+ */
 int prism2mgmt_readpda(struct wlandevice *wlandev, void *msgp)
 {
         struct hfa384x *hw = wlandev->priv;
@@ -748,30 +752,31 @@ int prism2mgmt_readpda(struct wlandevice *wlandev, void *msgp)
 }
 
 /*----------------------------------------------------------------
-* prism2mgmt_ramdl_state
-*
-* Establishes the beginning/end of a card RAM download session.
-*
-* It is expected that the ramdl_write() function will be called
-* one or more times between the 'enable' and 'disable' calls to
-* this function.
-*
-* Note: This function should not be called when a mac comm port
-*       is active.
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       msgp            ptr to msg buffer
-*
-* Returns:
-*       0       success and done
-*       <0      success, but we're waiting for something to finish.
-*       >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*       process thread  (usually)
-----------------------------------------------------------------*/
+ * prism2mgmt_ramdl_state
+ *
+ * Establishes the beginning/end of a card RAM download session.
+ *
+ * It is expected that the ramdl_write() function will be called
+ * one or more times between the 'enable' and 'disable' calls to
+ * this function.
+ *
+ * Note: This function should not be called when a mac comm port
+ *       is active.
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      msgp            ptr to msg buffer
+ *
+ * Returns:
+ *      0       success and done
+ *      <0      success, but we're waiting for something to finish.
+ *      >0      an error occurred while handling the message.
+ * Side effects:
+ *
+ * Call context:
+ *      process thread  (usually)
+ *----------------------------------------------------------------
+ */
 int prism2mgmt_ramdl_state(struct wlandevice *wlandev, void *msgp)
 {
         struct hfa384x *hw = wlandev->priv;
@@ -808,25 +813,26 @@ int prism2mgmt_ramdl_state(struct wlandevice *wlandev, void *msgp)
 }
 
 /*----------------------------------------------------------------
-* prism2mgmt_ramdl_write
-*
-* Writes a buffer to the card RAM using the download state.  This
-* is for writing code to card RAM.  To just read or write raw data
-* use the aux functions.
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       msgp            ptr to msg buffer
-*
-* Returns:
-*       0       success and done
-*       <0      success, but we're waiting for something to finish.
-*       >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*       process thread  (usually)
-----------------------------------------------------------------*/
+ * prism2mgmt_ramdl_write
+ *
+ * Writes a buffer to the card RAM using the download state.  This
+ * is for writing code to card RAM.  To just read or write raw data
+ * use the aux functions.
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      msgp            ptr to msg buffer
+ *
+ * Returns:
+ *      0       success and done
+ *      <0      success, but we're waiting for something to finish.
+ *      >0      an error occurred while handling the message.
+ * Side effects:
+ *
+ * Call context:
+ *      process thread  (usually)
+ *----------------------------------------------------------------
+ */
 int prism2mgmt_ramdl_write(struct wlandevice *wlandev, void *msgp)
 {
         struct hfa384x *hw = wlandev->priv;
@@ -864,30 +870,31 @@ int prism2mgmt_ramdl_write(struct wlandevice *wlandev, void *msgp)
 }
 
 /*----------------------------------------------------------------
-* prism2mgmt_flashdl_state
-*
-* Establishes the beginning/end of a card Flash download session.
-*
-* It is expected that the flashdl_write() function will be called
-* one or more times between the 'enable' and 'disable' calls to
-* this function.
-*
-* Note: This function should not be called when a mac comm port
-*       is active.
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       msgp            ptr to msg buffer
-*
-* Returns:
-*       0       success and done
-*       <0      success, but we're waiting for something to finish.
-*       >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*       process thread  (usually)
-----------------------------------------------------------------*/
+ * prism2mgmt_flashdl_state
+ *
+ * Establishes the beginning/end of a card Flash download session.
+ *
+ * It is expected that the flashdl_write() function will be called
+ * one or more times between the 'enable' and 'disable' calls to
+ * this function.
+ *
+ * Note: This function should not be called when a mac comm port
+ *       is active.
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      msgp            ptr to msg buffer
+ *
+ * Returns:
+ *      0       success and done
+ *      <0      success, but we're waiting for something to finish.
+ *      >0      an error occurred while handling the message.
+ * Side effects:
+ *
+ * Call context:
+ *      process thread  (usually)
+ *----------------------------------------------------------------
+ */
 int prism2mgmt_flashdl_state(struct wlandevice *wlandev, void *msgp)
 {
         int result = 0;
@@ -942,23 +949,24 @@ int prism2mgmt_flashdl_state(struct wlandevice *wlandev, void *msgp)
 }
 
 /*----------------------------------------------------------------
-* prism2mgmt_flashdl_write
-*
-*
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       msgp            ptr to msg buffer
-*
-* Returns:
-*       0       success and done
-*       <0      success, but we're waiting for something to finish.
-*       >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*       process thread  (usually)
-----------------------------------------------------------------*/
+ * prism2mgmt_flashdl_write
+ *
+ *
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      msgp            ptr to msg buffer
+ *
+ * Returns:
+ *      0       success and done
+ *      <0      success, but we're waiting for something to finish.
+ *      >0      an error occurred while handling the message.
+ * Side effects:
+ *
+ * Call context:
+ *      process thread  (usually)
+ *----------------------------------------------------------------
+ */
 int prism2mgmt_flashdl_write(struct wlandevice *wlandev, void *msgp)
 {
         struct hfa384x *hw = wlandev->priv;
@@ -1001,24 +1009,25 @@ int prism2mgmt_flashdl_write(struct wlandevice *wlandev, void *msgp)
 }
 
 /*----------------------------------------------------------------
-* prism2mgmt_autojoin
-*
-* Associate with an ESS.
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       msgp            ptr to msg buffer
-*
-* Returns:
-*       0       success and done
-*       <0      success, but we're waiting for something to finish.
-*       >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*       process thread  (usually)
-*       interrupt
-----------------------------------------------------------------*/
+ * prism2mgmt_autojoin
+ *
+ * Associate with an ESS.
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      msgp            ptr to msg buffer
+ *
+ * Returns:
+ *      0       success and done
+ *      <0      success, but we're waiting for something to finish.
+ *      >0      an error occurred while handling the message.
+ * Side effects:
+ *
+ * Call context:
+ *      process thread  (usually)
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp)
 {
         struct hfa384x *hw = wlandev->priv;
@@ -1072,24 +1081,25 @@ int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp)
 }
 
 /*----------------------------------------------------------------
-* prism2mgmt_wlansniff
-*
-* Start or stop sniffing.
-*
-* Arguments:
-*       wlandev         wlan device structure
-*       msgp            ptr to msg buffer
-*
-* Returns:
-*       0       success and done
-*       <0      success, but we're waiting for something to finish.
-*       >0      an error occurred while handling the message.
-* Side effects:
-*
-* Call context:
-*       process thread  (usually)
-*       interrupt
-----------------------------------------------------------------*/
+ * prism2mgmt_wlansniff
+ *
+ * Start or stop sniffing.
+ *
+ * Arguments:
+ *      wlandev         wlan device structure
+ *      msgp            ptr to msg buffer
+ *
+ * Returns:
+ *      0       success and done
+ *      <0      success, but we're waiting for something to finish.
+ *      >0      an error occurred while handling the message.
+ * Side effects:
+ *
+ * Call context:
+ *      process thread  (usually)
+ *      interrupt
+ *----------------------------------------------------------------
+ */
 int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
 {
         int result = 0;
diff --git a/drivers/staging/wlan-ng/prism2mgmt.h b/drivers/staging/wlan-ng/prism2mgmt.h
index cc1ac7a60dfe..88b979ff68b3 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.h
+++ b/drivers/staging/wlan-ng/prism2mgmt.h
@@ -1,61 +1,61 @@
 /* prism2mgmt.h
-*
-* Declares the mgmt command handler functions
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-* This file contains the constants and data structures for interaction
-* with the hfa384x Wireless LAN (WLAN) Media Access Controller (MAC).
-* The hfa384x is a portion of the Harris PRISM(tm) WLAN chipset.
-*
-* [Implementation and usage notes]
-*
-* [References]
-*   CW10 Programmer's Manual v1.5
-*   IEEE 802.11 D10.0
-*
-*    --------------------------------------------------------------------
-*/
+ *
+ * Declares the mgmt command handler functions
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ * This file contains the constants and data structures for interaction
+ * with the hfa384x Wireless LAN (WLAN) Media Access Controller (MAC).
+ * The hfa384x is a portion of the Harris PRISM(tm) WLAN chipset.
+ *
+ * [Implementation and usage notes]
+ *
+ * [References]
+ *   CW10 Programmer's Manual v1.5
+ *   IEEE 802.11 D10.0
+ *
+ *    --------------------------------------------------------------------
+ */
 
 #ifndef _PRISM2MGMT_H
 #define _PRISM2MGMT_H
@@ -65,7 +65,8 @@ extern int prism2_reset_settletime;
 
 u32 prism2sta_ifstate(struct wlandevice *wlandev, u32 ifstate);
 
-void prism2sta_ev_info(struct wlandevice *wlandev, struct hfa384x_InfFrame *inf);
+void prism2sta_ev_info(struct wlandevice *wlandev,
+                       struct hfa384x_inf_frame *inf);
 void prism2sta_ev_txexc(struct wlandevice *wlandev, u16 status);
 void prism2sta_ev_tx(struct wlandevice *wlandev, u16 status);
 void prism2sta_ev_alloc(struct wlandevice *wlandev);
@@ -83,9 +84,11 @@ int prism2mgmt_flashdl_write(struct wlandevice *wlandev, void *msgp);
 int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp);
 
 /*---------------------------------------------------------------
-* conversion functions going between wlan message data types and
-* Prism2 data types
----------------------------------------------------------------*/
+ * conversion functions going between wlan message data types and
+ * Prism2 data types
+ *---------------------------------------------------------------
+ */
+
 /* byte area conversion functions*/
 void prism2mgmt_bytearea2pstr(u8 *bytearea, struct p80211pstrd *pstr, int len);
 
diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index 63ab6bc88654..8ea6a647d037 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -1,54 +1,54 @@
 /* src/prism2/driver/prism2mib.c
-*
-* Management request for mibset/mibget
-*
-* Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
-* --------------------------------------------------------------------
-*
-* linux-wlan
-*
-*   The contents of this file are subject to the Mozilla Public
-*   License Version 1.1 (the "License"); you may not use this file
-*   except in compliance with the License. You may obtain a copy of
-*   the License at http://www.mozilla.org/MPL/
-*
-*   Software distributed under the License is distributed on an "AS
-*   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-*   implied. See the License for the specific language governing
-*   rights and limitations under the License.
-*
-*   Alternatively, the contents of this file may be used under the
-*   terms of the GNU Public License version 2 (the "GPL"), in which
-*   case the provisions of the GPL are applicable instead of the
-*   above.  If you wish to allow the use of your version of this file
-*   only under the terms of the GPL and not to allow others to use
-*   your version of this file under the MPL, indicate your decision
-*   by deleting the provisions above and replace them with the notice
-*   and other provisions required by the GPL.  If you do not delete
-*   the provisions above, a recipient may use your version of this
-*   file under either the MPL or the GPL.
-*
-* --------------------------------------------------------------------
-*
-* Inquiries regarding the linux-wlan Open Source project can be
-* made directly to:
-*
-* AbsoluteValue Systems Inc.
-* info@linux-wlan.com
-* http://www.linux-wlan.com
-*
-* --------------------------------------------------------------------
-*
-* Portions of the development of this software were funded by
-* Intersil Corporation as part of PRISM(R) chipset product development.
-*
-* --------------------------------------------------------------------
-*
-* The functions in this file handle the mibset/mibget management
-* functions.
-*
-* --------------------------------------------------------------------
-*/
+ *
+ * Management request for mibset/mibget
+ *
+ * Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * --------------------------------------------------------------------
+ *
+ * linux-wlan
+ *
+ *   The contents of this file are subject to the Mozilla Public
+ *   License Version 1.1 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.mozilla.org/MPL/
+ *
+ *   Software distributed under the License is distributed on an "AS
+ *   IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *   implied. See the License for the specific language governing
+ *   rights and limitations under the License.
+ *
+ *   Alternatively, the contents of this file may be used under the
+ *   terms of the GNU Public License version 2 (the "GPL"), in which
+ *   case the provisions of the GPL are applicable instead of the
+ *   above.  If you wish to allow the use of your version of this file
+ *   only under the terms of the GPL and not to allow others to use
+ *   your version of this file under the MPL, indicate your decision
+ *   by deleting the provisions above and replace them with the notice
+ *   and other provisions required by the GPL.  If you do not delete
+ *   the provisions above, a recipient may use your version of this
+ *   file under either the MPL or the GPL.
+ *
+ * --------------------------------------------------------------------
+ *
+ * Inquiries regarding the linux-wlan Open Source project can be
+ * made directly to:
+ *
+ * AbsoluteValue Systems Inc.
+ * info@linux-wlan.com
+ * http://www.linux-wlan.com
+ *
+ * --------------------------------------------------------------------
+ *
+ * Portions of the development of this software were funded by
+ * Intersil Corporation as part of PRISM(R) chipset product development.
+ *
+ * --------------------------------------------------------------------
+ *
+ * The functions in this file handle the mibset/mibget management
+ * functions.
+ *
+ * --------------------------------------------------------------------
+ */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -709,7 +709,7 @@ static int prism2mib_priv(struct mibrec *mib,
 
         switch (mib->did) {
         case DIDmib_lnx_lnxConfigTable_lnxRSNAIE:{
-                        struct hfa384x_WPAData wpa;
+                        struct hfa384x_wpa_data wpa;
 
                         if (isget) {
                                 hfa384x_drvr_getconfig(hw,
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index e1b4a94292ff..984804b92e05 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -104,32 +104,33 @@ static void prism2sta_reset(struct wlandevice *wlandev);
 static int prism2sta_txframe(struct wlandevice *wlandev, struct sk_buff *skb,
                              union p80211_hdr *p80211_hdr,
                              struct p80211_metawep *p80211_wep);
-static int prism2sta_mlmerequest(struct wlandevice *wlandev, struct p80211msg *msg);
+static int prism2sta_mlmerequest(struct wlandevice *wlandev,
+                                 struct p80211msg *msg);
 static int prism2sta_getcardinfo(struct wlandevice *wlandev);
 static int prism2sta_globalsetup(struct wlandevice *wlandev);
 static int prism2sta_setmulticast(struct wlandevice *wlandev,
                                   struct net_device *dev);
 
 static void prism2sta_inf_handover(struct wlandevice *wlandev,
-                                   struct hfa384x_InfFrame *inf);
+                                   struct hfa384x_inf_frame *inf);
 static void prism2sta_inf_tallies(struct wlandevice *wlandev,
-                                  struct hfa384x_InfFrame *inf);
+                                  struct hfa384x_inf_frame *inf);
 static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,
-                                          struct hfa384x_InfFrame *inf);
+                                          struct hfa384x_inf_frame *inf);
 static void prism2sta_inf_scanresults(struct wlandevice *wlandev,
-                                      struct hfa384x_InfFrame *inf);
+                                      struct hfa384x_inf_frame *inf);
 static void prism2sta_inf_chinforesults(struct wlandevice *wlandev,
-                                        struct hfa384x_InfFrame *inf);
+                                        struct hfa384x_inf_frame *inf);
 static void prism2sta_inf_linkstatus(struct wlandevice *wlandev,
-                                     struct hfa384x_InfFrame *inf);
+                                     struct hfa384x_inf_frame *inf);
 static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,
-                                      struct hfa384x_InfFrame *inf);
+                                      struct hfa384x_inf_frame *inf);
 static void prism2sta_inf_authreq(struct wlandevice *wlandev,
-                                  struct hfa384x_InfFrame *inf);
+                                  struct hfa384x_inf_frame *inf);
 static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,
-                                        struct hfa384x_InfFrame *inf);
+                                        struct hfa384x_inf_frame *inf);
 static void prism2sta_inf_psusercnt(struct wlandevice *wlandev,
-                                    struct hfa384x_InfFrame *inf);
+                                    struct hfa384x_inf_frame *inf);
 
 /*
  * prism2sta_open
@@ -278,7 +279,8 @@ static int prism2sta_txframe(struct wlandevice *wlandev, struct sk_buff *skb,
  * Call context:
  *      process thread
  */
-static int prism2sta_mlmerequest(struct wlandevice *wlandev, struct p80211msg *msg)
+static int prism2sta_mlmerequest(struct wlandevice *wlandev,
+                                 struct p80211msg *msg)
 {
         struct hfa384x *hw = wlandev->priv;
 
@@ -370,9 +372,10 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev, struct p80211msg *m
                         qualmsg->noise.status =
                             P80211ENUM_msgitem_status_data_ok;
 
-                        qualmsg->link.data = le16_to_cpu(hw->qual.CQ_currBSS);
-                        qualmsg->level.data = le16_to_cpu(hw->qual.ASL_currBSS);
-                        qualmsg->noise.data = le16_to_cpu(hw->qual.ANL_currFC);
+                        qualmsg->link.data = le16_to_cpu(hw->qual.cq_curr_bss);
+                        qualmsg->level.data =
+                                le16_to_cpu(hw->qual.asl_curr_bss);
+                        qualmsg->noise.data = le16_to_cpu(hw->qual.anl_curr_fc);
                         qualmsg->txrate.data = hw->txrate;
 
                         break;
@@ -606,8 +609,8 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
         hw->ident_nic.minor = le16_to_cpu(hw->ident_nic.minor);
 
         netdev_info(wlandev->netdev, "ident: nic h/w: id=0x%02x %d.%d.%d\n",
-               hw->ident_nic.id, hw->ident_nic.major,
-               hw->ident_nic.minor, hw->ident_nic.variant);
+                    hw->ident_nic.id, hw->ident_nic.major,
+                    hw->ident_nic.minor, hw->ident_nic.variant);
 
         /* Primary f/w identity */
         result = hfa384x_drvr_getconfig(hw, HFA384x_RID_PRIIDENTITY,
@@ -625,8 +628,8 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
         hw->ident_pri_fw.minor = le16_to_cpu(hw->ident_pri_fw.minor);
 
         netdev_info(wlandev->netdev, "ident: pri f/w: id=0x%02x %d.%d.%d\n",
-               hw->ident_pri_fw.id, hw->ident_pri_fw.major,
-               hw->ident_pri_fw.minor, hw->ident_pri_fw.variant);
+                    hw->ident_pri_fw.id, hw->ident_pri_fw.major,
+                    hw->ident_pri_fw.minor, hw->ident_pri_fw.variant);
 
         /* Station (Secondary?) f/w identity */
         result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STAIDENTITY,
@@ -639,7 +642,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
 
         if (hw->ident_nic.id < 0x8000) {
                 netdev_err(wlandev->netdev,
-                       "FATAL: Card is not an Intersil Prism2/2.5/3\n");
+                           "FATAL: Card is not an Intersil Prism2/2.5/3\n");
                 result = -1;
                 goto failed;
         }
@@ -651,19 +654,19 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
         hw->ident_sta_fw.minor = le16_to_cpu(hw->ident_sta_fw.minor);
 
         /* strip out the 'special' variant bits */
-        hw->mm_mods = hw->ident_sta_fw.variant & (BIT(14) | BIT(15));
-        hw->ident_sta_fw.variant &= ~((u16)(BIT(14) | BIT(15)));
+        hw->mm_mods = hw->ident_sta_fw.variant & GENMASK(15, 14);
+        hw->ident_sta_fw.variant &= ~((u16)GENMASK(15, 14));
 
         if (hw->ident_sta_fw.id == 0x1f) {
                 netdev_info(wlandev->netdev,
-                       "ident: sta f/w: id=0x%02x %d.%d.%d\n",
-                       hw->ident_sta_fw.id, hw->ident_sta_fw.major,
-                       hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
+                            "ident: sta f/w: id=0x%02x %d.%d.%d\n",
+                            hw->ident_sta_fw.id, hw->ident_sta_fw.major,
+                            hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
         } else {
                 netdev_info(wlandev->netdev,
-                       "ident:  ap f/w: id=0x%02x %d.%d.%d\n",
-                       hw->ident_sta_fw.id, hw->ident_sta_fw.major,
-                       hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
+                            "ident:  ap f/w: id=0x%02x %d.%d.%d\n",
+                            hw->ident_sta_fw.id, hw->ident_sta_fw.major,
+                            hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
                 netdev_err(wlandev->netdev, "Unsupported Tertiary AP firmware loaded!\n");
                 goto failed;
         }
@@ -687,10 +690,10 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
         hw->cap_sup_mfi.top = le16_to_cpu(hw->cap_sup_mfi.top);
 
         netdev_info(wlandev->netdev,
-               "MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
-               hw->cap_sup_mfi.role, hw->cap_sup_mfi.id,
-               hw->cap_sup_mfi.variant, hw->cap_sup_mfi.bottom,
-               hw->cap_sup_mfi.top);
+                    "MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+                    hw->cap_sup_mfi.role, hw->cap_sup_mfi.id,
+                    hw->cap_sup_mfi.variant, hw->cap_sup_mfi.bottom,
+                    hw->cap_sup_mfi.top);
 
         /* Compatibility range, Controller supplier */
         result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CFISUPRANGE,
@@ -711,10 +714,10 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
         hw->cap_sup_cfi.top = le16_to_cpu(hw->cap_sup_cfi.top);
 
         netdev_info(wlandev->netdev,
-               "CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
-               hw->cap_sup_cfi.role, hw->cap_sup_cfi.id,
-               hw->cap_sup_cfi.variant, hw->cap_sup_cfi.bottom,
-               hw->cap_sup_cfi.top);
+                    "CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+                    hw->cap_sup_cfi.role, hw->cap_sup_cfi.id,
+                    hw->cap_sup_cfi.variant, hw->cap_sup_cfi.bottom,
+                    hw->cap_sup_cfi.top);
 
         /* Compatibility range, Primary f/w supplier */
         result = hfa384x_drvr_getconfig(hw, HFA384x_RID_PRISUPRANGE,
@@ -735,10 +738,10 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
         hw->cap_sup_pri.top = le16_to_cpu(hw->cap_sup_pri.top);
 
         netdev_info(wlandev->netdev,
-               "PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
-               hw->cap_sup_pri.role, hw->cap_sup_pri.id,
-               hw->cap_sup_pri.variant, hw->cap_sup_pri.bottom,
-               hw->cap_sup_pri.top);
+                    "PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+                    hw->cap_sup_pri.role, hw->cap_sup_pri.id,
+                    hw->cap_sup_pri.variant, hw->cap_sup_pri.bottom,
+                    hw->cap_sup_pri.top);
 
         /* Compatibility range, Station f/w supplier */
         result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STASUPRANGE,
@@ -791,10 +794,10 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
         hw->cap_act_pri_cfi.top = le16_to_cpu(hw->cap_act_pri_cfi.top);
 
         netdev_info(wlandev->netdev,
-               "PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
-               hw->cap_act_pri_cfi.role, hw->cap_act_pri_cfi.id,
-               hw->cap_act_pri_cfi.variant, hw->cap_act_pri_cfi.bottom,
-               hw->cap_act_pri_cfi.top);
+                    "PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+                    hw->cap_act_pri_cfi.role, hw->cap_act_pri_cfi.id,
+                    hw->cap_act_pri_cfi.variant, hw->cap_act_pri_cfi.bottom,
+                    hw->cap_act_pri_cfi.top);
 
         /* Compatibility range, sta f/w actor, CFI supplier */
         result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STA_CFIACTRANGES,
@@ -815,10 +818,10 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
         hw->cap_act_sta_cfi.top = le16_to_cpu(hw->cap_act_sta_cfi.top);
 
         netdev_info(wlandev->netdev,
-               "STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
-               hw->cap_act_sta_cfi.role, hw->cap_act_sta_cfi.id,
-               hw->cap_act_sta_cfi.variant, hw->cap_act_sta_cfi.bottom,
-               hw->cap_act_sta_cfi.top);
+                    "STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+                    hw->cap_act_sta_cfi.role, hw->cap_act_sta_cfi.id,
+                    hw->cap_act_sta_cfi.variant, hw->cap_act_sta_cfi.bottom,
+                    hw->cap_act_sta_cfi.top);
 
         /* Compatibility range, sta f/w actor, MFI supplier */
         result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STA_MFIACTRANGES,
@@ -839,10 +842,10 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev)
         hw->cap_act_sta_mfi.top = le16_to_cpu(hw->cap_act_sta_mfi.top);
 
         netdev_info(wlandev->netdev,
-               "STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
-               hw->cap_act_sta_mfi.role, hw->cap_act_sta_mfi.id,
-               hw->cap_act_sta_mfi.variant, hw->cap_act_sta_mfi.bottom,
-               hw->cap_act_sta_mfi.top);
+                    "STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+                    hw->cap_act_sta_mfi.role, hw->cap_act_sta_mfi.id,
+                    hw->cap_act_sta_mfi.variant, hw->cap_act_sta_mfi.bottom,
+                    hw->cap_act_sta_mfi.top);
 
         /* Serial Number */
         result = hfa384x_drvr_getconfig(hw, HFA384x_RID_NICSERIALNUMBER,
@@ -920,7 +923,7 @@ static int prism2sta_globalsetup(struct wlandevice *wlandev)
 }
 
 static int prism2sta_setmulticast(struct wlandevice *wlandev,
-                                        struct net_device *dev)
+                                  struct net_device *dev)
 {
         int result = 0;
         struct hfa384x *hw = wlandev->priv;
@@ -962,7 +965,7 @@ exit:
  *      interrupt
  */
 static void prism2sta_inf_handover(struct wlandevice *wlandev,
-                                   struct hfa384x_InfFrame *inf)
+                                   struct hfa384x_inf_frame *inf)
 {
         pr_debug("received infoframe:HANDOVER (unhandled)\n");
 }
@@ -985,7 +988,7 @@ static void prism2sta_inf_handover(struct wlandevice *wlandev,
  *      interrupt
  */
 static void prism2sta_inf_tallies(struct wlandevice *wlandev,
-                                  struct hfa384x_InfFrame *inf)
+                                  struct hfa384x_inf_frame *inf)
 {
         struct hfa384x *hw = wlandev->priv;
         u16 *src16;
@@ -999,7 +1002,7 @@ static void prism2sta_inf_tallies(struct wlandevice *wlandev,
          * record length of the info record.
          */
 
-        cnt = sizeof(struct hfa384x_CommTallies32) / sizeof(u32);
+        cnt = sizeof(struct hfa384x_comm_tallies_32) / sizeof(u32);
         if (inf->framelen > 22) {
                 dst = (u32 *)&hw->tallies;
                 src32 = (u32 *)&inf->info.commtallies32;
@@ -1031,19 +1034,19 @@ static void prism2sta_inf_tallies(struct wlandevice *wlandev,
  *      interrupt
  */
 static void prism2sta_inf_scanresults(struct wlandevice *wlandev,
-                                      struct hfa384x_InfFrame *inf)
+                                      struct hfa384x_inf_frame *inf)
 {
         struct hfa384x *hw = wlandev->priv;
         int nbss;
-        struct hfa384x_ScanResult *sr = &(inf->info.scanresult);
+        struct hfa384x_scan_result *sr = &inf->info.scanresult;
         int i;
-        struct hfa384x_JoinRequest_data joinreq;
+        struct hfa384x_join_request_data joinreq;
         int result;
 
         /* Get the number of results, first in bytes, then in results */
         nbss = (inf->framelen * sizeof(u16)) -
             sizeof(inf->infotype) - sizeof(inf->info.scanresult.scanreason);
-        nbss /= sizeof(struct hfa384x_ScanResultSub);
+        nbss /= sizeof(struct hfa384x_scan_result_sub);
 
         /* Print em */
         pr_debug("rx scanresults, reason=%d, nbss=%d:\n",
@@ -1064,7 +1067,7 @@ static void prism2sta_inf_scanresults(struct wlandevice *wlandev,
                                         &joinreq, HFA384x_RID_JOINREQUEST_LEN);
         if (result) {
                 netdev_err(wlandev->netdev, "setconfig(joinreq) failed, result=%d\n",
-                       result);
+                           result);
         }
 }
 
@@ -1086,7 +1089,7 @@ static void prism2sta_inf_scanresults(struct wlandevice *wlandev,
  *      interrupt
  */
 static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,
-                                          struct hfa384x_InfFrame *inf)
+                                          struct hfa384x_inf_frame *inf)
 {
         struct hfa384x *hw = wlandev->priv;
         int nbss;
@@ -1099,7 +1102,7 @@ static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,
 
         kfree(hw->scanresults);
 
-        hw->scanresults = kmemdup(inf, sizeof(struct hfa384x_InfFrame), GFP_ATOMIC);
+        hw->scanresults = kmemdup(inf, sizeof(*inf), GFP_ATOMIC);
 
         if (nbss == 0)
                 nbss = -1;
@@ -1127,7 +1130,7 @@ static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,
  *      interrupt
  */
 static void prism2sta_inf_chinforesults(struct wlandevice *wlandev,
-                                        struct hfa384x_InfFrame *inf)
+                                        struct hfa384x_inf_frame *inf)
 {
         struct hfa384x *hw = wlandev->priv;
         unsigned int i, n;
@@ -1136,8 +1139,8 @@ static void prism2sta_inf_chinforesults(struct wlandevice *wlandev,
             le16_to_cpu(inf->info.chinforesult.scanchannels);
 
         for (i = 0, n = 0; i < HFA384x_CHINFORESULT_MAX; i++) {
-                struct hfa384x_ChInfoResultSub *result;
-                struct hfa384x_ChInfoResultSub *chinforesult;
+                struct hfa384x_ch_info_result_sub *result;
+                struct hfa384x_ch_info_result_sub *chinforesult;
                 int chan;
 
                 if (!(hw->channel_info.results.scanchannels & (1 << i)))
@@ -1179,10 +1182,10 @@ void prism2sta_processing_defer(struct work_struct *data)
         /* First let's process the auth frames */
         {
                 struct sk_buff *skb;
-                struct hfa384x_InfFrame *inf;
+                struct hfa384x_inf_frame *inf;
 
                 while ((skb = skb_dequeue(&hw->authq))) {
-                        inf = (struct hfa384x_InfFrame *)skb->data;
+                        inf = (struct hfa384x_inf_frame *)skb->data;
                         prism2sta_inf_authreq_defer(wlandev, inf);
                 }
 
@@ -1294,7 +1297,7 @@ void prism2sta_processing_defer(struct work_struct *data)
                  */
                 if (wlandev->netdev->type == ARPHRD_ETHER)
                         netdev_info(wlandev->netdev,
-                               "linkstatus=DISCONNECTED (unhandled)\n");
+                                    "linkstatus=DISCONNECTED (unhandled)\n");
                 wlandev->macmode = WLAN_MACMODE_NONE;
 
                 netif_carrier_off(wlandev->netdev);
@@ -1391,7 +1394,7 @@ void prism2sta_processing_defer(struct work_struct *data)
                  * Disable Transmits, Ignore receives of data frames
                  */
                 if (hw->join_ap && --hw->join_retries > 0) {
-                        struct hfa384x_JoinRequest_data joinreq;
+                        struct hfa384x_join_request_data joinreq;
 
                         joinreq = hw->joinreq;
                         /* Send the join request */
@@ -1415,7 +1418,7 @@ void prism2sta_processing_defer(struct work_struct *data)
         default:
                 /* This is bad, IO port problems? */
                 netdev_warn(wlandev->netdev,
-                       "unknown linkstatus=0x%02x\n", hw->link_status);
+                            "unknown linkstatus=0x%02x\n", hw->link_status);
                 return;
         }
 
@@ -1440,7 +1443,7 @@ void prism2sta_processing_defer(struct work_struct *data)
  *      interrupt
  */
 static void prism2sta_inf_linkstatus(struct wlandevice *wlandev,
-                                     struct hfa384x_InfFrame *inf)
+                                     struct hfa384x_inf_frame *inf)
 {
         struct hfa384x *hw = wlandev->priv;
 
@@ -1468,10 +1471,10 @@ static void prism2sta_inf_linkstatus(struct wlandevice *wlandev,
  *      interrupt
  */
 static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,
-                                      struct hfa384x_InfFrame *inf)
+                                      struct hfa384x_inf_frame *inf)
 {
         struct hfa384x *hw = wlandev->priv;
-        struct hfa384x_AssocStatus rec;
+        struct hfa384x_assoc_status rec;
         int i;
 
         memcpy(&rec, &inf->info.assocstatus, sizeof(rec));
@@ -1529,7 +1532,7 @@ static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,
  *
  */
 static void prism2sta_inf_authreq(struct wlandevice *wlandev,
-                                  struct hfa384x_InfFrame *inf)
+                                  struct hfa384x_inf_frame *inf)
 {
         struct hfa384x *hw = wlandev->priv;
         struct sk_buff *skb;
@@ -1544,10 +1547,10 @@ static void prism2sta_inf_authreq(struct wlandevice *wlandev,
 }
 
 static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,
-                                        struct hfa384x_InfFrame *inf)
+                                        struct hfa384x_inf_frame *inf)
 {
         struct hfa384x *hw = wlandev->priv;
-        struct hfa384x_authenticateStation_data rec;
+        struct hfa384x_authenticate_station_data rec;
 
         int i, added, result, cnt;
         u8 *addr;
@@ -1718,7 +1721,7 @@ static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,
  *      interrupt
  */
 static void prism2sta_inf_psusercnt(struct wlandevice *wlandev,
-                                    struct hfa384x_InfFrame *inf)
+                                    struct hfa384x_inf_frame *inf)
 {
         struct hfa384x *hw = wlandev->priv;
 
@@ -1742,7 +1745,8 @@ static void prism2sta_inf_psusercnt(struct wlandevice *wlandev,
  * Call context:
  *      interrupt
  */
-void prism2sta_ev_info(struct wlandevice *wlandev, struct hfa384x_InfFrame *inf)
+void prism2sta_ev_info(struct wlandevice *wlandev,
+                       struct hfa384x_inf_frame *inf)
 {
         inf->infotype = le16_to_cpu(inf->infotype);
         /* Dispatch */
@@ -1785,7 +1789,7 @@ void prism2sta_ev_info(struct wlandevice *wlandev, struct hfa384x_InfFrame *inf)
                 break;
         default:
                 netdev_warn(wlandev->netdev,
-                       "Unknown info type=0x%02x\n", inf->infotype);
+                            "Unknown info type=0x%02x\n", inf->infotype);
                 break;
         }
 }
@@ -1859,32 +1863,32 @@ void prism2sta_ev_alloc(struct wlandevice *wlandev)
 }
 
 /*
-* create_wlan
-*
-* Called at module init time.  This creates the struct wlandevice structure
-* and initializes it with relevant bits.
-*
-* Arguments:
-*       none
-*
-* Returns:
-*       the created struct wlandevice structure.
-*
-* Side effects:
-*       also allocates the priv/hw structures.
-*
-* Call context:
-*       process thread
-*
-*/
+ * create_wlan
+ *
+ * Called at module init time.  This creates the struct wlandevice structure
+ * and initializes it with relevant bits.
+ *
+ * Arguments:
+ *      none
+ *
+ * Returns:
+ *      the created struct wlandevice structure.
+ *
+ * Side effects:
+ *      also allocates the priv/hw structures.
+ *
+ * Call context:
+ *      process thread
+ *
+ */
 static struct wlandevice *create_wlan(void)
 {
         struct wlandevice *wlandev = NULL;
         struct hfa384x *hw = NULL;
 
         /* Alloc our structures */
-        wlandev = kzalloc(sizeof(struct wlandevice), GFP_KERNEL);
-        hw = kzalloc(sizeof(struct hfa384x), GFP_KERNEL);
+        wlandev = kzalloc(sizeof(*wlandev), GFP_KERNEL);
+        hw = kzalloc(sizeof(*hw), GFP_KERNEL);
 
         if (!wlandev || !hw) {
                 kfree(wlandev);
@@ -1943,9 +1947,9 @@ void prism2sta_commsqual_defer(struct work_struct *data)
                 }
 
                 pr_debug("commsqual %d %d %d\n",
-                         le16_to_cpu(hw->qual.CQ_currBSS),
-                         le16_to_cpu(hw->qual.ASL_currBSS),
-                         le16_to_cpu(hw->qual.ANL_currFC));
+                         le16_to_cpu(hw->qual.cq_curr_bss),
+                         le16_to_cpu(hw->qual.asl_curr_bss),
+                         le16_to_cpu(hw->qual.anl_curr_fc));
         }
 
         /* Get the signal rate */
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 85079fea7152..7a80a90f229f 100644
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -139,7 +139,7 @@ static const struct _XGIbios_mode {
 
 static const unsigned short XGI310paneltype[] = {
          LCD_UNKNOWN,   LCD_800x600, LCD_1024x768, LCD_1280x1024,
-         LCD_640x480,  LCD_1024x600, LCD_1152x864, LCD_1280x960,
+         LCD_640x480,  LCD_1024x600, LCD_1152x864,  LCD_1280x960,
         LCD_1152x768, LCD_1400x1050, LCD_1280x768, LCD_1600x1200,
         LCD_1024x768,  LCD_1024x768, LCD_1024x768};
 
@@ -174,7 +174,7 @@ static const struct _XGI_tvtype {
         {"NTSC",        2},
         {"pal",         1},
         {"ntsc",        2},
-        {"\0",          -1}
+        {"\0",         -1}
 };
 
 static const struct _XGI_vrate {
@@ -183,44 +183,44 @@ static const struct _XGI_vrate {
         u16 yres;
         u16 refresh;
 } XGIfb_vrate[] = {
-        {1,  640,  480, 60}, {2,  640,  480,  72},
-        {3, 640,   480,  75}, {4,  640, 480,  85},
+        {1,  640,  480,  60}, {2,  640,  480,  72},
+        {3,  640,  480,  75}, {4,  640,  480,  85},
 
         {5,  640,  480, 100}, {6,  640,  480, 120},
-        {7, 640,   480, 160}, {8,  640, 480, 200},
+        {7,  640,  480, 160}, {8,  640,  480, 200},
 
-        {1,  720,  480, 60},
-        {1,  720,  576, 58},
-        {1,  800,  480, 60}, {2,  800,  480,  75}, {3, 800,   480,  85},
-        {1,  800,  600,  60}, {2, 800,   600,  72}, {3,  800, 600,  75},
-        {4,  800,  600, 85}, {5,  800,  600, 100},
-        {6, 800,   600, 120}, {7,  800, 600, 160},
+        {1,  720,  480,  60},
+        {1,  720,  576,  58},
+        {1,  800,  480,  60}, {2,  800,  480,  75}, {3,  800,  480,  85},
+        {1,  800,  600,  60}, {2,  800,  600,  72}, {3,  800,  600,  75},
+        {4,  800,  600,  85}, {5,  800,  600, 100},
+        {6,  800,  600, 120}, {7,  800,  600, 160},
 
-        {1, 1024,  768,  60}, {2, 1024,  768,  70}, {3, 1024, 768,  75},
-        {4, 1024,  768, 85}, {5, 1024,  768, 100}, {6, 1024,  768, 120},
-        {1, 1024,  576, 60}, {2, 1024,  576,  75}, {3, 1024,  576,  85},
-        {1, 1024,  600, 60},
-        {1, 1152,  768, 60},
-        {1, 1280,  720, 60}, {2, 1280,  720,  75}, {3, 1280,  720,  85},
-        {1, 1280,  768, 60},
+        {1, 1024,  768,  60}, {2, 1024,  768,  70}, {3, 1024,  768,  75},
+        {4, 1024,  768,  85}, {5, 1024,  768, 100}, {6, 1024,  768, 120},
+        {1, 1024,  576,  60}, {2, 1024,  576,  75}, {3, 1024,  576,  85},
+        {1, 1024,  600,  60},
+        {1, 1152,  768,  60},
+        {1, 1280,  720,  60}, {2, 1280,  720,  75}, {3, 1280,  720,  85},
+        {1, 1280,  768,  60},
         {1, 1280, 1024,  60}, {2, 1280, 1024,  75}, {3, 1280, 1024,  85},
-        {1, 1280,  960, 70},
-        {1, 1400, 1050, 60},
-        {1, 1600, 1200, 60}, {2, 1600, 1200,  65},
+        {1, 1280,  960,  70},
+        {1, 1400, 1050,  60},
+        {1, 1600, 1200,  60}, {2, 1600, 1200,  65},
         {3, 1600, 1200,  70}, {4, 1600, 1200,  75},
 
-        {5, 1600, 1200, 85}, {6, 1600, 1200, 100},
+        {5, 1600, 1200,  85}, {6, 1600, 1200, 100},
         {7, 1600, 1200, 120},
 
-        {1, 1920, 1440, 60}, {2, 1920, 1440,  65},
+        {1, 1920, 1440,  60}, {2, 1920, 1440,  65},
         {3, 1920, 1440,  70}, {4, 1920, 1440,  75},
 
-        {5, 1920, 1440, 85}, {6, 1920, 1440, 100},
-        {1, 2048, 1536, 60}, {2, 2048, 1536,  65},
+        {5, 1920, 1440,  85}, {6, 1920, 1440, 100},
+        {1, 2048, 1536,  60}, {2, 2048, 1536,  65},
         {3, 2048, 1536,  70}, {4, 2048, 1536,  75},
 
-        {5, 2048, 1536, 85},
-        {0, 0, 0, 0}
+        {5, 2048, 1536,  85},
+        {0,    0,    0,   0}
 };
 
 static const struct _XGI_TV_filter {
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 0c78491ff5a1..777cd6e11694 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -56,8 +56,8 @@ static inline void dumpVGAReg(struct xgifb_video_info *xgifb_info)
 /* --------------- Hardware Access Routines -------------------------- */
 
 static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
-                struct xgi_hw_device_info *HwDeviceExtension,
-                unsigned char modeno)
+                                     struct xgi_hw_device_info *HwDeviceExtension,
+                                     unsigned char modeno)
 {
         unsigned short ModeNo = modeno;
         unsigned short ModeIdIndex = 0, ClockIndex = 0;
@@ -68,7 +68,7 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
         XGI_SearchModeID(ModeNo, &ModeIdIndex);
 
         RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
-                        ModeIdIndex, XGI_Pr);
+                                                   ModeIdIndex, XGI_Pr);
 
         ClockIndex = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
 
@@ -76,11 +76,11 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
 }
 
 static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
-                struct xgi_hw_device_info *HwDeviceExtension,
-                unsigned char modeno,
-                u32 *left_margin, u32 *right_margin, u32 *upper_margin,
-                u32 *lower_margin, u32 *hsync_len, u32 *vsync_len, u32 *sync,
-                u32 *vmode)
+                                    struct xgi_hw_device_info *HwDeviceExtension,
+                                    unsigned char modeno, u32 *left_margin,
+                                    u32 *right_margin, u32 *upper_margin,
+                                    u32 *lower_margin, u32 *hsync_len,
+                                    u32 *vsync_len, u32 *sync, u32 *vmode)
 {
         unsigned short ModeNo = modeno;
         unsigned short ModeIdIndex, index = 0;
@@ -95,7 +95,7 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
         if (!XGI_SearchModeID(ModeNo, &ModeIdIndex))
                 return 0;
         RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
-                        ModeIdIndex, XGI_Pr);
+                                                   ModeIdIndex, XGI_Pr);
         index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
 
         sr_data = XGI_CRT1Table[index].CR[5];
@@ -105,7 +105,7 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
         cr_data = XGI_CRT1Table[index].CR[3];
 
         /* Horizontal retrace (=sync) start */
-        HRS = (cr_data & 0xff) | ((unsigned short) (sr_data & 0xC0) << 2);
+        HRS = (cr_data & 0xff) | ((unsigned short)(sr_data & 0xC0) << 2);
         F = HRS - HDE - 3;
 
         sr_data = XGI_CRT1Table[index].CR[6];
@@ -115,8 +115,8 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
         cr_data2 = XGI_CRT1Table[index].CR[4];
 
         /* Horizontal blank end */
-        HBE = (cr_data & 0x1f) | ((unsigned short) (cr_data2 & 0x80) >> 2)
-                        | ((unsigned short) (sr_data & 0x03) << 6);
+        HBE = (cr_data & 0x1f) | ((unsigned short)(cr_data2 & 0x80) >> 2)
+                        | ((unsigned short)(sr_data & 0x03) << 6);
 
         /* Horizontal retrace (=sync) end */
         HRE = (cr_data2 & 0x1f) | ((sr_data & 0x04) << 3);
@@ -142,15 +142,15 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
         cr_data = XGI_CRT1Table[index].CR[10];
 
         /* Vertical retrace (=sync) start */
-        VRS = (cr_data & 0xff) | ((unsigned short) (cr_data2 & 0x04) << 6)
-                        | ((unsigned short) (cr_data2 & 0x80) << 2)
-                        | ((unsigned short) (sr_data & 0x08) << 7);
+        VRS = (cr_data & 0xff) | ((unsigned short)(cr_data2 & 0x04) << 6)
+                        | ((unsigned short)(cr_data2 & 0x80) << 2)
+                        | ((unsigned short)(sr_data & 0x08) << 7);
         F = VRS + 1 - VDE;
 
         cr_data = XGI_CRT1Table[index].CR[13];
 
         /* Vertical blank end */
-        VBE = (cr_data & 0xff) | ((unsigned short) (sr_data & 0x10) << 4);
+        VBE = (cr_data & 0xff) | ((unsigned short)(sr_data & 0x10) << 4);
         temp = VBE - ((VDE - 1) & 511);
         B = (temp > 0) ? temp : (temp + 512);
 
@@ -231,11 +231,11 @@ static int XGIfb_GetXG21DefaultLVDSModeIdx(struct xgifb_video_info *xgifb_info)
 {
         int i = 0;
 
-        while ((XGIbios_mode[i].mode_no != 0)
-               && (XGIbios_mode[i].xres <= xgifb_info->lvds_data.LVDSHDE)) {
-                if ((XGIbios_mode[i].xres == xgifb_info->lvds_data.LVDSHDE)
-                    && (XGIbios_mode[i].yres == xgifb_info->lvds_data.LVDSVDE)
-                    && (XGIbios_mode[i].bpp == 8)) {
+        while ((XGIbios_mode[i].mode_no != 0) &&
+               (XGIbios_mode[i].xres <= xgifb_info->lvds_data.LVDSHDE)) {
+                if ((XGIbios_mode[i].xres == xgifb_info->lvds_data.LVDSHDE) &&
+                    (XGIbios_mode[i].yres == xgifb_info->lvds_data.LVDSVDE) &&
+                    (XGIbios_mode[i].bpp == 8)) {
                         return i;
                 }
                 i++;
@@ -384,9 +384,8 @@ static int XGIfb_validate_mode(struct xgifb_video_info *xgifb_info, int myindex)
                                         return -1;
                                 break;
                         case 640:
-                                if ((XGIbios_mode[myindex].yres != 400)
-                                                && (XGIbios_mode[myindex].yres
-                                                                != 480))
+                                if ((XGIbios_mode[myindex].yres != 400) &&
+                                    (XGIbios_mode[myindex].yres != 480))
                                         return -1;
                                 break;
                         case 800:
@@ -518,7 +517,7 @@ static void XGIfb_search_crt2type(const char *name)
 {
         int i = 0;
 
-        if (name == NULL)
+        if (!name)
                 return;
 
         while (XGI_crt2type[i].type_no != -1) {
@@ -562,7 +561,7 @@ static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info,
                                                 != 1)) {
                                         pr_debug("Adjusting rate from %d down to %d\n",
                                                  rate,
-                                                 XGIfb_vrate[i-1].refresh);
+                                                 XGIfb_vrate[i - 1].refresh);
                                         xgifb_info->rate_idx =
                                                 XGIfb_vrate[i - 1].idx;
                                         xgifb_info->refresh_rate =
@@ -589,7 +588,7 @@ static void XGIfb_search_tvstd(const char *name)
 {
         int i = 0;
 
-        if (name == NULL)
+        if (!name)
                 return;
 
         while (XGI_tvtype[i].type_no != -1) {
@@ -683,7 +682,7 @@ static void XGIfb_pre_setmode(struct xgifb_video_info *xgifb_info)
         xgifb_reg_set(XGICR, IND_XGI_SCRATCH_REG_CR30, cr30);
         xgifb_reg_set(XGICR, IND_XGI_SCRATCH_REG_CR31, cr31);
         xgifb_reg_set(XGICR, IND_XGI_SCRATCH_REG_CR33,
-                                                (xgifb_info->rate_idx & 0x0F));
+                      (xgifb_info->rate_idx & 0x0F));
 }
 
 static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
@@ -730,7 +729,6 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
 
         if (xgifb_info->display2 == XGIFB_DISP_TV &&
             xgifb_info->hasVB == HASVB_301) {
-
                 reg = xgifb_reg_get(XGIPART4, 0x01);
 
                 if (reg < 0xB0) { /* Set filter for XGI301 */
@@ -763,16 +761,13 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
                                      0x01);
 
                         if (xgifb_info->TV_type == TVMODE_NTSC) {
-
                                 xgifb_reg_and(XGIPART2, 0x3a, 0x1f);
 
                                 if (xgifb_info->TV_plug == TVPLUG_SVIDEO) {
-
                                         xgifb_reg_and(XGIPART2, 0x30, 0xdf);
 
                                 } else if (xgifb_info->TV_plug
                                                 == TVPLUG_COMPOSITE) {
-
                                         xgifb_reg_or(XGIPART2, 0x30, 0x20);
 
                                         switch (xgifb_info->video_width) {
@@ -822,16 +817,13 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
                                 }
 
                         } else if (xgifb_info->TV_type == TVMODE_PAL) {
-
                                 xgifb_reg_and(XGIPART2, 0x3A, 0x1F);
 
                                 if (xgifb_info->TV_plug == TVPLUG_SVIDEO) {
-
                                         xgifb_reg_and(XGIPART2, 0x30, 0xDF);
 
                                 } else if (xgifb_info->TV_plug
                                                 == TVPLUG_COMPOSITE) {
-
                                         xgifb_reg_or(XGIPART2, 0x30, 0x20);
 
                                         switch (xgifb_info->video_width) {
@@ -912,7 +904,7 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
 }
 
 static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
-                struct fb_info *info)
+                            struct fb_info *info)
 {
         struct xgifb_video_info *xgifb_info = info->par;
         struct xgi_hw_device_info *hw_info = &xgifb_info->hw_info;
@@ -945,17 +937,15 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
         if (var->pixclock) {
                 drate = 1000000000 / var->pixclock;
                 hrate = (drate * 1000) / htotal;
-                xgifb_info->refresh_rate = (unsigned int) (hrate * 2
+                xgifb_info->refresh_rate = (unsigned int)(hrate * 2
                                 / vtotal);
         } else {
                 xgifb_info->refresh_rate = 60;
         }
 
         pr_debug("Change mode to %dx%dx%d-%dHz\n",
-               var->xres,
-               var->yres,
-               var->bits_per_pixel,
-               xgifb_info->refresh_rate);
+                 var->xres, var->yres, var->bits_per_pixel,
+                 xgifb_info->refresh_rate);
 
         old_mode = xgifb_info->mode_idx;
         xgifb_info->mode_idx = 0;
@@ -992,7 +982,6 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
         }
 
         if (isactive) {
-
                 XGIfb_pre_setmode(xgifb_info);
                 if (XGISetModeNew(xgifb_info, hw_info,
                                   XGIbios_mode[xgifb_info->mode_idx].mode_no)
@@ -1064,7 +1053,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
                         break;
                 }
         }
-        XGIfb_bpp_to_var(xgifb_info, var); /*update ARGB info*/
+        XGIfb_bpp_to_var(xgifb_info, var); /* update ARGB info */
 
         dumpVGAReg(xgifb_info);
         return 0;
@@ -1150,7 +1139,7 @@ static int XGIfb_setcolreg(unsigned int regno, unsigned int red,
                 }
                 break;
         case 16:
-                ((u32 *) (info->pseudo_palette))[regno] = ((red & 0xf800))
+                ((u32 *)(info->pseudo_palette))[regno] = ((red & 0xf800))
                                 | ((green & 0xfc00) >> 5) | ((blue & 0xf800)
                                 >> 11);
                 break;
@@ -1158,7 +1147,7 @@ static int XGIfb_setcolreg(unsigned int regno, unsigned int red,
                 red >>= 8;
                 green >>= 8;
                 blue >>= 8;
-                ((u32 *) (info->pseudo_palette))[regno] = (red << 16) | (green
+                ((u32 *)(info->pseudo_palette))[regno] = (red << 16) | (green
                                 << 8) | (blue);
                 break;
         }
@@ -1168,7 +1157,7 @@ static int XGIfb_setcolreg(unsigned int regno, unsigned int red,
 /* ----------- FBDev related routines for all series ---------- */
 
 static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
-                struct fb_info *info)
+                         struct fb_info *info)
 {
         struct xgifb_video_info *xgifb_info = info->par;
 
@@ -1250,7 +1239,7 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                 drate = 1000000000 / var->pixclock;
                 hrate = (drate * 1000) / htotal;
                 xgifb_info->refresh_rate =
-                        (unsigned int) (hrate * 2 / vtotal);
+                        (unsigned int)(hrate * 2 / vtotal);
                 pr_debug(
                         "%s: pixclock = %d ,htotal=%d, vtotal=%d\n"
                         "%s: drate=%d, hrate=%d, refresh_rate=%d\n",
@@ -1262,10 +1251,10 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
         search_idx = 0;
         while ((XGIbios_mode[search_idx].mode_no != 0) &&
-                (XGIbios_mode[search_idx].xres <= var->xres)) {
+               (XGIbios_mode[search_idx].xres <= var->xres)) {
                 if ((XGIbios_mode[search_idx].xres == var->xres) &&
-                        (XGIbios_mode[search_idx].yres == var->yres) &&
-                        (XGIbios_mode[search_idx].bpp == var->bits_per_pixel)) {
+                    (XGIbios_mode[search_idx].yres == var->yres) &&
+                    (XGIbios_mode[search_idx].bpp == var->bits_per_pixel)) {
                         if (XGIfb_validate_mode(xgifb_info, search_idx) > 0) {
                                 found_mode = 1;
                                 break;
@@ -1275,9 +1264,8 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         }
 
         if (!found_mode) {
-
                 pr_err("%dx%dx%d is no valid mode\n",
-                        var->xres, var->yres, var->bits_per_pixel);
+                       var->xres, var->yres, var->bits_per_pixel);
                 search_idx = 0;
                 while (XGIbios_mode[search_idx].mode_no != 0) {
                         if ((var->xres <= XGIbios_mode[search_idx].xres) &&
@@ -1296,11 +1284,11 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
                         var->xres = XGIbios_mode[search_idx].xres;
                         var->yres = XGIbios_mode[search_idx].yres;
                         pr_debug("Adapted to mode %dx%dx%d\n",
-                                var->xres, var->yres, var->bits_per_pixel);
+                                 var->xres, var->yres, var->bits_per_pixel);
 
                 } else {
                         pr_err("Failed to find similar mode to %dx%dx%d\n",
-                                var->xres, var->yres, var->bits_per_pixel);
+                               var->xres, var->yres, var->bits_per_pixel);
                         return -EINVAL;
                 }
         }
@@ -1332,7 +1320,7 @@ static int XGIfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 }
 
 static int XGIfb_pan_display(struct fb_var_screeninfo *var,
-                struct fb_info *info)
+                             struct fb_info *info)
 {
         int err;
 
@@ -1344,9 +1332,8 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var,
         if (var->vmode & FB_VMODE_YWRAP) {
                 if (var->yoffset >= info->var.yres_virtual || var->xoffset)
                         return -EINVAL;
-        } else if (var->xoffset + info->var.xres > info->var.xres_virtual
-                                || var->yoffset + info->var.yres
-                                                > info->var.yres_virtual) {
+        } else if (var->xoffset + info->var.xres > info->var.xres_virtual ||
+                   var->yoffset + info->var.yres > info->var.yres_virtual) {
                 return -EINVAL;
         }
         err = XGIfb_pan_var(var, info);
@@ -1401,7 +1388,6 @@ static struct fb_ops XGIfb_ops = {
 
 static int XGIfb_get_dram_size(struct xgifb_video_info *xgifb_info)
 {
-
         u8 ChannelNum, tmp;
         u8 reg = 0;
 
@@ -1474,10 +1460,8 @@ static int XGIfb_get_dram_size(struct xgifb_video_info *xgifb_info)
         xgifb_info->video_size = xgifb_info->video_size * ChannelNum;
 
         pr_info("SR14=%x DramSzie %x ChannelNum %x\n",
-               reg,
-               xgifb_info->video_size, ChannelNum);
+                reg, xgifb_info->video_size, ChannelNum);
         return 0;
-
 }
 
 static void XGIfb_detect_VB(struct xgifb_video_info *xgifb_info)
@@ -1597,7 +1581,6 @@ static int __init XGIfb_setup(char *options)
         pr_info("Options: %s\n", options);
 
         while ((this_opt = strsep(&options, ",")) != NULL) {
-
                 if (!*this_opt)
                         continue;
 
@@ -1634,8 +1617,7 @@ static int __init XGIfb_setup(char *options)
         return 0;
 }
 
-static int xgifb_probe(struct pci_dev *pdev,
-                const struct pci_device_id *ent)
+static int xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         u8 reg, reg1;
         u8 CR48, CR38;
@@ -1670,7 +1652,7 @@ static int xgifb_probe(struct pci_dev *pdev,
         xgifb_info->mmio_size = pci_resource_len(pdev, 1);
         xgifb_info->vga_base = pci_resource_start(pdev, 2) + 0x30;
         dev_info(&pdev->dev, "Relocate IO address: %Lx [%08lx]\n",
-                 (u64) pci_resource_start(pdev, 2),
+                 (u64)pci_resource_start(pdev, 2),
                  xgifb_info->vga_base);
 
         if (pci_enable_device(pdev)) {
@@ -1688,7 +1670,7 @@ static int xgifb_probe(struct pci_dev *pdev,
         xgifb_reg_set(XGISR, IND_SIS_PASSWORD, SIS_PASSWORD);
         reg1 = xgifb_reg_get(XGISR, IND_SIS_PASSWORD);
 
-        if (reg1 != 0xa1) { /*I/O error */
+        if (reg1 != 0xa1) { /* I/O error */
                 dev_err(&pdev->dev, "I/O error\n");
                 ret = -EIO;
                 goto error_disable;
@@ -1698,7 +1680,7 @@ static int xgifb_probe(struct pci_dev *pdev,
         case PCI_DEVICE_ID_XGI_20:
                 xgifb_reg_or(XGICR, Index_CR_GPIO_Reg3, GPIOG_EN);
                 CR48 = xgifb_reg_get(XGICR, Index_CR_GPIO_Reg1);
-                if (CR48&GPIOG_READ)
+                if (CR48 & GPIOG_READ)
                         xgifb_info->chip = XG21;
                 else
                         xgifb_info->chip = XG20;
@@ -1727,7 +1709,7 @@ static int xgifb_probe(struct pci_dev *pdev,
                 xgifb_info->video_size = video_size_max;
         }
 
-        /* Enable PCI_LINEAR_ADDRESSING and MMIO_ENABLE  */
+        /* Enable PCI_LINEAR_ADDRESSING and MMIO_ENABLE */
         xgifb_reg_or(XGISR,
                      IND_SIS_PCI_ADDRESS_SET,
                      (SIS_PCI_ADDR_ENABLE | SIS_MEM_MAP_IO_ENABLE));
@@ -1740,7 +1722,7 @@ static int xgifb_probe(struct pci_dev *pdev,
                                 xgifb_info->video_size,
                                 "XGIfb FB")) {
                 dev_err(&pdev->dev, "Unable request memory size %x\n",
-                       xgifb_info->video_size);
+                        xgifb_info->video_size);
                 dev_err(&pdev->dev,
                         "Fatal error: Unable to reserve frame buffer memory. Is there another framebuffer driver active?\n");
                 ret = -ENODEV;
@@ -1763,13 +1745,13 @@ static int xgifb_probe(struct pci_dev *pdev,
 
         dev_info(&pdev->dev,
                  "Framebuffer at 0x%Lx, mapped to 0x%p, size %dk\n",
-                 (u64) xgifb_info->video_base,
+                 (u64)xgifb_info->video_base,
                  xgifb_info->video_vbase,
                  xgifb_info->video_size / 1024);
 
         dev_info(&pdev->dev,
                  "MMIO at 0x%Lx, mapped to 0x%p, size %ldk\n",
-                 (u64) xgifb_info->mmio_base, xgifb_info->mmio_vbase,
+                 (u64)xgifb_info->mmio_base, xgifb_info->mmio_vbase,
                  xgifb_info->mmio_size / 1024);
 
         pci_set_drvdata(pdev, xgifb_info);
@@ -1784,9 +1766,9 @@ static int xgifb_probe(struct pci_dev *pdev,
                 xgifb_info->hasVB = HASVB_NONE;
         } else if (xgifb_info->chip == XG21) {
                 CR38 = xgifb_reg_get(XGICR, 0x38);
-                if ((CR38&0xE0) == 0xC0)
+                if ((CR38 & 0xE0) == 0xC0)
                         xgifb_info->display2 = XGIFB_DISP_LCD;
-                else if ((CR38&0xE0) == 0x60)
+                else if ((CR38 & 0xE0) == 0x60)
                         xgifb_info->hasVB = HASVB_CHRONTEL;
                 else
                         xgifb_info->hasVB = HASVB_NONE;
@@ -1903,8 +1885,7 @@ static int xgifb_probe(struct pci_dev *pdev,
         xgifb_info->refresh_rate = refresh_rate;
         if (xgifb_info->refresh_rate == 0)
                 xgifb_info->refresh_rate = 60;
-        if (XGIfb_search_refresh_rate(xgifb_info,
-                        xgifb_info->refresh_rate) == 0) {
+        if (XGIfb_search_refresh_rate(xgifb_info, xgifb_info->refresh_rate) == 0) {
                 xgifb_info->rate_idx = 1;
                 xgifb_info->refresh_rate = 60;
         }
@@ -1939,15 +1920,13 @@ static int xgifb_probe(struct pci_dev *pdev,
         default:
                 xgifb_info->video_cmap_len = 16;
                 pr_info("Unsupported depth %d\n",
-                       xgifb_info->video_bpp);
+                        xgifb_info->video_bpp);
                 break;
         }
 
         pr_info("Default mode is %dx%dx%d (%dHz)\n",
-               xgifb_info->video_width,
-               xgifb_info->video_height,
-               xgifb_info->video_bpp,
-               xgifb_info->refresh_rate);
+                xgifb_info->video_width, xgifb_info->video_height,
+                xgifb_info->video_bpp, xgifb_info->refresh_rate);
 
         fb_info->var.red.length         = 8;
         fb_info->var.green.length       = 8;
@@ -1964,22 +1943,20 @@ static int xgifb_probe(struct pci_dev *pdev,
 
         XGIfb_bpp_to_var(xgifb_info, &fb_info->var);
 
-        fb_info->var.pixclock = (u32) (1000000000 /
-                        XGIfb_mode_rate_to_dclock(&xgifb_info->dev_info,
-                                hw_info,
-                                XGIbios_mode[xgifb_info->mode_idx].mode_no));
-
-        if (XGIfb_mode_rate_to_ddata(&xgifb_info->dev_info, hw_info,
-                XGIbios_mode[xgifb_info->mode_idx].mode_no,
-                &fb_info->var.left_margin,
-                &fb_info->var.right_margin,
-                &fb_info->var.upper_margin,
-                &fb_info->var.lower_margin,
-                &fb_info->var.hsync_len,
-                &fb_info->var.vsync_len,
-                &fb_info->var.sync,
-                &fb_info->var.vmode)) {
-
+        fb_info->var.pixclock = (u32)(1000000000 / XGIfb_mode_rate_to_dclock
+                                      (&xgifb_info->dev_info, hw_info,
+                                       XGIbios_mode[xgifb_info->mode_idx].mode_no));
+
+        if (XGIfb_mode_rate_to_ddata(&xgifb_info->dev_info,
+                                     hw_info, XGIbios_mode[xgifb_info->mode_idx].mode_no,
+                                     &fb_info->var.left_margin,
+                                     &fb_info->var.right_margin,
+                                     &fb_info->var.upper_margin,
+                                     &fb_info->var.lower_margin,
+                                     &fb_info->var.hsync_len,
+                                     &fb_info->var.vsync_len,
+                                     &fb_info->var.sync,
+                                     &fb_info->var.vmode)) {
                 if ((fb_info->var.vmode & FB_VMODE_MASK) ==
                     FB_VMODE_INTERLACED) {
                         fb_info->var.yres <<= 1;
@@ -1990,7 +1967,6 @@ static int xgifb_probe(struct pci_dev *pdev,
                         fb_info->var.yres >>= 1;
                         fb_info->var.yres_virtual >>= 1;
                 }
-
         }
 
         fb_info->flags = FBINFO_FLAG_DEFAULT;
@@ -2028,9 +2004,7 @@ error:
         return ret;
 }
 
-/*****************************************************/
-/*                PCI DEVICE HANDLING                */
-/*****************************************************/
+/* -------------------- PCI DEVICE HANDLING -------------------- */
 
 static void xgifb_remove(struct pci_dev *pdev)
 {
@@ -2054,25 +2028,23 @@ static struct pci_driver xgifb_driver = {
         .remove = xgifb_remove
 };
 
-/*****************************************************/
-/*                      MODULE                       */
-/*****************************************************/
+/* -------------------- MODULE -------------------- */
 
-module_param(mode, charp, 0);
+module_param(mode, charp, 0000);
 MODULE_PARM_DESC(mode,
-        "Selects the desired default display mode in the format XxYxDepth (eg. 1024x768x16).");
+                 "Selects the desired default display mode in the format XxYxDepth (eg. 1024x768x16).");
 
-module_param(forcecrt2type, charp, 0);
+module_param(forcecrt2type, charp, 0000);
 MODULE_PARM_DESC(forcecrt2type,
-        "Force the second display output type. Possible values are NONE, LCD, TV, VGA, SVIDEO or COMPOSITE.");
+                 "Force the second display output type. Possible values are NONE, LCD, TV, VGA, SVIDEO or COMPOSITE.");
 
-module_param(vesa, int, 0);
+module_param(vesa, int, 0000);
 MODULE_PARM_DESC(vesa,
-        "Selects the desired default display mode by VESA mode number (eg. 0x117).");
+                 "Selects the desired default display mode by VESA mode number (eg. 0x117).");
 
-module_param(filter, int, 0);
+module_param(filter, int, 0000);
 MODULE_PARM_DESC(filter,
-        "Selects TV flicker filter type (only for systems with a SiS301 video bridge). Possible values 0-7. Default: [no filter]).");
+                 "Selects TV flicker filter type (only for systems with a SiS301 video bridge). Possible values 0-7. Default: [no filter]).");
 
 static int __init xgifb_init(void)
 {
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 062ece22ed84..14af157958cd 100644
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -55,8 +55,9 @@ XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension,
                 xgifb_reg_or(pVBInfo->P3d4, 0x4A, 0x80); /* Enable GPIOH read */
                 /* GPIOF 0:DVI 1:DVO */
                 data = xgifb_reg_get(pVBInfo->P3d4, 0x48);
-                /* HOTPLUG_SUPPORT */
-                /* for current XG20 & XG21, GPIOH is floating, driver will
+                /*
+                 * HOTPLUG_SUPPORT
+                 * for current XG20 & XG21, GPIOH is floating, driver will
                  * fix DDR temporarily
                  */
                 /* DVI read GPIOH */
@@ -199,7 +200,8 @@ static void XGINew_DDRII_Bootup_XG27(
 }
 
 static void XGINew_DDR2_MRS_XG20(struct xgi_hw_device_info *HwDeviceExtension,
-                unsigned long P3c4, struct vb_device_info *pVBInfo)
+                                 unsigned long P3c4,
+                                 struct vb_device_info *pVBInfo)
 {
         unsigned long P3d4 = P3c4 + 0x10;
 
@@ -353,8 +355,8 @@ static void XGINew_DDR2_DefaultRegister(
                 unsigned long Port, struct vb_device_info *pVBInfo)
 {
         unsigned long P3d4 = Port, P3c4 = Port - 0x10;
-
-        /* keep following setting sequence, each setting in
+        /*
+         * keep following setting sequence, each setting in
          * the same reg insert idle
          */
         xgifb_reg_set(P3d4, 0x82, 0x77);
@@ -387,7 +389,7 @@ static void XGINew_DDR2_DefaultRegister(
 }
 
 static void XGI_SetDRAM_Helper(unsigned long P3d4, u8 seed, u8 temp2, u8 reg,
-        u8 shift_factor, u8 mask1, u8 mask2)
+                               u8 shift_factor, u8 mask1, u8 mask2)
 {
         u8 j;
 
@@ -460,15 +462,15 @@ static void XGINew_SetDRAMDefaultRegister340(
 
         for (j = 0; j <= 6; j++) /* CR90 - CR96 */
                 xgifb_reg_set(P3d4, (0x90 + j),
-                                pVBInfo->CR40[14 + j][pVBInfo->ram_type]);
+                              pVBInfo->CR40[14 + j][pVBInfo->ram_type]);
 
         for (j = 0; j <= 2; j++) /* CRC3 - CRC5 */
                 xgifb_reg_set(P3d4, (0xC3 + j),
-                                pVBInfo->CR40[21 + j][pVBInfo->ram_type]);
+                              pVBInfo->CR40[21 + j][pVBInfo->ram_type]);
 
         for (j = 0; j < 2; j++) /* CR8A - CR8B */
                 xgifb_reg_set(P3d4, (0x8A + j),
-                                pVBInfo->CR40[1 + j][pVBInfo->ram_type]);
+                              pVBInfo->CR40[1 + j][pVBInfo->ram_type]);
 
         if (HwDeviceExtension->jChipType == XG42)
                 xgifb_reg_set(P3d4, 0x8C, 0x87);
@@ -539,7 +541,8 @@ static unsigned short XGINew_SetDRAMSize20Reg(
 }
 
 static int XGINew_ReadWriteRest(unsigned short StopAddr,
-                unsigned short StartAddr, struct vb_device_info *pVBInfo)
+                                unsigned short StartAddr,
+                                struct vb_device_info *pVBInfo)
 {
         int i;
         unsigned long Position = 0;
@@ -583,7 +586,7 @@ static unsigned char XGINew_CheckFrequence(struct vb_device_info *pVBInfo)
 }
 
 static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
-                struct vb_device_info *pVBInfo)
+                                struct vb_device_info *pVBInfo)
 {
         unsigned char data;
 
@@ -647,7 +650,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
                                 pVBInfo->ram_bus = 16; /* 16 bits */
                                 /* (0x31:12x8x2) 22bit + 2 rank */
                                 xgifb_reg_set(pVBInfo->P3c4, 0x13, 0xB1);
-                                /* 0x41:16Mx16 bit*/
+                                /* 0x41:16Mx16 bit */
                                 xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x41);
                                 usleep_range(15, 1015);
 
@@ -660,7 +663,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
                                         xgifb_reg_set(pVBInfo->P3c4,
                                                       0x13,
                                                       0x31);
-                                        /* 0x31:8Mx16 bit*/
+                                        /* 0x31:8Mx16 bit */
                                         xgifb_reg_set(pVBInfo->P3c4,
                                                       0x14,
                                                       0x31);
@@ -678,7 +681,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
                                 pVBInfo->ram_bus = 8; /* 8 bits */
                                 /* (0x31:12x8x2) 22bit + 2 rank */
                                 xgifb_reg_set(pVBInfo->P3c4, 0x13, 0xB1);
-                                /* 0x30:8Mx8 bit*/
+                                /* 0x30:8Mx8 bit */
                                 xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x30);
                                 usleep_range(15, 1015);
 
@@ -697,7 +700,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
         case XG27:
                 pVBInfo->ram_bus = 16; /* 16 bits */
                 pVBInfo->ram_channel = 1; /* Single channel */
-                xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x51); /* 32Mx16 bit*/
+                xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x51); /* 32Mx16 bit */
                 break;
         case XG42:
                 /*
@@ -785,7 +788,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
 }
 
 static int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension,
-                struct vb_device_info *pVBInfo)
+                               struct vb_device_info *pVBInfo)
 {
         u8 i, size;
         unsigned short memsize, start_addr;
@@ -827,8 +830,8 @@ static int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension,
 }
 
 static void XGINew_SetDRAMSize_340(struct xgifb_video_info *xgifb_info,
-                struct xgi_hw_device_info *HwDeviceExtension,
-                struct vb_device_info *pVBInfo)
+                                   struct xgi_hw_device_info *HwDeviceExtension,
+                                   struct vb_device_info *pVBInfo)
 {
         unsigned short data;
 
@@ -905,9 +908,9 @@ static bool xgifb_read_vbios(struct pci_dev *pdev)
                 goto error;
         if (j == 0xff)
                 j = 1;
-        /*
-         * Read the LVDS table index scratch register set by the BIOS.
-         */
+
+        /* Read the LVDS table index scratch register set by the BIOS. */
+
         entry = xgifb_reg_get(xgifb_info->dev_info.P3d4, 0x36);
         if (entry >= j)
                 entry = 0;
@@ -1039,8 +1042,9 @@ static void XGINew_SetModeScratch(struct vb_device_info *pVBInfo)
         }
 
         tempcl |= SetSimuScanMode;
-        if ((!(temp & ActiveCRT1)) && ((temp & ActiveLCD) || (temp & ActiveTV)
-                        || (temp & ActiveCRT2)))
+        if ((!(temp & ActiveCRT1)) && ((temp & ActiveLCD) ||
+                                       (temp & ActiveTV) ||
+                                       (temp & ActiveCRT2)))
                 tempcl ^= (SetSimuScanMode | SwitchCRT2);
         if ((temp & ActiveLCD) && (temp & ActiveTV))
                 tempcl ^= (SetSimuScanMode | SwitchCRT2);
@@ -1085,7 +1089,7 @@ static unsigned short XGINew_SenseLCD(struct xgi_hw_device_info
 }
 
 static void XGINew_GetXG21Sense(struct pci_dev *pdev,
-                struct vb_device_info *pVBInfo)
+                                struct vb_device_info *pVBInfo)
 {
         struct xgifb_video_info *xgifb_info = pci_get_drvdata(pdev);
         unsigned char Temp;
@@ -1095,7 +1099,7 @@ static void XGINew_GetXG21Sense(struct pci_dev *pdev,
                 /* LVDS on chip */
                 xgifb_reg_and_or(pVBInfo->P3d4, 0x38, ~0xE0, 0xC0);
         } else {
-                /* Enable GPIOA/B read  */
+                /* Enable GPIOA/B read */
                 xgifb_reg_and_or(pVBInfo->P3d4, 0x4A, ~0x03, 0x03);
                 Temp = xgifb_reg_get(pVBInfo->P3d4, 0x48) & 0xC0;
                 if (Temp == 0xC0) { /* DVI & DVO GPIOA/B pull high */
@@ -1119,7 +1123,7 @@ static void XGINew_GetXG27Sense(struct vb_device_info *pVBInfo)
         unsigned char Temp, bCR4A;
 
         bCR4A = xgifb_reg_get(pVBInfo->P3d4, 0x4A);
-        /* Enable GPIOA/B/C read  */
+        /* Enable GPIOA/B/C read */
         xgifb_reg_and_or(pVBInfo->P3d4, 0x4A, ~0x07, 0x07);
         Temp = xgifb_reg_get(pVBInfo->P3d4, 0x48) & 0x07;
         xgifb_reg_set(pVBInfo->P3d4, 0x4A, bCR4A);
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index d8010c5c1a70..7c7c8c8f1df3 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -55,7 +55,7 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
                 pVBInfo->XGINew_CR97 = 0xc1;
                 pVBInfo->SR18 = XG27_SR18;
 
-                /*Z11m DDR*/
+                /* Z11m DDR */
                 temp = xgifb_reg_get(pVBInfo->P3c4, 0x3B);
                 /* SR3B[7][3]MAA15 MAA11 (Power on Trapping) */
                 if (((temp & 0x88) == 0x80) || ((temp & 0x88) == 0x08))
@@ -73,7 +73,7 @@ static void XGI_SetSeqRegs(struct vb_device_info *pVBInfo)
                 /* Get SR1,2,3,4 from file */
                 /* SR1 is with screen off 0x20 */
                 SRdata = XGI330_StandTable.SR[i];
-                xgifb_reg_set(pVBInfo->P3c4, i+1, SRdata); /* Set SR 1 2 3 4 */
+                xgifb_reg_set(pVBInfo->P3c4, i + 1, SRdata); /* Set SR 1 2 3 4 */
         }
 }
 
@@ -167,7 +167,8 @@ static unsigned char XGI_SetDefaultVCLK(struct vb_device_info *pVBInfo)
 }
 
 static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex, unsigned short *i,
+                                       unsigned short RefreshRateTableIndex,
+                                       unsigned short *i,
                 struct vb_device_info *pVBInfo)
 {
         unsigned short tempax, tempbx, resinfo, modeflag, infoflag;
@@ -244,7 +245,7 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,
 }
 
 static void XGI_SetSync(unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                        struct vb_device_info *pVBInfo)
 {
         unsigned short sync, temp;
 
@@ -257,7 +258,7 @@ static void XGI_SetSync(unsigned short RefreshRateTableIndex,
 }
 
 static void XGI_SetCRT1Timing_H(struct vb_device_info *pVBInfo,
-                struct xgi_hw_device_info *HwDeviceExtension)
+                                struct xgi_hw_device_info *HwDeviceExtension)
 {
         unsigned char data, data1, pushax;
         unsigned short i, j;
@@ -359,9 +360,9 @@ static void XGI_SetCRT1Timing_V(unsigned short ModeIdIndex,
 }
 
 static void XGI_SetCRT1CRTC(unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo,
-                struct xgi_hw_device_info *HwDeviceExtension)
+                            unsigned short RefreshRateTableIndex,
+                            struct vb_device_info *pVBInfo,
+                            struct xgi_hw_device_info *HwDeviceExtension)
 {
         unsigned char index, data;
         unsigned short i;
@@ -390,14 +391,14 @@ static void XGI_SetCRT1CRTC(unsigned short ModeIdIndex,
                 xgifb_reg_set(pVBInfo->P3d4, 0x14, 0x4F);
 }
 
-/* --------------------------------------------------------------------- */
-/* Function : XGI_SetXG21CRTC */
-/* Input : Stand or enhance CRTC table */
-/* Output : Fill CRT Hsync/Vsync to SR2E/SR2F/SR30/SR33/SR34/SR3F */
-/* Description : Set LCD timing */
-/* --------------------------------------------------------------------- */
+/*
+ * Function : XGI_SetXG21CRTC
+ * Input : Stand or enhance CRTC table
+ * Output : Fill CRT Hsync/Vsync to SR2E/SR2F/SR30/SR33/SR34/SR3F
+ * Description : Set LCD timing
+ */
 static void XGI_SetXG21CRTC(unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                            struct vb_device_info *pVBInfo)
 {
         unsigned char index, Tempax, Tempbx, Tempcx, Tempdx;
         unsigned short Temp1, Temp2, Temp3;
@@ -506,8 +507,8 @@ static void XGI_SetXG27CRTC(unsigned short RefreshRateTableIndex,
 
         /* SR0B */
         Tempax = XGI_CRT1Table[index].CR[5];
-        Tempax &= 0xC0; /* Tempax[7:6]: SR0B[7:6]: HRS[9:8]*/
-        Tempbx |= (Tempax << 2); /* Tempbx: HRS[9:0] */
+        Tempax &= 0xC0; /* Tempax[7:6]: SR0B[7:6]: HRS[9:8] */
+        Tempbx |= Tempax << 2; /* Tempbx: HRS[9:0] */
 
         Tempax = XGI_CRT1Table[index].CR[4]; /* CR5 HRE */
         Tempax &= 0x1F; /* Tempax[4:0]: HRE[4:0] */
@@ -530,7 +531,7 @@ static void XGI_SetXG27CRTC(unsigned short RefreshRateTableIndex,
         Tempax = XGI_CRT1Table[index].CR[5]; /* SR0B */
         Tempax &= 0xC0; /* Tempax[7:6]: SR0B[7:6]: HRS[9:8]*/
         Tempax >>= 6; /* Tempax[1:0]: HRS[9:8]*/
-        Tempax |= ((Tempbx << 2) & 0xFF); /* Tempax[7:2]: HRE[5:0] */
+        Tempax |= (Tempbx << 2) & 0xFF; /* Tempax[7:2]: HRE[5:0] */
         /* SR2F [7:2][1:0]: HRE[5:0]HRS[9:8] */
         xgifb_reg_set(pVBInfo->P3c4, 0x2F, Tempax);
         xgifb_reg_and_or(pVBInfo->P3c4, 0x30, 0xE3, 00);
@@ -548,12 +549,12 @@ static void XGI_SetXG27CRTC(unsigned short RefreshRateTableIndex,
         Tempax >>= 2; /* Tempax[0]: VRS[8] */
         /* SR35[0]: VRS[8] */
         xgifb_reg_and_or(pVBInfo->P3c4, 0x35, ~0x01, Tempax);
-        Tempcx |= (Tempax << 8); /* Tempcx <= VRS[8:0] */
-        Tempcx |= ((Tempbx & 0x80) << 2); /* Tempcx <= VRS[9:0] */
+        Tempcx |= Tempax << 8; /* Tempcx <= VRS[8:0] */
+        Tempcx |= (Tempbx & 0x80) << 2; /* Tempcx <= VRS[9:0] */
         /* Tempax: SR0A */
         Tempax = XGI_CRT1Table[index].CR[14];
         Tempax &= 0x08; /* SR0A[3] VRS[10] */
-        Tempcx |= (Tempax << 7); /* Tempcx <= VRS[10:0] */
+        Tempcx |= Tempax << 7; /* Tempcx <= VRS[10:0] */
 
         /* Tempax: CR11 VRE */
         Tempax = XGI_CRT1Table[index].CR[11];
@@ -636,12 +637,12 @@ static void xgifb_set_lcd(int chip_id,
                 xgifb_reg_or(pVBInfo->P3c4, 0x35, 0x80);
 }
 
-/* --------------------------------------------------------------------- */
-/* Function : XGI_UpdateXG21CRTC */
-/* Input : */
-/* Output : CRT1 CRTC */
-/* Description : Modify CRT1 Hsync/Vsync to fix LCD mode timing */
-/* --------------------------------------------------------------------- */
+/*
+ * Function : XGI_UpdateXG21CRTC
+ * Input :
+ * Output : CRT1 CRTC
+ * Description : Modify CRT1 Hsync/Vsync to fix LCD mode timing
+ */
 static void XGI_UpdateXG21CRTC(unsigned short ModeNo,
                                struct vb_device_info *pVBInfo,
                                unsigned short RefreshRateTableIndex)
@@ -665,19 +666,19 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo,
 
         if (index != -1) {
                 xgifb_reg_set(pVBInfo->P3d4, 0x02,
-                                XGI_UpdateCRT1Table[index].CR02);
+                              XGI_UpdateCRT1Table[index].CR02);
                 xgifb_reg_set(pVBInfo->P3d4, 0x03,
-                                XGI_UpdateCRT1Table[index].CR03);
+                              XGI_UpdateCRT1Table[index].CR03);
                 xgifb_reg_set(pVBInfo->P3d4, 0x15,
-                                XGI_UpdateCRT1Table[index].CR15);
+                              XGI_UpdateCRT1Table[index].CR15);
                 xgifb_reg_set(pVBInfo->P3d4, 0x16,
-                                XGI_UpdateCRT1Table[index].CR16);
+                              XGI_UpdateCRT1Table[index].CR16);
         }
 }
 
 static void XGI_SetCRT1DE(unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                          unsigned short RefreshRateTableIndex,
+                          struct vb_device_info *pVBInfo)
 {
         unsigned short resindex, tempax, tempbx, tempcx, temp, modeflag;
 
@@ -715,7 +716,7 @@ static void XGI_SetCRT1DE(unsigned short ModeIdIndex,
         xgifb_reg_set(pVBInfo->P3d4, 0x11, data); /* Unlock CRTC */
         xgifb_reg_set(pVBInfo->P3d4, 0x01, (unsigned short)(tempcx & 0xff));
         xgifb_reg_and_or(pVBInfo->P3d4, 0x0b, ~0x0c,
-                        (unsigned short)((tempcx & 0x0ff00) >> 10));
+                         (unsigned short)((tempcx & 0x0ff00) >> 10));
         xgifb_reg_set(pVBInfo->P3d4, 0x12, (unsigned short)(tempbx & 0xff));
         tempax = 0;
         tempbx >>= 8;
@@ -796,7 +797,7 @@ static void XGI_SetCRT1Offset(unsigned short ModeNo,
         i |= temp;
         xgifb_reg_set(pVBInfo->P3c4, 0x0E, i);
 
-        temp = (unsigned char) temp2;
+        temp = (unsigned char)temp2;
         temp &= 0xFF; /* al */
         xgifb_reg_set(pVBInfo->P3d4, 0x13, temp);
 
@@ -822,15 +823,15 @@ static void XGI_SetCRT1Offset(unsigned short ModeNo,
 }
 
 static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                                      unsigned short RefreshRateTableIndex,
+                                      struct vb_device_info *pVBInfo)
 {
         unsigned short VCLKIndex, modeflag;
 
         /* si+Ext_ResInfo */
         modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
-        if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) { /*301b*/
+        if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) { /* 301b */
                 if (pVBInfo->LCDResInfo != Panel_1024x768)
                         /* LCDXlat2VCLK */
                         VCLKIndex = VCLK108_2_315 + 5;
@@ -951,8 +952,8 @@ static void XGI_SetCRT1FIFO(struct xgi_hw_device_info *HwDeviceExtension,
 }
 
 static void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                             unsigned short RefreshRateTableIndex,
+                             struct vb_device_info *pVBInfo)
 {
         unsigned short data, data2 = 0;
         short VCLK;
@@ -989,9 +990,9 @@ static void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension,
 }
 
 static void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension,
-                unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                                unsigned short ModeIdIndex,
+                                unsigned short RefreshRateTableIndex,
+                                struct vb_device_info *pVBInfo)
 {
         unsigned short data, data2, data3, infoflag = 0, modeflag, resindex,
                         xres;
@@ -1087,9 +1088,9 @@ static void XGI_WriteDAC(unsigned short dl,
                 else
                         swap(bl, bh);
         }
-        outb((unsigned short) dh, pVBInfo->P3c9);
-        outb((unsigned short) bh, pVBInfo->P3c9);
-        outb((unsigned short) bl, pVBInfo->P3c9);
+        outb((unsigned short)dh, pVBInfo->P3c9);
+        outb((unsigned short)bh, pVBInfo->P3c9);
+        outb((unsigned short)bl, pVBInfo->P3c9);
 }
 
 static void XGI_LoadDAC(struct vb_device_info *pVBInfo)
@@ -1187,8 +1188,8 @@ static void XGI_GetLVDSResInfo(unsigned short ModeIdIndex,
 }
 
 static void const *XGI_GetLcdPtr(struct XGI330_LCDDataTablStruct const *table,
-                unsigned short ModeIdIndex,
-                struct vb_device_info *pVBInfo)
+                                 unsigned short ModeIdIndex,
+                                 struct vb_device_info *pVBInfo)
 {
         unsigned short i, tempdx, tempbx, modeflag;
 
@@ -1201,12 +1202,12 @@ static void const *XGI_GetLcdPtr(struct XGI330_LCDDataTablStruct const *table,
         while (table[i].PANELID != 0xff) {
                 tempdx = pVBInfo->LCDResInfo;
                 if (tempbx & 0x0080) { /* OEMUtil */
-                        tempbx &= (~0x0080);
+                        tempbx &= ~0x0080;
                         tempdx = pVBInfo->LCDTypeInfo;
                 }
 
                 if (pVBInfo->LCDInfo & EnableScalingLCD)
-                        tempdx &= (~PanelResInfo);
+                        tempdx &= ~PanelResInfo;
 
                 if (table[i].PANELID == tempdx) {
                         tempbx = table[i].MASK;
@@ -1226,8 +1227,8 @@ static void const *XGI_GetLcdPtr(struct XGI330_LCDDataTablStruct const *table,
 }
 
 static struct SiS_TVData const *XGI_GetTVPtr(unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                                             unsigned short RefreshRateTableIndex,
+                                             struct vb_device_info *pVBInfo)
 {
         unsigned short i, tempdx, tempal, modeflag;
 
@@ -1441,9 +1442,9 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex,
         tempbx >>= 3;
 
         xgifb_reg_set(pVBInfo->Part1Port, 0x16,
-                        (unsigned short) (tempbx & 0xff));
+                      (unsigned short)(tempbx & 0xff));
         xgifb_reg_set(pVBInfo->Part1Port, 0x17,
-                        (unsigned short) (tempcx & 0xff));
+                      (unsigned short)(tempcx & 0xff));
 
         tempax = pVBInfo->HT;
 
@@ -1469,7 +1470,7 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex,
 
         xgifb_reg_set(pVBInfo->Part1Port, 0x15, tempax);
         xgifb_reg_set(pVBInfo->Part1Port, 0x14,
-                        (unsigned short) (tempbx & 0xff));
+                      (unsigned short)(tempbx & 0xff));
 
         tempax = pVBInfo->VT;
         tempbx = LCDPtr1->LCDVDES;
@@ -1480,17 +1481,14 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex,
         if (tempcx >= tempax)
                 tempcx -= tempax;
 
-        xgifb_reg_set(pVBInfo->Part1Port, 0x1b,
-                        (unsigned short) (tempbx & 0xff));
-        xgifb_reg_set(pVBInfo->Part1Port, 0x1c,
-                        (unsigned short) (tempcx & 0xff));
+        xgifb_reg_set(pVBInfo->Part1Port, 0x1b, (unsigned short)(tempbx & 0xff));
+        xgifb_reg_set(pVBInfo->Part1Port, 0x1c, (unsigned short)(tempcx & 0xff));
 
         tempbx = (tempbx >> 8) & 0x07;
         tempcx = (tempcx >> 8) & 0x07;
 
-        xgifb_reg_set(pVBInfo->Part1Port, 0x1d,
-                        (unsigned short) ((tempcx << 3)
-                                        | tempbx));
+        xgifb_reg_set(pVBInfo->Part1Port, 0x1d, (unsigned short)((tempcx << 3) |
+                      tempbx));
 
         tempax = pVBInfo->VT;
         tempbx = LCDPtr1->LCDVRS;
@@ -1504,10 +1502,8 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex,
         if (tempcx >= tempax)
                 tempcx -= tempax;
 
-        xgifb_reg_set(pVBInfo->Part1Port, 0x18,
-                        (unsigned short) (tempbx & 0xff));
-        xgifb_reg_and_or(pVBInfo->Part1Port, 0x19, ~0x0f,
-                        (unsigned short) (tempcx & 0x0f));
+        xgifb_reg_set(pVBInfo->Part1Port, 0x18, (unsigned short)(tempbx & 0xff));
+        xgifb_reg_and_or(pVBInfo->Part1Port, 0x19, ~0x0f, (unsigned short)(tempcx & 0x0f));
 
         tempax = ((tempbx >> 8) & 0x07) << 3;
 
@@ -1518,8 +1514,7 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex,
         if (pVBInfo->LCDInfo & XGI_EnableLVDSDDA)
                 tempax |= 0x40;
 
-        xgifb_reg_and_or(pVBInfo->Part1Port, 0x1a, 0x07,
-                                tempax);
+        xgifb_reg_and_or(pVBInfo->Part1Port, 0x1a, 0x07, tempax);
 
         tempbx = pVBInfo->VDE;
         tempax = pVBInfo->VGAVDE;
@@ -1527,7 +1522,7 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex,
         temp = tempax; /* 0430 ylshieh */
         temp1 = (temp << 18) / tempbx;
 
-        tempdx = (unsigned short) ((temp << 18) % tempbx);
+        tempdx = (unsigned short)((temp << 18) % tempbx);
 
         if (tempdx != 0)
                 temp1 += 1;
@@ -1535,12 +1530,10 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex,
         temp2 = temp1;
         push3 = temp2;
 
-        xgifb_reg_set(pVBInfo->Part1Port, 0x37,
-                        (unsigned short) (temp2 & 0xff));
-        xgifb_reg_set(pVBInfo->Part1Port, 0x36,
-                        (unsigned short) ((temp2 >> 8) & 0xff));
+        xgifb_reg_set(pVBInfo->Part1Port, 0x37, (unsigned short)(temp2 & 0xff));
+        xgifb_reg_set(pVBInfo->Part1Port, 0x36, (unsigned short)((temp2 >> 8) & 0xff));
 
-        tempbx = (unsigned short) (temp2 >> 16);
+        tempbx = (unsigned short)(temp2 >> 16);
         tempax = tempbx & 0x03;
 
         tempbx = pVBInfo->VGAVDE;
@@ -1553,24 +1546,20 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex,
                 temp2 = push3;
                 xgifb_reg_set(pVBInfo->Part4Port,
                               0x3c,
-                              (unsigned short) (temp2 & 0xff));
+                              (unsigned short)(temp2 & 0xff));
                 xgifb_reg_set(pVBInfo->Part4Port,
                               0x3b,
-                              (unsigned short) ((temp2 >> 8) &
+                              (unsigned short)((temp2 >> 8) &
                               0xff));
-                tempbx = (unsigned short) (temp2 >> 16);
-                xgifb_reg_and_or(pVBInfo->Part4Port, 0x3a,
-                                ~0xc0,
-                                (unsigned short) ((tempbx &
-                                                   0xff) << 6));
+                tempbx = (unsigned short)(temp2 >> 16);
+                xgifb_reg_and_or(pVBInfo->Part4Port, 0x3a, ~0xc0,
+                                 (unsigned short)((tempbx & 0xff) << 6));
 
                 tempcx = pVBInfo->VGAVDE;
                 if (tempcx == pVBInfo->VDE)
-                        xgifb_reg_and_or(pVBInfo->Part4Port,
-                                        0x30, ~0x0c, 0x00);
+                        xgifb_reg_and_or(pVBInfo->Part4Port, 0x30, ~0x0c, 0x00);
                 else
-                        xgifb_reg_and_or(pVBInfo->Part4Port,
-                                        0x30, ~0x0c, 0x08);
+                        xgifb_reg_and_or(pVBInfo->Part4Port, 0x30, ~0x0c, 0x08);
         }
 
         tempcx = pVBInfo->VGAHDE;
@@ -1578,7 +1567,7 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex,
 
         temp1 = tempcx << 16;
 
-        tempax = (unsigned short) (temp1 / tempbx);
+        tempax = (unsigned short)(temp1 / tempbx);
 
         if ((tempbx & 0xffff) == (tempcx & 0xffff))
                 tempax = 65535;
@@ -1592,42 +1581,38 @@ static void XGI_SetLVDSRegs(unsigned short ModeIdIndex,
 
         temp3 = (temp3 & 0xffff0000) + (temp1 & 0xffff);
 
-        tempax = (unsigned short) (temp3 & 0xff);
+        tempax = (unsigned short)(temp3 & 0xff);
         xgifb_reg_set(pVBInfo->Part1Port, 0x1f, tempax);
 
         temp1 = pVBInfo->VGAVDE << 18;
         temp1 = temp1 / push3;
-        tempbx = (unsigned short) (temp1 & 0xffff);
+        tempbx = (unsigned short)(temp1 & 0xffff);
 
         if (pVBInfo->LCDResInfo == Panel_1024x768)
                 tempbx -= 1;
 
         tempax = ((tempbx >> 8) & 0xff) << 3;
-        tempax |= (unsigned short) ((temp3 >> 8) & 0x07);
-        xgifb_reg_set(pVBInfo->Part1Port, 0x20,
-                        (unsigned short) (tempax & 0xff));
-        xgifb_reg_set(pVBInfo->Part1Port, 0x21,
-                        (unsigned short) (tempbx & 0xff));
+        tempax |= (unsigned short)((temp3 >> 8) & 0x07);
+        xgifb_reg_set(pVBInfo->Part1Port, 0x20, (unsigned short)(tempax & 0xff));
+        xgifb_reg_set(pVBInfo->Part1Port, 0x21, (unsigned short)(tempbx & 0xff));
 
         temp3 >>= 16;
 
         if (modeflag & HalfDCLK)
                 temp3 >>= 1;
 
-        xgifb_reg_set(pVBInfo->Part1Port, 0x22,
-                        (unsigned short) ((temp3 >> 8) & 0xff));
-        xgifb_reg_set(pVBInfo->Part1Port, 0x23,
-                        (unsigned short) (temp3 & 0xff));
+        xgifb_reg_set(pVBInfo->Part1Port, 0x22, (unsigned short)((temp3 >> 8) & 0xff));
+        xgifb_reg_set(pVBInfo->Part1Port, 0x23, (unsigned short)(temp3 & 0xff));
 }
 
-/* --------------------------------------------------------------------- */
-/* Function : XGI_GETLCDVCLKPtr */
-/* Input : */
-/* Output : al -> VCLK Index */
-/* Description : */
-/* --------------------------------------------------------------------- */
+/*
+ * Function : XGI_GETLCDVCLKPtr
+ * Input :
+ * Output : al -> VCLK Index
+ * Description :
+ */
 static void XGI_GetLCDVCLKPtr(unsigned char *di_0, unsigned char *di_1,
-                struct vb_device_info *pVBInfo)
+                              struct vb_device_info *pVBInfo)
 {
         unsigned short index;
 
@@ -1645,7 +1630,8 @@ static void XGI_GetLCDVCLKPtr(unsigned char *di_0, unsigned char *di_1,
 }
 
 static unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex,
-                unsigned short ModeIdIndex, struct vb_device_info *pVBInfo)
+                                    unsigned short ModeIdIndex,
+                                    struct vb_device_info *pVBInfo)
 {
         unsigned short index, modeflag;
         unsigned char tempal;
@@ -1681,15 +1667,11 @@ static unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex,
                                 return tempal;
                         }
 
-                        if (pVBInfo->TVInfo & TVSetYPbPr750p) {
-                                tempal = XGI_YPbPr750pVCLK;
-                                return tempal;
-                        }
+                        if (pVBInfo->TVInfo & TVSetYPbPr750p)
+                                return XGI_YPbPr750pVCLK;
 
-                        if (pVBInfo->TVInfo & TVSetYPbPr525p) {
-                                tempal = YPbPr525pVCLK;
-                                return tempal;
-                        }
+                        if (pVBInfo->TVInfo & TVSetYPbPr525p)
+                                return YPbPr525pVCLK;
 
                         tempal = NTSC1024VCLK;
 
@@ -1705,12 +1687,11 @@ static unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex,
         } /* {End of VB} */
 
         inb((pVBInfo->P3ca + 0x02));
-        tempal = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
-        return tempal;
+        return XGI330_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
 }
 
 static void XGI_GetVCLKLen(unsigned char tempal, unsigned char *di_0,
-                unsigned char *di_1, struct vb_device_info *pVBInfo)
+                           unsigned char *di_1, struct vb_device_info *pVBInfo)
 {
         if (pVBInfo->VBType & (VB_SIS301 | VB_SIS301B | VB_SIS302B
                         | VB_SIS301LV | VB_SIS302LV | VB_XGI301C)) {
@@ -1726,8 +1707,8 @@ static void XGI_GetVCLKLen(unsigned char tempal, unsigned char *di_0,
 }
 
 static void XGI_SetCRT2ECLK(unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                            unsigned short RefreshRateTableIndex,
+                            struct vb_device_info *pVBInfo)
 {
         unsigned char di_0, di_1, tempal;
         int i;
@@ -1738,7 +1719,7 @@ static void XGI_SetCRT2ECLK(unsigned short ModeIdIndex,
 
         for (i = 0; i < 4; i++) {
                 xgifb_reg_and_or(pVBInfo->P3d4, 0x31, ~0x30,
-                                (unsigned short) (0x10 * i));
+                                 (unsigned short)(0x10 * i));
                 if (!(pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) &&
                     !(pVBInfo->VBInfo & SetInSlaveMode)) {
                         xgifb_reg_set(pVBInfo->P3c4, 0x2e, di_0);
@@ -1876,8 +1857,7 @@ finish:
         pVBInfo->VBType = tempbx;
 }
 
-static void XGI_GetVBInfo(unsigned short ModeIdIndex,
-                struct vb_device_info *pVBInfo)
+static void XGI_GetVBInfo(unsigned short ModeIdIndex, struct vb_device_info *pVBInfo)
 {
         unsigned short tempax, push, tempbx, temp, modeflag;
 
@@ -1921,7 +1901,7 @@ static void XGI_GetVBInfo(unsigned short ModeIdIndex,
                         tempbx |= SetCRT2ToHiVision;
 
                         if (temp != YPbPrMode1080i) {
-                                tempbx &= (~SetCRT2ToHiVision);
+                                tempbx &= ~SetCRT2ToHiVision;
                                 tempbx |= SetCRT2ToYPbPr525750;
                         }
                 }
@@ -2002,8 +1982,7 @@ static void XGI_GetVBInfo(unsigned short ModeIdIndex,
         pVBInfo->VBInfo = tempbx;
 }
 
-static void XGI_GetTVInfo(unsigned short ModeIdIndex,
-                struct vb_device_info *pVBInfo)
+static void XGI_GetTVInfo(unsigned short ModeIdIndex, struct vb_device_info *pVBInfo)
 {
         unsigned short tempbx = 0, resinfo = 0, modeflag, index1;
 
@@ -2078,7 +2057,7 @@ static unsigned char XGI_GetLCDInfo(unsigned short ModeIdIndex,
         pVBInfo->LCDTypeInfo = 0;
         pVBInfo->LCDInfo = 0;
 
-        /* si+Ext_ResInfo // */
+        /* si+Ext_ResInfo */
         resinfo = XGI330_EModeIDTable[ModeIdIndex].Ext_RESINFO;
         temp = xgifb_reg_get(pVBInfo->P3d4, 0x36); /* Get LCD Res.Info */
         tempbx = temp & 0x0F;
@@ -2175,12 +2154,12 @@ static unsigned char XG21GPIODataTransfer(unsigned char ujDate)
         return ujRet;
 }
 
-/*----------------------------------------------------------------------------*/
-/* output                                                                     */
-/*      bl[5] : LVDS signal                                                   */
-/*      bl[1] : LVDS backlight                                                */
-/*      bl[0] : LVDS VDD                                                      */
-/*----------------------------------------------------------------------------*/
+/*
+ * output
+ *      bl[5] : LVDS signal
+ *      bl[1] : LVDS backlight
+ *      bl[0] : LVDS VDD
+ */
 static unsigned char XGI_XG21GetPSCValue(struct vb_device_info *pVBInfo)
 {
         unsigned char CR4A, temp;
@@ -2196,12 +2175,12 @@ static unsigned char XGI_XG21GetPSCValue(struct vb_device_info *pVBInfo)
         return temp;
 }
 
-/*----------------------------------------------------------------------------*/
-/* output                                                                     */
-/*      bl[5] : LVDS signal                                                   */
-/*      bl[1] : LVDS backlight                                                */
-/*      bl[0] : LVDS VDD                                                      */
-/*----------------------------------------------------------------------------*/
+/*
+ * output
+ *      bl[5] : LVDS signal
+ *      bl[1] : LVDS backlight
+ *      bl[0] : LVDS VDD
+ */
 static unsigned char XGI_XG27GetPSCValue(struct vb_device_info *pVBInfo)
 {
         unsigned char CR4A, CRB4, temp;
@@ -2219,17 +2198,17 @@ static unsigned char XGI_XG27GetPSCValue(struct vb_device_info *pVBInfo)
         return temp;
 }
 
-/*----------------------------------------------------------------------------*/
-/* input                                                                      */
-/*      bl[5] : 1;LVDS signal on                                              */
-/*      bl[1] : 1;LVDS backlight on                                           */
-/*      bl[0] : 1:LVDS VDD on                                                 */
-/*      bh: 100000b : clear bit 5, to set bit5                                */
-/*          000010b : clear bit 1, to set bit1                                */
-/*          000001b : clear bit 0, to set bit0                                */
-/*----------------------------------------------------------------------------*/
+/*
+ * input
+ *      bl[5] : 1;LVDS signal on
+ *      bl[1] : 1;LVDS backlight on
+ *      bl[0] : 1:LVDS VDD on
+ *      bh: 100000b : clear bit 5, to set bit5
+ *          000010b : clear bit 1, to set bit1
+ *          000001b : clear bit 0, to set bit0
+ */
 static void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
-                struct vb_device_info *pVBInfo)
+                                struct vb_device_info *pVBInfo)
 {
         unsigned char CR4A, temp;
 
@@ -2254,7 +2233,7 @@ static void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
 }
 
 static void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
-                struct vb_device_info *pVBInfo)
+                                struct vb_device_info *pVBInfo)
 {
         unsigned char CR4A, temp;
         unsigned short tempbh0, tempbl0;
@@ -2284,8 +2263,8 @@ static void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
 }
 
 static void XGI_DisplayOn(struct xgifb_video_info *xgifb_info,
-                struct xgi_hw_device_info *pXGIHWDE,
-                struct vb_device_info *pVBInfo)
+                          struct xgi_hw_device_info *pXGIHWDE,
+                          struct vb_device_info *pVBInfo)
 {
         xgifb_reg_and_or(pVBInfo->P3c4, 0x01, 0xDF, 0x00);
         if (pXGIHWDE->jChipType == XG21) {
@@ -2328,8 +2307,8 @@ static void XGI_DisplayOn(struct xgifb_video_info *xgifb_info,
 }
 
 void XGI_DisplayOff(struct xgifb_video_info *xgifb_info,
-                struct xgi_hw_device_info *pXGIHWDE,
-                struct vb_device_info *pVBInfo)
+                    struct xgi_hw_device_info *pXGIHWDE,
+                    struct vb_device_info *pVBInfo)
 {
         if (pXGIHWDE->jChipType == XG21) {
                 if (pVBInfo->IF_DEF_LVDS == 1) {
@@ -2448,7 +2427,7 @@ exit:
 static unsigned char XGI_IsLCDDualLink(struct vb_device_info *pVBInfo)
 {
         if ((pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) &&
-                        (pVBInfo->LCDInfo & SetLCDDualLink)) /* shampoo0129 */
+            (pVBInfo->LCDInfo & SetLCDDualLink)) /* shampoo0129 */
                 return 1;
 
         return 0;
@@ -2466,16 +2445,15 @@ static void XGI_GetRAMDAC2DATA(unsigned short ModeIdIndex,
         modeflag = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
         CRT1Index = XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
         CRT1Index &= IndexMask;
-        temp1 = (unsigned short) XGI_CRT1Table[CRT1Index].CR[0];
-        temp2 = (unsigned short) XGI_CRT1Table[CRT1Index].CR[5];
+        temp1 = (unsigned short)XGI_CRT1Table[CRT1Index].CR[0];
+        temp2 = (unsigned short)XGI_CRT1Table[CRT1Index].CR[5];
         tempax = (temp1 & 0xFF) | ((temp2 & 0x03) << 8);
-        tempbx = (unsigned short) XGI_CRT1Table[CRT1Index].CR[8];
-        tempcx = (unsigned short)
-                        XGI_CRT1Table[CRT1Index].CR[14] << 8;
+        tempbx = (unsigned short)XGI_CRT1Table[CRT1Index].CR[8];
+        tempcx = (unsigned short)XGI_CRT1Table[CRT1Index].CR[14] << 8;
         tempcx &= 0x0100;
         tempcx <<= 2;
         tempbx |= tempcx;
-        temp1 = (unsigned short) XGI_CRT1Table[CRT1Index].CR[9];
+        temp1 = (unsigned short)XGI_CRT1Table[CRT1Index].CR[9];
 
         if (temp1 & 0x01)
                 tempbx |= 0x0100;
@@ -2497,8 +2475,8 @@ static void XGI_GetRAMDAC2DATA(unsigned short ModeIdIndex,
 }
 
 static void XGI_GetCRT2Data(unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                            unsigned short RefreshRateTableIndex,
+                            struct vb_device_info *pVBInfo)
 {
         unsigned short tempax = 0, tempbx = 0, modeflag, resinfo;
 
@@ -2667,8 +2645,8 @@ static void XGI_GetCRT2Data(unsigned short ModeIdIndex,
 }
 
 static void XGI_SetCRT2VCLK(unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                            unsigned short RefreshRateTableIndex,
+                            struct vb_device_info *pVBInfo)
 {
         unsigned char di_0, di_1, tempal;
 
@@ -2739,9 +2717,9 @@ static unsigned short XGI_GetOffset(unsigned short ModeNo,
 }
 
 static void XGI_SetCRT2Offset(unsigned short ModeNo,
-                unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                              unsigned short ModeIdIndex,
+                              unsigned short RefreshRateTableIndex,
+                              struct vb_device_info *pVBInfo)
 {
         unsigned short offset;
         unsigned char temp;
@@ -2750,11 +2728,11 @@ static void XGI_SetCRT2Offset(unsigned short ModeNo,
                 return;
 
         offset = XGI_GetOffset(ModeNo, ModeIdIndex, RefreshRateTableIndex);
-        temp = (unsigned char) (offset & 0xFF);
+        temp = (unsigned char)(offset & 0xFF);
         xgifb_reg_set(pVBInfo->Part1Port, 0x07, temp);
-        temp = (unsigned char) ((offset & 0xFF00) >> 8);
+        temp = (unsigned char)((offset & 0xFF00) >> 8);
         xgifb_reg_set(pVBInfo->Part1Port, 0x09, temp);
-        temp = (unsigned char) (((offset >> 3) & 0xFF) + 1);
+        temp = (unsigned char)(((offset >> 3) & 0xFF) + 1);
         xgifb_reg_set(pVBInfo->Part1Port, 0x03, temp);
 }
 
@@ -2767,8 +2745,8 @@ static void XGI_SetCRT2FIFO(struct vb_device_info *pVBInfo)
 }
 
 static void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                             unsigned short RefreshRateTableIndex,
+                             struct vb_device_info *pVBInfo)
 {
         u8 tempcx;
 
@@ -2783,8 +2761,8 @@ static void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex,
 }
 
 static void XGI_SetGroup1(unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                          unsigned short RefreshRateTableIndex,
+                          struct vb_device_info *pVBInfo)
 {
         unsigned short temp = 0, tempax = 0, tempbx = 0, tempcx = 0,
                         pushbx = 0, CRT1Index, modeflag;
@@ -2933,11 +2911,11 @@ static unsigned short XGI_GetVGAHT2(struct vb_device_info *pVBInfo)
         tempax = (pVBInfo->VT - pVBInfo->VDE) * pVBInfo->RVBHCFACT;
         tempax = (tempax * pVBInfo->HT) / tempbx;
 
-        return (unsigned short) tempax;
+        return (unsigned short)tempax;
 }
 
 static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
-                struct vb_device_info *pVBInfo)
+                            struct vb_device_info *pVBInfo)
 {
         unsigned short push1, push2, tempax, tempbx = 0, tempcx, temp, resinfo,
                         modeflag;
@@ -3044,14 +3022,14 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
                         if (ModeNo == 0x50) {
                                 if (pVBInfo->TVInfo == SetNTSCTV) {
                                         xgifb_reg_set(pVBInfo->Part1Port,
-                                                        0x07, 0x30);
+                                                      0x07, 0x30);
                                         xgifb_reg_set(pVBInfo->Part1Port,
-                                                        0x08, 0x03);
+                                                      0x08, 0x03);
                                 } else {
                                         xgifb_reg_set(pVBInfo->Part1Port,
-                                                        0x07, 0x2f);
+                                                      0x07, 0x2f);
                                         xgifb_reg_set(pVBInfo->Part1Port,
-                                                        0x08, 0x02);
+                                                      0x08, 0x02);
                                 }
                         }
                 }
@@ -3064,7 +3042,7 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
         tempbx = pVBInfo->VGAVT;
         push1 = tempbx;
         tempcx = 0x121;
-        tempbx = pVBInfo->VGAVDE; /* 0x0E Virtical Display End */
+        tempbx = pVBInfo->VGAVDE; /* 0x0E Vertical Display End */
 
         if (tempbx == 357)
                 tempbx = 350;
@@ -3116,7 +3094,7 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
         if (tempbx & 0x0400)
                 tempcx |= 0x0600;
 
-        /* 0x11 Vertival Blank End */
+        /* 0x11 Vertical Blank End */
         xgifb_reg_set(pVBInfo->Part1Port, 0x11, 0x00);
 
         tempax = push1;
@@ -3227,7 +3205,7 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
 }
 
 static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex,
-                struct vb_device_info *pVBInfo)
+                          struct vb_device_info *pVBInfo)
 {
         unsigned short i, j, tempax, tempbx, tempcx, temp, push1, push2,
                         modeflag;
@@ -3315,7 +3293,7 @@ static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex,
                 tempax = (tempax & 0x00FF) | ((tempax & 0x00FF) << 8);
                 push1 = tempax;
                 temp = (tempax & 0xFF00) >> 8;
-                temp += (unsigned short) TimingPoint[0];
+                temp += (unsigned short)TimingPoint[0];
 
                 if (pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV
                                 | VB_SIS302LV | VB_XGI301C)) {
@@ -3526,7 +3504,7 @@ static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex,
 
         tempcx = 0x0101;
 
-        if (pVBInfo->VBInfo & SetCRT2ToTV) { /*301b*/
+        if (pVBInfo->VBInfo & SetCRT2ToTV) { /* 301b */
                 if (pVBInfo->VGAHDE >= 1024) {
                         tempcx = 0x1920;
                         if (pVBInfo->VGAHDE >= 1280) {
@@ -3562,7 +3540,7 @@ static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex,
                 if (temp2 != 0)
                         tempeax += 1;
 
-                tempax = (unsigned short) tempeax;
+                tempax = (unsigned short)tempeax;
 
                 /* 301b */
                 if (pVBInfo->VBType & (VB_SIS301B | VB_SIS302B | VB_SIS301LV
@@ -3572,9 +3550,9 @@ static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex,
                 /* end 301b */
 
                 tempbx = push1;
-                tempbx = (unsigned short) (((tempeax & 0x0000FF00) & 0x1F00)
+                tempbx = (unsigned short)(((tempeax & 0x0000FF00) & 0x1F00)
                                 | (tempbx & 0x00FF));
-                tempax = (unsigned short) (((tempeax & 0x000000FF) << 8)
+                tempax = (unsigned short)(((tempeax & 0x000000FF) << 8)
                                 | (tempax & 0x00FF));
                 temp = (tempax & 0xFF00) >> 8;
         } else {
@@ -3622,14 +3600,14 @@ static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex,
 
         xgifb_reg_set(pVBInfo->Part2Port, 0x4d, temp);
         temp = xgifb_reg_get(pVBInfo->Part2Port, 0x43); /* 301b change */
-        xgifb_reg_set(pVBInfo->Part2Port, 0x43, (unsigned short) (temp - 3));
+        xgifb_reg_set(pVBInfo->Part2Port, 0x43, (unsigned short)(temp - 3));
 
         if (!(pVBInfo->TVInfo & (TVSetYPbPr525p | TVSetYPbPr750p))) {
                 if (pVBInfo->TVInfo & NTSC1024x768) {
                         TimingPoint = XGI_NTSC1024AdjTime;
                         for (i = 0x1c, j = 0; i <= 0x30; i++, j++) {
                                 xgifb_reg_set(pVBInfo->Part2Port, i,
-                                                TimingPoint[j]);
+                                              TimingPoint[j]);
                         }
                         xgifb_reg_set(pVBInfo->Part2Port, 0x43, 0x72);
                 }
@@ -3639,7 +3617,7 @@ static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex,
         if (pVBInfo->VBType & VB_XGI301C) {
                 if (pVBInfo->TVInfo & TVSetPALM)
                         xgifb_reg_and_or(pVBInfo->Part2Port, 0x4E, ~0x08,
-                                        0x08); /* PALM Mode */
+                                         0x08); /* PALM Mode */
         }
 
         if (pVBInfo->TVInfo & TVSetPALM) {
@@ -3656,8 +3634,7 @@ static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex,
         }
 }
 
-static void XGI_SetLCDRegs(unsigned short ModeIdIndex,
-                struct vb_device_info *pVBInfo)
+static void XGI_SetLCDRegs(unsigned short ModeIdIndex, struct vb_device_info *pVBInfo)
 {
         unsigned short pushbx, tempax, tempbx, tempcx, temp, tempah,
                         tempbh, tempch;
@@ -3853,12 +3830,12 @@ static void XGI_SetLCDRegs(unsigned short ModeIdIndex,
         }
 }
 
-/* --------------------------------------------------------------------- */
-/* Function : XGI_GetTap4Ptr */
-/* Input : */
-/* Output : di -> Tap4 Reg. Setting Pointer */
-/* Description : */
-/* --------------------------------------------------------------------- */
+/*
+ * Function : XGI_GetTap4Ptr
+ * Input :
+ * Output : di -> Tap4 Reg. Setting Pointer
+ * Description :
+ */
 static struct XGI301C_Tap4TimingStruct const
 *XGI_GetTap4Ptr(unsigned short tempcx, struct vb_device_info *pVBInfo)
 {
@@ -3882,7 +3859,7 @@ static struct XGI301C_Tap4TimingStruct const
 
         if (pVBInfo->VBInfo & SetCRT2ToYPbPr525750) {
                 if ((pVBInfo->TVInfo & TVSetYPbPr525i) ||
-                        (pVBInfo->TVInfo & TVSetYPbPr525p))
+                    (pVBInfo->TVInfo & TVSetYPbPr525p))
                         Tap4TimingPtr = xgifb_ntsc_525_tap4_timing;
                 if (pVBInfo->TVInfo & TVSetYPbPr750p)
                         Tap4TimingPtr = YPbPr750pTap4Timing;
@@ -3988,8 +3965,8 @@ static void XGI_SetGroup3(unsigned short ModeIdIndex,
 }
 
 static void XGI_SetGroup4(unsigned short ModeIdIndex,
-                unsigned short RefreshRateTableIndex,
-                struct vb_device_info *pVBInfo)
+                          unsigned short RefreshRateTableIndex,
+                          struct vb_device_info *pVBInfo)
 {
         unsigned short tempax, tempcx, tempbx, modeflag, temp, temp2;
 
@@ -4080,12 +4057,12 @@ static void XGI_SetGroup4(unsigned short ModeIdIndex,
         if (templong != 0)
                 tempebx++;
 
-        temp = (unsigned short) (tempebx & 0x000000FF);
+        temp = (unsigned short)(tempebx & 0x000000FF);
         xgifb_reg_set(pVBInfo->Part4Port, 0x1B, temp);
 
-        temp = (unsigned short) ((tempebx & 0x0000FF00) >> 8);
+        temp = (unsigned short)((tempebx & 0x0000FF00) >> 8);
         xgifb_reg_set(pVBInfo->Part4Port, 0x1A, temp);
-        tempbx = (unsigned short) (tempebx >> 16);
+        tempbx = (unsigned short)(tempebx >> 16);
         temp = tempbx & 0x00FF;
         temp <<= 4;
         temp |= ((tempcx & 0xFF00) >> 8);
@@ -4132,8 +4109,7 @@ static void XGI_SetGroup4(unsigned short ModeIdIndex,
                                         | TVSetHiVision))) {
                                 temp |= 0x0001;
                                 if ((pVBInfo->VBInfo & SetInSlaveMode) &&
-                                                !(pVBInfo->TVInfo
-                                                                & TVSimuMode))
+                                    !(pVBInfo->TVInfo & TVSimuMode))
                                         temp &= (~0x0001);
                         }
                 }
@@ -4174,7 +4150,8 @@ static void XGI_DisableGatingCRT(struct vb_device_info *pVBInfo)
 }
 
 static unsigned char XGI_XG21CheckLVDSMode(struct xgifb_video_info *xgifb_info,
-                unsigned short ModeNo, unsigned short ModeIdIndex)
+                                           unsigned short ModeNo,
+                                           unsigned short ModeIdIndex)
 {
         unsigned short xres, yres, colordepth, modeflag, resindex;
 
@@ -4221,7 +4198,7 @@ static void xgifb_set_lvds(struct xgifb_video_info *xgifb_info,
         unsigned short LVDSVT, LVDSVBS, LVDSVRS, LVDSVRE, LVDSVBE;
         unsigned short value;
 
-        temp = (unsigned char) ((xgifb_info->lvds_data.LVDS_Capability &
+        temp = (unsigned char)((xgifb_info->lvds_data.LVDS_Capability &
                                 (LCDPolarity << 8)) >> 8);
         temp &= LCDPolarity;
         Miscdata = inb(pVBInfo->P3cc);
@@ -4354,12 +4331,12 @@ static void xgifb_set_lvds(struct xgifb_video_info *xgifb_info,
         if (chip_id == XG27) {
                 /* Panel VRS SR35[2:0] SR34[7:0] */
                 xgifb_reg_and_or(pVBInfo->P3c4, 0x35, ~0x07,
-                                        (value & 0x700) >> 8);
+                                 (value & 0x700) >> 8);
                 xgifb_reg_set(pVBInfo->P3c4, 0x34, value & 0xFF);
         } else {
                 /* Panel VRS SR3F[1:0] SR34[7:0] SR33[0] */
                 xgifb_reg_and_or(pVBInfo->P3c4, 0x3F, ~0x03,
-                                        (value & 0x600) >> 9);
+                                 (value & 0x600) >> 9);
                 xgifb_reg_set(pVBInfo->P3c4, 0x34, (value >> 1) & 0xFF);
                 xgifb_reg_and_or(pVBInfo->P3d4, 0x33, ~0x01, value & 0x01);
         }
@@ -4372,11 +4349,11 @@ static void xgifb_set_lvds(struct xgifb_video_info *xgifb_info,
         /* Panel VRE SR3F[7:2] */
         if (chip_id == XG27)
                 xgifb_reg_and_or(pVBInfo->P3c4, 0x3F, ~0xFC,
-                                        (value << 2) & 0xFC);
+                                 (value << 2) & 0xFC);
         else
                 /* SR3F[7] has to be 0, h/w bug */
                 xgifb_reg_and_or(pVBInfo->P3c4, 0x3F, ~0xFC,
-                                        (value << 2) & 0x7C);
+                                 (value << 2) & 0x7C);
 
         for (temp = 0, value = 0; temp < 3; temp++) {
                 xgifb_reg_and_or(pVBInfo->P3c4, 0x31, ~0x30, value);
@@ -4400,13 +4377,13 @@ static void xgifb_set_lvds(struct xgifb_video_info *xgifb_info,
         }
 }
 
-/* --------------------------------------------------------------------- */
-/* Function : XGI_IsLCDON */
-/* Input : */
-/* Output : 0 : Skip PSC Control */
-/* 1: Disable PSC */
-/* Description : */
-/* --------------------------------------------------------------------- */
+/*
+ * Function : XGI_IsLCDON
+ * Input :
+ * Output : 0 : Skip PSC Control
+ * 1: Disable PSC
+ * Description :
+ */
 static unsigned char XGI_IsLCDON(struct vb_device_info *pVBInfo)
 {
         unsigned short tempax;
@@ -4421,8 +4398,8 @@ static unsigned char XGI_IsLCDON(struct vb_device_info *pVBInfo)
 }
 
 static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info,
-                struct xgi_hw_device_info *HwDeviceExtension,
-                struct vb_device_info *pVBInfo)
+                              struct xgi_hw_device_info *HwDeviceExtension,
+                              struct vb_device_info *pVBInfo)
 {
         unsigned short tempah = 0;
 
@@ -4498,23 +4475,23 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info,
         }
 }
 
-/* --------------------------------------------------------------------- */
-/* Function : XGI_GetTVPtrIndex */
-/* Input : */
-/* Output : */
-/* Description : bx 0 : ExtNTSC */
-/* 1 : StNTSC */
-/* 2 : ExtPAL */
-/* 3 : StPAL */
-/* 4 : ExtHiTV */
-/* 5 : StHiTV */
-/* 6 : Ext525i */
-/* 7 : St525i */
-/* 8 : Ext525p */
-/* 9 : St525p */
-/* A : Ext750p */
-/* B : St750p */
-/* --------------------------------------------------------------------- */
+/*
+ * Function : XGI_GetTVPtrIndex
+ * Input :
+ * Output :
+ * Description : bx 0 : ExtNTSC
+ * 1 : StNTSC
+ * 2 : ExtPAL
+ * 3 : StPAL
+ * 4 : ExtHiTV
+ * 5 : StHiTV
+ * 6 : Ext525i
+ * 7 : St525i
+ * 8 : Ext525p
+ * 9 : St525p
+ * A : Ext750p
+ * B : St750p
+ */
 static unsigned short XGI_GetTVPtrIndex(struct vb_device_info *pVBInfo)
 {
         unsigned short tempbx = 0;
@@ -4535,24 +4512,24 @@ static unsigned short XGI_GetTVPtrIndex(struct vb_device_info *pVBInfo)
         return tempbx;
 }
 
-/* --------------------------------------------------------------------- */
-/* Function : XGI_GetTVPtrIndex2 */
-/* Input : */
-/* Output : bx 0 : NTSC */
-/* 1 : PAL */
-/* 2 : PALM */
-/* 3 : PALN */
-/* 4 : NTSC1024x768 */
-/* 5 : PAL-M 1024x768 */
-/* 6-7: reserved */
-/* cl 0 : YFilter1 */
-/* 1 : YFilter2 */
-/* ch 0 : 301A */
-/* 1 : 301B/302B/301LV/302LV */
-/* Description : */
-/* --------------------------------------------------------------------- */
+/*
+ * Function : XGI_GetTVPtrIndex2
+ * Input :
+ * Output : bx 0 : NTSC
+ * 1 : PAL
+ * 2 : PALM
+ * 3 : PALN
+ * 4 : NTSC1024x768
+ * 5 : PAL-M 1024x768
+ * 6-7: reserved
+ * cl 0 : YFilter1
+ * 1 : YFilter2
+ * ch 0 : 301A
+ * 1 : 301B/302B/301LV/302LV
+ * Description :
+ */
 static void XGI_GetTVPtrIndex2(unsigned short *tempbx, unsigned char *tempcl,
-                unsigned char *tempch, struct vb_device_info *pVBInfo)
+                               unsigned char *tempch, struct vb_device_info *pVBInfo)
 {
         *tempbx = 0;
         *tempcl = 0;
@@ -4637,33 +4614,32 @@ static void XGI_SetLCDCap_A(unsigned short tempcx,
 
         if (temp & LCDRGB18Bit) {
                 xgifb_reg_and_or(pVBInfo->Part1Port, 0x19, 0x0F,
-                                /* Enable Dither */
-                                (unsigned short) (0x20 | (tempcx & 0x00C0)));
+                                 /* Enable Dither */
+                                 (unsigned short)(0x20 | (tempcx & 0x00C0)));
                 xgifb_reg_and_or(pVBInfo->Part1Port, 0x1A, 0x7F, 0x80);
         } else {
                 xgifb_reg_and_or(pVBInfo->Part1Port, 0x19, 0x0F,
-                                (unsigned short) (0x30 | (tempcx & 0x00C0)));
+                                 (unsigned short)(0x30 | (tempcx & 0x00C0)));
                 xgifb_reg_and_or(pVBInfo->Part1Port, 0x1A, 0x7F, 0x00);
         }
 }
 
-/* --------------------------------------------------------------------- */
-/* Function : XGI_SetLCDCap_B */
-/* Input : cx -> LCD Capability */
-/* Output : */
-/* Description : */
-/* --------------------------------------------------------------------- */
+/*
+ * Function : XGI_SetLCDCap_B
+ * Input : cx -> LCD Capability
+ * Output :
+ * Description :
+ */
 static void XGI_SetLCDCap_B(unsigned short tempcx,
                             struct vb_device_info *pVBInfo)
 {
         if (tempcx & EnableLCD24bpp) /* 24bits */
                 xgifb_reg_and_or(pVBInfo->Part2Port, 0x1A, 0xE0,
-                                (unsigned short) (((tempcx & 0x00ff) >> 6)
-                                                | 0x0c));
+                                 (unsigned short)(((tempcx & 0x00ff) >> 6) | 0x0c));
         else
                 xgifb_reg_and_or(pVBInfo->Part2Port, 0x1A, 0xE0,
-                                (unsigned short) (((tempcx & 0x00ff) >> 6)
-                                                | 0x18)); /* Enable Dither */
+                                 (unsigned short)(((tempcx & 0x00ff) >> 6) | 0x18));
+                                  /* Enable Dither */
 }
 
 static void XGI_LongWait(struct vb_device_info *pVBInfo)
@@ -4698,13 +4674,13 @@ static void SetSpectrum(struct vb_device_info *pVBInfo)
         XGI_LongWait(pVBInfo);
 
         xgifb_reg_set(pVBInfo->Part4Port, 0x31,
-                        pVBInfo->LCDCapList[index].Spectrum_31);
+                      pVBInfo->LCDCapList[index].Spectrum_31);
         xgifb_reg_set(pVBInfo->Part4Port, 0x32,
-                        pVBInfo->LCDCapList[index].Spectrum_32);
+                      pVBInfo->LCDCapList[index].Spectrum_32);
         xgifb_reg_set(pVBInfo->Part4Port, 0x33,
-                        pVBInfo->LCDCapList[index].Spectrum_33);
+                      pVBInfo->LCDCapList[index].Spectrum_33);
         xgifb_reg_set(pVBInfo->Part4Port, 0x34,
-                        pVBInfo->LCDCapList[index].Spectrum_34);
+                      pVBInfo->LCDCapList[index].Spectrum_34);
         XGI_LongWait(pVBInfo);
         xgifb_reg_or(pVBInfo->Part4Port, 0x30, 0x40); /* enable spectrum */
 }
@@ -4721,13 +4697,13 @@ static void XGI_SetLCDCap(struct vb_device_info *pVBInfo)
                     (VB_SIS301LV | VB_SIS302LV | VB_XGI301C)) {
                         /* Set 301LV Capability */
                         xgifb_reg_set(pVBInfo->Part4Port, 0x24,
-                                        (unsigned char) (tempcx & 0x1F));
+                                      (unsigned char)(tempcx & 0x1F));
                 }
                 /* VB Driving */
                 xgifb_reg_and_or(pVBInfo->Part4Port, 0x0D,
-                                ~((EnableVBCLKDRVLOW | EnablePLLSPLOW) >> 8),
-                                (unsigned short) ((tempcx & (EnableVBCLKDRVLOW
-                                                | EnablePLLSPLOW)) >> 8));
+                                 ~((EnableVBCLKDRVLOW | EnablePLLSPLOW) >> 8),
+                                 (unsigned short)((tempcx & (EnableVBCLKDRVLOW |
+                                 EnablePLLSPLOW)) >> 8));
 
                 if (pVBInfo->VBInfo & SetCRT2ToLCD)
                         XGI_SetLCDCap_B(tempcx, pVBInfo);
@@ -4744,12 +4720,12 @@ static void XGI_SetLCDCap(struct vb_device_info *pVBInfo)
         }
 }
 
-/* --------------------------------------------------------------------- */
-/* Function : XGI_SetAntiFlicker */
-/* Input : */
-/* Output : */
-/* Description : Set TV Customized Param. */
-/* --------------------------------------------------------------------- */
+/*
+ * Function : XGI_SetAntiFlicker
+ * Input :
+ * Output :
+ * Description : Set TV Customized Param.
+ */
 static void XGI_SetAntiFlicker(struct vb_device_info *pVBInfo)
 {
         unsigned short tempbx;
@@ -4792,13 +4768,13 @@ static void XGI_SetPhaseIncr(struct vb_device_info *pVBInfo)
         XGI_GetTVPtrIndex2(&tempbx, &tempcl, &tempch, pVBInfo); /* bx, cl, ch */
         tempData = TVPhaseList[tempbx];
 
-        xgifb_reg_set(pVBInfo->Part2Port, 0x31, (unsigned short) (tempData
+        xgifb_reg_set(pVBInfo->Part2Port, 0x31, (unsigned short)(tempData
                         & 0x000000FF));
-        xgifb_reg_set(pVBInfo->Part2Port, 0x32, (unsigned short) ((tempData
+        xgifb_reg_set(pVBInfo->Part2Port, 0x32, (unsigned short)((tempData
                         & 0x0000FF00) >> 8));
-        xgifb_reg_set(pVBInfo->Part2Port, 0x33, (unsigned short) ((tempData
+        xgifb_reg_set(pVBInfo->Part2Port, 0x33, (unsigned short)((tempData
                         & 0x00FF0000) >> 16));
-        xgifb_reg_set(pVBInfo->Part2Port, 0x34, (unsigned short) ((tempData
+        xgifb_reg_set(pVBInfo->Part2Port, 0x34, (unsigned short)((tempData
                         & 0xFF000000) >> 24));
 }
 
@@ -4866,12 +4842,12 @@ static void XGI_SetYFilter(unsigned short ModeIdIndex,
         }
 }
 
-/* --------------------------------------------------------------------- */
-/* Function : XGI_OEM310Setting */
-/* Input : */
-/* Output : */
-/* Description : Customized Param. for 301 */
-/* --------------------------------------------------------------------- */
+/*
+ * Function : XGI_OEM310Setting
+ * Input :
+ * Output :
+ * Description : Customized Param. for 301
+ */
 static void XGI_OEM310Setting(unsigned short ModeIdIndex,
                               struct vb_device_info *pVBInfo)
 {
@@ -4890,12 +4866,12 @@ static void XGI_OEM310Setting(unsigned short ModeIdIndex,
         }
 }
 
-/* --------------------------------------------------------------------- */
-/* Function : XGI_SetCRT2ModeRegs */
-/* Input : */
-/* Output : */
-/* Description : Origin code for crt2group */
-/* --------------------------------------------------------------------- */
+/*
+ * Function : XGI_SetCRT2ModeRegs
+ * Input :
+ * Output :
+ * Description : Origin code for crt2group
+ */
 static void XGI_SetCRT2ModeRegs(struct vb_device_info *pVBInfo)
 {
         unsigned short tempbl;
@@ -4999,8 +4975,8 @@ reg_and_or:
                                 tempah |= 0x40;
                 }
 
-                if ((pVBInfo->LCDResInfo == Panel_1280x1024)
-                                || (pVBInfo->LCDResInfo == Panel_1280x1024x75))
+                if ((pVBInfo->LCDResInfo == Panel_1280x1024) ||
+                    (pVBInfo->LCDResInfo == Panel_1280x1024x75))
                         tempah |= 0x80;
 
                 if (pVBInfo->LCDResInfo == Panel_1280x960)
@@ -5068,8 +5044,9 @@ void XGI_LockCRT2(struct vb_device_info *pVBInfo)
 }
 
 unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
-                unsigned short ModeNo, unsigned short ModeIdIndex,
-                struct vb_device_info *pVBInfo)
+                                  unsigned short ModeNo,
+                                  unsigned short ModeIdIndex,
+                                  struct vb_device_info *pVBInfo)
 {
         const u8 LCDARefreshIndex[] = {
                 0x00, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x00 };
@@ -5143,14 +5120,14 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
 }
 
 static void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex,
-                struct xgi_hw_device_info *HwDeviceExtension,
-                struct vb_device_info *pVBInfo)
+                             struct xgi_hw_device_info *HwDeviceExtension,
+                             struct vb_device_info *pVBInfo)
 {
         unsigned short RefreshRateTableIndex;
 
         pVBInfo->SetFlag |= ProgrammingCRT2;
         RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
-                        ModeIdIndex, pVBInfo);
+                                                   ModeIdIndex, pVBInfo);
         XGI_GetLVDSResInfo(ModeIdIndex, pVBInfo);
         XGI_GetLVDSData(ModeIdIndex, pVBInfo);
         XGI_ModCRT1Regs(ModeIdIndex, HwDeviceExtension, pVBInfo);
@@ -5159,8 +5136,8 @@ static void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex,
 }
 
 static unsigned char XGI_SetCRT2Group301(unsigned short ModeNo,
-                struct xgi_hw_device_info *HwDeviceExtension,
-                struct vb_device_info *pVBInfo)
+                                         struct xgi_hw_device_info *HwDeviceExtension,
+                                         struct vb_device_info *pVBInfo)
 {
         unsigned short ModeIdIndex, RefreshRateTableIndex;
 
@@ -5168,7 +5145,7 @@ static unsigned char XGI_SetCRT2Group301(unsigned short ModeNo,
         XGI_SearchModeID(ModeNo, &ModeIdIndex);
         pVBInfo->SelectCRT2Rate = 4;
         RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
-                        ModeIdIndex, pVBInfo);
+                                                   ModeIdIndex, pVBInfo);
         XGI_SaveCRT2Info(ModeNo, pVBInfo);
         XGI_GetCRT2ResInfo(ModeIdIndex, pVBInfo);
         XGI_GetCRT2Data(ModeIdIndex, RefreshRateTableIndex, pVBInfo);
@@ -5210,39 +5187,39 @@ void XGI_SenseCRT1(struct vb_device_info *pVBInfo)
         CR63 = xgifb_reg_get(pVBInfo->P3d4, 0x63);
         SR01 = xgifb_reg_get(pVBInfo->P3c4, 0x01);
 
-        xgifb_reg_set(pVBInfo->P3c4, 0x01, (unsigned char) (SR01 & 0xDF));
-        xgifb_reg_set(pVBInfo->P3d4, 0x63, (unsigned char) (CR63 & 0xBF));
+        xgifb_reg_set(pVBInfo->P3c4, 0x01, (unsigned char)(SR01 & 0xDF));
+        xgifb_reg_set(pVBInfo->P3d4, 0x63, (unsigned char)(CR63 & 0xBF));
 
         CR17 = xgifb_reg_get(pVBInfo->P3d4, 0x17);
-        xgifb_reg_set(pVBInfo->P3d4, 0x17, (unsigned char) (CR17 | 0x80));
+        xgifb_reg_set(pVBInfo->P3d4, 0x17, (unsigned char)(CR17 | 0x80));
 
         SR1F = xgifb_reg_get(pVBInfo->P3c4, 0x1F);
-        xgifb_reg_set(pVBInfo->P3c4, 0x1F, (unsigned char) (SR1F | 0x04));
+        xgifb_reg_set(pVBInfo->P3c4, 0x1F, (unsigned char)(SR1F | 0x04));
 
         SR07 = xgifb_reg_get(pVBInfo->P3c4, 0x07);
-        xgifb_reg_set(pVBInfo->P3c4, 0x07, (unsigned char) (SR07 & 0xFB));
+        xgifb_reg_set(pVBInfo->P3c4, 0x07, (unsigned char)(SR07 & 0xFB));
         SR06 = xgifb_reg_get(pVBInfo->P3c4, 0x06);
-        xgifb_reg_set(pVBInfo->P3c4, 0x06, (unsigned char) (SR06 & 0xC3));
+        xgifb_reg_set(pVBInfo->P3c4, 0x06, (unsigned char)(SR06 & 0xC3));
 
         xgifb_reg_set(pVBInfo->P3d4, 0x11, 0x00);
 
         for (i = 0; i < 8; i++)
-                xgifb_reg_set(pVBInfo->P3d4, (unsigned short) i, CRTCData[i]);
+                xgifb_reg_set(pVBInfo->P3d4, (unsigned short)i, CRTCData[i]);
 
         for (i = 8; i < 11; i++)
-                xgifb_reg_set(pVBInfo->P3d4, (unsigned short) (i + 8),
-                                CRTCData[i]);
+                xgifb_reg_set(pVBInfo->P3d4, (unsigned short)(i + 8),
+                              CRTCData[i]);
 
         for (i = 11; i < 13; i++)
-                xgifb_reg_set(pVBInfo->P3d4, (unsigned short) (i + 4),
-                                CRTCData[i]);
+                xgifb_reg_set(pVBInfo->P3d4, (unsigned short)(i + 4),
+                              CRTCData[i]);
 
         for (i = 13; i < 16; i++)
-                xgifb_reg_set(pVBInfo->P3c4, (unsigned short) (i - 3),
-                                CRTCData[i]);
+                xgifb_reg_set(pVBInfo->P3c4, (unsigned short)(i - 3),
+                              CRTCData[i]);
 
-        xgifb_reg_set(pVBInfo->P3c4, 0x0E, (unsigned char) (CRTCData[16]
-                        & 0xE0));
+        xgifb_reg_set(pVBInfo->P3c4, 0x0E, (unsigned char)(CRTCData[16]
+                      & 0xE0));
 
         xgifb_reg_set(pVBInfo->P3c4, 0x31, 0x00);
         xgifb_reg_set(pVBInfo->P3c4, 0x2B, 0x1B);
@@ -5275,12 +5252,12 @@ void XGI_SenseCRT1(struct vb_device_info *pVBInfo)
 
         xgifb_reg_set(pVBInfo->P3d4, 0x53, (xgifb_reg_get(
                         pVBInfo->P3d4, 0x53) & 0xFD));
-        xgifb_reg_set(pVBInfo->P3c4, 0x1F, (unsigned char) SR1F);
+        xgifb_reg_set(pVBInfo->P3c4, 0x1F, (unsigned char)SR1F);
 }
 
 static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info,
-                struct xgi_hw_device_info *HwDeviceExtension,
-                struct vb_device_info *pVBInfo)
+                             struct xgi_hw_device_info *HwDeviceExtension,
+                             struct vb_device_info *pVBInfo)
 {
         unsigned short tempah;
 
@@ -5310,11 +5287,11 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info,
 
                 if (!(pVBInfo->VBInfo & DisableCRT2Display)) {
                         xgifb_reg_and_or(pVBInfo->Part2Port, 0x00, ~0xE0,
-                                        0x20); /* shampoo 0129 */
+                                         0x20); /* shampoo 0129 */
                         if (pVBInfo->VBType & (VB_SIS302LV | VB_XGI301C)) {
                                 if (pVBInfo->VBInfo &
                                         (SetCRT2ToLCD | XGI_SetCRT2ToLCDA))
-                                        /* LVDS PLL power on */
+                                         /* LVDS PLL power on */
                                         xgifb_reg_and(pVBInfo->Part4Port, 0x2A,
                                                       0x7F);
                                 /* LVDS Driver power on */
@@ -5358,9 +5335,9 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info,
 }
 
 static void XGI_SetCRT1Group(struct xgifb_video_info *xgifb_info,
-                struct xgi_hw_device_info *HwDeviceExtension,
-                unsigned short ModeNo, unsigned short ModeIdIndex,
-                struct vb_device_info *pVBInfo)
+                             struct xgi_hw_device_info *HwDeviceExtension,
+                             unsigned short ModeNo, unsigned short ModeIdIndex,
+                             struct vb_device_info *pVBInfo)
 {
         unsigned short RefreshRateTableIndex, temp;
 
@@ -5389,14 +5366,14 @@ static void XGI_SetCRT1Group(struct xgifb_video_info *xgifb_info,
         }
 
         RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
-                        ModeIdIndex, pVBInfo);
+                                                   ModeIdIndex, pVBInfo);
         if (RefreshRateTableIndex != 0xFFFF) {
                 XGI_SetSync(RefreshRateTableIndex, pVBInfo);
                 XGI_SetCRT1CRTC(ModeIdIndex, RefreshRateTableIndex,
                                 pVBInfo, HwDeviceExtension);
                 XGI_SetCRT1DE(ModeIdIndex, RefreshRateTableIndex, pVBInfo);
                 XGI_SetCRT1Offset(ModeNo, ModeIdIndex, RefreshRateTableIndex,
-                                HwDeviceExtension, pVBInfo);
+                                  HwDeviceExtension, pVBInfo);
                 XGI_SetCRT1VCLK(ModeIdIndex, HwDeviceExtension,
                                 RefreshRateTableIndex, pVBInfo);
         }
@@ -5410,15 +5387,15 @@ static void XGI_SetCRT1Group(struct xgifb_video_info *xgifb_info,
                                 XGI_SetXG21CRTC(RefreshRateTableIndex, pVBInfo);
 
                         XGI_UpdateXG21CRTC(ModeNo, pVBInfo,
-                                        RefreshRateTableIndex);
+                                           RefreshRateTableIndex);
 
                         xgifb_set_lcd(HwDeviceExtension->jChipType,
                                       pVBInfo, RefreshRateTableIndex);
 
                         if (pVBInfo->IF_DEF_LVDS == 1)
                                 xgifb_set_lvds(xgifb_info,
-                                                HwDeviceExtension->jChipType,
-                                                ModeIdIndex, pVBInfo);
+                                               HwDeviceExtension->jChipType,
+                                               ModeIdIndex, pVBInfo);
                 }
         }
 
@@ -5430,8 +5407,8 @@ static void XGI_SetCRT1Group(struct xgifb_video_info *xgifb_info,
 }
 
 unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
-                        struct xgi_hw_device_info *HwDeviceExtension,
-                        unsigned short ModeNo)
+                            struct xgi_hw_device_info *HwDeviceExtension,
+                            unsigned short ModeNo)
 {
         unsigned short ModeIdIndex;
         struct vb_device_info VBINF;
@@ -5440,7 +5417,7 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
         pVBInfo->IF_DEF_LVDS = 0;
 
         if (HwDeviceExtension->jChipType >= XG20)
-                pVBInfo->VBType = 0; /*set VBType default 0*/
+                pVBInfo->VBType = 0; /* set VBType default 0 */
 
         XGIRegInit(pVBInfo, xgifb_info->vga_base);
 
@@ -5473,13 +5450,13 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
                 XGI_DisableBridge(xgifb_info, HwDeviceExtension, pVBInfo);
 
                 if (pVBInfo->VBInfo & (SetSimuScanMode | XGI_SetCRT2ToLCDA) ||
-                        !(pVBInfo->VBInfo & SwitchCRT2)) {
+                    !(pVBInfo->VBInfo & SwitchCRT2)) {
                         XGI_SetCRT1Group(xgifb_info, HwDeviceExtension, ModeNo,
-                                        ModeIdIndex, pVBInfo);
+                                         ModeIdIndex, pVBInfo);
 
                         if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
                                 XGI_SetLCDAGroup(ModeNo, ModeIdIndex,
-                                                HwDeviceExtension, pVBInfo);
+                                                 HwDeviceExtension, pVBInfo);
                         }
                 }
 
@@ -5488,7 +5465,7 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
                         case VB_CHIP_301: /* fall through */
                         case VB_CHIP_302:
                                 XGI_SetCRT2Group301(ModeNo, HwDeviceExtension,
-                                                pVBInfo); /*add for CRT2 */
+                                                    pVBInfo); /* add for CRT2 */
                                 break;
 
                         default:
@@ -5497,7 +5474,7 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
                 }
 
                 XGI_SetCRT2ModeRegs(pVBInfo);
-                XGI_OEM310Setting(ModeIdIndex, pVBInfo); /*0212*/
+                XGI_OEM310Setting(ModeIdIndex, pVBInfo); /* 0212 */
                 XGI_EnableBridge(xgifb_info, HwDeviceExtension, pVBInfo);
         } /* !XG20 */
         else {
@@ -5515,7 +5492,7 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
                 XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo);
 
                 XGI_SetCRT1Group(xgifb_info, HwDeviceExtension, ModeNo,
-                                ModeIdIndex, pVBInfo);
+                                 ModeIdIndex, pVBInfo);
 
                 XGI_DisplayOn(xgifb_info, HwDeviceExtension, pVBInfo);
         }
diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index c801deb142f6..f9f98e06e6d5 100644
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -1701,6 +1701,7 @@ static const struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_Vx75[] = {
         { {0x28, 0xF5, 0x00, 0x84, 0xFF, 0x29, 0x90} },/* ; 04 (x768) */
         { {0x28, 0x5A, 0x13, 0x87, 0xFF, 0x29, 0xA9} } /* ; 05 (x1024) */
 };
+
 /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */
 static const struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_Hx75[] = {
         { {0x7E, 0x3B, 0x9A, 0x44, 0x12, 0x00, 0x01, 0x00} },/* ; 00 (320x) */
@@ -1886,17 +1887,17 @@ static const struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = {
         0x6C, 0xC3, 0x35, 0x62,
         0x0A, 0xC0, 0x28, 0x10},
 /* LCDCap1280x1024 */
-        {Panel_1280x1024, XGI_LCDDualLink+DefaultLCDCap,
+        {Panel_1280x1024, XGI_LCDDualLink + DefaultLCDCap,
         0x70, 0x03, VCLK108_2_315,
         0x70, 0x44, 0xF8, 0x2F,
         0x0A, 0xC0, 0x30, 0x10},
 /* LCDCap1400x1050 */
-        {Panel_1400x1050, XGI_LCDDualLink+DefaultLCDCap,
+        {Panel_1400x1050, XGI_LCDDualLink + DefaultLCDCap,
         0x70, 0x03, VCLK108_2_315,
          0x70, 0x44, 0xF8, 0x2F,
          0x0A, 0xC0, 0x30, 0x10},
 /* LCDCap1600x1200 */
-        {Panel_1600x1200, XGI_LCDDualLink+DefaultLCDCap,
+        {Panel_1600x1200, XGI_LCDDualLink + DefaultLCDCap,
         0xC0, 0x03, VCLK162,
          0x43, 0x22, 0x70, 0x24,
          0x0A, 0xC0, 0x30, 0x10},
@@ -1905,7 +1906,7 @@ static const struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = {
          0x2B, 0x61, 0x2B, 0x61,
          0x0A, 0xC0, 0x28, 0x10},
 /* LCDCap1280x1024x75 */
-        {Panel_1280x1024x75, XGI_LCDDualLink+DefaultLCDCap,
+        {Panel_1280x1024x75, XGI_LCDDualLink + DefaultLCDCap,
          0x90, 0x03, VCLK135_5,
          0x54, 0x42, 0x4A, 0x61,
          0x0A, 0xC0, 0x30, 0x10},
diff --git a/drivers/staging/xgifb/vb_util.h b/drivers/staging/xgifb/vb_util.h
index 08db58b396b2..052694e75053 100644
--- a/drivers/staging/xgifb/vb_util.h
+++ b/drivers/staging/xgifb/vb_util.h
@@ -18,7 +18,7 @@ static inline void xgifb_reg_and_or(unsigned long port, u8 index,
         u8 temp;
 
         temp = xgifb_reg_get(port, index);
-        temp = (u8) ((temp & data_and) | data_or);
+        temp = (u8)((temp & data_and) | data_or);
         xgifb_reg_set(port, index, temp);
 }
 
@@ -28,7 +28,7 @@ static inline void xgifb_reg_and(unsigned long port, u8 index,
         u8 temp;
 
         temp = xgifb_reg_get(port, index);
-        temp = (u8) (temp & data_and);
+        temp = (u8)(temp & data_and);
         xgifb_reg_set(port, index, temp);
 }
 
diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc/ad_sigma_delta.h
index e7fdec4db9da..5ba430cc9a87 100644
--- a/include/linux/iio/adc/ad_sigma_delta.h
+++ b/include/linux/iio/adc/ad_sigma_delta.h
@@ -136,6 +136,7 @@ int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig);
                 .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
                         BIT(IIO_CHAN_INFO_OFFSET), \
                 .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
+                .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
                 .scan_index = (_si), \
                 .scan_type = { \
                         .sign = 'u', \
diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h
index 9edccfba1ffb..47eeec3218b5 100644
--- a/include/linux/iio/consumer.h
+++ b/include/linux/iio/consumer.h
@@ -226,6 +226,34 @@ int iio_read_channel_processed(struct iio_channel *chan, int *val);
 int iio_write_channel_raw(struct iio_channel *chan, int val);
 
 /**
+ * iio_read_max_channel_raw() - read maximum available raw value from a given
+ *                              channel, i.e. the maximum possible value.
+ * @chan:               The channel being queried.
+ * @val:                Value read back.
+ *
+ * Note raw reads from iio channels are in adc counts and hence
+ * scale will need to be applied if standard units are required.
+ */
+int iio_read_max_channel_raw(struct iio_channel *chan, int *val);
+
+/**
+ * iio_read_avail_channel_raw() - read available raw values from a given channel
+ * @chan:               The channel being queried.
+ * @vals:               Available values read back.
+ * @length:             Number of entries in vals.
+ *
+ * Returns an error code, IIO_AVAIL_RANGE or IIO_AVAIL_LIST.
+ *
+ * For ranges, three vals are always returned; min, step and max.
+ * For lists, all the possible values are enumerated.
+ *
+ * Note raw available values from iio channels are in adc counts and
+ * hence scale will need to be applied if standard units are required.
+ */
+int iio_read_avail_channel_raw(struct iio_channel *chan,
+                               const int **vals, int *length);
+
+/**
  * iio_get_channel_type() - get the type of a channel
  * @channel:            The channel being queried.
  * @type:               The type of the channel.
@@ -236,6 +264,19 @@ int iio_get_channel_type(struct iio_channel *channel,
                          enum iio_chan_type *type);
 
 /**
+ * iio_read_channel_offset() - read the offset value for a channel
+ * @chan:               The channel being queried.
+ * @val:                First part of value read back.
+ * @val2:               Second part of value read back.
+ *
+ * Note returns a description of what is in val and val2, such
+ * as IIO_VAL_INT_PLUS_MICRO telling us we have a value of val
+ * + val2/1e6
+ */
+int iio_read_channel_offset(struct iio_channel *chan, int *val,
+                           int *val2);
+
+/**
  * iio_read_channel_scale() - read the scale value for a channel
  * @chan:               The channel being queried.
  * @val:                First part of value read back.
diff --git a/include/linux/iio/dac/mcp4725.h b/include/linux/iio/dac/mcp4725.h
index 91530e6611e9..628b2cf54c50 100644
--- a/include/linux/iio/dac/mcp4725.h
+++ b/include/linux/iio/dac/mcp4725.h
@@ -9,8 +9,18 @@
 #ifndef IIO_DAC_MCP4725_H_
 #define IIO_DAC_MCP4725_H_
 
+/**
+ * struct mcp4725_platform_data - MCP4725/6 DAC specific data.
+ * @use_vref: Whether an external reference voltage on Vref pin should be used.
+ *            Additional vref-supply must be specified when used.
+ * @vref_buffered: Controls buffering of the external reference voltage.
+ *
+ * Vref related settings are available only on MCP4756. See
+ * Documentation/devicetree/bindings/iio/dac/mcp4725.txt for more information.
+ */
 struct mcp4725_platform_data {
-        u16 vref_mv;
+        bool use_vref;
+        bool vref_buffered;
 };
 
 #endif /* IIO_DAC_MCP4725_H_ */
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index b4a0679e4a49..3f5ea2e9a39e 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -225,12 +225,22 @@ struct iio_event_spec {
  *                      endianness:     little or big endian
  * @info_mask_separate: What information is to be exported that is specific to
  *                      this channel.
+ * @info_mask_separate_available: What availability information is to be
+ *                      exported that is specific to this channel.
  * @info_mask_shared_by_type: What information is to be exported that is shared
  *                      by all channels of the same type.
+ * @info_mask_shared_by_type_available: What availability information is to be
+ *                      exported that is shared by all channels of the same
+ *                      type.
  * @info_mask_shared_by_dir: What information is to be exported that is shared
  *                      by all channels of the same direction.
+ * @info_mask_shared_by_dir_available: What availability information is to be
+ *                      exported that is shared by all channels of the same
+ *                      direction.
  * @info_mask_shared_by_all: What information is to be exported that is shared
  *                      by all channels.
+ * @info_mask_shared_by_all_available: What availability information is to be
+ *                      exported that is shared by all channels.
  * @event_spec:         Array of events which should be registered for this
  *                      channel.
  * @num_event_specs:    Size of the event_spec array.
@@ -269,9 +279,13 @@ struct iio_chan_spec {
                 enum iio_endian endianness;
         } scan_type;
         long                    info_mask_separate;
+        long                    info_mask_separate_available;
         long                    info_mask_shared_by_type;
+        long                    info_mask_shared_by_type_available;
         long                    info_mask_shared_by_dir;
+        long                    info_mask_shared_by_dir_available;
         long                    info_mask_shared_by_all;
+        long                    info_mask_shared_by_all_available;
         const struct iio_event_spec *event_spec;
         unsigned int            num_event_specs;
         const struct iio_chan_spec_ext_info *ext_info;
@@ -301,6 +315,23 @@ static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,
                 (chan->info_mask_shared_by_all & BIT(type));
 }
 
+/**
+ * iio_channel_has_available() - Checks if a channel has an available attribute
+ * @chan: The channel to be queried
+ * @type: Type of the available attribute to be checked
+ *
+ * Returns true if the channel supports reporting available values for the
+ * given attribute type, false otherwise.
+ */
+static inline bool iio_channel_has_available(const struct iio_chan_spec *chan,
+                                             enum iio_chan_info_enum type)
+{
+        return (chan->info_mask_separate_available & BIT(type)) |
+                (chan->info_mask_shared_by_type_available & BIT(type)) |
+                (chan->info_mask_shared_by_dir_available & BIT(type)) |
+                (chan->info_mask_shared_by_all_available & BIT(type));
+}
+
 #define IIO_CHAN_SOFT_TIMESTAMP(_si) {                                  \
         .type = IIO_TIMESTAMP,                                          \
         .channel = -1,                                                  \
@@ -349,6 +380,14 @@ struct iio_dev;
  *                      max_len specifies maximum number of elements
  *                      vals pointer can contain. val_len is used to return
  *                      length of valid elements in vals.
+ * @read_avail:         function to return the available values from the device.
+ *                      mask specifies which value. Note 0 means the available
+ *                      values for the channel in question.  Return value
+ *                      specifies if a IIO_AVAIL_LIST or a IIO_AVAIL_RANGE is
+ *                      returned in vals. The type of the vals are returned in
+ *                      type and the number of vals is returned in length. For
+ *                      ranges, there are always three vals returned; min, step
+ *                      and max. For lists, all possible values are enumerated.
  * @write_raw:          function to write a value to the device.
  *                      Parameters are the same as for read_raw.
  * @write_raw_get_fmt:  callback function to query the expected
@@ -381,7 +420,7 @@ struct iio_dev;
  **/
 struct iio_info {
         struct module                   *driver_module;
-        struct attribute_group          *event_attrs;
+        const struct attribute_group    *event_attrs;
         const struct attribute_group    *attrs;
 
         int (*read_raw)(struct iio_dev *indio_dev,
@@ -397,6 +436,13 @@ struct iio_info {
                         int *val_len,
                         long mask);
 
+        int (*read_avail)(struct iio_dev *indio_dev,
+                          struct iio_chan_spec const *chan,
+                          const int **vals,
+                          int *type,
+                          int *length,
+                          long mask);
+
         int (*write_raw)(struct iio_dev *indio_dev,
                          struct iio_chan_spec const *chan,
                          int val,
diff --git a/include/linux/iio/sysfs.h b/include/linux/iio/sysfs.h
index 9cd8f747212f..ce9426c507fd 100644
--- a/include/linux/iio/sysfs.h
+++ b/include/linux/iio/sysfs.h
@@ -55,10 +55,34 @@ struct iio_const_attr {
         { .dev_attr = __ATTR(_name, _mode, _show, _store),      \
           .address = _addr }
 
+#define IIO_ATTR_RO(_name, _addr)       \
+        { .dev_attr = __ATTR_RO(_name), \
+          .address = _addr }
+
+#define IIO_ATTR_WO(_name, _addr)       \
+        { .dev_attr = __ATTR_WO(_name), \
+          .address = _addr }
+
+#define IIO_ATTR_RW(_name, _addr)       \
+        { .dev_attr = __ATTR_RW(_name), \
+          .address = _addr }
+
 #define IIO_DEVICE_ATTR(_name, _mode, _show, _store, _addr)     \
         struct iio_dev_attr iio_dev_attr_##_name                \
         = IIO_ATTR(_name, _mode, _show, _store, _addr)
 
+#define IIO_DEVICE_ATTR_RO(_name, _addr)                       \
+        struct iio_dev_attr iio_dev_attr_##_name                \
+        = IIO_ATTR_RO(_name, _addr)
+
+#define IIO_DEVICE_ATTR_WO(_name, _addr)                       \
+        struct iio_dev_attr iio_dev_attr_##_name                \
+        = IIO_ATTR_WO(_name, _addr)
+
+#define IIO_DEVICE_ATTR_RW(_name, _addr)                                   \
+        struct iio_dev_attr iio_dev_attr_##_name                            \
+        = IIO_ATTR_RW(_name, _addr)
+
 #define IIO_DEVICE_ATTR_NAMED(_vname, _name, _mode, _show, _store, _addr) \
         struct iio_dev_attr iio_dev_attr_##_vname                       \
         = IIO_ATTR(_name, _mode, _show, _store, _addr)
diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
index 4f1154f7a33c..ea08302f2d7b 100644
--- a/include/linux/iio/trigger.h
+++ b/include/linux/iio/trigger.h
@@ -170,6 +170,8 @@ void iio_trigger_free(struct iio_trigger *trig);
  */
 bool iio_trigger_using_own(struct iio_dev *indio_dev);
 
+int iio_trigger_validate_own_device(struct iio_trigger *trig,
+                                     struct iio_dev *indio_dev);
 
 #else
 struct iio_trigger;
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index 32b579525004..2aa7b6384d64 100644
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -29,4 +29,9 @@ enum iio_event_info {
 #define IIO_VAL_FRACTIONAL 10
 #define IIO_VAL_FRACTIONAL_LOG2 11
 
+enum iio_available_type {
+        IIO_AVAIL_LIST,
+        IIO_AVAIL_RANGE,
+};
+
 #endif /* _IIO_TYPES_H_ */
diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h
index 76f7ef4d3a0d..f62043a75f43 100644
--- a/include/linux/mfd/cros_ec.h
+++ b/include/linux/mfd/cros_ec.h
@@ -148,6 +148,15 @@ struct cros_ec_device {
         int event_size;
 };
 
+/**
+ * struct cros_ec_sensor_platform - ChromeOS EC sensor platform information
+ *
+ * @sensor_num: Id of the sensor, as reported by the EC.
+ */
+struct cros_ec_sensor_platform {
+        u8 sensor_num;
+};
+
 /* struct cros_ec_platform - ChromeOS EC platform information
  *
  * @ec_name: name of EC device (e.g. 'cros-ec', 'cros-pd', ...)
@@ -175,6 +184,7 @@ struct cros_ec_dev {
         struct cros_ec_device *ec_dev;
         struct device *dev;
         u16 cmd_offset;
+        u32 features[2];
 };
 
 /**
diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h
index 76728ff37d01..1683003603f3 100644
--- a/include/linux/mfd/cros_ec_commands.h
+++ b/include/linux/mfd/cros_ec_commands.h
@@ -713,6 +713,90 @@ struct ec_response_get_set_value {
 /* More than one command can use these structs to get/set paramters. */
 #define EC_CMD_GSV_PAUSE_IN_S5  0x0c
 
+/*****************************************************************************/
+/* List the features supported by the firmware */
+#define EC_CMD_GET_FEATURES  0x0d
+
+/* Supported features */
+enum ec_feature_code {
+        /*
+         * This image contains a limited set of features. Another image
+         * in RW partition may support more features.
+         */
+        EC_FEATURE_LIMITED = 0,
+        /*
+         * Commands for probing/reading/writing/erasing the flash in the
+         * EC are present.
+         */
+        EC_FEATURE_FLASH = 1,
+        /*
+         * Can control the fan speed directly.
+         */
+        EC_FEATURE_PWM_FAN = 2,
+        /*
+         * Can control the intensity of the keyboard backlight.
+         */
+        EC_FEATURE_PWM_KEYB = 3,
+        /*
+         * Support Google lightbar, introduced on Pixel.
+         */
+        EC_FEATURE_LIGHTBAR = 4,
+        /* Control of LEDs  */
+        EC_FEATURE_LED = 5,
+        /* Exposes an interface to control gyro and sensors.
+         * The host goes through the EC to access these sensors.
+         * In addition, the EC may provide composite sensors, like lid angle.
+         */
+        EC_FEATURE_MOTION_SENSE = 6,
+        /* The keyboard is controlled by the EC */
+        EC_FEATURE_KEYB = 7,
+        /* The AP can use part of the EC flash as persistent storage. */
+        EC_FEATURE_PSTORE = 8,
+        /* The EC monitors BIOS port 80h, and can return POST codes. */
+        EC_FEATURE_PORT80 = 9,
+        /*
+         * Thermal management: include TMP specific commands.
+         * Higher level than direct fan control.
+         */
+        EC_FEATURE_THERMAL = 10,
+        /* Can switch the screen backlight on/off */
+        EC_FEATURE_BKLIGHT_SWITCH = 11,
+        /* Can switch the wifi module on/off */
+        EC_FEATURE_WIFI_SWITCH = 12,
+        /* Monitor host events, through for example SMI or SCI */
+        EC_FEATURE_HOST_EVENTS = 13,
+        /* The EC exposes GPIO commands to control/monitor connected devices. */
+        EC_FEATURE_GPIO = 14,
+        /* The EC can send i2c messages to downstream devices. */
+        EC_FEATURE_I2C = 15,
+        /* Command to control charger are included */
+        EC_FEATURE_CHARGER = 16,
+        /* Simple battery support. */
+        EC_FEATURE_BATTERY = 17,
+        /*
+         * Support Smart battery protocol
+         * (Common Smart Battery System Interface Specification)
+         */
+        EC_FEATURE_SMART_BATTERY = 18,
+        /* EC can dectect when the host hangs. */
+        EC_FEATURE_HANG_DETECT = 19,
+        /* Report power information, for pit only */
+        EC_FEATURE_PMU = 20,
+        /* Another Cros EC device is present downstream of this one */
+        EC_FEATURE_SUB_MCU = 21,
+        /* Support USB Power delivery (PD) commands */
+        EC_FEATURE_USB_PD = 22,
+        /* Control USB multiplexer, for audio through USB port for instance. */
+        EC_FEATURE_USB_MUX = 23,
+        /* Motion Sensor code has an internal software FIFO */
+        EC_FEATURE_MOTION_SENSE_FIFO = 24,
+};
+
+#define EC_FEATURE_MASK_0(event_code) (1UL << (event_code % 32))
+#define EC_FEATURE_MASK_1(event_code) (1UL << (event_code - 32))
+struct ec_response_get_features {
+        uint32_t flags[2];
+} __packed;
 
 /*****************************************************************************/
 /* Flash commands */
@@ -1315,6 +1399,24 @@ enum motionsense_command {
          */
         MOTIONSENSE_CMD_KB_WAKE_ANGLE = 5,
 
+        /*
+         * Returns a single sensor data.
+         */
+        MOTIONSENSE_CMD_DATA = 6,
+
+        /*
+         * Perform low level calibration.. On sensors that support it, ask to
+         * do offset calibration.
+         */
+        MOTIONSENSE_CMD_PERFORM_CALIB = 10,
+
+        /*
+         * Sensor Offset command is a setter/getter command for the offset used
+         * for calibration. The offsets can be calculated by the host, or via
+         * PERFORM_CALIB command.
+         */
+        MOTIONSENSE_CMD_SENSOR_OFFSET = 11,
+
         /* Number of motionsense sub-commands. */
         MOTIONSENSE_NUM_CMDS
 };
@@ -1335,12 +1437,18 @@ enum motionsensor_id {
 enum motionsensor_type {
         MOTIONSENSE_TYPE_ACCEL = 0,
         MOTIONSENSE_TYPE_GYRO = 1,
+        MOTIONSENSE_TYPE_MAG = 2,
+        MOTIONSENSE_TYPE_PROX = 3,
+        MOTIONSENSE_TYPE_LIGHT = 4,
+        MOTIONSENSE_TYPE_ACTIVITY = 5,
+        MOTIONSENSE_TYPE_MAX
 };
 
 /* List of motion sensor locations. */
 enum motionsensor_location {
         MOTIONSENSE_LOC_BASE = 0,
         MOTIONSENSE_LOC_LID = 1,
+        MOTIONSENSE_LOC_MAX,
 };
 
 /* List of motion sensor chips. */
@@ -1361,6 +1469,31 @@ enum motionsensor_chip {
  */
 #define EC_MOTION_SENSE_NO_VALUE -1
 
+#define EC_MOTION_SENSE_INVALID_CALIB_TEMP 0x8000
+
+/* Set Calibration information */
+#define MOTION_SENSE_SET_OFFSET 1
+
+struct ec_response_motion_sensor_data {
+        /* Flags for each sensor. */
+        uint8_t flags;
+        /* Sensor number the data comes from */
+        uint8_t sensor_num;
+        /* Each sensor is up to 3-axis. */
+        union {
+                int16_t             data[3];
+                struct {
+                        uint16_t    rsvd;
+                        uint32_t    timestamp;
+                } __packed;
+                struct {
+                        uint8_t     activity; /* motionsensor_activity */
+                        uint8_t     state;
+                        int16_t     add_info[2];
+                };
+        };
+} __packed;
+
 struct ec_params_motion_sense {
         uint8_t cmd;
         union {
@@ -1378,9 +1511,37 @@ struct ec_params_motion_sense {
                         int16_t data;
                 } ec_rate, kb_wake_angle;
 
+                /* Used for MOTIONSENSE_CMD_SENSOR_OFFSET */
+                struct {
+                        uint8_t sensor_num;
+
+                        /*
+                         * bit 0: If set (MOTION_SENSE_SET_OFFSET), set
+                         * the calibration information in the EC.
+                         * If unset, just retrieve calibration information.
+                         */
+                        uint16_t flags;
+
+                        /*
+                         * Temperature at calibration, in units of 0.01 C
+                         * 0x8000: invalid / unknown.
+                         * 0x0: 0C
+                         * 0x7fff: +327.67C
+                         */
+                        int16_t temp;
+
+                        /*
+                         * Offset for calibration.
+                         * Unit:
+                         * Accelerometer: 1/1024 g
+                         * Gyro:          1/1024 deg/s
+                         * Compass:       1/16 uT
+                         */
+                        int16_t offset[3];
+                } __packed sensor_offset;
+
                 /* Used for MOTIONSENSE_CMD_INFO. */
                 struct {
-                        /* Should be element of enum motionsensor_id. */
                         uint8_t sensor_num;
                 } info;
 
@@ -1410,11 +1571,14 @@ struct ec_response_motion_sense {
                         /* Flags representing the motion sensor module. */
                         uint8_t module_flags;
 
-                        /* Flags for each sensor in enum motionsensor_id. */
-                        uint8_t sensor_flags[EC_MOTION_SENSOR_COUNT];
+                        /* Number of sensors managed directly by the EC. */
+                        uint8_t sensor_count;
 
-                        /* Array of all sensor data. Each sensor is 3-axis. */
-                        int16_t data[3*EC_MOTION_SENSOR_COUNT];
+                        /*
+                         * Sensor data is truncated if response_max is too small
+                         * for holding all the data.
+                         */
+                        struct ec_response_motion_sensor_data sensor[0];
                 } dump;
 
                 /* Used for MOTIONSENSE_CMD_INFO. */
@@ -1429,6 +1593,9 @@ struct ec_response_motion_sense {
                         uint8_t chip;
                 } info;
 
+                /* Used for MOTIONSENSE_CMD_DATA */
+                struct ec_response_motion_sensor_data data;
+
                 /*
                  * Used for MOTIONSENSE_CMD_EC_RATE, MOTIONSENSE_CMD_SENSOR_ODR,
                  * MOTIONSENSE_CMD_SENSOR_RANGE, and
@@ -1438,6 +1605,12 @@ struct ec_response_motion_sense {
                         /* Current value of the parameter queried. */
                         int32_t ret;
                 } ec_rate, sensor_odr, sensor_range, kb_wake_angle;
+
+                /* Used for MOTIONSENSE_CMD_SENSOR_OFFSET */
+                struct {
+                        int16_t temp;
+                        int16_t offset[3];
+                } sensor_offset, perform_calib;
         };
 } __packed;
 
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index 7f55b8b41032..b9a53e013bff 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -23,6 +23,8 @@
 #define REG_IRQENABLE           0x02C
 #define REG_IRQCLR              0x030
 #define REG_IRQWAKEUP           0x034
+#define REG_DMAENABLE_SET       0x038
+#define REG_DMAENABLE_CLEAR     0x03c
 #define REG_CTRL                0x040
 #define REG_ADCFSM              0x044
 #define REG_CLKDIV              0x04C
@@ -36,6 +38,7 @@
 #define REG_FIFO0THR            0xE8
 #define REG_FIFO1CNT            0xF0
 #define REG_FIFO1THR            0xF4
+#define REG_DMA1REQ             0xF8
 #define REG_FIFO0               0x100
 #define REG_FIFO1               0x200
 
@@ -126,6 +129,10 @@
 #define FIFOREAD_DATA_MASK (0xfff << 0)
 #define FIFOREAD_CHNLID_MASK (0xf << 16)
 
+/* DMA ENABLE/CLEAR Register */
+#define DMA_FIFO0               BIT(0)
+#define DMA_FIFO1               BIT(1)
+
 /* Sequencer Status */
 #define SEQ_STATUS BIT(5)
 #define CHARGE_STEP             0x11
@@ -155,6 +162,7 @@ struct ti_tscadc_dev {
         struct device *dev;
         struct regmap *regmap;
         void __iomem *tscadc_base;
+        phys_addr_t tscadc_phys_base;
         int irq;
         int used_cells; /* 1-2 */
         int tsc_wires;
diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
index 3fb357193f09..cb979ad90401 100644
--- a/include/soc/bcm2835/raspberrypi-firmware.h
+++ b/include/soc/bcm2835/raspberrypi-firmware.h
@@ -109,14 +109,35 @@ enum rpi_firmware_property_tag {
         RPI_FIRMWARE_FRAMEBUFFER_SET_OVERSCAN =               0x0004800a,
         RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE =                0x0004800b,
 
+        RPI_FIRMWARE_VCHIQ_INIT =                             0x00048010,
+
         RPI_FIRMWARE_GET_COMMAND_LINE =                       0x00050001,
         RPI_FIRMWARE_GET_DMA_CHANNELS =                       0x00060001,
 };
 
+#if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)
 int rpi_firmware_property(struct rpi_firmware *fw,
                           u32 tag, void *data, size_t len);
 int rpi_firmware_property_list(struct rpi_firmware *fw,
                                void *data, size_t tag_size);
 struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node);
+#else
+static inline int rpi_firmware_property(struct rpi_firmware *fw, u32 tag,
+                                        void *data, size_t len)
+{
+        return 0;
+}
+
+static inline int rpi_firmware_property_list(struct rpi_firmware *fw,
+                                             void *data, size_t tag_size)
+{
+        return 0;
+}
+
+static inline struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node)
+{
+        return NULL;
+}
+#endif
 
 #endif /* __SOC_RASPBERRY_FIRMWARE_H__ */
diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
index 22e5e589a274..e54d14a7f876 100644
--- a/include/uapi/linux/iio/types.h
+++ b/include/uapi/linux/iio/types.h
@@ -40,6 +40,8 @@ enum iio_chan_type {
         IIO_PH,
         IIO_UVINDEX,
         IIO_ELECTRICALCONDUCTIVITY,
+        IIO_COUNT,
+        IIO_INDEX,
 };
 
 enum iio_modifier {
diff --git a/tools/iio/iio_generic_buffer.c b/tools/iio/iio_generic_buffer.c
index f39c0e9c0d5c..f0c6f54a8b2f 100644
--- a/tools/iio/iio_generic_buffer.c
+++ b/tools/iio/iio_generic_buffer.c
@@ -247,6 +247,7 @@ void print_usage(void)
         fprintf(stderr, "Usage: generic_buffer [options]...\n"
                 "Capture, convert and output data from IIO device buffer\n"
                 "  -a         Auto-activate all available channels\n"
+                "  -A         Force-activate ALL channels\n"
                 "  -c <n>     Do n conversions\n"
                 "  -e         Disable wait for event (new data)\n"
                 "  -g         Use trigger-less mode\n"
@@ -347,16 +348,22 @@ int main(int argc, char **argv)
         int noevents = 0;
         int notrigger = 0;
         char *dummy;
+        bool force_autochannels = false;
 
         struct iio_channel_info *channels = NULL;
 
         register_cleanup();
 
-        while ((c = getopt_long(argc, argv, "ac:egl:n:N:t:T:w:", longopts, NULL)) != -1) {
+        while ((c = getopt_long(argc, argv, "aAc:egl:n:N:t:T:w:?", longopts,
+                                NULL)) != -1) {
                 switch (c) {
                 case 'a':
                         autochannels = AUTOCHANNELS_ENABLED;
                         break;
+                case 'A':
+                        autochannels = AUTOCHANNELS_ENABLED;
+                        force_autochannels = true;
+                        break;  
                 case 'c':
                         errno = 0;
                         num_loops = strtoul(optarg, &dummy, 10);
@@ -519,15 +526,16 @@ int main(int argc, char **argv)
                         "diag %s\n", dev_dir_name);
                 goto error;
         }
-        if (num_channels && autochannels == AUTOCHANNELS_ENABLED) {
+        if (num_channels && autochannels == AUTOCHANNELS_ENABLED &&
+            !force_autochannels) {
                 fprintf(stderr, "Auto-channels selected but some channels "
                         "are already activated in sysfs\n");
                 fprintf(stderr, "Proceeding without activating any channels\n");
         }
 
-        if (!num_channels && autochannels == AUTOCHANNELS_ENABLED) {
-                fprintf(stderr,
-                        "No channels are enabled, enabling all channels\n");
+        if ((!num_channels && autochannels == AUTOCHANNELS_ENABLED) ||
+            (autochannels == AUTOCHANNELS_ENABLED && force_autochannels)) {
+                fprintf(stderr, "Enabling all channels\n");
 
                 ret = enable_disable_all_channels(dev_dir_name, 1);
                 if (ret) {